mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
aad20c2b33
* .NET: Bump Azure.AI.Projects to 2.1.0-beta.2 and add agent-endpoint AsAIAgent path
Bumps Azure.AI.Projects to 2.1.0-beta.2 with the matching transitive pins (Azure.Core 1.55.0, System.ClientModel 1.11.0).
Foundry agent endpoint plumbing:
* FoundryAgent now routes the agent-endpoint constructor through the new GetProjectResponsesClientForAgentEndpoint helper.
* Adds an internal FoundryAgent ctor that takes an existing AIProjectClient plus a parsed agent endpoint so the public extension does not need to construct a second project client.
* Adds public AIProjectClient.AsAIAgent(Uri agentEndpoint, ...) extension. This is the path consumer samples are expected to use for hosted agents because version selection happens server-side.
* Trims the dangling "If you want to construct a FoundryAgent against a project endpoint..." sentence from ParseAgentEndpoint.
Unit tests:
* Four new tests in AzureAIProjectChatClientExtensionsTests cover the AIProjectClient.AsAIAgent(Uri agentEndpoint, ...) overload. 263/263 pass.
Consumer samples (Using-Samples):
* SimpleAgent and SessionFilesClient now read AZURE_AI_PROJECT_ENDPOINT and AZURE_AI_AGENT_NAME (both required, throw on missing), derive the agent endpoint with new Uri($"{projectEndpoint}/agents/{agentName}/endpoint/protocols/openai"), then call aiProjectClient.AsAIAgent(agentEndpoint, ...).
* SessionFilesClient README updated.
Contributor samples (responses/*):
* New HostedContributorRouteExtensions.MapDevTemporaryLocalAgentEndpoint() wildcard route extension so localhost contributor servers accept the per-agent OpenAI endpoint shape the production Hosted runtime exposes.
* All 11 contributor Program.cs files call MapDevTemporaryLocalAgentEndpoint() with a contributor-only warning comment.
* Hosted-Files and Hosted-AzureSearchRag were importing Hosted_Shared_Contributor_Setup but never calling AddDevTemporaryLocalContributorSetup(). Both now call it so HostedSessionIsolationKeyProvider resolves correctly in dev.
* Hosted-AzureSearchRag, Hosted-Files, Hosted-MemoryAgent csprojs drop stale VersionOverride="2.1.0-beta.1" pins.
* Hosted-AzureSearchRag and Hosted-Files csprojs add ProjectReference to Hosted_Shared_Contributor_Setup.
* Hosted-Observability/.dockerignore removed the out/ exclusion that was blocking COPY out/ . in Dockerfile.contributor.
Verified:
* Full solution-scoped build of changed projects: green.
* Scoped CI-parity dotnet format via WSL2 + Docker (mcr.microsoft.com/dotnet/sdk:10.0) over every changed csproj: clean.
* Foundry unit tests: 263/263.
* Contributor docker smoke for 8 hosted samples (publish + docker build + docker run + curl POST to the wildcard route): HTTP 200 / 500 with route matched.
* End-to-end smoke against the real Azure Foundry project with a fresh bearer token: Hosted-Files contributor container served HTTP 200, the agent invoked ListBundledFiles, and returned the expected file name.
* Address PR review: forward pipeline settings; add UTs
- CreateProjectClientOptions also carries RetryPolicy, NetworkTimeout, ClientLoggingOptions, MessageLoggingPolicy (was Transport+UserAgentApplicationId only).
- Make CreateProjectClientOptions internal so tests can verify the copy directly.
- Add AsAIAgent(Uri) UTs covering tools forwarding to inner ChatOptions and null tools handling.
- Add CreateProjectClientOptions UTs covering null caller and full pipeline-settings copy.
96 lines
4.6 KiB
C#
96 lines
4.6 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
// This sample demonstrates a hosted agent with two layers of MCP (Model Context Protocol) tools:
|
|
//
|
|
// 1. CLIENT-SIDE MCP: The agent connects to the Microsoft Learn MCP server directly via
|
|
// McpClient, discovers tools, and handles tool invocations locally within the agent process.
|
|
//
|
|
// 2. SERVER-SIDE MCP: The agent declares a HostedMcpServerTool for the same MCP server which
|
|
// delegates tool discovery and invocation to the LLM provider (Azure OpenAI Responses API).
|
|
// The provider calls the MCP server on behalf of the agent — no local connection needed.
|
|
//
|
|
// Both patterns use the Microsoft Learn MCP server to illustrate the architectural difference:
|
|
// client-side tools are resolved and invoked by the agent, while server-side tools are resolved
|
|
// and invoked by the LLM provider.
|
|
|
|
#pragma warning disable MEAI001 // HostedMcpServerTool is experimental
|
|
|
|
using Azure.AI.Projects;
|
|
using Azure.Core;
|
|
using Azure.Identity;
|
|
using DotNetEnv;
|
|
using Hosted_Shared_Contributor_Setup;
|
|
using Microsoft.Agents.AI;
|
|
using Microsoft.Agents.AI.Foundry.Hosting;
|
|
using Microsoft.Extensions.AI;
|
|
using ModelContextProtocol.Client;
|
|
|
|
// Load .env file if present (for local development)
|
|
Env.TraversePath().Load();
|
|
|
|
var projectEndpoint = new Uri(Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT")
|
|
?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set."));
|
|
var deployment = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-4o";
|
|
|
|
// Use a chained credential: try a temporary dev token first (for local Docker debugging),
|
|
// then fall back to DefaultAzureCredential (for local dev via dotnet run / managed identity in production).
|
|
TokenCredential credential = new ChainedTokenCredential(
|
|
new DevTemporaryTokenCredential(),
|
|
new DefaultAzureCredential());
|
|
|
|
// ── Client-side MCP: Microsoft Learn (local resolution) ──────────────────────
|
|
// Connect directly to the MCP server. The agent discovers and invokes tools locally.
|
|
Console.WriteLine("Connecting to Microsoft Learn MCP server (client-side)...");
|
|
|
|
await using var learnMcp = await McpClient.CreateAsync(new HttpClientTransport(new()
|
|
{
|
|
Endpoint = new Uri("https://learn.microsoft.com/api/mcp"),
|
|
Name = "Microsoft Learn (client)",
|
|
}));
|
|
|
|
var clientTools = await learnMcp.ListToolsAsync();
|
|
Console.WriteLine($"Client-side MCP tools: {string.Join(", ", clientTools.Select(t => t.Name))}");
|
|
|
|
// ── Server-side MCP: Microsoft Learn (provider resolution) ───────────────────
|
|
// Declare a HostedMcpServerTool — the LLM provider (Responses API) handles tool
|
|
// invocations directly. No local MCP connection needed for this pattern.
|
|
AITool serverTool = new HostedMcpServerTool(
|
|
serverName: "microsoft_learn_hosted",
|
|
serverAddress: "https://learn.microsoft.com/api/mcp")
|
|
{
|
|
AllowedTools = ["microsoft_docs_search"],
|
|
ApprovalMode = HostedMcpServerToolApprovalMode.NeverRequire
|
|
};
|
|
Console.WriteLine("Server-side MCP tool: microsoft_docs_search (via HostedMcpServerTool)");
|
|
|
|
// ── Combine both tool types into a single agent ──────────────────────────────
|
|
// The agent has access to tools from both MCP patterns simultaneously.
|
|
List<AITool> allTools = [.. clientTools.Cast<AITool>(), serverTool];
|
|
|
|
AIAgent agent = new AIProjectClient(projectEndpoint, credential)
|
|
.AsAIAgent(
|
|
model: deployment,
|
|
instructions: """
|
|
You are a helpful developer assistant with access to Microsoft Learn documentation.
|
|
Use the available tools to search and retrieve documentation.
|
|
Be concise and provide direct answers with relevant links.
|
|
""",
|
|
name: "mcp-tools",
|
|
description: "Developer assistant with dual-layer MCP tools (client-side and server-side)",
|
|
tools: allTools);
|
|
|
|
// Host the agent as a Foundry Hosted Agent using the Responses API.
|
|
var builder = WebApplication.CreateBuilder(args);
|
|
builder.Services.AddFoundryResponses(agent);
|
|
builder.Services.AddDevTemporaryLocalContributorSetup(); // Local Docker debugging only - must not be used in production.
|
|
|
|
var app = builder.Build();
|
|
app.MapFoundryResponses();
|
|
|
|
// Contributor-only: in Development, also map the per-agent OpenAI route shape that live Foundry uses
|
|
// so a local REPL client can target this server via AIProjectClient.AsAIAgent(Uri agentEndpoint).
|
|
// Do not use this in production. Hosted Foundry agents only support the agent-endpoint path.
|
|
app.MapDevTemporaryLocalAgentEndpoint();
|
|
|
|
app.Run();
|