[AutoPR cognitiveservices/data-plane/ComputerVision] Add areaOfInterest and detectObject to CV API

azure-cognitiveservices-vision-computervision/MANIFEST.in

@@ -1 +1,5 @@
 include *.rst
+include azure/__init__.py
+include azure/cognitiveservices/__init__.py
+include azure/cognitiveservices/vision/__init__.py
+

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/__init__.py

@@ -22,21 +22,26 @@
     from .image_caption_py3 import ImageCaption
     from .image_description_details_py3 import ImageDescriptionDetails
     from .face_description_py3 import FaceDescription
+    from .bounding_rect_py3 import BoundingRect
+    from .object_hierarchy_py3 import ObjectHierarchy
+    from .detected_object_py3 import DetectedObject
     from .image_metadata_py3 import ImageMetadata
     from .image_analysis_py3 import ImageAnalysis
+    from .image_description_py3 import ImageDescription
+    from .detect_result_py3 import DetectResult
+    from .model_description_py3 import ModelDescription
+    from .list_models_result_py3 import ListModelsResult
+    from .domain_model_results_py3 import DomainModelResults
     from .ocr_word_py3 import OcrWord
     from .ocr_line_py3 import OcrLine
     from .ocr_region_py3 import OcrRegion
     from .ocr_result_py3 import OcrResult
-    from .model_description_py3 import ModelDescription
-    from .list_models_result_py3 import ListModelsResult
-    from .domain_model_results_py3 import DomainModelResults
-    from .celebrity_results_py3 import CelebrityResults
-    from .landmark_results_py3 import LandmarkResults
-    from .image_description_py3 import ImageDescription
     from .tag_result_py3 import TagResult
-    from .computer_vision_error_py3 import ComputerVisionError, ComputerVisionErrorException
+    from .area_of_interest_result_py3 import AreaOfInterestResult
     from .image_url_py3 import ImageUrl
+    from .computer_vision_error_py3 import ComputerVisionError, ComputerVisionErrorException
+    from .landmark_results_py3 import LandmarkResults
+    from .celebrity_results_py3 import CelebrityResults
     from .word_py3 import Word
     from .line_py3 import Line
     from .recognition_result_py3 import RecognitionResult
@@ -54,31 +59,35 @@
     from .image_caption import ImageCaption
     from .image_description_details import ImageDescriptionDetails
     from .face_description import FaceDescription
+    from .bounding_rect import BoundingRect
+    from .object_hierarchy import ObjectHierarchy
+    from .detected_object import DetectedObject
     from .image_metadata import ImageMetadata
     from .image_analysis import ImageAnalysis
+    from .image_description import ImageDescription
+    from .detect_result import DetectResult
+    from .model_description import ModelDescription
+    from .list_models_result import ListModelsResult
+    from .domain_model_results import DomainModelResults
     from .ocr_word import OcrWord
     from .ocr_line import OcrLine
     from .ocr_region import OcrRegion
     from .ocr_result import OcrResult
-    from .model_description import ModelDescription
-    from .list_models_result import ListModelsResult
-    from .domain_model_results import DomainModelResults
-    from .celebrity_results import CelebrityResults
-    from .landmark_results import LandmarkResults
-    from .image_description import ImageDescription
     from .tag_result import TagResult
-    from .computer_vision_error import ComputerVisionError, ComputerVisionErrorException
+    from .area_of_interest_result import AreaOfInterestResult
     from .image_url import ImageUrl
+    from .computer_vision_error import ComputerVisionError, ComputerVisionErrorException
+    from .landmark_results import LandmarkResults
+    from .celebrity_results import CelebrityResults
     from .word import Word
     from .line import Line
     from .recognition_result import RecognitionResult
     from .text_operation_result import TextOperationResult
 from .computer_vision_client_enums import (
     Gender,
-    ComputerVisionErrorCodes,
     TextOperationStatusCodes,
-    VisualFeatureTypes,
     OcrLanguages,
+    VisualFeatureTypes,
     TextRecognitionMode,
     Details,
 )
@@ -96,30 +105,34 @@
     'ImageCaption',
     'ImageDescriptionDetails',
     'FaceDescription',
+    'BoundingRect',
+    'ObjectHierarchy',
+    'DetectedObject',
     'ImageMetadata',
     'ImageAnalysis',
