Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -16,12 +16,19 @@ 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.4
+
+- Added ExportShapesAsSvg to HtmlSaveOption.
+- Added new endpoint '~/styles/copy_from'.
+
+
 ## Enhancements in Version 22.3
 
 - Online methods returns the dictionary of files with included original filename as key instead of single file content in responses.
 - Parameters contained sensitive data should be passed in encrypted form. Names of the parameters have 'encrypted' prefix.
 - Added Encrypt method to encrypt data on the API public key. Use it to prepare values for parameters required encrypted data.
 - GetPublicKey method is not billable.
+- Changed type of enumerations for members of SaveOptionsData and other inherited classes from string to enum.
 
 
 ## Enhancements in Version 22.2

TestData/DocumentElements/Styles/StyleTemplate.docx

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

asposewordscloud/api_client.py

@@ -1500,6 +1500,86 @@ def copy_style_online_with_http_info(self, request, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=http_params['collection_formats']))
 
+    def copy_styles_from_template(self, request, **kwargs):  # noqa: E501
+        """Copies styles from the origin document to the target 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 name str : The filename of the target document. (required)
+        :param template_name str : The filename of the origin 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.
+        :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: WordsResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        try:
+            if kwargs.get('is_async'):
+                return self.copy_styles_from_template_with_http_info(request, **kwargs)  # noqa: E501
+            data = self.copy_styles_from_template_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.copy_styles_from_template_with_http_info(request, **kwargs)  # noqa: E501
+            data = self.copy_styles_from_template_with_http_info(request, **kwargs)  # noqa: E501
+            return data
+        
+    def copy_styles_from_template_with_http_info(self, request, **kwargs):  # noqa: E501
+        """Copies styles from the origin document to the target 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 CopyStylesFromTemplateRequest object with parameters
+        :return: WordsResponse
+                 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 copy_styles_from_template" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        http_params = request.create_http_request(self.api_client)
+
+        # 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 create_document(self, request, **kwargs):  # noqa: E501
         """Supported extensions: ".doc", ".docx", ".docm", ".dot", ".dotm", ".dotx", ".flatopc", ".fopc", ".flatopc_macro", ".fopc_macro", ".flatopc_template", ".fopc_template", ".flatopc_template_macro", ".fopc_template_macro", ".wordml", ".wml", ".rtf".  # 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.3\n"\
-               "SDK Package Version: 22.3".\
+               "Version of the API: 22.4\n"\
+               "SDK Package Version: 22.4".\
                format(env=sys.platform, pyversion=sys.version)

asposewordscloud/configuration.py

@@ -77,6 +77,7 @@ class EpubSaveOptionsData(object):
         'export_page_setup': 'bool',
         'export_relative_font_size': 'bool',
         'export_roundtrip_information': 'bool',
+        'export_shapes_as_svg': 'bool',
         'export_text_box_as_svg': 'bool',
         'export_text_input_form_field_as_text': 'bool',
         'export_toc_page_numbers': 'bool',
@@ -135,6 +136,7 @@ class EpubSaveOptionsData(object):
         'export_page_setup': 'ExportPageSetup',
         'export_relative_font_size': 'ExportRelativeFontSize',
         'export_roundtrip_information': 'ExportRoundtripInformation',
+        'export_shapes_as_svg': 'ExportShapesAsSvg',
         'export_text_box_as_svg': 'ExportTextBoxAsSvg',
         'export_text_input_form_field_as_text': 'ExportTextInputFormFieldAsText',
         'export_toc_page_numbers': 'ExportTocPageNumbers',
@@ -158,7 +160,7 @@ class EpubSaveOptionsData(object):
         'save_format': 'SaveFormat'
     }
 
-    def __init__(self, allow_embedding_post_script_fonts=None, custom_time_zone_info_data=None, dml3_d_effects_rendering_mode=None, dml_effects_rendering_mode=None, dml_rendering_mode=None, file_name=None, flat_opc_xml_mapping_only=None, iml_rendering_mode=None, update_created_time_property=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=None, update_sdt_content=None, zip_output=None, allow_negative_indent=None, css_class_name_prefix=None, css_style_sheet_file_name=None, css_style_sheet_type=None, document_split_criteria=None, document_split_heading_level=None, encoding=None, export_document_properties=None, export_drop_down_form_field_as_text=None, export_font_resources=None, export_fonts_as_base64=None, export_headers_footers_mode=None, export_images_as_base64=None, export_language_information=None, export_list_labels=None, export_original_url_for_linked_images=None, export_page_margins=None, export_page_setup=None, export_relative_font_size=None, export_roundtrip_information=None, export_text_box_as_svg=None, export_text_input_form_field_as_text=None, export_toc_page_numbers=None, export_xhtml_transitional=None, font_resources_subsetting_size_threshold=None, fonts_folder=None, fonts_folder_alias=None, html_version=None, image_resolution=None, images_folder=None, images_folder_alias=None, metafile_format=None, office_math_output_mode=None, pretty_format=None, resolve_font_names=None, resource_folder=None, resource_folder_alias=None, scale_image_to_shape_size=None, table_width_output_mode=None, epub_navigation_map_level=None):  # noqa: E501
+    def __init__(self, allow_embedding_post_script_fonts=None, custom_time_zone_info_data=None, dml3_d_effects_rendering_mode=None, dml_effects_rendering_mode=None, dml_rendering_mode=None, file_name=None, flat_opc_xml_mapping_only=None, iml_rendering_mode=None, update_created_time_property=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=None, update_sdt_content=None, zip_output=None, allow_negative_indent=None, css_class_name_prefix=None, css_style_sheet_file_name=None, css_style_sheet_type=None, document_split_criteria=None, document_split_heading_level=None, encoding=None, export_document_properties=None, export_drop_down_form_field_as_text=None, export_font_resources=None, export_fonts_as_base64=None, export_headers_footers_mode=None, export_images_as_base64=None, export_language_information=None, export_list_labels=None, export_original_url_for_linked_images=None, export_page_margins=None, export_page_setup=None, export_relative_font_size=None, export_roundtrip_information=None, export_shapes_as_svg=None, export_text_box_as_svg=None, export_text_input_form_field_as_text=None, export_toc_page_numbers=None, export_xhtml_transitional=None, font_resources_subsetting_size_threshold=None, fonts_folder=None, fonts_folder_alias=None, html_version=None, image_resolution=None, images_folder=None, images_folder_alias=None, metafile_format=None, office_math_output_mode=None, pretty_format=None, resolve_font_names=None, resource_folder=None, resource_folder_alias=None, scale_image_to_shape_size=None, table_width_output_mode=None, epub_navigation_map_level=None):  # noqa: E501
         """EpubSaveOptionsData - a model defined in Swagger"""  # noqa: E501
 
         self._allow_embedding_post_script_fonts = None
@@ -195,6 +197,7 @@ def __init__(self, allow_embedding_post_script_fonts=None, custom_time_zone_info
         self._export_page_setup = None
         self._export_relative_font_size = None
         self._export_roundtrip_information = None
+        self._export_shapes_as_svg = None
         self._export_text_box_as_svg = None
         self._export_text_input_form_field_as_text = None
         self._export_toc_page_numbers = None
@@ -286,6 +289,8 @@ def __init__(self, allow_embedding_post_script_fonts=None, custom_time_zone_info
             self.export_relative_font_size = export_relative_font_size
         if export_roundtrip_information is not None:
             self.export_roundtrip_information = export_roundtrip_information
+        if export_shapes_as_svg is not None:
+            self.export_shapes_as_svg = export_shapes_as_svg
         if export_text_box_as_svg is not None:
             self.export_text_box_as_svg = export_text_box_as_svg
         if export_text_input_form_field_as_text is not None:
@@ -1139,6 +1144,28 @@ def export_roundtrip_information(self, export_roundtrip_information):
         """
         self._export_roundtrip_information = export_roundtrip_information
 
