Cleanup MapAGUI API

Author: javiercn

dotnet/samples/AGUIClientServer/AGUIServer/Program.cs

@@ -3,6 +3,7 @@
 using Azure.AI.OpenAI;
 using Azure.Identity;
 using Microsoft.Agents.AI.Hosting.AGUI.AspNetCore;
+using Microsoft.Extensions.AI;
 using OpenAI;
 
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
@@ -12,14 +13,14 @@
 string endpoint = builder.Configuration["AZURE_OPENAI_ENDPOINT"] ?? throw new InvalidOperationException("AZURE_OPENAI_ENDPOINT is not set.");
 string deploymentName = builder.Configuration["AZURE_OPENAI_DEPLOYMENT_NAME"] ?? throw new InvalidOperationException("AZURE_OPENAI_DEPLOYMENT_NAME is not set.");
 
+// Create the AI agent
+var agent = new AzureOpenAIClient(
+        new Uri(endpoint),
+        new DefaultAzureCredential())
+    .GetChatClient(deploymentName)
+    .CreateAIAgent(name: "AGUIAssistant");
+
 // Map the AG-UI agent endpoint
-app.MapAGUIAgent("/", (messages) =>
-{
-    return new AzureOpenAIClient(
-            new Uri(endpoint),
-            new DefaultAzureCredential())
-        .GetChatClient(deploymentName)
-        .CreateAIAgent(name: "AGUIAssistant");
-});
+app.MapAGUI("/", agent);
 
 await app.RunAsync();

dotnet/samples/AGUIClientServer/README.md

@@ -114,18 +114,16 @@ User (:q or quit to exit): :q
 
 ### Server Side
 
-The `AGUIServer` uses the `MapAGUIAgent` extension method to expose an agent through the AG-UI protocol:
+The `AGUIServer` uses the `MapAGUI` extension method to expose an agent through the AG-UI protocol:
 
 ```csharp
-app.MapAGUIAgent("/", (messages, tools, context, forwardedProps) =>
-{
-    AIAgent agent = new OpenAIClient(apiKey)
-        .GetChatClient(model)
-        .CreateAIAgent(
-            instructions: "You are a helpful assistant.",
-            name: "AGUIAssistant");
-    return agent;
-});
+AIAgent agent = new OpenAIClient(apiKey)
+    .GetChatClient(model)
+    .CreateAIAgent(
+        instructions: "You are a helpful assistant.",
+        name: "AGUIAssistant");
+
+app.MapAGUI("/", agent);
 ```
 
 This automatically handles:

dotnet/src/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore/AGUIEndpointRouteBuilderExtensions.cs

@@ -24,12 +24,12 @@ public static class AGUIEndpointRouteBuilderExtensions
     /// </summary>
     /// <param name="endpoints">The endpoint route builder.</param>
     /// <param name="pattern">The URL pattern for the endpoint.</param>
-    /// <param name="agentFactory">Factory function to create an agent instance.</param>
+    /// <param name="aiAgent">The agent instance.</param>
     /// <returns>An <see cref="IEndpointConventionBuilder"/> for the mapped endpoint.</returns>
-    public static IEndpointConventionBuilder MapAGUIAgent(
+    public static IEndpointConventionBuilder MapAGUI(
         this IEndpointRouteBuilder endpoints,
         string pattern,
-        Func<IEnumerable<ChatMessage>, AIAgent> agentFactory)
+        AIAgent aiAgent)
     {
         return endpoints.MapPost(pattern, async ([FromBody] RunAgentInput? input, HttpContext context, CancellationToken cancellationToken) =>
         {
@@ -39,7 +39,7 @@ public static IEndpointConventionBuilder MapAGUIAgent(
             }
 
             var messages = input.Messages.AsChatMessages();
-            var agent = agentFactory(messages);
+            var agent = aiAgent;
 
             var events = agent.RunStreamingAsync(
                 messages,

dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/BasicStreamingTests.cs

@@ -258,16 +258,11 @@ private async Task SetupTestServerAsync(bool useMultiMessageAgent = false)
 
         this._app = builder.Build();
 
-        if (useMultiMessageAgent)
-        {
-            this._app.MapAGUIAgent("/agent", (IEnumerable<ChatMessage> messages) =>
-                this._app.Services.GetRequiredService<FakeMultiMessageAgent>());
-        }
-        else
-        {
-            this._app.MapAGUIAgent("/agent", (IEnumerable<ChatMessage> messages) =>
-                this._app.Services.GetRequiredService<FakeChatClientAgent>());
-        }
+        AIAgent agent = useMultiMessageAgent
+            ? this._app.Services.GetRequiredService<FakeMultiMessageAgent>()
+            : this._app.Services.GetRequiredService<FakeChatClientAgent>();
+
+        this._app.MapAGUI("/agent", agent);
 
         await this._app.StartAsync();
 

dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.UnitTests/AGUIEndpointRouteBuilderExtensionsTests.cs

@@ -35,10 +35,10 @@ public void MapAGUIAgent_MapsEndpoint_AtSpecifiedPattern()
         endpointsMock.Setup(e => e.DataSources).Returns([]);
 
         const string Pattern = "/api/agent";
-        AIAgent factory(IEnumerable<ChatMessage> messages) => new TestAgent();
+        AIAgent agent = new TestAgent();
 
         // Act
-        IEndpointConventionBuilder? result = AGUIEndpointRouteBuilderExtensions.MapAGUIAgent(endpointsMock.Object, Pattern, factory);
+        IEndpointConventionBuilder? result = AGUIEndpointRouteBuilderExtensions.MapAGUI(endpointsMock.Object, Pattern, agent);
 
         // Assert
         Assert.NotNull(result);