pymammotion 0.2.95__py3-none-any.whl → 0.2.97__py3-none-any.whl

pymammotion/aliyun/cloud_gateway.py

@@ -700,7 +700,7 @@ class CloudIOTGateway:
     def devices_by_account_response(self):
         return self._devices_by_account_response
 
-    def set_http(self, mammotion_http) -> None:
+    def set_http(self, mammotion_http: MammotionHTTP) -> None:
         self.mammotion_http = mammotion_http
 
     @property

pymammotion/data/model/device.py

@@ -12,6 +12,7 @@ from pymammotion.data.model.device_info import MowerInfo
 from pymammotion.data.model.location import Location
 from pymammotion.data.model.report_info import ReportData
 from pymammotion.data.mqtt.properties import ThingPropertiesMessage
+from pymammotion.http.model.http import ErrorInfo
 from pymammotion.proto.dev_net import DevNet
 from pymammotion.proto.luba_msg import LubaMsg
 from pymammotion.proto.luba_mul import SocMul
@@ -45,6 +46,7 @@ class MowingDevice(DataClassORJSONMixin):
     err_code_list_time: Optional[list] = field(default_factory=list)
     limits: DeviceLimits = field(default_factory=DeviceLimits)
     device: Optional[LubaMsg] = field(default_factory=LubaMsg)
+    error_codes: dict[str, ErrorInfo] = field(default_factory=dict)
 
     @classmethod
     def from_raw(cls, raw: dict) -> "MowingDevice":

pymammotion/http/http.py

@@ -18,10 +18,11 @@ class MammotionHTTP:
         self._headers = dict()
         self.login_info = LoginResponseData.from_dict(response.data) if response.data else None
         self._headers["Authorization"] = f"Bearer {self.login_info.access_token}" if response.data else None
+        self.response = response
         self.msg = response.msg
         self.code = response.code
 
-    async def get_all_error_codes(self) -> list[ErrorInfo]:
+    async def get_all_error_codes(self) -> dict[str, ErrorInfo]:
         async with ClientSession(MAMMOTION_API_DOMAIN) as session:
             async with session.post(
                 "/user-server/v1/code/record/export-data",
@@ -29,9 +30,10 @@ class MammotionHTTP:
             ) as resp:
                 data = await resp.json()
                 reader = csv.DictReader(data.get("data", "").split("\n"), delimiter=",")
-                codes = []
+                codes = dict()
                 for row in reader:
-                    codes.append(ErrorInfo(**cast(dict, row)))
+                    error_info = ErrorInfo(**cast(dict, row))
+                    codes[error_info.code] = error_info
                 return codes
 
     async def oauth_check(self) -> None:
@@ -73,7 +75,7 @@ class MammotionHTTP:
             ),
         ) as resp:
             data = await resp.json()
-            response = Response.from_dict(data)
+            response = Response[LoginResponseData].from_dict(data)
             # TODO catch errors from mismatch user / password elsewhere
             # Assuming the data format matches the expected structure
             return response

pymammotion/utility/constant/device_constant.py

@@ -186,30 +186,29 @@ class SystemTardStateTunnel:
 
 
 class WorkMode:
-    MODE_BOUNDARY_JUMP = 38
-    MODE_CHANNEL_DRAW = 34
-    MODE_CHARGING = 15
-    MODE_DISABLE = 8
-    MODE_EDIT_BOUNDARY = 36
-    MODE_ERASER_DRAW = 35
-    MODE_INITIALIZATION = 10
-    MODE_JOB_DRAW = 31
-    MODE_LOCATION_ERROR = 37
-    MODE_LOCK = 17
-    MODE_MANUAL_MOWING = 20
     MODE_NOT_ACTIVE = 0
-    MODE_OBSTACLE_DRAW = 32
-    MODE_OFFLINE = 2
     MODE_ONLINE = 1
-    MODE_OTA_UPGRADE_FAIL = 23
-    MODE_PATH_MODIFICATION = 35
-    MODE_PAUSE = 19
+    MODE_OFFLINE = 2
+    MODE_DISABLE = 8
+    MODE_INITIALIZATION = 10
     MODE_READY = 11
+    MODE_WORKING = 13
     MODE_RETURNING = 14
-    MODE_SECOND_EDIT = 36
-    MODE_UPDATE_SUCCESS = 22
+    MODE_CHARGING = 15
     MODE_UPDATING = 16
-    MODE_WORKING = 13
+    MODE_LOCK = 17
+    MODE_PAUSE = 19
+    MODE_MANUAL_MOWING = 20
+    MODE_UPDATE_SUCCESS = 22
+    MODE_OTA_UPGRADE_FAIL = 23
+    MODE_JOB_DRAW = 31
+    MODE_OBSTACLE_DRAW = 32
+    MODE_CHANNEL_DRAW = 34
+    MODE_ERASER_DRAW = 35
+    MODE_EDIT_BOUNDARY = 36
+    MODE_LOCATION_ERROR = 37
+    MODE_BOUNDARY_JUMP = 38
+    MODE_CHARGING_PAUSE = 39
 
 
 def device_connection(value: int, mnet_type: str) -> str:
@@ -262,6 +261,7 @@ def device_mode(value: int) -> str:
         36: "MODE_EDIT_BOUNDARY",
         37: "MODE_LOCATION_ERROR",
         38: "MODE_BOUNDARY_JUMP",
+        39: "MODE_CHARGING_PAUSE",
     }
     return modes.get(value, "Invalid mode")
 
@@ -272,7 +272,7 @@ class PosType(IntEnum):
     AREA_BORDER_ON = 7
     AREA_INSIDE = 1
     AREA_OUT = 0
-    CHANNAL_AREA_OVERLAP = 9
+    CHANNEL_AREA_OVERLAP = 9
     CHANNEL_ON = 3
     CHARGE_ON = 5
     DUMPING_AREA_INSIDE = 8

{pymammotion-0.2.95.dist-info → pymammotion-0.2.97.dist-info}/METADATA

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

