Update coordinator typing (5) [r-s] (#68465)

homeassistant/components/rainforest_eagle/sensor.py

@@ -67,11 +67,9 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class EagleSensor(CoordinatorEntity, SensorEntity):
+class EagleSensor(CoordinatorEntity[EagleDataCoordinator], SensorEntity):
     """Implementation of the Rainforest Eagle sensor."""
 
-    coordinator: EagleDataCoordinator
-
     def __init__(self, coordinator, entity_description):
         """Initialize the sensor."""
         super().__init__(coordinator)

homeassistant/components/rituals_perfume_genie/entity.py

@@ -14,11 +14,9 @@ MODEL = "The Perfume Genie"
 MODEL2 = "The Perfume Genie 2.0"
 
 
-class DiffuserEntity(CoordinatorEntity):
+class DiffuserEntity(CoordinatorEntity[RitualsDataUpdateCoordinator]):
     """Representation of a diffuser entity."""
 
-    coordinator: RitualsDataUpdateCoordinator
-
     def __init__(
         self,
         diffuser: Diffuser,

homeassistant/components/roku/entity.py

@@ -9,11 +9,9 @@ from . import RokuDataUpdateCoordinator
 from .const import DOMAIN
 
 
-class RokuEntity(CoordinatorEntity):
+class RokuEntity(CoordinatorEntity[RokuDataUpdateCoordinator]):
     """Defines a base Roku entity."""
 
-    coordinator: RokuDataUpdateCoordinator
-
     def __init__(
         self,
         *,

homeassistant/components/screenlogic/__init__.py

@@ -167,11 +167,9 @@ class ScreenlogicDataUpdateCoordinator(DataUpdateCoordinator):
             raise UpdateFailed(ex) from ex
 
 
-class ScreenlogicEntity(CoordinatorEntity):
+class ScreenlogicEntity(CoordinatorEntity[ScreenlogicDataUpdateCoordinator]):
     """Base class for all ScreenLogic entities."""
 
-    coordinator: ScreenlogicDataUpdateCoordinator
-
     def __init__(self, coordinator, data_key, enabled=True):
         """Initialize of the entity."""
         super().__init__(coordinator)

homeassistant/components/sensibo/entity.py

@@ -14,11 +14,9 @@ from .const import DOMAIN, LOGGER, SENSIBO_ERRORS, TIMEOUT
 from .coordinator import MotionSensor, SensiboDataUpdateCoordinator
 
 
-class SensiboBaseEntity(CoordinatorEntity):
+class SensiboBaseEntity(CoordinatorEntity[SensiboDataUpdateCoordinator]):
     """Representation of a Sensibo entity."""
 
-    coordinator: SensiboDataUpdateCoordinator
-
     def __init__(
         self,
         coordinator: SensiboDataUpdateCoordinator,

homeassistant/components/sharkiq/vacuum.py

@@ -84,11 +84,9 @@ async def async_setup_entry(
     async_add_entities([SharkVacuumEntity(d, coordinator) for d in devices])
 
 
-class SharkVacuumEntity(CoordinatorEntity, StateVacuumEntity):
+class SharkVacuumEntity(CoordinatorEntity[SharkIqUpdateCoordinator], StateVacuumEntity):
     """Shark IQ vacuum entity."""
 
-    coordinator: SharkIqUpdateCoordinator
-
     def __init__(
         self, sharkiq: SharkIqVacuum, coordinator: SharkIqUpdateCoordinator
     ) -> None:

homeassistant/components/solarlog/sensor.py

@@ -2,9 +2,9 @@
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import update_coordinator
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import SolarlogData
 from .const import DOMAIN, SENSOR_TYPES, SolarLogSensorEntityDescription
@@ -20,7 +20,7 @@ async def async_setup_entry(
     )
 
 
-class SolarlogSensor(update_coordinator.CoordinatorEntity, SensorEntity):
+class SolarlogSensor(CoordinatorEntity[SolarlogData], SensorEntity):
     """Representation of a Sensor."""
 
     entity_description: SolarLogSensorEntityDescription

homeassistant/components/speedtestdotnet/sensor.py

@@ -43,10 +43,11 @@ async def async_setup_entry(
     )
 
 
-class SpeedtestSensor(CoordinatorEntity, RestoreEntity, SensorEntity):
+class SpeedtestSensor(
+    CoordinatorEntity[SpeedTestDataCoordinator], RestoreEntity, SensorEntity
+):
     """Implementation of a speedtest.net sensor."""
 
-    coordinator: SpeedTestDataCoordinator
     entity_description: SpeedtestSensorEntityDescription
     _attr_icon = ICON
 

homeassistant/components/steamist/entity.py

@@ -13,11 +13,9 @@ from .const import CONF_MODEL
 from .coordinator import SteamistDataUpdateCoordinator
 
 
-class SteamistEntity(CoordinatorEntity, Entity):
+class SteamistEntity(CoordinatorEntity[SteamistDataUpdateCoordinator], Entity):
     """Representation of an Steamist entity."""
 
-    coordinator: SteamistDataUpdateCoordinator
-
     def __init__(
         self,
         coordinator: SteamistDataUpdateCoordinator,

homeassistant/components/surepetcare/entity.py

@@ -13,7 +13,7 @@ from . import SurePetcareDataCoordinator
 from .const import DOMAIN
 
 
-class SurePetcareEntity(CoordinatorEntity):
+class SurePetcareEntity(CoordinatorEntity[SurePetcareDataCoordinator]):
     """An implementation for Sure Petcare Entities."""
 
     def __init__(

homeassistant/components/surepetcare/lock.py

@@ -46,8 +46,6 @@ async def async_setup_entry(
 class SurePetcareLock(SurePetcareEntity, LockEntity):
     """A lock implementation for Sure Petcare Entities."""
 
-    coordinator: SurePetcareDataCoordinator
-
     def __init__(
         self,
         surepetcare_id: int,

homeassistant/components/switchbot/binary_sensor.py

@@ -54,8 +54,6 @@ async def async_setup_entry(
 class SwitchBotBinarySensor(SwitchbotEntity, BinarySensorEntity):
     """Representation of a Switchbot binary sensor."""
 
-    coordinator: SwitchbotDataUpdateCoordinator
-
     def __init__(
         self,
         coordinator: SwitchbotDataUpdateCoordinator,

homeassistant/components/switchbot/cover.py

@@ -59,7 +59,6 @@ async def async_setup_entry(
 class SwitchBotCurtainEntity(SwitchbotEntity, CoverEntity, RestoreEntity):
     """Representation of a Switchbot."""
 
-    coordinator: SwitchbotDataUpdateCoordinator
     _attr_device_class = CoverDeviceClass.CURTAIN
     _attr_supported_features = (
         SUPPORT_OPEN | SUPPORT_CLOSE | SUPPORT_STOP | SUPPORT_SET_POSITION

homeassistant/components/switchbot/entity.py

@@ -12,7 +12,7 @@ from .const import MANUFACTURER
 from .coordinator import SwitchbotDataUpdateCoordinator
 
 
-class SwitchbotEntity(CoordinatorEntity, Entity):
+class SwitchbotEntity(CoordinatorEntity[SwitchbotDataUpdateCoordinator], Entity):
     """Generic entity encapsulating common features of Switchbot device."""
 
     def __init__(

homeassistant/components/switchbot/sensor.py

@@ -74,8 +74,6 @@ async def async_setup_entry(
 class SwitchBotSensor(SwitchbotEntity, SensorEntity):
     """Representation of a Switchbot sensor."""
 
-    coordinator: SwitchbotDataUpdateCoordinator
-
     def __init__(
         self,
         coordinator: SwitchbotDataUpdateCoordinator,

homeassistant/components/switchbot/switch.py

@@ -104,7 +104,6 @@ async def async_setup_entry(
 class SwitchBotBotEntity(SwitchbotEntity, SwitchEntity, RestoreEntity):
     """Representation of a Switchbot."""
 
-    coordinator: SwitchbotDataUpdateCoordinator
     _attr_device_class = SwitchDeviceClass.SWITCH
 
     def __init__(

homeassistant/components/switcher_kis/sensor.py

@@ -92,7 +92,9 @@ async def async_setup_entry(
     )
 
 
-class SwitcherSensorEntity(CoordinatorEntity, SensorEntity):
+class SwitcherSensorEntity(
+    CoordinatorEntity[SwitcherDataUpdateCoordinator], SensorEntity
+):
     """Representation of a Switcher sensor entity."""
 
     def __init__(

homeassistant/components/switcher_kis/switch.py

@@ -78,7 +78,9 @@ async def async_setup_entry(
     )
 
 
-class SwitcherBaseSwitchEntity(CoordinatorEntity, SwitchEntity):
+class SwitcherBaseSwitchEntity(
+    CoordinatorEntity[SwitcherDataUpdateCoordinator], SwitchEntity
+):
     """Representation of a Switcher switch entity."""
 
     def __init__(self, coordinator: SwitcherDataUpdateCoordinator) -> None:

homeassistant/components/synology_dsm/__init__.py

@@ -227,7 +227,9 @@ async def _async_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> Non
     await hass.config_entries.async_reload(entry.entry_id)
 
 
-class SynologyDSMBaseEntity(CoordinatorEntity):
+class SynologyDSMBaseEntity(
+    CoordinatorEntity[DataUpdateCoordinator[dict[str, dict[str, Any]]]]
+):
     """Representation of a Synology NAS entry."""
 
     entity_description: SynologyDSMEntityDescription

homeassistant/components/system_bridge/__init__.py

@@ -289,7 +289,7 @@ async def async_reload_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     await hass.config_entries.async_reload(entry.entry_id)
 
 
-class SystemBridgeEntity(CoordinatorEntity):
+class SystemBridgeEntity(CoordinatorEntity[SystemBridgeDataUpdateCoordinator]):
     """Defines a base System Bridge entity."""
 
     def __init__(

homeassistant/components/system_bridge/binary_sensor.py

@@ -67,7 +67,6 @@ async def async_setup_entry(
 class SystemBridgeBinarySensor(SystemBridgeDeviceEntity, BinarySensorEntity):
     """Define a System Bridge binary sensor."""
 
-    coordinator: SystemBridgeDataUpdateCoordinator
     entity_description: SystemBridgeBinarySensorEntityDescription
 
     def __init__(

homeassistant/components/system_bridge/sensor.py

@@ -484,7 +484,6 @@ async def async_setup_entry(
 class SystemBridgeSensor(SystemBridgeDeviceEntity, SensorEntity):
     """Define a System Bridge sensor."""
 
-    coordinator: SystemBridgeDataUpdateCoordinator
     entity_description: SystemBridgeSensorEntityDescription
 
     def __init__(