+    @property
+    def export_shapes_as_svg(self):
+        """Gets the export_shapes_as_svg of this EpubSaveOptionsData.  # noqa: E501
+
+        Gets or sets the flag, that controls whether Aspose.Words.Drawing.Shape nodes are converted to SVG images when saving to HTML, MHTML or EPUB. Default value is false.  # noqa: E501
+
+        :return: The export_shapes_as_svg of this EpubSaveOptionsData.  # noqa: E501
+        :rtype: bool
+        """
+        return self._export_shapes_as_svg
+
+    @export_shapes_as_svg.setter
+    def export_shapes_as_svg(self, export_shapes_as_svg):
+        """Sets the export_shapes_as_svg of this EpubSaveOptionsData.
+
+        Gets or sets the flag, that controls whether Aspose.Words.Drawing.Shape nodes are converted to SVG images when saving to HTML, MHTML or EPUB. Default value is false.  # noqa: E501
+
+        :param export_shapes_as_svg: The export_shapes_as_svg of this EpubSaveOptionsData.  # noqa: E501
+        :type: bool
+        """
+        self._export_shapes_as_svg = export_shapes_as_svg
+
     @property
     def export_text_box_as_svg(self):
         """Gets the export_text_box_as_svg of this EpubSaveOptionsData.  # noqa: E501