pymammotion 0.2.12__py3-none-any.whl → 0.2.14__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -52,6 +52,9 @@ class SetupException(Exception):
 class AuthRefreshException(Exception):
     """Raise exception when library cannot refresh token."""
 
+class DeviceOfflineException(Exception):
+    """Raise exception when device is offline."""
+
 
 class CloudIOTGateway:
     """Class for interacting with Aliyun Cloud IoT Gateway."""
@@ -416,10 +419,15 @@ class CloudIOTGateway:
         # Load the JSON string into a dictionary
         response_body_dict = json.loads(response_body_str)
 
-        if int(response_body_dict.get("code")) != 200:
-            raise Exception("Error in creating session: " + response_body_dict["msg"])
+        session_by_auth = SessionByAuthCodeResponse.from_dict(response_body_dict)
 
-        self._session_by_authcode_response = SessionByAuthCodeResponse.from_dict(response_body_dict)
+        if int(session_by_auth.code) != 200:
+            raise Exception("Error in creating session: " + response_body_str)
+
+        if session_by_auth.data.identityId is None:
+            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())
 
         return response.body
@@ -472,17 +480,13 @@ class CloudIOTGateway:
         if int(response_body_dict.get("code")) != 200:
             raise Exception("Error check or refresh token: " + response_body_dict.get('msg', ''))
 
-        identityId = response_body_dict.get('data', {}).get('identityId', None)
-        refreshTokenExpire = response_body_dict.get('data', {}).get('refreshTokenExpire', None)
-        iotToken = response_body_dict.get('data', {}).get('iotToken', None)
-        iotTokenExpire = response_body_dict.get('data', {}).get('iotTokenExpire', None)
-        refreshToken = response_body_dict.get('data', {}).get('refreshToken', None)
-
+        session = SessionByAuthCodeResponse.from_dict(response_body_dict)
+        session_data = session.data
 
