pymammotion 0.5.3__tar.gz → 0.5.5__tar.gz

{pymammotion-0.5.3 → pymammotion-0.5.5}/PKG-INFO

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

{pymammotion-0.5.3 → pymammotion-0.5.5}/pymammotion/aliyun/cloud_gateway.py

@@ -5,6 +5,7 @@ import hashlib
 import hmac
 import itertools
 import json
+from json.decoder import JSONDecodeError
 from logging import getLogger
 import random
 import string
@@ -15,7 +16,6 @@ from aiohttp import ClientSession, ConnectionTimeoutError
 from alibabacloud_iot_api_gateway.models import CommonParams, Config, IoTApiRequest
 from alibabacloud_tea_util.client import Client as UtilClient
 from alibabacloud_tea_util.models import RuntimeOptions
-from orjson.orjson import JSONDecodeError
 from Tea.exceptions import UnretryableException
 
 from pymammotion.aliyun.client import Client
@@ -153,7 +153,7 @@ class CloudIOTGateway:
             return json.loads(response_body_str) if response_body_str is not None else {}
         except JSONDecodeError:
             logger.error("Couldn't decode message %s", response_body_str)
-            return {'code': 22000}
+            return {"code": 22000}
 
     def sign(self, data):
         """Generate signature for the given data."""
@@ -691,21 +691,21 @@ class CloudIOTGateway:
         return self._devices_by_account_response
 
     async def send_cloud_command(self, iot_id: str, command: bytes) -> str:
-
         """Sends a cloud command to a specified IoT device.
-        
+
         This function checks if the IoT token is expired and attempts to refresh it if
         possible. It then constructs a request using the provided command and sends it
         to the IoT device via an asynchronous HTTP POST request. The function handles
         various error codes and exceptions based on the response from the cloud
         service.
-        
+
         Args:
             iot_id (str): The unique identifier of the IoT device.
             command (bytes): The command to be sent to the IoT device in binary format.
-        
+
         Returns:
             str: A unique message ID for the sent command.
+
         """
         if command is None:
             raise Exception("Command is missing / None")

{pymammotion-0.5.3 → pymammotion-0.5.5}/pymammotion/data/mqtt/properties.py

@@ -125,13 +125,13 @@ ItemTypes = Union[
 
 
 @dataclass
-class Item:
+class Item(DataClassDictMixin):
     time: int
     value: int | float | str | dict[str, Any] | ItemTypes  # Depending on the type of value
 
 
 @dataclass
-class Items:
+class Items(DataClassDictMixin):
     iotState: Item | None = None
     extMod: Item | None = None
     deviceVersionInfo: Item | None = None
@@ -163,12 +163,12 @@ class Items:
 
 @dataclass
 class Params(DataClassORJSONMixin):
-    deviceType: Literal["LawnMower"]
+    deviceType: Literal["LawnMower", "Tracker"]
     checkFailedData: dict
     groupIdList: list[str]
     _tenantId: str
     groupId: str
-    categoryKey: Literal["LawnMower"]
+    categoryKey: Literal["LawnMower", "Tracker"]
     batchId: str
     gmtCreate: int
     productKey: str

{pymammotion-0.5.3 → pymammotion-0.5.5}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -61,7 +61,9 @@ class MammotionCloud:
         return self._mqtt_client.is_connected
 
     def disconnect(self) -> None:
-        self._mqtt_client.disconnect()
+        """Disconnect the MQTT client."""
+        if self.is_connected:
+            self._mqtt_client.disconnect()
 
     def connect_async(self) -> None:
         self._mqtt_client.connect_async()

{pymammotion-0.5.3 → pymammotion-0.5.5}/pymammotion/mqtt/linkkit/linkkit.py

@@ -1352,6 +1352,9 @@ UxeCp6
 
     def connect_async(self):
         self.__link_log.debug("connect_async")
+        if self.__linkkit_state == LinkKit.LinkKitState.CONNECTED:
+            self.__link_log.info("already connected, returning")
+            return
         if self.__linkkit_state not in (LinkKit.LinkKitState.INITIALIZED, LinkKit.LinkKitState.DISCONNECTED):
             raise LinkKit.StateError("not in INITIALIZED or DISCONNECTED state")
         self.__connect_async_req = True

{pymammotion-0.5.3 → pymammotion-0.5.5}/pymammotion/mqtt/mammotion_mqtt.py

@@ -175,18 +175,18 @@ class MammotionMQTT:
         )
         payload = json.loads(payload)
         iot_id = payload.get("params", {}).get("iotId", "")
-        if iot_id != "" and self.on_message:
+        if iot_id != "" and self.on_message is not None:
             future = asyncio.run_coroutine_threadsafe(self.on_message(topic, payload, iot_id), self.loop)
             asyncio.wrap_future(future, loop=self.loop)
 
-    def _thing_on_connect(self, session_flag, rc, user_data) -> None:
+    def _thing_on_connect(self, userdata, flags, reason_code, properties) -> None:
         """Is called on thing connect."""
         self.is_connected = True
         if self.on_connected is not None:
             future = asyncio.run_coroutine_threadsafe(self.on_connected(), self.loop)
             asyncio.wrap_future(future, loop=self.loop)
 
-        logger.debug("on_connect, session_flag:%d, rc:%d", session_flag, rc)
+        logger.debug("on_connect, session_flag:%d, rc:%d", flags, reason_code)
 
         # self._linkkit_client.subscribe_topic(f"/sys/{self._product_key}/{self._device_name}/#")
 

{pymammotion-0.5.3 → pymammotion-0.5.5}/pyproject.toml

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