pymammotion 0.4.0a9__tar.gz → 0.4.0b1__tar.gz

{pymammotion-0.4.0a9 → pymammotion-0.4.0b1}/PKG-INFO

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

pymammotion-0.4.0b1/pymammotion/data/state_manager.py

@@ -0,0 +1,173 @@
+"""Manage state from notifications into MowingDevice."""
+
+from collections.abc import Awaitable, Callable
+from datetime import datetime
+import logging
+from typing import Any
+
+import betterproto
+
+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
+from pymammotion.proto.mctrl_sys import DeviceProductTypeInfoT, TimeCtrlLight
+
+logger = logging.getLogger(__name__)
+
+
+class StateManager:
+"""Manage state."""
+
+_device: MowingDevice
+last_updated_at: datetime = datetime.now()
+
+def __init__(self, device: MowingDevice) -> None:
+    self._device = device
+    self.cloud_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
+    self.cloud_get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = None
+    self.cloud_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
+
+    # possibly don't need anymore
+    self.cloud_queue_command_callback: Callable[[str, dict[str, Any]], Awaitable[bytes]] | None = None
+
+    self.ble_gethash_ack_callback: Callable[[NavGetHashListAck], Awaitable[None]] | None = None
+    self.ble_get_commondata_ack_callback: Callable[[NavGetCommDataAck | SvgMessageAckT], Awaitable[None]] | None = None
+    self.ble_on_notification_callback: Callable[[tuple[str, Any | None]], Awaitable[None]] | None = None
+
+    # possibly don't need anymore
+    self.ble_queue_command_callback: Callable[[str, dict[str, Any]], Awaitable[bytes]] | None = None
+    self.last_updated_at = datetime.now()
+
+def get_device(self) -> MowingDevice:
+    """Get device."""
+    return self._device
+
+def set_device(self, device: MowingDevice) -> None:
+    """Set device."""
+    self._device = device
+
+async def properties(self, properties: ThingPropertiesMessage) -> None:
+    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 gethash_ack_callback(self, msg: NavGetHashListAck):
+    if self.cloud_gethash_ack_callback:
+        await self.cloud_gethash_ack_callback(msg)
+    if self.ble_gethash_ack_callback:
+        await self.ble_gethash_ack_callback(msg)
+
+async def on_notification_callback(self, res: tuple[str, Any | None]):
+    if self.cloud_on_notification_callback:
+        await self.cloud_on_notification_callback(res)
+    if self.ble_on_notification_callback:
+        await self.ble_on_notification_callback(res)
+
+async def get_commondata_ack_callback(self, comm_data: NavGetCommDataAck | SvgMessageAckT):
+    if self.cloud_get_commondata_ack_callback:
+        await self.cloud_get_commondata_ack_callback(comm_data)
+    if self.ble_get_commondata_ack_callback:
+        await self.ble_get_commondata_ack_callback(comm_data)
+
+async def notification(self, message: LubaMsg) -> None:
+    """Handle protobuf notifications."""
+    res = betterproto.which_one_of(message, "LubaSubMsg")
+    self.last_updated_at = datetime.now()
+
+    match res[0]:
+        case "nav":
+            await self._update_nav_data(message)
+        case "sys":
+            await self._update_sys_data(message)
+        case "driver":
+            self._update_driver_data(message)
+        case "net":
+            self._update_net_data(message)
+        case "mul":
+            self._update_mul_data(message)
+        case "ota":
+            self._update_ota_data(message)
+
+    await self.on_notification_callback(res)
+
+async def _update_nav_data(self, message) -> None:
+    """Update nav data."""
+    nav_msg = betterproto.which_one_of(message.nav, "SubNavMsg")
+    match nav_msg[0]:
+        case "toapp_gethash_ack":
+            hashlist_ack: NavGetHashListAck = nav_msg[1]
+            self._device.map.update_root_hash_list(hashlist_ack)
+            await self.gethash_ack_callback(nav_msg[1])
+        case "toapp_get_commondata_ack":
+            common_data: NavGetCommDataAck = nav_msg[1]
+            updated = self._device.map.update(common_data)
+            if updated:
+                await self.get_commondata_ack_callback(common_data)
+        case "toapp_svg_msg":
+            common_data: SvgMessageAckT = nav_msg[1]
+            updated = self._device.map.update(common_data)
+            if updated:
+                await self.get_commondata_ack_callback(common_data)
+
+        case "toapp_all_hash_name":
+            hash_names: AppGetAllAreaHashName = nav_msg[1]
+            converted_list = [AreaHashNameList(name=item.name, hash=item.hash) for item in hash_names.hashnames]
+            self._device.map.area_name = converted_list
+
+async def _update_sys_data(self, message) -> None:
+    """Update system."""
+    sys_msg = betterproto.which_one_of(message.sys, "SubSysMsg")
+    match sys_msg[0]:
+        case "system_update_buf":
+            self._device.buffer(sys_msg[1])
+        case "toapp_report_data":
+            self._device.update_report_data(sys_msg[1])
+        case "mow_to_app_info":
+            self._device.mow_info(sys_msg[1])
+        case "system_tard_state_tunnel":
+            self._device.run_state_update(sys_msg[1])
+        case "todev_time_ctrl_light":
+            ctrl_light: TimeCtrlLight = sys_msg[1]
+            side_led: SideLight = SideLight.from_dict(ctrl_light.to_dict(casing=betterproto.Casing.SNAKE))
+            self._device.mower_state.side_led = side_led
+        case "device_product_type_info":
+            device_product_type: DeviceProductTypeInfoT = sys_msg[1]
+            self._device.mower_state.model_id = device_product_type.main_product_type
+
+def _update_driver_data(self, message) -> None:
+    pass
+
+def _update_net_data(self, message) -> None:
+    net_msg = betterproto.which_one_of(message.net, "NetSubType")
+    match net_msg[0]:
+        case "toapp_wifi_iot_status":
+            wifi_iot_status: WifiIotStatusReport = net_msg[1]
+            self._device.mower_state.product_key = wifi_iot_status.productkey
+        case "toapp_devinfo_resp":
+            toapp_devinfo_resp: DrvDevInfoResp = net_msg[1]
+            for resp in toapp_devinfo_resp.resp_ids:
+                if resp.res == "DRV_RESULT_SUC":
+                    self._device.mower_state.swversion = resp.info
+                    self._device.device_firmwares.device_version = resp.info
+
+def _update_mul_data(self, message) -> None:
+    pass
+
+def _update_ota_data(self, message) -> None:
+    pass

