python-roborock 2.7.1__tar.gz → 2.8.1__tar.gz

{python_roborock-2.7.1 → python_roborock-2.8.1}/PKG-INFO

@@ -1,20 +1,19 @@
 Metadata-Version: 2.1
 Name: python-roborock
-Version: 2.7.1
+Version: 2.8.1
 Summary: A package to control Roborock vacuums.
 Home-page: https://github.com/humbertogontijo/python-roborock
 License: GPL-3.0-only
 Keywords: roborock,vacuum,homeassistant
 Author: humbertogontijo
 Author-email: humbertogontijo@users.noreply.github.com
-Requires-Python: >=3.10,<4.0
+Requires-Python: >=3.11,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
@@ -27,6 +26,7 @@ Requires-Dist: dacite (>=1.8.0,<2.0.0)
 Requires-Dist: paho-mqtt (>=1.6.1,<2.0.0)
 Requires-Dist: pycryptodome (>=3.18,<4.0)
 Requires-Dist: pycryptodomex (>=3.18,<4.0) ; sys_platform == "darwin"
+Requires-Dist: vacuum-map-parser-roborock
 Project-URL: Documentation, https://python-roborock.readthedocs.io/
 Project-URL: Repository, https://github.com/humbertogontijo/python-roborock
 Description-Content-Type: text/markdown

