From e9bfb6baeecfc910239e35c8cfcb4de9b9da0f6b Mon Sep 17 00:00:00 2001
From: Michael <35783820+mib1185@users.noreply.github.com>
Date: Sat, 8 Feb 2025 01:04:05 +0100
Subject: [PATCH] Explicitly pass in the config_entry in emoncms coordinator
 (#137743)

---
 homeassistant/components/emoncms/__init__.py    | 11 ++++-------
 homeassistant/components/emoncms/coordinator.py |  7 +++++++
 homeassistant/components/emoncms/sensor.py      |  6 +++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/emoncms/__init__.py b/homeassistant/components/emoncms/__init__.py
index 581948bbc6f..012abcc8c9a 100644
--- a/homeassistant/components/emoncms/__init__.py
+++ b/homeassistant/components/emoncms/__init__.py
@@ -2,7 +2,6 @@
 
 from pyemoncms import EmoncmsClient
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_URL, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -10,12 +9,10 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 
 from .const import DOMAIN, EMONCMS_UUID_DOC_URL, LOGGER
-from .coordinator import EmoncmsCoordinator
+from .coordinator import EmonCMSConfigEntry, EmoncmsCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
-type EmonCMSConfigEntry = ConfigEntry[EmoncmsCoordinator]
-
 
 def _migrate_unique_id(
     hass: HomeAssistant, entry: EmonCMSConfigEntry, emoncms_unique_id: str
@@ -68,7 +65,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: EmonCMSConfigEntry) -> b
         session=async_get_clientsession(hass),
     )
     await _check_unique_id_migration(hass, entry, emoncms_client)
-    coordinator = EmoncmsCoordinator(hass, emoncms_client)
+    coordinator = EmoncmsCoordinator(hass, entry, emoncms_client)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
 
@@ -77,11 +74,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: EmonCMSConfigEntry) -> b
     return True
 
 
-async def update_listener(hass: HomeAssistant, entry: ConfigEntry):
+async def update_listener(hass: HomeAssistant, entry: EmonCMSConfigEntry):
     """Handle options update."""
     await hass.config_entries.async_reload(entry.entry_id)
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: EmonCMSConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/emoncms/coordinator.py b/homeassistant/components/emoncms/coordinator.py
index c6fda5ed7c8..ec439b400d5 100644
--- a/homeassistant/components/emoncms/coordinator.py
+++ b/homeassistant/components/emoncms/coordinator.py
@@ -5,24 +5,31 @@ from typing import Any
 
 from pyemoncms import EmoncmsClient
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import CONF_MESSAGE, CONF_SUCCESS, LOGGER
 
+type EmonCMSConfigEntry = ConfigEntry[EmoncmsCoordinator]
+
 
 class EmoncmsCoordinator(DataUpdateCoordinator[list[dict[str, Any]] | None]):
     """Emoncms Data Update Coordinator."""
 
+    config_entry: EmonCMSConfigEntry
+
     def __init__(
         self,
         hass: HomeAssistant,
+        config_entry: EmonCMSConfigEntry,
         emoncms_client: EmoncmsClient,
     ) -> None:
         """Initialize the emoncms data coordinator."""
         super().__init__(
             hass,
             LOGGER,
+            config_entry=config_entry,
             name="emoncms_coordinator",
             update_interval=timedelta(seconds=60),
         )
diff --git a/homeassistant/components/emoncms/sensor.py b/homeassistant/components/emoncms/sensor.py
index 1920e06a8e8..e3483d3f5d7 100644
--- a/homeassistant/components/emoncms/sensor.py
+++ b/homeassistant/components/emoncms/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_MILLION,
@@ -53,7 +53,7 @@ from .const import (
     FEED_NAME,
     FEED_TAG,
 )
-from .coordinator import EmoncmsCoordinator
+from .coordinator import EmonCMSConfigEntry, EmoncmsCoordinator
 
 SENSORS: dict[str | None, SensorEntityDescription] = {
     "kWh": SensorEntityDescription(
@@ -288,7 +288,7 @@ async def async_setup_platform(
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: EmonCMSConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the emoncms sensors."""