Merge branch 'master' into release

Author: YaroslawEkimov

README.md

@@ -16,6 +16,14 @@ 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 23.12
+
+- Properties Name, Text, StartRange, EndRange marked as required for InsertBookmark operation.
+- Implemented DeleteOfficeMathObjects operation to delete all office math objects from document.
+- Parameter ProtectionRequest was removed from the UnprotectDocument operation. Now removing protection from a document does not require a password.
+- Model ProtectionRequest marked as deprecated, please use ProtectionRequestV2 instead for perform ProtectDocument operation. To change the password or protection type of protected document, the old password is no required.
+- Rename aspose-client header.
+
 ## Enhancements in Version 23.11
 
 - Support of required properties in models.

asposewordscloud/__init__.py

@@ -181,6 +181,7 @@
 from asposewordscloud.models.protection_data import ProtectionData
 from asposewordscloud.models.protection_data_response import ProtectionDataResponse
 from asposewordscloud.models.protection_request import ProtectionRequest
+from asposewordscloud.models.protection_request_v2 import ProtectionRequestV2
 from asposewordscloud.models.ps_save_options_data import PsSaveOptionsData
 from asposewordscloud.models.public_key_response import PublicKeyResponse
 from asposewordscloud.models.range_document import RangeDocument
@@ -256,6 +257,8 @@
 from asposewordscloud.models.tiff_save_options_data import TiffSaveOptionsData
 from asposewordscloud.models.time_zone_info_data import TimeZoneInfoData
 from asposewordscloud.models.user_information import UserInformation
+from asposewordscloud.models.watermark_data_image import WatermarkDataImage
+from asposewordscloud.models.watermark_data_text import WatermarkDataText
 from asposewordscloud.models.watermark_text import WatermarkText
 from asposewordscloud.models.word_ml_save_options_data import WordMLSaveOptionsData
 from asposewordscloud.models.words_api_error_response import WordsApiErrorResponse

asposewordscloud/api_client.py

@@ -246,6 +246,7 @@ class ApiClient(object):
         'ProtectionData, _': asposewordscloud.models.ProtectionData,
         'ProtectionDataResponse, _': asposewordscloud.models.ProtectionDataResponse,
         'ProtectionRequest, _': asposewordscloud.models.ProtectionRequest,
+        'ProtectionRequestV2, _': asposewordscloud.models.ProtectionRequestV2,
         'PsSaveOptionsData, _': asposewordscloud.models.PsSaveOptionsData,
         'PublicKeyResponse, _': asposewordscloud.models.PublicKeyResponse,
         'RangeDocument, _': asposewordscloud.models.RangeDocument,
@@ -321,6 +322,8 @@ class ApiClient(object):
         'TiffSaveOptionsData, _': asposewordscloud.models.TiffSaveOptionsData,
         'TimeZoneInfoData, _': asposewordscloud.models.TimeZoneInfoData,
         'UserInformation, _': asposewordscloud.models.UserInformation,
+        'WatermarkDataImage, _': asposewordscloud.models.WatermarkDataImage,
+        'WatermarkDataText, _': asposewordscloud.models.WatermarkDataText,
         'WatermarkText, _': asposewordscloud.models.WatermarkText,
         'WordMLSaveOptionsData, _': asposewordscloud.models.WordMLSaveOptionsData,
         'WordsApiErrorResponse, _': asposewordscloud.models.WordsApiErrorResponse,
@@ -342,12 +345,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': '23.11'}
+        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-client-version': '23.12'}
         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 23.11'
+        self.user_agent = 'python sdk 23.12'
 
     def __del__(self):
         if not self.pool is None:

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

asposewordscloud/configuration.py

@@ -176,6 +176,7 @@
 from asposewordscloud.models.protection_data import ProtectionData
 from asposewordscloud.models.protection_data_response import ProtectionDataResponse
 from asposewordscloud.models.protection_request import ProtectionRequest
+from asposewordscloud.models.protection_request_v2 import ProtectionRequestV2
 from asposewordscloud.models.ps_save_options_data import PsSaveOptionsData
 from asposewordscloud.models.public_key_response import PublicKeyResponse
 from asposewordscloud.models.range_document import RangeDocument
@@ -251,6 +252,8 @@
 from asposewordscloud.models.tiff_save_options_data import TiffSaveOptionsData
 from asposewordscloud.models.time_zone_info_data import TimeZoneInfoData
 from asposewordscloud.models.user_information import UserInformation
+from asposewordscloud.models.watermark_data_image import WatermarkDataImage
+from asposewordscloud.models.watermark_data_text import WatermarkDataText
 from asposewordscloud.models.watermark_text import WatermarkText
 from asposewordscloud.models.word_ml_save_options_data import WordMLSaveOptionsData
 from asposewordscloud.models.words_api_error_response import WordsApiErrorResponse

asposewordscloud/models/__init__.py

@@ -168,6 +168,14 @@ def extract_files_content(self, filesContentResult):
 
     def validate(self):
         """Validate all required properties in model"""
