python-roborock 7.12.2__py3-none-any.whl → 7.12.4__py3-none-any.whl

{python_roborock-7.12.2.dist-info → python_roborock-7.12.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-roborock
-Version: 7.12.2
+Version: 7.12.4
 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.2.dist-info → python_roborock-7.12.4.dist-info}/RECORD

@@ -28,9 +28,9 @@ roborock/data/mower/__init__.py,sha256=RXFcOE0-rchWViq3F-cLXB9Jnx4nKrn98TUR917sz
 roborock/data/mower/mower_code_mappings.py,sha256=T3NJEjgkYv3svIt7-gqFgrnNmVeBOkqit8_D52vSIao,1741
 roborock/data/mower/mower_containers.py,sha256=PYNVhbGCafkchenBlBmG_fUnIC-9WfxF8gNB0C4_9Yo,4106
 roborock/data/v1/__init__.py,sha256=Lx_D6baZrCMxp57D0NcdiA8rssJ5NnInZwUwrT79XOI,91
-roborock/data/v1/v1_clean_modes.py,sha256=RNi3_a1ZzDuaKpbEzFp-V1ugeJfIkjE4QdBI3YvI2G8,14886
+roborock/data/v1/v1_clean_modes.py,sha256=lD0RnDa9hciRNi0VuWENjxbxflocdS1gCnK4fFrNoWY,15646
 roborock/data/v1/v1_code_mappings.py,sha256=hToQbd38mM3Dw8ONLyuDa2scqmNs0gNgOyqVgm-Gg7Y,12948
-roborock/data/v1/v1_containers.py,sha256=6erBnuQicFsdAsUaWIEAghzOxUU-xGuwqJBhcy_snZ4,17939
+roborock/data/v1/v1_containers.py,sha256=s5ivZjkNIX7ls6IXBnppBWATTqdAlRY-Busw3aoKPnc,18602
 roborock/data/zeo/__init__.py,sha256=VxG5qG4M24DGOq2YAaxownWp6bEfj9DEOgOMHmTpcqY,63
 roborock/data/zeo/zeo_code_mappings.py,sha256=mfm2xoI8RllPZfyZE0HmUhUhLECwRD0llkMNWfaEHvw,8057
 roborock/data/zeo/zeo_containers.py,sha256=huDeisutagKz1rzsLZr_tGAietec_qOd0KB3i09YGgo,4339
@@ -92,7 +92,7 @@ roborock/devices/traits/v1/obstacle_photos.py,sha256=Aul1sOxJ6AxLWqI5AbeHHSzxfUP
 roborock/devices/traits/v1/rooms.py,sha256=SEAs3sHZxDmiiSWc9Korm838zu8ub_04CsmJVlT4F48,6237
 roborock/devices/traits/v1/routines.py,sha256=BfktlpnyDjD2DB3zBDS5BnmjZPE38aHa-wjMontPnik,931
 roborock/devices/traits/v1/smart_wash_params.py,sha256=6K3XrF5SRS39BWaMjjtGJgKX3lZ24jPsb6Nia4a9GVM,634
-roborock/devices/traits/v1/status.py,sha256=xmnu6pXXMYagihSBSJVSSR6pUSdgRaa1eAM2N1huIfU,6056
+roborock/devices/traits/v1/status.py,sha256=P85-41-aY-_IYZaZjnDvY8OYgQx2NDHncvhKlIID_4E,6675
 roborock/devices/traits/v1/valley_electricity_timer.py,sha256=vE9bLJe8TdFGVh_9mDRkEoC3_DTBkDcdlSMSiYq0YTw,1863
 roborock/devices/traits/v1/volume.py,sha256=etRIYE0ynZZLEo2ez7Dm7_JbijmElrdjpn59hyLWqsQ,814
 roborock/devices/traits/v1/wash_towel_mode.py,sha256=bSXtaJ0ObDlXsJYuCHWCN3J0GyHEibPsDvOqBCxQW3Q,2039
