Skip to content

[Cognitive Services] Update endpoint template for Content Moderator SDK. #4653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsgouda merged 2 commits into from Aug 22, 2018
Merged

[Cognitive Services] Update endpoint template for Content Moderator SDK. #4653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
024ab8e
[Cognitive Services] Update endpoint template for Content Moderator SDK.
yangyuan Aug 10, 2018
a1e62c4
Fix issue of metadata.
yangyuan Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ...iveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ public static ContentModeratorClient GenerateClient(ReviewAPI api)
{
ContentModeratorClient client = new ContentModeratorClient(new ApiKeyServiceClientCredentials(ReviewAPISubscriptionKey));

client.BaseUrl = "southeastasia.api.cognitive.microsoft.com";
client.Endpoint = "https://southeastasia.api.cognitive.microsoft.com";

return client;

Expand All @@ -572,8 +572,8 @@ public static ContentModeratorClient GenerateClient(ReviewAPI api, DelegatingHan
try
{
ContentModeratorClient client = new ContentModeratorClient(new ApiKeyServiceClientCredentials(ReviewAPISubscriptionKey),handlers: handler);
client.BaseUrl = "southeastasia.api.cognitive.microsoft.com";

client.Endpoint = "https://southeastasia.api.cognitive.microsoft.com";
return client;

}
Expand Down Expand Up @@ -822,7 +822,7 @@ public static ContentModeratorClient GenerateClient(ContentModeratorAPI api)
try
{
ContentModeratorClient client = new ContentModeratorClient(new ApiKeyServiceClientCredentials(ContentModeratorSubscriptionKey));
client.BaseUrl = AzureRegionBaseUrl.Southeastasiaapicognitivemicrosoftcom;
client.Endpoint = "https://southeastasia.api.cognitive.microsoft.com";
return client;

}
Expand All @@ -838,7 +838,7 @@ public static ContentModeratorClient GenerateClient(ContentModeratorAPI api, Del
try
{
ContentModeratorClient client = new ContentModeratorClient(new ApiKeyServiceClientCredentials(ContentModeratorSubscriptionKey),handlers: handler);
client.BaseUrl = "southeastasia.api.cognitive.microsoft.com";
client.Endpoint = "https://southeastasia.api.cognitive.microsoft.com";
return client;

}
Expand Down Expand Up @@ -872,10 +872,10 @@ public static Body GetListBody(Content c)
Random r = new Random();
string num = r.Next(0,1000).ToString();
b.Name = $"BVT{c.GetDescription()}List" + num;
b.Description = $"BVT{c.GetDescription()}List" + num;
b.Metadata = new BodyMetadata();
b.Metadata.KeyOne = $"BVT{c.GetDescription()}ListKeyNote1" + num;
b.Metadata.KeyTwo = $"BVT{c.GetDescription()}ListKeyNote2" + num;
b.Description = $"BVT{c.GetDescription()}List" + num;
b.Metadata = new Dictionary<string, string>();
b.Metadata["Key One"] = $"BVT{c.GetDescription()}ListKeyNote1" + num;
b.Metadata["Key Two"] = $"BVT{c.GetDescription()}ListKeyNote2" + num;
return b;
}
catch (Exception e)
Expand Down
16 changes: 8 additions & 8 deletions ...iveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ public static bool VerifyImageListContents(Body expected, ImageList actual)
try
{
return expected.Name.Equals(actual.Name, StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata.KeyOne.Equals(actual.Metadata.KeyOne, StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata.KeyTwo.Equals(actual.Metadata.KeyTwo, StringComparison.InvariantCultureIgnoreCase);
&& expected.Metadata["Key One"].Equals(actual.Metadata["Key One"], StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata["Key Two"].Equals(actual.Metadata["Key Two"], StringComparison.InvariantCultureIgnoreCase);
}
catch (Exception e)
{
Expand All @@ -111,8 +111,8 @@ public static bool VerifyImageListContents(ImageList expected, ImageList actual)
{
return expected.Id == Convert.ToDouble(actual.Id)
&& expected.Name.Equals(actual.Name, StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata.KeyOne.Equals(actual.Metadata.KeyOne, StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata.KeyTwo.Equals(actual.Metadata.KeyTwo, StringComparison.InvariantCultureIgnoreCase);
&& expected.Metadata["Key One"].Equals(actual.Metadata["Key One"], StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata["Key Two"].Equals(actual.Metadata["Key Two"], StringComparison.InvariantCultureIgnoreCase);
}
catch (Exception e)
{
Expand All @@ -126,8 +126,8 @@ public static bool VerifyTermListContents(Body expected, TermList actual)
try
{
return expected.Name.Equals(actual.Name, StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata.KeyOne.Equals(actual.Metadata.KeyOne, StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata.KeyTwo.Equals(actual.Metadata.KeyTwo, StringComparison.InvariantCultureIgnoreCase);
&& expected.Metadata["Key One"].Equals(actual.Metadata["Key One"], StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata["Key Two"].Equals(actual.Metadata["Key Two"], StringComparison.InvariantCultureIgnoreCase);
}
catch (Exception e)
{
Expand All @@ -142,8 +142,8 @@ public static bool VerifyTermListContents(TermList expected, TermList actual)
{
return expected.Id == Convert.ToDouble(actual.Id)
&& expected.Name.Equals(actual.Name, StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata.KeyOne.Equals(actual.Metadata.KeyOne, StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata.KeyTwo.Equals(actual.Metadata.KeyTwo, StringComparison.InvariantCultureIgnoreCase);
&& expected.Metadata["Key One"].Equals(actual.Metadata["Key One"], StringComparison.InvariantCultureIgnoreCase)
&& expected.Metadata["Key Two"].Equals(actual.Metadata["Key Two"], StringComparison.InvariantCultureIgnoreCase);
}
catch (Exception e)
{
Expand Down
68 changes: 44 additions & 24 deletions ...es/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ContentModeratorClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ namespace Microsoft.CognitiveServices.ContentModerator
/// Text can be at most 1024 characters long.
/// If the content passed to the text API or the image API exceeds the size
/// limits, the API will return an error code that informs about the issue.
///
/// This API is currently available in:
///
/// * West US - westus.api.cognitive.microsoft.com
/// * East US 2 - eastus2.api.cognitive.microsoft.com
/// * West Central US - westcentralus.api.cognitive.microsoft.com
/// * West Europe - westeurope.api.cognitive.microsoft.com
/// * Southeast Asia - southeastasia.api.cognitive.microsoft.com .
/// </summary>
public partial class ContentModeratorClient : ServiceClient<ContentModeratorClient>, IContentModeratorClient
{
Expand All @@ -54,22 +46,10 @@ public partial class ContentModeratorClient : ServiceClient<ContentModeratorClie
public JsonSerializerSettings DeserializationSettings { get; private set; }

/// <summary>
/// Supported Azure regions for Content Moderator endpoints. Possible values
/// include: 'westus.api.cognitive.microsoft.com',
/// 'westus2.api.cognitive.microsoft.com',
/// 'eastus.api.cognitive.microsoft.com',
/// 'eastus2.api.cognitive.microsoft.com',
/// 'westcentralus.api.cognitive.microsoft.com',
/// 'southcentralus.api.cognitive.microsoft.com',
/// 'westeurope.api.cognitive.microsoft.com',
/// 'northeurope.api.cognitive.microsoft.com',
/// 'southeastasia.api.cognitive.microsoft.com',
/// 'eastasia.api.cognitive.microsoft.com',
/// 'australiaeast.api.cognitive.microsoft.com',
/// 'brazilsouth.api.cognitive.microsoft.com',
/// 'contentmoderatortest.azure-api.net'
/// Supported Cognitive Services endpoints (protocol and hostname, for example:
/// https://westus.api.cognitive.microsoft.com).
/// </summary>
public string BaseUrl { get; set; }
public string Endpoint { get; set; }

/// <summary>
/// Subscription credentials which uniquely identify client subscription.
Expand Down Expand Up @@ -111,6 +91,19 @@ public partial class ContentModeratorClient : ServiceClient<ContentModeratorClie
/// </summary>
public virtual IReviews Reviews { get; private set; }

/// <summary>
/// Initializes a new instance of the ContentModeratorClient class.
/// </summary>
/// <param name='httpClient'>
/// HttpClient to be used
/// </param>
/// <param name='disposeHttpClient'>
/// True: will dispose the provided httpClient on calling ContentModeratorClient.Dispose(). False: will not dispose provided httpClient</param>
protected ContentModeratorClient(HttpClient httpClient, bool disposeHttpClient) : base(httpClient, disposeHttpClient)
{
Initialize();
}

/// <summary>
/// Initializes a new instance of the ContentModeratorClient class.
/// </summary>
Expand Down Expand Up @@ -161,6 +154,33 @@ public ContentModeratorClient(ServiceClientCredentials credentials, params Deleg
}
}

/// <summary>
/// Initializes a new instance of the ContentModeratorClient class.
/// </summary>
/// <param name='credentials'>
/// Required. Subscription credentials which uniquely identify client subscription.
/// </param>
/// <param name='httpClient'>
/// HttpClient to be used
/// </param>
/// <param name='disposeHttpClient'>
/// True: will dispose the provided httpClient on calling ContentModeratorClient.Dispose(). False: will not dispose provided httpClient</param>
/// <exception cref="System.ArgumentNullException">
/// Thrown when a required parameter is null
/// </exception>
public ContentModeratorClient(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);
}
}

/// <summary>
/// Initializes a new instance of the ContentModeratorClient class.
/// </summary>
Expand Down Expand Up @@ -205,7 +225,7 @@ private void Initialize()
ListManagementImage = new ListManagementImage(this);
ListManagementTerm = new ListManagementTerm(this);
Reviews = new Reviews(this);
BaseUri = "https://{baseUrl}";
BaseUri = "{Endpoint}";
SerializationSettings = new JsonSerializerSettings
{
Formatting = Newtonsoft.Json.Formatting.Indented,
Expand Down
26 changes: 3 additions & 23 deletions ...s/dataPlane/Vision/ContentModerator/ContentModerator/Generated/IContentModeratorClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ namespace Microsoft.CognitiveServices.ContentModerator
/// Text can be at most 1024 characters long.
/// If the content passed to the text API or the image API exceeds the size
/// limits, the API will return an error code that informs about the issue.
///
/// This API is currently available in:
///
/// * West US - westus.api.cognitive.microsoft.com
/// * East US 2 - eastus2.api.cognitive.microsoft.com
/// * West Central US - westcentralus.api.cognitive.microsoft.com
/// * West Europe - westeurope.api.cognitive.microsoft.com
/// * Southeast Asia - southeastasia.api.cognitive.microsoft.com .
/// </summary>
public partial interface IContentModeratorClient : System.IDisposable
{
Expand All @@ -48,22 +40,10 @@ public partial interface IContentModeratorClient : System.IDisposable
JsonSerializerSettings DeserializationSettings { get; }

/// <summary>
/// Supported Azure regions for Content Moderator endpoints. Possible
/// values include: 'westus.api.cognitive.microsoft.com',
/// 'westus2.api.cognitive.microsoft.com',
/// 'eastus.api.cognitive.microsoft.com',
/// 'eastus2.api.cognitive.microsoft.com',
/// 'westcentralus.api.cognitive.microsoft.com',
/// 'southcentralus.api.cognitive.microsoft.com',
/// 'westeurope.api.cognitive.microsoft.com',
/// 'northeurope.api.cognitive.microsoft.com',
/// 'southeastasia.api.cognitive.microsoft.com',
/// 'eastasia.api.cognitive.microsoft.com',
/// 'australiaeast.api.cognitive.microsoft.com',
/// 'brazilsouth.api.cognitive.microsoft.com',
/// 'contentmoderatortest.azure-api.net'
/// Supported Cognitive Services endpoints (protocol and hostname, for
/// example: https://westus.api.cognitive.microsoft.com).
/// </summary>
string BaseUrl { get; set; }
string Endpoint { get; set; }

/// <summary>
/// Subscription credentials which uniquely identify client
Expand Down
Loading