Update stookwijzer api to atlas leefomgeving and add extra sensors

.strict-typing

@@ -438,6 +438,7 @@ homeassistant.components.starlink.*
 homeassistant.components.statistics.*
 homeassistant.components.steamist.*
 homeassistant.components.stookalert.*
+homeassistant.components.stookwijzer.*
 homeassistant.components.stream.*
 homeassistant.components.streamlabswater.*
 homeassistant.components.stt.*

homeassistant/components/stookwijzer/__init__.py

@@ -2,29 +2,91 @@
 
 from __future__ import annotations
 
+from typing import Any
+
 from stookwijzer import Stookwijzer
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_LATITUDE, CONF_LOCATION, CONF_LONGITUDE, Platform
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er, issue_registry as ir
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import DOMAIN
+from .const import DOMAIN, LOGGER
+from .coordinator import StookwijzerConfigEntry, StookwijzerCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: StookwijzerConfigEntry) -> bool:
     """Set up Stookwijzer from a config entry."""
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = Stookwijzer(
-        entry.data[CONF_LOCATION][CONF_LATITUDE],
-        entry.data[CONF_LOCATION][CONF_LONGITUDE],
-    )
+    await er.async_migrate_entries(hass, entry.entry_id, async_migrate_entity_entry)
+
+    coordinator = StookwijzerCoordinator(hass, entry)
+    await coordinator.async_config_entry_first_refresh()
+
+    entry.runtime_data = coordinator
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: StookwijzerConfigEntry
+) -> bool:
     """Unload Stookwijzer config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        del hass.data[DOMAIN][entry.entry_id]
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def async_migrate_entry(
+    hass: HomeAssistant, entry: StookwijzerConfigEntry
+) -> bool:
+    """Migrate old entry."""
+    LOGGER.debug("Migrating from version %s", entry.version)
+
+    if entry.version == 1:
+        session = async_get_clientsession(hass)
+        latitude, longitude = await Stookwijzer.async_transform_coordinates(
+            session,
+            entry.data[CONF_LOCATION][CONF_LATITUDE],
+            entry.data[CONF_LOCATION][CONF_LONGITUDE],
+        )
+
+        if not latitude or not longitude:
+            ir.async_create_issue(
+                hass,
+                DOMAIN,
+                "location_migration_failed",
+                is_fixable=False,
+                severity=ir.IssueSeverity.ERROR,
+                translation_key="location_migration_failed",
+                translation_placeholders={
+                    "entry_title": entry.title,
+                },
+            )
+            return False
+
+        hass.config_entries.async_update_entry(
+            entry,
+            version=2,
+            data={
+                CONF_LATITUDE: latitude,
+                CONF_LONGITUDE: longitude,
+            },
+        )
+
+        LOGGER.debug("Migration to version %s successful", entry.version)
+
+    return True
+
+
+@callback
+def async_migrate_entity_entry(entity_entry: er.RegistryEntry) -> dict[str, Any] | None:
+    """Migrate Stookwijzer entity entries.
+
+    - Migrates unique ID for the old Stookwijzer sensors to the new unique ID.
+    """
+    if entity_entry.unique_id == entity_entry.config_entry_id:
+        return {"new_unique_id": f"{entity_entry.config_entry_id}_advice"}
+
+    # No migration needed
+    return None

homeassistant/components/stookwijzer/config_flow.py

@@ -4,10 +4,12 @@
 
 from typing import Any
 
+from stookwijzer import Stookwijzer
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_LATITUDE, CONF_LOCATION, CONF_LONGITUDE
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.selector import LocationSelector
 
 from .const import DOMAIN
@@ -16,21 +18,29 @@
 class StookwijzerFlowHandler(ConfigFlow, domain=DOMAIN):
     """Config flow for Stookwijzer."""
 
-    VERSION = 1
+    VERSION = 2
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle a flow initialized by the user."""
-
+        errors = {}
         if user_input is not None:
