From faff5f473809c0b9adb72fa5dfb110ca2c9c8001 Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Tue, 14 May 2024 21:02:31 +0200 Subject: [PATCH] Some minor cleanups in WLED (#117453) --- homeassistant/components/wled/binary_sensor.py | 5 ++--- homeassistant/components/wled/button.py | 5 ++--- homeassistant/components/wled/{models.py => entity.py} | 2 +- homeassistant/components/wled/helpers.py | 2 +- homeassistant/components/wled/light.py | 2 +- homeassistant/components/wled/number.py | 2 +- homeassistant/components/wled/select.py | 2 +- homeassistant/components/wled/sensor.py | 2 +- homeassistant/components/wled/switch.py | 2 +- homeassistant/components/wled/update.py | 5 ++--- 10 files changed, 13 insertions(+), 16 deletions(-) rename homeassistant/components/wled/{models.py => entity.py} (97%) diff --git a/homeassistant/components/wled/binary_sensor.py b/homeassistant/components/wled/binary_sensor.py index cceaadd84b2..41f7a4f8ba0 100644 --- a/homeassistant/components/wled/binary_sensor.py +++ b/homeassistant/components/wled/binary_sensor.py @@ -12,7 +12,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import WLEDConfigEntry from .coordinator import WLEDDataUpdateCoordinator -from .models import WLEDEntity +from .entity import WLEDEntity async def async_setup_entry( @@ -21,10 +21,9 @@ async def async_setup_entry( async_add_entities: AddEntitiesCallback, ) -> None: """Set up a WLED binary sensor based on a config entry.""" - coordinator = entry.runtime_data async_add_entities( [ - WLEDUpdateBinarySensor(coordinator), + WLEDUpdateBinarySensor(entry.runtime_data), ] ) diff --git a/homeassistant/components/wled/button.py b/homeassistant/components/wled/button.py index 3165a0cba0a..74799b4dcc4 100644 --- a/homeassistant/components/wled/button.py +++ b/homeassistant/components/wled/button.py @@ -9,8 +9,8 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import WLEDConfigEntry from .coordinator import WLEDDataUpdateCoordinator +from .entity import WLEDEntity from .helpers import wled_exception_handler -from .models import WLEDEntity async def async_setup_entry( @@ -19,8 +19,7 @@ async def async_setup_entry( async_add_entities: AddEntitiesCallback, ) -> None: """Set up WLED button based on a config entry.""" - coordinator = entry.runtime_data - async_add_entities([WLEDRestartButton(coordinator)]) + async_add_entities([WLEDRestartButton(entry.runtime_data)]) class WLEDRestartButton(WLEDEntity, ButtonEntity): diff --git a/homeassistant/components/wled/models.py b/homeassistant/components/wled/entity.py similarity index 97% rename from homeassistant/components/wled/models.py rename to homeassistant/components/wled/entity.py index ac7103303cc..f91e06a5858 100644 --- a/homeassistant/components/wled/models.py +++ b/homeassistant/components/wled/entity.py @@ -1,4 +1,4 @@ -"""Models for WLED.""" +"""Base entity for WLED.""" from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo from homeassistant.helpers.update_coordinator import CoordinatorEntity diff --git a/homeassistant/components/wled/helpers.py b/homeassistant/components/wled/helpers.py index ad9a02b38ca..1358a3c05f1 100644 --- a/homeassistant/components/wled/helpers.py +++ b/homeassistant/components/wled/helpers.py @@ -9,7 +9,7 @@ from wled import WLEDConnectionError, WLEDError from homeassistant.exceptions import HomeAssistantError -from .models import WLEDEntity +from .entity import WLEDEntity _WLEDEntityT = TypeVar("_WLEDEntityT", bound=WLEDEntity) _P = ParamSpec("_P") diff --git a/homeassistant/components/wled/light.py b/homeassistant/components/wled/light.py index 7f118db5b06..36ebd024de3 100644 --- a/homeassistant/components/wled/light.py +++ b/homeassistant/components/wled/light.py @@ -21,8 +21,8 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import WLEDConfigEntry from .const import ATTR_COLOR_PRIMARY, ATTR_ON, ATTR_SEGMENT_ID from .coordinator import WLEDDataUpdateCoordinator +from .entity import WLEDEntity from .helpers import wled_exception_handler -from .models import WLEDEntity PARALLEL_UPDATES = 1 diff --git a/homeassistant/components/wled/number.py b/homeassistant/components/wled/number.py index b21de71a00c..5af466360bb 100644 --- a/homeassistant/components/wled/number.py +++ b/homeassistant/components/wled/number.py @@ -16,8 +16,8 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import WLEDConfigEntry from .const import ATTR_INTENSITY, ATTR_SPEED from .coordinator import WLEDDataUpdateCoordinator +from .entity import WLEDEntity from .helpers import wled_exception_handler -from .models import WLEDEntity PARALLEL_UPDATES = 1 diff --git a/homeassistant/components/wled/select.py b/homeassistant/components/wled/select.py index abae15059cd..20b14531ac7 100644 --- a/homeassistant/components/wled/select.py +++ b/homeassistant/components/wled/select.py @@ -13,8 +13,8 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import WLEDConfigEntry from .coordinator import WLEDDataUpdateCoordinator +from .entity import WLEDEntity from .helpers import wled_exception_handler -from .models import WLEDEntity PARALLEL_UPDATES = 1 diff --git a/homeassistant/components/wled/sensor.py b/homeassistant/components/wled/sensor.py index aa897d6d1b9..7d18665a085 100644 --- a/homeassistant/components/wled/sensor.py +++ b/homeassistant/components/wled/sensor.py @@ -28,7 +28,7 @@ from homeassistant.util.dt import utcnow from . import WLEDConfigEntry from .coordinator import WLEDDataUpdateCoordinator -from .models import WLEDEntity +from .entity import WLEDEntity @dataclass(frozen=True, kw_only=True) diff --git a/homeassistant/components/wled/switch.py b/homeassistant/components/wled/switch.py index 305303d4254..7ec75b956c0 100644 --- a/homeassistant/components/wled/switch.py +++ b/homeassistant/components/wled/switch.py @@ -13,8 +13,8 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import WLEDConfigEntry from .const import ATTR_DURATION, ATTR_FADE, ATTR_TARGET_BRIGHTNESS, ATTR_UDP_PORT from .coordinator import WLEDDataUpdateCoordinator +from .entity import WLEDEntity from .helpers import wled_exception_handler -from .models import WLEDEntity PARALLEL_UPDATES = 1 diff --git a/homeassistant/components/wled/update.py b/homeassistant/components/wled/update.py index 5f4036cb10c..05df5fcf54f 100644 --- a/homeassistant/components/wled/update.py +++ b/homeassistant/components/wled/update.py @@ -14,8 +14,8 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback from . import WLEDConfigEntry from .coordinator import WLEDDataUpdateCoordinator +from .entity import WLEDEntity from .helpers import wled_exception_handler -from .models import WLEDEntity async def async_setup_entry( @@ -24,8 +24,7 @@ async def async_setup_entry( async_add_entities: AddEntitiesCallback, ) -> None: """Set up WLED update based on a config entry.""" - coordinator = entry.runtime_data - async_add_entities([WLEDUpdateEntity(coordinator)]) + async_add_entities([WLEDUpdateEntity(entry.runtime_data)]) class WLEDUpdateEntity(WLEDEntity, UpdateEntity):