mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
67a8147151
* Python: Add Scaffolding for Durable AzureFunctions package to Agent Framework (#1823) * Add scafolding * update readme * add code owners and label * update owners * .NET: Durable extension: initial src and unit tests (#1900) * Python: Add Durable Agent Wrapper code (#1913) * add initial changes * Move code and add single sample * Update logger * Remove unused code * address PR comments * cleanup code and address comments --------- Co-authored-by: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com> * Azure Functions .NET samples (#1939) * Python: Add Unit tests for Azurefunctions package (#1976) * Add Unit tests for Azurefunctions * remove duplicate import * .NET: [Feature Branch] Migrate state schema updates and support for agents as MCP tools (#1979) * Python: Add more samples for Azure Functions (#1980) * Move all samples * fix comments * remove dead lines * Make samples simpler * .NET: [Feature Branch] Durable Task extension integration tests (#2017) * .NET: [Feature Branch] Update OpenAI config for integration tests (#2063) * Python: Add Integration tests for AzureFunctions (#2020) * Add Integration tests * Remove DTS extension * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Add pyi file for type safety * Add samples in readme * Updated all readme instructions * Address comments * Update readmes * Fix requirements * Address comments --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * .NET: [Feature Branch] Update dotnet-build-and-test.yml to support integration tests (#2070) Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix DTS startup issue and improve logging (#2103) * .NET: [Feature Branch] Introduce Azure OpenAI config for .NET pipeline (#2106) Also fixes an issue where we were trying to start docker containers for integration tests on Windows, which doesn't work. Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix uv.lock after merge * Python: Add README for Azure Functions samples setup (#2100) * Add README for Azure Functions samples setup Added setup instructions for Azure Functions samples, including environment setup, virtual environment creation, and running samples. * Update python/samples/getting_started/azure_functions/README.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Laveesh Rohra <larohra@microsoft.com> * Fix or remove broken markdown file links (#2115) * .NET: [Feature Branch] Update HTTP API to be consistent across languages (#2118) * Python: Fix AzureFunctions Integration Tests (#2116) * Add Identity Auth to samples * Update python/samples/getting_started/azure_functions/README.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update python/samples/getting_started/azure_functions/01_single_agent/function_app.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update python/samples/getting_started/azure_functions/02_multi_agent/function_app.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update python/samples/getting_started/azure_functions/06_multi_agent_orchestration_conditionals/README.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Python: Fix Http Schema (#2112) * Rename to threadid * Respond in plain text * Make snake-case * Add http prefix * rename to wait-for-response * Add query param check * address comments * .NET: Remove IsPackable=false in preparation for nuget release (#2142) * Python: Move `azurefunctions` to `azure` for import (#2141) * Move import to Azure * fix mypy * Update python/packages/azurefunctions/README.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Add missing types * Address comments --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update python/packages/azurefunctions/pyproject.toml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update python/packages/azurefunctions/agent_framework_azurefunctions/__init__.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix imports * Address PR feedback from westey-m (#2150) - Adds a link from the /dotnet/samples/README.md to /dotnet/samples/AzureFunctions - Make DurableAgentThread deserialization internal for future-proofing - Update JSON serialization logic to address recently discovered issues with source generator serialization * Address comments (#2160) --------- Co-authored-by: Laveesh Rohra <larohra@microsoft.com> Co-authored-by: Chris Gillum <cgillum@microsoft.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Anirudh Garg <anirudhg@microsoft.com>
160 lines
6.4 KiB
C#
160 lines
6.4 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
using System.Diagnostics.CodeAnalysis;
|
|
using System.Text.Json;
|
|
using System.Text.Json.Serialization.Metadata;
|
|
using Microsoft.Agents.AI.DurableTask.State;
|
|
using Microsoft.DurableTask;
|
|
using Microsoft.DurableTask.Client;
|
|
using Microsoft.DurableTask.Worker;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
namespace Microsoft.Agents.AI.DurableTask;
|
|
|
|
/// <summary>
|
|
/// Agent-specific extension methods for the <see cref="IServiceCollection"/> class.
|
|
/// </summary>
|
|
public static class ServiceCollectionExtensions
|
|
{
|
|
/// <summary>
|
|
/// Gets a durable agent proxy by name.
|
|
/// </summary>
|
|
/// <param name="services">The service provider.</param>
|
|
/// <param name="name">The name of the agent.</param>
|
|
/// <returns>The durable agent proxy.</returns>
|
|
/// <exception cref="KeyNotFoundException">Thrown if the agent proxy is not found.</exception>
|
|
public static AIAgent GetDurableAgentProxy(this IServiceProvider services, string name)
|
|
{
|
|
return services.GetKeyedService<AIAgent>(name)
|
|
?? throw new KeyNotFoundException($"A durable agent with name '{name}' has not been registered.");
|
|
}
|
|
|
|
/// <summary>
|
|
/// Configures the Durable Agents services via the service collection.
|
|
/// </summary>
|
|
/// <param name="services">The service collection.</param>
|
|
/// <param name="configure">A delegate to configure the durable agents.</param>
|
|
/// <param name="workerBuilder">A delegate to configure the Durable Task worker.</param>
|
|
/// <param name="clientBuilder">A delegate to configure the Durable Task client.</param>
|
|
/// <returns>The service collection.</returns>
|
|
public static IServiceCollection ConfigureDurableAgents(
|
|
this IServiceCollection services,
|
|
Action<DurableAgentsOptions> configure,
|
|
Action<IDurableTaskWorkerBuilder>? workerBuilder = null,
|
|
Action<IDurableTaskClientBuilder>? clientBuilder = null)
|
|
{
|
|
ArgumentNullException.ThrowIfNull(configure);
|
|
|
|
DurableAgentsOptions options = services.ConfigureDurableAgents(configure);
|
|
|
|
// A worker is required to run the agent entities
|
|
services.AddDurableTaskWorker(builder =>
|
|
{
|
|
workerBuilder?.Invoke(builder);
|
|
|
|
builder.AddTasks(registry =>
|
|
{
|
|
foreach (string name in options.GetAgentFactories().Keys)
|
|
{
|
|
registry.AddEntity<AgentEntity>(AgentSessionId.ToEntityName(name));
|
|
}
|
|
});
|
|
});
|
|
|
|
// The client is needed to send notifications to the agent entities from non-orchestrator code
|
|
if (clientBuilder != null)
|
|
{
|
|
services.AddDurableTaskClient(clientBuilder);
|
|
}
|
|
|
|
services.AddSingleton<IDurableAgentClient, DefaultDurableAgentClient>();
|
|
|
|
return services;
|
|
}
|
|
|
|
// This is internal because it's also used by Microsoft.Azure.Functions.DurableAgents, which is a friend assembly project.
|
|
internal static DurableAgentsOptions ConfigureDurableAgents(
|
|
this IServiceCollection services,
|
|
Action<DurableAgentsOptions> configure)
|
|
{
|
|
DurableAgentsOptions options = new();
|
|
configure(options);
|
|
|
|
var agents = options.GetAgentFactories();
|
|
|
|
// The agent dictionary contains the real agent factories, which is used by the agent entities.
|
|
services.AddSingleton(agents);
|
|
|
|
// The keyed services are used to resolve durable agent *proxy* instances for external clients.
|
|
foreach (var factory in agents)
|
|
{
|
|
services.AddKeyedSingleton(factory.Key, (sp, _) => factory.Value(sp).AsDurableAgentProxy(sp));
|
|
}
|
|
|
|
// A custom data converter is needed because the default chat client uses camel case for JSON properties,
|
|
// which is not the default behavior for the Durable Task SDK.
|
|
services.AddSingleton<DataConverter, DefaultDataConverter>();
|
|
|
|
return options;
|
|
}
|
|
|
|
private sealed class DefaultDataConverter : DataConverter
|
|
{
|
|
// Use durable agent options (web defaults + camel case by default) with case-insensitive matching.
|
|
// We clone to apply naming/casing tweaks while retaining source-generated metadata where available.
|
|
private static readonly JsonSerializerOptions s_options = new(DurableAgentJsonUtilities.DefaultOptions)
|
|
{
|
|
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
|
|
PropertyNameCaseInsensitive = true,
|
|
};
|
|
|
|
[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Fallback path uses reflection when metadata unavailable.")]
|
|
[UnconditionalSuppressMessage("ReflectionAnalysis", "IL3050", Justification = "Fallback path uses reflection when metadata unavailable.")]
|
|
public override object? Deserialize(string? data, Type targetType)
|
|
{
|
|
if (data is null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
if (targetType == typeof(DurableAgentState))
|
|
{
|
|
return JsonSerializer.Deserialize(data, DurableAgentStateJsonContext.Default.DurableAgentState);
|
|
}
|
|
|
|
JsonTypeInfo? typeInfo = s_options.GetTypeInfo(targetType);
|
|
if (typeInfo is JsonTypeInfo typedInfo)
|
|
{
|
|
return JsonSerializer.Deserialize(data, typedInfo);
|
|
}
|
|
|
|
// Fallback (may trigger trimming/AOT warnings for unsupported dynamic types).
|
|
return JsonSerializer.Deserialize(data, targetType, s_options);
|
|
}
|
|
|
|
[return: NotNullIfNotNull(nameof(value))]
|
|
[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Fallback path uses reflection when metadata unavailable.")]
|
|
[UnconditionalSuppressMessage("ReflectionAnalysis", "IL3050", Justification = "Fallback path uses reflection when metadata unavailable.")]
|
|
public override string? Serialize(object? value)
|
|
{
|
|
if (value is null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
if (value is DurableAgentState durableAgentState)
|
|
{
|
|
return JsonSerializer.Serialize(durableAgentState, DurableAgentStateJsonContext.Default.DurableAgentState);
|
|
}
|
|
|
|
JsonTypeInfo? typeInfo = s_options.GetTypeInfo(value.GetType());
|
|
if (typeInfo is JsonTypeInfo typedInfo)
|
|
{
|
|
return JsonSerializer.Serialize(value, typedInfo);
|
|
}
|
|
|
|
return JsonSerializer.Serialize(value, s_options);
|
|
}
|
|
}
|
|
}
|