Improve metoffice typing (home-assistant#154670)

Author: epenet

homeassistant/components/metoffice/__init__.py

@@ -5,9 +5,8 @@
 import asyncio
 import logging
 
-import datapoint
-import datapoint.Forecast
-import datapoint.Manager
+from datapoint.Forecast import Forecast
+from datapoint.Manager import Manager
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -48,19 +47,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     coordinates = f"{latitude}_{longitude}"
 
-    connection = datapoint.Manager.Manager(api_key=api_key)
+    connection = Manager(api_key=api_key)
 
-    async def async_update_hourly() -> datapoint.Forecast:
+    async def async_update_hourly() -> Forecast:
         return await hass.async_add_executor_job(
             fetch_data, connection, latitude, longitude, "hourly"
         )
 
-    async def async_update_daily() -> datapoint.Forecast:
+    async def async_update_daily() -> Forecast:
         return await hass.async_add_executor_job(
             fetch_data, connection, latitude, longitude, "daily"
         )
 
-    async def async_update_twice_daily() -> datapoint.Forecast:
+    async def async_update_twice_daily() -> Forecast:
         return await hass.async_add_executor_job(
             fetch_data, connection, latitude, longitude, "twice-daily"
         )

homeassistant/components/metoffice/config_flow.py

@@ -6,9 +6,8 @@
 import logging
 from typing import Any
 
-import datapoint
 from datapoint.exceptions import APIException
-import datapoint.Manager
+from datapoint.Manager import Manager
 from requests import HTTPError
 import voluptuous as vol
 
@@ -31,7 +30,7 @@ async def validate_input(
     Data has the keys from DATA_SCHEMA with values provided by the user.
     """
     errors = {}
-    connection = datapoint.Manager.Manager(api_key=api_key)
+    connection = Manager(api_key=api_key)
 
     try:
         forecast = await hass.async_add_executor_job(

homeassistant/components/metoffice/helpers.py

@@ -5,8 +5,9 @@
 import logging
 from typing import Any, Literal
 
-import datapoint
+from datapoint.exceptions import APIException
 from datapoint.Forecast import Forecast
+from datapoint.Manager import Manager
 from requests import HTTPError
 
 from homeassistant.exceptions import ConfigEntryAuthFailed
@@ -16,7 +17,7 @@
 
 
 def fetch_data(
-    connection: datapoint.Manager,
+    connection: Manager,
     latitude: float,
     longitude: float,
     frequency: Literal["daily", "twice-daily", "hourly"],
@@ -26,7 +27,7 @@ def fetch_data(
         return connection.get_forecast(
             latitude, longitude, frequency, convert_weather_code=False
         )
-    except (ValueError, datapoint.exceptions.APIException) as err:
+    except (ValueError, APIException) as err:
         _LOGGER.error("Check Met Office connection: %s", err.args)
         raise UpdateFailed from err
     except HTTPError as err:

homeassistant/components/metoffice/weather.py

@@ -5,7 +5,7 @@
 from datetime import datetime
 from typing import Any, cast
 
-from datapoint.Forecast import Forecast as ForecastData
+from datapoint.Forecast import Forecast
 
 from homeassistant.components.weather import (
     ATTR_FORECAST_CONDITION,
@@ -22,7 +22,7 @@
     ATTR_FORECAST_WIND_BEARING,
     DOMAIN as WEATHER_DOMAIN,
     CoordinatorWeatherEntity,
-    Forecast,
+    Forecast as WeatherForecast,
     WeatherEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
@@ -85,20 +85,20 @@ async def async_setup_entry(
     )
 
 
-def _build_hourly_forecast_data(timestep: dict[str, Any]) -> Forecast:
-    data = Forecast(datetime=timestep["time"].isoformat())
+def _build_hourly_forecast_data(timestep: dict[str, Any]) -> WeatherForecast:
+    data = WeatherForecast(datetime=timestep["time"].isoformat())
     _populate_forecast_data(data, timestep, HOURLY_FORECAST_ATTRIBUTE_MAP)
     return data
 
 
-def _build_daily_forecast_data(timestep: dict[str, Any]) -> Forecast:
-    data = Forecast(datetime=timestep["time"].isoformat())
+def _build_daily_forecast_data(timestep: dict[str, Any]) -> WeatherForecast:
+    data = WeatherForecast(datetime=timestep["time"].isoformat())
     _populate_forecast_data(data, timestep, DAILY_FORECAST_ATTRIBUTE_MAP)
     return data
 
 
-def _build_twice_daily_forecast_data(timestep: dict[str, Any]) -> Forecast:
-    data = Forecast(datetime=timestep["time"].isoformat())
+def _build_twice_daily_forecast_data(timestep: dict[str, Any]) -> WeatherForecast:
+    data = WeatherForecast(datetime=timestep["time"].isoformat())
 
     # day and night forecasts have slightly different format
     if "daySignificantWeatherCode" in timestep:
@@ -111,7 +111,7 @@ def _build_twice_daily_forecast_data(timestep: dict[str, Any]) -> Forecast:
 
 
 def _populate_forecast_data(
-    forecast: Forecast, timestep: dict[str, Any], mapping: dict[str, str]
+    forecast: WeatherForecast, timestep: dict[str, Any], mapping: dict[str, str]
 ) -> None:
     def get_mapped_attribute(attr: str) -> Any:
         if attr not in mapping:
@@ -153,9 +153,9 @@ def get_mapped_attribute(attr: str) -> Any:
 
 class MetOfficeWeather(
     CoordinatorWeatherEntity[
-        TimestampDataUpdateCoordinator[ForecastData],
-        TimestampDataUpdateCoordinator[ForecastData],
-        TimestampDataUpdateCoordinator[ForecastData],
+        TimestampDataUpdateCoordinator[Forecast],
+        TimestampDataUpdateCoordinator[Forecast],
+        TimestampDataUpdateCoordinator[Forecast],
     ]
 ):
     """Implementation of a Met Office weather condition."""
@@ -177,9 +177,9 @@ class MetOfficeWeather(
 
     def __init__(
         self,
-        coordinator_daily: TimestampDataUpdateCoordinator[ForecastData],
-        coordinator_hourly: TimestampDataUpdateCoordinator[ForecastData],
-        coordinator_twice_daily: TimestampDataUpdateCoordinator[ForecastData],
+        coordinator_daily: TimestampDataUpdateCoordinator[Forecast],
+        coordinator_hourly: TimestampDataUpdateCoordinator[Forecast],
+        coordinator_twice_daily: TimestampDataUpdateCoordinator[Forecast],
         hass_data: dict[str, Any],
     ) -> None:
         """Initialise the platform with a data instance."""
@@ -263,10 +263,10 @@ def wind_bearing(self) -> float | None:
         return float(value) if value is not None else None
 
     @callback
-    def _async_forecast_daily(self) -> list[Forecast] | None:
+    def _async_forecast_daily(self) -> list[WeatherForecast] | None:
         """Return the daily forecast in native units."""
         coordinator = cast(
-            TimestampDataUpdateCoordinator[ForecastData],
+            TimestampDataUpdateCoordinator[Forecast],
             self.forecast_coordinators["daily"],
         )
         timesteps = coordinator.data.timesteps
@@ -277,10 +277,10 @@ def _async_forecast_daily(self) -> list[Forecast] | None:
         ]
 
     @callback
-    def _async_forecast_hourly(self) -> list[Forecast] | None:
+    def _async_forecast_hourly(self) -> list[WeatherForecast] | None:
         """Return the hourly forecast in native units."""
         coordinator = cast(
-            TimestampDataUpdateCoordinator[ForecastData],
+            TimestampDataUpdateCoordinator[Forecast],
             self.forecast_coordinators["hourly"],
         )
 
@@ -292,10 +292,10 @@ def _async_forecast_hourly(self) -> list[Forecast] | None:
         ]
 
     @callback
-    def _async_forecast_twice_daily(self) -> list[Forecast] | None:
+    def _async_forecast_twice_daily(self) -> list[WeatherForecast] | None:
         """Return the twice daily forecast in native units."""
         coordinator = cast(
-            TimestampDataUpdateCoordinator[ForecastData],
+            TimestampDataUpdateCoordinator[Forecast],
             self.forecast_coordinators["twice_daily"],
         )
         timesteps = coordinator.data.timesteps