Move melnor coordinator to separate module (#117486)

homeassistant/components/melnor/__init__.py

@@ -12,7 +12,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
 
 from .const import DOMAIN
-from .models import MelnorDataUpdateCoordinator
+from .coordinator import MelnorDataUpdateCoordinator
 
 PLATFORMS: list[Platform] = [
     Platform.NUMBER,

homeassistant/components/melnor/coordinator.py

@@ -0,0 +1,33 @@
+"""Coordinator for the Melnor integration."""
+
+from datetime import timedelta
+import logging
+
+from melnor_bluetooth.device import Device
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class MelnorDataUpdateCoordinator(DataUpdateCoordinator[Device]):
+    """Melnor data update coordinator."""
+
+    _device: Device
+
+    def __init__(self, hass: HomeAssistant, device: Device) -> None:
+        """Initialize my coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            name="Melnor Bluetooth",
+            update_interval=timedelta(seconds=5),
+        )
+        self._device = device
+
+    async def _async_update_data(self):
+        """Update the device state."""
+
+        await self._device.fetch_state()
+        return self._device

homeassistant/components/melnor/models.py

@@ -1,45 +1,17 @@
 """Melnor integration models."""
 
 from collections.abc import Callable
-from datetime import timedelta
-import logging
 from typing import TypeVar
 
 from melnor_bluetooth.device import Device, Valve
 
 from homeassistant.components.number import EntityDescription
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import callback
 from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import (
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
-    CoordinatorEntity,
-    DataUpdateCoordinator,
-)
 
 from .const import DOMAIN
-
+from .coordinator import MelnorDataUpdateCoordinator
-_LOGGER = logging.getLogger(__name__)
-
-
-class MelnorDataUpdateCoordinator(DataUpdateCoordinator[Device]):  # pylint: disable=hass-enforce-coordinator-module
-    """Melnor data update coordinator."""
-
-    _device: Device
-
-    def __init__(self, hass: HomeAssistant, device: Device) -> None:
-        """Initialize my coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name="Melnor Bluetooth",
-            update_interval=timedelta(seconds=5),
-        )
-        self._device = device
-
-    async def _async_update_data(self):
-        """Update the device state."""
-
-        await self._device.fetch_state()
-        return self._device
 
 
 class MelnorBluetoothEntity(CoordinatorEntity[MelnorDataUpdateCoordinator]):

homeassistant/components/melnor/number.py

@@ -19,11 +19,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN
-from .models import (
+from .coordinator import MelnorDataUpdateCoordinator
-    MelnorDataUpdateCoordinator,
+from .models import MelnorZoneEntity, get_entities_for_valves
-    MelnorZoneEntity,
-    get_entities_for_valves,
-)
 
 
 @dataclass(frozen=True, kw_only=True)

homeassistant/components/melnor/sensor.py

@@ -27,12 +27,8 @@ from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
-from .models import (
+from .coordinator import MelnorDataUpdateCoordinator
-    MelnorBluetoothEntity,
+from .models import MelnorBluetoothEntity, MelnorZoneEntity, get_entities_for_valves
-    MelnorDataUpdateCoordinator,
-    MelnorZoneEntity,
-    get_entities_for_valves,
-)
 
 
 def watering_seconds_left(valve: Valve) -> datetime | None:

homeassistant/components/melnor/switch.py

@@ -18,11 +18,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN
-from .models import (
+from .coordinator import MelnorDataUpdateCoordinator
-    MelnorDataUpdateCoordinator,
+from .models import MelnorZoneEntity, get_entities_for_valves
-    MelnorZoneEntity,
-    get_entities_for_valves,
-)
 
 
 @dataclass(frozen=True, kw_only=True)

homeassistant/components/melnor/time.py

@@ -16,11 +16,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN
-from .models import (
+from .coordinator import MelnorDataUpdateCoordinator
-    MelnorDataUpdateCoordinator,
+from .models import MelnorZoneEntity, get_entities_for_valves
-    MelnorZoneEntity,
-    get_entities_for_valves,
-)
 
 
 @dataclass(frozen=True, kw_only=True)