Remove Azure.AI.OpenAI dependency from templates and tests

eng/packages/General.props

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageVersion Include="Azure.Core" Version="1.45.0" />
-    <PackageVersion Include="Azure.Identity" Version="1.13.2" />
+    <PackageVersion Include="Azure.Core" Version="1.49.0" />
+    <PackageVersion Include="Azure.Identity" Version="1.16.0" />
     <PackageVersion Include="Azure.Storage.Files.DataLake" Version="12.21.0" />
     <PackageVersion Include="Azure.AI.Inference" Version="1.0.0-beta.5" />
     <PackageVersion Include="DnsClient" Version="1.8.0" />

eng/packages/TestOnly.props

@@ -2,7 +2,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <PackageVersion Include="AutoFixture.AutoMoq" Version="4.17.0" />
-    <PackageVersion Include="Azure.AI.OpenAI" Version="2.3.0-beta.2" />
     <PackageVersion Include="autofixture" Version="4.17.0" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
     <PackageVersion Include="AwesomeAssertions" Version="8.0.2" />

src/ProjectTemplates/GeneratedContent.targets

@@ -35,9 +35,8 @@
     <PropertyGroup>
       <TemplatePackageVersion_Aspire>9.5.0</TemplatePackageVersion_Aspire>
       <TemplatePackageVersion_Aspire_Preview>9.5.0-preview.1.25474.7</TemplatePackageVersion_Aspire_Preview>
-      <TemplatePackageVersion_AzureAIOpenAI>2.3.0-beta.2</TemplatePackageVersion_AzureAIOpenAI>
       <TemplatePackageVersion_AzureAIProjects>1.0.0-beta.9</TemplatePackageVersion_AzureAIProjects>
-      <TemplatePackageVersion_AzureIdentity>1.14.0</TemplatePackageVersion_AzureIdentity>
+      <TemplatePackageVersion_AzureIdentity>1.16.0</TemplatePackageVersion_AzureIdentity>
       <TemplatePackageVersion_AzureSearchDocuments>11.6.1</TemplatePackageVersion_AzureSearchDocuments>
       <TemplatePackageVersion_CommunityToolkitAspire>9.4.1-beta.291</TemplatePackageVersion_CommunityToolkitAspire>
       <TemplatePackageVersion_MicrosoftExtensionsHosting>10.0.0-preview.6.25358.103</TemplatePackageVersion_MicrosoftExtensionsHosting>
@@ -62,7 +61,6 @@
         <!-- Package version properties -->
         TemplatePackageVersion_Aspire=$(TemplatePackageVersion_Aspire);
         TemplatePackageVersion_Aspire_Preview=$(TemplatePackageVersion_Aspire_Preview);
-        TemplatePackageVersion_AzureAIOpenAI=$(TemplatePackageVersion_AzureAIOpenAI);
         TemplatePackageVersion_AzureAIProjects=$(TemplatePackageVersion_AzureAIProjects);
         TemplatePackageVersion_AzureIdentity=$(TemplatePackageVersion_AzureIdentity);
         TemplatePackageVersion_AzureSearchDocuments=$(TemplatePackageVersion_AzureSearchDocuments);

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/.template.config/template.json

@@ -88,7 +88,7 @@
         ]
       },
       {
-        "condition": "(!UseLocalVectorStore)",
+        "condition": "(!IsLocalVectorStore)",
         "exclude": [
           "ChatWithCustomData-CSharp.Web/Services/JsonVectorStore.cs"
         ]
@@ -185,6 +185,10 @@
       "defaultValue": "false",
       "description": "Create the project as a distributed application using Aspire."
     },
+    "IsManagedIdentity": {
+      "type": "computed",
+      "value": "(UseManagedIdentity)"
+    },
     "IsAspire": {
       "type": "computed",
       "value": "(UseAspire || VectorStore == \"qdrant\")"
@@ -209,21 +213,21 @@
       "type": "computed",
       "value": "(AiServiceProvider == \"azureaifoundry\")"
     },
