pymammotion 0.4.50__py3-none-any.whl → 0.4.52__py3-none-any.whl

pymammotion/data/mqtt/event.py

@@ -142,6 +142,13 @@ class DeviceConfigurationRequestEvent(GeneralParams):
     value: DeviceConfigurationRequestValue
 
 
+@dataclass
+class DeviceLogProgressEventParams(GeneralParams):
+    identifier: Literal["device_log_progress_event"]
+    type: Literal["info"]
+    value: DeviceNotificationEventValue
+
+
 @dataclass
 class ThingEventMessage(DataClassORJSONMixin):
     method: Literal["thing.events", "thing.properties"]
@@ -157,7 +164,6 @@ class ThingEventMessage(DataClassORJSONMixin):
         params_dict = payload.get("params", {})
         version = payload.get("version")
 
-        # Determina quale classe usare per i parametri
         identifier = params_dict.get("identifier")
         if identifier is None:
             """Request configuration event."""
@@ -168,6 +174,8 @@ class ThingEventMessage(DataClassORJSONMixin):
             params_obj = DeviceWarningEventParams.from_dict(params_dict)
         elif identifier == "device_biz_req_event":
             params_obj = DeviceBizReqEventParams.from_dict(params_dict)
+        elif identifier == "device_log_progress_event":
+            params_obj = DeviceLogProgressEventParams.from_dict(params_dict)
         elif identifier == "device_config_req_event":
             params_obj = payload.get("params", {})
         elif (

pymammotion/mammotion/devices/base.py

@@ -36,8 +36,6 @@ def find_next_integer(lst: list[int], current_hash: int) -> int | None:
 class MammotionBaseDevice:
     """Base class for Mammotion devices."""
 
-    command_sent_time: datetime = time.time()
-
     def __init__(self, state_manager: StateManager, cloud_device: Device) -> None:
         """Initialize MammotionBaseDevice."""
         self.loop = asyncio.get_event_loop()
@@ -46,6 +44,7 @@ class MammotionBaseDevice:
         self._raw_mower_data: RawMowerData = RawMowerData()
         self._notify_future: asyncio.Future[bytes] | None = None
         self._cloud_device = cloud_device
+        self.command_sent_time: datetime = time.time()
 
     async def datahash_response(self, hash_ack: NavGetHashListAck) -> None:
         """Handle datahash responses for root level hashs."""

pymammotion/mammotion/devices/mammotion.py

@@ -33,7 +33,7 @@ class MammotionMixedDeviceManager:
         iot_id: str,
         cloud_client: CloudIOTGateway,
         mammotion_http: MammotionHTTP,
-        cloud_device: Device | None = None,
+        cloud_device: Device,
         ble_device: BLEDevice | None = None,
         mqtt: MammotionCloud | None = None,
         preference: ConnectionPreference = ConnectionPreference.BLUETOOTH,
@@ -45,8 +45,9 @@ class MammotionMixedDeviceManager:
         self.cloud_client = cloud_client
         self._state_manager = StateManager(MowingDevice())
         self._state_manager.get_device().name = name
-        self.add_ble(cloud_device, ble_device)
-        self.add_cloud(cloud_device, mqtt)
+        self._device: Device = cloud_device
+        self.add_ble(ble_device)
+        self.add_cloud(mqtt)
         self.mammotion_http = mammotion_http
         self.preference = preference
         self._state_manager.preference = preference
@@ -71,17 +72,16 @@ class MammotionMixedDeviceManager:
         else:
             return not self.ble().command_queue.empty()
 
-    def add_ble(self, cloud_device: Device, ble_device: BLEDevice) -> None:
+    def add_ble(self, ble_device: BLEDevice) -> None:
         if ble_device is not None:
             self._ble_device = MammotionBaseBLEDevice(
-                state_manager=self._state_manager, cloud_device=cloud_device, device=ble_device
+                state_manager=self._state_manager, cloud_device=self._device, device=ble_device
             )
 
-    def add_cloud(self, cloud_device: Device, mqtt: MammotionCloud) -> None:
-        if cloud_device is not None:
-            self._cloud_device = MammotionBaseCloudDevice(
-                mqtt, cloud_device=cloud_device, state_manager=self._state_manager
-            )
+    def add_cloud(self, mqtt: MammotionCloud) -> None:
+        self._cloud_device = MammotionBaseCloudDevice(
+            mqtt, cloud_device=self._device, state_manager=self._state_manager
+        )
 
     def replace_cloud(self, cloud_device: MammotionBaseCloudDevice) -> None:
         self._cloud_device = cloud_device
@@ -231,7 +231,7 @@ class Mammotion:
                 self.device_manager.add_device(mixed_device)
             elif device.deviceName.startswith(("Luba-", "Yuka-")) and mower_device:
                 if mower_device.cloud() is None:
-                    mower_device.add_cloud(cloud_device=device, mqtt=mqtt_client)
+                    mower_device.add_cloud(mqtt=mqtt_client)
                 else:
                     mower_device.replace_mqtt(mqtt_client)
 

{pymammotion-0.4.50.dist-info → pymammotion-0.4.52.dist-info}/METADATA

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

{pymammotion-0.4.50.dist-info → pymammotion-0.4.52.dist-info}/RECORD

@@ -42,7 +42,7 @@ pymammotion/data/model/region_data.py,sha256=VokMRqB_o4OFL1TWAM90Fvm-1z4jcYrw3X2
 pymammotion/data/model/report_info.py,sha256=3nXBFRfdKWnZj4YfBcrPwhBRpq58ICMQlrESfI1tTMg,3808
 pymammotion/data/model/work.py,sha256=AfKMItFqnRtAlVHzKCfYY-BQy-WFDYZBzdj-9Yc03bo,655
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pymammotion/data/mqtt/event.py,sha256=r14gzZVxmlGVAwFdZQ1CUsMZFHHwRKnbt2VHnjugP28,5123
+pymammotion/data/mqtt/event.py,sha256=C8TGRJs9wNxwg9FFmr9qcsweDnl5v5kcVcwiHxtYzJw,5384
 pymammotion/data/mqtt/properties.py,sha256=pX5JRVmmpVO04CSPm5xAGcSWA_OeLd0JnBagLsfiSEc,3755
 pymammotion/data/mqtt/status.py,sha256=SgdrpE1Uldb01hybO6hYhgU1Sp1eILghC0UhMZMHrdQ,1091
 pymammotion/data/state_manager.py,sha256=aRpxgIxWwlMV-36YCbnIUwdcQbTrWM7p0YrQFem0wCs,10842
@@ -70,8 +70,8 @@ pymammotion/mammotion/commands/messages/video.py,sha256=KN9Zj8h7EnVipVBOzHxWF4RX
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=wM2c2vjfPjYPYmMTk77E833IN1ioearcU2pcLZUkP7I,12030
-pymammotion/mammotion/devices/mammotion.py,sha256=c578d2i0dihHtrPtzyK4qWcYGPon-gJo0L0C4g7uzQ8,14563
+pymammotion/mammotion/devices/base.py,sha256=qDh7P7fnakDKgxTqjNLcQg8eE-6gHJaXAV0ONjhy_IU,12038
+pymammotion/mammotion/devices/mammotion.py,sha256=SBisZ7zbLQmo8WpLQze5lI2gDawZpzLWZ9ANTkiLV8s,14451
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=sgfL4sz6WkIlr2bvYplzxsudmzATNE-z3UGe0K1Csng,18919
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=P352E-pcbG6wA-RXubI51EUJ3UUQcqJkxRDIqh3g-58,14217
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
@@ -123,7 +123,7 @@ pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tp
 pymammotion/utility/mur_mur_hash.py,sha256=xEfOZVbqRawJj66eLgtnZ85OauDR47oIPr29OHelzPI,4468
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.4.50.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.50.dist-info/METADATA,sha256=ntu1e_YVRR2FH4-B0XS8jqUH7GBvs2DUISuxP04zbUY,3878
-pymammotion-0.4.50.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.4.50.dist-info/RECORD,,
+pymammotion-0.4.52.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.52.dist-info/METADATA,sha256=x_e3b_Q7aNFN5jnivYyy49BKm52a0Zm7WrqK3u8SExc,3878
+pymammotion-0.4.52.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.4.52.dist-info/RECORD,,