diff --git a/Directory.Packages.props b/Directory.Packages.props index 45dce001b87..7a9feb79adb 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -13,7 +13,7 @@ - + @@ -100,7 +100,7 @@ - + diff --git a/eng/Versions.props b/eng/Versions.props index 27d7c6c83f7..c97b5b6dc2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,9 +9,9 @@ net8.0 $(DefaultTargetFramework);net9.0 - 8.0.12 + 8.0.13 - 8.0.404 + 8.0.406 true false @@ -35,46 +35,43 @@ 9.0.0-beta.25077.4 9.0.1-servicing.24603.14 - 9.1.0-preview.1.25064.3 - + 9.3.0-preview.1.25114.11 - 9.1.0 - - 9.1.0 - 9.1.0 - + 9.2.0 + 9.2.0 + 9.2.0 - 9.0.1 + 9.0.2 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 @@ -99,11 +96,11 @@ 8.0.0 8.0.2 8.0.2 - 8.0.2 + 8.0.3 8.0.2 8.0.0 8.0.1 - 8.0.1 + 8.0.2 8.0.5 diff --git a/global.json b/global.json index c2291d5609a..09f88b236bf 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "9.0.102", + "version": "9.0.200", "rollForward": "major", "allowPrerelease": true }, "tools": { - "dotnet": "9.0.102", + "dotnet": "9.0.200", "runtimes": { "dotnet/x64": [ "$(DotNetRuntimePreviousVersionForTesting)" diff --git a/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/Components/Pages/UseIChatClient.razor b/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/Components/Pages/UseIChatClient.razor index 69e3e68db24..2244ce8c695 100644 --- a/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/Components/Pages/UseIChatClient.razor +++ b/playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/Components/Pages/UseIChatClient.razor @@ -26,7 +26,7 @@ chatMessages.Add(new (ChatRole.User, "Write the next sentence in the story.")); } - var response = await aiClient.CompleteAsync(chatMessages); + var response = await aiClient.GetResponseAsync(chatMessages); chatMessages.Add(response.Message); } diff --git a/src/Components/Aspire.OpenAI/MEAIPackageOverrides.targets b/src/Components/Aspire.OpenAI/MEAIPackageOverrides.targets index 99fe033fc33..fbe22a9e83a 100644 --- a/src/Components/Aspire.OpenAI/MEAIPackageOverrides.targets +++ b/src/Components/Aspire.OpenAI/MEAIPackageOverrides.targets @@ -5,9 +5,9 @@ to avoid "package downgrade" build errors. This is only used when referencing Aspire.OpenAI and doesn't break compatibility with net8.0. --> - - - - + + + + diff --git a/tests/Aspire.Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderChatClientExtensionsTests.cs b/tests/Aspire.Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderChatClientExtensionsTests.cs index 26705f40155..67711ed8adb 100644 --- a/tests/Aspire.Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderChatClientExtensionsTests.cs +++ b/tests/Aspire.Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderChatClientExtensionsTests.cs @@ -37,7 +37,7 @@ public void CanReadDeploymentNameFromConfig(bool useKeyed) host.Services.GetRequiredService(); Assert.NotNull(client); - Assert.Equal("testdeployment1", client.Metadata.ModelId); + Assert.Equal("testdeployment1", client.GetService()?.ModelId); } [Theory] @@ -67,7 +67,7 @@ public void CanReadDeploymentNameFromConnectionString(bool useKeyed, string conn host.Services.GetRequiredService(); Assert.NotNull(client); - Assert.Equal("testdeployment1", client.Metadata.ModelId); + Assert.Equal("testdeployment1", client.GetService()?.ModelId); } [Theory] @@ -95,7 +95,7 @@ public void CanAcceptDeploymentNameAsArgument(bool useKeyed) host.Services.GetRequiredService(); Assert.NotNull(client); - Assert.Equal("testdeployment1", client.Metadata.ModelId); + Assert.Equal("testdeployment1", client.GetService()?.ModelId); } [Theory] @@ -214,10 +214,10 @@ public async Task CanConfigurePipelineAsync(bool useKeyed) host.Services.GetRequiredKeyedService("openai_chatclient") : host.Services.GetRequiredService(); - var completion = await client.CompleteAsync("Whatever"); + var completion = await client.GetResponseAsync("Whatever"); Assert.Equal("Hello from middleware", completion.Message.Text); - static Task TestMiddleware(IList list, ChatOptions? options, IChatClient client, CancellationToken token) - => Task.FromResult(new ChatCompletion(new ChatMessage(ChatRole.Assistant, "Hello from middleware"))); + static Task TestMiddleware(IList list, ChatOptions? options, IChatClient client, CancellationToken token) + => Task.FromResult(new ChatResponse(new ChatMessage(ChatRole.Assistant, "Hello from middleware"))); } } diff --git a/tests/Aspire.Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderEmbeddingGeneratorExtensionsTests.cs b/tests/Aspire.Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderEmbeddingGeneratorExtensionsTests.cs index 1f600a76e6d..4fcb25bbcdb 100644 --- a/tests/Aspire.Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderEmbeddingGeneratorExtensionsTests.cs +++ b/tests/Aspire.Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderEmbeddingGeneratorExtensionsTests.cs @@ -37,7 +37,7 @@ public void CanReadDeploymentNameFromConfig(bool useKeyed) host.Services.GetRequiredService>>(); Assert.NotNull(generator); - Assert.Equal("testdeployment1", generator.Metadata.ModelId); + Assert.Equal("testdeployment1", generator.GetService()?.ModelId); } [Theory] @@ -67,7 +67,7 @@ public void CanReadDeploymentNameFromConnectionString(bool useKeyed, string conn host.Services.GetRequiredService>>(); Assert.NotNull(generator); - Assert.Equal("testdeployment1", generator.Metadata.ModelId); + Assert.Equal("testdeployment1", generator.GetService()?.ModelId); } [Theory] @@ -95,7 +95,7 @@ public void CanAcceptDeploymentNameAsArgument(bool useKeyed) host.Services.GetRequiredService>>(); Assert.NotNull(generator); - Assert.Equal("testdeployment1", generator.Metadata.ModelId); + Assert.Equal("testdeployment1", generator.GetService()?.ModelId); } [Theory] diff --git a/tests/Aspire.OpenAI.Tests/AspireOpenAIClientBuilderChatClientExtensionsTests.cs b/tests/Aspire.OpenAI.Tests/AspireOpenAIClientBuilderChatClientExtensionsTests.cs index 53bc8e94c23..601ef2d541a 100644 --- a/tests/Aspire.OpenAI.Tests/AspireOpenAIClientBuilderChatClientExtensionsTests.cs +++ b/tests/Aspire.OpenAI.Tests/AspireOpenAIClientBuilderChatClientExtensionsTests.cs @@ -38,7 +38,7 @@ public void CanReadDeploymentNameFromConfig(bool useKeyed) host.Services.GetRequiredService(); Assert.NotNull(client); - Assert.Equal("testdeployment1", client.Metadata.ModelId); + Assert.Equal("testdeployment1", client.GetService()?.ModelId); } [Theory] @@ -68,7 +68,7 @@ public void CanReadDeploymentNameFromConnectionString(bool useKeyed, string conn host.Services.GetRequiredService(); Assert.NotNull(client); - Assert.Equal("testdeployment1", client.Metadata.ModelId); + Assert.Equal("testdeployment1", client.GetService()?.ModelId); } [Theory] @@ -96,7 +96,7 @@ public void CanAcceptDeploymentNameAsArgument(bool useKeyed) host.Services.GetRequiredService(); Assert.NotNull(client); - Assert.Equal("testdeployment1", client.Metadata.ModelId); + Assert.Equal("testdeployment1", client.GetService()?.ModelId); } [Theory] @@ -215,10 +215,10 @@ public async Task CanConfigurePipelineAsync(bool useKeyed) host.Services.GetRequiredKeyedService("openai_chatclient") : host.Services.GetRequiredService(); - var completion = await client.CompleteAsync("Whatever"); + var completion = await client.GetResponseAsync("Whatever"); Assert.Equal("Hello from middleware", completion.Message.Text); - static Task TestMiddleware(IList list, ChatOptions? options, IChatClient client, CancellationToken token) - => Task.FromResult(new ChatCompletion(new ChatMessage(ChatRole.Assistant, "Hello from middleware"))); + static Task TestMiddleware(IList list, ChatOptions? options, IChatClient client, CancellationToken token) + => Task.FromResult(new ChatResponse(new ChatMessage(ChatRole.Assistant, "Hello from middleware"))); } } diff --git a/tests/Aspire.OpenAI.Tests/AspireOpenAIClientBuilderEmbeddingGeneratorExtensionsTests.cs b/tests/Aspire.OpenAI.Tests/AspireOpenAIClientBuilderEmbeddingGeneratorExtensionsTests.cs index 55290088766..8d06557172d 100644 --- a/tests/Aspire.OpenAI.Tests/AspireOpenAIClientBuilderEmbeddingGeneratorExtensionsTests.cs +++ b/tests/Aspire.OpenAI.Tests/AspireOpenAIClientBuilderEmbeddingGeneratorExtensionsTests.cs @@ -38,7 +38,7 @@ public void CanReadDeploymentNameFromConfig(bool useKeyed) host.Services.GetRequiredService>>(); Assert.NotNull(generator); - Assert.Equal("testdeployment1", generator.Metadata.ModelId); + Assert.Equal("testdeployment1", generator.GetService()?.ModelId); } [Theory] @@ -68,7 +68,7 @@ public void CanReadDeploymentNameFromConnectionString(bool useKeyed, string conn host.Services.GetRequiredService>>(); Assert.NotNull(generator); - Assert.Equal("testdeployment1", generator.Metadata.ModelId); + Assert.Equal("testdeployment1", generator.GetService()?.ModelId); } [Theory] @@ -96,7 +96,7 @@ public void CanAcceptDeploymentNameAsArgument(bool useKeyed) host.Services.GetRequiredService>>(); Assert.NotNull(generator); - Assert.Equal("testdeployment1", generator.Metadata.ModelId); + Assert.Equal("testdeployment1", generator.GetService()?.ModelId); } [Theory]