pymammotion 0.2.18__tar.gz → 0.2.20__tar.gz

{pymammotion-0.2.18 → pymammotion-0.2.20}/PKG-INFO

@@ -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 → pymammotion-0.2.20}/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-0.2.18 → pymammotion-0.2.20}/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-0.2.18 → pymammotion-0.2.20}/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 → pymammotion-0.2.20}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.18"
+version     = "0.2.20"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.18"
+version     = "0.2.20"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -53,7 +53,7 @@ mypy = "^1.10.0"
 pre-commit = "^3.7.1"
 
 [tool.bumpver]
-current_version = "0.2.17"
+current_version = "0.2.20"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true