refactor(q7): use generated protobuf message types

Author: arduano

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

@@ -8,8 +8,6 @@
 For B01/Q7 devices, the underlying raw map payload is retrieved via `MapTrait`.
 """
 
-from __future__ import annotations
-
 from dataclasses import dataclass
 
 from vacuum_map_parser_base.map_data import MapData

roborock/map/b01_map_parser.py

@@ -10,15 +10,12 @@
 `roborock/map/proto/b01_scmap.proto`.
 """
 
-from __future__ import annotations
-
 import base64
 import binascii
 import hashlib
 import io
 import zlib
 from dataclasses import dataclass, field
-from typing import Protocol, cast
 
 from Crypto.Cipher import AES
 from Crypto.Util.Padding import pad, unpad
@@ -29,79 +26,21 @@
 
 from roborock.exceptions import RoborockException
 from roborock.map.proto import b01_scmap_pb2
+from roborock.map.proto.b01_scmap_pb2 import (
+    DevicePointInfo,
+    MapBoundaryInfo,
+    MapExtInfo,
+    MapHeadInfo,
+    RobotMap,
+    RoomDataInfo,
+)
 
 from .map_parser import ParsedMapData
 
 _B64_CHARS = set(b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=")
 _MAP_FILE_FORMAT = "PNG"
 
 
-class _ProtoMessage(Protocol):
-    def HasField(self, field_name: str) -> bool: ...
-
-
-class _ScPointMessage(_ProtoMessage, Protocol):
-    x: float
-    y: float
-
-
-class _ScMapBoundaryInfoMessage(_ProtoMessage, Protocol):
-    mapMd5: str
-    vMinX: int
-    vMaxX: int
-    vMinY: int
-    vMaxY: int
-
-
-class _ScMapExtInfoMessage(_ProtoMessage, Protocol):
-    taskBeginDate: int
-    mapUploadDate: int
-    mapValid: int
-    radian: int
-    force: int
-    cleanPath: int
-    boudaryInfo: _ScMapBoundaryInfoMessage
-    mapVersion: int
-    mapValueType: int
-
-
-class _ScMapHeadMessage(_ProtoMessage, Protocol):
-    mapHeadId: int
-    sizeX: int
-    sizeY: int
-    minX: float
-    minY: float
-    maxX: float
-    maxY: float
-    resolution: float
-
-
-class _ScRoomDataMessage(_ProtoMessage, Protocol):
-    roomId: int
-    roomName: str
-    roomTypeId: int
-    meterialId: int
-    cleanState: int
-    roomClean: int
-    roomCleanIndex: int
-    roomNamePost: _ScPointMessage
-    colorId: int
-    floor_direction: int
-    global_seq: int
-
-
-class _ScMapDataContainerMessage(_ProtoMessage, Protocol):
-    mapData: bytes
-
-
-class _ScMapMessage(_ProtoMessage, Protocol):
-    mapType: int
-    mapExtInfo: _ScMapExtInfoMessage
-    mapHead: _ScMapHeadMessage
-    mapData: _ScMapDataContainerMessage
-    roomDataInfo: list[_ScRoomDataMessage]
-
-
 @dataclass(frozen=True)
 class _ScPoint:
     x: float | None = None
@@ -265,14 +204,14 @@ def _decode_map_data_bytes(value: bytes) -> bytes:
         return value
 
 
-def _parse_sc_point(parsed: _ScPointMessage) -> _ScPoint:
+def _parse_sc_point(parsed: DevicePointInfo) -> _ScPoint:
     return _ScPoint(
         x=parsed.x if parsed.HasField("x") else None,
         y=parsed.y if parsed.HasField("y") else None,
     )
 
 
-def _parse_sc_map_boundary_info(parsed: _ScMapBoundaryInfoMessage) -> _ScMapBoundaryInfo:
+def _parse_sc_map_boundary_info(parsed: MapBoundaryInfo) -> _ScMapBoundaryInfo:
     return _ScMapBoundaryInfo(
         map_md5=parsed.mapMd5 if parsed.HasField("mapMd5") else None,
         v_min_x=parsed.vMinX if parsed.HasField("vMinX") else None,
@@ -282,7 +221,7 @@ def _parse_sc_map_boundary_info(parsed: _ScMapBoundaryInfoMessage) -> _ScMapBoun
     )
 
 
-def _parse_sc_map_ext_info(parsed: _ScMapExtInfoMessage) -> _ScMapExtInfo:
+def _parse_sc_map_ext_info(parsed: MapExtInfo) -> _ScMapExtInfo:
     return _ScMapExtInfo(
         task_begin_date=parsed.taskBeginDate if parsed.HasField("taskBeginDate") else None,
         map_upload_date=parsed.mapUploadDate if parsed.HasField("mapUploadDate") else None,
@@ -296,7 +235,7 @@ def _parse_sc_map_ext_info(parsed: _ScMapExtInfoMessage) -> _ScMapExtInfo:
     )
 
 
-def _parse_sc_map_head(parsed: _ScMapHeadMessage) -> _ScMapHead:
+def _parse_sc_map_head(parsed: MapHeadInfo) -> _ScMapHead:
     return _ScMapHead(
         map_head_id=parsed.mapHeadId if parsed.HasField("mapHeadId") else None,
         size_x=parsed.sizeX if parsed.HasField("sizeX") else None,
@@ -309,7 +248,7 @@ def _parse_sc_map_head(parsed: _ScMapHeadMessage) -> _ScMapHead:
     )
 
 
-def _parse_sc_room_data(parsed: _ScRoomDataMessage) -> _ScRoomData:
+def _parse_sc_room_data(parsed: RoomDataInfo) -> _ScRoomData:
     return _ScRoomData(
         room_id=parsed.roomId if parsed.HasField("roomId") else None,
         room_name=parsed.roomName if parsed.HasField("roomName") else None,
@@ -327,8 +266,8 @@ def _parse_sc_room_data(parsed: _ScRoomDataMessage) -> _ScRoomData:
 
 def _parse_scmap_payload(payload: bytes) -> _ScMapPayload:
     """Parse inflated SCMap bytes into typed map metadata."""
-    parsed = cast(_ScMapMessage, getattr(b01_scmap_pb2, "RobotMap")())
-    _parse_proto(payload, cast(Message, parsed), context="B01 SCMap")
+    parsed = RobotMap()
+    _parse_proto(payload, parsed, context="B01 SCMap")
 
     map_data = None
     if parsed.HasField("mapData"):