Optimize Python SDK

gordonge · gordonge · commit 13f9c488e332 · 2019-02-12T14:40:41.000+08:00
diff --git a/asposeDiagramcloud/api_client.py b/asposeDiagramcloud/api_client.py
@@ -42,6 +42,7 @@ class ApiClient(object):
     Ref: https://github.com/swagger-api/swagger-codegen
     Do not edit the class manually.
 
+    :param configuration: .Configuration object for this client
     :param host: The base path for the server to call.
     :param header_name: a header to pass when making calls to the API.
     :param header_value: a header value to pass when making calls to the API.
@@ -59,16 +60,20 @@ class ApiClient(object):
         'object': object,
     }
 
-    def __init__(self, host=None, header_name=None, header_value=None, cookie=None):
+    def __init__(self, host=None,configuration=None, header_name=None, header_value=None, cookie=None):
         """
         Constructor of the class.
         """
+        if configuration is None:
+                configuration = Configuration()
+        self.configuration = configuration
+
         self.rest_client = RESTClientObject()
         self.default_headers = {}
         if header_name is not None:
             self.default_headers[header_name] = header_value
         if host is None:
-            self.host = Configuration().host
+            self.host =  self.configuration.host
         else:
             self.host = host
         self.cookie = cookie
@@ -99,7 +104,7 @@ def __call_api(self, resource_path, method,
                    _return_http_data_only=None, collection_formats=None, _preload_content=True,
                    _request_timeout=None):
 
-        config = Configuration()
+        config = self.configuration
 
         # header parameters
         header_params = header_params or {}
@@ -505,7 +510,7 @@ def update_params_for_auth(self, headers, querys, auth_settings):
         :param querys: Query parameters tuple list to be updated.
         :param auth_settings: Authentication setting identifiers list.
         """
-        config = Configuration()
+        config = self.configuration
 
         if not auth_settings:
             return
@@ -532,7 +537,7 @@ def __deserialize_file(self, response):
         :param response:  RESTResponse.
         :return: file path.
         """
-        config = Configuration()
+        config = self.configuration
 
         fd, path = tempfile.mkstemp(dir=config.temp_folder_path)
         os.close(fd)
diff --git a/asposeDiagramcloud/apis/diagram_file_api.py b/asposeDiagramcloud/apis/diagram_file_api.py
@@ -16,6 +16,7 @@
 import sys
 import os
 import re
+import six
 
 # python 2 and python 3 compatibility library
 from six import iteritems
@@ -40,6 +41,57 @@ def __init__(self, api_client=None):
                 config.api_client = ApiClient()
             self.api_client = config.api_client
 
