From d97ef67620c06bc2667cfe447306ef667f9109e2 Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Sat, 8 Feb 2025 15:32:46 +0100 Subject: [PATCH] Explicitly pass in the config_entry in gios coordinator (#137832) explicitly pass in the config_entry in coordinator --- homeassistant/components/gios/__init__.py | 15 ++--------- homeassistant/components/gios/coordinator.py | 27 ++++++++++++++++++-- homeassistant/components/gios/diagnostics.py | 2 +- homeassistant/components/gios/sensor.py | 3 +-- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/homeassistant/components/gios/__init__.py b/homeassistant/components/gios/__init__.py index b5a0e9d5371..c76efbcf361 100644 --- a/homeassistant/components/gios/__init__.py +++ b/homeassistant/components/gios/__init__.py @@ -2,32 +2,21 @@ from __future__ import annotations -from dataclasses import dataclass import logging from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_PLATFORM -from homeassistant.config_entries import ConfigEntry from homeassistant.const import Platform from homeassistant.core import HomeAssistant from homeassistant.helpers import device_registry as dr, entity_registry as er from homeassistant.helpers.aiohttp_client import async_get_clientsession from .const import CONF_STATION_ID, DOMAIN -from .coordinator import GiosDataUpdateCoordinator +from .coordinator import GiosConfigEntry, GiosData, GiosDataUpdateCoordinator _LOGGER = logging.getLogger(__name__) PLATFORMS = [Platform.SENSOR] -type GiosConfigEntry = ConfigEntry[GiosData] - - -@dataclass -class GiosData: - """Data for GIOS integration.""" - - coordinator: GiosDataUpdateCoordinator - async def async_setup_entry(hass: HomeAssistant, entry: GiosConfigEntry) -> bool: """Set up GIOS as config entry.""" @@ -48,7 +37,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: GiosConfigEntry) -> bool websession = async_get_clientsession(hass) - coordinator = GiosDataUpdateCoordinator(hass, websession, station_id) + coordinator = GiosDataUpdateCoordinator(hass, entry, websession, station_id) await coordinator.async_config_entry_first_refresh() entry.runtime_data = GiosData(coordinator) diff --git a/homeassistant/components/gios/coordinator.py b/homeassistant/components/gios/coordinator.py index 17b4b89174f..be4b41ca6ee 100644 --- a/homeassistant/components/gios/coordinator.py +++ b/homeassistant/components/gios/coordinator.py @@ -3,6 +3,7 @@ from __future__ import annotations import asyncio +from dataclasses import dataclass import logging from aiohttp import ClientSession @@ -11,6 +12,7 @@ from gios import Gios from gios.exceptions import GiosError from gios.model import GiosSensors +from homeassistant.config_entries import ConfigEntry from homeassistant.core import HomeAssistant from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed @@ -18,17 +20,38 @@ from .const import API_TIMEOUT, DOMAIN, SCAN_INTERVAL _LOGGER = logging.getLogger(__name__) +type GiosConfigEntry = ConfigEntry[GiosData] + + +@dataclass +class GiosData: + """Data for GIOS integration.""" + + coordinator: GiosDataUpdateCoordinator + class GiosDataUpdateCoordinator(DataUpdateCoordinator[GiosSensors]): """Define an object to hold GIOS data.""" + config_entry: GiosConfigEntry + def __init__( - self, hass: HomeAssistant, session: ClientSession, station_id: int + self, + hass: HomeAssistant, + config_entry: GiosConfigEntry, + session: ClientSession, + station_id: int, ) -> None: """Class to manage fetching GIOS data API.""" self.gios = Gios(station_id, session) - super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=SCAN_INTERVAL) + super().__init__( + hass, + _LOGGER, + config_entry=config_entry, + name=DOMAIN, + update_interval=SCAN_INTERVAL, + ) async def _async_update_data(self) -> GiosSensors: """Update data via library.""" diff --git a/homeassistant/components/gios/diagnostics.py b/homeassistant/components/gios/diagnostics.py index a94a95254de..7e938d5ac6b 100644 --- a/homeassistant/components/gios/diagnostics.py +++ b/homeassistant/components/gios/diagnostics.py @@ -7,7 +7,7 @@ from typing import Any from homeassistant.core import HomeAssistant -from . import GiosConfigEntry +from .coordinator import GiosConfigEntry async def async_get_config_entry_diagnostics( diff --git a/homeassistant/components/gios/sensor.py b/homeassistant/components/gios/sensor.py index 69e198d34df..096ea838a41 100644 --- a/homeassistant/components/gios/sensor.py +++ b/homeassistant/components/gios/sensor.py @@ -23,7 +23,6 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.typing import StateType from homeassistant.helpers.update_coordinator import CoordinatorEntity -from . import GiosConfigEntry from .const import ( ATTR_AQI, ATTR_C6H6, @@ -38,7 +37,7 @@ from .const import ( MANUFACTURER, URL, ) -from .coordinator import GiosDataUpdateCoordinator +from .coordinator import GiosConfigEntry, GiosDataUpdateCoordinator _LOGGER = logging.getLogger(__name__)