Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -16,6 +16,13 @@ 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 25.4
+
+- Added 'AttachmentsEmbeddingMode' property for PdfSaveOptionsData class.
+- Added 'UpdateAmbiguousTextFont' property for SaveOptionsData class.
+- Added 'Granularity' property for CompareOptions class.
+
+
 ## Enhancements in Version 25.2
 
 - Added 'IdPrefix' property for HtmlFixedSaveOptionsData and SvgSaveOptionsData class.

asposewordscloud/api_client.py

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

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

asposewordscloud/models/azw3_save_options_data.py

@@ -50,6 +50,7 @@ class Azw3SaveOptionsData(object):
         'dml_rendering_mode': 'str',
         'file_name': 'str',
         'iml_rendering_mode': 'str',
+        'update_ambiguous_text_font': 'bool',
         'update_created_time_property': 'bool',
         'update_fields': 'bool',
         'update_last_printed_property': 'bool',
@@ -106,6 +107,7 @@ class Azw3SaveOptionsData(object):
         'dml_rendering_mode': 'DmlRenderingMode',
         'file_name': 'FileName',
         'iml_rendering_mode': 'ImlRenderingMode',
+        'update_ambiguous_text_font': 'UpdateAmbiguousTextFont',
         'update_created_time_property': 'UpdateCreatedTimeProperty',
         'update_fields': 'UpdateFields',
         'update_last_printed_property': 'UpdateLastPrintedProperty',
@@ -154,7 +156,7 @@ class Azw3SaveOptionsData(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, iml_rendering_mode=None, update_created_time_property=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=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_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, replace_backslash_with_yen_sign=None, resolve_font_names=None, resource_folder=None, resource_folder_alias=None, scale_image_to_shape_size=None, table_width_output_mode=None, 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, iml_rendering_mode=None, update_ambiguous_text_font=None, update_created_time_property=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=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_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, replace_backslash_with_yen_sign=None, resolve_font_names=None, resource_folder=None, resource_folder_alias=None, scale_image_to_shape_size=None, table_width_output_mode=None, navigation_map_level=None):  # noqa: E501
         """Azw3SaveOptionsData - a model defined in Swagger"""  # noqa: E501
 
         self._allow_embedding_post_script_fonts = None
