mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
904a5b843e
* Python: .NET Samples - Restructure and Improve Samples (Feature Branch) (#4091) * Moved by agent (#4094) * Fix readme links * .NET Samples - Create `04-hosting` learning path step (#4098) * Agent move * Agent reorderd * Remove A2A section from README Removed A2A section from the Getting Started README. * Agent fixed links * Fix broken sample links in durable-agents README (#4101) * Initial plan * Fix broken internal links in documentation Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Revert template link changes; keep only durable-agents README fix Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * .NET Samples - Create `03-workflows` learning path step (#4102) * Fix solution project path * Python: Fix broken markdown links to repo resources (outside /docs) (#4105) * Initial plan * Fix broken markdown links to repo resources Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Update README to rename .NET Workflows Samples section --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * .NET Samples - Create `02-agents` learning path step (#4107) * .NET: Fix broken relative link in GroupChatToolApproval README (#4108) * Initial plan * Fix broken link in GroupChatToolApproval README Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Update labeler configuration for workflow samples * .NET - Reorder Agents samples to start from Step01 instead of Step04 (#4110) * Fix solution * Resolve new sample paths * Move new AgentSkills and AgentWithMemory_Step04 samples * Fix link * Fix readme path * fix: update stale dotnet/samples/Durable path reference in AGENTS.md Co-authored-by: crickman <66376200+crickman@users.noreply.github.com> * Moved new sample * Update solution * Resolve merge (new sample) * Sync to new sample - FoundryAgents_Step21_BingCustomSearch * Updated README * .NET Samples - Configuration Naming Update (#4149) * .NET: Restore AzureFunctions index parity with ConsoleApps under DurableAgents samples (#4221) * Clean-up `05_host_your_agent` * Config setting consistency * Refine samples * AGENTS.md * Move new samples * Re-order samples * Move new project and fixup solution * Fixup model config * Fix up new UT project --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
107 lines
4.9 KiB
C#
107 lines
4.9 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
using AgentWebChat.AgentHost.Utilities;
|
|
using Microsoft.Extensions.AI;
|
|
using OllamaSharp;
|
|
|
|
namespace AgentWebChat.AgentHost.Utilities;
|
|
|
|
public static class ChatClientExtensions
|
|
{
|
|
public static ChatClientBuilder AddChatClient(this IHostApplicationBuilder builder, string connectionName)
|
|
{
|
|
var cs = builder.Configuration.GetConnectionString(connectionName);
|
|
|
|
if (!ChatClientConnectionInfo.TryParse(cs, out var connectionInfo))
|
|
{
|
|
throw new InvalidOperationException($"Invalid connection string: {cs}. Expected format: 'Endpoint=endpoint;AccessKey=your_access_key;Model=model_name;Provider=ollama/openai/azureopenai;'.");
|
|
}
|
|
|
|
var chatClientBuilder = connectionInfo.Provider switch
|
|
{
|
|
ClientChatProvider.Ollama => builder.AddOllamaClient(connectionName, connectionInfo),
|
|
ClientChatProvider.OpenAI => builder.AddOpenAIClient(connectionName, connectionInfo),
|
|
ClientChatProvider.AzureOpenAI => builder.AddAzureOpenAIClient(connectionName).AddChatClient(connectionInfo.SelectedModel),
|
|
_ => throw new NotSupportedException($"Unsupported provider: {connectionInfo.Provider}")
|
|
};
|
|
|
|
// Add OpenTelemetry tracing for the ChatClient activity source
|
|
chatClientBuilder.UseOpenTelemetry().UseLogging();
|
|
|
|
builder.Services.AddOpenTelemetry().WithTracing(t => t.AddSource("Experimental.Microsoft.Extensions.AI"));
|
|
|
|
return chatClientBuilder;
|
|
}
|
|
|
|
private static ChatClientBuilder AddOpenAIClient(this IHostApplicationBuilder builder, string connectionName, ChatClientConnectionInfo connectionInfo) =>
|
|
builder.AddOpenAIClient(connectionName, settings =>
|
|
{
|
|
settings.Endpoint = connectionInfo.Endpoint;
|
|
settings.Key = connectionInfo.AccessKey;
|
|
})
|
|
.AddChatClient(connectionInfo.SelectedModel);
|
|
|
|
private static ChatClientBuilder AddOllamaClient(this IHostApplicationBuilder builder, string connectionName, ChatClientConnectionInfo connectionInfo)
|
|
{
|
|
var httpKey = $"{connectionName}_http";
|
|
|
|
builder.Services.AddHttpClient(httpKey, c => c.BaseAddress = connectionInfo.Endpoint);
|
|
|
|
return builder.Services.AddChatClient(sp =>
|
|
{
|
|
// Create a client for the Ollama API using the http client factory
|
|
var client = sp.GetRequiredService<IHttpClientFactory>().CreateClient(httpKey);
|
|
|
|
return new OllamaApiClient(client, connectionInfo.SelectedModel);
|
|
});
|
|
}
|
|
|
|
public static ChatClientBuilder AddKeyedChatClient(this IHostApplicationBuilder builder, string connectionName)
|
|
{
|
|
var cs = builder.Configuration.GetConnectionString(connectionName);
|
|
|
|
if (!ChatClientConnectionInfo.TryParse(cs, out var connectionInfo))
|
|
{
|
|
throw new InvalidOperationException($"Invalid connection string: {cs}. Expected format: 'Endpoint=endpoint;AccessKey=your_access_key;Model=model_name;Provider=ollama/openai/azureopenai;'.");
|
|
}
|
|
|
|
var chatClientBuilder = connectionInfo.Provider switch
|
|
{
|
|
ClientChatProvider.Ollama => builder.AddKeyedOllamaClient(connectionName, connectionInfo),
|
|
ClientChatProvider.OpenAI => builder.AddKeyedOpenAIClient(connectionName, connectionInfo),
|
|
ClientChatProvider.AzureOpenAI => builder.AddKeyedAzureOpenAIClient(connectionName).AddKeyedChatClient(connectionName, connectionInfo.SelectedModel),
|
|
_ => throw new NotSupportedException($"Unsupported provider: {connectionInfo.Provider}")
|
|
};
|
|
|
|
// Add OpenTelemetry tracing for the ChatClient activity source
|
|
chatClientBuilder.UseOpenTelemetry().UseLogging();
|
|
|
|
builder.Services.AddOpenTelemetry().WithTracing(t => t.AddSource("Experimental.Microsoft.Extensions.AI"));
|
|
|
|
return chatClientBuilder;
|
|
}
|
|
|
|
private static ChatClientBuilder AddKeyedOpenAIClient(this IHostApplicationBuilder builder, string connectionName, ChatClientConnectionInfo connectionInfo) =>
|
|
builder.AddKeyedOpenAIClient(connectionName, settings =>
|
|
{
|
|
settings.Endpoint = connectionInfo.Endpoint;
|
|
settings.Key = connectionInfo.AccessKey;
|
|
})
|
|
.AddKeyedChatClient(connectionName, connectionInfo.SelectedModel);
|
|
|
|
private static ChatClientBuilder AddKeyedOllamaClient(this IHostApplicationBuilder builder, string connectionName, ChatClientConnectionInfo connectionInfo)
|
|
{
|
|
var httpKey = $"{connectionName}_http";
|
|
|
|
builder.Services.AddHttpClient(httpKey, c => c.BaseAddress = connectionInfo.Endpoint);
|
|
|
|
return builder.Services.AddKeyedChatClient(connectionName, sp =>
|
|
{
|
|
// Create a client for the Ollama API using the http client factory
|
|
var client = sp.GetRequiredService<IHttpClientFactory>().CreateClient(httpKey);
|
|
|
|
return new OllamaApiClient(client, connectionInfo.SelectedModel);
|
|
});
|
|
}
|
|
}
|