{python_roborock-2.7.1 → python_roborock-2.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "python-roborock"
-version = "2.7.1"
+version = "2.8.1"
 description = "A package to control Roborock vacuums."
 authors = ["humbertogontijo <humbertogontijo@users.noreply.github.com>"]
 license = "GPL-3.0-only"
@@ -21,7 +21,7 @@ keywords = ["roborock", "vacuum", "homeassistant"]
 roborock = "roborock.cli:main"
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.11"
 click = ">=8"
 aiohttp = "^3.8.2"
 async-timeout = "*"
@@ -30,6 +30,7 @@ pycryptodomex = {version = "^3.18", markers = "sys_platform == 'darwin'"}
 paho-mqtt = "^1.6.1"
 dacite = "^1.8.0"
 construct = "^2.10.57"
+vacuum-map-parser-roborock = "*"
 
 
 [build-system]
@@ -47,7 +48,7 @@ pyshark = "^0.6"
 
 [tool.semantic_release]
 branch = "main"
-version_toml = "pyproject.toml:tool.poetry.version"
+version_toml = ["pyproject.toml:tool.poetry.version"]
 build_command = "pip install poetry && poetry build"
 [tool.semantic_release.commit_parser_options]
 allowed_tags = [

{python_roborock-2.7.1 → python_roborock-2.8.1}/roborock/code_mappings.py

@@ -243,6 +243,15 @@ class RoborockFanSpeedQ7Max(RoborockFanPowerCode):
     max = 104
 
 
+class RoborockFanSpeedQRevoMaster(RoborockFanPowerCode):
+    quiet = 101
+    balanced = 102
+    turbo = 103
+    max = 104
+    max_plus = 105
+    custom = 110  # Smartplan
+
+
 class RoborockFanSpeedP10(RoborockFanPowerCode):
     off = 105
     quiet = 101
@@ -288,6 +297,7 @@ class RoborockMopModeS8ProUltra(RoborockMopModeCode):
 class RoborockMopModeS8MaxVUltra(RoborockMopModeCode):
     standard = 300
     deep = 301
+    custom = 302
     deep_plus = 303
     fast = 304
     deep_plus_pearl = 305
@@ -318,6 +328,17 @@ class RoborockMopIntensityV2(RoborockMopIntensityCode):
     custom = 207
 
 
+class RoborockMopIntensityQRevoMaster(RoborockMopIntensityCode):
+    """Describes the mop intensity of the vacuum cleaner."""
+
+    off = 200
+    low = 201
+    medium = 202
+    high = 203
+    custom_water_flow = 207
+    custom = 209  # SmartPlan
+
+
 class RoborockMopIntensityP10(RoborockMopIntensityCode):
     """Describes the mop intensity of the vacuum cleaner."""
 
@@ -362,6 +383,16 @@ class RoborockMopIntensityS6MaxV(RoborockMopIntensityCode):
     custom_water_flow = 207
 
 
+class RoborockMopIntensityQ7Max(RoborockMopIntensityCode):
+    """Describes the mop intensity of the vacuum cleaner."""
+
+    off = 200
+    low = 201
+    medium = 202
+    high = 203
+    custom_water_flow = 207
+
+
 class RoborockDockErrorCode(RoborockEnum):
     """Describes the error code of the dock."""
 

{python_roborock-2.7.1 → python_roborock-2.8.1}/roborock/const.py

@@ -30,6 +30,7 @@ ROBOROCK_Q5_PRO = "roborock.vacuum.a72"
 ROBOROCK_Q7 = "roborock.vacuum.a40"
 ROBOROCK_Q7_MAX = "roborock.vacuum.a38"
 ROBOROCK_Q7PLUS = "roborock.vacuum.a40"
+ROBOROCK_QREVO_MASTER = "roborock.vacuum.a117"
 ROBOROCK_Q8_MAX = "roborock.vacuum.a73"
 ROBOROCK_G10S_PRO = "roborock.vacuum.a26"
 ROBOROCK_G10S = "roborock.vacuum.a46"

{python_roborock-2.7.1 → python_roborock-2.8.1}/roborock/containers.py

@@ -20,6 +20,7 @@ from .code_mappings import (
     RoborockFanPowerCode,
     RoborockFanSpeedP10,
     RoborockFanSpeedQ7Max,
+    RoborockFanSpeedQRevoMaster,
     RoborockFanSpeedS6Pure,
     RoborockFanSpeedS7,
     RoborockFanSpeedS7MaxV,
@@ -28,11 +29,12 @@ from .code_mappings import (
     RoborockInCleaning,
     RoborockMopIntensityCode,
     RoborockMopIntensityP10,
+    RoborockMopIntensityQ7Max,
+    RoborockMopIntensityQRevoMaster,
     RoborockMopIntensityS5Max,
     RoborockMopIntensityS6MaxV,
     RoborockMopIntensityS7,
     RoborockMopIntensityS8MaxVUltra,
-    RoborockMopIntensityV2,
     RoborockMopModeCode,
     RoborockMopModeS7,
     RoborockMopModeS8MaxVUltra,
@@ -49,6 +51,7 @@ from .const import (
     ROBOROCK_G10S_PRO,
     ROBOROCK_P10,
     ROBOROCK_Q7_MAX,
+    ROBOROCK_QREVO_MASTER,
     ROBOROCK_QREVO_MAXV,
     ROBOROCK_QREVO_PRO,
     ROBOROCK_QREVO_S,
@@ -138,12 +141,12 @@ class RoborockBase:
                 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
@@ -567,7 +570,13 @@ class S5MaxStatus(Status):
 @dataclass
 class Q7MaxStatus(Status):
     fan_power: RoborockFanSpeedQ7Max | None = None
-    water_box_mode: RoborockMopIntensityV2 | None = None
+    water_box_mode: RoborockMopIntensityQ7Max | None = None
+
+
+@dataclass
+class QRevoMasterStatus(Status):
+    fan_power: RoborockFanSpeedQRevoMaster | None = None
+    water_box_mode: RoborockMopIntensityQRevoMaster | None = None
 
 
 @dataclass
@@ -627,6 +636,7 @@ ModelStatus: dict[str, type[Status]] = {
     ROBOROCK_S4_MAX: S4MaxStatus,
     ROBOROCK_S5_MAX: S5MaxStatus,
     ROBOROCK_Q7_MAX: Q7MaxStatus,
+    ROBOROCK_QREVO_MASTER: QRevoMasterStatus,
     ROBOROCK_S6: S6PureStatus,
     ROBOROCK_S6_MAXV: S6MaxVStatus,
     ROBOROCK_S6_PURE: S6PureStatus,

{python_roborock-2.7.1 → python_roborock-2.8.1}/roborock/roborock_typing.py

@@ -116,6 +116,7 @@ class RoborockCommand(str, Enum):
     GET_MAP_STATUS = "get_map_status"
     GET_MAP_V1 = "get_map_v1"
     GET_MAP_V2 = "get_map_v2"
+    GET_MAP_CALIBRATION = "get_map_calibration"  # Custom command
     GET_MOP_MOTOR_STATUS = "get_mop_motor_status"
     GET_MOP_TEMPLATE_PARAMS_BY_ID = "get_mop_template_params_by_id"
     GET_MOP_TEMPLATE_PARAMS_SUMMARY = "get_mop_template_params_summary"

{python_roborock-2.7.1 → python_roborock-2.8.1}/roborock/version_1_apis/roborock_client_v1.py

@@ -55,10 +55,14 @@ from roborock.roborock_message import (
 )
 from roborock.util import RepeatableTask, get_next_int, unpack_list
 
-COMMANDS_SECURED = [
+COMMANDS_SECURED = {
     RoborockCommand.GET_MAP_V1,
     RoborockCommand.GET_MULTI_MAP,
-]
+}
+
+CUSTOM_COMMANDS = {RoborockCommand.GET_MAP_CALIBRATION}
+
+CLOUD_REQUIRED = COMMANDS_SECURED.union(CUSTOM_COMMANDS)
 
 WASH_N_FILL_DOCK = [
     RoborockDockTypeCode.empty_wash_fill_dock,

{python_roborock-2.7.1 → python_roborock-2.8.1}/roborock/version_1_apis/roborock_mqtt_client_v1.py

@@ -2,6 +2,10 @@ import asyncio
 import base64
 
 import paho.mqtt.client as mqtt
+from vacuum_map_parser_base.config.color import ColorsPalette
+from vacuum_map_parser_base.config.image_config import ImageConfig
+from vacuum_map_parser_base.config.size import Sizes
+from vacuum_map_parser_roborock.map_data_parser import RoborockMapDataParser
 
 from roborock.cloud_api import RoborockMqttClient
 
@@ -13,7 +17,7 @@ from ..roborock_message import (
     RoborockMessageProtocol,
 )
 from ..roborock_typing import RoborockCommand
-from .roborock_client_v1 import COMMANDS_SECURED, RoborockClientV1
+from .roborock_client_v1 import COMMANDS_SECURED, CUSTOM_COMMANDS, RoborockClientV1
 
 
 class RoborockMqttClientV1(RoborockMqttClient, RoborockClientV1):
@@ -66,10 +70,21 @@ class RoborockMqttClientV1(RoborockMqttClient, RoborockClientV1):
         method: RoborockCommand | str,
         params: list | dict | int | None = None,
     ):
+        if method in CUSTOM_COMMANDS:
+            # 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)
         request_protocol = RoborockMessageProtocol.RPC_REQUEST
         roborock_message = RoborockMessage(timestamp=timestamp, protocol=request_protocol, payload=payload)
         return await self.send_message(roborock_message)
 
+    async def _get_calibration_points(self):
+        map: bytes = await self.send_command(RoborockCommand.GET_MAP_V1)
+        parser = RoborockMapDataParser(ColorsPalette(), Sizes(), [], ImageConfig(), [])
+        parsed_map = parser.parse(map)
+        calibration = parsed_map.calibration()
+        self._logger.info(parsed_map.calibration())
+        return calibration
+
     async def get_map_v1(self) -> bytes | None:
         return await self.send_command(RoborockCommand.GET_MAP_V1)