pymammotion 0.2.14__tar.gz → 0.2.16__tar.gz

{pymammotion-0.2.14 → pymammotion-0.2.16}/PKG-INFO

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

{pymammotion-0.2.14 → pymammotion-0.2.16}/pymammotion/aliyun/cloud_gateway.py

@@ -55,6 +55,8 @@ class AuthRefreshException(Exception):
 class DeviceOfflineException(Exception):
     """Raise exception when device is offline."""
 
+class LoginException(Exception):
+    """Raise exception when library cannot log in."""
 
 class CloudIOTGateway:
     """Class for interacting with Aliyun Cloud IoT Gateway."""
@@ -303,8 +305,11 @@ class CloudIOTGateway:
                 params={"request": json.dumps(_bodyParam, separators=(",", ":"))},
             ) as resp:
                 data = await resp.json()
-                self._connect_response = ConnectResponse.from_dict(data)
                 logger.debug(data)
+                if resp.status == 200:
+                    self._connect_response = ConnectResponse.from_dict(data)
+                    return self._connect_response
+                raise LoginException(data)
 
     async def login_by_oauth(self, country_code: str, auth_code: str):
         """Login by OAuth."""
@@ -372,8 +377,10 @@ class CloudIOTGateway:
             ) as resp:
                 data = await resp.json()
                 logger.debug(data)
-
-                self._login_by_oauth_response = LoginByOAuthResponse.from_dict(data)
+                if resp.status == 200:
+                    self._login_by_oauth_response = LoginByOAuthResponse.from_dict(data)
+                    return self._login_by_oauth_response
+                raise LoginException(data)
 
     def session_by_auth_code(self):
         """Create a session by auth code."""

{pymammotion-0.2.14 → pymammotion-0.2.16}/pymammotion/proto/mctrl_sys.proto

@@ -196,7 +196,7 @@ message LoraCfgRsp {
   int32 result = 1;
   int32 op = 2;
   string cfg = 3;
-  string fac_cfg = 4;
+  bytes fac_cfg = 4;
 }
 
 message mod_fw_info {

{pymammotion-0.2.14 → pymammotion-0.2.16}/pymammotion/proto/mctrl_sys.py

@@ -312,7 +312,7 @@ class LoraCfgRsp(betterproto.Message):
     result: int = betterproto.int32_field(1)
     op: int = betterproto.int32_field(2)
     cfg: str = betterproto.string_field(3)
-    fac_cfg: str = betterproto.string_field(4)
+    fac_cfg: bytes = betterproto.bytes_field(4)
 
 
 @dataclass

{pymammotion-0.2.14 → pymammotion-0.2.16}/pymammotion/proto/mctrl_sys_pb2.pyi

@@ -82,7 +82,7 @@ class LoraCfgRsp(_message.Message):
     OP_FIELD_NUMBER: _ClassVar[int]
     RESULT_FIELD_NUMBER: _ClassVar[int]
     cfg: str
-    fac_cfg: str
+    fac_cfg: bytes
     op: int
     result: int
     def __init__(self, result: _Optional[int] = ..., op: _Optional[int] = ..., cfg: _Optional[str] = ..., fac_cfg: _Optional[str] = ...) -> None: ...

{pymammotion-0.2.14 → pymammotion-0.2.16}/pyproject.toml

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