modify test

Author: wallisyan

a

@@ -24,20 +24,20 @@
 from alibabacloud.handlers.retry_handler import RetryHandler
 from alibabacloud.handlers.server_error_handler import ServerErrorHandler
 from alibabacloud.handlers.http_handler import HttpHandler
+from alibabacloud.request import HTTPRequest
+import alibabacloud.retry.retry_policy as retry_policy
 
 
 DEFAULT_HANDLERS = [
-    PrepareHandler,
-
-    CredentialsHandler,
-    SignerHandler,
-    TimeoutConfigReader,
-    LogHandler,
-    EndpointHandler,
-
-    RetryHandler,
-    ServerErrorHandler,
-    HttpHandler,
+    PrepareHandler(),
+    CredentialsHandler(),
+    SignerHandler(),
+    TimeoutConfigReader(),
+    LogHandler(),
+    EndpointHandler(),
+    RetryHandler(),
+    ServerErrorHandler(),
+    HttpHandler(),
 ]
 
 DEFAULT_FORMAT = 'JSON'
@@ -66,7 +66,7 @@ def __init__(self, access_key_id=None, access_key_secret=None, region_id=None,
                  http_proxy=None, https_proxy=None, enable_stream_logger=None,
                  profile_name=None, config_file=None, enable_retry=True, endpoint=None):
 
-        # credentials部分会用到
+        # credentials
         self.access_key_id = access_key_id
         self.access_key_secret = access_key_secret
         self.region_id = region_id
