python-roborock 4.7.2__tar.gz → 4.9.0__tar.gz

{python_roborock-4.7.2 → python_roborock-4.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-roborock
-Version: 4.7.2
+Version: 4.9.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.7.2 → python_roborock-4.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "4.7.2"
+version = "4.9.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.7.2 → python_roborock-4.9.0}/roborock/data/b01_q7/b01_q7_containers.py

@@ -3,7 +3,9 @@ from dataclasses import dataclass, field
 from ..containers import RoborockBase
 from .b01_q7_code_mappings import (
     B01Fault,
+    CleanTypeMapping,
     SCWindMapping,
+    WaterLevelMapping,
     WorkModeMapping,
     WorkStatusMapping,
 )
@@ -77,8 +79,8 @@ class B01Props(RoborockBase):
     status: WorkStatusMapping | None = None
     fault: B01Fault | None = None
     wind: SCWindMapping | None = None
-    water: int | None = None
-    mode: int | None = None
+    water: WaterLevelMapping | None = None
+    mode: CleanTypeMapping | None = None
     quantity: int | None = None
     alarm: int | None = None
     volume: int | None = None

{python_roborock-4.7.2 → python_roborock-4.9.0}/roborock/devices/traits/b01/q10/__init__.py

@@ -1,12 +1,10 @@
 """Traits for Q10 B01 devices."""
 
-from typing import Any
-
-from roborock.devices.rpc.b01_q7_channel import send_decoded_command
 from roborock.devices.traits import Trait
 from roborock.devices.transport.mqtt_channel import MqttChannel
 
 from .command import CommandTrait
+from .vacuum import VacuumTrait
 
 __all__ = [
     "Q10PropertiesApi",
@@ -19,9 +17,13 @@ class Q10PropertiesApi(Trait):
     command: CommandTrait
     """Trait for sending commands to Q10 devices."""
 
+    vacuum: VacuumTrait
+    """Trait for sending vacuum related commands to Q10 devices."""
+
     def __init__(self, channel: MqttChannel) -> None:
         """Initialize the B01Props API."""
         self.command = CommandTrait(channel)
+        self.vacuum = VacuumTrait(self.command)
 
 
 def create(channel: MqttChannel) -> Q10PropertiesApi:

python_roborock-4.9.0/roborock/devices/traits/b01/q10/vacuum.py

@@ -0,0 +1,56 @@
+"""Traits for Q10 B01 devices."""
+
+from roborock.data.b01_q10.b01_q10_code_mappings import B01_Q10_DP
+
+from .command import CommandTrait
+
+
+class VacuumTrait:
+    """Trait for sending vacuum commands.
+
+    This is a wrapper around the CommandTrait for sending vacuum related
+    commands to Q10 devices.
+    """
+
+    def __init__(self, command: CommandTrait) -> None:
+        """Initialize the VacuumTrait."""
+        self._command = command
+
+    async def start_clean(self) -> None:
+        """Start cleaning."""
+        await self._command.send(
+            command=B01_Q10_DP.START_CLEAN,
+            # TODO: figure out other commands
+            # 1 = start cleaning
+            # 2 = "electoral" clean, also has "clean_parameters"
+            # 4 = fast create map
+            params={"cmd": 1},
+        )
+
+    async def pause_clean(self) -> None:
+        """Pause cleaning."""
+        await self._command.send(
+            command=B01_Q10_DP.PAUSE,
+            params={},
+        )
+
+    async def resume_clean(self) -> None:
+        """Resume cleaning."""
+        await self._command.send(
+            command=B01_Q10_DP.RESUME,
+            params={},
+        )
+
+    async def stop_clean(self) -> None:
+        """Stop cleaning."""
+        await self._command.send(
+            command=B01_Q10_DP.STOP,
+            params={},
+        )
+
+    async def return_to_dock(self) -> None:
+        """Return to dock."""
+        await self._command.send(
+            command=B01_Q10_DP.START_DOCK_TASK,
+            params={},
+        )

{python_roborock-4.7.2 → python_roborock-4.9.0}/roborock/devices/traits/b01/q7/__init__.py

@@ -6,6 +6,7 @@ from typing import Any
 from roborock import B01Props
 from roborock.data.b01_q7.b01_q7_code_mappings import (
     CleanTaskTypeMapping,
+    CleanTypeMapping,
     SCDeviceCleanParam,
     SCWindMapping,
     WaterLevelMapping,
@@ -54,6 +55,10 @@ class Q7PropertiesApi(Trait):
         """Set the water level (water)."""
         await self.set_prop(RoborockB01Props.WATER, water_level.code)
 
+    async def set_mode(self, mode: CleanTypeMapping) -> None:
+        """Set the cleaning mode (vacuum, mop, or vacuum and mop)."""
+        await self.set_prop(RoborockB01Props.MODE, mode.code)
+
     async def start_clean(self) -> None:
         """Start cleaning."""
         await self.send(