-    "UseAzureAISearch": {
+    "IsAzureAISearch": {
       "type": "computed",
       "value": "(VectorStore == \"azureaisearch\")"
     },
-    "UseLocalVectorStore": {
+    "IsLocalVectorStore": {
       "type": "computed",
       "value": "(VectorStore == \"local\")"
     },
-    "UseQdrant": {
+    "IsQdrant": {
       "type": "computed",
       "value": "(VectorStore == \"qdrant\")"
     },
-    "UseAzure": {
+    "IsAzure": {
       "type": "computed",
-      "value": "(IsAzureOpenAI || IsAzureAiFoundry || UseAzureAISearch)"
+      "value": "(IsAzureOpenAI || IsAzureAIFoundry || IsAzureAISearch)"
     },
     "ChatModel": {
       "type": "parameter",

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.AppHost/AppHost.cs

@@ -29,7 +29,7 @@
     modelName: "text-embedding-3-small",
     modelVersion: "1");
 #endif
-#if (UseAzureAISearch)
+#if (IsAzureAISearch)
 
 // See https://learn.microsoft.com/dotnet/aspire/azure/local-provisioning#configuration
 // for instructions providing configuration values
@@ -42,13 +42,13 @@
 var chat = ollama.AddModel("chat", "llama3.2");
 var embeddings = ollama.AddModel("embeddings", "all-minilm");
 #endif
-#if (UseAzureAISearch) // VECTOR DATABASE CONFIGURATION
-#elif (UseQdrant)
+#if (IsAzureAISearch) // VECTOR DATABASE CONFIGURATION
+#elif (IsQdrant)
 
 var vectorDB = builder.AddQdrant("vectordb")
     .WithDataVolume()
     .WithLifetime(ContainerLifetime.Persistent);
-#else // UseLocalVectorStore
+#else // IsLocalVectorStore
 #endif
 
 var webApp = builder.AddProject<Projects.ChatWithCustomData_CSharp_Web_AspireClassName_Web>("aichatweb-app");
@@ -65,15 +65,15 @@
     .WithReference(openai)
     .WaitFor(openai);
 #endif
-#if (UseAzureAISearch) // VECTOR DATABASE REFERENCES
+#if (IsAzureAISearch) // VECTOR DATABASE REFERENCES
 webApp
     .WithReference(search)
     .WaitFor(search);
-#elif (UseQdrant)
+#elif (IsQdrant)
 webApp
     .WithReference(vectorDB)
     .WaitFor(vectorDB);
-#else // UseLocalVectorStore
+#else // IsLocalVectorStore
 #endif
 
 builder.Build().Run();

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.AppHost/ChatWithCustomData-CSharp.AppHost.csproj.in

@@ -12,9 +12,9 @@
 
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting.AppHost" Version="${TemplatePackageVersion_Aspire}" />
-<!--#if (UseQdrant)
+<!--#if (IsQdrant)
     <PackageReference Include="Aspire.Hosting.Qdrant" Version="${TemplatePackageVersion_Aspire}" />
-#elif (UseAzureAISearch)
+#elif (IsAzureAISearch)
     <PackageReference Include="Aspire.Hosting.Azure.Search" Version="${TemplatePackageVersion_Aspire}" />
 #endif -->
 <!--#if (IsAzureOpenAI) -->

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/ChatWithCustomData-CSharp.Web.csproj.in

@@ -15,38 +15,35 @@
     <PackageReference Include="OllamaSharp" Version="${TemplatePackageVersion_OllamaSharp}" />
 #elif ((IsGHModels || IsOpenAI) && !IsAspire)
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="${TemplatePackageVersion_MicrosoftExtensionsAIOpenAI}" />
-#elif (IsAzureAiFoundry)
-    <PackageReference Include="Azure.AI.OpenAI" Version="${TemplatePackageVersion_AzureAIOpenAI}" />
+#elif (IsAzureAIFoundry)
     <PackageReference Include="Azure.AI.Projects" Version="${TemplatePackageVersion_AzureAIProjects}" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="${TemplatePackageVersion_MicrosoftExtensionsAIOpenAI}" />
 #endif -->
 <!--#if ((IsAzureOpenAI || IsOpenAI || IsGHModels) && IsAspire) -->
-    <PackageReference Include="Azure.AI.OpenAI" Version="${TemplatePackageVersion_AzureAIOpenAI}" />
     <PackageReference Include="Aspire.Azure.AI.OpenAI" Version="${TemplatePackageVersion_Aspire_Preview}" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="${TemplatePackageVersion_MicrosoftExtensionsAIOpenAI}" />
 <!--#endif -->
 <!--#if (IsAzureOpenAI && !IsAspire) -->
-    <PackageReference Include="Azure.AI.OpenAI" Version="${TemplatePackageVersion_AzureAIOpenAI}" />
     <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="${TemplatePackageVersion_MicrosoftExtensionsAIOpenAI}" />
 <!--#endif -->
-<!--#if (UseManagedIdentity) -->
+<!--#if (IsManagedIdentity) -->
     <PackageReference Include="Azure.Identity" Version="${TemplatePackageVersion_AzureIdentity}" />
 <!--#endif -->
     <PackageReference Include="Microsoft.Extensions.AI" Version="${TemplatePackageVersion_MicrosoftExtensionsAI}" />
     <PackageReference Include="Microsoft.SemanticKernel.Core" Version="${TemplatePackageVersion_MicrosoftSemanticKernel}" />
     <PackageReference Include="PdfPig" Version="${TemplatePackageVersion_PdfPig}" />
     <PackageReference Include="System.Linq.Async" Version="${TemplatePackageVersion_SystemLinqAsync}" />
-<!--#if (UseAzureAISearch && IsAspire)
+<!--#if (IsAzureAISearch && IsAspire)
     <PackageReference Include="Aspire.Azure.Search.Documents" Version="${TemplatePackageVersion_Aspire}" />
-#elif (UseAzureAISearch && !IsAspire)
+#elif (IsAzureAISearch && !IsAspire)
     <PackageReference Include="Azure.Search.Documents" Version="${TemplatePackageVersion_AzureSearchDocuments}" />
 #endif -->
-<!--#if (UseAzureAISearch)
+<!--#if (IsAzureAISearch)
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAISearch" Version="${TemplatePackageVersion_MicrosoftSemanticKernel_Preview}" />
-#elif (UseQdrant)-->
+#elif (IsQdrant)-->
     <PackageReference Include="Aspire.Qdrant.Client" Version="${TemplatePackageVersion_Aspire}" />
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="${TemplatePackageVersion_MicrosoftSemanticKernel_Preview}" />
-<!--#elif (UseLocalVectorStore)-->
+<!--#elif (IsLocalVectorStore)-->
     <PackageReference Include="Microsoft.SemanticKernel.Connectors.SqliteVec" Version="${TemplatePackageVersion_MicrosoftSemanticKernel_Preview}" />
 <!--#endif -->
   </ItemGroup>

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.Aspire.cs

@@ -1,12 +1,10 @@
 using Microsoft.Extensions.AI;
+#if (IsOpenAI || IsGHModels)
+using OpenAI;
+#endif
 using ChatWithCustomData_CSharp.Web.Components;
 using ChatWithCustomData_CSharp.Web.Services;
 using ChatWithCustomData_CSharp.Web.Services.Ingestion;
-#if (IsOllama)
-#elif (IsOpenAI || IsGHModels)
-using OpenAI;
-#else // IsAzureOpenAI
-#endif
 
 var builder = WebApplication.CreateBuilder(args);
 builder.AddServiceDefaults();
@@ -20,7 +18,7 @@
         c.EnableSensitiveData = builder.Environment.IsDevelopment());
 builder.AddOllamaApiClient("embeddings")
     .AddEmbeddingGenerator();
-#elif (IsAzureAiFoundry)
+#elif (IsAzureAIFoundry)
 #else // (IsOpenAI || IsAzureOpenAI || IsGHModels)
 #if (IsOpenAI)
 var openai = builder.AddOpenAIClient("openai");
@@ -34,15 +32,15 @@
 openai.AddEmbeddingGenerator("text-embedding-3-small");
 #endif
 
-#if (UseAzureAISearch)
+#if (IsAzureAISearch)
 builder.AddAzureSearchClient("search");
 builder.Services.AddAzureAISearchCollection<IngestedChunk>("data-ChatWithCustomData-CSharp.Web-chunks");
 builder.Services.AddAzureAISearchCollection<IngestedDocument>("data-ChatWithCustomData-CSharp.Web-documents");
-#elif (UseQdrant)
+#elif (IsQdrant)
 builder.AddQdrantClient("vectordb");
 builder.Services.AddQdrantCollection<Guid, IngestedChunk>("data-ChatWithCustomData-CSharp.Web-chunks");
 builder.Services.AddQdrantCollection<Guid, IngestedDocument>("data-ChatWithCustomData-CSharp.Web-documents");
-#else // UseLocalVectorStore
+#else // IsLocalVectorStore
 var vectorStorePath = Path.Combine(AppContext.BaseDirectory, "vector-store.db");
 var vectorStoreConnectionString = $"Data Source={vectorStorePath}";
 builder.Services.AddSqliteCollection<string, IngestedChunk>("data-ChatWithCustomData-CSharp.Web-chunks", vectorStoreConnectionString);

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.cs

@@ -1,22 +1,22 @@
-using Microsoft.Extensions.AI;
-using ChatWithCustomData_CSharp.Web.Components;
-using ChatWithCustomData_CSharp.Web.Services;
-using ChatWithCustomData_CSharp.Web.Services.Ingestion;
-#if(IsAzureOpenAI || UseAzureAISearch)
+#if (IsGHModels || IsOpenAI || (IsAzureOpenAI && !IsManagedIdentity))
+using System.ClientModel;
+#elif (IsAzureOpenAI && IsManagedIdentity)
+using System.ClientModel.Primitives;
+#endif
+#if (IsAzureAISearch && !IsManagedIdentity)
 using Azure;
-#if (UseManagedIdentity)
+#elif (IsManagedIdentity)
 using Azure.Identity;
 #endif
-#endif
+using Microsoft.Extensions.AI;
 #if (IsOllama)
 using OllamaSharp;
-#elif (IsOpenAI || IsGHModels)
+#elif (IsGHModels || IsOpenAI || IsAzureOpenAI)
 using OpenAI;
-using System.ClientModel;
-#else
-using Azure.AI.OpenAI;
-using System.ClientModel;
 #endif
+using ChatWithCustomData_CSharp.Web.Components;
+using ChatWithCustomData_CSharp.Web.Services;
+using ChatWithCustomData_CSharp.Web.Services.Ingestion;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddRazorComponents().AddInteractiveServerComponents();
@@ -45,54 +45,63 @@
 // You can do this using Visual Studio's "Manage User Secrets" UI, or on the command line:
 //   cd this-project-directory
 //   dotnet user-secrets set OpenAI:Key YOUR-API-KEY
+
 var openAIClient = new OpenAIClient(
     new ApiKeyCredential(builder.Configuration["OpenAI:Key"] ?? throw new InvalidOperationException("Missing configuration: OpenAI:Key. See the README for details.")));
-#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+
+#pragma warning disable OPENAI001 // GetOpenAIResponseClient(string) is experimental and subject to change or removal in future updates.
 var chatClient = openAIClient.GetOpenAIResponseClient("gpt-4o-mini").AsIChatClient();
-#pragma warning restore OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+#pragma warning restore OPENAI001
+
 var embeddingGenerator = openAIClient.GetEmbeddingClient("text-embedding-3-small").AsIEmbeddingGenerator();
-#elif (IsAzureAiFoundry)
+#elif (IsAzureAIFoundry)
 
-#else // IsAzureOpenAI
+#elif (IsAzureOpenAI)
 // You will need to set the endpoint and key to your own values
 // You can do this using Visual Studio's "Manage User Secrets" UI, or on the command line:
 //   cd this-project-directory
 //   dotnet user-secrets set AzureOpenAI:Endpoint https://YOUR-DEPLOYMENT-NAME.openai.azure.com
-#if (!UseManagedIdentity)
+#if (!IsManagedIdentity)
 //   dotnet user-secrets set AzureOpenAI:Key YOUR-API-KEY
 #endif
-var azureOpenAi = new AzureOpenAIClient(
-    new Uri(builder.Configuration["AzureOpenAI:Endpoint"] ?? throw new InvalidOperationException("Missing configuration: AzureOpenAi:Endpoint. See the README for details.")),
-#if (UseManagedIdentity)
-    new DefaultAzureCredential());
-#else
-    new ApiKeyCredential(builder.Configuration["AzureOpenAI:Key"] ?? throw new InvalidOperationException("Missing configuration: AzureOpenAi:Key. See the README for details.")));
+var azureOpenAIEndpoint = new Uri(new Uri(builder.Configuration["AzureOpenAI:Endpoint"] ?? throw new InvalidOperationException("Missing configuration: AzureOpenAi:Endpoint. See the README for details.")), "/openai/v1");
+#if (IsManagedIdentity)
+#pragma warning disable OPENAI001 // OpenAIClient(AuthenticationPolicy, OpenAIClientOptions) and GetOpenAIResponseClient(string) are experimental and subject to change or removal in future updates.
+var azureOpenAi = new OpenAIClient(
+    new BearerTokenPolicy(new DefaultAzureCredential(), "https://ai.azure.com/.default"),
+    new OpenAIClientOptions { Endpoint = azureOpenAIEndpoint });
+
+#elif (!IsManagedIdentity)
+var openAIOptions = new OpenAIClientOptions { Endpoint = azureOpenAIEndpoint };
+var azureOpenAi = new OpenAIClient(new ApiKeyCredential(builder.Configuration["AzureOpenAI:Key"] ?? throw new InvalidOperationException("Missing configuration: AzureOpenAi:Key. See the README for details.")), openAIOptions);
+
+#pragma warning disable OPENAI001 // GetOpenAIResponseClient(string) is experimental and subject to change or removal in future updates.
 #endif
-#pragma warning disable OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 var chatClient = azureOpenAi.GetOpenAIResponseClient("gpt-4o-mini").AsIChatClient();
-#pragma warning restore OPENAI001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+#pragma warning restore OPENAI001
+
 var embeddingGenerator = azureOpenAi.GetEmbeddingClient("text-embedding-3-small").AsIEmbeddingGenerator();
 #endif
 
-#if (UseAzureAISearch)
+#if (IsAzureAISearch)
 // You will need to set the endpoint and key to your own values
 // You can do this using Visual Studio's "Manage User Secrets" UI, or on the command line:
 //   cd this-project-directory
 //   dotnet user-secrets set AzureAISearch:Endpoint https://YOUR-DEPLOYMENT-NAME.search.windows.net
-#if (!UseManagedIdentity)
+#if (!IsManagedIdentity)
 //   dotnet user-secrets set AzureAISearch:Key YOUR-API-KEY
 #endif
 var azureAISearchEndpoint = new Uri(builder.Configuration["AzureAISearch:Endpoint"]
     ?? throw new InvalidOperationException("Missing configuration: AzureAISearch:Endpoint. See the README for details."));
-#if (UseManagedIdentity)
+#if (IsManagedIdentity)
 var azureAISearchCredential = new DefaultAzureCredential();
-#else
+#elif (!IsManagedIdentity)
 var azureAISearchCredential = new AzureKeyCredential(builder.Configuration["AzureAISearch:Key"]
     ?? throw new InvalidOperationException("Missing configuration: AzureAISearch:Key. See the README for details."));
 #endif
 builder.Services.AddAzureAISearchCollection<IngestedChunk>("data-ChatWithCustomData-CSharp.Web-chunks", azureAISearchEndpoint, azureAISearchCredential);
 builder.Services.AddAzureAISearchCollection<IngestedDocument>("data-ChatWithCustomData-CSharp.Web-documents", azureAISearchEndpoint, azureAISearchCredential);
-#else // UseLocalVectorStore
+#elif (IsLocalVectorStore)
 var vectorStorePath = Path.Combine(AppContext.BaseDirectory, "vector-store.db");
 var vectorStoreConnectionString = $"Data Source={vectorStorePath}";
 builder.Services.AddSqliteCollection<string, IngestedChunk>("data-ChatWithCustomData-CSharp.Web-chunks", vectorStoreConnectionString);