pymammotion 0.4.8__py3-none-any.whl → 0.4.10__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -16,6 +16,7 @@ from alibabacloud_iot_api_gateway.client import Client
 from alibabacloud_iot_api_gateway.models import CommonParams, Config, IoTApiRequest
 from alibabacloud_tea_util.client import Client as UtilClient
 from alibabacloud_tea_util.models import RuntimeOptions
+from Tea.exceptions import UnretryableException
 
 from pymammotion.aliyun.model.aep_response import AepResponse
 from pymammotion.aliyun.model.connect_response import ConnectResponse
@@ -45,6 +46,10 @@ MOVE_HEADERS = (
 class SetupException(Exception):
     """Raise when mqtt expires token or token is invalid."""
 
+    def __init__(self, *args: object) -> None:
+        super().__init__(args)
+        self.iot_id = args[1]
+
 
 class AuthRefreshException(Exception):
     """Raise exception when library cannot refresh token."""
@@ -53,10 +58,22 @@ class AuthRefreshException(Exception):
 class DeviceOfflineException(Exception):
     """Raise exception when device is offline."""
 
+    def __init__(self, *args: object) -> None:
+        super().__init__(args)
+        self.iot_id = args[1]
+
+
+class NoConnectionException(UnretryableException):
+    """Raise exception when device is unreachable."""
+
 
 class GatewayTimeoutException(Exception):
     """Raise exception when the gateway times out."""
 
+    def __init__(self, *args: object) -> None:
+        super().__init__(args)
+        self.iot_id = args[1]
+
 
 class LoginException(Exception):
     """Raise exception when library cannot log in."""
@@ -691,14 +708,14 @@ class CloudIOTGateway:
             )
             if response_body_dict.get("code") == 20056:
                 logger.debug("Gateway timeout.")
-                raise GatewayTimeoutException(response_body_dict.get("code"))
+                raise GatewayTimeoutException(response_body_dict.get("code"), iot_id)
 
             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"))
+                raise SetupException(response_body_dict.get("code"), iot_id)
             if response_body_dict.get("code") == 6205:
-                raise DeviceOfflineException(response_body_dict.get("code"))
+                raise DeviceOfflineException(response_body_dict.get("code"), iot_id)
 
         return message_id
 

pymammotion/data/model/mowing_modes.py

@@ -44,6 +44,13 @@ class TraversalMode(IntEnum):
     follow_perimeter = 1
 
 
+class TurningMode(IntEnum):
+    """Turning mode on corners."""
+
+    multipoint = 0
+    zero_turn = 1
+
+
 class DetectionStrategy(IntEnum):
     """Matches up with ultra_wave."""
 

pymammotion/data/model/report_info.py

@@ -140,6 +140,6 @@ class ReportData(DataClassORJSONMixin):
         self.dev = DeviceData.from_dict(data.get("dev", self.dev.to_dict()))
         self.rtk = RTKData.from_dict(data.get("rtk", self.rtk.to_dict()))
         self.maintenance = Maintain.from_dict(data.get("maintain", self.maintenance.to_dict()))
-        self.vision_info = VisionInfo.from_dict(data.get("vio_to_app_info", VisionInfo(0, 0, 0, 0, 0, 0, 0).to_dict()))
+        self.vision_info = VisionInfo.from_dict(data.get("vio_to_app_info", VisionInfo().to_dict()))
         self.locations = locations
         self.work = WorkData.from_dict(data.get("work", self.work.to_dict()))

pymammotion/data/mqtt/status.py

@@ -8,7 +8,7 @@ from mashumaro.mixins.orjson import DataClassORJSONMixin
 @dataclass
 class GroupIdListItem(DataClassORJSONMixin):
     groupId: str
-    groupType: Literal["ISOLATION"]
+    groupType: Literal["ISOLATION", "ILOP_APP"]
 
 
 # are there other values?

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -8,6 +8,7 @@ import logging
 from typing import Any, cast
 
 import betterproto
