pymammotion 0.5.23__tar.gz → 0.5.24__tar.gz

{pymammotion-0.5.23 → pymammotion-0.5.24}/PKG-INFO

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

{pymammotion-0.5.23 → pymammotion-0.5.24}/pymammotion/aliyun/client.py

@@ -81,7 +81,7 @@ class Client:
                 "maxAttempts": UtilClient.default_number(runtime.max_attempts, 3),
             },
             "backoff": {
-                "policy": UtilClient.default_string(runtime.backoff_policy, "no"),
+                "policy": UtilClient.default_string(runtime.backoff_policy, "yes"),
                 "period": UtilClient.default_number(runtime.backoff_period, 1),
             },
             "ignoreSSL": runtime.ignore_ssl,
@@ -171,7 +171,7 @@ class Client:
                 "maxAttempts": UtilClient.default_number(runtime.max_attempts, 3),
             },
             "backoff": {
-                "policy": UtilClient.default_string(runtime.backoff_policy, "no"),
+                "policy": UtilClient.default_string(runtime.backoff_policy, "yes"),
                 "period": UtilClient.default_number(runtime.backoff_period, 1),
             },
             "ignoreSSL": runtime.ignore_ssl,

{pymammotion-0.5.23 → pymammotion-0.5.24}/pymammotion/aliyun/cloud_gateway.py

@@ -1,5 +1,6 @@
 """Module for interacting with Aliyun Cloud IoT Gateway."""
 
+import asyncio
 import base64
 import hashlib
 import hmac
@@ -86,6 +87,14 @@ class GatewayTimeoutException(Exception):
         self.iot_id = args[1]
 
 
+class TooManyRequestsException(Exception):
+    """Raise exception when the gateway times out."""
+
+    def __init__(self, *args: object) -> None:
+        super().__init__(args)
+        self.iot_id = args[1]
+
+
 class LoginException(Exception):
     """Raise exception when library cannot log in."""
 
@@ -118,7 +127,7 @@ class CloudIOTGateway:
         self._app_key = APP_KEY
         self._app_secret = APP_SECRET
         self.domain = ALIYUN_DOMAIN
-
+        self.message_delay = 1
         self._client_id = self.generate_hardware_string(8)  # 8 characters
         self._device_sn = self.generate_hardware_string(32)  # 32 characters
         self._utdid = self.generate_hardware_string(32)  # 32 characters
@@ -730,7 +739,6 @@ class CloudIOTGateway:
         )
 
         client = Client(config)
