diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/api/Azure.AI.ContentSafety.netstandard2.0.cs b/sdk/contentsafety/Azure.AI.ContentSafety/api/Azure.AI.ContentSafety.netstandard2.0.cs index 95ac87b95a31..04b08ebcae78 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/api/Azure.AI.ContentSafety.netstandard2.0.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/api/Azure.AI.ContentSafety.netstandard2.0.cs @@ -4,7 +4,6 @@ public partial class AddOrUpdateTextBlocklistItemsOptions : System.ClientModel.P { public AddOrUpdateTextBlocklistItemsOptions(System.Collections.Generic.IEnumerable blocklistItems) { } public System.Collections.Generic.IList BlocklistItems { get { throw null; } } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AddOrUpdateTextBlocklistItemsOptions System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AddOrUpdateTextBlocklistItemsOptions System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -15,7 +14,6 @@ public partial class AddOrUpdateTextBlocklistItemsResult : System.ClientModel.Pr { internal AddOrUpdateTextBlocklistItemsResult() { } public System.Collections.Generic.IReadOnlyList BlocklistItems { get { throw null; } } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AddOrUpdateTextBlocklistItemsResult System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AddOrUpdateTextBlocklistItemsResult System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -28,7 +26,6 @@ public AnalyzeImageOptions(Azure.AI.ContentSafety.ContentSafetyImageData image) public System.Collections.Generic.IList Categories { get { throw null; } } public Azure.AI.ContentSafety.ContentSafetyImageData Image { get { throw null; } } public Azure.AI.ContentSafety.AnalyzeImageOutputType? OutputType { get { throw null; } set { } } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AnalyzeImageOptions System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AnalyzeImageOptions System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -56,7 +53,6 @@ public partial class AnalyzeImageResult : System.ClientModel.Primitives.IJsonMod { internal AnalyzeImageResult() { } public System.Collections.Generic.IReadOnlyList CategoriesAnalysis { get { throw null; } } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AnalyzeImageResult System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AnalyzeImageResult System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -71,7 +67,6 @@ public AnalyzeTextOptions(string text) { } public bool? HaltOnBlocklistHit { get { throw null; } set { } } public Azure.AI.ContentSafety.AnalyzeTextOutputType? OutputType { get { throw null; } set { } } public string Text { get { throw null; } } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AnalyzeTextOptions System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AnalyzeTextOptions System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -101,7 +96,6 @@ public partial class AnalyzeTextResult : System.ClientModel.Primitives.IJsonMode internal AnalyzeTextResult() { } public System.Collections.Generic.IReadOnlyList BlocklistsMatch { get { throw null; } } public System.Collections.Generic.IReadOnlyList CategoriesAnalysis { get { throw null; } } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AnalyzeTextResult System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.AnalyzeTextResult System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -167,13 +161,18 @@ public ContentSafetyClient(System.Uri endpoint, Azure.Core.TokenCredential crede public virtual System.Threading.Tasks.Task> AnalyzeTextAsync(Azure.AI.ContentSafety.AnalyzeTextOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } public virtual System.Threading.Tasks.Task AnalyzeTextAsync(Azure.Core.RequestContent content, Azure.RequestContext context = null) { throw null; } public virtual System.Threading.Tasks.Task> AnalyzeTextAsync(string text, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.Response DetectTextProtectedMaterial(Azure.AI.ContentSafety.DetectTextProtectedMaterialOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual Azure.Response DetectTextProtectedMaterial(Azure.Core.RequestContent content, Azure.RequestContext context = null) { throw null; } + public virtual System.Threading.Tasks.Task> DetectTextProtectedMaterialAsync(Azure.AI.ContentSafety.DetectTextProtectedMaterialOptions options, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; } + public virtual System.Threading.Tasks.Task DetectTextProtectedMaterialAsync(Azure.Core.RequestContent content, Azure.RequestContext context = null) { throw null; } } public partial class ContentSafetyClientOptions : Azure.Core.ClientOptions { - public ContentSafetyClientOptions(Azure.AI.ContentSafety.ContentSafetyClientOptions.ServiceVersion version = Azure.AI.ContentSafety.ContentSafetyClientOptions.ServiceVersion.V2023_10_01) { } + public ContentSafetyClientOptions(Azure.AI.ContentSafety.ContentSafetyClientOptions.ServiceVersion version = Azure.AI.ContentSafety.ContentSafetyClientOptions.ServiceVersion.V2024_09_01) { } public enum ServiceVersion { V2023_10_01 = 1, + V2024_09_01 = 2, } } public partial class ContentSafetyImageData : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel @@ -181,7 +180,6 @@ public partial class ContentSafetyImageData : System.ClientModel.Primitives.IJso public ContentSafetyImageData() { } public ContentSafetyImageData(System.BinaryData content) { } public ContentSafetyImageData(System.Uri blobUri) { } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.ContentSafetyImageData System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.ContentSafetyImageData System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -195,18 +193,39 @@ public static partial class ContentSafetyModelFactory public static Azure.AI.ContentSafety.AnalyzeImageResult AnalyzeImageResult(System.Collections.Generic.IEnumerable categoriesAnalysis = null) { throw null; } public static Azure.AI.ContentSafety.AnalyzeTextOptions AnalyzeTextOptions(string text = null, System.Collections.Generic.IEnumerable categories = null, System.Collections.Generic.IEnumerable blocklistNames = null, bool? haltOnBlocklistHit = default(bool?), Azure.AI.ContentSafety.AnalyzeTextOutputType? outputType = default(Azure.AI.ContentSafety.AnalyzeTextOutputType?)) { throw null; } public static Azure.AI.ContentSafety.AnalyzeTextResult AnalyzeTextResult(System.Collections.Generic.IEnumerable blocklistsMatch = null, System.Collections.Generic.IEnumerable categoriesAnalysis = null) { throw null; } + public static Azure.AI.ContentSafety.DetectTextProtectedMaterialResult DetectTextProtectedMaterialResult(Azure.AI.ContentSafety.TextProtectedMaterialAnalysisResult protectedMaterialAnalysis = null) { throw null; } public static Azure.AI.ContentSafety.ImageCategoriesAnalysis ImageCategoriesAnalysis(Azure.AI.ContentSafety.ImageCategory category = default(Azure.AI.ContentSafety.ImageCategory), int? severity = default(int?)) { throw null; } public static Azure.AI.ContentSafety.TextBlocklist TextBlocklist(string name = null, string description = null) { throw null; } - public static Azure.AI.ContentSafety.TextBlocklistItem TextBlocklistItem(string blocklistItemId = null, string description = null, string text = null) { throw null; } + public static Azure.AI.ContentSafety.TextBlocklistItem TextBlocklistItem(string blocklistItemId = null, string description = null, string text = null, bool? isRegex = default(bool?)) { throw null; } public static Azure.AI.ContentSafety.TextBlocklistMatch TextBlocklistMatch(string blocklistName = null, string blocklistItemId = null, string blocklistItemText = null) { throw null; } public static Azure.AI.ContentSafety.TextCategoriesAnalysis TextCategoriesAnalysis(Azure.AI.ContentSafety.TextCategory category = default(Azure.AI.ContentSafety.TextCategory), int? severity = default(int?)) { throw null; } + public static Azure.AI.ContentSafety.TextProtectedMaterialAnalysisResult TextProtectedMaterialAnalysisResult(bool detected = false) { throw null; } + } + public partial class DetectTextProtectedMaterialOptions : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel + { + public DetectTextProtectedMaterialOptions(string text) { } + public string Text { get { throw null; } } + Azure.AI.ContentSafety.DetectTextProtectedMaterialOptions System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } + Azure.AI.ContentSafety.DetectTextProtectedMaterialOptions System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + string System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + System.BinaryData System.ClientModel.Primitives.IPersistableModel.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + } + public partial class DetectTextProtectedMaterialResult : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel + { + internal DetectTextProtectedMaterialResult() { } + public Azure.AI.ContentSafety.TextProtectedMaterialAnalysisResult ProtectedMaterialAnalysis { get { throw null; } } + Azure.AI.ContentSafety.DetectTextProtectedMaterialResult System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } + Azure.AI.ContentSafety.DetectTextProtectedMaterialResult System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + string System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + System.BinaryData System.ClientModel.Primitives.IPersistableModel.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } } public partial class ImageCategoriesAnalysis : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel { internal ImageCategoriesAnalysis() { } public Azure.AI.ContentSafety.ImageCategory Category { get { throw null; } } public int? Severity { get { throw null; } } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.ImageCategoriesAnalysis System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.ImageCategoriesAnalysis System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -237,7 +256,6 @@ public partial class RemoveTextBlocklistItemsOptions : System.ClientModel.Primit { public RemoveTextBlocklistItemsOptions(System.Collections.Generic.IEnumerable blocklistItemIds) { } public System.Collections.Generic.IList BlocklistItemIds { get { throw null; } } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.RemoveTextBlocklistItemsOptions System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.RemoveTextBlocklistItemsOptions System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -249,7 +267,6 @@ public partial class TextBlocklist : System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.TextBlocklist System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -261,8 +278,8 @@ public partial class TextBlocklistItem : System.ClientModel.Primitives.IJsonMode public TextBlocklistItem(string text) { } public string BlocklistItemId { get { throw null; } } public string Description { get { throw null; } set { } } + public bool? IsRegex { get { throw null; } set { } } public string Text { get { throw null; } set { } } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.TextBlocklistItem System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.TextBlocklistItem System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -275,7 +292,6 @@ internal TextBlocklistMatch() { } public string BlocklistItemId { get { throw null; } } public string BlocklistItemText { get { throw null; } } public string BlocklistName { get { throw null; } } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.TextBlocklistMatch System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.TextBlocklistMatch System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -287,7 +303,6 @@ public partial class TextCategoriesAnalysis : System.ClientModel.Primitives.IJso internal TextCategoriesAnalysis() { } public Azure.AI.ContentSafety.TextCategory Category { get { throw null; } } public int? Severity { get { throw null; } } - protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.TextCategoriesAnalysis System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } Azure.AI.ContentSafety.TextCategoriesAnalysis System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -314,6 +329,16 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer public static bool operator !=(Azure.AI.ContentSafety.TextCategory left, Azure.AI.ContentSafety.TextCategory right) { throw null; } public override string ToString() { throw null; } } + public partial class TextProtectedMaterialAnalysisResult : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel + { + internal TextProtectedMaterialAnalysisResult() { } + public bool Detected { get { throw null; } } + Azure.AI.ContentSafety.TextProtectedMaterialAnalysisResult System.ClientModel.Primitives.IJsonModel.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + void System.ClientModel.Primitives.IJsonModel.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } + Azure.AI.ContentSafety.TextProtectedMaterialAnalysisResult System.ClientModel.Primitives.IPersistableModel.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + string System.ClientModel.Primitives.IPersistableModel.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + System.BinaryData System.ClientModel.Primitives.IPersistableModel.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + } } namespace Microsoft.Extensions.Azure { diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AddOrUpdateTextBlocklistItemsOptions.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AddOrUpdateTextBlocklistItemsOptions.Serialization.cs index 7a566dd5d7e6..1bca9c7e7e04 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AddOrUpdateTextBlocklistItemsOptions.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AddOrUpdateTextBlocklistItemsOptions.Serialization.cs @@ -18,15 +18,6 @@ public partial class AddOrUpdateTextBlocklistItemsOptions : IUtf8JsonSerializabl void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(AddOrUpdateTextBlocklistItemsOptions)} does not support writing '{format}' format."); } + writer.WriteStartObject(); writer.WritePropertyName("blocklistItems"u8); writer.WriteStartArray(); foreach (var item in BlocklistItems) @@ -56,6 +48,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } AddOrUpdateTextBlocklistItemsOptions IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AddOrUpdateTextBlocklistItemsResult.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AddOrUpdateTextBlocklistItemsResult.Serialization.cs index 9d0e90d95bf9..3be97e14ebd8 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AddOrUpdateTextBlocklistItemsResult.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AddOrUpdateTextBlocklistItemsResult.Serialization.cs @@ -18,15 +18,6 @@ public partial class AddOrUpdateTextBlocklistItemsResult : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(AddOrUpdateTextBlocklistItemsResult)} does not support writing '{format}' format."); } + writer.WriteStartObject(); writer.WritePropertyName("blocklistItems"u8); writer.WriteStartArray(); foreach (var item in BlocklistItems) @@ -56,6 +48,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } AddOrUpdateTextBlocklistItemsResult IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageOptions.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageOptions.Serialization.cs index 65b27e0fa8de..f9f0107d4c48 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageOptions.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageOptions.Serialization.cs @@ -18,15 +18,6 @@ public partial class AnalyzeImageOptions : IUtf8JsonSerializable, IJsonModel ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(AnalyzeImageOptions)} does not support writing '{format}' format."); } + writer.WriteStartObject(); writer.WritePropertyName("image"u8); writer.WriteObjectValue(Image, options); if (Optional.IsCollectionDefined(Categories)) @@ -66,6 +58,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } AnalyzeImageOptions IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageOptions.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageOptions.cs index bf507f5616b3..f5e0a4a860eb 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageOptions.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageOptions.cs @@ -46,7 +46,7 @@ public partial class AnalyzeImageOptions private IDictionary _serializedAdditionalRawData; /// Initializes a new instance of . - /// The image needs to be analyzed. + /// The image to be analyzed. /// is null. public AnalyzeImageOptions(ContentSafetyImageData image) { @@ -57,7 +57,7 @@ public AnalyzeImageOptions(ContentSafetyImageData image) } /// Initializes a new instance of . - /// The image needs to be analyzed. + /// The image to be analyzed. /// The categories will be analyzed. If they are not assigned, a default set of analysis results for the categories will be returned. /// This refers to the type of image analysis output. If no value is assigned, the default value will be "FourSeverityLevels". /// Keeps track of any properties unknown to the library. @@ -74,7 +74,7 @@ internal AnalyzeImageOptions() { } - /// The image needs to be analyzed. + /// The image to be analyzed. public ContentSafetyImageData Image { get; } /// The categories will be analyzed. If they are not assigned, a default set of analysis results for the categories will be returned. public IList Categories { get; } diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageResult.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageResult.Serialization.cs index c993ccf77234..41d6301bb40f 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageResult.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeImageResult.Serialization.cs @@ -18,15 +18,6 @@ public partial class AnalyzeImageResult : IUtf8JsonSerializable, IJsonModel ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(AnalyzeImageResult)} does not support writing '{format}' format."); } + writer.WriteStartObject(); writer.WritePropertyName("categoriesAnalysis"u8); writer.WriteStartArray(); foreach (var item in CategoriesAnalysis) @@ -56,6 +48,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } AnalyzeImageResult IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextOptions.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextOptions.Serialization.cs index c781f945697c..ae81cab0812e 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextOptions.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextOptions.Serialization.cs @@ -18,15 +18,6 @@ public partial class AnalyzeTextOptions : IUtf8JsonSerializable, IJsonModel ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(AnalyzeTextOptions)} does not support writing '{format}' format."); } + writer.WriteStartObject(); writer.WritePropertyName("text"u8); writer.WriteStringValue(Text); if (Optional.IsCollectionDefined(Categories)) @@ -81,6 +73,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } AnalyzeTextOptions IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextOptions.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextOptions.cs index 2be40626cdae..b0d19ae58434 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextOptions.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextOptions.cs @@ -46,7 +46,7 @@ public partial class AnalyzeTextOptions private IDictionary _serializedAdditionalRawData; /// Initializes a new instance of . - /// The text needs to be analyzed. We support a maximum of 10k Unicode characters (Unicode code points) in the text of one request. + /// The text to be analyzed. We support a maximum of 10k Unicode characters (Unicode code points) in the text of one request. /// is null. public AnalyzeTextOptions(string text) { @@ -58,7 +58,7 @@ public AnalyzeTextOptions(string text) } /// Initializes a new instance of . - /// The text needs to be analyzed. We support a maximum of 10k Unicode characters (Unicode code points) in the text of one request. + /// The text to be analyzed. We support a maximum of 10k Unicode characters (Unicode code points) in the text of one request. /// The categories will be analyzed. If they are not assigned, a default set of analysis results for the categories will be returned. /// The names of blocklists. /// When set to true, further analyses of harmful content will not be performed in cases where blocklists are hit. When set to false, all analyses of harmful content will be performed, whether or not blocklists are hit. @@ -79,7 +79,7 @@ internal AnalyzeTextOptions() { } - /// The text needs to be analyzed. We support a maximum of 10k Unicode characters (Unicode code points) in the text of one request. + /// The text to be analyzed. We support a maximum of 10k Unicode characters (Unicode code points) in the text of one request. public string Text { get; } /// The categories will be analyzed. If they are not assigned, a default set of analysis results for the categories will be returned. public IList Categories { get; } diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextResult.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextResult.Serialization.cs index ac23e84b2cd0..82a49b7a460d 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextResult.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/AnalyzeTextResult.Serialization.cs @@ -18,15 +18,6 @@ public partial class AnalyzeTextResult : IUtf8JsonSerializable, IJsonModel ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(AnalyzeTextResult)} does not support writing '{format}' format."); } + writer.WriteStartObject(); if (Optional.IsCollectionDefined(BlocklistsMatch)) { writer.WritePropertyName("blocklistsMatch"u8); @@ -66,6 +58,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } AnalyzeTextResult IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyClient.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyClient.cs index abe04eda4f70..a3a72e3fb52d 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyClient.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyClient.cs @@ -100,6 +100,116 @@ public ContentSafetyClient(Uri endpoint, TokenCredential credential, ContentSafe _apiVersion = options.Version; } + /// Analyze Image. + /// The image analysis request. + /// The cancellation token to use. + /// is null. + /// A synchronous API for the analysis of potentially harmful image content. Currently, it supports four categories: Hate, SelfHarm, Sexual, and Violence. + /// + public virtual async Task> AnalyzeImageAsync(AnalyzeImageOptions options, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(options, nameof(options)); + + using RequestContent content = options.ToRequestContent(); + RequestContext context = FromCancellationToken(cancellationToken); + Response response = await AnalyzeImageAsync(content, context).ConfigureAwait(false); + return Response.FromValue(AnalyzeImageResult.FromResponse(response), response); + } + + /// Analyze Image. + /// The image analysis request. + /// The cancellation token to use. + /// is null. + /// A synchronous API for the analysis of potentially harmful image content. Currently, it supports four categories: Hate, SelfHarm, Sexual, and Violence. + /// + public virtual Response AnalyzeImage(AnalyzeImageOptions options, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(options, nameof(options)); + + using RequestContent content = options.ToRequestContent(); + RequestContext context = FromCancellationToken(cancellationToken); + Response response = AnalyzeImage(content, context); + return Response.FromValue(AnalyzeImageResult.FromResponse(response), response); + } + + /// + /// [Protocol Method] Analyze Image + /// + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// + /// Please try the simpler convenience overload with strongly typed models first. + /// + /// + /// + /// + /// The content to send as the body of the request. + /// The request context, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + /// + public virtual async Task AnalyzeImageAsync(RequestContent content, RequestContext context = null) + { + Argument.AssertNotNull(content, nameof(content)); + + using var scope = ClientDiagnostics.CreateScope("ContentSafetyClient.AnalyzeImage"); + scope.Start(); + try + { + using HttpMessage message = CreateAnalyzeImageRequest(content, context); + return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false); + } + catch (Exception e) + { + scope.Failed(e); + throw; + } + } + + /// + /// [Protocol Method] Analyze Image + /// + /// + /// + /// This protocol method allows explicit creation of the request and processing of the response for advanced scenarios. + /// + /// + /// + /// + /// Please try the simpler convenience overload with strongly typed models first. + /// + /// + /// + /// + /// The content to send as the body of the request. + /// The request context, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. + /// + public virtual Response AnalyzeImage(RequestContent content, RequestContext context = null) + { + Argument.AssertNotNull(content, nameof(content)); + + using var scope = ClientDiagnostics.CreateScope("ContentSafetyClient.AnalyzeImage"); + scope.Start(); + try + { + using HttpMessage message = CreateAnalyzeImageRequest(content, context); + return _pipeline.ProcessMessage(message, context); + } + catch (Exception e) + { + scope.Failed(e); + throw; + } + } + /// Analyze Text. /// The text analysis request. /// The cancellation token to use. @@ -210,40 +320,40 @@ public virtual Response AnalyzeText(RequestContent content, RequestContext conte } } - /// Analyze Image. - /// The image analysis request. + /// Detect Protected Material for Text. + /// The request body to be detected, which may contain protected material. /// The cancellation token to use. /// is null. - /// A synchronous API for the analysis of potentially harmful image content. Currently, it supports four categories: Hate, SelfHarm, Sexual, and Violence. - /// - public virtual async Task> AnalyzeImageAsync(AnalyzeImageOptions options, CancellationToken cancellationToken = default) + /// A synchronous API for detecting protected material in the given text. + /// + public virtual async Task> DetectTextProtectedMaterialAsync(DetectTextProtectedMaterialOptions options, CancellationToken cancellationToken = default) { Argument.AssertNotNull(options, nameof(options)); using RequestContent content = options.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); - Response response = await AnalyzeImageAsync(content, context).ConfigureAwait(false); - return Response.FromValue(AnalyzeImageResult.FromResponse(response), response); + Response response = await DetectTextProtectedMaterialAsync(content, context).ConfigureAwait(false); + return Response.FromValue(DetectTextProtectedMaterialResult.FromResponse(response), response); } - /// Analyze Image. - /// The image analysis request. + /// Detect Protected Material for Text. + /// The request body to be detected, which may contain protected material. /// The cancellation token to use. /// is null. - /// A synchronous API for the analysis of potentially harmful image content. Currently, it supports four categories: Hate, SelfHarm, Sexual, and Violence. - /// - public virtual Response AnalyzeImage(AnalyzeImageOptions options, CancellationToken cancellationToken = default) + /// A synchronous API for detecting protected material in the given text. + /// + public virtual Response DetectTextProtectedMaterial(DetectTextProtectedMaterialOptions options, CancellationToken cancellationToken = default) { Argument.AssertNotNull(options, nameof(options)); using RequestContent content = options.ToRequestContent(); RequestContext context = FromCancellationToken(cancellationToken); - Response response = AnalyzeImage(content, context); - return Response.FromValue(AnalyzeImageResult.FromResponse(response), response); + Response response = DetectTextProtectedMaterial(content, context); + return Response.FromValue(DetectTextProtectedMaterialResult.FromResponse(response), response); } /// - /// [Protocol Method] Analyze Image + /// [Protocol Method] Detect Protected Material for Text /// /// /// @@ -252,7 +362,7 @@ public virtual Response AnalyzeImage(AnalyzeImageOptions opt /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -262,16 +372,16 @@ public virtual Response AnalyzeImage(AnalyzeImageOptions opt /// is null. /// Service returned a non-success status code. /// The response returned from the service. - /// - public virtual async Task AnalyzeImageAsync(RequestContent content, RequestContext context = null) + /// + public virtual async Task DetectTextProtectedMaterialAsync(RequestContent content, RequestContext context = null) { Argument.AssertNotNull(content, nameof(content)); - using var scope = ClientDiagnostics.CreateScope("ContentSafetyClient.AnalyzeImage"); + using var scope = ClientDiagnostics.CreateScope("ContentSafetyClient.DetectTextProtectedMaterial"); scope.Start(); try { - using HttpMessage message = CreateAnalyzeImageRequest(content, context); + using HttpMessage message = CreateDetectTextProtectedMaterialRequest(content, context); return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false); } catch (Exception e) @@ -282,7 +392,7 @@ public virtual async Task AnalyzeImageAsync(RequestContent content, Re } /// - /// [Protocol Method] Analyze Image + /// [Protocol Method] Detect Protected Material for Text /// /// /// @@ -291,7 +401,7 @@ public virtual async Task AnalyzeImageAsync(RequestContent content, Re /// /// /// - /// Please try the simpler convenience overload with strongly typed models first. + /// Please try the simpler convenience overload with strongly typed models first. /// /// /// @@ -301,16 +411,16 @@ public virtual async Task AnalyzeImageAsync(RequestContent content, Re /// is null. /// Service returned a non-success status code. /// The response returned from the service. - /// - public virtual Response AnalyzeImage(RequestContent content, RequestContext context = null) + /// + public virtual Response DetectTextProtectedMaterial(RequestContent content, RequestContext context = null) { Argument.AssertNotNull(content, nameof(content)); - using var scope = ClientDiagnostics.CreateScope("ContentSafetyClient.AnalyzeImage"); + using var scope = ClientDiagnostics.CreateScope("ContentSafetyClient.DetectTextProtectedMaterial"); scope.Start(); try { - using HttpMessage message = CreateAnalyzeImageRequest(content, context); + using HttpMessage message = CreateDetectTextProtectedMaterialRequest(content, context); return _pipeline.ProcessMessage(message, context); } catch (Exception e) @@ -320,6 +430,23 @@ public virtual Response AnalyzeImage(RequestContent content, RequestContext cont } } + internal HttpMessage CreateAnalyzeImageRequest(RequestContent content, RequestContext context) + { + var message = _pipeline.CreateMessage(context, ResponseClassifier200); + var request = message.Request; + request.Method = RequestMethod.Post; + var uri = new RawRequestUriBuilder(); + uri.Reset(_endpoint); + uri.AppendRaw("/contentsafety", false); + uri.AppendPath("/image:analyze", false); + uri.AppendQuery("api-version", _apiVersion, true); + request.Uri = uri; + request.Headers.Add("Accept", "application/json"); + request.Headers.Add("Content-Type", "application/json"); + request.Content = content; + return message; + } + internal HttpMessage CreateAnalyzeTextRequest(RequestContent content, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); @@ -337,7 +464,7 @@ internal HttpMessage CreateAnalyzeTextRequest(RequestContent content, RequestCon return message; } - internal HttpMessage CreateAnalyzeImageRequest(RequestContent content, RequestContext context) + internal HttpMessage CreateDetectTextProtectedMaterialRequest(RequestContent content, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; @@ -345,7 +472,7 @@ internal HttpMessage CreateAnalyzeImageRequest(RequestContent content, RequestCo var uri = new RawRequestUriBuilder(); uri.Reset(_endpoint); uri.AppendRaw("/contentsafety", false); - uri.AppendPath("/image:analyze", false); + uri.AppendPath("/text:detectProtectedMaterial", false); uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyClientOptions.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyClientOptions.cs index a827f8bbab37..e81580a74055 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyClientOptions.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyClientOptions.cs @@ -13,13 +13,15 @@ namespace Azure.AI.ContentSafety /// Client options for Azure.AI.ContentSafety library clients. public partial class ContentSafetyClientOptions : ClientOptions { - private const ServiceVersion LatestVersion = ServiceVersion.V2023_10_01; + private const ServiceVersion LatestVersion = ServiceVersion.V2024_09_01; /// The version of the service to use. public enum ServiceVersion { /// Service version "2023-10-01". V2023_10_01 = 1, + /// Service version "2024-09-01". + V2024_09_01 = 2, } internal string Version { get; } @@ -30,6 +32,7 @@ public ContentSafetyClientOptions(ServiceVersion version = LatestVersion) Version = version switch { ServiceVersion.V2023_10_01 => "2023-10-01", + ServiceVersion.V2024_09_01 => "2024-09-01", _ => throw new NotSupportedException() }; } diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyImageData.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyImageData.Serialization.cs index b1d4ec7b064b..44bb41d24580 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyImageData.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyImageData.Serialization.cs @@ -18,15 +18,6 @@ public partial class ContentSafetyImageData : IUtf8JsonSerializable, IJsonModel< void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(ContentSafetyImageData)} does not support writing '{format}' format."); } + writer.WriteStartObject(); if (Optional.IsDefined(Content)) { writer.WritePropertyName("content"u8); @@ -59,6 +51,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } ContentSafetyImageData IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyModelFactory.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyModelFactory.cs index 1f718056b007..bd65325c2604 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyModelFactory.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ContentSafetyModelFactory.cs @@ -14,8 +14,39 @@ namespace Azure.AI.ContentSafety /// Model factory for models. public static partial class ContentSafetyModelFactory { + /// Initializes a new instance of . + /// The image to be analyzed. + /// The categories will be analyzed. If they are not assigned, a default set of analysis results for the categories will be returned. + /// This refers to the type of image analysis output. If no value is assigned, the default value will be "FourSeverityLevels". + /// A new instance for mocking. + public static AnalyzeImageOptions AnalyzeImageOptions(ContentSafetyImageData image = null, IEnumerable categories = null, AnalyzeImageOutputType? outputType = null) + { + categories ??= new List(); + + return new AnalyzeImageOptions(image, categories?.ToList(), outputType, serializedAdditionalRawData: null); + } + + /// Initializes a new instance of . + /// Analysis result for categories. + /// A new instance for mocking. + public static AnalyzeImageResult AnalyzeImageResult(IEnumerable categoriesAnalysis = null) + { + categoriesAnalysis ??= new List(); + + return new AnalyzeImageResult(categoriesAnalysis?.ToList(), serializedAdditionalRawData: null); + } + + /// Initializes a new instance of . + /// The image analysis category. + /// The value increases with the severity of the input content. The value of this field is determined by the output type specified in the request. The output type could be ‘FourSeverityLevels’, and the output value can be 0, 2, 4, 6. + /// A new instance for mocking. + public static ImageCategoriesAnalysis ImageCategoriesAnalysis(ImageCategory category = default, int? severity = null) + { + return new ImageCategoriesAnalysis(category, severity, serializedAdditionalRawData: null); + } + /// Initializes a new instance of . - /// The text needs to be analyzed. We support a maximum of 10k Unicode characters (Unicode code points) in the text of one request. + /// The text to be analyzed. We support a maximum of 10k Unicode characters (Unicode code points) in the text of one request. /// The categories will be analyzed. If they are not assigned, a default set of analysis results for the categories will be returned. /// The names of blocklists. /// When set to true, further analyses of harmful content will not be performed in cases where blocklists are hit. When set to false, all analyses of harmful content will be performed, whether or not blocklists are hit. @@ -66,45 +97,31 @@ public static TextCategoriesAnalysis TextCategoriesAnalysis(TextCategory categor return new TextCategoriesAnalysis(category, severity, serializedAdditionalRawData: null); } - /// Initializes a new instance of . - /// The image needs to be analyzed. - /// The categories will be analyzed. If they are not assigned, a default set of analysis results for the categories will be returned. - /// This refers to the type of image analysis output. If no value is assigned, the default value will be "FourSeverityLevels". - /// A new instance for mocking. - public static AnalyzeImageOptions AnalyzeImageOptions(ContentSafetyImageData image = null, IEnumerable categories = null, AnalyzeImageOutputType? outputType = null) + /// Initializes a new instance of . + /// Analysis result for the given text. + /// A new instance for mocking. + public static DetectTextProtectedMaterialResult DetectTextProtectedMaterialResult(TextProtectedMaterialAnalysisResult protectedMaterialAnalysis = null) { - categories ??= new List(); - - return new AnalyzeImageOptions(image, categories?.ToList(), outputType, serializedAdditionalRawData: null); + return new DetectTextProtectedMaterialResult(protectedMaterialAnalysis, serializedAdditionalRawData: null); } - /// Initializes a new instance of . - /// Analysis result for categories. - /// A new instance for mocking. - public static AnalyzeImageResult AnalyzeImageResult(IEnumerable categoriesAnalysis = null) + /// Initializes a new instance of . + /// Whether potential protected material is detected or not. + /// A new instance for mocking. + public static TextProtectedMaterialAnalysisResult TextProtectedMaterialAnalysisResult(bool detected = default) { - categoriesAnalysis ??= new List(); - - return new AnalyzeImageResult(categoriesAnalysis?.ToList(), serializedAdditionalRawData: null); - } - - /// Initializes a new instance of . - /// The image analysis category. - /// The value increases with the severity of the input content. The value of this field is determined by the output type specified in the request. The output type could be ‘FourSeverityLevels’, and the output value can be 0, 2, 4, 6. - /// A new instance for mocking. - public static ImageCategoriesAnalysis ImageCategoriesAnalysis(ImageCategory category = default, int? severity = null) - { - return new ImageCategoriesAnalysis(category, severity, serializedAdditionalRawData: null); + return new TextProtectedMaterialAnalysisResult(detected, serializedAdditionalRawData: null); } /// Initializes a new instance of . /// The service will generate a BlocklistItemId, which will be a UUID. /// BlocklistItem description. - /// BlocklistItem content. + /// BlocklistItem content. The length is counted using Unicode code point. + /// An optional properties indicating whether this item is to be matched as a regular expression. /// A new instance for mocking. - public static TextBlocklistItem TextBlocklistItem(string blocklistItemId = null, string description = null, string text = null) + public static TextBlocklistItem TextBlocklistItem(string blocklistItemId = null, string description = null, string text = null, bool? isRegex = null) { - return new TextBlocklistItem(blocklistItemId, description, text, serializedAdditionalRawData: null); + return new TextBlocklistItem(blocklistItemId, description, text, isRegex, serializedAdditionalRawData: null); } /// Initializes a new instance of . diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialOptions.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialOptions.Serialization.cs new file mode 100644 index 000000000000..7e3516362a50 --- /dev/null +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialOptions.Serialization.cs @@ -0,0 +1,135 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; +using Azure.Core; + +namespace Azure.AI.ContentSafety +{ + public partial class DetectTextProtectedMaterialOptions : IUtf8JsonSerializable, IJsonModel + { + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(DetectTextProtectedMaterialOptions)} does not support writing '{format}' format."); + } + + writer.WriteStartObject(); + writer.WritePropertyName("text"u8); + writer.WriteStringValue(Text); + if (options.Format != "W" && _serializedAdditionalRawData != null) + { + foreach (var item in _serializedAdditionalRawData) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + writer.WriteEndObject(); + } + + DetectTextProtectedMaterialOptions IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(DetectTextProtectedMaterialOptions)} does not support reading '{format}' format."); + } + + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeDetectTextProtectedMaterialOptions(document.RootElement, options); + } + + internal static DetectTextProtectedMaterialOptions DeserializeDetectTextProtectedMaterialOptions(JsonElement element, ModelReaderWriterOptions options = null) + { + options ??= ModelSerializationExtensions.WireOptions; + + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + string text = default; + IDictionary serializedAdditionalRawData = default; + Dictionary rawDataDictionary = new Dictionary(); + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("text"u8)) + { + text = property.Value.GetString(); + continue; + } + if (options.Format != "W") + { + rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); + } + } + serializedAdditionalRawData = rawDataDictionary; + return new DetectTextProtectedMaterialOptions(text, serializedAdditionalRawData); + } + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options); + default: + throw new FormatException($"The model {nameof(DetectTextProtectedMaterialOptions)} does not support writing '{options.Format}' format."); + } + } + + DetectTextProtectedMaterialOptions IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + { + using JsonDocument document = JsonDocument.Parse(data); + return DeserializeDetectTextProtectedMaterialOptions(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(DetectTextProtectedMaterialOptions)} does not support reading '{options.Format}' format."); + } + } + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// Deserializes the model from a raw response. + /// The response to deserialize the model from. + internal static DetectTextProtectedMaterialOptions FromResponse(Response response) + { + using var document = JsonDocument.Parse(response.Content); + return DeserializeDetectTextProtectedMaterialOptions(document.RootElement); + } + + /// Convert into a . + internal virtual RequestContent ToRequestContent() + { + var content = new Utf8JsonRequestContent(); + content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions); + return content; + } + } +} diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialOptions.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialOptions.cs new file mode 100644 index 000000000000..fee6cd9bc51b --- /dev/null +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialOptions.cs @@ -0,0 +1,75 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace Azure.AI.ContentSafety +{ + /// The request of detecting potential protected material present in the given text. + public partial class DetectTextProtectedMaterialOptions + { + /// + /// Keeps track of any properties unknown to the library. + /// + /// To assign an object to the value of this property use . + /// + /// + /// To assign an already formatted json string to this property use . + /// + /// + /// Examples: + /// + /// + /// BinaryData.FromObjectAsJson("foo") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromString("\"foo\"") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromObjectAsJson(new { key = "value" }) + /// Creates a payload of { "key": "value" }. + /// + /// + /// BinaryData.FromString("{\"key\": \"value\"}") + /// Creates a payload of { "key": "value" }. + /// + /// + /// + /// + private IDictionary _serializedAdditionalRawData; + + /// Initializes a new instance of . + /// The text to be analyzed, which may contain protected material. The characters will be counted in Unicode code points. + /// is null. + public DetectTextProtectedMaterialOptions(string text) + { + Argument.AssertNotNull(text, nameof(text)); + + Text = text; + } + + /// Initializes a new instance of . + /// The text to be analyzed, which may contain protected material. The characters will be counted in Unicode code points. + /// Keeps track of any properties unknown to the library. + internal DetectTextProtectedMaterialOptions(string text, IDictionary serializedAdditionalRawData) + { + Text = text; + _serializedAdditionalRawData = serializedAdditionalRawData; + } + + /// Initializes a new instance of for deserialization. + internal DetectTextProtectedMaterialOptions() + { + } + + /// The text to be analyzed, which may contain protected material. The characters will be counted in Unicode code points. + public string Text { get; } + } +} diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialResult.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialResult.Serialization.cs new file mode 100644 index 000000000000..09591800e1a5 --- /dev/null +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialResult.Serialization.cs @@ -0,0 +1,135 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; +using Azure.Core; + +namespace Azure.AI.ContentSafety +{ + public partial class DetectTextProtectedMaterialResult : IUtf8JsonSerializable, IJsonModel + { + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(DetectTextProtectedMaterialResult)} does not support writing '{format}' format."); + } + + writer.WriteStartObject(); + writer.WritePropertyName("protectedMaterialAnalysis"u8); + writer.WriteObjectValue(ProtectedMaterialAnalysis, options); + if (options.Format != "W" && _serializedAdditionalRawData != null) + { + foreach (var item in _serializedAdditionalRawData) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + writer.WriteEndObject(); + } + + DetectTextProtectedMaterialResult IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(DetectTextProtectedMaterialResult)} does not support reading '{format}' format."); + } + + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeDetectTextProtectedMaterialResult(document.RootElement, options); + } + + internal static DetectTextProtectedMaterialResult DeserializeDetectTextProtectedMaterialResult(JsonElement element, ModelReaderWriterOptions options = null) + { + options ??= ModelSerializationExtensions.WireOptions; + + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + TextProtectedMaterialAnalysisResult protectedMaterialAnalysis = default; + IDictionary serializedAdditionalRawData = default; + Dictionary rawDataDictionary = new Dictionary(); + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("protectedMaterialAnalysis"u8)) + { + protectedMaterialAnalysis = TextProtectedMaterialAnalysisResult.DeserializeTextProtectedMaterialAnalysisResult(property.Value, options); + continue; + } + if (options.Format != "W") + { + rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); + } + } + serializedAdditionalRawData = rawDataDictionary; + return new DetectTextProtectedMaterialResult(protectedMaterialAnalysis, serializedAdditionalRawData); + } + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options); + default: + throw new FormatException($"The model {nameof(DetectTextProtectedMaterialResult)} does not support writing '{options.Format}' format."); + } + } + + DetectTextProtectedMaterialResult IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + { + using JsonDocument document = JsonDocument.Parse(data); + return DeserializeDetectTextProtectedMaterialResult(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(DetectTextProtectedMaterialResult)} does not support reading '{options.Format}' format."); + } + } + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// Deserializes the model from a raw response. + /// The response to deserialize the model from. + internal static DetectTextProtectedMaterialResult FromResponse(Response response) + { + using var document = JsonDocument.Parse(response.Content); + return DeserializeDetectTextProtectedMaterialResult(document.RootElement); + } + + /// Convert into a . + internal virtual RequestContent ToRequestContent() + { + var content = new Utf8JsonRequestContent(); + content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions); + return content; + } + } +} diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialResult.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialResult.cs new file mode 100644 index 000000000000..0d1c5aec2272 --- /dev/null +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/DetectTextProtectedMaterialResult.cs @@ -0,0 +1,75 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace Azure.AI.ContentSafety +{ + /// The combined detection results of potential protected material. + public partial class DetectTextProtectedMaterialResult + { + /// + /// Keeps track of any properties unknown to the library. + /// + /// To assign an object to the value of this property use . + /// + /// + /// To assign an already formatted json string to this property use . + /// + /// + /// Examples: + /// + /// + /// BinaryData.FromObjectAsJson("foo") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromString("\"foo\"") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromObjectAsJson(new { key = "value" }) + /// Creates a payload of { "key": "value" }. + /// + /// + /// BinaryData.FromString("{\"key\": \"value\"}") + /// Creates a payload of { "key": "value" }. + /// + /// + /// + /// + private IDictionary _serializedAdditionalRawData; + + /// Initializes a new instance of . + /// Analysis result for the given text. + /// is null. + internal DetectTextProtectedMaterialResult(TextProtectedMaterialAnalysisResult protectedMaterialAnalysis) + { + Argument.AssertNotNull(protectedMaterialAnalysis, nameof(protectedMaterialAnalysis)); + + ProtectedMaterialAnalysis = protectedMaterialAnalysis; + } + + /// Initializes a new instance of . + /// Analysis result for the given text. + /// Keeps track of any properties unknown to the library. + internal DetectTextProtectedMaterialResult(TextProtectedMaterialAnalysisResult protectedMaterialAnalysis, IDictionary serializedAdditionalRawData) + { + ProtectedMaterialAnalysis = protectedMaterialAnalysis; + _serializedAdditionalRawData = serializedAdditionalRawData; + } + + /// Initializes a new instance of for deserialization. + internal DetectTextProtectedMaterialResult() + { + } + + /// Analysis result for the given text. + public TextProtectedMaterialAnalysisResult ProtectedMaterialAnalysis { get; } + } +} diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/BlocklistClient.xml b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/BlocklistClient.xml index 1f155addaff7..1a9717b5ee7f 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/BlocklistClient.xml +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/BlocklistClient.xml @@ -14,6 +14,11 @@ AddOrUpdateTextBlocklistItemsOptions options = new AddOrUpdateTextBlocklistItems new TextBlocklistItem("hate") { Description = "Hate word", + }, + new TextBlocklistItem("b[i1][a@][s\\$]") + { + Description = "A regular expression that matches harmful words.", + IsRegex = true, } }); Response response = await client.AddOrUpdateBlocklistItemsAsync("TestBlocklist", options); @@ -32,6 +37,11 @@ AddOrUpdateTextBlocklistItemsOptions options = new AddOrUpdateTextBlocklistItems new TextBlocklistItem("hate") { Description = "Hate word", + }, + new TextBlocklistItem("b[i1][a@][s\\$]") + { + Description = "A regular expression that matches harmful words.", + IsRegex = true, } }); Response response = client.AddOrUpdateBlocklistItems("TestBlocklist", options); @@ -53,6 +63,12 @@ using RequestContent content = RequestContent.Create(new { description = "Hate word", text = "hate", + }, + new + { + description = "A regular expression that matches harmful words.", + text = "b[i1][a@][s\\$]", + isRegex = true, } }, }); @@ -79,6 +95,12 @@ using RequestContent content = RequestContent.Create(new { description = "Hate word", text = "hate", + }, + new + { + description = "A regular expression that matches harmful words.", + text = "b[i1][a@][s\\$]", + isRegex = true, } }, }); diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/ContentSafetyClient.xml b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/ContentSafetyClient.xml index e08488786ea6..1a921c9e5aa7 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/ContentSafetyClient.xml +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/Docs/ContentSafetyClient.xml @@ -1,6 +1,72 @@ + + +This sample shows how to call AnalyzeImageAsync. +"); +AzureKeyCredential credential = new AzureKeyCredential(""); +ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); + +AnalyzeImageOptions options = new AnalyzeImageOptions(new ContentSafetyImageData()); +Response response = await client.AnalyzeImageAsync(options); +]]> + + + +This sample shows how to call AnalyzeImage. +"); +AzureKeyCredential credential = new AzureKeyCredential(""); +ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); + +AnalyzeImageOptions options = new AnalyzeImageOptions(new ContentSafetyImageData()); +Response response = client.AnalyzeImage(options); +]]> + + + +This sample shows how to call AnalyzeImageAsync and parse the result. +"); +AzureKeyCredential credential = new AzureKeyCredential(""); +ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); + +using RequestContent content = RequestContent.Create(new +{ + image = new + { + content = "Y29udGVudDE=", + }, +}); +Response response = await client.AnalyzeImageAsync(content); + +JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; +Console.WriteLine(result.GetProperty("categoriesAnalysis")[0].GetProperty("category").ToString()); +]]> + + + +This sample shows how to call AnalyzeImage and parse the result. +"); +AzureKeyCredential credential = new AzureKeyCredential(""); +ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); + +using RequestContent content = RequestContent.Create(new +{ + image = new + { + content = "Y29udGVudDE=", + }, +}); +Response response = client.AnalyzeImage(content); + +JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; +Console.WriteLine(result.GetProperty("categoriesAnalysis")[0].GetProperty("category").ToString()); +]]> + This sample shows how to call AnalyzeTextAsync. @@ -61,33 +127,33 @@ JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; Console.WriteLine(result.GetProperty("categoriesAnalysis")[0].GetProperty("category").ToString()); ]]> - + -This sample shows how to call AnalyzeImageAsync. +This sample shows how to call DetectTextProtectedMaterialAsync. "); AzureKeyCredential credential = new AzureKeyCredential(""); ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); -AnalyzeImageOptions options = new AnalyzeImageOptions(new ContentSafetyImageData()); -Response response = await client.AnalyzeImageAsync(options); +DetectTextProtectedMaterialOptions options = new DetectTextProtectedMaterialOptions("to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine"); +Response response = await client.DetectTextProtectedMaterialAsync(options); ]]> - + -This sample shows how to call AnalyzeImage. +This sample shows how to call DetectTextProtectedMaterial. "); AzureKeyCredential credential = new AzureKeyCredential(""); ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); -AnalyzeImageOptions options = new AnalyzeImageOptions(new ContentSafetyImageData()); -Response response = client.AnalyzeImage(options); +DetectTextProtectedMaterialOptions options = new DetectTextProtectedMaterialOptions("to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine"); +Response response = client.DetectTextProtectedMaterial(options); ]]> - + -This sample shows how to call AnalyzeImageAsync and parse the result. +This sample shows how to call DetectTextProtectedMaterialAsync and parse the result. "); AzureKeyCredential credential = new AzureKeyCredential(""); @@ -95,20 +161,17 @@ ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); using RequestContent content = RequestContent.Create(new { - image = new - { - content = "Y29udGVudDE=", - }, + text = "to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine", }); -Response response = await client.AnalyzeImageAsync(content); +Response response = await client.DetectTextProtectedMaterialAsync(content); JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; -Console.WriteLine(result.GetProperty("categoriesAnalysis")[0].GetProperty("category").ToString()); +Console.WriteLine(result.GetProperty("protectedMaterialAnalysis").GetProperty("detected").ToString()); ]]> - + -This sample shows how to call AnalyzeImage and parse the result. +This sample shows how to call DetectTextProtectedMaterial and parse the result. "); AzureKeyCredential credential = new AzureKeyCredential(""); @@ -116,15 +179,12 @@ ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); using RequestContent content = RequestContent.Create(new { - image = new - { - content = "Y29udGVudDE=", - }, + text = "to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine", }); -Response response = client.AnalyzeImage(content); +Response response = client.DetectTextProtectedMaterial(content); JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; -Console.WriteLine(result.GetProperty("categoriesAnalysis")[0].GetProperty("category").ToString()); +Console.WriteLine(result.GetProperty("protectedMaterialAnalysis").GetProperty("detected").ToString()); ]]> diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ImageCategoriesAnalysis.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ImageCategoriesAnalysis.Serialization.cs index 995e909d72b2..d552b01f8d64 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ImageCategoriesAnalysis.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ImageCategoriesAnalysis.Serialization.cs @@ -18,15 +18,6 @@ public partial class ImageCategoriesAnalysis : IUtf8JsonSerializable, IJsonModel void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(ImageCategoriesAnalysis)} does not support writing '{format}' format."); } + writer.WriteStartObject(); writer.WritePropertyName("category"u8); writer.WriteStringValue(Category.ToString()); if (Optional.IsDefined(Severity)) @@ -56,6 +48,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } ImageCategoriesAnalysis IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ImageCategory.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ImageCategory.cs index 3738fd2aae26..d5de630a29ca 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ImageCategory.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/ImageCategory.cs @@ -10,7 +10,7 @@ namespace Azure.AI.ContentSafety { - /// Image analyze category. + /// The harm category supported in Image content analysis. public readonly partial struct ImageCategory : IEquatable { private readonly string _value; @@ -27,13 +27,13 @@ public ImageCategory(string value) private const string SexualValue = "Sexual"; private const string ViolenceValue = "Violence"; - /// Hate. + /// The harm category for Image - Hate. public static ImageCategory Hate { get; } = new ImageCategory(HateValue); - /// SelfHarm. + /// The harm category for Image - SelfHarm. public static ImageCategory SelfHarm { get; } = new ImageCategory(SelfHarmValue); - /// Sexual. + /// The harm category for Image - Sexual. public static ImageCategory Sexual { get; } = new ImageCategory(SexualValue); - /// Violence. + /// The harm category for Image - Violence. public static ImageCategory Violence { get; } = new ImageCategory(ViolenceValue); /// Determines if two values are the same. public static bool operator ==(ImageCategory left, ImageCategory right) => left.Equals(right); diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/RemoveTextBlocklistItemsOptions.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/RemoveTextBlocklistItemsOptions.Serialization.cs index a7ea2708b7af..0927553ac5ff 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/RemoveTextBlocklistItemsOptions.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/RemoveTextBlocklistItemsOptions.Serialization.cs @@ -18,15 +18,6 @@ public partial class RemoveTextBlocklistItemsOptions : IUtf8JsonSerializable, IJ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(RemoveTextBlocklistItemsOptions)} does not support writing '{format}' format."); } + writer.WriteStartObject(); writer.WritePropertyName("blocklistItemIds"u8); writer.WriteStartArray(); foreach (var item in BlocklistItemIds) @@ -56,6 +48,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } RemoveTextBlocklistItemsOptions IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklist.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklist.Serialization.cs index fe74637ae9b7..5b898c8e3027 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklist.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklist.Serialization.cs @@ -18,15 +18,6 @@ public partial class TextBlocklist : IUtf8JsonSerializable, IJsonModel ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(TextBlocklist)} does not support writing '{format}' format."); } + writer.WriteStartObject(); writer.WritePropertyName("blocklistName"u8); writer.WriteStringValue(Name); if (Optional.IsDefined(Description)) @@ -56,6 +48,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } TextBlocklist IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistItem.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistItem.Serialization.cs index d61a75922978..b3ca0c3ff94a 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistItem.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistItem.Serialization.cs @@ -18,15 +18,6 @@ public partial class TextBlocklistItem : IUtf8JsonSerializable, IJsonModel ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(TextBlocklistItem)} does not support writing '{format}' format."); } + writer.WriteStartObject(); if (options.Format != "W") { writer.WritePropertyName("blocklistItemId"u8); @@ -46,6 +38,11 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit } writer.WritePropertyName("text"u8); writer.WriteStringValue(Text); + if (Optional.IsDefined(IsRegex)) + { + writer.WritePropertyName("isRegex"u8); + writer.WriteBooleanValue(IsRegex.Value); + } if (options.Format != "W" && _serializedAdditionalRawData != null) { foreach (var item in _serializedAdditionalRawData) @@ -61,6 +58,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } TextBlocklistItem IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) @@ -86,6 +84,7 @@ internal static TextBlocklistItem DeserializeTextBlocklistItem(JsonElement eleme string blocklistItemId = default; string description = default; string text = default; + bool? isRegex = default; IDictionary serializedAdditionalRawData = default; Dictionary rawDataDictionary = new Dictionary(); foreach (var property in element.EnumerateObject()) @@ -105,13 +104,22 @@ internal static TextBlocklistItem DeserializeTextBlocklistItem(JsonElement eleme text = property.Value.GetString(); continue; } + if (property.NameEquals("isRegex"u8)) + { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + isRegex = property.Value.GetBoolean(); + continue; + } if (options.Format != "W") { rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); } } serializedAdditionalRawData = rawDataDictionary; - return new TextBlocklistItem(blocklistItemId, description, text, serializedAdditionalRawData); + return new TextBlocklistItem(blocklistItemId, description, text, isRegex, serializedAdditionalRawData); } BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistItem.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistItem.cs index 6a8c855e7ec1..c28fea37e4ac 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistItem.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistItem.cs @@ -46,7 +46,7 @@ public partial class TextBlocklistItem private IDictionary _serializedAdditionalRawData; /// Initializes a new instance of . - /// BlocklistItem content. + /// BlocklistItem content. The length is counted using Unicode code point. /// is null. public TextBlocklistItem(string text) { @@ -58,13 +58,15 @@ public TextBlocklistItem(string text) /// Initializes a new instance of . /// The service will generate a BlocklistItemId, which will be a UUID. /// BlocklistItem description. - /// BlocklistItem content. + /// BlocklistItem content. The length is counted using Unicode code point. + /// An optional properties indicating whether this item is to be matched as a regular expression. /// Keeps track of any properties unknown to the library. - internal TextBlocklistItem(string blocklistItemId, string description, string text, IDictionary serializedAdditionalRawData) + internal TextBlocklistItem(string blocklistItemId, string description, string text, bool? isRegex, IDictionary serializedAdditionalRawData) { BlocklistItemId = blocklistItemId; Description = description; Text = text; + IsRegex = isRegex; _serializedAdditionalRawData = serializedAdditionalRawData; } @@ -77,7 +79,9 @@ internal TextBlocklistItem() public string BlocklistItemId { get; } /// BlocklistItem description. public string Description { get; set; } - /// BlocklistItem content. + /// BlocklistItem content. The length is counted using Unicode code point. public string Text { get; set; } + /// An optional properties indicating whether this item is to be matched as a regular expression. + public bool? IsRegex { get; set; } } } diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistMatch.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistMatch.Serialization.cs index 5ddae29e82f7..ecb5d19f7c5d 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistMatch.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextBlocklistMatch.Serialization.cs @@ -18,15 +18,6 @@ public partial class TextBlocklistMatch : IUtf8JsonSerializable, IJsonModel ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(TextBlocklistMatch)} does not support writing '{format}' format."); } + writer.WriteStartObject(); writer.WritePropertyName("blocklistName"u8); writer.WriteStringValue(BlocklistName); writer.WritePropertyName("blocklistItemId"u8); @@ -55,6 +47,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } TextBlocklistMatch IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextCategoriesAnalysis.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextCategoriesAnalysis.Serialization.cs index 718ce7ab6eae..446c50800ac8 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextCategoriesAnalysis.Serialization.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextCategoriesAnalysis.Serialization.cs @@ -18,15 +18,6 @@ public partial class TextCategoriesAnalysis : IUtf8JsonSerializable, IJsonModel< void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) - { - writer.WriteStartObject(); - JsonModelWriteCore(writer, options); - writer.WriteEndObject(); - } - - /// The JSON writer. - /// The client options for reading and writing models. - protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options) { var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; if (format != "J") @@ -34,6 +25,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit throw new FormatException($"The model {nameof(TextCategoriesAnalysis)} does not support writing '{format}' format."); } + writer.WriteStartObject(); writer.WritePropertyName("category"u8); writer.WriteStringValue(Category.ToString()); if (Optional.IsDefined(Severity)) @@ -56,6 +48,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit #endif } } + writer.WriteEndObject(); } TextCategoriesAnalysis IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextCategory.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextCategory.cs index 2e073817b841..71a345254862 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextCategory.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextCategory.cs @@ -10,7 +10,7 @@ namespace Azure.AI.ContentSafety { - /// Text analyze category. + /// The harm category supported in Text content analysis. public readonly partial struct TextCategory : IEquatable { private readonly string _value; @@ -27,13 +27,13 @@ public TextCategory(string value) private const string SexualValue = "Sexual"; private const string ViolenceValue = "Violence"; - /// Hate. + /// The harm category for Text - Hate. public static TextCategory Hate { get; } = new TextCategory(HateValue); - /// SelfHarm. + /// The harm category for Text - SelfHarm. public static TextCategory SelfHarm { get; } = new TextCategory(SelfHarmValue); - /// Sexual. + /// The harm category for Text - Sexual. public static TextCategory Sexual { get; } = new TextCategory(SexualValue); - /// Violence. + /// The harm category for Text - Violence. public static TextCategory Violence { get; } = new TextCategory(ViolenceValue); /// Determines if two values are the same. public static bool operator ==(TextCategory left, TextCategory right) => left.Equals(right); diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextProtectedMaterialAnalysisResult.Serialization.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextProtectedMaterialAnalysisResult.Serialization.cs new file mode 100644 index 000000000000..72aa39351ce7 --- /dev/null +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextProtectedMaterialAnalysisResult.Serialization.cs @@ -0,0 +1,135 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ClientModel.Primitives; +using System.Collections.Generic; +using System.Text.Json; +using Azure.Core; + +namespace Azure.AI.ContentSafety +{ + public partial class TextProtectedMaterialAnalysisResult : IUtf8JsonSerializable, IJsonModel + { + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel)this).Write(writer, ModelSerializationExtensions.WireOptions); + + void IJsonModel.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(TextProtectedMaterialAnalysisResult)} does not support writing '{format}' format."); + } + + writer.WriteStartObject(); + writer.WritePropertyName("detected"u8); + writer.WriteBooleanValue(Detected); + if (options.Format != "W" && _serializedAdditionalRawData != null) + { + foreach (var item in _serializedAdditionalRawData) + { + writer.WritePropertyName(item.Key); +#if NET6_0_OR_GREATER + writer.WriteRawValue(item.Value); +#else + using (JsonDocument document = JsonDocument.Parse(item.Value)) + { + JsonSerializer.Serialize(writer, document.RootElement); + } +#endif + } + } + writer.WriteEndObject(); + } + + TextProtectedMaterialAnalysisResult IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(TextProtectedMaterialAnalysisResult)} does not support reading '{format}' format."); + } + + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeTextProtectedMaterialAnalysisResult(document.RootElement, options); + } + + internal static TextProtectedMaterialAnalysisResult DeserializeTextProtectedMaterialAnalysisResult(JsonElement element, ModelReaderWriterOptions options = null) + { + options ??= ModelSerializationExtensions.WireOptions; + + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + bool detected = default; + IDictionary serializedAdditionalRawData = default; + Dictionary rawDataDictionary = new Dictionary(); + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("detected"u8)) + { + detected = property.Value.GetBoolean(); + continue; + } + if (options.Format != "W") + { + rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText())); + } + } + serializedAdditionalRawData = rawDataDictionary; + return new TextProtectedMaterialAnalysisResult(detected, serializedAdditionalRawData); + } + + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options); + default: + throw new FormatException($"The model {nameof(TextProtectedMaterialAnalysisResult)} does not support writing '{options.Format}' format."); + } + } + + TextProtectedMaterialAnalysisResult IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) + { + var format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + + switch (format) + { + case "J": + { + using JsonDocument document = JsonDocument.Parse(data); + return DeserializeTextProtectedMaterialAnalysisResult(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(TextProtectedMaterialAnalysisResult)} does not support reading '{options.Format}' format."); + } + } + + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + + /// Deserializes the model from a raw response. + /// The response to deserialize the model from. + internal static TextProtectedMaterialAnalysisResult FromResponse(Response response) + { + using var document = JsonDocument.Parse(response.Content); + return DeserializeTextProtectedMaterialAnalysisResult(document.RootElement); + } + + /// Convert into a . + internal virtual RequestContent ToRequestContent() + { + var content = new Utf8JsonRequestContent(); + content.JsonWriter.WriteObjectValue(this, ModelSerializationExtensions.WireOptions); + return content; + } + } +} diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextProtectedMaterialAnalysisResult.cs b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextProtectedMaterialAnalysisResult.cs new file mode 100644 index 000000000000..bf29b3fa4907 --- /dev/null +++ b/sdk/contentsafety/Azure.AI.ContentSafety/src/Generated/TextProtectedMaterialAnalysisResult.cs @@ -0,0 +1,72 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace Azure.AI.ContentSafety +{ + /// The individual detection result of potential protected material. + public partial class TextProtectedMaterialAnalysisResult + { + /// + /// Keeps track of any properties unknown to the library. + /// + /// To assign an object to the value of this property use . + /// + /// + /// To assign an already formatted json string to this property use . + /// + /// + /// Examples: + /// + /// + /// BinaryData.FromObjectAsJson("foo") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromString("\"foo\"") + /// Creates a payload of "foo". + /// + /// + /// BinaryData.FromObjectAsJson(new { key = "value" }) + /// Creates a payload of { "key": "value" }. + /// + /// + /// BinaryData.FromString("{\"key\": \"value\"}") + /// Creates a payload of { "key": "value" }. + /// + /// + /// + /// + private IDictionary _serializedAdditionalRawData; + + /// Initializes a new instance of . + /// Whether potential protected material is detected or not. + internal TextProtectedMaterialAnalysisResult(bool detected) + { + Detected = detected; + } + + /// Initializes a new instance of . + /// Whether potential protected material is detected or not. + /// Keeps track of any properties unknown to the library. + internal TextProtectedMaterialAnalysisResult(bool detected, IDictionary serializedAdditionalRawData) + { + Detected = detected; + _serializedAdditionalRawData = serializedAdditionalRawData; + } + + /// Initializes a new instance of for deserialization. + internal TextProtectedMaterialAnalysisResult() + { + } + + /// Whether potential protected material is detected or not. + public bool Detected { get; } + } +} diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_BlocklistClient.cs b/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_BlocklistClient.cs index 054ddad0e1df..42f851608138 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_BlocklistClient.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_BlocklistClient.cs @@ -32,6 +32,12 @@ public void Example_BlocklistClient_AddOrUpdateBlocklistItems_AddOrUpdateBlockli { description = "Hate word", text = "hate", +}, +new +{ +description = "A regular expression that matches harmful words.", +text = "b[i1][a@][s\\$]", +isRegex = true, } }, }); @@ -58,6 +64,12 @@ public async Task Example_BlocklistClient_AddOrUpdateBlocklistItems_AddOrUpdateB { description = "Hate word", text = "hate", +}, +new +{ +description = "A regular expression that matches harmful words.", +text = "b[i1][a@][s\\$]", +isRegex = true, } }, }); @@ -81,6 +93,11 @@ public void Example_BlocklistClient_AddOrUpdateBlocklistItems_AddOrUpdateBlockli new TextBlocklistItem("hate") { Description = "Hate word", +}, +new TextBlocklistItem("b[i1][a@][s\\$]") +{ +Description = "A regular expression that matches harmful words.", +IsRegex = true, } }); Response response = client.AddOrUpdateBlocklistItems("TestBlocklist", options); @@ -99,6 +116,11 @@ public async Task Example_BlocklistClient_AddOrUpdateBlocklistItems_AddOrUpdateB new TextBlocklistItem("hate") { Description = "Hate word", +}, +new TextBlocklistItem("b[i1][a@][s\\$]") +{ +Description = "A regular expression that matches harmful words.", +IsRegex = true, } }); Response response = await client.AddOrUpdateBlocklistItemsAsync("TestBlocklist", options); diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_ContentSafetyClient.cs b/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_ContentSafetyClient.cs index 08c06719c611..1347ddfd9c54 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_ContentSafetyClient.cs +++ b/sdk/contentsafety/Azure.AI.ContentSafety/tests/Generated/Samples/Samples_ContentSafetyClient.cs @@ -16,6 +16,72 @@ namespace Azure.AI.ContentSafety.Samples { public partial class Samples_ContentSafetyClient { + [Test] + [Ignore("Only validating compilation of examples")] + public void Example_ContentSafetyClient_AnalyzeImage_AnalyzeImage() + { + Uri endpoint = new Uri(""); + AzureKeyCredential credential = new AzureKeyCredential(""); + ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); + + using RequestContent content = RequestContent.Create(new + { + image = new + { + content = "Y29udGVudDE=", + }, + }); + Response response = client.AnalyzeImage(content); + + JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; + Console.WriteLine(result.GetProperty("categoriesAnalysis")[0].GetProperty("category").ToString()); + } + + [Test] + [Ignore("Only validating compilation of examples")] + public async Task Example_ContentSafetyClient_AnalyzeImage_AnalyzeImage_Async() + { + Uri endpoint = new Uri(""); + AzureKeyCredential credential = new AzureKeyCredential(""); + ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); + + using RequestContent content = RequestContent.Create(new + { + image = new + { + content = "Y29udGVudDE=", + }, + }); + Response response = await client.AnalyzeImageAsync(content); + + JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; + Console.WriteLine(result.GetProperty("categoriesAnalysis")[0].GetProperty("category").ToString()); + } + + [Test] + [Ignore("Only validating compilation of examples")] + public void Example_ContentSafetyClient_AnalyzeImage_AnalyzeImage_Convenience() + { + Uri endpoint = new Uri(""); + AzureKeyCredential credential = new AzureKeyCredential(""); + ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); + + AnalyzeImageOptions options = new AnalyzeImageOptions(new ContentSafetyImageData()); + Response response = client.AnalyzeImage(options); + } + + [Test] + [Ignore("Only validating compilation of examples")] + public async Task Example_ContentSafetyClient_AnalyzeImage_AnalyzeImage_Convenience_Async() + { + Uri endpoint = new Uri(""); + AzureKeyCredential credential = new AzureKeyCredential(""); + ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); + + AnalyzeImageOptions options = new AnalyzeImageOptions(new ContentSafetyImageData()); + Response response = await client.AnalyzeImageAsync(options); + } + [Test] [Ignore("Only validating compilation of examples")] public void Example_ContentSafetyClient_AnalyzeText_AnalyzeText() @@ -78,7 +144,7 @@ public async Task Example_ContentSafetyClient_AnalyzeText_AnalyzeText_Convenienc [Test] [Ignore("Only validating compilation of examples")] - public void Example_ContentSafetyClient_AnalyzeImage_AnalyzeImage() + public void Example_ContentSafetyClient_DetectTextProtectedMaterial_DetectProtectedMaterialForText() { Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); @@ -86,20 +152,17 @@ public void Example_ContentSafetyClient_AnalyzeImage_AnalyzeImage() using RequestContent content = RequestContent.Create(new { - image = new - { - content = "Y29udGVudDE=", - }, + text = "to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine", }); - Response response = client.AnalyzeImage(content); + Response response = client.DetectTextProtectedMaterial(content); JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; - Console.WriteLine(result.GetProperty("categoriesAnalysis")[0].GetProperty("category").ToString()); + Console.WriteLine(result.GetProperty("protectedMaterialAnalysis").GetProperty("detected").ToString()); } [Test] [Ignore("Only validating compilation of examples")] - public async Task Example_ContentSafetyClient_AnalyzeImage_AnalyzeImage_Async() + public async Task Example_ContentSafetyClient_DetectTextProtectedMaterial_DetectProtectedMaterialForText_Async() { Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); @@ -107,39 +170,36 @@ public async Task Example_ContentSafetyClient_AnalyzeImage_AnalyzeImage_Async() using RequestContent content = RequestContent.Create(new { - image = new - { - content = "Y29udGVudDE=", - }, + text = "to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine", }); - Response response = await client.AnalyzeImageAsync(content); + Response response = await client.DetectTextProtectedMaterialAsync(content); JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; - Console.WriteLine(result.GetProperty("categoriesAnalysis")[0].GetProperty("category").ToString()); + Console.WriteLine(result.GetProperty("protectedMaterialAnalysis").GetProperty("detected").ToString()); } [Test] [Ignore("Only validating compilation of examples")] - public void Example_ContentSafetyClient_AnalyzeImage_AnalyzeImage_Convenience() + public void Example_ContentSafetyClient_DetectTextProtectedMaterial_DetectProtectedMaterialForText_Convenience() { Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); - AnalyzeImageOptions options = new AnalyzeImageOptions(new ContentSafetyImageData()); - Response response = client.AnalyzeImage(options); + DetectTextProtectedMaterialOptions options = new DetectTextProtectedMaterialOptions("to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine"); + Response response = client.DetectTextProtectedMaterial(options); } [Test] [Ignore("Only validating compilation of examples")] - public async Task Example_ContentSafetyClient_AnalyzeImage_AnalyzeImage_Convenience_Async() + public async Task Example_ContentSafetyClient_DetectTextProtectedMaterial_DetectProtectedMaterialForText_Convenience_Async() { Uri endpoint = new Uri(""); AzureKeyCredential credential = new AzureKeyCredential(""); ContentSafetyClient client = new ContentSafetyClient(endpoint, credential); - AnalyzeImageOptions options = new AnalyzeImageOptions(new ContentSafetyImageData()); - Response response = await client.AnalyzeImageAsync(options); + DetectTextProtectedMaterialOptions options = new DetectTextProtectedMaterialOptions("to everyone, the best things in life are free. the stars belong to everyone, they gleam there for you and me. the flowers in spring, the robins that sing, the sunbeams that shine"); + Response response = await client.DetectTextProtectedMaterialAsync(options); } } } diff --git a/sdk/contentsafety/Azure.AI.ContentSafety/tsp-location.yaml b/sdk/contentsafety/Azure.AI.ContentSafety/tsp-location.yaml index 61b76ee93a0d..e25b2ba3c754 100644 --- a/sdk/contentsafety/Azure.AI.ContentSafety/tsp-location.yaml +++ b/sdk/contentsafety/Azure.AI.ContentSafety/tsp-location.yaml @@ -1,5 +1,4 @@ -commit: 3c78a559bd144e352a25705c3d231a20f47134b5 -additionalDirectories: [] -repo: Azure/azure-rest-api-specs directory: specification/cognitiveservices/ContentSafety - +commit: e65d0b7c42ca45bda916a57ee2e07ab0a6763cb0 +repo: Azure/azure-rest-api-specs +additionalDirectories: