python-roborock 4.20.0__tar.gz → 4.21.0__tar.gz

{python_roborock-4.20.0 → python_roborock-4.21.0}/PKG-INFO

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

{python_roborock-4.20.0 → python_roborock-4.21.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "4.20.0"
+version = "4.21.0"
 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"

{python_roborock-4.20.0 → python_roborock-4.21.0}/roborock/data/v1/v1_code_mappings.py

@@ -587,17 +587,6 @@ class RoborockDockDustCollectionModeCode(RoborockEnum):
     max = 4
 
 
-class RoborockDockWashTowelModeCode(RoborockEnum):
-    """Describes the wash towel mode of the vacuum cleaner."""
-
-    # TODO: Get the correct values for various different docks
-    unknown = -9999
-    light = 0
-    balanced = 1
-    deep = 2
-    smart = 10
-
-
 class RoborockStateCode(RoborockEnum):
     unknown = 0
     starting = 1

{python_roborock-4.20.0 → python_roborock-4.21.0}/roborock/data/v1/v1_containers.py

@@ -39,6 +39,7 @@ from roborock.const import (
 from roborock.exceptions import RoborockException
 
 from ..containers import NamedRoomMapping, RoborockBase, RoborockBaseTimer, _attr_repr
+from .v1_clean_modes import WashTowelModes
 from .v1_code_mappings import (
     CleanFluidStatus,
     ClearWaterBoxStatus,
@@ -48,7 +49,6 @@ from .v1_code_mappings import (
     RoborockDockDustCollectionModeCode,
     RoborockDockErrorCode,
     RoborockDockTypeCode,
-    RoborockDockWashTowelModeCode,
     RoborockErrorCode,
     RoborockFanPowerCode,
     RoborockFanSpeedP10,
@@ -750,7 +750,7 @@ class DustCollectionMode(RoborockBase):
 
 @dataclass
 class WashTowelMode(RoborockBase):
-    wash_mode: RoborockDockWashTowelModeCode | None = None
+    wash_mode: WashTowelModes | None = None
 
 
 @dataclass

{python_roborock-4.20.0 → python_roborock-4.21.0}/roborock/devices/traits/v1/__init__.py

@@ -234,6 +234,12 @@ class PropertiesApi(Trait):
         # Dock type also acts like a device feature for some traits.
         dock_type = await self._dock_type()
 
+        # Initialize traits with special arguments before the generic loop
+        if self.wash_towel_mode is None and self._is_supported(WashTowelModeTrait, "wash_towel_mode", dock_type):
+            wash_towel_mode = WashTowelModeTrait(self.device_features)
+            wash_towel_mode._rpc_channel = self._get_rpc_channel(wash_towel_mode)  # type: ignore[assignment]
+            self.wash_towel_mode = wash_towel_mode
+
         # Dynamically create any traits that need to be populated
         for item in fields(self):
             if (trait := getattr(self, item.name, None)) is not None:

python_roborock-4.21.0/roborock/devices/traits/v1/wash_towel_mode.py

@@ -0,0 +1,48 @@
+"""Trait for wash towel mode."""
+
+from functools import cached_property
+from typing import Self
+
+from roborock.data import WashTowelMode, WashTowelModes, get_wash_towel_modes
+from roborock.device_features import is_wash_n_fill_dock
+from roborock.devices.traits.v1 import common
+from roborock.devices.traits.v1.device_features import DeviceFeaturesTrait
+from roborock.roborock_typing import RoborockCommand
+
+
+class WashTowelModeTrait(WashTowelMode, common.V1TraitMixin):
+    """Trait for wash towel mode."""
+
+    command = RoborockCommand.GET_WASH_TOWEL_MODE
+    requires_dock_type = is_wash_n_fill_dock
+
+    def __init__(
+        self,
+        device_feature_trait: DeviceFeaturesTrait,
+    ) -> None:
+        super().__init__()
+        self.device_feature_trait = device_feature_trait
+
+    def _parse_response(self, response: common.V1ResponseData) -> Self:
+        """Parse the response from the device into a WashTowelMode object."""
+        if isinstance(response, list):
+            response = response[0]
+        if isinstance(response, dict):
+            return WashTowelMode.from_dict(response)
+        raise ValueError(f"Unexpected wash towel mode format: {response!r}")
+
+    @cached_property
+    def wash_towel_mode_options(self) -> list[WashTowelModes]:
+        return get_wash_towel_modes(self.device_feature_trait)
+
+    async def set_wash_towel_mode(self, mode: WashTowelModes) -> None:
+        """Set the wash towel mode."""
+        await self.rpc_channel.send_command(RoborockCommand.SET_WASH_TOWEL_MODE, params={"wash_mode": mode.code})
+
+    async def start_wash(self) -> None:
+        """Start washing the mop."""
+        await self.rpc_channel.send_command(RoborockCommand.APP_START_WASH)
+
+    async def stop_wash(self) -> None:
+        """Stop washing the mop."""
+        await self.rpc_channel.send_command(RoborockCommand.APP_STOP_WASH)

python_roborock-4.20.0/roborock/devices/traits/v1/wash_towel_mode.py

@@ -1,13 +0,0 @@
-"""Trait for wash towel mode."""
-
-from roborock.data import WashTowelMode
-from roborock.device_features import is_wash_n_fill_dock
-from roborock.devices.traits.v1 import common
-from roborock.roborock_typing import RoborockCommand
-
-
-class WashTowelModeTrait(WashTowelMode, common.V1TraitMixin):
-    """Trait for wash towel mode."""
-
-    command = RoborockCommand.GET_WASH_TOWEL_MODE
-    requires_dock_type = is_wash_n_fill_dock