{pymammotion-0.4.0a9 → pymammotion-0.4.0b1}/pymammotion/mammotion/commands/messages/video.py

@@ -5,6 +5,7 @@ import time
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
 from pymammotion.proto import luba_msg_pb2, luba_mul_pb2
 from pymammotion.proto.luba_msg import MsgAttr, MsgCmdType, MsgDevice
+from pymammotion.proto.luba_mul import MUL_CAMERA_POSITION
 from pymammotion.utility.device_type import DeviceType
 
 
@@ -25,10 +26,6 @@ class MessageVideo(AbstractMessage, ABC):
         return luba_msg.SerializeToString()
 
     def device_agora_join_channel_with_position(self, enter_state: int):
-        position = (
-            luba_mul_pb2.MUL_CAMERA_POSITION.ALL
-            if DeviceType.is_yuka(self.get_device_name())
-            else luba_mul_pb2.MUL_CAMERA_POSITION.LEFT
-        )
+        position = MUL_CAMERA_POSITION.ALL if DeviceType.is_yuka(self.get_device_name()) else MUL_CAMERA_POSITION.LEFT
         mctl_sys = luba_mul_pb2.SocMul(set_video=luba_mul_pb2.MulSetVideo(position=position, vi_switch=enter_state))
         return self.send_order_msg_video(mctl_sys)

{pymammotion-0.4.0a9 → pymammotion-0.4.0b1}/pymammotion/mammotion/devices/base.py

