fix(core): fix

Author: bytestarter

volcenginesdkcore/auth/credential.py

@@ -1,12 +1,11 @@
 # coding=utf-8
 class Credential(object):
-    """凭证管理类"""
 
     def __init__(self, provider):
         self.provider = provider
 
     def get(self):
         if self.provider.is_expired():
-            # 当凭证过期时自动刷新
+            # refresh if expired
             self.provider.refresh()
         return self.provider.retrieve()

volcenginesdkcore/auth/providers/provider.py

@@ -14,15 +14,12 @@ class Provider(object):
 
     @abc.abstractmethod
     def retrieve(self):
-        """获取凭证"""
         raise NotImplementedError()
 
     @abc.abstractmethod
     def is_expired(self):
-        """判断凭证是否过期"""
         raise NotImplementedError()
 
     @abc.abstractmethod
     def refresh(self):
-        """刷新凭证"""
         raise NotImplementedError()

volcenginesdkcore/auth/providers/static_provider.py

@@ -3,7 +3,6 @@
 
 
 class StaticCredentialProvider(Provider):
-    """静态凭证提供者"""
 
     def _refresh(self):
         return

volcenginesdkcore/auth/providers/sts_provider.py

@@ -51,7 +51,8 @@ def is_expired(self):
 
     def refresh(self):
         with self._lock:
