python-roborock 7.10.0__py3-none-any.whl → 7.11.1__py3-none-any.whl

{python_roborock-7.10.0.dist-info → python_roborock-7.11.1.dist-info}/METADATA

@@ -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.dist-info → python_roborock-7.11.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 roborock/__init__.py,sha256=jpp3MEmevRvoJ5tq2waCDGH5VfJk--Lv1DmrwEdDyEQ,375
 roborock/broadcast_protocol.py,sha256=HY3towvw_JyeAQxhMwD7XyG0Gvd3pn-Ik7BYb5iP6M4,4047
 roborock/callbacks.py,sha256=w2yPXtWFH7zfoFsLPYoCTbfwbE9p1ivA7iDcw20lJQI,4300
-roborock/cli.py,sha256=gbe444a9Hq-AU16a5ov3fmoX7mBcuxa7JN4YW43-P2M,63321
+roborock/cli.py,sha256=r3pq19x33vCkJH54DQxa9lZA--VmFtIXV3ldHMBlTJ8,63978
 roborock/const.py,sha256=fWpgUPrCgLnaXmncgjCLZET-t7wHWQlpyzV8qHtTjb4,2860
 roborock/device_features.py,sha256=RZTE6WovDYPHD9B6Iv_1pEeKaTmqb993Qfo8lCW-9xA,46737
 roborock/diagnostics.py,sha256=OVfPCjBVidAlQtFz-WRlgCWOBIaXlO-73xQloXJaLwI,5107
@@ -82,9 +82,9 @@ roborock/devices/traits/v1/device_features.py,sha256=vSacV1NMoOwrP0vpysVc7vI0EPN
 roborock/devices/traits/v1/do_not_disturb.py,sha256=_pJ-DS9r9h9eoTx1MW2MZ0RcrEh9J9gbSUPMQKoMSnE,1661
 roborock/devices/traits/v1/dust_collection_mode.py,sha256=2Sdi_-U0wzhtN-aOertDF6aGq9z9SeVVIL0dhEJcIiQ,656
 roborock/devices/traits/v1/flow_led_status.py,sha256=alwHAvD6D9Dunn4siMb6euH1Wxor_BlbRMXyT4FbNwQ,1160
-roborock/devices/traits/v1/home.py,sha256=UCLGCkhIowmVSjNv_aC76MortpKn8v0E1jlQA1kuRH4,14194
+roborock/devices/traits/v1/home.py,sha256=r50O6dHgzvw44-RXWu9D2_DkT5V3OV6rpFA5y1cVZGY,14206
 roborock/devices/traits/v1/led_status.py,sha256=qUY6GgC-RSXCAKlL2D0_FBO-1xwi2eU3fkMFg-pLQCs,1754
-roborock/devices/traits/v1/map_content.py,sha256=w_34H6ItiYm98QFOmEDCP0AvTBWAFVuB-uz5rmgBRwI,3175
+roborock/devices/traits/v1/map_content.py,sha256=yQyy20EwQBkbMhb7epH-wGRel-2Kfq5f4aPt4v19Kqs,4540
 roborock/devices/traits/v1/maps.py,sha256=JdOjJCeJ6iAH85pNHKHbVGlD-zOrha9h6XAh7IDeQr8,3468
 roborock/devices/traits/v1/mop_dryer.py,sha256=O_kesBuk_oxtcTE3jFD3Qm2lH939kQatib2aEjvPwCY,1979
 roborock/devices/traits/v1/network_info.py,sha256=CX9-ye2Zb_8lAWPGvegXWSOguxMY2K0xO-2OmWmE67o,2291
@@ -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=HPEUnpCbOxoZ6O_Dz3C3mJpYiIiq9vs8zvrzc78oxAw,5078
+roborock/devices/traits/v1/status.py,sha256=ZCNrRPfE_a6nga-WSJ8sry2M3XrqHigpNw_eRRU8hFo,5889
 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
@@ -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.10.0.dist-info/METADATA,sha256=6oK-R9o3xvwvArMYF5eH9Zo7YOxm_mMtV03Z2rj2n0s,5279
-python_roborock-7.10.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-python_roborock-7.10.0.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
-python_roborock-7.10.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-python_roborock-7.10.0.dist-info/RECORD,,
+python_roborock-7.11.1.dist-info/METADATA,sha256=l1QU8R1Law1v6OrWjFE6N7ogYqtCLDmDNOlpUj5T7XU,5279
+python_roborock-7.11.1.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+python_roborock-7.11.1.dist-info/entry_points.txt,sha256=EvC1nMqi9ZXKgZnqlNXA33v_3nzgPNjnM0mzWlrehnY,47
+python_roborock-7.11.1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+python_roborock-7.11.1.dist-info/RECORD,,

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)

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:

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)

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.