chore: move parsing to the container

Author: Lash-L

roborock/data/b01_q7/b01_q7_containers.py

@@ -1,6 +1,9 @@
 import datetime
+import json
 from dataclasses import dataclass, field
+from functools import cached_property
 
+from ...exceptions import RoborockException
 from ..containers import RoborockBase
 from .b01_q7_code_mappings import (
     B01Fault,
@@ -246,6 +249,17 @@ class CleanRecordListItem(RoborockBase):
     url: str | None = None
     detail: str | None = None
 
+    @cached_property
+    def detail_parsed(self) -> CleanRecordDetail | None:
+        """Parse and return the detail as a CleanRecordDetail object."""
+        if self.detail is None:
+            return None
+        try:
+            parsed = json.loads(self.detail)
+        except json.JSONDecodeError as ex:
+            raise RoborockException(f"Invalid B01 record detail JSON: {self.detail!r}") from ex
+        return CleanRecordDetail.from_dict(parsed)
+
 
 @dataclass
 class CleanRecordList(RoborockBase):

roborock/devices/traits/b01/q7/clean_summary.py

@@ -6,7 +6,7 @@
 
 from __future__ import annotations
 
-import json
+import logging
 
 from roborock import CleanRecordDetail, CleanRecordList, CleanRecordSummary
 from roborock.devices.rpc.b01_q7_channel import send_decoded_command
@@ -20,6 +20,8 @@
     "CleanSummaryTrait",
 ]
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class CleanSummaryTrait(CleanRecordSummary, Trait):
     """B01/Q7 clean summary + clean record access (via record list service)."""
@@ -59,14 +61,12 @@ async def _get_clean_record_details(self, *, record_list: CleanRecordList) -> li
         """Return parsed record detail objects (newest-first)."""
         details: list[CleanRecordDetail] = []
         for item in record_list.record_list:
-            if item.detail is None:
-                continue
             try:
-                parsed = json.loads(item.detail)
-            except json.JSONDecodeError as ex:
-                raise RoborockException(f"Invalid B01 record detail JSON: {item.detail!r}") from ex
-            parsed = CleanRecordDetail.from_dict(parsed)
-
+                parsed = item.detail_parsed
+            except RoborockException as ex:
+                # Rather than failing if something goes wrong here, we should fail and log to tell the user.
+                _LOGGER.debug("Failed to parse record detail: %s", ex)
+                continue
             if parsed is not None:
                 details.append(parsed)
 

tests/devices/traits/b01/q7/test_clean_summary.py

@@ -1,6 +1,7 @@
 """Tests for CleanSummaryTrait class for B01/Q7 devices."""
 
 import json
+import logging
 
 import pytest
 
@@ -156,8 +157,9 @@ async def test_get_clean_record_details_with_none_detail(
 
 async def test_get_clean_record_details_invalid_json(
     clean_summary_trait: CleanSummaryTrait,
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
-    """Test that invalid JSON in detail raises RoborockException."""
+    """Test that invalid JSON in detail is logged and skipped."""
     response_with_invalid_json = {
         "total_time": 34980,
         "total_area": 28540,
@@ -170,7 +172,10 @@ async def test_get_clean_record_details_invalid_json(
         ],
     }
 
-    with pytest.raises(RoborockException, match="Invalid B01 record detail JSON"):
-        await clean_summary_trait._get_clean_record_details(
+    with caplog.at_level(logging.DEBUG):
+        details = await clean_summary_trait._get_clean_record_details(
             record_list=CleanRecordList.from_dict(response_with_invalid_json)
         )
+
+    assert len(details) == 0
+    assert any("Failed to parse record detail" in record.message for record in caplog.records)