pymammotion 0.5.18__tar.gz → 0.5.19__tar.gz

{pymammotion-0.5.18 → pymammotion-0.5.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.5.18
+Version: 0.5.19
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur
@@ -16,7 +16,7 @@ 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: async-timeout (>=4.0.3,<5.0.0)
-Requires-Dist: betterproto (>=1.2.5,<2.0.0)
+Requires-Dist: betterproto2 (>=0.8.0,<0.9.0)
 Requires-Dist: bleak (>=0.21.0)
 Requires-Dist: bleak-retry-connector (>=3.5.0)
 Requires-Dist: crcmod (>=1.7,<2.0)

{pymammotion-0.5.18 → pymammotion-0.5.19}/pymammotion/data/model/device.py

@@ -2,7 +2,7 @@
 
 from dataclasses import dataclass, field
 
-import betterproto
+import betterproto2
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 from pymammotion.data.model import HashList, RapidState
@@ -110,7 +110,7 @@ class MowingDevice(DataClassORJSONMixin):
         if toapp_report_data.fw_info:
             self.update_device_firmwares(toapp_report_data.fw_info)
 
-        self.report_data.update(toapp_report_data.to_dict(casing=betterproto.Casing.SNAKE))
+        self.report_data.update(toapp_report_data.to_dict(casing=betterproto2.Casing.SNAKE))
 
     def run_state_update(self, rapid_state: SystemRapidStateTunnelMsg) -> None:
         """Set lat long, work zone of RTK and robot."""

{pymammotion-0.5.18 → pymammotion-0.5.19}/pymammotion/data/state_manager.py

@@ -1,11 +1,10 @@
 """Manage state from notifications into MowingDevice."""
 
-from collections.abc import Awaitable, Callable
 from datetime import UTC, datetime
 import logging
-from typing import Any
+from typing import Any, Awaitable, Callable
 
-import betterproto
+import betterproto2
 
 from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.device_info import SideLight
@@ -142,7 +141,7 @@ class StateManager:
 
     async def notification(self, message: LubaMsg) -> None:
         """Handle protobuf notifications."""
-        res = betterproto.which_one_of(message, "LubaSubMsg")
+        res = betterproto2.which_one_of(message, "LubaSubMsg")
         self.last_updated_at = datetime.now(UTC)
         # additional catch all if we don't get a status update
         if not self._device.online:
@@ -166,30 +165,30 @@ class StateManager:
 
     async def _update_nav_data(self, message) -> None:
         """Update nav data."""
-        nav_msg = betterproto.which_one_of(message.nav, "SubNavMsg")
+        nav_msg = betterproto2.which_one_of(message.nav, "SubNavMsg")
         match nav_msg[0]:
             case "toapp_gethash_ack":
                 hashlist_ack: NavGetHashListAck = nav_msg[1]
                 self._device.map.update_root_hash_list(
-                    NavGetHashListData.from_dict(hashlist_ack.to_dict(casing=betterproto.Casing.SNAKE))
+                    NavGetHashListData.from_dict(hashlist_ack.to_dict(casing=betterproto2.Casing.SNAKE))
                 )
                 await self.gethash_ack_callback(nav_msg[1])
             case "toapp_get_commondata_ack":
                 common_data: NavGetCommDataAck = nav_msg[1]
                 updated = self._device.map.update(
-                    NavGetCommData.from_dict(common_data.to_dict(casing=betterproto.Casing.SNAKE))
+                    NavGetCommData.from_dict(common_data.to_dict(casing=betterproto2.Casing.SNAKE))
                 )
                 if updated:
                     await self.get_commondata_ack_callback(common_data)
             case "todev_planjob_set":
                 planjob: NavPlanJobSet = nav_msg[1]
-                self._device.map.update_plan(Plan.from_dict(planjob.to_dict(casing=betterproto.Casing.SNAKE)))
+                self._device.map.update_plan(Plan.from_dict(planjob.to_dict(casing=betterproto2.Casing.SNAKE)))
                 await self.get_plan_callback(planjob)
 
             case "toapp_svg_msg":
                 common_svg_data: SvgMessageAckT = nav_msg[1]
                 updated = self._device.map.update(
-                    SvgMessage.from_dict(common_svg_data.to_dict(casing=betterproto.Casing.SNAKE))
+                    SvgMessage.from_dict(common_svg_data.to_dict(casing=betterproto2.Casing.SNAKE))
                 )
                 if updated:
                     await self.get_commondata_ack_callback(common_svg_data)
@@ -202,7 +201,7 @@ class StateManager:
             case "bidire_reqconver_path":
                 work_settings: NavReqCoverPath = nav_msg[1]
                 self._device.work = CurrentTaskSettings.from_dict(
-                    work_settings.to_dict(casing=betterproto.Casing.SNAKE)
+                    work_settings.to_dict(casing=betterproto2.Casing.SNAKE)
                 )
             case "nav_sys_param_cmd":
                 settings: NavSysParamMsg = nav_msg[1]
@@ -220,7 +219,7 @@ class StateManager:
 
     def _update_sys_data(self, message) -> None:
         """Update system."""
-        sys_msg = betterproto.which_one_of(message.sys, "SubSysMsg")
+        sys_msg = betterproto2.which_one_of(message.sys, "SubSysMsg")
         match sys_msg[0]:
             case "system_update_buf":
                 self._device.buffer(sys_msg[1])
@@ -232,7 +231,7 @@ class StateManager:
                 self._device.run_state_update(sys_msg[1])
             case "todev_time_ctrl_light":
                 ctrl_light: TimeCtrlLight = sys_msg[1]
-                side_led: SideLight = SideLight.from_dict(ctrl_light.to_dict(casing=betterproto.Casing.SNAKE))
+                side_led: SideLight = SideLight.from_dict(ctrl_light.to_dict(casing=betterproto2.Casing.SNAKE))
                 self._device.mower_state.side_led = side_led
             case "device_product_type_info":
                 device_product_type: DeviceProductTypeInfoT = sys_msg[1]
@@ -248,7 +247,7 @@ class StateManager:
         pass
 
     def _update_net_data(self, message) -> None:
-        net_msg = betterproto.which_one_of(message.net, "NetSubType")
+        net_msg = betterproto2.which_one_of(message.net, "NetSubType")
         match net_msg[0]:
             case "toapp_wifi_iot_status":
                 wifi_iot_status: WifiIotStatusReport = net_msg[1]
@@ -265,17 +264,15 @@ class StateManager:
 
     def _update_mul_data(self, message) -> None:
         """Media and video states."""
-        mul_msg = betterproto.which_one_of(message.net, "SubMul")
+        mul_msg = betterproto2.which_one_of(message.net, "SubMul")
         match mul_msg[0]:
             case "Getlamprsp":
                 lamp_resp: Getlamprsp = mul_msg[1]
                 self._device.mower_state.lamp_info.lamp_bright = lamp_resp.lamp_bright
                 if lamp_resp.get_ids == 1126:
-                    self._device.mower_state.lamp_info.manual_light = (
-                        True if lamp_resp.lamp_manual_ctrl.value > 0 else False
-                    )
+                    self._device.mower_state.lamp_info.manual_light = bool(lamp_resp.lamp_manual_ctrl.value)
                 if lamp_resp.get_ids == 1123:
-                    self._device.mower_state.lamp_info.night_light = True if lamp_resp.lamp_ctrl.value > 0 else False
+                    self._device.mower_state.lamp_info.night_light = bool(lamp_resp.lamp_ctrl.value)
 
     def _update_ota_data(self, message) -> None:
         pass

{pymammotion-0.5.18 → pymammotion-0.5.19}/pymammotion/mammotion/devices/base.py

@@ -1,11 +1,10 @@
 from abc import abstractmethod
 import asyncio
-import datetime
 import logging
 import time
 from typing import Any
 
-import betterproto
+import betterproto2
 
 from pymammotion.aliyun.model.dev_by_account_response import Device
 from pymammotion.data.model import RegionData
@@ -44,7 +43,7 @@ class MammotionBaseDevice:
         self._raw_mower_data: RawMowerData = RawMowerData()
         self._notify_future: asyncio.Future[bytes] | None = None
         self._cloud_device = cloud_device
-        self.command_sent_time: datetime = time.time()
+        self.command_sent_time: float = time.time()
 
     async def datahash_response(self, hash_ack: NavGetHashListAck) -> None:
         """Handle datahash responses for root level hashs."""
@@ -100,7 +99,7 @@ class MammotionBaseDevice:
     def _update_raw_data(self, data: bytes) -> None:
         """Update raw and model data from notifications."""
         tmp_msg = LubaMsg().parse(data)
-        res = betterproto.which_one_of(tmp_msg, "LubaSubMsg")
+        res = betterproto2.which_one_of(tmp_msg, "LubaSubMsg")
         match res[0]:
             case "nav":
                 self._update_nav_data(tmp_msg)
@@ -119,7 +118,7 @@ class MammotionBaseDevice:
 
     def _update_nav_data(self, tmp_msg) -> None:
         """Update navigation data."""
-        nav_sub_msg = betterproto.which_one_of(tmp_msg.nav, "SubNavMsg")
+        nav_sub_msg = betterproto2.which_one_of(tmp_msg.nav, "SubNavMsg")
         if nav_sub_msg[1] is None:
             _LOGGER.debug("Sub message was NoneType %s", nav_sub_msg[0])
             return
@@ -127,32 +126,32 @@ class MammotionBaseDevice:
         if isinstance(nav_sub_msg[1], int):
             nav[nav_sub_msg[0]] = nav_sub_msg[1]
         else:
-            nav[nav_sub_msg[0]] = nav_sub_msg[1].to_dict(casing=betterproto.Casing.SNAKE)
+            nav[nav_sub_msg[0]] = nav_sub_msg[1].to_dict(casing=betterproto2.Casing.SNAKE)
         self._raw_data["nav"] = nav
 
     def _update_sys_data(self, tmp_msg) -> None:
         """Update system data."""
-        sys_sub_msg = betterproto.which_one_of(tmp_msg.sys, "SubSysMsg")
+        sys_sub_msg = betterproto2.which_one_of(tmp_msg.sys, "SubSysMsg")
         if sys_sub_msg[1] is None:
             _LOGGER.debug("Sub message was NoneType %s", sys_sub_msg[0])
             return
         sys = self._raw_data.get("sys", {})
-        sys[sys_sub_msg[0]] = sys_sub_msg[1].to_dict(casing=betterproto.Casing.SNAKE)
+        sys[sys_sub_msg[0]] = sys_sub_msg[1].to_dict(casing=betterproto2.Casing.SNAKE)
         self._raw_data["sys"] = sys
 
     def _update_driver_data(self, tmp_msg) -> None:
         """Update driver data."""
-        drv_sub_msg = betterproto.which_one_of(tmp_msg.driver, "SubDrvMsg")
+        drv_sub_msg = betterproto2.which_one_of(tmp_msg.driver, "SubDrvMsg")
         if drv_sub_msg[1] is None:
             _LOGGER.debug("Sub message was NoneType %s", drv_sub_msg[0])
             return
         drv = self._raw_data.get("driver", {})
-        drv[drv_sub_msg[0]] = drv_sub_msg[1].to_dict(casing=betterproto.Casing.SNAKE)
+        drv[drv_sub_msg[0]] = drv_sub_msg[1].to_dict(casing=betterproto2.Casing.SNAKE)
         self._raw_data["driver"] = drv
 
     def _update_net_data(self, tmp_msg) -> None:
         """Update network data."""
-        net_sub_msg = betterproto.which_one_of(tmp_msg.net, "NetSubType")
+        net_sub_msg = betterproto2.which_one_of(tmp_msg.net, "NetSubType")
         if net_sub_msg[1] is None:
             _LOGGER.debug("Sub message was NoneType %s", net_sub_msg[0])
             return
@@ -160,27 +159,27 @@ class MammotionBaseDevice:
         if isinstance(net_sub_msg[1], int):
             net[net_sub_msg[0]] = net_sub_msg[1]
         else:
-            net[net_sub_msg[0]] = net_sub_msg[1].to_dict(casing=betterproto.Casing.SNAKE)
+            net[net_sub_msg[0]] = net_sub_msg[1].to_dict(casing=betterproto2.Casing.SNAKE)
         self._raw_data["net"] = net
 
     def _update_mul_data(self, tmp_msg) -> None:
         """Update mul data."""
-        mul_sub_msg = betterproto.which_one_of(tmp_msg.mul, "SubMul")
+        mul_sub_msg = betterproto2.which_one_of(tmp_msg.mul, "SubMul")
         if mul_sub_msg[1] is None:
             _LOGGER.debug("Sub message was NoneType %s", mul_sub_msg[0])
             return
         mul = self._raw_data.get("mul", {})
-        mul[mul_sub_msg[0]] = mul_sub_msg[1].to_dict(casing=betterproto.Casing.SNAKE)
+        mul[mul_sub_msg[0]] = mul_sub_msg[1].to_dict(casing=betterproto2.Casing.SNAKE)
         self._raw_data["mul"] = mul
 
     def _update_ota_data(self, tmp_msg) -> None:
         """Update OTA data."""
-        ota_sub_msg = betterproto.which_one_of(tmp_msg.ota, "SubOtaMsg")
+        ota_sub_msg = betterproto2.which_one_of(tmp_msg.ota, "SubOtaMsg")
         if ota_sub_msg[1] is None:
             _LOGGER.debug("Sub message was NoneType %s", ota_sub_msg[0])
             return
         ota = self._raw_data.get("ota", {})
-        ota[ota_sub_msg[0]] = ota_sub_msg[1].to_dict(casing=betterproto.Casing.SNAKE)
+        ota[ota_sub_msg[0]] = ota_sub_msg[1].to_dict(casing=betterproto2.Casing.SNAKE)
         self._raw_data["ota"] = ota
 
     @property
@@ -229,20 +228,20 @@ class MammotionBaseDevice:
         ):
             await self.queue_command("read_plan", sub_cmd=2, plan_index=0)
 
