Replace AzureOpenAIClient with OpenAIClient using BearerTokenPolicy

dotnet/README.md

@@ -12,14 +12,17 @@
 
 ```c#
 using System;
-using Azure.AI.OpenAI;
+using System.ClientModel.Primitives;
 using Azure.Identity;
 using Microsoft.Agents.AI;
+using OpenAI;
 
 var endpoint = Environment.GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT")!;
 var deploymentName = Environment.GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_NAME")!;
 
-var agent = new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential())
+var agent = new OpenAIClient(
+    new BearerTokenPolicy(new AzureCliCredential(), "https://ai.azure.com/.default"),
+    new OpenAIClientOptions() { Endpoint = new Uri($"{endpoint}/openai/v1") })
     .GetOpenAIResponseClient(deploymentName)
     .CreateAIAgent(name: "HaikuBot", instructions: "You are an upbeat assistant that writes beautifully.");
 

dotnet/samples/AGUIClientServer/AGUIDojoServer/ChatClientAgentFactory.cs

@@ -1,37 +1,38 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using System.ClientModel.Primitives;
 using System.ComponentModel;
 using System.Text.Json;
 using AGUIDojoServer.AgenticUI;
 using AGUIDojoServer.BackendToolRendering;
 using AGUIDojoServer.PredictiveStateUpdates;
 using AGUIDojoServer.SharedState;
-using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
+using OpenAI;
 using ChatClient = OpenAI.Chat.ChatClient;
 
 namespace AGUIDojoServer;
 
 internal static class ChatClientAgentFactory
 {
-    private static AzureOpenAIClient? s_azureOpenAIClient;
+    private static OpenAIClient? s_openAIClient;
     private static string? s_deploymentName;
 
     public static void Initialize(IConfiguration configuration)
     {
         string endpoint = configuration["AZURE_OPENAI_ENDPOINT"] ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
         s_deploymentName = configuration["AZURE_OPENAI_DEPLOYMENT_NAME"] ?? throw new InvalidOperationException("AZURE_OPENAI_DEPLOYMENT_NAME is not set.");
 
-        s_azureOpenAIClient = new AzureOpenAIClient(
-            new Uri(endpoint),
-            new DefaultAzureCredential());
+        s_openAIClient = new OpenAIClient(
+            new BearerTokenPolicy(new DefaultAzureCredential(), "https://ai.azure.com/.default"),
+            new OpenAIClientOptions() { Endpoint = new Uri($"{endpoint}/openai/v1") });
     }
 
     public static ChatClientAgent CreateAgenticChat()
     {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
+        ChatClient chatClient = s_openAIClient!.GetChatClient(s_deploymentName!);
 
         return chatClient.AsIChatClient().CreateAIAgent(
             name: "AgenticChat",
@@ -40,7 +41,7 @@ public static ChatClientAgent CreateAgenticChat()
 
     public static ChatClientAgent CreateBackendToolRendering()
     {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
+        ChatClient chatClient = s_openAIClient!.GetChatClient(s_deploymentName!);
 
         return chatClient.AsIChatClient().CreateAIAgent(
             name: "BackendToolRenderer",
@@ -54,7 +55,7 @@ public static ChatClientAgent CreateBackendToolRendering()
 
     public static ChatClientAgent CreateHumanInTheLoop()
     {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
+        ChatClient chatClient = s_openAIClient!.GetChatClient(s_deploymentName!);
 
         return chatClient.AsIChatClient().CreateAIAgent(
             name: "HumanInTheLoopAgent",
@@ -63,7 +64,7 @@ public static ChatClientAgent CreateHumanInTheLoop()
 
     public static ChatClientAgent CreateToolBasedGenerativeUI()
     {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
+        ChatClient chatClient = s_openAIClient!.GetChatClient(s_deploymentName!);
 
         return chatClient.AsIChatClient().CreateAIAgent(
             name: "ToolBasedGenerativeUIAgent",
@@ -72,7 +73,7 @@ public static ChatClientAgent CreateToolBasedGenerativeUI()
 
     public static AIAgent CreateAgenticUI(JsonSerializerOptions options)
     {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
+        ChatClient chatClient = s_openAIClient!.GetChatClient(s_deploymentName!);
         var baseAgent = chatClient.AsIChatClient().CreateAIAgent(new ChatClientAgentOptions
         {
             Name = "AgenticUIAgent",
@@ -114,7 +115,7 @@ again until all the steps in current plan are completed.
 
     public static AIAgent CreateSharedState(JsonSerializerOptions options)
     {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
+        ChatClient chatClient = s_openAIClient!.GetChatClient(s_deploymentName!);
 
         var baseAgent = chatClient.AsIChatClient().CreateAIAgent(
             name: "SharedStateAgent",
@@ -125,7 +126,7 @@ public static AIAgent CreateSharedState(JsonSerializerOptions options)
 
     public static AIAgent CreatePredictiveStateUpdates(JsonSerializerOptions options)
     {
-        ChatClient chatClient = s_azureOpenAIClient!.GetChatClient(s_deploymentName!);
+        ChatClient chatClient = s_openAIClient!.GetChatClient(s_deploymentName!);
 
         var baseAgent = chatClient.AsIChatClient().CreateAIAgent(new ChatClientAgentOptions
         {

dotnet/samples/AGUIClientServer/AGUIServer/Program.cs

@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+using System.ClientModel.Primitives;
 using System.ComponentModel;
 using AGUIServer;
-using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI.Hosting.AGUI.AspNetCore;
 using Microsoft.Extensions.AI;
+using OpenAI;
 using OpenAI.Chat;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
@@ -19,9 +20,9 @@
 string deploymentName = builder.Configuration["AZURE_OPENAI_DEPLOYMENT_NAME"] ?? throw new InvalidOperationException("AZURE_OPENAI_DEPLOYMENT_NAME is not set.");
 
 // Create the AI agent with tools
-var agent = new AzureOpenAIClient(
-        new Uri(endpoint),
-        new DefaultAzureCredential())
+var agent = new OpenAIClient(
+        new BearerTokenPolicy(new DefaultAzureCredential(), "https://ai.azure.com/.default"),
+        new OpenAIClientOptions() { Endpoint = new Uri($"{endpoint}/openai/v1") })
     .GetChatClient(deploymentName)
     .CreateAIAgent(
         name: "AGUIAssistant",

dotnet/samples/AGUIWebChat/README.md

@@ -67,11 +67,11 @@ The server (`Server/Program.cs`) creates a simple chat agent:
 
 ```csharp
 // Create Azure OpenAI client
