pymammotion 0.4.0a8__tar.gz → 0.4.0b1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.0a8
+Version: 0.4.0b1
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur
@@ -25,7 +25,7 @@ Requires-Dist: jsonic (>=1.0.0,<2.0.0)
 Requires-Dist: mashumaro (>=3.13,<4.0)
 Requires-Dist: numpy (>=1.26.0)
 Requires-Dist: orjson (>=3.9.15,<4.0.0)
-Requires-Dist: paho-mqtt (==2.1.0)
+Requires-Dist: paho-mqtt (>=2.1.0,<3.0.0)
 Requires-Dist: protobuf (>=4.23.1)
 Requires-Dist: py-jsonic (>=0.0.2,<0.0.3)
 Description-Content-Type: text/markdown

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/aliyun/cloud_gateway.py

@@ -5,11 +5,11 @@ import hashlib
 import hmac
 import itertools
 import json
+from logging import getLogger
 import random
 import string
 import time
 import uuid
-from logging import getLogger
 
 from aiohttp import ClientSession
 from alibabacloud_iot_api_gateway.client import Client
@@ -19,14 +19,10 @@ from alibabacloud_tea_util.models import RuntimeOptions
 
 from pymammotion.aliyun.model.aep_response import AepResponse
 from pymammotion.aliyun.model.connect_response import ConnectResponse
-from pymammotion.aliyun.model.dev_by_account_response import (
-    ListingDevByAccountResponse,
-)
+from pymammotion.aliyun.model.dev_by_account_response import ListingDevByAccountResponse
 from pymammotion.aliyun.model.login_by_oauth_response import LoginByOAuthResponse
 from pymammotion.aliyun.model.regions_response import RegionResponse
-from pymammotion.aliyun.model.session_by_authcode_response import (
-    SessionByAuthCodeResponse,
-)
+from pymammotion.aliyun.model.session_by_authcode_response import SessionByAuthCodeResponse
 from pymammotion.const import ALIYUN_DOMAIN, APP_KEY, APP_SECRET, APP_VERSION
 from pymammotion.http.http import MammotionHTTP
 from pymammotion.utility.datatype_converter import DatatypeConverter

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/aliyun/model/aep_response.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
@@ -16,7 +15,7 @@ class DeviceData(DataClassORJSONMixin):
 class AepResponse(DataClassORJSONMixin):
     code: int
     data: DeviceData
-    id: Optional[str] = None
+    id: str | None = None
 
     class Config(BaseConfig):
         omit_default = True

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/aliyun/model/dev_by_account_response.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
@@ -23,11 +22,11 @@ class Device(DataClassORJSONMixin):
     identityId: str
     thingType: str
     status: int
-    nickName: Optional[str] = None
-    description: Optional[str] = None
-    productImage: Optional[str] = None
-    categoryImage: Optional[str] = None
-    productModel: Optional[str] = None
+    nickName: str | None = None
+    description: str | None = None
+    productImage: str | None = None
+    categoryImage: str | None = None
+    productModel: str | None = None
 
     class Config(BaseConfig):
         omit_default = True
@@ -44,5 +43,5 @@ class Data(DataClassORJSONMixin):
 @dataclass
 class ListingDevByAccountResponse(DataClassORJSONMixin):
     code: int
-    data: Optional[Data]
-    id: Optional[str] = None
+    data: Data | None
+    id: str | None = None

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/aliyun/model/login_by_oauth_response.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -18,7 +17,7 @@ class OpenAccount(DataClassORJSONMixin):
     domainId: int
     enableDevice: str
     status: int
-    country: Optional[str] = None
+    country: str | None = None
 
 
 @dataclass
@@ -54,7 +53,7 @@ class InnerData(DataClassORJSONMixin):
     subCode: int
     message: str
     successful: str
-    deviceId: Optional[str] = None
+    deviceId: str | None = None
 
 
 @dataclass

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/aliyun/model/regions_response.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Optional, TypeVar
+from typing import TypeVar
 
 from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
