More UpCloud config entry refactors (#135548)

homeassistant/components/upcloud/__init__.py

@@ -8,7 +8,6 @@ import logging
 import requests.exceptions
 import upcloud_api
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_PASSWORD,
     CONF_SCAN_INTERVAL,
@@ -23,14 +22,12 @@ from homeassistant.helpers.dispatcher import (
 )
 
 from .const import CONFIG_ENTRY_UPDATE_SIGNAL_TEMPLATE, DEFAULT_SCAN_INTERVAL
-from .coordinator import UpCloudDataUpdateCoordinator
+from .coordinator import UpCloudConfigEntry, UpCloudDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SWITCH]
 
-type UpCloudConfigEntry = ConfigEntry[UpCloudDataUpdateCoordinator]
-
 
 def _config_entry_update_signal_name(config_entry: UpCloudConfigEntry) -> str:
     """Get signal name for updates to a config entry."""
@@ -69,6 +66,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: UpCloudConfigEntry) -> b
 
     coordinator = UpCloudDataUpdateCoordinator(
         hass,
+        config_entry=entry,
         update_interval=update_interval,
         cloud_manager=manager,
         username=entry.data[CONF_USERNAME],
@@ -94,8 +92,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: UpCloudConfigEntry) -> b
     return True
 
 
-async def async_unload_entry(
+async def async_unload_entry(hass: HomeAssistant, entry: UpCloudConfigEntry) -> bool:
-    hass: HomeAssistant, config_entry: UpCloudConfigEntry
-) -> bool:
     """Unload the config entry."""
-    return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/upcloud/binary_sensor.py

@@ -7,7 +7,7 @@ from homeassistant.components.binary_sensor import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import UpCloudConfigEntry
+from .coordinator import UpCloudConfigEntry
 from .entity import UpCloudServerEntity
 
 

homeassistant/components/upcloud/config_flow.py

@@ -13,8 +13,8 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFl
 from homeassistant.const import CONF_PASSWORD, CONF_SCAN_INTERVAL, CONF_USERNAME
 from homeassistant.core import callback
 
-from . import UpCloudConfigEntry
 from .const import DEFAULT_SCAN_INTERVAL, DOMAIN
+from .coordinator import UpCloudConfigEntry
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/components/upcloud/coordinator.py

@@ -4,20 +4,20 @@ from __future__ import annotations
 
 from datetime import timedelta
 import logging
-from typing import TYPE_CHECKING
 
 import upcloud_api
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_SCAN_INTERVAL
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
-if TYPE_CHECKING:
-    from . import UpCloudConfigEntry
-
 _LOGGER = logging.getLogger(__name__)
 
 
+type UpCloudConfigEntry = ConfigEntry[UpCloudDataUpdateCoordinator]
+
+
 class UpCloudDataUpdateCoordinator(
     DataUpdateCoordinator[dict[str, upcloud_api.Server]]
 ):
@@ -27,13 +27,18 @@ class UpCloudDataUpdateCoordinator(
         self,
         hass: HomeAssistant,
         *,
+        config_entry: UpCloudConfigEntry,
         cloud_manager: upcloud_api.CloudManager,
         update_interval: timedelta,
         username: str,
     ) -> None:
         """Initialize coordinator."""
         super().__init__(
-            hass, _LOGGER, name=f"{username}@UpCloud", update_interval=update_interval
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name=f"{username}@UpCloud",
+            update_interval=update_interval,
         )
         self.cloud_manager = cloud_manager
 

homeassistant/components/upcloud/entity.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import logging
 from typing import Any
 
 import upcloud_api
@@ -11,11 +10,8 @@ from homeassistant.const import CONF_USERNAME, STATE_OFF, STATE_ON, STATE_PROBLE
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import UpCloudConfigEntry
 from .const import DOMAIN
-from .coordinator import UpCloudDataUpdateCoordinator
+from .coordinator import UpCloudConfigEntry, UpCloudDataUpdateCoordinator
-
-_LOGGER = logging.getLogger(__name__)
 
 ATTR_CORE_NUMBER = "core_number"
 ATTR_HOSTNAME = "hostname"

homeassistant/components/upcloud/switch.py

@@ -8,7 +8,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import UpCloudConfigEntry
+from .coordinator import UpCloudConfigEntry
 from .entity import UpCloudServerEntity
 
 SIGNAL_UPDATE_UPCLOUD = "upcloud_update"