Cleanup

javiercn · javiercn · commit ae684aaa412c · 2025-11-05T17:09:37.000+01:00
diff --git a/dotnet/src/Microsoft.Agents.AI.AGUI/AGUIChatClient.cs b/dotnet/src/Microsoft.Agents.AI.AGUI/AGUIChatClient.cs
@@ -44,7 +44,7 @@ public AGUIChatClient(
     {
     }
 
-    private static IChatClient CreateInnerClient(
+    private static FunctionInvokingChatClient CreateInnerClient(
         HttpClient httpClient,
         string endpoint,
         JsonSerializerOptions jsonSerializerOptions,
diff --git a/dotnet/src/Microsoft.Agents.AI.AGUI/Microsoft.Agents.AI.AGUI.csproj b/dotnet/src/Microsoft.Agents.AI.AGUI/Microsoft.Agents.AI.AGUI.csproj
@@ -11,8 +11,6 @@
 
   <PropertyGroup>
     <InjectSharedThrow>true</InjectSharedThrow>
-    <!-- CA1859: We intentionally use IChatClient for flexibility in middleware composition -->
-    <NoWarn>$(NoWarn);CA1859</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/dotnet/src/Microsoft.Agents.AI.AGUI/Shared/ToolCallResultEvent.cs b/dotnet/src/Microsoft.Agents.AI.AGUI/Shared/ToolCallResultEvent.cs
@@ -15,10 +15,10 @@ public ToolCallResultEvent()
         this.Type = AGUIEventTypes.ToolCallResult;
     }
 
-    [JsonPropertyName("message_id")]
+    [JsonPropertyName("messageId")]
     public string? MessageId { get; set; }
 
-    [JsonPropertyName("tool_call_id")]
+    [JsonPropertyName("toolCallId")]
     public string ToolCallId { get; set; } = string.Empty;
 
     [JsonPropertyName("content")]
diff --git a/dotnet/src/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore/AGUIEndpointRouteBuilderExtensions.cs b/dotnet/src/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore/AGUIEndpointRouteBuilderExtensions.cs
@@ -43,51 +43,40 @@ public static IEndpointConventionBuilder MapAGUI(
                 return Results.BadRequest();
             }
 
-            var messages = input.Messages.AsChatMessages(AGUIJsonSerializerContext.Default.Options);
-            logger.LogInformation("[MapAGUI] Received request - ThreadId: {ThreadId}, RunId: {RunId}, MessageCount: {MessageCount}",
-                input.ThreadId, input.RunId, messages.Count());
+            var jsonSerializerOptions = context.RequestServices.GetService<JsonSerializerOptions>() ??
+                AGUIJsonSerializerContext.Default.Options;
 
-            for (int i = 0; i < messages.Count(); i++)
-            {
-                var msg = messages.ElementAt(i);
-                logger.LogDebug("[MapAGUI]   Message[{Index}]: Role={Role}, ContentCount={ContentCount}",
-                    i, msg.Role.Value, msg.Contents.Count);
+            var messages = input.Messages.AsChatMessages(jsonSerializerOptions);
+            var agent = aiAgent;
 
-                foreach (var content in msg.Contents)
+            ChatClientAgentRunOptions? runOptions = null;
+            if (input.Tools?.Any() == true)
+            {
+                runOptions = new ChatClientAgentRunOptions
                 {
-                    if (content is FunctionCallContent fcc)
-                    {
-                        logger.LogDebug("[MapAGUI]     - FunctionCallContent: Name={Name}, CallId={CallId}",
-                            fcc.Name, fcc.CallId);
-                    }
-                    else if (content is FunctionResultContent frc)
+                    ChatOptions = new ChatOptions
                     {
-                        logger.LogDebug("[MapAGUI]     - FunctionResultContent: CallId={CallId}, Result={Result}",
-                            frc.CallId, frc.Result);
+                        Tools = input.Tools.AsAITools().ToList()
                     }
-                    else
-                    {
-                        logger.LogDebug("[MapAGUI]     - {ContentType}", content.GetType().Name);
-                    }
-                }
+                };
             }
 
-            var agent = aiAgent;
-
             logger.LogInformation("[MapAGUI] Starting agent.RunStreamingAsync for ThreadId: {ThreadId}, RunId: {RunId}",
                 input.ThreadId, input.RunId);
 
             var events = agent.RunStreamingAsync(
                 messages,
+                options: runOptions,
                 cancellationToken: cancellationToken)
                 .AsChatResponseUpdatesAsync()
                 .AsAGUIEventStreamAsync(
                     input.ThreadId,
                     input.RunId,
+                    jsonSerializerOptions,
                     cancellationToken);
 
             var sseLogger = context.RequestServices.GetRequiredService<ILogger<AGUIServerSentEventsResult>>();
-            await new AGUIServerSentEventsResult(events, sseLogger).ExecuteAsync(context).ConfigureAwait(false);
+            return new AGUIServerSentEventsResult(events, sseLogger);
         });
     }
 }
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/BasicStreamingTests.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/BasicStreamingTests.cs
@@ -29,12 +29,8 @@ public async Task ClientReceivesStreamedAssistantMessageAsync()
     {
         // Arrange
         await this.SetupTestServerAsync();
-<<<<<<< HEAD
-        AGUIAgent agent = new("assistant", "Sample assistant", this._client!, "", null, []);
-=======
         var chatClient = new AGUIChatClient(this._client!, "", null);
         AIAgent agent = chatClient.CreateAIAgent(instructions: null, name: "assistant", description: "Sample assistant", tools: []);
->>>>>>> 60969b4e (Cleanup)
         AgentThread thread = agent.GetNewThread();
         ChatMessage userMessage = new(ChatRole.User, "hello");
 
@@ -473,5 +469,5 @@ public FakeInMemoryAgentThread(JsonElement serializedThread, JsonSerializerOptio
         }
     }
 
