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

pymammotion/aliyun/cloud_gateway.py

@@ -57,9 +57,11 @@ 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."""
 

pymammotion/data/model/device.py

@@ -10,6 +10,7 @@ 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.data.mqtt.status import ThingStatusMessage
 from pymammotion.http.model.http import ErrorInfo
 from pymammotion.proto.mctrl_sys import (
     DeviceFwInfo,
@@ -27,8 +28,10 @@ from pymammotion.utility.map import CoordinateConverter
 class MowingDevice(DataClassORJSONMixin):
     """Wraps the betterproto dataclasses, so we can bypass the groups for keeping all data."""
 
+    online: bool = True
     mower_state: MowerInfo = field(default_factory=MowerInfo)
     mqtt_properties: ThingPropertiesMessage | None = None
+    status_properties: ThingStatusMessage | None = None
     map: HashList = field(default_factory=HashList)
     location: Location = field(default_factory=Location)
     mowing_state: RapidState = field(default_factory=RapidState)

pymammotion/data/mqtt/event.py

@@ -1,6 +1,6 @@
 from base64 import b64decode
 from dataclasses import dataclass
-from typing import Any, Literal, Optional, Union
+from typing import Any, Literal
 
 from google.protobuf import json_format
 from mashumaro.mixins.orjson import DataClassORJSONMixin
@@ -91,16 +91,16 @@ class GeneralParams(DataClassORJSONMixin):
     tenantInstanceId: str
     value: Any
 
-    identifier: Optional[str] = None
-    checkFailedData: Optional[dict] = None
-    _tenantId: Optional[str] = None
-    generateTime: Optional[int] = None
-    JMSXDeliveryCount: Optional[int] = None
-    qos: Optional[int] = None
-    requestId: Optional[str] = None
-    _categoryKey: Optional[str] = None
-    deviceType: Optional[str] = None
-    _traceId: Optional[str] = None
+    identifier: str | None = None
+    checkFailedData: dict | None = None
+    _tenantId: str | None = None
+    generateTime: int | None = None
+    JMSXDeliveryCount: int | None = None
+    qos: int | None = None
+    requestId: str | None = None
+    _categoryKey: str | None = None
+    deviceType: str | None = None
+    _traceId: str | None = None
 
 
 @dataclass
@@ -117,7 +117,7 @@ class DeviceNotificationEventParams(GeneralParams):
     {'data': '{"localTime":1725159492000,"code":"1002"}'},
     """
 
-    identifier: Literal["device_notification_event", "device_warning_code_event"]
+    identifier: Literal["device_notification_event", "device_information_event", "device_warning_code_event"]
     type: Literal["info"]
     value: DeviceNotificationEventValue
 
@@ -146,7 +146,7 @@ class DeviceConfigurationRequestEvent(GeneralParams):
 class ThingEventMessage(DataClassORJSONMixin):
     method: Literal["thing.events", "thing.properties"]
     id: str
-    params: Union[DeviceProtobufMsgEventParams, DeviceWarningEventParams, dict]
+    params: DeviceProtobufMsgEventParams | DeviceWarningEventParams | dict
     version: Literal["1.0"]
 
     @classmethod
@@ -170,7 +170,11 @@ class ThingEventMessage(DataClassORJSONMixin):
             params_obj = DeviceBizReqEventParams.from_dict(params_dict)
         elif identifier == "device_config_req_event":
             params_obj = payload.get("params", {})
-        elif identifier == "device_notification_event" or identifier == "device_warning_code_event":
+        elif (
+            identifier == "device_notification_event"
+            or identifier == "device_warning_code_event"
+            or identifier == "device_information_event"
+        ):
             params_obj = DeviceNotificationEventParams.from_dict(params_dict)
         else:
             raise ValueError(f"Unknown identifier: {identifier} {params_dict}")

pymammotion/data/mqtt/status.py

@@ -26,7 +26,7 @@ class Status(DataClassORJSONMixin):
 @dataclass
 class Params(DataClassORJSONMixin):
     groupIdList: list[GroupIdListItem]
-    netType: Literal["NET_WIFI"]
+    netType: Literal["NET_WIFI", "NET_MNET"]
     activeTime: int
     ip: str
     aliyunCommodityCode: Literal["iothub_senior"]

pymammotion/data/state_manager.py

@@ -11,6 +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.data.mqtt.status import ThingStatusMessage
 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
@@ -42,8 +43,20 @@ class StateManager:
         self._device = device
 
     async def properties(self, properties: ThingPropertiesMessage) -> None:
-        params = properties.params
-        self._device.mqtt_properties = params
+        self._device.mqtt_properties = properties
+
+    async def status(self, status: ThingStatusMessage) -> None:
+        if not self._device.online:
+            self._device.online = True
+        self._device.status_properties = status
+
+    @property
+    def online(self) -> bool:
+        return self._device.online
+
+    @online.setter
+    def online(self, value: bool) -> None:
+        self._device.online = value
 
     async def notification(self, message: LubaMsg) -> None:
         """Handle protobuf notifications."""

