From 8bb68d16ec0454c44220d1e60b5e4b9aa3074f62 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 14 Nov 2018 15:21:50 +0800 Subject: [PATCH 1/4] Add recognition model --- .../Vision/Face/Face/Generated/FaceClient.cs | 40 ++++++++++ .../Face/Face/Generated/FaceListOperations.cs | 17 +++- .../Generated/FaceListOperationsExtensions.cs | 7 +- .../Face/Generated/IFaceListOperations.cs | 5 +- .../Generated/ILargeFaceListOperations.cs | 5 +- .../Generated/ILargePersonGroupOperations.cs | 5 +- .../Face/Generated/IPersonGroupOperations.cs | 5 +- .../Face/Generated/LargeFaceListOperations.cs | 17 +++- .../LargeFaceListOperationsExtensions.cs | 7 +- .../Generated/LargePersonGroupOperations.cs | 17 +++- .../LargePersonGroupOperationsExtensions.cs | 7 +- .../Face/Generated/Models/DetectedFace.cs | 18 ++++- .../Face/Face/Generated/Models/FaceList.cs | 8 +- .../Face/Generated/Models/LargeFaceList.cs | 8 +- .../Face/Generated/Models/LargePersonGroup.cs | 8 +- .../Face/Generated/Models/MetaDataContract.cs | 77 +++++++++++++++++++ .../Face/Face/Generated/Models/PersonGroup.cs | 8 +- .../Face/Generated/PersonGroupOperations.cs | 17 +++- .../PersonGroupOperationsExtensions.cs | 7 +- 19 files changed, 246 insertions(+), 37 deletions(-) create mode 100644 src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/MetaDataContract.cs diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceClient.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceClient.cs index ca42af3bd53a..6b143ded2bb9 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceClient.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceClient.cs @@ -85,6 +85,19 @@ public partial class FaceClient : ServiceClient, IFaceClient /// public virtual ILargeFaceListOperations LargeFaceList { get; private set; } + /// + /// Initializes a new instance of the FaceClient class. + /// + /// + /// HttpClient to be used + /// + /// + /// True: will dispose the provided httpClient on calling FaceClient.Dispose(). False: will not dispose provided httpClient + protected FaceClient(HttpClient httpClient, bool disposeHttpClient) : base(httpClient, disposeHttpClient) + { + Initialize(); + } + /// /// Initializes a new instance of the FaceClient class. /// @@ -135,6 +148,33 @@ public FaceClient(ServiceClientCredentials credentials, params DelegatingHandler } } + /// + /// Initializes a new instance of the FaceClient class. + /// + /// + /// Required. Subscription credentials which uniquely identify client subscription. + /// + /// + /// HttpClient to be used + /// + /// + /// True: will dispose the provided httpClient on calling FaceClient.Dispose(). False: will not dispose provided httpClient + /// + /// Thrown when a required parameter is null + /// + public FaceClient(ServiceClientCredentials credentials, HttpClient httpClient, bool disposeHttpClient) : this(httpClient, disposeHttpClient) + { + if (credentials == null) + { + throw new System.ArgumentNullException("credentials"); + } + Credentials = credentials; + if (Credentials != null) + { + Credentials.InitializeServiceClient(this); + } + } + /// /// Initializes a new instance of the FaceClient class. /// diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperations.cs index 19040fc0afe5..cb1c35e5a02c 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperations.cs @@ -63,6 +63,9 @@ public FaceListOperations(FaceClient client) /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// Headers that will be added to request. /// @@ -81,7 +84,7 @@ public FaceListOperations(FaceClient client) /// /// A response object containing the response body and response headers. /// - public async Task CreateWithHttpMessagesAsync(string faceListId, string name = default(string), string userData = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task CreateWithHttpMessagesAsync(string faceListId, string name = default(string), string userData = default(string), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.Endpoint == null) { @@ -116,11 +119,19 @@ public FaceListOperations(FaceClient client) throw new ValidationException(ValidationRules.MaxLength, "userData", 16384); } } - NameAndUserDataContract body = new NameAndUserDataContract(); - if (name != null || userData != null) + if (recognitionModel != null) + { + if (recognitionModel.Length > 128) + { + throw new ValidationException(ValidationRules.MaxLength, "recognitionModel", 128); + } + } + MetaDataContract body = new MetaDataContract(); + if (name != null || userData != null || recognitionModel != null) { body.Name = name; body.UserData = userData; + body.RecognitionModel = recognitionModel; } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperationsExtensions.cs index 903936b3faed..ab23f166c368 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperationsExtensions.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperationsExtensions.cs @@ -38,12 +38,15 @@ public static partial class FaceListOperationsExtensions /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// The cancellation token. /// - public static async Task CreateAsync(this IFaceListOperations operations, string faceListId, string name = default(string), string userData = default(string), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task CreateAsync(this IFaceListOperations operations, string faceListId, string name = default(string), string userData = default(string), string recognitionModel = default(string), CancellationToken cancellationToken = default(CancellationToken)) { - (await operations.CreateWithHttpMessagesAsync(faceListId, name, userData, null, cancellationToken).ConfigureAwait(false)).Dispose(); + (await operations.CreateWithHttpMessagesAsync(faceListId, name, userData, recognitionModel, null, cancellationToken).ConfigureAwait(false)).Dispose(); } /// diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceListOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceListOperations.cs index 1ed9a3f60022..cf252a1fccb4 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceListOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceListOperations.cs @@ -36,6 +36,9 @@ public partial interface IFaceListOperations /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// The headers that will be added to request. /// @@ -48,7 +51,7 @@ public partial interface IFaceListOperations /// /// Thrown when a required parameter is null /// - Task CreateWithHttpMessagesAsync(string faceListId, string name = default(string), string userData = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task CreateWithHttpMessagesAsync(string faceListId, string name = default(string), string userData = default(string), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Retrieve a face list's information. /// diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargeFaceListOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargeFaceListOperations.cs index 50237ea1d3a3..af6f4c00b72d 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargeFaceListOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargeFaceListOperations.cs @@ -36,6 +36,9 @@ public partial interface ILargeFaceListOperations /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// The headers that will be added to request. /// @@ -48,7 +51,7 @@ public partial interface ILargeFaceListOperations /// /// Thrown when a required parameter is null /// - Task CreateWithHttpMessagesAsync(string largeFaceListId, string name = default(string), string userData = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task CreateWithHttpMessagesAsync(string largeFaceListId, string name = default(string), string userData = default(string), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Retrieve a large face list's information. /// diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargePersonGroupOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargePersonGroupOperations.cs index 1dc0e72f7309..5df2feab705c 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargePersonGroupOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargePersonGroupOperations.cs @@ -35,6 +35,9 @@ public partial interface ILargePersonGroupOperations /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// The headers that will be added to request. /// @@ -47,7 +50,7 @@ public partial interface ILargePersonGroupOperations /// /// Thrown when a required parameter is null /// - Task CreateWithHttpMessagesAsync(string largePersonGroupId, string name = default(string), string userData = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task CreateWithHttpMessagesAsync(string largePersonGroupId, string name = default(string), string userData = default(string), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Delete an existing large person group. Persisted face features of /// all people in the large person group will also be deleted. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IPersonGroupOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IPersonGroupOperations.cs index 0fef02f6a473..dee8c14052ff 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IPersonGroupOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IPersonGroupOperations.cs @@ -35,6 +35,9 @@ public partial interface IPersonGroupOperations /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// The headers that will be added to request. /// @@ -47,7 +50,7 @@ public partial interface IPersonGroupOperations /// /// Thrown when a required parameter is null /// - Task CreateWithHttpMessagesAsync(string personGroupId, string name = default(string), string userData = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task CreateWithHttpMessagesAsync(string personGroupId, string name = default(string), string userData = default(string), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Delete an existing person group. Persisted face features of all /// people in the person group will also be deleted. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperations.cs index 239606d35cc0..94f851c13c94 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperations.cs @@ -63,6 +63,9 @@ public LargeFaceListOperations(FaceClient client) /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// Headers that will be added to request. /// @@ -81,7 +84,7 @@ public LargeFaceListOperations(FaceClient client) /// /// A response object containing the response body and response headers. /// - public async Task CreateWithHttpMessagesAsync(string largeFaceListId, string name = default(string), string userData = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task CreateWithHttpMessagesAsync(string largeFaceListId, string name = default(string), string userData = default(string), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.Endpoint == null) { @@ -116,11 +119,19 @@ public LargeFaceListOperations(FaceClient client) throw new ValidationException(ValidationRules.MaxLength, "userData", 16384); } } - NameAndUserDataContract body = new NameAndUserDataContract(); - if (name != null || userData != null) + if (recognitionModel != null) + { + if (recognitionModel.Length > 128) + { + throw new ValidationException(ValidationRules.MaxLength, "recognitionModel", 128); + } + } + MetaDataContract body = new MetaDataContract(); + if (name != null || userData != null || recognitionModel != null) { body.Name = name; body.UserData = userData; + body.RecognitionModel = recognitionModel; } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperationsExtensions.cs index f48952c1f777..94ea1489ee80 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperationsExtensions.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperationsExtensions.cs @@ -38,12 +38,15 @@ public static partial class LargeFaceListOperationsExtensions /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// The cancellation token. /// - public static async Task CreateAsync(this ILargeFaceListOperations operations, string largeFaceListId, string name = default(string), string userData = default(string), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task CreateAsync(this ILargeFaceListOperations operations, string largeFaceListId, string name = default(string), string userData = default(string), string recognitionModel = default(string), CancellationToken cancellationToken = default(CancellationToken)) { - (await operations.CreateWithHttpMessagesAsync(largeFaceListId, name, userData, null, cancellationToken).ConfigureAwait(false)).Dispose(); + (await operations.CreateWithHttpMessagesAsync(largeFaceListId, name, userData, recognitionModel, null, cancellationToken).ConfigureAwait(false)).Dispose(); } /// diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperations.cs index 97ebad890187..6c7036434e8a 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperations.cs @@ -63,6 +63,9 @@ public LargePersonGroupOperations(FaceClient client) /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// Headers that will be added to request. /// @@ -81,7 +84,7 @@ public LargePersonGroupOperations(FaceClient client) /// /// A response object containing the response body and response headers. /// - public async Task CreateWithHttpMessagesAsync(string largePersonGroupId, string name = default(string), string userData = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task CreateWithHttpMessagesAsync(string largePersonGroupId, string name = default(string), string userData = default(string), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.Endpoint == null) { @@ -116,11 +119,19 @@ public LargePersonGroupOperations(FaceClient client) throw new ValidationException(ValidationRules.MaxLength, "userData", 16384); } } - NameAndUserDataContract body = new NameAndUserDataContract(); - if (name != null || userData != null) + if (recognitionModel != null) + { + if (recognitionModel.Length > 128) + { + throw new ValidationException(ValidationRules.MaxLength, "recognitionModel", 128); + } + } + MetaDataContract body = new MetaDataContract(); + if (name != null || userData != null || recognitionModel != null) { body.Name = name; body.UserData = userData; + body.RecognitionModel = recognitionModel; } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperationsExtensions.cs index e22c33ea2f77..717be42c225a 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperationsExtensions.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperationsExtensions.cs @@ -37,12 +37,15 @@ public static partial class LargePersonGroupOperationsExtensions /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// The cancellation token. /// - public static async Task CreateAsync(this ILargePersonGroupOperations operations, string largePersonGroupId, string name = default(string), string userData = default(string), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task CreateAsync(this ILargePersonGroupOperations operations, string largePersonGroupId, string name = default(string), string userData = default(string), string recognitionModel = default(string), CancellationToken cancellationToken = default(CancellationToken)) { - (await operations.CreateWithHttpMessagesAsync(largePersonGroupId, name, userData, null, cancellationToken).ConfigureAwait(false)).Dispose(); + (await operations.CreateWithHttpMessagesAsync(largePersonGroupId, name, userData, recognitionModel, null, cancellationToken).ConfigureAwait(false)).Dispose(); } /// diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs index 2d64fce0d116..2f5b9495953f 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs @@ -30,9 +30,12 @@ public DetectedFace() /// /// Initializes a new instance of the DetectedFace class. /// - public DetectedFace(FaceRectangle faceRectangle, System.Guid? faceId = default(System.Guid?), FaceLandmarks faceLandmarks = default(FaceLandmarks), FaceAttributes faceAttributes = default(FaceAttributes)) + /// Recognition model name. maximum + /// length is 128. + public DetectedFace(FaceRectangle faceRectangle, System.Guid? faceId = default(System.Guid?), string recognitionModel = default(string), FaceLandmarks faceLandmarks = default(FaceLandmarks), FaceAttributes faceAttributes = default(FaceAttributes)) { FaceId = faceId; + RecognitionModel = recognitionModel; FaceRectangle = faceRectangle; FaceLandmarks = faceLandmarks; FaceAttributes = faceAttributes; @@ -49,6 +52,12 @@ public DetectedFace() [JsonProperty(PropertyName = "faceId")] public System.Guid? FaceId { get; set; } + /// + /// Gets or sets recognition model name. maximum length is 128. + /// + [JsonProperty(PropertyName = "RecognitionModel")] + public string RecognitionModel { get; set; } + /// /// [JsonProperty(PropertyName = "faceRectangle")] @@ -76,6 +85,13 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "FaceRectangle"); } + if (RecognitionModel != null) + { + if (RecognitionModel.Length > 128) + { + throw new ValidationException(ValidationRules.MaxLength, "RecognitionModel", 128); + } + } if (FaceRectangle != null) { FaceRectangle.Validate(); diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/FaceList.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/FaceList.cs index 8b4dc1030a00..6a73e245eb1e 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/FaceList.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/FaceList.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.CognitiveServices.Vision.Face.Models /// /// Face list object. /// - public partial class FaceList : NameAndUserDataContract + public partial class FaceList : MetaDataContract { /// /// Initializes a new instance of the FaceList class. @@ -38,10 +38,12 @@ public FaceList() /// 128. /// User specified data. Length should not /// exceed 16KB. + /// Recognition model name. maximum + /// length is 128. /// Persisted faces within the face /// list. - public FaceList(string faceListId, string name = default(string), string userData = default(string), IList persistedFaces = default(IList)) - : base(name, userData) + public FaceList(string faceListId, string name = default(string), string userData = default(string), string recognitionModel = default(string), IList persistedFaces = default(IList)) + : base(name, userData, recognitionModel) { FaceListId = faceListId; PersistedFaces = persistedFaces; diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargeFaceList.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargeFaceList.cs index d5c6da592b97..a3655607f473 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargeFaceList.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargeFaceList.cs @@ -17,7 +17,7 @@ namespace Microsoft.Azure.CognitiveServices.Vision.Face.Models /// /// Large face list object. /// - public partial class LargeFaceList : NameAndUserDataContract + public partial class LargeFaceList : MetaDataContract { /// /// Initializes a new instance of the LargeFaceList class. @@ -36,8 +36,10 @@ public LargeFaceList() /// 128. /// User specified data. Length should not /// exceed 16KB. - public LargeFaceList(string largeFaceListId, string name = default(string), string userData = default(string)) - : base(name, userData) + /// Recognition model name. maximum + /// length is 128. + public LargeFaceList(string largeFaceListId, string name = default(string), string userData = default(string), string recognitionModel = default(string)) + : base(name, userData, recognitionModel) { LargeFaceListId = largeFaceListId; CustomInit(); diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargePersonGroup.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargePersonGroup.cs index 18d800d5d556..c38aa1bf0707 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargePersonGroup.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargePersonGroup.cs @@ -17,7 +17,7 @@ namespace Microsoft.Azure.CognitiveServices.Vision.Face.Models /// /// Large person group object. /// - public partial class LargePersonGroup : NameAndUserDataContract + public partial class LargePersonGroup : MetaDataContract { /// /// Initializes a new instance of the LargePersonGroup class. @@ -36,8 +36,10 @@ public LargePersonGroup() /// 128. /// User specified data. Length should not /// exceed 16KB. - public LargePersonGroup(string largePersonGroupId, string name = default(string), string userData = default(string)) - : base(name, userData) + /// Recognition model name. maximum + /// length is 128. + public LargePersonGroup(string largePersonGroupId, string name = default(string), string userData = default(string), string recognitionModel = default(string)) + : base(name, userData, recognitionModel) { LargePersonGroupId = largePersonGroupId; CustomInit(); diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/MetaDataContract.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/MetaDataContract.cs new file mode 100644 index 000000000000..5bdf0fecd365 --- /dev/null +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/MetaDataContract.cs @@ -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. +// + +namespace Microsoft.Azure.CognitiveServices.Vision.Face.Models +{ + using Microsoft.Rest; + using Newtonsoft.Json; + using System.Linq; + + /// + /// A combination of user defined name and user specified data and + /// recognition model name for largePersonGroup/personGroup, and + /// largeFaceList/faceList. + /// + public partial class MetaDataContract : NameAndUserDataContract + { + /// + /// Initializes a new instance of the MetaDataContract class. + /// + public MetaDataContract() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the MetaDataContract class. + /// + /// User defined name, maximum length is + /// 128. + /// User specified data. Length should not + /// exceed 16KB. + /// Recognition model name. maximum + /// length is 128. + public MetaDataContract(string name = default(string), string userData = default(string), string recognitionModel = default(string)) + : base(name, userData) + { + RecognitionModel = recognitionModel; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets recognition model name. maximum length is 128. + /// + [JsonProperty(PropertyName = "RecognitionModel")] + public string RecognitionModel { get; set; } + + /// + /// Validate the object. + /// + /// + /// Thrown if validation fails + /// + public override void Validate() + { + base.Validate(); + if (RecognitionModel != null) + { + if (RecognitionModel.Length > 128) + { + throw new ValidationException(ValidationRules.MaxLength, "RecognitionModel", 128); + } + } + } + } +} diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/PersonGroup.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/PersonGroup.cs index 7794e32f2bdb..a73dccd1e406 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/PersonGroup.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/PersonGroup.cs @@ -17,7 +17,7 @@ namespace Microsoft.Azure.CognitiveServices.Vision.Face.Models /// /// Person group object. /// - public partial class PersonGroup : NameAndUserDataContract + public partial class PersonGroup : MetaDataContract { /// /// Initializes a new instance of the PersonGroup class. @@ -36,8 +36,10 @@ public PersonGroup() /// 128. /// User specified data. Length should not /// exceed 16KB. - public PersonGroup(string personGroupId, string name = default(string), string userData = default(string)) - : base(name, userData) + /// Recognition model name. maximum + /// length is 128. + public PersonGroup(string personGroupId, string name = default(string), string userData = default(string), string recognitionModel = default(string)) + : base(name, userData, recognitionModel) { PersonGroupId = personGroupId; CustomInit(); diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperations.cs index 1f6a387a086e..0773d7255601 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperations.cs @@ -63,6 +63,9 @@ public PersonGroupOperations(FaceClient client) /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// Headers that will be added to request. /// @@ -81,7 +84,7 @@ public PersonGroupOperations(FaceClient client) /// /// A response object containing the response body and response headers. /// - public async Task CreateWithHttpMessagesAsync(string personGroupId, string name = default(string), string userData = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task CreateWithHttpMessagesAsync(string personGroupId, string name = default(string), string userData = default(string), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.Endpoint == null) { @@ -116,11 +119,19 @@ public PersonGroupOperations(FaceClient client) throw new ValidationException(ValidationRules.MaxLength, "userData", 16384); } } - NameAndUserDataContract body = new NameAndUserDataContract(); - if (name != null || userData != null) + if (recognitionModel != null) + { + if (recognitionModel.Length > 128) + { + throw new ValidationException(ValidationRules.MaxLength, "recognitionModel", 128); + } + } + MetaDataContract body = new MetaDataContract(); + if (name != null || userData != null || recognitionModel != null) { body.Name = name; body.UserData = userData; + body.RecognitionModel = recognitionModel; } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperationsExtensions.cs index 728e30fa9e28..55909e01b19c 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperationsExtensions.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperationsExtensions.cs @@ -37,12 +37,15 @@ public static partial class PersonGroupOperationsExtensions /// /// User specified data. Length should not exceed 16KB. /// + /// + /// Recognition model name. maximum length is 128. + /// /// /// The cancellation token. /// - public static async Task CreateAsync(this IPersonGroupOperations operations, string personGroupId, string name = default(string), string userData = default(string), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task CreateAsync(this IPersonGroupOperations operations, string personGroupId, string name = default(string), string userData = default(string), string recognitionModel = default(string), CancellationToken cancellationToken = default(CancellationToken)) { - (await operations.CreateWithHttpMessagesAsync(personGroupId, name, userData, null, cancellationToken).ConfigureAwait(false)).Dispose(); + (await operations.CreateWithHttpMessagesAsync(personGroupId, name, userData, recognitionModel, null, cancellationToken).ConfigureAwait(false)).Dispose(); } /// From fbc975839b87d81ffb0f5ae589eb8fbf328008d5 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 15 Nov 2018 13:24:37 +0800 Subject: [PATCH 2/4] update generated sdk --- .../Face/Face/Generated/FaceListOperations.cs | 8 -------- .../Face/Generated/FaceListOperationsExtensions.cs | 1 - .../Face/Face/Generated/IFaceListOperations.cs | 1 - .../Face/Face/Generated/ILargeFaceListOperations.cs | 1 - .../Face/Generated/ILargePersonGroupOperations.cs | 1 - .../Face/Face/Generated/IPersonGroupOperations.cs | 1 - .../Face/Face/Generated/LargeFaceListOperations.cs | 8 -------- .../Generated/LargeFaceListOperationsExtensions.cs | 1 - .../Face/Generated/LargePersonGroupOperations.cs | 8 -------- .../LargePersonGroupOperationsExtensions.cs | 1 - .../Face/Face/Generated/Models/DetectedFace.cs | 10 ---------- .../Vision/Face/Face/Generated/Models/FaceList.cs | 2 -- .../Face/Face/Generated/Models/LargeFaceList.cs | 2 -- .../Face/Face/Generated/Models/LargePersonGroup.cs | 2 -- .../Face/Face/Generated/Models/MetaDataContract.cs | 13 +------------ .../Face/Face/Generated/Models/PersonGroup.cs | 2 -- .../Face/Face/Generated/PersonGroupOperations.cs | 8 -------- .../Generated/PersonGroupOperationsExtensions.cs | 1 - 18 files changed, 1 insertion(+), 70 deletions(-) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperations.cs index cb1c35e5a02c..bfe39d8f5987 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperations.cs @@ -64,7 +64,6 @@ public FaceListOperations(FaceClient client) /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// Headers that will be added to request. @@ -119,13 +118,6 @@ public FaceListOperations(FaceClient client) throw new ValidationException(ValidationRules.MaxLength, "userData", 16384); } } - if (recognitionModel != null) - { - if (recognitionModel.Length > 128) - { - throw new ValidationException(ValidationRules.MaxLength, "recognitionModel", 128); - } - } MetaDataContract body = new MetaDataContract(); if (name != null || userData != null || recognitionModel != null) { diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperationsExtensions.cs index ab23f166c368..375a94566605 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperationsExtensions.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceListOperationsExtensions.cs @@ -39,7 +39,6 @@ public static partial class FaceListOperationsExtensions /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// The cancellation token. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceListOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceListOperations.cs index cf252a1fccb4..2704c66df48c 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceListOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceListOperations.cs @@ -37,7 +37,6 @@ public partial interface IFaceListOperations /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// The headers that will be added to request. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargeFaceListOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargeFaceListOperations.cs index af6f4c00b72d..43a87fcb8b95 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargeFaceListOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargeFaceListOperations.cs @@ -37,7 +37,6 @@ public partial interface ILargeFaceListOperations /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// The headers that will be added to request. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargePersonGroupOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargePersonGroupOperations.cs index 5df2feab705c..787eb37b7326 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargePersonGroupOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/ILargePersonGroupOperations.cs @@ -36,7 +36,6 @@ public partial interface ILargePersonGroupOperations /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// The headers that will be added to request. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IPersonGroupOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IPersonGroupOperations.cs index dee8c14052ff..86e2921a3e7b 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IPersonGroupOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IPersonGroupOperations.cs @@ -36,7 +36,6 @@ public partial interface IPersonGroupOperations /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// The headers that will be added to request. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperations.cs index 94f851c13c94..6168cdb0f11c 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperations.cs @@ -64,7 +64,6 @@ public LargeFaceListOperations(FaceClient client) /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// Headers that will be added to request. @@ -119,13 +118,6 @@ public LargeFaceListOperations(FaceClient client) throw new ValidationException(ValidationRules.MaxLength, "userData", 16384); } } - if (recognitionModel != null) - { - if (recognitionModel.Length > 128) - { - throw new ValidationException(ValidationRules.MaxLength, "recognitionModel", 128); - } - } MetaDataContract body = new MetaDataContract(); if (name != null || userData != null || recognitionModel != null) { diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperationsExtensions.cs index 94ea1489ee80..a012bf53e8ee 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperationsExtensions.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargeFaceListOperationsExtensions.cs @@ -39,7 +39,6 @@ public static partial class LargeFaceListOperationsExtensions /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// The cancellation token. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperations.cs index 6c7036434e8a..03f785e6dab8 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperations.cs @@ -64,7 +64,6 @@ public LargePersonGroupOperations(FaceClient client) /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// Headers that will be added to request. @@ -119,13 +118,6 @@ public LargePersonGroupOperations(FaceClient client) throw new ValidationException(ValidationRules.MaxLength, "userData", 16384); } } - if (recognitionModel != null) - { - if (recognitionModel.Length > 128) - { - throw new ValidationException(ValidationRules.MaxLength, "recognitionModel", 128); - } - } MetaDataContract body = new MetaDataContract(); if (name != null || userData != null || recognitionModel != null) { diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperationsExtensions.cs index 717be42c225a..00fc52f12140 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperationsExtensions.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/LargePersonGroupOperationsExtensions.cs @@ -38,7 +38,6 @@ public static partial class LargePersonGroupOperationsExtensions /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// The cancellation token. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs index 2f5b9495953f..7d0f6c380df6 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs @@ -30,8 +30,6 @@ public DetectedFace() /// /// Initializes a new instance of the DetectedFace class. /// - /// Recognition model name. maximum - /// length is 128. public DetectedFace(FaceRectangle faceRectangle, System.Guid? faceId = default(System.Guid?), string recognitionModel = default(string), FaceLandmarks faceLandmarks = default(FaceLandmarks), FaceAttributes faceAttributes = default(FaceAttributes)) { FaceId = faceId; @@ -53,7 +51,6 @@ public DetectedFace() public System.Guid? FaceId { get; set; } /// - /// Gets or sets recognition model name. maximum length is 128. /// [JsonProperty(PropertyName = "RecognitionModel")] public string RecognitionModel { get; set; } @@ -85,13 +82,6 @@ public virtual void Validate() { throw new ValidationException(ValidationRules.CannotBeNull, "FaceRectangle"); } - if (RecognitionModel != null) - { - if (RecognitionModel.Length > 128) - { - throw new ValidationException(ValidationRules.MaxLength, "RecognitionModel", 128); - } - } if (FaceRectangle != null) { FaceRectangle.Validate(); diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/FaceList.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/FaceList.cs index 6a73e245eb1e..fda9c92ef6b2 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/FaceList.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/FaceList.cs @@ -38,8 +38,6 @@ public FaceList() /// 128. /// User specified data. Length should not /// exceed 16KB. - /// Recognition model name. maximum - /// length is 128. /// Persisted faces within the face /// list. public FaceList(string faceListId, string name = default(string), string userData = default(string), string recognitionModel = default(string), IList persistedFaces = default(IList)) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargeFaceList.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargeFaceList.cs index a3655607f473..08ed554a2044 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargeFaceList.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargeFaceList.cs @@ -36,8 +36,6 @@ public LargeFaceList() /// 128. /// User specified data. Length should not /// exceed 16KB. - /// Recognition model name. maximum - /// length is 128. public LargeFaceList(string largeFaceListId, string name = default(string), string userData = default(string), string recognitionModel = default(string)) : base(name, userData, recognitionModel) { diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargePersonGroup.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargePersonGroup.cs index c38aa1bf0707..ea5e45e0e26f 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargePersonGroup.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/LargePersonGroup.cs @@ -36,8 +36,6 @@ public LargePersonGroup() /// 128. /// User specified data. Length should not /// exceed 16KB. - /// Recognition model name. maximum - /// length is 128. public LargePersonGroup(string largePersonGroupId, string name = default(string), string userData = default(string), string recognitionModel = default(string)) : base(name, userData, recognitionModel) { diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/MetaDataContract.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/MetaDataContract.cs index 5bdf0fecd365..bd15c13b38b1 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/MetaDataContract.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/MetaDataContract.cs @@ -10,7 +10,6 @@ namespace Microsoft.Azure.CognitiveServices.Vision.Face.Models { - using Microsoft.Rest; using Newtonsoft.Json; using System.Linq; @@ -36,8 +35,6 @@ public MetaDataContract() /// 128. /// User specified data. Length should not /// exceed 16KB. - /// Recognition model name. maximum - /// length is 128. public MetaDataContract(string name = default(string), string userData = default(string), string recognitionModel = default(string)) : base(name, userData) { @@ -51,7 +48,6 @@ public MetaDataContract() partial void CustomInit(); /// - /// Gets or sets recognition model name. maximum length is 128. /// [JsonProperty(PropertyName = "RecognitionModel")] public string RecognitionModel { get; set; } @@ -59,19 +55,12 @@ public MetaDataContract() /// /// Validate the object. /// - /// + /// /// Thrown if validation fails /// public override void Validate() { base.Validate(); - if (RecognitionModel != null) - { - if (RecognitionModel.Length > 128) - { - throw new ValidationException(ValidationRules.MaxLength, "RecognitionModel", 128); - } - } } } } diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/PersonGroup.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/PersonGroup.cs index a73dccd1e406..61d2500d5a05 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/PersonGroup.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/PersonGroup.cs @@ -36,8 +36,6 @@ public PersonGroup() /// 128. /// User specified data. Length should not /// exceed 16KB. - /// Recognition model name. maximum - /// length is 128. public PersonGroup(string personGroupId, string name = default(string), string userData = default(string), string recognitionModel = default(string)) : base(name, userData, recognitionModel) { diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperations.cs index 0773d7255601..8fa0f9b0212f 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperations.cs @@ -64,7 +64,6 @@ public PersonGroupOperations(FaceClient client) /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// Headers that will be added to request. @@ -119,13 +118,6 @@ public PersonGroupOperations(FaceClient client) throw new ValidationException(ValidationRules.MaxLength, "userData", 16384); } } - if (recognitionModel != null) - { - if (recognitionModel.Length > 128) - { - throw new ValidationException(ValidationRules.MaxLength, "recognitionModel", 128); - } - } MetaDataContract body = new MetaDataContract(); if (name != null || userData != null || recognitionModel != null) { diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperationsExtensions.cs index 55909e01b19c..60a0bbf61e4c 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperationsExtensions.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/PersonGroupOperationsExtensions.cs @@ -38,7 +38,6 @@ public static partial class PersonGroupOperationsExtensions /// User specified data. Length should not exceed 16KB. /// /// - /// Recognition model name. maximum length is 128. /// /// /// The cancellation token. From d34ac2774b43e584dfcbb903e052ff9fe4406371 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 15 Nov 2018 15:20:13 +0800 Subject: [PATCH 3/4] Add RecognitionModel as parameter in detect operation. --- .../Face/Face/Generated/FaceOperations.cs | 36 +++++++++++++++++-- .../Generated/FaceOperationsExtensions.cs | 14 +++++--- .../Face/Face/Generated/IFaceOperations.cs | 10 ++++-- .../Face/Generated/Models/DetectedFace.cs | 6 +++- 4 files changed, 57 insertions(+), 9 deletions(-) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperations.cs index deadae9b7861..25d9c7850ced 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperations.cs @@ -840,6 +840,9 @@ public FaceOperations(FaceClient client) /// Detect human faces in an image and returns face locations, and optionally /// with faceIds, landmarks, and attributes. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// Publicly reachable URL of an image /// @@ -879,12 +882,23 @@ public FaceOperations(FaceClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> DetectWithUrlWithHttpMessagesAsync(string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> DetectWithUrlWithHttpMessagesAsync(string recognitionModel, string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.Endpoint == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } + if (recognitionModel == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "recognitionModel"); + } + if (recognitionModel != null) + { + if (recognitionModel.Length > 128) + { + throw new ValidationException(ValidationRules.MaxLength, "recognitionModel", 128); + } + } if (url == null) { throw new ValidationException(ValidationRules.CannotBeNull, "url"); @@ -904,6 +918,7 @@ public FaceOperations(FaceClient client) tracingParameters.Add("returnFaceId", returnFaceId); tracingParameters.Add("returnFaceLandmarks", returnFaceLandmarks); tracingParameters.Add("returnFaceAttributes", returnFaceAttributes); + tracingParameters.Add("recognitionModel", recognitionModel); tracingParameters.Add("imageUrl", imageUrl); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "DetectWithUrl", tracingParameters); @@ -912,6 +927,7 @@ public FaceOperations(FaceClient client) var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "detect"; _url = _url.Replace("{Endpoint}", Client.Endpoint); + _url = _url.Replace("{RecognitionModel}", System.Uri.EscapeDataString(recognitionModel)); List _queryParameters = new List(); if (returnFaceId != null) { @@ -1244,6 +1260,9 @@ public FaceOperations(FaceClient client) /// /// An image stream. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// A value indicating whether the operation should return faceIds of detected /// faces. @@ -1280,7 +1299,7 @@ public FaceOperations(FaceClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> DetectWithStreamWithHttpMessagesAsync(Stream image, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> DetectWithStreamWithHttpMessagesAsync(Stream image, string recognitionModel, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.Endpoint == null) { @@ -1290,6 +1309,17 @@ public FaceOperations(FaceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "image"); } + if (recognitionModel == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "recognitionModel"); + } + if (recognitionModel != null) + { + if (recognitionModel.Length > 128) + { + throw new ValidationException(ValidationRules.MaxLength, "recognitionModel", 128); + } + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1301,6 +1331,7 @@ public FaceOperations(FaceClient client) tracingParameters.Add("returnFaceLandmarks", returnFaceLandmarks); tracingParameters.Add("returnFaceAttributes", returnFaceAttributes); tracingParameters.Add("image", image); + tracingParameters.Add("recognitionModel", recognitionModel); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "DetectWithStream", tracingParameters); } @@ -1308,6 +1339,7 @@ public FaceOperations(FaceClient client) var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "detect"; _url = _url.Replace("{Endpoint}", Client.Endpoint); + _url = _url.Replace("{RecognitionModel}", System.Uri.EscapeDataString(recognitionModel)); List _queryParameters = new List(); if (returnFaceId != null) { diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperationsExtensions.cs index 5a18f84990da..9634b3fc7fb4 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperationsExtensions.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperationsExtensions.cs @@ -163,6 +163,9 @@ public static partial class FaceOperationsExtensions /// /// The operations group for this extension method. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// Publicly reachable URL of an image /// @@ -184,9 +187,9 @@ public static partial class FaceOperationsExtensions /// /// The cancellation token. /// - public static async Task> DetectWithUrlAsync(this IFaceOperations operations, string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> DetectWithUrlAsync(this IFaceOperations operations, string recognitionModel, string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.DetectWithUrlWithHttpMessagesAsync(url, returnFaceId, returnFaceLandmarks, returnFaceAttributes, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.DetectWithUrlWithHttpMessagesAsync(recognitionModel, url, returnFaceId, returnFaceLandmarks, returnFaceAttributes, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } @@ -240,6 +243,9 @@ public static partial class FaceOperationsExtensions /// /// An image stream. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// A value indicating whether the operation should return faceIds of detected /// faces. @@ -258,9 +264,9 @@ public static partial class FaceOperationsExtensions /// /// The cancellation token. /// - public static async Task> DetectWithStreamAsync(this IFaceOperations operations, Stream image, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> DetectWithStreamAsync(this IFaceOperations operations, Stream image, string recognitionModel, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.DetectWithStreamWithHttpMessagesAsync(image, returnFaceId, returnFaceLandmarks, returnFaceAttributes, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.DetectWithStreamWithHttpMessagesAsync(image, recognitionModel, returnFaceId, returnFaceLandmarks, returnFaceAttributes, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceOperations.cs index 23a7f84c98b1..9d5099bb6444 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceOperations.cs @@ -175,6 +175,9 @@ public partial interface IFaceOperations /// Detect human faces in an image and returns face locations, and /// optionally with faceIds, landmarks, and attributes. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// Publicly reachable URL of an image /// @@ -208,7 +211,7 @@ public partial interface IFaceOperations /// /// Thrown when a required parameter is null /// - Task>> DetectWithUrlWithHttpMessagesAsync(string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> DetectWithUrlWithHttpMessagesAsync(string recognitionModel, string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Verify whether two faces belong to a same person. Compares a face /// Id with a Person Id @@ -256,6 +259,9 @@ public partial interface IFaceOperations /// /// An image stream. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// A value indicating whether the operation should return faceIds of /// detected faces. @@ -286,6 +292,6 @@ public partial interface IFaceOperations /// /// Thrown when a required parameter is null /// - Task>> DetectWithStreamWithHttpMessagesAsync(Stream image, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> DetectWithStreamWithHttpMessagesAsync(Stream image, string recognitionModel, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } } diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs index 7d0f6c380df6..4775f2905655 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/Models/DetectedFace.cs @@ -30,7 +30,7 @@ public DetectedFace() /// /// Initializes a new instance of the DetectedFace class. /// - public DetectedFace(FaceRectangle faceRectangle, System.Guid? faceId = default(System.Guid?), string recognitionModel = default(string), FaceLandmarks faceLandmarks = default(FaceLandmarks), FaceAttributes faceAttributes = default(FaceAttributes)) + public DetectedFace(string recognitionModel, FaceRectangle faceRectangle, System.Guid? faceId = default(System.Guid?), FaceLandmarks faceLandmarks = default(FaceLandmarks), FaceAttributes faceAttributes = default(FaceAttributes)) { FaceId = faceId; RecognitionModel = recognitionModel; @@ -78,6 +78,10 @@ public DetectedFace() /// public virtual void Validate() { + if (RecognitionModel == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "RecognitionModel"); + } if (FaceRectangle == null) { throw new ValidationException(ValidationRules.CannotBeNull, "FaceRectangle"); From 17e2ee55a3e80fb673a4562cd0a3d2ad2d43d5dc Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 15 Nov 2018 16:27:09 +0800 Subject: [PATCH 4/4] Change recognitionModel required to false. --- .../Face/Face/Generated/FaceOperations.cs | 34 +++++++++---------- .../Generated/FaceOperationsExtensions.cs | 20 +++++------ .../Face/Face/Generated/IFaceOperations.cs | 16 ++++----- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperations.cs index 25d9c7850ced..2a9ea6f20a0b 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperations.cs @@ -840,9 +840,6 @@ public FaceOperations(FaceClient client) /// Detect human faces in an image and returns face locations, and optionally /// with faceIds, landmarks, and attributes. /// - /// - /// Recognition model name, maximum length is 128. - /// /// /// Publicly reachable URL of an image /// @@ -861,6 +858,9 @@ public FaceOperations(FaceClient client) /// and emotion. Note that each face attribute analysis has additional /// computational and time cost. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// Headers that will be added to request. /// @@ -882,16 +882,12 @@ public FaceOperations(FaceClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> DetectWithUrlWithHttpMessagesAsync(string recognitionModel, string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> DetectWithUrlWithHttpMessagesAsync(string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.Endpoint == null) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } - if (recognitionModel == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "recognitionModel"); - } if (recognitionModel != null) { if (recognitionModel.Length > 128) @@ -927,7 +923,6 @@ public FaceOperations(FaceClient client) var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "detect"; _url = _url.Replace("{Endpoint}", Client.Endpoint); - _url = _url.Replace("{RecognitionModel}", System.Uri.EscapeDataString(recognitionModel)); List _queryParameters = new List(); if (returnFaceId != null) { @@ -941,6 +936,10 @@ public FaceOperations(FaceClient client) { _queryParameters.Add(string.Format("returnFaceAttributes={0}", System.Uri.EscapeDataString(string.Join(",", returnFaceAttributes)))); } + if (recognitionModel != null) + { + _queryParameters.Add(string.Format("RecognitionModel={0}", System.Uri.EscapeDataString(recognitionModel))); + } if (_queryParameters.Count > 0) { _url += "?" + string.Join("&", _queryParameters); @@ -1260,9 +1259,6 @@ public FaceOperations(FaceClient client) /// /// An image stream. /// - /// - /// Recognition model name, maximum length is 128. - /// /// /// A value indicating whether the operation should return faceIds of detected /// faces. @@ -1278,6 +1274,9 @@ public FaceOperations(FaceClient client) /// and emotion. Note that each face attribute analysis has additional /// computational and time cost. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// Headers that will be added to request. /// @@ -1299,7 +1298,7 @@ public FaceOperations(FaceClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> DetectWithStreamWithHttpMessagesAsync(Stream image, string recognitionModel, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> DetectWithStreamWithHttpMessagesAsync(Stream image, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.Endpoint == null) { @@ -1309,10 +1308,6 @@ public FaceOperations(FaceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "image"); } - if (recognitionModel == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "recognitionModel"); - } if (recognitionModel != null) { if (recognitionModel.Length > 128) @@ -1339,7 +1334,6 @@ public FaceOperations(FaceClient client) var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "detect"; _url = _url.Replace("{Endpoint}", Client.Endpoint); - _url = _url.Replace("{RecognitionModel}", System.Uri.EscapeDataString(recognitionModel)); List _queryParameters = new List(); if (returnFaceId != null) { @@ -1353,6 +1347,10 @@ public FaceOperations(FaceClient client) { _queryParameters.Add(string.Format("returnFaceAttributes={0}", System.Uri.EscapeDataString(string.Join(",", returnFaceAttributes)))); } + if (recognitionModel != null) + { + _queryParameters.Add(string.Format("RecognitionModel={0}", System.Uri.EscapeDataString(recognitionModel))); + } if (_queryParameters.Count > 0) { _url += "?" + string.Join("&", _queryParameters); diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperationsExtensions.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperationsExtensions.cs index 9634b3fc7fb4..241722a6586e 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperationsExtensions.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/FaceOperationsExtensions.cs @@ -163,9 +163,6 @@ public static partial class FaceOperationsExtensions /// /// The operations group for this extension method. /// - /// - /// Recognition model name, maximum length is 128. - /// /// /// Publicly reachable URL of an image /// @@ -184,12 +181,15 @@ public static partial class FaceOperationsExtensions /// and emotion. Note that each face attribute analysis has additional /// computational and time cost. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// The cancellation token. /// - public static async Task> DetectWithUrlAsync(this IFaceOperations operations, string recognitionModel, string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> DetectWithUrlAsync(this IFaceOperations operations, string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), string recognitionModel = default(string), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.DetectWithUrlWithHttpMessagesAsync(recognitionModel, url, returnFaceId, returnFaceLandmarks, returnFaceAttributes, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.DetectWithUrlWithHttpMessagesAsync(url, returnFaceId, returnFaceLandmarks, returnFaceAttributes, recognitionModel, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } @@ -243,9 +243,6 @@ public static partial class FaceOperationsExtensions /// /// An image stream. /// - /// - /// Recognition model name, maximum length is 128. - /// /// /// A value indicating whether the operation should return faceIds of detected /// faces. @@ -261,12 +258,15 @@ public static partial class FaceOperationsExtensions /// and emotion. Note that each face attribute analysis has additional /// computational and time cost. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// The cancellation token. /// - public static async Task> DetectWithStreamAsync(this IFaceOperations operations, Stream image, string recognitionModel, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> DetectWithStreamAsync(this IFaceOperations operations, Stream image, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), string recognitionModel = default(string), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.DetectWithStreamWithHttpMessagesAsync(image, recognitionModel, returnFaceId, returnFaceLandmarks, returnFaceAttributes, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.DetectWithStreamWithHttpMessagesAsync(image, returnFaceId, returnFaceLandmarks, returnFaceAttributes, recognitionModel, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceOperations.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceOperations.cs index 9d5099bb6444..028dd9e5d534 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceOperations.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/Face/Face/Generated/IFaceOperations.cs @@ -175,9 +175,6 @@ public partial interface IFaceOperations /// Detect human faces in an image and returns face locations, and /// optionally with faceIds, landmarks, and attributes. /// - /// - /// Recognition model name, maximum length is 128. - /// /// /// Publicly reachable URL of an image /// @@ -196,6 +193,9 @@ public partial interface IFaceOperations /// facialHair, glasses and emotion. Note that each face attribute /// analysis has additional computational and time cost. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// The headers that will be added to request. /// @@ -211,7 +211,7 @@ public partial interface IFaceOperations /// /// Thrown when a required parameter is null /// - Task>> DetectWithUrlWithHttpMessagesAsync(string recognitionModel, string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> DetectWithUrlWithHttpMessagesAsync(string url, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Verify whether two faces belong to a same person. Compares a face /// Id with a Person Id @@ -259,9 +259,6 @@ public partial interface IFaceOperations /// /// An image stream. /// - /// - /// Recognition model name, maximum length is 128. - /// /// /// A value indicating whether the operation should return faceIds of /// detected faces. @@ -277,6 +274,9 @@ public partial interface IFaceOperations /// facialHair, glasses and emotion. Note that each face attribute /// analysis has additional computational and time cost. /// + /// + /// Recognition model name, maximum length is 128. + /// /// /// The headers that will be added to request. /// @@ -292,6 +292,6 @@ public partial interface IFaceOperations /// /// Thrown when a required parameter is null /// - Task>> DetectWithStreamWithHttpMessagesAsync(Stream image, string recognitionModel, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> DetectWithStreamWithHttpMessagesAsync(Stream image, bool? returnFaceId = true, bool? returnFaceLandmarks = false, IList returnFaceAttributes = default(IList), string recognitionModel = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } }