pymammotion 0.1.9__tar.gz → 0.2.1__tar.gz

{pymammotion-0.1.9 → pymammotion-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymammotion
-Version: 0.1.9
+Version: 0.2.1
 Summary: 
 License: GNU-3.0
 Author: Michael Arthur

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/__init__.py

@@ -10,21 +10,13 @@ import os
 
 # works outside HA on its own
 from pymammotion.bluetooth.ble import LubaBLE
-from pymammotion.http.http import LubaHTTP, connect_http
+from pymammotion.http.http import MammotionHTTP, connect_http
 
 # TODO make a working device that will work outside HA too.
 from pymammotion.mammotion.devices import MammotionBaseBLEDevice
 from pymammotion.mqtt import MammotionMQTT
 
-
-
-__all__ = [
-    'LubaBLE',
-    'LubaHTTP',
-    'connect_http',
-    'MammotionBaseBLEDevice',
-    'MammotionMQTT'
-]
+__all__ = ["LubaBLE", "MammotionHTTP", "connect_http", "MammotionBaseBLEDevice", "MammotionMQTT"]
 
 logger = logging.getLogger(__name__)
 

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/aliyun/cloud_gateway.py

@@ -391,8 +391,6 @@ class CloudIOTGateway:
 
     def check_or_refresh_session(self):
         """Check or refresh the session."""
-        if self.load_saved_params() is False:
-            return False
         config = Config(
             app_key=self._app_key,
             app_secret=self._app_secret,
@@ -436,7 +434,7 @@ class CloudIOTGateway:
         # Carica la stringa JSON in un dizionario
         json.loads(response_body_str)
 
-    def list_binding_by_account(self):
+    def list_binding_by_account(self) -> ListingDevByAccountResponse:
         """List bindings by account."""
         config = Config(
             app_key=self._app_key,
@@ -476,6 +474,7 @@ class CloudIOTGateway:
             raise Exception("Error in creating session: " + response_body_dict["msg"])
 
         self._listing_dev_by_account_response = ListingDevByAccountResponse.from_dict(response_body_dict)
+        return self._listing_dev_by_account_response
 
     def send_cloud_command(self, iot_id: str, command: bytes) -> str:
         """Send a cloud command to the specified IoT device."""

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/aliyun/dataclass/aep_response.py

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

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/aliyun/dataclass/dev_by_account_response.py

@@ -1,12 +1,12 @@
 from dataclasses import dataclass
 from typing import List, Optional
 
+from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 
 @dataclass
 class Device(DataClassORJSONMixin):
-    productModel: str
     gmtModified: int
     netType: str
     nickName: str
@@ -26,6 +26,10 @@ class Device(DataClassORJSONMixin):
     status: int
     productImage: Optional[str] = None
     categoryImage: Optional[str] = None
+    productModel: Optional[str] = None
+
+    class Config(BaseConfig):
+        omit_default = True
 
 
 @dataclass

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/aliyun/dataclass/regions_response.py

@@ -2,6 +2,7 @@ from dataclasses import dataclass
 from typing import Optional, TypeVar
 
 from mashumaro import DataClassDictMixin
+from mashumaro.config import BaseConfig
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
 DataT = TypeVar("DataT")
@@ -24,3 +25,6 @@ class RegionResponse(DataClassDictMixin):
     code: int
     id: Optional[str] = None
     msg: Optional[str] = None
+
+    class Config(BaseConfig):
+        omit_default = True

pymammotion-0.2.1/pymammotion/data/model/account.py

@@ -0,0 +1,8 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class Credentials:
+    email: str
+    password: str
+    account_id: str

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/data/model/device.py

@@ -1,4 +1,5 @@
 """MowingDevice class to wrap around the betterproto dataclasses."""
+
 import math
 from dataclasses import dataclass
 
@@ -15,7 +16,7 @@ from pymammotion.proto.mctrl_driver import MctlDriver
 from pymammotion.proto.mctrl_nav import MctlNav
 from pymammotion.proto.mctrl_ota import MctlOta
 from pymammotion.proto.mctrl_pept import MctlPept
-from pymammotion.proto.mctrl_sys import MctlSys, MowToAppInfoT, SystemUpdateBufMsg, ReportInfoData
+from pymammotion.proto.mctrl_sys import MctlSys, MowToAppInfoT, ReportInfoData, SystemUpdateBufMsg
 from pymammotion.utility.map import CoordinateConverter
 
 
@@ -99,12 +100,12 @@ class MowingDevice:
             if index == 0:
                 self.location.position_type = location.pos_type
                 self.location.orientation = location.real_toward / 10000
-                self.location.device = coordinate_converter.enu_to_lla(parse_double(location.real_pos_y, 4.0), parse_double(location.real_pos_x, 4.0))
+                self.location.device = coordinate_converter.enu_to_lla(
+                    parse_double(location.real_pos_y, 4.0), parse_double(location.real_pos_x, 4.0)
+                )
 
         self.report_data = self.report_data.from_dict(toapp_report_data.to_dict(casing=betterproto.Casing.SNAKE))
 
-
-
     def mow_info(self, toapp_mow_info: MowToAppInfoT):
         pass
 

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/data/model/device_config.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 
 @dataclass
 class DeviceLimits:
-    cutter_height_min: int
-    cutter_height_max: int
+    blade_height_min: int
+    blade_height_max: int
     working_speed_min: float
     working_speed_max: float

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/data/model/location.py

@@ -34,7 +34,7 @@ class Location:
     RTK: Point
     dock: Dock
     position_type: int
-    orientation: int # 360 degree rotation +-
+    orientation: int  # 360 degree rotation +-
 
     def __init__(self):
         self.device = Point()

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/data/model/mowing_modes.py

@@ -39,7 +39,8 @@ class MowOrder(IntEnum):
 
 class BypassStrategy(IntEnum):
     """Matches up with ultra_wave."""
+
     direct_touch = 0
     slow_touch = 1
     less_touch = 2
-    no_touch = 3 # luba 2 yuka only or possibly value of 10
+    no_touch = 3  # luba 2 yuka only or possibly value of 10

pymammotion-0.2.1/pymammotion/data/model/report_info.py

@@ -0,0 +1,146 @@
+from dataclasses import asdict, dataclass, field
+
+
+@dataclass
+class ConnectData:
+    connect_type: int = 0
+    ble_rssi: int = 0
+    wifi_rssi: int = 0
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            connect_type=data.get("connect_type", 0),
+            ble_rssi=data.get("ble_rssi", 0),
+            wifi_rssi=data.get("wifi_rssi", 0),
+        )
+
+
+@dataclass
+class DeviceData:
+    sys_status: int = 0
+    charge_state: int = 0
+    battery_val: int = 0
+    sensor_status: int = 0
+    last_status: int = 0
+    sys_time_stamp: str = ""
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            sys_status=data.get("sys_status", 0),
+            charge_state=data.get("charge_state", 0),
+            battery_val=data.get("battery_val", 0),
+            sensor_status=data.get("sensor_status", 0),
+            last_status=data.get("last_status", 0),
+            sys_time_stamp=data.get("sys_time_stamp", ""),
+        )
+
+
+@dataclass
+class RTKData:
+    status: int = 0
+    pos_level: int = 0
+    gps_stars: int = 0
+    dis_status: str = ""
+    co_view_stars: int = 0
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            status=data.get("status", 0),
+            pos_level=data.get("pos_level", 0),
+            gps_stars=data.get("gps_stars", 0),
+            dis_status=data.get("dis_status", ""),
+            co_view_stars=data.get("co_view_stars", 0),
+        )
+
+
+@dataclass
+class LocationData:
+    real_pos_x: int = 0
+    real_pos_y: int = 0
+    real_toward: int = 0
+    pos_type: int = 0
+    bol_hash: str = ""
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            real_pos_x=data.get("real_pos_x", 0),
+            real_pos_y=data.get("real_pos_y", 0),
+            real_toward=data.get("real_toward", 0),
+            pos_type=data.get("pos_type", 0),
+            bol_hash=data.get("bol_hash", ""),
+        )
+
+
+@dataclass
+class WorkData:
+    path: int = 0
+    path_hash: str = ""
+    progress: int = 0
+    area: int = 0
+    bp_info: int = 0
+    bp_hash: str = ""
+    bp_pos_x: int = 0
+    bp_pos_y: int = 0
+    real_path_num: str = ""
+    path_pos_x: int = 0
+    path_pos_y: int = 0
+    ub_zone_hash: str = ""
+    ub_path_hash: str = ""
+    init_cfg_hash: str = ""
+    ub_ecode_hash: str = ""
+    nav_run_mode: int = 0
+    test_mode_status: int = 0
+    man_run_speed: int = 0
+    nav_edit_status: int = 0
+    knife_height: int = 0
+
+    @classmethod
+    def from_dict(cls, data: dict):
+        return cls(
+            path=data.get("path", 0),
+            path_hash=data.get("path_hash", ""),
+            progress=data.get("progress", 0),
+            area=data.get("area", 0),
+            bp_info=data.get("bp_info", 0),
+            bp_hash=data.get("bp_hash", ""),
+            bp_pos_x=data.get("bp_pos_x", 0),
+            bp_pos_y=data.get("bp_pos_y", 0),
+            real_path_num=data.get("real_path_num", ""),
+            path_pos_x=data.get("path_pos_x", 0),
+            path_pos_y=data.get("path_pos_y", 0),
+            ub_zone_hash=data.get("ub_zone_hash", ""),
+            ub_path_hash=data.get("ub_path_hash", ""),
+            init_cfg_hash=data.get("init_cfg_hash", ""),
+            ub_ecode_hash=data.get("ub_ecode_hash", ""),
+            nav_run_mode=data.get("nav_run_mode", 0),
+            test_mode_status=data.get("test_mode_status", 0),
+            man_run_speed=data.get("man_run_speed", 0),
+            nav_edit_status=data.get("nav_edit_status", 0),
+            knife_height=data.get("knife_height", 0),
+        )
+
+
+@dataclass
+class ReportData:
+    connect: ConnectData = field(default_factory=ConnectData)
+    dev: DeviceData = field(default_factory=DeviceData)
+    rtk: RTKData = field(default_factory=RTKData)
+    locations: list[LocationData] = field(default_factory=list)
+    work: WorkData = field(default_factory=WorkData)
+
+    def from_dict(self, data: dict):
+        locations = self.locations
+        if data.get("locations") is not None:
+            locations = [LocationData.from_dict(loc) for loc in data.get("locations", [])]
+
+        return ReportData(
+            connect=ConnectData.from_dict(data.get("connect", asdict(self.connect))),
+            dev=DeviceData.from_dict(data.get("dev", asdict(self.dev))),
+            rtk=RTKData.from_dict(data.get("rtk", asdict(self.rtk))),
+            locations=locations,
+            work=WorkData.from_dict(data.get("work", asdict(self.work))),
+        )

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/data/mqtt/event.py

@@ -1,6 +1,6 @@
 from base64 import b64decode
 from dataclasses import dataclass
-from typing import Any, Literal, Union
+from typing import Any, Literal, Optional, Union
 
 from google.protobuf import json_format
 from mashumaro.mixins.orjson import DataClassORJSONMixin
@@ -67,6 +67,17 @@ class GeneralParams(DataClassORJSONMixin):
     tenantInstanceId: str
     value: Any
 
+    # Campi opzionali
+    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
+
 
 @dataclass
 class DeviceProtobufMsgEventParams(GeneralParams):
@@ -88,3 +99,23 @@ class ThingEventMessage(DataClassORJSONMixin):
     id: str
     params: Union[DeviceProtobufMsgEventParams, DeviceWarningEventParams]
     version: Literal["1.0"]
+
+    @classmethod
+    def from_dicts(cls, payload: dict) -> "ThingEventMessage":
+        """Deserializza il payload JSON in un'istanza di ThingEventMessage."""
+        method = payload.get("method")
+        event_id = payload.get("id")
+        params_dict = payload.get("params", {})
+        version = payload.get("version")
+
+        # Determina quale classe usare per i parametri
+        identifier = params_dict.get("identifier")
+        if identifier == "device_protobuf_msg_event":
+            params_obj = DeviceProtobufMsgEventParams(**params_dict)
+        elif identifier == "device_warning_event":
+            params_obj = DeviceWarningEventParams(**params_dict)
+        else:
+            raise ValueError(f"Unknown identifier: {identifier}")
+
+        # Crea e restituisce l'istanza di ThingEventMessage
+        return cls(method=method, id=event_id, params=params_obj, version=version)

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/http/http.py

@@ -1,10 +1,12 @@
 from dataclasses import dataclass
-from typing import Generic, Literal, TypeVar
+from typing import Generic, Literal, Optional, TypeVar
 
 from aiohttp import ClientSession
+from aiohttp.hdrs import AUTHORIZATION
 from mashumaro import DataClassDictMixin
 from mashumaro.mixins.orjson import DataClassORJSONMixin
 
+from pymammotion.aliyun.dataclass.connect_response import Device
 from pymammotion.const import (
     MAMMOTION_CLIENT_ID,
     MAMMOTION_CLIENT_SECRET,
@@ -25,7 +27,7 @@ class Response(DataClassDictMixin, Generic[DataT]):
 class LoginResponseUserInformation(DataClassORJSONMixin):
     areaCode: str
     domainAbbreviation: str
-    email: str
+    email: Optional[str]
     userId: str
     userAccount: str
     authType: str
@@ -44,11 +46,11 @@ class LoginResponseData(DataClassORJSONMixin):
     jti: str
 
 
-class LubaHTTP:
-    def __init__(self, session: ClientSession, login: LoginResponseData):
-        self._session = session
-        self._session.headers["Authorization"] = f"Bearer {login.access_token}"
-        self._login = login
+class MammotionHTTP:
+    def __init__(self, login: LoginResponseData):
+        self._headers = dict()
+        self._headers["Authorization"] = f"Bearer {login.access_token}"
+        self.login_info = login
 
     @classmethod
     async def login(cls, session: ClientSession, username: str, password: str) -> Response[LoginResponseData]:
@@ -63,14 +65,13 @@ class LubaHTTP:
             ),
         ) as resp:
             data = await resp.json()
-            print(data)
             # TODO catch errors from mismatch user / password
             # Assuming the data format matches the expected structure
             login_response_data = LoginResponseData.from_dict(data["data"])
             return Response(data=login_response_data, code=data["code"], msg=data["msg"])
 
 
-async def connect_http(username: str, password: str) -> LubaHTTP:
+async def connect_http(username: str, password: str) -> MammotionHTTP:
     async with ClientSession(MAMMOTION_DOMAIN) as session:
-        login_response = await LubaHTTP.login(session, username, password)
-        return LubaHTTP(session, login_response.data)
+        login_response = await MammotionHTTP.login(session, username, password)
+        return MammotionHTTP(login_response.data)

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/mammotion/commands/mammotion_command.py

@@ -4,14 +4,11 @@ from pymammotion.mammotion.commands.messages.ota import MessageOta
 from pymammotion.mammotion.commands.messages.system import MessageSystem
 from pymammotion.mammotion.commands.messages.video import MessageVideo
 from pymammotion.proto import dev_net_pb2, luba_msg_pb2
-from pymammotion.utility.device_type import DeviceType
 
 
 class MammotionCommand(MessageSystem, MessageNavigation, MessageNetwork, MessageOta, MessageVideo):
     """MQTT commands for Luba."""
 
-
-
     def __init__(self, device_name: str) -> None:
         self._device_name = device_name
         self._product_key = ""
@@ -26,7 +23,6 @@ class MammotionCommand(MessageSystem, MessageNavigation, MessageNetwork, Message
     def set_device_product_key(self, product_key: str) -> None:
         self._product_key = product_key
 
-
     """BLE commands for Luba."""
 
     def send_todev_ble_sync(self, sync_type: int) -> bytes:

{pymammotion-0.1.9 → pymammotion-0.2.1}/pymammotion/mammotion/commands/messages/navigation.py

@@ -34,7 +34,10 @@ logger = logging.getLogger(__name__)
 class MessageNavigation(AbstractMessage, ABC):
     def get_msg_device(self, msg_type: MsgCmdType, msg_device: MsgDevice) -> MsgDevice:
         """Changes the rcver name if it's not a luba1."""
-        if not DeviceType.is_luba1(self.get_device_name(), self.get_device_product_key()) and msg_type == MsgCmdType.MSG_CMD_TYPE_NAV:
+        if (
+            not DeviceType.is_luba1(self.get_device_name(), self.get_device_product_key())
+            and msg_type == MsgCmdType.MSG_CMD_TYPE_NAV
+        ):
             return MsgDevice.DEV_NAVIGATION
         return msg_device