mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
6cd81286a9
* dotnet: Add hosted-agent User-Agent supplement to outgoing requests
When an agent runs inside a Foundry Hosted Agent, the outgoing
User-Agent header now includes 'agent-framework-hosted/{version}'
alongside the existing 'MEAI/{version}' segment.
- Add HostedAgentContext with AsyncLocal<string?> property
- MeaiUserAgentPolicy reads the supplement per-call
- AgentFrameworkResponseHandler sets/restores the context
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* chore: update hosted UA format to foundry-hosting/agent-framework-dotnet/{version}
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
* Trying to get UA flowing, no luck yet.
* .NET: Polyfill MEAI OpenAIResponsesChatClient to add hosted-agent User-Agent supplement
When AgentFrameworkResponseHandler resolves an agent (i.e. we are running in a
hosted context), TryApplyUserAgent walks the agent's IChatClient decorator chain
to find MEAI's internal OpenAIResponsesChatClient and reflectively swaps its
inner _responseClient field with a DelegatingResponsesClient wrapper. The
wrapper overrides the public-virtual protocol methods to add a per-call
HostedAgentUserAgentPolicy to the RequestOptions and delegate to the inner
ResponsesClient. The OpenAI SDK's internal streaming overloads bottom out in
calls to the public-virtual non-streaming overloads via virtual dispatch on
this, so streaming is covered without overriding any non-virtual member.
The wrapper accepts any ResponsesClient-derived inner — both the Foundry
ProjectResponsesClient and the native OpenAI ResponsesClient — and preserves
the inner client's full pipeline (Transport, RetryPolicy, NetworkTimeout,
OrganizationId / ProjectId / UserAgentApplicationId, custom policies).
- Add DelegatingResponsesClient + HostedAgentUserAgentPolicy in Microsoft.Agents.AI.Foundry.Hosting.
- Add TryApplyUserAgent next to ApplyOpenTelemetry in FoundryHostingExtensions; wire it into AgentFrameworkResponseHandler.GetAgent for both keyed and default-agent paths.
- Drop earlier-iteration dead code: AddHostedAgentTelemetry extension, HostedUserAgentPolicy class, HostedAgentContext.cs, and the never-called ToRequestOptions helper.
- Revert RequestOptionsExtensions.MeaiUserAgentPolicy to MEAI-only (the supplement is now injected by the polyfill).
- Revert unrelated whitespace change in Agent_Step25_ToolboxServerSideTools sample.
- Tests cover streaming AND non-streaming, retry policy preservation, OrganizationId/ProjectId/UserAgentApplicationId pass-through, idempotency, native OpenAI ResponsesClient, and reflection guards for MEAI/OpenAI shape drift.
* .NET: Address review feedback on hosted-agent User-Agent polyfill
- TryApplyUserAgent: replace silent null-return with ArgumentNullException to match the codebase's convention.
- Add idempotency test (TryApplyUserAgent_CalledTwiceOnSameAgent_DoesNotDoubleWrap) — runs the polyfill twice on the same agent and asserts the wire UA contains exactly one foundry-hosting segment, proving the 'current is DelegatingResponsesClient' guard prevents nested wrapping.
- Add retry-double-append test (Polyfill_RetryWithinCall_DoesNotDuplicateSupplementInUserAgent) — exercises the HostedAgentUserAgentPolicy Contains-guard via a custom retry policy that re-runs the inner pipeline on the same message.
- Replace TryApplyUserAgent_NullAgent_ReturnsNullWithoutThrowing with TryApplyUserAgent_NullAgent_ThrowsArgumentNullException to match the new contract.
* .NET: Drop null check from TryApplyUserAgent and its now-redundant test
The two call sites in AgentFrameworkResponseHandler.GetAgent already null-check the agent before invoking TryApplyUserAgent, so the defensive ArgumentNullException is unreachable. Remove it and the corresponding test.
* .NET: Remove unused Microsoft.Shared.Diagnostics import in ServiceCollectionExtensions
The Throw.IfNull helper from this namespace was used by the now-removed null check in TryApplyUserAgent. Drop the unused import to satisfy IDE0005 in CI's full-project dotnet format run.
---------
Co-authored-by: alliscode <bentho@microsoft.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Roger Barreto <19890735+rogerbarreto@users.noreply.github.com>
166 lines
6.5 KiB
C#
166 lines
6.5 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
using System;
|
|
using System.ClientModel.Primitives;
|
|
using System.Collections.Generic;
|
|
using System.Net;
|
|
using System.Net.Http;
|
|
using System.Text;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Azure.AI.Extensions.OpenAI;
|
|
using Microsoft.Agents.AI.Foundry.Hosting;
|
|
using Microsoft.AspNetCore.Builder;
|
|
using Microsoft.AspNetCore.Hosting.Server;
|
|
using Microsoft.AspNetCore.TestHost;
|
|
using Microsoft.Extensions.AI;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
#pragma warning disable OPENAI001, SCME0001, SCME0002, MEAI001
|
|
|
|
namespace Microsoft.Agents.AI.Foundry.UnitTests.Hosting;
|
|
|
|
/// <summary>
|
|
/// End-to-end tests that exercise the FULL hosted ASP.NET Core pipeline:
|
|
/// inbound HTTP → MapFoundryResponses → AgentFrameworkResponseHandler → TryApplyUserAgent →
|
|
/// agent invocation → outbound HTTP from inside the hosted environment.
|
|
/// Verifies that the hosted-agent <c>User-Agent</c> supplement reaches the outbound wire,
|
|
/// not just the inbound request.
|
|
/// </summary>
|
|
public sealed class HostedOutboundUserAgentTests : IAsyncDisposable
|
|
{
|
|
private const string TestEndpoint = "https://fake-foundry.example.com/api/projects/fake-prj";
|
|
private const string Deployment = "fake-deployment";
|
|
|
|
private WebApplication? _app;
|
|
private HttpClient? _inboundClient;
|
|
private RecordingHandler? _outboundHandler;
|
|
|
|
public async ValueTask DisposeAsync()
|
|
{
|
|
this._inboundClient?.Dispose();
|
|
this._outboundHandler?.Dispose();
|
|
if (this._app is not null)
|
|
{
|
|
await this._app.DisposeAsync();
|
|
}
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Hosted_InboundResponsesRequest_TriggersOutboundCall_WithFoundryHostingSupplementAsync()
|
|
{
|
|
// Arrange: spin up a real ASP.NET Core TestServer that hosts an AIAgent backed by MEAI's
|
|
// OpenAIResponsesChatClient → ProjectResponsesClient → fake HTTP transport. This is the
|
|
// exact production stack minus the network: the only thing not real is the wire transport.
|
|
await this.StartHostedServerAsync();
|
|
|
|
// Act: send an inbound /openai/v1/responses request as the Foundry runtime would.
|
|
using var inboundRequest = new HttpRequestMessage(HttpMethod.Post, "/responses")
|
|
{
|
|
Content = new StringContent(InboundResponsesRequestJson(), Encoding.UTF8, "application/json"),
|
|
};
|
|
using var inboundResponse = await this._inboundClient!.SendAsync(inboundRequest);
|
|
var inboundBody = await inboundResponse.Content.ReadAsStringAsync();
|
|
|
|
// Assert: at least one OUTBOUND request reached the fake transport, AND it carries the
|
|
// foundry-hosting/agent-framework-dotnet/{version} supplement on its User-Agent.
|
|
// (We don't care about the inbound response shape — only that the agent's call to MEAI
|
|
// triggered an outbound request whose UA reaches the sandbox boundary correctly.)
|
|
Assert.True(this._outboundHandler!.Requests.Count > 0,
|
|
$"Expected at least one outbound request. Inbound status: {(int)inboundResponse.StatusCode}, body: {inboundBody}");
|
|
var outbound = this._outboundHandler.Requests[0];
|
|
Assert.StartsWith(TestEndpoint, outbound.Uri);
|
|
Assert.Contains("MEAI/", outbound.UserAgent);
|
|
Assert.Contains("foundry-hosting/agent-framework-dotnet", outbound.UserAgent);
|
|
}
|
|
|
|
private async Task StartHostedServerAsync()
|
|
{
|
|
var builder = WebApplication.CreateBuilder();
|
|
builder.WebHost.UseTestServer();
|
|
|
|
// Build a real ChatClientAgent whose IChatClient is MEAI's OpenAIResponsesChatClient
|
|
// wrapping a ProjectResponsesClient backed by a fake HTTP handler. After AgentFrameworkResponseHandler
|
|
// resolves this agent, TryApplyUserAgent will swap the inner _responseClient with our wrapper.
|
|
this._outboundHandler = new RecordingHandler(MinimalResponseJson());
|
|
#pragma warning disable CA5399
|
|
var outboundHttpClient = new HttpClient(this._outboundHandler);
|
|
#pragma warning restore CA5399
|
|
|
|
var projectOptions = new ProjectResponsesClientOptions
|
|
{
|
|
Transport = new HttpClientPipelineTransport(outboundHttpClient),
|
|
};
|
|
var projectResponsesClient = new ProjectResponsesClient(
|
|
new Uri(TestEndpoint),
|
|
new FakeAuthenticationTokenProvider(),
|
|
projectOptions);
|
|
|
|
IChatClient chatClient = projectResponsesClient.AsIChatClient(Deployment);
|
|
AIAgent agent = new ChatClientAgent(chatClient);
|
|
|
|
builder.Services.AddFoundryResponses(agent);
|
|
builder.Services.AddLogging();
|
|
|
|
this._app = builder.Build();
|
|
this._app.MapFoundryResponses();
|
|
|
|
await this._app.StartAsync();
|
|
|
|
var testServer = this._app.Services.GetRequiredService<IServer>() as TestServer
|
|
?? throw new InvalidOperationException("TestServer not found");
|
|
|
|
this._inboundClient = testServer.CreateClient();
|
|
}
|
|
|
|
private static string InboundResponsesRequestJson() => """
|
|
{
|
|
"model": "fake-deployment",
|
|
"input": [
|
|
{
|
|
"type": "message",
|
|
"id": "msg_1",
|
|
"status": "completed",
|
|
"role": "user",
|
|
"content": [{ "type": "input_text", "text": "Hello" }]
|
|
}
|
|
]
|
|
}
|
|
""";
|
|
|
|
private static string MinimalResponseJson() => """
|
|
{
|
|
"id":"resp_1","object":"response","created_at":1700000000,"status":"completed",
|
|
"model":"fake","output":[],"usage":{"input_tokens":1,"output_tokens":1,"total_tokens":2}
|
|
}
|
|
""";
|
|
|
|
private sealed class RecordingHandler : HttpClientHandler
|
|
{
|
|
private readonly string _body;
|
|
public List<RecordedRequest> Requests { get; } = [];
|
|
|
|
public RecordingHandler(string body)
|
|
{
|
|
this._body = body;
|
|
}
|
|
|
|
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
|
|
{
|
|
string ua = request.Headers.TryGetValues("User-Agent", out var values)
|
|
? string.Join(",", values)
|
|
: "(none)";
|
|
this.Requests.Add(new RecordedRequest(request.RequestUri?.ToString() ?? "?", ua));
|
|
|
|
var resp = new HttpResponseMessage(HttpStatusCode.OK)
|
|
{
|
|
Content = new StringContent(this._body, Encoding.UTF8, "application/json"),
|
|
RequestMessage = request,
|
|
};
|
|
return Task.FromResult(resp);
|
|
}
|
|
}
|
|
|
|
private readonly record struct RecordedRequest(string Uri, string UserAgent);
|
|
}
|