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.
174 lines
8.3 KiB
C#
174 lines
8.3 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
// This sample shows how to add Retrieval Augmented Generation (RAG) capabilities to a hosted
|
|
// agent using Azure AI Search. The sample assumes the search index has already been provisioned
|
|
// and populated out of band (see README.md for the required schema and example seed content).
|
|
// A SearchClient-backed adapter is plugged into TextSearchProvider, which runs a keyword search
|
|
// against the index before each model invocation and injects the matching documents into the
|
|
// model context.
|
|
|
|
using Azure;
|
|
using Azure.AI.Projects;
|
|
using Azure.Core;
|
|
using Azure.Identity;
|
|
using Azure.Search.Documents;
|
|
using Azure.Search.Documents.Models;
|
|
using DotNetEnv;
|
|
using Hosted_Shared_Contributor_Setup;
|
|
using Microsoft.Agents.AI;
|
|
using Microsoft.Agents.AI.Foundry.Hosting;
|
|
using Microsoft.Extensions.AI;
|
|
using OpenAI.Chat;
|
|
|
|
// Load .env file if present (for local development)
|
|
Env.TraversePath().Load();
|
|
|
|
string projectEndpoint = Environment.GetEnvironmentVariable("AZURE_AI_PROJECT_ENDPOINT")
|
|
?? throw new InvalidOperationException("AZURE_AI_PROJECT_ENDPOINT is not set.");
|
|
string deploymentName = Environment.GetEnvironmentVariable("AZURE_AI_MODEL_DEPLOYMENT_NAME") ?? "gpt-4o";
|
|
|
|
string searchEndpoint = Environment.GetEnvironmentVariable("AZURE_SEARCH_ENDPOINT")
|
|
?? throw new InvalidOperationException("AZURE_SEARCH_ENDPOINT is not set.");
|
|
string searchIndexName = Environment.GetEnvironmentVariable("AZURE_SEARCH_INDEX_NAME")
|
|
?? throw new InvalidOperationException("AZURE_SEARCH_INDEX_NAME is not set.");
|
|
|
|
// 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). The dev credential is scope aware so a single instance serves both Foundry and
|
|
// Azure AI Search clients (each Azure SDK client requests a token for its own audience).
|
|
TokenCredential credential = new ChainedTokenCredential(
|
|
new DevTemporaryTokenCredential(),
|
|
new DefaultAzureCredential());
|
|
|
|
// Connect to the pre-provisioned search index. The caller is expected to have created the
|
|
// index and populated it with documents matching the schema (id / content / sourceName /
|
|
// sourceLink) before running this sample. See README.md for an example provisioning script.
|
|
var searchClient = new SearchClient(new Uri(searchEndpoint), searchIndexName, credential);
|
|
|
|
TextSearchProviderOptions textSearchOptions = new()
|
|
{
|
|
SearchTime = TextSearchProviderOptions.TextSearchBehavior.BeforeAIInvoke,
|
|
RecentMessageMemoryLimit = 6,
|
|
};
|
|
|
|
AIAgent agent = new AIProjectClient(new Uri(projectEndpoint), credential)
|
|
.AsAIAgent(new ChatClientAgentOptions
|
|
{
|
|
Name = Environment.GetEnvironmentVariable("AGENT_NAME") ?? "hosted-azure-search-rag",
|
|
ChatOptions = new ChatOptions
|
|
{
|
|
ModelId = deploymentName,
|
|
Instructions = "You are a helpful support specialist for Contoso Outdoors. " +
|
|
"Answer questions using the provided context and cite the source document when available.",
|
|
},
|
|
AIContextProviders = [new TextSearchProvider(CreateSearchAdapter(searchClient), textSearchOptions)]
|
|
});
|
|
|
|
// 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();
|
|
|
|
// ── Search adapter ───────────────────────────────────────────────────────────
|
|
// Wraps a SearchClient as the delegate TextSearchProvider expects. Keyword/full-text only;
|
|
// no embeddings. Returns the top results and projects them into TextSearchResult entries
|
|
// the provider will inject into the model context.
|
|
|
|
static Func<string, CancellationToken, Task<IEnumerable<TextSearchProvider.TextSearchResult>>>
|
|
CreateSearchAdapter(SearchClient client, int top = 3) =>
|
|
async (query, cancellationToken) =>
|
|
{
|
|
var options = new SearchOptions { Size = top };
|
|
Response<SearchResults<SearchDocument>> response =
|
|
await client.SearchAsync<SearchDocument>(query, options, cancellationToken).ConfigureAwait(false);
|
|
|
|
var results = new List<TextSearchProvider.TextSearchResult>();
|
|
await foreach (SearchResult<SearchDocument> hit in response.Value.GetResultsAsync().WithCancellation(cancellationToken).ConfigureAwait(false))
|
|
{
|
|
results.Add(new TextSearchProvider.TextSearchResult
|
|
{
|
|
SourceName = hit.Document.TryGetValue("sourceName", out var name) ? name?.ToString() ?? string.Empty : string.Empty,
|
|
SourceLink = hit.Document.TryGetValue("sourceLink", out var link) ? link?.ToString() ?? string.Empty : string.Empty,
|
|
Text = hit.Document.TryGetValue("content", out var content) ? content?.ToString() ?? string.Empty : string.Empty,
|
|
RawRepresentation = hit
|
|
});
|
|
}
|
|
|
|
return results;
|
|
};
|
|
|
|
/// <summary>
|
|
/// A scope aware <see cref="TokenCredential"/> for local Docker debugging only.
|
|
/// Reads pre-fetched bearer tokens from environment variables, dispensing the right token
|
|
/// based on the requested scope:
|
|
/// <list type="bullet">
|
|
/// <item><description><c>ai.azure.com</c> scopes -> <c>AZURE_BEARER_TOKEN_FOUNDRY</c></description></item>
|
|
/// <item><description><c>search.azure.com</c> scopes -> <c>AZURE_BEARER_TOKEN_SEARCH</c></description></item>
|
|
/// </list>
|
|
/// For any other scope, throws <see cref="CredentialUnavailableException"/> so a chained
|
|
/// credential will fall through. This should NOT be used in production: tokens expire (~1 hour)
|
|
/// and cannot be refreshed.
|
|
///
|
|
/// Generate the tokens on your host and pass them to the container:
|
|
/// <code>
|
|
/// export AZURE_BEARER_TOKEN_FOUNDRY=$(az account get-access-token --resource https://ai.azure.com --query accessToken -o tsv)
|
|
/// export AZURE_BEARER_TOKEN_SEARCH=$(az account get-access-token --resource https://search.azure.com --query accessToken -o tsv)
|
|
/// docker run -e AZURE_BEARER_TOKEN_FOUNDRY -e AZURE_BEARER_TOKEN_SEARCH ...
|
|
/// </code>
|
|
/// </summary>
|
|
internal sealed class DevTemporaryTokenCredential : TokenCredential
|
|
{
|
|
private const string FoundryEnvironmentVariable = "AZURE_BEARER_TOKEN_FOUNDRY";
|
|
private const string SearchEnvironmentVariable = "AZURE_BEARER_TOKEN_SEARCH";
|
|
|
|
public override AccessToken GetToken(TokenRequestContext requestContext, CancellationToken cancellationToken)
|
|
=> Resolve(requestContext.Scopes);
|
|
|
|
public override ValueTask<AccessToken> GetTokenAsync(TokenRequestContext requestContext, CancellationToken cancellationToken)
|
|
=> new(Resolve(requestContext.Scopes));
|
|
|
|
private static AccessToken Resolve(IReadOnlyList<string> scopes)
|
|
{
|
|
string? envVar = null;
|
|
foreach (var scope in scopes)
|
|
{
|
|
if (scope.Contains("search.azure.com", StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
envVar = SearchEnvironmentVariable;
|
|
break;
|
|
}
|
|
|
|
if (scope.Contains("ai.azure.com", StringComparison.OrdinalIgnoreCase))
|
|
{
|
|
envVar = FoundryEnvironmentVariable;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (envVar is null)
|
|
{
|
|
throw new CredentialUnavailableException(
|
|
$"DevTemporaryTokenCredential cannot serve scopes [{string.Join(", ", scopes)}]; falling through.");
|
|
}
|
|
|
|
var token = Environment.GetEnvironmentVariable(envVar);
|
|
if (string.IsNullOrEmpty(token) || string.Equals(token, "DefaultAzureCredential", StringComparison.Ordinal))
|
|
{
|
|
throw new CredentialUnavailableException(
|
|
$"{envVar} environment variable is not set; falling through to next credential.");
|
|
}
|
|
|
|
return new AccessToken(token, DateTimeOffset.UtcNow.AddHours(1));
|
|
}
|
|
}
|