-    public object? GetService(Type serviceType, object? serviceKey = null) => null;
+    public override object? GetService(Type serviceType, object? serviceKey = null) => null;
 }
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/ToolCallingTests.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/ToolCallingTests.cs
@@ -538,58 +538,24 @@ private async Task SetupTestServerWithAzureOpenAIAsync(string endpoint, string d
 
         this._app = builder.Build();
 
-        this._app.MapAGUIAgent("/agent", (IEnumerable<ChatMessage> messages, IEnumerable<AITool> tools) =>
-        {
-            var clientTools = tools?.ToList() ?? [];
-            var messagesList = messages?.ToList() ?? [];
-            var serverToolsList = serverTools?.ToList() ?? [];
-
-            this._output.WriteLine($"[Server Factory] Client tools count: {clientTools.Count}");
-            this._output.WriteLine($"[Server Factory] Server tools count: {serverToolsList.Count}");
-            this._output.WriteLine($"[Server Factory] Messages count: {messagesList.Count}");
-            for (int i = 0; i < messagesList.Count; i++)
-            {
-                var msg = messagesList[i];
-                this._output.WriteLine($"  Message[{i}]: Role={msg.Role}, ContentCount={msg.Contents.Count}");
-                foreach (var content in msg.Contents)
-                {
-                    if (content is FunctionCallContent fcc)
-                    {
-                        this._output.WriteLine($"    - FunctionCallContent: {fcc.Name} (CallId: {fcc.CallId})");
-                    }
-                    else if (content is FunctionResultContent frc)
-                    {
-                        this._output.WriteLine($"    - FunctionResultContent: CallId={frc.CallId}, Result={frc.Result}");
-                    }
-                    else if (content is TextContent tc)
-                    {
-                        this._output.WriteLine($"    - TextContent: {tc.Text}");
-                    }
-                    else
-                    {
-                        this._output.WriteLine($"    - {content.GetType().Name}");
-                    }
-                }
-            }
-
-            var azureOpenAIClient = new AzureOpenAIClient(
-                new Uri(endpoint),
-                new DefaultAzureCredential());
-
-            var chatClient = azureOpenAIClient
-                .GetChatClient(deploymentName)
-                .AsIChatClient();
-
-            // DO NOT pass client tools to Azure OpenAI
-            // Client tools should only be executed on the client side
-            // Pass only server-side tools to Azure OpenAI
-            return chatClient.CreateAIAgent(
-                instructions: null,
-                name: "azure-openai-agent",
-                description: "An agent using Azure OpenAI",
-                tools: serverToolsList);
-        });
+        var azureOpenAIClient = new AzureOpenAIClient(
+            new Uri(endpoint),
+            new DefaultAzureCredential());
+
+        var chatClient = azureOpenAIClient
+            .GetChatClient(deploymentName)
+            .AsIChatClient();
+
+        // DO NOT pass client tools to Azure OpenAI
+        // Client tools should only be executed on the client side
+        // Pass only server-side tools to Azure OpenAI
+        var agent = chatClient.CreateAIAgent(
+            instructions: null,
+            name: "azure-openai-agent",
+            description: "An agent using Azure OpenAI",
+            tools: serverTools);
 
+        this._app.MapAGUI("/agent", agent);
         await this._app.StartAsync();
 
         TestServer testServer = this._app.Services.GetRequiredService<IServer>() as TestServer
@@ -605,39 +571,9 @@ private async Task SetupTestServerAsync(IList<AITool>? serverTools = null, bool
         builder.WebHost.UseTestServer();
 
         this._app = builder.Build();
-
-        this._app.MapAGUIAgent("/agent", (IEnumerable<ChatMessage> messages, IEnumerable<AITool> tools) =>
-        {
-            // tools = client tools from AG-UI request (sent as declarations, not executable)
-            // serverTools = actual executable server tools
-            var clientTools = tools?.ToList() ?? [];
-            var serverToolsList = serverTools?.ToList() ?? [];
-
-            this._output.WriteLine($"[Server Factory] Client tools count: {clientTools.Count}");
-            this._output.WriteLine($"[Server Factory] Server tools count: {serverToolsList.Count}");
-
-            foreach (var tool in serverToolsList)
-            {
-                var name = tool is AIFunctionDeclaration decl ? decl.Name : "Unknown";
-                this._output.WriteLine($"[Server Factory]   Server tool: {tool?.GetType().Name} - {name}");
-            }
-
-            foreach (var tool in clientTools)
-            {
-                var name = tool is AIFunctionDeclaration decl ? decl.Name : "Unknown";
-                this._output.WriteLine($"[Server Factory]   Client tool: {tool?.GetType().Name} - {name}");
-            }
-
-            // FunctionInvokingChatClient will terminate if it sees ANY non-invocable AIFunctionDeclaration
-            // So we must ONLY pass executable server tools to CreateAIAgent
-            // The FakeChatClient needs to know about ALL tools (server + client) to generate proper function calls
-            var allTools = serverToolsList.Concat(clientTools).ToList();
-
-            var fakeChatClient = new FakeToolCallingChatClient(triggerParallelCalls, this._output, allTools);
-            // Pass ONLY executable server tools - client tool declarations would cause FunctionInvokingChatClient to terminate
-            this._output.WriteLine($"[Server Factory] Passing {serverToolsList.Count} server tools to CreateAIAgent");
-            return fakeChatClient.CreateAIAgent(instructions: null, name: "fake-agent", description: "A fake agent for tool testing", tools: serverToolsList);
-        });
+        var fakeChatClient = new FakeToolCallingChatClient(triggerParallelCalls, this._output);
+        AIAgent baseAgent = fakeChatClient.CreateAIAgent(instructions: null, name: "base-agent", description: "A base agent for tool testing", tools: serverTools ?? []);
+        this._app.MapAGUI("/agent", baseAgent);
 
         await this._app.StartAsync();
 
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/test-output.txt b/dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/test-output.txt
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/test-output2.txt b/dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.IntegrationTests/test-output2.txt
diff --git a/dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.UnitTests/AGUIEndpointRouteBuilderExtensionsTests.cs b/dotnet/tests/Microsoft.Agents.AI.Hosting.AGUI.AspNetCore.UnitTests/AGUIEndpointRouteBuilderExtensionsTests.cs
@@ -217,7 +217,7 @@ private RequestDelegate CreateRequestDelegate(
                 return;
             }
 
-            IEnumerable<ChatMessage> messages = input.Messages.AsChatMessages();
+            IEnumerable<ChatMessage> messages = input.Messages.AsChatMessages(AGUIJsonSerializerContext.Default.Options);
             IEnumerable<KeyValuePair<string, string>> contextValues = input.Context;
             JsonElement forwardedProps = input.ForwardedProperties;
             AIAgent agent = factory(messages, [], contextValues, forwardedProps);
@@ -229,6 +229,7 @@ private RequestDelegate CreateRequestDelegate(
                 .AsAGUIEventStreamAsync(
                     input.ThreadId,
                     input.RunId,
+                    AGUIJsonSerializerContext.Default.Options,
                     cancellationToken);
 
             ILogger<AGUIServerSentEventsResult> logger = NullLogger<AGUIServerSentEventsResult>.Instance;

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public AGUIChatClient(`
`44`	`44`	`{`
`45`	`45`	`}`
`46`	`46`
`47`		`- private static IChatClient CreateInnerClient(`
	`47`	`+ private static FunctionInvokingChatClient CreateInnerClient(`
`48`	`48`	`HttpClient httpClient,`
`49`	`49`	`string endpoint,`
`50`	`50`	`JsonSerializerOptions jsonSerializerOptions,`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,8 @@ public async Task ClientReceivesStreamedAssistantMessageAsync()`
`29`	`29`	`{`
`30`	`30`	`// Arrange`
`31`	`31`	`await this.SetupTestServerAsync();`
`32`		`-<<<<<<< HEAD`
`33`		`- AGUIAgent agent = new("assistant", "Sample assistant", this._client!, "", null, []);`
`34`		`-=======`
`35`	`32`	`var chatClient = new AGUIChatClient(this._client!, "", null);`
`36`	`33`	`AIAgent agent = chatClient.CreateAIAgent(instructions: null, name: "assistant", description: "Sample assistant", tools: []);`
`37`		`->>>>>>> 60969b4e (Cleanup)`
`38`	`34`	`AgentThread thread = agent.GetNewThread();`
`39`	`35`	`ChatMessage userMessage = new(ChatRole.User, "hello");`
`40`	`36`
`@@ -473,5 +469,5 @@ public FakeInMemoryAgentThread(JsonElement serializedThread, JsonSerializerOptio`
`473`	`469`	`}`
`474`	`470`	`}`
`475`	`471`
`476`		`- public object? GetService(Type serviceType, object? serviceKey = null) => null;`
	`472`	`+ public override object? GetService(Type serviceType, object? serviceKey = null) => null;`
`477`	`473`	`}`