Improve DataUpdateCoordinator typing in integrations (6) (#84741)

homeassistant/components/recollect_waste/diagnostics.py

@@ -4,6 +4,8 @@ from __future__ import annotations
 import dataclasses
 from typing import Any
 
+from aiorecollect.client import PickupEvent
+
 from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_UNIQUE_ID
@@ -28,7 +30,9 @@ async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, entry: ConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinator: DataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator: DataUpdateCoordinator[list[PickupEvent]] = hass.data[DOMAIN][
+        entry.entry_id
+    ]
 
     return async_redact_data(
         {

homeassistant/components/recollect_waste/sensor.py

@@ -1,7 +1,7 @@
 """Support for ReCollect Waste sensors."""
 from __future__ import annotations
 
-from aiorecollect.client import PickupType
+from aiorecollect.client import PickupEvent, PickupType
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -54,7 +54,9 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Set up ReCollect Waste sensors based on a config entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator: DataUpdateCoordinator[list[PickupEvent]] = hass.data[DOMAIN][
+        entry.entry_id
+    ]
 
     async_add_entities(
         [
@@ -64,7 +66,9 @@ async def async_setup_entry(
     )
 
 
-class ReCollectWasteSensor(CoordinatorEntity, SensorEntity):
+class ReCollectWasteSensor(
+    CoordinatorEntity[DataUpdateCoordinator[list[PickupEvent]]], SensorEntity
+):
     """ReCollect Waste Sensor."""
 
     _attr_device_class = SensorDeviceClass.DATE
@@ -72,7 +76,7 @@ class ReCollectWasteSensor(CoordinatorEntity, SensorEntity):
 
     def __init__(
         self,
-        coordinator: DataUpdateCoordinator,
+        coordinator: DataUpdateCoordinator[list[PickupEvent]],
         entry: ConfigEntry,
         description: SensorEntityDescription,
     ) -> None:

homeassistant/components/spotify/__init__.py

@@ -49,7 +49,7 @@ class HomeAssistantSpotifyData:
 
     client: Spotify
     current_user: dict[str, Any]
-    devices: DataUpdateCoordinator
+    devices: DataUpdateCoordinator[list[dict[str, Any]]]
     session: OAuth2Session
 
 

homeassistant/components/whois/sensor.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import datetime, timezone
-from typing import cast
+from typing import Optional, cast
 
 from whois import Domain
 
@@ -139,7 +139,9 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the platform from config_entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator: DataUpdateCoordinator[Domain | None] = hass.data[DOMAIN][
+        entry.entry_id
+    ]
     async_add_entities(
         [
             WhoisSensorEntity(
@@ -152,7 +154,9 @@ async def async_setup_entry(
     )
 
 
-class WhoisSensorEntity(CoordinatorEntity, SensorEntity):
+class WhoisSensorEntity(
+    CoordinatorEntity[DataUpdateCoordinator[Optional[Domain]]], SensorEntity
+):
     """Implementation of a WHOIS sensor."""
 
     entity_description: WhoisSensorEntityDescription
@@ -160,7 +164,7 @@ class WhoisSensorEntity(CoordinatorEntity, SensorEntity):
 
     def __init__(
         self,
-        coordinator: DataUpdateCoordinator,
+        coordinator: DataUpdateCoordinator[Domain | None],
         description: WhoisSensorEntityDescription,
         domain: str,
     ) -> None: