pymammotion 0.2.58__py3-none-any.whl → 0.2.60__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → pymammotion-0.2.60.dist-info}/METADATA

@@ -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.dist-info → pymammotion-0.2.60.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pymammotion/__init__.py,sha256=jHCQrpJaG1jAoID9T4RT3g4JsZc0JpJqIcqjnA7cXd0,1605
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
-pymammotion/aliyun/cloud_gateway.py,sha256=GC125Vjz5Z5h_o9NYoBwJRkTOY6qSWoC6fdBKIPleJ0,25576
+pymammotion/aliyun/cloud_gateway.py,sha256=81el3sCj7bS02PnY3krOlwnlDvQiAr2G0nHsRJLN0tk,25743
 pymammotion/aliyun/cloud_service.py,sha256=px7dUKow5Z7VyebjYzuKkzkm77XbUXYiFiYO_2e-UQ0,2207
 pymammotion/aliyun/model/aep_response.py,sha256=8f6GIP58ve8gd6AL3HBoXxsy0n2q4ygWvjELGnoOnVc,452
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
@@ -23,7 +23,7 @@ pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 pymammotion/data/model/__init__.py,sha256=aSyroxYQQS-WMRi6WmWm2js4wLa9nmsi160gx9tts4o,323
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
 pymammotion/data/model/device.py,sha256=hsN_NrrM_Kg1gbxcmSL3sVubGmeMxWHwnPiUN1-d8Eo,12196
-pymammotion/data/model/device_config.py,sha256=GtWR9SOXlwEwWsg7-UtoVuBmd-i8wXI4LnJ-cL5fh1o,2827
+pymammotion/data/model/device_config.py,sha256=SMBrG-rjN58Z59V-ok3wQ0721BQxM9zSdYXI3Q8GFdY,2828
 pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3IE,1582
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
 pymammotion/data/model/execute_boarder.py,sha256=9rd_h4fbcsXxgnLOd2rO2hWyD1abnTGc47QTEpp8DD0,1103
@@ -36,10 +36,10 @@ pymammotion/data/model/rapid_state.py,sha256=mIdhAG_LZXpVcybxqTLgLXkNOmVmDTn04B9
 pymammotion/data/model/region_data.py,sha256=OTV15vRyn9JORXsQPjWMNF1ZujuNhsOKl25KeqwMObA,3007
 pymammotion/data/model/report_info.py,sha256=AE2u64uKgcJtVooldJcxXBsEHfDyCvH5DnQFUQ5qWmk,2226
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pymammotion/data/mqtt/event.py,sha256=ciXqLRD1IQfMImVCifO5Dkm433LvkUwVhe2QqEdHP5E,4641
+pymammotion/data/mqtt/event.py,sha256=z6j8t-ZOjEeKjFt7S0wV8vV5L0-iHD3RbwI9hCfzGTY,5044
 pymammotion/data/mqtt/properties.py,sha256=kvphcjrDuJHuX8Az98-wKeFv_rSmu2Fz9YKLGodGSj0,3759
 pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
-pymammotion/data/state_manager.py,sha256=tH1dI5uH8qiIeJjHXR8FhGiWPEcOz-f3D4TyAhCiz-I,4327
+pymammotion/data/state_manager.py,sha256=DjWi_ojheZFB_KfdMnOJgxMTQ46HpbwtATK2ebgwRHE,4634
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=UzYnxV5DfvMDK3E06UvSzvzuBbaXOOUwO6xYt_zn9To,2034
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -60,10 +60,10 @@ pymammotion/mammotion/commands/messages/video.py,sha256=ne1YSuQChaDFfmHgMO5Jc9_O
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
-pymammotion/mammotion/devices/base.py,sha256=MXAuJ9sGnf9QqBeNxGbOkdtqwVpPocVdxw0uT0DgSks,9800
-pymammotion/mammotion/devices/mammotion.py,sha256=ckGN6wjIB3rfXkk__0jUt7Jw6_02ZffhPTldw5fnvU8,12431
+pymammotion/mammotion/devices/base.py,sha256=Q5acOJEevJji_fI09R6qbupzvkxGsteJxcWsfTjqLXc,9861
+pymammotion/mammotion/devices/mammotion.py,sha256=KRtGSoDY9FxeehOZAlzasmk0fO-2Ru1fkw6McFEovzA,12373
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=nyO7pkKgAoRPs-28ESf6ee-y3G5JTYRO-MCp4wKPMlE,17476
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=VuXuYlvi-HRbfRlgIV3KraVtbu2EM3QxP-JWWAYj_E0,11774
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=EbIdtOYOZS6E0RoIDgHJmGBOTjGIKx77ZDtA9BerF-M,11945
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
 pymammotion/mqtt/mammotion_mqtt.py,sha256=LaySave_hf0gU3crUTLqzpdQtxIwK8vu5DM8F8fbU2Y,8748
@@ -118,7 +118,7 @@ pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,22
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.2.58.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.58.dist-info/METADATA,sha256=VuOMlzTsHVYCqTzog6HnR9HkMfz--WWxE8yIeoXouvY,3874
-pymammotion-0.2.58.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.58.dist-info/RECORD,,
+pymammotion-0.2.60.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.60.dist-info/METADATA,sha256=j7Wek8S1oT8yaIKyoK6aKbqaLiboeMm1J--yDMwMyX0,3874
+pymammotion-0.2.60.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.60.dist-info/RECORD,,