Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -16,6 +16,12 @@ 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 22.7
+
+- Expand 'AppendDocument' API method to support 'ImageEntryList' for directly appending images to documents and another images.
+- Added 'CompressDocument' API method to support compression and resizing images inside the document for reduce the size of the document.
+
+
 ## Enhancements in Version 22.6
 
 - Added 'DeleteBookmark' and 'DeleteBookmarkOnline' API methods for delete bookmarks by name from the document.

TestData/DocumentActions/CompressDocument/TestCompress.docx

@@ -12,6 +12,7 @@
 # import models into sdk package
 from asposewordscloud.models.api_error import ApiError
 from asposewordscloud.models.available_fonts_response import AvailableFontsResponse
+from asposewordscloud.models.base_entry import BaseEntry
 from asposewordscloud.models.bmp_save_options_data import BmpSaveOptionsData
 from asposewordscloud.models.bookmark import Bookmark
 from asposewordscloud.models.bookmark_data import BookmarkData
@@ -35,6 +36,8 @@
 from asposewordscloud.models.comment_update import CommentUpdate
 from asposewordscloud.models.compare_data import CompareData
 from asposewordscloud.models.compare_options import CompareOptions
+from asposewordscloud.models.compress_options import CompressOptions
+from asposewordscloud.models.compress_response import CompressResponse
 from asposewordscloud.models.csv_data_load_options import CsvDataLoadOptions
 from asposewordscloud.models.custom_xml_part import CustomXmlPart
 from asposewordscloud.models.custom_xml_part_insert import CustomXmlPartInsert
@@ -120,6 +123,8 @@
 from asposewordscloud.models.hyperlink_response import HyperlinkResponse
 from asposewordscloud.models.hyperlinks import Hyperlinks
 from asposewordscloud.models.hyperlinks_response import HyperlinksResponse
+from asposewordscloud.models.image_entry import ImageEntry
+from asposewordscloud.models.image_entry_list import ImageEntryList
 from asposewordscloud.models.info_additional_item import InfoAdditionalItem
 from asposewordscloud.models.info_response import InfoResponse
 from asposewordscloud.models.jpeg_save_options_data import JpegSaveOptionsData

asposewordscloud/__init__.py

@@ -83,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': '22.6'}
+        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '22.7'}
         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 22.6'
+        self.user_agent = 'python sdk 22.7'
 
     def __del__(self):
         if not self.pool is None:

asposewordscloud/api_client.py

@@ -232,7 +232,7 @@ def append_document(self, request, **kwargs):  # noqa: E501
 
         :param is_async bool
         :param name str : The filename of the input document. (required)
-        :param document_list DocumentEntryList : <see cref="DocumentEntryList"/> with a list of documents to append. (required)
+        :param document_list BaseEntryList : <see cref="BaseEntryList"/> with a list of entries to append. (required)
         :param folder str : Original document folder.
         :param storage str : Original document storage.
         :param load_encoding str : Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
@@ -315,7 +315,7 @@ def append_document_online(self, request, **kwargs):  # noqa: E501
 
         :param is_async bool
         :param document file : Original document. (required)
-        :param document_list DocumentEntryList : <see cref="DocumentEntryList"/> with a list of documents to append. (required)
+        :param document_list BaseEntryList : <see cref="BaseEntryList"/> with a list of entries to append. (required)
         :param load_encoding str : Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
         :param password str : Password of protected Word document. Use the parameter to pass a password via SDK. SDK encrypts it automatically. We don't recommend to use the parameter to pass a plain password for direct call of API.
         :param encrypted_password str : Password of protected Word document. Use the parameter to pass an encrypted password for direct calls of API. See SDK code for encyption details.
@@ -1108,6 +1108,166 @@ def compare_document_online_with_http_info(self, request, **kwargs):  # noqa: E5
             _request_timeout=params.get('_request_timeout'),
             collection_formats=http_params['collection_formats']))
 
