pymammotion 0.4.0a5__py3-none-any.whl → 0.4.0a6__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -57,6 +57,8 @@ class AuthRefreshException(Exception):
 class DeviceOfflineException(Exception):
     """Raise exception when device is offline."""
 
+class GatewayTimeoutException(Exception):
+    """Raise exception when the gateway times out."""
 
 class LoginException(Exception):
     """Raise exception when library cannot log in."""
@@ -657,7 +659,7 @@ class CloudIOTGateway:
             iot_token=self._session_by_authcode_response.data.iotToken,
         )
 
-        # TODO move to using  InvokeThingServiceRequest()
+        # TODO move to using InvokeThingServiceRequest()
 
         message_id = str(uuid.uuid4())
 
@@ -689,6 +691,10 @@ class CloudIOTGateway:
                 str(response_body_dict.get("code")),
                 str(response_body_dict.get("message")),
             )
+            if response_body_dict.get("code") == 20056:
+                logger.debug("Gateway timeout.")
+                raise GatewayTimeoutException(response_body_dict.get("code"))
+
             if response_body_dict.get("code") == 29003:
                 logger.debug(self._session_by_authcode_response.data.identityId)
                 self.sign_out()

pymammotion/data/model/device.py

@@ -1,22 +1,22 @@
 """MowingDevice class to wrap around the betterproto dataclasses."""
 
 from dataclasses import dataclass, field
-from typing import Optional
 
 import betterproto
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 from pymammotion.data.model import HashList, RapidState
-from pymammotion.data.model.device_info import MowerInfo, DeviceFirmwares
+from pymammotion.data.model.device_info import DeviceFirmwares, MowerInfo
 from pymammotion.data.model.location import Location
 from pymammotion.data.model.report_info import ReportData
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.http.model.http import ErrorInfo
 from pymammotion.proto.mctrl_sys import (
+    DeviceFwInfo,
     MowToAppInfoT,
     ReportInfoData,
     SystemRapidStateTunnelMsg,
-    SystemUpdateBufMsg, DeviceFwInfo,
+    SystemUpdateBufMsg,
 )
 from pymammotion.utility.constant import WorkMode
 from pymammotion.utility.conversions import parse_double
@@ -35,7 +35,7 @@ class MowingDevice(DataClassORJSONMixin):
     report_data: ReportData = field(default_factory=ReportData)
     device_firmwares: DeviceFirmwares = field(default_factory=DeviceFirmwares)
     err_code_list: list = field(default_factory=list)
-    err_code_list_time: Optional[list] = field(default_factory=list)
+    err_code_list_time: list | None = field(default_factory=list)
     error_codes: dict[str, ErrorInfo] = field(default_factory=dict)
 
     def buffer(self, buffer_list: SystemUpdateBufMsg) -> None:

pymammotion/data/model/device_info.py

@@ -24,6 +24,7 @@ class MowerInfo(DataClassORJSONMixin):
     product_key: str = ""
     model_id: str = ""
 
+
 @dataclass
 class DeviceFirmwares(DataClassORJSONMixin):
     device_version: str = ""
@@ -34,4 +35,4 @@ class DeviceFirmwares(DataClassORJSONMixin):
     right_motor_driver: str = ""
     rtk_rover_station: str = ""
     rtk_version: str = ""
-    version: str = ""
+    version: str = ""

pymammotion/data/state_manager.py

@@ -1,8 +1,9 @@
 """Manage state from notifications into MowingDevice."""
 
 import logging
+from collections.abc import Awaitable, Callable
 from datetime import datetime
-from typing import Any, Awaitable, Callable, Optional
+from typing import Any
 
 import betterproto
 
@@ -10,7 +11,7 @@ from pymammotion.data.model.device import MowingDevice
 from pymammotion.data.model.device_info import SideLight
 from pymammotion.data.model.hash_list import AreaHashNameList
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
-from pymammotion.proto.dev_net import WifiIotStatusReport, DrvDevInfoResp
+from pymammotion.proto.dev_net import DrvDevInfoResp, WifiIotStatusReport
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.mctrl_nav import AppGetAllAreaHashName, NavGetCommDataAck, NavGetHashListAck, SvgMessageAckT
 from pymammotion.proto.mctrl_sys import DeviceProductTypeInfoT, TimeCtrlLight
@@ -26,12 +27,10 @@ class StateManager:
 
     def __init__(self, device: MowingDevice) -> None:
         self._device = device
-        self.gethash_ack_callback: Optional[Callable[[NavGetHashListAck], Awaitable[None]]] = None
-        self.get_commondata_ack_callback: Optional[Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]]] = (
-            None
-        )
-        self.on_notification_callback: Optional[Callable[[tuple[str, Any | None]], Awaitable[None]]] = None
-        self.queue_command_callback: Optional[Callable[[str, dict[str, Any]], Awaitable[bytes]]] = None
+        self.gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
+        self.get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = None
+        self.on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
+        self.queue_command_callback: Callable[[str, dict[str, Any]], Awaitable[bytes]] | None = None
         self.last_updated_at = datetime.now()
 
     def get_device(self) -> MowingDevice:
@@ -124,7 +123,7 @@ class StateManager:
             case "toapp_devinfo_resp":
                 toapp_devinfo_resp: DrvDevInfoResp = net_msg[1]
                 for resp in toapp_devinfo_resp.resp_ids:
-                    if resp.res is "DRV_RESULT_SUC":
+                    if resp.res == "DRV_RESULT_SUC":
                         self._device.mower_state.swversion = resp.info
                         self._device.device_firmwares.device_version = resp.info
 

pymammotion/mqtt/linkkit/__init__.py

@@ -2,4 +2,4 @@
 
 from .linkkit import LinkKit
 
-__all__ = ["LinkKit"]
+__all__ = ["LinkKit"]