refactor: Declare legacy component actions on the gateway payload

DeviceStatus.from_raw_response reached into the legacy mapper's private attrs key to merge Gen1 actions into available_actions, so the domain entity knew the mapper's internals. The mapper now declares each component's actions as a first-class available_actions list on its payload, and the entity merges any declared list generically with the actions derived from the RPC method list. attrs keeps only the gateway-private routing keys.

Author: jfmlima

packages/core/src/core/domain/entities/device_status.py

@@ -72,9 +72,12 @@ def from_raw_response(
         for component_data in components_data:
             component = ComponentFactory.create_component(component_data)
             component.available_actions = component.get_available_actions(methods)
-            legacy_actions = component.attrs.get("legacy_actions")
-            if isinstance(legacy_actions, list):
-                component.available_actions.extend(legacy_actions)
+            # A gateway may declare per-component actions directly in its
+            # payload; the legacy mapper does, since Gen1 has no method list
+            # to derive them from.
+            declared_actions = component_data.get("available_actions")
+            if isinstance(declared_actions, list):
+                component.available_actions.extend(declared_actions)
             components.append(component)
 
         for key, status in status_dict.items():

packages/core/src/core/gateways/device/legacy_component_mapper.py

@@ -191,10 +191,10 @@ def _build_input_components(
                         "enable": config.get("enable", True),
                         "invert": config.get("invert", False),
                     },
+                    "available_actions": LEGACY_INPUT_ACTIONS.copy(),
                     "attrs": {
                         "legacy_component": "input",
                         "legacy_id": idx,
-                        "legacy_actions": LEGACY_INPUT_ACTIONS.copy(),
                     },
                 }
             )
@@ -250,10 +250,10 @@ def _build_switch_components(
                             "current_limit", config.get("max_current", 0.0)
                         ),
                     },
+                    "available_actions": LEGACY_SWITCH_ACTIONS.copy(),
                     "attrs": {
                         "legacy_component": "relay",
                         "legacy_id": idx,
-                        "legacy_actions": LEGACY_SWITCH_ACTIONS.copy(),
                     },
                 }
             )
@@ -306,10 +306,10 @@ def _build_cover_components(
                         "maxtime_close": config.get("maxtime_close", 0),
                         "power_limit": config.get("power_limit", 0),
                     },
+                    "available_actions": LEGACY_COVER_ACTIONS.copy(),
                     "attrs": {
                         "legacy_component": "roller",
                         "legacy_id": idx,
-                        "legacy_actions": LEGACY_COVER_ACTIONS.copy(),
                     },
                 }
             )

packages/core/tests/unit/domain/entities/test_device_status.py

@@ -77,6 +77,31 @@ def test_it_creates_device_status_without_zigbee_data(self):
         zigbee_comp = device_status.get_component_by_key("zigbee")
         assert zigbee_comp is None
 
+    def test_it_extends_derived_actions_with_the_ones_a_gateway_declares(self):
+        response_data = {
+            "components": [
+                {
+                    "key": "switch:0",
+                    "status": {"output": True},
+                    "config": {"name": "Test Switch"},
+                    "available_actions": ["Legacy.Toggle", "Legacy.TurnOn"],
+                    "attrs": {},
+                }
+            ],
+        }
+
+        device_status = DeviceStatus.from_raw_response(
+            "192.168.1.100", response_data, available_methods=["Switch.Toggle"]
+        )
+
+        switch_comp = device_status.get_component_by_key("switch:0")
+        assert switch_comp is not None
+        assert switch_comp.available_actions == [
+            "Switch.Toggle",
+            "Legacy.Toggle",
+            "Legacy.TurnOn",
+        ]
+
     def test_it_gets_zigbee_info_method(self):
         zigbee_comp = ZigbeeComponent(
             key="zigbee", component_type="zigbee", network_state="joined", enabled=True

packages/core/tests/unit/gateways/device/test_legacy_component_mapper.py

@@ -20,6 +20,22 @@ def _switch_config(mapper, relay_settings):
     return switch["config"]
 
 
+class TestLegacyActionDeclaration:
+    def test_it_declares_the_relay_actions_on_the_component_payload(self, mapper):
+        components = mapper.map(
+            {"mac": "AABBCCDDEEFF", "type": "SHSW-1"},
+            {"relays": [{"ison": False}]},
+            {"relays": [{}]},
+        )
+
+        switch = next(c for c in components if c["key"] == "switch:0")
+        assert switch["available_actions"] == [
+            "Legacy.Toggle",
+            "Legacy.TurnOn",
+            "Legacy.TurnOff",
+        ]
+
+
 class TestLegacyAutoTimerMapping:
     @pytest.mark.parametrize(
         "value, expected_flag, expected_delay",