pymammotion 0.5.28__py3-none-any.whl → 0.5.30__py3-none-any.whl

pymammotion/http/http.py

@@ -26,6 +26,11 @@ class MammotionHTTP:
     def generate_headers(token: str) -> dict:
         return {"Authorization": f"Bearer {token}"}
 
+    async def handle_expiry(self, resp: Response) -> Response:
+        if resp.code == 401:
+            return await self.login(self.account, self._password)
+        return resp
+
     async def login_by_email(self, email: str, password: str) -> Response[LoginResponseData]:
         return await self.login(email, password)
 
@@ -54,11 +59,37 @@ class MammotionHTTP:
 
         Returns 401 if token is invalid. We then need to re-authenticate, can try to refresh token first
         """
-        async with ClientSession(MAMMOTION_API_DOMAIN) as session:
-            async with session.post("/user-server/v1/user/oauth/check", headers=self._headers) as resp:
+        async with ClientSession(MAMMOTION_DOMAIN) as session:
+            async with session.post(
+                "/user-server/v1/user/oauth/check",
+                headers={
+                    **self._headers,
+                    "Authorization": f"Bearer {self.login_info.access_token}",
+                    "Content-Type": "application/json",
+                    "User-Agent": "okhttp/4.9.3",
+                },
+            ) as resp:
                 data = await resp.json()
                 return Response.from_dict(data)
 
+    async def refresh_token(self) -> Response:
+        """Refresh token."""
+        async with ClientSession(MAMMOTION_DOMAIN) as session:
+            async with session.post(
+                "/authorization/code",
+                headers={
+                    **self._headers,
+                    "Authorization": f"Bearer {self.login_info.access_token}",
+                    "Content-Type": "application/json",
+                    "User-Agent": "okhttp/4.9.3",
+                },
+                json={"clientId": MAMMOTION_CLIENT_ID},
+            ) as resp:
+                data = await resp.json()
+
+                self.login_info.authorization_code = data["data"].get("code", self.login_info.authorization_code)
+                return Response.from_dict(data)
+
     async def pair_devices_mqtt(self, mower_name: str, rtk_name: str) -> Response:
         async with ClientSession(MAMMOTION_API_DOMAIN) as session:
             async with session.post(
@@ -72,6 +103,7 @@ class MammotionHTTP:
                     return Response.from_dict(data)
                 else:
                     print(data)
+                    return Response.from_dict(data)
 
     async def unpair_devices_mqtt(self, mower_name: str, rtk_name: str) -> Response:
         async with ClientSession(MAMMOTION_API_DOMAIN) as session:
@@ -86,6 +118,7 @@ class MammotionHTTP:
                     return Response.from_dict(data)
                 else:
                     print(data)
+                    return Response.from_dict(data)
 
     async def net_rtk_enable(self, device_id: str) -> Response:
         async with ClientSession(MAMMOTION_API_DOMAIN) as session:
@@ -98,6 +131,7 @@ class MammotionHTTP:
                     return Response.from_dict(data)
                 else:
                     print(data)
+                    return Response.from_dict(data)
 
     async def get_stream_subscription(self, iot_id: str) -> Response[StreamSubscriptionResponse]:
         """Fetches stream subscription data from agora.io for a given IoT device."""
@@ -116,6 +150,7 @@ class MammotionHTTP:
                 # TODO catch errors from mismatch like token expire etc
                 # Assuming the data format matches the expected structure
                 response = Response[StreamSubscriptionResponse].from_dict(data)
+                await self.handle_expiry(response)
                 if response.code != 0:
                     return response
                 response.data = StreamSubscriptionResponse.from_dict(data.get("data", {}))
@@ -231,6 +266,9 @@ class MammotionHTTP:
             self._password = password
         if self._password is None:
             raise ValueError("Password is required for refresh login")
+        res = await self.refresh_token()
+        if res.code == 0:
+            return res
         return await self.login(account, self._password)
 
     async def login(self, account: str, password: str) -> Response[LoginResponseData]:

pymammotion/mammotion/commands/mammotion_command.py

@@ -30,6 +30,20 @@ class MammotionCommand(
             return self.allpowerfull_rw_adapter_x3(rw_id, context, rw)
         return self.allpowerfull_rw(rw_id, context, rw)
 
+    def traverse_mode(self, context: int) -> bytes:
+        """Sets the traversal mode back to charger."""
+        # setReChargeMode
+        # 0 direct
+        # 1 follow the perimeter
+        return self.read_write_device(7, context, 1)
+
+    def turning_mode(self, context: int) -> bytes:
+        """Sets the traversal mode back to charger."""
+        # setTurnAroundMode
+        # 0 zero turn
+        # 1 multipoint turn
+        return self.read_write_device(6, context, 1)
+
     def get_device_product_key(self) -> str:
         return self._product_key
 

pymammotion/mammotion/commands/messages/system.py

@@ -119,20 +119,6 @@ class MessageSystem(AbstractMessage, ABC):
         logger.debug(f"Send command - 9 general read and write command id={rw_id}, context={context}, rw={rw}")
         return self.send_order_msg_sys(build)
 
-    def traverse_mode(self, context: int) -> bytes:
-        """Sets the traversal mode back to charger."""
-        # setReChargeMode
-        # 0 direct
-        # 1 follow the perimeter
-        return self.allpowerfull_rw(7, context, 1)
-
-    def turning_mode(self, context: int) -> bytes:
-        """Sets the traversal mode back to charger."""
-        # setTurnAroundMode
-        # 0 zero turn
-        # 1 multipoint turn
-        return self.allpowerfull_rw(6, context, 1)
-
     # Commented out as not needed and too many refs to try fix up
     # def factory_test_order(self, test_id: int, test_duration: int, expect: str):
     #     new_builder = mow_to_app_qctools_info_t.Builder()

pymammotion/mammotion/devices/base.py

@@ -210,7 +210,7 @@ class MammotionBaseDevice:
         await self.queue_command("get_device_product_model")
         await self.queue_command("get_report_cfg")
         """RTK and dock location."""
-        await self.queue_command("allpowerfull_rw", rw_id=5, context=1, rw=1)
+        await self.queue_command("read_write_device", rw_id=5, context=1, rw=1)
         await self.async_read_settings()
 
     async def start_map_sync(self) -> None:
@@ -261,13 +261,13 @@ class MammotionBaseDevice:
     async def async_read_settings(self) -> None:
         """Read settings from device."""
         # no cutting in rain nav_sys_param_cmd (id 3 context 1/0)
-        await self.queue_command("allpowerfull_rw", rw_id=3, context=1, rw=0)
+        await self.queue_command("read_write_device", rw_id=3, context=1, rw=0)
         # ??
-        await self.queue_command("allpowerfull_rw", rw_id=4, context=1, rw=0)
+        await self.queue_command("read_write_device", rw_id=4, context=1, rw=0)
         # turning mode nav_sys_param_cmd (id 6, context 1/0)
-        await self.queue_command("allpowerfull_rw", rw_id=6, context=1, rw=0)
+        await self.queue_command("read_write_device", rw_id=6, context=1, rw=0)
         # traversal mode
-        await self.queue_command("allpowerfull_rw", rw_id=7, context=1, rw=0)
+        await self.queue_command("read_write_device", rw_id=7, context=1, rw=0)
 
         await self.queue_command("read_and_set_sidelight", is_sidelight=True, operate=1)
 
@@ -275,8 +275,8 @@ class MammotionBaseDevice:
 
     async def async_get_errors(self) -> None:
         """Error codes."""
-        await self.queue_command("allpowerfull_rw", rw_id=5, rw=1, context=2)
-        await self.queue_command("allpowerfull_rw", rw_id=5, rw=1, context=3)
+        await self.queue_command("read_write_device", rw_id=5, rw=1, context=2)
+        await self.queue_command("read_write_device", rw_id=5, rw=1, context=3)
 
     async def command(self, key: str, **kwargs):
         """Send a command to the device."""

{pymammotion-0.5.28.dist-info → pymammotion-0.5.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.5.28
+Version: 0.5.30
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur
@@ -21,6 +21,7 @@ Requires-Dist: bleak (>=0.21.0)
 Requires-Dist: bleak-retry-connector (>=3.5.0)
 Requires-Dist: crcmod (>=1.7,<2.0)
 Requires-Dist: cryptography (>=43.0.1)
+Requires-Dist: grpclib (>=0.4.8,<0.5.0)
 Requires-Dist: jsonic (>=1.0.0,<2.0.0)
 Requires-Dist: mashumaro (>=3.13,<4.0)
 Requires-Dist: numpy (>=1.26.0)

{pymammotion-0.5.28.dist-info → pymammotion-0.5.30.dist-info}/RECORD

@@ -53,7 +53,7 @@ pymammotion/event/event.py,sha256=Z8WYxv_-5khEqKjL1w4c_Et24G1Kdm8QFuIBylD3h3U,30
 pymammotion/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/encryption.py,sha256=lzXu3WwBdQlzjXxWnlJuRgkCrKdPbxx5drhMitVKIEk,8287
-pymammotion/http/http.py,sha256=a-EGTagL2wAdTYbDpQSoRciCdGoWky6Qbrl2U5XOXVg,13157
+pymammotion/http/http.py,sha256=K30JryDOmxmqUfAmvVchhemKKe_E5lr0XMifbzW9XMs,14670
 pymammotion/http/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/http/model/camera_stream.py,sha256=ilxQNny_w9Frwt-m8kbHinvyjDv4Bx8C2swfZ2lTEDE,600
 pymammotion/http/model/http.py,sha256=VDBmi9nyY5Y2ns_HYvKIyzbkKRxhZ5elpq0lWXWzbGw,4123
@@ -62,7 +62,7 @@ pymammotion/http/model/rtk.py,sha256=pR2mi6_Y8oTPlqDXWLk7oaUqmcgcrBQ0f3MJdC0_CUg
 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=M4qL-Yw5g3fTgS9jB9LUSgJSAqpUf7MME-2mfv471Sk,808
-pymammotion/mammotion/commands/mammotion_command.py,sha256=AMOx6nEbPa0HijbENomPLLuJummS1q-23BzgetBAuOI,2991
+pymammotion/mammotion/commands/mammotion_command.py,sha256=-TOdikRS0x9gCpXmBZblzKoOd4Zy1zODGiA5KoF0OCc,3468
 pymammotion/mammotion/commands/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/messages/basestation.py,sha256=a1LEF4C25ynILeQLx-FOOU4d-N_vMkXSh_etojJjIDM,1442
 pymammotion/mammotion/commands/messages/driver.py,sha256=tJUM1WhlWFs92PbZW5QSG-TMo6nemAUkcUDzI_6gETU,4695
@@ -70,12 +70,12 @@ pymammotion/mammotion/commands/messages/media.py,sha256=KJyMzSZkwQrHWjAWfAI88Y7-
 pymammotion/mammotion/commands/messages/navigation.py,sha256=yI-B5HHGuZJXn9iYrxhYZ5BArde6wB_j9bUc5IcSIJE,23261
 pymammotion/mammotion/commands/messages/network.py,sha256=7K6aqt29ymTSUG0iEv4kIRD0Dv6rfHNctE00UvuMpG4,7264
 pymammotion/mammotion/commands/messages/ota.py,sha256=Nk3Tlp6n7hkbkuy355BlqbozHIHzsYnrH2cDO8QGaLk,1446
-pymammotion/mammotion/commands/messages/system.py,sha256=620kzRgX_ee9ATRgxQ1fwog4hN_-ijGNxGUH-wwlIIU,13816
+pymammotion/mammotion/commands/messages/system.py,sha256=1Xchdx7Y0-kbrM-knSEUhwELu9PyF7DjtsCFt7_BCXw,13343
 pymammotion/mammotion/commands/messages/video.py,sha256=5D5Azt6Q63K-OeC2eSPmmrGgFLmGIi21jPuESCYVgnE,1296
 pymammotion/mammotion/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/control/joystick.py,sha256=QfBVxM_gxpWsZAGO90whtgxCI2tIZ3TTad9wHIPsU9s,5640
 pymammotion/mammotion/devices/__init__.py,sha256=f2qQFPgLGmV85W2hSlMUh5BYuht9o_Ar_JEAAMD4fsE,102
-pymammotion/mammotion/devices/base.py,sha256=-AYurMM70CFxrtm-YelttYAWdOGta4p4Cxg_5eD5cXY,12051
+pymammotion/mammotion/devices/base.py,sha256=3-7-xZLgs4xXWRt9vDDgfv7Rlno7Ce6LolPDXLaV4GI,12065
 pymammotion/mammotion/devices/mammotion.py,sha256=uk0mM6JSOzr84qkf8lECvlmTLX0UEQDXyowSeHZydek,15801
 pymammotion/mammotion/devices/mammotion_bluetooth.py,sha256=lVqGice3fv-Xura10PuWUCMdtNXf84gtf3S1STw2hr4,19345
 pymammotion/mammotion/devices/mammotion_cloud.py,sha256=ligdszu1KsHe0b0ZyyIibN_uXpxoSNp7ytNmsumidHY,16489
@@ -130,7 +130,7 @@ pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tp
 pymammotion/utility/mur_mur_hash.py,sha256=xEfOZVbqRawJj66eLgtnZ85OauDR47oIPr29OHelzPI,4468
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.5.28.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.5.28.dist-info/METADATA,sha256=0LkGDYjPd8jt78p1jzAj6zkJoqgF1STchdjs39wMCns,3872
-pymammotion-0.5.28.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pymammotion-0.5.28.dist-info/RECORD,,
+pymammotion-0.5.30.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.5.30.dist-info/METADATA,sha256=wG2W00B9kT2MCxiKPbKgu08ostwFfNmyD_ycfBS5TJ0,3912
+pymammotion-0.5.30.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pymammotion-0.5.30.dist-info/RECORD,,