pymammotion 0.2.15__py3-none-any.whl → 0.2.17__py3-none-any.whl

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/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/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.dist-info → pymammotion-0.2.17.dist-info}/METADATA

@@ -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.dist-info → pymammotion-0.2.17.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=FCQzc24PHAhdO0rovTNv1yax4fG60CsLK24CxJikP5Y,21856
+pymammotion/aliyun/cloud_gateway.py,sha256=RzlfDGzhaIZcu6o8gzGbSJGiQ3al73jTp3dNb6mqZrk,22221
 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
@@ -38,7 +38,7 @@ pymammotion/data/mqtt/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdr
 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
+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
@@ -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=Mml0L_eGUbLzJtQ97xThDpYzDhoaT6oDY9rHo8riAJ8,47868
+pymammotion/mammotion/devices/mammotion.py,sha256=6icsKV066SX-4QPVD1IF3LXhJf_fGv8CtDDuDyOF29U,47997
 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.15.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.15.dist-info/METADATA,sha256=aep84UH19vOBx8r-xrONsANEUg9IeBOu3Fb4k42VoT8,3969
-pymammotion-0.2.15.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.15.dist-info/RECORD,,
+pymammotion-0.2.17.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.17.dist-info/METADATA,sha256=Pu-S4POuRuUcvi7fOiAROoc8QwzxZmIVwoV-g8EO16M,3969
+pymammotion-0.2.17.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.17.dist-info/RECORD,,