refactor(core): fix

Author: bytestarter

volcenginesdkcore/api_client.py

@@ -71,12 +71,12 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
 
         self.interceptor_chain = InterceptorChain()
 
-        self.interceptor_chain.append_common_request_interceptor(BuildRequestInterceptor())
-        self.interceptor_chain.append_common_request_interceptor(RuntimeOptionsInterceptor())
-        self.interceptor_chain.append_common_request_interceptor(ResolveEndpointInterceptor())
-        self.interceptor_chain.append_common_request_interceptor(SignRequestInterceptor())
+        self.interceptor_chain.append_request_interceptor(BuildRequestInterceptor())
+        self.interceptor_chain.append_request_interceptor(RuntimeOptionsInterceptor())
+        self.interceptor_chain.append_request_interceptor(ResolveEndpointInterceptor())
+        self.interceptor_chain.append_request_interceptor(SignRequestInterceptor())
 
-        self.interceptor_chain.append_common_response_interceptor(DeserializedResponseInterceptor())
+        self.interceptor_chain.append_response_interceptor(DeserializedResponseInterceptor())
 
     def __del__(self):
         if self._pool is not None:

volcenginesdkcore/auth/providers/sts_provider.py

@@ -3,11 +3,11 @@
 from datetime import datetime
 
 import dateutil.parser
-from urllib3 import Timeout
 
 from volcenginesdkcore import UniversalApi, UniversalInfo, ApiClient, Configuration
 from volcenginesdkcore.auth.providers.provider import Provider, CredentialValue
 
+import threading
 
 class AssumeRoleCredentials:
     def __init__(self, ak, sk, session_token, current_time, expired_time):
@@ -20,7 +20,7 @@ def __init__(self, ak, sk, session_token, current_time, expired_time):
 
 class StsCredentialProvider(Provider):
     def __init__(self, ak, sk, role_name, account_id, duration_seconds=3600, scheme='https',
-                 host='sts.volcengineapi.com', region='cn-north-1', timeout=30):
+                 host='sts.volcengineapi.com', region='cn-north-1', timeout=30, expired_buffer_seconds=60):
         self.ak = ak
         self.sk = sk
         self.role_name = role_name
@@ -34,17 +34,24 @@ def __init__(self, ak, sk, role_name, account_id, duration_seconds=3600, scheme=
         self.scheme = scheme
 
         self.expired_time = None
+        if expired_buffer_seconds > 600:
+            raise ValueError('expired_buffer_seconds must be less than or equal to 600')
+        self.expired_buffer_seconds = expired_buffer_seconds
 
         self.credentials = None
 
+        self._lock = threading.Lock()
+
     def retrieve(self):
         return self.credentials
 
     def is_expired(self):
-        return self.credentials is None or (self.expired_time and self.expired_time < time.time())
+        return (self.credentials is None or
+                (self.expired_time and self.expired_time < time.time() + self.expired_buffer_seconds))
 
     def refresh(self):
-        self._assume_role()
+        with self._lock:
+            self._assume_role()
 
     def _assume_role(self):
         params = {
@@ -58,7 +65,7 @@ def _assume_role(self):
         configuration.host = self.host
         configuration.region = self.region
         configuration.schema = self.scheme
-        configuration.timeout = Timeout(self.timeout)
+        configuration.read_timeout = self.timeout
         c = UniversalApi(ApiClient(configuration))
         info = UniversalInfo(method='GET', service='sts', version='2018-01-01', action='AssumeRole',
                              content_type='text/plain')

volcenginesdkcore/configuration.py

@@ -88,8 +88,9 @@ def __init__(self):
         self.assert_hostname = None
 
         self.num_pools = 4
-        self.timeout = Timeout(connect=3.0, read=30.0, total=30.0)
-        self.retries = Retry(3)
+
+        self.connect_timeout = 60.0
+        self.read_timeout = 60.0
 
         # urllib3 connection pool's maximum number of connections saved
         # per pool. urllib3 uses 1 connection as default value, but this is

volcenginesdkcore/endpoint/endpoint_provider.py

@@ -4,13 +4,11 @@
 
 
 class ResolvedEndpoint:
-    def __init__(self, host, scheme="https"):
+    def __init__(self, host):
         self.host = host
-        self.scheme = scheme
 
-    @property
-    def full_url(self):
-        return self.scheme + '://' + self.host
+    def url_for(self, scheme='https'):
+        return scheme + '://' + self.host
 
 
 class EndpointProvider(object):

volcenginesdkcore/endpoint/providers/default_provider.py

@@ -4,7 +4,7 @@
 fallback_endpoint = 'open.volcengineapi.com'
 
 
-class DefaultEndpointConfig:
+class ServiceEndpointInfo:
     def __init__(self, service, is_global, global_endpoint,
                  region_endpoint_map, fallback_endpoint=fallback_endpoint):
         self.service = service
@@ -13,50 +13,48 @@ def __init__(self, service, is_global, global_endpoint,
         self.region_endpoint_map = region_endpoint_map
         self.fallback_endpoint = fallback_endpoint
 
-
-def get_default_endpoint(service, region):
-    if service in default_endpoint:
-        e = default_endpoint[service]
-        if e.is_global:
-            return e.global_endpoint
-        if region in e.region_endpoint_map:
-            return e.region_endpoint_map[region]
-        return e.fallback_endpoint
-    return fallback_endpoint
-
-
-default_endpoint = {
-    'ecs': DefaultEndpointConfig(
-        service='ecs',
-        is_global=False,
-        global_endpoint='',
-        region_endpoint_map={
-            'cn-beijing-autodriving': 'ecs' + '.' + 'cn-beijing-autodriving' + '.volcengineapi.com'
-        }
-    ),
-}
+    def get_endpoint_for(self, region):
+        if self.is_global:
+            return self.global_endpoint
+        if region in self.region_endpoint_map:
+            return self.region_endpoint_map[region]
+        return self.fallback_endpoint
 
 
 class DefaultEndpointProvider(EndpointProvider):
+    default_endpoint = {
+        'ecs': ServiceEndpointInfo(
+            service='ecs',
+            is_global=False,
+            global_endpoint='',
+            region_endpoint_map={
+                'cn-beijing-autodriving': 'ecs' + '.' + 'cn-beijing-autodriving' + '.volcengineapi.com'
+            }
+        ),
+    }
 
     def __init__(self, custom_endpoints=None):
-        self.scheme = 'https'
         self.custom_endpoints = custom_endpoints or {}
 
+    def get_default_endpoint(self, service, region):
+        if service in self.default_endpoint:
+            e = self.default_endpoint[service]
+            return e.get_endpoint_for(region)
+        return fallback_endpoint
+
     def endpoint_for(self, service, region):
-        # 检查自定义终端节点配置
         if service in self.custom_endpoints:
-            url = self.custom_endpoints[service]
+            conf = self.custom_endpoints[service]
+            host = conf.get_endpoint_for(region)
         else:
-            url = get_default_endpoint(service=service, region=region)
+            host = self.get_default_endpoint(service=service, region=region)
 
-        return ResolvedEndpoint(url, self.scheme)
+        return ResolvedEndpoint(host)
 
 
 class HostEndpointProvider(EndpointProvider):
     def __init__(self, host):
         self.host = host
-        self.scheme = 'https'
 
     def endpoint_for(self, service, region):
-        return ResolvedEndpoint(self.host, self.scheme)
+        return ResolvedEndpoint(self.host)

volcenginesdkcore/interceptor/__init__.py

@@ -1,3 +1,2 @@
 from volcenginesdkcore.interceptor.interceptors.context import *
-from .chain import *
 from .interceptors import *

volcenginesdkcore/interceptor/chain.py

@@ -1,40 +1,15 @@
 # coding=utf-8
-
-
-def check_common_request_interceptor(interceptor):
-    if not interceptor.is_common():
-        raise Exception("interceptor is not common")
-    if not interceptor.is_request():
-        raise Exception("interceptor is not for request")
-    if not interceptor.name():
-        raise Exception("interceptor name is not defined")
-
-
-def check_common_response_interceptor(interceptor):
-    if not interceptor.is_common():
-        raise Exception("interceptor is not common")
-    if not interceptor.is_response():
-        raise Exception("interceptor is not for response")
-    if not interceptor.name():
-        raise Exception("interceptor name is not defined")
+from volcenginesdkcore.interceptor import RequestInterceptor, ResponseInterceptor
 
 
 def check_request_interceptor(interceptor):
-    if interceptor.is_common():
-        raise Exception("interceptor is common")
-    if not interceptor.is_request():
+    if not issubclass(interceptor.__class__, RequestInterceptor):
         raise Exception("interceptor is not for request")
-    if not interceptor.name():
-        raise Exception("interceptor name is not defined")
 
 
 def check_response_interceptor(interceptor):
-    if interceptor.is_common():
-        raise Exception("interceptor is common")
-    if not interceptor.is_response():
+    if not issubclass(interceptor.__class__, ResponseInterceptor):
         raise Exception("interceptor is not for response")
-    if not interceptor.name():
-        raise Exception("interceptor name is not defined")
 
 
 def insert_interceptor(chain, interceptor, after_name=''):
@@ -54,21 +29,9 @@ class InterceptorChain:
     """拦截器链"""
 
     def __init__(self):
-        self.common_request_interceptors = []
         self.request_interceptors = []
-        self.common_response_interceptors = []
         self.response_interceptors = []
 
-    def append_common_request_interceptor(self, interceptor):
-        check_common_request_interceptor(interceptor)
-        self.common_request_interceptors.append(interceptor)
-        return self
-
-    def insert_common_request_interceptor(self, interceptor, after_name=''):
-        check_common_request_interceptor(interceptor)
-        self.common_request_interceptors = insert_interceptor(self.common_request_interceptors, interceptor, after_name)
-        return self
-
     def append_request_interceptor(self, interceptor):
         check_request_interceptor(interceptor)
         self.request_interceptors.append(interceptor)
@@ -79,16 +42,6 @@ def insert_request_interceptor(self, interceptor, after_name=''):
         self.request_interceptors = insert_interceptor(self.request_interceptors, interceptor, after_name)
         return self
 
-    def append_common_response_interceptor(self, interceptor):
-        check_common_response_interceptor(interceptor)
-        self.common_response_interceptors.append(interceptor)
-        return self
-
-    def insert_common_response_interceptor(self, interceptor, after_name=''):
-        check_common_response_interceptor(interceptor)
-        self.common_response_interceptors = insert_interceptor(self.common_response_interceptors, interceptor,
-                                                               after_name)
-
     def append_response_interceptor(self, interceptor):
         check_response_interceptor(interceptor)
         self.response_interceptors.append(interceptor)
@@ -99,18 +52,12 @@ def insert_response_interceptor(self, interceptor, after_name=''):
         self.response_interceptors = insert_interceptor(self.response_interceptors, interceptor, after_name)
 
     def execute_request(self, context):
-        for interceptor in self.common_request_interceptors:
-            context = interceptor.intercept(context)
-
         for interceptor in self.request_interceptors:
             context = interceptor.intercept(context)
 
         return context
 
     def execute_response(self, context):
-        for interceptor in self.common_response_interceptors:
-            context = interceptor.intercept(context)
-
         for interceptor in self.response_interceptors:
             context = interceptor.intercept(context)