pymammotion 0.2.59__tar.gz → 0.2.61__tar.gz

{pymammotion-0.2.59 → pymammotion-0.2.61}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.2.59
+Version: 0.2.61
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur

{pymammotion-0.2.59 → pymammotion-0.2.61}/pymammotion/aliyun/cloud_gateway.py

@@ -664,7 +664,6 @@ class CloudIOTGateway:
                 "args": {"content": self.converter.printBase64Binary(command)},
                 "identifier": "device_protobuf_sync_service",
                 "iotId": f"{iot_id}",
-                "identityId": f"{self._session_by_authcode_response.data.identityId}"
             },
             request=request,
             version="1.0",

{pymammotion-0.2.59 → pymammotion-0.2.61}/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_config import DeviceLimits
+from pymammotion.data.model.device_info import MowerInfo
 from pymammotion.data.model.location import Location
 from pymammotion.data.model.report_info import ReportData
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
@@ -34,7 +35,8 @@ from pymammotion.utility.map import CoordinateConverter
 class MowingDevice(DataClassORJSONMixin):
     """Wraps the betterproto dataclasses, so we can bypass the groups for keeping all data."""
 
-    mqtt_properties: ThingPropertiesMessage | None = None
+    mower_state: MowerInfo = field(default_factory=MowerInfo)
+    mqtt_properties: ThingPropertiesMessage = field(default_factory=ThingPropertiesMessage)
     map: HashList = field(default_factory=HashList)
     location: Location = field(default_factory=Location)
     mowing_state: RapidState = field(default_factory=RapidState)

pymammotion-0.2.61/pymammotion/data/model/device_info.py

@@ -0,0 +1,25 @@
+from dataclasses import dataclass, field
+
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+
+
+@dataclass
+class SideLight(DataClassORJSONMixin):
+    operate: int = 0
+    enable: int = 0
+    start_hour: int = 0
+    start_min: int = 0
+    end_hour: int = 0
+    end_min: int = 0
+    action: int = 0
+
+
+@dataclass
+class MowerInfo(DataClassORJSONMixin):
+    blade_status: bool = False
+    side_led: SideLight = field(default_factory=SideLight)
+    collector_installation_status: bool = False
+    model: str = ""
+    swversion: str = ""
+    product_key: str = ""
+    model_id: str = ""

{pymammotion-0.2.59 → pymammotion-0.2.61}/pymammotion/data/model/report_info.py

@@ -10,6 +10,18 @@ class ConnectData(DataClassORJSONMixin):
     wifi_rssi: int = 0
 
 
+@dataclass
+class CollectorStatus(DataClassORJSONMixin):
+    collector_installation_status: int = 0
+
+
+@dataclass
+class MnetInfo(DataClassORJSONMixin):
+    model: str = ""
+    revision: str = ""
+    imei: str = ""
+
+
 @dataclass
 class DeviceData(DataClassORJSONMixin):
     sys_status: int = 0
@@ -18,6 +30,8 @@ class DeviceData(DataClassORJSONMixin):
     sensor_status: int = 0
     last_status: int = 0
     sys_time_stamp: str = ""
+    collector_status: CollectorStatus = field(default_factory=CollectorStatus)
+    mnet_info: MnetInfo = field(default_factory=MnetInfo)
 
 
 @dataclass

{pymammotion-0.2.59 → pymammotion-0.2.61}/pymammotion/data/mqtt/event.py

@@ -64,6 +64,13 @@ class DeviceNotificationEventValue(DataClassORJSONMixin):
     data: str  # parsed to DeviceNotificationEventCode
 
 
+@dataclass
+class DeviceBizReqEventValue(DataClassORJSONMixin):
+    bizType: str
+    bizId: str
+    params: str
+
+
 @dataclass
 class GeneralParams(DataClassORJSONMixin):
     groupIdList: list[str]
@@ -115,6 +122,13 @@ class DeviceNotificationEventParams(GeneralParams):
     value: DeviceNotificationEventValue
 
 
+@dataclass
+class DeviceBizReqEventParams(GeneralParams):
+    identifier: Literal["device_biz_req_event"]
+    type: Literal["info"]
+    value: DeviceBizReqEventValue
+
+
 @dataclass
 class DeviceWarningEventParams(GeneralParams):
     identifier: Literal["device_warning_event"]
@@ -152,6 +166,8 @@ class ThingEventMessage(DataClassORJSONMixin):
             params_obj = DeviceProtobufMsgEventParams.from_dict(params_dict)
         elif identifier == "device_warning_event":
             params_obj = DeviceWarningEventParams.from_dict(params_dict)
+        elif identifier == "device_biz_req_event":
+            params_obj = DeviceBizReqEventParams.from_dict(params_dict)
         elif identifier == "device_config_req_event":
             params_obj = payload.get("params", {})
         elif identifier == "device_notification_event" or identifier == "device_warning_code_event":