@@ -164,6 +166,7 @@ def __init__(self, allow_embedding_post_script_fonts=None, custom_time_zone_info
         self._dml_rendering_mode = None
         self._file_name = None
         self._iml_rendering_mode = None
+        self._update_ambiguous_text_font = None
         self._update_created_time_property = None
         self._update_fields = None
         self._update_last_printed_property = None
@@ -226,6 +229,8 @@ def __init__(self, allow_embedding_post_script_fonts=None, custom_time_zone_info
             self.file_name = file_name
         if iml_rendering_mode is not None:
             self.iml_rendering_mode = iml_rendering_mode
+        if update_ambiguous_text_font is not None:
+            self.update_ambiguous_text_font = update_ambiguous_text_font
         if update_created_time_property is not None:
             self.update_created_time_property = update_created_time_property
         if update_fields is not None:
@@ -503,6 +508,28 @@ def iml_rendering_mode(self, iml_rendering_mode):
         else:
             self._iml_rendering_mode = allowed_values[int(iml_rendering_mode) if six.PY3 else long(iml_rendering_mode)]
 
+    @property
+    def update_ambiguous_text_font(self):
+        """Gets the update_ambiguous_text_font of this Azw3SaveOptionsData.  # noqa: E501
+
+        Gets or sets a value indicating whether the font attributes will be changed according to the character code being used.  # noqa: E501
+
+        :return: The update_ambiguous_text_font of this Azw3SaveOptionsData.  # noqa: E501
+        :rtype: bool
+        """
+        return self._update_ambiguous_text_font
+
+    @update_ambiguous_text_font.setter
+    def update_ambiguous_text_font(self, update_ambiguous_text_font):
+        """Sets the update_ambiguous_text_font of this Azw3SaveOptionsData.
+
+        Gets or sets a value indicating whether the font attributes will be changed according to the character code being used.  # noqa: E501
+
+        :param update_ambiguous_text_font: The update_ambiguous_text_font of this Azw3SaveOptionsData.  # noqa: E501
+        :type: bool
+        """
+        self._update_ambiguous_text_font = update_ambiguous_text_font
+
     @property
     def update_created_time_property(self):
         """Gets the update_created_time_property of this Azw3SaveOptionsData.  # noqa: E501
@@ -1631,6 +1658,7 @@ def validate(self):
 
 
 
+
 
 
     def to_dict(self):

asposewordscloud/models/bmp_save_options_data.py

@@ -50,6 +50,7 @@ class BmpSaveOptionsData(object):
         'dml_rendering_mode': 'str',
         'file_name': 'str',
         'iml_rendering_mode': 'str',
+        'update_ambiguous_text_font': 'bool',
         'update_created_time_property': 'bool',
         'update_fields': 'bool',
         'update_last_printed_property': 'bool',
@@ -87,6 +88,7 @@ class BmpSaveOptionsData(object):
         'dml_rendering_mode': 'DmlRenderingMode',
         'file_name': 'FileName',
         'iml_rendering_mode': 'ImlRenderingMode',
+        'update_ambiguous_text_font': 'UpdateAmbiguousTextFont',
         'update_created_time_property': 'UpdateCreatedTimeProperty',
         'update_fields': 'UpdateFields',
         'update_last_printed_property': 'UpdateLastPrintedProperty',
@@ -116,7 +118,7 @@ class BmpSaveOptionsData(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, iml_rendering_mode=None, update_created_time_property=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=None, zip_output=None, color_mode=None, jpeg_quality=None, metafile_rendering_options=None, numeral_format=None, optimize_output=None, page_count=None, page_index=None, horizontal_resolution=None, image_brightness=None, image_color_mode=None, image_contrast=None, paper_color=None, pixel_format=None, resolution=None, scale=None, use_anti_aliasing=None, use_high_quality_rendering=None, vertical_resolution=None, image_height=None, image_width=None, use_gdi_emf_renderer=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, iml_rendering_mode=None, update_ambiguous_text_font=None, update_created_time_property=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=None, zip_output=None, color_mode=None, jpeg_quality=None, metafile_rendering_options=None, numeral_format=None, optimize_output=None, page_count=None, page_index=None, horizontal_resolution=None, image_brightness=None, image_color_mode=None, image_contrast=None, paper_color=None, pixel_format=None, resolution=None, scale=None, use_anti_aliasing=None, use_high_quality_rendering=None, vertical_resolution=None, image_height=None, image_width=None, use_gdi_emf_renderer=None):  # noqa: E501
         """BmpSaveOptionsData - a model defined in Swagger"""  # noqa: E501
 
         self._allow_embedding_post_script_fonts = None
@@ -126,6 +128,7 @@ def __init__(self, allow_embedding_post_script_fonts=None, custom_time_zone_info
         self._dml_rendering_mode = None
         self._file_name = None
         self._iml_rendering_mode = None
+        self._update_ambiguous_text_font = None
         self._update_created_time_property = None
         self._update_fields = None
         self._update_last_printed_property = None
@@ -169,6 +172,8 @@ def __init__(self, allow_embedding_post_script_fonts=None, custom_time_zone_info
             self.file_name = file_name
         if iml_rendering_mode is not None:
             self.iml_rendering_mode = iml_rendering_mode
+        if update_ambiguous_text_font is not None:
+            self.update_ambiguous_text_font = update_ambiguous_text_font
         if update_created_time_property is not None:
             self.update_created_time_property = update_created_time_property
         if update_fields is not None:
@@ -408,6 +413,28 @@ def iml_rendering_mode(self, iml_rendering_mode):
         else:
             self._iml_rendering_mode = allowed_values[int(iml_rendering_mode) if six.PY3 else long(iml_rendering_mode)]
 
+    @property
+    def update_ambiguous_text_font(self):
+        """Gets the update_ambiguous_text_font of this BmpSaveOptionsData.  # noqa: E501
+
+        Gets or sets a value indicating whether the font attributes will be changed according to the character code being used.  # noqa: E501
+
+        :return: The update_ambiguous_text_font of this BmpSaveOptionsData.  # noqa: E501
+        :rtype: bool
+        """
+        return self._update_ambiguous_text_font
+
+    @update_ambiguous_text_font.setter
+    def update_ambiguous_text_font(self, update_ambiguous_text_font):
+        """Sets the update_ambiguous_text_font of this BmpSaveOptionsData.
+
+        Gets or sets a value indicating whether the font attributes will be changed according to the character code being used.  # noqa: E501
+
+        :param update_ambiguous_text_font: The update_ambiguous_text_font of this BmpSaveOptionsData.  # noqa: E501
+        :type: bool
+        """
+        self._update_ambiguous_text_font = update_ambiguous_text_font
+
     @property
     def update_created_time_property(self):
         """Gets the update_created_time_property of this BmpSaveOptionsData.  # noqa: E501
@@ -1050,6 +1077,7 @@ def validate(self):
 
 
 
+
         if self._metafile_rendering_options is not None:
             self._metafile_rendering_options.validate()
 

asposewordscloud/models/compare_options.py

@@ -44,6 +44,7 @@ class CompareOptions(object):
     """
     swagger_types = {
         'accept_all_revisions_before_comparison': 'bool',
+        'granularity': 'str',
         'ignore_case_changes': 'bool',
         'ignore_comments': 'bool',
         'ignore_fields': 'bool',
@@ -57,6 +58,7 @@ class CompareOptions(object):
 
     attribute_map = {
         'accept_all_revisions_before_comparison': 'AcceptAllRevisionsBeforeComparison',
+        'granularity': 'Granularity',
         'ignore_case_changes': 'IgnoreCaseChanges',
         'ignore_comments': 'IgnoreComments',
         'ignore_fields': 'IgnoreFields',
@@ -68,10 +70,11 @@ class CompareOptions(object):
         'target': 'Target'
     }
 
-    def __init__(self, accept_all_revisions_before_comparison=None, ignore_case_changes=None, ignore_comments=None, ignore_fields=None, ignore_footnotes=None, ignore_formatting=None, ignore_headers_and_footers=None, ignore_tables=None, ignore_textboxes=None, target=None):  # noqa: E501
+    def __init__(self, accept_all_revisions_before_comparison=None, granularity=None, ignore_case_changes=None, ignore_comments=None, ignore_fields=None, ignore_footnotes=None, ignore_formatting=None, ignore_headers_and_footers=None, ignore_tables=None, ignore_textboxes=None, target=None):  # noqa: E501
         """CompareOptions - a model defined in Swagger"""  # noqa: E501
 
         self._accept_all_revisions_before_comparison = None
+        self._granularity = None
         self._ignore_case_changes = None
         self._ignore_comments = None
         self._ignore_fields = None
@@ -85,6 +88,8 @@ def __init__(self, accept_all_revisions_before_comparison=None, ignore_case_chan
 
         if accept_all_revisions_before_comparison is not None:
             self.accept_all_revisions_before_comparison = accept_all_revisions_before_comparison
+        if granularity is not None:
+            self.granularity = granularity
         if ignore_case_changes is not None:
             self.ignore_case_changes = ignore_case_changes
         if ignore_comments is not None:
@@ -126,6 +131,36 @@ def accept_all_revisions_before_comparison(self, accept_all_revisions_before_com
         """
         self._accept_all_revisions_before_comparison = accept_all_revisions_before_comparison
 
+    @property
+    def granularity(self):
+        """Gets the granularity of this CompareOptions.  # noqa: E501
+
+        Gets or sets the option indicating whether changes are tracked by character or by word.  # noqa: E501
+
+        :return: The granularity of this CompareOptions.  # noqa: E501
+        :rtype: str
+        """
+        return self._granularity
+
+    @granularity.setter
+    def granularity(self, granularity):
+        """Sets the granularity of this CompareOptions.
+
+        Gets or sets the option indicating whether changes are tracked by character or by word.  # noqa: E501
+
+        :param granularity: The granularity of this CompareOptions.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["CharLevel", "WordLevel"]  # noqa: E501
+        if not granularity.isdigit():
+            if granularity not in allowed_values:
+                raise ValueError(
+                    "Invalid value for `granularity` ({0}), must be one of {1}"  # noqa: E501
+                    .format(granularity, allowed_values))
+            self._granularity = granularity
+        else:
+            self._granularity = allowed_values[int(granularity) if six.PY3 else long(granularity)]
+
     @property
     def ignore_case_changes(self):
         """Gets the ignore_case_changes of this CompareOptions.  # noqa: E501