pymammotion 0.5.5__tar.gz → 0.5.6__tar.gz

{pymammotion-0.5.5 → pymammotion-0.5.6}/PKG-INFO

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

{pymammotion-0.5.5 → pymammotion-0.5.6}/pymammotion/data/model/device.py

@@ -7,12 +7,14 @@ from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 from pymammotion.data.model import HashList, RapidState
 from pymammotion.data.model.device_info import DeviceFirmwares, DeviceNonWorkingHours, MowerInfo
+from pymammotion.data.model.errors import DeviceErrors
 from pymammotion.data.model.location import Location
 from pymammotion.data.model.report_info import ReportData
 from pymammotion.data.model.work import CurrentTaskSettings
+from pymammotion.data.mqtt.event import ThingEventMessage
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
-from pymammotion.http.model.http import CheckDeviceVersion, ErrorInfo
+from pymammotion.http.model.http import CheckDeviceVersion
 from pymammotion.proto import DeviceFwInfo, MowToAppInfoT, ReportInfoData, SystemRapidStateTunnelMsg, SystemUpdateBufMsg
 from pymammotion.utility.constant import WorkMode
 from pymammotion.utility.conversions import parse_double
@@ -30,15 +32,14 @@ class MowingDevice(DataClassORJSONMixin):
     mower_state: MowerInfo = field(default_factory=MowerInfo)
     mqtt_properties: ThingPropertiesMessage | None = None
     status_properties: ThingStatusMessage | None = None
+    device_event: ThingEventMessage | None = None
     map: HashList = field(default_factory=HashList)
     work: CurrentTaskSettings = field(default_factory=CurrentTaskSettings)
     location: Location = field(default_factory=Location)
     mowing_state: RapidState = field(default_factory=RapidState)
     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: list | None = field(default_factory=list)
-    error_codes: dict[str, ErrorInfo] = field(default_factory=dict)
+    errors: DeviceErrors = field(default_factory=DeviceErrors)
     non_work_hours: DeviceNonWorkingHours = field(default_factory=DeviceNonWorkingHours)
 
     def buffer(self, buffer_list: SystemUpdateBufMsg) -> None:

{pymammotion-0.5.5 → pymammotion-0.5.6}/pymammotion/data/state_manager.py

@@ -12,6 +12,7 @@ from pymammotion.data.model.device_info import SideLight
 from pymammotion.data.model.enums import ConnectionPreference
 from pymammotion.data.model.hash_list import AreaHashNameList, NavGetCommData, NavGetHashListData, Plan, SvgMessage
 from pymammotion.data.model.work import CurrentTaskSettings
+from pymammotion.data.mqtt.event import ThingEventMessage
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
 from pymammotion.data.mqtt.status import ThingStatusMessage
 from pymammotion.event.event import DataEvent
@@ -62,6 +63,7 @@ class StateManager:
 
         self.properties_callback = DataEvent()
         self.status_callback = DataEvent()
+        self.device_event_callback = DataEvent()
 
     def get_device(self) -> MowingDevice:
         """Get device."""
@@ -84,6 +86,10 @@ class StateManager:
             self._device.mower_state.product_key = thing_status.params.productKey
         await self.on_status_callback(thing_status)
 
+    async def device_event(self, device_event: ThingEventMessage) -> None:
+        self._device.mqtt_device_event = device_event
+        await self.on_device_event_callback(device_event)
+
     @property
     def online(self) -> bool:
         return self._device.online
@@ -114,6 +120,11 @@ class StateManager:
         if self.status_callback:
             await self.status_callback.data_event(thing_status)
 
+    async def on_device_event_callback(self, device_event: ThingEventMessage) -> None:
+        """Execute the status callback if it is set."""
+        if self.device_event_callback:
+            await self.device_event_callback.data_event(device_event)
+
     async def get_commondata_ack_callback(self, comm_data: NavGetCommDataAck | SvgMessageAckT) -> None:
         """Asynchronously calls the appropriate callback based on available handlers."""
         if self.cloud_get_commondata_ack_callback:

{pymammotion-0.5.5 → pymammotion-0.5.6}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -31,6 +31,7 @@ class MammotionCloud:
     """Per account MQTT cloud."""
 
     def __init__(self, mqtt_client: MammotionMQTT, cloud_client: CloudIOTGateway) -> None:
+        """Initialize MammotionCloud."""
         self.cloud_client = cloud_client
         self.loop = asyncio.get_event_loop()
         self.is_ready = False
@@ -39,6 +40,7 @@ class MammotionCloud:
         self.mqtt_message_event = DataEvent()
         self.mqtt_properties_event = DataEvent()
         self.mqtt_status_event = DataEvent()
+        self.mqtt_device_event = DataEvent()
         self.on_ready_event = DataEvent()
         self.on_disconnected_event = DataEvent()
         self.on_connected_event = DataEvent()
@@ -49,9 +51,6 @@ class MammotionCloud:
         self._mqtt_client.on_message = self._on_mqtt_message
         self._mqtt_client.on_ready = self.on_ready
 
-        # temporary for testing only
-        # self._start_sync_task = self.loop.call_later(30, lambda: asyncio.ensure_future(self.start_sync(0)))
-
     async def on_ready(self) -> None:
         loop = asyncio.get_event_loop()
         loop.create_task(self.process_queue())
@@ -129,6 +128,8 @@ class MammotionCloud:
                 _LOGGER.debug("Protobuf event")
                 # Call the callbacks for each cloudDevice
                 await self.mqtt_message_event.data_event(event)
+            if event.method == "thing.events":
+                await self.mqtt_device_event.data_event(event)
             if event.method == "thing.properties":
                 await self.mqtt_properties_event.data_event(event)
                 _LOGGER.debug(event)
@@ -170,6 +171,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         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.mqtt_device_event.add_subscribers(self._parse_device_event_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)
@@ -188,6 +190,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._mqtt.mqtt_message_event.remove_subscribers(self._parse_message_for_device)
         self._mqtt.mqtt_properties_event.remove_subscribers(self._parse_message_properties_for_device)
         self._mqtt.mqtt_status_event.remove_subscribers(self._parse_message_status_for_device)
+        self._mqtt.mqtt_device_event.remove_subscribers(self._parse_device_event_for_device)
         self._state_manager.cloud_gethash_ack_callback = None
         self._state_manager.cloud_get_commondata_ack_callback = None
         self._state_manager.cloud_get_plan_callback = None
@@ -319,6 +322,11 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             return
         await self.state_manager.status(status)
 
+    async def _parse_device_event_for_device(self, status: ThingStatusMessage) -> None:
+        if status.params.iotId != self.iot_id:
+            return
+        await self.state_manager.device_event(status)
+
     async def _parse_message_for_device(self, event: ThingEventMessage) -> None:
         params = event.params
         new_msg = LubaMsg()

{pymammotion-0.5.5 → pymammotion-0.5.6}/pyproject.toml

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