pymammotion 0.4.0b6__tar.gz → 0.4.0b8__tar.gz

{pymammotion-0.4.0b6 → pymammotion-0.4.0b8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.0b6
+Version: 0.4.0b8
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur
@@ -15,7 +15,6 @@ Requires-Dist: aiohttp (>=3.9.1,<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)
-Requires-Dist: aliyun-iot-linkkit (>=1.2.12,<2.0.0)
 Requires-Dist: async-timeout (>=4.0.3,<5.0.0)
 Requires-Dist: betterproto (>=1.2.5,<2.0.0)
 Requires-Dist: bleak (>=0.21.0)
@@ -26,7 +25,7 @@ Requires-Dist: jsonic (>=1.0.0,<2.0.0)
 Requires-Dist: mashumaro (>=3.13,<4.0)
 Requires-Dist: numpy (>=1.26.0)
 Requires-Dist: orjson (>=3.9.15,<4.0.0)
-Requires-Dist: paho-mqtt (>=1.6.1,<2.0.0)
+Requires-Dist: paho-mqtt (>=2.1.0,<3.0.0)
 Requires-Dist: protobuf (>=4.23.1)
 Requires-Dist: py-jsonic (>=0.0.2,<0.0.3)
 Description-Content-Type: text/markdown

{pymammotion-0.4.0b6 → pymammotion-0.4.0b8}/pymammotion/data/state_manager.py

@@ -52,6 +52,7 @@ class StateManager:
         self._device = device
 
     def properties(self, thing_properties: ThingPropertiesMessage) -> None:
+        # TODO update device based off thing properties
         self._device.mqtt_properties = thing_properties
 
     def status(self, thing_status: ThingStatusMessage) -> None:
@@ -70,19 +71,19 @@ class StateManager:
     async def gethash_ack_callback(self, msg: NavGetHashListAck) -> None:
         if self.cloud_gethash_ack_callback:
             await self.cloud_gethash_ack_callback(msg)
-        if self.ble_gethash_ack_callback:
+        elif self.ble_gethash_ack_callback:
             await self.ble_gethash_ack_callback(msg)
 
     async def on_notification_callback(self, res: tuple[str, Any | None]) -> None:
         if self.cloud_on_notification_callback:
             await self.cloud_on_notification_callback(res)
-        if self.ble_on_notification_callback:
+        elif self.ble_on_notification_callback:
             await self.ble_on_notification_callback(res)
 
     async def get_commondata_ack_callback(self, comm_data: NavGetCommDataAck | SvgMessageAckT) -> None:
         if self.cloud_get_commondata_ack_callback:
             await self.cloud_get_commondata_ack_callback(comm_data)
-        if self.ble_get_commondata_ack_callback:
+        elif self.ble_get_commondata_ack_callback:
             await self.ble_get_commondata_ack_callback(comm_data)
 
     async def notification(self, message: LubaMsg) -> None:
@@ -94,7 +95,7 @@ class StateManager:
             case "nav":
                 await self._update_nav_data(message)
             case "sys":
-                await self._update_sys_data(message)
+                self._update_sys_data(message)
             case "driver":
                 self._update_driver_data(message)
             case "net":
@@ -130,7 +131,7 @@ class StateManager:
                 converted_list = [AreaHashNameList(name=item.name, hash=item.hash) for item in hash_names.hashnames]
                 self._device.map.area_name = converted_list
 
-    async def _update_sys_data(self, message) -> None:
+    def _update_sys_data(self, message) -> None:
         """Update system."""
         sys_msg = betterproto.which_one_of(message.sys, "SubSysMsg")
         match sys_msg[0]:
@@ -148,8 +149,9 @@ class StateManager:
                 self._device.mower_state.side_led = side_led
             case "device_product_type_info":
                 device_product_type: DeviceProductTypeInfoT = sys_msg[1]
-                self._device.mower_state.model_id = device_product_type.main_product_type
-                self._device.mower_state.sub_model_id = device_product_type.sub_product_type
+                if device_product_type.main_product_type != "" or device_product_type.sub_product_type != "":
+                    self._device.mower_state.model_id = device_product_type.main_product_type
+                    self._device.mower_state.sub_model_id = device_product_type.sub_product_type
             case "toapp_dev_fw_info":
                 device_fw_info: DeviceFwInfo = sys_msg[1]
                 self._device.device_firmwares.device_version = device_fw_info.version

{pymammotion-0.4.0b6 → pymammotion-0.4.0b8}/pymammotion/mammotion/devices/mammotion.py

@@ -84,9 +84,15 @@ class MammotionMixedDeviceManager:
     def replace_cloud(self, cloud_device: MammotionBaseCloudDevice) -> None:
         self._cloud_device = cloud_device
 
+    def remove_cloud(self) -> None:
+        del self._cloud_device
+
     def replace_ble(self, ble_device: MammotionBaseBLEDevice) -> None:
         self._ble_device = ble_device
 
+    def remove_ble(self) -> None:
+        del self._ble_device
+
     def replace_mqtt(self, mqtt: MammotionCloud) -> None:
         device = self._cloud_device.device
         self._cloud_device = MammotionBaseCloudDevice(mqtt, cloud_device=device, state_manager=self._state_manager)

{pymammotion-0.4.0b6 → pymammotion-0.4.0b8}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -184,6 +184,8 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._mqtt.on_disconnected_event.remove_subscribers(self.on_disconnect)
         self._mqtt.on_connected_event.remove_subscribers(self.on_connect)
         self._mqtt.mqtt_message_event.remove_subscribers(self._parse_message_for_device)
+        self._state_manager.cloud_gethash_ack_callback = None
+        self._state_manager.cloud_get_commondata_ack_callback = None
         if self._ble_sync_task:
             self._ble_sync_task.cancel()
 
@@ -317,6 +319,8 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             if new_msg.net.todev_ble_sync != 0 or has_field(new_msg.net.toapp_wifi_iot_status):
                 return
 
+        await self._state_manager.notification(new_msg)
+
         if len(self._mqtt.waiting_queue) > 0:
             fut: MammotionFuture = self.dequeue_by_iot_id(self._mqtt.waiting_queue, self.iot_id)
             if fut is None:
@@ -325,7 +329,6 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
                 fut = self.dequeue_by_iot_id(self._mqtt.waiting_queue, self.iot_id)
             if not fut.fut.cancelled():
                 fut.resolve(cast(bytes, binary_data))
-        await self._state_manager.notification(new_msg)
 
     @property
     def mqtt(self):

pymammotion-0.4.0b8/pymammotion/mqtt/linkkit/__init__.py

@@ -0,0 +1,5 @@
+"""Package for linkkit."""
+
+from .linkkit import LinkKit
+
+__all__ = ["LinkKit"]