mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
ad95f2f2fa
* .NET: Add Hosted-MemoryAgent sample with isolation key plumbing (#5692) Adds HostedSessionContext + HostedSessionIsolationKeyProvider in Microsoft.Agents.AI.Foundry.Hosting so AIContextProviders (notably FoundryMemoryProvider) can scope per user via the platform's x-agent-user-isolation-key / x-agent-chat-isolation-key headers. - New types: HostedSessionContext (sealed), HostedSessionContextExtensions (public Get, internal Set), abstract HostedSessionIsolationKeyProvider (async), internal PlatformHostedSessionIsolationKeyProvider mapping ResponseContext.Isolation. - AgentFrameworkResponseHandler now resolves the provider, tags fresh sessions, and validates resumed sessions against the live request (strict 403 'Hosted session identity context mismatch' on any mismatch; 500 on null keys). - New shared sample project Hosted_Shared_Contributor_Setup hosts DevTemporaryTokenCredential and DevTemporaryLocalSessionIsolationKeyProvider plus AddDevTemporaryLocalContributorSetup. All 9 existing responses samples migrated to consume it so local runs keep working under the strict isolation contract. - New Hosted-MemoryAgent sample: travel assistant wired through FoundryMemoryProvider with stateInitializer reading session.GetHostedContext().UserId. Includes Dockerfile, smoke.ps1, agent.yaml/manifest. - New IT scenario 'memory' in Foundry.Hosting.IntegrationTests + MemoryHostedAgentFixture + MemoryHostedAgentTests. Verified end to end against the tao Foundry project. - ADR 0026 captures the design tree. * Address PR review feedback - Dockerfile: add header noting it targets NuGet builds; contributors must use Dockerfile.contributor for ProjectReference source builds. - PlatformHostedSessionIsolationKeyProvider: doc said 'returns context with empty values'; corrected to 'returns null' which the handler treats as 500. - FakeHostedSessionIsolationKeyProvider: doc clarifies that null configurations are allowed for testing the handler error path. - HostedSessionContextExtensions.SetHostedContext: enforce write-once with InvalidOperationException; doc + xml exception updated. - AgentFrameworkResponseHandler: cache PlatformHostedSessionIsolationKeyProvider as static readonly to avoid per-request allocation. - MemoryHostedAgentTests: tighten waits from 20s to 5s (FoundryMemoryProvider defaults UpdateDelay=0; ingestion ~3s). - Sample Program.cs imports reordered to satisfy IDE0005. * Add HostedFoundryMemoryProviderScopes built-in helpers (#5692) Addresses review feedback from @lokitoth on Hosted-MemoryAgent/Program.cs:54. - New HostedFoundryMemoryProviderScopes static class with PerUser, PerChat, PerUserAndChat factories returning Func<AgentSession?, FoundryMemoryProvider.State>. - All helpers throw InvalidOperationException when GetHostedContext() is null, with a message pointing at writing a custom stateInitializer for non-hosted scenarios. - New HostedFoundryMemoryScope enum and AddHostedFoundryMemoryProvider DI extension (two overloads: explicit AIProjectClient and DI-resolved). Singleton lifetime. Default scope = PerUser. - Hosted-MemoryAgent sample and the memory IT scenario container both swap their inline lambdas for HostedFoundryMemoryProviderScopes.PerUser(). - 14 new unit tests (241/241 hosting unit tests pass). * Replace HostedFoundryMemoryScope enum with Func<...> parameter (#5692) Address PR review feedback from @westey-m: enums are a breaking-change hazard when extended, and the enum was redundant with the existing HostedFoundryMemoryProviderScopes static class. - Delete HostedFoundryMemoryScope.cs. - AddHostedFoundryMemoryProvider DI extensions now take Func<AgentSession?, FoundryMemoryProvider.State>? stateInitializer = null. When null, default to HostedFoundryMemoryProviderScopes.PerUser(). - Callers pick a built-in helper (PerUser/PerChat/PerUserAndChat) or pass a custom delegate. New built-ins are a single static method addition with zero impact on existing callers. - Tests updated; 244/244 hosting unit tests pass. * Fix isolation context resume for externally-created conversations (#5692) Branch on the session's existing hosted-context (not on conversation_id presence) so a conversation provisioned externally (e.g. via conversations.CreateProjectConversationAsync) is treated as fresh on first hosted-agent request and stamped, rather than rejected with 403 hosted_session_identity_mismatch. Strict equality is preserved on real resume of an already-stamped session. Also tighten dotnet/global.json to version 10.0.204 + rollForward latestPatch so local builds match the CI Docker image SDK and avoid 10.0.300 dotnet format stripping required usings. * Revert global.json SDK pin to upstream (#5692) The 10.0.204 + latestPatch pin from the previous commit broke the dotnet-format CI job (hostfxr_resolve_sdk2 could not find a compatible SDK in the mcr.microsoft.com/dotnet/sdk:10.0 image). Restore upstream 10.0.200 + minor; local Release builds with SDK 10.0.300 should set GITHUB_ACTIONS=true to bypass the auto-format-on-build target.
234 lines
9.7 KiB
C#
234 lines
9.7 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
using System;
|
|
using System.ClientModel;
|
|
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.AspNetCore.Builder;
|
|
using Microsoft.AspNetCore.Hosting.Server;
|
|
using Microsoft.AspNetCore.TestHost;
|
|
using Microsoft.Extensions.AI;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using OpenAI;
|
|
|
|
#pragma warning disable OPENAI001, SCME0001, SCME0002, MEAI001
|
|
|
|
namespace Microsoft.Agents.AI.Foundry.Hosting.UnitTests;
|
|
|
|
/// <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.AddSingleton<HostedSessionIsolationKeyProvider>(new FakeHostedSessionIsolationKeyProvider());
|
|
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}
|
|
}
|
|
""";
|
|
|
|
[Fact]
|
|
public void TryApplyUserAgent_RepeatedCalls_OnSameAgent_RegistersPolicyOnce()
|
|
{
|
|
// Arrange: hosted resolution calls TryApplyUserAgent on every request. Without per-instance
|
|
// dedup, each call would append another policy entry to the shared OpenAIRequestPolicies,
|
|
// producing unbounded growth on singleton agents (one chat client reused across requests).
|
|
using var http = new HttpClient(new NoopHandler());
|
|
var openAIClient = new OpenAIClient(new ApiKeyCredential("fake"),
|
|
new OpenAIClientOptions { Transport = new HttpClientPipelineTransport(http) });
|
|
IChatClient chatClient = openAIClient.GetResponsesClient().AsIChatClient();
|
|
AIAgent agent = new ChatClientAgent(chatClient);
|
|
|
|
// Act
|
|
for (int i = 0; i < 50; i++)
|
|
{
|
|
FoundryHostingExtensions.TryApplyUserAgent(agent);
|
|
}
|
|
|
|
// Assert: exactly one HostedAgentUserAgentPolicy entry on the shared OpenAIRequestPolicies.
|
|
var policies = chatClient.GetService<OpenAIRequestPolicies>();
|
|
Assert.NotNull(policies);
|
|
Assert.Equal(1, EntriesCount(policies!));
|
|
}
|
|
|
|
[Fact]
|
|
public void TryApplyUserAgent_AcrossDistinctAgents_RegistersPolicyOncePerChatClient()
|
|
{
|
|
// Arrange: dedup is per-OpenAIRequestPolicies-instance, not global, so two agents on
|
|
// different chat clients each get exactly one registration.
|
|
using var http1 = new HttpClient(new NoopHandler());
|
|
using var http2 = new HttpClient(new NoopHandler());
|
|
var client1 = new OpenAIClient(new ApiKeyCredential("k1"),
|
|
new OpenAIClientOptions { Transport = new HttpClientPipelineTransport(http1) });
|
|
var client2 = new OpenAIClient(new ApiKeyCredential("k2"),
|
|
new OpenAIClientOptions { Transport = new HttpClientPipelineTransport(http2) });
|
|
|
|
IChatClient cc1 = client1.GetResponsesClient().AsIChatClient();
|
|
IChatClient cc2 = client2.GetResponsesClient().AsIChatClient();
|
|
AIAgent a1 = new ChatClientAgent(cc1);
|
|
AIAgent a2 = new ChatClientAgent(cc2);
|
|
|
|
// Act
|
|
for (int i = 0; i < 10; i++)
|
|
{
|
|
FoundryHostingExtensions.TryApplyUserAgent(a1);
|
|
FoundryHostingExtensions.TryApplyUserAgent(a2);
|
|
}
|
|
|
|
// Assert
|
|
Assert.Equal(1, EntriesCount(cc1.GetService<OpenAIRequestPolicies>()!));
|
|
Assert.Equal(1, EntriesCount(cc2.GetService<OpenAIRequestPolicies>()!));
|
|
}
|
|
|
|
private static int EntriesCount(OpenAIRequestPolicies policies)
|
|
{
|
|
var field = typeof(OpenAIRequestPolicies).GetField("_entries", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
|
|
var array = (Array?)field?.GetValue(policies);
|
|
return array?.Length ?? -1;
|
|
}
|
|
|
|
private sealed class NoopHandler : HttpMessageHandler
|
|
{
|
|
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
|
|
=> Task.FromResult(new HttpResponseMessage(HttpStatusCode.OK));
|
|
}
|
|
|
|
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);
|
|
}
|