pymammotion 0.2.28__py3-none-any.whl → 0.2.30__py3-none-any.whl

pymammotion/__init__.py

@@ -8,15 +8,16 @@ import asyncio
 import logging
 import os
 
+from pymammotion.aliyun.cloud_gateway import CloudIOTGateway
+
 # 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", "MammotionMQTT"]
 
 logger = logging.getLogger(__name__)
 
@@ -32,13 +33,15 @@ if __name__ == "__main__":
     CLIENT_ID = os.environ.get("CLIENT_ID")
     IOT_TOKEN = os.environ.get("IOT_TOKEN")
     REGION = os.environ.get("REGION")
+    cloud_client = CloudIOTGateway()
     luba = MammotionMQTT(
-        iot_token=IOT_TOKEN,
-        region_id=REGION,
-        product_key=PRODUCT_KEY,
-        device_name=DEVICE_NAME,
-        device_secret=DEVICE_SECRET,
-        client_id=CLIENT_ID,
+        iot_token=IOT_TOKEN or "",
+        region_id=REGION or "",
+        product_key=PRODUCT_KEY or "",
+        device_name=DEVICE_NAME or "",
+        device_secret=DEVICE_SECRET or "",
+        client_id=CLIENT_ID or "",
+        cloud_client=cloud_client,
     )
     luba.connect_async()
 

pymammotion/aliyun/cloud_gateway.py

@@ -17,7 +17,6 @@ from alibabacloud_iot_api_gateway.models import CommonParams, Config, IoTApiRequ
 from alibabacloud_tea_util.client import Client as UtilClient
 from alibabacloud_tea_util.models import RuntimeOptions
 
-from pymammotion.http.http import MammotionHTTP
 from pymammotion.aliyun.dataclass.aep_response import AepResponse
 from pymammotion.aliyun.dataclass.connect_response import ConnectResponse
 from pymammotion.aliyun.dataclass.dev_by_account_response import (
@@ -29,6 +28,7 @@ from pymammotion.aliyun.dataclass.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
 
 logger = getLogger(__name__)
@@ -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,
+    ) -> None:
         """Initialize the CloudIOTGateway."""
         self.mammotion_http: MammotionHTTP | None = None
         self._app_key = APP_KEY
@@ -94,13 +106,13 @@ class CloudIOTGateway:
         self._devices_by_account_response = dev_by_account
 
     @staticmethod
-    def generate_random_string(length):
+    def generate_random_string(length: int):
         """Generate a random string of specified length."""
         characters = string.ascii_letters + string.digits
         return "".join(random.choice(characters) for _ in range(length))
 
     @staticmethod
-    def generate_hardware_string(length) -> str:
+    def generate_hardware_string(length: int) -> str:
         """Generate hardware string that is consistent per device."""
         hashed_uuid = hashlib.sha1(f"{uuid.getnode()}".encode()).hexdigest()
         return "".join(itertools.islice(itertools.cycle(hashed_uuid), length))
@@ -120,24 +132,6 @@ class CloudIOTGateway:
             hashlib.sha1,
         ).hexdigest()
 
-    def get_connect_response(self):
-        return self._connect_response
-
-    def get_login_by_oauth_response(self):
-        return self._login_by_oauth_response
-
-    def get_aep_response(self):
-        return self._aep_response
-
-    def get_session_by_authcode_response(self):
-        return self._session_by_authcode_response
-
-    def get_devices_by_account_response(self):
-        return self._devices_by_account_response
-
-    def get_region_response(self):
-        return self._region_response
-
     def get_region(self, country_code: str, auth_code: str):
         """Get the region based on country code and auth code."""
         config = Config(
@@ -376,11 +370,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 +432,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 +482,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 +546,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,
@@ -614,8 +612,28 @@ class CloudIOTGateway:
         return message_id
 
     @property
-    def listing_dev_by_account_response(self):
+    def devices_by_account_response(self):
         return self._devices_by_account_response
 
-    def set_http(self, mammotion_http):
+    def set_http(self, mammotion_http) -> None:
         self.mammotion_http = mammotion_http
+
+    @property
+    def region_response(self):
+        return self._region_response
+
+    @property
+    def aep_response(self):
+        return self._aep_response
+
+    @property
+    def session_by_authcode_response(self):
+        return self._session_by_authcode_response
+
+    @property
+    def client_id(self):
+        return self._client_id
+
+    @property
+    def login_by_oath_response(self):
+        return self._login_by_oauth_response

pymammotion/aliyun/cloud_service.py

@@ -10,7 +10,7 @@ from aliyunsdkiot.request.v20180120.InvokeThingServiceRequest import (
 class CloudService:
     # com.aliyun.iot.aep.sdk
     # https://domestic.mammotion.com/privacy/ - lists all aliyun packages
-    def __init__(self):
+    def __init__(self) -> None:
         self.selectDeviceIOTID = ""
         accessKeyId = "<your accessKey>"
         accessKeySecret = "<your accessSecret>"
@@ -31,7 +31,7 @@ class CloudService:
     
     """
 
-    def invoke_thing_service(self, data: bytearray):
+    def invoke_thing_service(self, data: bytearray) -> None:
         base64_encoded = base64.b64encode(data).decode("utf-8")
 
         # Create a dictionary structure
@@ -53,7 +53,7 @@ class CloudService:
         # python2:  print(response)
         print(response)
 
-    def get_device_status(self):
+    def get_device_status(self) -> None:
         request = GetDeviceStatusRequest()
         request.set_accept_format("json")
 

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
 
@@ -37,7 +36,7 @@ class Device(DataClassORJSONMixin):
 @dataclass
 class Data(DataClassORJSONMixin):
     total: int
-    data: List[Device]
+    data: list[Device]
     pageNo: int
     pageSize: int
 

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/bluetooth/ble.py

@@ -11,16 +11,16 @@ from pymammotion.event.event import BleNotificationEvent
 address = "90:38:0C:6E:EE:9E"
 
 
-class LubaBLE:
+class MammotionBLE:
     client: BleakClient
 
-    def __init__(self, bleEvt: BleNotificationEvent):
+    def __init__(self, bleEvt: BleNotificationEvent) -> None:
         self._bleEvt = bleEvt
 
     async def scanForLubaAndConnect(self) -> bool:
         scanner = BleakScanner()
 
-        def scanCallback(device, advertising_data):
+        def scanCallback(device, advertising_data) -> bool:
             # TODO: do something with incoming data
             print(device)
             print(advertising_data)
@@ -46,18 +46,18 @@ class LubaBLE:
         if self.client is not None:
             return await self.client.disconnect()
 
-    async def notification_handler(self, _characteristic: BleakGATTCharacteristic, data: bytearray):
+    async def notification_handler(self, _characteristic: BleakGATTCharacteristic, data: bytearray) -> None:
         """Simple notification handler which prints the data received."""
         await self._bleEvt.BleNotification(data)
 
-    def service_changed_handler(self, characteristic: BleakGATTCharacteristic, data: bytearray):
+    def service_changed_handler(self, characteristic: BleakGATTCharacteristic, data: bytearray) -> None:
         """Simple notification handler which prints the data received."""
         print(f"Response 2 {characteristic.description}: {data}")
         print(data.decode("utf-8"))
         # BlufiNotifyData
         # run an event handler back to somewhere
 
-    async def notifications(self):
+    async def notifications(self) -> None:
         if self.client.is_connected:
             await self.client.start_notify(UUID_NOTIFICATION_CHARACTERISTIC, self.notification_handler)
             await self.client.start_notify(SERVICE_CHANGED_CHARACTERISTIC, self.service_changed_handler)

pymammotion/bluetooth/ble_message.py

@@ -51,14 +51,14 @@ class BleMessage:
     notification: BlufiNotifyData
     messageNavigation: MessageNavigation = MessageNavigation()
 
-    def __init__(self, client: BleakClient):
+    def __init__(self, client: BleakClient) -> None:
         self.client = client
         self.mSendSequence = itertools.count()
         self.mReadSequence = itertools.count()
         self.mAck = queue.Queue()
         self.notification = BlufiNotifyData()
 
-    async def get_device_version_main(self):
+    async def get_device_version_main(self) -> None:
         commEsp = dev_net_pb2.DevNet(todev_devinfo_req=dev_net_pb2.DrvDevInfoReq())
 
         for i in range(1, 8):
@@ -75,24 +75,38 @@ class BleMessage:
         lubaMsg.subtype = 1
         lubaMsg.net.CopyFrom(commEsp)
         byte_arr = lubaMsg.SerializeToString()
-        await self.messageNavigation.post_custom_data_bytes(byte_arr)
+        await self.post_custom_data_bytes(byte_arr)
 
-    async def get_task(self):
+    async def get_task(self) -> None:
         hash_map = {"pver": 1, "subCmd": 2, "result": 0}
-        await self.messageNavigation.post_custom_data(self.get_json_string(bleOrderCmd.task, hash_map))
+        await self.post_custom_data(self.get_json_string(bleOrderCmd.task, hash_map))
 
-    async def send_ble_alive(self):
+    async def send_ble_alive(self) -> None:
         hash_map = {"ctrl": 1}
-        await self.messageNavigation.post_custom_data(self.get_json_string(bleOrderCmd.bleAlive, hash_map))
+        await self.post_custom_data(self.get_json_string(bleOrderCmd.bleAlive, hash_map))
 
-    def clearNotification(self):
+    def get_json_string(self, cmd: int, hash_map: dict[str, object]) -> str:
+        jSONObject = {}
+        try:
+            jSONObject["cmd"] = cmd
+            jSONObject[tmp_constant.REQUEST_ID] = int(time.time())
+            jSONObject2 = {}
+            for key, value in hash_map.items():
+                jSONObject2[key] = value
+            jSONObject["params"] = jSONObject2
+            return json.dumps(jSONObject)
+        except Exception as e:
+            print(e)
+            return ""
+
+    def clearNotification(self) -> None:
         self.notification = None
         self.notification = BlufiNotifyData()
 
     # async def get_device_info(self):
     #     await self.postCustomData(self.getJsonString(bleOrderCmd.getDeviceInfo))
 
-    async def send_device_info(self):
+    async def send_device_info(self) -> None:
         """Currently not called"""
         luba_msg = luba_msg_pb2.LubaMsg(
             msgtype=luba_msg_pb2.MsgCmdType.MSG_CMD_TYPE_ESP,
@@ -107,7 +121,7 @@ class BleMessage:
         byte_arr = luba_msg.SerializeToString()
         await self.post_custom_data_bytes(byte_arr)
 
-    async def requestDeviceStatus(self):
+    async def requestDeviceStatus(self) -> None:
         request = False
         type = self.messageNavigation.getTypeValue(0, 5)
         try:
@@ -121,7 +135,7 @@ class BleMessage:
         # if not request:
         #     onStatusResponse(BlufiCallback.CODE_WRITE_DATA_FAILED, null)
 
-    async def requestDeviceVersion(self):
+    async def requestDeviceVersion(self) -> None:
         request = False
         type = self.messageNavigation.getTypeValue(0, 7)
         try:
@@ -132,7 +146,7 @@ class BleMessage:
             request = False
             _LOGGER.error(err)
 
-    async def sendBorderPackage(self, executeBorder: ExecuteBorder):
+    async def sendBorderPackage(self, executeBorder: ExecuteBorder) -> None:
         await self.messageNavigation.post_custom_data(serialize(executeBorder))
 
     async def gatt_write(self, data: bytes) -> None:
@@ -226,7 +240,7 @@ class BleMessage:
                 return dataBytes
             return await self._parseDataData(subType, dataBytes)
 
-    def _parseCtrlData(self, subType: int, data: bytes):
+    def _parseCtrlData(self, subType: int, data: bytes) -> None:
         pass
         # self._parseAck(data)
 
@@ -303,7 +317,7 @@ class BleMessage:
     def generateSendSequence(self):
         return next(self.mSendSequence) & 255
 
-    async def post_custom_data_bytes(self, data: bytes):
+    async def post_custom_data_bytes(self, data: bytes) -> None:
         if data == None:
             return
         type_val = self.getTypeValue(1, 19)
@@ -315,7 +329,7 @@ class BleMessage:
         except Exception as err:
             _LOGGER.debug(err)
 
-    async def post_custom_data(self, data_str: str):
+    async def post_custom_data(self, data_str: str) -> None:
         data = data_str.encode()
         if data == None:
             return
@@ -389,7 +403,7 @@ class BleMessage:
         require_ack: bool,
         hasFrag: bool,
         sequence: int,
-        data: bytes,
+        data: bytes | None,
     ) -> bytes:
         byteOS = BytesIO()
         dataLength = 0 if data == None else len(data)

pymammotion/bluetooth/data/convert.py

@@ -14,7 +14,7 @@ def parse_custom_data(data: bytes):
         print(err)
 
 
-def store_sys_data(sys):
+def store_sys_data(sys) -> None:
     if sys.HasField("systemTardStateTunnel"):
         tard_state_data_list = sys.systemTardStateTunnel.tard_state_data
         longValue8 = tard_state_data_list[0]

pymammotion/bluetooth/data/framectrldata.py

@@ -6,7 +6,7 @@ class FrameCtrlData:
     FRAME_CTRL_POSITION_REQUIRE_ACK = 3
     mValue = 0
 
-    def __init__(self, frameCtrlValue):
+    def __init__(self, frameCtrlValue) -> None:
         self.mValue = frameCtrlValue
 
     def check(self, position):

pymammotion/bluetooth/data/notifydata.py

@@ -6,7 +6,7 @@ from io import BytesIO
 class BlufiNotifyData:
     """generated source for class BlufiNotifyData"""
 
-    def __init__(self):
+    def __init__(self) -> None:
         self.mDataOS = BytesIO()
         self.mFrameCtrlValue = 0
         self.mPkgType = 0
@@ -18,7 +18,7 @@ class BlufiNotifyData:
         return self.mTypeValue
 
     #  JADX INFO: Access modifiers changed from: package-private
-    def setType(self, i):
+    def setType(self, i) -> None:
         """Generated source for method setType"""
         self.mTypeValue = i
 
@@ -28,7 +28,7 @@ class BlufiNotifyData:
         return self.mPkgType
 
     #  JADX INFO: Access modifiers changed from: package-private
-    def setPkgType(self, i):
+    def setPkgType(self, i) -> None:
         """Generated source for method setPkgType"""
         self.mPkgType = i
 
@@ -38,7 +38,7 @@ class BlufiNotifyData:
         return self.mSubType
 
     #  JADX INFO: Access modifiers changed from: package-private
-    def setSubType(self, i):
+    def setSubType(self, i) -> None:
         """Generated source for method setSubType"""
         self.mSubType = i
 
@@ -47,12 +47,12 @@ class BlufiNotifyData:
         return self.mFrameCtrlValue
 
     #  JADX INFO: Access modifiers changed from: package-private
-    def setFrameCtrl(self, i):
+    def setFrameCtrl(self, i) -> None:
         """Generated source for method setFrameCtrl"""
         self.mFrameCtrlValue = i
 
     #  JADX INFO: Access modifiers changed from: package-private
-    def addData(self, bArr, i):
+    def addData(self, bArr, i) -> None:
         """Generated source for method addData"""
         self.mDataOS.write(bArr[i:])
 

pymammotion/const.py

@@ -5,5 +5,6 @@ APP_SECRET = "1ba85698bb10e19c6437413b61ba3445"
 APP_VERSION = "1.11.130"
 ALIYUN_DOMAIN = "api.link.aliyun.com"
 MAMMOTION_DOMAIN = "https://id.mammotion.com"
+MAMMOTION_API_DOMAIN = "https://domestic.mammotion.com"
 MAMMOTION_CLIENT_ID = "MADKALUBAS"
 MAMMOTION_CLIENT_SECRET = "GshzGRZJjuMUgd2sYHM7"

pymammotion/data/model/__init__.py

@@ -5,3 +5,5 @@ from .hash_list import HashList
 from .plan import Plan
 from .rapid_state import RapidState, RTKStatus
 from .region_data import RegionData
+
+__all__ = ["GenerateRouteInformation", "HashList", "Plan", "RapidState", "RTKStatus", "RegionData"]

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