pymammotion 0.2.19__tar.gz → 0.2.21__tar.gz

{pymammotion-0.2.19 → pymammotion-0.2.21}/PKG-INFO

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

{pymammotion-0.2.19 → pymammotion-0.2.21}/pymammotion/http/http.py

@@ -18,9 +18,9 @@ DataT = TypeVar("DataT")
 
 @dataclass
 class Response(DataClassDictMixin, Generic[DataT]):
-    data: DataT
     code: int
     msg: str
+    data: DataT | None = None
 
 
 @dataclass
@@ -47,10 +47,12 @@ class LoginResponseData(DataClassORJSONMixin):
 
 
 class MammotionHTTP:
-    def __init__(self, login: LoginResponseData):
+    def __init__(self, response: Response):
         self._headers = dict()
-        self._headers["Authorization"] = f"Bearer {login.access_token}"
-        self.login_info = login
+        self._headers["Authorization"] = f"Bearer {response.data.access_token}"
+        self.login_info = response.data
+        self.msg = response.msg
+        self.code = response.code
 
     @classmethod
     async def login(cls, session: ClientSession, username: str, password: str) -> Response[LoginResponseData]:
@@ -64,14 +66,15 @@ class MammotionHTTP:
                 grant_type="password",
             ),
         ) as resp:
-            data = await resp.json()
-            # TODO catch errors from mismatch user / password
-            # Assuming the data format matches the expected structure
-            login_response_data = LoginResponseData.from_dict(data["data"])
-            return Response(data=login_response_data, code=data["code"], msg=data["msg"])
+            if resp.status == 200:
+                data = await resp.json()
+                response = Response.from_dict(data)
+                # TODO catch errors from mismatch user / password elsewhere
+                # Assuming the data format matches the expected structure
+                return response
 
 
 async def connect_http(username: str, password: str) -> MammotionHTTP:
     async with ClientSession(MAMMOTION_DOMAIN) as session:
         login_response = await MammotionHTTP.login(session, username, password)
-        return MammotionHTTP(login_response.data)
+        return MammotionHTTP(login_response)

{pymammotion-0.2.19 → pymammotion-0.2.21}/pyproject.toml

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