Fix shared coordinator for all instances

Share MetAPI for all coordinator instances
Use HASS shared aiohttp session

Author: toringer

custom_components/metnowcast/__init__.py

@@ -8,6 +8,7 @@
 from .const import DOMAIN
 from .coordinator import MetCoordinator
 import asyncio
+from .met_api import MetApi
 
 PLATFORMS: list[Platform] = [Platform.WEATHER]
 _LOGGER = logging.getLogger(__name__)
@@ -18,13 +19,18 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     lat = entry.data[CONF_LATITUDE]
     lon = entry.data[CONF_LONGITUDE]
     name = entry.data[CONF_NAME]
-    coordinator = MetCoordinator(hass, entry, name, lat, lon)
-    await coordinator.async_config_entry_first_refresh()
 
-    if DOMAIN not in hass.data:
-        hass.data[DOMAIN] = {}
-    hass.data[DOMAIN]["coordinator"] = coordinator
+    # Ensure DOMAIN is initialized in hass.data
+    hass.data.setdefault(DOMAIN, {})
+    # Create and store a single MetApi instance if not already present
+    if "api" not in hass.data[DOMAIN]:
+        hass.data[DOMAIN]["api"] = MetApi(hass)
+    api = hass.data[DOMAIN]["api"]
+
+    coordinator = MetCoordinator(hass, entry, name, lat, lon, api)
+    await coordinator.async_config_entry_first_refresh()
 
+    hass.data[DOMAIN][entry.entry_id] = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
@@ -42,9 +48,8 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         )
     )
     if unloaded:
-        coordinator = hass.data[DOMAIN]["coordinator"]
-        if coordinator is not None:
-            hass.data[DOMAIN]["coordinator"] = None
+        hass.data[DOMAIN].pop(entry.entry_id)
+        _LOGGER.debug("pop coordinator")
     return unloaded
 
 

custom_components/metnowcast/config_flow.py

@@ -28,7 +28,7 @@
 async def validate_input(hass: HomeAssistant, lat: float, lon: float) -> dict[str, Any]:
     """Validate the user input allows us to connect."""
 
-    api = MetApi()
+    api = MetApi(hass)
     forecast = await api.get_now_cast(lat, lon)
     radar_coverage = forecast["properties"]["meta"]["radar_coverage"]
     if radar_coverage == "no coverage":

custom_components/metnowcast/coordinator.py

@@ -12,7 +12,7 @@
 class MetCoordinator(DataUpdateCoordinator):
     """Met coordinator."""
 
-    def __init__(self, hass, config_entry, name, lat, long):
+    def __init__(self, hass, config_entry, name, lat, long, met_api):
         """Initialize my coordinator."""
         super().__init__(
             hass,
@@ -23,7 +23,7 @@ def __init__(self, hass, config_entry, name, lat, long):
             # Polling interval. Will only be polled if there are subscribers.
             update_interval=timedelta(minutes=7),
         )
-        self._metApi = MetApi()
+        self._metApi = met_api
         self.lat = lat
         self.long = long
 

custom_components/metnowcast/met_api.py

@@ -2,7 +2,7 @@
 from __future__ import annotations
 import logging
 from .const import NotFound, VERSION
-import aiohttp
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -16,16 +16,17 @@
 class MetApi:
     """Met.no API"""
 
-    def __init__(self) -> None:
-        """Init"""
+    def __init__(self, hass) -> None:
+        """Init with Home Assistant instance."""
+        self.hass = hass
 
     async def get_now_cast(self, lat: float, lon: float):
-        """Get Nowcast from met.no using aiohttp """
+        """Get Nowcast from met.no using Home Assistant's shared aiohttp session."""
         url = f"{BASE_URL}/complete"
         param = {"lat": lat, "lon": lon}
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url=url, params=param, headers=REQUEST_HEADER) as response:
-                if response.status != 200:
-                    raise NotFound
-                data = await response.json()
-                return data
+        session = async_get_clientsession(self.hass)
+        async with session.get(url=url, params=param, headers=REQUEST_HEADER) as response:
+            if response.status != 200:
+                raise NotFound
+            data = await response.json()
+            return data

custom_components/metnowcast/weather.py

@@ -47,7 +47,7 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Setup weather platform."""
-    coordinator = hass.data[DOMAIN]["coordinator"]
+    coordinator = hass.data[DOMAIN][entry.entry_id]
     lat = entry.data[CONF_LATITUDE]
     lon = entry.data[CONF_LONGITUDE]
     name = entry.data[CONF_NAME]