pymammotion 0.2.91__tar.gz → 0.2.93__tar.gz

{pymammotion-0.2.91 → pymammotion-0.2.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.2.91
+Version: 0.2.93
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur

{pymammotion-0.2.91 → pymammotion-0.2.93}/pymammotion/aliyun/cloud_gateway.py

@@ -704,25 +704,25 @@ class CloudIOTGateway:
         self.mammotion_http = mammotion_http
 
     @property
-    def region_response(self):
+    def region_response(self) -> RegionResponse:
         return self._region_response
 
     @property
-    def aep_response(self):
+    def aep_response(self) -> AepResponse:
         return self._aep_response
 
     @property
-    def session_by_authcode_response(self):
+    def session_by_authcode_response(self) -> SessionByAuthCodeResponse:
         return self._session_by_authcode_response
 
     @property
-    def client_id(self):
+    def client_id(self) -> str:
         return self._client_id
 
     @property
-    def login_by_oauth_response(self):
+    def login_by_oauth_response(self) -> LoginByOAuthResponse:
         return self._login_by_oauth_response
 
     @property
-    def connect_response(self):
+    def connect_response(self) -> ConnectResponse:
         return self._connect_response

{pymammotion-0.2.91 → pymammotion-0.2.93}/pymammotion/data/model/report_info.py

@@ -1,4 +1,4 @@
-from dataclasses import asdict, dataclass, field
+from dataclasses import dataclass, field
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -8,6 +8,7 @@ class ConnectData(DataClassORJSONMixin):
     connect_type: int = 0
     ble_rssi: int = 0
     wifi_rssi: int = 0
+    used_net: str = ""
 
 
 @dataclass
@@ -52,6 +53,24 @@ class LocationData(DataClassORJSONMixin):
     bol_hash: str = ""
 
 
+@dataclass
+class Maintain(DataClassORJSONMixin):
+    mileage: int = 0
+    work_time: int = 0
+    bat_cycles: int = 0
+
+
+@dataclass
+class VisionInfo(DataClassORJSONMixin):
+    x: float = 0.0
+    y: float = 0.0
+    heading: float = 0.0
+    vio_state: int = 0
+    brightness: int = 1
+    detect_feature_num: int = 0
+    track_feature_num: int = 0
+
+
 @dataclass
 class WorkData(DataClassORJSONMixin):
     path: int = 0
@@ -80,6 +99,8 @@ class WorkData(DataClassORJSONMixin):
 class ReportData(DataClassORJSONMixin):
     connect: ConnectData = field(default_factory=ConnectData)
     dev: DeviceData = field(default_factory=DeviceData)
+    maintenance: Maintain = field(default_factory=Maintain)
+    vision_info: VisionInfo = field(default_factory=VisionInfo)
     rtk: RTKData = field(default_factory=RTKData)
     locations: list[LocationData] = field(default_factory=list)
     work: WorkData = field(default_factory=WorkData)
@@ -89,8 +110,10 @@ class ReportData(DataClassORJSONMixin):
         if data.get("locations") is not None:
             locations = [LocationData.from_dict(loc) for loc in data.get("locations", [])]
 
-        self.connect = ConnectData.from_dict(data.get("connect", asdict(self.connect)))
-        self.dev = DeviceData.from_dict(data.get("dev", asdict(self.dev)))
-        self.rtk = RTKData.from_dict(data.get("rtk", asdict(self.rtk)))
+        self.connect = ConnectData.from_dict(data.get("connect", self.connect.to_dict()))
+        self.dev = DeviceData.from_dict(data.get("dev", self.dev.to_dict()))
+        self.rtk = RTKData.from_dict(data.get("rtk", self.rtk.to_dict()))
+        self.maintenance = Maintain.from_dict(data.get("maintain", self.maintenance.to_dict()))
+        self.vision_info = VisionInfo.from_dict(data.get("vio_to_app_info", self.vision_info.to_dict()))
         self.locations = locations
-        self.work = WorkData.from_dict(data.get("work", asdict(self.work)))
+        self.work = WorkData.from_dict(data.get("work", self.work.to_dict()))

{pymammotion-0.2.91 → pymammotion-0.2.93}/pymammotion/event/event.py

@@ -14,7 +14,7 @@ class Event:
         self.__eventhandlers.remove(handler)
         return self
 
-    async def __call__(self, *args, **kwargs) -> None:
+    async def __call__(self, *args: Any, **kwargs: Any) -> None:
         await asyncio.gather(*[handler(*args, **kwargs) for handler in self.__eventhandlers])
 
 

{pymammotion-0.2.91 → pymammotion-0.2.93}/pymammotion/mammotion/commands/messages/network.py

@@ -1,16 +1,19 @@
 # === sendOrderMsg_Net  ===
 import time
+from abc import ABC
 
 from pymammotion import logger
+from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.mammotion.commands.messages.navigation import MessageNavigation
 from pymammotion.proto import dev_net_pb2, luba_msg_pb2
+from pymammotion.proto.dev_net import DevNet
 
 
-class MessageNetwork:
+class MessageNetwork(AbstractMessage, ABC):
     messageNavigation: MessageNavigation = MessageNavigation()
 
     @staticmethod
-    def send_order_msg_net(build) -> bytes:
+    def send_order_msg_net(build: DevNet) -> bytes:
         luba_msg = luba_msg_pb2.LubaMsg(
             msgtype=luba_msg_pb2.MSG_CMD_TYPE_ESP,
             sender=luba_msg_pb2.DEV_MOBILEAPP,
@@ -183,20 +186,12 @@ class MessageNetwork:
         logger.debug("Send command - get memorized WiFi list upload command")
         return self.send_order_msg_net(build)
 
-    def close_clear_connect_current_wifi(self, ssid: str, status: int, is_binary: bool) -> bytes:
-        if is_binary:
-            build = dev_net_pb2.DevNet(
-                todev_ble_sync=1,
-                todev_Wifi_Configuration=dev_net_pb2.DrvWifiSet(configParam=status, Confssid=ssid),
-            )
-            logger.debug(
-                f"Send command - set network (disconnect, direct connect, forget, no operation reconnect) operation command (downlink ssid={ssid}, status={status})"
-            )
-            return self.send_order_msg_net(build)
-        self.close_clear_connect_current_wifi2(ssid, status)
-
-    # def close_clear_connect_current_wifi2(self, ssid: str, get_msg_cmd: int) -> None:
-    #     data = {"ssid": ssid, "getMsgCmd": get_msg_cmd}
-    # self.messageNavigation.post_custom_data(
-    # ToDo: Fix this
-    # self.get_json_string(bleOrderCmd.close_clear_connect_current_wifi, data).encode())
+    def close_clear_connect_current_wifi(self, ssid: str, status: int) -> bytes:
+        build = dev_net_pb2.DevNet(
+            todev_ble_sync=1,
+            todev_Wifi_Configuration=dev_net_pb2.DrvWifiSet(configParam=status, Confssid=ssid),
+        )
+        logger.debug(
+            f"Send command - set network (disconnect, direct connect, forget, no operation reconnect) operation command (downlink ssid={ssid}, status={status})"
+        )
+        return self.send_order_msg_net(build)

{pymammotion-0.2.91 → pymammotion-0.2.93}/pymammotion/mammotion/commands/messages/system.py

@@ -36,7 +36,7 @@ class MessageSystem(AbstractMessage, ABC):
             seqs=1,
             version=1,
             subtype=1,
-            timestamp=round(time.time() * 1000)
+            timestamp=round(time.time() * 1000),
         )
 
         return luba_msg.SerializeToString()
@@ -52,7 +52,7 @@ class MessageSystem(AbstractMessage, ABC):
             seqs=1,
             version=1,
             subtype=1,
-            timestamp=round(time.time() * 1000)
+            timestamp=round(time.time() * 1000),
         )
 
         return luba_msg.SerializeToString()