+        self.__request_token()
+
+    def __request_token(self):
+        config = self.api_client.configuration
+        host = config.host
+        self.api_client.host = 'https://api.aspose.cloud/'
+        request_url = "oauth2/token"
+        form_params = [('grant_type', 'client_credentials'), ('client_id', config.api_key['app_sid']),
+                       ('client_secret', config.api_key['api_key'])]
+
+        header_params = {'Accept': 'application/json', 'Content-Type': 'application/x-www-form-urlencoded'}
+
+        data = self.api_client.call_api(request_url, 'POST',
+                                        {},
+                                        [],
+                                        header_params,
+                                        post_params=form_params,
+                                        response_type='object',
+                                        files={}, _return_http_data_only=True)
+        access_token = data['access_token'] if six.PY3 else data['access_token'].encode('utf8')
+        refresh_token = data['refresh_token'] if six.PY3 else data['refresh_token'].encode('utf8')
+        self.api_client.configuration.access_token = access_token
+        self.api_client.host = host
+        self.api_client.configuration.refresh_token = refresh_token
+        
+        self.api_client.set_default_header("Authorization", "Bearer " + access_token)
+
+    
+    # Refresh token method is going to be removed soon. Obsolete, do not use
+    def __refresh_token(self):
+        config = self.api_client.configuration
+        host = config.host
+        config.host = ''
+        request_url = "oauth2/token"
+        form_params = [('grant_type', 'refresh_token'), ('refresh_token', config.refresh_token)]
+
+        header_params = {'Accept': 'application/json', 'Content-Type': 'application/x-www-form-urlencoded'}
+
+        data = self.api_client.call_api(request_url, 'POST',
+                                        {},
+                                        [],
+                                        header_params,
+                                        post_params=form_params,
+                                        response_type='object',
+                                        files={}, _return_http_data_only=True)
+        access_token = data['access_token'] if six.PY3 else data['access_token'].encode('utf8')
+        refresh_token = data['refresh_token'] if six.PY3 else data['refresh_token'].encode('utf8')
+        self.api_client.configuration.access_token = access_token
+        self.api_client.configuration.host = host
+        self.api_client.configuration.refresh_token = refresh_token
+
     def diagram_file_get_diagram(self, name, **kwargs):
         """
         Read document info or export.
@@ -511,3 +563,6 @@ def diagram_file_put_upload_with_http_info(self, name, **kwargs):
                                         _preload_content=params.get('_preload_content', True),
                                         _request_timeout=params.get('_request_timeout'),
                                         collection_formats=collection_formats)
+
+      
+
diff --git a/asposeDiagramcloud/configuration.py b/asposeDiagramcloud/configuration.py
@@ -66,7 +66,7 @@ def __init__(self):
 
         # Logging Settings
         self.logger = {}
-        self.logger["package_logger"] = logging.getLogger("asposeDiagramcloud")
+        self.logger["package_logger"] = logging.getLogger("asposediagramcloud")
         self.logger["urllib3_logger"] = logging.getLogger("urllib3")
         # Log format
         self.logger_format = '%(asctime)s %(levelname)s %(message)s'
diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 from setuptools import setup, find_packages
 
 NAME = "asposediagramcloud"
-VERSION = "18.10.1"
+VERSION = "18.10.2"
 # To install the library, run the following
 #
 # python setup.py install
diff --git a/test/test_base.py b/test/test_base.py
@@ -6,10 +6,11 @@
 ABSPATH = os.path.abspath(os.path.realpath(os.path.dirname(__file__)) + "/..")
 sys.path.append(ABSPATH)
 
-import asposeDiagramcloud
-from asposeDiagramcloud.rest import ApiException
-from asposeDiagramcloud.apis.o_auth_api import OAuthApi
-from asposeDiagramcloud.api_client import ApiClient
+import asposediagramcloud
+from asposediagramcloud.rest import ApiException
+from asposediagramcloud.apis.o_auth_api import OAuthApi
+from asposediagramcloud.api_client import ApiClient
+from asposediagramcloud.configuration import Configuration
 import asposestoragecloud
 
 grantType = "client_credentials"
@@ -18,7 +19,7 @@
 
 def GetAccessToken():
     client = ApiClient('https://api.aspose.cloud/')
-    api = asposeDiagramcloud.apis.o_auth_api.OAuthApi(client)
+    api = asposediagramcloud.apis.o_auth_api.OAuthApi(client)
     data = api.o_auth_post(grantType, clientId, clientSecret)
     return data.access_token
 
@@ -27,8 +28,12 @@ def GetAccessToken():
 def GetApiClient():
     global api_client
     if api_client == None:
-        api_client = ApiClient('https://api.aspose.cloud/v1.1')
-        api_client.set_default_header("Authorization", "Bearer " + GetAccessToken())
+        configuration=Configuration()
+        configuration.api_key['app_sid'] = '84220e69-32e2-41c4-ba2f-662a0a01433e' # Put your appSid here
+        configuration.api_key['api_key'] = '883dc8d6b8ecd879dae35cb363e9eb56' # Put your appkey here
+        api_client = ApiClient('https://api.aspose.cloud/v1.1',configuration)
+       
+        #api_client.set_default_header("Authorization", "Bearer " + GetAccessToken())
     return api_client
 
 
diff --git a/test/test_diagram_file_api.py b/test/test_diagram_file_api.py
@@ -19,19 +19,19 @@
 
 ABSPATH = os.path.abspath(os.path.realpath(os.path.dirname(__file__)) + "/..")
 sys.path.append(ABSPATH)
-import asposeDiagramcloud
+import asposediagramcloud
 import test_base
 
-from asposeDiagramcloud.rest import ApiException
-from asposeDiagramcloud.apis.diagram_file_api import DiagramFileApi
-from asposeDiagramcloud.models import FileFormatRequest
+from asposediagramcloud.rest import ApiException
+from asposediagramcloud.apis.diagram_file_api import DiagramFileApi
+from asposediagramcloud.models import FileFormatRequest
 
 class TestDiagramFileApi(unittest.TestCase):
     """ DiagramFileApi unit test stubs """
 
     def setUp(self):
         self.api_client = test_base.GetApiClient()
-        self.api = asposeDiagramcloud.apis.diagram_file_api.DiagramFileApi(self.api_client)
+        self.api = asposediagramcloud.apis.diagram_file_api.DiagramFileApi(self.api_client)
 
     def tearDown(self):
         pass
@@ -45,7 +45,7 @@ def test_diagram_file_get_diagram(self):
         name ='file_get_1.vdx'       
         folder = "Temp"
         result = self.api.diagram_file_get_diagram(name,format="pdf",folder=folder)
-        print(result);
+        #print(result)
         self.assertIsNotNone(result, 'Error has occurred while get file')
 
     def test_diagram_file_post_save_as(self):

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`from setuptools import setup, find_packages`
`16`	`16`
`17`	`17`	`NAME = "asposediagramcloud"`
`18`		`-VERSION = "18.10.1"`
	`18`	`+VERSION = "18.10.2"`
`19`	`19`	`# To install the library, run the following`
`20`	`20`	`#`
`21`	`21`	`# python setup.py install`