Fix number or entity choose schema (#160358)

Author: bramkragten

homeassistant/helpers/trigger.py

@@ -537,7 +537,7 @@ def _validate_range(value: _T) -> _T:
 
 _NUMBER_OR_ENTITY_CHOOSE_SCHEMA = vol.Schema(
     {
-        vol.Required("chosen_selector"): vol.In(["number", "entity"]),
+        vol.Required("active_choice"): vol.In(["number", "entity"]),
         vol.Optional("entity"): cv.entity_id,
         vol.Optional("number"): vol.Coerce(float),
     }
@@ -548,7 +548,7 @@ def _validate_number_or_entity(value: dict | float | str) -> float | str:
     """Validate number or entity selector result."""
     if isinstance(value, dict):
         _NUMBER_OR_ENTITY_CHOOSE_SCHEMA(value)
-        return value[value["chosen_selector"]]  # type: ignore[no-any-return]
+        return value[value["active_choice"]]  # type: ignore[no-any-return]
     return value
 
 

tests/helpers/test_trigger.py

@@ -1207,19 +1207,19 @@ async def good_subscriber(new_triggers: set[str]):
         ),
         # Test verbose choose selector options
         (
-            {CONF_ABOVE: {"chosen_selector": "entity", "entity": "sensor.test"}},
+            {CONF_ABOVE: {"active_choice": "entity", "entity": "sensor.test"}},
             does_not_raise(),
         ),
         (
-            {CONF_ABOVE: {"chosen_selector": "number", "number": 10}},
+            {CONF_ABOVE: {"active_choice": "number", "number": 10}},
             does_not_raise(),
         ),
         (
-            {CONF_BELOW: {"chosen_selector": "entity", "entity": "sensor.test"}},
+            {CONF_BELOW: {"active_choice": "entity", "entity": "sensor.test"}},
             does_not_raise(),
         ),
         (
-            {CONF_BELOW: {"chosen_selector": "number", "number": 90}},
+            {CONF_BELOW: {"active_choice": "number", "number": 90}},
             does_not_raise(),
         ),
         # Test invalid configurations
@@ -1235,7 +1235,7 @@ async def good_subscriber(new_triggers: set[str]):
         ),
         (
             # Invalid choose selector option
-            {CONF_BELOW: {"chosen_selector": "cat", "cat": 90}},
+            {CONF_BELOW: {"active_choice": "cat", "cat": 90}},
             pytest.raises(vol.Invalid),
         ),
     ],