pymammotion 0.2.62__py3-none-any.whl → 0.5.51__py3-none-any.whl

pymammotion/data/mqtt/mammotion_properties.py

@@ -0,0 +1,257 @@
+from dataclasses import dataclass
+from typing import Annotated
+
+from mashumaro.config import BaseConfig
+from mashumaro.mixins.orjson import DataClassORJSONMixin
+from mashumaro.types import Alias
+
+
+@dataclass
+class FirmwareInfo(DataClassORJSONMixin):
+    t: str
+    c: str
+    v: str
+
+
+@dataclass
+class DeviceVersionInfo(DataClassORJSONMixin):
+    dev_ver: Annotated[str, Alias("devVer")]
+    whole: int
+    fw_info: Annotated[list[FirmwareInfo], Alias("fwInfo")]
+
+
+@dataclass
+class Coordinate(DataClassORJSONMixin):
+    lon: float
+    lat: float
+
+
+@dataclass
+class InternalNavigation(DataClassORJSONMixin):
+    nav: Annotated[str, Alias("NAV")]
+    pau: Annotated[str, Alias("Pau")]
+    r_pau: Annotated[str, Alias("rPau")]
+    mcu: Annotated[str, Alias("MCU")]
+    app: Annotated[str, Alias("APP")]
+    w_slp: Annotated[str, Alias("wSlp")]
+    i_slp: Annotated[str, Alias("iSlp")]
+
+
+@dataclass
+class BandwidthTraffic(DataClassORJSONMixin):
+    iot: Annotated[str, Alias("IoT")]
+    roi: Annotated[str, Alias("RoI")]
+    fpv: Annotated[str, Alias("FPV")]
+    inav: InternalNavigation
+
+
+@dataclass
+class TrafficPeriod(DataClassORJSONMixin):
+    r: str
+    t: str
+    s: str
+
+
+@dataclass
+class TrafficData(DataClassORJSONMixin):
+    upt: str
+    hour: Annotated[dict[str, TrafficPeriod], Alias("Hour")]
+    day: Annotated[dict[str, TrafficPeriod], Alias("Day")]
+    mon: Annotated[dict[str, TrafficPeriod], Alias("Mon")]
+
+
+@dataclass
+class NetworkInfo(DataClassORJSONMixin):
+    ssid: str
+    ip: str
+    wifi_sta_mac: str
+    wifi_rssi: int
+    wifi_available: int
+    bt_mac: str
+    mnet_model: str
+    imei: str
+    fw_ver: str
+    sim: str
+    imsi: str
+    iccid: str
+    sim_source: str
+    mnet_rssi: int
+    signal: int
+    mnet_link: int
+    mnet_option: str
+    mnet_ip: str
+    mnet_reg: str
+    mnet_rsrp: str
+    mnet_snr: str
+    mnet_enable: int
+    apn_num: int
+    apn_info: str
+    apn_cid: int
+    used_net: int
+    hub_reset: int
+    mnet_dis: int
+    airplane_times: int
+    lsusb_num: int
+    b_tra: Annotated[BandwidthTraffic, Alias("bTra")]
+    bw_tra: Annotated[BandwidthTraffic, Alias("bwTra")]
+    mnet_rx: str
+    mnet_tx: str
+    m_tra: Annotated[TrafficData, Alias("mTra")]
+    mnet_uniot: int
+    mnet_un_getiot: int
+    ssh_flag: str
+    mileage: str
+    work_time: str
+    wt_sec: int
+    bat_cycles: str
+
+
+@dataclass
+class DeviceOtherInfo(DataClassORJSONMixin):
+    soc_up_time: Annotated[int, Alias("socUpTime")]
+    mcu_up_time: Annotated[int, Alias("mcuUpTime")]
+    soc_loads: Annotated[str, Alias("socLoads")]
+    soc_mem_free: Annotated[int, Alias("socMemFree")]
+    soc_mem_total: Annotated[int, Alias("socMemTotal")]
+    soc_mmc_life_time: Annotated[int, Alias("socMmcLifeTime")]
+    usb_dis_cnt: Annotated[int, Alias("usbDisCnt")]
+    soc_pstore: Annotated[int, Alias("socPstore")]
+    soc_coredump: Annotated[int, Alias("socCoredump")]
+    soc_tmp: Annotated[int, Alias("socTmp")]
+    mc_mcu: Annotated[str, Alias("mcMcu")]
+    tilt_degree: str
+    i_msg_free: Annotated[int, Alias("iMsgFree")]
+    i_msg_limit: Annotated[int, Alias("iMsgLimit")]
+    i_msg_raw: Annotated[int, Alias("iMsgRaw")]
+    i_msg_prop: Annotated[int, Alias("iMsgprop")]
+    i_msg_serv: Annotated[int, Alias("iMsgServ")]
+    i_msg_info: Annotated[int, Alias("iMsgInfo")]
+    i_msg_warn: Annotated[int, Alias("iMsgWarn")]
+    i_msg_fault: Annotated[int, Alias("iMsgFault")]
+    i_msg_ota_stage: Annotated[int, Alias("iMsgOtaStage")]
+    i_msg_protobuf: Annotated[int, Alias("iMsgProtobuf")]
+    i_msg_notify: Annotated[int, Alias("iMsgNotify")]
+    i_msg_log_prog: Annotated[int, Alias("iMsgLogProg")]
+    i_msg_biz_req: Annotated[int, Alias("iMsgBizReq")]
+    i_msg_cfg_req: Annotated[int, Alias("iMsgCfgReq")]
+    i_msg_voice: Annotated[int, Alias("iMsgVoice")]
+    i_msg_warn_code: Annotated[int, Alias("iMsgWarnCode")]
+    pb_net: Annotated[int, Alias("pbNet")]
+    pb_sys: Annotated[int, Alias("pbSys")]
+    pb_nav: Annotated[int, Alias("pbNav")]
+    pb_local: Annotated[int, Alias("pbLocal")]
+    pb_plan: Annotated[int, Alias("pbPlan")]
+    pb_e_drv: Annotated[int, Alias("pbEDrv")]
+    pb_e_sys: Annotated[int, Alias("pbESys")]
+    pb_midware: Annotated[int, Alias("pbMidware")]
+    pb_ota: Annotated[int, Alias("pbOta")]
+    pb_appl: Annotated[int, Alias("pbAppl")]
+    pb_mul: Annotated[int, Alias("pbMul")]
+    pb_other: Annotated[int, Alias("pbOther")]
+    lora_connect: Annotated[int, Alias("loraConnect")]
+    base_status: Annotated[int, Alias("Basestatus")]
+    mqtt_rtk_switch: int
+    mqtt_rtk_channel: int
+    mqtt_rtk_status: int
+    mqtt_rtcm_cnt: int
+    mqtt_conn_cnt: int
+    mqtt_disconn_cnt: int
+    mqtt_rtk_hb_flag: int
+    mqtt_rtk_hb_count: int
+    mqtt_start_cnt: int
+    mqtt_close_cnt: int
+    mqtt_rtk_ssl_fail: int
+    mqtt_rtk_wifi_config: int
+    nrtk_svc_prov: int
+    nrtk_svc_err: int
+    base_stn_id: int
+    rtk_status: int
+    charge_status: int
+    chassis_state: int
+    nav: str
+    ins_fusion: str
+    perception: str
+    vision_proxy: str
+    vslam_vio: str
+    iot_con_timeout: int
+    iot_con: int
+    iot_con_fail_max: str
+    iot_con_fail_min: Annotated[str, Alias("iot_con__fail_min")]
+    iot_url_count: int
+    iot_url_max: str
+    iot_url_min: str
+    iot_cn: int
+    iot_ap: int
+    iot_us: int
+    iot_eu: int
+    task_area: float
+    task_count: int
+    task_hash: str
+    systemio_boot_time: Annotated[str, Alias("systemioBootTime")]
+    dds_no_gdc: int
+
+
+@dataclass
+class CheckData(DataClassORJSONMixin):
+    result: str
+    error: Annotated[list[int], Alias("Error")]
+    warn: Annotated[list[int], Alias("Warn")]
+    ok: Annotated[list[int], Alias("OK")]
+
+
+@dataclass
+class DeviceProperties(DataClassORJSONMixin):
+    device_state: Annotated[int, Alias("deviceState")]
+    battery_percentage: Annotated[int, Alias("batteryPercentage")]
+    device_version: Annotated[str, Alias("deviceVersion")]
+    knife_height: Annotated[int, Alias("knifeHeight")]
+    lora_general_config: Annotated[str, Alias("loraGeneralConfig")]
+    ext_mod: Annotated[str, Alias("extMod")]
+    int_mod: Annotated[str, Alias("intMod")]
+    iot_state: Annotated[int, Alias("iotState")]
+    iot_msg_total: Annotated[int, Alias("iotMsgTotal")]
+    iot_msg_hz: Annotated[int, Alias("iotMsgHz")]
+    lt_mr_mod: Annotated[str, Alias("ltMrMod")]
+    rt_mr_mod: Annotated[str, Alias("rtMrMod")]
+    bms_hardware_version: Annotated[str, Alias("bmsHardwareVersion")]
+    stm32_h7_version: Annotated[str, Alias("stm32H7Version")]
+    left_motor_version: Annotated[str, Alias("leftMotorVersion")]
+    right_motor_version: Annotated[str, Alias("rightMotorVersion")]
+    rtk_version: Annotated[str, Alias("rtkVersion")]
+    bms_version: Annotated[str, Alias("bmsVersion")]
+    mc_boot_version: Annotated[str, Alias("mcBootVersion")]
+    left_motor_boot_version: Annotated[str, Alias("leftMotorBootVersion")]
+    right_motor_boot_version: Annotated[str, Alias("rightMotorBootVersion")]
+
+    # Nested JSON objects
+    device_version_info: Annotated[DeviceVersionInfo, Alias("deviceVersionInfo")]
+    coordinate: Coordinate
+    device_other_info: Annotated[DeviceOtherInfo, Alias("deviceOtherInfo")]
+    network_info: Annotated[NetworkInfo, Alias("networkInfo")]
+    check_data: Annotated[CheckData, Alias("checkData")]
+    iot_id: str = ""
+
+    class Config(BaseConfig):
+        # Custom deserializer for nested JSON strings
+        serialization_strategy = {
+            DeviceVersionInfo: {
+                "deserialize": lambda x: DeviceVersionInfo.from_json(x) if isinstance(x, str) else x,
+                "serialize": lambda x: x.to_json() if hasattr(x, "to_json") else x,
+            },
+            Coordinate: {
+                "deserialize": lambda x: Coordinate.from_json(x) if isinstance(x, str) else x,
+                "serialize": lambda x: x.to_json() if hasattr(x, "to_json") else x,
+            },
+            DeviceOtherInfo: {
+                "deserialize": lambda x: DeviceOtherInfo.from_json(x) if isinstance(x, str) else x,
+                "serialize": lambda x: x.to_json() if hasattr(x, "to_json") else x,
+            },
+            NetworkInfo: {
+                "deserialize": lambda x: NetworkInfo.from_json(x) if isinstance(x, str) else x,
+                "serialize": lambda x: x.to_json() if hasattr(x, "to_json") else x,
+            },
+            CheckData: {
+                "deserialize": lambda x: CheckData.from_json(x) if isinstance(x, str) else x,
+                "serialize": lambda x: x.to_json() if hasattr(x, "to_json") else x,
+            },
+        }

