Update coordinator typing (4) [o-p] (#68464)

homeassistant/components/octoprint/binary_sensor.py

@@ -36,11 +36,11 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class OctoPrintBinarySensorBase(CoordinatorEntity, BinarySensorEntity):
+class OctoPrintBinarySensorBase(
+    CoordinatorEntity[OctoprintDataUpdateCoordinator], BinarySensorEntity
+):
     """Representation an OctoPrint binary sensor."""
 
-    coordinator: OctoprintDataUpdateCoordinator
-
     def __init__(
         self,
         coordinator: OctoprintDataUpdateCoordinator,

homeassistant/components/octoprint/button.py

@@ -34,10 +34,9 @@ async def async_setup_entry(
     )
 
 
-class OctoprintButton(CoordinatorEntity, ButtonEntity):
+class OctoprintButton(CoordinatorEntity[OctoprintDataUpdateCoordinator], ButtonEntity):
     """Represent an OctoPrint binary sensor."""
 
-    coordinator: OctoprintDataUpdateCoordinator
     client: OctoprintClient
 
     def __init__(

homeassistant/components/octoprint/sensor.py

@@ -89,11 +89,11 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class OctoPrintSensorBase(CoordinatorEntity, SensorEntity):
+class OctoPrintSensorBase(
+    CoordinatorEntity[OctoprintDataUpdateCoordinator], SensorEntity
+):
     """Representation of an OctoPrint sensor."""
 
-    coordinator: OctoprintDataUpdateCoordinator
-
     def __init__(
         self,
         coordinator: OctoprintDataUpdateCoordinator,

homeassistant/components/omnilogic/common.py

@@ -73,7 +73,7 @@ class OmniLogicUpdateCoordinator(DataUpdateCoordinator):
         return parsed_data
 
 
-class OmniLogicEntity(CoordinatorEntity):
+class OmniLogicEntity(CoordinatorEntity[OmniLogicUpdateCoordinator]):
     """Defines the base OmniLogic entity."""
 
     def __init__(

homeassistant/components/open_meteo/weather.py

@@ -28,14 +28,18 @@ async def async_setup_entry(
     async_add_entities([OpenMeteoWeatherEntity(entry=entry, coordinator=coordinator)])
 
 
-class OpenMeteoWeatherEntity(CoordinatorEntity, WeatherEntity):
+class OpenMeteoWeatherEntity(
+    CoordinatorEntity[DataUpdateCoordinator[OpenMeteoForecast]], WeatherEntity
+):
     """Defines an Open-Meteo weather entity."""
 
     _attr_temperature_unit = TEMP_CELSIUS
-    coordinator: DataUpdateCoordinator[OpenMeteoForecast]
 
     def __init__(
-        self, *, entry: ConfigEntry, coordinator: DataUpdateCoordinator
+        self,
+        *,
+        entry: ConfigEntry,
+        coordinator: DataUpdateCoordinator[OpenMeteoForecast],
     ) -> None:
         """Initialize Open-Meteo weather entity."""
         super().__init__(coordinator=coordinator)

homeassistant/components/overkiz/entity.py

@@ -16,11 +16,9 @@ from .coordinator import OverkizDataUpdateCoordinator
 from .executor import OverkizExecutor
 
 
-class OverkizEntity(CoordinatorEntity):
+class OverkizEntity(CoordinatorEntity[OverkizDataUpdateCoordinator]):
     """Representation of an Overkiz device entity."""
 
-    coordinator: OverkizDataUpdateCoordinator
-
     def __init__(
         self, device_url: str, coordinator: OverkizDataUpdateCoordinator
     ) -> None:

homeassistant/components/p1_monitor/sensor.py

@@ -235,11 +235,11 @@ async def async_setup_entry(
     )
 
 
-class P1MonitorSensorEntity(CoordinatorEntity, SensorEntity):
+class P1MonitorSensorEntity(
+    CoordinatorEntity[P1MonitorDataUpdateCoordinator], SensorEntity
+):
     """Defines an P1 Monitor sensor."""
 
-    coordinator: P1MonitorDataUpdateCoordinator
-
     def __init__(
         self,
         *,

homeassistant/components/philips_js/light.py

@@ -123,7 +123,9 @@ def _average_pixels(data):
     return 0.0, 0.0, 0.0
 
 
-class PhilipsTVLightEntity(CoordinatorEntity, LightEntity):
+class PhilipsTVLightEntity(
+    CoordinatorEntity[PhilipsTVDataUpdateCoordinator], LightEntity
+):
     """Representation of a Philips TV exposing the JointSpace API."""
 
     def __init__(

homeassistant/components/philips_js/media_player.py

@@ -79,10 +79,11 @@ async def async_setup_entry(
     )
 
 
-class PhilipsTVMediaPlayer(CoordinatorEntity, MediaPlayerEntity):
+class PhilipsTVMediaPlayer(
+    CoordinatorEntity[PhilipsTVDataUpdateCoordinator], MediaPlayerEntity
+):
     """Representation of a Philips TV exposing the JointSpace API."""
 
-    coordinator: PhilipsTVDataUpdateCoordinator
     _attr_device_class = MediaPlayerDeviceClass.TV
 
     def __init__(

homeassistant/components/philips_js/remote.py

@@ -27,11 +27,9 @@ async def async_setup_entry(
     async_add_entities([PhilipsTVRemote(coordinator)])
 
 
-class PhilipsTVRemote(CoordinatorEntity, RemoteEntity):
+class PhilipsTVRemote(CoordinatorEntity[PhilipsTVDataUpdateCoordinator], RemoteEntity):
     """Device that sends commands."""
 
-    coordinator: PhilipsTVDataUpdateCoordinator
-
     def __init__(
         self,
         coordinator: PhilipsTVDataUpdateCoordinator,

homeassistant/components/philips_js/switch.py

@@ -27,11 +27,11 @@ async def async_setup_entry(
     async_add_entities([PhilipsTVScreenSwitch(coordinator)])
 
 
-class PhilipsTVScreenSwitch(CoordinatorEntity, SwitchEntity):
+class PhilipsTVScreenSwitch(
+    CoordinatorEntity[PhilipsTVDataUpdateCoordinator], SwitchEntity
+):
     """A Philips TV screen state switch."""
 
-    coordinator: PhilipsTVDataUpdateCoordinator
-
     def __init__(
         self,
         coordinator: PhilipsTVDataUpdateCoordinator,

homeassistant/components/pvoutput/sensor.py

@@ -133,10 +133,11 @@ async def async_setup_entry(
     )
 
 
-class PVOutputSensorEntity(CoordinatorEntity, SensorEntity):
+class PVOutputSensorEntity(
+    CoordinatorEntity[PVOutputDataUpdateCoordinator], SensorEntity
+):
     """Representation of a PVOutput sensor."""
 
-    coordinator: PVOutputDataUpdateCoordinator
     entity_description: PVOutputSensorEntityDescription
 
     def __init__(

homeassistant/components/pvpc_hourly_pricing/sensor.py

@@ -125,11 +125,9 @@ async def async_setup_entry(
     )
 
 
-class ElecPriceSensor(CoordinatorEntity, SensorEntity):
+class ElecPriceSensor(CoordinatorEntity[ElecPricesDataUpdateCoordinator], SensorEntity):
     """Class to hold the prices of electricity as a sensor."""
 
-    coordinator: ElecPricesDataUpdateCoordinator
-
     def __init__(
         self,
         coordinator: ElecPricesDataUpdateCoordinator,