pymammotion 0.4.9__tar.gz → 0.4.11b1__tar.gz

{pymammotion-0.4.9 → pymammotion-0.4.11b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.9
+Version: 0.4.11b1
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.4.9 → pymammotion-0.4.11b1}/pymammotion/aliyun/cloud_gateway.py

@@ -46,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."""
@@ -54,6 +58,10 @@ 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."""
@@ -62,6 +70,10 @@ class NoConnectionException(UnretryableException):
 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."""
@@ -696,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.9 → pymammotion-0.4.11b1}/pymammotion/data/model/hash_list.py

@@ -118,7 +118,7 @@ class HashList(DataClassORJSONMixin):
     hashlist for all our hashIDs for verification
     """
 
-    root_hash_list: RootHashList = field(default_factory=RootHashList)
+    root_hash_lists: list[RootHashList] = field(default_factory=list)
     area: dict = field(default_factory=dict)  # type 0
     path: dict = field(default_factory=dict)  # type 2
     obstacle: dict = field(default_factory=dict)  # type 1
@@ -135,37 +135,51 @@ class HashList(DataClassORJSONMixin):
 
     @property
     def hashlist(self) -> list[int]:
-        if len(self.root_hash_list.data) == 0:
+        if not self.root_hash_lists:
             return []
-        return [i for obj in self.root_hash_list.data for i in obj.data_couple]
+        # Combine data_couple from all RootHashLists
+        return [i for root_list in self.root_hash_lists for obj in root_list.data for i in obj.data_couple]
 
     @property
     def missing_hashlist(self) -> list[int]:
         """Return missing hashlist."""
+        all_hash_ids = set(self.area.keys()).union(
+            self.path.keys(), self.obstacle.keys(), self.dump.keys(), self.svg.keys()
+        )
         return [
             i
-            for obj in self.root_hash_list.data
+            for root_list in self.root_hash_lists
+            for obj in root_list.data
             for i in obj.data_couple
-            if f"{i}"
-            not in set(self.area.keys()).union(
-                self.path.keys(), self.obstacle.keys(), self.dump.keys(), self.svg.keys()
-            )
+            if f"{i}" not in all_hash_ids
         ]
 
     def update_root_hash_list(self, hash_list: NavGetHashListData) -> None:
-        self.root_hash_list.total_frame = hash_list.total_frame
+        target_root_list = next((rhl for rhl in self.root_hash_lists if rhl.total_frame == hash_list.total_frame), None)
 
-        for index, obj in enumerate(self.root_hash_list.data):
+        if target_root_list is None:
+            # Create new RootHashList if none exists for this total_frame
+            new_root_list = RootHashList(total_frame=hash_list.total_frame, data=[hash_list])
+            self.root_hash_lists.append(new_root_list)
+            return
+
+        for index, obj in enumerate(target_root_list.data):
             if obj.current_frame == hash_list.current_frame:
                 # Replace the item if current_frame matches
-                self.root_hash_list.data[index] = hash_list
+                target_root_list.data[index] = hash_list
                 return
 
         # If no match was found, append the new item
-        self.root_hash_list.data.append(hash_list)
+        target_root_list.data.append(hash_list)
 
     def missing_hash_frame(self) -> list[int]:
-        return self._find_missing_frames(self.root_hash_list)
+        """Returns a combined list of all missing frames across all RootHashLists."""
+        missing_frames = []
+        for root_list in self.root_hash_lists:
+            missing = self._find_missing_frames(root_list)
+            if missing:
+                missing_frames.extend(missing)
+        return missing_frames
 
     def missing_frame(self, hash_data: NavGetCommDataAck | SvgMessageAckT) -> list[int]:
         if hash_data.type == PathType.AREA:

{pymammotion-0.4.9 → pymammotion-0.4.11b1}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -219,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:
@@ -227,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.9 → pymammotion-0.4.11b1}/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.9 → pymammotion-0.4.11b1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.9"
+version     = "0.4.11-beta1"
 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.9"
+current_version = "0.4.11-beta1"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true