-            return self.async_create_entry(
-                title="Stookwijzer",
-                data=user_input,
+            latitude, longitude = await Stookwijzer.async_transform_coordinates(
+                async_get_clientsession(self.hass),
+                user_input[CONF_LOCATION][CONF_LATITUDE],
+                user_input[CONF_LOCATION][CONF_LONGITUDE],
             )
+            if latitude and longitude:
+                return self.async_create_entry(
+                    title="Stookwijzer",
+                    data={CONF_LATITUDE: latitude, CONF_LONGITUDE: longitude},
+                )
+            errors["base"] = "unknown"
 
         return self.async_show_form(
             step_id="user",
+            errors=errors,
             data_schema=vol.Schema(
                 {
                     vol.Required(

homeassistant/components/stookwijzer/const.py

@@ -1,16 +1,7 @@
 """Constants for the Stookwijzer integration."""
 
-from enum import StrEnum
 import logging
 from typing import Final
 
 DOMAIN: Final = "stookwijzer"
 LOGGER = logging.getLogger(__package__)
-
-
-class StookwijzerState(StrEnum):
-    """Stookwijzer states for sensor entity."""
-
-    BLUE = "blauw"
-    ORANGE = "oranje"
-    RED = "rood"

homeassistant/components/stookwijzer/coordinator.py

@@ -0,0 +1,44 @@
+"""Class representing a Stookwijzer update coordinator."""
+
+from datetime import timedelta
+
+from stookwijzer import Stookwijzer
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import 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 .const import DOMAIN, LOGGER
+
+SCAN_INTERVAL = timedelta(minutes=60)
+
+type StookwijzerConfigEntry = ConfigEntry[StookwijzerCoordinator]
+
+
+class StookwijzerCoordinator(DataUpdateCoordinator[None]):
+    """Stookwijzer update coordinator."""
+
+    def __init__(self, hass: HomeAssistant, entry: StookwijzerConfigEntry) -> None:
+        """Initialize the coordinator."""
+        super().__init__(
+            hass,
+            LOGGER,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
+        self.client = Stookwijzer(
+            async_get_clientsession(hass),
+            entry.data[CONF_LATITUDE],
+            entry.data[CONF_LONGITUDE],
+        )
+
+    async def _async_update_data(self) -> None:
+        """Fetch data from API endpoint."""
+        await self.client.async_update()
+        if self.client.advice is None:
+            raise UpdateFailed(
+                translation_domain=DOMAIN,
+                translation_key="no_data_received",
+            )

homeassistant/components/stookwijzer/diagnostics.py

@@ -4,29 +4,18 @@
 
 from typing import Any
 
-from stookwijzer import Stookwijzer
-
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
+from .coordinator import StookwijzerConfigEntry
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: ConfigEntry
+    hass: HomeAssistant, entry: StookwijzerConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    client: Stookwijzer = hass.data[DOMAIN][entry.entry_id]
-
-    last_updated = None
-    if client.last_updated:
-        last_updated = client.last_updated.isoformat()
-
+    client = entry.runtime_data.client
     return {
-        "state": client.state,
-        "last_updated": last_updated,
-        "lqi": client.lqi,
-        "windspeed": client.windspeed,
-        "weather": client.weather,
-        "concentrations": client.concentrations,
+        "advice": client.advice,
+        "air_quality_index": client.lki,
+        "windspeed_ms": client.windspeed_ms,
     }

homeassistant/components/stookwijzer/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/stookwijzer",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["stookwijzer==1.3.0"]
+  "requirements": ["stookwijzer==1.5.1"]
 }

homeassistant/components/stookwijzer/quality_scale.yaml

@@ -0,0 +1,89 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: |
+      The integration doesn't provide any additional service actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      The integration doesn't provide any additional service actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: todo
+  entity-event-setup:
+    status: exempt
+    comment: |
+      The integration doesn't subscribe to any events.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: todo
+  test-before-setup: done
+  unique-config-entry: todo
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: |
+      This integration is read-only and doesn't provide any actions.
+  config-entry-unloading: done
+  docs-configuration-parameters: todo
+  docs-installation-parameters: todo
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates:
+    status: exempt
+    comment: |
+      This integration is read-only and doesn't provide any actions.
+  reauthentication-flow:
+    status: exempt
+    comment: |
+      This integration doesn't require re-authentication.
+  test-coverage: todo
+  # Gold
+  devices: done
+  diagnostics: done
+  discovery-update-info:
+    status: exempt
+    comment: |
+      The integration cannot be discovered, as it is an external service.
+  discovery:
+    status: exempt
+    comment: |
+      The integration cannot be discovered, as it is an external service.
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices:
+    status: exempt
+    comment: |
+      This integration provides a single device entry for the service.
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: done
+  entity-translations: done
+  exception-translations: done
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues: done
+  stale-devices:
+    status: exempt
+    comment: |
+      This integration provides a single device entry for the service.
+
+  # Platinum
+  async-dependency: done
+  inject-websession: done
+  strict-typing: done