+    def compress_document(self, request, **kwargs):  # noqa: E501
+        """The default settings allows to reduce the size of the document without any visible degradation of images quality.  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass is_async=True
+
+        :param is_async bool
+        :param name str : The filename of the input document. (required)
+        :param compress_options CompressOptions : Options for compress the document. (required)
+        :param folder str : Original document folder.
+        :param storage str : Original document storage.
+        :param load_encoding str : Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
+        :param password str : Password of protected Word document. Use the parameter to pass a password via SDK. SDK encrypts it automatically. We don't recommend to use the parameter to pass a plain password for direct call of API.
+        :param encrypted_password str : Password of protected Word document. Use the parameter to pass an encrypted password for direct calls of API. See SDK code for encyption details.
+        :param dest_file_name str : Result path of the document after the operation. If this parameter is omitted then result of the operation will be saved as the source document.
+        :return: CompressResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        try:
+            if kwargs.get('is_async'):
+                return self.compress_document_with_http_info(request, **kwargs)  # noqa: E501
+            data = self.compress_document_with_http_info(request, **kwargs)  # noqa: E501
+            return data
+        except ApiException as e:
+            if e.status == 401:
+                self.api_client.request_token()
+                if kwargs.get('is_async'):
+                    return self.compress_document_with_http_info(request, **kwargs)  # noqa: E501
+            data = self.compress_document_with_http_info(request, **kwargs)  # noqa: E501
+            return data
+        
+    def compress_document_with_http_info(self, request, **kwargs):  # noqa: E501
+        """The default settings allows to reduce the size of the document without any visible degradation of images quality.  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass is_async=True
+
+        :param is_async bool
+        :param request CompressDocumentRequest object with parameters
+        :return: CompressResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        params = locals()
+        params['is_async'] = ''
+        params['_preload_content'] = True
+        params['_request_timeout'] = self.timeout
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method compress_document" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        http_params = request.create_http_request(self.api_client)
+
+        # HTTP header `Accept`
+        http_params['header_params']['Accept'] = self.api_client.select_header_accept(
+            ['application/xml', 'application/json'])  # noqa: E501
+        # Authentication setting
+        auth_settings = ['JWT']  # noqa: E501
+
+        self.api_client.handle_password(http_params, self)
+
+        return request.deserialize_response(self.api_client, self.api_client.call_api(
+            http_params['path'],
+            http_params['method'],
+            http_params['query_params'],
+            http_params['header_params'],
+            body=http_params['body'],
+            post_params=http_params['form_params'],
+            response_type=http_params['response_type'],  # noqa: E501
+            auth_settings=auth_settings,
+            is_async=params.get('is_async'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=http_params['collection_formats']))
+
+    def compress_document_online(self, request, **kwargs):  # noqa: E501
+        """Compress and resize images inside the document.  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass is_async=True
+
+        :param is_async bool
+        :param document file : The document. (required)
+        :param compress_options CompressOptions : Options for compress the document. (required)
+        :param load_encoding str : Encoding that will be used to load an HTML (or TXT) document if the encoding is not specified in HTML.
+        :param password str : Password of protected Word document. Use the parameter to pass a password via SDK. SDK encrypts it automatically. We don't recommend to use the parameter to pass a plain password for direct call of API.
+        :param encrypted_password str : Password of protected Word document. Use the parameter to pass an encrypted password for direct calls of API. See SDK code for encyption details.
+        :param dest_file_name str : Result path of the document after the operation. If this parameter is omitted then result of the operation will be saved as the source document.
+        :return: CompressDocumentOnlineResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        try:
+            if kwargs.get('is_async'):
+                return self.compress_document_online_with_http_info(request, **kwargs)  # noqa: E501
+            data = self.compress_document_online_with_http_info(request, **kwargs)  # noqa: E501
+            return data
+        except ApiException as e:
+            if e.status == 401:
+                self.api_client.request_token()
+                if kwargs.get('is_async'):
+                    return self.compress_document_online_with_http_info(request, **kwargs)  # noqa: E501
+            data = self.compress_document_online_with_http_info(request, **kwargs)  # noqa: E501
+            return data
+        
+    def compress_document_online_with_http_info(self, request, **kwargs):  # noqa: E501
+        """Compress and resize images inside the document.  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass is_async=True
+
+        :param is_async bool
+        :param request CompressDocumentOnlineRequest object with parameters
+        :return: CompressDocumentOnlineResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        params = locals()
+        params['is_async'] = ''
+        params['_preload_content'] = True
+        params['_request_timeout'] = self.timeout
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method compress_document_online" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        http_params = request.create_http_request(self.api_client)
+
+        # HTTP header `Accept`
+        http_params['header_params']['Accept'] = self.api_client.select_header_accept(
+            ['application/xml', 'application/json'])  # noqa: E501
+        # Authentication setting
+        auth_settings = ['JWT']  # noqa: E501
+
+        self.api_client.handle_password(http_params, self)
+
+        return request.deserialize_response(self.api_client, self.api_client.call_api(
+            http_params['path'],
+            http_params['method'],
+            http_params['query_params'],
+            http_params['header_params'],
+            body=http_params['body'],
+            post_params=http_params['form_params'],
+            response_type=http_params['response_type'],  # noqa: E501
+            auth_settings=auth_settings,
+            is_async=params.get('is_async'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=http_params['collection_formats']))
+
     def convert_document(self, request, **kwargs):  # noqa: E501
         """Converts a document on a local drive to the specified format.  # noqa: E501
 

asposewordscloud/apis/words_api.py

@@ -262,6 +262,6 @@ def to_debug_report(self):
         return "Python SDK Debug Report:\n"\
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
-               "Version of the API: 22.6\n"\
-               "SDK Package Version: 22.6".\
+               "Version of the API: 22.7\n"\
+               "SDK Package Version: 22.7".\
                format(env=sys.platform, pyversion=sys.version)

asposewordscloud/configuration.py

@@ -7,6 +7,7 @@
 # import models into model package
 from asposewordscloud.models.api_error import ApiError
 from asposewordscloud.models.available_fonts_response import AvailableFontsResponse
+from asposewordscloud.models.base_entry import BaseEntry
 from asposewordscloud.models.bmp_save_options_data import BmpSaveOptionsData
 from asposewordscloud.models.bookmark import Bookmark
 from asposewordscloud.models.bookmark_data import BookmarkData
@@ -30,6 +31,8 @@
 from asposewordscloud.models.comment_update import CommentUpdate
 from asposewordscloud.models.compare_data import CompareData
 from asposewordscloud.models.compare_options import CompareOptions
+from asposewordscloud.models.compress_options import CompressOptions
+from asposewordscloud.models.compress_response import CompressResponse
 from asposewordscloud.models.csv_data_load_options import CsvDataLoadOptions
 from asposewordscloud.models.custom_xml_part import CustomXmlPart
 from asposewordscloud.models.custom_xml_part_insert import CustomXmlPartInsert
@@ -115,6 +118,8 @@
 from asposewordscloud.models.hyperlink_response import HyperlinkResponse
 from asposewordscloud.models.hyperlinks import Hyperlinks
 from asposewordscloud.models.hyperlinks_response import HyperlinksResponse
+from asposewordscloud.models.image_entry import ImageEntry
+from asposewordscloud.models.image_entry_list import ImageEntryList
 from asposewordscloud.models.info_additional_item import InfoAdditionalItem
 from asposewordscloud.models.info_response import InfoResponse
 from asposewordscloud.models.jpeg_save_options_data import JpegSaveOptionsData