python-roborock 7.12.0__tar.gz → 7.12.2__tar.gz

{python_roborock-7.12.0 → python_roborock-7.12.2}/.gitignore

@@ -19,3 +19,6 @@ docs/_build/
 
 # GitHub App credentials
 gha-creds-*.json
+
+# pytest-benchmark storage
+.benchmarks/

{python_roborock-7.12.0 → python_roborock-7.12.2}/PKG-INFO

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

{python_roborock-7.12.0 → python_roborock-7.12.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "7.12.0"
+version = "7.12.2"
 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"
@@ -67,6 +67,8 @@ dev = [
     "syrupy>=4.9.1,<6",
     "pdoc>=15.0.4,<17",
     "pytest-cov>=7.0.0",
+    "zmqtt>=0.2.0,<0.3.0",
+    "pytest-benchmark>=5.1.0",
 ]
 
 [tool.hatch.build.targets.sdist]
@@ -146,6 +148,8 @@ module = ["roborock.map.proto.*"]
 ignore_errors = true
 
 [tool.pytest.ini_options]
+addopts = "-m 'not mqtt_broker'"
+markers = ["mqtt_broker: tests requiring a real MQTT broker"]
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "function"
 timeout = 30

{python_roborock-7.12.0 → python_roborock-7.12.2}/roborock/data/v1/v1_clean_modes.py

@@ -57,9 +57,10 @@ class WaterModes(RoborockModeEnum):
     SMART_MODE = ("smart_mode", 209)
     PURE_WATER_FLOW_START = ("slight", 221)
     PURE_WATER_FLOW_SMALL = ("low", 225)
+    PURE_WATER_FLOW_GENTLE = ("gentle", 230)
     PURE_WATER_FLOW_MIDDLE = ("medium", 235)
-    PURE_WATER_FLOW_LARGE = ("moderate", 245)
-    PURE_WATER_SUPER_BEGIN = ("high", 248)
+    PURE_WATER_FLOW_LARGE = ("moderate", 240)
+    PURE_WATER_SUPER_BEGIN = ("high", 245)
     PURE_WATER_FLOW_END = ("extreme", 250)
 
 
@@ -91,12 +92,25 @@ WATER_SLIDE_MODE_MAPPING: dict[int, WaterModes] = {
     200: WaterModes.OFF,
     221: WaterModes.PURE_WATER_FLOW_START,
     225: WaterModes.PURE_WATER_FLOW_SMALL,
+    230: WaterModes.PURE_WATER_FLOW_GENTLE,
     235: WaterModes.PURE_WATER_FLOW_MIDDLE,
-    245: WaterModes.PURE_WATER_FLOW_LARGE,
-    248: WaterModes.PURE_WATER_SUPER_BEGIN,
+    240: WaterModes.PURE_WATER_FLOW_LARGE,
+    245: WaterModes.PURE_WATER_SUPER_BEGIN,
     250: WaterModes.PURE_WATER_FLOW_END,
 }
 
+# Water slide devices report the raw slider position (1-30) as 220 + position.
+# The app groups positions into named ranges, keyed here by their last position.
+_WATER_SLIDE_RANGES: tuple[tuple[int, WaterModes], ...] = (
+    (3, WaterModes.PURE_WATER_FLOW_START),
+    (7, WaterModes.PURE_WATER_FLOW_SMALL),
+    (12, WaterModes.PURE_WATER_FLOW_GENTLE),
+    (17, WaterModes.PURE_WATER_FLOW_MIDDLE),
+    (22, WaterModes.PURE_WATER_FLOW_LARGE),
+    (27, WaterModes.PURE_WATER_SUPER_BEGIN),
+    (30, WaterModes.PURE_WATER_FLOW_END),
+)
+
 ModeEnumT = TypeVar("ModeEnumT", bound=RoborockModeEnum)
 
 
@@ -183,6 +197,19 @@ def get_water_modes(features: DeviceFeatures) -> list[WaterModes]:
     return supported_modes
 
 
+def get_water_slide_mode_name(code: int) -> str | None:
+    """Get the app's range name for a water slide code, or None if out of range."""
+    if code == 200:
+        return WaterModes.OFF.value
+    position = code - 220
+    if position < 1:
+        return None
+    for last_position, mode in _WATER_SLIDE_RANGES:
+        if position <= last_position:
+            return mode.value
+    return None
+
+
 def get_water_mode_mapping(features: DeviceFeatures) -> dict[int, str]:
     """Get water mode mapping by supported feature set.
 

{python_roborock-7.12.0 → python_roborock-7.12.2}/roborock/devices/traits/v1/clean_summary.py

@@ -82,7 +82,8 @@ class CleanSummaryTrait(CleanSummaryWithDetail, common.V1TraitMixin):
             _LOGGER.debug("No clean records available in clean summary.")
             self.last_clean_record = None
             return
-        last_record_id = self.records[0]
+        # Record IDs are start timestamps; devices may return them in either order.
+        last_record_id = max(self.records)
         self.last_clean_record = await self.get_clean_record(last_record_id)
 
     async def get_clean_record(self, record_id: int) -> CleanRecord:

{python_roborock-7.12.0 → python_roborock-7.12.2}/roborock/devices/traits/v1/status.py

@@ -15,6 +15,7 @@ from roborock import (
     get_current_cleaning_mode,
     get_water_mode_mapping,
     get_water_modes,
+    get_water_slide_mode_name,
     resolve_cleaning_mode,
 )
 from roborock.devices.traits.common import DpsDataConverter, TraitUpdateListener
@@ -103,6 +104,8 @@ class StatusTrait(StatusV2, common.V1TraitMixin, TraitUpdateListener):
     def water_mode_name(self) -> str | None:
         if self.water_box_mode is None:
             return None
+        if self._device_features_trait.is_water_slide_mode_supported:
+            return get_water_slide_mode_name(self.water_box_mode)
         return self.water_mode_mapping.get(self.water_box_mode)
 
     @property