Merge branch 'main' into dynamic_status_trait

Author: Lash-L

.pre-commit-config.yaml

@@ -26,6 +26,10 @@ repos:
         rev: v2.2.6
         hooks:
             -   id: codespell
+                exclude: >
+                    (?x)^(
+                        .*\.ambr
+                    )$
     -   repo: https://github.com/charliermarsh/ruff-pre-commit
         rev: v0.13.2
         hooks:

CHANGELOG.md

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "3.19.0"
+version = "4.2.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"
@@ -44,7 +44,7 @@ dev = [
     "pytest",
     "pre-commit>=3.5,<5.0",
     "mypy",
-    "ruff==0.14.9",
+    "ruff==0.14.10",
     "codespell",
     "pyshark>=0.6,<0.7",
     "aioresponses>=0.7.7,<0.8",

pyproject.toml

@@ -8,14 +8,11 @@
 from roborock.roborock_typing import *
 
 from . import (
-    cloud_api,
     const,
     data,
     devices,
     exceptions,
     roborock_typing,
-    version_1_apis,
-    version_a01_apis,
     web_api,
 )
 

roborock/__init__.py

@@ -121,7 +121,7 @@ def decoder_callback(
 
     def wrapper(data: K) -> None:
         if not (messages := decoder(data)):
-            logger.warning("Failed to decode message: %s", data)
+            logger.debug("Failed to decode message: %s", data)
             return
         for message in messages:
             logger.debug("Decoded message: %s", message)

roborock/api.py

@@ -41,8 +41,9 @@
 from pyshark.capture.live_capture import LiveCapture, UnknownInterfaceException  # type: ignore
 from pyshark.packet.packet import Packet  # type: ignore
 
-from roborock import SHORT_MODEL_TO_ENUM, RoborockCommand
-from roborock.data import DeviceData, RoborockBase, UserData
+from roborock import RoborockCommand
+from roborock.data import RoborockBase, UserData
+from roborock.data.b01_q10.b01_q10_code_mappings import B01_Q10_DP
 from roborock.device_features import DeviceFeatures
 from roborock.devices.cache import Cache, CacheData
 from roborock.devices.device import RoborockDevice
@@ -53,7 +54,6 @@
 from roborock.devices.traits.v1.map_content import MapContentTrait
 from roborock.exceptions import RoborockException, RoborockUnsupportedFeature
 from roborock.protocol import MessageParser
-from roborock.version_1_apis.roborock_mqtt_client_v1 import RoborockMqttClientV1
 from roborock.web_api import RoborockApiClient
 
 _LOGGER = logging.getLogger(__name__)
@@ -91,7 +91,14 @@ def wrapper(*args, **kwargs):
         context: RoborockContext = ctx.obj
 
         async def run():
-            return await func(*args, **kwargs)
+            try:
+                await func(*args, **kwargs)
+            except Exception as err:
+                _LOGGER.exception("Uncaught exception in command")
+                click.echo(f"Error: {err}", err=True)
+            finally:
+                if not context.is_session_mode():
+                    await context.cleanup()
 
         if context.is_session_mode():
             # Session mode - run in the persistent loop
@@ -739,6 +746,21 @@ async def network_info(ctx, device_id: str):
     await _display_v1_trait(context, device_id, lambda v1: v1.network_info)
 
 
+def _parse_b01_q10_command(cmd: str) -> B01_Q10_DP:
+    """Parse B01_Q10 command from either enum name or value."""
+    try:
+        return B01_Q10_DP(int(cmd))
+    except ValueError:
+        try:
+            return B01_Q10_DP.from_name(cmd)
+        except ValueError:
+            try:
+                return B01_Q10_DP.from_value(cmd)
+            except ValueError:
+                pass
+    raise RoborockException(f"Invalid command {cmd} for B01_Q10 device")
+
+
 @click.command()
 @click.option("--device_id", required=True)
 @click.option("--cmd", required=True)
@@ -749,12 +771,18 @@ async def command(ctx, cmd, device_id, params):
     context: RoborockContext = ctx.obj
     device_manager = await context.get_device_manager()
     device = await device_manager.get_device(device_id)
-    if device.v1_properties is None:
-        raise RoborockException(f"Device {device.name} does not support V1 protocol")
-    command_trait: Trait = device.v1_properties.command
-    result = await command_trait.send(cmd, json.loads(params) if params is not None else None)
-    if result:
-        click.echo(dump_json(result))
+    if device.v1_properties is not None:
+        command_trait: Trait = device.v1_properties.command
+        result = await command_trait.send(cmd, json.loads(params) if params is not None else None)
+        if result:
+            click.echo(dump_json(result))
+    elif device.b01_q10_properties is not None:
+        cmd_value = _parse_b01_q10_command(cmd)
+        command_trait: Trait = device.b01_q10_properties.command
+        await command_trait.send(cmd_value, json.loads(params) if params is not None else None)
+        click.echo("Command sent successfully; Enable debug logging (-d) to see responses.")
+        # Q10 commands don't have a specific time to respond, so wait a bit and log
+        await asyncio.sleep(5)
 
 
 @click.command()
@@ -815,44 +843,46 @@ async def get_device_info(ctx: click.Context):
     """
     click.echo("Discovering devices...")
     context: RoborockContext = ctx.obj
-    connection_cache = await context.get_devices()
-
-    home_data = connection_cache.cache_data.home_data
-
-    all_devices = home_data.get_all_devices()
-    if not all_devices:
+    device_connection_manager = await context.get_device_manager()
+    device_manager = await device_connection_manager.ensure_device_manager()
+    devices = await device_manager.get_devices()
+    if not devices:
         click.echo("No devices found.")
         return
 
-    click.echo(f"Found {len(all_devices)} devices. Fetching data...")
+    click.echo(f"Found {len(devices)} devices. Fetching data...")
 
     all_products_data = {}
 
-    for device in all_devices:
+    for device in devices:
         click.echo(f"  - Processing {device.name} ({device.duid})")
-        product_info = home_data.product_map[device.product_id]
-        device_data = DeviceData(device, product_info.model)
-        mqtt_client = RoborockMqttClientV1(connection_cache.user_data, device_data)
 
-        try:
-            init_status_result = await mqtt_client.send_command(
-                RoborockCommand.APP_GET_INIT_STATUS,
-            )
-            product_nickname = SHORT_MODEL_TO_ENUM.get(product_info.model.split(".")[-1]).name
-            current_product_data = {
-                "Protocol Version": device.pv,
-                "Product Nickname": product_nickname,
-                "New Feature Info": init_status_result.get("new_feature_info"),
-                "New Feature Info Str": init_status_result.get("new_feature_info_str"),
-                "Feature Info": init_status_result.get("feature_info"),
-            }
+        if device.product.model in all_products_data:
+            click.echo(f"    - Skipping duplicate model {device.product.model}")
+            continue
 
-            all_products_data[product_info.model] = current_product_data
+        current_product_data = {
+            "Protocol Version": device.device_info.pv,
+            "Product Nickname": device.product.product_nickname.name,
+        }
+        if device.v1_properties is not None:
+            try:
+                result: list[dict[str, Any]] = await device.v1_properties.command.send(
+                    RoborockCommand.APP_GET_INIT_STATUS
+                )
+            except Exception as e:
+                click.echo(f"    - Error processing device {device.name}: {e}", err=True)
+                continue
+            init_status_result = result[0] if result else {}
+            current_product_data.update(
+                {
+                    "New Feature Info": init_status_result.get("new_feature_info"),
+                    "New Feature Info Str": init_status_result.get("new_feature_info_str"),
+                    "Feature Info": init_status_result.get("feature_info"),
+                }
+            )
 
-        except Exception as e:
-            click.echo(f"    - Error processing device {device.name}: {e}", err=True)
-        finally:
-            await mqtt_client.async_release()
+        all_products_data[device.product.model] = current_product_data
 
     if all_products_data:
         click.echo("\n--- Device Information (copy to your YAML file) ---\n")