Update to official MS AI package (#331)

Author: dimodi

common/microsoft-extensions-ai-integration/AIPromptIntegration/AIPromptIntegration/AIPromptIntegration.csproj

@@ -11,11 +11,11 @@
   <ItemGroup>
     <PackageReference Include="Azure.AI.OpenAI" Version="2.1.0" />
     <PackageReference Include="Azure.Core" Version="1.45.0" />
-    <PackageReference Include="Microsoft.Extensions.AI" Version="9.1.0-preview.1.25064.3" />
-    <PackageReference Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.1.0-preview.1.25064.3" />
-    <PackageReference Include="Microsoft.Extensions.AI.Ollama" Version="9.1.0-preview.1.25064.3" />
-    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.1.0-preview.1.25064.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.2.25163.2" />
+    <PackageReference Include="Microsoft.Extensions.AI" Version="9.*" />
+    <PackageReference Include="Microsoft.Extensions.AI.AzureAIInference" Version="9.5.0-preview.1.25265.7" />
+    <PackageReference Include="Microsoft.Extensions.AI.Ollama" Version="9.5.0-preview.1.25265.7" />
+    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" Version="9.5.0-preview.1.25265.7" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.*" />
     <PackageReference Include="Telerik.UI.for.Blazor" Version="*" />
   </ItemGroup>
 </Project>

common/microsoft-extensions-ai-integration/AIPromptIntegration/AIPromptIntegration/Program.cs

@@ -28,22 +28,35 @@
 var endpoint = builder.Configuration["Endpoint"] ?? throw new InvalidOperationException("Missing configuration: Endpoint. See the README for details.");
 // 🔑 The API Key for your provider
 var apikey = builder.Configuration["ApiKey"] ?? throw new InvalidOperationException("Missing configuration: ApiKey. See the README for details.");
-// 🧠 The model name or azure deployment name
+// 🧠 The model name or Azure deployment name
 var model = "YOUR_MODEL_NAME";
 
-// Replace the innerClient below with your preferred model provider 
-var innerClient = new OpenAIClient(
+// Use your preferred AI client below
+
+// If using OpenAIClient
+builder.Services.AddSingleton(new OpenAIClient(
     new ApiKeyCredential(apikey),
     new OpenAIClientOptions()
     {
         Endpoint = new Uri(endpoint)
     }
-    ).AsChatClient(model);
+));
 
-builder.Services.AddChatClient(innerClient) // 🤖 Add the configured chat client
+builder.Services.AddChatClient(services => services.GetRequiredService<OpenAIClient>().GetChatClient(model).AsIChatClient())  // 🤖 Add the configured chat client
     .UseFunctionInvocation() // 🛠️ Include tool calling
     .UseLogging(); //🐞 Include Logging
 
+// OR
+
+// If using AzureOpenAIClient
+
+// builder.Services.AddSingleton(new AzureOpenAIClient(
+//     new Uri(endpoint),
+//     new AzureKeyCredential(apikey)
+// ));
+
+// builder.Services.AddChatClient(services => services.GetRequiredService<AzureOpenAIClient>().GetChatClient(model).AsIChatClient());
+
 var app = builder.Build();
 
 // Configure the HTTP request pipeline.

common/microsoft-extensions-ai-integration/AIPromptIntegration/readme.md

@@ -35,7 +35,7 @@ To run the project successfully, you need to provide your endpoint and credentia
 var innerClient = new Azure.AI.Inference.ChatCompletionsClient(
         new Uri(endpoint),
         new AzureKeyCredential(apikey)
-    ).AsChatClient(model);
+    );
 ```
 
 **Azure OpenAI Client registration**
@@ -45,15 +45,20 @@ var innerClient = new Azure.AI.Inference.ChatCompletionsClient(
 var innerClient = new AzureOpenAIClient(
         new Uri(endpoint),
         new AzureKeyCredential(apikey)
-    ).AsChatClient(model);
+    );
 ```
 
 **OpenAI Client registration**
 
 >Program.cs
 ```csharp
-var innerClient = new OpenAIClient(apikey)
-                        .AsChatClient(model);
+var innerClient = new OpenAIClient(
+    new ApiKeyCredential(apikey),
+    new OpenAIClientOptions()
+    {
+        Endpoint = new Uri(endpoint)
+    }
+);
 ```
 
 **GitHub Models Client registration**
@@ -66,7 +71,7 @@ var innerClient = new OpenAIClient(
 			{
 				Endpoint = new Uri(endpoint)
 			}
-		).AsChatClient(model);
+		);
 ```
 
 **Ollama Client registration**