Don't assume that attrs exists for every dynamic component (#785)

* Use get for virtual components attrs

* Add basic tests

* Remove unused `noqa`

Author: bieniu

aioshelly/rpc_device/device.py

@@ -562,7 +562,7 @@ def _parse_dynamic_components(self, components: dict[str, Any]) -> None:
 
         self._config.update(
             {
-                item["key"]: {**item["config"], **item["attrs"]}
+                item["key"]: {**item["config"], **item.get("attrs", {})}
                 for item in self._dynamic_components
             }
         )

ruff.toml

@@ -37,6 +37,7 @@ lint.ignore = [
     "D103",
     "D104",
     "S101",
+    "SLF001",
 ]
 
 [lint.mccabe]

tests/rpc_device/conftest.py

@@ -137,5 +137,5 @@ async def ws_rpc(
 @pytest_asyncio.fixture
 async def ws_rpc_with_auth(ws_rpc: WsRPCMocker) -> AsyncGenerator[WsRPCMocker, None]:
     """Fixture for an RPC WebSocket with authentication."""
-    ws_rpc._auth_data = AuthData("any", "any", "any")  # noqa: SLF001
+    ws_rpc._auth_data = AuthData("any", "any", "any")
     yield ws_rpc

tests/rpc_device/test_device.py

@@ -1,6 +1,20 @@
 """Tests for rpc_device.device module."""
 
-from aioshelly.rpc_device.device import mergedicts
+from unittest.mock import Mock
+
+import pytest
+
+from aioshelly.rpc_device.device import RpcDevice, mergedicts
+
+VIRT_COMP_STATUS = {"value": 0}
+VIRT_COMP_CONFIG = {
+    "id": 200,
+    "name": "Test",
+    "min": 0,
+    "max": 100,
+    "meta": {"ui": {"view": "slider", "unit": "%", "step": 1}},
+}
+VIRT_COMP_ATTRS = {"role": "current_humidity"}
 
 
 def test_mergedicts() -> None:
@@ -9,3 +23,52 @@ def test_mergedicts() -> None:
     source = {"b": {"c": 4, "e": 5}}
     mergedicts(dest, source)
     assert dest == {"a": 1, "b": {"c": 4, "d": 3, "e": 5}}
+
+
+@pytest.mark.asyncio
+async def test_parse_dynamic_components() -> None:
+    """Test RPC device _parse_dynamic_components() method."""
+    device = await RpcDevice.create(Mock(), Mock(), "10.10.10.10")
+
+    device._status = {}
+    device._config = {}
+
+    device._parse_dynamic_components(
+        {
+            "components": [
+                {
+                    "key": "number:200",
+                    "status": VIRT_COMP_STATUS,
+                    "config": VIRT_COMP_CONFIG,
+                }
+            ]
+        }
+    )
+
+    assert device._status["number:200"] == VIRT_COMP_STATUS
+    assert device._config["number:200"] == VIRT_COMP_CONFIG
+
+
+@pytest.mark.asyncio
+async def test_parse_dynamic_components_with_attrs() -> None:
+    """Test RPC device _parse_dynamic_components() method with attrs."""
+    device = await RpcDevice.create(Mock(), Mock(), "10.10.10.10")
+
+    device._status = {}
+    device._config = {}
+
+    device._parse_dynamic_components(
+        {
+            "components": [
+                {
+                    "key": "number:200",
+                    "status": VIRT_COMP_STATUS,
+                    "config": VIRT_COMP_CONFIG,
+                    "attrs": VIRT_COMP_ATTRS,
+                }
+            ]
+        }
+    )
+
+    assert device._status["number:200"] == VIRT_COMP_STATUS
+    assert device._config["number:200"] == {**VIRT_COMP_CONFIG, **VIRT_COMP_ATTRS}