style: apply ruff-format and end-of-file-fixer fixes

Author: NOisi-X

roborock/data/zeo/zeo_code_mappings.py

@@ -210,7 +210,7 @@ class ZeoDetergentExpansionType(RoborockEnum):
 class ZeoSoftenerExpansionType(RoborockEnum):
     softener = 1
     softener_expansion = 2
-    wool_detergent = 3 
+    wool_detergent = 3
 
 
 class ZeoDirtDetectionStatus(RoborockEnum):
@@ -318,11 +318,3 @@ class ZeoDryerStartError(RoborockEnum):
 # class SmartHostStatus(RoborockEnum):
 #     smart_host_waiting = 0
 #     smart_hosting = 1
-
-
-
-
-
-
-
-

roborock/devices/traits/a01/__init__.py

@@ -62,12 +62,17 @@
 from roborock.device_features import ZeoFeatures
 from roborock.devices.rpc.a01_channel import send_decoded_command
 from roborock.devices.traits import Trait
-from roborock.protocols.a01_protocol import decode_rpc_response
 from roborock.devices.traits.a01.device_features import ZeoFeatureTrait
 from roborock.devices.transport.mqtt_channel import MqttChannel
 from roborock.exceptions import RoborockException
 from roborock.mqtt.session import MqttQos
-from roborock.roborock_message import RoborockDyadDataProtocol, RoborockMessage, RoborockMessageProtocol, RoborockZeoProtocol
+from roborock.protocols.a01_protocol import decode_rpc_response
+from roborock.roborock_message import (
+    RoborockDyadDataProtocol,
+    RoborockMessage,
+    RoborockMessageProtocol,
+    RoborockZeoProtocol,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -217,8 +222,12 @@ def to_dp_bool(val: Any) -> str:
     RoborockZeoProtocol.ION_DEODORIZATION: parse_bool,
     RoborockZeoProtocol.UV_LIGHT: parse_bool,
     RoborockZeoProtocol.SMART_HOSTING: parse_bool,
-    RoborockZeoProtocol.SOFTENER_EXPANSION_TYPE: lambda val: _decode_expansion_type(val, ZeoSoftenerExpansionType.softener),
-    RoborockZeoProtocol.DETERGENT_EXPANSION_TYPE: lambda val: _decode_expansion_type(val, ZeoDetergentExpansionType.concentrated_detergent),
+    RoborockZeoProtocol.SOFTENER_EXPANSION_TYPE: lambda val: _decode_expansion_type(
+        val, ZeoSoftenerExpansionType.softener
+    ),
+    RoborockZeoProtocol.DETERGENT_EXPANSION_TYPE: lambda val: _decode_expansion_type(
+        val, ZeoDetergentExpansionType.concentrated_detergent
+    ),
     RoborockZeoProtocol.SMILE_LIGHT_STATUS: parse_bool,
     RoborockZeoProtocol.POWER_LIGHT: parse_bool,
     RoborockZeoProtocol.PANEL_PROGRAM_PARAMS_SET: lambda val: int(val),
@@ -336,6 +345,7 @@ class ZeoStartParams:
 # 32-bit integer at DP 222.  This mirrors WasherDpsCache.customMode in
 # module 725 of the React Native plugin bundle.
 
+
 @dataclass
 class ZeoCustomMode:
     """Decoded custom programme parameters from DP 222 (LoadCloudProgram).
@@ -610,9 +620,7 @@ def _start_params(self) -> tuple[RoborockZeoProtocol, ...]:
         (RoborockZeoProtocol.ION_DEODORIZATION, "ion_deodorization"),
     )
 
-    async def _build_feature_gated_dps(
-        self, features: ZeoFeatures | None, dps: dict[RoborockZeoProtocol, Any]
-    ) -> None:
+    async def _build_feature_gated_dps(self, features: ZeoFeatures | None, dps: dict[RoborockZeoProtocol, Any]) -> None:
         """Add feature-gated DPs to *dps* in-place, batch-querying uncached ones.
 
         Only includes DPs whose corresponding FeatureBit is set in *features*.
@@ -822,12 +830,8 @@ async def _build_save_payload(self) -> dict[RoborockZeoProtocol, Any]:
         """Bundle Mode + Program + cached optionals for a save command."""
         await self._ensure_subscribed()
         payload: dict[RoborockZeoProtocol, Any] = {
-            RoborockZeoProtocol.MODE: self._dps_cache.get(
-                int(RoborockZeoProtocol.MODE), 1
-            ),
-            RoborockZeoProtocol.PROGRAM: self._dps_cache.get(
-                int(RoborockZeoProtocol.PROGRAM), 1
-            ),
+            RoborockZeoProtocol.MODE: self._dps_cache.get(int(RoborockZeoProtocol.MODE), 1),
+            RoborockZeoProtocol.PROGRAM: self._dps_cache.get(int(RoborockZeoProtocol.PROGRAM), 1),
         }
         for dp in self._save_params:
             val = self._dps_cache.get(int(dp))
@@ -994,15 +998,15 @@ async def get_auto_detergent(self) -> bool:
             self._channel,
             {
                 RoborockZeoProtocol.ID_QUERY: [
-                    RoborockZeoProtocol.DETERGENT_TYPE if self.is_addition_type_control
+                    RoborockZeoProtocol.DETERGENT_TYPE
+                    if self.is_addition_type_control
                     else RoborockZeoProtocol.DETERGENT_SET,
                 ],
             },
             value_encoder=json.dumps,
         )
         raw = result.get(
-            RoborockZeoProtocol.DETERGENT_TYPE if self.is_addition_type_control
-            else RoborockZeoProtocol.DETERGENT_SET
+            RoborockZeoProtocol.DETERGENT_TYPE if self.is_addition_type_control else RoborockZeoProtocol.DETERGENT_SET
         )
         return parse_bool(raw) if not self.is_addition_type_control else bool(raw and int(raw) > 0)
 
