python-roborock 7.10.0__tar.gz → 7.11.1__tar.gz

{python_roborock-7.10.0 → python_roborock-7.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-roborock
-Version: 7.10.0
+Version: 7.11.1
 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.10.0 → python_roborock-7.11.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "7.10.0"
+version = "7.11.1"
 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-7.10.0 → python_roborock-7.11.1}/roborock/cli.py

@@ -749,6 +749,20 @@ async def reset_consumable(ctx, device_id: str, consumable: str):
     click.echo(f"Reset {consumable} for device {device_id}")
 
 
+@session.command()
+@click.option("--device_id", required=True)
+@click.option("--error_code", type=int, help="Error code to resolve. Defaults to the current dock or robot error.")
+@click.pass_context
+@async_command
+async def resolve_error(ctx, device_id: str, error_code: int | None):
+    """Resolve the current dock or robot error, like "Resolved" in the app."""
+    context: RoborockContext = ctx.obj
+    trait = await _v1_trait(context, device_id, lambda v1: v1.status)
+    await trait.refresh()
+    await trait.resolve_error(error_code)
+    click.echo(f"Dock error: {trait.dock_error_status}, error: {trait.error_code}")
+
+
 @session.command()
 @click.option("--device_id", required=True)
 @click.option("--enabled", type=bool, help="Enable (True) or disable (False) the child lock.")
@@ -1369,6 +1383,7 @@ cli.add_command(map_data)
 cli.add_command(q10_position)
 cli.add_command(consumables)
 cli.add_command(reset_consumable)
+cli.add_command(resolve_error)
 cli.add_command(rooms)
 cli.add_command(home)
 cli.add_command(features)

{python_roborock-7.10.0 → python_roborock-7.11.1}/roborock/devices/traits/v1/home.py

@@ -96,7 +96,7 @@ class HomeTrait(RoborockBase, common.V1TraitMixin, TraitUpdateListener):
             self._discovery_completed = True
             try:
                 self._home_map_content = {
-                    k: self._map_content.converter.parse_map_content(base64.b64decode(v))
+                    k: await self._map_content.converter.async_parse_map_content(base64.b64decode(v))
                     for k, v in (device_cache_data.home_map_content_base64 or {}).items()
                 }
             except (ValueError, RoborockException) as ex:

{python_roborock-7.10.0 → python_roborock-7.11.1}/roborock/devices/traits/v1/map_content.py

@@ -1,5 +1,6 @@
 """Trait for fetching the map content from Roborock devices."""
 
+import asyncio
 import logging
 from dataclasses import dataclass
 
@@ -7,6 +8,7 @@ from vacuum_map_parser_base.map_data import MapData
 
 from roborock.data import RoborockBase
 from roborock.devices.traits.v1 import common
+from roborock.exceptions import RoborockParsingException
 from roborock.map.map_parser import MapParser, MapParserConfig
 from roborock.roborock_typing import RoborockCommand
 
@@ -78,6 +80,20 @@ class MapContentConverter(common.V1TraitDataConverter):
             raw_api_response=response,
         )
 
+    async def async_parse_map_content(self, response: bytes) -> MapContent:
+        """Parse the map content from raw bytes asynchronously.
+
+        Args:
+            response: The raw bytes of the map data from the API.
+
+        Returns:
+            MapContent: The parsed map content.
+
+        Raises:
+            RoborockException: If the map data cannot be parsed.
+        """
+        return await asyncio.to_thread(self.parse_map_content, response)
+
 
 @common.map_rpc_channel
 class MapContentTrait(MapContent, common.V1TraitMixin):
@@ -90,3 +106,21 @@ class MapContentTrait(MapContent, common.V1TraitMixin):
         """Initialize MapContentTrait."""
         super().__init__()
         self.converter = MapContentConverter(MapParser(map_parser_config or MapParserConfig()))
+
+    async def refresh(self) -> None:
+        """Refresh the contents of this trait without blocking the event loop."""
+        response = await self.rpc_channel.send_command(self.command)
+        if self.raw_api_response is not None and self.raw_api_response == response:
+            return
+        if not isinstance(response, bytes):
+            raise ValueError(f"Unexpected MapContentTrait response format: {type(response)}")
+        try:
+            new_data = await self.converter.async_parse_map_content(response)
+        except (TypeError, ValueError) as err:
+            raise RoborockParsingException(
+                trait_name=type(self).__name__,
+                command=self.command,
+                payload=response,
+                inner_error=err,
+            ) from err
+        common.merge_trait_values(self, new_data)

{python_roborock-7.10.0 → python_roborock-7.11.1}/roborock/devices/traits/v1/status.py

@@ -133,6 +133,23 @@ class StatusTrait(StatusV2, common.V1TraitMixin, TraitUpdateListener):
             params=get_cleaning_mode_parameters(resolve_cleaning_mode(cleaning_mode), self._device_features_trait),
         )
 
+    async def resolve_error(self, error_code: int | None = None) -> None:
+        """Resolve an error, like tapping "Resolved" in the Roborock app.
+
+        Without an explicit code this resolves the current dock error if there is one,
+        otherwise the current robot error. A dock error such as water_empty stays latched
+        on the device until it is resolved, even after the cause has been fixed.
+        """
+        if error_code is None:
+            if self.dock_error_status:
+                error_code = int(self.dock_error_status)
+            elif self.error_code:
+                error_code = int(self.error_code)
+            else:
+                return
+        await self.rpc_channel.send_command(RoborockCommand.RESOLVE_ERROR, params={"error_code": error_code})
+        await self.refresh()
+
     def update_from_dps(self, decoded_dps: dict[RoborockDataProtocol, Any]) -> None:
         """Update the trait from data protocol push message data.