pymammotion 0.4.26__tar.gz → 0.4.28__tar.gz

{pymammotion-0.4.26 → pymammotion-0.4.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.26
+Version: 0.4.28
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur
@@ -10,7 +10,8 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: aiohttp (>=3.9.1,<4.0.0)
+Classifier: Programming Language :: Python :: 3.13
+Requires-Dist: aiohttp (>=3.11.18,<4.0.0)
 Requires-Dist: alibabacloud-apigateway-util (>=0.0.2,<0.0.3)
 Requires-Dist: alibabacloud-iot-api-gateway (>=0.0.4,<0.0.5)
 Requires-Dist: alicloud-gateway-iot (>=1.0.0,<2.0.0)

{pymammotion-0.4.26 → pymammotion-0.4.28}/pymammotion/data/model/hash_list.py

@@ -280,7 +280,8 @@ class HashList(DataClassORJSONMixin):
         return []
 
     def update_plan(self, plan: Plan) -> None:
-        self.plan[plan.plan_index] = plan
+        if plan.total_plan_num != 0:
+            self.plan[plan.plan_index] = plan
 
     def update(self, hash_data: NavGetCommData | SvgMessage) -> bool:
         """Update the map data."""

{pymammotion-0.4.26 → pymammotion-0.4.28}/pymammotion/data/state_manager.py

@@ -102,7 +102,7 @@ class StateManager:
 
     async def get_plan_callback(self, planjob: NavPlanJobSet) -> None:
         if self.cloud_get_plan_callback:
-            await self.get_plan_callback(planjob)
+            await self.cloud_get_plan_callback(planjob)
         elif self.ble_get_plan_callback:
             await self.ble_get_plan_callback(planjob)
 

{pymammotion-0.4.26 → pymammotion-0.4.28}/pymammotion/mammotion/commands/messages/video.py

@@ -8,7 +8,7 @@ from pymammotion.utility.device_type import DeviceType
 
 
 class MessageVideo(AbstractMessage, ABC):
-    async def send_order_msg_video(self, mul):
+    def send_order_msg_video(self, mul):
         luba_msg = LubaMsg(
             msgtype=MsgCmdType.MUL,
             msgattr=MsgAttr.REQ,

{pymammotion-0.4.26 → pymammotion-0.4.28}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -21,6 +21,7 @@ from pymammotion.event.event import DataEvent
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
 from pymammotion.mammotion.devices.base import MammotionBaseDevice
 from pymammotion.proto import LubaMsg, has_field
+from pymammotion.utility.constant.device_constant import NO_REQUEST_MODES
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -228,13 +229,13 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         #     self.mqtt._mqtt_client.thing_on_thing_enable(None)
 
     async def _ble_sync(self) -> None:
-        if self.stopped or self._mqtt.is_connected is False:
+        if self.stopped or self.mqtt.is_connected is False or self.state_manager.get_device().report_data.dev.sys_status in NO_REQUEST_MODES:
             return
 
         command_bytes = self._commands.send_todev_ble_sync(3)
         try:
             await self._mqtt.send_command(self.iot_id, command_bytes)
-        except (CheckSessionException, SetupException):
+        except (CheckSessionException, SetupException, DeviceOfflineException):
             if self._ble_sync_task:
                 self._ble_sync_task.cancel()
 

{pymammotion-0.4.26 → pymammotion-0.4.28}/pymammotion/utility/constant/device_constant.py

@@ -213,6 +213,19 @@ class WorkMode:
     MODE_CHARGING_PAUSE = 39
 
 
+NO_REQUEST_MODES = (
+    WorkMode.MODE_JOB_DRAW,
+    WorkMode.MODE_OBSTACLE_DRAW,
+    WorkMode.MODE_CHANNEL_DRAW,
+    WorkMode.MODE_ERASER_DRAW,
+    WorkMode.MODE_UPDATING,
+    WorkMode.MODE_EDIT_BOUNDARY,
+    WorkMode.MODE_UPDATING,
+    WorkMode.MODE_LOCK,
+    WorkMode.MODE_MANUAL_MOWING,
+)
+
+
 def device_connection(connect: ConnectData) -> str:
     """Return string representation of device connection."""
 

{pymammotion-0.4.26 → pymammotion-0.4.28}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.26"
+version     = "0.4.28"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -21,11 +21,11 @@ packages = [{include = "pymammotion"}]
 
 
 [tool.poetry.dependencies]
-python = ">=3.11,<3.13"
+python = ">=3.11,<3.14"
 bleak = ">=0.21.0"
 protobuf = ">=4.23.1"
 py-jsonic = "^0.0.2"
-aiohttp = "^3.9.1"
+aiohttp = "^3.11.18"
 paho-mqtt = "^2.1.0"
 alicloud-gateway-iot = "^1.0.0"
 alibabacloud-apigateway-util = "^0.0.2"
@@ -66,7 +66,7 @@ autotyping = "^24.3.0"
 ipython = "^9.0.2"
 
 [tool.bumpver]
-current_version = "0.4.26"
+current_version = "0.4.28"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true