mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
3baf527909
Promotes the Sequential and Concurrent orchestration shapes to first-class fluent
builder classes, matching Handoff / GroupChat / Magentic. Users can call
`WithOutputFrom(agents)` / `WithIntermediateOutputFrom(agents)` to control which
agents are designated output / intermediate sources; when no designation call is
made, the Python-aligned defaults apply (terminal aggregator output + every agent
intermediate; Concurrent also tags per-agent accumulators).
`AgentWorkflowBuilder.BuildSequential(...)` and `BuildConcurrent(...)` are kept
and now delegate to the new builders; observable behavior unchanged. Five static
factories now mirror each other:
- `AgentWorkflowBuilder.CreateSequentialBuilderWith(params IEnumerable<AIAgent>)`
- `AgentWorkflowBuilder.CreateConcurrentBuilderWith(params IEnumerable<AIAgent>)`
- `AgentWorkflowBuilder.CreateHandoffBuilderWith(AIAgent)` (already existed)
- `AgentWorkflowBuilder.CreateGroupChatBuilderWith(Func<...>)` (already existed)
- `AgentWorkflowBuilder.CreateMagenticBuilderWith(AIAgent)` (new)
OrchestrationBuilderBase
------------------------
New abstract `OrchestrationBuilderBase<TBuilder>` unifies the shared fluent
surface across all five orchestration builders: `WithName`, `WithDescription`,
`WithOutputFrom`, `WithIntermediateOutputFrom`, and the
`ApplyOutputDesignations(builder, agentMap, kind, applyDefaults)` helper that
either replays the user's designations or invokes the orchestration-specific
defaults.
Removes ~150 LOC of duplicated designation-management code from the four
non-Handoff builders, plus the equivalent from `HandoffWorkflowBuilderCore`.
Tests
-----
- New `SequentialWorkflowBuilderTests.cs` / `ConcurrentWorkflowBuilderTests.cs`
(replace the old `AgentWorkflowBuilder.{Sequential,Concurrent}Tests.cs`
nested-class files). Method names normalized to
`Test_<BuilderType>_<Scenario>[Async]`.
- Shared helpers (`DoubleEchoAgent`, `DoubleEchoAgentWithBarrier`,
`WorkflowRunResult`, `RunWorkflow*`) moved from the old
`AgentWorkflowBuilderTests` partial class into a new
`OrchestrationTestHelpers` static class in `OrchestrationTestHelpers.cs`.
Downstream test files (Group Chat, Handoff, Sequential, Concurrent) updated
to qualify with `OrchestrationTestHelpers.*`.
- A new `AgentWorkflowBuilderTests.cs` covers the static surface directly:
`BuildSequential` / `BuildConcurrent` invariants and aggregator wiring, plus
null-rejection + round-trip checks for every `Create*BuilderWith` factory.
- New AsAgent intermediate-suppression tests on a nested `AsAgentForwarding`
class for each of Sequential and Concurrent: build with only the terminal
agent designated via `WithOutputFrom`, run via `AsAIAgent(...)`, assert via
`AgentResponseUpdate.AuthorName` that intermediate agents do not surface.
Both join the `FuturesSerial` collection.
- New `Test_<Builder>_WithDescriptionPropagatesToWorkflow` smoke tests on
Sequential and Concurrent (newly available via the base class).
625/625 unit tests pass on net10.0.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
78 lines
3.3 KiB
C#
78 lines
3.3 KiB
C#
// Copyright (c) Microsoft. All rights reserved.
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using FluentAssertions;
|
|
|
|
namespace Microsoft.Agents.AI.Workflows.UnitTests;
|
|
|
|
/// <summary>
|
|
/// Tests focused on <see cref="HandoffWorkflowBuilder"/>'s output-designation surface —
|
|
/// the Python-aligned defaults applied at <see cref="HandoffWorkflowBuilderCore{TBuilder}.Build"/>
|
|
/// when the user has not made explicit designations, and the memoized
|
|
/// <c>WithOutputFrom</c> / <c>WithIntermediateOutputFrom</c> replay otherwise.
|
|
/// </summary>
|
|
#pragma warning disable MAAIW001 // Experimental: HandoffWorkflowBuilder
|
|
public class HandoffWorkflowBuilderTests
|
|
{
|
|
[Fact]
|
|
public void Test_HandoffWorkflowBuilder_DefaultDesignationsMatchSpec()
|
|
{
|
|
OrchestrationTestHelpers.DoubleEchoAgent coordinator = new("coordinator");
|
|
OrchestrationTestHelpers.DoubleEchoAgent specialist = new("specialist");
|
|
|
|
Workflow workflow = AgentWorkflowBuilder
|
|
.CreateHandoffBuilderWith(coordinator)
|
|
.WithHandoff(coordinator, specialist)
|
|
.Build();
|
|
|
|
Dictionary<string, HashSet<OutputTag>> designations = workflow.OutputExecutors;
|
|
|
|
designations.Where(kvp => kvp.Value.Count == 0)
|
|
.Should().ContainSingle("the handoff end executor is the sole terminal output by default");
|
|
designations.Where(kvp => kvp.Value.Contains(OutputTag.Intermediate))
|
|
.Should().HaveCount(2, "both the coordinator and the specialist are designated intermediate by default");
|
|
}
|
|
|
|
[Fact]
|
|
public void Test_HandoffWorkflowBuilder_ExplicitDesignationsReplaceDefaults()
|
|
{
|
|
OrchestrationTestHelpers.DoubleEchoAgent coordinator = new("coordinator");
|
|
OrchestrationTestHelpers.DoubleEchoAgent specialist = new("specialist");
|
|
|
|
Workflow workflow = AgentWorkflowBuilder
|
|
.CreateHandoffBuilderWith(coordinator)
|
|
.WithHandoff(coordinator, specialist)
|
|
.WithOutputFrom(coordinator)
|
|
.WithIntermediateOutputFrom([specialist])
|
|
.Build();
|
|
|
|
Dictionary<string, HashSet<OutputTag>> designations = workflow.OutputExecutors;
|
|
|
|
designations.Should().HaveCount(2,
|
|
"only the user-specified designations land on the inner builder; the handoff-end default is suppressed");
|
|
designations.Values.Where(tags => tags.Count == 0)
|
|
.Should().ContainSingle("coordinator is the only terminal designation");
|
|
designations.Values.Where(tags => tags.Contains(OutputTag.Intermediate))
|
|
.Should().ContainSingle("specialist is the only intermediate designation");
|
|
}
|
|
|
|
[Fact]
|
|
public void Test_HandoffWorkflowBuilder_DesignationForNonParticipantThrows()
|
|
{
|
|
OrchestrationTestHelpers.DoubleEchoAgent coordinator = new("coordinator");
|
|
OrchestrationTestHelpers.DoubleEchoAgent specialist = new("specialist");
|
|
OrchestrationTestHelpers.DoubleEchoAgent stranger = new("stranger");
|
|
|
|
HandoffWorkflowBuilder builder = AgentWorkflowBuilder
|
|
.CreateHandoffBuilderWith(coordinator)
|
|
.WithHandoff(coordinator, specialist)
|
|
.WithIntermediateOutputFrom([stranger]);
|
|
|
|
Action build = () => builder.Build();
|
|
build.Should().Throw<InvalidOperationException>().WithMessage("*stranger*");
|
|
}
|
|
}
|
|
#pragma warning restore MAAIW001
|