pymammotion 0.2.52__py3-none-any.whl → 0.2.54__py3-none-any.whl

pymammotion/data/model/hash_list.py

@@ -82,12 +82,10 @@ class HashList(DataClassORJSONMixin):
             if obj.current_frame == hash_list.current_frame:
                 # Replace the item if current_frame matches
                 self.root_hash_list.data[index] = hash_list
-                self.update_hash_lists(self.hashlist)
                 return
 
         # If no match was found, append the new item
         self.root_hash_list.data.append(hash_list)
-        self.update_hash_lists(self.hashlist)
 
     def missing_hash_frame(self):
         return self._find_missing_frames(self.root_hash_list)

pymammotion/mammotion/devices/mammotion.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 import asyncio
 import logging
 from enum import Enum
-from functools import cache
 from typing import Any
 
 from bleak.backends.device import BLEDevice
@@ -45,16 +44,15 @@ class MammotionMixedDeviceManager:
         mqtt: MammotionCloud | None = None,
         preference: ConnectionPreference = ConnectionPreference.BLUETOOTH,
     ) -> None:
-        self._mower_state = None
         self.name = name
-        self._mowing_state = MowingDevice()
+        self._mower_state = MowingDevice()
         self.add_ble(ble_device)
         self.add_cloud(cloud_device, mqtt)
         self.preference = preference
 
     @property
     def mower_state(self):
-        return self._mowing_state
+        return self._mower_state
 
     @mower_state.setter
     def mower_state(self, value: MowingDevice) -> None:
@@ -62,7 +60,7 @@ class MammotionMixedDeviceManager:
             self._cloud_device.state_manager.set_device(value)
         if self._ble_device:
             self._ble_device.state_manager.set_device(value)
-        self._mowing_state = value
+        self._mower_state = value
 
     def ble(self) -> MammotionBaseBLEDevice | None:
         return self._ble_device
@@ -70,6 +68,12 @@ class MammotionMixedDeviceManager:
     def cloud(self) -> MammotionBaseCloudDevice | None:
         return self._cloud_device
 
+    def has_queued_commands(self) -> bool:
+        if self.has_cloud() and self.preference == ConnectionPreference.WIFI:
+            return not self.cloud()._mqtt.command_queue.empty()
+        else:
+            return False
+
     def add_ble(self, ble_device: BLEDevice) -> None:
         if ble_device is not None:
             self._ble_device = MammotionBaseBLEDevice(self.mower_state, ble_device)
@@ -145,7 +149,6 @@ async def create_devices(
     return mammotion
 
 
-@cache
 class Mammotion:
     """Represents a Mammotion account and its devices."""
 

{pymammotion-0.2.52.dist-info → pymammotion-0.2.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.2.52
+Version: 0.2.54
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur
@@ -18,20 +18,17 @@ Requires-Dist: alicloud-gateway-iot (>=1.0.0,<2.0.0)
 Requires-Dist: aliyun-iot-linkkit (>=1.2.12,<2.0.0)
 Requires-Dist: aliyun-python-sdk-iot (>=8.57.0,<9.0.0)
 Requires-Dist: async-timeout (>=4.0.3,<5.0.0)
-Requires-Dist: autotyping (>=24.3.0,<25.0.0)
 Requires-Dist: betterproto (>=1.2.5,<2.0.0)
 Requires-Dist: bleak (>=0.21.0)
 Requires-Dist: bleak-retry-connector (>=3.5.0,<4.0.0)
 Requires-Dist: jsonic (>=1.0.0,<2.0.0)
 Requires-Dist: mashumaro (>=3.13,<4.0)
-Requires-Dist: mypy (>=1.11.2,<2.0.0)
 Requires-Dist: nest-asyncio (>=1.6.0,<2.0.0)
-Requires-Dist: numpy (>=1.26.0,<2.0.0)
+Requires-Dist: numpy (>=1.26.4,<2.0.0)
 Requires-Dist: orjson (>=3.9.15,<4.0.0)
 Requires-Dist: paho-mqtt (>=1.6.1,<2.0.0)
 Requires-Dist: protobuf (>=4.23.1)
 Requires-Dist: py-jsonic (>=0.0.2,<0.0.3)
-Requires-Dist: pyjoystick (>=1.2.4,<2.0.0)
 Description-Content-Type: text/markdown
 
 # PyMammotion - Python API for Mammotion Mowers [![Discord](https://img.shields.io/discord/1247286396297678879)](https://discord.gg/vpZdWhJX8x)

{pymammotion-0.2.52.dist-info → pymammotion-0.2.54.dist-info}/RECORD

@@ -28,7 +28,7 @@ pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3
 pymammotion/data/model/excute_boarder_params.py,sha256=9CpUqrygcle1C_1hDW-riLmm4map4ZbE842NXjcomEI,1394
 pymammotion/data/model/execute_boarder.py,sha256=9rd_h4fbcsXxgnLOd2rO2hWyD1abnTGc47QTEpp8DD0,1103
 pymammotion/data/model/generate_route_information.py,sha256=MkUBoqGtCAKmiVQ4Q1pEoDVHZs5uLIo7vhfWT4nGbtY,801
-pymammotion/data/model/hash_list.py,sha256=UOefAP9NHUX9cYDai1n0eogXVQXPqQO7B4S9Oo42X7Q,5283
+pymammotion/data/model/hash_list.py,sha256=v9zoOhrwr1TMTsyPL-BQSylbqfapmO4l5oIefaW9YHw,5183
 pymammotion/data/model/location.py,sha256=PwmITejfI4pm7PI4rzqSuuHetwle6IJr_CV95435s2M,871
 pymammotion/data/model/mowing_modes.py,sha256=5TrHSijUyPtIDWpNtgzx_vFQukRJWRz4gIrUaXggKPw,827
 pymammotion/data/model/plan.py,sha256=mcadkSL7fQXy0iJ0q786I3GEQY4i6kmQXfW6Ri69lcQ,2906
@@ -61,7 +61,7 @@ pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
 pymammotion/mammotion/devices/base.py,sha256=MXAuJ9sGnf9QqBeNxGbOkdtqwVpPocVdxw0uT0DgSks,9800
-pymammotion/mammotion/devices/mammotion.py,sha256=QKSQmF0HojVND-quF4gxngZoMiKwubxKSn_1tS83ubk,12318
+pymammotion/mammotion/devices/mammotion.py,sha256=OFLrxstDnOtfq1ikC-HF8MaWy5h3Wjmlw-hvHRmAZdc,12472
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=nyO7pkKgAoRPs-28ESf6ee-y3G5JTYRO-MCp4wKPMlE,17476
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=VuXuYlvi-HRbfRlgIV3KraVtbu2EM3QxP-JWWAYj_E0,11774
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
@@ -118,7 +118,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.2.52.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.52.dist-info/METADATA,sha256=KHNWfLO2GVaCyxEVS7pI-xhYewSWfy2CDFwrOtiAMQM,4052
-pymammotion-0.2.52.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.52.dist-info/RECORD,,
+pymammotion-0.2.54.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.54.dist-info/METADATA,sha256=j0TL-HVDtfRxxrsPXUDv5mofUmhqXbUFUO7FTxv_9RI,3926
+pymammotion-0.2.54.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.54.dist-info/RECORD,,