pymammotion/mammotion/devices/mammotion_cloud.py

@@ -4,7 +4,8 @@ import json
 import logging
 from asyncio import TimerHandle
 from collections import deque
-from typing import Any, Awaitable, Callable, Optional, cast
+from collections.abc import Awaitable, Callable
+from typing import Any, cast
 
 import betterproto
 
@@ -13,6 +14,7 @@ from pymammotion.aliyun.cloud_gateway import DeviceOfflineException
 from pymammotion.aliyun.model.dev_by_account_response import Device
 from pymammotion.data.mqtt.event import ThingEventMessage
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
+from pymammotion.data.mqtt.status import ThingStatusMessage
 from pymammotion.data.state_manager import StateManager
 from pymammotion.event.event import DataEvent
 from pymammotion.mammotion.commands.mammotion_command import MammotionCommand
@@ -35,6 +37,7 @@ class MammotionCloud:
         self._waiting_queue = deque()
         self.mqtt_message_event = DataEvent()
         self.mqtt_properties_event = DataEvent()
+        self.mqtt_status_event = DataEvent()
         self.on_ready_event = DataEvent()
         self.on_disconnected_event = DataEvent()
         self.on_connected_event = DataEvent()
@@ -116,7 +119,7 @@ class MammotionCloud:
         json_str = json.dumps(payload)
         payload = json.loads(json_str)
 
-        await self._handle_mqtt_message(topic, payload)
+        await self._parse_mqtt_response(topic, payload)
 
     async def _parse_mqtt_response(self, topic: str, payload: dict) -> None:
         """Parse the MQTT response."""
@@ -134,10 +137,9 @@ class MammotionCloud:
             if event.method == "thing.properties":
                 await self.mqtt_properties_event.data_event(event)
                 _LOGGER.debug(event)
-
-    async def _handle_mqtt_message(self, topic: str, payload: dict) -> None:
-        """Async handler for incoming MQTT messages."""
-        await self._parse_mqtt_response(topic=topic, payload=payload)
+        elif topic.endswith("/app/down/thing/status"):
+            status = ThingStatusMessage.from_dict(payload)
+            await self.mqtt_status_event.data_event(status)
 
     def _disconnect(self) -> None:
         """Disconnect the MQTT client."""
@@ -156,7 +158,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         super().__init__(state_manager, cloud_device)
         self._ble_sync_task: TimerHandle | None = None
         self.stopped = False
-        self.on_ready_callback: Optional[Callable[[], Awaitable[None]]] = None
+        self.on_ready_callback: Callable[[], Awaitable[None]] | None = None
         self.loop = asyncio.get_event_loop()
         self._mqtt = mqtt
         self.iot_id = cloud_device.iotId
@@ -166,6 +168,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self.currentID = ""
         self._mqtt.mqtt_message_event.add_subscribers(self._parse_message_for_device)
         self._mqtt.mqtt_properties_event.add_subscribers(self._parse_message_properties_for_device)
+        self._mqtt.mqtt_status_event.add_subscribers(self._parse_message_status_for_device)
         self._mqtt.on_ready_event.add_subscribers(self.on_ready)
         self._mqtt.on_disconnected_event.add_subscribers(self.on_disconnect)
         self._mqtt.on_connected_event.add_subscribers(self.on_connect)
@@ -278,6 +281,11 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             return
         self.state_manager.properties(event)
 
+    async def _parse_message_status_for_device(self, status: ThingStatusMessage) -> None:
+        if status.params.iotId != self.iot_id:
+            return
+        self.state_manager.status(status)
+
     async def _parse_message_for_device(self, event: ThingEventMessage) -> None:
         _LOGGER.debug("_parse_message_for_device")
         params = event.params

pymammotion/mqtt/mammotion_mqtt.py

@@ -193,6 +193,10 @@ class MammotionMQTT:
             else:
                 logger.info("Unhandled event: %s", params.identifier)
         elif message.topic.endswith("/app/down/thing/status"):
+            # the tell if a device has come back online
+            # lastStatus
+            # 1 online?
+            # 3 offline?
             status = ThingStatusMessage(**payload)
             logger.debug(status.params.status.value)
         elif message.topic.endswith("/app/down/thing/properties"):

