Migrate WAQI to runtime data (#148977)

This commit is contained in:
Joost Lekkerkerker 2025-07-17 23:22:30 +02:00 committed by GitHub
parent 3c87a3e892
commit 37a154b1df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 16 deletions

View File

@ -4,18 +4,16 @@ from __future__ import annotations
from aiowaqi import WAQIClient from aiowaqi import WAQIClient
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_API_KEY, Platform from homeassistant.const import CONF_API_KEY, Platform
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.aiohttp_client import async_get_clientsession
from .const import DOMAIN from .coordinator import WAQIConfigEntry, WAQIDataUpdateCoordinator
from .coordinator import WAQIDataUpdateCoordinator
PLATFORMS: list[Platform] = [Platform.SENSOR] PLATFORMS: list[Platform] = [Platform.SENSOR]
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_setup_entry(hass: HomeAssistant, entry: WAQIConfigEntry) -> bool:
"""Set up World Air Quality Index (WAQI) from a config entry.""" """Set up World Air Quality Index (WAQI) from a config entry."""
client = WAQIClient(session=async_get_clientsession(hass)) client = WAQIClient(session=async_get_clientsession(hass))
@ -23,16 +21,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
waqi_coordinator = WAQIDataUpdateCoordinator(hass, entry, client) waqi_coordinator = WAQIDataUpdateCoordinator(hass, entry, client)
await waqi_coordinator.async_config_entry_first_refresh() await waqi_coordinator.async_config_entry_first_refresh()
hass.data.setdefault(DOMAIN, {})[entry.entry_id] = waqi_coordinator entry.runtime_data = waqi_coordinator
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS) await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
return True return True
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool: async def async_unload_entry(hass: HomeAssistant, entry: WAQIConfigEntry) -> bool:
"""Unload a config entry.""" """Unload a config entry."""
if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS): return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
hass.data[DOMAIN].pop(entry.entry_id)
return unload_ok

View File

@ -12,14 +12,16 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
from .const import CONF_STATION_NUMBER, DOMAIN, LOGGER from .const import CONF_STATION_NUMBER, DOMAIN, LOGGER
type WAQIConfigEntry = ConfigEntry[WAQIDataUpdateCoordinator]
class WAQIDataUpdateCoordinator(DataUpdateCoordinator[WAQIAirQuality]): class WAQIDataUpdateCoordinator(DataUpdateCoordinator[WAQIAirQuality]):
"""The WAQI Data Update Coordinator.""" """The WAQI Data Update Coordinator."""
config_entry: ConfigEntry config_entry: WAQIConfigEntry
def __init__( def __init__(
self, hass: HomeAssistant, config_entry: ConfigEntry, client: WAQIClient self, hass: HomeAssistant, config_entry: WAQIConfigEntry, client: WAQIClient
) -> None: ) -> None:
"""Initialize the WAQI data coordinator.""" """Initialize the WAQI data coordinator."""
super().__init__( super().__init__(

View File

@ -14,7 +14,6 @@ from homeassistant.components.sensor import (
SensorEntityDescription, SensorEntityDescription,
SensorStateClass, SensorStateClass,
) )
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import PERCENTAGE, UnitOfPressure, UnitOfTemperature from homeassistant.const import PERCENTAGE, UnitOfPressure, UnitOfTemperature
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
@ -23,7 +22,7 @@ from homeassistant.helpers.typing import StateType
from homeassistant.helpers.update_coordinator import CoordinatorEntity from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import DOMAIN from .const import DOMAIN
from .coordinator import WAQIDataUpdateCoordinator from .coordinator import WAQIConfigEntry, WAQIDataUpdateCoordinator
@dataclass(frozen=True, kw_only=True) @dataclass(frozen=True, kw_only=True)
@ -127,11 +126,11 @@ SENSORS: list[WAQISensorEntityDescription] = [
async def async_setup_entry( async def async_setup_entry(
hass: HomeAssistant, hass: HomeAssistant,
entry: ConfigEntry, entry: WAQIConfigEntry,
async_add_entities: AddConfigEntryEntitiesCallback, async_add_entities: AddConfigEntryEntitiesCallback,
) -> None: ) -> None:
"""Set up the WAQI sensor.""" """Set up the WAQI sensor."""
coordinator: WAQIDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id] coordinator = entry.runtime_data
async_add_entities( async_add_entities(
WaqiSensor(coordinator, sensor) WaqiSensor(coordinator, sensor)
for sensor in SENSORS for sensor in SENSORS