Improve hunterdouglas_powerview typing (#107445)

homeassistant/components/hunterdouglas_powerview/config_flow.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 
 import asyncio
 import logging
+from typing import Any
 
 from aiopvapi.helpers.aiorequest import AioRequest
 import voluptuous as vol
@@ -51,18 +52,20 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    def __init__(self):
+    def __init__(self) -> None:
         """Initialize the powerview config flow."""
-        self.powerview_config = {}
+        self.powerview_config: dict[str, str] = {}
-        self.discovered_ip = None
+        self.discovered_ip: str | None = None
-        self.discovered_name = None
+        self.discovered_name: str | None = None
 
-    async def async_step_user(self, user_input=None):
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
         """Handle the initial step."""
-        errors = {}
+        errors: dict[str, Any] = {}
         if user_input is not None:
             info, error = await self._async_validate_or_error(user_input[CONF_HOST])
-            if not error:
+            if info and not error:
                 await self.async_set_unique_id(info["unique_id"])
                 return self.async_create_entry(
                     title=info["title"], data={CONF_HOST: user_input[CONF_HOST]}
@@ -73,7 +76,9 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             step_id="user", data_schema=DATA_SCHEMA, errors=errors
         )
 
-    async def _async_validate_or_error(self, host):
+    async def _async_validate_or_error(
+        self, host: str
+    ) -> tuple[dict[str, str], None] | tuple[None, str]:
         self._async_abort_entries_match({CONF_HOST: host})
 
         try:
@@ -110,21 +115,22 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         self.discovered_name = name
         return await self.async_step_discovery_confirm()
 
-    async def async_step_discovery_confirm(self):
+    async def async_step_discovery_confirm(self) -> FlowResult:
         """Confirm dhcp or homekit discovery."""
         # If we already have the host configured do
         # not open connections to it if we can avoid it.
+        assert self.discovered_ip and self.discovered_name
         self.context[CONF_HOST] = self.discovered_ip
         for progress in self._async_in_progress():
             if progress.get("context", {}).get(CONF_HOST) == self.discovered_ip:
                 return self.async_abort(reason="already_in_progress")
 
         self._async_abort_entries_match({CONF_HOST: self.discovered_ip})
-
         info, error = await self._async_validate_or_error(self.discovered_ip)
         if error:
             return self.async_abort(reason=error)
 
+        assert info is not None
         await self.async_set_unique_id(info["unique_id"], raise_on_progress=False)
         self._abort_if_unique_id_configured({CONF_HOST: self.discovered_ip})
 
@@ -134,7 +140,9 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         }
         return await self.async_step_link()
 
-    async def async_step_link(self, user_input=None):
+    async def async_step_link(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
         """Attempt to link with Powerview."""
         if user_input is not None:
             return self.async_create_entry(

homeassistant/components/hunterdouglas_powerview/cover.py

@@ -2,9 +2,9 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from contextlib import suppress
-from datetime import timedelta
+from datetime import datetime, timedelta
 import logging
 from math import ceil
 from typing import Any
@@ -137,7 +137,7 @@ class PowerViewShadeBase(ShadeEntity, CoverEntity):
         self._scheduled_transition_update: CALLBACK_TYPE | None = None
         if self._device_info.model != LEGACY_DEVICE_MODEL:
             self._attr_supported_features |= CoverEntityFeature.STOP
-        self._forced_resync = None
+        self._forced_resync: Callable[[], None] | None = None
 
     @property
     def assumed_state(self) -> bool:
@@ -291,7 +291,7 @@ class PowerViewShadeBase(ShadeEntity, CoverEntity):
             self._async_complete_schedule_update,
         )
 
-    async def _async_complete_schedule_update(self, _):
+    async def _async_complete_schedule_update(self, _: datetime) -> None:
         """Update status of the cover."""
         _LOGGER.debug("Processing scheduled update for %s", self.name)
         self._scheduled_transition_update = None
@@ -382,7 +382,7 @@ class PowerViewShadeWithTiltBase(PowerViewShadeBase):
         return hd_position_to_hass(self.positions.vane, self._max_tilt)
 
     @property
-    def transition_steps(self):
+    def transition_steps(self) -> int:
         """Return the steps to make a move."""
         return hd_position_to_hass(
             self.positions.primary, MAX_POSITION

homeassistant/components/hunterdouglas_powerview/scene.py

@@ -11,8 +11,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN, ROOM_NAME_UNICODE, STATE_ATTRIBUTE_ROOM_NAME
+from .coordinator import PowerviewShadeUpdateCoordinator
 from .entity import HDEntity
-from .model import PowerviewEntryData
+from .model import PowerviewDeviceInfo, PowerviewEntryData
 
 
 async def async_setup_entry(
@@ -22,7 +23,7 @@ async def async_setup_entry(
 
     pv_entry: PowerviewEntryData = hass.data[DOMAIN][entry.entry_id]
 
-    pvscenes = []
+    pvscenes: list[PowerViewScene] = []
     for raw_scene in pv_entry.scene_data.values():
         scene = PvScene(raw_scene, pv_entry.api)
         room_name = pv_entry.room_data.get(scene.room_id, {}).get(ROOM_NAME_UNICODE, "")
@@ -37,7 +38,13 @@ class PowerViewScene(HDEntity, Scene):
 
     _attr_icon = "mdi:blinds"
 
-    def __init__(self, coordinator, device_info, room_name, scene):
+    def __init__(
+        self,
+        coordinator: PowerviewShadeUpdateCoordinator,
+        device_info: PowerviewDeviceInfo,
+        room_name: str,
+        scene: PvScene,
+    ) -> None:
         """Initialize the scene."""
         super().__init__(coordinator, device_info, room_name, scene.id)
         self._scene = scene