Mypy cleanup

homeassistant/components/hydrawise/binary_sensor.py

@@ -2,10 +2,6 @@
 
 from __future__ import annotations
 
-from typing import Any
-
-from pydrawise import Sensor, Zone
-
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
@@ -86,7 +82,7 @@ def _update_attrs(self) -> None:
     def _get_status(self) -> bool:
         return self.coordinator.last_update_success
 
-    def _get_rain_sensor(self) -> Any:
+    def _get_rain_sensor(self) -> bool | None:
         assert self.sensor is not None
         return self.sensor.status.active
 

homeassistant/components/hydrawise/sensor.py

@@ -3,9 +3,6 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any
-
-from pydrawise import Zone
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -109,8 +106,6 @@ async def async_setup_entry(
 class HydrawiseSensor(HydrawiseEntity, SensorEntity):
     """A sensor implementation for Hydrawise device."""
 
-    zone: Zone
-
     @property
     def icon(self) -> str | None:
         """Icon of the entity based on the value."""
@@ -123,16 +118,18 @@ def _update_attrs(self) -> None:
         self._attr_native_value = getattr(self, f"_get_{self.entity_description.key}")()
 
     def _get_watering_time(self) -> int:
+        assert self.zone is not None
         if (current_run := self.zone.scheduled_runs.current_run) is not None:
             return int(current_run.remaining_time.total_seconds() / 60)
         return 0
 
     def _get_next_cycle(self) -> datetime:
+        assert self.zone is not None
         if (next_run := self.zone.scheduled_runs.next_run) is not None:
             return dt_util.as_utc(next_run.start_time)
         return datetime.max.replace(tzinfo=dt_util.UTC)
 
-    def _get_daily_active_water_use(self) -> Any:
+    def _get_daily_active_water_use(self) -> float:
         daily_water_summary = self.coordinator.data.daily_water_use[self.controller.id]
         if self.zone is not None:
             # water use for the zone
@@ -144,7 +141,7 @@ def _get_daily_active_water_use(self) -> Any:
             return daily_water_summary.total_active_use
         return 0.0  # pragma: no cover
 
-    def _get_daily_inactive_water_use(self) -> Any:
+    def _get_daily_inactive_water_use(self) -> float | None:
         if self.zone is None and self.sensor is not None:
             # water use for the controller
             daily_water_summary = self.coordinator.data.daily_water_use[
@@ -153,7 +150,7 @@ def _get_daily_inactive_water_use(self) -> Any:
             return daily_water_summary.total_inactive_use
         return None  # pragma: no cover
 
-    def _get_daily_total_water_use(self) -> Any:
+    def _get_daily_total_water_use(self) -> float | None:
         if self.zone is None and self.sensor is not None:
             # water use for the controller
             daily_water_summary = self.coordinator.data.daily_water_use[