-AzureOpenAIClient azureOpenAIClient = new AzureOpenAIClient(
-    new Uri(endpoint),
-    new DefaultAzureCredential());
+OpenAIClient openAIClient = new OpenAIClient(
+    new BearerTokenPolicy(new DefaultAzureCredential(), "https://ai.azure.com/.default"),
+    new OpenAIClientOptions() { Endpoint = new Uri($"{endpoint}/openai/v1") });
 
-ChatClient chatClient = azureOpenAIClient.GetChatClient(deploymentName);
+ChatClient chatClient = openAIClient.GetChatClient(deploymentName);
 
 // Create AI agent
 ChatClientAgent agent = chatClient.AsIChatClient().CreateAIAgent(

dotnet/samples/AGUIWebChat/Server/Program.cs

@@ -2,11 +2,12 @@
 
 // This sample demonstrates a basic AG-UI server hosting a chat agent for the Blazor web client.
 
-using Azure.AI.OpenAI;
+using System.ClientModel.Primitives;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Hosting.AGUI.AspNetCore;
 using Microsoft.Extensions.AI;
+using OpenAI;
 using OpenAI.Chat;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
@@ -19,11 +20,11 @@
 string deploymentName = builder.Configuration["AZURE_OPENAI_DEPLOYMENT_NAME"] ?? throw new InvalidOperationException("AZURE_OPENAI_DEPLOYMENT_NAME is not set.");
 
 // Create the AI agent
-AzureOpenAIClient azureOpenAIClient = new(
-    new Uri(endpoint),
-    new DefaultAzureCredential());
+OpenAIClient openAIClient = new(
+    new BearerTokenPolicy(new DefaultAzureCredential(), "https://ai.azure.com/.default"),
+    new OpenAIClientOptions() { Endpoint = new Uri($"{endpoint}/openai/v1") });
 
-ChatClient chatClient = azureOpenAIClient.GetChatClient(deploymentName);
+ChatClient chatClient = openAIClient.GetChatClient(deploymentName);
 
 ChatClientAgent agent = chatClient.AsIChatClient().CreateAIAgent(
     name: "ChatAssistant",

dotnet/samples/AzureFunctions/01_SingleAgent/Program.cs

@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-using Azure;
-using Azure.AI.OpenAI;
+using System.ClientModel;
+using System.ClientModel.Primitives;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Hosting.AzureFunctions;
 using Microsoft.Azure.Functions.Worker.Builder;
 using Microsoft.Extensions.Hosting;
+using OpenAI;
 using OpenAI.Chat;
 
 // Get the Azure OpenAI endpoint and deployment name from environment variables.
@@ -17,9 +18,10 @@
 
 // Use Azure Key Credential if provided, otherwise use Azure CLI Credential.
 string? azureOpenAiKey = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_KEY");
-AzureOpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
-    ? new AzureOpenAIClient(new Uri(endpoint), new AzureKeyCredential(azureOpenAiKey))
-    : new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential());
+OpenAIClientOptions clientOptions = new() { Endpoint = new Uri($"{endpoint}/openai/v1") };
+OpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
+    ? new OpenAIClient(new ApiKeyCredential(azureOpenAiKey), clientOptions)
+    : new OpenAIClient(new BearerTokenPolicy(new AzureCliCredential(), "https://ai.azure.com/.default"), clientOptions);
 
 // Set up an AI agent following the standard Microsoft Agent Framework pattern.
 const string JokerName = "Joker";

dotnet/samples/AzureFunctions/02_AgentOrchestration_Chaining/Program.cs

@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-using Azure;
-using Azure.AI.OpenAI;
+using System.ClientModel;
+using System.ClientModel.Primitives;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Hosting.AzureFunctions;
 using Microsoft.Azure.Functions.Worker.Builder;
 using Microsoft.Extensions.Hosting;
+using OpenAI;
 using OpenAI.Chat;
 
 // Get the Azure OpenAI endpoint and deployment name from environment variables.
@@ -17,9 +18,10 @@
 
 // Use Azure Key Credential if provided, otherwise use Azure CLI Credential.
 string? azureOpenAiKey = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_KEY");
-AzureOpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
-    ? new AzureOpenAIClient(new Uri(endpoint), new AzureKeyCredential(azureOpenAiKey))
-    : new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential());
+OpenAIClientOptions clientOptions = new() { Endpoint = new Uri($"{endpoint}/openai/v1") };
+OpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
+    ? new OpenAIClient(new ApiKeyCredential(azureOpenAiKey), clientOptions)
+    : new OpenAIClient(new BearerTokenPolicy(new AzureCliCredential(), "https://ai.azure.com/.default"), clientOptions);
 
 // Single agent used by the orchestration to demonstrate sequential calls on the same thread.
 const string WriterName = "WriterAgent";

