Import and cache supported feature enum flags only when needed (#117270)

* Import and cache supported feature enum flags only when needed

* Add comment aboud being loaded from executor.

---------

Co-authored-by: J. Nick Koston <nick@koston.org>

homeassistant/helpers/selector.py

@@ -3,8 +3,9 @@
 from __future__ import annotations
 
 from collections.abc import Callable, Mapping, Sequence
-from enum import IntFlag, StrEnum
+from enum import StrEnum
 from functools import cache
+import importlib
 from typing import Any, Generic, Literal, Required, TypedDict, TypeVar, cast
 from uuid import UUID
 
@@ -82,63 +83,23 @@ class Selector(Generic[_T]):
 
 
 @cache
-def _entity_features() -> dict[str, type[IntFlag]]:
+def _entity_feature_flag(domain: str, enum_name: str, feature_name: str) -> int:
-    """Return a cached lookup of entity feature enums."""
+    """Return a cached lookup of an entity feature enum.
-    # pylint: disable=import-outside-toplevel
-    from homeassistant.components.alarm_control_panel import (
-        AlarmControlPanelEntityFeature,
-    )
-    from homeassistant.components.calendar import CalendarEntityFeature
-    from homeassistant.components.camera import CameraEntityFeature
-    from homeassistant.components.climate import ClimateEntityFeature
-    from homeassistant.components.cover import CoverEntityFeature
-    from homeassistant.components.fan import FanEntityFeature
-    from homeassistant.components.humidifier import HumidifierEntityFeature
-    from homeassistant.components.lawn_mower import LawnMowerEntityFeature
-    from homeassistant.components.light import LightEntityFeature
-    from homeassistant.components.lock import LockEntityFeature
-    from homeassistant.components.media_player import MediaPlayerEntityFeature
-    from homeassistant.components.notify import NotifyEntityFeature
-    from homeassistant.components.remote import RemoteEntityFeature
-    from homeassistant.components.siren import SirenEntityFeature
-    from homeassistant.components.todo import TodoListEntityFeature
-    from homeassistant.components.update import UpdateEntityFeature
-    from homeassistant.components.vacuum import VacuumEntityFeature
-    from homeassistant.components.valve import ValveEntityFeature
-    from homeassistant.components.water_heater import WaterHeaterEntityFeature
-    from homeassistant.components.weather import WeatherEntityFeature
 
-    return {
+    This will import a module from disk and is run from an executor when
-        "AlarmControlPanelEntityFeature": AlarmControlPanelEntityFeature,
+    loading the services schema files.
-        "CalendarEntityFeature": CalendarEntityFeature,
+    """
-        "CameraEntityFeature": CameraEntityFeature,
+    module = importlib.import_module(f"homeassistant.components.{domain}")
-        "ClimateEntityFeature": ClimateEntityFeature,
+    enum = getattr(module, enum_name)
-        "CoverEntityFeature": CoverEntityFeature,
+    feature = getattr(enum, feature_name)
-        "FanEntityFeature": FanEntityFeature,
+    return cast(int, feature.value)
-        "HumidifierEntityFeature": HumidifierEntityFeature,
-        "LawnMowerEntityFeature": LawnMowerEntityFeature,
-        "LightEntityFeature": LightEntityFeature,
-        "LockEntityFeature": LockEntityFeature,
-        "MediaPlayerEntityFeature": MediaPlayerEntityFeature,
-        "NotifyEntityFeature": NotifyEntityFeature,
-        "RemoteEntityFeature": RemoteEntityFeature,
-        "SirenEntityFeature": SirenEntityFeature,
-        "TodoListEntityFeature": TodoListEntityFeature,
-        "UpdateEntityFeature": UpdateEntityFeature,
-        "VacuumEntityFeature": VacuumEntityFeature,
-        "ValveEntityFeature": ValveEntityFeature,
-        "WaterHeaterEntityFeature": WaterHeaterEntityFeature,
-        "WeatherEntityFeature": WeatherEntityFeature,
-    }
 
 
 def _validate_supported_feature(supported_feature: str) -> int:
     """Validate a supported feature and resolve an enum string to its value."""
 
-    known_entity_features = _entity_features()
-
     try:
-        _, enum, feature = supported_feature.split(".", 2)
+        domain, enum, feature = supported_feature.split(".", 2)
     except ValueError as exc:
         raise vol.Invalid(
             f"Invalid supported feature '{supported_feature}', expected "
@@ -146,8 +107,8 @@ def _validate_supported_feature(supported_feature: str) -> int:
         ) from exc
 
     try:
-        return cast(int, getattr(known_entity_features[enum], feature).value)
+        return _entity_feature_flag(domain, enum, feature)
-    except (AttributeError, KeyError) as exc:
+    except (ModuleNotFoundError, AttributeError) as exc:
         raise vol.Invalid(f"Unknown supported feature '{supported_feature}'") from exc
 
 

tests/helpers/test_selector.py

@@ -282,6 +282,8 @@ def test_entity_selector_schema(schema, valid_selections, invalid_selections) ->
         {"filter": [{"supported_features": ["blah"]}]},
         # Unknown feature enum
         {"filter": [{"supported_features": ["blah.FooEntityFeature.blah"]}]},
+        # Unknown feature enum
+        {"filter": [{"supported_features": ["light.FooEntityFeature.blah"]}]},
         # Unknown feature enum member
         {"filter": [{"supported_features": ["light.LightEntityFeature.blah"]}]},
     ],