@@ -1012,15 +1016,15 @@ async def get_auto_softener(self) -> bool:
             self._channel,
             {
                 RoborockZeoProtocol.ID_QUERY: [
-                    RoborockZeoProtocol.SOFTENER_TYPE if self.is_addition_type_control
+                    RoborockZeoProtocol.SOFTENER_TYPE
+                    if self.is_addition_type_control
                     else RoborockZeoProtocol.SOFTENER_SET,
                 ],
             },
             value_encoder=json.dumps,
         )
         raw = result.get(
-            RoborockZeoProtocol.SOFTENER_TYPE if self.is_addition_type_control
-            else RoborockZeoProtocol.SOFTENER_SET
+            RoborockZeoProtocol.SOFTENER_TYPE if self.is_addition_type_control else RoborockZeoProtocol.SOFTENER_SET
         )
         return parse_bool(raw) if not self.is_addition_type_control else bool(raw and int(raw) > 0)
 
@@ -1223,12 +1227,15 @@ async def load_general_info(self) -> dict[RoborockZeoProtocol, Any]:
     async def upload_log(self) -> dict[RoborockZeoProtocol, Any]:
         """Request the device to upload diagnostic logs (RPC call)."""
         import random as _random
+
         return await send_decoded_command(
             self._channel,
-            {RoborockZeoProtocol.RPC_REQUEST: {
-                "id": _random.randint(0, 999999),
-                "method": "user_upload_log",
-            }},
+            {
+                RoborockZeoProtocol.RPC_REQUEST: {
+                    "id": _random.randint(0, 999999),
+                    "method": "user_upload_log",
+                }
+            },
             value_encoder=lambda x: x,
         )
 
@@ -1355,26 +1362,45 @@ async def set_value(self, protocol: RoborockZeoProtocol, value: Any) -> dict[Rob
 # auto‑enable logic and for force‑load DP selection.  These frozensets
 # mirror the ``isHyperionSeries / isHaliaSeries / isHeraSeries`` and
 # ``isM1Series / isMuseSeries / isMetisSeries`` guards.
-_HYPERION_HALIA_HERA_PRODUCT_IDS: frozenset[str] = frozenset({
-    # Hyperion series
-    "roborock.wm.a141", "roborock.wm.a149", "roborock.wm.a207", "roborock.wm.a230",
-    # Halia series
-    "roborock.wm.a240", "roborock.wm.a241",
-    # Hera series
-    "roborock.wm.a227", "roborock.wm.a261", "roborock.wm.a273",
-    "roborock.wm.a268", "roborock.wm.a269",
-})
-
-_M1_MUSE_METIS_PRODUCT_IDS: frozenset[str] = frozenset({
-    # M1 series
-    "roborock.wm.a92",  "roborock.wm.a93",  "roborock.wm.a133", "roborock.wm.a277",
-    "roborock.wm.a162", "roborock.wm.a233", "roborock.wm.a276", "roborock.wm.a234",
-    "roborock.wm.a218",
-    # Muse series
-    "roborock.wm.a142", "roborock.wm.a215",
-    # Metis series
-    "roborock.wm.a154", "roborock.wm.a214",
-})
+_HYPERION_HALIA_HERA_PRODUCT_IDS: frozenset[str] = frozenset(
+    {
+        # Hyperion series
+        "roborock.wm.a141",
+        "roborock.wm.a149",
+        "roborock.wm.a207",
+        "roborock.wm.a230",
+        # Halia series
+        "roborock.wm.a240",
+        "roborock.wm.a241",
+        # Hera series
+        "roborock.wm.a227",
+        "roborock.wm.a261",
+        "roborock.wm.a273",
+        "roborock.wm.a268",
+        "roborock.wm.a269",
+    }
+)
+
+_M1_MUSE_METIS_PRODUCT_IDS: frozenset[str] = frozenset(
+    {
+        # M1 series
+        "roborock.wm.a92",
+        "roborock.wm.a93",
+        "roborock.wm.a133",
+        "roborock.wm.a277",
+        "roborock.wm.a162",
+        "roborock.wm.a233",
+        "roborock.wm.a276",
+        "roborock.wm.a234",
+        "roborock.wm.a218",
+        # Muse series
+        "roborock.wm.a142",
+        "roborock.wm.a215",
+        # Metis series
+        "roborock.wm.a154",
+        "roborock.wm.a214",
+    }
+)
 
 
 def _is_dryer(product: HomeDataProduct) -> bool:

tests/devices/test_a01_code_review.py

@@ -126,9 +126,7 @@ def test_zeo_feature_bits_match_bundle_positions():
         ZeoFeatureBits.ion_deodorization: 23,
     }
     for member, expected_pos in expected.items():
