Move modern_forms base entity to separate module (#126497)

homeassistant/components/modern_forms/__init__.py

@@ -11,11 +11,10 @@ from aiomodernforms import ModernFormsConnectionError, ModernFormsError
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
 from .coordinator import ModernFormsDataUpdateCoordinator
+from .entity import ModernFormsDeviceEntity
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -84,35 +83,3 @@ def modernforms_exception_handler[
             _LOGGER.error("Invalid response from API: %s", error)
 
     return handler
-
-
-class ModernFormsDeviceEntity(CoordinatorEntity[ModernFormsDataUpdateCoordinator]):
-    """Defines a Modern Forms device entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        *,
-        entry_id: str,
-        coordinator: ModernFormsDataUpdateCoordinator,
-        enabled_default: bool = True,
-    ) -> None:
-        """Initialize the Modern Forms entity."""
-        super().__init__(coordinator)
-        self._attr_enabled_default = enabled_default
-        self._entry_id = entry_id
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device information about this Modern Forms device."""
-        return DeviceInfo(
-            identifiers={(DOMAIN, self.coordinator.data.info.mac_address)},
-            name=self.coordinator.data.info.device_name,
-            manufacturer="Modern Forms",
-            model=self.coordinator.data.info.fan_type,
-            sw_version=(
-                f"{self.coordinator.data.info.firmware_version} /"
-                f" {self.coordinator.data.info.main_mcu_firmware_version}"
-            ),
-        )

homeassistant/components/modern_forms/binary_sensor.py

@@ -8,9 +8,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 
-from . import ModernFormsDeviceEntity
 from .const import CLEAR_TIMER, DOMAIN
 from .coordinator import ModernFormsDataUpdateCoordinator
+from .entity import ModernFormsDeviceEntity
 
 
 async def async_setup_entry(

homeassistant/components/modern_forms/entity.py

@@ -0,0 +1,41 @@
+"""The Modern Forms integration."""
+
+from __future__ import annotations
+
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import ModernFormsDataUpdateCoordinator
+
+
+class ModernFormsDeviceEntity(CoordinatorEntity[ModernFormsDataUpdateCoordinator]):
+    """Defines a Modern Forms device entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        *,
+        entry_id: str,
+        coordinator: ModernFormsDataUpdateCoordinator,
+        enabled_default: bool = True,
+    ) -> None:
+        """Initialize the Modern Forms entity."""
+        super().__init__(coordinator)
+        self._attr_enabled_default = enabled_default
+        self._entry_id = entry_id
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Return device information about this Modern Forms device."""
+        return DeviceInfo(
+            identifiers={(DOMAIN, self.coordinator.data.info.mac_address)},
+            name=self.coordinator.data.info.device_name,
+            manufacturer="Modern Forms",
+            model=self.coordinator.data.info.fan_type,
+            sw_version=(
+                f"{self.coordinator.data.info.firmware_version} /"
+                f" {self.coordinator.data.info.main_mcu_firmware_version}"
+            ),
+        )

homeassistant/components/modern_forms/fan.py

@@ -18,7 +18,7 @@ from homeassistant.util.percentage import (
 )
 from homeassistant.util.scaling import int_states_in_range
 
-from . import ModernFormsDeviceEntity, modernforms_exception_handler
+from . import modernforms_exception_handler
 from .const import (
     ATTR_SLEEP_TIME,
     CLEAR_TIMER,
@@ -29,6 +29,7 @@ from .const import (
     SERVICE_SET_FAN_SLEEP_TIMER,
 )
 from .coordinator import ModernFormsDataUpdateCoordinator
+from .entity import ModernFormsDeviceEntity
 
 
 async def async_setup_entry(

homeassistant/components/modern_forms/light.py

@@ -17,7 +17,7 @@ from homeassistant.util.percentage import (
     ranged_value_to_percentage,
 )
 
-from . import ModernFormsDeviceEntity, modernforms_exception_handler
+from . import modernforms_exception_handler
 from .const import (
     ATTR_SLEEP_TIME,
     CLEAR_TIMER,
@@ -28,6 +28,7 @@ from .const import (
     SERVICE_SET_LIGHT_SLEEP_TIMER,
 )
 from .coordinator import ModernFormsDataUpdateCoordinator
+from .entity import ModernFormsDeviceEntity
 
 BRIGHTNESS_RANGE = (1, 255)
 

homeassistant/components/modern_forms/sensor.py

@@ -11,9 +11,9 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.util import dt as dt_util
 
-from . import ModernFormsDeviceEntity
 from .const import CLEAR_TIMER, DOMAIN
 from .coordinator import ModernFormsDataUpdateCoordinator
+from .entity import ModernFormsDeviceEntity
 
 
 async def async_setup_entry(

homeassistant/components/modern_forms/switch.py

@@ -9,9 +9,10 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import ModernFormsDeviceEntity, modernforms_exception_handler
+from . import modernforms_exception_handler
 from .const import DOMAIN
 from .coordinator import ModernFormsDataUpdateCoordinator
+from .entity import ModernFormsDeviceEntity
 
 
 async def async_setup_entry(