@@ -22,8 +22,8 @@ class RegionResponseData(DataClassORJSONMixin):
 class RegionResponse(DataClassORJSONMixin):
     data: RegionResponseData
     code: int
-    id: Optional[str] = None
-    msg: Optional[str] = None
+    id: str | None = None
+    msg: str | None = None
 
     class Config(BaseConfig):
         omit_default = True

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/aliyun/model/session_by_authcode_response.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -16,4 +15,4 @@ class SessionOauthToken(DataClassORJSONMixin):
 @dataclass
 class SessionByAuthCodeResponse(DataClassORJSONMixin):
     code: int
-    data: Optional[SessionOauthToken] = None
+    data: SessionOauthToken | None = None

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/aliyun/model/stream_subscription_response.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import List
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -13,7 +12,7 @@ class Camera(DataClassORJSONMixin):
 @dataclass
 class StreamSubscriptionResponse(DataClassORJSONMixin):
     appid: str
-    cameras: List[Camera]
+    cameras: list[Camera]
     channelName: str
     token: str
     uid: int

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/bluetooth/ble.py

@@ -1,10 +1,7 @@
 from bleak import BleakClient, BleakScanner, BLEDevice
 from bleak.backends.characteristic import BleakGATTCharacteristic
 
-from pymammotion.bluetooth.const import (
-    SERVICE_CHANGED_CHARACTERISTIC,
-    UUID_NOTIFICATION_CHARACTERISTIC,
-)
+from pymammotion.bluetooth.const import SERVICE_CHANGED_CHARACTERISTIC, UUID_NOTIFICATION_CHARACTERISTIC
 from pymammotion.event.event import BleNotificationEvent
 
 

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/bluetooth/ble_message.py

@@ -1,12 +1,11 @@
+from asyncio import sleep
+from io import BytesIO
 import itertools
 import json
 import logging
 import queue
 import sys
 import time
-from asyncio import sleep
-from io import BytesIO
-from typing import Union
 
 from bleak import BleakClient
 from jsonic.serializable import serialize
@@ -17,9 +16,7 @@ from pymammotion.bluetooth.data.framectrldata import FrameCtrlData
 from pymammotion.bluetooth.data.notifydata import BlufiNotifyData
 from pymammotion.bluetooth.model.atomic_integer import AtomicInteger
 from pymammotion.data.model.execute_boarder import ExecuteBorder
-from pymammotion.proto import (
-    dev_net_pb2,
-)
+from pymammotion.proto import dev_net_pb2
 from pymammotion.proto.luba_msg import LubaMsg, MsgAttr, MsgCmdType, MsgDevice
 from pymammotion.utility.constant.device_constant import bleOrderCmd
 
@@ -656,7 +653,7 @@ class BleMessage:
         return byteOS.getvalue()
 
     @staticmethod
