Fix Q10 diagnostics display in Home Assistant

Author: allenporter

roborock/data/containers.py

@@ -143,13 +143,14 @@ def convert_dict(types_map: dict[Any, type], data: dict[Any, Any]) -> dict[Any,
 
         return result
 
-    def as_dict(self) -> dict:
+    def as_dict(self, exclude: set[str] | None = None) -> dict:
+        exclude_set = exclude or set()
         return asdict(
             self,
             dict_factory=lambda _fields: {
                 _camelize(key): value.value if isinstance(value, Enum) else value
                 for (key, value) in _fields
-                if value is not None
+                if value is not None and key not in exclude_set
             },
         )
 

roborock/devices/device.py

@@ -243,6 +243,8 @@ def diagnostic_data(self) -> dict[str, Any]:
         extra: dict[str, Any] = {}
         if self.v1_properties:
             extra["traits"] = self.v1_properties.as_dict()
+        elif self.b01_q10_properties:
+            extra["traits"] = self.b01_q10_properties.as_dict()
         return redact_device_data(
             {
                 "device": self.device_info.as_dict(),

roborock/devices/traits/b01/q10/__init__.py

@@ -2,8 +2,10 @@
 
 import asyncio
 import logging
+from typing import Any
 
 from roborock.data.b01_q10.b01_q10_code_mappings import B01_Q10_DP
+from roborock.data.containers import RoborockBase
 from roborock.devices.rpc.b01_q10_channel import stream_decoded_messages
 from roborock.devices.traits import Trait
 from roborock.devices.transport.mqtt_channel import MqttChannel
@@ -149,6 +151,14 @@ def _handle_message(self, message: Q10Message) -> None:
             for trait in self._updatable_traits:
                 trait.update_from_dps(message.dps)
 
+    def as_dict(self) -> dict[str, Any]:
+        """Return the trait data as a dictionary."""
+        result: dict[str, Any] = {}
+        for name, value in self.__dict__.items():
+            if isinstance(value, RoborockBase):
+                result[name] = value.as_dict()
+        return result
+
 
 def create(channel: MqttChannel) -> Q10PropertiesApi:
     """Create traits for B01 devices."""

roborock/devices/traits/b01/q10/map.py

@@ -19,6 +19,7 @@
 
 import logging
 from dataclasses import dataclass, field
+from typing import Any
 
 from vacuum_map_parser_base.map_data import MapData
 
@@ -108,3 +109,10 @@ def update_from_trace_packet(self, packet: Q10TracePacket) -> None:
         self.path = packet.points
         self.robot_position = packet.robot_position
         self._notify_update()
+
+    def as_dict(self, exclude: set[str] | None = None) -> dict[str, Any]:
+        """Return the trait data as a dictionary, excluding large binary data."""
+        exclude_set = {"image_content", "map_data"}
+        if exclude:
+            exclude_set.update(exclude)
+        return super().as_dict(exclude=exclude_set)