{pymammotion-0.4.0a6.dist-info → pymammotion-0.4.0a8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.0a6
+Version: 0.4.0a8
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur
@@ -15,8 +15,6 @@ Requires-Dist: aiohttp (>=3.9.1,<4.0.0)
 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: aliyun-python-sdk-core (>=2.16.0,<3.0.0)
-Requires-Dist: aliyun-python-sdk-iot (>=8.59.0,<9.0.0)
 Requires-Dist: async-timeout (>=4.0.3,<5.0.0)
 Requires-Dist: betterproto (>=1.2.5,<2.0.0)
 Requires-Dist: bleak (>=0.21.0)

{pymammotion-0.4.0a6.dist-info → pymammotion-0.4.0a8.dist-info}/RECORD

@@ -1,7 +1,6 @@
 pymammotion/__init__.py,sha256=u1OHuD8Uj0qCOH4I7Lt5d7T-TPt1R0pY-bv8S6UfVxM,1587
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
-pymammotion/aliyun/cloud_gateway.py,sha256=uUes76XWvclWVy-b9tIKPhjHDh9ZIRMarU0UcefMTh0,26115
-pymammotion/aliyun/cloud_service.py,sha256=px7dUKow5Z7VyebjYzuKkzkm77XbUXYiFiYO_2e-UQ0,2207
+pymammotion/aliyun/cloud_gateway.py,sha256=XLe1crlSmntZtt3MekGBZzqQ0zHh_c4sVAb_x-hDRe0,26117
 pymammotion/aliyun/model/aep_response.py,sha256=8f6GIP58ve8gd6AL3HBoXxsy0n2q4ygWvjELGnoOnVc,452
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
 pymammotion/aliyun/model/dev_by_account_response.py,sha256=QZeopszFlGI7wltla-XDyGMbg5QSnb4Q1wTINkkaJyA,1026
@@ -24,7 +23,7 @@ pymammotion/const.py,sha256=lWRxvTVdXnNHuxqvRkjO5ziK0Ic-fZMM6J2dbe5M6Nc,385
 pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/data/model/__init__.py,sha256=aSyroxYQQS-WMRi6WmWm2js4wLa9nmsi160gx9tts4o,323
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
-pymammotion/data/model/device.py,sha256=lKQl3wuCTlqM0D5F-kpxSRemqv5lbffnkSGnD9yw6lI,6743
+pymammotion/data/model/device.py,sha256=lZEuWfEr4My0BUjY3OdIpUui91t9KbONhBc2t9oS2ro,6883
 pymammotion/data/model/device_config.py,sha256=wjayKnzoPDmBhqWZKTPDSueNEPCIWCB20tFEDSGIUsM,2602
 pymammotion/data/model/device_info.py,sha256=8FxHok09_uy99qBmgPiZw-MYbyqxXolF9eEw-8cQxSw,899
 pymammotion/data/model/device_limits.py,sha256=saW3iUvGq8WEn6CASn5hS5tVJpSeak4FDy_gnHtYqTQ,1955
@@ -41,10 +40,10 @@ pymammotion/data/model/raw_data.py,sha256=NO7FMzg_nE3WxT_K2ny-pEqbMf25LnvoYMB86s
 pymammotion/data/model/region_data.py,sha256=OTV15vRyn9JORXsQPjWMNF1ZujuNhsOKl25KeqwMObA,3007
 pymammotion/data/model/report_info.py,sha256=9sPPfhBv8f0K-xuHRkKrbez-7nZ_oCND2vZYLuKvkBA,3436
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pymammotion/data/mqtt/event.py,sha256=pEOQcjnv5XKosSPD8UmVAgCAaI8vLuIhGECZcU4xKjk,5055
+pymammotion/data/mqtt/event.py,sha256=r14gzZVxmlGVAwFdZQ1CUsMZFHHwRKnbt2VHnjugP28,5123
 pymammotion/data/mqtt/properties.py,sha256=kvphcjrDuJHuX8Az98-wKeFv_rSmu2Fz9YKLGodGSj0,3759
-pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
-pymammotion/data/state_manager.py,sha256=ZLPczA-tQMDKA8-O_DNDxYVqaRiDBan1lzCCHqMaV_Q,5744
+pymammotion/data/mqtt/status.py,sha256=DuNC3JdewLPKNqNHx76_FPXRvheYSiM-CdiVTCCYY8s,1079
+pymammotion/data/state_manager.py,sha256=t8RtRPUZuqp6dyMgy5bTV9W1Te-Ppq8-Qatj80o-85g,6140
 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
@@ -69,13 +68,13 @@ pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_A
 pymammotion/mammotion/devices/base.py,sha256=2IKm7CYGmvRLpJaAKp25tL23UhOoSEHJ6On5D0N5TSk,10763
 pymammotion/mammotion/devices/mammotion.py,sha256=_4w8dGoA1dcylZWtfMJyr7z-bjp9WcIEnWJ3mPHqOKA,12632
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=HUOKnjYUWTGjksyQDCPKF_u3dWo2ddgrWCBXnJ2VkwA,18963
-pymammotion/mammotion/devices/mammotion_cloud.py,sha256=a9fB0ZCYElRxrjnwCM81RXCbxo5kJKhGa-BGck9U3-A,12949
+pymammotion/mammotion/devices/mammotion_cloud.py,sha256=IzJeWeLL8maLGHRi1-FO_cnTTbfB0gp1o8l0lCn0vbc,13329
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/linkkit/__init__.py,sha256=ENgc3ynd2kd9gMQR3-kgmCu6Ed9Y6XCIzU0zFReUlkk,80
 pymammotion/mqtt/linkkit/h2client.py,sha256=cca526y3NiZjMPodXWHGupgELpIBTc9MxM5fN4Ku0z0,19683
 pymammotion/mqtt/linkkit/linkkit.py,sha256=1kmQP3G-S2hOVZjL2HRu3anaaJR5YThljIXlnlfzzAg,132781
 pymammotion/mqtt/mammotion_future.py,sha256=_OWqKOlUGl2yT1xOsXFQYpGd-1zQ63OxqXgy7KRQgYc,710
-pymammotion/mqtt/mammotion_mqtt.py,sha256=5Jt-zG9A-E1MyVdyhvEIF0Ssbh_Y8grvadK2fcQjBuQ,8746
+pymammotion/mqtt/mammotion_mqtt.py,sha256=Zpub35HFkixviTojnthKrYo0L_chodagHh4e3PWch4o,8876
 pymammotion/proto/__init__.py,sha256=v3_P1LOsYRBN9qCAhaWrWMX7GWHrox9XD3hdZQxcPZM,190
 pymammotion/proto/basestation.proto,sha256=_x5gAz3FkZXS1jtq4GgZgaDCuRU-UV-7HTFdsfQ3zbo,1034
 pymammotion/proto/basestation.py,sha256=js64_N2xQYRxWPRdVNEapO0qe7vBlfYnjW5sE8hi7hw,2026
@@ -128,7 +127,7 @@ pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,22
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.4.0a6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.4.0a6.dist-info/METADATA,sha256=Dp_naMRuux98fhLby-gjSQeeX6f5teipKUdesc4m7oo,3990
-pymammotion-0.4.0a6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-pymammotion-0.4.0a6.dist-info/RECORD,,
+pymammotion-0.4.0a8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.4.0a8.dist-info/METADATA,sha256=R7_WJcbRLeF1uFrAbhKXQ6chMTXprwfrJRh0dqKDOVo,3879
+pymammotion-0.4.0a8.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+pymammotion-0.4.0a8.dist-info/RECORD,,

pymammotion/aliyun/cloud_service.py

@@ -1,65 +0,0 @@
-import base64
-
-from aliyunsdkcore import client
-from aliyunsdkiot.request.v20180120.GetDeviceStatusRequest import GetDeviceStatusRequest
-from aliyunsdkiot.request.v20180120.InvokeThingServiceRequest import (
-    InvokeThingServiceRequest,
-)
-
-
-class CloudService:
-    # com.aliyun.iot.aep.sdk
-    # https://domestic.mammotion.com/privacy/ - lists all aliyun packages
-    def __init__(self) -> None:
-        self.selectDeviceIOTID = ""
-        accessKeyId = "<your accessKey>"
-        accessKeySecret = "<your accessSecret>"
-        self.clt = client.AcsClient(accessKeyId, accessKeySecret, "ap-southeast")
-
-    """
-    String printBase64Binary = DatatypeConverter.printBase64Binary(byteArray);
-        JSONObject jSONObject = new JSONObject();
-        JSONObject jSONObject2 = new JSONObject();
-        try {
-            jSONObject2.put("content", printBase64Binary);
-            jSONObject.put("args", jSONObject2);
-            jSONObject.put("iotId", this.selectDeviceIOTID);
-            jSONObject.put("identifier", "device_protobuf_sync_service");
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    
-    """
-
-    def invoke_thing_service(self, data: bytearray) -> None:
-        base64_encoded = base64.b64encode(data).decode("utf-8")
-
-        # Create a dictionary structure
-        data = {
-            "args": {"content": base64_encoded},
-            "DEVICE_IOTID": self.selectDeviceIOTID,
-            "identifier": "device_protobuf_sync_service",
-        }
-
-        request = InvokeThingServiceRequest()
-        request.set_accept_format("json")
-
-        request.set_Args("Args")
-        request.set_Identifier("Identifier")
-        request.set_IotId("IotId")
-        request.set_ProductKey("ProductKey")
-
-        response = self.clt.do_action_with_exception(request)
-        # python2:  print(response)
-        print(response)
-
-    def get_device_status(self) -> None:
-        request = GetDeviceStatusRequest()
-        request.set_accept_format("json")
-
-        request.set_IotId("IotId")
-        request.set_ProductKey("ProductKey")
-        request.set_DeviceName("DeviceName")
-
-        response = self.clt.do_action_with_exception(request)
-        print(response)