diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Utilities.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Utilities.cs index 3dc1c9288025..49094914bbb5 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Utilities.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Utilities.cs @@ -375,12 +375,12 @@ public static bool VerifyScreenText(Screen s,bool isAutoCorrect = false, bool is error = " Classification is null"; else { - if (s.Classification.AdultScore == null) - error += " Classification.Adult Score is null"; - if (s.Classification.RacyScore == null) - error += " Classification.Racy Score is null"; - if (s.Classification.OffensiveScore== null) - error += " Classification.OffensiveScore is null"; + if (s.Classification.Category1 == null) + error += " Classification.Category1 Score is null"; + if (s.Classification.Category2 == null) + error += " Classification.Category2 Score is null"; + if (s.Classification.Category3== null) + error += " Classification.Category3 Score is null"; if (s.Classification.ReviewRecommended == null) error += " Classification.ReviewRecommended is null"; } diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Properties/AssemblyInfo.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Properties/AssemblyInfo.cs index b9a6a6c94a64..27d9ddf8dd89 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Properties/AssemblyInfo.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.9.0.0")] -[assembly: AssemblyFileVersion("0.9.0.0")] +[assembly: AssemblyVersion("0.10.0.0")] +[assembly: AssemblyFileVersion("0.10.0.0")] diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ImageModeration.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ImageModeration.cs index 3afe4fb36605..f5c61fde846c 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ImageModeration.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ImageModeration.cs @@ -814,8 +814,8 @@ public ImageModeration(ContentModeratorClient client) } if (imageStream != null && imageStream != Stream.Null) { - _httpRequest.Content = new StreamContent(imageStream); - _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("image/gif"); + _httpRequest.Content = new StreamContent(imageStream); + _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("image/gif"); } // Set Credentials if (Client.Credentials != null) @@ -1401,8 +1401,8 @@ public ImageModeration(ContentModeratorClient client) } if (imageStream != null && imageStream != Stream.Null) { - _httpRequest.Content = new StreamContent(imageStream); - _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("image/gif"); + _httpRequest.Content = new StreamContent(imageStream); + _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("image/gif"); } // Set Credentials if (Client.Credentials != null) @@ -1576,8 +1576,8 @@ public ImageModeration(ContentModeratorClient client) } if (imageStream != null && imageStream != Stream.Null) { - _httpRequest.Content = new StreamContent(imageStream); - _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("image/gif"); + _httpRequest.Content = new StreamContent(imageStream); + _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("image/gif"); } // Set Credentials if (Client.Credentials != null) @@ -2143,8 +2143,8 @@ public ImageModeration(ContentModeratorClient client) } if (imageStream != null && imageStream != Stream.Null) { - _httpRequest.Content = new StreamContent(imageStream); - _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("image/gif"); + _httpRequest.Content = new StreamContent(imageStream); + _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("image/gif"); } // Set Credentials if (Client.Credentials != null) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImage.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImage.cs index 01a7063d9273..3c3fa33e55cc 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImage.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImage.cs @@ -994,8 +994,8 @@ public ListManagementImage(ContentModeratorClient client) } if (imageStream != null && imageStream != Stream.Null) { - _httpRequest.Content = new StreamContent(imageStream); - _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("image/gif"); + _httpRequest.Content = new StreamContent(imageStream); + _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("image/gif"); } // Set Credentials if (Client.Credentials != null) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/Classification.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/Classification.cs index 6ce22025317e..16f7cb22f543 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/Classification.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/Classification.cs @@ -25,16 +25,22 @@ public Classification() /// /// Initializes a new instance of the Classification class. /// - /// The adult score. - /// The racy score. - /// The offensive score. + /// The category1 score details of the text. + /// <a href="https://aka.ms/textClassifyCategories">Click + /// here</a> for more details on category classification. + /// The category2 score details of the text. + /// <a href="https://aka.ms/textClassifyCategories">Click + /// here</a> for more details on category classification. + /// The category3 score details of the text. + /// <a href="https://aka.ms/textClassifyCategories">Click + /// here</a> for more details on category classification. /// The review recommended /// flag. - public Classification(double? adultScore = default(double?), double? racyScore = default(double?), double? offensiveScore = default(double?), bool? reviewRecommended = default(bool?)) + public Classification(ClassificationCategory1 category1 = default(ClassificationCategory1), ClassificationCategory2 category2 = default(ClassificationCategory2), ClassificationCategory3 category3 = default(ClassificationCategory3), bool? reviewRecommended = default(bool?)) { - AdultScore = adultScore; - RacyScore = racyScore; - OffensiveScore = offensiveScore; + Category1 = category1; + Category2 = category2; + Category3 = category3; ReviewRecommended = reviewRecommended; CustomInit(); } @@ -45,22 +51,28 @@ public Classification() partial void CustomInit(); /// - /// Gets or sets the adult score. + /// Gets or sets the category1 score details of the text. &lt;a + /// href="https://aka.ms/textClassifyCategories"&gt;Click + /// here&lt;/a&gt; for more details on category classification. /// - [JsonProperty(PropertyName = "AdultScore")] - public double? AdultScore { get; set; } + [JsonProperty(PropertyName = "Category1")] + public ClassificationCategory1 Category1 { get; set; } /// - /// Gets or sets the racy score. + /// Gets or sets the category2 score details of the text. &lt;a + /// href="https://aka.ms/textClassifyCategories"&gt;Click + /// here&lt;/a&gt; for more details on category classification. /// - [JsonProperty(PropertyName = "RacyScore")] - public double? RacyScore { get; set; } + [JsonProperty(PropertyName = "Category2")] + public ClassificationCategory2 Category2 { get; set; } /// - /// Gets or sets the offensive score. + /// Gets or sets the category3 score details of the text. &lt;a + /// href="https://aka.ms/textClassifyCategories"&gt;Click + /// here&lt;/a&gt; for more details on category classification. /// - [JsonProperty(PropertyName = "OffensiveScore")] - public double? OffensiveScore { get; set; } + [JsonProperty(PropertyName = "Category3")] + public ClassificationCategory3 Category3 { get; set; } /// /// Gets or sets the review recommended flag. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ClassificationCategory1.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ClassificationCategory1.cs new file mode 100644 index 000000000000..b07c889dc44b --- /dev/null +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ClassificationCategory1.cs @@ -0,0 +1,49 @@ +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.CognitiveServices.ContentModerator.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The category1 score details of the text. <a + /// href="https://aka.ms/textClassifyCategories">Click here</a> + /// for more details on category classification. + /// + public partial class ClassificationCategory1 + { + /// + /// Initializes a new instance of the ClassificationCategory1 class. + /// + public ClassificationCategory1() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ClassificationCategory1 class. + /// + /// The category1 score. + public ClassificationCategory1(double? score = default(double?)) + { + Score = score; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the category1 score. + /// + [JsonProperty(PropertyName = "Score")] + public double? Score { get; set; } + + } +} diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ClassificationCategory2.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ClassificationCategory2.cs new file mode 100644 index 000000000000..fb66c4b44646 --- /dev/null +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ClassificationCategory2.cs @@ -0,0 +1,49 @@ +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.CognitiveServices.ContentModerator.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The category2 score details of the text. <a + /// href="https://aka.ms/textClassifyCategories">Click here</a> + /// for more details on category classification. + /// + public partial class ClassificationCategory2 + { + /// + /// Initializes a new instance of the ClassificationCategory2 class. + /// + public ClassificationCategory2() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ClassificationCategory2 class. + /// + /// The category2 score. + public ClassificationCategory2(double? score = default(double?)) + { + Score = score; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the category2 score. + /// + [JsonProperty(PropertyName = "Score")] + public double? Score { get; set; } + + } +} diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ClassificationCategory3.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ClassificationCategory3.cs new file mode 100644 index 000000000000..325b7dbdd802 --- /dev/null +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ClassificationCategory3.cs @@ -0,0 +1,49 @@ +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.CognitiveServices.ContentModerator.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The category3 score details of the text. <a + /// href="https://aka.ms/textClassifyCategories">Click here</a> + /// for more details on category classification. + /// + public partial class ClassificationCategory3 + { + /// + /// Initializes a new instance of the ClassificationCategory3 class. + /// + public ClassificationCategory3() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ClassificationCategory3 class. + /// + /// The category3 score. + public ClassificationCategory3(double? score = default(double?)) + { + Score = score; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the category3 score. + /// + [JsonProperty(PropertyName = "Score")] + public double? Score { get; set; } + + } +} diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Reviews.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Reviews.cs index 682fffbcefb1..fa60ef23c12d 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Reviews.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Reviews.cs @@ -1691,8 +1691,8 @@ public Reviews(ContentModeratorClient client) } if (vTTfile != null && vTTfile != Stream.Null) { - _httpRequest.Content = new StreamContent(vTTfile); - _httpRequest.Content.Headers.ContentType =MediaTypeHeaderValue.Parse("text/plain"); + _httpRequest.Content = new StreamContent(vTTfile); + _httpRequest.Content.Headers.ContentType =MediaTypeHeaderValue.Parse("text/plain"); } // Set Credentials if (Client.Credentials != null) @@ -2292,7 +2292,7 @@ public Reviews(ContentModeratorClient client) MultipartFormDataContent _multiPartContent = new MultipartFormDataContent(); if (frameImageZip != null) { - StreamContent _frameImageZip = new StreamContent(frameImageZip); + StreamContent _frameImageZip = new StreamContent(frameImageZip); _frameImageZip.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream"); FileStream _frameImageZipAsFileStream = frameImageZip as FileStream; if (_frameImageZipAsFileStream != null) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Microsoft.Azure.CognitiveServices.ContentModerator.csproj b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Microsoft.Azure.CognitiveServices.ContentModerator.csproj index a78a3d2d8f98..fc08407a0998 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Microsoft.Azure.CognitiveServices.ContentModerator.csproj +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Microsoft.Azure.CognitiveServices.ContentModerator.csproj @@ -5,7 +5,7 @@ Microsoft.Azure.CognitiveServices.ContentModerator This client library provides access to the Microsoft Cognitive Services Content Moderator APIs. - 0.9.0-preview + 0.10.0-preview Microsoft.Azure.CognitiveServices.ContentModerator ContentModerator;Content Moderator; This is a preview release of the Cognitive Services Content Moderator SDK. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/generate.cmd b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/generate.cmd index 16a1398d4901..f64aecce203b 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/generate.cmd +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/generate.cmd @@ -4,4 +4,4 @@ :: @echo off -call %~dp0..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/ContentModerator %* \ No newline at end of file +call %~dp0..\..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/ContentModerator %* \ No newline at end of file diff --git a/src/SDKs/_metadata/cognitiveservices_data-plane_ContentModerator.txt b/src/SDKs/_metadata/cognitiveservices_data-plane_ContentModerator.txt index af14be3e1305..defb4721c3fa 100644 --- a/src/SDKs/_metadata/cognitiveservices_data-plane_ContentModerator.txt +++ b/src/SDKs/_metadata/cognitiveservices_data-plane_ContentModerator.txt @@ -1,11 +1,10 @@ -2017-12-08 20:25:38 UTC +2018-02-16 21:45:48 UTC 1) azure-rest-api-specs repository information GitHub user: Azure -Branch: current -Commit: 58b5052b90deb9f280725ca7811896fb98d2c63c +Branch: master +Commit: b1bd5185dc7575232b0c4bc14eff76b877dd3d7b 2) AutoRest information Requested version: latest -Bootstrapper version: C:\Users\v-sodsou\AppData\Roaming\npm `-- autorest@2.0.4215 -Latest installed version: +Bootstrapper version: C:\Users\v-sodsou\AppData\Roaming\npm `-- autorest@2.0.4245