@@ -103,11 +103,11 @@ roborock/devices/transport/mqtt_channel.py,sha256=dpL1mZIoI4Glk3hfUO9JweWFHG1tZW
 roborock/map/__init__.py,sha256=L3WHujuxUHCTTPaOElkJsTN_FkYhw01drfR-W4blgFc,146
 roborock/map/b01_grid_layers.py,sha256=b87MsGXslqLR_5H_4z4aj1wQqYgeTuULWqt4_txOF-M,12303
 roborock/map/b01_map_parser.py,sha256=y4Qlgiwre3bn5_UpL6R-ytjg8kQqwkbvhIYFOtpAM3s,14814
-roborock/map/b01_q10_map_parser.py,sha256=QWUu126wI2IzzFPrr7qrxcfnAgxU0LD0WRbSzhJB7LY,36715
+roborock/map/b01_q10_map_parser.py,sha256=3DawtwPqyKhLUAW5Y4D6Ebm16l6RdWYiti0McELJCYQ,37066
 roborock/map/b01_q10_overlays.py,sha256=JmriUbT4-oe6NiE94VttMplFc1HHQrAGNQIiZHj5QKk,6640
-roborock/map/b01_q10_render.py,sha256=VmDxYbLHIARRRf8-Bg_05YxTyTElKN1y9AduEY0LQEY,13612
+roborock/map/b01_q10_render.py,sha256=PFAYqFxRANCH141drkHnB_0hNGsH5RR-jtkYIo7b46Y,13626
 roborock/map/map_parser.py,sha256=EcJcz9yld_wu7d5QrmxR2BTfJ801F6SaEgJkbIIap4w,5111
-roborock/map/room_colors.py,sha256=5Q85oR_7xsUyzHYGOJPuzsZ6LQSCpJwfxfWql1v6T1E,2152
+roborock/map/room_colors.py,sha256=YvjuqsUPPAH5exJ16V72OTikDT-KEjgF7vd91l78Pjs,2627
 roborock/map/proto/__init__.py,sha256=XcH_s-E67_hcQNwqSkdtY7DgYE0mRBBJwctzsf8zng4,60
 roborock/map/proto/b01_scmap.proto,sha256=lQtOruroUfrDK9EJ99cnGTi7avEK3CQ1haLIopDrS_A,3725
 roborock/map/proto/b01_scmap_pb2.py,sha256=HI7xxxpvV0cFl80B7T7RN74C3cP8YNqfukL_FW324ss,7493
@@ -127,8 +127,8 @@ roborock/testing/channel.py,sha256=vjulT5MHBe8lAq6XITUqcxJVcCILWx7ZEcw5imTx0Tk,7
 roborock/testing/cloud.py,sha256=L2L0KlZDYaMuoV19KUQUoq5EAUDeNQ1lJ8Ew5YaOgjo,11946
 roborock/testing/simulator.py,sha256=g8ZUWVSjgAzuRRxWOCeOq-7deodyEItwUpqEw9RzCmQ,4347
 roborock/testing/v1_simulator.py,sha256=_LX_vsBMcB2Uu2QDt8QnQymgtVtbnwD5Xa7tmhiPAnY,14439
-python_roborock-7.12.2.dist-info/METADATA,sha256=ZULsv1uHLLGPW-ZYGcBDhHIlluaM_fwPfqrIDkrdfzc,5279
-python_roborock-7.12.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-python_roborock-7.12.2.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
-python_roborock-7.12.2.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-python_roborock-7.12.2.dist-info/RECORD,,
+python_roborock-7.12.4.dist-info/METADATA,sha256=fuYSHig-rrR-C1NJMjLKBQ-D6gjsY3GfdAWT0KTgZVU,5279
+python_roborock-7.12.4.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+python_roborock-7.12.4.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
+python_roborock-7.12.4.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+python_roborock-7.12.4.dist-info/RECORD,,

roborock/data/v1/v1_clean_modes.py

@@ -199,14 +199,20 @@ def get_water_modes(features: DeviceFeatures) -> list[WaterModes]:
 
 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."""
+    mode = _resolve_water_slide_mode(code)
+    return mode.value if mode is not None else None
+
+
+def _resolve_water_slide_mode(code: int) -> WaterModes | None:
+    """Resolve a raw slider code to the water mode for its app range."""
     if code == 200:
-        return WaterModes.OFF.value
+        return WaterModes.OFF
     position = code - 220
     if position < 1:
         return None
     for last_position, mode in _WATER_SLIDE_RANGES:
         if position <= last_position:
-            return mode.value
+            return mode
     return None
 
 
@@ -300,7 +306,14 @@ def get_cleaning_mode_parameters(cleaning_mode: CleaningMode, features: DeviceFe
         raise RoborockUnsupportedFeature(f"Cleaning mode {cleaning_mode.value!r} is not supported")
 
     fan_power, water_box_mode, mop_mode = _get_clean_motor_mode_params(cleaning_mode, features)
-    params: dict[str, int] = {"fan_power": fan_power.code, "water_box_mode": water_box_mode.code}
+    water_code = water_box_mode.code
+    if features.is_water_slide_mode_supported:
+        # Aliased water enums retain legacy codes; the device mapping preserves
+        # slide-specific wire values without changing the user-facing names.
+        water_code = next(
+            code for code, name in get_water_mode_mapping(features).items() if name == water_box_mode.value
+        )
+    params: dict[str, int] = {"fan_power": fan_power.code, "water_box_mode": water_code}
     if features.is_clean_route_setting_supported:
         params["mop_mode"] = mop_mode.code
     return [params]
@@ -337,6 +350,8 @@ def get_current_cleaning_mode(
         return None
     clean_mode_enum = _resolve_clean_mode(clean_mode, features)
     water_mode_enum = _resolve_mode_code(water_mode, WaterModes)
+    if features.is_water_slide_mode_supported and isinstance(water_mode, int):
+        water_mode_enum = _resolve_water_slide_mode(water_mode) or water_mode_enum
     mop_mode_enum = _resolve_mode_code(mop_mode, CleanRoutes)
     if clean_mode_enum is None or water_mode_enum is None:
         return None

roborock/data/v1/v1_containers.py

@@ -1,5 +1,6 @@
 import datetime
 import logging
+import warnings
 from dataclasses import dataclass, field
 from enum import StrEnum
 from typing import Any
@@ -73,6 +74,39 @@ class StatusField(FieldNameBase):
     RDT = "rdt"
 
 
+def get_dock_state(
+    state: RoborockStateCode | int | None,
+    battery: int | None,
+    charge_status: RoborockChargeStatus | int | None = None,
+    *,
+    is_supported_valley_electricity: bool = False,
+) -> RoborockDockState:
+    """Return the dock state, accounting for off-peak charging support."""
+    if state is None or state == RoborockStateCode.unknown:
+        return RoborockDockState.unknown
+
+    # 6. DUSTING
+    if state == RoborockStateCode.emptying_the_bin:
+        return RoborockDockState.dusting
+
+    # 5. FULL
+    if state == RoborockStateCode.charging_complete or (state == RoborockStateCode.charging and battery == 100):
+        return RoborockDockState.full
+
+    # 3 & 4. CHARGING and CHARGE_WAITING
+    if state == RoborockStateCode.charging:
+        if is_supported_valley_electricity and charge_status == RoborockChargeStatus.charge_waiting:
+            return RoborockDockState.off_peak_waiting
+        return RoborockDockState.charging
+
+    # 2. RECHARGING
+    if state in (RoborockStateCode.returning_home, RoborockStateCode.docking):
+        return RoborockDockState.returning
+
+    # 1. IDLE (Not on dock, or doing something else)
+    return RoborockDockState.idle
+
+
 @dataclass
 class StatusV2(RoborockBase):
     """The result of a GET_STATUS API request."""
@@ -219,36 +253,26 @@ class StatusV2(RoborockBase):
     def dock_state(self) -> RoborockDockState:
         """A synthesized, high-level dock state reflecting the UI's display.
 
-        This property simplifies integration by handling the complex logic
-        of checking state, charge_status, and battery level simultaneously. It handles
-        newer off-peak charging logic seamlessly while maintaining backwards compatibility
-        with older devices.
+        .. deprecated::
+            Use StatusTrait.dock_state or get_dock_state instead.
         """
-        if self.state is None or self.state == RoborockStateCode.unknown:
-            return RoborockDockState.unknown
-
-        # 6. DUSTING
-        if self.state == RoborockStateCode.emptying_the_bin:
-            return RoborockDockState.dusting
-
-        # 5. FULL
-        if self.state == RoborockStateCode.charging_complete or (
-            self.state == RoborockStateCode.charging and self.battery == 100
-        ):
-            return RoborockDockState.full
-
-        # 3 & 4. CHARGING and CHARGE_WAITING
-        if self.state == RoborockStateCode.charging:
-            if self.charge_status == RoborockChargeStatus.charge_waiting:
-                return RoborockDockState.off_peak_waiting
-            return RoborockDockState.charging
-
-        # 2. RECHARGING
-        if self.state in (RoborockStateCode.returning_home, RoborockStateCode.docking):
-            return RoborockDockState.returning
-
-        # 1. IDLE (Not on dock, or doing something else)
-        return RoborockDockState.idle
+        warnings.warn(
+            "StatusV2.dock_state is deprecated and will be removed in a future release. "
+            "Use StatusTrait.dock_state or get_dock_state instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return get_dock_state(
+            state=self.state,
+            battery=self.battery,
+            charge_status=self.charge_status,
+            is_supported_valley_electricity=True,
+        )
+
+    @property
+    def is_battery_charging(self) -> bool:
+        """Return whether the battery is actively charging."""
+        return self.dock_state == RoborockDockState.charging
 
     def __repr__(self) -> str:
         return _attr_repr(self)

roborock/devices/traits/v1/status.py

@@ -5,6 +5,7 @@ from typing import Any
 from roborock import (
     CleaningMode,
     CleanRoutes,
+    RoborockDockState,
     StatusV2,
     VacuumModes,
     WaterModes,
@@ -13,6 +14,7 @@ from roborock import (
     get_cleaning_mode_options,
     get_cleaning_mode_parameters,
     get_current_cleaning_mode,
+    get_dock_state,
     get_water_mode_mapping,
     get_water_modes,
     get_water_slide_mode_name,
@@ -66,6 +68,21 @@ class StatusTrait(StatusV2, common.V1TraitMixin, TraitUpdateListener):
         self._device_features_trait = device_feature_trait
         self._region = region
 
+    @property
+    def dock_state(self) -> RoborockDockState:
+        """Return the feature-aware dock state used by the Roborock app."""
+        return get_dock_state(
+            state=self.state,
+            battery=self.battery,
+            charge_status=self.charge_status,
+            is_supported_valley_electricity=self._device_features_trait.is_supported_valley_electricity,
+        )
+
+    @property
+    def is_battery_charging(self) -> bool:
+        """Return whether the battery is actively charging."""
+        return self.dock_state == RoborockDockState.charging
+
     @cached_property
     def fan_speed_options(self) -> list[VacuumModes]:
         return get_clean_modes(self._device_features_trait)

roborock/map/b01_q10_map_parser.py

@@ -801,8 +801,8 @@ class B01Q10MapParser:
         """
         return self.parsed_from_packet(packet)
 
-    def parsed_from_packet(self, packet: Q10MapPacket) -> ParsedMapData:
-        """Render a (possibly erase-modified) packet into a PNG + ``MapData``."""
+    def map_data_from_packet(self, packet: Q10MapPacket) -> MapData:
+        """Build MapData with a rendered base image, without PNG serialization."""
         image = self._render(packet)
 
         map_data = MapData()
@@ -830,17 +830,23 @@ class B01Q10MapParser:
         if packet.carpet_mask is not None:
             map_data.carpet_map = {i for i, value in enumerate(packet.carpet_mask) if value}
 