pymammotion/data/mqtt/properties.py

@@ -1,99 +1,104 @@
 from dataclasses import dataclass
-from typing import Any, Generic, Literal, TypeVar, Union
+from typing import Annotated, Any, Literal, Union
 
 from mashumaro import DataClassDictMixin
 from mashumaro.mixins.orjson import DataClassORJSONMixin
+from mashumaro.types import Alias
 
-DataT = TypeVar("DataT")
-
-
-@dataclass
-class Item(DataClassDictMixin, Generic[DataT]):
-    time: int
-    value: DataT
+from pymammotion.data.mqtt.mammotion_properties import DeviceProperties
 
 
 @dataclass
 class BatteryPercentageItems(DataClassORJSONMixin):
-    batteryPercentage: Item[int]
+    batteryPercentage: int
 
 
 @dataclass
 class BMSHardwareVersionItems(DataClassORJSONMixin):
-    bmsHardwareVersion: Item[str]
+    bmsHardwareVersion: str
 
 
 @dataclass
 class CoordinateItems(DataClassORJSONMixin):
-    coordinate: Item[str]  # '{"lon":0.303903,"lat":1.051868}'
+    coordinate: str  # '{"lon":0.303903,"lat":1.051868}'
 
 
 @dataclass
 class DeviceStateItems(DataClassORJSONMixin):