-    def calc_crc(initial: int, data: Union[bytes, bytearray]) -> int:
+    def calc_crc(initial: int, data: bytes | bytearray) -> int:
         """Calculate CRC value for given initial value and byte array.
 
         Args:

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/data/model/plan.py

@@ -1,6 +1,3 @@
-from typing import List
-
-
 class Plan:
     def __init__(self) -> None:
         self.pver: int = 0

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/data/model/raw_data.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass, field
-from typing import Optional
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -15,7 +14,7 @@ from pymammotion.proto.mctrl_sys import MctlSys
 
 @dataclass
 class RawMowerData:
-    raw: Optional[LubaMsg] = field(default_factory=LubaMsg)
+    raw: LubaMsg | None = field(default_factory=LubaMsg)
 
     @classmethod
     def from_raw(cls, raw: dict) -> "RawMowerData":

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/data/model/region_data.py

@@ -1,5 +1,4 @@
 from dataclasses import dataclass
-from typing import Optional
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
@@ -7,14 +6,14 @@ from mashumaro.mixins.orjson import DataClassORJSONMixin
 @dataclass
 class RegionData(DataClassORJSONMixin):
     def __init__(self) -> None:
-        self.hash: Optional[int] = None
+        self.hash: int | None = None
         self.action: int = 0
         self.current_frame: int = 0
-        self.data_hash: Optional[int] = None
+        self.data_hash: int | None = None
         self.data_len: int = 0
-        self.p_hash_a: Optional[int] = None
-        self.p_hash_b: Optional[int] = None
-        self.path: Optional[list[list[float]]] = None
+        self.p_hash_a: int | None = None
+        self.p_hash_b: int | None = None
+        self.path: list[list[float]] | None = None
         self.pver: int = 0
         self.result: int = 0
         self.sub_cmd: int = 0
@@ -72,31 +71,31 @@ class RegionData(DataClassORJSONMixin):
     def set_current_frame(self, current_frame: int) -> None:
         self.current_frame = current_frame
 
-    def get_path(self) -> Optional[list[list[float]]]:
+    def get_path(self) -> list[list[float]] | None:
         return self.path
 
     def set_path(self, path: list[list[float]]) -> None:
         self.path = path
 
-    def get_hash(self) -> Optional[int]:
+    def get_hash(self) -> int | None:
         return self.hash
 
     def set_data_hash(self, data_hash: int) -> None:
         self.data_hash = data_hash
 
-    def get_data_hash(self) -> Optional[int]:
+    def get_data_hash(self) -> int | None:
         return self.data_hash
 
     def set_p_hash_a(self, p_hash_a: int) -> None:
         self.p_hash_a = p_hash_a
 
-    def get_p_hash_a(self) -> Optional[int]:
+    def get_p_hash_a(self) -> int | None:
         return self.p_hash_a
 
     def set_p_hash_b(self, p_hash_b: int) -> None:
         self.p_hash_b = p_hash_b
 
-    def get_p_hash_b(self) -> Optional[int]:
+    def get_p_hash_b(self) -> int | None:
         return self.p_hash_b
 
     def __str__(self) -> str:

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/data/mqtt/properties.py

@@ -116,7 +116,7 @@ Items = Union[
 @dataclass
 class Item:
     time: int
-    value: Union[int, float, str, dict[str, Any]]  # Depending on the type of value
+    value: int | float | str | dict[str, Any]  # Depending on the type of value
 
 
 @dataclass

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.0a8 → pymammotion-0.4.0b1}/pymammotion/http/encryption.py

@@ -2,7 +2,6 @@ import base64
 import logging
 import secrets
 import string
-from typing import Optional
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import padding, serialization
@@ -50,7 +49,7 @@ class EncryptionUtils:
             private_key_bytes = base64.b64decode(EncryptionUtils.PRIVATE_KEY)
             return serialization.load_der_private_key(private_key_bytes, password=None, backend=default_backend())
         except Exception as e:
-            raise Exception(f"Failed to load private key: {str(e)}")
+            raise Exception(f"Failed to load private key: {e!s}")
 
     @staticmethod
     def load_public_key(is_production: bool = True):
@@ -65,7 +64,7 @@ class EncryptionUtils:
             public_key_bytes = base64.b64decode(key_string)
             return serialization.load_der_public_key(public_key_bytes, backend=default_backend())
         except Exception as e:
-            raise Exception(f"Failed to load public key: {str(e)}")
+            raise Exception(f"Failed to load public key: {e!s}")
 
     @staticmethod
     def encrypt(plaintext: str, key: str, iv: str) -> str:
@@ -104,7 +103,7 @@ class EncryptionUtils:
             return base64.b64encode(encrypted_bytes).decode("utf-8")
 
         except Exception as e:
-            raise Exception(f"Encryption failed: {str(e)}")
+            raise Exception(f"Encryption failed: {e!s}")
 
     def encryption_by_aes(self, text: str) -> str:
         """Encrypt text using AES with class-level key and IV