-        if (identityId is None or refreshTokenExpire is None or iotToken is None or iotTokenExpire is None or 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 = SessionByAuthCodeResponse.from_dict(response_body_dict)
+        self._session_by_authcode_response = session
         self._iot_token_issued_at  = int(time.time())
 
         
@@ -591,6 +595,7 @@ class CloudIOTGateway:
             if response_body_dict.get("code") == 29003:
                 raise SetupException(response_body_dict.get("code"))
             if response_body_dict.get("code") == 6205:
+                raise DeviceOfflineException(response_body_dict.get("code"))
                 """Device is offline."""
 
         return message_id

pymammotion/data/mqtt/event.py

@@ -95,9 +95,9 @@ class DeviceWarningEventParams(GeneralParams):
 
 @dataclass
 class ThingEventMessage(DataClassORJSONMixin):
-    method: Literal["thing.events"]
+    method: Literal["thing.events", "thing.properties"]
     id: str
-    params: Union[DeviceProtobufMsgEventParams, DeviceWarningEventParams]
+    params: Union[DeviceProtobufMsgEventParams, DeviceWarningEventParams, str]
     version: Literal["1.0"]
 
     @classmethod
@@ -114,6 +114,8 @@ class ThingEventMessage(DataClassORJSONMixin):
             params_obj = DeviceProtobufMsgEventParams(**params_dict)
         elif identifier == "device_warning_event":
             params_obj = DeviceWarningEventParams(**params_dict)
+        elif identifier == "device_config_req_event":
+            params_obj = payload.get("params", '')
         else:
             raise ValueError(f"Unknown identifier: {identifier}")
 

pymammotion/mammotion/devices/mammotion.py

@@ -29,7 +29,7 @@ from bleak_retry_connector import (
     establish_connection,
 )
 
-from pymammotion.aliyun.cloud_gateway import CloudIOTGateway
+from pymammotion.aliyun.cloud_gateway import CloudIOTGateway, DeviceOfflineException, SetupException
 from pymammotion.aliyun.dataclass.dev_by_account_response import Device
 from pymammotion.bluetooth import BleMessage
 from pymammotion.const import MAMMOTION_DOMAIN
@@ -1070,9 +1070,23 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         """Send command to device and read response."""
         try:
             return await self._execute_command_locked(key, command)
+        except DeviceOfflineException as ex:
+            _LOGGER.debug(
+                "%s: device offline in _send_command_locked: %s",
+                self.device.nickName,
+                ex,
+            )
+        except SetupException as ex:
+            session = self._mqtt_client.get_cloud_client().get_session_by_authcode_response()
+            _LOGGER.debug(
+                "%s: session identityId mssing in _send_command_locked: %s",
+                self.device.nickName,
+                session,
+            )
+            if session.data.identityId is None:
+                await self._mqtt_client.get_cloud_client().session_by_auth_code()
+
         except Exception as ex:
-            # Disconnect so we can reset state and try again
-            await asyncio.sleep(DBUS_ERROR_BACKOFF_TIME)
             _LOGGER.debug(
                 "%s: error in _send_command_locked: %s",
                 self.device.nickName,
@@ -1085,6 +1099,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         assert self._mqtt_client is not None
         self._key = key
         _LOGGER.debug("%s: Sending command: %s", self.device.nickName, key)
+
         await self.loop.run_in_executor(None, self._mqtt_client.get_cloud_client().send_cloud_command, self.iot_id, command)
         future = MammotionFuture()
         self._waiting_queue.append(future)
@@ -1132,7 +1147,10 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             _LOGGER.debug("Thing event received")
             event = ThingEventMessage.from_dicts(payload)
             params = event.params
-            if params.identifier == "device_protobuf_msg_event":
+            if isinstance(params, str):
+                _LOGGER.debug("config event %s", str)
+                return
+            if params.identifier == "device_protobuf_msg_event" and params.thingType == "thing.events":
                 _LOGGER.debug("Protobuf event")
                 binary_data = base64.b64decode(params.value.get("content", ""))
                 self._update_raw_data(cast(bytes, binary_data))
@@ -1153,6 +1171,8 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
                     if not fut.fut.cancelled():
                         fut.resolve(cast(bytes, binary_data))
                 await self._state_manager.notification(new_msg)
+            if params.thingType == "thing.properties":
+                _LOGGER.debug(event)
 
     async def _handle_mqtt_message(self, topic: str, payload: dict) -> None:
         """Async handler for incoming MQTT messages."""
@@ -1163,3 +1183,4 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         self._mqtt_client.disconnect()
 
 
+

pymammotion/mqtt/mammotion_mqtt.py

@@ -70,7 +70,7 @@ class MammotionMQTT:
             username=self._mqtt_username,
         )
 
-        self._linkkit_client.enable_logger(level=logging.DEBUG)
+        self._linkkit_client.enable_logger(level=logging.ERROR)
         self._linkkit_client.on_connect = self._thing_on_connect
         self._linkkit_client.on_disconnect = self._on_disconnect
         self._linkkit_client.on_thing_enable = self._thing_on_thing_enable

{pymammotion-0.2.12.dist-info → pymammotion-0.2.14.dist-info}/METADATA

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

{pymammotion-0.2.12.dist-info → pymammotion-0.2.14.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=IqmxgjDIgRoZvJvQnwYGOSl4XaCV4MoMKTlfhC9-6Ys,21830
+pymammotion/aliyun/cloud_gateway.py,sha256=FCQzc24PHAhdO0rovTNv1yax4fG60CsLK24CxJikP5Y,21856
 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
@@ -35,7 +35,7 @@ pymammotion/data/model/rapid_state.py,sha256=_e9M-65AbkvIqXyMYzLKBxbNvpso42qD8R-
 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=7hq-dl-HdKJB-TQ2kKfYfrebR_8qWE_lF2nQLlPyphU,3437
+pymammotion/data/mqtt/event.py,sha256=j2bo__p7ROPPeiBH-74YyOAOMV7tlYYfl30nnZ81XgQ,3567
 pymammotion/data/mqtt/properties.py,sha256=HkBPghr26L9_b4QaOi1DtPgb0UoPIOGSe9wb3kgnM6Y,2815
 pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
 pymammotion/data/state_manager.py,sha256=mNIAhP8f1Cb6-wFm2R5e-NlZauj-71iDGz8oZvdTq3Y,2826
@@ -58,10 +58,10 @@ pymammotion/mammotion/commands/messages/video.py,sha256=_8lJsU4sLm2CGnc7RDkueA0A
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=EWV20MMzQuhbLlNlXbsyZKSEpeM7x1CQL7saU4Pn0-g,6165
 pymammotion/mammotion/devices/__init__.py,sha256=T72jt0ejtMjo1rPmn_FeMF3pmp0LLeRRpc9WcDKEYYY,126
-pymammotion/mammotion/devices/mammotion.py,sha256=oYInls6l_DjGU0VwXersSpqJtXDrH6yObcQb3V_f8oc,47043
+pymammotion/mammotion/devices/mammotion.py,sha256=Mml0L_eGUbLzJtQ97xThDpYzDhoaT6oDY9rHo8riAJ8,47868
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/mammotion_future.py,sha256=WKnHqeHiS2Ut-SaDBNOxqh1jDLeTiyLTsJ7PNUexrjk,687
-pymammotion/mqtt/mammotion_mqtt.py,sha256=K9TokiQWYJloWu5Hom00g7cfGhWHDSWqbcU9AqW4C9Q,8071
+pymammotion/mqtt/mammotion_mqtt.py,sha256=7V0JW2N9dshUJAGlg6d6Y5LKWYoXvlQd0o-9l6idPNg,8071
 pymammotion/proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/proto/basestation.proto,sha256=_x5gAz3FkZXS1jtq4GgZgaDCuRU-UV-7HTFdsfQ3zbo,1034
 pymammotion/proto/basestation.py,sha256=js64_N2xQYRxWPRdVNEapO0qe7vBlfYnjW5sE8hi7hw,2026
@@ -111,7 +111,7 @@ pymammotion/utility/device_type.py,sha256=KYawu2glZMVlPmxRbA4kVFujXz3miHp3rJiOWR
 pymammotion/utility/map.py,sha256=aoi-Luzuph02hKynTofMoq3mnPstanx75MDAVv49CuY,2211
 pymammotion/utility/periodic.py,sha256=9wJMfwXPlx6Mbp3Fws7LLTI34ZDKphH1bva_Ggyk32g,3281
 pymammotion/utility/rocker_util.py,sha256=syPL0QN4zMzHiTIkUKS7RXBBptjdbkfNlPddwUD5V3A,7171
-pymammotion-0.2.12.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.12.dist-info/METADATA,sha256=1Mvxd071W8iz9hB4GG7VodeeUqHFslb-0p4l7dL4-IA,3969
-pymammotion-0.2.12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.12.dist-info/RECORD,,
+pymammotion-0.2.14.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.14.dist-info/METADATA,sha256=mdcQH7AqMEKODoyghFU8tjC6Pw13xv6MK8QQCP_sXh4,3969
+pymammotion-0.2.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.14.dist-info/RECORD,,