Merge branch 'main' into add-qrevo-curv

Author: Lash-L

.github/workflows/ci.yml

@@ -68,7 +68,7 @@ jobs:
       actions: write
       packages: write
     environment:
-      name: pypi
+      name: release
 
     steps:
     - uses: actions/checkout@v4
@@ -79,7 +79,7 @@ jobs:
       id: release
       uses: python-semantic-release/python-semantic-release@v9.14.0
       with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+        github_token: ${{ secrets.GH_TOKEN }}
 
     - name: Publish package distributions to PyPI
       uses: pypa/gh-action-pypi-publish@v1.12.2
@@ -92,4 +92,4 @@ jobs:
       uses: python-semantic-release/upload-to-gh-release@v8.7.0
       if: steps.release.outputs.released == 'true'
       with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+        github_token: ${{ secrets.GH_TOKEN }}

CHANGELOG.md

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-roborock"
-version = "2.8.0"
+version = "2.8.5"
 description = "A package to control Roborock vacuums."
 authors = ["humbertogontijo <humbertogontijo@users.noreply.github.com>"]
 license = "GPL-3.0-only"

pyproject.toml

@@ -7,7 +7,7 @@
 import logging
 import secrets
 import time
-from collections.abc import Callable, Coroutine
+from collections.abc import Coroutine
 from typing import Any
 
 from .containers import (
@@ -36,8 +36,8 @@ def __init__(self, endpoint: str, device_info: DeviceData, queue_timeout: int =
         self._endpoint = endpoint
         self._nonce = secrets.token_bytes(16)
         self._waiting_queue: dict[int, RoborockFuture] = {}
-        self._last_device_msg_in = self.time_func()
-        self._last_disconnection = self.time_func()
+        self._last_device_msg_in = time.monotonic()
+        self._last_disconnection = time.monotonic()
         self.keep_alive = KEEPALIVE
         self._diagnostic_data: dict[str, dict[str, Any]] = {
             "misc_info": {"Nonce": base64.b64encode(self._nonce).decode("utf-8")}
@@ -59,15 +59,6 @@ async def async_release(self) -> None:
     def diagnostic_data(self) -> dict:
         return self._diagnostic_data
 
-    @property
-    def time_func(self) -> Callable[[], float]:
-        try:
-            # Use monotonic clock if available
-            time_func = time.monotonic
-        except AttributeError:
-            time_func = time.time
-        return time_func
-
     async def async_connect(self):
         raise NotImplementedError
 
@@ -81,13 +72,13 @@ def on_message_received(self, messages: list[RoborockMessage]) -> None:
         raise NotImplementedError
 
     def on_connection_lost(self, exc: Exception | None) -> None:
-        self._last_disconnection = self.time_func()
+        self._last_disconnection = time.monotonic()
         self._logger.info("Roborock client disconnected")
         if exc is not None:
             self._logger.warning(exc)
 
     def should_keepalive(self) -> bool:
-        now = self.time_func()
+        now = time.monotonic()
         # noinspection PyUnresolvedReferences
         if now - self._last_disconnection > self.keep_alive**2 and now - self._last_device_msg_in > self.keep_alive:
             return False
@@ -116,8 +107,11 @@ def _async_response(
         if request_id in self._waiting_queue:
             new_id = get_next_int(10000, 32767)
             _LOGGER.warning(
-                f"Attempting to create a future with an existing request_id... New id is {new_id}. "
-                f"Code may not function properly."
+                "Attempting to create a future with an existing id %s (%s)... New id is %s. "
+                "Code may not function properly.",
+                request_id,
+                protocol_id,
+                new_id,
             )
             request_id = new_id
         self._waiting_queue[request_id] = queue

roborock/api.py

@@ -244,12 +244,14 @@ class RoborockFanSpeedQ7Max(RoborockFanPowerCode):
 
 
 class RoborockFanSpeedQRevoMaster(RoborockFanPowerCode):
+    off = 105
     quiet = 101
     balanced = 102
     turbo = 103
     max = 104
-    max_plus = 105
-    custom = 110  # Smartplan
+    custom = 106
+    max_plus = 108
+    smart_mode = 110
 
 
 class RoborockFanSpeedQRevoCurv(RoborockFanPowerCode):
@@ -321,6 +323,15 @@ class RoborockMopModeS8MaxVUltra(RoborockMopModeCode):
     smart_mode = 306
 
 
+class RoborockMopModeQRevoMaster(RoborockMopModeCode):
+    standard = 300
+    deep = 301
+    custom = 302
+    deep_plus = 303
+    fast = 304
+    smart_mode = 306
+
+
 class RoborockMopIntensityCode(RoborockEnum):
     """Describes the mop intensity of the vacuum cleaner."""
 
@@ -352,8 +363,9 @@ class RoborockMopIntensityQRevoMaster(RoborockMopIntensityCode):
     low = 201
     medium = 202
     high = 203
+    custom = 204
     custom_water_flow = 207
-    custom = 209  # SmartPlan
+    smart_mode = 209
 
 
 class RoborockMopIntensityQRevoCurv(RoborockMopIntensityCode):
@@ -443,6 +455,7 @@ class RoborockDockTypeCode(RoborockEnum):
     p10_dock = 8
     p10_pro_dock = 9
     s8_maxv_ultra_dock = 10
+    qrevo_master_dock = 14
     qrevo_s_dock = 15
     qrevo_curv_dock = 17
 

roborock/code_mappings.py

@@ -39,6 +39,7 @@
     RoborockMopIntensityS8MaxVUltra,
     RoborockMopModeCode,
     RoborockMopModeQRevoCurv,
+    RoborockMopModeQRevoMaster,
     RoborockMopModeS7,
     RoborockMopModeS8MaxVUltra,
     RoborockMopModeS8ProUltra,
@@ -145,12 +146,12 @@ def from_dict(cls, data: dict[str, Any]):
                 cls_annotations.update(getattr(base, "__annotations__", {}))
             remove_keys = []
             for key, value in data.items():
-                if value == "None" or value is None:
-                    data[key] = None
-                    continue
                 if key not in cls_annotations:
                     remove_keys.append(key)
                     continue
+                if value == "None" or value is None:
+                    data[key] = None
+                    continue
                 field_type: str = cls_annotations[key]
                 if "|" in field_type:
                     # It's a union
@@ -581,6 +582,7 @@ class Q7MaxStatus(Status):
 class QRevoMasterStatus(Status):
     fan_power: RoborockFanSpeedQRevoMaster | None = None
     water_box_mode: RoborockMopIntensityQRevoMaster | None = None
+    mop_mode: RoborockMopModeQRevoMaster | None = None
 
 
 @dataclass

roborock/containers.py

@@ -362,7 +362,7 @@ def _get_payload(
 
     def on_message_received(self, messages: list[RoborockMessage]) -> None:
         try:
-            self._last_device_msg_in = self.time_func()
+            self._last_device_msg_in = time.monotonic()
             for data in messages:
                 protocol = data.protocol
                 if data.payload and protocol in [
@@ -392,6 +392,8 @@ def on_message_received(self, messages: list[RoborockMessage]) -> None:
                                     if isinstance(result, list) and len(result) == 1:
                                         result = result[0]
                                     queue.resolve((result, None))
+                            else:
+                                self._logger.debug("Received response for unknown request id %s", request_id)
                         else:
                             try:
                                 data_protocol = RoborockDataProtocol(int(data_point_number))
@@ -444,10 +446,14 @@ def on_message_received(self, messages: list[RoborockMessage]) -> None:
                             if isinstance(decompressed, list):
                                 decompressed = decompressed[0]
                             queue.resolve((decompressed, None))
+                        else:
+                            self._logger.debug("Received response for unknown request id %s", request_id)
                 else:
                     queue = self._waiting_queue.get(data.seq)
                     if queue:
                         queue.resolve((data.payload, None))
+                    else:
+                        self._logger.debug("Received response for unknown request id %s", data.seq)
         except Exception as ex:
             self._logger.exception(ex)
 

roborock/version_1_apis/roborock_client_v1.py

@@ -18,6 +18,7 @@ def build_roborock_message(
     ) -> RoborockMessage:
         secured = True if method in COMMANDS_SECURED else False
         request_id, timestamp, payload = self._get_payload(method, params, secured)
+        self._logger.debug("Building message id %s for method %s", request_id, method)
         request_protocol = RoborockMessageProtocol.GENERAL_REQUEST
         message_retry: MessageRetry | None = None
         if method == RoborockCommand.RETRY_REQUEST and isinstance(params, dict):

roborock/version_1_apis/roborock_local_client_v1.py

@@ -74,6 +74,7 @@ async def _send_command(
             # When we have more custom commands do something more complicated here
             return await self._get_calibration_points()
         request_id, timestamp, payload = self._get_payload(method, params, True)
+        self._logger.debug("Building message id %s for method %s", request_id, method)
         request_protocol = RoborockMessageProtocol.RPC_REQUEST
         roborock_message = RoborockMessage(timestamp=timestamp, protocol=request_protocol, payload=payload)
         return await self.send_message(roborock_message)