pymammotion 0.4.0a6__tar.gz → 0.4.0a7__tar.gz

{pymammotion-0.4.0a6 → pymammotion-0.4.0a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.0a6
+Version: 0.4.0a7
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

{pymammotion-0.4.0a6 → pymammotion-0.4.0a7}/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-0.4.0a6 → pymammotion-0.4.0a7}/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-0.4.0a6 → pymammotion-0.4.0a7}/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-0.4.0a6 → pymammotion-0.4.0a7}/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-0.4.0a6 → pymammotion-0.4.0a7}/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-0.4.0a6 → pymammotion-0.4.0a7}/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-0.4.0a6 → pymammotion-0.4.0a7}/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 → pymammotion-0.4.0a7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name        = "pymammotion"
-version     = "0.4.0-alpha6"
+version     = "0.4.0-alpha7"
 license     = "GPL-3.0"
 description = ""
 readme      = "README.md"
@@ -67,7 +67,7 @@ mypy = "^1.11.2"
 autotyping = "^24.3.0"
 
 [tool.bumpver]
-current_version = "0.4.0-alpha6"
+current_version = "0.4.0-alpha7"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true