pymammotion 0.4.8__tar.gz → 0.4.10__tar.gz

{pymammotion-0.4.8 → pymammotion-0.4.10}/PKG-INFO

@@ -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 → pymammotion-0.4.10}/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-0.4.8 → pymammotion-0.4.10}/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-0.4.8 → pymammotion-0.4.10}/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-0.4.8 → pymammotion-0.4.10}/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-0.4.8 → pymammotion-0.4.10}/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-0.4.8 → pymammotion-0.4.10}/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-0.4.8 → pymammotion-0.4.10}/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 → pymammotion-0.4.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.8"
+version     = "0.4.10"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -65,7 +65,7 @@ mypy = "^1.11.2"
 autotyping = "^24.3.0"
 
 [tool.bumpver]
-current_version = "0.4.8"
+current_version = "0.4.10"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true