A programming framework for agentic AI
fix: Get InProcessRuntime building
Jacob Alber60b06583ebb3
diff --git a/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/AgentId.cs b/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/AgentId.csindex c9a6e01e9..a85a21686 100644--- a/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/AgentId.cs+++ b/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/AgentId.cs@@ -99,5 +99,8 @@ public struct AgentId/// <param name="id">The string representation of an agent ID.</param>/// <returns>An instance of <see cref="AgentId"/>.</returns>public static explicit operator AgentId(string id) => FromStr(id);++ public static bool operator ==(AgentId left, AgentId right) => left.Equals(right);+ public static bool operator !=(AgentId left, AgentId right) => !left.Equals(right);}diff --git a/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/AgentProxy.cs b/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/AgentProxy.csindex e5191ec9d..06182d086 100644--- a/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/AgentProxy.cs+++ b/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/AgentProxy.cs@@ -45,7 +45,7 @@ public class AgentProxy(AgentId agentId, IAgentRuntime runtime)/// A token used to cancel an in-progress operation. Defaults to <c>null</c>./// </param>/// <returns>A task representing the asynchronous operation, returning the response from the agent.</returns>- public ValueTask<object> SendMessageAsync(object message, AgentId sender, string? messageId = null, CancellationToken? cancellationToken = default)+ public ValueTask<object?> SendMessageAsync(object message, AgentId sender, string? messageId = null, CancellationToken? cancellationToken = default){return this.runtime.SendMessageAsync(message, this.Id, sender, messageId, cancellationToken);}diff --git a/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/IAgentRuntime.cs b/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/IAgentRuntime.csindex 3bf059a18..60dbb746d 100644--- a/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/IAgentRuntime.cs+++ b/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/IAgentRuntime.cs@@ -7,11 +7,11 @@ namespace Microsoft.AutoGen.Contracts.Python;public interface IAgentRuntime : ISaveState<IAgentRuntime>{- public ValueTask<object> SendMessageAsync(object message, AgentId recepient, AgentId? sender = null, string? messageId = null, CancellationToken? cancellationToken = default);- public ValueTask<object> PublishMessageAsync(object message, TopicId topic, AgentId? sender = null, string? messageId = null, CancellationToken? cancellationToken = default);+ public ValueTask<object?> SendMessageAsync(object message, AgentId recepient, AgentId? sender = null, string? messageId = null, CancellationToken? cancellationToken = default);+ public ValueTask PublishMessageAsync(object message, TopicId topic, AgentId? sender = null, string? messageId = null, CancellationToken? cancellationToken = default);// TODO: Can we call this Resolve?- public ValueTask<AgentId> GetAgentAsync(AgentId agentId, string key = "default", bool lazy = true/*, CancellationToken? = default*/);+ public ValueTask<AgentId> GetAgentAsync(AgentId agentId, bool lazy = true/*, CancellationToken? = default*/);public ValueTask<AgentId> GetAgentAsync(AgentType agentType, string key = "default", bool lazy = true/*, CancellationToken? = default*/);public ValueTask<AgentId> GetAgentAsync(string agent, string key = "default", bool lazy = true/*, CancellationToken? = default*/);diff --git a/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/IUnboundSubscriptionDefinition.cs b/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/IUnboundSubscriptionDefinition.csindex e1ff1684f..9cfd80e82 100644--- a/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/IUnboundSubscriptionDefinition.cs+++ b/dotnet/src/Microsoft.AutoGen/Contracts/PythonEquiv/IUnboundSubscriptionDefinition.cs@@ -1,10 +1,9 @@-// Copyright (c) Microsoft Corporation. All rights reserved.+// Copyright (c) Microsoft Corporation. All rights reserved.// IUnboundSubscriptionDefinition.cs-namespace Microsoft.AutoGen.Contracts.Python;public interface IUnboundSubscriptionDefinition{public ISubscriptionDefinition Bind(AgentType agentType);-}\ No newline at end of file+}diff --git a/dotnet/src/Microsoft.AutoGen/Core/PythonEquiv/BaseAgent.cs b/dotnet/src/Microsoft.AutoGen/Core/PythonEquiv/BaseAgent.csindex a99e8faa0..4e66f9fe2 100644--- a/dotnet/src/Microsoft.AutoGen/Core/PythonEquiv/BaseAgent.cs+++ b/dotnet/src/Microsoft.AutoGen/Core/PythonEquiv/BaseAgent.cs@@ -132,13 +132,13 @@ public abstract class BaseAgent : IAgent, IHostableAgentthrow new NotImplementedException();}- public ValueTask<object> SendMessageAsync(object message, AgentId recepient, string? messageId = null, CancellationToken? cancellationToken = default)+ public ValueTask<object?> SendMessageAsync(object message, AgentId recepient, string? messageId = null, CancellationToken? cancellationToken = default){return this.Runtime.SendMessageAsync(message, recepient, sender: this.Id, messageId: messageId, cancellationToken: cancellationToken);}- public ValueTask<object> PublishMessageAsync(object message, TopicId topic, string? messageId = null, CancellationToken? cancellationToken = default)+ public ValueTask PublishMessageAsync(object message, TopicId topic, string? messageId = null, CancellationToken? cancellationToken = default){return this.Runtime.PublishMessageAsync(message, topic, sender: this.Id, messageId: messageId, cancellationToken: cancellationToken);}diff --git a/dotnet/src/Microsoft.AutoGen/Core/PythonEquiv/InProcessRuntime.cs b/dotnet/src/Microsoft.AutoGen/Core/PythonEquiv/InProcessRuntime.csindex d5187534e..5d75f623f 100644--- a/dotnet/src/Microsoft.AutoGen/Core/PythonEquiv/InProcessRuntime.cs+++ b/dotnet/src/Microsoft.AutoGen/Core/PythonEquiv/InProcessRuntime.cs@@ -5,45 +5,50 @@ using Microsoft.AutoGen.Contracts.Python;namespace Microsoft.AutoGen.Core;-internal class InProcessRuntime : IAgentRuntime+internal sealed class InProcessRuntime : IAgentRuntime{Dictionary<AgentId, IHostableAgent> agentInstances = new();Dictionary<string, ISubscriptionDefinition> subscriptions = new();Dictionary<AgentType, Func<AgentId, IAgentRuntime, ValueTask<IHostableAgent>>> agentFactories = new();- private ValueTask ExecuteTracedAsync<T>(Action<ValueTask<T>> action)++ private ValueTask<T> ExecuteTracedAsync<T>(Func<ValueTask<T>> func){// TODO: Bind tracing- return action();+ return func();+ }++ private ValueTask ExecuteTracedAsync(Func<ValueTask> func)+ {+ // TODO: Bind tracing+ return func();}public InProcessRuntime(){}- public ValueTask<object> PublishMessage(object message, TopicId topic, AgentId? sender = null, string? messageId = null, CancellationToken? cancellationToken = null)+ public ValueTask PublishMessageAsync(object message, TopicId topic, AgentId? sender = null, string? messageId = null, CancellationToken? cancellationToken = null){return this.ExecuteTracedAsync(async () =>{- cancellationToken ??= CancellationToken.None;messageId ??= Guid.NewGuid().ToString();foreach (var subscription in this.subscriptions.Values.Where(subscription => subscription.Matches(topic))){AgentId agentId = subscription.MapToAgent(topic);- if (agentId == sender)+ if (sender.HasValue && sender == agentId){// TODO: enable re-entrant modecontinue;}- MessageContext messageContext = new MessageContext(messageId)+ MessageContext messageContext = new (messageId ?? Guid.NewGuid().ToString(), cancellationToken ?? CancellationToken.None){- CancellationToken = cancellationToken,Sender = sender,Topic = topic,IsRpc = false- }+ };IHostableAgent agent = await this.EnsureAgentAsync(agentId);await agent.OnMessageAsync(message, messageContext);@@ -51,39 +56,34 @@ internal class InProcessRuntime : IAgentRuntime});}- public ValueTask<object> SendMessageAsync(object message, AgentId recepient, AgentId? sender = null, string? messageId = null, CancellationToken? cancellationToken = null)+ public ValueTask<object?> SendMessageAsync(object message, AgentId recepient, AgentId? sender = null, string? messageId = null, CancellationToken? cancellationToken = null){return this.ExecuteTracedAsync(async () =>{cancellationToken ??= CancellationToken.None;messageId ??= Guid.NewGuid().ToString();- MessageContext messageContext = new MessageContext(messageId)+ MessageContext messageContext = new(messageId ?? Guid.NewGuid().ToString(), cancellationToken ?? CancellationToken.None){- CancellationToken = cancellationToken,Sender = sender,- Topic = topic,IsRpc = false- }+ };IHostableAgent agent = await this.EnsureAgentAsync(recepient);- await agent.OnMessageAsync(message, messageContext);+ return await agent.OnMessageAsync(message, messageContext);});}private async ValueTask<IHostableAgent> EnsureAgentAsync(AgentId agentId){- if (!this.agentInstances.ContainsKey(agentId))+ if (!this.agentInstances.TryGetValue(agentId, out IHostableAgent? agent)){- if (!this.agentFactories.ContainsKey(agentId.Type))+ if (!this.agentFactories.TryGetValue(agentId.Type, out Func<AgentId, IAgentRuntime, ValueTask<IHostableAgent>>? factoryFunc)){throw new Exception($"Agent with name {agentId.Type} not found.");}- Func<AgentId, IAgentRuntime, ValueTask<IHostableAgent>> factoryFunc = this.agentFactories[agentId.Type]-- var agent = await factoryFunc(agentId, this);-+ agent = await factoryFunc(agentId, this);this.agentInstances.Add(agentId, agent);}@@ -106,9 +106,10 @@ internal class InProcessRuntime : IAgentRuntimepublic ValueTask<AgentId> GetAgentAsync(string agent, string key = "default", bool lazy = true)=> this.GetAgentAsync(new AgentId(agent, key), lazy);- public ValueTask<AgentMetadata> GetAgentMetadataAsync(AgentId agentId)+ public async ValueTask<AgentMetadata> GetAgentMetadataAsync(AgentId agentId){- return this.EnsureAgentAsync(agentId).ContinueWith(agent => agent.Metadata);+ IHostableAgent agent = await this.EnsureAgentAsync(agentId);+ return agent.Metadata;}public async ValueTask LoadAgentStateAsync(AgentId agentId, IDictionary<string, object> state)@@ -117,10 +118,10 @@ internal class InProcessRuntime : IAgentRuntimeawait agent.LoadStateAsync(state);}- public ValueTask<IDictionary<string, object>> SaveAgentStateAsync(AgentId agentId)+ public async ValueTask<IDictionary<string, object>> SaveAgentStateAsync(AgentId agentId){IHostableAgent agent = await this.EnsureAgentAsync(agentId);- return agent.SaveStateAsync();+ return await agent.SaveStateAsync();}/// <inheritdoc cref="IAgentRuntime.AddSubscriptionAsync(ISubscriptionDefinition)"/>@@ -146,25 +147,33 @@ internal class InProcessRuntime : IAgentRuntimereturn ValueTask.CompletedTask;}- public ValueTask LoadStateAsync(IDictionary<string, object> state)+ public async ValueTask LoadStateAsync(IDictionary<string, object> state){foreach (var agentIdStr in state.Keys){- AgentId agentId = AgentId.FromString(agentIdStr);+ AgentId agentId = AgentId.FromStr(agentIdStr);+ if (state[agentIdStr] is not IDictionary<string, object> agentState)+ {+ throw new Exception($"Agent state for {agentId} is not a {typeof(IDictionary<string, object>)}: {state[agentIdStr].GetType()}");+ }+if (this.agentFactories.ContainsKey(agentId.Type)){- await this.EnsureAgentAsync(agentId).LoadStateAsync(state[agentIdStr]);+ IHostableAgent agent = await this.EnsureAgentAsync(agentId);+ await agent.LoadStateAsync(agentState);}}}- public ValueTask<IDictionary<string, object>> SaveStateAsync()+ public async ValueTask<IDictionary<string, object>> SaveStateAsync(){Dictionary<string, object> state = new();foreach (var agentId in this.agentInstances.Keys){state[agentId.ToString()] = await this.agentInstances[agentId].SaveStateAsync();}++ return state;}public ValueTask<AgentType> RegisterAgentFactoryAsync<TAgent>(AgentType type, Func<ValueTask<TAgent>> factoryFunc) where TAgent : IHostableAgent@@ -174,10 +183,10 @@ internal class InProcessRuntime : IAgentRuntimethrow new Exception($"Agent with type {type} already exists.");}- return type;+ return ValueTask.FromResult(type);}- public ValueTask<IAgent> TryGetAgentProxyAsync(AgentId agentId)+ public ValueTask<AgentProxy> TryGetAgentProxyAsync(AgentId agentId){return ValueTask.FromResult(new AgentProxy(agentId, this));}