@@ -123,10 +122,10 @@ class EncryptionUtils:
             return encrypted
 
         except Exception as e:
-            _LOGGER.error(f"Encryption failed: {str(e)}")
+            _LOGGER.error(f"Encryption failed: {e!s}")
             return None
 
-    def encrypt_by_public_key(self) -> Optional[str]:
+    def encrypt_by_public_key(self) -> str | None:
         """Encrypt data using RSA public key.
 
         Args:

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/http/http.py

@@ -4,12 +4,7 @@ from typing import cast
 from aiohttp import ClientSession
 
 from pymammotion.aliyun.model.stream_subscription_response import StreamSubscriptionResponse
-from pymammotion.const import (
-    MAMMOTION_API_DOMAIN,
-    MAMMOTION_CLIENT_ID,
-    MAMMOTION_CLIENT_SECRET,
-    MAMMOTION_DOMAIN,
-)
+from pymammotion.const import MAMMOTION_API_DOMAIN, MAMMOTION_CLIENT_ID, MAMMOTION_CLIENT_SECRET, MAMMOTION_DOMAIN
 from pymammotion.http.encryption import EncryptionUtils
 from pymammotion.http.model.http import ErrorInfo, LoginResponseData, Response
 

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/http/model/http.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Generic, Literal, Optional, TypeVar
+from typing import Generic, Literal, TypeVar
 
 from mashumaro import DataClassDictMixin
 from mashumaro.config import BaseConfig
@@ -83,7 +83,7 @@ class LoginResponseUserInformation(DataClassORJSONMixin):
     userId: str
     userAccount: str
     authType: str
-    email: Optional[str] = None
+    email: str | None = None
 
     class Config(BaseConfig):
         omit_none = True

{pymammotion-0.4.0a8 → pymammotion-0.4.0b1}/pymammotion/mammotion/commands/messages/network.py

@@ -1,6 +1,6 @@
 # === sendOrderMsg_Net  ===
-import time
 from abc import ABC
+import time
 
 from pymammotion import logger
 from pymammotion.mammotion.commands.abstract_message import AbstractMessage
@@ -193,7 +193,7 @@ class MessageNetwork(AbstractMessage, ABC):
     def wifi_connectinfo_update2(self) -> None:
         hash_map = {"getMsgCmd": 1}
         # self.post_custom_data(self.get_json_string(
-        #     68, hash_map))  # ToDo: Fix this
+        #     68, hash_map))  # TODO: Fix this
 
     def get_record_wifi_list(self) -> bytes:
         build = DevNet(todev_ble_sync=1, todev__wifi_list_upload=DrvWifiList())

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

@@ -1,10 +1,11 @@
 # === sendOrderMsg_Video ===
-import time
 from abc import ABC
+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.0a8 → pymammotion-0.4.0b1}/pymammotion/mammotion/devices/base.py

@@ -1,7 +1,7 @@
+from abc import abstractmethod
 import asyncio
 import logging
-from abc import abstractmethod
-from typing import Any, Awaitable, Callable
+from typing import Any
 
 import betterproto
 
@@ -40,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.0a8 → pymammotion-0.4.0b1}/pymammotion/mammotion/devices/mammotion.py

@@ -3,8 +3,8 @@
 from __future__ import annotations
 
 import asyncio
-import logging
 from enum import Enum
+import logging
 from typing import Any
 
 from bleak.backends.device import BLEDevice
@@ -296,7 +296,9 @@ class Mammotion:
         device = self.get_device_by_name(name)
         if device.preference is ConnectionPreference.WIFI:
             if device.has_cloud():
-                _stream_response = await device.cloud().mqtt.cloud_client.get_stream_subscription(device.cloud().iot_id)
+                _stream_response = await device.cloud().mqtt.cloud_client.mammotion_http.get_stream_subscription(
+                    device.cloud().iot_id
+                )
                 _LOGGER.debug(_stream_response)
                 return _stream_response