Explicitly pass in the config_entry in Nextcloud coordinator init (ho…

…me-assistant#136774)
zxdavb · Jan 29, 2025 · 7348f1b · 7348f1b
1 parent 96908a8
commit 7348f1b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/homeassistant/components/nextcloud/__init__.py b/homeassistant/components/nextcloud/__init__.py
@@ -9,7 +9,6 @@
     NextcloudMonitorRequestError,
 )
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_PASSWORD,
     CONF_URL,
@@ -21,15 +20,13 @@
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import entity_registry as er
 
-from .coordinator import NextcloudDataUpdateCoordinator
+from .coordinator import NextcloudConfigEntry, NextcloudDataUpdateCoordinator
 
 PLATFORMS = (Platform.SENSOR, Platform.BINARY_SENSOR, Platform.UPDATE)
 
 
 _LOGGER = logging.getLogger(__name__)
 
-type NextcloudConfigEntry = ConfigEntry[NextcloudDataUpdateCoordinator]
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: NextcloudConfigEntry) -> bool:
     """Set up the Nextcloud integration."""

diff --git a/homeassistant/components/nextcloud/binary_sensor.py b/homeassistant/components/nextcloud/binary_sensor.py
@@ -12,7 +12,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import NextcloudConfigEntry
+from .coordinator import NextcloudConfigEntry
 from .entity import NextcloudEntity
 
 BINARY_SENSORS: Final[list[BinarySensorEntityDescription]] = [

diff --git a/homeassistant/components/nextcloud/coordinator.py b/homeassistant/components/nextcloud/coordinator.py
@@ -14,12 +14,16 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+type NextcloudConfigEntry = ConfigEntry[NextcloudDataUpdateCoordinator]
+
 
 class NextcloudDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Nextcloud data update coordinator."""
 
+    config_entry: NextcloudConfigEntry
+
     def __init__(
-        self, hass: HomeAssistant, ncm: NextcloudMonitor, entry: ConfigEntry
+        self, hass: HomeAssistant, ncm: NextcloudMonitor, entry: NextcloudConfigEntry
     ) -> None:
         """Initialize the Nextcloud coordinator."""
         self.ncm = ncm
@@ -28,6 +32,7 @@ def __init__(
         super().__init__(
             hass,
             _LOGGER,
+            config_entry=entry,
             name=self.url,
             update_interval=DEFAULT_SCAN_INTERVAL,
         )

diff --git a/homeassistant/components/nextcloud/entity.py b/homeassistant/components/nextcloud/entity.py
@@ -6,9 +6,8 @@
 from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import NextcloudConfigEntry
 from .const import DOMAIN
-from .coordinator import NextcloudDataUpdateCoordinator
+from .coordinator import NextcloudConfigEntry, NextcloudDataUpdateCoordinator
 
 
 class NextcloudEntity(CoordinatorEntity[NextcloudDataUpdateCoordinator]):

diff --git a/homeassistant/components/nextcloud/sensor.py b/homeassistant/components/nextcloud/sensor.py
@@ -23,7 +23,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.dt import utc_from_timestamp
 
-from . import NextcloudConfigEntry
+from .coordinator import NextcloudConfigEntry
 from .entity import NextcloudEntity
 
 UNIT_OF_LOAD: Final[str] = "load"

diff --git a/homeassistant/components/nextcloud/update.py b/homeassistant/components/nextcloud/update.py
@@ -6,7 +6,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import NextcloudConfigEntry
+from .coordinator import NextcloudConfigEntry
 from .entity import NextcloudEntity