@@ -251,7 +251,7 @@ class MessageSystem(AbstractMessage, ABC):
 
     def get_report_cfg_stop(self, timeout: int = 10000, period: int = 1000, no_change_period: int = 1000):
         # TODO use send_order_msg_sys_legacy
-        mctlsys = MctlSys(
+        mctl_sys = MctlSys(
             todev_report_cfg=ReportInfoCfg(
                 act=RptAct.RPT_STOP,
                 timeout=timeout,
@@ -261,30 +261,33 @@ class MessageSystem(AbstractMessage, ABC):
             )
         )
 
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_CONNECT)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_RTK)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_LOCAL)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_WORK)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_STA)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_MAINTAIN)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_POINT)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VIO)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_STATISTIC)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_CONNECT)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_RTK)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_LOCAL)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_WORK)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_STA)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_MAINTAIN)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_POINT)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_VIO)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_STATISTIC)
 
-        lubaMsg = LubaMsg()
-        lubaMsg.msgtype = MsgCmdType.MSG_CMD_TYPE_EMBED_SYS
-        lubaMsg.sender = MsgDevice.DEV_MOBILEAPP
-        lubaMsg.rcver = MsgDevice.DEV_MAINCTL
-        lubaMsg.msgattr = MsgAttr.MSG_ATTR_REQ
-        lubaMsg.seqs = 1
-        lubaMsg.version = 1
-        lubaMsg.subtype = 1
-        lubaMsg.sys = mctlsys
-        return lubaMsg.SerializeToString()
+        luba_msg = LubaMsg(
+            msgtype=MsgCmdType.MSG_CMD_TYPE_EMBED_SYS,
+            sender=MsgDevice.DEV_MOBILEAPP,
+            rcver=MsgDevice.DEV_MAINCTL,
+            msgattr=MsgAttr.MSG_ATTR_REQ,
+            seqs=1,
+            version=1,
+            subtype=1,
+            sys=mctl_sys,
+            timestamp=round(time.time() * 1000),
+        )
+
+        return luba_msg.SerializeToString()
 
     def get_report_cfg(self, timeout: int = 10000, period: int = 1000, no_change_period: int = 2000):
         # TODO use send_order_msg_sys_legacy
