🦎 q7: move map list containers into data layer

Author: arduano

roborock/data/b01_q7/b01_q7_containers.py

@@ -75,6 +75,33 @@ class Recommend(RoborockBase):
     room_id: list[int] = field(default_factory=list)
 
 
+@dataclass
+class Q7MapListEntry(RoborockBase):
+    """Single map list entry returned by `service.get_map_list`."""
+
+    id: int | None = None
+    cur: bool | None = None
+
+
+@dataclass
+class Q7MapList(RoborockBase):
+    """Map list response returned by `service.get_map_list`."""
+
+    map_list: list[Q7MapListEntry] = field(default_factory=list)
+
+    @property
+    def current_map_id(self) -> int | None:
+        """Current map id, preferring the entry marked current."""
+        if not self.map_list:
+            return None
+
+        ordered = sorted(self.map_list, key=lambda entry: entry.cur or False, reverse=True)
+        first = next(iter(ordered), None)
+        if first is None or not isinstance(first.id, int):
+            return None
+        return first.id
+
+
 @dataclass
 class B01Props(RoborockBase):
     """

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

@@ -4,6 +4,7 @@
 from typing import Any
 
 from roborock import B01Props
+from roborock.data import Q7MapList, Q7MapListEntry
 from roborock.data.b01_q7.b01_q7_code_mappings import (
     CleanPathPreferenceMapping,
     CleanRepeatMapping,
@@ -21,7 +22,7 @@
 from roborock.roborock_typing import RoborockB01Q7Methods
 
 from .clean_summary import CleanSummaryTrait
-from .map import MapTrait, Q7MapList, Q7MapListEntry
+from .map import MapTrait
 
 __all__ = [
     "Q7PropertiesApi",

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

@@ -1,9 +1,8 @@
 """Map trait for B01 Q7 devices."""
 
 import asyncio
-from dataclasses import dataclass, field
 
-from roborock.data import RoborockBase
+from roborock.data import Q7MapList
 from roborock.devices.rpc.b01_q7_channel import send_decoded_command, send_map_command
 from roborock.devices.traits import Trait
 from roborock.devices.transport.mqtt_channel import MqttChannel
@@ -12,33 +11,6 @@
 from roborock.roborock_typing import RoborockB01Q7Methods
 
 
-@dataclass
-class Q7MapListEntry(RoborockBase):
-    """Single map list entry returned by `service.get_map_list`."""
-
-    id: int | None = None
-    cur: bool | None = None
-
-
-@dataclass
-class Q7MapList(RoborockBase):
-    """Map list response returned by `service.get_map_list`."""
-
-    map_list: list[Q7MapListEntry] = field(default_factory=list)
-
-    @property
-    def current_map_id(self) -> int | None:
-        """Current map id, preferring the entry marked current."""
-        if not self.map_list:
-            return None
-
-        ordered = sorted(self.map_list, key=lambda entry: entry.cur or False, reverse=True)
-        first = next(iter(ordered), None)
-        if first is None or not isinstance(first.id, int):
-            return None
-        return first.id
-
-
 class MapTrait(Q7MapList, Trait):
     """Map retrieval + map metadata helpers for Q7 devices."""
 

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

@@ -4,7 +4,8 @@
 from Crypto.Cipher import AES
 from Crypto.Util.Padding import unpad
 
-from roborock.devices.traits.b01.q7 import Q7MapList, Q7MapListEntry, Q7PropertiesApi
+from roborock.data import Q7MapList, Q7MapListEntry
+from roborock.devices.traits.b01.q7 import Q7PropertiesApi
 from roborock.exceptions import RoborockException
 from roborock.roborock_message import RoborockMessage, RoborockMessageProtocol
 from tests.fixtures.channel_fixtures import FakeChannel