Skip to content

Update Microsoft.Extensions.AI to 9.3.0-preview.1.25114.11 #7643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 18, 2025
Merged

Update Microsoft.Extensions.AI to 9.3.0-preview.1.25114.11 #7643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abc4702
Update Microsoft.Extensions.AI to 9.3.0-preview.1.25114.11
stephentoub Feb 17, 2025
79c221c
Update to latest .NET versions
eerhardt Feb 18, 2025
636d187
Update code for updated MEAI APIs
eerhardt Feb 18, 2025
76f7e37
Apply suggestions from code review
stephentoub Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>
<ItemGroup>
<!-- Azure SDK for .NET dependencies -->
<PackageVersion Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageVersion Include="Azure.AI.OpenAI" Version="2.2.0-beta.1" />
<PackageVersion Include="Azure.Data.Tables" Version="12.10.0" />
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
<PackageVersion Include="Azure.Messaging.EventHubs" Version="5.11.5" />
Expand Down Expand Up @@ -100,7 +100,7 @@
<PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" />
<PackageVersion Include="NATS.Net" Version="2.5.3" />
<PackageVersion Include="Npgsql.DependencyInjection" Version="9.0.2" />
<PackageVersion Include="OpenAI" Version="2.1.0" />
<PackageVersion Include="OpenAI" Version="2.2.0-beta.1" />
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.60" />
<PackageVersion Include="Oracle.ManagedDataAccess.OpenTelemetry" Version="23.6.0" />
<PackageVersion Include="Polly.Core" Version="8.5.1" />
Expand Down
66 changes: 33 additions & 33 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<DefaultTargetFramework>net8.0</DefaultTargetFramework>
<AllTargetFrameworks>$(DefaultTargetFramework);net9.0</AllTargetFrameworks>
<!-- dotnet 8.0 versions for running tests -->
<DotNetRuntimePreviousVersionForTesting>8.0.12</DotNetRuntimePreviousVersionForTesting>
<DotNetRuntimePreviousVersionForTesting>8.0.13</DotNetRuntimePreviousVersionForTesting>
<!-- dotnet 8.0 versions for running tests - used for workload tests -->
<DotNetSdkPreviousVersionForTesting>8.0.404</DotNetSdkPreviousVersionForTesting>
<DotNetSdkPreviousVersionForTesting>8.0.406</DotNetSdkPreviousVersionForTesting>
<UseVSTestRunner>true</UseVSTestRunner>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
Expand All @@ -35,43 +35,43 @@
<MicrosoftDotNetBuildTasksWorkloadsVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksWorkloadsVersion>
<MicrosoftNETRuntimeWorkloadTestingInternalVersion>9.0.1-servicing.24603.14</MicrosoftNETRuntimeWorkloadTestingInternalVersion>
<!-- dotnet/extensions -->
<MicrosoftExtensionsAIVersion>9.1.0-preview.1.25064.3</MicrosoftExtensionsAIVersion>
<MicrosoftExtensionsAIVersion>9.3.0-preview.1.25114.11</MicrosoftExtensionsAIVersion>
<!-- when updating this, also update cgmanifest.json as it is consumed in templates -->
<MicrosoftExtensionsHttpResilienceVersion>9.1.0</MicrosoftExtensionsHttpResilienceVersion>
<MicrosoftExtensionsDiagnosticsTestingVersion>9.1.0</MicrosoftExtensionsDiagnosticsTestingVersion>
<MicrosoftExtensionsTimeProviderTestingVersion>9.1.0</MicrosoftExtensionsTimeProviderTestingVersion>
<MicrosoftExtensionsHttpResilienceVersion>9.2.0</MicrosoftExtensionsHttpResilienceVersion>
<MicrosoftExtensionsDiagnosticsTestingVersion>9.2.0</MicrosoftExtensionsDiagnosticsTestingVersion>
<MicrosoftExtensionsTimeProviderTestingVersion>9.2.0</MicrosoftExtensionsTimeProviderTestingVersion>
<!-- for templates -->
<MicrosoftAspNetCorePackageVersionForNet9>9.0.1</MicrosoftAspNetCorePackageVersionForNet9>
<MicrosoftAspNetCorePackageVersionForNet9>9.0.2</MicrosoftAspNetCorePackageVersionForNet9>
</PropertyGroup>
<!-- .NET 9.0 Package Versions -->
<PropertyGroup Label="Current">
<!-- EF -->
<MicrosoftEntityFrameworkCoreCosmosVersion>9.0.1</MicrosoftEntityFrameworkCoreCosmosVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>9.0.1</MicrosoftEntityFrameworkCoreDesignVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>9.0.1</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>9.0.1</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreCosmosVersion>9.0.2</MicrosoftEntityFrameworkCoreCosmosVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>9.0.2</MicrosoftEntityFrameworkCoreDesignVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>9.0.2</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>9.0.2</MicrosoftEntityFrameworkCoreToolsVersion>
<!-- ASP.NET Core -->
<MicrosoftAspNetCoreAuthenticationCertificateVersion>9.0.1</MicrosoftAspNetCoreAuthenticationCertificateVersion>
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>9.0.1</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
<MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>9.0.1</MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>
<MicrosoftAspNetCoreOutputCachingStackExchangeRedisVersion>9.0.1</MicrosoftAspNetCoreOutputCachingStackExchangeRedisVersion>
<MicrosoftAspNetCoreTestHostVersion>9.0.1</MicrosoftAspNetCoreTestHostVersion>
<MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.1</MicrosoftExtensionsCachingStackExchangeRedisVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCoreVersion>9.0.1</MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCoreVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.1</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
<MicrosoftExtensionsFeaturesVersion>9.0.1</MicrosoftExtensionsFeaturesVersion>
<MicrosoftAspNetCoreAuthenticationCertificateVersion>9.0.2</MicrosoftAspNetCoreAuthenticationCertificateVersion>
<MicrosoftAspNetCoreAuthenticationJwtBearerVersion>9.0.2</MicrosoftAspNetCoreAuthenticationJwtBearerVersion>
<MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>9.0.2</MicrosoftAspNetCoreAuthenticationOpenIdConnectVersion>
<MicrosoftAspNetCoreOutputCachingStackExchangeRedisVersion>9.0.2</MicrosoftAspNetCoreOutputCachingStackExchangeRedisVersion>
<MicrosoftAspNetCoreTestHostVersion>9.0.2</MicrosoftAspNetCoreTestHostVersion>
<MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.2</MicrosoftExtensionsCachingStackExchangeRedisVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCoreVersion>9.0.2</MicrosoftExtensionsDiagnosticsHealthChecksEntityFrameworkCoreVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.2</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
<MicrosoftExtensionsFeaturesVersion>9.0.2</MicrosoftExtensionsFeaturesVersion>
<!-- Runtime -->
<MicrosoftExtensionsHostingAbstractionsVersion>9.0.1</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>9.0.1</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>9.0.1</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.1</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsOptionsVersion>9.0.1</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>9.0.1</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftExtensionsHttpVersion>9.0.1</MicrosoftExtensionsHttpVersion>
<SystemFormatsAsn1Version>9.0.1</SystemFormatsAsn1Version>
<SystemTextJsonVersion>9.0.1</SystemTextJsonVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>9.0.2</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>9.0.2</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>9.0.2</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.2</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.2</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsOptionsVersion>9.0.2</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>9.0.2</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftExtensionsHttpVersion>9.0.2</MicrosoftExtensionsHttpVersion>
<SystemFormatsAsn1Version>9.0.2</SystemFormatsAsn1Version>
<SystemTextJsonVersion>9.0.2</SystemTextJsonVersion>
</PropertyGroup>
<!-- .NET 8.0 Package Versions -->
<PropertyGroup Label="LTS">
Expand All @@ -96,11 +96,11 @@
<MicrosoftExtensionsConfigurationAbstractionsLTSVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsLTSVersion>
<MicrosoftExtensionsConfigurationBinderLTSVersion>8.0.2</MicrosoftExtensionsConfigurationBinderLTSVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsLTSVersion>8.0.2</MicrosoftExtensionsDependencyInjectionAbstractionsLTSVersion>
<MicrosoftExtensionsLoggingAbstractionsLTSVersion>8.0.2</MicrosoftExtensionsLoggingAbstractionsLTSVersion>
<MicrosoftExtensionsLoggingAbstractionsLTSVersion>8.0.3</MicrosoftExtensionsLoggingAbstractionsLTSVersion>
<MicrosoftExtensionsOptionsLTSVersion>8.0.2</MicrosoftExtensionsOptionsLTSVersion>
<MicrosoftExtensionsPrimitivesLTSVersion>8.0.0</MicrosoftExtensionsPrimitivesLTSVersion>
<MicrosoftExtensionsHttpLTSVersion>8.0.1</MicrosoftExtensionsHttpLTSVersion>
<SystemFormatsAsn1LTSVersion>8.0.1</SystemFormatsAsn1LTSVersion>
<SystemFormatsAsn1LTSVersion>8.0.2</SystemFormatsAsn1LTSVersion>
<SystemTextJsonLTSVersion>8.0.5</SystemTextJsonLTSVersion>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "9.0.103",
"version": "9.0.200",
"rollForward": "major",
"allowPrerelease": true
},
"tools": {
"dotnet": "9.0.103",
"dotnet": "9.0.200",
"runtimes": {
"dotnet/x64": [
"$(DotNetRuntimePreviousVersionForTesting)"
Expand Down
2 changes: 1 addition & 1 deletion playground/OpenAIEndToEnd/OpenAIEndToEnd.WebStory/Components/Pages/UseIChatClient.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
8 changes: 4 additions & 4 deletions src/Components/Aspire.OpenAI/MEAIPackageOverrides.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<PackageReference Include="Microsoft.Extensions.Primitives" VersionOverride="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" VersionOverride="9.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" VersionOverride="9.0.1" />
<PackageReference Include="System.Text.Json" VersionOverride="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Primitives" VersionOverride="9.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" VersionOverride="9.0.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" VersionOverride="9.0.2" />
<PackageReference Include="System.Text.Json" VersionOverride="9.0.2" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions ...s/Aspire.Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderChatClientExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void CanReadDeploymentNameFromConfig(bool useKeyed)
host.Services.GetRequiredService<IChatClient>();

Assert.NotNull(client);
Assert.Equal("testdeployment1", client.Metadata.ModelId);
Assert.Equal("testdeployment1", client.GetService<ChatClientMetadata>()?.ModelId);
}

[Theory]
Expand Down Expand Up @@ -67,7 +67,7 @@ public void CanReadDeploymentNameFromConnectionString(bool useKeyed, string conn
host.Services.GetRequiredService<IChatClient>();

Assert.NotNull(client);
Assert.Equal("testdeployment1", client.Metadata.ModelId);
Assert.Equal("testdeployment1", client.GetService<ChatClientMetadata>()?.ModelId);
}

[Theory]
Expand Down Expand Up @@ -95,7 +95,7 @@ public void CanAcceptDeploymentNameAsArgument(bool useKeyed)
host.Services.GetRequiredService<IChatClient>();

Assert.NotNull(client);
Assert.Equal("testdeployment1", client.Metadata.ModelId);
Assert.Equal("testdeployment1", client.GetService<ChatClientMetadata>()?.ModelId);
}

[Theory]
Expand Down Expand Up @@ -214,10 +214,10 @@ public async Task CanConfigurePipelineAsync(bool useKeyed)
host.Services.GetRequiredKeyedService<IChatClient>("openai_chatclient") :
host.Services.GetRequiredService<IChatClient>();

var completion = await client.CompleteAsync("Whatever");
var completion = await client.GetResponseAsync("Whatever");
Assert.Equal("Hello from middleware", completion.Message.Text);

static Task<ChatCompletion> TestMiddleware(IList<ChatMessage> list, ChatOptions? options, IChatClient client, CancellationToken token)
=> Task.FromResult(new ChatCompletion(new ChatMessage(ChatRole.Assistant, "Hello from middleware")));
static Task<ChatResponse> TestMiddleware(IList<ChatMessage> list, ChatOptions? options, IChatClient client, CancellationToken token)
=> Task.FromResult(new ChatResponse(new ChatMessage(ChatRole.Assistant, "Hello from middleware")));
}
}
6 changes: 3 additions & 3 deletions ....Azure.AI.OpenAI.Tests/AspireAzureOpenAIClientBuilderEmbeddingGeneratorExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void CanReadDeploymentNameFromConfig(bool useKeyed)
host.Services.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>();

