Updated sources

Author: product-team

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2003-2018 Aspose Pty Ltd
+Copyright (c) 2003-2021 Aspose Pty Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

groupdocs_annotation_cloud/api_client.py

@@ -74,12 +74,12 @@ def __init__(self, configuration, header_name=None, header_value=None,
         self.configuration = configuration
         self.pool = None
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {'x-groupdocs-client': 'python sdk', 'x-groupdocs-version': '21.2'}
+        self.default_headers = {'x-groupdocs-client': 'python sdk', 'x-groupdocs-version': '21.6'}
         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 21.2'
+        self.user_agent = 'python sdk 21.6'
 
     def __del__(self):
         if self.pool is not None:

groupdocs_annotation_cloud/api_exception.py

@@ -41,14 +41,16 @@ def __init__(self, status=None, reason=None, http_resp=None):
                 data = json.loads(http_resp.data)
 
                 error = data.get("error")
-                error_api = data.get("Error")
 
                 if error is not None:
-                    self.message = error
-                elif error_api is not None:
-                    self.message = error_api.get("Message") if error_api.get("Message") is not None else http_resp.data
+                    self.message = error if type(error) is str else error.get("message")                 
                 else:
-                    self.message = http_resp.data   
+                    message = data.get("message")
+                    if message is not None:
+                        self.message = message
+                        self.code = data.get("code")
+                    else:
+                        self.message = http_resp.data   
             except ValueError:
                 self.message = http_resp.data
         else:

groupdocs_annotation_cloud/configuration.py

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

groupdocs_annotation_cloud/models/annotate_options.py

@@ -48,7 +48,8 @@ class AnnotateOptions(object):
         'first_page': 'int',
         'last_page': 'int',
         'only_annotated_pages': 'bool',
-        'output_path': 'str'
+        'output_path': 'str',
+        'fonts_path': 'str'
     }
 
     attribute_map = {
@@ -57,10 +58,11 @@ class AnnotateOptions(object):
         'first_page': 'FirstPage',
         'last_page': 'LastPage',
         'only_annotated_pages': 'OnlyAnnotatedPages',
-        'output_path': 'OutputPath'
+        'output_path': 'OutputPath',
+        'fonts_path': 'FontsPath'
     }
 
-    def __init__(self, file_info=None, annotations=None, first_page=None, last_page=None, only_annotated_pages=None, output_path=None, **kwargs):  # noqa: E501
+    def __init__(self, file_info=None, annotations=None, first_page=None, last_page=None, only_annotated_pages=None, output_path=None, fonts_path=None, **kwargs):  # noqa: E501
         """Initializes new instance of AnnotateOptions"""  # noqa: E501
 
         self._file_info = None
