pymammotion 0.2.19__py3-none-any.whl → 0.2.21__py3-none-any.whl

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

@@ -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.dist-info → pymammotion-0.2.21.dist-info}/RECORD

@@ -42,7 +42,7 @@ pymammotion/data/state_manager.py,sha256=jkedK5qAVDTGqIzlPNCmPpE-Pc1V4e-ZHW6Ds1i
 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
-pymammotion/http/http.py,sha256=is0PNnglB4hdOMxLi1w5nyOrz3i4N3_jk0XzF_BbAZY,2346
+pymammotion/http/http.py,sha256=izNb6BPy1qB-CXOWXkV8YhhpDQY3QdRVDIt3onQ7FX0,2406
 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=nw6r7694yzl7iJKqRqhLmAPRjd_TL_Xo_-JXq2_a_ug,222
@@ -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.19.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-pymammotion-0.2.19.dist-info/METADATA,sha256=OAYBonVzuROxFpjnN4-v7Ny1iZhc3HJMvcU_GSYXYvY,3969
-pymammotion-0.2.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-pymammotion-0.2.19.dist-info/RECORD,,
+pymammotion-0.2.21.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymammotion-0.2.21.dist-info/METADATA,sha256=GhYka3lZNszqjDllgK7DLJ184QnNH6ZMvsPguG2WxBo,3969
+pymammotion-0.2.21.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+pymammotion-0.2.21.dist-info/RECORD,,