python-roborock 2.8.5__tar.gz → 2.9.0rc1__tar.gz

{python_roborock-2.8.5 → python_roborock-2.9.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: python-roborock
-Version: 2.8.5
+Version: 2.9.0rc1
 Summary: A package to control Roborock vacuums.
 Home-page: https://github.com/humbertogontijo/python-roborock
 License: GPL-3.0-only

{python_roborock-2.8.5 → python_roborock-2.9.0rc1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-roborock"
-version = "2.8.5"
+version = "2.9.0-rc.1"
 description = "A package to control Roborock vacuums."
 authors = ["humbertogontijo <humbertogontijo@users.noreply.github.com>"]
 license = "GPL-3.0-only"
@@ -47,9 +47,18 @@ codespell = "*"
 pyshark = "^0.6"
 
 [tool.semantic_release]
-branch = "main"
 version_toml = ["pyproject.toml:tool.poetry.version"]
 build_command = "pip install poetry && poetry build"
+
+[semantic_release.branches.main]
+match = "release"
+prerelease = false
+
+[tool.semantic_release.branches.other]
+match = ".*"
+prerelease_token = "rc"
+prerelease = true
+
 [tool.semantic_release.commit_parser_options]
 allowed_tags = [
     "chore",

{python_roborock-2.8.5 → python_roborock-2.9.0rc1}/roborock/api.py

@@ -7,7 +7,7 @@ import base64
 import logging
 import secrets
 import time
-from collections.abc import Coroutine
+from collections.abc import Callable, Coroutine
 from typing import Any
 
 from .containers import (
@@ -36,8 +36,8 @@ class RoborockClient:
         self._endpoint = endpoint
         self._nonce = secrets.token_bytes(16)
         self._waiting_queue: dict[int, RoborockFuture] = {}
-        self._last_device_msg_in = time.monotonic()
-        self._last_disconnection = time.monotonic()
+        self._last_device_msg_in = self.time_func()
+        self._last_disconnection = self.time_func()
         self.keep_alive = KEEPALIVE
         self._diagnostic_data: dict[str, dict[str, Any]] = {
             "misc_info": {"Nonce": base64.b64encode(self._nonce).decode("utf-8")}
@@ -59,6 +59,15 @@ class RoborockClient:
     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
 
@@ -72,13 +81,13 @@ class RoborockClient:
         raise NotImplementedError
 
     def on_connection_lost(self, exc: Exception | None) -> None:
-        self._last_disconnection = time.monotonic()
+        self._last_disconnection = self.time_func()
         self._logger.info("Roborock client disconnected")
         if exc is not None:
             self._logger.warning(exc)
 
     def should_keepalive(self) -> bool:
-        now = time.monotonic()
+        now = self.time_func()
         # noinspection PyUnresolvedReferences
         if now - self._last_disconnection > self.keep_alive**2 and now - self._last_device_msg_in > self.keep_alive:
             return False
@@ -107,11 +116,8 @@ class RoborockClient:
         if request_id in self._waiting_queue:
             new_id = get_next_int(10000, 32767)
             _LOGGER.warning(
-                "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,
+                f"Attempting to create a future with an existing request_id... New id is {new_id}. "
+                f"Code may not function properly."
             )
             request_id = new_id
         self._waiting_queue[request_id] = queue

{python_roborock-2.8.5 → python_roborock-2.9.0rc1}/roborock/code_mappings.py

@@ -244,14 +244,12 @@ class RoborockFanSpeedQ7Max(RoborockFanPowerCode):
 
 
 class RoborockFanSpeedQRevoMaster(RoborockFanPowerCode):
-    off = 105
     quiet = 101
     balanced = 102
     turbo = 103
     max = 104
-    custom = 106
-    max_plus = 108
-    smart_mode = 110
+    max_plus = 105
+    custom = 110  # Smartplan
 
 
 class RoborockFanSpeedP10(RoborockFanPowerCode):
@@ -306,15 +304,6 @@ 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."""
 
@@ -346,9 +335,8 @@ class RoborockMopIntensityQRevoMaster(RoborockMopIntensityCode):
     low = 201
     medium = 202
     high = 203
-    custom = 204
     custom_water_flow = 207
-    smart_mode = 209
+    custom = 209  # SmartPlan
 
 
 class RoborockMopIntensityP10(RoborockMopIntensityCode):
@@ -429,7 +417,6 @@ class RoborockDockTypeCode(RoborockEnum):
     p10_dock = 8
     p10_pro_dock = 9
     s8_maxv_ultra_dock = 10
-    qrevo_master_dock = 14
     qrevo_s_dock = 15
 
 

{python_roborock-2.8.5 → python_roborock-2.9.0rc1}/roborock/containers.py

@@ -36,7 +36,6 @@ from .code_mappings import (
     RoborockMopIntensityS7,
     RoborockMopIntensityS8MaxVUltra,
     RoborockMopModeCode,
-    RoborockMopModeQRevoMaster,
     RoborockMopModeS7,
     RoborockMopModeS8MaxVUltra,
     RoborockMopModeS8ProUltra,
@@ -142,12 +141,12 @@ class RoborockBase:
                 cls_annotations.update(getattr(base, "__annotations__", {}))
             remove_keys = []
             for key, value in data.items():
-                if key not in cls_annotations:
-                    remove_keys.append(key)
-                    continue
                 if value == "None" or value is None:
                     data[key] = None
                     continue
+                if key not in cls_annotations:
+                    remove_keys.append(key)
+                    continue
                 field_type: str = cls_annotations[key]
                 if "|" in field_type:
                     # It's a union
@@ -578,7 +577,6 @@ class Q7MaxStatus(Status):
 class QRevoMasterStatus(Status):
     fan_power: RoborockFanSpeedQRevoMaster | None = None
     water_box_mode: RoborockMopIntensityQRevoMaster | None = None
-    mop_mode: RoborockMopModeQRevoMaster | None = None
 
 
 @dataclass

{python_roborock-2.8.5 → python_roborock-2.9.0rc1}/roborock/version_1_apis/roborock_client_v1.py

@@ -361,7 +361,7 @@ class RoborockClientV1(RoborockClient):
 
     def on_message_received(self, messages: list[RoborockMessage]) -> None:
         try:
-            self._last_device_msg_in = time.monotonic()
+            self._last_device_msg_in = self.time_func()
             for data in messages:
                 protocol = data.protocol
                 if data.payload and protocol in [
@@ -391,8 +391,6 @@ class RoborockClientV1(RoborockClient):
                                     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))
@@ -445,14 +443,10 @@ class RoborockClientV1(RoborockClient):
                             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)
 

{python_roborock-2.8.5 → python_roborock-2.9.0rc1}/roborock/version_1_apis/roborock_local_client_v1.py

@@ -18,7 +18,6 @@ class RoborockLocalClientV1(RoborockLocalClient, RoborockClientV1):
     ) -> 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):

{python_roborock-2.8.5 → python_roborock-2.9.0rc1}/roborock/version_1_apis/roborock_mqtt_client_v1.py

@@ -74,7 +74,6 @@ class RoborockMqttClientV1(RoborockMqttClient, RoborockClientV1):
             # 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)