pymammotion 0.2.58__tar.gz → 0.2.60__tar.gz

{pymammotion-0.2.58 → pymammotion-0.2.60}/PKG-INFO

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

{pymammotion-0.2.58 → pymammotion-0.2.60}/pymammotion/aliyun/cloud_gateway.py

@@ -664,6 +664,7 @@ 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",
@@ -687,6 +688,7 @@ class CloudIOTGateway:
                 str(response_body_dict.get("msg")),
             )
             if response_body_dict.get("code") == 29003:
+                logger.debug(self._session_by_authcode_response.data.identityId)
                 self.sign_out()
                 raise SetupException(response_body_dict.get("code"))
             if response_body_dict.get("code") == 6205:

{pymammotion-0.2.58 → pymammotion-0.2.60}/pymammotion/data/model/device_config.py

@@ -34,7 +34,7 @@ class OperationSettings(DataClassORJSONMixin):
     blade_height: int = 0
     path_order: str = ""
     toward: int = 0  # is just angle
-    toward_included_angle: int = 0
+    toward_included_angle: int = 90
     toward_mode: int = 0  # angle type relative etc
     border_mode: int = 1  # border laps
     obstacle_laps: int = 1

{pymammotion-0.2.58 → pymammotion-0.2.60}/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.58 → pymammotion-0.2.60}/pymammotion/data/state_manager.py

@@ -1,10 +1,12 @@
 """Manage state from notifications into MowingDevice."""
 
+import logging
 from datetime import datetime
 from typing import Any, Awaitable, Callable, Optional
 
 import betterproto
 
+from pymammotion.aliyun.cloud_gateway import SetupException
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.hash_list import AreaHashNameList
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
@@ -12,6 +14,8 @@ from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.mctrl_nav import AppGetAllAreaHashName, NavGetCommDataAck, NavGetHashListAck
 from pymammotion.utility.constant import WorkMode
 
+logger = logging.getLogger(__name__)
+
 
 class StateManager:
     """Manage state."""
@@ -89,7 +93,11 @@ class StateManager:
                 self._device.update_report_data(sys_msg[1])
                 if self.queue_command_callback:
                     if self._device.sys.toapp_report_data.dev.sys_status != WorkMode.MODE_WORKING:
-                        await self.queue_command_callback("get_report_cfg_stop")
+                        try:
+                            await self.queue_command_callback("get_report_cfg_stop")
+                        except SetupException as exc:
+                            # can't do anything about it yet
+                            logger.debug(exc)
             case "mow_to_app_info":
                 self._device.mow_info(sys_msg[1])
             case "system_tard_state_tunnel":

{pymammotion-0.2.58 → pymammotion-0.2.60}/pymammotion/mammotion/devices/base.py

@@ -217,8 +217,9 @@ class MammotionBaseDevice:
 
         await self.queue_command("get_all_boundary_hash_list", sub_cmd=0)
         await self.queue_command("get_hash_response", total_frame=1, current_frame=1)
-        data_hash = self.mower.map.missing_hashlist.pop()
-        await self.queue_command("synchronize_hash_data", hash_num=data_hash)
+        if len(self.mower.map.missing_hashlist) > 0:
+            data_hash = self.mower.map.missing_hashlist.pop()
+            await self.queue_command("synchronize_hash_data", hash_num=data_hash)
 
         # sub_cmd 3 is job hashes??
         # sub_cmd 4 is dump location (yuka)

{pymammotion-0.2.58 → pymammotion-0.2.60}/pymammotion/mammotion/devices/mammotion.py

@@ -182,11 +182,10 @@ class Mammotion:
                 await self.initiate_cloud_connection(account, cloud_client)
 
     async def initiate_cloud_connection(self, account: str, cloud_client: CloudIOTGateway) -> None:
+        loop = asyncio.get_running_loop()
         if self.mqtt_list.get(account) is not None:
-            if self.mqtt_list.get(account).is_connected:
-                # we might have removed a device so readd
-                self.add_cloud_devices(self.mqtt_list.get(account))
-                return
+            if self.mqtt_list.get(account).is_connected():
+                await loop.run_in_executor(None, self.mqtt_list.get(account).disconnect)
 
         mammotion_cloud = MammotionCloud(
             MammotionMQTT(
@@ -203,7 +202,6 @@ class Mammotion:
         self.mqtt_list[account] = mammotion_cloud
         self.add_cloud_devices(mammotion_cloud)
 
-        loop = asyncio.get_running_loop()
         await loop.run_in_executor(None, self.mqtt_list[account].connect_async)
 
     def add_cloud_devices(self, mqtt_client: MammotionCloud) -> None:

{pymammotion-0.2.58 → pymammotion-0.2.60}/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.58 → pymammotion-0.2.60}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.58"
+version     = "0.2.60"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.58"
+version     = "0.2.60"
 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.58"
+current_version = "0.2.60"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true