+        if self._name is None:
+            raise ValueError("Property Name in BookmarkInsert is required.")  # noqa: E501
+        if self._text is None:
+            raise ValueError("Property Text in BookmarkInsert is required.")  # noqa: E501
+        if self._start_range is None:
+            raise ValueError("Property StartRange in BookmarkInsert is required.")  # noqa: E501
+        if self._end_range is None:
+            raise ValueError("Property EndRange in BookmarkInsert is required.")  # noqa: E501
 
         if self._start_range is not None:
             self._start_range.validate()

asposewordscloud/models/bookmark_insert.py

@@ -47,6 +47,7 @@ class CompareData(object):
         'compare_options': 'CompareOptions',
         'comparing_with_document': 'str',
         'date_time': 'datetime',
+        'file_reference': 'FileReference',
         'result_document_format': 'str'
     }
 
@@ -55,16 +56,18 @@ class CompareData(object):
         'compare_options': 'CompareOptions',
         'comparing_with_document': 'ComparingWithDocument',
         'date_time': 'DateTime',
+        'file_reference': 'FileReference',
         'result_document_format': 'ResultDocumentFormat'
     }
 
-    def __init__(self, author=None, compare_options=None, comparing_with_document=None, date_time=None, result_document_format=None):  # noqa: E501
+    def __init__(self, author=None, compare_options=None, comparing_with_document=None, date_time=None, file_reference=None, result_document_format=None):  # noqa: E501
         """CompareData - a model defined in Swagger"""  # noqa: E501
 
         self._author = None
         self._compare_options = None
         self._comparing_with_document = None
         self._date_time = None
+        self._file_reference = None
         self._result_document_format = None
         self.discriminator = None
 
@@ -76,6 +79,8 @@ def __init__(self, author=None, compare_options=None, comparing_with_document=No
             self.comparing_with_document = comparing_with_document
         if date_time is not None:
             self.date_time = date_time
+        if file_reference is not None:
+            self.file_reference = file_reference
         if result_document_format is not None:
             self.result_document_format = result_document_format
 
@@ -167,6 +172,28 @@ def date_time(self, date_time):
         """
         self._date_time = date_time
 
+    @property
+    def file_reference(self):
+        """Gets the file_reference of this CompareData.  # noqa: E501
+
+        Gets or sets the file reference.  # noqa: E501
+
+        :return: The file_reference of this CompareData.  # noqa: E501
+        :rtype: FileReference
+        """
+        return self._file_reference
+
+    @file_reference.setter
+    def file_reference(self, file_reference):
+        """Sets the file_reference of this CompareData.
+
+        Gets or sets the file reference.  # noqa: E501
+
+        :param file_reference: The file_reference of this CompareData.  # noqa: E501
+        :type: FileReference
+        """
+        self._file_reference = file_reference
+
     @property
     def result_document_format(self):
         """Gets the result_document_format of this CompareData.  # noqa: E501
@@ -192,13 +219,17 @@ def result_document_format(self, result_document_format):
 
     def extract_files_content(self, filesContentResult):
         """Append the file content result list"""
+        if self._file_reference is not None:
+            self._file_reference.extract_files_content(filesContentResult)
+
+
 
     def validate(self):
         """Validate all required properties in model"""
         if self._author is None:
             raise ValueError("Property Author in CompareData is required.")  # noqa: E501
-        if self._comparing_with_document is None:
-            raise ValueError("Property ComparingWithDocument in CompareData is required.")  # noqa: E501
+        if self._file_reference is None:
+            raise ValueError("Property FileReference in CompareData is required.")  # noqa: E501
 
         if self._compare_options is not None:
             self._compare_options.validate()
@@ -207,6 +238,11 @@ def validate(self):
 
 
 
+        if self._file_reference is not None:
+            self._file_reference.validate()
+
+
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

asposewordscloud/models/compare_data.py

@@ -79,14 +79,24 @@ def protection_type(self, protection_type):
         :param protection_type: The protection_type of this ProtectionData.  # noqa: E501
         :type: str
         """
-        self._protection_type = protection_type
+        allowed_values = ["AllowOnlyRevisions", "AllowOnlyComments", "AllowOnlyFormFields", "ReadOnly", "NoProtection"]  # noqa: E501
+        if not protection_type.isdigit():
+            if protection_type not in allowed_values:
+                raise ValueError(
+                    "Invalid value for `protection_type` ({0}), must be one of {1}"  # noqa: E501
+                    .format(protection_type, allowed_values))
+            self._protection_type = protection_type
+        else:
+            self._protection_type = allowed_values[int(protection_type) if six.PY3 else long(protection_type)]
 
 
     def extract_files_content(self, filesContentResult):
         """Append the file content result list"""
 
     def validate(self):
         """Validate all required properties in model"""
+        if self._protection_type is None:
+            raise ValueError("Property ProtectionType in ProtectionData is required.")  # noqa: E501
 
     def to_dict(self):
         """Returns the model properties as a dict"""

asposewordscloud/models/protection_data.py

@@ -31,6 +31,7 @@
 import six
 import json
 
+@typing_extensions.deprecated("ProtectionRequest is deprecated and remains for backwards compatibility only.")
 class ProtectionRequest(object):
     """Request on changing of protection.
     """