-            self._assume_role()
+            if self.is_expired():
+                self._assume_role()
 
     def _assume_role(self):
         params = {
@@ -64,13 +65,15 @@ def _assume_role(self):
         configuration.sk = self.sk
         configuration.host = self.host
         configuration.region = self.region
-        configuration.schema = self.scheme
+        configuration.scheme = self.scheme
         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')
 
         resp, status_code, resp_header = c.do_call_with_http_info(info=info, body=params)
+        if 'Credentials' not in resp:
+            raise RuntimeError('failed to retrieve credentials from sts' + str(resp_header))
         resp_cred = resp['Credentials']
 
         # Parse the ISO string

volcenginesdkcore/configuration.py

@@ -6,6 +6,7 @@
 import logging
 import multiprocessing
 import sys
+import warnings
 
 import six
 from six.moves import http_client as httplib
@@ -34,13 +35,31 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
     Do not edit the class manually.
     """
 
+    @property
+    def schema(self):
+        warnings.warn(
+            "The field 'schema' is deprecated and will be removed in future versions. Use 'scheme' instead.",
+            DeprecationWarning,
+            stacklevel=2
+        )
+        return self.scheme
+
+    @schema.setter
+    def schema(self, value):
+        warnings.warn(
+            "The field 'schema' is deprecated and will be removed in future versions. Use 'scheme' instead.",
+            DeprecationWarning,
+            stacklevel=2
+        )
+        self.scheme = value
+
     def __init__(self):
         """Constructor"""
 
         # Default Base url
         self.host = None
-        # Schema Support http or https
-        self.schema = "http"
+        # Scheme Support http or https
+        self.scheme = "http"
         # Temp file folder for downloading files
         self.temp_folder_path = None
 
@@ -88,8 +107,8 @@ def __init__(self):
 
         self.num_pools = 4
 
-        self.connect_timeout = 60.0
-        self.read_timeout = 60.0
+        self.connect_timeout = 30.0
+        self.read_timeout = 30.0
 
         # urllib3 connection pool's maximum number of connections saved
         # per pool. urllib3 uses 1 connection as default value, but this is

volcenginesdkcore/interceptor/__init__.py

@@ -1,9 +1,8 @@
 from .chain import InterceptorChain
-
-from .interceptors.common_request import SignRequestInterceptor, BuildRequestInterceptor, RuntimeOptionsInterceptor, \
-    ResolveEndpointInterceptor
-from .interceptors.common_response import DeserializedResponseInterceptor
+from .interceptors import SignRequestInterceptor, BuildRequestInterceptor, ResolveEndpointInterceptor
 from .interceptors.context import InterceptorContext
+from .interceptors.deserialized_response_interceptor import DeserializedResponseInterceptor
 from .interceptors.interceptor import RequestInterceptor, ResponseInterceptor
 from .interceptors.request import Request, RuntimeOption
 from .interceptors.response import Response
+from .interceptors.runtime_options_interceptor import RuntimeOptionsInterceptor

volcenginesdkcore/interceptor/interceptors/__init__.py

@@ -1,8 +1,9 @@
-from .common_request import SignRequestInterceptor, BuildRequestInterceptor, RuntimeOptionsInterceptor, \
-    ResolveEndpointInterceptor
-from .common_response import DeserializedResponseInterceptor
-
+from .build_request_interceptor import BuildRequestInterceptor
 from .context import InterceptorContext
+from .deserialized_response_interceptor import DeserializedResponseInterceptor
 from .interceptor import RequestInterceptor, ResponseInterceptor
 from .request import Request, RuntimeOption
+from .resolve_endpoint_interceptor import ResolveEndpointInterceptor
 from .response import Response
+from .runtime_options_interceptor import RuntimeOptionsInterceptor
+from .sign_request_interceptor import SignRequestInterceptor

…terceptor/interceptors/common_request.py …nterceptors/build_request_interceptor.pyvolcenginesdkcore/interceptor/interceptors/common_request.py renamed to volcenginesdkcore/interceptor/interceptors/build_request_interceptor.py volcenginesdkcore/interceptor/interceptors/common_request.py renamed to volcenginesdkcore/interceptor/interceptors/build_request_interceptor.py

@@ -1,55 +1,13 @@
-# coding=utf-8
 import datetime
-import json
 import mimetypes
 import os
+from urllib.parse import quote
 
 import six
-from six.moves.urllib.parse import quote
-from urllib3 import Timeout
 
-from volcenginesdkcore.signv4 import SignerV4
 from .interceptor import RequestInterceptor
 
 
-class SignRequestInterceptor(RequestInterceptor):
-    """SDK通用请求拦截器"""
-
-    def name(self):
-        return 'volcengine-sign-request-interceptor'
-
-    def intercept(self, context):
-        self.update_params_for_auth(host=context.request.host, path=context.request.true_path,
-                                    method=context.request.method,
-                                    headers=context.request.header_params,
-                                    querys=context.request.query_params,
-                                    auth_settings=context.request.auth_settings,
-                                    body=context.request.body,
-                                    post_params=context.request.post_params,
-                                    service=context.request.service,
-                                    ak=context.request.ak,
-                                    sk=context.request.sk,
-                                    session_token=context.request.session_token,
-                                    region=context.request.region)
-        return context
-
-    @staticmethod
-    def update_params_for_auth(host, path, method, headers, querys, auth_settings, body, post_params, service, ak,
-                               sk, session_token, region):
-        if not auth_settings:
-            return
-
-        for auth in auth_settings:
-            headers["Host"] = host
-            if method in ["POST", "PUT", "DELETE", "PATCH"]:
-                body = json.dumps(body)
-            else:
-                body = ""
-            SignerV4.sign(path, method, headers, body, post_params, querys,
-                          ak, sk, session_token,
-                          region, service)
-
-
 def parameters_to_tuples(params, collection_formats):
     """Get parameters as list of tuples, formatting collections.
 
@@ -239,56 +197,3 @@ def __req_to_params(self, req, prefix="", params=None):
                 params.append((prefix + key, value))
 
         return params
-
-
-class ResolveEndpointInterceptor(RequestInterceptor):
-    """SDK通用请求拦截器"""
-
-    def name(self):
-        return 'volcengine-resolve-endpoint-interceptor'
-
-    def intercept(self, context):
-        host = context.request.host
-        scheme = context.request.scheme
-        if not host:
-            service = context.request.resource_path.split('/')[3]
-            endpoint_resolver = context.request.endpoint_provider.endpoint_for(
-                service, context.request.region)
-            context.request.host = endpoint_resolver.host
-            prefix = endpoint_resolver.url_for(scheme)
-        else:
-            prefix = scheme + '://' + host
-        context.request.url = prefix + context.request.true_path
-
-        return context
-
-
-class RuntimeOptionsInterceptor(RequestInterceptor):
-    """SDK通用请求拦截器"""
-
-    def name(self):
-        return 'volcengine-runtime-options-interceptor'
-
-    def intercept(self, context):
-        opt = context.request.runtime_options
-        if not opt:
-            return context
-
-        context.request.ak = opt.ak if opt.ak is not None else context.request.ak
-        context.request.sk = opt.sk if opt.sk is not None else context.request.sk
-        context.request.session_token = opt.session_token \
-            if opt.session_token is not None else context.request.session_token
-        context.request.region = opt.region if opt.region is not None else context.request.region
-        context.request.scheme = opt.scheme if opt.scheme is not None else context.request.scheme
-
-        if opt.connect_timeout is not None or opt.read_timeout is not None:
-            context.request.request_timeout = Timeout(
-                connect=opt.connect_timeout if opt.connect_timeout is not None else -1,
-                read=opt.read_timeout if opt.read_timeout is not None else -1,
-            )
-
-        if opt.endpoint_provider is not None:
-            context.request.endpoint_provider = opt.endpoint_provider
-            context.request.host = None
-
-        return context

…erceptor/interceptors/common_response.py …ors/deserialized_response_interceptor.pyvolcenginesdkcore/interceptor/interceptors/common_response.py renamed to volcenginesdkcore/interceptor/interceptors/deserialized_response_interceptor.py volcenginesdkcore/interceptor/interceptors/common_response.py renamed to volcenginesdkcore/interceptor/interceptors/deserialized_response_interceptor.py

@@ -44,7 +44,7 @@ def __init__(
         self.sk = configuration.sk
         self.session_token = configuration.session_token
         self.region = configuration.region
-        self.scheme = configuration.schema
+        self.scheme = configuration.scheme
         self.endpoint_provider = configuration.endpoint_provider
 
         self.runtime_options = None