python-roborock 3.10.9__tar.gz → 3.11.0__tar.gz

{python_roborock-3.10.9 → python_roborock-3.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-roborock
-Version: 3.10.9
+Version: 3.11.0
 Summary: A package to control Roborock vacuums.
 Project-URL: Repository, https://github.com/humbertogontijo/python-roborock
 Project-URL: Documentation, https://python-roborock.readthedocs.io/

{python_roborock-3.10.9 → python_roborock-3.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "3.10.9"
+version = "3.11.0"
 description = "A package to control Roborock vacuums."
 authors = [{ name = "humbertogontijo", email = "humbertogontijo@users.noreply.github.com" }, {name="Lash-L"}, {name="allenporter"}]
 requires-python = ">=3.11, <4"

{python_roborock-3.10.9 → python_roborock-3.11.0}/roborock/data/v1/v1_code_mappings.py

@@ -123,6 +123,13 @@ class DustBagStatus(RoborockDssCodes):
     full = 34
 
 
+class CleanFluidStatus(RoborockDssCodes):
+    """Status of the cleaning fluid container."""
+
+    empty_not_installed = 1
+    okay = 2
+
+
 class RoborockErrorCode(RoborockEnum):
     none = 0
     lidar_blocked = 1

{python_roborock-3.10.9 → python_roborock-3.11.0}/roborock/data/v1/v1_containers.py

@@ -39,6 +39,7 @@ from roborock.exceptions import RoborockException
 
 from ..containers import RoborockBase, RoborockBaseTimer, _attr_repr
 from .v1_code_mappings import (
+    CleanFluidStatus,
     ClearWaterBoxStatus,
     DirtyWaterBoxStatus,
     DustBagStatus,
@@ -229,9 +230,12 @@ class Status(RoborockBase):
         return None
 
     @property
-    def clean_fluid_status(self) -> int | None:
+    def clean_fluid_status(self) -> CleanFluidStatus | None:
         if self.dss:
-            return (self.dss >> 10) & 3
+            value = (self.dss >> 10) & 3
+            if value == 0:
+                return None  # Feature not supported by this device
+            return CleanFluidStatus(value)
         return None
 
     @property

{python_roborock-3.10.9 → python_roborock-3.11.0}/roborock/devices/a01_channel.py

@@ -2,6 +2,7 @@
 
 import asyncio
 import logging
+from collections.abc import Callable
 from typing import Any, overload
 
 from roborock.exceptions import RoborockException
@@ -29,6 +30,7 @@ _ID_QUERY = int(RoborockDyadDataProtocol.ID_QUERY)
 async def send_decoded_command(
     mqtt_channel: MqttChannel,
     params: dict[RoborockDyadDataProtocol, Any],
+    value_encoder: Callable[[Any], Any] | None = None,
 ) -> dict[RoborockDyadDataProtocol, Any]: ...
 
 
@@ -36,16 +38,18 @@ async def send_decoded_command(
 async def send_decoded_command(
     mqtt_channel: MqttChannel,
     params: dict[RoborockZeoProtocol, Any],
+    value_encoder: Callable[[Any], Any] | None = None,
 ) -> dict[RoborockZeoProtocol, Any]: ...
 
 
 async def send_decoded_command(
     mqtt_channel: MqttChannel,
     params: dict[RoborockDyadDataProtocol, Any] | dict[RoborockZeoProtocol, Any],
+    value_encoder: Callable[[Any], Any] | None = None,
 ) -> dict[RoborockDyadDataProtocol, Any] | dict[RoborockZeoProtocol, Any]:
     """Send a command on the MQTT channel and get a decoded response."""
     _LOGGER.debug("Sending MQTT command: %s", params)
-    roborock_message = encode_mqtt_payload(params)
+    roborock_message = encode_mqtt_payload(params, value_encoder)
 
     # For commands that set values: send the command and do not
     # block waiting for a response. Queries are handled below.

{python_roborock-3.10.9 → python_roborock-3.11.0}/roborock/devices/traits/a01/__init__.py

@@ -1,3 +1,4 @@
+import json
 from collections.abc import Callable
 from datetime import time
 from typing import Any
@@ -121,8 +122,11 @@ class DyadApi(Trait):
 
     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: str([int(p) for p in protocols])}
-        response = await send_decoded_command(self._channel, params)
+        response = await send_decoded_command(
+            self._channel,
+            {RoborockDyadDataProtocol.ID_QUERY: protocols},
+            value_encoder=json.dumps,
+        )
         return {protocol: convert_dyad_value(protocol, response.get(protocol)) for protocol in protocols}
 
     async def set_value(self, protocol: RoborockDyadDataProtocol, value: Any) -> dict[RoborockDyadDataProtocol, Any]:
@@ -142,14 +146,17 @@ class ZeoApi(Trait):
 
     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: str([int(p) for p in protocols])}
-        response = await send_decoded_command(self._channel, params)
+        response = await send_decoded_command(
+            self._channel,
+            {RoborockZeoProtocol.ID_QUERY: protocols},
+            value_encoder=json.dumps,
+        )
         return {protocol: convert_zeo_value(protocol, response.get(protocol)) for protocol in protocols}
 
     async def set_value(self, protocol: RoborockZeoProtocol, value: Any) -> dict[RoborockZeoProtocol, Any]:
         """Set a value for a specific protocol on the device."""
         params = {protocol: value}
-        return await send_decoded_command(self._channel, params)
+        return await send_decoded_command(self._channel, params, value_encoder=lambda x: x)
 
 
 def create(product: HomeDataProduct, mqtt_channel: MqttChannel) -> DyadApi | ZeoApi:

{python_roborock-3.10.9 → python_roborock-3.11.0}/roborock/protocols/a01_protocol.py

@@ -2,6 +2,7 @@
 
 import json
 import logging
+from collections.abc import Callable
 from typing import Any
 
 from Crypto.Cipher import AES
@@ -20,13 +21,28 @@ _LOGGER = logging.getLogger(__name__)
 A01_VERSION = b"A01"
 
 
+def _no_encode(value: Any) -> Any:
+    return value
+
+
 def encode_mqtt_payload(
     data: dict[RoborockDyadDataProtocol, Any]
     | dict[RoborockZeoProtocol, Any]
     | dict[RoborockDyadDataProtocol | RoborockZeoProtocol, Any],
+    value_encoder: Callable[[Any], Any] | None = None,
 ) -> RoborockMessage:
-    """Encode payload for A01 commands over MQTT."""
-    dps_data = {"dps": data}
+    """Encode payload for A01 commands over MQTT.
+
+    Args:
+        data: The data to encode.
+        value_encoder: A function to encode the values of the dictionary.
+
+    Returns:
+        RoborockMessage: The encoded message.
+    """
+    if value_encoder is None:
+        value_encoder = _no_encode
+    dps_data = {"dps": {key: value_encoder(value) for key, value in data.items()}}
     payload = pad(json.dumps(dps_data).encode("utf-8"), AES.block_size)
     return RoborockMessage(
         protocol=RoborockMessageProtocol.RPC_REQUEST,