Assert.NotNull(generator);
Assert.Equal("testdeployment1", generator.Metadata.ModelId);
Assert.Equal("testdeployment1", generator.GetService<EmbeddingGeneratorMetadata>()?.ModelId);
}

[Theory]
Expand Down Expand Up @@ -67,7 +67,7 @@ public void CanReadDeploymentNameFromConnectionString(bool useKeyed, string conn
host.Services.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>();

Assert.NotNull(generator);
Assert.Equal("testdeployment1", generator.Metadata.ModelId);
Assert.Equal("testdeployment1", generator.GetService<EmbeddingGeneratorMetadata>()?.ModelId);
}

[Theory]
Expand Down Expand Up @@ -95,7 +95,7 @@ public void CanAcceptDeploymentNameAsArgument(bool useKeyed)
host.Services.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>();

Assert.NotNull(generator);
Assert.Equal("testdeployment1", generator.Metadata.ModelId);
Assert.Equal("testdeployment1", generator.GetService<EmbeddingGeneratorMetadata>()?.ModelId);
}

[Theory]
Expand Down
12 changes: 6 additions & 6 deletions tests/Aspire.OpenAI.Tests/AspireOpenAIClientBuilderChatClientExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void CanReadDeploymentNameFromConfig(bool useKeyed)
host.Services.GetRequiredService<IChatClient>();