{pymammotion-0.2.95.dist-info → pymammotion-0.2.97.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pymammotion/__init__.py,sha256=BcwrItywpSECTxrTPwEuBExi_ekOrG2M2tbphuotIlE,1617
 pymammotion/aliyun/__init__.py,sha256=T1lkX7TRYiL4nqYanG4l4MImV-SlavSbuooC-W-uUGw,29
-pymammotion/aliyun/cloud_gateway.py,sha256=NDrDFEI86I-fv2wJL2PWsYXbty4SrltGBRh3_Ykpw5o,25769
+pymammotion/aliyun/cloud_gateway.py,sha256=k3gh0-YSTjMUhHoG38YWx5-GjlAIkDWf4YvrPDz-ef4,25784
 pymammotion/aliyun/cloud_service.py,sha256=px7dUKow5Z7VyebjYzuKkzkm77XbUXYiFiYO_2e-UQ0,2207
 pymammotion/aliyun/model/aep_response.py,sha256=8f6GIP58ve8gd6AL3HBoXxsy0n2q4ygWvjELGnoOnVc,452
 pymammotion/aliyun/model/connect_response.py,sha256=Yz-fEbDzgGPTo5Of2oAjmFkSv08T7ze80pQU4k-gKIU,824
@@ -22,7 +22,7 @@ pymammotion/const.py,sha256=lWRxvTVdXnNHuxqvRkjO5ziK0Ic-fZMM6J2dbe5M6Nc,385
 pymammotion/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/data/model/__init__.py,sha256=aSyroxYQQS-WMRi6WmWm2js4wLa9nmsi160gx9tts4o,323
 pymammotion/data/model/account.py,sha256=vJM-KTf2q6eBfVC-UlNHBSmJvqHiCawZ40vnuhXhaz8,140
-pymammotion/data/model/device.py,sha256=uta1BzfCIKd7Z0naw7JcEGy273yMdcAJ7pjidfpGhKQ,12315
+pymammotion/data/model/device.py,sha256=GQH9pNPcqb4zdl55r8dYIHgvXlwdA8k3xHwMVzNalys,12433
 pymammotion/data/model/device_config.py,sha256=b3zmArKg10NIheNGSugwWruLM_H4ySBlQxDgXAiB2es,2852
 pymammotion/data/model/device_info.py,sha256=ahz2xILdSYdX6SIVuVzz8QCfSQLefbQnpXrsiDpBDbY,585
 pymammotion/data/model/enums.py,sha256=EpKmO8yVUZyEnTY4yH0DMMVKYNQM42zpW1maUu0i3IE,1582
@@ -44,7 +44,7 @@ pymammotion/data/state_manager.py,sha256=vtBT28-5DY58hJMi_kqOUKnOq6rJ4fx1zX8yU7N
 pymammotion/event/__init__.py,sha256=mgATR6vPHACNQ-0zH5fi7NdzeTCDV1CZyaWPmtUusi8,115
 pymammotion/event/event.py,sha256=bj2RirSIRyBs0QvkcrOtwZWUX_8F3m1sySuHVyKmZLs,2143
 pymammotion/http/_init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymammotion/http/http.py,sha256=9TnVah-R8nkjlb6oCMk78IZ0Y-2iAcMyIdjcQ54GEPk,3562
+pymammotion/http/http.py,sha256=uPa6NeBKGbgw9FBIRfuSmFtp0nhsnK0NPtR1EBOkeEM,3678
 pymammotion/http/model/http.py,sha256=_hHqe9IfKDukUYKQDrZb_Tt_9rd5BNN1WKsaGIjsexM,1876
 pymammotion/mammotion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/mammotion/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -111,7 +111,7 @@ pymammotion/proto/mctrl_sys_pb2.py,sha256=DYemb514mlC7c27t-k1YqqBif0xxhLmnIWk8rX
 pymammotion/proto/mctrl_sys_pb2.pyi,sha256=Dj_1UM86kZ5MfcVyNC76Z0gKrfl5YFsVWP2b-bKoZvk,38912
 pymammotion/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymammotion/utility/constant/__init__.py,sha256=tcY0LDeD-qDDHx2LKt55KOyv9ZI0UfCNM6fknLCmm8s,110
-pymammotion/utility/constant/device_constant.py,sha256=jVlqlhnl86ZZh4D8FBz9zyc0VQRy1wNKFLQ5PrNosOw,7374
+pymammotion/utility/constant/device_constant.py,sha256=frRk_ie9-D7963NRQXfG_GusoVBQrW0Mb6Gziu7_09k,7380
 pymammotion/utility/conversions.py,sha256=v3YICy0zZwwBBzrUZgabI7GRfiDBnkiAX2qdtk3NxOY,89
 pymammotion/utility/datatype_converter.py,sha256=SPM_HuaaD_XOawlqEnA8qlRRZXGba3WjA8kGOZgeBlQ,4284
 pymammotion/utility/device_type.py,sha256=xOgfIhOkzgcAtoKtlhlB1q8FpiKe1rVVV5BvN7K7zYc,9433
@@ -119,7 +119,7 @@ pymammotion/utility/map.py,sha256=GYscVMg2cX3IPlNpCBNHDW0S55yS1WGRf1iHnNZ7TfQ,22
 pymammotion/utility/movement.py,sha256=N75oAoAgFydqoaOedYIxGUHmuTCtPzAOtb-d_29tpfI,615
 pymammotion/utility/periodic.py,sha256=MbeSb9cfhxzYmdT_RiE0dZe3H9IfbQW_zSqhmSX2RUc,3321
 pymammotion/utility/rocker_util.py,sha256=6tX7sS87qoQC_tsxbx3NLL-HgS08wtzXiZkhDiz7uo0,7179
-pymammotion-0.2.95.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.95.dist-info/METADATA,sha256=EzIlLhR97_2ksA97O3pWjcNIWAXVnnErP0ZP-6GemcI,3896
-pymammotion-0.2.95.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.95.dist-info/RECORD,,
+pymammotion-0.2.97.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.97.dist-info/METADATA,sha256=8Gy8NdtB4I1lUX-eP4I0f6xb8i7rdWzGlsHSZ_WUyMg,3896
+pymammotion-0.2.97.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.97.dist-info/RECORD,,