pymammotion 0.2.15__tar.gz → 0.2.17__tar.gz

{pymammotion-0.2.15 → pymammotion-0.2.17}/PKG-INFO

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

{pymammotion-0.2.15 → pymammotion-0.2.17}/pymammotion/aliyun/cloud_gateway.py

@@ -55,6 +55,8 @@ class AuthRefreshException(Exception):
 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."""
@@ -303,8 +305,11 @@ class CloudIOTGateway:
                 params={"request": json.dumps(_bodyParam, separators=(",", ":"))},
             ) as resp:
                 data = await resp.json()
-                self._connect_response = ConnectResponse.from_dict(data)
                 logger.debug(data)
+                if resp.status == 200:
+                    self._connect_response = ConnectResponse.from_dict(data)
+                    return self._connect_response
+                raise LoginException(data)
 
     async def login_by_oauth(self, country_code: str, auth_code: str):
         """Login by OAuth."""
@@ -372,8 +377,10 @@ class CloudIOTGateway:
             ) as resp:
                 data = await resp.json()
                 logger.debug(data)
-
-                self._login_by_oauth_response = LoginByOAuthResponse.from_dict(data)
+                if resp.status == 200:
+                    self._login_by_oauth_response = LoginByOAuthResponse.from_dict(data)
+                    return self._login_by_oauth_response
+                raise LoginException(data)
 
     def session_by_auth_code(self):
         """Create a session by auth code."""

{pymammotion-0.2.15 → pymammotion-0.2.17}/pymammotion/data/state_manager.py

@@ -17,6 +17,7 @@ class StateManager:
         self._device = device
         self.gethash_ack_callback: Optional[Callable[[NavGetHashListAck],Awaitable[None]]] = None
         self.get_commondata_ack_callback: Optional[Callable[[NavGetCommDataAck],Awaitable[None]]] = None
+        self.on_notification_callback: Optional[Callable[[],Awaitable[None]]] = None
 
     def get_device(self) -> MowingDevice:
         """Get device."""
@@ -44,6 +45,9 @@ class StateManager:
             case "ota":
                 self._update_ota_data(message)
 
+        if self.on_notification_callback:
+            await self.on_notification_callback()
+
     async def _update_nav_data(self, message):
         """Update nav data."""
         nav_msg = betterproto.which_one_of(message.nav, "SubNavMsg")

{pymammotion-0.2.15 → pymammotion-0.2.17}/pymammotion/mammotion/devices/mammotion.py

@@ -346,6 +346,9 @@ class MammotionBaseDevice:
         self._notify_future: asyncio.Future[bytes] | None = None
         self._cloud_device = cloud_device
 
+    def set_notifiction_callback(self, func: Callable[[],Awaitable[None]]):
+        self._state_manager.on_notification_callback = func
+
     async def datahash_response(self, hash_ack: NavGetHashListAck):
         """Handle datahash responses."""
         result_hash = 0
@@ -1150,7 +1153,7 @@ class MammotionBaseCloudDevice(MammotionBaseDevice):
             if isinstance(params, str):
                 _LOGGER.debug("config event %s", str)
                 return
-            if params.identifier == "device_protobuf_msg_event" and params.thingType == "thing.events":
+            if params.identifier == "device_protobuf_msg_event" and event.method == "thing.events":
                 _LOGGER.debug("Protobuf event")
                 binary_data = base64.b64decode(params.value.get("content", ""))
                 self._update_raw_data(cast(bytes, binary_data))
@@ -1171,7 +1174,7 @@ 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":
+            if event.method == "thing.properties":
                 _LOGGER.debug(event)
 
     async def _handle_mqtt_message(self, topic: str, payload: dict) -> None:

{pymammotion-0.2.15 → pymammotion-0.2.17}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.15"
+version     = "0.2.17"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.15"
+version     = "0.2.17"
 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.15"
+current_version = "0.2.17"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true