Assert.NotNull(client);
Assert.Equal("testdeployment1", client.Metadata.ModelId);
Assert.Equal("testdeployment1", client.GetService<ChatClientMetadata>()?.ModelId);
}

[Theory]
Expand Down Expand Up @@ -68,7 +68,7 @@ public void CanReadDeploymentNameFromConnectionString(bool useKeyed, string conn
host.Services.GetRequiredService<IChatClient>();

Assert.NotNull(client);
Assert.Equal("testdeployment1", client.Metadata.ModelId);
Assert.Equal("testdeployment1", client.GetService<ChatClientMetadata>()?.ModelId);
}

[Theory]
Expand Down Expand Up @@ -96,7 +96,7 @@ public void CanAcceptDeploymentNameAsArgument(bool useKeyed)
host.Services.GetRequiredService<IChatClient>();

Assert.NotNull(client);
Assert.Equal("testdeployment1", client.Metadata.ModelId);
Assert.Equal("testdeployment1", client.GetService<ChatClientMetadata>()?.ModelId);
}

[Theory]
Expand Down Expand Up @@ -215,10 +215,10 @@ public async Task CanConfigurePipelineAsync(bool useKeyed)
host.Services.GetRequiredKeyedService<IChatClient>("openai_chatclient") :
host.Services.GetRequiredService<IChatClient>();