-        for hash, frame in list(self.mower.map.area.items()):
+        for hash_id, frame in list(self.mower.map.area.items()):
             missing_frames = self.mower.map.find_missing_frames(frame)
             if len(missing_frames) > 0:
-                del self.mower.map.area[hash]
+                del self.mower.map.area[hash_id]
 
-        for hash, frame in list(self.mower.map.path.items()):
+        for hash_id, frame in list(self.mower.map.path.items()):
             missing_frames = self.mower.map.find_missing_frames(frame)
             if len(missing_frames) > 0:
-                del self.mower.map.path[hash]
+                del self.mower.map.path[hash_id]
 
-        for hash, frame in list(self.mower.map.obstacle.items()):
+        for hash_id, frame in list(self.mower.map.obstacle.items()):
             missing_frames = self.mower.map.find_missing_frames(frame)
             if len(missing_frames) > 0:
-                del self.mower.map.obstacle[hash]
+                del self.mower.map.obstacle[hash_id]
 
         # don't know why but total frame on svg is wrong
         # for hash, frame in self.mower.map.svg.items():

{pymammotion-0.5.18 → pymammotion-0.5.19}/pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -5,7 +5,7 @@ import time
 from typing import Any
 from uuid import UUID
 
-import betterproto
+import betterproto2
 from bleak import BleakGATTCharacteristic, BleakGATTServiceCollection, BLEDevice
 from bleak.exc import BleakDBusError
 from bleak_retry_connector import (
@@ -356,7 +356,7 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
             return
 
         new_msg = LubaMsg().parse(data)
-        res = betterproto.which_one_of(new_msg, "LubaSubMsg")
+        res = betterproto2.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() == "":

{pymammotion-0.5.18 → pymammotion-0.5.19}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -8,7 +8,7 @@ import logging
 import time
 from typing import Any
 
-import betterproto
+import betterproto2
 from Tea.exceptions import UnretryableException
 
 from pymammotion import CloudIOTGateway, MammotionMQTT
@@ -118,14 +118,15 @@ class MammotionCloud:
 
     async def _parse_mqtt_response(self, topic: str, payload: dict) -> None:
         """Parse and handle MQTT responses based on the topic.
-        
+
         This function processes different types of MQTT messages received from various
         topics. It logs debug information and calls appropriate callback methods for
         each event type.
-        
+
         Args:
             topic (str): The MQTT topic from which the message was received.
             payload (dict): The payload data of the MQTT message.
+
         """
         if topic.endswith("/app/down/thing/events"):
             _LOGGER.debug("Thing event received")
@@ -340,15 +341,16 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
 
     async def _parse_message_for_device(self, event: ThingEventMessage) -> None:
         """Parses a message received from a device and updates internal state.
-        
+
         This function processes an incoming `ThingEventMessage`, checks if the message
         is intended for this device, decodes the binary data, and updates raw data. It
         then attempts to parse the binary data into a `LubaMsg`. If parsing fails, it
         logs the exception. The function also handles setting the device product key if
         not already set and processes specific sub-messages based on their types.
-        
+
         Args:
             event (ThingEventMessage): The event message received from the device.
+
         """
         params = event.params
         new_msg = LubaMsg()
@@ -367,7 +369,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         ):
             self._commands.set_device_product_key(event.params.productKey)
 
-        res = betterproto.which_one_of(new_msg, "LubaSubMsg")
+        res = betterproto2.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.5.18 → pymammotion-0.5.19}/pymammotion/mqtt/mammotion_mqtt.py

@@ -2,14 +2,14 @@
 
 import asyncio
 import base64
-from collections.abc import Awaitable, Callable
+from typing import Awaitable, Callable
 import hashlib
 import hmac
 import json
 import logging
 from logging import getLogger
 
-import betterproto
+import betterproto2
 from paho.mqtt.client import MQTTMessage
 
 from pymammotion.aliyun.cloud_gateway import CloudIOTGateway
@@ -138,7 +138,6 @@ class MammotionMQTT:
             self.is_ready = True
             future = asyncio.run_coroutine_threadsafe(self.on_ready(), self.loop)
             asyncio.wrap_future(future, loop=self.loop)
-        # self._linkkit_client.query_ota_firmware()
 
     def unsubscribe(self) -> None:
         self._linkkit_client.unsubscribe_topic(
@@ -188,8 +187,6 @@ class MammotionMQTT:
 
         logger.debug("on_connect, session_flag:%d, rc:%d", session_flag, rc)
 
-        # self._linkkit_client.subscribe_topic(f"/sys/{self._product_key}/{self._device_name}/#")
-
     def _on_disconnect(self, _client, _userdata) -> None:
         """Is called on disconnect."""
         if self._linkkit_client.check_state() is LinkKit.LinkKitState.DISCONNECTED:
@@ -211,7 +208,7 @@ class MammotionMQTT:
             if params.identifier == "device_protobuf_msg_event":
                 content = LubaMsg().parse(base64.b64decode(params.value.content))
 
-                logger.info("Unhandled protobuf event: %s", betterproto.which_one_of(content, "LubaSubMsg"))
+                logger.info("Unhandled protobuf event: %s", betterproto2.which_one_of(content, "LubaSubMsg"))
             elif params.identifier == "device_warning_event":
                 logger.debug("identifier event: %s", params.identifier)
             else: