feat: Initialize only boolean fields in DeviceFeatures and enhance APP_GET_INIT_STATUS mock data with model-specific feature information

Author: allenporter

.pre-commit-config.yaml

@@ -1,51 +1,51 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 exclude: "CHANGELOG.md"
-default_stages: [ pre-commit ]
+default_stages: [pre-commit]
 
 repos:
-    -   repo: https://github.com/pre-commit/pre-commit-hooks
-        rev: v4.5.0
-        hooks:
-            -   id: debug-statements
-            -   id: check-builtin-literals
-            -   id: check-case-conflict
-            -   id: check-docstring-first
-            -   id: check-json
-            -   id: check-toml
-            -   id: check-yaml
-            -   id: detect-private-key
-            -   id: end-of-file-fixer
-            -   id: trailing-whitespace
-    -   repo: https://github.com/astral-sh/uv-pre-commit
-        rev: 0.9.1
-        hooks:
+    - repo: https://github.com/pre-commit/pre-commit-hooks
+      rev: v4.5.0
+      hooks:
+          - id: debug-statements
+          - id: check-builtin-literals
+          - id: check-case-conflict
+          - id: check-docstring-first
+          - id: check-json
+          - id: check-toml
+          - id: check-yaml
+          - id: detect-private-key
+          - id: end-of-file-fixer
+          - id: trailing-whitespace
+    - repo: https://github.com/astral-sh/uv-pre-commit
+      rev: 0.9.1
+      hooks:
           - id: uv-sync
             args: ["--locked", "--all-packages"]
-    -   repo: https://github.com/codespell-project/codespell
-        rev: v2.2.6
-        hooks:
-            -   id: codespell
-                exclude: >
-                    (?x)^(
-                        .*\.ambr
-                    )$
-    -   repo: https://github.com/charliermarsh/ruff-pre-commit
-        rev: v0.13.2
-        hooks:
-            -   id: ruff-format
-            -   id: ruff
-                args:
-                    - --fix
-    -   repo: https://github.com/pre-commit/mirrors-mypy
-        rev: v1.7.1
-        hooks:
-            -   id: mypy
-                exclude: cli.py
-                additional_dependencies: [ "types-paho-mqtt" ]
-    -   repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
-        rev: v9.23.0
-        hooks:
-            -   id: commitlint
-                stages: [commit-msg]
-                additional_dependencies: ['@commitlint/config-conventional']
+    - repo: https://github.com/codespell-project/codespell
+      rev: v2.2.6
+      hooks:
+          - id: codespell
+            exclude: >
+                (?x)^(
+                    .*\.ambr
+                )$
+    - repo: https://github.com/charliermarsh/ruff-pre-commit
+      rev: v0.13.2
+      hooks:
+          - id: ruff-format
+          - id: ruff
+            args:
+                - --fix
+    - repo: https://github.com/pre-commit/mirrors-mypy
+      rev: v1.7.1
+      hooks:
+          - id: mypy
+            exclude: cli.py
+            additional_dependencies: ["types-paho-mqtt", "types-pyyaml"]
+    - repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
+      rev: v9.23.0
+      hooks:
+          - id: commitlint
+            stages: [commit-msg]
+            additional_dependencies: ["@commitlint/config-conventional"]

roborock/device_features.py

@@ -1,8 +1,6 @@
-from __future__ import annotations
-
 from dataclasses import dataclass, field, fields
 from enum import IntEnum, StrEnum
-from typing import Any
+from typing import Any, Self
 
 from roborock.data.code_mappings import RoborockProductNickname
 from roborock.data.containers import RoborockBase
@@ -566,7 +564,7 @@ def from_feature_flags(
         new_feature_info_str: str,
         feature_info: list[int],
         product_nickname: RoborockProductNickname | None,
-    ) -> DeviceFeatures:
+    ) -> Self:
         """Creates a DeviceFeatures instance from raw feature flags.
         :param new_feature_info: A int from get_init_status (sometimes can be found in homedata, but it is not always)
         :param new_feature_info_str: A hex string from get_init_status or home_data.

roborock/devices/traits/v1/device_features.py

@@ -40,10 +40,11 @@ def __init__(self, product: HomeDataProduct, device_cache: DeviceCache) -> None:
         self.converter = DeviceTraitsConverter(product)
         self._product = product
         self._device_cache = device_cache
-        # All fields of DeviceFeatures are required. Initialize them to False
+        # All boolean fields of DeviceFeatures are required. Initialize them to False
         # so we have some known state.
         for field in fields(self):
-            setattr(self, field.name, False)
+            if field.type is bool:
+                setattr(self, field.name, False)
 
     def is_field_supported(self, cls: type[RoborockBase], field_name: FieldNameBase) -> bool:
         """Determines if the specified field is supported by this device.

tests/devices/traits/v1/fixtures.py

@@ -110,11 +110,21 @@ def dock_type_code_fixture(request: pytest.FixtureRequest) -> RoborockDockTypeCo
 
 @pytest.fixture(name="mock_app_get_init_status")
 def mock_app_get_init_status_fixture(device_info: HomeDataDevice, products: list[HomeDataProduct]) -> dict[str, Any]:
-    """Fixture to provide a DeviceFeaturesInfo instance for tests."""
+    """Fixture to provide model-specific APP_GET_INIT_STATUS data.
+
+    Uses real device feature data from device_info.yaml when available for the
+    product model, falling back to the default mock data otherwise.
+    """
     product = next(filter(lambda product: product.id == device_info.product_id, products))
     if not product:
         raise ValueError(f"Product {device_info.product_id} not found")
-    return mock_data.APP_GET_INIT_STATUS
+    device_info_data = mock_data.DEVICE_INFO.get(product.model)
+    if device_info_data is None:
+        return mock_data.APP_GET_INIT_STATUS
+    return {
+        **mock_data.APP_GET_INIT_STATUS,
+        **device_info_data,
+    }
 
 
 @pytest.fixture(autouse=True)

tests/mock_data.py

@@ -143,14 +143,14 @@
 ZEO_ONE_DEVICE_DATA = DEVICES["home_data_device_zeo_one.json"]
 SAROS_10R_DEVICE_DATA = DEVICES["home_data_device_saros_10r.json"]
 
-# Additional Device Features info from YAML. In the future we can merge these
-# all into a similar format or get from diagnostrics.
+# Additional Device Features info from YAML keyed by product model.
+# Each entry contains the fields needed for APP_GET_INIT_STATUS responses.
 _DEVICE_INFO_DATA = yaml.safe_load(pathlib.Path("device_info.yaml").read_text())
-DEVICE_INFO = {
+DEVICE_INFO: dict[str, dict[str, Any]] = {
     product_model: {
-        "new_feature_info": data.get("New Feature Info"),
-        "new_feature_info_str": data.get("New Feature Info Str"),
-        "feature_info": data.get("Feature Info"),
+        "new_feature_info": data.get("new_feature_info"),
+        "new_feature_info_str": data.get("new_feature_info_str"),
+        "feature_info": data.get("feature_info", []),
     }
     for product_model, data in _DEVICE_INFO_DATA.items()
 }