Merge pull request #67 from aspose-pdf-cloud/develop

update to 24.3

Author: kaferi

README.md

@@ -30,8 +30,7 @@ XLS, XLSX, PPTX, DOC, DOCX, MobiXML, JPEG, EMF, PNG, BMP, GIF, TIFF, Text
 ## Read PDF Formats
 MHT, PCL, PS, XSLFO, MD
 
-## Enhancements in Version 24.2
-- Memory leak when converting PDF to DOCX.
+## Enhancements in Version 24.3
 - A new version of Aspose.PDF Cloud was prepared using the latest version of Aspose.PDF for .NET.
 
 ## Requirements.
@@ -68,13 +67,18 @@ import asposepdfcloud
 ```python
 	# Get your ClientId and ClientSecret from https://dashboard.aspose.cloud (free registration required).
 	pdf_api_client = asposepdfcloud.ApiClient('MY_CLIENT_ID', 'MY_CLIENT_SECRET')
-
 	pdf_api = asposepdfcloud.PdfApi(pdf_api_client)
-
 	file_name = 'PdfWithAnnotations.pdf'
 	page_number = 2
 	response = pdf_api.get_page_annotations(file_name, page_number, folder=temp_folder)
 ```
+
+## SelfHost Aspose.PDF Cloud
+Create **ApiClient** object without **app_key** and **app_sid** parameters, but with **host** parameter set to *url of SelfHost Aspose.PDF Cloud* and **self_host** parameter set to *True*:
+```python
+	pdf_api_client = asposepdfcloud.ApiClient('', '', 'MY_SELFHOST_URL', True)
+```
+
 ## Unit Tests
 Aspose PDF SDK includes a suite of unit tests within the "test" subdirectory. These Unit Tests also serves as examples of how to use the Aspose PDF SDK.
 

asposepdfcloud/api_client.py

@@ -76,15 +76,16 @@ class ApiClient(object):
         'object': object,
     }
 
-    def __init__(self, app_key, app_sid, host=None):
+    def __init__(self, app_key, app_sid, host=None, self_host=False):
         """
         Constructor of the class.
         """
         self.rest_client = RESTClientObject()
         self.default_headers = {}
         self.default_headers['x-aspose-client'] = 'python sdk'
-        self.default_headers['x-aspose-client-version'] = '24.2.0'
+        self.default_headers['x-aspose-client-version'] = '24.3.0'
 
+        self.self_host = self_host
         self.app_key = app_key
         self.app_sid = app_sid
 
@@ -175,12 +176,11 @@ def __call_api(self, resource_path, method,
         # request url
         url = self.host + resource_path
 
-
-        # OAuth2.0 authentication
-        if Configuration().access_token == "":
-          self.__request_token()
-
-        self.__add_o_auth_token(header_params)
+        if not self.self_host:
+            # OAuth2.0 authentication
+            if Configuration().access_token == "":
+                self.__request_token()
+            self.__add_o_auth_token(header_params)
 
         response_data = None
 
@@ -194,9 +194,10 @@ def __call_api(self, resource_path, method,
                                          _request_timeout=_request_timeout)
         except ApiException as error:
             if error.status == 401:
-                self.__request_token()
-                self.__add_o_auth_token(header_params)
-                response_data = self.request(method, url,
+                if not self.self_host:
+                    self.__request_token()
+                    self.__add_o_auth_token(header_params)
+                    response_data = self.request(method, url,
                                          query_params=query_params,
                                          headers=header_params,
                                          post_params=post_params, body=body,

asposepdfcloud/configuration.py

@@ -199,5 +199,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 3.0\n"\
-               "SDK Package Version: 24.2.0".\
+               "SDK Package Version: 24.3.0".\
                format(env=sys.platform, pyversion=sys.version)

setup.py

@@ -32,7 +32,7 @@
 from setuptools import setup, find_packages
 
 NAME = "asposepdfcloud"
-VERSION = "24.2.0"
+VERSION = "24.3.0"
 # To install the library, run the following
 #
 # python setup.py install

test/pdf_tests.py

@@ -50,14 +50,14 @@ def setUp(self):
             data = json.load(json_file)
 
             self.pdf_api_client = asposepdfcloud.api_client.ApiClient(
-                                app_key=str(data['AppKey']),
-                                app_sid=str(data['AppSID']),
-                                host=str(data['ProductUri']))
+                app_key=str(data.get('AppKey', '')),
+                app_sid=str(data.get('AppSID', '')),
+                host=str(data['ProductUri']),
+                self_host=bool(data.get('SelfHost', False)),
+                )
 
             self.pdf_api = PdfApi(self.pdf_api_client)
-
             self.output_path = str(data['OutputLocation'])
-
             self.temp_folder = 'TempPdfCloud'
             self.test_data_path = 'test_data/'