-        assert int(member) == expected_pos, (
-            f"{member.name} is at bit {int(member)}, expected {expected_pos}"
-        )
+        assert int(member) == expected_pos, f"{member.name} is at bit {int(member)}, expected {expected_pos}"
 
 
 def test_zeo_features_fields_map_to_feature_bits():
@@ -138,9 +136,7 @@ def test_zeo_features_fields_map_to_feature_bits():
     ZeoFeatures.from_feature_bits() to raise AttributeError.
     """
     for f in fields(ZeoFeatures):
-        assert hasattr(ZeoFeatureBits, f.name), (
-            f"ZeoFeatures.{f.name} has no matching ZeoFeatureBits member"
-        )
+        assert hasattr(ZeoFeatureBits, f.name), f"ZeoFeatures.{f.name} has no matching ZeoFeatureBits member"
 
 
 def test_zeo_features_from_feature_bits_decodes_correct_bits():
@@ -226,22 +222,19 @@ async def _side_effect(channel, params, **kwargs):
             }
         return {}
 
-    with patch(
-        "roborock.devices.traits.a01.send_decoded_command", new_callable=AsyncMock, side_effect=_side_effect
-    ), patch(
-        "roborock.devices.traits.a01.device_features.send_decoded_command",
-        new_callable=AsyncMock,
-        side_effect=_side_effect,
+    with (
+        patch("roborock.devices.traits.a01.send_decoded_command", new_callable=AsyncMock, side_effect=_side_effect),
+        patch(
+            "roborock.devices.traits.a01.device_features.send_decoded_command",
+            new_callable=AsyncMock,
+            side_effect=_side_effect,
+        ),
     ):
         api = ZeoApi(mock_channel)
         await api.start()
 
     # The SET (non-query) command is the one that carries START.
-    set_calls = [
-        params
-        for params, _ in captured
-        if _ID_QUERY_INT not in {int(k) for k in params}
-    ]
+    set_calls = [params for params, _ in captured if _ID_QUERY_INT not in {int(k) for k in params}]
     assert set_calls, "start() should issue a SET command"
     start_params = set_calls[-1]
     assert start_params[RoborockZeoProtocol.START] == "True"
@@ -275,24 +268,27 @@ async def _side_effect(channel, params, **kwargs):
 
     # Pre-populate cache with START params so _get_start_params() doesn't
     # issue an extra query that would distort the count.
-    with patch(
-        "roborock.devices.traits.a01.send_decoded_command", new_callable=AsyncMock, side_effect=_side_effect
-    ), patch(
-        "roborock.devices.traits.a01.device_features.send_decoded_command",
-        new_callable=AsyncMock,
-        side_effect=_side_effect,
+    with (
+        patch("roborock.devices.traits.a01.send_decoded_command", new_callable=AsyncMock, side_effect=_side_effect),
+        patch(
+            "roborock.devices.traits.a01.device_features.send_decoded_command",
+            new_callable=AsyncMock,
+            side_effect=_side_effect,
+        ),
     ):
         api = ZeoApi(mock_channel)
         # Seed the DPS cache with required START params so only FEATURE_BITS
         # and feature-gated queries are counted.
-        api._dps_cache.update({
-            int(RoborockZeoProtocol.MODE): 1,
-            int(RoborockZeoProtocol.PROGRAM): 1,
-            int(RoborockZeoProtocol.TEMP): 30,
-            int(RoborockZeoProtocol.RINSE_TIMES): 2,
-            int(RoborockZeoProtocol.SPIN_LEVEL): 800,
-            int(RoborockZeoProtocol.DRYING_MODE): 1,
-        })
+        api._dps_cache.update(
+            {
+                int(RoborockZeoProtocol.MODE): 1,
+                int(RoborockZeoProtocol.PROGRAM): 1,
+                int(RoborockZeoProtocol.TEMP): 30,
+                int(RoborockZeoProtocol.RINSE_TIMES): 2,
+                int(RoborockZeoProtocol.SPIN_LEVEL): 800,
+                int(RoborockZeoProtocol.DRYING_MODE): 1,
+            }
+        )
         await api.start()
 
     # FEATURE_BITS query (1) + batch gated-DP query (1) + SET (1) = 3 total calls.