-        mctlsys = MctlSys(
+        mctl_sys = MctlSys(
             todev_report_cfg=ReportInfoCfg(
                 act=RptAct.RPT_START,
                 timeout=timeout,
@@ -294,24 +297,26 @@ class MessageSystem(AbstractMessage, ABC):
             )
         )
 
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_CONNECT)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_RTK)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_LOCAL)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_WORK)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_STA)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_MAINTAIN)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_POINT)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VIO)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_STATISTIC)
-        mctlsys.todev_report_cfg.sub.append(RptInfoType.RIT_BASESTATION_INFO)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_CONNECT)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_RTK)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_LOCAL)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_WORK)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_DEV_STA)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_MAINTAIN)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_POINT)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_VIO)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_VISION_STATISTIC)
+        mctl_sys.todev_report_cfg.sub.append(RptInfoType.RIT_BASESTATION_INFO)
 
-        lubaMsg = LubaMsg()
-        lubaMsg.msgtype = MsgCmdType.MSG_CMD_TYPE_EMBED_SYS
-        lubaMsg.sender = MsgDevice.DEV_MOBILEAPP
-        lubaMsg.rcver = MsgDevice.DEV_MAINCTL
-        lubaMsg.msgattr = MsgAttr.MSG_ATTR_REQ
-        lubaMsg.seqs = 1
-        lubaMsg.version = 1
-        lubaMsg.subtype = 1
-        lubaMsg.sys = mctlsys
-        return lubaMsg.SerializeToString()
+        luba_msg = LubaMsg(
+            msgtype=MsgCmdType.MSG_CMD_TYPE_EMBED_SYS,
+            sender=MsgDevice.DEV_MOBILEAPP,
+            rcver=MsgDevice.DEV_MAINCTL,
+            msgattr=MsgAttr.MSG_ATTR_REQ,
+            seqs=1,
+            version=1,
+            subtype=1,
+            sys=mctl_sys,
+            timestamp=round(time.time() * 1000),
+        )
+        return luba_msg.SerializeToString()

{pymammotion-0.2.91 → pymammotion-0.2.93}/pymammotion/mammotion/commands/messages/video.py

@@ -4,7 +4,7 @@ from abc import ABC
 
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import luba_msg_pb2, luba_mul_pb2
-from pymammotion.proto.luba_msg import MsgCmdType, MsgDevice, MsgAttr
+from pymammotion.proto.luba_msg import MsgAttr, MsgCmdType, MsgDevice
 from pymammotion.utility.device_type import DeviceType
 
 
@@ -19,7 +19,7 @@ class MessageVideo(AbstractMessage, ABC):
             seqs=1,
             version=1,
             subtype=1,
-            timestamp=round(time.time() * 1000)
+            timestamp=round(time.time() * 1000),
         )
 
         return luba_msg.SerializeToString()

{pymammotion-0.2.91 → pymammotion-0.2.93}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -244,7 +244,12 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         command_bytes = getattr(self._commands, key)(**kwargs)
         await self._mqtt.command_queue.put((self.iot_id, key, command_bytes, future))
         # Wait for the future to be resolved
-        return await future
+        try:
+            return await future
+        except asyncio.CancelledError:
+            """Try again once."""
+            future = asyncio.Future()
+            await self._mqtt.command_queue.put((self.iot_id, key, command_bytes, future))
 
     def _extract_message_id(self, payload: dict) -> str:
         """Extract the message ID from the payload."""

{pymammotion-0.2.91 → pymammotion-0.2.93}/pymammotion/utility/constant/device_constant.py

@@ -212,7 +212,18 @@ class WorkMode:
     MODE_WORKING = 13
 
 
-def device_mode(value) -> str:
+def device_connection(value: int, mnet_type: str) -> str:
+    """Return string representation of device connection."""
+    if value == 1:
+        return "BLE"
+
+    if mnet_type == "NET_USED_TYPE_WIFI":
+        return "WIFI"
+
+    return "3G/4G"
+
+
+def device_mode(value: int) -> str:
     """Return the mode corresponding to the given value.
 
     This function takes a value and returns the corresponding mode from a

{pymammotion-0.2.91 → pymammotion-0.2.93}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.91"
+version     = "0.2.93"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.91"
+version     = "0.2.93"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -61,7 +61,7 @@ mypy = "^1.11.2"
 autotyping = "^24.3.0"
 
 [tool.bumpver]
-current_version = "0.2.91"
+current_version = "0.2.93"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true