{pymammotion-0.2.59 → pymammotion-0.2.61}/pymammotion/data/state_manager.py

@@ -6,12 +6,15 @@ from typing import Any, Awaitable, Callable, Optional
 
 import betterproto
 
+from build.lib.pymammotion.proto.dev_net import WifiIotStatusReport
 from pymammotion.aliyun.cloud_gateway import SetupException
 from pymammotion.data.model.device import MowingDevice
+from pymammotion.data.model.device_info import SideLight
 from pymammotion.data.model.hash_list import AreaHashNameList
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.mctrl_nav import AppGetAllAreaHashName, NavGetCommDataAck, NavGetHashListAck
+from pymammotion.proto.mctrl_sys import TimeCtrlLight, DeviceProductTypeInfoT
 from pymammotion.utility.constant import WorkMode
 
 logger = logging.getLogger(__name__)
@@ -102,12 +105,23 @@ class StateManager:
                 self._device.mow_info(sys_msg[1])
             case "system_tard_state_tunnel":
                 self._device.run_state_update(sys_msg[1])
+            case "todev_time_ctrl_light":
+                ctrl_light: TimeCtrlLight = sys_msg[1]
+                side_led: SideLight = SideLight.from_dict(ctrl_light.to_dict(casing=betterproto.Casing.SNAKE))
+                self._device.mower_state.side_led = side_led
+            case "device_product_type_info":
+                device_product_type: DeviceProductTypeInfoT = sys_msg[1]
+                self._device.mower_state.model_id = device_product_type.main_product_type
 
     def _update_driver_data(self, message) -> None:
         pass
 
     def _update_net_data(self, message) -> None:
-        pass
+        net_msg = betterproto.which_one_of(message.net, "NetSubType")
+        match net_msg[0]:
+            case "toapp_wifi_iot_status":
+                wifi_iot_status: WifiIotStatusReport = net_msg[1]
+                self._device.mower_state.product_key = wifi_iot_status.productkey
 
     def _update_mul_data(self, message) -> None:
         pass

{pymammotion-0.2.59 → pymammotion-0.2.61}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -258,11 +258,15 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
 
     async def _parse_message_for_device(self, event: ThingEventMessage) -> None:
         params = event.params
+        new_msg = LubaMsg()
         if event.params.iotId != self.iot_id:
             return
         binary_data = base64.b64decode(params.value.content)
-        self._update_raw_data(binary_data)
-        new_msg = LubaMsg().parse(binary_data)
+        try:
+            self._update_raw_data(binary_data)
+            new_msg = LubaMsg().parse(binary_data)
+        except (KeyError, ValueError, IndexError):
+            _LOGGER.exception("Error parsing message %s", binary_data)
 
         if (
             self._commands.get_device_product_key() == ""

{pymammotion-0.2.59 → pymammotion-0.2.61}/pymammotion/proto/mctrl_nav.proto

@@ -461,8 +461,8 @@ message SvgMessageAckT {
     int32 sub_cmd = 2;       // Represents SUBCMD field
     int32 total_frame = 3;   // Represents TOTALFRAME field
     int32 current_frame = 4; // Represents CURRENTFRAME field
-    int64 data_hash = 5;     // Represents DATAHASH field
-    int64 paternal_hash_a = 6; // Represents PATERNALHASHA field
+    fixed64 data_hash = 5;     // Represents DATAHASH field
+    fixed64 paternal_hash_a = 6; // Represents PATERNALHASHA field
     int32 type = 7;          // Represents TYPE field
     int32 result = 8;        // Represents RESULT field
     svg_message_t svg_message = 9; // Represents SVG_MESSAGE field

{pymammotion-0.2.59 → pymammotion-0.2.61}/pymammotion/proto/mctrl_nav.py

@@ -516,8 +516,8 @@ class SvgMessageAckT(betterproto.Message):
     sub_cmd: int = betterproto.int32_field(2)
     total_frame: int = betterproto.int32_field(3)
     current_frame: int = betterproto.int32_field(4)
-    data_hash: int = betterproto.int64_field(5)
-    paternal_hash_a: int = betterproto.int64_field(6)
+    data_hash: int = betterproto.fixed64_field(5)
+    paternal_hash_a: int = betterproto.fixed64_field(6)
     type: int = betterproto.int32_field(7)
     result: int = betterproto.int32_field(8)
     svg_message: "SvgMessageT" = betterproto.message_field(9)

{pymammotion-0.2.59 → pymammotion-0.2.61}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.59"
+version     = "0.2.61"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.59"
+version     = "0.2.61"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -61,7 +61,7 @@ mypy = "^1.11.2"
 autotyping = "^24.3.0"
 
 [tool.bumpver]
-current_version = "0.2.59"
+current_version = "0.2.61"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true