From cd463b871e71ebe7573b02fefcdeaf035ecb8d10 Mon Sep 17 00:00:00 2001 From: SergeyMenshykh <68852919+SergeyMenshykh@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:35:36 +0000 Subject: [PATCH] .Net AudioContent class moved to the Microsoft.SemanticKernel namespace (#5112) The AudioContent class lives in the Microsoft.SemanticKernel.Contents namespace, while the other content classes reside in the Microsoft.SemanticKernel namespace. This PR moves the AudioContent class to the Microsoft.SemanticKernel namespace to align it with the other content classes. --------- Co-authored-by: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com> --- .../KernelSyntaxExamples/Example82_Audio.cs | 1 - .../AzureOpenAIAudioToTextService.cs | 1 - .../AudioToText/OpenAIAudioToTextService.cs | 1 - .../AzureSdk/AzureOpenAITextToAudioClient.cs | 1 - .../Connectors.OpenAI/AzureSdk/ClientCore.cs | 1 - .../AzureSdk/OpenAITextToAudioClient.cs | 1 - .../CompatibilitySuppressions.xml | 32 +++++++++++++++ .../AzureOpenAITextToAudioService.cs | 1 - .../TextToAudio/OpenAITextToAudioService.cs | 1 - .../AzureOpenAIAudioToTextServiceTests.cs | 2 +- .../OpenAIAudioToTextServiceTests.cs | 2 +- .../OpenAI/OpenAIAudioToTextTests.cs | 2 +- .../AI/AudioToText/IAudioToTextService.cs | 1 - .../AI/TextToAudio/ITextToAudioService.cs | 1 - .../CompatibilitySuppressions.xml | 39 +++++++++++++++++++ .../Contents/AudioContent.cs | 2 +- 16 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 dotnet/src/Connectors/Connectors.OpenAI/CompatibilitySuppressions.xml create mode 100644 dotnet/src/SemanticKernel.Abstractions/CompatibilitySuppressions.xml diff --git a/dotnet/samples/KernelSyntaxExamples/Example82_Audio.cs b/dotnet/samples/KernelSyntaxExamples/Example82_Audio.cs index 726198458b..ceeff43323 100644 --- a/dotnet/samples/KernelSyntaxExamples/Example82_Audio.cs +++ b/dotnet/samples/KernelSyntaxExamples/Example82_Audio.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Microsoft.SemanticKernel; using Microsoft.SemanticKernel.AudioToText; using Microsoft.SemanticKernel.Connectors.OpenAI; -using Microsoft.SemanticKernel.Contents; using Microsoft.SemanticKernel.TextToAudio; using Xunit; using Xunit.Abstractions; diff --git a/dotnet/src/Connectors/Connectors.OpenAI/AudioToText/AzureOpenAIAudioToTextService.cs b/dotnet/src/Connectors/Connectors.OpenAI/AudioToText/AzureOpenAIAudioToTextService.cs index 602fd2e928..3a7666a13b 100644 --- a/dotnet/src/Connectors/Connectors.OpenAI/AudioToText/AzureOpenAIAudioToTextService.cs +++ b/dotnet/src/Connectors/Connectors.OpenAI/AudioToText/AzureOpenAIAudioToTextService.cs @@ -9,7 +9,6 @@ using Azure.AI.OpenAI; using Azure.Core; using Microsoft.Extensions.Logging; using Microsoft.SemanticKernel.AudioToText; -using Microsoft.SemanticKernel.Contents; using Microsoft.SemanticKernel.Services; namespace Microsoft.SemanticKernel.Connectors.OpenAI; diff --git a/dotnet/src/Connectors/Connectors.OpenAI/AudioToText/OpenAIAudioToTextService.cs b/dotnet/src/Connectors/Connectors.OpenAI/AudioToText/OpenAIAudioToTextService.cs index 762d3b565a..4d5c2bfb78 100644 --- a/dotnet/src/Connectors/Connectors.OpenAI/AudioToText/OpenAIAudioToTextService.cs +++ b/dotnet/src/Connectors/Connectors.OpenAI/AudioToText/OpenAIAudioToTextService.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using Azure.AI.OpenAI; using Microsoft.Extensions.Logging; using Microsoft.SemanticKernel.AudioToText; -using Microsoft.SemanticKernel.Contents; using Microsoft.SemanticKernel.Services; namespace Microsoft.SemanticKernel.Connectors.OpenAI; diff --git a/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/AzureOpenAITextToAudioClient.cs b/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/AzureOpenAITextToAudioClient.cs index c8beeb291c..5173824da6 100644 --- a/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/AzureOpenAITextToAudioClient.cs +++ b/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/AzureOpenAITextToAudioClient.cs @@ -8,7 +8,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.SemanticKernel.Contents; using Microsoft.SemanticKernel.Http; namespace Microsoft.SemanticKernel.Connectors.OpenAI; diff --git a/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/ClientCore.cs b/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/ClientCore.cs index 62826887c9..8e83aa9927 100644 --- a/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/ClientCore.cs +++ b/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/ClientCore.cs @@ -18,7 +18,6 @@ using Azure.Core.Pipeline; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.SemanticKernel.ChatCompletion; -using Microsoft.SemanticKernel.Contents; using Microsoft.SemanticKernel.Http; #pragma warning disable CA2208 // Instantiate argument exceptions correctly diff --git a/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/OpenAITextToAudioClient.cs b/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/OpenAITextToAudioClient.cs index 134f14f171..54a5f2b193 100644 --- a/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/OpenAITextToAudioClient.cs +++ b/dotnet/src/Connectors/Connectors.OpenAI/AzureSdk/OpenAITextToAudioClient.cs @@ -8,7 +8,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.SemanticKernel.Contents; using Microsoft.SemanticKernel.Http; namespace Microsoft.SemanticKernel.Connectors.OpenAI; diff --git a/dotnet/src/Connectors/Connectors.OpenAI/CompatibilitySuppressions.xml b/dotnet/src/Connectors/Connectors.OpenAI/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..29a0a63180 --- /dev/null +++ b/dotnet/src/Connectors/Connectors.OpenAI/CompatibilitySuppressions.xml @@ -0,0 +1,32 @@ + + + + + CP0002 + M:Microsoft.SemanticKernel.Connectors.OpenAI.AzureOpenAIAudioToTextService.GetTextContentAsync(Microsoft.SemanticKernel.Contents.AudioContent,Microsoft.SemanticKernel.PromptExecutionSettings,Microsoft.SemanticKernel.Kernel,System.Threading.CancellationToken) + lib/netstandard2.0/Microsoft.SemanticKernel.Connectors.OpenAI.dll + lib/netstandard2.0/Microsoft.SemanticKernel.Connectors.OpenAI.dll + true + + + CP0002 + M:Microsoft.SemanticKernel.Connectors.OpenAI.AzureOpenAITextToAudioService.GetAudioContentAsync(System.String,Microsoft.SemanticKernel.PromptExecutionSettings,Microsoft.SemanticKernel.Kernel,System.Threading.CancellationToken) + lib/netstandard2.0/Microsoft.SemanticKernel.Connectors.OpenAI.dll + lib/netstandard2.0/Microsoft.SemanticKernel.Connectors.OpenAI.dll + true + + + CP0002 + M:Microsoft.SemanticKernel.Connectors.OpenAI.OpenAIAudioToTextService.GetTextContentAsync(Microsoft.SemanticKernel.Contents.AudioContent,Microsoft.SemanticKernel.PromptExecutionSettings,Microsoft.SemanticKernel.Kernel,System.Threading.CancellationToken) + lib/netstandard2.0/Microsoft.SemanticKernel.Connectors.OpenAI.dll + lib/netstandard2.0/Microsoft.SemanticKernel.Connectors.OpenAI.dll + true + + + CP0002 + M:Microsoft.SemanticKernel.Connectors.OpenAI.OpenAITextToAudioService.GetAudioContentAsync(System.String,Microsoft.SemanticKernel.PromptExecutionSettings,Microsoft.SemanticKernel.Kernel,System.Threading.CancellationToken) + lib/netstandard2.0/Microsoft.SemanticKernel.Connectors.OpenAI.dll + lib/netstandard2.0/Microsoft.SemanticKernel.Connectors.OpenAI.dll + true + + \ No newline at end of file diff --git a/dotnet/src/Connectors/Connectors.OpenAI/TextToAudio/AzureOpenAITextToAudioService.cs b/dotnet/src/Connectors/Connectors.OpenAI/TextToAudio/AzureOpenAITextToAudioService.cs index 838b63555a..0b85d5ec5e 100644 --- a/dotnet/src/Connectors/Connectors.OpenAI/TextToAudio/AzureOpenAITextToAudioService.cs +++ b/dotnet/src/Connectors/Connectors.OpenAI/TextToAudio/AzureOpenAITextToAudioService.cs @@ -6,7 +6,6 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Microsoft.SemanticKernel.Contents; using Microsoft.SemanticKernel.Services; using Microsoft.SemanticKernel.TextToAudio; diff --git a/dotnet/src/Connectors/Connectors.OpenAI/TextToAudio/OpenAITextToAudioService.cs b/dotnet/src/Connectors/Connectors.OpenAI/TextToAudio/OpenAITextToAudioService.cs index 6236e666a9..695003d7ac 100644 --- a/dotnet/src/Connectors/Connectors.OpenAI/TextToAudio/OpenAITextToAudioService.cs +++ b/dotnet/src/Connectors/Connectors.OpenAI/TextToAudio/OpenAITextToAudioService.cs @@ -6,7 +6,6 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Microsoft.SemanticKernel.Contents; using Microsoft.SemanticKernel.Services; using Microsoft.SemanticKernel.TextToAudio; diff --git a/dotnet/src/Connectors/Connectors.UnitTests/OpenAI/AudioToText/AzureOpenAIAudioToTextServiceTests.cs b/dotnet/src/Connectors/Connectors.UnitTests/OpenAI/AudioToText/AzureOpenAIAudioToTextServiceTests.cs index a8b353644d..6cbde3d3a3 100644 --- a/dotnet/src/Connectors/Connectors.UnitTests/OpenAI/AudioToText/AzureOpenAIAudioToTextServiceTests.cs +++ b/dotnet/src/Connectors/Connectors.UnitTests/OpenAI/AudioToText/AzureOpenAIAudioToTextServiceTests.cs @@ -6,8 +6,8 @@ using System.Threading.Tasks; using Azure.AI.OpenAI; using Azure.Core; using Microsoft.Extensions.Logging; +using Microsoft.SemanticKernel; using Microsoft.SemanticKernel.Connectors.OpenAI; -using Microsoft.SemanticKernel.Contents; using Moq; using Xunit; diff --git a/dotnet/src/Connectors/Connectors.UnitTests/OpenAI/AudioToText/OpenAIAudioToTextServiceTests.cs b/dotnet/src/Connectors/Connectors.UnitTests/OpenAI/AudioToText/OpenAIAudioToTextServiceTests.cs index 24a0afe57a..2f221f287a 100644 --- a/dotnet/src/Connectors/Connectors.UnitTests/OpenAI/AudioToText/OpenAIAudioToTextServiceTests.cs +++ b/dotnet/src/Connectors/Connectors.UnitTests/OpenAI/AudioToText/OpenAIAudioToTextServiceTests.cs @@ -5,8 +5,8 @@ using System.Net.Http; using System.Threading.Tasks; using Azure.AI.OpenAI; using Microsoft.Extensions.Logging; +using Microsoft.SemanticKernel; using Microsoft.SemanticKernel.Connectors.OpenAI; -using Microsoft.SemanticKernel.Contents; using Moq; using Xunit; diff --git a/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAIAudioToTextTests.cs b/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAIAudioToTextTests.cs index 157c57088f..0df376bda0 100644 --- a/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAIAudioToTextTests.cs +++ b/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAIAudioToTextTests.cs @@ -4,8 +4,8 @@ using System; using System.IO; using System.Threading.Tasks; using Microsoft.Extensions.Configuration; +using Microsoft.SemanticKernel; using Microsoft.SemanticKernel.Connectors.OpenAI; -using Microsoft.SemanticKernel.Contents; using SemanticKernel.IntegrationTests.TestSettings; using Xunit; using Xunit.Abstractions; diff --git a/dotnet/src/SemanticKernel.Abstractions/AI/AudioToText/IAudioToTextService.cs b/dotnet/src/SemanticKernel.Abstractions/AI/AudioToText/IAudioToTextService.cs index d98ee75c8c..eab60a260d 100644 --- a/dotnet/src/SemanticKernel.Abstractions/AI/AudioToText/IAudioToTextService.cs +++ b/dotnet/src/SemanticKernel.Abstractions/AI/AudioToText/IAudioToTextService.cs @@ -3,7 +3,6 @@ using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; -using Microsoft.SemanticKernel.Contents; using Microsoft.SemanticKernel.Services; namespace Microsoft.SemanticKernel.AudioToText; diff --git a/dotnet/src/SemanticKernel.Abstractions/AI/TextToAudio/ITextToAudioService.cs b/dotnet/src/SemanticKernel.Abstractions/AI/TextToAudio/ITextToAudioService.cs index 178556fc76..3d8fd3a5b5 100644 --- a/dotnet/src/SemanticKernel.Abstractions/AI/TextToAudio/ITextToAudioService.cs +++ b/dotnet/src/SemanticKernel.Abstractions/AI/TextToAudio/ITextToAudioService.cs @@ -3,7 +3,6 @@ using System.Diagnostics.CodeAnalysis; using System.Threading; using System.Threading.Tasks; -using Microsoft.SemanticKernel.Contents; using Microsoft.SemanticKernel.Services; namespace Microsoft.SemanticKernel.TextToAudio; diff --git a/dotnet/src/SemanticKernel.Abstractions/CompatibilitySuppressions.xml b/dotnet/src/SemanticKernel.Abstractions/CompatibilitySuppressions.xml new file mode 100644 index 0000000000..6f64074864 --- /dev/null +++ b/dotnet/src/SemanticKernel.Abstractions/CompatibilitySuppressions.xml @@ -0,0 +1,39 @@ + + + + + CP0001 + T:Microsoft.SemanticKernel.Contents.AudioContent + lib/netstandard2.0/Microsoft.SemanticKernel.Abstractions.dll + lib/netstandard2.0/Microsoft.SemanticKernel.Abstractions.dll + true + + + CP0002 + M:Microsoft.SemanticKernel.AudioToText.IAudioToTextService.GetTextContentAsync(Microsoft.SemanticKernel.Contents.AudioContent,Microsoft.SemanticKernel.PromptExecutionSettings,Microsoft.SemanticKernel.Kernel,System.Threading.CancellationToken) + lib/netstandard2.0/Microsoft.SemanticKernel.Abstractions.dll + lib/netstandard2.0/Microsoft.SemanticKernel.Abstractions.dll + true + + + CP0002 + M:Microsoft.SemanticKernel.TextToAudio.ITextToAudioService.GetAudioContentAsync(System.String,Microsoft.SemanticKernel.PromptExecutionSettings,Microsoft.SemanticKernel.Kernel,System.Threading.CancellationToken) + lib/netstandard2.0/Microsoft.SemanticKernel.Abstractions.dll + lib/netstandard2.0/Microsoft.SemanticKernel.Abstractions.dll + true + + + CP0006 + M:Microsoft.SemanticKernel.AudioToText.IAudioToTextService.GetTextContentAsync(Microsoft.SemanticKernel.AudioContent,Microsoft.SemanticKernel.PromptExecutionSettings,Microsoft.SemanticKernel.Kernel,System.Threading.CancellationToken) + lib/netstandard2.0/Microsoft.SemanticKernel.Abstractions.dll + lib/netstandard2.0/Microsoft.SemanticKernel.Abstractions.dll + true + + + CP0006 + M:Microsoft.SemanticKernel.TextToAudio.ITextToAudioService.GetAudioContentAsync(System.String,Microsoft.SemanticKernel.PromptExecutionSettings,Microsoft.SemanticKernel.Kernel,System.Threading.CancellationToken) + lib/netstandard2.0/Microsoft.SemanticKernel.Abstractions.dll + lib/netstandard2.0/Microsoft.SemanticKernel.Abstractions.dll + true + + \ No newline at end of file diff --git a/dotnet/src/SemanticKernel.Abstractions/Contents/AudioContent.cs b/dotnet/src/SemanticKernel.Abstractions/Contents/AudioContent.cs index 33493415f0..28096844c3 100644 --- a/dotnet/src/SemanticKernel.Abstractions/Contents/AudioContent.cs +++ b/dotnet/src/SemanticKernel.Abstractions/Contents/AudioContent.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; -namespace Microsoft.SemanticKernel.Contents; +namespace Microsoft.SemanticKernel; /// /// Represents audio content.