-
         # build request
         request = CommonParams(
             api_ver="1.0.5",
@@ -762,6 +770,14 @@ class CloudIOTGateway:
         logger.debug(response.body)
         logger.debug(iot_id)
 
+        if response.status_code == 429:
+            logger.debug("too many requests.")
+            if self.message_delay > 8:
+                raise TooManyRequestsException(response.status_message, iot_id)
+            asyncio.get_event_loop().call_later(self.message_delay, self.send_cloud_command, iot_id, command)
+            self.message_delay = self.message_delay * 2
+            return message_id
+
         response_body_str = response.body.decode("utf-8")
         response_body_dict = self.parse_json_response(response_body_str)
 
@@ -785,6 +801,9 @@ class CloudIOTGateway:
             if response_body_dict.get("code") == 6205:
                 raise DeviceOfflineException(response_body_dict.get("code"), iot_id)
 
+        if self.message_delay != 1:
+            self.message_delay = 1
+
         return message_id
 
     async def get_device_properties(self, iot_id: str) -> ThingPropertiesResponse:

{pymammotion-0.5.23 → pymammotion-0.5.24}/pymammotion/data/state_manager.py

@@ -1,8 +1,9 @@
 """Manage state from notifications into MowingDevice."""
 
+from collections.abc import Awaitable, Callable
 from datetime import UTC, datetime
 import logging
-from typing import Any, Awaitable, Callable
+from typing import Any
 
 import betterproto2
 
@@ -42,6 +43,7 @@ class StateManager:
     """Manage state."""
 
     def __init__(self, device: MowingDevice) -> None:
+        """Initialize state manager with a device."""
         self._device: MowingDevice = device
         self.last_updated_at = datetime.now(UTC)
         self.preference = ConnectionPreference.WIFI
@@ -74,11 +76,13 @@ class StateManager:
         self._device = device
 
     async def properties(self, thing_properties: ThingPropertiesMessage) -> None:
+        """Update device properties and invoke callback."""
         # TODO update device based off thing properties
         self._device.mqtt_properties = thing_properties
         await self.on_properties_callback(thing_properties)
 
     async def status(self, thing_status: ThingStatusMessage) -> None:
+        """Update device status and invoke callback."""
         if not self._device.online:
             self._device.online = True
         self._device.status_properties = thing_status
@@ -93,19 +97,23 @@ class StateManager:
 
     @property
     def online(self) -> bool:
+        """Return online status."""
         return self._device.online
 
     @online.setter
     def online(self, value: bool) -> None:
+        """Set online status."""
         self._device.online = value
 
     async def gethash_ack_callback(self, msg: NavGetHashListAck) -> None:
+        """Dispatch hash list acknowledgment to available callback."""
         if self.cloud_gethash_ack_callback:
             await self.cloud_gethash_ack_callback(msg)
         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:
+        """Dispatch notification to available callback."""
         if self.cloud_on_notification_callback:
             await self.cloud_on_notification_callback.data_event(res)
         elif self.ble_on_notification_callback:
@@ -134,6 +142,7 @@ class StateManager:
             await self.ble_get_commondata_ack_callback(comm_data)
 
     async def get_plan_callback(self, planjob: NavPlanJobSet) -> None:
+        """Dispatch plan job to available callback."""
         if self.cloud_get_plan_callback:
             await self.cloud_get_plan_callback(planjob)
         elif self.ble_get_plan_callback:
@@ -244,9 +253,10 @@ class StateManager:
                 self._device.mower_state.swversion = device_fw_info.version
 
     def _update_driver_data(self, message) -> None:
-        pass
+        """Update driver data."""
 
     def _update_net_data(self, message) -> None:
+        """Update network data."""
         net_msg = betterproto2.which_one_of(message.net, "NetSubType")
         match net_msg[0]:
             case "toapp_wifi_iot_status":
@@ -269,10 +279,16 @@ class StateManager:
             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 = bool(lamp_resp.lamp_manual_ctrl.value)
+                if lamp_resp.get_ids in (1126, 1127):
+                    self._device.mower_state.lamp_info.lamp_bright = lamp_resp.lamp_bright
+                    self._device.mower_state.lamp_info.manual_light = bool(lamp_resp.lamp_manual_ctrl.value) or bool(
+                        lamp_resp.lamp_bright
+                    )
                 if lamp_resp.get_ids == 1123:
-                    self._device.mower_state.lamp_info.night_light = bool(lamp_resp.lamp_ctrl.value)
+                    self._device.mower_state.lamp_info.lamp_bright = lamp_resp.lamp_bright
+                    self._device.mower_state.lamp_info.night_light = bool(lamp_resp.lamp_ctrl.value) or bool(
+                        lamp_resp.lamp_bright
+                    )
 
     def _update_ota_data(self, message) -> None:
-        pass
+        """Update OTA data."""

{pymammotion-0.5.23 → pymammotion-0.5.24}/pymammotion/mammotion/commands/messages/driver.py

@@ -5,6 +5,8 @@ import time
 
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import (
+    AppGetCutterWorkMode,
+    AppSetCutterWorkMode,
     DrvKnifeHeight,
     DrvMotionCtrl,
     DrvMowCtrlByHand,
@@ -23,6 +25,7 @@ logger = getLogger(__name__)
 
 class MessageDriver(AbstractMessage, ABC):
     def send_order_msg_driver(self, driver) -> bytes:
+        """Build and serialize a driver command message."""
         return LubaMsg(
             msgtype=MsgCmdType.EMBED_DRIVER,
             sender=MsgDevice.DEV_MOBILEAPP,
@@ -36,23 +39,42 @@ class MessageDriver(AbstractMessage, ABC):
         ).SerializeToString()
 
     def set_blade_height(self, height: int) -> bytes:
+        """Set mower blade height."""
         logger.debug(f"Send knife height height={height}")
         build = MctlDriver(todev_knife_height_set=DrvKnifeHeight(knife_height=height))
         logger.debug(f"Send command--Knife motor height setting height={height}")
         return self.send_order_msg_driver(build)
 
     def set_speed(self, speed: float) -> bytes:
+        """Set the device speed."""
         logger.debug(f"{self.get_device_name()} set speed, {speed}")
         build = MctlDriver(bidire_speed_read_set=DrvSrSpeed(speed=speed, rw=1))
         logger.debug(f"Send command--Speed setting speed={speed}")
         return self.send_order_msg_driver(build)
 
+    def get_cutter_mode(self) -> bytes:
+        """Request the current cutter mode."""
+        build = MctlDriver(current_cutter_mode=AppGetCutterWorkMode())
+        return self.send_order_msg_driver(build)
+
+    def set_cutter_mode(self, cutter_mode: int) -> bytes:
+        """Set blade speed."""
+        """
+        1 slow
+        0 normal
+        2 fast
+        """
+        build = MctlDriver(cutter_mode_ctrl_by_hand=AppSetCutterWorkMode(cutter_mode=cutter_mode))
+        return self.send_order_msg_driver(build)
+
     def syn_nav_star_point_data(self, sat_system: int) -> bytes:
+        """Synchronize navigation satellite frequency points."""
         build = MctlDriver(rtk_sys_mask_query=RtkSysMaskQueryT(sat_system=sat_system))
         logger.debug(f"Send command--Navigation satellite frequency point synchronization={sat_system}")
         return self.send_order_msg_driver(build)
 
     def set_nav_star_point(self, cmd_req: str) -> bytes:
+        """Configure navigation satellite frequency points."""
         build = MctlDriver(rtk_cfg_req=RtkCfgReqT(cmd_req=cmd_req, cmd_length=len(cmd_req) - 1))
         logger.debug(f"Send command--Navigation satellite frequency point setting={cmd_req}")
         logger.debug(
@@ -61,6 +83,7 @@ class MessageDriver(AbstractMessage, ABC):
         return self.send_order_msg_driver(build)
 
     def get_speed(self) -> bytes:
+        """Request the current speed value."""
         build = MctlDriver(bidire_speed_read_set=DrvSrSpeed(rw=0))
         logger.debug("Send command--Get speed value")
         return self.send_order_msg_driver(build)
@@ -72,6 +95,7 @@ class MessageDriver(AbstractMessage, ABC):
         cut_knife_height: int,
         max_run_speed: float,
     ) -> bytes:
+        """Send manual mowing control command."""
         build = MctlDriver(
             mow_ctrl_by_hand=DrvMowCtrlByHand(
                 main_ctrl=main_ctrl,
@@ -88,6 +112,7 @@ class MessageDriver(AbstractMessage, ABC):
         return self.send_order_msg_driver(build)
 
     def send_movement(self, linear_speed: int, angular_speed: int) -> bytes:
+        """Send motion command with linear and angular speeds."""
         logger.debug(f"Control command print, linearSpeed={
         linear_speed} // angularSpeed={angular_speed}")
         return self.send_order_msg_driver(

{pymammotion-0.5.23 → pymammotion-0.5.24}/pyproject.toml

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