pymammotion 0.2.25__py3-none-any.whl → 0.2.27__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -9,9 +9,7 @@ import random
 import string
 import time
 import uuid
-from logging import getLogger, exception
-from datetime import datetime
-from urllib.parse import urlencode
+from logging import getLogger
 
 from aiohttp import ClientSession
 from alibabacloud_iot_api_gateway.client import Client
@@ -19,6 +17,7 @@ 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 (
@@ -79,6 +78,7 @@ class CloudIOTGateway:
 
     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
         self._app_secret = APP_SECRET
         self.domain = ALIYUN_DOMAIN
@@ -616,3 +616,6 @@ class CloudIOTGateway:
     @property
     def listing_dev_by_account_response(self):
         return self._devices_by_account_response
+
+    def set_http(self, mammotion_http):
+        self.mammotion_http = mammotion_http

pymammotion/bluetooth/ble_message.py

@@ -112,11 +112,11 @@ class BleMessage:
         type = self.messageNavigation.getTypeValue(0, 5)
         try:
             request = await self.messageNavigation.post(BleMessage.mEncrypted, BleMessage.mChecksum, False, type, None)
-            # print(request)
+            # _LOGGER.debug(request)
         except Exception as err:
             # Log.w(TAG, "post requestDeviceStatus interrupted")
             request = False
-            print(err)
+            _LOGGER.error(err)
 
         # if not request:
         #     onStatusResponse(BlufiCallback.CODE_WRITE_DATA_FAILED, null)
@@ -126,11 +126,11 @@ class BleMessage:
         type = self.messageNavigation.getTypeValue(0, 7)
         try:
             request = await self.messageNavigation.post(BleMessage.mEncrypted, BleMessage.mChecksum, False, type, None)
-            # print(request)
+            # _LOGGER.debug(request)
         except Exception as err:
             # Log.w(TAG, "post requestDeviceStatus interrupted")
             request = False
-            print(err)
+            _LOGGER.error(err)
 
     async def sendBorderPackage(self, executeBorder: ExecuteBorder):
         await self.messageNavigation.post_custom_data(serialize(executeBorder))
@@ -150,7 +150,7 @@ class BleMessage:
         if len(response) >= 4:
             sequence = int(response[2])  # toInt
             if sequence != next(self.mReadSequence):
-                print(
+                _LOGGER.debug(
                     "parseNotification read sequence wrong",
                     sequence,
                     self.mReadSequence,
@@ -168,10 +168,10 @@ class BleMessage:
             self.notification.setPkgType(pkgType)
             self.notification.setSubType(subType)
             frameCtrl = int(response[1])  # toInt
-            # print("frame ctrl")
-            # print(frameCtrl)
-            # print(response)
-            # print(f"pktType {pkt_type} pkgType {pkgType} subType {subType}")
+            # _LOGGER.debug("frame ctrl")
+            # _LOGGER.debug(frameCtrl)
+            # _LOGGER.debug(response)
+            # _LOGGER.debug(f"pktType {pkt_type} pkgType {pkgType} subType {subType}")
             self.notification.setFrameCtrl(frameCtrl)
             frameCtrlData = FrameCtrlData(frameCtrl)
             dataLen = int(response[3])  # toInt specifies length of data
@@ -179,12 +179,12 @@ class BleMessage:
             try:
                 dataBytes = response[4 : 4 + dataLen]
                 if frameCtrlData.isEncrypted():
-                    print("is encrypted")
+                    _LOGGER.debug("is encrypted")
                 #     BlufiAES aes = new BlufiAES(self.mAESKey, AES_TRANSFORMATION, generateAESIV(sequence));
                 #     dataBytes = aes.decrypt(dataBytes);
                 # }
                 if frameCtrlData.isChecksum():
-                    print("checksum")
+                    _LOGGER.debug("checksum")
                 #     int respChecksum1 = toInt(response[response.length - 1]);
                 #     int respChecksum2 = toInt(response[response.length - 2]);
                 #     int crc = BlufiCRC.calcCRC(BlufiCRC.calcCRC(0, new byte[]{(byte) sequence, (byte) dataLen}), dataBytes);
@@ -208,7 +208,7 @@ class BleMessage:
                 self.notification.addData(dataBytes, dataOffset)
                 return 1 if frameCtrlData.hasFrag() else 0
             except Exception as e:
-                print(e)
+                _LOGGER.debug(e)
                 return -100
 
         # Log.w(TAG, "parseNotification data length less than 4");
@@ -235,7 +235,7 @@ class BleMessage:
         #         this.mSecurityCallback.onReceiveDevicePublicKey(data);
         #         return;
         #     }
-        print(subType)
+        _LOGGER.debug(subType)
         match subType:
             #         case 15:
             #             parseWifiState(data);
@@ -257,7 +257,7 @@ class BleMessage:
                 if luba_msg.HasField("net"):
                     if luba_msg.net.HasField("toapp_wifi_iot_status"):
                         # await sleep(1.5)
-                        print("sending ble sync")
+                        _LOGGER.debug("sending ble sync")
                         # await self.send_todev_ble_sync(2)
                 return luba_msg
 
@@ -297,7 +297,7 @@ class BleMessage:
             ack = next(self.mAck)
             return ack == expectAck
         except Exception as err:
-            print(err)
+            _LOGGER.debug(err)
             return False
 
     def generateSendSequence(self):
@@ -311,9 +311,9 @@ class BleMessage:
             suc = await self.post(self.mEncrypted, self.mChecksum, self.mRequireAck, type_val, data)
             # int status = suc ? 0 : BlufiCallback.CODE_WRITE_DATA_FAILED
             # onPostCustomDataResult(status, data)
-            # print(suc)
+            # _LOGGER.debug(suc)
         except Exception as err:
-            print(err)
+            _LOGGER.debug(err)
 
     async def post_custom_data(self, data_str: str):
         data = data_str.encode()
@@ -325,7 +325,7 @@ class BleMessage:
             # int status = suc ? 0 : BlufiCallback.CODE_WRITE_DATA_FAILED
             # onPostCustomDataResult(status, data)
         except Exception as err:
-            print(err)
+            _LOGGER.debug(err)
 
     async def post(
         self,
@@ -366,8 +366,8 @@ class BleMessage:
             frag = index != len(chunks) - 1
             sequence = self.generateSendSequence()
             postBytes = self.getPostBytes(type_of, encrypt, checksum, require_ack, frag, sequence, chunk)
-            # print("sequence")
-            # print(sequence)
+            # _LOGGER.debug("sequence")
+            # _LOGGER.debug(sequence)
             posted = await self.gatt_write(postBytes)
             if posted != None:
                 return False
@@ -378,7 +378,7 @@ class BleMessage:
             if require_ack and not self.receiveAck(sequence):
                 return False
             else:
-                print("sleeping 0.01")
+                _LOGGER.debug("sleeping 0.01")
                 await sleep(0.01)
 
     def getPostBytes(
@@ -402,5 +402,5 @@ class BleMessage:
         if data != None:
             byteOS.write(data)
 
-        print(byteOS.getvalue())
+        _LOGGER.debug(byteOS.getvalue())
         return byteOS.getvalue()

pymammotion/data/mqtt/event.py

@@ -148,7 +148,7 @@ class ThingEventMessage(DataClassORJSONMixin):
         elif identifier == "device_warning_event":
             params_obj = DeviceWarningEventParams(**params_dict)
         elif identifier == "device_config_req_event":
-            params_obj = payload.get("params", '')
+            params_obj = payload.get("params", {})
         elif identifier == "device_notification_event":
             params_obj = DeviceNotificationEventParams(**params_dict)
         else:

pymammotion/mammotion/commands/mammotion_command.py

@@ -23,18 +23,3 @@ 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:
-        commEsp = dev_net_pb2.DevNet(todev_ble_sync=sync_type)
-
-        lubaMsg = luba_msg_pb2.LubaMsg()
-        lubaMsg.msgtype = luba_msg_pb2.MSG_CMD_TYPE_ESP
-        lubaMsg.sender = luba_msg_pb2.DEV_MOBILEAPP
-        lubaMsg.msgattr = luba_msg_pb2.MSG_ATTR_REQ
-        lubaMsg.seqs = 1
-        lubaMsg.version = 1
-        lubaMsg.subtype = 1
-        lubaMsg.net.CopyFrom(commEsp)
-        return lubaMsg.SerializeToString()

pymammotion/mammotion/commands/messages/network.py

@@ -26,6 +26,10 @@ class MessageNetwork:
 
         return luba_msg.SerializeToString()
 
+    def send_todev_ble_sync(self, sync_type: int) -> bytes:
+        comm_esp = dev_net_pb2.DevNet(todev_ble_sync=sync_type)
+        return self.send_order_msg_net(comm_esp)
+
     def get_device_base_info(self):
         net = dev_net_pb2.DevNet(todev_devinfo_req=dev_net_pb2.DrvDevInfoReq())
         net.todev_devinfo_req.req_ids.add(id=1, type=6)

pymammotion/mammotion/devices/mammotion.py

@@ -199,7 +199,7 @@ async def create_devices(ble_device: BLEDevice,
     preference: ConnectionPreference = ConnectionPreference.BLUETOOTH):
     mammotion = Mammotion(ble_device, preference)
 
-    if cloud_credentials:
+    if cloud_credentials and preference == ConnectionPreference.EITHER or preference == ConnectionPreference.WIFI:
         cloud_client = await Mammotion.login(cloud_credentials.account_id or cloud_credentials.email,
                                              cloud_credentials.password)
         await mammotion.initiate_cloud_connection(cloud_client)
@@ -266,6 +266,7 @@ class Mammotion(object):
             _LOGGER.debug("CountryCode: " + country_code)
             _LOGGER.debug("AuthCode: " + mammotion_http.login_info.authorization_code)
             loop = asyncio.get_running_loop()
+            cloud_client.set_http(mammotion_http)
             await loop.run_in_executor(None, cloud_client.get_region, country_code, mammotion_http.login_info.authorization_code)
             await cloud_client.connect()
             await cloud_client.login_by_oauth(country_code, mammotion_http.login_info.authorization_code)
@@ -815,7 +816,6 @@ class MammotionBaseBLEDevice(MammotionBaseDevice):
         except asyncio.TimeoutError:
             timeout_expired = True
             notify_msg = b''
-            self._notify_future.set_result(notify_msg)
         finally:
             if not timeout_expired:
                 timeout_handle.cancel()

{pymammotion-0.2.25.dist-info → pymammotion-0.2.27.dist-info}/METADATA

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

{pymammotion-0.2.25.dist-info → pymammotion-0.2.27.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pymammotion/__init__.py,sha256=kmnjdt3AEMejIz5JK7h1tTJj5ZriAgKwZBa3ScA4-Ao,1516
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
-pymammotion/aliyun/cloud_gateway.py,sha256=ra7m3CgP6mIoc0RhRFk-rySdcEWOjbZcDBwvfNvMpM8,22461
+pymammotion/aliyun/cloud_gateway.py,sha256=L3efICH21kHNz2eXpReGoTBoTQU-PERX5RTyS7J6eDA,22576
 pymammotion/aliyun/cloud_service.py,sha256=YWcKuKK6iRWy5mTnBYgHxcCusiRGGzQt3spSf7dGDss,2183
 pymammotion/aliyun/dataclass/aep_response.py,sha256=8f6GIP58ve8gd6AL3HBoXxsy0n2q4ygWvjELGnoOnVc,452
 pymammotion/aliyun/dataclass/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
@@ -11,7 +11,7 @@ pymammotion/aliyun/dataclass/session_by_authcode_response.py,sha256=_5vsyIxocoec
 pymammotion/aliyun/tmp_constant.py,sha256=M4Hq_lrGB3LZdX6R2XohRPFoK1NDnNV-pTJwJcJ9838,6650
 pymammotion/bluetooth/__init__.py,sha256=LAl8jqZ1fPh-3mLmViNQsP3s814C1vsocYUa6oSaXt0,36
 pymammotion/bluetooth/ble.py,sha256=9fA8yw5xXNJRSbC68SdOMf2QJnHoD7RhhCjLFoF0c0I,2404
-pymammotion/bluetooth/ble_message.py,sha256=75jaOgUiPoCt33c9OLyCpfN9Pp1QfINTUAFZVF3zoM8,15487
+pymammotion/bluetooth/ble_message.py,sha256=byibcxZ5b_hE3UzHAImyTcxdBOcya9rdswdtuLV8_hY,15663
 pymammotion/bluetooth/const.py,sha256=CCqyHsYbB0BAYjwdhXt_n6eWWxmhlUrAFjvVv57mbvE,1749
 pymammotion/bluetooth/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/bluetooth/data/convert.py,sha256=tlctvRODoYypy4FpMD_UBwB1bIn5hG0QdQQdNI0e1R8,792
@@ -35,7 +35,7 @@ pymammotion/data/model/rapid_state.py,sha256=BdJFD_DlhrVneg-PqEruqCoMty-CR7q_9Qn
 pymammotion/data/model/region_data.py,sha256=75xOTM1qeRbSROp53eIczw3yCmYM9DgMjMh8qE9xkKo,2880
 pymammotion/data/model/report_info.py,sha256=1Rj_yRZ9apWX296QHae5prdObDbs32bsQf9rzMz2KEQ,4458
 pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pymammotion/data/mqtt/event.py,sha256=0bxP7mt3unvoaPIJn5VDUXMuwTcakgw6bfuv64aaYAk,4522
+pymammotion/data/mqtt/event.py,sha256=ec5TfIBaPZefTKTM3SBweM758hYR3ocjb7rNUMpttn0,4522
 pymammotion/data/mqtt/properties.py,sha256=HkBPghr26L9_b4QaOi1DtPgb0UoPIOGSe9wb3kgnM6Y,2815
 pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
 pymammotion/data/state_manager.py,sha256=T6slACOpbnhWVKmJD_XrBY9vrcCFc6q2l6jEf-g89NQ,3095
@@ -46,19 +46,19 @@ pymammotion/http/http.py,sha256=XJ8_i20HwZ94BqKxCF29dRtRyP_gNOwqJ8gue4F7SOw,2491
 pymammotion/mammotion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/abstract_message.py,sha256=nw6r7694yzl7iJKqRqhLmAPRjd_TL_Xo_-JXq2_a_ug,222
-pymammotion/mammotion/commands/mammotion_command.py,sha256=LwJkBTXNjEXpJG-vjeJTsSHdvojQflpLJ_D7Q75ZKNQ,1578
+pymammotion/mammotion/commands/mammotion_command.py,sha256=84XxnatnBm_5WQ_KOa2N0ltydQOhSvCme3fFqkuyEhg,1056
 pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/messages/driver.py,sha256=IFtmp9gJ3p3U2xtTgWVpKBMbnVnUht6Ioih17po6Hr4,3783
 pymammotion/mammotion/commands/messages/media.py,sha256=ps0l06CXy5Ej--gTNCsyKttwo7yHLVrJUpn-wNJYecs,1150
 pymammotion/mammotion/commands/messages/navigation.py,sha256=-qit4SrtMpnPr0qsub_HD0pzKMlYsyzspW5uf1Ym008,23217
-pymammotion/mammotion/commands/messages/network.py,sha256=1a0BIhaBhBuhqYaK5EUqLbDgfzjzsIGrXS32wMKtxOU,8316
+pymammotion/mammotion/commands/messages/network.py,sha256=Hv5u7omEdffpTsOKw-uIlfhRkd_X1GyvKJT-nswHJ2w,8490
 pymammotion/mammotion/commands/messages/ota.py,sha256=XkeuWBZtpYMMBze6r8UN7dJXbe2FxUNGNnjwBpXJKM0,1240
 pymammotion/mammotion/commands/messages/system.py,sha256=m4Cc1zUcLgMFCu6zp5rMupwjDnMD-1PM6hqXpXuXRtw,10984
 pymammotion/mammotion/commands/messages/video.py,sha256=_8lJsU4sLm2CGnc7RDkueA0A51Ysui6x7SqFnhX8O2g,1007
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=mresPubTlWCuLQBOFD9KTyYJz5BjZgqt52BaRodemhM,5557
 pymammotion/mammotion/devices/__init__.py,sha256=T72jt0ejtMjo1rPmn_FeMF3pmp0LLeRRpc9WcDKEYYY,126
-pymammotion/mammotion/devices/mammotion.py,sha256=PQPiPxfPGi9wNne2Rcxy7Tcf1kRdkvAvqZqM5nEu5qM,49394
+pymammotion/mammotion/devices/mammotion.py,sha256=Cu6N_zq93TsOnvpd-nH7StopmkKTrzBOQsDKv_RYKEE,49478
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/mammotion_future.py,sha256=WKnHqeHiS2Ut-SaDBNOxqh1jDLeTiyLTsJ7PNUexrjk,687
 pymammotion/mqtt/mammotion_mqtt.py,sha256=X012f5RvmZI52FlgchLSWbngvPnkv9M_gTYvJHakYaM,8127
@@ -113,7 +113,7 @@ pymammotion/utility/map.py,sha256=aoi-Luzuph02hKynTofMoq3mnPstanx75MDAVv49CuY,22
 pymammotion/utility/movement.py,sha256=JISPBWCOe4MqHbhmkewhV5aWykr1p6f01DzJfvOF-J8,613
 pymammotion/utility/periodic.py,sha256=9wJMfwXPlx6Mbp3Fws7LLTI34ZDKphH1bva_Ggyk32g,3281
 pymammotion/utility/rocker_util.py,sha256=syPL0QN4zMzHiTIkUKS7RXBBptjdbkfNlPddwUD5V3A,7171
-pymammotion-0.2.25.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.25.dist-info/METADATA,sha256=liR32EcxsTwl9FcHXPD2W2Xnt7IefPMm5GxOHUTPRMc,3969
-pymammotion-0.2.25.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.25.dist-info/RECORD,,
+pymammotion-0.2.27.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.27.dist-info/METADATA,sha256=5ks2LDgNm-FfMrx3bda29NSW3pyW1s8h50iSj9p1pQQ,3969
+pymammotion-0.2.27.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.27.dist-info/RECORD,,