pymammotion 0.4.50__tar.gz → 0.4.51__tar.gz

{pymammotion-0.4.50 → pymammotion-0.4.51}/PKG-INFO

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

{pymammotion-0.4.50 → pymammotion-0.4.51}/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-0.4.50 → pymammotion-0.4.51}/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 → pymammotion-0.4.51}/pyproject.toml

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