Move met_eireann coordinator to separate module (#148014)

homeassistant/components/met_eireann/__init__.py

@@ -1,59 +1,21 @@
 """The met_eireann component."""
 
-from collections.abc import Mapping
-from datetime import timedelta
-import logging
-from typing import Any, Self
-
-import meteireann
-
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ELEVATION, CONF_LATITUDE, CONF_LONGITUDE, Platform
+from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
-
+from .coordinator import MetEireannUpdateCoordinator
-_LOGGER = logging.getLogger(__name__)
-
-UPDATE_INTERVAL = timedelta(minutes=60)
 
 PLATFORMS = [Platform.WEATHER]
 
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Set up Met Éireann as config entry."""
-    hass.data.setdefault(DOMAIN, {})
+    coordinator = MetEireannUpdateCoordinator(hass, config_entry=config_entry)
-
-    raw_weather_data = meteireann.WeatherData(
-        async_get_clientsession(hass),
-        latitude=config_entry.data[CONF_LATITUDE],
-        longitude=config_entry.data[CONF_LONGITUDE],
-        altitude=config_entry.data[CONF_ELEVATION],
-    )
-
-    weather_data = MetEireannWeatherData(config_entry.data, raw_weather_data)
-
-    async def _async_update_data() -> MetEireannWeatherData:
-        """Fetch data from Met Éireann."""
-        try:
-            return await weather_data.fetch_data()
-        except Exception as err:
-            raise UpdateFailed(f"Update failed: {err}") from err
-
-    coordinator = DataUpdateCoordinator(
-        hass,
-        _LOGGER,
-        config_entry=config_entry,
-        name=DOMAIN,
-        update_method=_async_update_data,
-        update_interval=UPDATE_INTERVAL,
-    )
     await coordinator.async_refresh()
 
-    hass.data[DOMAIN][config_entry.entry_id] = coordinator
+    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = coordinator
 
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
@@ -68,26 +30,3 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     hass.data[DOMAIN].pop(config_entry.entry_id)
 
     return unload_ok
-
-
-class MetEireannWeatherData:
-    """Keep data for Met Éireann weather entities."""
-
-    def __init__(
-        self, config: Mapping[str, Any], weather_data: meteireann.WeatherData
-    ) -> None:
-        """Initialise the weather entity data."""
-        self._config = config
-        self._weather_data = weather_data
-        self.current_weather_data: dict[str, Any] = {}
-        self.daily_forecast: list[dict[str, Any]] = []
-        self.hourly_forecast: list[dict[str, Any]] = []
-
-    async def fetch_data(self) -> Self:
-        """Fetch data from API - (current weather and forecast)."""
-        await self._weather_data.fetching_data()
-        self.current_weather_data = self._weather_data.get_current_weather()
-        time_zone = dt_util.get_default_time_zone()
-        self.daily_forecast = self._weather_data.get_forecast(time_zone, False)
-        self.hourly_forecast = self._weather_data.get_forecast(time_zone, True)
-        return self

homeassistant/components/met_eireann/coordinator.py

@@ -0,0 +1,76 @@
+"""The met_eireann component."""
+
+from __future__ import annotations
+
+from collections.abc import Mapping
+from datetime import timedelta
+import logging
+from typing import Any, Self
+
+import meteireann
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_ELEVATION, CONF_LATITUDE, CONF_LONGITUDE
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util import dt as dt_util
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+UPDATE_INTERVAL = timedelta(minutes=60)
+
+
+class MetEireannWeatherData:
+    """Keep data for Met Éireann weather entities."""
+
+    def __init__(
+        self, config: Mapping[str, Any], weather_data: meteireann.WeatherData
+    ) -> None:
+        """Initialise the weather entity data."""
+        self._config = config
+        self._weather_data = weather_data
+        self.current_weather_data: dict[str, Any] = {}
+        self.daily_forecast: list[dict[str, Any]] = []
+        self.hourly_forecast: list[dict[str, Any]] = []
+
+    async def fetch_data(self) -> Self:
+        """Fetch data from API - (current weather and forecast)."""
+        await self._weather_data.fetching_data()
+        self.current_weather_data = self._weather_data.get_current_weather()
+        time_zone = dt_util.get_default_time_zone()
+        self.daily_forecast = self._weather_data.get_forecast(time_zone, False)
+        self.hourly_forecast = self._weather_data.get_forecast(time_zone, True)
+        return self
+
+
+class MetEireannUpdateCoordinator(DataUpdateCoordinator[MetEireannWeatherData]):
+    """Coordinator for Met Éireann weather data."""
+
+    config_entry: ConfigEntry
+
+    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+        """Initialize the coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=DOMAIN,
+            update_interval=UPDATE_INTERVAL,
+        )
+        raw_weather_data = meteireann.WeatherData(
+            async_get_clientsession(hass),
+            latitude=config_entry.data[CONF_LATITUDE],
+            longitude=config_entry.data[CONF_LONGITUDE],
+            altitude=config_entry.data[CONF_ELEVATION],
+        )
+        self._weather_data = MetEireannWeatherData(config_entry.data, raw_weather_data)
+
+    async def _async_update_data(self) -> MetEireannWeatherData:
+        """Fetch data from Met Éireann."""
+        try:
+            return await self._weather_data.fetch_data()
+        except Exception as err:
+            raise UpdateFailed(f"Update failed: {err}") from err

homeassistant/components/met_eireann/weather.py

@@ -1,7 +1,6 @@
 """Support for Met Éireann weather service."""
 
 from collections.abc import Mapping
-import logging
 from typing import Any, cast
 
 from homeassistant.components.weather import (
@@ -29,10 +28,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util import dt as dt_util
 
-from . import MetEireannWeatherData
 from .const import CONDITION_MAP, DEFAULT_NAME, DOMAIN, FORECAST_MAP
-
+from .coordinator import MetEireannWeatherData
-_LOGGER = logging.getLogger(__name__)
 
 
 def format_condition(condition: str | None) -> str | None:

tests/components/met_eireann/__init__.py

@@ -19,7 +19,7 @@ async def init_integration(hass: HomeAssistant) -> MockConfigEntry:
     }
     entry = MockConfigEntry(domain=DOMAIN, data=entry_data)
     with patch(
-        "homeassistant.components.met_eireann.meteireann.WeatherData.fetching_data",
+        "homeassistant.components.met_eireann.coordinator.meteireann.WeatherData.fetching_data",
         return_value=True,
     ):
         entry.add_to_hass(hass)

tests/components/met_eireann/test_weather.py

@@ -6,8 +6,8 @@ from freezegun.api import FrozenDateTimeFactory
 import pytest
 from syrupy.assertion import SnapshotAssertion
 
-from homeassistant.components.met_eireann import UPDATE_INTERVAL
 from homeassistant.components.met_eireann.const import DOMAIN
+from homeassistant.components.met_eireann.coordinator import UPDATE_INTERVAL
 from homeassistant.components.weather import (
     DOMAIN as WEATHER_DOMAIN,
     SERVICE_GET_FORECASTS,