fix: Update where the string conversion happens

Author: allenporter

roborock/devices/traits/a01/__init__.py

@@ -21,7 +21,7 @@ def __init__(self, channel: MqttChannel) -> None:
 
     async def query_values(self, protocols: list[RoborockDyadDataProtocol]) -> dict[RoborockDyadDataProtocol, Any]:
         """Query the device for the values of the given Dyad protocols."""
-        params = {RoborockDyadDataProtocol.ID_QUERY: [int(p) for p in protocols]}
+        params = {RoborockDyadDataProtocol.ID_QUERY: str([int(p) for p in protocols])}
         return await send_decoded_command(self._channel, params)
 
     async def set_value(self, protocol: RoborockDyadDataProtocol, value: Any) -> dict[RoborockDyadDataProtocol, Any]:
@@ -41,7 +41,7 @@ def __init__(self, channel: MqttChannel) -> None:
 
     async def query_values(self, protocols: list[RoborockZeoProtocol]) -> dict[RoborockZeoProtocol, Any]:
         """Query the device for the values of the given protocols."""
-        params = {RoborockZeoProtocol.ID_QUERY: [int(p) for p in protocols]}
+        params = {RoborockZeoProtocol.ID_QUERY: str([int(p) for p in protocols])}
         return await send_decoded_command(self._channel, params)
 
     async def set_value(self, protocol: RoborockZeoProtocol, value: Any) -> dict[RoborockZeoProtocol, Any]:

roborock/protocols/a01_protocol.py

@@ -26,10 +26,7 @@ def encode_mqtt_payload(
     | dict[RoborockDyadDataProtocol | RoborockZeoProtocol, Any],
 ) -> RoborockMessage:
     """Encode payload for A01 commands over MQTT."""
-    # The A01 protocol generally expects values to be encoded as strings.
-    # We use json.dumps for non-string types to ensure valid JSON formatting
-    # (e.g. [1, 2] -> "[1, 2]", True -> "true", 123 -> "123").
-    dps_data = {"dps": {key: json.dumps(value) for key, value in data.items()}}
+    dps_data = {"dps": data}
     payload = pad(json.dumps(dps_data).encode("utf-8"), AES.block_size)
     return RoborockMessage(
         protocol=RoborockMessageProtocol.RPC_REQUEST,

tests/devices/test_a01_channel.py

@@ -45,6 +45,9 @@ async def test_id_query(mock_mqtt_channel: FakeChannel):
     result = await send_decoded_command(mock_mqtt_channel, params)  # type: ignore[call-overload]
 
     # Assertions
-    assert result == {RoborockDyadDataProtocol.WARM_LEVEL: 101, RoborockDyadDataProtocol.POWER: 75}
+    assert result == {
+        RoborockDyadDataProtocol.WARM_LEVEL: 101,
+        RoborockDyadDataProtocol.POWER: 75,
+    }
     mock_mqtt_channel.publish.assert_awaited_once()
     mock_mqtt_channel.subscribe.assert_awaited_once()

tests/protocols/test_a01_protocol.py

@@ -35,9 +35,8 @@ def test_encode_mqtt_payload_basic():
     assert len(result.payload) % 16 == 0  # Should be padded to AES block size
 
     # Decode the payload to verify structure
-    # With general stringification, numbers are converted to strings: 42 -> "42"
     decoded_data = decode_rpc_response(result)
-    assert decoded_data == {200: '{"test": "data", "number": 42}'}
+    assert decoded_data == {200: {"test": "data", "number": 42}}
 
 
 def test_encode_mqtt_payload_empty_data():
@@ -55,21 +54,6 @@ def test_encode_mqtt_payload_empty_data():
     assert decoded_data == {}
 
 
-def test_encode_mqtt_payload_list_conversion():
-    """Test that lists are converted to string representation (Fix validity)."""
-    # This verifies the fix where lists must be encoded as strings
-    data: dict[RoborockDyadDataProtocol | RoborockZeoProtocol, Any] = {RoborockDyadDataProtocol.ID_QUERY: [101, 102]}
-
-    result = encode_mqtt_payload(data)
-
-    # Decode manually to check the raw JSON structure
-    decoded_json = json.loads(unpad(result.payload, AES.block_size).decode())
-
-    # ID_QUERY (10000) should be a string "[101, 102]", not a list [101, 102]
-    assert decoded_json["dps"]["10000"] == "[101, 102]"
-    assert isinstance(decoded_json["dps"]["10000"], str)
-
-
 def test_encode_mqtt_payload_complex_data():
     """Test encoding with complex nested data."""
     data: dict[RoborockDyadDataProtocol | RoborockZeoProtocol, Any] = {
@@ -92,17 +76,13 @@ def test_encode_mqtt_payload_complex_data():
     # Decode the payload to verify structure
     decoded_data = decode_rpc_response(result)
     assert decoded_data == {
-        201: json.dumps(
-            {
-                "nested": {"deep": {"value": 123}},
-                # Note: The list inside the dictionary is NOT converted because
-                # our fix only targets top-level list values in the dps map
-                "list": [1, 2, 3, "test"],
-                "boolean": True,
-                "null": None,
-            }
-        ),
-        204: '"simple_value"',
+        201: {
+            "nested": {"deep": {"value": 123}},
+            "list": [1, 2, 3, "test"],
+            "boolean": True,
+            "null": None,
+        },
+        204: "simple_value",
     }