pymammotion 0.5.44__py3-none-any.whl → 0.5.53__py3-none-any.whl

pymammotion/aliyun/model/dev_by_account_response.py

@@ -1,7 +1,9 @@
 from dataclasses import dataclass
+from typing import Annotated, Optional
 
 from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
+from mashumaro.types import Alias
 
 
 @dataclass
@@ -9,79 +11,47 @@ class Device(DataClassORJSONMixin):
     """Unified device model supporting both Device and ShareNotification data"""
 
     # Core device fields (from Device model)
-    gmt_modified: int
-    node_type: str
-    device_name: str
-    product_name: str
+    gmt_modified: Annotated[int, Alias("gmtModified")]
+    node_type: Annotated[str, Alias("nodeType")]
+    device_name: Annotated[str, Alias("deviceName")]
+    product_name: Annotated[str, Alias("productName")]
     status: int
-    identity_id: str
+    identity_id: Annotated[str, Alias("identityId")]
 
     # Required fields from original Device model
-    net_type: str
-    category_key: str
-    product_key: str
-    is_edge_gateway: bool
-    category_name: str
-    identity_alias: str
-    iot_id: str
-    bind_time: int
+    net_type: Annotated[str, Alias("netType")]
+    category_key: Annotated[str, Alias("categoryKey")]
+    product_key: Annotated[str, Alias("productKey")]
+    is_edge_gateway: Annotated[bool, Alias("isEdgeGateway")]
+    category_name: Annotated[str, Alias("categoryName")]
+    identity_alias: Annotated[str, Alias("identityAlias")]
+    iot_id: Annotated[str, Alias("iotId")]
+    bind_time: Annotated[int, Alias("bindTime")]
     owned: int
-    thing_type: str
+    thing_type: Annotated[str, Alias("thingType")]
 
     # Optional fields (common to both or nullable)
-    nick_name: str | None = None
-    description: str | None = None
-    product_image: str | None = None
-    category_image: str | None = None
-    product_model: str | None = None
+    nick_name: Annotated[Optional[str], Alias("nickName")] = None
+    description: Optional[str] = None
+    product_image: Annotated[Optional[str], Alias("productImage")] = None
+    category_image: Annotated[Optional[str], Alias("categoryImage")] = None
+    product_model: Annotated[Optional[str], Alias("productModel")] = None
 
     # Optional fields from ShareNotification only
-    target_id: str | None = None
-    receiver_identity_id: str | None = None
-    target_type: str | None = None
-    gmt_create: int | None = None
-    batch_id: str | None = None
-    record_id: str | None = None
-    initiator_identity_id: str | None = None
-    is_receiver: int | None = None
-    initiator_alias: str | None = None
-    receiver_alias: str | None = None
+    target_id: Annotated[Optional[str], Alias("targetId")] = None
+    receiver_identity_id: Annotated[Optional[str], Alias("receiverIdentityId")] = None
+    target_type: Annotated[Optional[str], Alias("targetType")] = None
+    gmt_create: Annotated[Optional[int], Alias("gmtCreate")] = None
+    batch_id: Annotated[Optional[str], Alias("batchId")] = None
+    record_id: Annotated[Optional[str], Alias("recordId")] = None
+    initiator_identity_id: Annotated[Optional[str], Alias("initiatorIdentityId")] = None
+    is_receiver: Annotated[Optional[int], Alias("isReceiver")] = None
+    initiator_alias: Annotated[Optional[str], Alias("initiatorAlias")] = None
+    receiver_alias: Annotated[Optional[str], Alias("receiverAlias")] = None
 
     class Config(BaseConfig):
         omit_default = True
-        serialize_by_alias = True
-        aliases = {
-            # Original Device model aliases
-            "gmt_modified": "gmtModified",
-            "net_type": "netType",
-            "category_key": "categoryKey",
-            "product_key": "productKey",
-            "node_type": "nodeType",
-            "is_edge_gateway": "isEdgeGateway",
-            "device_name": "deviceName",
-            "category_name": "categoryName",
-            "identity_alias": "identityAlias",
-            "product_name": "productName",
-            "iot_id": "iotId",
-            "bind_time": "bindTime",
-            "identity_id": "identityId",
-            "thing_type": "thingType",
-            "nick_name": "nickName",
-            "product_image": "productImage",
-            "category_image": "categoryImage",
-            "product_model": "productModel",
-            # ShareNotification specific aliases
-            "target_id": "targetId",
-            "receiver_identity_id": "receiverIdentityId",
-            "target_type": "targetType",
-            "gmt_create": "gmtCreate",
-            "batch_id": "batchId",
-            "record_id": "recordId",
-            "initiator_identity_id": "initiatorIdentityId",
-            "is_receiver": "isReceiver",
-            "initiator_alias": "initiatorAlias",
-            "receiver_alias": "receiverAlias",
-        }
+        allow_deserialization_not_by_alias = True
 
 
 # # Alternative: Keep them separate but with a common base class