+    'ImageDescription',
+    'DetectResult',
+    'ModelDescription',
+    'ListModelsResult',
+    'DomainModelResults',
     'OcrWord',
     'OcrLine',
     'OcrRegion',
     'OcrResult',
-    'ModelDescription',
-    'ListModelsResult',
-    'DomainModelResults',
-    'CelebrityResults',
-    'LandmarkResults',
-    'ImageDescription',
     'TagResult',
-    'ComputerVisionError', 'ComputerVisionErrorException',
+    'AreaOfInterestResult',
     'ImageUrl',
+    'ComputerVisionError', 'ComputerVisionErrorException',
+    'LandmarkResults',
+    'CelebrityResults',
     'Word',
     'Line',
     'RecognitionResult',
     'TextOperationResult',
     'Gender',
-    'ComputerVisionErrorCodes',
     'TextOperationStatusCodes',
-    'VisualFeatureTypes',
     'OcrLanguages',
+    'VisualFeatureTypes',
     'TextRecognitionMode',
     'Details',
 ]

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/adult_info.py

@@ -19,10 +19,10 @@ class AdultInfo(Model):
     :param is_adult_content: A value indicating if the image contains
      adult-oriented content.
     :type is_adult_content: bool
-    :param is_racy_content: A value indicating if the image is race.
+    :param is_racy_content: A value indicating if the image is racy.
     :type is_racy_content: bool
-    :param adult_score: Score from 0 to 1 that indicates how much of adult
-     content is within the image.
+    :param adult_score: Score from 0 to 1 that indicates how much the content
+     is considered adult-oriented within the image.
     :type adult_score: float
     :param racy_score: Score from 0 to 1 that indicates how suggestive is the
      image.

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/adult_info_py3.py

@@ -19,10 +19,10 @@ class AdultInfo(Model):
     :param is_adult_content: A value indicating if the image contains
      adult-oriented content.
     :type is_adult_content: bool
-    :param is_racy_content: A value indicating if the image is race.
+    :param is_racy_content: A value indicating if the image is racy.
     :type is_racy_content: bool
-    :param adult_score: Score from 0 to 1 that indicates how much of adult
-     content is within the image.
+    :param adult_score: Score from 0 to 1 that indicates how much the content
+     is considered adult-oriented within the image.
     :type adult_score: float
     :param racy_score: Score from 0 to 1 that indicates how suggestive is the
      image.

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/area_of_interest_result.py

