A programming framework for agentic AI
add cancellation token to transition check lambda (#3132)
Xiaoyun Zhang178bb8d325f1
diff --git a/dotnet/src/AutoGen.Core/GroupChat/Graph.cs b/dotnet/src/AutoGen.Core/GroupChat/Graph.csindex d6b71e2a3..acff955a2 100644--- a/dotnet/src/AutoGen.Core/GroupChat/Graph.cs+++ b/dotnet/src/AutoGen.Core/GroupChat/Graph.cs@@ -4,6 +4,7 @@using System;using System.Collections.Generic;using System.Linq;+using System.Threading;using System.Threading.Tasks;namespace AutoGen.Core;@@ -12,11 +13,7 @@ public class Graph{private readonly List<Transition> transitions = new List<Transition>();- public Graph()- {- }-- public Graph(IEnumerable<Transition>? transitions)+ public Graph(IEnumerable<Transition>? transitions = null){if (transitions != null){@@ -40,13 +37,13 @@ public class Graph/// <param name="fromAgent">the from agent</param>/// <param name="messages">messages</param>/// <returns>A list of agents that the messages can be transit to</returns>- public async Task<IEnumerable<IAgent>> TransitToNextAvailableAgentsAsync(IAgent fromAgent, IEnumerable<IMessage> messages)+ public async Task<IEnumerable<IAgent>> TransitToNextAvailableAgentsAsync(IAgent fromAgent, IEnumerable<IMessage> messages, CancellationToken ct = default){var nextAgents = new List<IAgent>();var availableTransitions = transitions.FindAll(t => t.From == fromAgent) ?? Enumerable.Empty<Transition>();foreach (var transition in availableTransitions){- if (await transition.CanTransitionAsync(messages))+ if (await transition.CanTransitionAsync(messages, ct)){nextAgents.Add(transition.To);}@@ -63,7 +60,7 @@ public class Transition{private readonly IAgent _from;private readonly IAgent _to;- private readonly Func<IAgent, IAgent, IEnumerable<IMessage>, Task<bool>>? _canTransition;+ private readonly Func<IAgent, IAgent, IEnumerable<IMessage>, CancellationToken, Task<bool>>? _canTransition;/// <summary>/// Create a new instance of <see cref="Transition"/>.@@ -73,22 +70,44 @@ public class Transition/// <param name="from">from agent</param>/// <param name="to">to agent</param>/// <param name="canTransitionAsync">detect if the transition is allowed, default to be always true</param>- internal Transition(IAgent from, IAgent to, Func<IAgent, IAgent, IEnumerable<IMessage>, Task<bool>>? canTransitionAsync = null)+ internal Transition(IAgent from, IAgent to, Func<IAgent, IAgent, IEnumerable<IMessage>, CancellationToken, Task<bool>>? canTransitionAsync = null){_from = from;_to = to;_canTransition = canTransitionAsync;}+ /// <summary>+ /// Create a new instance of <see cref="Transition"/> without transition condition check.+ /// </summary>+ /// <returns><see cref="Transition"/></returns>"+ public static Transition Create<TFromAgent, TToAgent>(TFromAgent from, TToAgent to)+ where TFromAgent : IAgent+ where TToAgent : IAgent+ {+ return new Transition(from, to, (fromAgent, toAgent, messages, _) => Task.FromResult(true));+ }+/// <summary>/// Create a new instance of <see cref="Transition"/>./// </summary>/// <returns><see cref="Transition"/></returns>"- public static Transition Create<TFromAgent, TToAgent>(TFromAgent from, TToAgent to, Func<TFromAgent, TToAgent, IEnumerable<IMessage>, Task<bool>>? canTransitionAsync = null)+ public static Transition Create<TFromAgent, TToAgent>(TFromAgent from, TToAgent to, Func<TFromAgent, TToAgent, IEnumerable<IMessage>, Task<bool>> canTransitionAsync)+ where TFromAgent : IAgent+ where TToAgent : IAgent+ {+ return new Transition(from, to, (fromAgent, toAgent, messages, _) => canTransitionAsync.Invoke((TFromAgent)fromAgent, (TToAgent)toAgent, messages));+ }++ /// <summary>+ /// Create a new instance of <see cref="Transition"/> with cancellation token.+ /// </summary>+ /// <returns><see cref="Transition"/></returns>"+ public static Transition Create<TFromAgent, TToAgent>(TFromAgent from, TToAgent to, Func<TFromAgent, TToAgent, IEnumerable<IMessage>, CancellationToken, Task<bool>> canTransitionAsync)where TFromAgent : IAgentwhere TToAgent : IAgent{- return new Transition(from, to, (fromAgent, toAgent, messages) => canTransitionAsync?.Invoke((TFromAgent)fromAgent, (TToAgent)toAgent, messages) ?? Task.FromResult(true));+ return new Transition(from, to, (fromAgent, toAgent, messages, ct) => canTransitionAsync.Invoke((TFromAgent)fromAgent, (TToAgent)toAgent, messages, ct));}public IAgent From => _from;@@ -99,13 +118,13 @@ public class Transition/// Check if the transition is allowed./// </summary>/// <param name="messages">messages</param>- public Task<bool> CanTransitionAsync(IEnumerable<IMessage> messages)+ public Task<bool> CanTransitionAsync(IEnumerable<IMessage> messages, CancellationToken ct = default){if (_canTransition == null){return Task.FromResult(true);}- return _canTransition(this.From, this.To, messages);+ return _canTransition(this.From, this.To, messages, ct);}}diff --git a/dotnet/test/AutoGen.Tests/WorkflowTest.cs b/dotnet/test/AutoGen.Tests/WorkflowTest.csindex d1d12010e..1079ec955 100644--- a/dotnet/test/AutoGen.Tests/WorkflowTest.cs+++ b/dotnet/test/AutoGen.Tests/WorkflowTest.cs@@ -17,7 +17,7 @@ public class WorkflowTestvar alice = new EchoAgent("alice");var bob = new EchoAgent("bob");- var aliceToBob = Transition.Create(alice, bob, async (from, to, messages) =>+ var aliceToBob = Transition.Create(alice, bob, async (from, to, messages, _) =>{if (messages.Any(m => m.GetContent() == "Hello")){@@ -30,7 +30,7 @@ public class WorkflowTestvar canTransit = await aliceToBob.CanTransitionAsync([]);canTransit.Should().BeFalse();- canTransit = await aliceToBob.CanTransitionAsync(new[] { new TextMessage(Role.Assistant, "Hello") });+ canTransit = await aliceToBob.CanTransitionAsync([new TextMessage(Role.Assistant, "Hello")]);canTransit.Should().BeTrue();// if no function is provided, it should always return true