pymammotion 0.2.27__tar.gz → 0.2.29__tar.gz

{pymammotion-0.2.27 → pymammotion-0.2.29}/PKG-INFO

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

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/__init__.py

@@ -9,14 +9,14 @@ import logging
 import os
 
 # works outside HA on its own
-from pymammotion.bluetooth.ble import LubaBLE
+from pymammotion.bluetooth.ble import MammotionBLE
 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", "MammotionHTTP", "connect_http", "MammotionBaseBLEDevice", "MammotionMQTT"]
+__all__ = ["MammotionBLE", "MammotionHTTP", "connect_http", "MammotionBaseBLEDevice", "MammotionMQTT"]
 
 logger = logging.getLogger(__name__)
 

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/aliyun/cloud_gateway.py

@@ -49,15 +49,19 @@ MOVE_HEADERS = (
 class SetupException(Exception):
     pass
 
+
 class AuthRefreshException(Exception):
     """Raise exception when library cannot refresh token."""
 
+
 class DeviceOfflineException(Exception):
     """Raise exception when device is offline."""
 
+
 class LoginException(Exception):
     """Raise exception when library cannot log in."""
 
+
 class CloudIOTGateway:
     """Class for interacting with Aliyun Cloud IoT Gateway."""
 
@@ -72,11 +76,19 @@ class CloudIOTGateway:
     _devices_by_account_response: ListingDevByAccountResponse | None = None
     _region_response = None
 
-    _iot_token_issued_at : int = None
+    _iot_token_issued_at: int = None
 
     converter = DatatypeConverter()
 
-    def __init__(self, connect_response: ConnectResponse | None = None, login_by_oauth_response: LoginByOAuthResponse | None = None, aep_response: AepResponse | None = None, session_by_authcode_response: SessionByAuthCodeResponse | None = None, region_response: RegionResponse | None = None, dev_by_account: ListingDevByAccountResponse | None = None):
+    def __init__(
+        self,
+        connect_response: ConnectResponse | None = None,
+        login_by_oauth_response: LoginByOAuthResponse | None = None,
+        aep_response: AepResponse | None = None,
+        session_by_authcode_response: SessionByAuthCodeResponse | None = None,
+        region_response: RegionResponse | None = None,
+        dev_by_account: ListingDevByAccountResponse | None = None,
+    ):
         """Initialize the CloudIOTGateway."""
         self.mammotion_http: MammotionHTTP | None = None
         self._app_key = APP_KEY
@@ -376,11 +388,8 @@ class CloudIOTGateway:
             async with session.post(
                 f"https://{region_url}/api/prd/loginbyoauth.json",
                 headers=headers,
-                data={
-                    'loginByOauthRequest': json.dumps(_bodyParam, separators=(",", ":"))
-                }
+                data={"loginByOauthRequest": json.dumps(_bodyParam, separators=(",", ":"))},
             ) as resp:
-
                 data = await resp.json()
                 logger.debug(data)
                 if resp.status == 200:
@@ -441,7 +450,7 @@ class CloudIOTGateway:
             raise Exception("Error in creating session: " + response_body_str)
 
         self._session_by_authcode_response = session_by_auth
-        self._iot_token_issued_at  = int(time.time())
+        self._iot_token_issued_at = int(time.time())
 
         return response.body
 
@@ -491,18 +500,23 @@ class CloudIOTGateway:
         response_body_dict = json.loads(response_body_str)
 
         if int(response_body_dict.get("code")) != 200:
-            raise Exception("Error check or refresh token: " + response_body_dict.get('msg', ''))
+            logger.error(response_body_dict)
+            raise Exception("Error check or refresh token: " + response_body_dict.__str__())
 
         session = SessionByAuthCodeResponse.from_dict(response_body_dict)
         session_data = session.data
 
-        if session_data.identityId is None or session_data.refreshTokenExpire is None or session_data.iotToken is None or session_data.iotTokenExpire is None or session_data.refreshToken is None:
+        if (
+            session_data.identityId is None
+            or session_data.refreshTokenExpire is None
+            or session_data.iotToken is None
+            or session_data.iotTokenExpire is None
+            or session_data.refreshToken is None
+        ):
             raise Exception("Error check or refresh token: Parameters not correct")
 
         self._session_by_authcode_response = session
-        self._iot_token_issued_at  = int(time.time())
-
-        
+        self._iot_token_issued_at = int(time.time())
 
     def list_binding_by_account(self) -> ListingDevByAccountResponse:
         """List bindings by account."""
@@ -550,14 +564,16 @@ class CloudIOTGateway:
         """Send a cloud command to the specified IoT device."""
 
         """Check if iotToken is expired"""
-        if self._iot_token_issued_at + self._session_by_authcode_response.data.iotTokenExpire <= (int(time.time()) + (5 * 3600)):
+        if self._iot_token_issued_at + self._session_by_authcode_response.data.iotTokenExpire <= (
+            int(time.time()) + (5 * 3600)
+        ):
             """Token expired - Try to refresh - Check if refreshToken is not expired"""
-            if self._iot_token_issued_at + self._session_by_authcode_response.data.refreshTokenExpire > (int(time.time())):
+            if self._iot_token_issued_at + self._session_by_authcode_response.data.refreshTokenExpire > (
+                int(time.time())
+            ):
                 self.check_or_refresh_session()
             else:
                 raise AuthRefreshException("Refresh token expired. Please re-login")
-                
-            
 
         config = Config(
             app_key=self._app_key,

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/aliyun/dataclass/dev_by_account_response.py

@@ -29,7 +29,6 @@ class Device(DataClassORJSONMixin):
     categoryImage: Optional[str] = None
     productModel: Optional[str] = None
 
-
     class Config(BaseConfig):
         omit_default = True
 

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/aliyun/dataclass/session_by_authcode_response.py

@@ -12,6 +12,7 @@ class SessionOauthToken(DataClassORJSONMixin):
     iotTokenExpire: int
     refreshToken: str
 
+
 @dataclass
 class SessionByAuthCodeResponse(DataClassORJSONMixin):
     code: int

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/bluetooth/ble.py

@@ -11,7 +11,7 @@ from pymammotion.event.event import BleNotificationEvent
 address = "90:38:0C:6E:EE:9E"
 
 
-class LubaBLE:
+class MammotionBLE:
     client: BleakClient
 
     def __init__(self, bleEvt: BleNotificationEvent):

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/data/model/account.py

@@ -5,4 +5,4 @@ from dataclasses import dataclass
 class Credentials:
     email: str = None
     password: str = None
-    account_id: str = None
+    account_id: str = None

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/data/model/device.py

@@ -16,8 +16,13 @@ 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, ReportInfoData, SystemUpdateBufMsg, \
-    SystemRapidStateTunnelMsg
+from pymammotion.proto.mctrl_sys import (
+    MctlSys,
+    MowToAppInfoT,
+    ReportInfoData,
+    SystemUpdateBufMsg,
+    SystemRapidStateTunnelMsg,
+)
 from pymammotion.utility.constant import WorkMode
 from pymammotion.utility.conversions import parse_double
 from pymammotion.utility.map import CoordinateConverter
@@ -105,9 +110,9 @@ class MowingDevice:
                     parse_double(location.real_pos_y, 4.0), parse_double(location.real_pos_x, 4.0)
                 )
                 if location.zone_hash:
-                    self.location.work_zone = location.zone_hash if self.report_data.dev.sys_status == WorkMode.MODE_WORKING else 0
-
-
+                    self.location.work_zone = (
+                        location.zone_hash if self.report_data.dev.sys_status == WorkMode.MODE_WORKING else 0
+                    )
 
         self.report_data = self.report_data.from_dict(toapp_report_data.to_dict(casing=betterproto.Casing.SNAKE))
 

pymammotion-0.2.29/pymammotion/data/model/device_config.py

@@ -0,0 +1,80 @@
+from dataclasses import dataclass
+
+from pymammotion.utility.device_type import DeviceType
+
+
+@dataclass
+class DeviceLimits:
+    blade_height_min: int
+    blade_height_max: int
+    working_speed_min: float
+    working_speed_max: float
+
+
+@dataclass
+class OperationSettings:
+    """Operation settings for a device."""
+
+    is_mow: bool = True
+    is_dump: bool = True
+    is_edge: bool = False
+    collect_grass_frequency: int = 10
+    job_mode: int = 0  # taskMode
+    job_version: int = 0
+    job_id: int = 0
+    speed: float = 0.3
+    ultra_wave: int = 2  # touch no touch etc
+    channel_mode: int = 0  # line mode is grid single double or single2
+    channel_width: int = 25
+    rain_tactics: int = 0
+    blade_height: int = 0
+    path_order: str = ""
+    toward: int = 0  # is just angle
+    toward_included_angle: int = 0
+    toward_mode: int = 0  # angle type relative etc
+    border_mode: int = 1  # border laps
+    obstacle_laps: int = 1
+    start_progress: int = 0
+
+
+def create_path_order(operation_mode: OperationSettings, device_name: str) -> str:
+    i = 8
+    bArr = bytearray(8)
+    bArr[0] = operation_mode.border_mode
+    bArr[1] = operation_mode.obstacle_laps
+    bArr[3] = operation_mode.start_progress
+    bArr[2] = 0
+
+    if not DeviceType.is_luba1(device_name):
+        bArr[4] = 0
+        if DeviceType.is_yuka(device_name):
+            i = calculate_yuka_mode(operation_mode)
+        elif not DeviceType.is_luba_2(device_name):
+            i = 0
+        bArr[5] = i
+        if operation_mode.is_dump:
+            b = operation_mode.collect_grass_frequency
+        else:
+            b = 10
+        bArr[6] = b
+    if DeviceType.is_luba1(device_name):
+        bArr[4] = operation_mode.toward_mode
+    return str(bArr, "UTF-8")
+
+
+def calculate_yuka_mode(operation_mode: OperationSettings):
+    if operation_mode.is_mow and operation_mode.is_dump and operation_mode.is_edge:
+        return 14
+    if operation_mode.is_mow and operation_mode.is_dump and not operation_mode.is_edge:
+        return 12
+    if operation_mode.is_mow and not operation_mode.is_dump and operation_mode.is_edge:
+        return 10
+    if operation_mode.is_mow and not operation_mode.is_dump and not operation_mode.is_edge:
+        return 8
+    if not operation_mode.is_mow and operation_mode.is_dump and operation_mode.is_edge:
+        return 6
+    if not operation_mode.is_mow and not operation_mode.is_dump and operation_mode.is_edge:
+        return 2
+    if not operation_mode.is_mow and operation_mode.is_dump and not operation_mode.is_edge:
+        return 4
+    return 0

pymammotion-0.2.29/pymammotion/data/model/generate_route_information.py

@@ -0,0 +1,27 @@
+import logging
+from dataclasses import dataclass
+from typing import List
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class GenerateRouteInformation:
+    """Creates a model for generating route information and mowing plan before starting a job."""
+
+    one_hashs: list[int] = list
+    job_mode: int = 0  # taskMode
+    job_version: int = 0
+    job_id: int = 0
+    speed: float = 0.3
+    ultra_wave: int = 2  # touch no touch etc
+    channel_mode: int = 0  # line mode is grid single double or single2
+    channel_width: int = 25
+    rain_tactics: int = 0
+    blade_height: int = 0
+    path_order: str = ""
+    toward: int = 0  # is just angle
+    toward_included_angle: int = 0
+    toward_mode: int = 0  # angle type relative etc
+    edge_mode: int = 1  # border laps
+    obstacle_laps: int = 1

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/data/model/hash_list.py

@@ -6,10 +6,12 @@ from pymammotion.proto.mctrl_nav import NavGetCommDataAck
 
 class PathType(IntEnum):
     """Path types for common data."""
+
     AREA = 0
     OBSTACLE = 1
     PATH = 2
 
+
 @dataclass
 class FrameList:
     total_frame: int
@@ -34,7 +36,6 @@ class HashList:
         self.path = {hash_id: frames for hash_id, frames in self.path.items() if hash_id in hashlist}
         self.obstacle = {hash_id: frames for hash_id, frames in self.obstacle.items() if hash_id in hashlist}
 
-
     def missing_frame(self, hash_data: NavGetCommDataAck) -> list[int]:
         if hash_data.type == PathType.AREA:
             return self._find_missing_frames(self.area.get(hash_data.hash))
@@ -45,8 +46,6 @@ class HashList:
         if hash_data.type == PathType.PATH:
             return self._find_missing_frames(self.path.get(hash_data.hash))
 
-
-
     def update(self, hash_data: NavGetCommDataAck) -> bool:
         """Update the map data."""
         if hash_data.type == PathType.AREA:
@@ -58,18 +57,16 @@ class HashList:
         if hash_data.type == PathType.PATH:
             return self._add_hash_data(self.path, hash_data)
 
-
     @staticmethod
     def _find_missing_frames(frame_list: FrameList) -> list[int]:
         if frame_list.total_frame == len(frame_list.data):
             return []
-        number_list = list(range(1, frame_list.total_frame+1))
+        number_list = list(range(1, frame_list.total_frame + 1))
 
         current_frames = {frame.current_frame for frame in frame_list.data}
         missing_numbers = [num for num in number_list if num not in current_frames]
         return missing_numbers
 
-
     @staticmethod
     def _add_hash_data(hash_dict: dict, hash_data: NavGetCommDataAck) -> bool:
         if hash_dict.get(hash_data.hash) is None:

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/data/model/location.py

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

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/data/model/mowing_modes.py

@@ -44,3 +44,11 @@ class BypassStrategy(IntEnum):
     slow_touch = 1
     less_touch = 2
     no_touch = 3  # luba 2 yuka only or possibly value of 10
+
+
+class PathAngleSetting(IntEnum):
+    """Path Angle type."""
+
+    relative_angle = 0
+    absolute_angle = 1
+    random_angle = 2  # Luba Pro / Luba 2 Yuka only

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/data/mqtt/event.py

@@ -45,23 +45,25 @@ class DeviceWarningEventValue(DataClassORJSONMixin):
     # (see resources/res/values-en-rUS/strings.xml in APK)
     code: int
 
+
 @dataclass
 class DeviceConfigurationRequestValue(DataClassORJSONMixin):
     code: int
     bizId: str
     params: str
 
+
 @dataclass
 class DeviceNotificationEventCode(DataClassORJSONMixin):
     localTime: int
     code: str
 
+
 @dataclass
 class DeviceNotificationEventValue(DataClassORJSONMixin):
     data: DeviceNotificationEventCode
 
 
-
 @dataclass
 class GeneralParams(DataClassORJSONMixin):
     groupIdList: list[str]
@@ -100,6 +102,7 @@ class DeviceProtobufMsgEventParams(GeneralParams):
     type: Literal["info"]
     value: DeviceProtobufMsgEventValue
 
+
 @dataclass
 class DeviceNotificationEventParams(GeneralParams):
     """Device notification event.
@@ -111,12 +114,14 @@ class DeviceNotificationEventParams(GeneralParams):
     type: Literal["info"]
     value: DeviceNotificationEventValue
 
+
 @dataclass
 class DeviceWarningEventParams(GeneralParams):
     identifier: Literal["device_warning_event"]
     type: Literal["alert"]
     value: DeviceWarningEventValue
 
+
 @dataclass
 class DeviceConfigurationRequestEvent(GeneralParams):
     type: Literal["info"]
@@ -127,7 +132,7 @@ class DeviceConfigurationRequestEvent(GeneralParams):
 class ThingEventMessage(DataClassORJSONMixin):
     method: Literal["thing.events", "thing.properties"]
     id: str
-    params: Union[DeviceProtobufMsgEventParams, DeviceWarningEventParams, str]
+    params: Union[DeviceProtobufMsgEventParams, DeviceWarningEventParams, dict]
     version: Literal["1.0"]
 
     @classmethod

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/data/state_manager.py

@@ -1,4 +1,5 @@
 """Manage state from notifications into MowingDevice."""
+
 from typing import Optional, Callable, Awaitable
 
 import betterproto
@@ -15,9 +16,9 @@ class StateManager:
 
     def __init__(self, device: MowingDevice):
         self._device = device
-        self.gethash_ack_callback: Optional[Callable[[NavGetHashListAck],Awaitable[None]]] = None
-        self.get_commondata_ack_callback: Optional[Callable[[NavGetCommDataAck],Awaitable[None]]] = None
-        self.on_notification_callback: Optional[Callable[[],Awaitable[None]]] = None
+        self.gethash_ack_callback: Optional[Callable[[NavGetHashListAck], Awaitable[None]]] = None
+        self.get_commondata_ack_callback: Optional[Callable[[NavGetCommDataAck], Awaitable[None]]] = None
+        self.on_notification_callback: Optional[Callable[[], Awaitable[None]]] = None
 
     def get_device(self) -> MowingDevice:
         """Get device."""

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/http/http.py

@@ -54,6 +54,16 @@ class MammotionHTTP:
         self.msg = response.msg
         self.code = response.code
 
+    async def get_all_error_codes(self):
+        async with ClientSession() as session:
+            async with session.post(
+                "code/record/export-data",
+                headers=self._headers,
+            ) as resp:
+                if resp.status == 200:
+                    data = await resp.json()
+                print(resp)
+
     @classmethod
     async def login(cls, session: ClientSession, username: str, password: str) -> Response[LoginResponseData]:
         async with session.post(

{pymammotion-0.2.27 → pymammotion-0.2.29}/pymammotion/mammotion/control/joystick.py

@@ -14,6 +14,7 @@ bleNotificationEvt = BleNotificationEvent()
 
 nest_asyncio.apply()
 
+
 class JoystickControl:
     """Joystick class for controlling Luba with a joystick"""