@@ -1,6 +1,5 @@
 from abc import abstractmethod
 import asyncio
-from collections.abc import Awaitable, Callable
 import logging
 from typing import Any
 
@@ -41,17 +40,9 @@ class MammotionBaseDevice:
         self._state_manager = state_manager
         self._raw_data = dict()
         self._raw_mower_data: RawMowerData = RawMowerData()
-        self._state_manager.gethash_ack_callback = self.datahash_response
-        self._state_manager.get_commondata_ack_callback = self.commdata_response
         self._notify_future: asyncio.Future[bytes] | None = None
         self._cloud_device = cloud_device
 
-    def set_notification_callback(self, func: Callable[[tuple[str, Any | None]], Awaitable[None]]) -> None:
-        self._state_manager.on_notification_callback = func
-
-    def set_queue_callback(self, func: Callable[[str, dict[str, Any]], Awaitable[bytes]]) -> None:
-        self._state_manager.queue_command_callback = func
-
     async def datahash_response(self, hash_ack: NavGetHashListAck) -> None:
         """Handle datahash responses."""
         current_frame = hash_ack.current_frame

{pymammotion-0.4.0a9 → pymammotion-0.4.0b1}/pymammotion/mammotion/devices/mammotion_bluetooth.py

@@ -1,4 +1,5 @@
 import asyncio
+from collections.abc import Awaitable, Callable
 import logging
 from typing import Any, cast
 from uuid import UUID
@@ -89,9 +90,17 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         self._operation_lock = asyncio.Lock()
         self._key: str | None = None
         self.set_queue_callback(self.queue_command)
+        self._state_manager.ble_gethash_ack_callback = self.datahash_response
+        self._state_manager.ble_get_commondata_ack_callback = self.commdata_response
         loop = asyncio.get_event_loop()
         loop.create_task(self.process_queue())
 
+    def set_notification_callback(self, func: Callable[[tuple[str, Any | None]], Awaitable[None]]) -> None:
+        self._state_manager.ble_on_notification_callback = func
+
+    def set_queue_callback(self, func: Callable[[str, dict[str, Any]], Awaitable[bytes]]) -> None:
+        self._state_manager.ble_queue_command_callback = func
+
     def update_device(self, device: BLEDevice) -> None:
         """Update the BLE device."""
         self.ble_device = device

{pymammotion-0.4.0a9 → pymammotion-0.4.0b1}/pymammotion/mammotion/devices/mammotion_cloud.py

@@ -172,6 +172,8 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         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)
+        self._state_manager.cloud_gethash_ack_callback = self.datahash_response
+        self._state_manager.cloud_get_commondata_ack_callback = self.commdata_response
         self.set_queue_callback(self.queue_command)
 
         if self._mqtt.is_ready:
@@ -185,6 +187,12 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         if self._ble_sync_task:
             self._ble_sync_task.cancel()
 
+    def set_notification_callback(self, func: Callable[[tuple[str, Any | None]], Awaitable[None]]) -> None:
+        self._state_manager.cloud_on_notification_callback = func
+
+    def set_queue_callback(self, func: Callable[[str, dict[str, Any]], Awaitable[bytes]]) -> None:
+        self._state_manager.cloud_queue_command_callback = func
+
     async def on_ready(self) -> None:
         """Callback for when MQTT is subscribed to events."""
         if self.stopped:

{pymammotion-0.4.0a9 → pymammotion-0.4.0b1}/pyproject.toml

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

pymammotion-0.4.0a9/pymammotion/data/state_manager.py

