Merge remote-tracking branch 'origin/master' into release

Author: dynabic-billing-team

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 24.4
+
+- Added the 'MergeWithNext' method to merge a section with the next one.
+- Added the 'LockAspectRatio' propperty for DrawingObjectInsert and DrawingObjectUpdate methods.
+
+
 ## Enhancements in Version 24.3
 
 - Added support for 'RemoveEmptyCells' option for the 'Cleanup' parameter in the insert 'MailMerge' API method.

asposewordscloud/api_client.py

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

asposewordscloud/apis/words_api.py

@@ -20487,6 +20487,169 @@ def load_web_document_with_http_info(self, request, **kwargs):  # noqa: E501
             collection_formats=http_params['collection_formats']))
 
 
+    def merge_with_next(self, request, **kwargs):  # noqa: E501
+        """Merge the section with the next one.  # 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 section_index int : The index of the section. (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.
+        :param revision_author str : Initials of the author to use for revisions.If you set this parameter and then make some changes to the document programmatically, save the document and later open the document in MS Word you will see these changes as revisions.
+        :param revision_date_time str : The date and time to use for revisions.
+        :return: None
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        try:
+            if kwargs.get('is_async'):
+                return self.merge_with_next_with_http_info(request, **kwargs)  # noqa: E501
+            data = self.merge_with_next_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.merge_with_next_with_http_info(request, **kwargs)  # noqa: E501
+            data = self.merge_with_next_with_http_info(request, **kwargs)  # noqa: E501
+            return data
+        
+    def merge_with_next_with_http_info(self, request, **kwargs):  # noqa: E501
+        """Merge the section with the next one.  # 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 MergeWithNextRequest object with parameters
+        :return: None
+                 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 merge_with_next" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        http_params = request.create_http_request(self.api_client, self)
+
+        # 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=None,
+            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 merge_with_next_online(self, request, **kwargs):  # noqa: E501
+        """Merge the section with the next one.  # 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 section_index int : The index of the section. (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.
+        :param revision_author str : Initials of the author to use for revisions.If you set this parameter and then make some changes to the document programmatically, save the document and later open the document in MS Word you will see these changes as revisions.
+        :param revision_date_time str : The date and time to use for revisions.
+        :return: files_collection
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        try:
+            if kwargs.get('is_async'):
+                return self.merge_with_next_online_with_http_info(request, **kwargs)  # noqa: E501
+            data = self.merge_with_next_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.merge_with_next_online_with_http_info(request, **kwargs)  # noqa: E501
+            data = self.merge_with_next_online_with_http_info(request, **kwargs)  # noqa: E501
+            return data
+        
+    def merge_with_next_online_with_http_info(self, request, **kwargs):  # noqa: E501
+        """Merge the section with the next one.  # 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 MergeWithNextOnlineRequest object with parameters
+        :return: files_collection
+                 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 merge_with_next_online" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        http_params = request.create_http_request(self.api_client, self)
+
+        # 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=None,
+            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 move_file(self, request, **kwargs):  # noqa: E501
         """Move file.  # noqa: E501
 

asposewordscloud/configuration.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: 24.3\n"\
-               "SDK Package Version: 24.3".\
+               "Version of the API: 24.4\n"\
+               "SDK Package Version: 24.4".\
                format(env=sys.platform, pyversion=sys.version)

asposewordscloud/models/drawing_object_insert.py

@@ -50,7 +50,8 @@ class DrawingObjectInsert(object):
         'top': 'float',
         'width': 'float',
         'height': 'float',
-        'wrap_type': 'str'
+        'wrap_type': 'str',
+        'aspect_ratio_locked': 'bool'
     }
 
     attribute_map = {
@@ -61,10 +62,11 @@ class DrawingObjectInsert(object):
         'top': 'Top',
         'width': 'Width',
         'height': 'Height',
-        'wrap_type': 'WrapType'
+        'wrap_type': 'WrapType',
+        'aspect_ratio_locked': 'AspectRatioLocked'
     }
 
-    def __init__(self, position=None, relative_horizontal_position=None, left=None, relative_vertical_position=None, top=None, width=None, height=None, wrap_type=None):  # noqa: E501
+    def __init__(self, position=None, relative_horizontal_position=None, left=None, relative_vertical_position=None, top=None, width=None, height=None, wrap_type=None, aspect_ratio_locked=None):  # noqa: E501
         """DrawingObjectInsert - a model defined in Swagger"""  # noqa: E501
 
         self._position = None
@@ -75,6 +77,7 @@ def __init__(self, position=None, relative_horizontal_position=None, left=None,
         self._width = None
         self._height = None
         self._wrap_type = None
+        self._aspect_ratio_locked = None
         self.discriminator = None
 
         if position is not None:
@@ -93,6 +96,8 @@ def __init__(self, position=None, relative_horizontal_position=None, left=None,
             self.height = height
         if wrap_type is not None:
             self.wrap_type = wrap_type
+        if aspect_ratio_locked is not None:
+            self.aspect_ratio_locked = aspect_ratio_locked
 
     @property
     def position(self):
@@ -294,6 +299,28 @@ def wrap_type(self, wrap_type):
         else:
             self._wrap_type = allowed_values[int(wrap_type) if six.PY3 else long(wrap_type)]
 
+    @property
+    def aspect_ratio_locked(self):
+        """Gets the aspect_ratio_locked of this DrawingObjectInsert.  # noqa: E501
+
+        Gets or sets a value indicating whether AspectRatioLocked option on or off.  # noqa: E501
+
+        :return: The aspect_ratio_locked of this DrawingObjectInsert.  # noqa: E501
+        :rtype: bool
+        """
+        return self._aspect_ratio_locked
+
+    @aspect_ratio_locked.setter
+    def aspect_ratio_locked(self, aspect_ratio_locked):
+        """Sets the aspect_ratio_locked of this DrawingObjectInsert.
+
+        Gets or sets a value indicating whether AspectRatioLocked option on or off.  # noqa: E501
+
+        :param aspect_ratio_locked: The aspect_ratio_locked of this DrawingObjectInsert.  # noqa: E501
+        :type: bool
+        """
+        self._aspect_ratio_locked = aspect_ratio_locked
+
 
     def extract_files_content(self, filesContentResult):
         """Append the file content result list"""
@@ -326,6 +353,7 @@ def validate(self):
 
 
 
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

asposewordscloud/models/drawing_object_update.py

@@ -49,7 +49,8 @@ class DrawingObjectUpdate(object):
         'top': 'float',
         'width': 'float',
         'height': 'float',
-        'wrap_type': 'str'
+        'wrap_type': 'str',
+        'aspect_ratio_locked': 'bool'
     }
 
     attribute_map = {
@@ -59,10 +60,11 @@ class DrawingObjectUpdate(object):
         'top': 'Top',
         'width': 'Width',
         'height': 'Height',
-        'wrap_type': 'WrapType'
+        'wrap_type': 'WrapType',
+        'aspect_ratio_locked': 'AspectRatioLocked'
     }
 
-    def __init__(self, relative_horizontal_position=None, left=None, relative_vertical_position=None, top=None, width=None, height=None, wrap_type=None):  # noqa: E501
+    def __init__(self, relative_horizontal_position=None, left=None, relative_vertical_position=None, top=None, width=None, height=None, wrap_type=None, aspect_ratio_locked=None):  # noqa: E501
         """DrawingObjectUpdate - a model defined in Swagger"""  # noqa: E501
 
         self._relative_horizontal_position = None
@@ -72,6 +74,7 @@ def __init__(self, relative_horizontal_position=None, left=None, relative_vertic
         self._width = None
         self._height = None
         self._wrap_type = None
+        self._aspect_ratio_locked = None
         self.discriminator = None
 
         if relative_horizontal_position is not None:
@@ -88,6 +91,8 @@ def __init__(self, relative_horizontal_position=None, left=None, relative_vertic
             self.height = height
         if wrap_type is not None:
             self.wrap_type = wrap_type
+        if aspect_ratio_locked is not None:
+            self.aspect_ratio_locked = aspect_ratio_locked
 
     @property
     def relative_horizontal_position(self):
@@ -267,6 +272,28 @@ def wrap_type(self, wrap_type):
         else:
             self._wrap_type = allowed_values[int(wrap_type) if six.PY3 else long(wrap_type)]
 
+    @property
+    def aspect_ratio_locked(self):
+        """Gets the aspect_ratio_locked of this DrawingObjectUpdate.  # noqa: E501
+
+        Gets or sets a value indicating whether AspectRatioLocked option on or off.  # noqa: E501
+
+        :return: The aspect_ratio_locked of this DrawingObjectUpdate.  # noqa: E501
+        :rtype: bool
+        """
+        return self._aspect_ratio_locked
+
+    @aspect_ratio_locked.setter
+    def aspect_ratio_locked(self, aspect_ratio_locked):
+        """Sets the aspect_ratio_locked of this DrawingObjectUpdate.
+
+        Gets or sets a value indicating whether AspectRatioLocked option on or off.  # noqa: E501
+
+        :param aspect_ratio_locked: The aspect_ratio_locked of this DrawingObjectUpdate.  # noqa: E501
+        :type: bool
+        """
+        self._aspect_ratio_locked = aspect_ratio_locked
+
 
     def extract_files_content(self, filesContentResult):
         """Append the file content result list"""

asposewordscloud/models/requests/__init__.py

@@ -254,6 +254,8 @@
 from asposewordscloud.models.requests.insert_watermark_text_online_request import InsertWatermarkTextOnlineRequest
 from asposewordscloud.models.requests.link_header_footers_to_previous_request import LinkHeaderFootersToPreviousRequest
 from asposewordscloud.models.requests.load_web_document_request import LoadWebDocumentRequest
+from asposewordscloud.models.requests.merge_with_next_request import MergeWithNextRequest
+from asposewordscloud.models.requests.merge_with_next_online_request import MergeWithNextOnlineRequest
 from asposewordscloud.models.requests.move_file_request import MoveFileRequest
 from asposewordscloud.models.requests.move_folder_request import MoveFolderRequest
 from asposewordscloud.models.requests.optimize_document_request import OptimizeDocumentRequest