+        return map_data
+
+    def parsed_from_packet(self, packet: Q10MapPacket) -> ParsedMapData:
+        """Render a (possibly erase-modified) packet into a PNG + ``MapData``."""
+        map_data = self.map_data_from_packet(packet)
         image_bytes = io.BytesIO()
-        image.save(image_bytes, format=_MAP_FILE_FORMAT)
+        if map_data.image is not None:
+            map_data.image.data.save(image_bytes, format=_MAP_FILE_FORMAT)
         return ParsedMapData(image_content=image_bytes.getvalue(), map_data=map_data)
 
     def _render(self, packet: Q10MapPacket) -> Image.Image:
         """Render the Q10 grid with the V1 map palette."""
         palette = _build_palette(packet.grid, packet.width)
-        rgba = bytearray()
-        for value in packet.grid:
-            rgba.extend(palette[value])
-        img = Image.frombytes("RGBA", (packet.width, packet.height), bytes(rgba))
+        flat_palette = [channel for color in palette for channel in color]
+        p_img = Image.frombytes("P", (packet.width, packet.height), packet.grid)
+        p_img.putpalette(flat_palette, rawmode="RGBA")
+        img = p_img.convert("RGBA")
         # The ss07 grid is stored top-down (row 0 = top of the home), so it is
         # rendered as-is -- unlike the V1/Q7 convention, no vertical flip.
         scale = self._config.map_scale

roborock/map/b01_q10_render.py

@@ -109,10 +109,9 @@ def render_q10_map(
             # areas disappear (as the app shows).
             render_packet = erased_packet(packet, cells)
 
-    parsed = parser.parsed_from_packet(render_packet)
-    if parsed.image_content is None or parsed.map_data is None:
+    map_data = parser.map_data_from_packet(render_packet)
+    if map_data.image is None:
         raise RoborockException("Failed to render Q10 map image")
-    map_data = parsed.map_data
 
     has_drawables = False
     if trace_calibration is not None and trace is not None:
@@ -128,7 +127,9 @@ def render_q10_map(
     if has_drawables:
         return _draw_map_content(map_data, config=config)
 
-    return parsed.image_content
+    buffer = io.BytesIO()
+    map_data.image.data.save(buffer, format="PNG")
+    return buffer.getvalue()
 
 
 def solve_q10_calibration(

roborock/map/room_colors.py

@@ -23,23 +23,31 @@ def adjacency_aware_room_colors(
     if width <= 0:
         return {}
 
+    lut = [room_id_from_cell(i) for i in range(256)]
     room_ids: set[int] = set()
     neighbors: dict[int, set[int]] = {}
     for index, value in enumerate(grid):
-        room_id = room_id_from_cell(value)
+        room_id = lut[value] if 0 <= value < 256 else room_id_from_cell(value)
         if room_id is None:
             continue
         room_ids.add(room_id)
         neighbors.setdefault(room_id, set())
 
-        for neighbor_index in (index - 1 if index % width else -1, index - width):
-            if neighbor_index < 0:
-                continue
-            neighbor_id = room_id_from_cell(grid[neighbor_index])
-            if neighbor_id is None or neighbor_id == room_id:
-                continue
-            neighbors[room_id].add(neighbor_id)
-            neighbors.setdefault(neighbor_id, set()).add(room_id)
+        if index % width:
+            left_val = grid[index - 1]
+            if left_val != value:
+                neighbor_id = lut[left_val] if 0 <= left_val < 256 else room_id_from_cell(left_val)
+                if neighbor_id is not None and neighbor_id != room_id:
+                    neighbors[room_id].add(neighbor_id)
+                    neighbors.setdefault(neighbor_id, set()).add(room_id)
+
+        if index >= width:
+            up_val = grid[index - width]
+            if up_val != value:
+                neighbor_id = lut[up_val] if 0 <= up_val < 256 else room_id_from_cell(up_val)
+                if neighbor_id is not None and neighbor_id != room_id:
+                    neighbors[room_id].add(neighbor_id)
+                    neighbors.setdefault(neighbor_id, set()).add(room_id)
 
     candidates: list[Color] = []
     for palette_id in map(int, ColorsPalette.ROOM_COLORS):