@@ -1,147 +0,0 @@
-"""Manage state from notifications into MowingDevice."""
-
-from collections.abc import Awaitable, Callable
-from datetime import datetime
-import logging
-from typing import Any
-
-import betterproto
-
-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
-from pymammotion.proto.mctrl_sys import DeviceProductTypeInfoT, TimeCtrlLight
-
-logger = logging.getLogger(__name__)
-
-
-class StateManager:
-    """Manage state."""
-
-    _device: MowingDevice
-    last_updated_at: datetime = datetime.now()
-
-    def __init__(self, device: MowingDevice) -> None:
-        self._device = device
-        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:
-        """Get device."""
-        return self._device
-
-    def set_device(self, device: MowingDevice) -> None:
-        """Set device."""
-        self._device = device
-
-    async def properties(self, properties: ThingPropertiesMessage) -> None:
-        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."""
-        res = betterproto.which_one_of(message, "LubaSubMsg")
-        self.last_updated_at = datetime.now()
-
-        match res[0]:
-            case "nav":
-                await self._update_nav_data(message)
-            case "sys":
-                await self._update_sys_data(message)
-            case "driver":
-                self._update_driver_data(message)
-            case "net":
-                self._update_net_data(message)
-            case "mul":
-                self._update_mul_data(message)
-            case "ota":
-                self._update_ota_data(message)
-
-        if self.on_notification_callback:
-            await self.on_notification_callback(res)
-
-    async def _update_nav_data(self, message) -> None:
-        """Update nav data."""
-        nav_msg = betterproto.which_one_of(message.nav, "SubNavMsg")
-        match nav_msg[0]:
-            case "toapp_gethash_ack":
-                hashlist_ack: NavGetHashListAck = nav_msg[1]
-                self._device.map.update_root_hash_list(hashlist_ack)
-                await self.gethash_ack_callback(nav_msg[1])
-            case "toapp_get_commondata_ack":
-                common_data: NavGetCommDataAck = nav_msg[1]
-                updated = self._device.map.update(common_data)
-                if updated:
-                    await self.get_commondata_ack_callback(common_data)
-            case "toapp_svg_msg":
-                common_data: SvgMessageAckT = nav_msg[1]
-                updated = self._device.map.update(common_data)
-                if updated:
-                    await self.get_commondata_ack_callback(common_data)
-
-            case "toapp_all_hash_name":
-                hash_names: AppGetAllAreaHashName = nav_msg[1]
-                converted_list = [AreaHashNameList(name=item.name, hash=item.hash) for item in hash_names.hashnames]
-                self._device.map.area_name = converted_list
-
-    async def _update_sys_data(self, message) -> None:
-        """Update system."""
-        sys_msg = betterproto.which_one_of(message.sys, "SubSysMsg")
-        match sys_msg[0]:
-            case "system_update_buf":
-                self._device.buffer(sys_msg[1])
-            case "toapp_report_data":
-                self._device.update_report_data(sys_msg[1])
-            case "mow_to_app_info":
-                self._device.mow_info(sys_msg[1])
-            case "system_tard_state_tunnel":
-                self._device.run_state_update(sys_msg[1])
-            case "todev_time_ctrl_light":
-                ctrl_light: TimeCtrlLight = sys_msg[1]
-                side_led: SideLight = SideLight.from_dict(ctrl_light.to_dict(casing=betterproto.Casing.SNAKE))
-                self._device.mower_state.side_led = side_led
-            case "device_product_type_info":
-                device_product_type: DeviceProductTypeInfoT = sys_msg[1]
-                self._device.mower_state.model_id = device_product_type.main_product_type
-
-    def _update_driver_data(self, message) -> None:
-        pass
-
-    def _update_net_data(self, message) -> None:
-        net_msg = betterproto.which_one_of(message.net, "NetSubType")
-        match net_msg[0]:
-            case "toapp_wifi_iot_status":
-                wifi_iot_status: WifiIotStatusReport = net_msg[1]
-                self._device.mower_state.product_key = wifi_iot_status.productkey
-            case "toapp_devinfo_resp":
-                toapp_devinfo_resp: DrvDevInfoResp = net_msg[1]
-                for resp in toapp_devinfo_resp.resp_ids:
-                    if resp.res == "DRV_RESULT_SUC":
-                        self._device.mower_state.swversion = resp.info
-                        self._device.device_firmwares.device_version = resp.info
-
-    def _update_mul_data(self, message) -> None:
-        pass
-
-    def _update_ota_data(self, message) -> None:
-        pass