+from Tea.exceptions import UnretryableException
 
 from pymammotion import CloudIOTGateway, MammotionMQTT
 from pymammotion.aliyun.cloud_gateway import DeviceOfflineException
@@ -201,7 +202,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         try:
             if self.on_ready_callback:
                 await self.on_ready_callback()
-        except DeviceOfflineException:
+        except (DeviceOfflineException, UnretryableException):
             _LOGGER.debug("Device is offline")
 
     async def on_disconnect(self) -> None:
@@ -218,6 +219,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         """Stop all tasks and disconnect."""
         if self._ble_sync_task:
             self._ble_sync_task.cancel()
+        # self._mqtt._mqtt_client.unsubscribe()
         self.stopped = True
 
     async def start(self) -> None:
@@ -226,7 +228,10 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             await self.run_periodic_sync_task()
         self.stopped = False
         if not self.mqtt.is_connected():
-            self.mqtt.connect_async()
+            loop = asyncio.get_running_loop()
+            await loop.run_in_executor(None, self.mqtt.connect_async)
+        # else:
+        #     self.mqtt._mqtt_client.thing_on_thing_enable(None)
 
     async def _ble_sync(self) -> None:
         command_bytes = self._commands.send_todev_ble_sync(3)

pymammotion/mqtt/mammotion_mqtt.py

@@ -142,6 +142,31 @@ class MammotionMQTT:
         # command = MammotionCommand(device_name="Luba")
         # self._cloud_client.send_cloud_command(command.get_report_cfg())
 