pymammotion/data/model/device.py

@@ -8,6 +8,7 @@ from mashumaro.mixins.orjson import DataClassORJSONMixin
 from pymammotion.data.model import HashList, RapidState
 from pymammotion.data.model.device_info import DeviceFirmwares, DeviceNonWorkingHours, MowerInfo
 from pymammotion.data.model.errors import DeviceErrors
+from pymammotion.data.model.events import Events
 from pymammotion.data.model.location import Location
 from pymammotion.data.model.report_info import ReportData
 from pymammotion.data.model.work import CurrentTaskSettings
@@ -41,6 +42,7 @@ class MowingDevice(DataClassORJSONMixin):
     device_firmwares: DeviceFirmwares = field(default_factory=DeviceFirmwares)
     errors: DeviceErrors = field(default_factory=DeviceErrors)
     non_work_hours: DeviceNonWorkingHours = field(default_factory=DeviceNonWorkingHours)
+    events: Events = field(default_factory=Events)
 
     def buffer(self, buffer_list: SystemUpdateBufMsg) -> None:
         """Update the device based on which buffer we are reading from."""
@@ -51,9 +53,11 @@ class MowingDevice(DataClassORJSONMixin):
                     self.location.RTK.latitude = parse_double(buffer_list.update_buf_data[5], 8.0)
                     self.location.RTK.longitude = parse_double(buffer_list.update_buf_data[6], 8.0)
                 if buffer_list.update_buf_data[7] != 0:
-                    self.location.dock.latitude = parse_double(buffer_list.update_buf_data[7], 4.0)
-                    self.location.dock.longitude = parse_double(buffer_list.update_buf_data[8], 4.0)
-                    self.location.dock.rotation = buffer_list.update_buf_data[3] + 180
+                    # latitude Y longitude X
+                    self.location.dock.longitude = parse_double(buffer_list.update_buf_data[7], 4.0)
+                    self.location.dock.latitude = parse_double(buffer_list.update_buf_data[8], 4.0)
+                    self.location.dock.rotation = buffer_list.update_buf_data[3]
+
             case 2:
                 self.errors.err_code_list.clear()
                 self.errors.err_code_list_time.clear()
@@ -85,6 +89,20 @@ class MowingDevice(DataClassORJSONMixin):
                         buffer_list.update_buf_data[22],
                     ]
                 )
+            case 3:
+                # task state event
+                task_area_map: dict[int, int] = {}
+                task_area_ids = []
+
+                for i in range(3, len(buffer_list.update_buf_data), 2):
+                    area_id = buffer_list.update_buf_data[i]
+
+                    if area_id != 0:
+                        area_value = int(buffer_list.update_buf_data[i + 1])
+                        task_area_map[area_id] = area_value
+                        task_area_ids.append(area_id)
+                self.events.work_tasks_event.hash_list = task_area_map
+                self.events.work_tasks_event.ids = task_area_ids
 
     def update_report_data(self, toapp_report_data: ReportInfoData) -> None:
         """Set report data for the mower."""
@@ -101,12 +119,6 @@ class MowingDevice(DataClassORJSONMixin):
                     self.location.work_zone = (
                         location.zone_hash if self.report_data.dev.sys_status == WorkMode.MODE_WORKING else 0
                     )
-                # if location.bol_hash:
-                #     for loc in toapp_report_data.locations:
-                #         if loc.bol_hash:
-                #             if loc.bol_hash != location.bol_hash:
-                #                 self.map = HashList()
-                # MurMurHashUtil.hash_unsigned_list(list(self.map.area.keys()))
 
         if toapp_report_data.fw_info:
             self.update_device_firmwares(toapp_report_data.fw_info)

pymammotion/data/model/device_info.py

@@ -16,6 +16,7 @@ class SideLight(DataClassORJSONMixin):
 
 @dataclass
 class DeviceNonWorkingHours(DataClassORJSONMixin):
+    sub_cmd: int = 0
     start_time: str = ""
     end_time: str = ""
 

pymammotion/data/model/events.py

@@ -0,0 +1,14 @@
+from dataclasses import dataclass, field
+
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
+
+@dataclass
+class WorkTaskEvent(DataClassORJSONMixin):
+    hash_area_map: dict[int, int] = field(default_factory=dict)
+    ids: list[int] = field(default_factory=list)
+
+
+@dataclass
+class Events(DataClassORJSONMixin):
+    work_tasks_event: WorkTaskEvent = field(default_factory=WorkTaskEvent)