pymammotion 0.4.13__tar.gz → 0.4.15__tar.gz

{pymammotion-0.4.13 → pymammotion-0.4.15}/PKG-INFO

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

{pymammotion-0.4.13 → pymammotion-0.4.15}/pymammotion/aliyun/cloud_gateway.py

@@ -146,6 +146,10 @@ class CloudIOTGateway:
 
     def get_region(self, country_code: str, auth_code: str):
         """Get the region based on country code and auth code."""
+
+        if self._region_response is not None:
+            return self._region_response
+
         config = Config(
             app_key=self._app_key,
             app_secret=self._app_secret,

{pymammotion-0.4.13 → pymammotion-0.4.15}/pymammotion/data/model/hash_list.py

@@ -269,13 +269,23 @@ class HashList(DataClassORJSONMixin):
         return missing_numbers
 
     @staticmethod
-    def _add_hash_data(hash_dict: dict, hash_data: NavGetCommData | SvgMessage) -> bool:
+    def _add_hash_data(hash_dict: dict[int, FrameList], hash_data: NavGetCommData | SvgMessage) -> bool:
         if isinstance(hash_data, SvgMessage):
             if hash_dict.get(hash_data.data_hash) is None:
                 hash_dict[hash_data.data_hash] = FrameList(total_frame=hash_data.total_frame, data=[hash_data])
                 return True
 
             if hash_data not in hash_dict[hash_data.data_hash].data:
+                exists = next(
+                    (
+                        rhl
+                        for rhl in hash_dict[hash_data.data_hash].data
+                        if rhl.current_frame == hash_data.current_frame
+                    ),
+                    None,
+                )
+                if exists:
+                    return True
                 hash_dict[hash_data.data_hash].data.append(hash_data)
                 return True
             return False
@@ -285,6 +295,12 @@ class HashList(DataClassORJSONMixin):
             return True
 
         if hash_data not in hash_dict[hash_data.hash].data:
+            exists = next(
+                (rhl for rhl in hash_dict[hash_data.hash].data if rhl.current_frame == hash_data.current_frame),
+                None,
+            )
+            if exists:
+                return True
             hash_dict[hash_data.hash].data.append(hash_data)
             return True
         return False

{pymammotion-0.4.13 → pymammotion-0.4.15}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -1,5 +1,5 @@
 import asyncio
-from asyncio import TimerHandle
+from asyncio import InvalidStateError, TimerHandle
 import base64
 from collections import deque
 from collections.abc import Awaitable, Callable
@@ -11,7 +11,7 @@ import betterproto
 from Tea.exceptions import UnretryableException
 
 from pymammotion import CloudIOTGateway, MammotionMQTT
-from pymammotion.aliyun.cloud_gateway import DeviceOfflineException
+from pymammotion.aliyun.cloud_gateway import CheckSessionException, DeviceOfflineException, SetupException
 from pymammotion.aliyun.model.dev_by_account_response import Device
 from pymammotion.data.mqtt.event import ThingEventMessage
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
@@ -87,7 +87,11 @@ class MammotionCloud:
                 future.set_result(result)
             except Exception as ex:
                 # Set the exception on the future if something goes wrong
-                future.set_exception(ex)
+                try:
+                    future.set_exception(ex)
+                except InvalidStateError:
+                    """Dead end, log an error."""
+                    _LOGGER.exception("InvalidStateError while trying to bubble up exception")
             finally:
                 # Mark the task as done
                 self.command_queue.task_done()
@@ -239,7 +243,10 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
     async def _ble_sync(self) -> None:
         command_bytes = self._commands.send_todev_ble_sync(3)
         loop = asyncio.get_running_loop()
-        await loop.run_in_executor(None, self._mqtt.send_command, self.iot_id, command_bytes)
+        try:
+            await loop.run_in_executor(None, self._mqtt.send_command, self.iot_id, command_bytes)
+        except (CheckSessionException, SetupException):
+            self._ble_sync_task.cancel()
 
     async def run_periodic_sync_task(self) -> None:
         """Send ble sync to robot."""

{pymammotion-0.4.13 → pymammotion-0.4.15}/pyproject.toml

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