From 75dc6994284f7e821a2f66f650d732d618125453 Mon Sep 17 00:00:00 2001 From: mik-laj <12058428+mik-laj@users.noreply.github.com> Date: Fri, 31 Oct 2025 22:40:13 +0000 Subject: [PATCH 1/2] Fix typing of ConfigEntry in WLED --- homeassistant/components/wled/config_flow.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/wled/config_flow.py b/homeassistant/components/wled/config_flow.py index e80760508a09d..1a1a3293c2e08 100644 --- a/homeassistant/components/wled/config_flow.py +++ b/homeassistant/components/wled/config_flow.py @@ -9,7 +9,6 @@ from homeassistant.components import onboarding from homeassistant.config_entries import ( - ConfigEntry, ConfigFlow, ConfigFlowResult, OptionsFlowWithReload, @@ -19,6 +18,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo +from . import WLEDConfigEntry from .const import CONF_KEEP_MAIN_LIGHT, DEFAULT_KEEP_MAIN_LIGHT, DOMAIN @@ -32,7 +32,7 @@ class WLEDFlowHandler(ConfigFlow, domain=DOMAIN): @staticmethod @callback def async_get_options_flow( - config_entry: ConfigEntry, + config_entry: WLEDConfigEntry, ) -> WLEDOptionsFlowHandler: """Get the options flow for this handler.""" return WLEDOptionsFlowHandler() From 60b1580783160190efd3e720d0e1877c1cd3c942 Mon Sep 17 00:00:00 2001 From: mik-laj <12058428+mik-laj@users.noreply.github.com> Date: Mon, 3 Nov 2025 10:46:25 +0000 Subject: [PATCH 2/2] fixup! Fix typing of ConfigEntry in WLED --- homeassistant/components/wled/__init__.py | 9 +++++---- homeassistant/components/wled/button.py | 3 +-- homeassistant/components/wled/config_flow.py | 2 +- homeassistant/components/wled/coordinator.py | 6 ++++-- homeassistant/components/wled/diagnostics.py | 2 +- homeassistant/components/wled/light.py | 3 +-- homeassistant/components/wled/number.py | 3 +-- homeassistant/components/wled/select.py | 3 +-- homeassistant/components/wled/sensor.py | 3 +-- homeassistant/components/wled/switch.py | 3 +-- homeassistant/components/wled/update.py | 8 ++++++-- 11 files changed, 23 insertions(+), 22 deletions(-) diff --git a/homeassistant/components/wled/__init__.py b/homeassistant/components/wled/__init__.py index c3917507fb982..a854254a262e7 100644 --- a/homeassistant/components/wled/__init__.py +++ b/homeassistant/components/wled/__init__.py @@ -2,7 +2,6 @@ from __future__ import annotations -from homeassistant.config_entries import ConfigEntry from homeassistant.const import Platform from homeassistant.core import HomeAssistant from homeassistant.helpers import config_validation as cv @@ -10,7 +9,11 @@ from homeassistant.util.hass_dict import HassKey from .const import DOMAIN -from .coordinator import WLEDDataUpdateCoordinator, WLEDReleasesDataUpdateCoordinator +from .coordinator import ( + WLEDConfigEntry, + WLEDDataUpdateCoordinator, + WLEDReleasesDataUpdateCoordinator, +) PLATFORMS = ( Platform.BUTTON, @@ -22,8 +25,6 @@ Platform.UPDATE, ) -type WLEDConfigEntry = ConfigEntry[WLEDDataUpdateCoordinator] - WLED_KEY: HassKey[WLEDReleasesDataUpdateCoordinator] = HassKey(DOMAIN) CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN) diff --git a/homeassistant/components/wled/button.py b/homeassistant/components/wled/button.py index 119b2dc9b9fcb..ef39ff0c6ff89 100644 --- a/homeassistant/components/wled/button.py +++ b/homeassistant/components/wled/button.py @@ -7,8 +7,7 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback -from . import WLEDConfigEntry -from .coordinator import WLEDDataUpdateCoordinator +from .coordinator import WLEDConfigEntry, WLEDDataUpdateCoordinator from .entity import WLEDEntity from .helpers import wled_exception_handler diff --git a/homeassistant/components/wled/config_flow.py b/homeassistant/components/wled/config_flow.py index 1a1a3293c2e08..5182d04bfdca6 100644 --- a/homeassistant/components/wled/config_flow.py +++ b/homeassistant/components/wled/config_flow.py @@ -18,8 +18,8 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo -from . import WLEDConfigEntry from .const import CONF_KEEP_MAIN_LIGHT, DEFAULT_KEEP_MAIN_LIGHT, DOMAIN +from .coordinator import WLEDConfigEntry class WLEDFlowHandler(ConfigFlow, domain=DOMAIN): diff --git a/homeassistant/components/wled/coordinator.py b/homeassistant/components/wled/coordinator.py index 8e2855e9f0543..87cf41a244230 100644 --- a/homeassistant/components/wled/coordinator.py +++ b/homeassistant/components/wled/coordinator.py @@ -26,18 +26,20 @@ SCAN_INTERVAL, ) +type WLEDConfigEntry = ConfigEntry[WLEDDataUpdateCoordinator] + class WLEDDataUpdateCoordinator(DataUpdateCoordinator[WLEDDevice]): """Class to manage fetching WLED data from single endpoint.""" keep_main_light: bool - config_entry: ConfigEntry + config_entry: WLEDConfigEntry def __init__( self, hass: HomeAssistant, *, - entry: ConfigEntry, + entry: WLEDConfigEntry, ) -> None: """Initialize global WLED data updater.""" self.keep_main_light = entry.options.get( diff --git a/homeassistant/components/wled/diagnostics.py b/homeassistant/components/wled/diagnostics.py index 732cd3602a085..c38953b81b0bb 100644 --- a/homeassistant/components/wled/diagnostics.py +++ b/homeassistant/components/wled/diagnostics.py @@ -7,7 +7,7 @@ from homeassistant.components.diagnostics import async_redact_data from homeassistant.core import HomeAssistant -from . import WLEDConfigEntry +from .coordinator import WLEDConfigEntry async def async_get_config_entry_diagnostics( diff --git a/homeassistant/components/wled/light.py b/homeassistant/components/wled/light.py index 5e2ff1175802a..b1774927689ba 100644 --- a/homeassistant/components/wled/light.py +++ b/homeassistant/components/wled/light.py @@ -19,7 +19,6 @@ from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback -from . import WLEDConfigEntry from .const import ( ATTR_CCT, ATTR_COLOR_PRIMARY, @@ -29,7 +28,7 @@ COLOR_TEMP_K_MIN, LIGHT_CAPABILITIES_COLOR_MODE_MAPPING, ) -from .coordinator import WLEDDataUpdateCoordinator +from .coordinator import WLEDConfigEntry, WLEDDataUpdateCoordinator from .entity import WLEDEntity from .helpers import kelvin_to_255, kelvin_to_255_reverse, wled_exception_handler diff --git a/homeassistant/components/wled/number.py b/homeassistant/components/wled/number.py index e4ff184fd4b0b..84e7d6ba66a8d 100644 --- a/homeassistant/components/wled/number.py +++ b/homeassistant/components/wled/number.py @@ -13,9 +13,8 @@ from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback -from . import WLEDConfigEntry from .const import ATTR_INTENSITY, ATTR_SPEED -from .coordinator import WLEDDataUpdateCoordinator +from .coordinator import WLEDConfigEntry, WLEDDataUpdateCoordinator from .entity import WLEDEntity from .helpers import wled_exception_handler diff --git a/homeassistant/components/wled/select.py b/homeassistant/components/wled/select.py index e5835d0e67162..f9785fa8e57ee 100644 --- a/homeassistant/components/wled/select.py +++ b/homeassistant/components/wled/select.py @@ -11,8 +11,7 @@ from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback -from . import WLEDConfigEntry -from .coordinator import WLEDDataUpdateCoordinator +from .coordinator import WLEDConfigEntry, WLEDDataUpdateCoordinator from .entity import WLEDEntity from .helpers import wled_exception_handler diff --git a/homeassistant/components/wled/sensor.py b/homeassistant/components/wled/sensor.py index 06f9678201905..83a3cd40ccc2f 100644 --- a/homeassistant/components/wled/sensor.py +++ b/homeassistant/components/wled/sensor.py @@ -26,8 +26,7 @@ from homeassistant.helpers.typing import StateType from homeassistant.util.dt import utcnow -from . import WLEDConfigEntry -from .coordinator import WLEDDataUpdateCoordinator +from .coordinator import WLEDConfigEntry, WLEDDataUpdateCoordinator from .entity import WLEDEntity diff --git a/homeassistant/components/wled/switch.py b/homeassistant/components/wled/switch.py index 8ed6ed5611488..1bbac423118d2 100644 --- a/homeassistant/components/wled/switch.py +++ b/homeassistant/components/wled/switch.py @@ -10,9 +10,8 @@ from homeassistant.core import HomeAssistant, callback from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback -from . import WLEDConfigEntry from .const import ATTR_DURATION, ATTR_TARGET_BRIGHTNESS, ATTR_UDP_PORT -from .coordinator import WLEDDataUpdateCoordinator +from .coordinator import WLEDConfigEntry, WLEDDataUpdateCoordinator from .entity import WLEDEntity from .helpers import wled_exception_handler diff --git a/homeassistant/components/wled/update.py b/homeassistant/components/wled/update.py index ccf72425b777b..dc6c0a5273c93 100644 --- a/homeassistant/components/wled/update.py +++ b/homeassistant/components/wled/update.py @@ -12,8 +12,12 @@ from homeassistant.core import HomeAssistant from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback -from . import WLED_KEY, WLEDConfigEntry -from .coordinator import WLEDDataUpdateCoordinator, WLEDReleasesDataUpdateCoordinator +from . import WLED_KEY +from .coordinator import ( + WLEDConfigEntry, + WLEDDataUpdateCoordinator, + WLEDReleasesDataUpdateCoordinator, +) from .entity import WLEDEntity from .helpers import wled_exception_handler