Adapt to new breaking changes in AF

Author: kzu

sample/Server/AgentDiscoveryExtensions.cs

@@ -1,17 +1,15 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
-using Microsoft.Agents.AI.Hosting;
+using Microsoft.Agents.AI;
 
 static class AgentDiscoveryExtensions
 {
     public static void MapAgentDiscovery(this IEndpointRouteBuilder endpoints, [StringSyntax("Route")] string path)
     {
         var routeGroup = endpoints.MapGroup(path);
-        routeGroup.MapGet("/", async (AgentCatalog catalog, CancellationToken cancellation)
-            => Results.Ok(await catalog
-                .GetAgentsAsync(cancellation)
-                .Select(agent => new AgentDiscoveryCard(agent.Name!, agent.Description))
-                .ToArrayAsync()))
+        routeGroup.MapGet("/", () => Results.Ok(endpoints.ServiceProvider
+            .GetKeyedServices<AIAgent>(KeyedService.AnyKey)
+            .Select(agent => new AgentDiscoveryCard(agent.Name!, agent.Description)).ToArray()))
             .WithName("GetAgents");
     }
 

sample/Server/ConsoleExtensions.cs

@@ -1,6 +1,6 @@
 using Devlooped.Agents.AI;
 using Devlooped.Extensions.AI;
-using Microsoft.Agents.AI.Hosting;
+using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
@@ -13,7 +13,6 @@ public static class ConsoleExtensions
     {
         public async ValueTask RenderAgentsAsync(IServiceCollection collection)
         {
-            var catalog = services.GetRequiredService<AgentCatalog>();
             var settings = new JsonSerializerSettings
             {
                 NullValueHandling = NullValueHandling.Include,
@@ -38,8 +37,12 @@ public async ValueTask RenderAgentsAsync(IServiceCollection collection)
             }
 
             // List configured agents
-            await foreach (var agent in catalog.GetAgentsAsync())
+            foreach (var descriptor in collection.AsEnumerable().Where(x => x.ServiceKey != null && x.ServiceType == typeof(AIAgent)))
             {
+                var agent = services.GetKeyedService<AIAgent>(descriptor.ServiceKey);
+                if (agent is null)
+                    continue;
+
                 var metadata = agent.GetService<ConfigurableAIAgentMetadata>();
 
                 AnsiConsole.Write(new Panel(new JsonText(JsonConvert.SerializeObject(new { Agent = agent, Metadata = metadata }, settings)))

sample/Server/Program.cs

@@ -2,8 +2,6 @@
 using System.Text;
 using Devlooped.Extensions.AI;
 using Microsoft.Agents.AI;
-using Microsoft.Agents.AI.Hosting;
-using Microsoft.Agents.AI.Hosting.OpenAI;
 using Microsoft.Extensions.AI;
 using Spectre.Console;
 
@@ -45,9 +43,8 @@
 #endif
 
 // Map each agent's endpoints via response API
-var catalog = app.Services.GetRequiredService<AgentCatalog>();
 // List configured agents
-await foreach (var agent in catalog.GetAgentsAsync())
+foreach (var agent in app.Services.GetKeyedServices<AIAgent>(KeyedService.AnyKey))
 {
     if (agent.Name != null)
         app.MapOpenAIResponses(agent.Name);

sample/Server/Server.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Agents.AI.Hosting.OpenAI" Version="42.42.11-pre" />
+    <PackageReference Include="Microsoft.Agents.AI.Hosting.OpenAI" Version="42.42.12-pre" />
     <PackageReference Include="ModelContextProtocol" Version="0.4.0-preview.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="ThisAssembly.Project" Version="2.1.2" PrivateAssets="all" />

src/Agents/Agents.csproj

@@ -23,10 +23,10 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
 
-    <PackageReference Include="Microsoft.Agents.AI" Version="42.42.11-pre" />
-    <PackageReference Include="Microsoft.Agents.AI.Hosting" Version="42.42.11-pre" />
-    <PackageReference Include="Microsoft.Agents.AI.AzureAI" Version="42.42.11-pre" />
-    <PackageReference Include="Microsoft.Agents.AI.OpenAI" Version="42.42.11-pre" />
+    <PackageReference Include="Microsoft.Agents.AI" Version="42.42.12-pre" />
+    <PackageReference Include="Microsoft.Agents.AI.Hosting" Version="42.42.12-pre" />
+    <PackageReference Include="Microsoft.Agents.AI.AzureAI" Version="42.42.12-pre" />
+    <PackageReference Include="Microsoft.Agents.AI.OpenAI" Version="42.42.12-pre" />
     <PackageReference Include="ModelContextProtocol" Version="0.4.0-preview.3" />
     <PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" />
     <PackageReference Include="YamlDotNet" Version="16.3.0" />

src/Agents/ConfigurableAIAgent.cs

@@ -236,6 +236,11 @@ void OnReload(object? state)
 
     internal class AgentClientOptions : ChatClientAgentOptions
     {
+        public string? Instructions
+        {
+            get => ChatOptions?.Instructions;
+            set => (ChatOptions ??= new()).Instructions = value;
+        }
         public string? Client { get; set; }
         public string? Model { get; set; }
         public IList<string>? Use { get; set; }

src/Tests/ConfigurableAgentTests.cs

@@ -1,5 +1,4 @@
 using Devlooped.Extensions.AI;
-using Devlooped.Extensions.AI.Grok;
 using Microsoft.Agents.AI;
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Configuration;
@@ -139,7 +138,7 @@ Line 3
                 - Step 1
                 - Step 2
                 - Step 3
-            """, agent.GetService<ChatClientAgentOptions>()?.Instructions);
+            """, agent.GetService<ChatClientAgentOptions>()?.ChatOptions?.Instructions);
     }
 
     [Fact]
@@ -166,7 +165,7 @@ public void CanReloadConfiguration()
         var agent = app.Services.GetRequiredKeyedService<AIAgent>("bot");
 
         Assert.Equal("Helpful chat agent", agent.Description);
-        Assert.Equal("You are a helpful agent.", agent.GetService<ChatClientAgentOptions>()?.Instructions);
+        Assert.Equal("You are a helpful agent.", agent.GetService<ChatClientAgentOptions>()?.ChatOptions?.Instructions);
         Assert.Equal("openai", agent.GetService<AIAgentMetadata>()?.ProviderName);
 
         // Change the configuration to point to a different client
@@ -179,7 +178,7 @@ public void CanReloadConfiguration()
         configuration.Reload();
 
         Assert.Equal("Very helpful chat agent", agent.Description);
-        Assert.Equal("You are a very helpful chat agent.", agent.GetService<ChatClientAgentOptions>()?.Instructions);
+        Assert.Equal("You are a very helpful chat agent.", agent.GetService<ChatClientAgentOptions>()?.ChatOptions?.Instructions);
         Assert.Equal("xai", agent.GetService<AIAgentMetadata>()?.ProviderName);
     }