pymammotion 0.2.95__tar.gz → 0.2.97__tar.gz

{pymammotion-0.2.95 → pymammotion-0.2.97}/PKG-INFO

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

@@ -1,10 +1,10 @@
 [project]
 name        = "pymammotion"
-version     = "0.2.95"
+version     = "0.2.97"
 
 [tool.poetry]
 name        = "pymammotion"
-version     = "0.2.95"
+version     = "0.2.97"
 license     = "GNU-3.0"
 description = ""
 readme      = "README.md"
@@ -61,7 +61,7 @@ mypy = "^1.11.2"
 autotyping = "^24.3.0"
 
 [tool.bumpver]
-current_version = "0.2.95"
+current_version = "0.2.97"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true