byteplus-python-sdk-v2 1.0.2__tar.gz → 1.0.3__tar.gz

{byteplus-python-sdk-v2-1.0.2/byteplus_python_sdk_v2.egg-info → byteplus-python-sdk-v2-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: byteplus-python-sdk-v2
-Version: 1.0.2
+Version: 1.0.3
 Summary: Byteplus SDK for Python
 Home-page: UNKNOWN
 Author: UNKNOWN

{byteplus-python-sdk-v2-1.0.2 → byteplus-python-sdk-v2-1.0.3/byteplus_python_sdk_v2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: byteplus-python-sdk-v2
-Version: 1.0.2
+Version: 1.0.3
 Summary: Byteplus SDK for Python
 Home-page: UNKNOWN
 Author: UNKNOWN

{byteplus-python-sdk-v2-1.0.2 → byteplus-python-sdk-v2-1.0.3}/byteplus_python_sdk_v2.egg-info/SOURCES.txt

@@ -57,6 +57,7 @@ byteplussdkbilling/models/unsubscribe_instance_response.py
 byteplussdkcore/__init__.py
 byteplussdkcore/api_client.py
 byteplussdkcore/configuration.py
+byteplussdkcore/endpoint.py
 byteplussdkcore/flatten.py
 byteplussdkcore/metadata.py
 byteplussdkcore/rest.py

{byteplus-python-sdk-v2-1.0.2 → byteplus-python-sdk-v2-1.0.3}/byteplussdkcore/api_client.py

@@ -19,6 +19,7 @@ from byteplussdkcore.configuration import Configuration
 from byteplussdkcore import rest
 from byteplussdkcore.metadata import ResponseMetadata
 from byteplussdkcore.signv4 import SignerV4
+from byteplussdkcore.endpoint import DefaultEndpointResolver
 
 
 class ApiClient(object):
@@ -67,7 +68,7 @@ class ApiClient(object):
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'byteplus-python-sdk-v2/1.0.2'
+        self.user_agent = 'byteplus-python-sdk-v2/1.0.3'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):
@@ -170,15 +171,20 @@ class ApiClient(object):
 
         true_path = "/"
         service = resource_path.split("/")[3]
+        host = ""
+        if len(self.configuration.host) > 0:
+            host = self.configuration.host
+        else:
+            host = DefaultEndpointResolver.get_default_endpoint_by_service_info(service, self.configuration.region)
 
         # auth setting
         # notice: change query_params from tuple to dict
-        self.update_params_for_auth(host=self.configuration.host, path=true_path, method=method,
+        self.update_params_for_auth(host=host, path=true_path, method=method,
                                     headers=header_params, querys=query_params,
                                     auth_settings=auth_settings, body=body, service=service)
 
         # request url
-        url = self.configuration.schema + "://" + self.configuration.host + true_path
+        url = self.configuration.schema + "://" + host + true_path
 
         # perform request and return response
         response_data = self.request(
@@ -646,7 +652,7 @@ class ApiClient(object):
                 status=0,
                 reason=(
                     "Failed to parse `{0}` as datetime object"
-                        .format(string)
+                    .format(string)
                 )
             )
 

{byteplus-python-sdk-v2-1.0.2 → byteplus-python-sdk-v2-1.0.3}/byteplussdkcore/configuration.py

@@ -34,9 +34,9 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
 
     def __init__(self):
         # Default Base url
-        self.host = "open.byteplusapi.com"
+        self.host = ""
         # Schema Support http or https
-        self.schema = "http"
+        self.schema = "https"
         # Temp file folder for downloading files
         self.temp_folder_path = None
 
@@ -219,5 +219,5 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 0.1.0\n"\
-               "SDK Package Version: 1.0.2".\
+               "SDK Package Version: 1.0.3".\
                format(env=sys.platform, pyversion=sys.version)

byteplus-python-sdk-v2-1.0.3/byteplussdkcore/endpoint.py

@@ -0,0 +1,32 @@
+class ServiceEndpointInfo(object):
+    def __init__(self, service_name, is_global, global_endpoint, default_endpoint, region_endpoint_map):
+        self.service_name = service_name
+        self.is_global = is_global
+        self.global_endpoint = global_endpoint
+        self.default_endpoint = default_endpoint
+        self.region_endpoint_map = region_endpoint_map
+
+
+class DefaultEndpointResolver(object):
+    global_endpoint = "open.ap-southeast-1.byteplusapi.com"
+    default_endpoint_map = {
+        "billing": ServiceEndpointInfo("billing",
+                                       True,
+                                       "",
+                                       "open.byteplusapi.com",
+                                       None)
+    }
+
+    @staticmethod
+    def get_default_endpoint_by_service_info(service, region):
+        if service in DefaultEndpointResolver.default_endpoint_map:
+            service_endpoint_info = DefaultEndpointResolver.default_endpoint_map[service]
+            if service_endpoint_info.is_global:
+                if len(service_endpoint_info.global_endpoint) > 0:
+                    return service_endpoint_info.global_endpoint
+            else:
+                if service_endpoint_info.region_endpoint_map is not None and region in service_endpoint_info.region_endpoint_map:
+                    return service_endpoint_info.region_endpoint_map[region]
+            if service_endpoint_info.default_endpoint is not None and len(service_endpoint_info.default_endpoint) > 0:
+                return service_endpoint_info.default_endpoint
+        return DefaultEndpointResolver.global_endpoint

{byteplus-python-sdk-v2-1.0.2 → byteplus-python-sdk-v2-1.0.3}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "byteplus-python-sdk-v2"
-VERSION = "1.0.2"
+VERSION = "1.0.3"
 # To install the library, run the following
 #
 # python setup.py install