Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -16,6 +16,10 @@ Python Cloud SDK wraps Aspose.Words Cloud API so you could seamlessly integrate
 - [Convert a document to desired file format](https://docs.aspose.cloud/display/wordscloud/Convert+Document+to+Destination+Format+with+Detailed+Settings+and+Save+Result+to+Storage) along with detailed settings.
 - Convert an encrypted PDF document into Word document format.
 
+## Enhancements in Version 21.11
+
+
+
 ## Enhancements in Version 21.10
 
 - Removed 'GraphicsQualityOptions' image save option as it no longer supported.
@@ -185,8 +189,7 @@ The complete source code is available at [GitHub Repository](https://github.com/
 ```python
         # Start README example
 
-        self.words_api = asposewordscloud.WordsApi(client_id, client_secret)
-        self.words_api.api_client.configuration.host = base_url
+        self.words_api = asposewordscloud.WordsApi(client_id, client_secret, base_url)
 
         upload_request = asposewordscloud.models.requests.UploadFileRequest(
             open(os.path.join(local_folder, filename), 'rb'), os.path.join(remote_folder, remote_name))

asposewordscloud/api_client.py

@@ -28,6 +28,7 @@
 
 import datetime
 import email.parser
+import io
 import json
 import mimetypes
 from multiprocessing.pool import ThreadPool
@@ -41,6 +42,7 @@
 from six.moves.urllib.parse import quote
 import six
 from urllib3 import encode_multipart_formdata
+from base64 import b64encode
 
 from asposewordscloud.configuration import Configuration
 import asposewordscloud.models
@@ -81,12 +83,12 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
 
         self.pool = None
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '21.10'}
+        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '21.11'}
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'python sdk 21.10'
+        self.user_agent = 'python sdk 21.11'
 
     def __del__(self):
         if not self.pool is None:
@@ -252,15 +254,21 @@ def sanitize_for_serialization(self, obj):
         return {key: self.sanitize_for_serialization(val)
                 for key, val in six.iteritems(obj_dict)}
 
-    def deserialize_multipart(self, multipart, requests):
-        if len(multipart.parts) != len(requests):
-            raise rest.ApiException(status=0, reason="Response parts and requests count mismatch.")
+    def deserialize_multipart(self, without_intermediate_results, multipart, requests):
+        if without_intermediate_results:
+            if len(multipart.parts) != 1:
+                raise rest.ApiException(status=0, reason="Response must have one part.")
+        else:
+            if len(multipart.parts) != len(requests):
+                raise rest.ApiException(status=0, reason="Response parts and requests count mismatch.")
+
+        id_to_requests = {}
+        for r in requests:
+            id_to_requests[r.id] = r
 
         results = []
-        for part_id in range(len(multipart.parts)):
+        for part in multipart.parts:
             try:
-                response_type = requests[part_id].get_response_type()
-                part = multipart.parts[part_id]
                 data = part.content
                 packet_parts = data.split(b"\r\n\r\n", 1)
                 header_parts = packet_parts[0].split(b"\r\n")
@@ -274,6 +282,8 @@ def deserialize_multipart(self, multipart, requests):
                         if len(header_line_parts) == 2:
                             headers[header_line_parts[0].strip()] = header_line_parts[1].strip()
 
+                response_type = id_to_requests[headers["RequestId"]].get_response_type()
+
                 result = None
                 if code == 200:
                     if response_type is not 'None':
@@ -524,12 +534,13 @@ def prepare_post_parameters(self, post_params=None):
                             continue
                         file_names = v if type(v) is list else [v]
                         for n in file_names:
-                            filename = os.path.basename(n.name)
-                            filedata = n.read()
-                            mimetype = (mimetypes.guess_type(filename)[0] or
-                                        'application/octet-stream')
-                            params.append(
-                                tuple([k, tuple([filename, filedata, mimetype])]))
+                            if isinstance(n, io.StringIO):
+                                params.append(tuple([k, tuple(['document', n.getvalue(), 'application/octet-stream'])]))
+                            else:
+                                filename = os.path.basename(n.name)
+                                filedata = n.read()
+                                mimetype = (mimetypes.guess_type(filename)[0] or 'application/octet-stream')
+                                params.append(tuple([k, tuple([filename, filedata, mimetype])]))
 
         return params
 
@@ -708,11 +719,13 @@ def __deserialize_model(self, data, klass):
                 instance = self.__deserialize(data, klass_name)
         return instance
 
-    def request_to_batch_part(self, request):
+    def request_to_batch_part(self, request, rsa_key):
         http_request = request.create_http_request(self)
         if http_request['form_params'] and http_request['body']:
             raise ValueError("body parameter cannot be used with post_params parameter.")
 
+        self.handle_password(http_request, rsa_key)
+
         url = http_request['path'][len('/v4.0/words/'):]
         if http_request['query_params']:
             url += '?' + urlencode(http_request['query_params'])
@@ -746,4 +759,20 @@ def request_to_batch_part(self, request):
         if body:
             result.extend(body)
 
-        return [None, result, 'multipart']
+        return [None, result, 'multipart']
+
+    def handle_password(self, http_params, rsa_key):
+
+        if rsa_key is None:
+            return
+
+        index = -1
+        for i in range(len(http_params['query_params'])):
+            k, v = http_params['query_params'][i]
+            if k == 'password':
+                index = i
+                break
+
+        if index > -1:
+            k,v = http_params['query_params'].pop(index)
+            http_params['query_params'].append(('encryptedPassword', b64encode(rsa_key.encrypt(v.encode('utf-8')))))