+    def unsubscribe(self) -> None:
+        self._linkkit_client.unsubscribe_topic(
+            f"/sys/{self._product_key}/{self._device_name}/app/down/account/bind_reply"
+        )
+        self._linkkit_client.unsubscribe_topic(
+            f"/sys/{self._product_key}/{self._device_name}/app/down/thing/event/property/post_reply"
+        )
+        self._linkkit_client.unsubscribe_topic(
+            f"/sys/{self._product_key}/{self._device_name}/app/down/thing/wifi/status/notify"
+        )
+        self._linkkit_client.unsubscribe_topic(
+            f"/sys/{self._product_key}/{self._device_name}/app/down/thing/wifi/connect/event/notify"
+        )
+        self._linkkit_client.unsubscribe_topic(
+            f"/sys/{self._product_key}/{self._device_name}/app/down/_thing/event/notify"
+        )
+        self._linkkit_client.unsubscribe_topic(f"/sys/{self._product_key}/{self._device_name}/app/down/thing/events")
+        self._linkkit_client.unsubscribe_topic(f"/sys/{self._product_key}/{self._device_name}/app/down/thing/status")
+        self._linkkit_client.unsubscribe_topic(
+            f"/sys/{self._product_key}/{self._device_name}/app/down/thing/properties"
+        )
+        self._linkkit_client.unsubscribe_topic(
+            f"/sys/{self._product_key}/{self._device_name}/app/down/thing/model/down_raw"
+        )
+
     def _thing_on_topic_message(self, topic, payload, qos, user_data) -> None:
         """Is called when thing topic comes in."""
         logger.debug(

pymammotion/proto/mctrl_nav.proto

@@ -141,7 +141,7 @@ message NavGetCommData {
   int32 subCmd = 2;
   int32 action = 3;
   int32 type = 4;
-  fixed64 hash = 5;
+  int64 hash = 5;
   int64 paternalHashA = 6;
   int64 paternalHashB = 7;
   int32 totalFrame = 8;

{pymammotion-0.4.8.dist-info → pymammotion-0.4.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.8
+Version: 0.4.10
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.4.8.dist-info → pymammotion-0.4.10.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pymammotion/__init__.py,sha256=u1OHuD8Uj0qCOH4I7Lt5d7T-TPt1R0pY-bv8S6UfVxM,1587
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
-pymammotion/aliyun/cloud_gateway.py,sha256=bLTFivD7qpNXjzpM85Tao2y2urHXah5PZOdLc3iQ1nw,26099
+pymammotion/aliyun/cloud_gateway.py,sha256=mafX63IuRhbSLNv5WjwhbDY4HJGHRCYAMJseVOQebJE,26605
 pymammotion/aliyun/model/aep_response.py,sha256=EY4uMTJ4F9rvbcXnAOc5YKi7q__9kIVgfDwfyr65Gk0,421
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
 pymammotion/aliyun/model/dev_by_account_response.py,sha256=P9yYy4Z2tLkJSqXA_5XGaCUliSSVa5ILl7VoMtL_tCA,977
@@ -33,16 +33,16 @@ pymammotion/data/model/execute_boarder.py,sha256=9rd_h4fbcsXxgnLOd2rO2hWyD1abnTG
 pymammotion/data/model/generate_route_information.py,sha256=pgjqURwmEIzjCMbl4Z5JDDkfxyUAdry1KhPfyir3-mU,777
 pymammotion/data/model/hash_list.py,sha256=1mwL715Q-OizowBDDPk1n_mYDZgb7kz24cIfzKu0QUM,7892
 pymammotion/data/model/location.py,sha256=PwmITejfI4pm7PI4rzqSuuHetwle6IJr_CV95435s2M,871
-pymammotion/data/model/mowing_modes.py,sha256=D9Tm8tRbVlu6i12-Lf3fp5KPG_qHnUvu273C6BGyJqc,975
+pymammotion/data/model/mowing_modes.py,sha256=bBbRhDe-imZsXDR0TN0emQv6BiIkAlXJFb5isPEjgDk,1078
 pymammotion/data/model/plan.py,sha256=wGlcJT-w0EdbWK9jI838TCOm_MABFg7WoR664VB8RWg,2880
 pymammotion/data/model/rapid_state.py,sha256=mIdhAG_LZXpVcybxqTLgLXkNOmVmDTn04B9PGIDA8Ls,1251
 pymammotion/data/model/raw_data.py,sha256=x2xuqVC8CQuV3ui3QK4G5EqRET9EsNljHLHR11ByYgo,6471
 pymammotion/data/model/region_data.py,sha256=VokMRqB_o4OFL1TWAM90Fvm-1z4jcYrw3X2o760qpx4,2949
-pymammotion/data/model/report_info.py,sha256=iYTESR5qFseSZ9nS9udNOE76xDVxKaWWXfLPuFjztq8,3827
+pymammotion/data/model/report_info.py,sha256=3nXBFRfdKWnZj4YfBcrPwhBRpq58ICMQlrESfI1tTMg,3808
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 pymammotion/data/mqtt/event.py,sha256=r14gzZVxmlGVAwFdZQ1CUsMZFHHwRKnbt2VHnjugP28,5123
 pymammotion/data/mqtt/properties.py,sha256=pX5JRVmmpVO04CSPm5xAGcSWA_OeLd0JnBagLsfiSEc,3755
-pymammotion/data/mqtt/status.py,sha256=DuNC3JdewLPKNqNHx76_FPXRvheYSiM-CdiVTCCYY8s,1079
+pymammotion/data/mqtt/status.py,sha256=SgdrpE1Uldb01hybO6hYhgU1Sp1eILghC0UhMZMHrdQ,1091
 pymammotion/data/state_manager.py,sha256=H3xHcLorw4xBtDAhyigl5rd1SYkLaSTBB9qQ6XQV9SM,8646
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=bj2RirSIRyBs0QvkcrOtwZWUX_8F3m1sySuHVyKmZLs,2143
@@ -68,13 +68,13 @@ pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_A
 pymammotion/mammotion/devices/base.py,sha256=Klkmvo56VgAX_zqen__lhbRb41k2U9HEHzA7t9FoZjc,10333
 pymammotion/mammotion/devices/mammotion.py,sha256=Zz2tUIdGA-jFSHLM3aO8tBMvVl7sBIBiqC9Kg7f-lm8,13190
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=oNDwtDKsdsG62frehBCg6xmwF3CD3VJ32iUwQcAjzKo,19576
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=-mUZkLP5vgApG-5r3GIRUNmjCGwas11H5u2JhrI0X3U,13929
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=ckTsfCjyCF_asXmACb7UgkPGUSdz9PqxlFdX1YPF7js,14208
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/linkkit/__init__.py,sha256=ENgc3ynd2kd9gMQR3-kgmCu6Ed9Y6XCIzU0zFReUlkk,80
 pymammotion/mqtt/linkkit/h2client.py,sha256=w9Nvi_nY4CLD_fw-pHtYChwQf7e2TiAGeqkY_sF4cf0,19659
 pymammotion/mqtt/linkkit/linkkit.py,sha256=NzFpdtfxNHQ6xNu-POyp45fTK7AWUAWV7RavFevX4m4,132772
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
-pymammotion/mqtt/mammotion_mqtt.py,sha256=dQuGz-dQnOYI7vz_v5Kn9nHcizs-S0E2lZzJlZVkG5Y,8867
+pymammotion/mqtt/mammotion_mqtt.py,sha256=urqhTIXabJ8QGAkArPZZQAm7CJQiA00912mviotTSds,10194
 pymammotion/proto/__init__.py,sha256=BLOSkNGEVbDJGtg9wYi0ziO3_tl3CIBRU3Sf9pmjuKU,72202
 pymammotion/proto/basestation.proto,sha256=_x5gAz3FkZXS1jtq4GgZgaDCuRU-UV-7HTFdsfQ3zbo,1034
 pymammotion/proto/basestation_pb2.py,sha256=PTVlHcDLQeRV6qv7ZPjGke9MF68mpqoUeJA0Sw_AoT0,2776
@@ -94,7 +94,7 @@ pymammotion/proto/luba_mul_pb2.pyi,sha256=f_lR1S7kkvwq67t7WO0SPG84dljA7fM3iCEz4x
 pymammotion/proto/mctrl_driver.proto,sha256=I0BncdAa3laeqT17Sn95r_1HuBD3dSc9IVu9U3o0fU4,1385
 pymammotion/proto/mctrl_driver_pb2.py,sha256=bfLwZb5Hehb6OIkgFrZMkQ0oTBXoOBxpruszKz-UM1U,3785
 pymammotion/proto/mctrl_driver_pb2.pyi,sha256=9_rcQELsSeOfeIQMTEFIpeXICpDe3arQeA4kAYWNSWw,5860
-pymammotion/proto/mctrl_nav.proto,sha256=bNnMQOp0lz61Xc4hiOCWGIcHF0BLk6wtfbLc7BHqn1Y,12459
+pymammotion/proto/mctrl_nav.proto,sha256=VC7lVfEfwDaj1o17CSnJRfAtxYy4wSEtOmfCZqN7050,12457
 pymammotion/proto/mctrl_nav_pb2.py,sha256=Tx1aIZlee6mt22zViX1Em6mDoI4IvY9fS0aDHBG3QQ8,24390
 pymammotion/proto/mctrl_nav_pb2.pyi,sha256=MKc6uXAhEpKE_b28wC7I09DefoDtF2ciKsfCW8uCcgk,51655
 pymammotion/proto/mctrl_ota.proto,sha256=4iHr-v1R0QiNndCnv3b6mhXiERLukB67ZzhTgt1iMc0,629
@@ -117,7 +117,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.4.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.8.dist-info/METADATA,sha256=uevomcw376FSWbXFrvPFolzgZTYXtN0XTCz9ZQiVUys,3884
-pymammotion-0.4.8.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-pymammotion-0.4.8.dist-info/RECORD,,
+pymammotion-0.4.10.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.10.dist-info/METADATA,sha256=Cd1drp-O7IQPcZRlk7EV6fQfONwNW1xqRYjE2I2mYAE,3885
+pymammotion-0.4.10.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+pymammotion-0.4.10.dist-info/RECORD,,