diff --git a/lib/services/cognitiveServicesTextAnalytics/LICENSE.txt b/lib/services/cognitiveServicesTextAnalytics/LICENSE.txt
index a70e8cf660..5431ba98b9 100644
--- a/lib/services/cognitiveServicesTextAnalytics/LICENSE.txt
+++ b/lib/services/cognitiveServicesTextAnalytics/LICENSE.txt
@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Microsoft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2018 Microsoft
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/lib/services/cognitiveServicesTextAnalytics/lib/models/entitiesBatchResultItemV2dot1.js b/lib/services/cognitiveServicesTextAnalytics/lib/models/entitiesBatchResultItemV2dot1.js
new file mode 100644
index 0000000000..3749011b87
--- /dev/null
+++ b/lib/services/cognitiveServicesTextAnalytics/lib/models/entitiesBatchResultItemV2dot1.js
@@ -0,0 +1,69 @@
+/*
+ * 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';
+
+/**
+ * Class representing a EntitiesBatchResultItemV2dot1.
+ */
+class EntitiesBatchResultItemV2dot1 {
+ /**
+ * Create a EntitiesBatchResultItemV2dot1.
+ * @member {string} [id] Unique document identifier.
+ * @member {array} [entities] Recognized entities in the document.
+ */
+ constructor() {
+ }
+
+ /**
+ * Defines the metadata of EntitiesBatchResultItemV2dot1
+ *
+ * @returns {object} metadata of EntitiesBatchResultItemV2dot1
+ *
+ */
+ mapper() {
+ return {
+ required: false,
+ serializedName: 'EntitiesBatchResultItemV2dot1',
+ type: {
+ name: 'Composite',
+ className: 'EntitiesBatchResultItemV2dot1',
+ modelProperties: {
+ id: {
+ required: false,
+ readOnly: true,
+ serializedName: 'id',
+ type: {
+ name: 'String'
+ }
+ },
+ entities: {
+ required: false,
+ readOnly: true,
+ serializedName: 'entities',
+ type: {
+ name: 'Sequence',
+ element: {
+ required: false,
+ serializedName: 'EntityRecordV2dot1ElementType',
+ type: {
+ name: 'Composite',
+ className: 'EntityRecordV2dot1'
+ }
+ }
+ }
+ }
+ }
+ }
+ };
+ }
+}
+
+module.exports = EntitiesBatchResultItemV2dot1;
diff --git a/lib/services/cognitiveServicesTextAnalytics/lib/models/entitiesBatchResultV2dot1.js b/lib/services/cognitiveServicesTextAnalytics/lib/models/entitiesBatchResultV2dot1.js
new file mode 100644
index 0000000000..b2178c3826
--- /dev/null
+++ b/lib/services/cognitiveServicesTextAnalytics/lib/models/entitiesBatchResultV2dot1.js
@@ -0,0 +1,77 @@
+/*
+ * 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';
+
+/**
+ * Class representing a EntitiesBatchResultV2dot1.
+ */
+class EntitiesBatchResultV2dot1 {
+ /**
+ * Create a EntitiesBatchResultV2dot1.
+ * @member {array} [documents]
+ * @member {array} [errors]
+ */
+ constructor() {
+ }
+
+ /**
+ * Defines the metadata of EntitiesBatchResultV2dot1
+ *
+ * @returns {object} metadata of EntitiesBatchResultV2dot1
+ *
+ */
+ mapper() {
+ return {
+ required: false,
+ serializedName: 'EntitiesBatchResultV2dot1',
+ type: {
+ name: 'Composite',
+ className: 'EntitiesBatchResultV2dot1',
+ modelProperties: {
+ documents: {
+ required: false,
+ readOnly: true,
+ serializedName: 'documents',
+ type: {
+ name: 'Sequence',
+ element: {
+ required: false,
+ serializedName: 'EntitiesBatchResultItemV2dot1ElementType',
+ type: {
+ name: 'Composite',
+ className: 'EntitiesBatchResultItemV2dot1'
+ }
+ }
+ }
+ },
+ errors: {
+ required: false,
+ readOnly: true,
+ serializedName: 'errors',
+ type: {
+ name: 'Sequence',
+ element: {
+ required: false,
+ serializedName: 'ErrorRecordElementType',
+ type: {
+ name: 'Composite',
+ className: 'ErrorRecord'
+ }
+ }
+ }
+ }
+ }
+ }
+ };
+ }
+}
+
+module.exports = EntitiesBatchResultV2dot1;
diff --git a/lib/services/cognitiveServicesTextAnalytics/lib/models/entityRecordV2dot1.js b/lib/services/cognitiveServicesTextAnalytics/lib/models/entityRecordV2dot1.js
new file mode 100644
index 0000000000..d2135bf009
--- /dev/null
+++ b/lib/services/cognitiveServicesTextAnalytics/lib/models/entityRecordV2dot1.js
@@ -0,0 +1,123 @@
+/*
+ * 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';
+
+/**
+ * Class representing a EntityRecordV2dot1.
+ */
+class EntityRecordV2dot1 {
+ /**
+ * Create a EntityRecordV2dot1.
+ * @member {string} [name] Entity formal name.
+ * @member {array} [matches] List of instances this entity appears in the
+ * text.
+ * @member {string} [wikipediaLanguage] Wikipedia language for which the
+ * WikipediaId and WikipediaUrl refers to.
+ * @member {string} [wikipediaId] Wikipedia unique identifier of the
+ * recognized entity.
+ * @member {string} [wikipediaUrl] URL for the entity's English Wikipedia
+ * page.
+ * @member {string} [bingId] Bing unique identifier of the recognized entity.
+ * Use in conjunction with the Bing Entity Search API to fetch additional
+ * relevant information.
+ * @member {string} [type] Entity type from Named Entity Recognition model
+ * @member {string} [subType] Entity sub type from Named Entity Recognition
+ * model
+ */
+ constructor() {
+ }
+
+ /**
+ * Defines the metadata of EntityRecordV2dot1
+ *
+ * @returns {object} metadata of EntityRecordV2dot1
+ *
+ */
+ mapper() {
+ return {
+ required: false,
+ serializedName: 'EntityRecordV2dot1',
+ type: {
+ name: 'Composite',
+ className: 'EntityRecordV2dot1',
+ modelProperties: {
+ name: {
+ required: false,
+ serializedName: 'name',
+ type: {
+ name: 'String'
+ }
+ },
+ matches: {
+ required: false,
+ serializedName: 'matches',
+ type: {
+ name: 'Sequence',
+ element: {
+ required: false,
+ serializedName: 'MatchRecordV2dot1ElementType',
+ type: {
+ name: 'Composite',
+ className: 'MatchRecordV2dot1'
+ }
+ }
+ }
+ },
+ wikipediaLanguage: {
+ required: false,
+ serializedName: 'wikipediaLanguage',
+ type: {
+ name: 'String'
+ }
+ },
+ wikipediaId: {
+ required: false,
+ serializedName: 'wikipediaId',
+ type: {
+ name: 'String'
+ }
+ },
+ wikipediaUrl: {
+ required: false,
+ readOnly: true,
+ serializedName: 'wikipediaUrl',
+ type: {
+ name: 'String'
+ }
+ },
+ bingId: {
+ required: false,
+ serializedName: 'bingId',
+ type: {
+ name: 'String'
+ }
+ },
+ type: {
+ required: false,
+ serializedName: 'type',
+ type: {
+ name: 'String'
+ }
+ },
+ subType: {
+ required: false,
+ serializedName: 'subType',
+ type: {
+ name: 'String'
+ }
+ }
+ }
+ }
+ };
+ }
+}
+
+module.exports = EntityRecordV2dot1;
diff --git a/lib/services/cognitiveServicesTextAnalytics/lib/models/index.d.ts b/lib/services/cognitiveServicesTextAnalytics/lib/models/index.d.ts
index 456c113be1..15aae94693 100644
--- a/lib/services/cognitiveServicesTextAnalytics/lib/models/index.d.ts
+++ b/lib/services/cognitiveServicesTextAnalytics/lib/models/index.d.ts
@@ -199,7 +199,7 @@ export interface SentimentBatchResult {
/**
* @class
- * Initializes a new instance of the MatchRecord class.
+ * Initializes a new instance of the MatchRecordV2dot1 class.
* @constructor
* @member {string} [text] Entity text as appears in the request.
* @member {number} [offset] Start position (in Unicode characters) for the
@@ -207,7 +207,7 @@ export interface SentimentBatchResult {
* @member {number} [length] Length (in Unicode characters) for the entity
* match text.
*/
-export interface MatchRecord {
+export interface MatchRecordV2dot1 {
text?: string;
offset?: number;
length?: number;
@@ -215,7 +215,7 @@ export interface MatchRecord {
/**
* @class
- * Initializes a new instance of the EntityRecord class.
+ * Initializes a new instance of the EntityRecordV2dot1 class.
* @constructor
* @member {string} [name] Entity formal name.
* @member {array} [matches] List of instances this entity appears in the text.
@@ -227,36 +227,41 @@ export interface MatchRecord {
* @member {string} [bingId] Bing unique identifier of the recognized entity.
* Use in conjunction with the Bing Entity Search API to fetch additional
* relevant information.
+ * @member {string} [type] Entity type from Named Entity Recognition model
+ * @member {string} [subType] Entity sub type from Named Entity Recognition
+ * model
*/
-export interface EntityRecord {
+export interface EntityRecordV2dot1 {
name?: string;
- readonly matches?: MatchRecord[];
+ matches?: MatchRecordV2dot1[];
wikipediaLanguage?: string;
wikipediaId?: string;
readonly wikipediaUrl?: string;
bingId?: string;
+ type?: string;
+ subType?: string;
}
/**
* @class
- * Initializes a new instance of the EntitiesBatchResultItem class.
+ * Initializes a new instance of the EntitiesBatchResultItemV2dot1 class.
* @constructor
* @member {string} [id] Unique document identifier.
* @member {array} [entities] Recognized entities in the document.
*/
-export interface EntitiesBatchResultItem {
+export interface EntitiesBatchResultItemV2dot1 {
readonly id?: string;
- readonly entities?: EntityRecord[];
+ readonly entities?: EntityRecordV2dot1[];
}
/**
* @class
- * Initializes a new instance of the EntitiesBatchResult class.
+ * Initializes a new instance of the EntitiesBatchResultV2dot1 class.
* @constructor
* @member {array} [documents]
* @member {array} [errors]
*/
-export interface EntitiesBatchResult {
- readonly documents?: EntitiesBatchResultItem[];
+export interface EntitiesBatchResultV2dot1 {
+ readonly documents?: EntitiesBatchResultItemV2dot1[];
readonly errors?: ErrorRecord[];
}
diff --git a/lib/services/cognitiveServicesTextAnalytics/lib/models/index.js b/lib/services/cognitiveServicesTextAnalytics/lib/models/index.js
index 13b2ce37c4..15156b0cc0 100644
--- a/lib/services/cognitiveServicesTextAnalytics/lib/models/index.js
+++ b/lib/services/cognitiveServicesTextAnalytics/lib/models/index.js
@@ -28,7 +28,7 @@ exports.LanguageBatchResultItem = require('./languageBatchResultItem');
exports.LanguageBatchResult = require('./languageBatchResult');
exports.SentimentBatchResultItem = require('./sentimentBatchResultItem');
exports.SentimentBatchResult = require('./sentimentBatchResult');
-exports.MatchRecord = require('./matchRecord');
-exports.EntityRecord = require('./entityRecord');
-exports.EntitiesBatchResultItem = require('./entitiesBatchResultItem');
-exports.EntitiesBatchResult = require('./entitiesBatchResult');
+exports.MatchRecordV2dot1 = require('./matchRecordV2dot1');
+exports.EntityRecordV2dot1 = require('./entityRecordV2dot1');
+exports.EntitiesBatchResultItemV2dot1 = require('./entitiesBatchResultItemV2dot1');
+exports.EntitiesBatchResultV2dot1 = require('./entitiesBatchResultV2dot1');
diff --git a/lib/services/cognitiveServicesTextAnalytics/lib/models/matchRecordV2dot1.js b/lib/services/cognitiveServicesTextAnalytics/lib/models/matchRecordV2dot1.js
new file mode 100644
index 0000000000..72151fda31
--- /dev/null
+++ b/lib/services/cognitiveServicesTextAnalytics/lib/models/matchRecordV2dot1.js
@@ -0,0 +1,69 @@
+/*
+ * 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';
+
+/**
+ * Class representing a MatchRecordV2dot1.
+ */
+class MatchRecordV2dot1 {
+ /**
+ * Create a MatchRecordV2dot1.
+ * @member {string} [text] Entity text as appears in the request.
+ * @member {number} [offset] Start position (in Unicode characters) for the
+ * entity match text.
+ * @member {number} [length] Length (in Unicode characters) for the entity
+ * match text.
+ */
+ constructor() {
+ }
+
+ /**
+ * Defines the metadata of MatchRecordV2dot1
+ *
+ * @returns {object} metadata of MatchRecordV2dot1
+ *
+ */
+ mapper() {
+ return {
+ required: false,
+ serializedName: 'MatchRecordV2dot1',
+ type: {
+ name: 'Composite',
+ className: 'MatchRecordV2dot1',
+ modelProperties: {
+ text: {
+ required: false,
+ serializedName: 'text',
+ type: {
+ name: 'String'
+ }
+ },
+ offset: {
+ required: false,
+ serializedName: 'offset',
+ type: {
+ name: 'Number'
+ }
+ },
+ length: {
+ required: false,
+ serializedName: 'length',
+ type: {
+ name: 'Number'
+ }
+ }
+ }
+ }
+ };
+ }
+}
+
+module.exports = MatchRecordV2dot1;
diff --git a/lib/services/cognitiveServicesTextAnalytics/lib/textAnalyticsClient.d.ts b/lib/services/cognitiveServicesTextAnalytics/lib/textAnalyticsClient.d.ts
index 02c23798ef..aca9d4afbd 100644
--- a/lib/services/cognitiveServicesTextAnalytics/lib/textAnalyticsClient.d.ts
+++ b/lib/services/cognitiveServicesTextAnalytics/lib/textAnalyticsClient.d.ts
@@ -254,9 +254,21 @@ export default class TextAnalyticsClient extends ServiceClient {
/**
* @summary The API returns a list of recognized entities in a given document.
*
- * To get even more information on each recognized entity we recommend using
- * the Bing Entity Search API by querying for the recognized entities names.
- * See the Supported
+ * languages in Text Analytics API for the list of enabled languages.The
+ * API returns a list of known entities and general named entities ("Person",
+ * "Location", "Organization" etc) in a given document. Known entities are
+ * returned with Wikipedia Id and Wikipedia link, and also Bing Id which can be
+ * used in Bing Entity Search API. General named entities are returned with
+ * entity types. If a general named entity is also a known entity, then all
+ * information regarding it (Wikipedia Id, Bing Id, entity type etc) will be
+ * returned. See the Supported
+ * Entity Types in Text Analytics API for the list of supported Entity
+ * Types. See the Supported
* languages in Text Analytics API for the list of enabled languages.
*
@@ -271,18 +283,30 @@ export default class TextAnalyticsClient extends ServiceClient {
*
* @returns {Promise} A promise is returned
*
- * @resolve {HttpOperationResponse} - The deserialized result object.
+ * @resolve {HttpOperationResponse} - The deserialized result object.
*
* @reject {Error|ServiceError} - The error object.
*/
- entitiesWithHttpOperationResponse(input: models.MultiLanguageBatchInput, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>;
+ entitiesWithHttpOperationResponse(input: models.MultiLanguageBatchInput, options?: { customHeaders? : { [headerName: string]: string; } }): Promise>;
/**
* @summary The API returns a list of recognized entities in a given document.
*
- * To get even more information on each recognized entity we recommend using
- * the Bing Entity Search API by querying for the recognized entities names.
- * See the Supported
+ * languages in Text Analytics API for the list of enabled languages.The
+ * API returns a list of known entities and general named entities ("Person",
+ * "Location", "Organization" etc) in a given document. Known entities are
+ * returned with Wikipedia Id and Wikipedia link, and also Bing Id which can be
+ * used in Bing Entity Search API. General named entities are returned with
+ * entity types. If a general named entity is also a known entity, then all
+ * information regarding it (Wikipedia Id, Bing Id, entity type etc) will be
+ * returned. See the Supported
+ * Entity Types in Text Analytics API for the list of supported Entity
+ * Types. See the Supported
* languages in Text Analytics API for the list of enabled languages.
*
@@ -302,7 +326,7 @@ export default class TextAnalyticsClient extends ServiceClient {
*
* {Promise} A promise is returned.
*
- * @resolve {EntitiesBatchResult} - The deserialized result object.
+ * @resolve {EntitiesBatchResultV2dot1} - The deserialized result object.
*
* @reject {Error|ServiceError} - The error object.
*
@@ -310,16 +334,17 @@ export default class TextAnalyticsClient extends ServiceClient {
*
* {Error|ServiceError} err - The Error object if an error occurred, null otherwise.
*
- * {EntitiesBatchResult} [result] - The deserialized result object if an error did not occur.
- * See {@link EntitiesBatchResult} for more information.
+ * {EntitiesBatchResultV2dot1} [result] - The deserialized result object if an error did not occur.
+ * See {@link EntitiesBatchResultV2dot1} for more
+ * information.
*
* {WebResource} [request] - The HTTP Request object if an error did not occur.
*
* {http.IncomingMessage} [response] - The HTTP Response stream if an error did not occur.
*/
- entities(input: models.MultiLanguageBatchInput, options?: { customHeaders? : { [headerName: string]: string; } }): Promise;
- entities(input: models.MultiLanguageBatchInput, callback: ServiceCallback): void;
- entities(input: models.MultiLanguageBatchInput, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void;
+ entities(input: models.MultiLanguageBatchInput, options?: { customHeaders? : { [headerName: string]: string; } }): Promise;
+ entities(input: models.MultiLanguageBatchInput, callback: ServiceCallback): void;
+ entities(input: models.MultiLanguageBatchInput, options: { customHeaders? : { [headerName: string]: string; } }, callback: ServiceCallback): void;
}
export { TextAnalyticsClient, models as TextAnalyticsModels };
diff --git a/lib/services/cognitiveServicesTextAnalytics/lib/textAnalyticsClient.js b/lib/services/cognitiveServicesTextAnalytics/lib/textAnalyticsClient.js
index fb9ec4899e..66963c1834 100644
--- a/lib/services/cognitiveServicesTextAnalytics/lib/textAnalyticsClient.js
+++ b/lib/services/cognitiveServicesTextAnalytics/lib/textAnalyticsClient.js
@@ -456,9 +456,21 @@ function _sentiment(input, options, callback) {
/**
* @summary The API returns a list of recognized entities in a given document.
*
- * To get even more information on each recognized entity we recommend using
- * the Bing Entity Search API by querying for the recognized entities names.
- * See the Supported
+ * languages in Text Analytics API for the list of enabled languages.The
+ * API returns a list of known entities and general named entities ("Person",
+ * "Location", "Organization" etc) in a given document. Known entities are
+ * returned with Wikipedia Id and Wikipedia link, and also Bing Id which can be
+ * used in Bing Entity Search API. General named entities are returned with
+ * entity types. If a general named entity is also a known entity, then all
+ * information regarding it (Wikipedia Id, Bing Id, entity type etc) will be
+ * returned. See the Supported
+ * Entity Types in Text Analytics API for the list of supported Entity
+ * Types. See the Supported
* languages in Text Analytics API for the list of enabled languages.
*
@@ -478,7 +490,8 @@ function _sentiment(input, options, callback) {
* {Error} err - The Error object if an error occurred, null otherwise.
*
* {object} [result] - The deserialized result object if an error did not occur.
- * See {@link EntitiesBatchResult} for more information.
+ * See {@link EntitiesBatchResultV2dot1} for more
+ * information.
*
* {object} [request] - The HTTP Request object if an error did not occur.
*
@@ -582,7 +595,7 @@ function _entities(input, options, callback) {
parsedResponse = JSON.parse(responseBody);
result = JSON.parse(responseBody);
if (parsedResponse !== null && parsedResponse !== undefined) {
- let resultMapper = new client.models['EntitiesBatchResult']().mapper();
+ let resultMapper = new client.models['EntitiesBatchResultV2dot1']().mapper();
result = client.deserialize(resultMapper, parsedResponse, 'result');
}
} catch (error) {
@@ -621,7 +634,7 @@ class TextAnalyticsClient extends ServiceClient {
super(credentials, options);
- this.baseUri = '{Endpoint}/text/analytics/v2.0';
+ this.baseUri = '{Endpoint}/text/analytics/v2.1-preview';
this.credentials = credentials;
this.endpoint = endpoint;
@@ -932,9 +945,21 @@ class TextAnalyticsClient extends ServiceClient {
/**
* @summary The API returns a list of recognized entities in a given document.
*
- * To get even more information on each recognized entity we recommend using
- * the Bing Entity Search API by querying for the recognized entities names.
- * See the Supported
+ * languages in Text Analytics API for the list of enabled languages.The
+ * API returns a list of known entities and general named entities ("Person",
+ * "Location", "Organization" etc) in a given document. Known entities are
+ * returned with Wikipedia Id and Wikipedia link, and also Bing Id which can be
+ * used in Bing Entity Search API. General named entities are returned with
+ * entity types. If a general named entity is also a known entity, then all
+ * information regarding it (Wikipedia Id, Bing Id, entity type etc) will be
+ * returned. See the Supported
+ * Entity Types in Text Analytics API for the list of supported Entity
+ * Types. See the Supported
* languages in Text Analytics API for the list of enabled languages.
*
@@ -949,7 +974,7 @@ class TextAnalyticsClient extends ServiceClient {
*
* @returns {Promise} A promise is returned
*
- * @resolve {HttpOperationResponse} - The deserialized result object.
+ * @resolve {HttpOperationResponse} - The deserialized result object.
*
* @reject {Error} - The error object.
*/
@@ -970,9 +995,21 @@ class TextAnalyticsClient extends ServiceClient {
/**
* @summary The API returns a list of recognized entities in a given document.
*
- * To get even more information on each recognized entity we recommend using
- * the Bing Entity Search API by querying for the recognized entities names.
- * See the Supported
+ * languages in Text Analytics API for the list of enabled languages.The
+ * API returns a list of known entities and general named entities ("Person",
+ * "Location", "Organization" etc) in a given document. Known entities are
+ * returned with Wikipedia Id and Wikipedia link, and also Bing Id which can be
+ * used in Bing Entity Search API. General named entities are returned with
+ * entity types. If a general named entity is also a known entity, then all
+ * information regarding it (Wikipedia Id, Bing Id, entity type etc) will be
+ * returned. See the Supported
+ * Entity Types in Text Analytics API for the list of supported Entity
+ * Types. See the Supported
* languages in Text Analytics API for the list of enabled languages.
*
@@ -992,7 +1029,7 @@ class TextAnalyticsClient extends ServiceClient {
*
* {Promise} A promise is returned
*
- * @resolve {EntitiesBatchResult} - The deserialized result object.
+ * @resolve {EntitiesBatchResultV2dot1} - The deserialized result object.
*
* @reject {Error} - The error object.
*
@@ -1001,7 +1038,8 @@ class TextAnalyticsClient extends ServiceClient {
* {Error} err - The Error object if an error occurred, null otherwise.
*
* {object} [result] - The deserialized result object if an error did not occur.
- * See {@link EntitiesBatchResult} for more information.
+ * See {@link EntitiesBatchResultV2dot1} for more
+ * information.
*
* {object} [request] - The HTTP Request object if an error did not occur.
*