From de8bc7c2825a7d7b91284bb7c36eeb619776b093 Mon Sep 17 00:00:00 2001 From: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com> Date: Mon, 11 Nov 2024 13:47:27 -0800 Subject: [PATCH 1/3] Upgraded OpenAI and Azure OpenAI package versions --- dotnet/Directory.Packages.props | 4 ++-- .../ChatCompletion/AzureOpenAIWithData_ChatCompletion.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props index 17db80f3b7bc..e2c7a6a77b22 100644 --- a/dotnet/Directory.Packages.props +++ b/dotnet/Directory.Packages.props @@ -16,9 +16,9 @@ - + - + diff --git a/dotnet/samples/Concepts/ChatCompletion/AzureOpenAIWithData_ChatCompletion.cs b/dotnet/samples/Concepts/ChatCompletion/AzureOpenAIWithData_ChatCompletion.cs index 8cab1da9df40..56dc76277d97 100644 --- a/dotnet/samples/Concepts/ChatCompletion/AzureOpenAIWithData_ChatCompletion.cs +++ b/dotnet/samples/Concepts/ChatCompletion/AzureOpenAIWithData_ChatCompletion.cs @@ -170,7 +170,7 @@ private void OutputCitations(IReadOnlyList citations) Console.WriteLine($"Chunk ID: {citation.ChunkId}"); Console.WriteLine($"Title: {citation.Title}"); Console.WriteLine($"File path: {citation.FilePath}"); - Console.WriteLine($"URI: {citation.Uri}"); + Console.WriteLine($"URL: {citation.Url}"); Console.WriteLine($"Content: {citation.Content}"); } } From 9d5c14169460a807c6ce8c894345914c37e75225 Mon Sep 17 00:00:00 2001 From: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com> Date: Mon, 11 Nov 2024 15:47:00 -0800 Subject: [PATCH 2/3] Fixed unit tests --- .../Services/AzureOpenAIAudioToTextServiceTests.cs | 1 - .../Services/AzureOpenAIChatCompletionServiceTests.cs | 1 - .../Services/AzureOpenAITextEmbeddingGenerationServiceTests.cs | 1 - .../Services/AzureOpenAITextToAudioServiceTests.cs | 1 - .../Services/AzureOpenAITextToImageServiceTests.cs | 1 - 5 files changed, 5 deletions(-) diff --git a/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAIAudioToTextServiceTests.cs b/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAIAudioToTextServiceTests.cs index 0090e37a22ad..05662a5706c8 100644 --- a/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAIAudioToTextServiceTests.cs +++ b/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAIAudioToTextServiceTests.cs @@ -221,7 +221,6 @@ public async Task GetTextContentGranularitiesWorksCorrectlyAsync(string[]? granu public static TheoryData Versions => new() { - { null, "2024-08-01-preview" }, { "V2024_10_01_preview", "2024-10-01-preview" }, { "V2024_10_01_PREVIEW", "2024-10-01-preview" }, { "2024_10_01_Preview", "2024-10-01-preview" }, diff --git a/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAIChatCompletionServiceTests.cs b/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAIChatCompletionServiceTests.cs index 074018f14fe6..0bf81dad8453 100644 --- a/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAIChatCompletionServiceTests.cs +++ b/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAIChatCompletionServiceTests.cs @@ -1537,7 +1537,6 @@ public async Task GetStreamingChatMessageContentsWithFunctionCallAndEmptyArgumen public static TheoryData Versions => new() { - { null, "2024-08-01-preview" }, { "V2024_10_01_preview", "2024-10-01-preview" }, { "V2024_10_01_PREVIEW", "2024-10-01-preview" }, { "2024_10_01_Preview", "2024-10-01-preview" }, diff --git a/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextEmbeddingGenerationServiceTests.cs b/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextEmbeddingGenerationServiceTests.cs index 31f267dd1daf..6dfc0cf9e68b 100644 --- a/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextEmbeddingGenerationServiceTests.cs +++ b/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextEmbeddingGenerationServiceTests.cs @@ -127,7 +127,6 @@ public async Task ItTargetsApiVersionAsExpected(string? apiVersion, string? expe public static TheoryData Versions => new() { - { null, "2024-08-01-preview" }, { "V2024_10_01_preview", "2024-10-01-preview" }, { "V2024_10_01_PREVIEW", "2024-10-01-preview" }, { "2024_10_01_Preview", "2024-10-01-preview" }, diff --git a/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextToAudioServiceTests.cs b/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextToAudioServiceTests.cs index f40bce5635a9..3ad42a32eac6 100644 --- a/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextToAudioServiceTests.cs +++ b/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextToAudioServiceTests.cs @@ -234,7 +234,6 @@ public async Task ItTargetsApiVersionAsExpected(string? apiVersion, string? expe public static TheoryData Versions => new() { - { null, "2024-08-01-preview" }, { "V2024_10_01_preview", "2024-10-01-preview" }, { "V2024_10_01_PREVIEW", "2024-10-01-preview" }, { "2024_10_01_Preview", "2024-10-01-preview" }, diff --git a/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextToImageServiceTests.cs b/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextToImageServiceTests.cs index 4a851a1ea542..d2c9e1081c45 100644 --- a/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextToImageServiceTests.cs +++ b/dotnet/src/Connectors/Connectors.AzureOpenAI.UnitTests/Services/AzureOpenAITextToImageServiceTests.cs @@ -361,7 +361,6 @@ public async Task ItTargetsApiVersionAsExpected(string? apiVersion, string? expe public static TheoryData Versions => new() { - { null, "2024-08-01-preview" }, { "V2024_10_01_preview", "2024-10-01-preview" }, { "V2024_10_01_PREVIEW", "2024-10-01-preview" }, { "2024_10_01_Preview", "2024-10-01-preview" }, From 70fb2bd47e8e0e35fd79ce6222126e97db705063 Mon Sep 17 00:00:00 2001 From: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com> Date: Tue, 12 Nov 2024 07:54:29 -0800 Subject: [PATCH 3/3] Fixed integration tests --- .../AzureOpenAIChatCompletionStreamingTests.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dotnet/src/IntegrationTests/Connectors/AzureOpenAI/AzureOpenAIChatCompletionStreamingTests.cs b/dotnet/src/IntegrationTests/Connectors/AzureOpenAI/AzureOpenAIChatCompletionStreamingTests.cs index e59b33a05f82..1540ff288197 100644 --- a/dotnet/src/IntegrationTests/Connectors/AzureOpenAI/AzureOpenAIChatCompletionStreamingTests.cs +++ b/dotnet/src/IntegrationTests/Connectors/AzureOpenAI/AzureOpenAIChatCompletionStreamingTests.cs @@ -62,7 +62,10 @@ public async Task ChatCompletionShouldUseChatHistoryAndReturnMetadataAsync() foreach (var key in update.Metadata!.Keys) { - metadata[key] = update.Metadata[key]; + if (!metadata.TryGetValue(key, out object? value) || value is null) + { + metadata[key] = update.Metadata[key]; + } } } @@ -123,7 +126,10 @@ public async Task TextGenerationShouldReturnMetadataAsync() foreach (var key in update.Metadata!.Keys) { - metadata[key] = update.Metadata[key]; + if (!metadata.TryGetValue(key, out object? value) || value is null) + { + metadata[key] = update.Metadata[key]; + } } }