Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.extensions.ai.evaluation.console": {
"version": "9.9.0",
"version": "9.10.0",
"commands": [
"aieval"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,20 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Azure.Identity" Version="1.15.0" />
<PackageReference Include="AwesomeAssertions" Version="9.1.0" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.9.0-preview.1.25458.4" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.0-preview.1.25458.4" />
<PackageReference Include="Azure.Core" Version="1.49.0" />
<PackageReference Include="Azure.Identity" Version="1.17.0" />
<PackageReference Include="AwesomeAssertions" Version="9.2.1" />
<PackageReference Include="Microsoft.Extensions.AI" Version="9.10.1" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.10.1" />
<PackageReference Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.10.0-preview.1.25513.3" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.10.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.10.0" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.10.1-preview.1.25521.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.10.4" />
<PackageReference Include="MSTest.TestFramework" Version="3.10.4" />
<PackageReference Include="OllamaSharp" Version="5.3.6" />
<PackageReference Include="MSTest.TestAdapter" Version="3.11.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.11.0" />
<PackageReference Include="OllamaSharp" Version="5.4.8" />
<PackageReference Include="OpenAI" Version="2.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System.ClientModel;
using System.ClientModel.Primitives;
using Azure;
using Azure.AI.Inference;
using Azure.AI.OpenAI;
using Azure.Identity;
using Microsoft.Extensions.AI;
using Microsoft.Extensions.AI.Evaluation;
Expand Down Expand Up @@ -76,10 +77,22 @@ private static ChatConfiguration GetAzureOpenAIChatConfiguration()
{
/// Get an instance of Microsoft.Extensions.AI's <see cref="IChatClient"/> interface for the selected LLM
/// endpoint.

/// Append /openai/v1 suffix.
/// See https://learn.microsoft.com/en-us/azure/developer/ai/how-to/switching-endpoints?tabs=openai&pivots=dotnet#microsoft-entra-authentication-1.
var endpoint = new Uri(new Uri(EnvironmentVariables.AzureOpenAIEndpoint), "/openai/v1");
var options = new OpenAIClientOptions { Endpoint = endpoint };

#pragma warning disable OPENAI001
/// OPENAI001: The APIs used below are experimental and subject to change or removal in future updates.
var policy =
new BearerTokenPolicy(tokenProvider: new DefaultAzureCredential(), scope: "https://ai.azure.com/.default");

IChatClient client =
new AzureOpenAIClient(new Uri(EnvironmentVariables.AzureOpenAIEndpoint), new DefaultAzureCredential())
new OpenAIClient(policy, options)
.GetChatClient(EnvironmentVariables.AzureOpenAIModel)
.AsIChatClient();
#pragma warning restore OPENAI001

/// Enable function invocation support.
client = client.AsBuilder().UseFunctionInvocation().Build();
Expand Down Expand Up @@ -112,10 +125,13 @@ private static ChatConfiguration GetOpenAIChatConfiguration()
{
/// Get an instance of Microsoft.Extensions.AI's <see cref="IChatClient"/> interface for the selected LLM
/// endpoint.
#pragma warning disable OPENAI001
/// OPENAI001: The APIs used below are experimental and subject to change or removal in future updates.
IChatClient client =
new OpenAIClient(EnvironmentVariables.OpenAIAPIKey)
new OpenAIClient(new ApiKeyCredential(EnvironmentVariables.OpenAIAPIKey))
.GetChatClient(EnvironmentVariables.OpenAIModel)
.AsIChatClient();
#pragma warning restore OPENAI001

/// Enable function invocation support.
client = client.AsBuilder().UseFunctionInvocation().Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,24 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
<PackageReference Include="Azure.Identity" Version="1.15.0" />
<PackageReference Include="AwesomeAssertions" Version="9.1.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.9.0-preview.1.25458.4" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.NLP" Version="9.9.0-preview.1.25458.4" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting.Azure" Version="9.9.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Safety" Version="9.9.0-preview.1.25458.4" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.0-preview.1.25458.4" />
<PackageReference Include="Azure.Core" Version="1.49.0" />
<PackageReference Include="Azure.Identity" Version="1.17.0" />
<PackageReference Include="AwesomeAssertions" Version="9.2.1" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.10" />
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" Version="9.10.1" />
<PackageReference Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.10.0-preview.1.25513.3" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation" Version="9.10.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.NLP" Version="9.10.0-preview.1.25513.3" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Quality" Version="9.10.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting" Version="9.10.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Reporting.Azure" Version="9.10.0" />
<PackageReference Include="Microsoft.Extensions.AI.Evaluation.Safety" Version="9.10.0-preview.1.25513.3" />
<PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.10.1-preview.1.25521.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.10.4" />
<PackageReference Include="MSTest.TestFramework" Version="3.10.4" />
<PackageReference Include="OllamaSharp" Version="5.3.6" />
<PackageReference Include="MSTest.TestAdapter" Version="3.11.0" />
<PackageReference Include="MSTest.TestFramework" Version="3.11.0" />
<PackageReference Include="OllamaSharp" Version="5.4.8" />
<PackageReference Include="OpenAI" Version="2.5.0" />
</ItemGroup>

<ItemGroup>
Expand Down