pymammotion 0.4.17__tar.gz → 0.4.19__tar.gz

{pymammotion-0.4.17 → pymammotion-0.4.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymammotion
-Version: 0.4.17
+Version: 0.4.19
 Summary: 
 License: GPL-3.0
 Author: Michael Arthur

pymammotion-0.4.19/pymammotion/aliyun/client.py

@@ -0,0 +1,231 @@
+import time
+
+from Tea.exceptions import UnretryableException
+from Tea.request import TeaRequest
+
+from pymammotion.aliyun.tea.core import TeaCore
+
+try:
+    from typing import Dict
+except ImportError:
+    pass
+
+from alibabacloud_apigateway_util.client import Client as APIGatewayUtilClient
+from alibabacloud_tea_util.client import Client as UtilClient
+
+
+class Client:
+    """test"""
+
+    _app_key = None  # type: str
+    _app_secret = None  # type: str
+    _protocol = None  # type: str
+    _user_agent = None  # type: str
+    _read_timeout = None  # type: int
+    _connect_timeout = None  # type: int
+    _http_proxy = None  # type: str
+    _https_proxy = None  # type: str
+    _no_proxy = None  # type: str
+    _max_idle_conns = None  # type: int
+    _domain = None  # type: str
+
+    def __init__(self, config) -> None:
+        self._domain = config.domain
+        self._app_key = config.app_key
+        self._app_secret = config.app_secret
+        self._protocol = config.protocol
+        self._read_timeout = config.read_timeout
+        self._connect_timeout = config.connect_timeout
+        self._http_proxy = config.http_proxy
+        self._https_proxy = config.https_proxy
+        self._no_proxy = config.no_proxy
+        self._max_idle_conns = config.max_idle_conns
+
+    def do_request(self, pathname, protocol, method, header, body, runtime):
+        """Send request
+
+        @type pathname: str
+        @param pathname: the url path
+
+        @type protocol: str
+        @param protocol: http or https
+
+        @type method: str
+        @param method: example GET
+
+        @type header: Dict[str, str]
+        @param header: request header
+
+        @type body: iot_api_gateway_models.IoTApiRequest
+        @param body: the object of IoTApiRequest
+
+        @type runtime: util_models.RuntimeOptions
+        @param runtime: which controls some details of call api, such as retry times
+
+        @rtype: TeaResponse
+        @return: the response
+        """
+        body.validate()
+        runtime.validate()
+        _runtime = {
+            "timeouted": "retry",
+            "readTimeout": UtilClient.default_number(runtime.read_timeout, self._read_timeout),
+            "connectTimeout": UtilClient.default_number(runtime.connect_timeout, self._connect_timeout),
+            "httpProxy": UtilClient.default_string(runtime.http_proxy, self._http_proxy),
+            "httpsProxy": UtilClient.default_string(runtime.https_proxy, self._https_proxy),
+            "noProxy": UtilClient.default_string(runtime.no_proxy, self._no_proxy),
+            "maxIdleConns": UtilClient.default_number(runtime.max_idle_conns, self._max_idle_conns),
+            "retry": {
+                "retryable": runtime.autoretry,
+                "maxAttempts": UtilClient.default_number(runtime.max_attempts, 3),
+            },
+            "backoff": {
+                "policy": UtilClient.default_string(runtime.backoff_policy, "no"),
+                "period": UtilClient.default_number(runtime.backoff_period, 1),
+            },
+            "ignoreSSL": runtime.ignore_ssl,
+        }
+        _last_request = None
+        _last_exception = None
+        _now = time.time()
+        _retry_times = 0
+        while TeaCore.allow_retry(_runtime.get("retry"), _retry_times, _now):
+            if _retry_times > 0:
+                _backoff_time = TeaCore.get_backoff_time(_runtime.get("backoff"), _retry_times)
+                if _backoff_time > 0:
+                    TeaCore.sleep(_backoff_time)
+            _retry_times = _retry_times + 1
+            try:
+                _request = TeaRequest()
+                _request.protocol = UtilClient.default_string(self._protocol, protocol)
+                _request.method = UtilClient.default_string(method, "POST")
+                _request.pathname = pathname
+                _request.headers = TeaCore.merge(
+                    {
+                        "host": self._domain,
+                        "date": UtilClient.get_date_utcstring(),
+                        "x-ca-nonce": UtilClient.get_nonce(),
+                        "x-ca-key": self._app_key,
+                        "x-ca-signaturemethod": "HmacSHA256",
+                        "accept": "application/json",
+                        "user-agent": self.get_user_agent(),
+                    },
+                    header,
+                )
+                if UtilClient.empty(body.id):
+                    body.id = UtilClient.get_nonce()
+                if not UtilClient.is_unset(body):
+                    _request.headers["content-type"] = "application/octet-stream"
+                    _request.headers["content-md5"] = APIGatewayUtilClient.get_content_md5(
+                        UtilClient.to_jsonstring(TeaCore.to_map(body))
+                    )
+                    _request.body = UtilClient.to_jsonstring(TeaCore.to_map(body))
+                _request.headers["x-ca-signature"] = APIGatewayUtilClient.get_signature(_request, self._app_secret)
+                _last_request = _request
+                _response = TeaCore.do_action(_request, _runtime)
+                return _response
+            except Exception as e:
+                if TeaCore.is_retryable(e):
+                    _last_exception = e
+                    continue
+                raise e
+        raise UnretryableException(_last_request, _last_exception)
+
+    async def async_do_request(self, pathname, protocol, method, header, body, runtime):
+        """Send request
+
+        @type pathname: str
+        @param pathname: the url path
+
+        @type protocol: str
+        @param protocol: http or https
+
+        @type method: str
+        @param method: example GET
+
+        @type header: Dict[str, str]
+        @param header: request header
+
+        @type body: iot_api_gateway_models.IoTApiRequest
+        @param body: the object of IoTApiRequest
+
+        @type runtime: util_models.RuntimeOptions
+        @param runtime: which controls some details of call api, such as retry times
+
+        @rtype: TeaResponse
+        @return: the response
+        """
+        body.validate()
+        runtime.validate()
+        _runtime = {
+            "timeouted": "retry",
+            "readTimeout": UtilClient.default_number(runtime.read_timeout, self._read_timeout),
+            "connectTimeout": UtilClient.default_number(runtime.connect_timeout, self._connect_timeout),
+            "httpProxy": UtilClient.default_string(runtime.http_proxy, self._http_proxy),
+            "httpsProxy": UtilClient.default_string(runtime.https_proxy, self._https_proxy),
+            "noProxy": UtilClient.default_string(runtime.no_proxy, self._no_proxy),
+            "maxIdleConns": UtilClient.default_number(runtime.max_idle_conns, self._max_idle_conns),
+            "retry": {
+                "retryable": runtime.autoretry,
+                "maxAttempts": UtilClient.default_number(runtime.max_attempts, 3),
+            },
+            "backoff": {
+                "policy": UtilClient.default_string(runtime.backoff_policy, "no"),
+                "period": UtilClient.default_number(runtime.backoff_period, 1),
+            },
+            "ignoreSSL": runtime.ignore_ssl,
+        }
+        _last_request = None
+        _last_exception = None
+        _now = time.time()
+        _retry_times = 0
+        while TeaCore.allow_retry(_runtime.get("retry"), _retry_times, _now):
+            if _retry_times > 0:
+                _backoff_time = TeaCore.get_backoff_time(_runtime.get("backoff"), _retry_times)
+                if _backoff_time > 0:
+                    TeaCore.sleep(_backoff_time)
+            _retry_times = _retry_times + 1
+            try:
+                _request = TeaRequest()
+                _request.protocol = UtilClient.default_string(self._protocol, protocol)
+                _request.method = UtilClient.default_string(method, "POST")
+                _request.pathname = pathname
+                _request.headers = TeaCore.merge(
+                    {
+                        "host": self._domain,
+                        "date": UtilClient.get_date_utcstring(),
+                        "x-ca-nonce": UtilClient.get_nonce(),
+                        "x-ca-key": self._app_key,
+                        "x-ca-signaturemethod": "HmacSHA256",
+                        "accept": "application/json",
+                        "user-agent": self.get_user_agent(),
+                    },
+                    header,
+                )
+                if UtilClient.empty(body.id):
+                    body.id = UtilClient.get_nonce()
+                if not UtilClient.is_unset(body):
+                    _request.headers["content-type"] = "application/octet-stream"
+                    _request.headers["content-md5"] = APIGatewayUtilClient.get_content_md5(
+                        UtilClient.to_jsonstring(TeaCore.to_map(body))
+                    )
+                    _request.body = UtilClient.to_jsonstring(TeaCore.to_map(body))
+                _request.headers["x-ca-signature"] = APIGatewayUtilClient.get_signature(_request, self._app_secret)
+                _last_request = _request
+                _response = await TeaCore.async_do_action(_request, _runtime)
+                return _response
+            except Exception as e:
+                if TeaCore.is_retryable(e):
+                    _last_exception = e
+                    continue
+                raise e
+        raise UnretryableException(_last_request, _last_exception)
+
+    def get_user_agent(self):
+        """Get user agent
+
+        @rtype: str
+        @return: user agent
+        """
+        user_agent = UtilClient.get_user_agent(self._user_agent)
+        return user_agent

{pymammotion-0.4.17 → pymammotion-0.4.19}/pymammotion/aliyun/cloud_gateway.py

@@ -12,12 +12,12 @@ import time
 import uuid
 
 from aiohttp import ClientSession
-from alibabacloud_iot_api_gateway.client import Client
 from alibabacloud_iot_api_gateway.models import CommonParams, Config, IoTApiRequest
 from alibabacloud_tea_util.client import Client as UtilClient
 from alibabacloud_tea_util.models import RuntimeOptions
 from Tea.exceptions import UnretryableException
 
+from pymammotion.aliyun.client import Client
 from pymammotion.aliyun.model.aep_response import AepResponse
 from pymammotion.aliyun.model.connect_response import ConnectResponse
 from pymammotion.aliyun.model.dev_by_account_response import ListingDevByAccountResponse
@@ -116,6 +116,13 @@ class CloudIOTGateway:
         self._session_by_authcode_response = session_by_authcode_response
         self._region_response = region_response
         self._devices_by_account_response = dev_by_account
+        self._iot_token_issued_at = int(time.time())
+        if self._session_by_authcode_response:
+            self._iot_token_issued_at = (
+                self._session_by_authcode_response.token_issued_at
+                if self._session_by_authcode_response.token_issued_at is not None
+                else int(time.time())
+            )
 
     @staticmethod
     def generate_random_string(length: int):
@@ -144,7 +151,7 @@ class CloudIOTGateway:
             hashlib.sha1,
         ).hexdigest()
 
-    def get_region(self, country_code: str, auth_code: str):
+    async def get_region(self, country_code: str, auth_code: str):
         """Get the region based on country code and auth code."""
 
         if self._region_response is not None:
@@ -171,7 +178,9 @@ class CloudIOTGateway:
         )
 
         # send request
-        response = client.do_request("/living/account/region/get", "https", "POST", None, body, RuntimeOptions())
+        response = await client.async_do_request(
+            "/living/account/region/get", "https", "POST", None, body, RuntimeOptions()
+        )
         logger.debug(response.status_message)
         logger.debug(response.headers)
         logger.debug(response.status_code)
@@ -191,7 +200,7 @@ class CloudIOTGateway:
 
         return response.body
 
-    def aep_handle(self):
+    async def aep_handle(self):
         """Handle AEP authentication."""
         aep_domain = self.domain
 
@@ -230,7 +239,7 @@ class CloudIOTGateway:
         )
 
         # send request
-        response = client.do_request("/app/aepauth/handle", "https", "POST", None, body, RuntimeOptions())
+        response = await client.async_do_request("/app/aepauth/handle", "https", "POST", None, body, RuntimeOptions())
         logger.debug(response.status_message)
         logger.debug(response.headers)
         logger.debug(response.status_code)
@@ -395,7 +404,7 @@ class CloudIOTGateway:
                     return self._login_by_oauth_response
                 raise LoginException(data)
 
-    def session_by_auth_code(self):
+    async def session_by_auth_code(self):
         """Create a session by auth code."""
         config = Config(
             app_key=self._app_key,
@@ -420,7 +429,7 @@ class CloudIOTGateway:
         )
 
         # send request
-        response = client.do_request(
+        response = await client.async_do_request(
             "/account/createSessionByAuthCode",
             "https",
             "POST",
@@ -452,7 +461,7 @@ class CloudIOTGateway:
 
         return response.body
 
-    def sign_out(self) -> None:
+    async def sign_out(self) -> None:
         config = Config(
             app_key=self._app_key,
             app_secret=self._app_secret,
@@ -476,7 +485,7 @@ class CloudIOTGateway:
 
         # send request
         # possibly need to do this ourselves
-        response = client.do_request(
+        response = await client.async_do_request(
             "/iotx/account/invalidSession",
             "https",
             "POST",
@@ -497,7 +506,7 @@ class CloudIOTGateway:
         logger.debug(response_body_dict)
         return response_body_dict
 
-    def check_or_refresh_session(self):
+    async def check_or_refresh_session(self):
         """Check or refresh the session."""
         logger.debug("Trying to refresh token")
         config = Config(
@@ -523,7 +532,7 @@ class CloudIOTGateway:
 
         # send request
         # possibly need to do this ourselves
-        response = client.do_request(
+        response = await client.async_do_request(
             "/account/checkOrRefreshSession",
             "https",
             "POST",
@@ -544,7 +553,7 @@ class CloudIOTGateway:
 
         if int(response_body_dict.get("code")) != 200:
             logger.error(response_body_dict)
-            self.sign_out()
+            await self.sign_out()
             raise CheckSessionException("Error check or refresh token: " + response_body_dict.__str__())
 
         session = SessionByAuthCodeResponse.from_dict(response_body_dict)
@@ -562,7 +571,7 @@ class CloudIOTGateway:
         self._session_by_authcode_response = session
         self._iot_token_issued_at = int(time.time())
 
-    def list_binding_by_account(self) -> ListingDevByAccountResponse:
+    async def list_binding_by_account(self) -> ListingDevByAccountResponse:
         """List bindings by account."""
         config = Config(
             app_key=self._app_key,
@@ -586,7 +595,9 @@ class CloudIOTGateway:
         )
 
         # send request
-        response = client.do_request("/uc/listBindingByAccount", "https", "POST", None, body, RuntimeOptions())
+        response = await client.async_do_request(
+            "/uc/listBindingByAccount", "https", "POST", None, body, RuntimeOptions()
+        )
         logger.debug(response.status_message)
         logger.debug(response.headers)
         logger.debug(response.status_code)
@@ -604,7 +615,7 @@ class CloudIOTGateway:
         self._devices_by_account_response = ListingDevByAccountResponse.from_dict(response_body_dict)
         return self._devices_by_account_response
 
-    def list_binding_by_dev(self, iot_id: str):
+    async def list_binding_by_dev(self, iot_id: str):
         config = Config(
             app_key=self._app_key,
             app_secret=self._app_secret,
@@ -627,7 +638,7 @@ class CloudIOTGateway:
         )
 
         # send request
-        response = client.do_request("/uc/listBindingByDev", "https", "POST", None, body, RuntimeOptions())
+        response = await client.async_do_request("/uc/listBindingByDev", "https", "POST", None, body, RuntimeOptions())
         logger.debug(response.status_message)
         logger.debug(response.headers)
         logger.debug(response.status_code)
@@ -645,7 +656,7 @@ class CloudIOTGateway:
         self._devices_by_account_response = ListingDevByAccountResponse.from_dict(response_body_dict)
         return self._devices_by_account_response
 
-    def send_cloud_command(self, iot_id: str, command: bytes) -> str:
+    async def send_cloud_command(self, iot_id: str, command: bytes) -> str:
         """Send a cloud command to the specified IoT device."""
 
         if command is None:
@@ -659,7 +670,7 @@ class CloudIOTGateway:
             if self._iot_token_issued_at + self._session_by_authcode_response.data.refreshTokenExpire > (
                 int(time.time())
             ):
-                self.check_or_refresh_session()
+                await self.check_or_refresh_session()
             else:
                 raise AuthRefreshException("Refresh token expired. Please re-login")
 
@@ -694,7 +705,8 @@ class CloudIOTGateway:
         )
         logger.debug(self.converter.printBase64Binary(command))
         # send request
-        response = client.do_request("/thing/service/invoke", "https", "POST", None, body, RuntimeOptions())
+        runtime_options = RuntimeOptions(autoretry=True, backoff_policy="yes")
+        response = await client.async_do_request("/thing/service/invoke", "https", "POST", None, body, runtime_options)
         logger.debug(response.status_message)
         logger.debug(response.headers)
         logger.debug(response.status_code)
@@ -716,7 +728,7 @@ class CloudIOTGateway:
 
             if response_body_dict.get("code") == 29003:
                 logger.debug(self._session_by_authcode_response.data.identityId)
-                self.sign_out()
+                await self.sign_out()
                 raise SetupException(response_body_dict.get("code"), iot_id)
             if response_body_dict.get("code") == 6205:
                 raise DeviceOfflineException(response_body_dict.get("code"), iot_id)

{pymammotion-0.4.17 → pymammotion-0.4.19}/pymammotion/aliyun/model/session_by_authcode_response.py

@@ -16,3 +16,4 @@ class SessionOauthToken(DataClassORJSONMixin):
 class SessionByAuthCodeResponse(DataClassORJSONMixin):
     code: int
     data: SessionOauthToken | None = None
+    token_issued_at: int | None = None