pymammotion 0.4.55__py3-none-any.whl → 0.4.56__py3-none-any.whl

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/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/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/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/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/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.dist-info → pymammotion-0.4.56.dist-info}/METADATA

@@ -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.dist-info → pymammotion-0.4.56.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pymammotion/__init__.py,sha256=H-U94bNLp0LPC6hkRopVEUlUsZSR97n7WfKGPjK1GMg,1638
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
-pymammotion/aliyun/client.py,sha256=44YqBt0advxbYYXs25Jpq438lhEXrP6xaBWWMGBLdp4,9603
+pymammotion/aliyun/client.py,sha256=GCpAnLOVWW_W0c8UvdRpWVzZH5oLto8JZnb82stJi-8,9662
 pymammotion/aliyun/cloud_gateway.py,sha256=DAawjvmlrdYrxzA-C4aXPN0hTx9FIXoIn5I4JSn2adw,28712
 pymammotion/aliyun/model/aep_response.py,sha256=EY4uMTJ4F9rvbcXnAOc5YKi7q__9kIVgfDwfyr65Gk0,421
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
@@ -45,13 +45,13 @@ pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdr
 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
+pymammotion/data/state_manager.py,sha256=wgTCt4fDtxx0YwwB30tXsHf5L-hRRUV1fpAEGcWpnsY,10853
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=bj2RirSIRyBs0QvkcrOtwZWUX_8F3m1sySuHVyKmZLs,2143
 pymammotion/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/encryption.py,sha256=lzXu3WwBdQlzjXxWnlJuRgkCrKdPbxx5drhMitVKIEk,8287
-pymammotion/http/http.py,sha256=ODG6VXGEn73WQVeH0llhw7vC1UA6lJ5p7dKJlSnx_FM,9787
+pymammotion/http/http.py,sha256=MTktxlOluwE2gjsLWoQLYimiACyl1F5Joc1mosBLJpk,10150
 pymammotion/http/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/model/camera_stream.py,sha256=ilxQNny_w9Frwt-m8kbHinvyjDv4Bx8C2swfZ2lTEDE,600
 pymammotion/http/model/http.py,sha256=tM5ikwVkWhRdXc2xi1NOLmWPH2mQEQelpaVgMlAEmlI,2333
@@ -65,15 +65,15 @@ pymammotion/mammotion/commands/messages/media.py,sha256=a6CY_1wEpepH9zg6-HfH1lt-
 pymammotion/mammotion/commands/messages/navigation.py,sha256=aEEpvDW5QukJ0QiWMhPjjz0eTTF1ndQuvv8a6hJlUg0,23257
 pymammotion/mammotion/commands/messages/network.py,sha256=OrmW4-BP_o3piBjwXZ12WY0HqbXHQqeDXC0YaDPeBM8,7409
 pymammotion/mammotion/commands/messages/ota.py,sha256=ZHLQRE5ETvLEIu2Vbj3m2XidIWT8uorYSHxkZd3pkRc,1376
-pymammotion/mammotion/commands/messages/system.py,sha256=XOEeyUAz1iNtPk37dzCbLrxx1pljUlGy1IKuof_Pko0,14244
+pymammotion/mammotion/commands/messages/system.py,sha256=P_J6ikTXGuVEsekOKGEV6o-wfrFDf8ChF4Tzxz6uDtY,14275
 pymammotion/mammotion/commands/messages/video.py,sha256=KN9Zj8h7EnVipVBOzHxWF4RXhU3MpueYe1GNErGHapg,1248
 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=qDh7P7fnakDKgxTqjNLcQg8eE-6gHJaXAV0ONjhy_IU,12038
 pymammotion/mammotion/devices/mammotion.py,sha256=SBisZ7zbLQmo8WpLQze5lI2gDawZpzLWZ9ANTkiLV8s,14451
-pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=MWoaiHqNRh_bHlvjmVPRjYVauVNIVgDpOIsC-UDvYMc,18949
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=P352E-pcbG6wA-RXubI51EUJ3UUQcqJkxRDIqh3g-58,14217
+pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=tHG4oqX5vQsEGEHNX5xbT9hfH8MFROeGsFksXFTD7QQ,18983
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=PJpGFQKTdPafarh5zA1z1zU0Wr6M6tBa_YiYqi_Kd3E,14251
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/linkkit/__init__.py,sha256=ENgc3ynd2kd9gMQR3-kgmCu6Ed9Y6XCIzU0zFReUlkk,80
 pymammotion/mqtt/linkkit/h2client.py,sha256=w9Nvi_nY4CLD_fw-pHtYChwQf7e2TiAGeqkY_sF4cf0,19659
@@ -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.55.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.55.dist-info/METADATA,sha256=4jYgGWTc7IL4ReWqPIUKdejtwmi78Syo_DL7jlrTY14,3878
-pymammotion-0.4.55.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.4.55.dist-info/RECORD,,
+pymammotion-0.4.56.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.56.dist-info/METADATA,sha256=cHeXrfxMupBNbv-44bLW-5SKV46qpME4xGq9Ctn5w3Y,3878
+pymammotion-0.4.56.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.4.56.dist-info/RECORD,,