Explicitly pass in the config_entry in smlight coordinator (#137943)

explicitly pass in the config_entry in coordinator

homeassistant/components/smlight/__init__.py

@@ -2,16 +2,18 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from pysmlight import Api2, Info, Radio
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .coordinator import SmDataUpdateCoordinator, SmFirmwareUpdateCoordinator
+from .coordinator import (
+    SmConfigEntry,
+    SmDataUpdateCoordinator,
+    SmFirmwareUpdateCoordinator,
+    SmlightData,
+)
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
@@ -22,25 +24,12 @@ PLATFORMS: list[Platform] = [
 ]
 
 
-@dataclass(kw_only=True)
-class SmlightData:
-    """Coordinator data class."""
-
-    data: SmDataUpdateCoordinator
-    firmware: SmFirmwareUpdateCoordinator
-
-
-type SmConfigEntry = ConfigEntry[SmlightData]
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: SmConfigEntry) -> bool:
     """Set up SMLIGHT Zigbee from a config entry."""
     client = Api2(host=entry.data[CONF_HOST], session=async_get_clientsession(hass))
 
-    data_coordinator = SmDataUpdateCoordinator(hass, entry.data[CONF_HOST], client)
-    firmware_coordinator = SmFirmwareUpdateCoordinator(
-        hass, entry.data[CONF_HOST], client
-    )
+    data_coordinator = SmDataUpdateCoordinator(hass, entry, client)
+    firmware_coordinator = SmFirmwareUpdateCoordinator(hass, entry, client)
 
     await data_coordinator.async_config_entry_first_refresh()
     await firmware_coordinator.async_config_entry_first_refresh()

homeassistant/components/smlight/binary_sensor.py

@@ -14,13 +14,12 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import SCAN_INTERNET_INTERVAL
-from .coordinator import SmDataUpdateCoordinator
+from .coordinator import SmConfigEntry, SmDataUpdateCoordinator
 from .entity import SmEntity
 
 SCAN_INTERVAL = SCAN_INTERNET_INTERVAL
@@ -56,7 +55,7 @@ SENSORS = [
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: SmConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up SMLIGHT sensor based on a config entry."""

homeassistant/components/smlight/button.py

@@ -14,14 +14,13 @@ from homeassistant.components.button import (
     ButtonEntity,
     ButtonEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN
-from .coordinator import SmDataUpdateCoordinator
+from .coordinator import SmConfigEntry, SmDataUpdateCoordinator
 from .entity import SmEntity
 
 _LOGGER = logging.getLogger(__name__)
@@ -65,7 +64,7 @@ ROUTER = SmButtonDescription(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: SmConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up SMLIGHT buttons based on a config entry."""

homeassistant/components/smlight/coordinator.py

@@ -4,14 +4,14 @@ from __future__ import annotations
 
 from abc import abstractmethod
 from dataclasses import dataclass
-from typing import TYPE_CHECKING
 
 from pysmlight import Api2, Info, Sensors
 from pysmlight.const import Settings, SettingsProp
 from pysmlight.exceptions import SmlightAuthError, SmlightConnectionError
 from pysmlight.models import FirmwareList
 
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers import issue_registry as ir
@@ -21,8 +21,13 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import DOMAIN, LOGGER, SCAN_FIRMWARE_INTERVAL, SCAN_INTERVAL
 
-if TYPE_CHECKING:
-    from . import SmConfigEntry
+
+@dataclass(kw_only=True)
+class SmlightData:
+    """Coordinator data class."""
+
+    data: SmDataUpdateCoordinator
+    firmware: SmFirmwareUpdateCoordinator
 
 
 @dataclass
@@ -42,17 +47,23 @@ class SmFwData:
     zb_firmware: list[FirmwareList]
 
 
+type SmConfigEntry = ConfigEntry[SmlightData]
+
+
 class SmBaseDataUpdateCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
     """Base Coordinator for SMLIGHT."""
 
     config_entry: SmConfigEntry
 
-    def __init__(self, hass: HomeAssistant, host: str, client: Api2) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: SmConfigEntry, client: Api2
+    ) -> None:
         """Initialize the coordinator."""
         super().__init__(
             hass,
             LOGGER,
-            name=f"{DOMAIN}_{host}",
+            config_entry=config_entry,
+            name=f"{DOMAIN}_{config_entry.data[CONF_HOST]}",
             update_interval=SCAN_INTERVAL,
         )
 
@@ -133,9 +144,11 @@ class SmDataUpdateCoordinator(SmBaseDataUpdateCoordinator[SmData]):
 class SmFirmwareUpdateCoordinator(SmBaseDataUpdateCoordinator[SmFwData]):
     """Class to manage fetching SMLIGHT firmware update data from cloud."""
 
-    def __init__(self, hass: HomeAssistant, host: str, client: Api2) -> None:
+    def __init__(
+        self, hass: HomeAssistant, config_entry: SmConfigEntry, client: Api2
+    ) -> None:
         """Initialize the coordinator."""
-        super().__init__(hass, host, client)
+        super().__init__(hass, config_entry, client)
 
         self.update_interval = SCAN_FIRMWARE_INTERVAL
         # only one update can run at a time (core or zibgee)

homeassistant/components/smlight/diagnostics.py

@@ -8,7 +8,7 @@ from pysmlight.const import Actions
 
 from homeassistant.core import HomeAssistant
 
-from . import SmConfigEntry
+from .coordinator import SmConfigEntry
 
 
 async def async_get_config_entry_diagnostics(

homeassistant/components/smlight/sensor.py

@@ -21,9 +21,8 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util.dt import utcnow
 
-from . import SmConfigEntry
 from .const import UPTIME_DEVIATION
-from .coordinator import SmDataUpdateCoordinator
+from .coordinator import SmConfigEntry, SmDataUpdateCoordinator
 from .entity import SmEntity
 
 

homeassistant/components/smlight/switch.py

@@ -19,8 +19,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import SmConfigEntry
-from .coordinator import SmDataUpdateCoordinator
+from .coordinator import SmConfigEntry, SmDataUpdateCoordinator
 from .entity import SmEntity
 
 _LOGGER = logging.getLogger(__name__)

homeassistant/components/smlight/update.py

@@ -22,9 +22,9 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import SmConfigEntry, get_radio
+from . import get_radio
 from .const import LOGGER
-from .coordinator import SmFirmwareUpdateCoordinator, SmFwData
+from .coordinator import SmConfigEntry, SmFirmwareUpdateCoordinator, SmFwData
 from .entity import SmEntity