@@ -69,6 +71,7 @@ def __init__(self, file_info=None, annotations=None, first_page=None, last_page=
         self._last_page = None
         self._only_annotated_pages = None
         self._output_path = None
+        self._fonts_path = None
 
         if file_info is not None:
             self.file_info = file_info
@@ -82,6 +85,8 @@ def __init__(self, file_info=None, annotations=None, first_page=None, last_page=
             self.only_annotated_pages = only_annotated_pages
         if output_path is not None:
             self.output_path = output_path
+        if fonts_path is not None:
+            self.fonts_path = fonts_path
 
     @property
     def file_info(self):
@@ -232,6 +237,30 @@ def output_path(self, output_path):
         :type: str
         """
         self._output_path = output_path
+    
+    @property
+    def fonts_path(self):
+        """
+        Gets the fonts_path.  # noqa: E501
+
+        The path to directory containing custom fonts in storage  # noqa: E501
+
+        :return: The fonts_path.  # noqa: E501
+        :rtype: str
+        """
+        return self._fonts_path
+
+    @fonts_path.setter
+    def fonts_path(self, fonts_path):
+        """
+        Sets the fonts_path.
+
+        The path to directory containing custom fonts in storage  # noqa: E501
+
+        :param fonts_path: The fonts_path.  # noqa: E501
+        :type: str
+        """
+        self._fonts_path = fonts_path
 
     def to_dict(self):
         """Returns the model properties as a dict"""

groupdocs_annotation_cloud/models/annotation_info.py

@@ -68,6 +68,7 @@ class AnnotationInfo(object):
         'font_size': 'float',
         'opacity': 'float',
         'angle': 'float',
+        'z_index': 'int',
         'url': 'str',
         'image_path': 'str'
     }
@@ -98,11 +99,12 @@ class AnnotationInfo(object):
         'font_size': 'FontSize',
         'opacity': 'Opacity',
         'angle': 'Angle',
+        'z_index': 'ZIndex',
         'url': 'Url',
         'image_path': 'ImagePath'
     }
 
-    def __init__(self, id=None, text=None, text_to_replace=None, horizontal_alignment=None, vertical_alignment=None, creator_id=None, creator_name=None, creator_email=None, box=None, points=None, page_number=None, annotation_position=None, svg_path=None, type=None, replies=None, created_on=None, font_color=None, pen_color=None, pen_width=None, pen_style=None, background_color=None, font_family=None, font_size=None, opacity=None, angle=None, url=None, image_path=None, **kwargs):  # noqa: E501
+    def __init__(self, id=None, text=None, text_to_replace=None, horizontal_alignment=None, vertical_alignment=None, creator_id=None, creator_name=None, creator_email=None, box=None, points=None, page_number=None, annotation_position=None, svg_path=None, type=None, replies=None, created_on=None, font_color=None, pen_color=None, pen_width=None, pen_style=None, background_color=None, font_family=None, font_size=None, opacity=None, angle=None, z_index=None, url=None, image_path=None, **kwargs):  # noqa: E501
         """Initializes new instance of AnnotationInfo"""  # noqa: E501
 
         self._id = None
@@ -130,6 +132,7 @@ def __init__(self, id=None, text=None, text_to_replace=None, horizontal_alignmen
         self._font_size = None
         self._opacity = None
         self._angle = None
+        self._z_index = None
         self._url = None
         self._image_path = None
 
@@ -183,6 +186,8 @@ def __init__(self, id=None, text=None, text_to_replace=None, horizontal_alignmen
             self.opacity = opacity
         if angle is not None:
             self.angle = angle
+        if z_index is not None:
+            self.z_index = z_index
         if url is not None:
             self.url = url
         if image_path is not None:
@@ -834,6 +839,32 @@ def angle(self, angle):
         """
         self._angle = angle
 
+    @property
+    def z_index(self):
+        """
+        Gets the z_index.  # noqa: E501
+
+        Gets or sets z-index. Default value is 0 The z-index property specifies the stack order of an element.  # noqa: E501
+
+        :return: The z_index.  # noqa: E501
+        :rtype: int
+        """
+        return self._z_index
+
+    @z_index.setter
+    def z_index(self, z_index):
+        """
+        Sets the z_index.
+
+        Gets or sets z-index. Default value is 0 The z-index property specifies the stack order of an element.  # noqa: E501
+
+        :param z_index: The z_index.  # noqa: E501
+        :type: int
+        """
+        if z_index is None:
+            raise ValueError("Invalid value for `z_index`, must not be `None`")  # noqa: E501
+        self._z_index = z_index
+    
     @property
     def url(self):
         """

groupdocs_annotation_cloud/models/preview_options.py

@@ -48,7 +48,10 @@ class PreviewOptions(object):
         'page_numbers': 'list[int]',
         'width': 'int',
         'height': 'int',
-        'render_comments': 'bool'
+        'resolution': 'int',
+        'render_comments': 'bool',
+        'render_annotations': 'bool',
+        'fonts_path': 'str'
     }
 
     attribute_map = {
@@ -57,18 +60,24 @@ class PreviewOptions(object):
         'page_numbers': 'PageNumbers',
         'width': 'Width',
         'height': 'Height',
-        'render_comments': 'RenderComments'
+        'resolution': 'Resolution',
+        'render_comments': 'RenderComments',
+        'render_annotations': 'RenderAnnotations',
+        'fonts_path': 'FontsPath'
     }
 
-    def __init__(self, file_info=None, format=None, page_numbers=None, width=None, height=None, render_comments=None, **kwargs):  # noqa: E501
+    def __init__(self, file_info=None, format=None, page_numbers=None, width=None, height=None, resolution=None, render_comments=None, render_annotations=None, fonts_path=None, **kwargs):  # noqa: E501
         """Initializes new instance of PreviewOptions"""  # noqa: E501
 
         self._file_info = None
         self._format = None
         self._page_numbers = None
         self._width = None
         self._height = None
+        self._resolution = None
         self._render_comments = None
+        self._render_annotations = None
+        self._fonts_path = None
 
         if file_info is not None:
             self.file_info = file_info
@@ -80,8 +89,14 @@ def __init__(self, file_info=None, format=None, page_numbers=None, width=None, h
             self.width = width
         if height is not None:
             self.height = height
+        if resolution is not None:
+            self.resolution = resolution
         if render_comments is not None:
             self.render_comments = render_comments
+        if render_annotations is not None:
+            self.render_annotations = render_annotations
+        if fonts_path is not None:
+            self.fonts_path = fonts_path
 
     @property
     def file_info(self):
@@ -217,6 +232,32 @@ def height(self, height):
             raise ValueError("Invalid value for `height`, must not be `None`")  # noqa: E501
         self._height = height
 
+    @property
+    def resolution(self):
+        """
+        Gets the resolution.  # noqa: E501
+
+        Gets or sets the resolution for generated images, in dots per inch. The default value is 96.  # noqa: E501
+
+        :return: The resolution.  # noqa: E501
+        :rtype: int
+        """
+        return self._resolution
+
+    @resolution.setter
+    def resolution(self, resolution):
+        """
+        Sets the resolution.
+
+        Gets or sets the resolution for generated images, in dots per inch. The default value is 96.  # noqa: E501
+
+        :param resolution: The resolution.  # noqa: E501
+        :type: int
+        """
+        if resolution is None:
+            raise ValueError("Invalid value for `resolution`, must not be `None`")  # noqa: E501
+        self._resolution = resolution
+    
     @property
     def render_comments(self):
         """
@@ -242,6 +283,56 @@ def render_comments(self, render_comments):
         if render_comments is None:
             raise ValueError("Invalid value for `render_comments`, must not be `None`")  # noqa: E501
         self._render_comments = render_comments
+    
+    @property
+    def render_annotations(self):
+        """
+        Gets the render_annotations.  # noqa: E501
+
+        The property that controls whether annotations will be generated on the preview. Default State - true.  # noqa: E501
+
+        :return: The render_annotations.  # noqa: E501
+        :rtype: bool
+        """
+        return self._render_annotations
+
+    @render_annotations.setter
+    def render_annotations(self, render_annotations):
+        """
+        Sets the render_annotations.
+
+        The property that controls whether annotations will be generated on the preview. Default State - true.  # noqa: E501
+
+        :param render_annotations: The render_annotations.  # noqa: E501
+        :type: bool
+        """
+        if render_annotations is None:
+            raise ValueError("Invalid value for `render_annotations`, must not be `None`")  # noqa: E501
+        self._render_annotations = render_annotations
+    
+    @property
+    def fonts_path(self):
+        """
+        Gets the fonts_path.  # noqa: E501
+
+        The path to directory containing custom fonts in storage  # noqa: E501
+
+        :return: The fonts_path.  # noqa: E501
+        :rtype: str
+        """
+        return self._fonts_path
+
+    @fonts_path.setter
+    def fonts_path(self, fonts_path):
+        """
+        Sets the fonts_path.
+
+        The path to directory containing custom fonts in storage  # noqa: E501
+
+        :param fonts_path: The fonts_path.  # noqa: E501
+        :type: str
+        """
+        self._fonts_path = fonts_path
 
     def to_dict(self):
         """Returns the model properties as a dict"""

setup.py

@@ -6,7 +6,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "groupdocs-annotation-cloud"
-VERSION = "21.2"
+VERSION = "21.6"
 
 # Append current time to the version when publishing to test environment
 if "--test" in sys.argv:

test/info/test_info_api.py

@@ -54,5 +54,14 @@ def test_get_info(self):
             self.assertEqual(file_info.file_path, response.path)
             self.assertGreater(len(response.pages), 0)
 
+    def test_get_info_returns_file_not_found(self):
+        file_info = FileInfo()
+        file_info.file_path = "somefolder\\not-exist.docx"
+
+        request = GetInfoRequest(file_info)
+        with self.assertRaises(ApiException) as context:
+            self.info_api.get_info(request)
+        self.assertEqual("Specified file not found", context.exception.message)
+
 if __name__ == '__main__':
     unittest.main()