Use runtime_data in evil_genius_labs (#136704)

homeassistant/components/evil_genius_labs/__init__.py

@@ -4,38 +4,32 @@ from __future__ import annotations
 
 import pyevilgenius
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 
-from .const import DOMAIN
+from .coordinator import EvilGeniusConfigEntry, EvilGeniusUpdateCoordinator
-from .coordinator import EvilGeniusUpdateCoordinator
 
 PLATFORMS = [Platform.LIGHT]
 
 UPDATE_INTERVAL = 10
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: EvilGeniusConfigEntry) -> bool:
     """Set up Evil Genius Labs from a config entry."""
     coordinator = EvilGeniusUpdateCoordinator(
         hass,
-        entry.title,
+        entry,
         pyevilgenius.EvilGeniusDevice(
             entry.data["host"], aiohttp_client.async_get_clientsession(hass)
         ),
     )
     await coordinator.async_config_entry_first_refresh()
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    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: EvilGeniusConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok

homeassistant/components/evil_genius_labs/coordinator.py

@@ -10,11 +10,16 @@ from typing import cast
 from aiohttp import ContentTypeError
 import pyevilgenius
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 UPDATE_INTERVAL = 10
 
+_LOGGER = logging.getLogger(__name__)
+
+type EvilGeniusConfigEntry = ConfigEntry[EvilGeniusUpdateCoordinator]
+
 
 class EvilGeniusUpdateCoordinator(DataUpdateCoordinator[dict]):
     """Update coordinator for Evil Genius data."""
@@ -24,14 +29,18 @@ class EvilGeniusUpdateCoordinator(DataUpdateCoordinator[dict]):
     product: dict | None
 
     def __init__(
-        self, hass: HomeAssistant, name: str, client: pyevilgenius.EvilGeniusDevice
+        self,
+        hass: HomeAssistant,
+        entry: EvilGeniusConfigEntry,
+        client: pyevilgenius.EvilGeniusDevice,
     ) -> None:
         """Initialize the data update coordinator."""
         self.client = client
         super().__init__(
             hass,
-            logging.getLogger(__name__),
+            _LOGGER,
-            name=name,
+            config_entry=entry,
+            name=entry.title,
             update_interval=timedelta(seconds=UPDATE_INTERVAL),
         )
 

homeassistant/components/evil_genius_labs/diagnostics.py

@@ -5,20 +5,18 @@ from __future__ import annotations
 from typing import Any
 
 from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
+from .coordinator import EvilGeniusConfigEntry
-from .coordinator import EvilGeniusUpdateCoordinator
 
 TO_REDACT = {"wiFiSsidDefault", "wiFiSSID"}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: EvilGeniusConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinator: EvilGeniusUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     return {
         "info": async_redact_data(coordinator.info, TO_REDACT),

homeassistant/components/evil_genius_labs/light.py

@@ -7,12 +7,10 @@ from typing import Any, cast
 
 from homeassistant.components import light
 from homeassistant.components.light import ColorMode, LightEntity, LightEntityFeature
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN
+from .coordinator import EvilGeniusConfigEntry, EvilGeniusUpdateCoordinator
-from .coordinator import EvilGeniusUpdateCoordinator
 from .entity import EvilGeniusEntity
 from .util import update_when_done
 
@@ -22,12 +20,11 @@ FIB_NO_EFFECT = "Solid Color"
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: EvilGeniusConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Evil Genius light platform."""
-    coordinator: EvilGeniusUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    async_add_entities([EvilGeniusLight(config_entry.runtime_data)])
-    async_add_entities([EvilGeniusLight(coordinator)])
 
 
 class EvilGeniusLight(EvilGeniusEntity, LightEntity):