pymammotion 0.4.55__tar.gz → 0.4.56__tar.gz

{pymammotion-0.4.55 → pymammotion-0.4.56}/PKG-INFO

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

{pymammotion-0.4.55 → pymammotion-0.4.56}/pymammotion/aliyun/client.py

@@ -1,3 +1,4 @@
+from datetime import UTC, datetime
 import time
 
 from Tea.exceptions import UnretryableException
@@ -103,7 +104,7 @@ class Client:
                 _request.headers = TeaCore.merge(
                     {
                         "host": self._domain,
-                        "date": UtilClient.get_date_utcstring(),
+                        "date": datetime.now(UTC).strftime("%a, %d %b %Y %H:%M:%S GMT"),
                         "x-ca-nonce": UtilClient.get_nonce(),
                         "x-ca-key": self._app_key,
                         "x-ca-signaturemethod": "HmacSHA256",

{pymammotion-0.4.55 → pymammotion-0.4.56}/pymammotion/data/state_manager.py

@@ -1,7 +1,7 @@
 """Manage state from notifications into MowingDevice."""
 
 from collections.abc import Awaitable, Callable
-from datetime import datetime
+from datetime import UTC, datetime
 import logging
 from typing import Any
 
@@ -41,7 +41,7 @@ class StateManager:
 
     def __init__(self, device: MowingDevice) -> None:
         self._device: MowingDevice = device
-        self.last_updated_at = datetime.now()
+        self.last_updated_at = datetime.now(UTC)
         self.preference = ConnectionPreference.WIFI
         self.cloud_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
         self.cloud_get_commondata_ack_callback: (
@@ -115,7 +115,7 @@ class StateManager:
     async def notification(self, message: LubaMsg) -> None:
         """Handle protobuf notifications."""
         res = betterproto.which_one_of(message, "LubaSubMsg")
-        self.last_updated_at = datetime.now()
+        self.last_updated_at = datetime.now(UTC)
         # additional catch all if we don't get a status update
         if not self._device.online:
             self._device.online = True

{pymammotion-0.4.55 → pymammotion-0.4.56}/pymammotion/http/http.py

@@ -107,7 +107,9 @@ class MammotionHTTP:
                 # TODO catch errors from mismatch like token expire etc
                 # Assuming the data format matches the expected structure
                 response = Response[StreamSubscriptionResponse].from_dict(data)
-                response.data = StreamSubscriptionResponse.from_dict(data["data"])
+                if response.code != 0:
+                    return response
+                response.data = StreamSubscriptionResponse.from_dict(data.get("data", {}))
                 return response
 
     async def get_stream_subscription_mini_or_x_series(
@@ -138,7 +140,9 @@ class MammotionHTTP:
                 # TODO catch errors from mismatch like token expire etc
                 # Assuming the data format matches the expected structure
                 response = Response[StreamSubscriptionResponse].from_dict(data)
-                response.data = StreamSubscriptionResponse.from_dict(data["data"])
+                if response.code != 0:
+                    return response
+                response.data = StreamSubscriptionResponse.from_dict(data.get("data", {}))
                 return response
 
     async def get_video_resource(self, iot_id: str) -> Response[VideoResourceResponse]:
@@ -155,7 +159,11 @@ class MammotionHTTP:
                 data = await resp.json()
                 # TODO catch errors from mismatch like token expire etc
                 # Assuming the data format matches the expected structure
-                return Response[VideoResourceResponse].from_dict(data)
+                response = Response[VideoResourceResponse].from_dict(data)
+                if response.code != 0:
+                    return response
+                response.data = VideoResourceResponse.from_dict(data.get("data", {}))
+                return response
 
     async def refresh_login(self, account: str, password: str | None = None) -> Response[LoginResponseData]:
         if self._password is None and password is not None:

{pymammotion-0.4.55 → pymammotion-0.4.56}/pymammotion/mammotion/commands/messages/system.py

@@ -202,6 +202,7 @@ class MessageSystem(AbstractMessage, ABC):
     #     return self.send_order_msg_sys(build2)
 
     def send_sys_set_date_time(self) -> bytes:
+        # TODO get HA timezone
         calendar = datetime.datetime.now()
         i = calendar.year
         i2 = calendar.month

{pymammotion-0.4.55 → pymammotion-0.4.56}/pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -345,7 +345,8 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
             return
 
         new_msg = LubaMsg().parse(data)
-        if betterproto.serialized_on_wire(new_msg.net):
+        res = betterproto.which_one_of(new_msg, "LubaSubMsg")
+        if res[0] == "net":
             if new_msg.net.todev_ble_sync != 0 or has_field(new_msg.net.toapp_wifi_iot_status):
                 if has_field(new_msg.net.toapp_wifi_iot_status) and self._commands.get_device_product_key() == "":
                     self._commands.set_device_product_key(new_msg.net.toapp_wifi_iot_status.productkey)

{pymammotion-0.4.55 → pymammotion-0.4.56}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -326,7 +326,8 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         ):
             self._commands.set_device_product_key(event.params.productKey)
 
-        if betterproto.serialized_on_wire(new_msg.net):
+        res = betterproto.which_one_of(new_msg, "LubaSubMsg")
+        if res[0] == "net":
             if new_msg.net.todev_ble_sync != 0 or has_field(new_msg.net.toapp_wifi_iot_status):
                 return
 

{pymammotion-0.4.55 → pymammotion-0.4.56}/pyproject.toml

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