@@ -88,7 +88,7 @@ def __init__(self, access_key_id=None, access_key_secret=None, region_id=None,
         self.enable_stream_logger = enable_stream_logger
         # credentials 的profile
         self.profile_name = profile_name
-        # 读取配置文件
+        # config file
         self.config_file = config_file
         self.enable_http_debug = enable_http_debug  # http-debug 只从环境变量获取，不设置开关
         # proxy provider两个： client  env
@@ -163,6 +163,10 @@ def get_merged_client_config(config):
 class AlibabaCloudClient:
 
     def __init__(self, client_config, credentials_provider):
+        self.product_code = None
+        self.location_service_code = None
+        self.product_version = None
+        self.location_endpoint_type = None
         # client_config:传入的ClientConfig
 
         self.config = get_merged_client_config(client_config)
@@ -178,12 +182,6 @@ def __init__(self, client_config, credentials_provider):
         from alibabacloud.endpoint.default_endpoint_resolver import DefaultEndpointResolver
 
         self.endpoint_resolver = DefaultEndpointResolver(self.config)  # TODO initialize
-        self.product_code = None
-        self.location_service_code = None
-        self.product_version = None
-        self.location_endpoint_type = None
-
-        import alibabacloud.retry.retry_policy as retry_policy
         # retry
         if self.config.enable_retry:
             self.retry_policy = retry_policy.get_default_retry_policy(
@@ -193,63 +191,22 @@ def __init__(self, client_config, credentials_provider):
 
     def _handle_request(self, api_request, _raise_exception=True):
         # handle context
-        context = RequestContext()
-        context.api_request = api_request
-        from .request import HTTPRequest
-        context.http_request = HTTPRequest()
-        context.config = self.config
-
-        context.client = self
-
+        context = RequestContext(api_request=api_request, http_request=HTTPRequest(),
+                                 config=self.config, client=self)
         handler_index = 0
-
         while True:
-            for i in range(len(self.handlers[handler_index:])):
-                self.handlers[i]().handle_request(context)
+            for handler in self.handlers[handler_index:]:
+                handler.handle_request(context)
 
-            for i in reversed(range(len(self.handlers[handler_index:]))):
-                self.handlers[i]().handle_response(context)
+            for handler in reversed(self.handlers[handler_index:]):
+                handler.handle_response(context)
                 if context.retry_flag:
                     time.sleep(context.retry_backoff / 1000)
-                    handler_index = i
+                    handler_index = self.handlers.index(handler)
                     break
-
+            if not context.retry_flag:
+                break
         if context.exception and _raise_exception:
             raise context.exception
 
         return context
-
-
-class ECSClient(AlibabaCloudClient):
-
-    def __init__(self):
-        self.product = 'Ecs'
-        self.location_service_code = 'ecs'
-        self.location_endpoint_type = 'OpenAPI'
-
-    def create_instance(self, instance_name=None, instance_id=None):
-        api_request = APIRequest(action_name, method, protocol, style)
-        api_request._params['InstanceName'] = instance_name
-        return self._handle_request(api_request).result
-
-    def delete_instance(self, **params):
-        api_request = APIRequest(**params)
-        return self._handle_request(api_request).result
-
-
-class OTSClient(AlibabaCloudClient):
-
-    def create_table(self, **params):
-        api_request = APIRequest(**params)
-        return self._handle_request(api_request).result
-
-
-class STSClient(AlibabaCloudClient):
-    def __init__(self):
-        self.product = 'Sts'
-        self.location_service_code = 'sts'
-        self.location_endpoint_type = 'OpenAPI'
-        # AlibabaCloudClient.__init__(self)
-
-    def handle_request(self, request, config):
-        self._handle_request(request, _config=config, _raise_exception=True)

aliyun-python-sdk-core/alibabacloud/client.py

@@ -15,14 +15,17 @@
 
 class RequestContext:
 
-    def __init__(self):
-        self.api_request = None
-        self.http_request = None
-        self.api_response = None
-        self.http_response = None
-        self.exception = None
-        self.retry_flag = False
-        self.retry_backoff = 0
+    def __init__(self, api_request=None, http_request=None, api_response=None, http_response=None,
+                 exception=None, retry_flag=True, retry_backoff=0, config=None, client=None):
+        self.api_request = api_request
+        self.http_request = http_request
+        self.api_response = api_response
+        self.http_response = http_response
+        self.exception = exception
+        self.config = config
+        self.client = client
+        self.retry_flag = retry_flag
+        self.retry_backoff = retry_backoff
 
 
 class RequestHandler:

aliyun-python-sdk-core/alibabacloud/handlers/__init__.py

@@ -20,7 +20,6 @@ class EndpointHandler(RequestHandler):
 
     def handle_request(self, context):
         if context.api_request.endpoint is not None:
-            print()
             context.endpoint = context.api_request.endpoint
         else:
             resolve_request = ResolveEndpointRequest(

aliyun-python-sdk-core/alibabacloud/handlers/endpoint_handler.py

@@ -27,6 +27,9 @@ def handle_response(self, context):
 
     def _do_request(self, context):
         http_request = context.http_request
+        # modify retry flag
+        context.retry_flag = False
+
         with Session() as s:
             current_protocol = 'http://' if http_request.protocol.lower() == 'http' else 'https://'
             url = current_protocol + context.endpoint + http_request.params

aliyun-python-sdk-core/alibabacloud/handlers/http_handler.py

@@ -38,16 +38,11 @@ def handle_response(self, context):
 
         should_retry = context.client.retry_policy.should_retry(retry_policy_context)
 
-        # if should_retry & RetryCondition.SHOULD_RETRY:
         if should_retry & RetryCondition.NO_RETRY:
             context.retry_flag = False
-            if context.exception:
-                raise context.exception
         else:
             retry_policy_context.retryable = should_retry
-
             context.http_request.retries += 1
-            print('context.http_request.retries', context.http_request.retries)
             context.retry_flag = True
             context.retry_backoff = context.client.retry_policy.compute_delay_before_next_retry(
                 retry_policy_context
@@ -56,9 +51,9 @@ def handle_response(self, context):
     @staticmethod
     def _add_request_client_token(request):
         # TODO implement: add a ClientToken parameter on api_request
-        if hasattr(request, "set_ClientToken") and hasattr(request, "get_ClientToken"):
-            client_token = request.get_ClientToken()
-            if not client_token:
-                # ClientToken has not been set
-                client_token = alibabacloud.utils.parameter_helper.get_uuid()  # up to 60 chars
-                request.set_ClientToken(client_token)
+        # 新的接口不确定body还是query获取到ClientToken
+        client_token = request.params.get('ClientToken')
+        if not client_token:
+            # ClientToken has not been set
+            client_token = alibabacloud.utils.parameter_helper.get_uuid()  # up to 60 chars
+            request.set_ClientToken(client_token)

aliyun-python-sdk-core/alibabacloud/handlers/retry_handler.py

@@ -42,11 +42,6 @@ def handle_response(self, context):
                 special_error_codes = ['IncompleteSignature', 'SignatureDoesNotMatch']
                 if response.status_code == codes.BAD_REQUEST and \
                         server_error_code in special_error_codes:
-                    # FIXME fix 了一个bug  关于roa 返回签名带时间的问题
-                    with open('a', 'w')as f:
-                        f.write(http_request.signature)
-                    with open('b', 'w')as f:
-                        f.write(server_error_message.split(':', 1)[1])
                     if http_request.signature == server_error_message.split(':', 1)[1]:
                         server_error_code = 'InvalidAccessKeySecret'
                         server_error_message = 'The AccessKeySecret is incorrect. ' \

aliyun-python-sdk-core/alibabacloud/handlers/server_error_handler.py

@@ -60,7 +60,6 @@ def __init__(self, accept_format=None, method=None, protocol=None, proxy=None,
                  body="", enable_retry=None, max_retry_times=None, retries=0, credentials=None):
 
         self.accept_format = accept_format
-        # TODO， request.body 必须是json
         self.body = body
         self.method = method
         self.protocol = protocol

aliyun-python-sdk-core/alibabacloud/request.py

@@ -23,6 +23,7 @@
 from aliyunsdkcore.vendored.six import iteritems
 from aliyunsdkcore.vendored.six.moves.urllib.request import pathname2url
 from aliyunsdkcore.compat import urlencode
+from aliyunsdkcore.acs_exception.exceptions import ClientException
 from alibabacloud.utils.parameter_helper import md5_sum
 
 FORMAT_ISO_8601 = "%Y-%m-%dT%H:%M:%SZ"
@@ -53,6 +54,9 @@ def __init__(self, credentials, api_request, region_id, version, signer=None):
         self._uri = self._replace_occupied_parameters()
 
     def _prepare_params_headers(self):
+        if self.credentials is None:
+            raise ClientException('Credentials Error', 'Unable to locate credentials.')
+
         headers = self.request.headers
         headers['x-acs-version'] = self.version
 
@@ -215,8 +219,7 @@ def _calc_signature(self, method, params):
 
     def _canonicalized_query_string(self):
         if self.credentials is None:
-            pass
-            # raise NoCredentialsError
+            raise ClientException('Credentials Error', 'Unable to locate credentials.')
         parameters = self.request.query_params
         if parameters is None:
             parameters = {}

aliyun-python-sdk-core/alibabacloud/signer/composer.py

@@ -490,7 +490,6 @@ def send(self, request, stream=False, timeout=None, verify=True, cert=None, prox
             raise ConnectionError(err, request=request)
 
         except MaxRetryError as e:
-            print(11111111111111111, e.reason)
             if isinstance(e.reason, ConnectTimeoutError):
                 # TODO: Remove this in 3.0.0: see #2811
                 if not isinstance(e.reason, NewConnectionError):