diff --git a/sdk/ai/Azure.AI.Projects/src/Azure.AI.Projects.csproj b/sdk/ai/Azure.AI.Projects/src/Azure.AI.Projects.csproj index 25e45634fc7f..d4bbbd921410 100644 --- a/sdk/ai/Azure.AI.Projects/src/Azure.AI.Projects.csproj +++ b/sdk/ai/Azure.AI.Projects/src/Azure.AI.Projects.csproj @@ -9,6 +9,7 @@ true latest true + false diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectClient.RestClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectClient.RestClient.cs index 1de470698629..2534b6d9e003 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectClient.RestClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectClient.RestClient.cs @@ -2,10 +2,12 @@ #nullable disable +using System.ClientModel.Primitives; + namespace Azure.AI.Projects { /// - public partial class AIProjectClient + public partial class AIProjectClient : ClientConnectionProvider { } } diff --git a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectClient.cs b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectClient.cs index 1e7d0e33a3b4..bfe9dc53d45c 100644 --- a/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectClient.cs +++ b/sdk/ai/Azure.AI.Projects/src/Generated/AIProjectClient.cs @@ -11,7 +11,7 @@ namespace Azure.AI.Projects { /// The AIProjectClient. - public partial class AIProjectClient + public partial class AIProjectClient : ClientConnectionProvider { private readonly Uri _endpoint; /// A credential provider used to authenticate to the service. diff --git a/sdk/ai/Azure.AI.Projects/src/Properties/AssemblyInfo.cs b/sdk/ai/Azure.AI.Projects/src/Properties/AssemblyInfo.cs index e505526fd17e..147b2b39c2ea 100644 --- a/sdk/ai/Azure.AI.Projects/src/Properties/AssemblyInfo.cs +++ b/sdk/ai/Azure.AI.Projects/src/Properties/AssemblyInfo.cs @@ -4,9 +4,3 @@ using Azure.Core; [assembly: AzureResourceProviderNamespace("Microsoft.CognitiveServices")] -[assembly: CodeGenSuppressType("Azure.AI.Projects.AgentObject")] -[assembly: CodeGenSuppressType("Azure.AI.Projects.AgentThreadObject")] -[assembly: CodeGenSuppressType("Azure.AI.Projects.OpenAIFileObject")] -[assembly: CodeGenSuppressType("Azure.AI.Projects.RunStepObject")] -[assembly: CodeGenSuppressType("Azure.AI.Projects.ThreadMessageObject")] -[assembly: CodeGenSuppressType("Azure.AI.Projects.ThreadRunObject")] diff --git a/sdk/ai/Azure.AI.Projects/tsp-location.yaml b/sdk/ai/Azure.AI.Projects/tsp-location.yaml index 7adb755af701..40c12924da1d 100644 --- a/sdk/ai/Azure.AI.Projects/tsp-location.yaml +++ b/sdk/ai/Azure.AI.Projects/tsp-location.yaml @@ -1,4 +1,4 @@ directory: specification/ai/Azure.AI.Projects -commit: d62e34a7aebd2a20d41832bc552d3b796695940c +commit: 681c15ad9028f91b3f4978625527fd461b57f4fa repo: Azure/azure-rest-api-specs emitterPackageJsonPath: eng/http-client-csharp-emitter-package.json diff --git a/sdk/appconfiguration/Azure.Data.AppConfiguration/tsp-location.yaml b/sdk/appconfiguration/Azure.Data.AppConfiguration/tsp-location.yaml index b9ae97fdf9e0..9002028a7d3e 100644 --- a/sdk/appconfiguration/Azure.Data.AppConfiguration/tsp-location.yaml +++ b/sdk/appconfiguration/Azure.Data.AppConfiguration/tsp-location.yaml @@ -1,4 +1,4 @@ repo: Azure/azure-rest-api-specs directory: "specification/appconfiguration/AppConfiguration" -commit: 5c7a5cda1558804a0b52001cdf23c4e3ef225567 +commit: cee8b51dc487fd473e2214a32d8eb1083cdabd21 emitterPackageJsonPath: "eng/azure-typespec-http-client-csharp-emitter-package.json" \ No newline at end of file diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/src/Azure.Messaging.EventGrid.Namespaces.csproj b/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/src/Azure.Messaging.EventGrid.Namespaces.csproj index c93475c6f184..b92110dfb23c 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/src/Azure.Messaging.EventGrid.Namespaces.csproj +++ b/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/src/Azure.Messaging.EventGrid.Namespaces.csproj @@ -9,6 +9,7 @@ $(RequiredTargetFrameworks) true true + false diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/src/properties/AssemblyInfo.cs b/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/src/properties/AssemblyInfo.cs index 32523328c35f..e4681872704d 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/src/properties/AssemblyInfo.cs +++ b/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/src/properties/AssemblyInfo.cs @@ -8,4 +8,3 @@ [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] [assembly: AzureResourceProviderNamespace("Microsoft.EventGrid")] -[assembly: CodeGenSuppressType("MessagingEventGridNamespacesClientBuilderExtensions")] diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/tsp-location.yaml b/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/tsp-location.yaml index 04d03b5cda53..e89f10414b6b 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/tsp-location.yaml +++ b/sdk/eventgrid/Azure.Messaging.EventGrid.Namespaces/tsp-location.yaml @@ -1,4 +1,4 @@ repo: Azure/azure-rest-api-specs directory: "specification/eventgrid/Azure.Messaging.EventGrid" -commit: 67e43665f813a4c7184ba4066902dc023ce638a6 +commit: 6b625eed7f0f065b6e6cf8f2a74379db81598ff9 emitterPackageJsonPath: eng/azure-typespec-http-client-csharp-emitter-package.json \ No newline at end of file diff --git a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml index bff06a79f7f7..21461f91e396 100644 --- a/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml +++ b/sdk/eventgrid/Azure.Messaging.EventGrid.SystemEvents/tsp-location.yaml @@ -1,4 +1,4 @@ repo: Azure/azure-rest-api-specs directory: "specification/eventgrid/Azure.Messaging.EventGrid.SystemEvents" -commit: 752dade436619ed28bd03ca2e77cfa5acf6222dd +commit: e89374a1f5e2c4ddcf34ed01495a98dfedac0f8b emitterPackageJsonPath: eng/azure-typespec-http-client-csharp-emitter-package.json diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/api/Azure.Health.Deidentification.net8.0.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/api/Azure.Health.Deidentification.net8.0.cs index 08eec758a096..ec1290e30861 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/api/Azure.Health.Deidentification.net8.0.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/api/Azure.Health.Deidentification.net8.0.cs @@ -43,10 +43,11 @@ public DeidentificationClient(System.Uri endpoint, Azure.Core.TokenCredential cr } public partial class DeidentificationClientOptions : Azure.Core.ClientOptions { - public DeidentificationClientOptions(Azure.Health.Deidentification.DeidentificationClientOptions.ServiceVersion version = Azure.Health.Deidentification.DeidentificationClientOptions.ServiceVersion.V2024_11_15) { } + public DeidentificationClientOptions(Azure.Health.Deidentification.DeidentificationClientOptions.ServiceVersion version = Azure.Health.Deidentification.DeidentificationClientOptions.ServiceVersion.V2025_07_15_Preview) { } public enum ServiceVersion { V2024_11_15 = 1, + V2025_07_15_Preview = 2, } } public partial class DeidentificationContent : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel @@ -55,6 +56,7 @@ public DeidentificationContent(string inputText) { } public Azure.Health.Deidentification.DeidentificationCustomizationOptions Customizations { get { throw null; } set { } } public string InputText { get { throw null; } } public Azure.Health.Deidentification.DeidentificationOperationType? OperationType { get { throw null; } set { } } + public Azure.Health.Deidentification.TaggedPhiEntities TaggedEntities { get { throw null; } set { } } protected virtual Azure.Health.Deidentification.DeidentificationContent JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } public static implicit operator Azure.Core.RequestContent (Azure.Health.Deidentification.DeidentificationContent deidentificationContent) { throw null; } @@ -69,6 +71,7 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer public partial class DeidentificationCustomizationOptions : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel { public DeidentificationCustomizationOptions() { } + public string InputLocale { get { throw null; } set { } } public string RedactionFormat { get { throw null; } set { } } public string SurrogateLocale { get { throw null; } set { } } protected virtual Azure.Health.Deidentification.DeidentificationCustomizationOptions JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -143,6 +146,7 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer public partial class DeidentificationJobCustomizationOptions : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel { public DeidentificationJobCustomizationOptions() { } + public string InputLocale { get { throw null; } set { } } public string RedactionFormat { get { throw null; } set { } } public string SurrogateLocale { get { throw null; } set { } } protected virtual Azure.Health.Deidentification.DeidentificationJobCustomizationOptions JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -181,6 +185,7 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer public DeidentificationOperationType(string value) { throw null; } public static Azure.Health.Deidentification.DeidentificationOperationType Redact { get { throw null; } } public static Azure.Health.Deidentification.DeidentificationOperationType Surrogate { get { throw null; } } + public static Azure.Health.Deidentification.DeidentificationOperationType SurrogateOnly { get { throw null; } } public static Azure.Health.Deidentification.DeidentificationOperationType Tag { get { throw null; } } public bool Equals(Azure.Health.Deidentification.DeidentificationOperationType other) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] @@ -211,18 +216,22 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer } public static partial class HealthDeidentificationModelFactory { - public static Azure.Health.Deidentification.DeidentificationContent DeidentificationContent(string inputText = null, Azure.Health.Deidentification.DeidentificationOperationType? operationType = default(Azure.Health.Deidentification.DeidentificationOperationType?), Azure.Health.Deidentification.DeidentificationCustomizationOptions customizations = null) { throw null; } - public static Azure.Health.Deidentification.DeidentificationCustomizationOptions DeidentificationCustomizationOptions(string redactionFormat = null, string surrogateLocale = null) { throw null; } + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public static Azure.Health.Deidentification.DeidentificationContent DeidentificationContent(string inputText, Azure.Health.Deidentification.DeidentificationOperationType? operationType, Azure.Health.Deidentification.DeidentificationCustomizationOptions customizations) { throw null; } + public static Azure.Health.Deidentification.DeidentificationContent DeidentificationContent(string inputText = null, Azure.Health.Deidentification.DeidentificationOperationType? operationType = default(Azure.Health.Deidentification.DeidentificationOperationType?), Azure.Health.Deidentification.TaggedPhiEntities taggedEntities = null, Azure.Health.Deidentification.DeidentificationCustomizationOptions customizations = null) { throw null; } + public static Azure.Health.Deidentification.DeidentificationCustomizationOptions DeidentificationCustomizationOptions(string redactionFormat = null, string surrogateLocale = null, string inputLocale = null) { throw null; } public static Azure.Health.Deidentification.DeidentificationDocumentDetails DeidentificationDocumentDetails(string id = null, Azure.Health.Deidentification.DeidentificationDocumentLocation inputLocation = null, Azure.Health.Deidentification.DeidentificationDocumentLocation outputLocation = null, Azure.Health.Deidentification.OperationStatus status = default(Azure.Health.Deidentification.OperationStatus), Azure.ResponseError error = null) { throw null; } public static Azure.Health.Deidentification.DeidentificationDocumentLocation DeidentificationDocumentLocation(System.Uri location = null, Azure.ETag etag = default(Azure.ETag)) { throw null; } public static Azure.Health.Deidentification.DeidentificationJob DeidentificationJob(string jobName = null, Azure.Health.Deidentification.DeidentificationOperationType? operationType = default(Azure.Health.Deidentification.DeidentificationOperationType?), Azure.Health.Deidentification.SourceStorageLocation sourceLocation = null, Azure.Health.Deidentification.TargetStorageLocation targetLocation = null, Azure.Health.Deidentification.DeidentificationJobCustomizationOptions customizations = null, Azure.Health.Deidentification.OperationStatus status = default(Azure.Health.Deidentification.OperationStatus), Azure.ResponseError error = null, System.DateTimeOffset lastUpdatedAt = default(System.DateTimeOffset), System.DateTimeOffset createdAt = default(System.DateTimeOffset), System.DateTimeOffset? startedAt = default(System.DateTimeOffset?), Azure.Health.Deidentification.DeidentificationJobSummary summary = null) { throw null; } - public static Azure.Health.Deidentification.DeidentificationJobCustomizationOptions DeidentificationJobCustomizationOptions(string redactionFormat = null, string surrogateLocale = null) { throw null; } + public static Azure.Health.Deidentification.DeidentificationJobCustomizationOptions DeidentificationJobCustomizationOptions(string redactionFormat = null, string surrogateLocale = null, string inputLocale = null) { throw null; } public static Azure.Health.Deidentification.DeidentificationJobSummary DeidentificationJobSummary(int successfulCount = 0, int failedCount = 0, int canceledCount = 0, int totalCount = 0, long bytesProcessed = (long)0) { throw null; } public static Azure.Health.Deidentification.DeidentificationResult DeidentificationResult(string outputText = null, Azure.Health.Deidentification.PhiTaggerResult taggerResult = null) { throw null; } public static Azure.Health.Deidentification.PhiEntity PhiEntity(Azure.Health.Deidentification.PhiCategory category = default(Azure.Health.Deidentification.PhiCategory), Azure.Health.Deidentification.StringIndex offset = null, Azure.Health.Deidentification.StringIndex length = null, string text = null, double? confidenceScore = default(double?)) { throw null; } public static Azure.Health.Deidentification.PhiTaggerResult PhiTaggerResult(System.Collections.Generic.IEnumerable entities = null) { throw null; } + public static Azure.Health.Deidentification.SimplePhiEntity SimplePhiEntity(Azure.Health.Deidentification.PhiCategory category = default(Azure.Health.Deidentification.PhiCategory), int offset = 0, int length = 0, string text = null) { throw null; } public static Azure.Health.Deidentification.SourceStorageLocation SourceStorageLocation(System.Uri location = null, string prefix = null, System.Collections.Generic.IEnumerable extensions = null) { throw null; } public static Azure.Health.Deidentification.StringIndex StringIndex(int utf8 = 0, int utf16 = 0, int codePoint = 0) { throw null; } + public static Azure.Health.Deidentification.TaggedPhiEntities TaggedPhiEntities(Azure.Health.Deidentification.TextEncodingType encoding = default(Azure.Health.Deidentification.TextEncodingType), System.Collections.Generic.IEnumerable entities = null) { throw null; } public static Azure.Health.Deidentification.TargetStorageLocation TargetStorageLocation(System.Uri location = null, string prefix = null, bool? overwrite = default(bool?)) { throw null; } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] @@ -325,6 +334,23 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer 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 SimplePhiEntity : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel + { + public SimplePhiEntity(Azure.Health.Deidentification.PhiCategory category, int offset, int length) { } + public Azure.Health.Deidentification.PhiCategory Category { get { throw null; } } + public int Length { get { throw null; } } + public int Offset { get { throw null; } } + public string Text { get { throw null; } set { } } + protected virtual Azure.Health.Deidentification.SimplePhiEntity JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } + protected virtual Azure.Health.Deidentification.SimplePhiEntity PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + Azure.Health.Deidentification.SimplePhiEntity 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.Health.Deidentification.SimplePhiEntity 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 SourceStorageLocation : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel { public SourceStorageLocation(System.Uri location, string prefix) { } @@ -357,6 +383,21 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer 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 TaggedPhiEntities : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel + { + public TaggedPhiEntities(Azure.Health.Deidentification.TextEncodingType encoding, System.Collections.Generic.IEnumerable entities) { } + public Azure.Health.Deidentification.TextEncodingType Encoding { get { throw null; } } + public System.Collections.Generic.IList Entities { get { throw null; } } + protected virtual Azure.Health.Deidentification.TaggedPhiEntities JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } + protected virtual Azure.Health.Deidentification.TaggedPhiEntities PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + Azure.Health.Deidentification.TaggedPhiEntities 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.Health.Deidentification.TaggedPhiEntities 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 TargetStorageLocation : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel { public TargetStorageLocation(System.Uri location, string prefix) { } @@ -373,6 +414,26 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer 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; } } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public readonly partial struct TextEncodingType : System.IEquatable + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public TextEncodingType(string value) { throw null; } + public static Azure.Health.Deidentification.TextEncodingType CodePoint { get { throw null; } } + public static Azure.Health.Deidentification.TextEncodingType Utf16 { get { throw null; } } + public static Azure.Health.Deidentification.TextEncodingType Utf8 { get { throw null; } } + public bool Equals(Azure.Health.Deidentification.TextEncodingType other) { throw null; } + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public override bool Equals(object obj) { throw null; } + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public override int GetHashCode() { throw null; } + public static bool operator ==(Azure.Health.Deidentification.TextEncodingType left, Azure.Health.Deidentification.TextEncodingType right) { throw null; } + public static implicit operator Azure.Health.Deidentification.TextEncodingType (string value) { throw null; } + public static implicit operator Azure.Health.Deidentification.TextEncodingType? (string value) { throw null; } + public static bool operator !=(Azure.Health.Deidentification.TextEncodingType left, Azure.Health.Deidentification.TextEncodingType right) { throw null; } + public override string ToString() { throw null; } + } } namespace Microsoft.Extensions.Azure { diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/api/Azure.Health.Deidentification.netstandard2.0.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/api/Azure.Health.Deidentification.netstandard2.0.cs index d013a0b39198..f1c132a9512c 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/api/Azure.Health.Deidentification.netstandard2.0.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/api/Azure.Health.Deidentification.netstandard2.0.cs @@ -43,10 +43,11 @@ public DeidentificationClient(System.Uri endpoint, Azure.Core.TokenCredential cr } public partial class DeidentificationClientOptions : Azure.Core.ClientOptions { - public DeidentificationClientOptions(Azure.Health.Deidentification.DeidentificationClientOptions.ServiceVersion version = Azure.Health.Deidentification.DeidentificationClientOptions.ServiceVersion.V2024_11_15) { } + public DeidentificationClientOptions(Azure.Health.Deidentification.DeidentificationClientOptions.ServiceVersion version = Azure.Health.Deidentification.DeidentificationClientOptions.ServiceVersion.V2025_07_15_Preview) { } public enum ServiceVersion { V2024_11_15 = 1, + V2025_07_15_Preview = 2, } } public partial class DeidentificationContent : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel @@ -55,6 +56,7 @@ public DeidentificationContent(string inputText) { } public Azure.Health.Deidentification.DeidentificationCustomizationOptions Customizations { get { throw null; } set { } } public string InputText { get { throw null; } } public Azure.Health.Deidentification.DeidentificationOperationType? OperationType { get { throw null; } set { } } + public Azure.Health.Deidentification.TaggedPhiEntities TaggedEntities { get { throw null; } set { } } protected virtual Azure.Health.Deidentification.DeidentificationContent JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } public static implicit operator Azure.Core.RequestContent (Azure.Health.Deidentification.DeidentificationContent deidentificationContent) { throw null; } @@ -69,6 +71,7 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer public partial class DeidentificationCustomizationOptions : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel { public DeidentificationCustomizationOptions() { } + public string InputLocale { get { throw null; } set { } } public string RedactionFormat { get { throw null; } set { } } public string SurrogateLocale { get { throw null; } set { } } protected virtual Azure.Health.Deidentification.DeidentificationCustomizationOptions JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -143,6 +146,7 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer public partial class DeidentificationJobCustomizationOptions : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel { public DeidentificationJobCustomizationOptions() { } + public string InputLocale { get { throw null; } set { } } public string RedactionFormat { get { throw null; } set { } } public string SurrogateLocale { get { throw null; } set { } } protected virtual Azure.Health.Deidentification.DeidentificationJobCustomizationOptions JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } @@ -181,6 +185,7 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer public DeidentificationOperationType(string value) { throw null; } public static Azure.Health.Deidentification.DeidentificationOperationType Redact { get { throw null; } } public static Azure.Health.Deidentification.DeidentificationOperationType Surrogate { get { throw null; } } + public static Azure.Health.Deidentification.DeidentificationOperationType SurrogateOnly { get { throw null; } } public static Azure.Health.Deidentification.DeidentificationOperationType Tag { get { throw null; } } public bool Equals(Azure.Health.Deidentification.DeidentificationOperationType other) { throw null; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] @@ -211,18 +216,22 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer } public static partial class HealthDeidentificationModelFactory { - public static Azure.Health.Deidentification.DeidentificationContent DeidentificationContent(string inputText = null, Azure.Health.Deidentification.DeidentificationOperationType? operationType = default(Azure.Health.Deidentification.DeidentificationOperationType?), Azure.Health.Deidentification.DeidentificationCustomizationOptions customizations = null) { throw null; } - public static Azure.Health.Deidentification.DeidentificationCustomizationOptions DeidentificationCustomizationOptions(string redactionFormat = null, string surrogateLocale = null) { throw null; } + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public static Azure.Health.Deidentification.DeidentificationContent DeidentificationContent(string inputText, Azure.Health.Deidentification.DeidentificationOperationType? operationType, Azure.Health.Deidentification.DeidentificationCustomizationOptions customizations) { throw null; } + public static Azure.Health.Deidentification.DeidentificationContent DeidentificationContent(string inputText = null, Azure.Health.Deidentification.DeidentificationOperationType? operationType = default(Azure.Health.Deidentification.DeidentificationOperationType?), Azure.Health.Deidentification.TaggedPhiEntities taggedEntities = null, Azure.Health.Deidentification.DeidentificationCustomizationOptions customizations = null) { throw null; } + public static Azure.Health.Deidentification.DeidentificationCustomizationOptions DeidentificationCustomizationOptions(string redactionFormat = null, string surrogateLocale = null, string inputLocale = null) { throw null; } public static Azure.Health.Deidentification.DeidentificationDocumentDetails DeidentificationDocumentDetails(string id = null, Azure.Health.Deidentification.DeidentificationDocumentLocation inputLocation = null, Azure.Health.Deidentification.DeidentificationDocumentLocation outputLocation = null, Azure.Health.Deidentification.OperationStatus status = default(Azure.Health.Deidentification.OperationStatus), Azure.ResponseError error = null) { throw null; } public static Azure.Health.Deidentification.DeidentificationDocumentLocation DeidentificationDocumentLocation(System.Uri location = null, Azure.ETag etag = default(Azure.ETag)) { throw null; } public static Azure.Health.Deidentification.DeidentificationJob DeidentificationJob(string jobName = null, Azure.Health.Deidentification.DeidentificationOperationType? operationType = default(Azure.Health.Deidentification.DeidentificationOperationType?), Azure.Health.Deidentification.SourceStorageLocation sourceLocation = null, Azure.Health.Deidentification.TargetStorageLocation targetLocation = null, Azure.Health.Deidentification.DeidentificationJobCustomizationOptions customizations = null, Azure.Health.Deidentification.OperationStatus status = default(Azure.Health.Deidentification.OperationStatus), Azure.ResponseError error = null, System.DateTimeOffset lastUpdatedAt = default(System.DateTimeOffset), System.DateTimeOffset createdAt = default(System.DateTimeOffset), System.DateTimeOffset? startedAt = default(System.DateTimeOffset?), Azure.Health.Deidentification.DeidentificationJobSummary summary = null) { throw null; } - public static Azure.Health.Deidentification.DeidentificationJobCustomizationOptions DeidentificationJobCustomizationOptions(string redactionFormat = null, string surrogateLocale = null) { throw null; } + public static Azure.Health.Deidentification.DeidentificationJobCustomizationOptions DeidentificationJobCustomizationOptions(string redactionFormat = null, string surrogateLocale = null, string inputLocale = null) { throw null; } public static Azure.Health.Deidentification.DeidentificationJobSummary DeidentificationJobSummary(int successfulCount = 0, int failedCount = 0, int canceledCount = 0, int totalCount = 0, long bytesProcessed = (long)0) { throw null; } public static Azure.Health.Deidentification.DeidentificationResult DeidentificationResult(string outputText = null, Azure.Health.Deidentification.PhiTaggerResult taggerResult = null) { throw null; } public static Azure.Health.Deidentification.PhiEntity PhiEntity(Azure.Health.Deidentification.PhiCategory category = default(Azure.Health.Deidentification.PhiCategory), Azure.Health.Deidentification.StringIndex offset = null, Azure.Health.Deidentification.StringIndex length = null, string text = null, double? confidenceScore = default(double?)) { throw null; } public static Azure.Health.Deidentification.PhiTaggerResult PhiTaggerResult(System.Collections.Generic.IEnumerable entities = null) { throw null; } + public static Azure.Health.Deidentification.SimplePhiEntity SimplePhiEntity(Azure.Health.Deidentification.PhiCategory category = default(Azure.Health.Deidentification.PhiCategory), int offset = 0, int length = 0, string text = null) { throw null; } public static Azure.Health.Deidentification.SourceStorageLocation SourceStorageLocation(System.Uri location = null, string prefix = null, System.Collections.Generic.IEnumerable extensions = null) { throw null; } public static Azure.Health.Deidentification.StringIndex StringIndex(int utf8 = 0, int utf16 = 0, int codePoint = 0) { throw null; } + public static Azure.Health.Deidentification.TaggedPhiEntities TaggedPhiEntities(Azure.Health.Deidentification.TextEncodingType encoding = default(Azure.Health.Deidentification.TextEncodingType), System.Collections.Generic.IEnumerable entities = null) { throw null; } public static Azure.Health.Deidentification.TargetStorageLocation TargetStorageLocation(System.Uri location = null, string prefix = null, bool? overwrite = default(bool?)) { throw null; } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] @@ -325,6 +334,23 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer 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 SimplePhiEntity : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel + { + public SimplePhiEntity(Azure.Health.Deidentification.PhiCategory category, int offset, int length) { } + public Azure.Health.Deidentification.PhiCategory Category { get { throw null; } } + public int Length { get { throw null; } } + public int Offset { get { throw null; } } + public string Text { get { throw null; } set { } } + protected virtual Azure.Health.Deidentification.SimplePhiEntity JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } + protected virtual Azure.Health.Deidentification.SimplePhiEntity PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + Azure.Health.Deidentification.SimplePhiEntity 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.Health.Deidentification.SimplePhiEntity 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 SourceStorageLocation : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel { public SourceStorageLocation(System.Uri location, string prefix) { } @@ -357,6 +383,21 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer 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 TaggedPhiEntities : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel + { + public TaggedPhiEntities(Azure.Health.Deidentification.TextEncodingType encoding, System.Collections.Generic.IEnumerable entities) { } + public Azure.Health.Deidentification.TextEncodingType Encoding { get { throw null; } } + public System.Collections.Generic.IList Entities { get { throw null; } } + protected virtual Azure.Health.Deidentification.TaggedPhiEntities JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options) { } + protected virtual Azure.Health.Deidentification.TaggedPhiEntities PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options) { throw null; } + Azure.Health.Deidentification.TaggedPhiEntities 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.Health.Deidentification.TaggedPhiEntities 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 TargetStorageLocation : System.ClientModel.Primitives.IJsonModel, System.ClientModel.Primitives.IPersistableModel { public TargetStorageLocation(System.Uri location, string prefix) { } @@ -373,6 +414,26 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer 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; } } + [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] + public readonly partial struct TextEncodingType : System.IEquatable + { + private readonly object _dummy; + private readonly int _dummyPrimitive; + public TextEncodingType(string value) { throw null; } + public static Azure.Health.Deidentification.TextEncodingType CodePoint { get { throw null; } } + public static Azure.Health.Deidentification.TextEncodingType Utf16 { get { throw null; } } + public static Azure.Health.Deidentification.TextEncodingType Utf8 { get { throw null; } } + public bool Equals(Azure.Health.Deidentification.TextEncodingType other) { throw null; } + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public override bool Equals(object obj) { throw null; } + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] + public override int GetHashCode() { throw null; } + public static bool operator ==(Azure.Health.Deidentification.TextEncodingType left, Azure.Health.Deidentification.TextEncodingType right) { throw null; } + public static implicit operator Azure.Health.Deidentification.TextEncodingType (string value) { throw null; } + public static implicit operator Azure.Health.Deidentification.TextEncodingType? (string value) { throw null; } + public static bool operator !=(Azure.Health.Deidentification.TextEncodingType left, Azure.Health.Deidentification.TextEncodingType right) { throw null; } + public override string ToString() { throw null; } + } } namespace Microsoft.Extensions.Azure { diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/assets.json b/sdk/healthdataaiservices/Azure.Health.Deidentification/assets.json index 6ee2f8e9a8af..55949412374d 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/assets.json +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/assets.json @@ -2,5 +2,5 @@ "AssetsRepo": "Azure/azure-sdk-assets", "AssetsRepoPrefixPath": "net", "TagPrefix": "net/healthdataaiservices/Azure.Health.Deidentification", - "Tag": "net/healthdataaiservices/Azure.Health.Deidentification_754ddcb6c3" + "Tag": "net/healthdataaiservices/Azure.Health.Deidentification_c5030f7773" } diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationClientOptions.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationClientOptions.cs index 3419fd61b242..a2a680c32366 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationClientOptions.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationClientOptions.cs @@ -13,7 +13,7 @@ namespace Azure.Health.Deidentification /// Client options for . public partial class DeidentificationClientOptions : ClientOptions { - private const ServiceVersion LatestVersion = ServiceVersion.V2024_11_15; + private const ServiceVersion LatestVersion = ServiceVersion.V2025_07_15_Preview; /// Initializes a new instance of DeidentificationClientOptions. /// The service version. @@ -22,6 +22,7 @@ public DeidentificationClientOptions(ServiceVersion version = LatestVersion) Version = version switch { ServiceVersion.V2024_11_15 => "2024-11-15", + ServiceVersion.V2025_07_15_Preview => "2025-07-15-preview", _ => throw new NotSupportedException() }; } @@ -33,7 +34,9 @@ public DeidentificationClientOptions(ServiceVersion version = LatestVersion) public enum ServiceVersion { /// V2024_11_15. - V2024_11_15 = 1 + V2024_11_15 = 1, + /// V2025_07_15_Preview. + V2025_07_15_Preview = 2 } } } diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationContent.Serialization.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationContent.Serialization.cs index 69299e01071c..444c6a022aff 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationContent.Serialization.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationContent.Serialization.cs @@ -46,6 +46,11 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit writer.WritePropertyName("operation"u8); writer.WriteStringValue(OperationType.Value.ToString()); } + if (Optional.IsDefined(TaggedEntities)) + { + writer.WritePropertyName("taggedEntities"u8); + writer.WriteObjectValue(TaggedEntities, options); + } if (Optional.IsDefined(Customizations)) { writer.WritePropertyName("customizations"u8); @@ -95,6 +100,7 @@ internal static DeidentificationContent DeserializeDeidentificationContent(JsonE } string inputText = default; DeidentificationOperationType? operationType = default; + TaggedPhiEntities taggedEntities = default; DeidentificationCustomizationOptions customizations = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); foreach (var prop in element.EnumerateObject()) @@ -113,6 +119,15 @@ internal static DeidentificationContent DeserializeDeidentificationContent(JsonE operationType = new DeidentificationOperationType(prop.Value.GetString()); continue; } + if (prop.NameEquals("taggedEntities"u8)) + { + if (prop.Value.ValueKind == JsonValueKind.Null) + { + continue; + } + taggedEntities = TaggedPhiEntities.DeserializeTaggedPhiEntities(prop.Value, options); + continue; + } if (prop.NameEquals("customizations"u8)) { if (prop.Value.ValueKind == JsonValueKind.Null) @@ -127,7 +142,7 @@ internal static DeidentificationContent DeserializeDeidentificationContent(JsonE additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } } - return new DeidentificationContent(inputText, operationType, customizations, additionalBinaryDataProperties); + return new DeidentificationContent(inputText, operationType, taggedEntities, customizations, additionalBinaryDataProperties); } /// The client options for reading and writing models. diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationContent.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationContent.cs index ac7b1bc1c4ff..6a5727678638 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationContent.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationContent.cs @@ -29,12 +29,14 @@ public DeidentificationContent(string inputText) /// Initializes a new instance of . /// Input text to de-identify. /// Operation to perform on the input documents. + /// Grouped PHI entities with single encoding specification for SurrogateOnly operation. /// Customization parameters to override default service behaviors. /// Keeps track of any properties unknown to the library. - internal DeidentificationContent(string inputText, DeidentificationOperationType? operationType, DeidentificationCustomizationOptions customizations, IDictionary additionalBinaryDataProperties) + internal DeidentificationContent(string inputText, DeidentificationOperationType? operationType, TaggedPhiEntities taggedEntities, DeidentificationCustomizationOptions customizations, IDictionary additionalBinaryDataProperties) { InputText = inputText; OperationType = operationType; + TaggedEntities = taggedEntities; Customizations = customizations; _additionalBinaryDataProperties = additionalBinaryDataProperties; } @@ -45,6 +47,9 @@ internal DeidentificationContent(string inputText, DeidentificationOperationType /// Operation to perform on the input documents. public DeidentificationOperationType? OperationType { get; set; } + /// Grouped PHI entities with single encoding specification for SurrogateOnly operation. + public TaggedPhiEntities TaggedEntities { get; set; } + /// Customization parameters to override default service behaviors. public DeidentificationCustomizationOptions Customizations { get; set; } } diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationCustomizationOptions.Serialization.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationCustomizationOptions.Serialization.cs index 637e3f4ade13..c016ad044710 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationCustomizationOptions.Serialization.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationCustomizationOptions.Serialization.cs @@ -43,6 +43,11 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit writer.WritePropertyName("surrogateLocale"u8); writer.WriteStringValue(SurrogateLocale); } + if (Optional.IsDefined(InputLocale)) + { + writer.WritePropertyName("inputLocale"u8); + writer.WriteStringValue(InputLocale); + } if (options.Format != "W" && _additionalBinaryDataProperties != null) { foreach (var item in _additionalBinaryDataProperties) @@ -87,6 +92,7 @@ internal static DeidentificationCustomizationOptions DeserializeDeidentification } string redactionFormat = default; string surrogateLocale = default; + string inputLocale = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); foreach (var prop in element.EnumerateObject()) { @@ -100,12 +106,17 @@ internal static DeidentificationCustomizationOptions DeserializeDeidentification surrogateLocale = prop.Value.GetString(); continue; } + if (prop.NameEquals("inputLocale"u8)) + { + inputLocale = prop.Value.GetString(); + continue; + } if (options.Format != "W") { additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } } - return new DeidentificationCustomizationOptions(redactionFormat, surrogateLocale, additionalBinaryDataProperties); + return new DeidentificationCustomizationOptions(redactionFormat, surrogateLocale, inputLocale, additionalBinaryDataProperties); } /// The client options for reading and writing models. diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationCustomizationOptions.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationCustomizationOptions.cs index 0fd323c87a65..2c0f78a78888 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationCustomizationOptions.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationCustomizationOptions.cs @@ -27,11 +27,13 @@ public DeidentificationCustomizationOptions() /// Please refer to https://learn.microsoft.com/azure/healthcare-apis/deidentification/redaction-format for more details. /// /// Locale in which the output surrogates are written. + /// Locale of the input text. Used for better PHI detection. Defaults to 'en-US'. /// Keeps track of any properties unknown to the library. - internal DeidentificationCustomizationOptions(string redactionFormat, string surrogateLocale, IDictionary additionalBinaryDataProperties) + internal DeidentificationCustomizationOptions(string redactionFormat, string surrogateLocale, string inputLocale, IDictionary additionalBinaryDataProperties) { RedactionFormat = redactionFormat; SurrogateLocale = surrogateLocale; + InputLocale = inputLocale; _additionalBinaryDataProperties = additionalBinaryDataProperties; } @@ -43,5 +45,8 @@ internal DeidentificationCustomizationOptions(string redactionFormat, string sur /// Locale in which the output surrogates are written. public string SurrogateLocale { get; set; } + + /// Locale of the input text. Used for better PHI detection. Defaults to 'en-US'. + public string InputLocale { get; set; } } } diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationJobCustomizationOptions.Serialization.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationJobCustomizationOptions.Serialization.cs index 8e155b2489d9..994c63e4aba0 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationJobCustomizationOptions.Serialization.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationJobCustomizationOptions.Serialization.cs @@ -43,6 +43,11 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit writer.WritePropertyName("surrogateLocale"u8); writer.WriteStringValue(SurrogateLocale); } + if (Optional.IsDefined(InputLocale)) + { + writer.WritePropertyName("inputLocale"u8); + writer.WriteStringValue(InputLocale); + } if (options.Format != "W" && _additionalBinaryDataProperties != null) { foreach (var item in _additionalBinaryDataProperties) @@ -87,6 +92,7 @@ internal static DeidentificationJobCustomizationOptions DeserializeDeidentificat } string redactionFormat = default; string surrogateLocale = default; + string inputLocale = default; IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); foreach (var prop in element.EnumerateObject()) { @@ -100,12 +106,17 @@ internal static DeidentificationJobCustomizationOptions DeserializeDeidentificat surrogateLocale = prop.Value.GetString(); continue; } + if (prop.NameEquals("inputLocale"u8)) + { + inputLocale = prop.Value.GetString(); + continue; + } if (options.Format != "W") { additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); } } - return new DeidentificationJobCustomizationOptions(redactionFormat, surrogateLocale, additionalBinaryDataProperties); + return new DeidentificationJobCustomizationOptions(redactionFormat, surrogateLocale, inputLocale, additionalBinaryDataProperties); } /// The client options for reading and writing models. diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationJobCustomizationOptions.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationJobCustomizationOptions.cs index 25f18c79bbdf..b709d1c469b8 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationJobCustomizationOptions.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationJobCustomizationOptions.cs @@ -27,11 +27,13 @@ public DeidentificationJobCustomizationOptions() /// Please refer to https://learn.microsoft.com/azure/healthcare-apis/deidentification/redaction-format for more details. /// /// Locale in which the output surrogates are written. + /// Locale of the input text. Used for better PHI detection. Defaults to 'en-US'. /// Keeps track of any properties unknown to the library. - internal DeidentificationJobCustomizationOptions(string redactionFormat, string surrogateLocale, IDictionary additionalBinaryDataProperties) + internal DeidentificationJobCustomizationOptions(string redactionFormat, string surrogateLocale, string inputLocale, IDictionary additionalBinaryDataProperties) { RedactionFormat = redactionFormat; SurrogateLocale = surrogateLocale; + InputLocale = inputLocale; _additionalBinaryDataProperties = additionalBinaryDataProperties; } @@ -43,5 +45,8 @@ internal DeidentificationJobCustomizationOptions(string redactionFormat, string /// Locale in which the output surrogates are written. public string SurrogateLocale { get; set; } + + /// Locale of the input text. Used for better PHI detection. Defaults to 'en-US'. + public string InputLocale { get; set; } } } diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationOperationType.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationOperationType.cs index 1fde0742863c..a6f633d586a7 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationOperationType.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/DeidentificationOperationType.cs @@ -20,6 +20,8 @@ namespace Azure.Health.Deidentification private const string SurrogateValue = "Surrogate"; /// Tag Operation will detect all entities of PHI, their type, and return their locations in the document. private const string TagValue = "Tag"; + /// SurrogateOnly Operation will replace only specified entities of PHI with surrogate values. + private const string SurrogateOnlyValue = "SurrogateOnly"; /// Initializes a new instance of . /// The value. @@ -40,6 +42,9 @@ public DeidentificationOperationType(string value) /// Tag Operation will detect all entities of PHI, their type, and return their locations in the document. public static DeidentificationOperationType Tag { get; } = new DeidentificationOperationType(TagValue); + /// SurrogateOnly Operation will replace only specified entities of PHI with surrogate values. + public static DeidentificationOperationType SurrogateOnly { get; } = new DeidentificationOperationType(SurrogateOnlyValue); + /// Determines if two values are the same. /// The left value to compare. /// The right value to compare. diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/HealthDeidentificationModelFactory.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/HealthDeidentificationModelFactory.cs index 30c8c9b8af69..0aafb1729d55 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/HealthDeidentificationModelFactory.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/HealthDeidentificationModelFactory.cs @@ -88,10 +88,11 @@ public static TargetStorageLocation TargetStorageLocation(Uri location = default /// Please refer to https://learn.microsoft.com/azure/healthcare-apis/deidentification/redaction-format for more details. /// /// Locale in which the output surrogates are written. + /// Locale of the input text. Used for better PHI detection. Defaults to 'en-US'. /// A new instance for mocking. - public static DeidentificationJobCustomizationOptions DeidentificationJobCustomizationOptions(string redactionFormat = default, string surrogateLocale = default) + public static DeidentificationJobCustomizationOptions DeidentificationJobCustomizationOptions(string redactionFormat = default, string surrogateLocale = default, string inputLocale = default) { - return new DeidentificationJobCustomizationOptions(redactionFormat, surrogateLocale, additionalBinaryDataProperties: null); + return new DeidentificationJobCustomizationOptions(redactionFormat, surrogateLocale, inputLocale, additionalBinaryDataProperties: null); } /// Summary metrics of a job. @@ -142,11 +143,34 @@ public static DeidentificationDocumentLocation DeidentificationDocumentLocation( /// Request body for de-identification operation. /// Input text to de-identify. /// Operation to perform on the input documents. + /// Grouped PHI entities with single encoding specification for SurrogateOnly operation. /// Customization parameters to override default service behaviors. /// A new instance for mocking. - public static DeidentificationContent DeidentificationContent(string inputText = default, DeidentificationOperationType? operationType = default, DeidentificationCustomizationOptions customizations = default) + public static DeidentificationContent DeidentificationContent(string inputText = default, DeidentificationOperationType? operationType = default, TaggedPhiEntities taggedEntities = default, DeidentificationCustomizationOptions customizations = default) { - return new DeidentificationContent(inputText, operationType, customizations, additionalBinaryDataProperties: null); + return new DeidentificationContent(inputText, operationType, taggedEntities, customizations, additionalBinaryDataProperties: null); + } + + /// Grouped PHI entities with shared encoding specification. + /// The encoding type used for all entities in this group. + /// List of PHI entities using the specified encoding. + /// A new instance for mocking. + public static TaggedPhiEntities TaggedPhiEntities(TextEncodingType encoding = default, IEnumerable entities = default) + { + entities ??= new ChangeTrackingList(); + + return new TaggedPhiEntities(encoding, entities.ToList(), additionalBinaryDataProperties: null); + } + + /// Simple PHI entity with encoding-specific offset and length values. + /// PHI Category of the entity. + /// Starting index of the location from within the input text using the group's encoding. + /// Length of the input text using the group's encoding. + /// Text of the entity (optional). + /// A new instance for mocking. + public static SimplePhiEntity SimplePhiEntity(PhiCategory category = default, int offset = default, int length = default, string text = default) + { + return new SimplePhiEntity(category, offset, length, text, additionalBinaryDataProperties: null); } /// Customizations options to override default service behaviors for synchronous usage. @@ -155,10 +179,11 @@ public static DeidentificationContent DeidentificationContent(string inputText = /// Please refer to https://learn.microsoft.com/azure/healthcare-apis/deidentification/redaction-format for more details. /// /// Locale in which the output surrogates are written. + /// Locale of the input text. Used for better PHI detection. Defaults to 'en-US'. /// A new instance for mocking. - public static DeidentificationCustomizationOptions DeidentificationCustomizationOptions(string redactionFormat = default, string surrogateLocale = default) + public static DeidentificationCustomizationOptions DeidentificationCustomizationOptions(string redactionFormat = default, string surrogateLocale = default, string inputLocale = default) { - return new DeidentificationCustomizationOptions(redactionFormat, surrogateLocale, additionalBinaryDataProperties: null); + return new DeidentificationCustomizationOptions(redactionFormat, surrogateLocale, inputLocale, additionalBinaryDataProperties: null); } /// Response body for de-identification operation. diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/Models/AzureHealthDeidentificationContext.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/Models/AzureHealthDeidentificationContext.cs index 2e2b0fd49aed..df833165ab25 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/Models/AzureHealthDeidentificationContext.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/Models/AzureHealthDeidentificationContext.cs @@ -27,8 +27,10 @@ namespace Azure.Health.Deidentification [ModelReaderWriterBuildable(typeof(PhiEntity))] [ModelReaderWriterBuildable(typeof(PhiTaggerResult))] [ModelReaderWriterBuildable(typeof(ResponseError))] + [ModelReaderWriterBuildable(typeof(SimplePhiEntity))] [ModelReaderWriterBuildable(typeof(SourceStorageLocation))] [ModelReaderWriterBuildable(typeof(StringIndex))] + [ModelReaderWriterBuildable(typeof(TaggedPhiEntities))] [ModelReaderWriterBuildable(typeof(TargetStorageLocation))] public partial class AzureHealthDeidentificationContext : ModelReaderWriterContext { diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/SimplePhiEntity.Serialization.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/SimplePhiEntity.Serialization.cs new file mode 100644 index 000000000000..8efb9ac34efa --- /dev/null +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/SimplePhiEntity.Serialization.cs @@ -0,0 +1,169 @@ +// 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; + +namespace Azure.Health.Deidentification +{ + /// Simple PHI entity with encoding-specific offset and length values. + public partial class SimplePhiEntity : IJsonModel + { + /// Initializes a new instance of for deserialization. + internal SimplePhiEntity() + { + } + + /// The JSON writer. + /// The client options for reading and writing models. + 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) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(SimplePhiEntity)} does not support writing '{format}' format."); + } + writer.WritePropertyName("category"u8); + writer.WriteStringValue(Category.ToString()); + writer.WritePropertyName("offset"u8); + writer.WriteNumberValue(Offset); + writer.WritePropertyName("length"u8); + writer.WriteNumberValue(Length); + if (Optional.IsDefined(Text)) + { + writer.WritePropertyName("text"u8); + writer.WriteStringValue(Text); + } + if (options.Format != "W" && _additionalBinaryDataProperties != null) + { + foreach (var item in _additionalBinaryDataProperties) + { + 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 + } + } + } + + /// The JSON reader. + /// The client options for reading and writing models. + SimplePhiEntity IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + + /// The JSON reader. + /// The client options for reading and writing models. + protected virtual SimplePhiEntity JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(SimplePhiEntity)} does not support reading '{format}' format."); + } + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeSimplePhiEntity(document.RootElement, options); + } + + /// The JSON element to deserialize. + /// The client options for reading and writing models. + internal static SimplePhiEntity DeserializeSimplePhiEntity(JsonElement element, ModelReaderWriterOptions options) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + PhiCategory category = default; + int offset = default; + int length = default; + string text = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("category"u8)) + { + category = new PhiCategory(prop.Value.GetString()); + continue; + } + if (prop.NameEquals("offset"u8)) + { + offset = prop.Value.GetInt32(); + continue; + } + if (prop.NameEquals("length"u8)) + { + length = prop.Value.GetInt32(); + continue; + } + if (prop.NameEquals("text"u8)) + { + text = prop.Value.GetString(); + continue; + } + if (options.Format != "W") + { + additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new SimplePhiEntity(category, offset, length, text, additionalBinaryDataProperties); + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, AzureHealthDeidentificationContext.Default); + default: + throw new FormatException($"The model {nameof(SimplePhiEntity)} does not support writing '{options.Format}' format."); + } + } + + /// The data to parse. + /// The client options for reading and writing models. + SimplePhiEntity IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual SimplePhiEntity PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data)) + { + return DeserializeSimplePhiEntity(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(SimplePhiEntity)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + } +} diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/SimplePhiEntity.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/SimplePhiEntity.cs new file mode 100644 index 000000000000..d71e6b153bd9 --- /dev/null +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/SimplePhiEntity.cs @@ -0,0 +1,57 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; + +namespace Azure.Health.Deidentification +{ + /// Simple PHI entity with encoding-specific offset and length values. + public partial class SimplePhiEntity + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// PHI Category of the entity. + /// Starting index of the location from within the input text using the group's encoding. + /// Length of the input text using the group's encoding. + public SimplePhiEntity(PhiCategory category, int offset, int length) + { + Category = category; + Offset = offset; + Length = length; + } + + /// Initializes a new instance of . + /// PHI Category of the entity. + /// Starting index of the location from within the input text using the group's encoding. + /// Length of the input text using the group's encoding. + /// Text of the entity (optional). + /// Keeps track of any properties unknown to the library. + internal SimplePhiEntity(PhiCategory category, int offset, int length, string text, IDictionary additionalBinaryDataProperties) + { + Category = category; + Offset = offset; + Length = length; + Text = text; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// PHI Category of the entity. + public PhiCategory Category { get; } + + /// Starting index of the location from within the input text using the group's encoding. + public int Offset { get; } + + /// Length of the input text using the group's encoding. + public int Length { get; } + + /// Text of the entity (optional). + public string Text { get; set; } + } +} diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/TaggedPhiEntities.Serialization.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/TaggedPhiEntities.Serialization.cs new file mode 100644 index 000000000000..d9f2947768c1 --- /dev/null +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/TaggedPhiEntities.Serialization.cs @@ -0,0 +1,160 @@ +// 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; + +namespace Azure.Health.Deidentification +{ + /// Grouped PHI entities with shared encoding specification. + public partial class TaggedPhiEntities : IJsonModel + { + /// Initializes a new instance of for deserialization. + internal TaggedPhiEntities() + { + } + + /// The JSON writer. + /// The client options for reading and writing models. + 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) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(TaggedPhiEntities)} does not support writing '{format}' format."); + } + writer.WritePropertyName("encoding"u8); + writer.WriteStringValue(Encoding.ToString()); + writer.WritePropertyName("entities"u8); + writer.WriteStartArray(); + foreach (SimplePhiEntity item in Entities) + { + writer.WriteObjectValue(item, options); + } + writer.WriteEndArray(); + if (options.Format != "W" && _additionalBinaryDataProperties != null) + { + foreach (var item in _additionalBinaryDataProperties) + { + 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 + } + } + } + + /// The JSON reader. + /// The client options for reading and writing models. + TaggedPhiEntities IJsonModel.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options); + + /// The JSON reader. + /// The client options for reading and writing models. + protected virtual TaggedPhiEntities JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + if (format != "J") + { + throw new FormatException($"The model {nameof(TaggedPhiEntities)} does not support reading '{format}' format."); + } + using JsonDocument document = JsonDocument.ParseValue(ref reader); + return DeserializeTaggedPhiEntities(document.RootElement, options); + } + + /// The JSON element to deserialize. + /// The client options for reading and writing models. + internal static TaggedPhiEntities DeserializeTaggedPhiEntities(JsonElement element, ModelReaderWriterOptions options) + { + if (element.ValueKind == JsonValueKind.Null) + { + return null; + } + TextEncodingType encoding = default; + IList entities = default; + IDictionary additionalBinaryDataProperties = new ChangeTrackingDictionary(); + foreach (var prop in element.EnumerateObject()) + { + if (prop.NameEquals("encoding"u8)) + { + encoding = new TextEncodingType(prop.Value.GetString()); + continue; + } + if (prop.NameEquals("entities"u8)) + { + List array = new List(); + foreach (var item in prop.Value.EnumerateArray()) + { + array.Add(SimplePhiEntity.DeserializeSimplePhiEntity(item, options)); + } + entities = array; + continue; + } + if (options.Format != "W") + { + additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText())); + } + } + return new TaggedPhiEntities(encoding, entities, additionalBinaryDataProperties); + } + + /// The client options for reading and writing models. + BinaryData IPersistableModel.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options); + + /// The client options for reading and writing models. + protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + return ModelReaderWriter.Write(this, options, AzureHealthDeidentificationContext.Default); + default: + throw new FormatException($"The model {nameof(TaggedPhiEntities)} does not support writing '{options.Format}' format."); + } + } + + /// The data to parse. + /// The client options for reading and writing models. + TaggedPhiEntities IPersistableModel.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options); + + /// The data to parse. + /// The client options for reading and writing models. + protected virtual TaggedPhiEntities PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options) + { + string format = options.Format == "W" ? ((IPersistableModel)this).GetFormatFromOptions(options) : options.Format; + switch (format) + { + case "J": + using (JsonDocument document = JsonDocument.Parse(data)) + { + return DeserializeTaggedPhiEntities(document.RootElement, options); + } + default: + throw new FormatException($"The model {nameof(TaggedPhiEntities)} does not support reading '{options.Format}' format."); + } + } + + /// The client options for reading and writing models. + string IPersistableModel.GetFormatFromOptions(ModelReaderWriterOptions options) => "J"; + } +} diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/TaggedPhiEntities.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/TaggedPhiEntities.cs new file mode 100644 index 000000000000..0d2ee848155e --- /dev/null +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/TaggedPhiEntities.cs @@ -0,0 +1,49 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Azure.Health.Deidentification +{ + /// Grouped PHI entities with shared encoding specification. + public partial class TaggedPhiEntities + { + /// Keeps track of any properties unknown to the library. + private protected readonly IDictionary _additionalBinaryDataProperties; + + /// Initializes a new instance of . + /// The encoding type used for all entities in this group. + /// List of PHI entities using the specified encoding. + /// is null. + public TaggedPhiEntities(TextEncodingType encoding, IEnumerable entities) + { + Argument.AssertNotNull(entities, nameof(entities)); + + Encoding = encoding; + Entities = entities.ToList(); + } + + /// Initializes a new instance of . + /// The encoding type used for all entities in this group. + /// List of PHI entities using the specified encoding. + /// Keeps track of any properties unknown to the library. + internal TaggedPhiEntities(TextEncodingType encoding, IList entities, IDictionary additionalBinaryDataProperties) + { + Encoding = encoding; + Entities = entities; + _additionalBinaryDataProperties = additionalBinaryDataProperties; + } + + /// The encoding type used for all entities in this group. + public TextEncodingType Encoding { get; } + + /// List of PHI entities using the specified encoding. + public IList Entities { get; } + } +} diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/TextEncodingType.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/TextEncodingType.cs new file mode 100644 index 000000000000..31bcffc0d30e --- /dev/null +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/Generated/TextEncodingType.cs @@ -0,0 +1,75 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ComponentModel; + +namespace Azure.Health.Deidentification +{ + /// Encoding type for text offset and length calculations. + public readonly partial struct TextEncodingType : IEquatable + { + private readonly string _value; + /// UTF-8 encoding. + private const string Utf8Value = "Utf8"; + /// UTF-16 encoding. Primary encoding used by .NET, Java, and JavaScript. + private const string Utf16Value = "Utf16"; + /// CodePoint encoding. Primary encoding used by Python. + private const string CodePointValue = "CodePoint"; + + /// Initializes a new instance of . + /// The value. + /// is null. + public TextEncodingType(string value) + { + Argument.AssertNotNull(value, nameof(value)); + + _value = value; + } + + /// UTF-8 encoding. + public static TextEncodingType Utf8 { get; } = new TextEncodingType(Utf8Value); + + /// UTF-16 encoding. Primary encoding used by .NET, Java, and JavaScript. + public static TextEncodingType Utf16 { get; } = new TextEncodingType(Utf16Value); + + /// CodePoint encoding. Primary encoding used by Python. + public static TextEncodingType CodePoint { get; } = new TextEncodingType(CodePointValue); + + /// Determines if two values are the same. + /// The left value to compare. + /// The right value to compare. + public static bool operator ==(TextEncodingType left, TextEncodingType right) => left.Equals(right); + + /// Determines if two values are not the same. + /// The left value to compare. + /// The right value to compare. + public static bool operator !=(TextEncodingType left, TextEncodingType right) => !left.Equals(right); + + /// Converts a string to a . + /// The value. + public static implicit operator TextEncodingType(string value) => new TextEncodingType(value); + + /// Converts a string to a . + /// The value. + public static implicit operator TextEncodingType?(string value) => value == null ? null : new TextEncodingType(value); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is TextEncodingType other && Equals(other); + + /// + public bool Equals(TextEncodingType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0; + + /// + public override string ToString() => _value; + } +} diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/HealthDeidentificationModelFactory.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/HealthDeidentificationModelFactory.cs index 4f12001385f7..8fa80e7fe00e 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/src/HealthDeidentificationModelFactory.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/src/HealthDeidentificationModelFactory.cs @@ -1,10 +1,22 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using System.ComponentModel; + namespace Azure.Health.Deidentification { [CodeGenType("DeidentificationModelFactory")] public partial class HealthDeidentificationModelFactory { + /// Request body for de-identification operation. + /// Input text to de-identify. + /// Operation to perform on the input documents. + /// Customization parameters to override default service behaviors. + /// A new instance for mocking. + [EditorBrowsable(EditorBrowsableState.Never)] + public static DeidentificationContent DeidentificationContent(string inputText, DeidentificationOperationType? operationType, DeidentificationCustomizationOptions customizations) + { + return DeidentificationContent(inputText, operationType, null, customizations); + } } } diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/tests/Tests/Helpers/DeidentificationTestEnvironment.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/tests/Tests/Helpers/DeidentificationTestEnvironment.cs index e1ce1422023b..d97172f72508 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/tests/Tests/Helpers/DeidentificationTestEnvironment.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/tests/Tests/Helpers/DeidentificationTestEnvironment.cs @@ -10,7 +10,7 @@ public class DeidentificationTestEnvironment : TestEnvironment public string Endpoint => GetRecordedOptionalVariable("DEID_SERVICE_ENDPOINT") ?? "https://localhost:5020"; public string StorageAccountName => GetRecordedOptionalVariable("STORAGE_ACCOUNT_NAME") ?? "storageAccount"; public string StorageContainerName => GetRecordedOptionalVariable("STORAGE_CONTAINER_NAME") ?? "container"; - public static string FakeNextLink => "https://localhost:5020/jobs/net-sdk-job-1234/documents?api-version=2024-11-15&maxpagesize=2&continuationToken=1234"; + public static string FakeNextLink => "https://localhost:5020/jobs/net-sdk-job-1234/documents?api-version=2025-07-15-preview&maxpagesize=2&continuationToken=1234"; public static string FakeStorageLocation => "https://fakeblobstorage.blob.core.windows.net/container"; public static string FakeJobName => "net-sdk-job-1234"; public static string FakeContinuationTokenSegment => "continuationToken=1234"; diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/tests/Tests/RealtimeOperationsTest.cs b/sdk/healthdataaiservices/Azure.Health.Deidentification/tests/Tests/RealtimeOperationsTest.cs index 03a8813c0c34..b69c9e5ec6df 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/tests/Tests/RealtimeOperationsTest.cs +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/tests/Tests/RealtimeOperationsTest.cs @@ -46,7 +46,7 @@ public async Task Realtime_Tag_ReturnsExcepted() DeidentificationClient client = GetDeidClient(); string input = "Hello, my name is John Smith."; - DeidentificationContent content = new(input, DeidentificationOperationType.Tag, null, null); + DeidentificationContent content = new(input, DeidentificationOperationType.Tag, null, null, null); DeidentificationResult result = await client.DeidentifyTextAsync(content); diff --git a/sdk/healthdataaiservices/Azure.Health.Deidentification/tsp-location.yaml b/sdk/healthdataaiservices/Azure.Health.Deidentification/tsp-location.yaml index 8c04f21a6afa..ff4108334226 100644 --- a/sdk/healthdataaiservices/Azure.Health.Deidentification/tsp-location.yaml +++ b/sdk/healthdataaiservices/Azure.Health.Deidentification/tsp-location.yaml @@ -1,6 +1,6 @@ directory: specification/healthdataaiservices/HealthDataAIServices.DeidServices repo: Azure/azure-rest-api-specs -commit: 70d293f0964bb1e04738cc4192321f40d1dc93a1 +commit: 681c15ad9028f91b3f4978625527fd461b57f4fa additionalDirectories: [] emitterPackageJsonPath: eng/azure-typespec-http-client-csharp-emitter-package.json diff --git a/sdk/monitor/Azure.Monitor.Ingestion/tsp-location.yaml b/sdk/monitor/Azure.Monitor.Ingestion/tsp-location.yaml index 3dd792ade846..2726e3edcaaa 100644 --- a/sdk/monitor/Azure.Monitor.Ingestion/tsp-location.yaml +++ b/sdk/monitor/Azure.Monitor.Ingestion/tsp-location.yaml @@ -1,4 +1,4 @@ repo: Azure/azure-rest-api-specs directory: specification/monitor/Monitor.Ingestion -commit: 4081040baf95813d6ae4fac980d11d077ed113e6 +commit: e89374a1f5e2c4ddcf34ed01495a98dfedac0f8b emitterPackageJsonPath: "eng/azure-typespec-http-client-csharp-emitter-package.json" diff --git a/sdk/schemaregistry/Azure.Data.SchemaRegistry/src/Azure.Data.SchemaRegistry.csproj b/sdk/schemaregistry/Azure.Data.SchemaRegistry/src/Azure.Data.SchemaRegistry.csproj index 0880d9f9d1c3..bf2a48341fc1 100644 --- a/sdk/schemaregistry/Azure.Data.SchemaRegistry/src/Azure.Data.SchemaRegistry.csproj +++ b/sdk/schemaregistry/Azure.Data.SchemaRegistry/src/Azure.Data.SchemaRegistry.csproj @@ -8,6 +8,7 @@ Azure;Schema Registry;SchemaRegistry;.NET;Data;$(PackageCommonTags) $(RequiredTargetFrameworks) true + false diff --git a/sdk/schemaregistry/Azure.Data.SchemaRegistry/src/DataSchemaRegistryClientBuildExtensions.cs b/sdk/schemaregistry/Azure.Data.SchemaRegistry/src/DataSchemaRegistryClientBuildExtensions.cs deleted file mode 100644 index d09c417ffda1..000000000000 --- a/sdk/schemaregistry/Azure.Data.SchemaRegistry/src/DataSchemaRegistryClientBuildExtensions.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -using Azure.Core; - -namespace Azure.Data.SchemaRegistry -{ - [CodeGenClient("DataSchemaRegistryClientBuilderExtensions")] - internal static partial class DataSchemaRegistryClientBuilderExtensions - { - } -}