-    deviceState: Item[int]
+    deviceState: int
 
 
 @dataclass
 class DeviceVersionItems(DataClassORJSONMixin):
-    deviceVersion: Item[str]
+    deviceVersion: str
 
 
 @dataclass
 class DeviceVersionInfoItems(DataClassORJSONMixin):
-    deviceVersionInfo: Item[str]
+    deviceVersionInfo: str
 
 
 @dataclass
 class ESP32VersionItems(DataClassORJSONMixin):
-    esp32Version: Item[str]
+    esp32Version: str
 
 
 @dataclass
 class LeftMotorBootVersionItems(DataClassORJSONMixin):
-    leftMotorBootVersion: Item[str]
+    leftMotorBootVersion: str
 
 
 @dataclass
 class LeftMotorVersionItems(DataClassORJSONMixin):
-    leftMotorVersion: Item[str]
+    leftMotorVersion: str
 
 
 @dataclass
 class MCBootVersionItems(DataClassORJSONMixin):
-    mcBootVersion: Item[str]
+    mcBootVersion: str
 
 
 @dataclass
 class NetworkInfoItems(DataClassORJSONMixin):
-    networkInfo: Item[str]
+    networkInfo: str
 
 
 @dataclass
 class RightMotorBootVersionItems(DataClassORJSONMixin):
