Bump pytradfri to 14.0.0 (home-assistant#182250)

Author: JamieMagee

homeassistant/components/tradfri/__init__.py

@@ -3,7 +3,7 @@
 from datetime import datetime, timedelta
 
 from pytradfri import Gateway, RequestError
-from pytradfri.api.aiocoap_api import APIFactory
+from pytradfri.api.aiocoap_api import APIFactory, APIRequestProtocol
 from pytradfri.command import Command
 from pytradfri.device import Device
 
@@ -56,12 +56,12 @@ async def on_hass_stop(event: Event) -> None:
         hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, on_hass_stop)
     )
 
-    api = factory.request
+    api: APIRequestProtocol = factory.request
     gateway = Gateway()
 
     try:
         gateway_info = await api(gateway.get_gateway_info(), timeout=TIMEOUT_API)
-        devices_commands: Command = await api(
+        devices_commands: list[Command[Device]] = await api(
             gateway.get_devices(), timeout=TIMEOUT_API
         )
         devices: list[Device] = await api(devices_commands, timeout=TIMEOUT_API)

homeassistant/components/tradfri/coordinator.py

@@ -1,15 +1,14 @@
 """Tradfri DataUpdateCoordinator."""
 
-from collections.abc import Callable
 from dataclasses import dataclass, field
 from datetime import timedelta
-from typing import Any, override
+from typing import cast, override
 
 from pytradfri import Gateway
-from pytradfri.api.aiocoap_api import APIFactory
-from pytradfri.command import Command
+from pytradfri.api.aiocoap_api import APIFactory, APIRequestProtocol
 from pytradfri.device import Device
 from pytradfri.error import RequestError
+from pytradfri.resource import ApiResource
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
@@ -28,7 +27,7 @@ class TradfriData:
 
     factory: APIFactory
     gateway: Gateway
-    api: Callable[[Command | list[Command]], Any]
+    api: APIRequestProtocol
     coordinator_list: list[TradfriDeviceDataUpdateCoordinator] = field(
         default_factory=list
     )
@@ -43,7 +42,7 @@ def __init__(
         self,
         hass: HomeAssistant,
         config_entry: TradfriConfigEntry,
-        api: Callable[[Command | list[Command]], Any],
+        api: APIRequestProtocol,
         device: Device,
     ) -> None:
         """Initialize device coordinator."""
@@ -67,9 +66,9 @@ async def set_hub_available(self, available: bool) -> None:
             await self.async_request_refresh()
 
     @callback
-    def _observe_update(self, device: Device) -> None:
+    def _observe_update(self, device: ApiResource) -> None:
         """Update the coordinator for a device when a change is detected."""
-        self.async_set_updated_data(data=device)
+        self.async_set_updated_data(data=cast(Device, device))
 
     @callback
     def _exception_callback(self, exc: Exception) -> None:

homeassistant/components/tradfri/cover.py

@@ -1,9 +1,8 @@
 """Support for IKEA Tradfri covers."""
 
-from collections.abc import Callable
-from typing import Any, cast, override
+from typing import TYPE_CHECKING, Any, override
 
-from pytradfri.command import Command
+from pytradfri.api.aiocoap_api import APIRequestProtocol
 
 from homeassistant.components.cover import ATTR_POSITION, CoverEntity
 from homeassistant.core import HomeAssistant
@@ -42,7 +41,7 @@ class TradfriCover(TradfriBaseEntity, CoverEntity):
     def __init__(
         self,
         device_coordinator: TradfriDeviceDataUpdateCoordinator,
-        api: Callable[[Command | list[Command]], Any],
+        api: APIRequestProtocol,
         gateway_id: str,
     ) -> None:
         """Initialize a switch."""
@@ -52,13 +51,15 @@ def __init__(
             gateway_id=gateway_id,
         )
 
+        if TYPE_CHECKING:
+            assert self._device.blind_control is not None
         self._device_control = self._device.blind_control
         self._device_data = self._device_control.blinds[0]
 
     @override
     def _refresh(self) -> None:
         """Refresh the device."""
-        self._device_data = self.coordinator.data.blind_control.blinds[0]
+        self._device_data = self._device_control.blinds[0]
 
     @property
     @override
@@ -75,7 +76,7 @@ def current_cover_position(self) -> int | None:
         """
         if not self._device_data:
             return None
-        return 100 - cast(int, self._device_data.current_cover_position)
+        return 100 - self._device_data.current_cover_position
 
     @override
     async def async_set_cover_position(self, **kwargs: Any) -> None:

homeassistant/components/tradfri/entity.py

@@ -3,10 +3,10 @@
 from abc import abstractmethod
 from collections.abc import Callable, Coroutine
 from functools import wraps
-from typing import Any, cast, override
+from typing import Any, override
 
+from pytradfri.api.aiocoap_api import APIRequestProtocol
 from pytradfri.command import Command
-from pytradfri.const import ATTR_DEVICE_FIRMWARE_VERSION
 from pytradfri.device import Device
 from pytradfri.error import RequestError
 
@@ -20,7 +20,7 @@
 
 
 def handle_error(
-    func: Callable[[Command | list[Command]], Any],
+    func: APIRequestProtocol,
 ) -> Callable[[Command | list[Command]], Coroutine[Any, Any, None]]:
     """Handle tradfri api call error."""
 
@@ -44,7 +44,7 @@ def __init__(
         self,
         device_coordinator: TradfriDeviceDataUpdateCoordinator,
         gateway_id: str,
-        api: Callable[[Command | list[Command]], Any],
+        api: APIRequestProtocol,
     ) -> None:
         """Initialize a device."""
         super().__init__(device_coordinator)
@@ -62,7 +62,7 @@ def __init__(
             manufacturer=info.manufacturer,
             model=info.model_number,
             name=self._device.name,
-            sw_version=info.raw.get(ATTR_DEVICE_FIRMWARE_VERSION),
+            sw_version=info.firmware_version,
             via_device_id=dr.async_get_device_id_by_identifier(
                 device_coordinator.hass,
                 (DOMAIN, gateway_id),
@@ -90,4 +90,4 @@ def _handle_coordinator_update(self) -> None:
     @override
     def available(self) -> bool:
         """Return if entity is available."""
-        return cast(bool, self._device.reachable) and super().available
+        return self._device.reachable and super().available

homeassistant/components/tradfri/fan.py

@@ -1,9 +1,8 @@
 """Represent an air purifier."""
 
-from collections.abc import Callable
-from typing import Any, cast, override
+from typing import TYPE_CHECKING, Any, override
 
-from pytradfri.command import Command
+from pytradfri.api.aiocoap_api import APIRequestProtocol
 
 from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.core import HomeAssistant
@@ -69,7 +68,7 @@ class TradfriAirPurifierFan(TradfriBaseEntity, FanEntity):
     def __init__(
         self,
         device_coordinator: TradfriDeviceDataUpdateCoordinator,
-        api: Callable[[Command | list[Command]], Any],
+        api: APIRequestProtocol,
         gateway_id: str,
     ) -> None:
         """Initialize a switch."""
@@ -79,21 +78,23 @@ def __init__(
             gateway_id=gateway_id,
         )
 
+        if TYPE_CHECKING:
+            assert self._device.air_purifier_control is not None
         self._device_control = self._device.air_purifier_control
         self._device_data = self._device_control.air_purifiers[0]
 
     @override
     def _refresh(self) -> None:
         """Refresh the device."""
-        self._device_data = self.coordinator.data.air_purifier_control.air_purifiers[0]
+        self._device_data = self._device_control.air_purifiers[0]
 
     @property
     @override
     def is_on(self) -> bool:
         """Return true if switch is on."""
         if not self._device_data:
             return False
-        return cast(bool, self._device_data.state)
+        return self._device_data.state
 
     @property
     @override