dotnet/samples/AzureFunctions/03_AgentOrchestration_Concurrency/Program.cs

@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-using Azure;
-using Azure.AI.OpenAI;
+using System.ClientModel;
+using System.ClientModel.Primitives;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Hosting.AzureFunctions;
 using Microsoft.Azure.Functions.Worker.Builder;
 using Microsoft.Extensions.Hosting;
+using OpenAI;
 using OpenAI.Chat;
 
 // Get the Azure OpenAI endpoint and deployment name from environment variables.
@@ -17,9 +18,10 @@
 
 // Use Azure Key Credential if provided, otherwise use Azure CLI Credential.
 string? azureOpenAiKey = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_KEY");
-AzureOpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
-    ? new AzureOpenAIClient(new Uri(endpoint), new AzureKeyCredential(azureOpenAiKey))
-    : new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential());
+OpenAIClientOptions clientOptions = new() { Endpoint = new Uri($"{endpoint}/openai/v1") };
+OpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
+    ? new OpenAIClient(new ApiKeyCredential(azureOpenAiKey), clientOptions)
+    : new OpenAIClient(new BearerTokenPolicy(new AzureCliCredential(), "https://ai.azure.com/.default"), clientOptions);
 
 // Two agents used by the orchestration to demonstrate concurrent execution.
 const string PhysicistName = "PhysicistAgent";

