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

lib/services/computerVision/lib/models/adultInfo.js

@@ -20,9 +20,9 @@ class AdultInfo {
    * Create a AdultInfo.
    * @member {boolean} [isAdultContent] A value indicating if the image
    * contains adult-oriented content.
-   * @member {boolean} [isRacyContent] A value indicating if the image is race.
-   * @member {number} [adultScore] Score from 0 to 1 that indicates how much of
-   * adult content is within the image.
+   * @member {boolean} [isRacyContent] A value indicating if the image is racy.
+   * @member {number} [adultScore] Score from 0 to 1 that indicates how much
+   * the content is considered adult-oriented within the image.
    * @member {number} [racyScore] Score from 0 to 1 that indicates how
    * suggestive is the image.
    */

lib/services/computerVision/lib/models/areaOfInterestResult.js

@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+'use strict';
+
+/**
+ * Result of AreaOfInterest operation.
+ *
+ */
+class AreaOfInterestResult {
+  /**
+   * Create a AreaOfInterestResult.
+   * @member {object} [areaOfInterest] A bounding box for an area of interest
+   * inside an image.
+   * @member {number} [areaOfInterest.x] X-coordinate of the top left point of
+   * the area, in pixels.
+   * @member {number} [areaOfInterest.y] Y-coordinate of the top left point of
+   * the area, in pixels.
+   * @member {number} [areaOfInterest.w] Width measured from the top-left point
+   * of the area, in pixels.
+   * @member {number} [areaOfInterest.h] Height measured from the top-left
+   * point of the area, in pixels.
+   * @member {string} [requestId] Id of the REST API request.
+   * @member {object} [metadata]
+   * @member {number} [metadata.width] Image width, in pixels.
+   * @member {number} [metadata.height] Image height, in pixels.
+   * @member {string} [metadata.format] Image format.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of AreaOfInterestResult
+   *
+   * @returns {object} metadata of AreaOfInterestResult
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'AreaOfInterestResult',
+      type: {
+        name: 'Composite',
+        className: 'AreaOfInterestResult',
+        modelProperties: {
+          areaOfInterest: {
+            required: false,
+            readOnly: true,
+            serializedName: 'areaOfInterest',
+            type: {
+              name: 'Composite',
+              className: 'BoundingRect'
+            }
+          },
+          requestId: {
+            required: false,
+            nullable: true,
+            serializedName: 'requestId',
+            type: {
+              name: 'String'
+            }
+          },
+          metadata: {
+            required: false,
+            serializedName: 'metadata',
+            type: {
+              name: 'Composite',
+              className: 'ImageMetadata'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = AreaOfInterestResult;

lib/services/computerVision/lib/models/boundingRect.js

@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+
+'use strict';
+
+/**
+ * A bounding box for an area inside an image.
+ *
+ */
+class BoundingRect {
+  /**
+   * Create a BoundingRect.
+   * @member {number} [x] X-coordinate of the top left point of the area, in
+   * pixels.
+   * @member {number} [y] Y-coordinate of the top left point of the area, in
+   * pixels.
+   * @member {number} [w] Width measured from the top-left point of the area,
+   * in pixels.
+   * @member {number} [h] Height measured from the top-left point of the area,
+   * in pixels.
+   */
+  constructor() {
+  }
+
+  /**
+   * Defines the metadata of BoundingRect
+   *
+   * @returns {object} metadata of BoundingRect
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'BoundingRect',
+      type: {
+        name: 'Composite',
+        className: 'BoundingRect',
+        modelProperties: {
+          x: {
+            required: false,
+            nullable: false,
+            serializedName: 'x',
+            type: {
+              name: 'Number'
+            }
+          },
+          y: {
+            required: false,
+            nullable: false,
+            serializedName: 'y',
+            type: {
+              name: 'Number'
+            }
+          },
+          w: {
+            required: false,
+            nullable: false,
+            serializedName: 'w',
+            type: {
+              name: 'Number'
+            }
+          },
+          h: {
+            required: false,
+            nullable: false,
+            serializedName: 'h',
+            type: {
+              name: 'Number'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = BoundingRect;

lib/services/computerVision/lib/models/category.js

@@ -19,7 +19,7 @@ class Category {
    * Create a Category.
    * @member {string} [name] Name of the category.
    * @member {number} [score] Scoring of the category.
-   * @member {object} [detail]
+   * @member {object} [detail] Details of the identified category.
    * @member {array} [detail.celebrities] An array of celebrities if any
    * identified.
    * @member {array} [detail.landmarks] An array of landmarks if any
@@ -44,6 +44,7 @@ class Category {
         modelProperties: {
           name: {
             required: false,
+            nullable: true,
             serializedName: 'name',
             type: {
               name: 'String'

lib/services/computerVision/lib/models/categoryDetail.js

@@ -39,6 +39,7 @@ class CategoryDetail {
         modelProperties: {
           celebrities: {
             required: false,
+            nullable: true,
             serializedName: 'celebrities',
             type: {
               name: 'Sequence',
@@ -54,6 +55,7 @@ class CategoryDetail {
           },
           landmarks: {
             required: false,
+            nullable: true,
             serializedName: 'landmarks',
             type: {
               name: 'Sequence',

lib/services/computerVision/lib/models/celebritiesModel.js

@@ -18,16 +18,18 @@ class CelebritiesModel {
   /**
    * Create a CelebritiesModel.
    * @member {string} [name] Name of the celebrity.
-   * @member {number} [confidence] Level of confidence ranging from 0 to 1.
-   * @member {object} [faceRectangle]
+   * @member {number} [confidence] Confidence level for the celebrity
+   * recognition as a value ranging from 0 to 1.
+   * @member {object} [faceRectangle] Location of the identified face in the
+   * image.
    * @member {number} [faceRectangle.left] X-coordinate of the top left point
-   * of the face.
+   * of the face, in pixels.
    * @member {number} [faceRectangle.top] Y-coordinate of the top left point of
-   * the face.
+   * the face, in pixels.
    * @member {number} [faceRectangle.width] Width measured from the top-left
-   * point of the face.
+   * point of the face, in pixels.
    * @member {number} [faceRectangle.height] Height measured from the top-left
-   * point of the face.
+   * point of the face, in pixels.
    */
   constructor() {
   }
@@ -48,6 +50,7 @@ class CelebritiesModel {
         modelProperties: {
           name: {
             required: false,
+            nullable: true,
             serializedName: 'name',
             type: {
               name: 'String'

lib/services/computerVision/lib/models/celebrityResults.js

@@ -11,18 +11,18 @@
 'use strict';
 
 /**
- * List of celebrities recognized in the image.
+ * Result of domain-specific classifications for the domain of celebrities.
  *
  */
 class CelebrityResults {
   /**
    * Create a CelebrityResults.
-   * @member {array} [celebrities]
+   * @member {array} [celebrities] List of celebrities recognized in the image.
    * @member {string} [requestId] Id of the REST API request.
    * @member {object} [metadata]
-   * @member {number} [metadata.width] Image width
-   * @member {number} [metadata.height] Image height
-   * @member {string} [metadata.format] Image format
+   * @member {number} [metadata.width] Image width, in pixels.
+   * @member {number} [metadata.height] Image height, in pixels.
+   * @member {string} [metadata.format] Image format.
    */
   constructor() {
   }
@@ -43,6 +43,7 @@ class CelebrityResults {
         modelProperties: {
           celebrities: {
             required: false,
+            nullable: true,
             serializedName: 'celebrities',
             type: {
               name: 'Sequence',
@@ -58,6 +59,7 @@ class CelebrityResults {
           },
           requestId: {
             required: false,
+            nullable: true,
             serializedName: 'requestId',
             type: {
               name: 'String'

lib/services/computerVision/lib/models/colorInfo.js

@@ -45,20 +45,23 @@ class ColorInfo {
         modelProperties: {
           dominantColorForeground: {
             required: false,
+            nullable: true,
             serializedName: 'dominantColorForeground',
             type: {
               name: 'String'
             }
           },
           dominantColorBackground: {
             required: false,
+            nullable: true,
             serializedName: 'dominantColorBackground',
             type: {
               name: 'String'
             }
           },
           dominantColors: {
             required: false,
+            nullable: true,
             serializedName: 'dominantColors',
             type: {
               name: 'Sequence',
@@ -73,6 +76,7 @@ class ColorInfo {
           },
           accentColor: {
             required: false,
+            nullable: true,
             serializedName: 'accentColor',
             type: {
               name: 'String'

lib/services/computerVision/lib/models/computerVisionError.js

@@ -11,16 +11,13 @@
 'use strict';
 
 /**
- * Class representing a ComputerVisionError.
+ * Details about the API request error.
+ *
  */
 class ComputerVisionError {
   /**
    * Create a ComputerVisionError.
-   * @member {string} code The error code. Possible values include:
-   * 'InvalidImageUrl', 'InvalidImageFormat', 'InvalidImageSize',
-   * 'NotSupportedVisualFeature', 'NotSupportedImage', 'InvalidDetails',
-   * 'NotSupportedLanguage', 'BadArgument', 'FailedToProcess', 'Timeout',
-   * 'InternalServerError', 'Unspecified', 'StorageException'
+   * @member {object} code The error code.
    * @member {string} message A message explaining the error reported by the
    * service.
    * @member {string} [requestId] A unique request identifier.
@@ -46,8 +43,7 @@ class ComputerVisionError {
             required: true,
             serializedName: 'code',
             type: {
-              name: 'Enum',
-              allowedValues: [ 'InvalidImageUrl', 'InvalidImageFormat', 'InvalidImageSize', 'NotSupportedVisualFeature', 'NotSupportedImage', 'InvalidDetails', 'NotSupportedLanguage', 'BadArgument', 'FailedToProcess', 'Timeout', 'InternalServerError', 'Unspecified', 'StorageException' ]
+              name: 'Object'
             }
           },
           message: {