-    rightMotorBootVersion: Item[str]
+    rightMotorBootVersion: str
 
 
 @dataclass
 class RightMotorVersionItems(DataClassORJSONMixin):
-    rightMotorVersion: Item[str]
+    rightMotorVersion: str
 
 
 @dataclass
 class RTKVersionItems(DataClassORJSONMixin):
-    rtkVersion: Item[str]
+    rtkVersion: str
 
 
 @dataclass
 class StationRTKVersionItems(DataClassORJSONMixin):
-    stationRtkVersion: Item[str]
+    stationRtkVersion: str
 
 
 @dataclass
 class STM32H7VersionItems(DataClassORJSONMixin):
-    stm32H7Version: Item[str]
+    stm32H7Version: str
+
 
+@dataclass
+class OTAProgressItems(DataClassORJSONMixin):
+    result: int
+    otaId: str
+    progress: int
+    message: str
+    version: str
+    properties: str
 
-Items = Union[
+
+ItemTypes = Union[
     BatteryPercentageItems,
     BMSHardwareVersionItems,
     CoordinateItems,
@@ -110,70 +115,72 @@ Items = Union[
     RTKVersionItems,
     StationRTKVersionItems,
     STM32H7VersionItems,
+    OTAProgressItems,
 ]
 
 
 @dataclass
-class Item:
+class Item(DataClassDictMixin):
     time: int
-    value: Union[int, float, str, dict[str, Any]]  # Depending on the type of value
-
-
-@dataclass
-class Items:
-    iotState: Item
-    extMod: Item
-    deviceVersionInfo: Item
-    leftMotorBootVersion: Item
-    knifeHeight: Item
-    rtMrMod: Item
-    iotMsgHz: Item
-    iotMsgTotal: Item
-    loraRawConfig: Item
-    loraGeneralConfig: Item
-    leftMotorVersion: Item
-    intMod: Item
-    coordinate: Item
-    bmsVersion: Item
-    rightMotorVersion: Item
-    stm32H7Version: Item
-    rightMotorBootVersion: Item
-    deviceVersion: Item
-    rtkVersion: Item
-    ltMrMod: Item
-    networkInfo: Item
-    bmsHardwareVersion: Item
-    batteryPercentage: Item
-    deviceState: Item
-    deviceOtherInfo: Item
-    mcBootVersion: Item
+    value: int | float | str | dict[str, Any] | ItemTypes  # Depending on the type of value
+
+
+@dataclass
+class Items(DataClassDictMixin):
+    iotState: Item | None = None
+    extMod: Item | None = None
+    deviceVersionInfo: Item | None = None
+    leftMotorBootVersion: Item | None = None
+    knifeHeight: Item | None = None
+    rtMrMod: Item | None = None
+    iotMsgHz: Item | None = None
+    iotMsgTotal: Item | None = None
+    loraRawConfig: Item | None = None
+    loraGeneralConfig: Item | None = None
+    leftMotorVersion: Item | None = None
+    intMod: Item | None = None
+    coordinate: Item | None = None
+    bmsVersion: Item | None = None
+    rightMotorVersion: Item | None = None
+    stm32H7Version: Item | None = None
+    rightMotorBootVersion: Item | None = None
+    deviceVersion: Item | None = None
+    rtkVersion: Item | None = None
+    ltMrMod: Item | None = None
+    networkInfo: Item | None = None
+    bmsHardwareVersion: Item | None = None
+    batteryPercentage: Item | None = None
+    deviceState: Item | None = None
+    deviceOtherInfo: Item | None = None
+    mcBootVersion: Item | None = None
+    otaProgress: Item | None = None
 
 
 @dataclass
 class Params(DataClassORJSONMixin):
-    deviceType: Literal["LawnMower"]
-    checkFailedData: dict
-    groupIdList: list[str]
-    _tenantId: str
-    groupId: str
-    categoryKey: Literal["LawnMower"]
-    batchId: str
-    gmtCreate: int
-    productKey: str
-    generateTime: int
-    deviceName: str
-    _traceId: str
-    iotId: str
-    JMSXDeliveryCount: int
-    checkLevel: int
+    device_type: Annotated[Literal["LawnMower", "Tracker"], Alias("deviceType")]
+    check_failed_data: Annotated[dict[str, Any], Alias("checkFailedData")]
+    group_id_list: Annotated[list[str], Alias("groupIdList")]
+    _tenant_id: Annotated[str, Alias("_tenantId")]
+    group_id: Annotated[str, Alias("groupId")]
+    category_key: Annotated[Literal["LawnMower", "Tracker"], Alias("categoryKey")]
+    batch_id: Annotated[str, Alias("batchId")]
+    gmt_create: Annotated[int, Alias("gmtCreate")]
+    product_key: Annotated[str, Alias("productKey")]
+    generate_time: Annotated[int, Alias("generateTime")]
+    device_name: Annotated[str, Alias("deviceName")]
+    _trace_id: Annotated[str, Alias("_traceId")]
+    iot_id: Annotated[str, Alias("iotId")]
+    jmsx_delivery_count: Annotated[int, Alias("JMSXDeliveryCount")]
+    check_level: Annotated[int, Alias("checkLevel")]
     qos: int
-    requestId: str
-    _categoryKey: str
+    request_id: Annotated[str, Alias("requestId")]
+    _category_key: Annotated[str, Alias("_categoryKey")]
     namespace: str
-    tenantId: str
-    thingType: Literal["DEVICE"]
-    items: Items
-    tenantInstanceId: str
+    tenant_id: Annotated[str, Alias("tenantId")]
+    thing_type: Annotated[Literal["DEVICE"], Alias("thingType")]
+    items: Annotated["Items", Alias("items")]
+    tenant_instance_id: Annotated[str, Alias("tenantInstanceId")]
 
 
 @dataclass
@@ -182,3 +189,11 @@ class ThingPropertiesMessage(DataClassORJSONMixin):
     id: str
     params: Params
     version: Literal["1.0"]
+
+
+@dataclass
+class MammotionPropertiesMessage(DataClassORJSONMixin):
+    id: str
+    version: str
+    sys: dict
+    params: DeviceProperties

pymammotion/data/mqtt/status.py

@@ -1,14 +1,15 @@
 from dataclasses import dataclass
 from enum import Enum
-from typing import Literal
+from typing import Annotated, Literal
 
 from mashumaro.mixins.orjson import DataClassORJSONMixin
+from mashumaro.types import Alias
 
 
 @dataclass
 class GroupIdListItem(DataClassORJSONMixin):
     groupId: str
-    groupType: Literal["ISOLATION"]
+    groupType: Literal["ISOLATION", "ILOP_APP"]
 
 
 # are there other values?
@@ -25,23 +26,23 @@ class Status(DataClassORJSONMixin):
 
 @dataclass
 class Params(DataClassORJSONMixin):
-    groupIdList: list[GroupIdListItem]
-    netType: Literal["NET_WIFI"]
-    activeTime: int
+    group_id_list: Annotated[list[GroupIdListItem], Alias("groupIdList")]
+    net_type: Annotated[Literal["NET_WIFI", "NET_MNET"], Alias("netType")]
+    active_time: Annotated[int, Alias("activeTime")]
     ip: str
-    aliyunCommodityCode: Literal["iothub_senior"]
-    categoryKey: Literal["LawnMower"]
-    nodeType: Literal["DEVICE"]
-    productKey: str
-    statusLast: int
-    deviceName: str
-    iotId: str
+    aliyun_commodity_code: Annotated[Literal["iothub_senior"], Alias("aliyunCommodityCode")]
+    category_key: Annotated[Literal["LawnMower", "Tracker"], Alias("categoryKey")]
+    node_type: Annotated[Literal["DEVICE"], Alias("nodeType")]
+    product_key: Annotated[str, Alias("productKey")]
+    status_last: Annotated[int, Alias("statusLast")]
+    device_name: Annotated[str, Alias("deviceName")]
+    iot_id: Annotated[str, Alias("iotId")]
     namespace: str
-    tenantId: str
-    thingType: Literal["DEVICE"]
-    tenantInstanceId: str
-    categoryId: int
-    status: Status
+    tenant_id: Annotated[str, Alias("tenantId")]
+    thing_type: Annotated[Literal["DEVICE"], Alias("thingType")]
+    tenant_instance_id: Annotated[str, Alias("tenantInstanceId")]
+    category_id: Annotated[int, Alias("categoryId")]
+    status: Annotated[Status, Alias("status")]
 
 
 @dataclass

pymammotion/event/event.py

@@ -1,21 +1,42 @@
 import asyncio
+from collections.abc import Callable
+from types import MethodType
 from typing import Any
+import weakref
 
 
 class Event:
     def __init__(self) -> None:
-        self.__eventhandlers = []
+        self.__eventhandlers: list[weakref.ReferenceType] = []
 
-    def __iadd__(self, handler):
-        self.__eventhandlers.append(handler)
+    def __iadd__(self, handler: Callable) -> "Event":
+        if isinstance(handler, MethodType):
+            # Instance method, use WeakMethod
+            ref = weakref.WeakMethod(handler)
+        else:
+            # Function or static method, use weakref.ref
+            ref = weakref.ref(handler)
+        self.__eventhandlers.append(ref)
         return self
 
-    def __isub__(self, handler):
-        self.__eventhandlers.remove(handler)
+    def __isub__(self, handler: Callable) -> "Event":
+        self.__eventhandlers = [ref for ref in self.__eventhandlers if ref() is not handler]
         return self
 
-    async def __call__(self, *args, **kwargs) -> None:
-        await asyncio.gather(*[handler(*args, **kwargs) for handler in self.__eventhandlers])
+    async def __call__(self, *args: Any, **kwargs: Any) -> None:
+        live_handlers = []
+        for ref in self.__eventhandlers:
+            func = ref()
+            if func is not None:
+                live_handlers.append(func(*args, **kwargs))
+        await asyncio.gather(*live_handlers)
+
+        # Clean up dead references
+        self.__eventhandlers = [ref for ref in self.__eventhandlers if ref() is not None]
+
+    def has_dead_handlers(self) -> bool:
+        """Check if any handlers have been garbage collected."""
+        return any(ref() is None for ref in self.__eventhandlers)
 
 
 class MoveEvent:
@@ -66,4 +87,7 @@ class DataEvent:
         self.on_data_event += obj_method
 
     def remove_subscribers(self, obj_method) -> None:
-        self.on_data_event -= obj_method
+        try:
+            self.on_data_event -= obj_method
+        except ValueError:
+            """Subscription object no longer there."""

pymammotion/homeassistant/__init__.py

@@ -0,0 +1,3 @@
+from pymammotion.homeassistant.mower_api import HomeAssistantMowerApi
+
+__all__ = ["HomeAssistantMowerApi"]