var completion = await client.CompleteAsync("Whatever");
var completion = await client.GetResponseAsync("Whatever");
Assert.Equal("Hello from middleware", completion.Message.Text);

static Task<ChatCompletion> TestMiddleware(IList<ChatMessage> list, ChatOptions? options, IChatClient client, CancellationToken token)
=> Task.FromResult(new ChatCompletion(new ChatMessage(ChatRole.Assistant, "Hello from middleware")));
static Task<ChatResponse> TestMiddleware(IList<ChatMessage> list, ChatOptions? options, IChatClient client, CancellationToken token)
=> Task.FromResult(new ChatResponse(new ChatMessage(ChatRole.Assistant, "Hello from middleware")));
}
}
6 changes: 3 additions & 3 deletions tests/Aspire.OpenAI.Tests/AspireOpenAIClientBuilderEmbeddingGeneratorExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void CanReadDeploymentNameFromConfig(bool useKeyed)
host.Services.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>();

Assert.NotNull(generator);
Assert.Equal("testdeployment1", generator.Metadata.ModelId);
Assert.Equal("testdeployment1", generator.GetService<EmbeddingGeneratorMetadata>()?.ModelId);
}

[Theory]
Expand Down Expand Up @@ -68,7 +68,7 @@ public void CanReadDeploymentNameFromConnectionString(bool useKeyed, string conn
host.Services.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>();

Assert.NotNull(generator);
Assert.Equal("testdeployment1", generator.Metadata.ModelId);
Assert.Equal("testdeployment1", generator.GetService<EmbeddingGeneratorMetadata>()?.ModelId);
}

[Theory]
Expand Down Expand Up @@ -96,7 +96,7 @@ public void CanAcceptDeploymentNameAsArgument(bool useKeyed)
host.Services.GetRequiredService<IEmbeddingGenerator<string, Embedding<float>>>();

Assert.NotNull(generator);
Assert.Equal("testdeployment1", generator.Metadata.ModelId);
Assert.Equal("testdeployment1", generator.GetService<EmbeddingGeneratorMetadata>()?.ModelId);
}

[Theory]
Expand Down