From 350691099b5d3757c905fc6946af0a63405caa0c Mon Sep 17 00:00:00 2001 From: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:13:16 -0700 Subject: [PATCH 1/3] Updated integration tests --- .../Connectors/OpenAI/OpenAITextToImageTests.cs | 4 ++-- .../Planners/Handlebars/HandlebarsPlannerTests.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAITextToImageTests.cs b/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAITextToImageTests.cs index 85512760dcd0..d623a35d2ed5 100644 --- a/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAITextToImageTests.cs +++ b/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAITextToImageTests.cs @@ -23,7 +23,7 @@ public sealed class OpenAITextToImageTests public async Task OpenAITextToImageByModelTestAsync(string modelId, int width, int height) { // Arrange - OpenAIConfiguration? openAIConfiguration = this._configuration.GetSection("OpenAITextToImage").Get(); + OpenAIConfiguration? openAIConfiguration = this._configuration.GetSection("OpenAI").Get(); Assert.NotNull(openAIConfiguration); var kernel = Kernel.CreateBuilder() @@ -44,7 +44,7 @@ public async Task OpenAITextToImageByModelTestAsync(string modelId, int width, i public async Task OpenAITextToImageUseDallE2ByDefaultAsync() { // Arrange - OpenAIConfiguration? openAIConfiguration = this._configuration.GetSection("OpenAITextToImage").Get(); + OpenAIConfiguration? openAIConfiguration = this._configuration.GetSection("OpenAI").Get(); Assert.NotNull(openAIConfiguration); var kernel = Kernel.CreateBuilder() diff --git a/dotnet/src/IntegrationTests/Planners/Handlebars/HandlebarsPlannerTests.cs b/dotnet/src/IntegrationTests/Planners/Handlebars/HandlebarsPlannerTests.cs index 5ed6d6364d6d..eca5582891c1 100644 --- a/dotnet/src/IntegrationTests/Planners/Handlebars/HandlebarsPlannerTests.cs +++ b/dotnet/src/IntegrationTests/Planners/Handlebars/HandlebarsPlannerTests.cs @@ -16,7 +16,7 @@ namespace SemanticKernel.IntegrationTests.Planners.Handlebars; public sealed class HandlebarsPlannerTests { - [Theory] + [Theory(Skip = "This test if for manual verification.")] [InlineData("Write a joke and send it in an e-mail to Kai.", "SendEmail", "test")] public async Task CreatePlanFunctionFlowAsync(string goal, string expectedFunction, string expectedPlugin) { @@ -37,7 +37,7 @@ public async Task CreatePlanFunctionFlowAsync(string goal, string expectedFuncti ); } - [RetryTheory] + [RetryTheory(Skip = "This test if for manual verification.")] [InlineData("Write a novel about software development that is 3 chapters long.", "NovelChapter", "WriterPlugin")] public async Task CreatePlanWithDefaultsAsync(string goal, string expectedFunction, string expectedPlugin) { @@ -56,7 +56,7 @@ public async Task CreatePlanWithDefaultsAsync(string goal, string expectedFuncti ); } - [Theory] + [Theory(Skip = "This test if for manual verification.")] [InlineData("List each property of the default Qux object.", "## Complex types", """ ### Qux: { From 102d17be63c1716539dda82c5f7bf0b4066609a8 Mon Sep 17 00:00:00 2001 From: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:22:35 -0700 Subject: [PATCH 2/3] Added configuration for text-to-image --- .github/workflows/dotnet-build-and-test.yml | 2 ++ .../Connectors/OpenAI/OpenAITextToImageTests.cs | 4 ++-- dotnet/src/IntegrationTests/testsettings.json | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-build-and-test.yml b/.github/workflows/dotnet-build-and-test.yml index f1a692b80074..dd83478b508b 100644 --- a/.github/workflows/dotnet-build-and-test.yml +++ b/.github/workflows/dotnet-build-and-test.yml @@ -111,6 +111,8 @@ jobs: OpenAITextToAudio__ModelId: ${{ vars.OPENAITEXTTOAUDIO__MODELID }} OpenAIAudioToText__ApiKey: ${{ secrets.OPENAIAUDIOTOTEXT__APIKEY }} OpenAIAudioToText__ModelId: ${{ vars.OPENAIAUDIOTOTEXT__MODELID }} + OpenAITextToImage__ApiKey: ${{ secrets.OPENAITEXTTOIMAGE__APIKEY }} + OpenAITextToImage__ModelId: ${{ vars.OPENAITEXTTOIMAGE__MODELID }} AzureOpenAITextToAudio__ApiKey: ${{ secrets.AZUREOPENAITEXTTOAUDIO__APIKEY }} AzureOpenAITextToAudio__Endpoint: ${{ secrets.AZUREOPENAITEXTTOAUDIO__ENDPOINT }} AzureOpenAITextToAudio__DeploymentName: ${{ vars.AZUREOPENAITEXTTOAUDIO__DEPLOYMENTNAME }} diff --git a/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAITextToImageTests.cs b/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAITextToImageTests.cs index d623a35d2ed5..85512760dcd0 100644 --- a/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAITextToImageTests.cs +++ b/dotnet/src/IntegrationTests/Connectors/OpenAI/OpenAITextToImageTests.cs @@ -23,7 +23,7 @@ public sealed class OpenAITextToImageTests public async Task OpenAITextToImageByModelTestAsync(string modelId, int width, int height) { // Arrange - OpenAIConfiguration? openAIConfiguration = this._configuration.GetSection("OpenAI").Get(); + OpenAIConfiguration? openAIConfiguration = this._configuration.GetSection("OpenAITextToImage").Get(); Assert.NotNull(openAIConfiguration); var kernel = Kernel.CreateBuilder() @@ -44,7 +44,7 @@ public async Task OpenAITextToImageByModelTestAsync(string modelId, int width, i public async Task OpenAITextToImageUseDallE2ByDefaultAsync() { // Arrange - OpenAIConfiguration? openAIConfiguration = this._configuration.GetSection("OpenAI").Get(); + OpenAIConfiguration? openAIConfiguration = this._configuration.GetSection("OpenAITextToImage").Get(); Assert.NotNull(openAIConfiguration); var kernel = Kernel.CreateBuilder() diff --git a/dotnet/src/IntegrationTests/testsettings.json b/dotnet/src/IntegrationTests/testsettings.json index c3a0c04301b5..131881900692 100644 --- a/dotnet/src/IntegrationTests/testsettings.json +++ b/dotnet/src/IntegrationTests/testsettings.json @@ -45,6 +45,10 @@ "Endpoint": "", "ApiKey": "" }, + "OpenAITextToImage": { + "ModelId": "dall-e-2", + "ApiKey": "" + }, "AzureOpenAITextToImage": { "ServiceId": "azure-dalle3", "DeploymentName": "dall-e-3", From 678b75ca2a893a9e10c87be19c6c54a8964c9a14 Mon Sep 17 00:00:00 2001 From: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com> Date: Tue, 3 Sep 2024 16:24:57 -0700 Subject: [PATCH 3/3] Fixed typo --- .../Planners/Handlebars/HandlebarsPlannerTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dotnet/src/IntegrationTests/Planners/Handlebars/HandlebarsPlannerTests.cs b/dotnet/src/IntegrationTests/Planners/Handlebars/HandlebarsPlannerTests.cs index eca5582891c1..bae2d4b98742 100644 --- a/dotnet/src/IntegrationTests/Planners/Handlebars/HandlebarsPlannerTests.cs +++ b/dotnet/src/IntegrationTests/Planners/Handlebars/HandlebarsPlannerTests.cs @@ -16,7 +16,7 @@ namespace SemanticKernel.IntegrationTests.Planners.Handlebars; public sealed class HandlebarsPlannerTests { - [Theory(Skip = "This test if for manual verification.")] + [Theory(Skip = "This test is for manual verification.")] [InlineData("Write a joke and send it in an e-mail to Kai.", "SendEmail", "test")] public async Task CreatePlanFunctionFlowAsync(string goal, string expectedFunction, string expectedPlugin) { @@ -37,7 +37,7 @@ public async Task CreatePlanFunctionFlowAsync(string goal, string expectedFuncti ); } - [RetryTheory(Skip = "This test if for manual verification.")] + [RetryTheory(Skip = "This test is for manual verification.")] [InlineData("Write a novel about software development that is 3 chapters long.", "NovelChapter", "WriterPlugin")] public async Task CreatePlanWithDefaultsAsync(string goal, string expectedFunction, string expectedPlugin) { @@ -56,7 +56,7 @@ public async Task CreatePlanWithDefaultsAsync(string goal, string expectedFuncti ); } - [Theory(Skip = "This test if for manual verification.")] + [Theory(Skip = "This test is for manual verification.")] [InlineData("List each property of the default Qux object.", "## Complex types", """ ### Qux: {