Merge pull request #242 from aliyun/refactor4.test

Refactor4.test

Author: wallisyan

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

@@ -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,  # 获取Signature,header,params
-    # HttpHeaderHandler,  # 获取签名的header
-    TimeoutConfigReader,  # 获取timeout
-    EndpointHandler,  # 获取endpoint
-    LogHandler,
-    RetryHandler,
-    HttpHandler,
-    ServerErrorHandler
+    PrepareHandler(),
+    CredentialsHandler(),
+    SignerHandler(),
+    TimeoutConfigReader(),
+    LogHandler(),
+    EndpointHandler(),
+    RetryHandler(),
+    ServerErrorHandler(),
+    HttpHandler(),
 ]
 
 DEFAULT_FORMAT = 'JSON'
@@ -47,6 +47,8 @@
 DEFAULT_READ_TIMEOUT = 10
 DEFAULT_ENABLE_HTTP_DEBUG = False
 DEFAULT_ENABLE_HTTPS = False
+HTTP_PORT = 80
+HTTPS_PORT = 443
 
 
 class ClientConfig:
@@ -58,13 +60,13 @@ class ClientConfig:
     DEFAULT_NAME_FOR_CONFIG_FILE = '~/.alibabacloud/config'
 
     def __init__(self, access_key_id=None, access_key_secret=None, region_id=None,
-                 max_retry_times=None, user_agent=None,
-                 extra_user_agent=None, enable_https=None, http_port=None, https_port=None,
+                 max_retry_times=None, user_agent=None, extra_user_agent=None,
+                 enable_https=None, http_port=HTTP_PORT, https_port=HTTPS_PORT,
                  connection_timeout=None, read_timeout=None, enable_http_debug=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
@@ -86,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
@@ -97,6 +99,10 @@ def __init__(self, access_key_id=None, access_key_secret=None, region_id=None,
             'https': self.https_proxy,
         }
 
+    @property
+    def proxy(self):
+        return self._proxy
+
     def read_from_env(self):
         # 从环境变量读取一定量的数据
         env_vars = ['HTTPS_PROXY', 'HTTP_PROXY']
@@ -157,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)
@@ -172,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(
@@ -187,67 +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 handler in self.handlers[handler_index:]:
+                handler.handle_request(context)
 
-            for i in range(len(self.handlers[handler_index:])):
-                self.handlers[i]().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
-                    context.retry_flag = False
-                continue
-
-            break
-
+                    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/credentials/provider.py

@@ -97,7 +97,8 @@ def __init__(self, client_config, credentials_config_file_name, profile_name):
         self.client_config = client_config
         self._inner_provider = self._get_provider_by_profile(profile)
 
-    def _load_profile(self, config_file_name, profile_name):
+    @staticmethod
+    def _load_profile(config_file_name, profile_name):
         full_path = os.path.expanduser(config_file_name)
         if not os.path.isfile(full_path):
             raise ClientException("Failed to find config file for SDK: " + full_path)
@@ -263,7 +264,8 @@ def _get_config_file_name(self):
         else:
             return self.DEFAULT_NAME_FOR_CREDENTIALS_FILE
 
-    def _get_config(self, config_name):
+    @staticmethod
+    def _get_config(config_name):
         env_name = 'ALIBABA_CLOUD_' + config_name.upper()
         if env_name in os.environ:
             return os.environ.get(env_name)

aliyun-python-sdk-core/alibabacloud/endpoint/local_config_regional_endpoint_resolver.py

@@ -104,5 +104,6 @@ def is_product_code_valid(self, request):
             self._get_normalized_product_code(request.product_code),
             request.location_service_code,
             request.endpoint_type,
+            request.credentials_provider
         )
         return EndpointResolverBase.is_product_code_valid(self, tmp_request)

aliyun-python-sdk-core/alibabacloud/endpoint/location_service_endpoint_resolver.py

@@ -69,10 +69,10 @@ def _get_endpoint_from_location_service(self, key, request):
         return self.endpoints_data.get(key)
 
     def _call_location_service(self, key, raw_request):
-        client_caller = DescribeEndpointCaller(self.config, None)
+        client_caller = DescribeEndpointCaller(self.config, raw_request.credentials_provider)
 
         try:
-            context = client_caller.fetch(region_id=self.config.region_id,
+            context = client_caller.fetch(region_id=raw_request.region_id,
                                           endpoint_type=raw_request.endpoint_type,
                                           location_service_code=raw_request.location_service_code,
                                           location_endpoint=self._location_service_endpoint)

aliyun-python-sdk-core/alibabacloud/endpoint/resolver_endpoint_request.py

@@ -23,7 +23,7 @@
 
 class ResolveEndpointRequest(object):
 
-    def __init__(self, region_id, product_code, location_service_code, endpoint_type):
+    def __init__(self, region_id, product_code, location_service_code, endpoint_type, credentials_provider):
 
         self.region_id = region_id
         self.product_code = product_code
@@ -35,6 +35,7 @@ def __init__(self, region_id, product_code, location_service_code, endpoint_type
             self.endpoint_type = endpoint_type
 
         self.location_service_code = location_service_code
+        self.credentials_provider = credentials_provider
 
     def is_open_api_endpoint(self):
         return ENDPOINT_TYPE_OPEN == self.endpoint_type

aliyun-python-sdk-core/alibabacloud/handlers/__init__.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/credentials_handler.py

@@ -19,9 +19,9 @@
 class CredentialsHandler(RequestHandler):
 
     def handle_request(self, context):
-
-        credentials = context.client.credentials_provider.provide()
-        context.http_request.credentials = credentials
+        if context.http_request.credentials is None:
+            credentials = context.client.credentials_provider.provide()
+            context.http_request.credentials = credentials
 
     def handle_response(self, response):
         pass

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

@@ -19,15 +19,15 @@
 class EndpointHandler(RequestHandler):
 
     def handle_request(self, context):
-        # FIXME
         if context.api_request.endpoint is not None:
             context.endpoint = context.api_request.endpoint
         else:
             resolve_request = ResolveEndpointRequest(
                 context.config.region_id,
                 context.client.product_code,
                 context.client.location_service_code,
-                context.client.location_endpoint_type
+                context.client.location_endpoint_type,
+                context.client.credentials_provider,
             )
             context.endpoint = context.client.endpoint_resolver.resolve(resolve_request)
 

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

@@ -19,9 +19,6 @@
 
 
 class HttpHandler(RequestHandler):
-    """
-    获取参数，组装成request
-    """
     def handle_request(self, context):
         self._do_request(context)
 
@@ -30,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
@@ -51,6 +51,9 @@ def _do_request(self, context):
                 response = s.send(prepped, proxies=http_request.proxy,
                                   timeout=http_request.timeout,
                                   allow_redirects=False, verify=None, cert=None)
+
+                from aliyunsdkcore.vendored import requests
+                # requests.adapters.DEFAULT_RETRIES = 0
             except IOError as e:
                 from aliyunsdkcore.acs_exception.exceptions import ClientException
                 from aliyunsdkcore.acs_exception import error_code