diff --git a/lib/services/computerVision/lib/computerVisionAPIClient.d.ts b/lib/services/computerVision/lib/computerVisionAPIClient.d.ts index 29a3cf5dd0..a7634c5486 100644 --- a/lib/services/computerVision/lib/computerVisionAPIClient.d.ts +++ b/lib/services/computerVision/lib/computerVisionAPIClient.d.ts @@ -555,13 +555,18 @@ export default class ComputerVisionAPIClient extends ServiceClient { * If the request failed, the response will contain an error code and a message * to help understand what went wrong. * - * @param {string} model The domain-specific content to recognize. Possible - * values include: 'Celebrities', 'Landmarks' + * @param {string} model The domain-specific content to recognize. * * @param {string} url Publicly reachable URL of an image * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -571,7 +576,7 @@ export default class ComputerVisionAPIClient extends ServiceClient { * * @reject {Error|ServiceError} - The error object. */ - analyzeImageByDomainWithHttpOperationResponse(model: string, url: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + analyzeImageByDomainWithHttpOperationResponse(model: string, url: string, options?: { language? : string, customHeaders? : { [headerName: string]: string; } }): Promise>; /** * This operation recognizes content within an image by applying a @@ -583,13 +588,18 @@ export default class ComputerVisionAPIClient extends ServiceClient { * If the request failed, the response will contain an error code and a message * to help understand what went wrong. * - * @param {string} model The domain-specific content to recognize. Possible - * values include: 'Celebrities', 'Landmarks' + * @param {string} model The domain-specific content to recognize. * * @param {string} url Publicly reachable URL of an image * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -615,9 +625,9 @@ export default class ComputerVisionAPIClient extends ServiceClient { * * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. */ - analyzeImageByDomain(model: string, url: string, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + analyzeImageByDomain(model: string, url: string, options?: { language? : string, customHeaders? : { [headerName: string]: string; } }): Promise; analyzeImageByDomain(model: string, url: string, callback: ServiceCallback): void; - analyzeImageByDomain(model: string, url: string, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + analyzeImageByDomain(model: string, url: string, options: { language? : string, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; /** @@ -1125,6 +1135,12 @@ export default class ComputerVisionAPIClient extends ServiceClient { * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -1134,7 +1150,7 @@ export default class ComputerVisionAPIClient extends ServiceClient { * * @reject {Error|ServiceError} - The error object. */ - tagImageInStreamWithHttpOperationResponse(image: stream.Readable, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + tagImageInStreamWithHttpOperationResponse(image: stream.Readable, options?: { language? : string, customHeaders? : { [headerName: string]: string; } }): Promise>; /** * This operation generates a list of words, or tags, that are relevant to the @@ -1149,6 +1165,12 @@ export default class ComputerVisionAPIClient extends ServiceClient { * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -1174,9 +1196,9 @@ export default class ComputerVisionAPIClient extends ServiceClient { * * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. */ - tagImageInStream(image: stream.Readable, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + tagImageInStream(image: stream.Readable, options?: { language? : string, customHeaders? : { [headerName: string]: string; } }): Promise; tagImageInStream(image: stream.Readable, callback: ServiceCallback): void; - tagImageInStream(image: stream.Readable, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + tagImageInStream(image: stream.Readable, options: { language? : string, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; /** @@ -1195,6 +1217,12 @@ export default class ComputerVisionAPIClient extends ServiceClient { * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -1204,7 +1232,7 @@ export default class ComputerVisionAPIClient extends ServiceClient { * * @reject {Error|ServiceError} - The error object. */ - analyzeImageByDomainInStreamWithHttpOperationResponse(model: string, image: stream.Readable, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>; + analyzeImageByDomainInStreamWithHttpOperationResponse(model: string, image: stream.Readable, options?: { language? : string, customHeaders? : { [headerName: string]: string; } }): Promise>; /** * This operation recognizes content within an image by applying a @@ -1222,6 +1250,12 @@ export default class ComputerVisionAPIClient extends ServiceClient { * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -1247,9 +1281,9 @@ export default class ComputerVisionAPIClient extends ServiceClient { * * {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur. */ - analyzeImageByDomainInStream(model: string, image: stream.Readable, options?: { customHeaders? : { [headerName: string]: string; } }): Promise; + analyzeImageByDomainInStream(model: string, image: stream.Readable, options?: { language? : string, customHeaders? : { [headerName: string]: string; } }): Promise; analyzeImageByDomainInStream(model: string, image: stream.Readable, callback: ServiceCallback): void; - analyzeImageByDomainInStream(model: string, image: stream.Readable, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; + analyzeImageByDomainInStream(model: string, image: stream.Readable, options: { language? : string, customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void; /** diff --git a/lib/services/computerVision/lib/computerVisionAPIClient.js b/lib/services/computerVision/lib/computerVisionAPIClient.js index 281445a1a3..df8ee85792 100644 --- a/lib/services/computerVision/lib/computerVisionAPIClient.js +++ b/lib/services/computerVision/lib/computerVisionAPIClient.js @@ -1084,13 +1084,18 @@ function _tagImage(url, options, callback) { * If the request failed, the response will contain an error code and a message * to help understand what went wrong. * - * @param {string} model The domain-specific content to recognize. Possible - * values include: 'Celebrities', 'Landmarks' + * @param {string} model The domain-specific content to recognize. * * @param {string} url Publicly reachable URL of an image * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -1117,6 +1122,7 @@ function _analyzeImageByDomain(model, url, options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } + let language = (options && options.language !== undefined) ? options.language : 'en'; // Validate try { if (this.azureRegion) { @@ -1128,13 +1134,11 @@ function _analyzeImageByDomain(model, url, options, callback) { } else { throw new Error('this.azureRegion cannot be null or undefined.'); } - if (model) { - let allowedValues1 = [ 'Celebrities', 'Landmarks' ]; - if (!allowedValues1.some( function(item) { return item === model; })) { - throw new Error(model + ' is not a valid value. The valid values are: ' + allowedValues1); - } - } else { - throw new Error('model cannot be null or undefined.'); + if (model === null || model === undefined || typeof model.valueOf() !== 'string') { + throw new Error('model cannot be null or undefined and it must be of type string.'); + } + if (language !== null && language !== undefined && typeof language.valueOf() !== 'string') { + throw new Error('language must be of type string.'); } if (url === null || url === undefined || typeof url.valueOf() !== 'string') { throw new Error('url cannot be null or undefined and it must be of type string.'); @@ -1153,6 +1157,13 @@ function _analyzeImageByDomain(model, url, options, callback) { let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'models/{model}/analyze'; requestUrl = requestUrl.replace('{AzureRegion}', this.azureRegion); requestUrl = requestUrl.replace('{model}', encodeURIComponent(model)); + let queryParameters = []; + if (language !== null && language !== undefined) { + queryParameters.push('language=' + encodeURIComponent(language)); + } + if (queryParameters.length > 0) { + requestUrl += '?' + queryParameters.join('&'); + } // Create HTTP transport objects let httpRequest = new WebResource(); @@ -2210,6 +2221,12 @@ function _describeImageInStream(image, options, callback) { * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -2236,6 +2253,7 @@ function _tagImageInStream(image, options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } + let language = (options && options.language !== undefined) ? options.language : 'en'; // Validate try { if (this.azureRegion) { @@ -2247,6 +2265,9 @@ function _tagImageInStream(image, options, callback) { } else { throw new Error('this.azureRegion cannot be null or undefined.'); } + if (language !== null && language !== undefined && typeof language.valueOf() !== 'string') { + throw new Error('language must be of type string.'); + } if (image === null || image === undefined) { throw new Error('image cannot be null or undefined and it must be of type object.'); } @@ -2258,6 +2279,13 @@ function _tagImageInStream(image, options, callback) { let baseUrl = this.baseUri; let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'tag'; requestUrl = requestUrl.replace('{AzureRegion}', this.azureRegion); + let queryParameters = []; + if (language !== null && language !== undefined) { + queryParameters.push('language=' + encodeURIComponent(language)); + } + if (queryParameters.length > 0) { + requestUrl += '?' + queryParameters.join('&'); + } // Create HTTP transport objects let httpRequest = new WebResource(); @@ -2349,6 +2377,12 @@ function _tagImageInStream(image, options, callback) { * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -2375,6 +2409,7 @@ function _analyzeImageByDomainInStream(model, image, options, callback) { if (!callback) { throw new Error('callback cannot be null.'); } + let language = (options && options.language !== undefined) ? options.language : 'en'; // Validate try { if (this.azureRegion) { @@ -2389,6 +2424,9 @@ function _analyzeImageByDomainInStream(model, image, options, callback) { if (model === null || model === undefined || typeof model.valueOf() !== 'string') { throw new Error('model cannot be null or undefined and it must be of type string.'); } + if (language !== null && language !== undefined && typeof language.valueOf() !== 'string') { + throw new Error('language must be of type string.'); + } if (image === null || image === undefined) { throw new Error('image cannot be null or undefined and it must be of type object.'); } @@ -2401,6 +2439,13 @@ function _analyzeImageByDomainInStream(model, image, options, callback) { let requestUrl = baseUrl + (baseUrl.endsWith('/') ? '' : '/') + 'models/{model}/analyze'; requestUrl = requestUrl.replace('{AzureRegion}', this.azureRegion); requestUrl = requestUrl.replace('{model}', encodeURIComponent(model)); + let queryParameters = []; + if (language !== null && language !== undefined) { + queryParameters.push('language=' + encodeURIComponent(language)); + } + if (queryParameters.length > 0) { + requestUrl += '?' + queryParameters.join('&'); + } // Create HTTP transport objects let httpRequest = new WebResource(); @@ -3335,13 +3380,18 @@ class ComputerVisionAPIClient extends ServiceClient { * If the request failed, the response will contain an error code and a message * to help understand what went wrong. * - * @param {string} model The domain-specific content to recognize. Possible - * values include: 'Celebrities', 'Landmarks' + * @param {string} model The domain-specific content to recognize. * * @param {string} url Publicly reachable URL of an image * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -3375,13 +3425,18 @@ class ComputerVisionAPIClient extends ServiceClient { * If the request failed, the response will contain an error code and a message * to help understand what went wrong. * - * @param {string} model The domain-specific content to recognize. Possible - * values include: 'Celebrities', 'Landmarks' + * @param {string} model The domain-specific content to recognize. * * @param {string} url Publicly reachable URL of an image * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -4094,6 +4149,12 @@ class ComputerVisionAPIClient extends ServiceClient { * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -4130,6 +4191,12 @@ class ComputerVisionAPIClient extends ServiceClient { * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -4191,6 +4258,12 @@ class ComputerVisionAPIClient extends ServiceClient { * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * @@ -4230,6 +4303,12 @@ class ComputerVisionAPIClient extends ServiceClient { * * @param {object} [options] Optional Parameters. * + * @param {string} [options.language] The desired language for output + * generation. If this parameter is not specified, the default value is + * "en".Supported languages:en - English, Default.ja - Japanese pt - + * Portuguese zh - Simplified Chinese. Possible values include: 'en', 'ja', + * 'pt', 'zh' + * * @param {object} [options.customHeaders] Headers that will be added to the * request * diff --git a/lib/services/computerVision/lib/models/celebrityResults.js b/lib/services/computerVision/lib/models/celebrityResults.js new file mode 100644 index 0000000000..799cc98f8e --- /dev/null +++ b/lib/services/computerVision/lib/models/celebrityResults.js @@ -0,0 +1,82 @@ +/* + * 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'; + +const models = require('./index'); + +/** + * List of celebrities recognized in the image. + * + */ +class CelebrityResults { + /** + * Create a CelebrityResults. + * @member {array} [celebrities] + * @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 + */ + constructor() { + } + + /** + * Defines the metadata of CelebrityResults + * + * @returns {object} metadata of CelebrityResults + * + */ + mapper() { + return { + required: false, + serializedName: 'CelebrityResults', + type: { + name: 'Composite', + className: 'CelebrityResults', + modelProperties: { + celebrities: { + required: false, + serializedName: 'celebrities', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'CelebritiesModelElementType', + type: { + name: 'Composite', + className: 'CelebritiesModel' + } + } + } + }, + requestId: { + required: false, + serializedName: 'requestId', + type: { + name: 'String' + } + }, + metadata: { + required: false, + serializedName: 'metadata', + type: { + name: 'Composite', + className: 'ImageMetadata' + } + } + } + } + }; + } +} + +module.exports = CelebrityResults; diff --git a/lib/services/computerVision/lib/models/domainModelResults.js b/lib/services/computerVision/lib/models/domainModelResults.js index 28e0e26456..56a62e5bce 100644 --- a/lib/services/computerVision/lib/models/domainModelResults.js +++ b/lib/services/computerVision/lib/models/domainModelResults.js @@ -20,8 +20,7 @@ const models = require('./index'); class DomainModelResults { /** * Create a DomainModelResults. - * @member {array} [celebrities] An array of possible celebritied identified - * in the image. + * @member {object} [result] Model-specific response * @member {string} [requestId] Id of the REST API request. * @member {object} [metadata] * @member {number} [metadata.width] Image width @@ -45,19 +44,11 @@ class DomainModelResults { name: 'Composite', className: 'DomainModelResults', modelProperties: { - celebrities: { + result: { required: false, - serializedName: 'result.celebrities', + serializedName: 'result', type: { - name: 'Sequence', - element: { - required: false, - serializedName: 'CelebritiesModelElementType', - type: { - name: 'Composite', - className: 'CelebritiesModel' - } - } + name: 'Object' } }, requestId: { diff --git a/lib/services/computerVision/lib/models/index.d.ts b/lib/services/computerVision/lib/models/index.d.ts index 469903f74a..6b01480989 100644 --- a/lib/services/computerVision/lib/models/index.d.ts +++ b/lib/services/computerVision/lib/models/index.d.ts @@ -410,7 +410,8 @@ export interface OcrRegion { * @class * Initializes a new instance of the OcrResult class. * @constructor - * @member {object} [language] + * @member {string} [language] The BCP-47 language code of the text in the + * image. * @member {number} [textAngle] The angle, in degrees, of the detected text * with respect to the closest horizontal or vertical direction. After rotating * the input image clockwise by this angle, the recognized text lines become @@ -430,7 +431,7 @@ export interface OcrRegion { * a region of recognized text. */ export interface OcrResult { - language?: OcrResult; + language?: string; textAngle?: number; orientation?: string; regions?: OcrRegion[]; @@ -469,8 +470,7 @@ export interface ListModelsResult { * Result of image analysis using a specific domain model including additional * metadata. * - * @member {array} [celebrities] An array of possible celebritied identified in - * the image. + * @member {object} [result] Model-specific response * @member {string} [requestId] Id of the REST API request. * @member {object} [metadata] * @member {number} [metadata.width] Image width @@ -478,11 +478,63 @@ export interface ListModelsResult { * @member {string} [metadata.format] Image format */ export interface DomainModelResults { + result?: any; + requestId?: string; + metadata?: ImageMetadata; +} + +/** + * @class + * Initializes a new instance of the CelebrityResults class. + * @constructor + * List of celebrities recognized in the image. + * + * @member {array} [celebrities] + * @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 + */ +export interface CelebrityResults { celebrities?: CelebritiesModel[]; requestId?: string; metadata?: ImageMetadata; } +/** + * @class + * Initializes a new instance of the LandmarkResultsLandmarksItem class. + * @constructor + * A landmark recognized in the image + * + * @member {string} [name] Name of the landmark. + * @member {number} [confidence] Confidence level for the landmark recognition. + */ +export interface LandmarkResultsLandmarksItem { + name?: string; + confidence?: number; +} + +/** + * @class + * Initializes a new instance of the LandmarkResults class. + * @constructor + * List of landmarks recognized in the image. + * + * @member {array} [landmarks] + * @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 + */ +export interface LandmarkResults { + landmarks?: LandmarkResultsLandmarksItem[]; + requestId?: string; + metadata?: ImageMetadata; +} + /** * @class * Initializes a new instance of the ImageDescription class. diff --git a/lib/services/computerVision/lib/models/index.js b/lib/services/computerVision/lib/models/index.js index 510ed06644..d7b847db19 100644 --- a/lib/services/computerVision/lib/models/index.js +++ b/lib/services/computerVision/lib/models/index.js @@ -38,6 +38,9 @@ exports.OcrResult = require('./ocrResult'); exports.ModelDescription = require('./modelDescription'); exports.ListModelsResult = require('./listModelsResult'); exports.DomainModelResults = require('./domainModelResults'); +exports.CelebrityResults = require('./celebrityResults'); +exports.LandmarkResultsLandmarksItem = require('./landmarkResultsLandmarksItem'); +exports.LandmarkResults = require('./landmarkResults'); exports.ImageDescription = require('./imageDescription'); exports.TagResult = require('./tagResult'); exports.ComputerVisionError = require('./computerVisionError'); diff --git a/lib/services/computerVision/lib/models/landmarkResults.js b/lib/services/computerVision/lib/models/landmarkResults.js new file mode 100644 index 0000000000..8ca87731f9 --- /dev/null +++ b/lib/services/computerVision/lib/models/landmarkResults.js @@ -0,0 +1,82 @@ +/* + * 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'; + +const models = require('./index'); + +/** + * List of landmarks recognized in the image. + * + */ +class LandmarkResults { + /** + * Create a LandmarkResults. + * @member {array} [landmarks] + * @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 + */ + constructor() { + } + + /** + * Defines the metadata of LandmarkResults + * + * @returns {object} metadata of LandmarkResults + * + */ + mapper() { + return { + required: false, + serializedName: 'LandmarkResults', + type: { + name: 'Composite', + className: 'LandmarkResults', + modelProperties: { + landmarks: { + required: false, + serializedName: 'landmarks', + type: { + name: 'Sequence', + element: { + required: false, + serializedName: 'LandmarkResultsLandmarksItemElementType', + type: { + name: 'Composite', + className: 'LandmarkResultsLandmarksItem' + } + } + } + }, + requestId: { + required: false, + serializedName: 'requestId', + type: { + name: 'String' + } + }, + metadata: { + required: false, + serializedName: 'metadata', + type: { + name: 'Composite', + className: 'ImageMetadata' + } + } + } + } + }; + } +} + +module.exports = LandmarkResults; diff --git a/lib/services/computerVision/lib/models/landmarkResultsLandmarksItem.js b/lib/services/computerVision/lib/models/landmarkResultsLandmarksItem.js new file mode 100644 index 0000000000..2a14231315 --- /dev/null +++ b/lib/services/computerVision/lib/models/landmarkResultsLandmarksItem.js @@ -0,0 +1,61 @@ +/* + * 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 landmark recognized in the image + * + */ +class LandmarkResultsLandmarksItem { + /** + * Create a LandmarkResultsLandmarksItem. + * @member {string} [name] Name of the landmark. + * @member {number} [confidence] Confidence level for the landmark + * recognition. + */ + constructor() { + } + + /** + * Defines the metadata of LandmarkResultsLandmarksItem + * + * @returns {object} metadata of LandmarkResultsLandmarksItem + * + */ + mapper() { + return { + required: false, + serializedName: 'LandmarkResults_landmarksItem', + type: { + name: 'Composite', + className: 'LandmarkResultsLandmarksItem', + modelProperties: { + name: { + required: false, + serializedName: 'name', + type: { + name: 'String' + } + }, + confidence: { + required: false, + serializedName: 'confidence', + type: { + name: 'Number' + } + } + } + } + }; + } +} + +module.exports = LandmarkResultsLandmarksItem; diff --git a/lib/services/computerVision/lib/models/ocrResult.js b/lib/services/computerVision/lib/models/ocrResult.js index 5a0704d280..31c052a7b9 100644 --- a/lib/services/computerVision/lib/models/ocrResult.js +++ b/lib/services/computerVision/lib/models/ocrResult.js @@ -18,7 +18,8 @@ const models = require('./index'); class OcrResult { /** * Create a OcrResult. - * @member {object} [language] + * @member {string} [language] The BCP-47 language code of the text in the + * image. * @member {number} [textAngle] The angle, in degrees, of the detected text * with respect to the closest horizontal or vertical direction. After * rotating the input image clockwise by this angle, the recognized text @@ -58,8 +59,7 @@ class OcrResult { required: false, serializedName: 'language', type: { - name: 'Composite', - className: 'OcrResult' + name: 'String' } }, textAngle: {