dotnet/samples/AzureFunctions/04_AgentOrchestration_Conditionals/Program.cs

@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-using Azure;
-using Azure.AI.OpenAI;
+using System.ClientModel;
+using System.ClientModel.Primitives;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Hosting.AzureFunctions;
 using Microsoft.Azure.Functions.Worker.Builder;
 using Microsoft.Extensions.Hosting;
+using OpenAI;
 using OpenAI.Chat;
 
 // Get the Azure OpenAI endpoint and deployment name from environment variables.
@@ -17,9 +18,10 @@
 
 // Use Azure Key Credential if provided, otherwise use Azure CLI Credential.
 string? azureOpenAiKey = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_KEY");
-AzureOpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
-    ? new AzureOpenAIClient(new Uri(endpoint), new AzureKeyCredential(azureOpenAiKey))
-    : new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential());
+OpenAIClientOptions clientOptions = new() { Endpoint = new Uri($"{endpoint}/openai/v1") };
+OpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
+    ? new OpenAIClient(new ApiKeyCredential(azureOpenAiKey), clientOptions)
+    : new OpenAIClient(new BearerTokenPolicy(new AzureCliCredential(), "https://ai.azure.com/.default"), clientOptions);
 
 // Two agents used by the orchestration to demonstrate conditional logic.
 const string SpamDetectionName = "SpamDetectionAgent";

dotnet/samples/AzureFunctions/05_AgentOrchestration_HITL/Program.cs

@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-using Azure;
-using Azure.AI.OpenAI;
+using System.ClientModel;
+using System.ClientModel.Primitives;
 using Azure.Identity;
 using Microsoft.Agents.AI;
 using Microsoft.Agents.AI.Hosting.AzureFunctions;
 using Microsoft.Azure.Functions.Worker.Builder;
 using Microsoft.Extensions.Hosting;
+using OpenAI;
 using OpenAI.Chat;
 
 // Get the Azure OpenAI endpoint and deployment name from environment variables.
@@ -17,9 +18,10 @@
 
 // Use Azure Key Credential if provided, otherwise use Azure CLI Credential.
 string? azureOpenAiKey = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_KEY");
-AzureOpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
-    ? new AzureOpenAIClient(new Uri(endpoint), new AzureKeyCredential(azureOpenAiKey))
-    : new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential());
+OpenAIClientOptions clientOptions = new() { Endpoint = new Uri($"{endpoint}/openai/v1") };
+OpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
+    ? new OpenAIClient(new ApiKeyCredential(azureOpenAiKey), clientOptions)
+    : new OpenAIClient(new BearerTokenPolicy(new AzureCliCredential(), "https://ai.azure.com/.default"), clientOptions);
 
 // Single agent used by the orchestration to demonstrate human-in-the-loop workflow.
 const string WriterName = "WriterAgent";

dotnet/samples/AzureFunctions/06_LongRunningTools/Program.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 
-using Azure;
-using Azure.AI.OpenAI;
+using System.ClientModel;
+using System.ClientModel.Primitives;
 using Azure.Identity;
 using LongRunningTools;
 using Microsoft.Agents.AI;
@@ -11,6 +11,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using OpenAI;
 using OpenAI.Chat;
 
 // Get the Azure OpenAI endpoint and deployment name from environment variables.
@@ -21,9 +22,10 @@
 
 // Use Azure Key Credential if provided, otherwise use Azure CLI Credential.
 string? azureOpenAiKey = System.Environment.GetEnvironmentVariable("AZURE_OPENAI_KEY");
-AzureOpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
-    ? new AzureOpenAIClient(new Uri(endpoint), new AzureKeyCredential(azureOpenAiKey))
-    : new AzureOpenAIClient(new Uri(endpoint), new AzureCliCredential());
+OpenAIClientOptions clientOptions = new() { Endpoint = new Uri($"{endpoint}/openai/v1") };
+OpenAIClient client = !string.IsNullOrEmpty(azureOpenAiKey)
+    ? new OpenAIClient(new ApiKeyCredential(azureOpenAiKey), clientOptions)
+    : new OpenAIClient(new BearerTokenPolicy(new AzureCliCredential(), "https://ai.azure.com/.default"), clientOptions);
 
 // Agent used by the orchestration to write content.
 const string WriterAgentName = "Writer";