pymammotion 0.2.18__py3-none-any.whl → 0.2.20__py3-none-any.whl

pymammotion/data/mqtt/event.py

@@ -130,6 +130,6 @@ class ThingEventMessage(DataClassORJSONMixin):
         elif identifier == "device_config_req_event":
             params_obj = payload.get("params", '')
         else:
-            raise ValueError(f"Unknown identifier: {identifier}")
+            raise ValueError(f"Unknown identifier: {identifier} {params_dict}")
 
         return cls(method=method, id=event_id, params=params_obj, version=version)

pymammotion/http/http.py

@@ -18,9 +18,9 @@ DataT = TypeVar("DataT")
 
 @dataclass
 class Response(DataClassDictMixin, Generic[DataT]):
-    data: DataT
     code: int
     msg: str
+    data: DataT | None = None
 
 
 @dataclass
@@ -64,11 +64,12 @@ class MammotionHTTP:
                 grant_type="password",
             ),
         ) as resp:
-            data = await resp.json()
-            # 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"])
+            if resp.status == 200:
+                data = await resp.json()
+                response = Response.from_dict(data)
+                # TODO catch errors from mismatch user / password elsewhere
+                # Assuming the data format matches the expected structure
+                return response
 
 
 async def connect_http(username: str, password: str) -> MammotionHTTP:

pymammotion/mammotion/devices/mammotion.py

@@ -1071,6 +1071,12 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
 
     async def _send_command_locked(self, key: str, command: bytes) -> bytes:
         """Send command to device and read response."""
+        if not self._mqtt_client.is_connected:
+            loop = asyncio.get_running_loop()
+            await loop.run_in_executor(None, self._mqtt_client.connect_async)
+
+            if not self._mqtt_client.is_connected:
+                raise Exception("MQTT not connected, couldn't recover")
         try:
             return await self._execute_command_locked(key, command)
         except DeviceOfflineException as ex:
@@ -1106,7 +1112,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
         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)
-        timeout = 20
+        timeout = 5
         try:
             notify_msg = await future.async_get(timeout)
         except asyncio.TimeoutError:

{pymammotion-0.2.18.dist-info → pymammotion-0.2.20.dist-info}/METADATA

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

{pymammotion-0.2.18.dist-info → pymammotion-0.2.20.dist-info}/RECORD

@@ -35,14 +35,14 @@ 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=ywlMEMVapuV-h6WE_miBq7lE10kcZBiNBJ3Taq2UP3k,3886
+pymammotion/data/mqtt/event.py,sha256=QkuFQtSUfg8eHisJ-llu-b6cpAlTePaP0JbqL6xZcvk,3900
 pymammotion/data/mqtt/properties.py,sha256=HkBPghr26L9_b4QaOi1DtPgb0UoPIOGSe9wb3kgnM6Y,2815
 pymammotion/data/mqtt/status.py,sha256=zqnlo-MzejEQZszl0i0Wucoc3E76x6UtI9JLxoBnu54,1067
 pymammotion/data/state_manager.py,sha256=jkedK5qAVDTGqIzlPNCmPpE-Pc1V4e-ZHW6Ds1ihJ50,3004
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=Fy5-I1p92AO_D67VW4eHQqA4pOt7MZsrP--tVfIVUz8,1820
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymammotion/http/http.py,sha256=is0PNnglB4hdOMxLi1w5nyOrz3i4N3_jk0XzF_BbAZY,2346
+pymammotion/http/http.py,sha256=gY23HlrJKYhliZf4FJHIchJuxSUs-LvxyICkgRIG1qU,2335
 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
@@ -58,7 +58,7 @@ 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=vPRVIV82c6Q25GHAG98kLihuPdwGgKJzPh9Kz4AGLqU,47945
+pymammotion/mammotion/devices/mammotion.py,sha256=eZxYo4GWomEaSQNAm_kapE64nyjADj72vwsXmIkdidI,48239
 pymammotion/mqtt/__init__.py,sha256=Ocs5e-HLJvTuDpVXyECEsWIvwsUaxzj7lZ9mSYutNDY,105
 pymammotion/mqtt/mammotion_future.py,sha256=WKnHqeHiS2Ut-SaDBNOxqh1jDLeTiyLTsJ7PNUexrjk,687
 pymammotion/mqtt/mammotion_mqtt.py,sha256=7V0JW2N9dshUJAGlg6d6Y5LKWYoXvlQd0o-9l6idPNg,8071
@@ -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.18.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.18.dist-info/METADATA,sha256=i4YzclEryvuMkLzPWQQC54c1gSgT2sWN2svPJKfyq04,3969
-pymammotion-0.2.18.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.18.dist-info/RECORD,,
+pymammotion-0.2.20.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.20.dist-info/METADATA,sha256=4x-B6uLX-AuU0YEfQF5b9PgTNGPsMVRppLj4BfXi8lo,3969
+pymammotion-0.2.20.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.20.dist-info/RECORD,,