@@ -0,0 +1,46 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class AreaOfInterestResult(Model):
+    """Result of AreaOfInterest operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar area_of_interest: A bounding box for an area of interest inside an
+     image.
+    :vartype area_of_interest:
+     ~azure.cognitiveservices.vision.computervision.models.BoundingRect
+    :param request_id: Id of the REST API request.
+    :type request_id: str
+    :param metadata:
+    :type metadata:
+     ~azure.cognitiveservices.vision.computervision.models.ImageMetadata
+    """
+
+    _validation = {
+        'area_of_interest': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'area_of_interest': {'key': 'areaOfInterest', 'type': 'BoundingRect'},
+        'request_id': {'key': 'requestId', 'type': 'str'},
+        'metadata': {'key': 'metadata', 'type': 'ImageMetadata'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AreaOfInterestResult, self).__init__(**kwargs)
+        self.area_of_interest = None
+        self.request_id = kwargs.get('request_id', None)
+        self.metadata = kwargs.get('metadata', None)

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/area_of_interest_result_py3.py

@@ -0,0 +1,46 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class AreaOfInterestResult(Model):
+    """Result of AreaOfInterest operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar area_of_interest: A bounding box for an area of interest inside an
+     image.
+    :vartype area_of_interest:
+     ~azure.cognitiveservices.vision.computervision.models.BoundingRect
+    :param request_id: Id of the REST API request.
+    :type request_id: str
+    :param metadata:
+    :type metadata:
+     ~azure.cognitiveservices.vision.computervision.models.ImageMetadata
+    """
+
+    _validation = {
+        'area_of_interest': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'area_of_interest': {'key': 'areaOfInterest', 'type': 'BoundingRect'},
+        'request_id': {'key': 'requestId', 'type': 'str'},
+        'metadata': {'key': 'metadata', 'type': 'ImageMetadata'},
+    }
+
+    def __init__(self, *, request_id: str=None, metadata=None, **kwargs) -> None:
+        super(AreaOfInterestResult, self).__init__(**kwargs)
+        self.area_of_interest = None
+        self.request_id = request_id
+        self.metadata = metadata

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/bounding_rect.py

@@ -0,0 +1,40 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class BoundingRect(Model):
+    """A bounding box for an area inside an image.
+
+    :param x: X-coordinate of the top left point of the area, in pixels.
+    :type x: int
+    :param y: Y-coordinate of the top left point of the area, in pixels.
+    :type y: int
+    :param w: Width measured from the top-left point of the area, in pixels.
+    :type w: int
+    :param h: Height measured from the top-left point of the area, in pixels.
+    :type h: int
+    """
+
+    _attribute_map = {
+        'x': {'key': 'x', 'type': 'int'},
+        'y': {'key': 'y', 'type': 'int'},
+        'w': {'key': 'w', 'type': 'int'},
+        'h': {'key': 'h', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(BoundingRect, self).__init__(**kwargs)
+        self.x = kwargs.get('x', None)
+        self.y = kwargs.get('y', None)
+        self.w = kwargs.get('w', None)
+        self.h = kwargs.get('h', None)

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/bounding_rect_py3.py

@@ -0,0 +1,40 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class BoundingRect(Model):
+    """A bounding box for an area inside an image.
+
+    :param x: X-coordinate of the top left point of the area, in pixels.
+    :type x: int
+    :param y: Y-coordinate of the top left point of the area, in pixels.
+    :type y: int
+    :param w: Width measured from the top-left point of the area, in pixels.
+    :type w: int
+    :param h: Height measured from the top-left point of the area, in pixels.
+    :type h: int
+    """
+
+    _attribute_map = {
+        'x': {'key': 'x', 'type': 'int'},
+        'y': {'key': 'y', 'type': 'int'},
+        'w': {'key': 'w', 'type': 'int'},
+        'h': {'key': 'h', 'type': 'int'},
+    }
+
+    def __init__(self, *, x: int=None, y: int=None, w: int=None, h: int=None, **kwargs) -> None:
+        super(BoundingRect, self).__init__(**kwargs)
+        self.x = x
+        self.y = y
+        self.w = w
+        self.h = h

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/category.py

@@ -19,7 +19,7 @@ class Category(Model):
     :type name: str
     :param score: Scoring of the category.
     :type score: float
-    :param detail:
+    :param detail: Details of the identified category.
     :type detail:
      ~azure.cognitiveservices.vision.computervision.models.CategoryDetail
     """

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/category_py3.py

@@ -19,7 +19,7 @@ class Category(Model):
     :type name: str
     :param score: Scoring of the category.
     :type score: float
-    :param detail:
+    :param detail: Details of the identified category.
     :type detail:
      ~azure.cognitiveservices.vision.computervision.models.CategoryDetail
     """

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/celebrities_model.py

@@ -17,9 +17,10 @@ class CelebritiesModel(Model):
 
     :param name: Name of the celebrity.
     :type name: str
-    :param confidence: Level of confidence ranging from 0 to 1.
+    :param confidence: Confidence level for the celebrity recognition as a
+     value ranging from 0 to 1.
     :type confidence: float
-    :param face_rectangle:
+    :param face_rectangle: Location of the identified face in the image.
     :type face_rectangle:
      ~azure.cognitiveservices.vision.computervision.models.FaceRectangle
     """

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/celebrities_model_py3.py

@@ -17,9 +17,10 @@ class CelebritiesModel(Model):
 
     :param name: Name of the celebrity.
     :type name: str
-    :param confidence: Level of confidence ranging from 0 to 1.
+    :param confidence: Confidence level for the celebrity recognition as a
+     value ranging from 0 to 1.
     :type confidence: float
-    :param face_rectangle:
+    :param face_rectangle: Location of the identified face in the image.
     :type face_rectangle:
      ~azure.cognitiveservices.vision.computervision.models.FaceRectangle
     """

azure-cognitiveservices-vision-computervision/azure/cognitiveservices/vision/computervision/models/celebrity_results.py

@@ -13,9 +13,9 @@
 
 
 class CelebrityResults(Model):
-    """List of celebrities recognized in the image.
+    """Result of domain-specific classifications for the domain of celebrities.
 
-    :param celebrities:
+    :param celebrities: List of celebrities recognized in the image.
     :type celebrities:
      list[~azure.cognitiveservices.vision.computervision.models.CelebritiesModel]
     :param request_id: Id of the REST API request.