diff --git a/dotnet/AutoGen.sln b/dotnet/AutoGen.sln index 5b26e27165b3..005423f3e19c 100644 --- a/dotnet/AutoGen.sln +++ b/dotnet/AutoGen.sln @@ -80,8 +80,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents", "src\Microsoft.AutoGen\Agents\Microsoft.AutoGen.Agents.csproj", "{FD87BD33-4616-460B-AC85-A412BA08BB78}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Abstractions", "src\Microsoft.AutoGen\Abstractions\Microsoft.AutoGen.Abstractions.csproj", "{E0C991D9-0DB8-471C-ADC9-5FB16E2A0106}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Extensions.SemanticKernel", "src\Microsoft.AutoGen\Extensions\SemanticKernel\Microsoft.AutoGen.Extensions.SemanticKernel.csproj", "{952827D4-8D4C-4327-AE4D-E8D25811EF35}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AgentChat", "AgentChat", "{668726B9-77BC-45CF-B576-0F0773BF1615}" @@ -132,6 +130,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Extension EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AutoGen.Agents.Tests", "test\Microsoft.AutoGen.Agents.Tests\Microsoft.AutoGen.Agents.Tests.csproj", "{394FDAF8-74F9-4977-94A5-3371737EB774}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hello.Shared", "samples\Hello\Hello.Shared\Hello.Shared.csproj", "{F16058BE-1BE9-79AE-119E-A220BC6AADED}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Core", "src\Microsoft.AutoGen\Core\Microsoft.AutoGen.Core.csproj", "{1222A7E7-F9C7-D89F-4953-EE063A7FDE49}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Client", "src\Microsoft.AutoGen\Client\Microsoft.AutoGen.Client.csproj", "{03E150AA-3B93-B2AA-3141-1AE4A3481115}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.DistributedRuntime", "src\Microsoft.AutoGen\DistributedRuntime\Microsoft.AutoGen.DistributedRuntime.csproj", "{F8726BFF-8D62-BFAB-D000-BFAA8B55649B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -254,10 +260,6 @@ Global {FD87BD33-4616-460B-AC85-A412BA08BB78}.Debug|Any CPU.Build.0 = Debug|Any CPU {FD87BD33-4616-460B-AC85-A412BA08BB78}.Release|Any CPU.ActiveCfg = Release|Any CPU {FD87BD33-4616-460B-AC85-A412BA08BB78}.Release|Any CPU.Build.0 = Release|Any CPU - {E0C991D9-0DB8-471C-ADC9-5FB16E2A0106}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0C991D9-0DB8-471C-ADC9-5FB16E2A0106}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0C991D9-0DB8-471C-ADC9-5FB16E2A0106}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0C991D9-0DB8-471C-ADC9-5FB16E2A0106}.Release|Any CPU.Build.0 = Release|Any CPU {952827D4-8D4C-4327-AE4D-E8D25811EF35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {952827D4-8D4C-4327-AE4D-E8D25811EF35}.Debug|Any CPU.Build.0 = Debug|Any CPU {952827D4-8D4C-4327-AE4D-E8D25811EF35}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -342,6 +344,22 @@ Global {394FDAF8-74F9-4977-94A5-3371737EB774}.Debug|Any CPU.Build.0 = Debug|Any CPU {394FDAF8-74F9-4977-94A5-3371737EB774}.Release|Any CPU.ActiveCfg = Release|Any CPU {394FDAF8-74F9-4977-94A5-3371737EB774}.Release|Any CPU.Build.0 = Release|Any CPU + {F16058BE-1BE9-79AE-119E-A220BC6AADED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F16058BE-1BE9-79AE-119E-A220BC6AADED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F16058BE-1BE9-79AE-119E-A220BC6AADED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F16058BE-1BE9-79AE-119E-A220BC6AADED}.Release|Any CPU.Build.0 = Release|Any CPU + {1222A7E7-F9C7-D89F-4953-EE063A7FDE49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1222A7E7-F9C7-D89F-4953-EE063A7FDE49}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1222A7E7-F9C7-D89F-4953-EE063A7FDE49}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1222A7E7-F9C7-D89F-4953-EE063A7FDE49}.Release|Any CPU.Build.0 = Release|Any CPU + {03E150AA-3B93-B2AA-3141-1AE4A3481115}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03E150AA-3B93-B2AA-3141-1AE4A3481115}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03E150AA-3B93-B2AA-3141-1AE4A3481115}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03E150AA-3B93-B2AA-3141-1AE4A3481115}.Release|Any CPU.Build.0 = Release|Any CPU + {F8726BFF-8D62-BFAB-D000-BFAA8B55649B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F8726BFF-8D62-BFAB-D000-BFAA8B55649B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F8726BFF-8D62-BFAB-D000-BFAA8B55649B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F8726BFF-8D62-BFAB-D000-BFAA8B55649B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -377,7 +395,6 @@ Global {42A8251C-E7B3-47BB-A82E-459952EBE132} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} {4BB66E06-37D8-45A0-9B97-DE590AFBA340} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} {FD87BD33-4616-460B-AC85-A412BA08BB78} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} - {E0C991D9-0DB8-471C-ADC9-5FB16E2A0106} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} {952827D4-8D4C-4327-AE4D-E8D25811EF35} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} {668726B9-77BC-45CF-B576-0F0773BF1615} = {686480D7-8FEC-4ED3-9C5D-CEBE1057A7ED} {84020C4A-933A-4693-9889-1B99304A7D76} = {668726B9-77BC-45CF-B576-0F0773BF1615} @@ -402,6 +419,10 @@ Global {64EF61E7-00A6-4E5E-9808-62E10993A0E5} = {7EB336C2-7C0A-4BC8-80C6-A3173AB8DC45} {65059914-5527-4A00-9308-9FAF23D5E85A} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} {394FDAF8-74F9-4977-94A5-3371737EB774} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64} + {F16058BE-1BE9-79AE-119E-A220BC6AADED} = {7EB336C2-7C0A-4BC8-80C6-A3173AB8DC45} + {1222A7E7-F9C7-D89F-4953-EE063A7FDE49} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} + {03E150AA-3B93-B2AA-3141-1AE4A3481115} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} + {F8726BFF-8D62-BFAB-D000-BFAA8B55649B} = {18BF8DD7-0585-48BF-8F97-AD333080CE06} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {93384647-528D-46C8-922C-8DB36A382F0B} diff --git a/dotnet/samples/Hello/Hello.Shared/Hello.Shared.csproj b/dotnet/samples/Hello/Hello.Shared/Hello.Shared.csproj new file mode 100644 index 000000000000..694773751040 --- /dev/null +++ b/dotnet/samples/Hello/Hello.Shared/Hello.Shared.csproj @@ -0,0 +1,20 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + + + + diff --git a/protos/agent_events.proto b/dotnet/samples/Hello/Hello.Shared/Protos/messages.proto similarity index 100% rename from protos/agent_events.proto rename to dotnet/samples/Hello/Hello.Shared/Protos/messages.proto diff --git a/dotnet/samples/Hello/HelloAIAgents/HelloAIAgents.csproj b/dotnet/samples/Hello/HelloAIAgents/HelloAIAgents.csproj index c33bfeed5a8d..e41ceee69471 100644 --- a/dotnet/samples/Hello/HelloAIAgents/HelloAIAgents.csproj +++ b/dotnet/samples/Hello/HelloAIAgents/HelloAIAgents.csproj @@ -11,7 +11,6 @@ - diff --git a/dotnet/samples/Hello/HelloAgent/HelloAgent.csproj b/dotnet/samples/Hello/HelloAgent/HelloAgent.csproj index 93c996e32093..32ab830d5bda 100644 --- a/dotnet/samples/Hello/HelloAgent/HelloAgent.csproj +++ b/dotnet/samples/Hello/HelloAgent/HelloAgent.csproj @@ -15,7 +15,6 @@ - diff --git a/dotnet/samples/Hello/HelloAgentState/HelloAgentState.csproj b/dotnet/samples/Hello/HelloAgentState/HelloAgentState.csproj index e26b6c9521c2..19c6684bf742 100644 --- a/dotnet/samples/Hello/HelloAgentState/HelloAgentState.csproj +++ b/dotnet/samples/Hello/HelloAgentState/HelloAgentState.csproj @@ -12,7 +12,6 @@ - diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/AgentId.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/AgentId.cs deleted file mode 100644 index 7229b7365773..000000000000 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/AgentId.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// AgentId.cs - -namespace Microsoft.AutoGen.Abstractions; - -public partial class AgentId -{ - public AgentId(string type, string key) - { - Type = type; - Key = key; - } -} diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/ChatHistoryItem.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/ChatHistoryItem.cs deleted file mode 100644 index 0a779405e278..000000000000 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/ChatHistoryItem.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// ChatHistoryItem.cs - -namespace Microsoft.AutoGen.Abstractions; - -[Serializable] -public class ChatHistoryItem -{ - public required string Message { get; set; } - public ChatUserType UserType { get; set; } - public int Order { get; set; } -} diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/ChatState.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/ChatState.cs deleted file mode 100644 index 459a17045496..000000000000 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/ChatState.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// ChatState.cs - -using Google.Protobuf; - -namespace Microsoft.AutoGen.Abstractions; - -public class ChatState - where T : IMessage, new() -{ - public List History { get; set; } = new(); - public T Data { get; set; } = new(); -} diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/ChatUserType.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/ChatUserType.cs deleted file mode 100644 index 4ee8dcd33890..000000000000 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/ChatUserType.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// ChatUserType.cs - -namespace Microsoft.AutoGen.Abstractions; - -public enum ChatUserType -{ - System, - User, - Agent -} diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj b/dotnet/src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj index aa79cf9665ae..59bdf431e3a2 100644 --- a/dotnet/src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj +++ b/dotnet/src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -10,7 +10,6 @@ - diff --git a/dotnet/src/Microsoft.AutoGen/Agents/AgentBase.cs b/dotnet/src/Microsoft.AutoGen/Client/AgentBase.cs similarity index 89% rename from dotnet/src/Microsoft.AutoGen/Agents/AgentBase.cs rename to dotnet/src/Microsoft.AutoGen/Client/AgentBase.cs index 01ad856a2d49..f06a19312b87 100644 --- a/dotnet/src/Microsoft.AutoGen/Agents/AgentBase.cs +++ b/dotnet/src/Microsoft.AutoGen/Client/AgentBase.cs @@ -7,10 +7,10 @@ using System.Text.Json; using System.Threading.Channels; using Google.Protobuf; -using Microsoft.AutoGen.Abstractions; +using Microsoft.AutoGen.Core; using Microsoft.Extensions.Logging; -namespace Microsoft.AutoGen.Agents; +namespace Microsoft.AutoGen.Client; public abstract class AgentBase : IAgentBase, IHandle { @@ -34,7 +34,7 @@ protected AgentBase( { _runtime = runtime; runtime.AgentInstance = this; - this.EventTypes = eventTypes; + EventTypes = eventTypes; _logger = logger ?? LoggerFactory.Create(builder => { }).CreateLogger(); var subscriptionRequest = new AddSubscriptionRequest { @@ -43,8 +43,8 @@ protected AgentBase( { TypeSubscription = new TypeSubscription { - AgentType = this.AgentId.Type, - TopicType = this.AgentId.Type + "/" + this.AgentId.Key + AgentType = AgentId.Type, + TopicType = AgentId.Type + "/" + AgentId.Key } } }; @@ -106,7 +106,7 @@ protected internal async Task HandleRpcMessage(Message msg, CancellationToken ca { var activity = this.ExtractActivity(msg.CloudEvent.Type, msg.CloudEvent.Metadata); await this.InvokeWithActivityAsync( - static ((AgentBase Agent, CloudEvent Item) state, CancellationToken _) => state.Agent.CallHandler(state.Item), + static (state, item) => state.Item1.CallHandler(state.CloudEvent), (this, msg.CloudEvent), activity, msg.CloudEvent.Type, cancellationToken).ConfigureAwait(false); @@ -116,7 +116,7 @@ await this.InvokeWithActivityAsync( { var activity = this.ExtractActivity(msg.Request.Method, msg.Request.Metadata); await this.InvokeWithActivityAsync( - static ((AgentBase Agent, RpcRequest Request) state, CancellationToken ct) => state.Agent.OnRequestCoreAsync(state.Request, ct), + static (state, ct) => state.Item1.OnRequestCoreAsync(state.Request, ct), (this, msg.Request), activity, msg.Request.Method, cancellationToken).ConfigureAwait(false); @@ -139,7 +139,7 @@ public List Subscribe(string topic) TypeSubscription = new TypeSubscription { TopicType = topic, - AgentType = this.AgentId.Key + AgentType = AgentId.Key } } } @@ -210,7 +210,7 @@ protected async Task RequestAsync(AgentId target, string method, Di var completion = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); _runtime.Update(request, activity); await this.InvokeWithActivityAsync( - static async ((AgentBase Agent, RpcRequest Request, TaskCompletionSource) state, CancellationToken ct) => + static async (state, ct) => { var (self, request, completion) = state; @@ -219,7 +219,7 @@ static async ((AgentBase Agent, RpcRequest Request, TaskCompletionSource(T message, string? source = null, CancellationToken token = default) where T : IMessage { - var src = string.IsNullOrWhiteSpace(source) ? this.AgentId.Key : source; + var src = string.IsNullOrWhiteSpace(source) ? AgentId.Key : source; var evt = message.ToCloudEvent(src); await PublishEventAsync(evt, token).ConfigureAwait(false); } @@ -246,9 +246,9 @@ public async ValueTask PublishEventAsync(CloudEvent item, CancellationToken canc // TODO: fix activity _runtime.Update(item, activity); await this.InvokeWithActivityAsync( - static async ((AgentBase Agent, CloudEvent Event) state, CancellationToken ct) => + static async (state, ct) => { - await state.Agent._runtime.PublishEventAsync(state.Event).ConfigureAwait(false); + await state.Item1._runtime.PublishEventAsync(state.item).ConfigureAwait(false); }, (this, item), activity, @@ -271,7 +271,7 @@ public Task CallHandler(CloudEvent item) try { // check that our target actually implements this interface, otherwise call the default static - if (genericInterfaceType.IsAssignableFrom(this.GetType())) + if (genericInterfaceType.IsAssignableFrom(GetType())) { methodInfo = genericInterfaceType.GetMethod(nameof(IHandle.Handle), BindingFlags.Public | BindingFlags.Instance) ?? throw new InvalidOperationException($"Method not found on type {genericInterfaceType.FullName}"); @@ -300,7 +300,7 @@ public Task CallHandler(CloudEvent item) public virtual Task HandleObject(object item) { // get all Handle methods - var handleTMethods = this.GetType().GetMethods().Where(m => m.Name == "Handle" && m.GetParameters().Length == 1).ToList(); + var handleTMethods = GetType().GetMethods().Where(m => m.Name == "Handle" && m.GetParameters().Length == 1).ToList(); // get the one that matches the type of the item var handleTMethod = handleTMethods.FirstOrDefault(m => m.GetParameters()[0].ParameterType == item.GetType()); diff --git a/dotnet/src/Microsoft.AutoGen/Agents/AgentBaseExtensions.cs b/dotnet/src/Microsoft.AutoGen/Client/AgentBaseExtensions.cs similarity index 99% rename from dotnet/src/Microsoft.AutoGen/Agents/AgentBaseExtensions.cs rename to dotnet/src/Microsoft.AutoGen/Client/AgentBaseExtensions.cs index 5d738e5fc383..01bf5e908ee1 100644 --- a/dotnet/src/Microsoft.AutoGen/Agents/AgentBaseExtensions.cs +++ b/dotnet/src/Microsoft.AutoGen/Client/AgentBaseExtensions.cs @@ -3,7 +3,7 @@ using System.Diagnostics; -namespace Microsoft.AutoGen.Agents; +namespace Microsoft.AutoGen.Client; /// /// Provides extension methods for the class. diff --git a/dotnet/src/Microsoft.AutoGen/Agents/AgentRuntime.cs b/dotnet/src/Microsoft.AutoGen/Client/AgentRuntime.cs similarity index 97% rename from dotnet/src/Microsoft.AutoGen/Agents/AgentRuntime.cs rename to dotnet/src/Microsoft.AutoGen/Client/AgentRuntime.cs index c36d456af32e..94740dafbb84 100644 --- a/dotnet/src/Microsoft.AutoGen/Agents/AgentRuntime.cs +++ b/dotnet/src/Microsoft.AutoGen/Client/AgentRuntime.cs @@ -2,10 +2,10 @@ // AgentRuntime.cs using System.Diagnostics; -using Microsoft.AutoGen.Abstractions; +using Microsoft.AutoGen.Core; using Microsoft.Extensions.Logging; -namespace Microsoft.AutoGen.Agents; +namespace Microsoft.AutoGen.Client; internal sealed class AgentRuntime(AgentId agentId, IAgentWorker worker, ILogger logger, DistributedContextPropagator distributedContextPropagator) : IAgentRuntime { diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/AgentWorker.cs b/dotnet/src/Microsoft.AutoGen/Client/AgentWorker.cs similarity index 97% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/AgentWorker.cs rename to dotnet/src/Microsoft.AutoGen/Client/AgentWorker.cs index f9a5050534c8..5609f1c892f2 100644 --- a/dotnet/src/Microsoft.AutoGen/Agents/Services/AgentWorker.cs +++ b/dotnet/src/Microsoft.AutoGen/Client/AgentWorker.cs @@ -4,12 +4,12 @@ using System.Collections.Concurrent; using System.Diagnostics; using System.Threading.Channels; -using Microsoft.AutoGen.Abstractions; +using Microsoft.AutoGen.Core; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace Microsoft.AutoGen.Agents; +namespace Microsoft.AutoGen.Client; public class AgentWorker : IHostedService, @@ -50,7 +50,7 @@ public async ValueTask PublishEventAsync(CloudEvent cloudEvent, CancellationToke foreach (var (typeName, _) in _agentTypes) { if (typeName == nameof(Client)) { continue; } - var agent = GetOrActivateAgent(new AgentId(typeName, cloudEvent.Source)); + var agent = GetOrActivateAgent(new AgentId { Type = typeName, Key = cloudEvent.Source }); agent.ReceiveMessage(new Message { CloudEvent = cloudEvent }); } } @@ -104,7 +104,7 @@ public async Task RunMessagePump() foreach (var (typeName, _) in _agentTypes) { - var agentToInvoke = GetOrActivateAgent(new AgentId(typeName, item.Source)); + var agentToInvoke = GetOrActivateAgent(new AgentId { Type = typeName, Key = item.Source }); agentToInvoke.ReceiveMessage(msg); } break; diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Client.cs b/dotnet/src/Microsoft.AutoGen/Client/Client.cs similarity index 62% rename from dotnet/src/Microsoft.AutoGen/Agents/Client.cs rename to dotnet/src/Microsoft.AutoGen/Client/Client.cs index 313685d79311..95e574ee0077 100644 --- a/dotnet/src/Microsoft.AutoGen/Agents/Client.cs +++ b/dotnet/src/Microsoft.AutoGen/Client/Client.cs @@ -2,13 +2,13 @@ // Client.cs using System.Diagnostics; -using Microsoft.AutoGen.Abstractions; +using Microsoft.AutoGen.Core; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace Microsoft.AutoGen.Agents; +namespace Microsoft.AutoGen.Client; public sealed class Client(IAgentWorker runtime, DistributedContextPropagator distributedContextPropagator, [FromKeyedServices("EventTypes")] EventTypes eventTypes, ILogger logger) - : AgentBase(new AgentRuntime(new AgentId("client", Guid.NewGuid().ToString()), runtime, logger, distributedContextPropagator), eventTypes) + : AgentBase(new AgentRuntime(new AgentId { Type = "client", Key = Guid.NewGuid().ToString() }, runtime, logger, distributedContextPropagator), eventTypes) { } diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcAgentWorker.cs b/dotnet/src/Microsoft.AutoGen/Client/GrpcAgentWorker.cs similarity index 99% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcAgentWorker.cs rename to dotnet/src/Microsoft.AutoGen/Client/GrpcAgentWorker.cs index 48f07573430d..b7589f37cbf7 100644 --- a/dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcAgentWorker.cs +++ b/dotnet/src/Microsoft.AutoGen/Client/GrpcAgentWorker.cs @@ -6,12 +6,12 @@ using System.Reflection; using System.Threading.Channels; using Grpc.Core; -using Microsoft.AutoGen.Abstractions; +using Microsoft.AutoGen.Core; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace Microsoft.AutoGen.Agents; +namespace Microsoft.AutoGen.Client; public sealed class GrpcAgentWorker( AgentRpc.AgentRpcClient client, @@ -102,7 +102,7 @@ private async Task RunReadPump() foreach (var (typeName, _) in _agentTypes) { - var agent = GetOrActivateAgent(new AgentId(typeName, item.Source)); + var agent = GetOrActivateAgent(new AgentId{ Type = typeName, Key = item.Source }); agent.ReceiveMessage(message); } diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcAgentWorkerHostBuilderExtension.cs b/dotnet/src/Microsoft.AutoGen/Client/GrpcAgentWorkerHostBuilderExtension.cs similarity index 96% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcAgentWorkerHostBuilderExtension.cs rename to dotnet/src/Microsoft.AutoGen/Client/GrpcAgentWorkerHostBuilderExtension.cs index 6757428302f4..1e2a74fc08f4 100644 --- a/dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcAgentWorkerHostBuilderExtension.cs +++ b/dotnet/src/Microsoft.AutoGen/Client/GrpcAgentWorkerHostBuilderExtension.cs @@ -3,11 +3,11 @@ using Grpc.Core; using Grpc.Net.Client.Configuration; -using Microsoft.AutoGen.Abstractions; +using Microsoft.AutoGen.Core; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -namespace Microsoft.AutoGen.Agents; +namespace Microsoft.AutoGen.Client; public static class GrpcAgentWorkerHostBuilderExtensions { diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/HostBuilderExtensions.cs b/dotnet/src/Microsoft.AutoGen/Client/HostBuilderExtensions.cs similarity index 94% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/HostBuilderExtensions.cs rename to dotnet/src/Microsoft.AutoGen/Client/HostBuilderExtensions.cs index f21096ccfbdb..63ce9d5584e8 100644 --- a/dotnet/src/Microsoft.AutoGen/Agents/Services/HostBuilderExtensions.cs +++ b/dotnet/src/Microsoft.AutoGen/Client/HostBuilderExtensions.cs @@ -6,12 +6,12 @@ using System.Reflection; using Google.Protobuf; using Google.Protobuf.Reflection; -using Microsoft.AutoGen.Abstractions; +using Microsoft.AutoGen.Core; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Hosting; -namespace Microsoft.AutoGen.Agents; +namespace Microsoft.AutoGen.Client; public static class HostBuilderExtensions { @@ -63,7 +63,7 @@ public static IHostApplicationBuilder AddAgentWorker(this IHostApplicationBuilde .Where(type => ReflectionHelper.IsSubclassOfGeneric(type, typeof(AgentBase)) && !type.IsAbstract) .Select(t => (t, t.GetInterfaces() .Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IHandle<>)) - .Select(i => (GetMessageDescriptor(i.GetGenericArguments().First())?.FullName ?? "")).ToHashSet())) + .Select(i => GetMessageDescriptor(i.GetGenericArguments().First())?.FullName ?? "").ToHashSet())) .ToDictionary(item => item.t, item => item.Item2); // if the assembly contains any interfaces of type IHandler, then add all the methods of the interface to the eventsMap var handlersMap = AppDomain.CurrentDomain.GetAssemblies() @@ -71,7 +71,7 @@ public static IHostApplicationBuilder AddAgentWorker(this IHostApplicationBuilde .Where(type => ReflectionHelper.IsSubclassOfGeneric(type, typeof(AgentBase)) && !type.IsAbstract) .Select(t => (t, t.GetMethods() .Where(m => m.Name == "Handle") - .Select(m => (GetMessageDescriptor(m.GetParameters().First().ParameterType)?.FullName ?? "")).ToHashSet())) + .Select(m => GetMessageDescriptor(m.GetParameters().First().ParameterType)?.FullName ?? "").ToHashSet())) .ToDictionary(item => item.t, item => item.Item2); // get interfaces implemented by the agent and get the methods of the interface if they are named Handle var ifaceHandlersMap = AppDomain.CurrentDomain.GetAssemblies() @@ -80,7 +80,7 @@ public static IHostApplicationBuilder AddAgentWorker(this IHostApplicationBuilde .Select(t => t.GetInterfaces() .Select(i => (t, i, i.GetMethods() .Where(m => m.Name == "Handle") - .Select(m => (GetMessageDescriptor(m.GetParameters().First().ParameterType)?.FullName ?? "")) + .Select(m => GetMessageDescriptor(m.GetParameters().First().ParameterType)?.FullName ?? "") //to dictionary of type t and paramter type of the method .ToDictionary(m => m, m => m).Keys.ToHashSet())).ToList()); // for each item in ifaceHandlersMap, add the handlers to eventsMap with item as the key diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/MessageExtensions.cs b/dotnet/src/Microsoft.AutoGen/Client/MessageExtensions.cs similarity index 95% rename from dotnet/src/Microsoft.AutoGen/Abstractions/MessageExtensions.cs rename to dotnet/src/Microsoft.AutoGen/Client/MessageExtensions.cs index 2c8f5d053063..3ffb7a013b55 100644 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/MessageExtensions.cs +++ b/dotnet/src/Microsoft.AutoGen/Client/MessageExtensions.cs @@ -3,8 +3,9 @@ using Google.Protobuf; using Google.Protobuf.WellKnownTypes; +using Microsoft.AutoGen.Core; -namespace Microsoft.AutoGen.Abstractions; +namespace Microsoft.AutoGen.Client; public static class MessageExtensions { diff --git a/dotnet/src/Microsoft.AutoGen/Client/Microsoft.AutoGen.Client.csproj b/dotnet/src/Microsoft.AutoGen/Client/Microsoft.AutoGen.Client.csproj new file mode 100644 index 000000000000..c999015ed893 --- /dev/null +++ b/dotnet/src/Microsoft.AutoGen/Client/Microsoft.AutoGen.Client.csproj @@ -0,0 +1,13 @@ + + + + net8.0 + enable + enable + + + + + + + diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/IAgentBase.cs b/dotnet/src/Microsoft.AutoGen/Core/IAgentBase.cs similarity index 95% rename from dotnet/src/Microsoft.AutoGen/Abstractions/IAgentBase.cs rename to dotnet/src/Microsoft.AutoGen/Core/IAgentBase.cs index ee7b9e74583c..e11c67db1ca0 100644 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/IAgentBase.cs +++ b/dotnet/src/Microsoft.AutoGen/Core/IAgentBase.cs @@ -3,7 +3,7 @@ using Google.Protobuf; -namespace Microsoft.AutoGen.Abstractions; +namespace Microsoft.AutoGen.Core; public interface IAgentBase { diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/IAgentRuntime.cs b/dotnet/src/Microsoft.AutoGen/Core/IAgentRuntime.cs similarity index 96% rename from dotnet/src/Microsoft.AutoGen/Abstractions/IAgentRuntime.cs rename to dotnet/src/Microsoft.AutoGen/Core/IAgentRuntime.cs index 6b3d4f98cdb2..bd92c086868b 100644 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/IAgentRuntime.cs +++ b/dotnet/src/Microsoft.AutoGen/Core/IAgentRuntime.cs @@ -3,7 +3,7 @@ using System.Diagnostics; -namespace Microsoft.AutoGen.Abstractions; +namespace Microsoft.AutoGen.Core; public interface IAgentRuntime { diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/IAgentState.cs b/dotnet/src/Microsoft.AutoGen/Core/IAgentState.cs similarity index 96% rename from dotnet/src/Microsoft.AutoGen/Abstractions/IAgentState.cs rename to dotnet/src/Microsoft.AutoGen/Core/IAgentState.cs index 1b816b4ef3ad..c5f04269a546 100644 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/IAgentState.cs +++ b/dotnet/src/Microsoft.AutoGen/Core/IAgentState.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // IAgentState.cs -namespace Microsoft.AutoGen.Abstractions; +namespace Microsoft.AutoGen.Core; /// /// Interface for managing the state of an agent. diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/IAgentWorker.cs b/dotnet/src/Microsoft.AutoGen/Core/IAgentWorker.cs similarity index 94% rename from dotnet/src/Microsoft.AutoGen/Abstractions/IAgentWorker.cs rename to dotnet/src/Microsoft.AutoGen/Core/IAgentWorker.cs index adce9be60c9e..4e6e44386c07 100644 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/IAgentWorker.cs +++ b/dotnet/src/Microsoft.AutoGen/Core/IAgentWorker.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // IAgentWorker.cs -namespace Microsoft.AutoGen.Abstractions; +namespace Microsoft.AutoGen.Core; public interface IAgentWorker { diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/IConnection.cs b/dotnet/src/Microsoft.AutoGen/Core/IConnection.cs similarity index 72% rename from dotnet/src/Microsoft.AutoGen/Abstractions/IConnection.cs rename to dotnet/src/Microsoft.AutoGen/Core/IConnection.cs index 3ac582f6d4b3..97bb0fd2a82f 100644 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/IConnection.cs +++ b/dotnet/src/Microsoft.AutoGen/Core/IConnection.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // IConnection.cs -namespace Microsoft.AutoGen.Abstractions; +namespace Microsoft.AutoGen.Core; public interface IConnection { } diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/IHandle.cs b/dotnet/src/Microsoft.AutoGen/Core/IHandle.cs similarity index 83% rename from dotnet/src/Microsoft.AutoGen/Abstractions/IHandle.cs rename to dotnet/src/Microsoft.AutoGen/Core/IHandle.cs index ff43852b14e5..c6bd5ee013d3 100644 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/IHandle.cs +++ b/dotnet/src/Microsoft.AutoGen/Core/IHandle.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // IHandle.cs -namespace Microsoft.AutoGen.Abstractions; +namespace Microsoft.AutoGen.Core; public interface IHandle { diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/Microsoft.AutoGen.Abstractions.csproj b/dotnet/src/Microsoft.AutoGen/Core/Microsoft.AutoGen.Core.csproj similarity index 80% rename from dotnet/src/Microsoft.AutoGen/Abstractions/Microsoft.AutoGen.Abstractions.csproj rename to dotnet/src/Microsoft.AutoGen/Core/Microsoft.AutoGen.Core.csproj index 39a90664057e..504e169e0239 100644 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/Microsoft.AutoGen.Abstractions.csproj +++ b/dotnet/src/Microsoft.AutoGen/Core/Microsoft.AutoGen.Core.csproj @@ -11,13 +11,11 @@ - - diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/TopicSubscriptionAttribute.cs b/dotnet/src/Microsoft.AutoGen/Core/TopicSubscriptionAttribute.cs similarity index 85% rename from dotnet/src/Microsoft.AutoGen/Abstractions/TopicSubscriptionAttribute.cs rename to dotnet/src/Microsoft.AutoGen/Core/TopicSubscriptionAttribute.cs index 79d8393d2027..8c1e93e2f664 100644 --- a/dotnet/src/Microsoft.AutoGen/Abstractions/TopicSubscriptionAttribute.cs +++ b/dotnet/src/Microsoft.AutoGen/Core/TopicSubscriptionAttribute.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // TopicSubscriptionAttribute.cs -namespace Microsoft.AutoGen.Abstractions; +namespace Microsoft.AutoGen.Core; [AttributeUsage(AttributeTargets.All)] public class TopicSubscriptionAttribute(string topic) : Attribute diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/AgentStateGrain.cs b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/AgentStateGrain.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/AgentStateGrain.cs rename to dotnet/src/Microsoft.AutoGen/DistributedRuntime/AgentStateGrain.cs diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/AgentWorkerHostingExtensions.cs b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/AgentWorkerHostingExtensions.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/AgentWorkerHostingExtensions.cs rename to dotnet/src/Microsoft.AutoGen/DistributedRuntime/AgentWorkerHostingExtensions.cs diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcGateway.cs b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/GrpcGateway.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcGateway.cs rename to dotnet/src/Microsoft.AutoGen/DistributedRuntime/GrpcGateway.cs diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcGatewayService.cs b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/GrpcGatewayService.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcGatewayService.cs rename to dotnet/src/Microsoft.AutoGen/DistributedRuntime/GrpcGatewayService.cs diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcWorkerConnection.cs b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/GrpcWorkerConnection.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcWorkerConnection.cs rename to dotnet/src/Microsoft.AutoGen/DistributedRuntime/GrpcWorkerConnection.cs diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/IRegistryGrain.cs b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/IRegistryGrain.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/IRegistryGrain.cs rename to dotnet/src/Microsoft.AutoGen/DistributedRuntime/IRegistryGrain.cs diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/ISubscriptionsGrain.cs b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/ISubscriptionsGrain.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/ISubscriptionsGrain.cs rename to dotnet/src/Microsoft.AutoGen/DistributedRuntime/ISubscriptionsGrain.cs diff --git a/dotnet/src/Microsoft.AutoGen/DistributedRuntime/Microsoft.AutoGen.DistributedRuntime.csproj b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/Microsoft.AutoGen.DistributedRuntime.csproj new file mode 100644 index 000000000000..c999015ed893 --- /dev/null +++ b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/Microsoft.AutoGen.DistributedRuntime.csproj @@ -0,0 +1,13 @@ + + + + net8.0 + enable + enable + + + + + + + diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/OrleansRuntimeHostingExtenions.cs b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/OrleansRuntimeHostingExtenions.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/OrleansRuntimeHostingExtenions.cs rename to dotnet/src/Microsoft.AutoGen/DistributedRuntime/OrleansRuntimeHostingExtenions.cs diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/RegistryGrain.cs b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/RegistryGrain.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/RegistryGrain.cs rename to dotnet/src/Microsoft.AutoGen/DistributedRuntime/RegistryGrain.cs diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/SubscriptionsGrain.cs b/dotnet/src/Microsoft.AutoGen/DistributedRuntime/SubscriptionsGrain.cs similarity index 100% rename from dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/SubscriptionsGrain.cs rename to dotnet/src/Microsoft.AutoGen/DistributedRuntime/SubscriptionsGrain.cs diff --git a/protos/agent_states.proto b/protos/agent_states.proto deleted file mode 100644 index 5a51c0c8c9db..000000000000 --- a/protos/agent_states.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; -package agents; - -option csharp_namespace = "Microsoft.AutoGen.Abstractions"; - -message AgentState { - string message = 1; -} diff --git a/protos/agent_worker.proto b/protos/agent_worker.proto index 61b00333cd24..4a8a0aa25d83 100644 --- a/protos/agent_worker.proto +++ b/protos/agent_worker.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package agents; -option csharp_namespace = "Microsoft.AutoGen.Abstractions"; +option csharp_namespace = "Microsoft.AutoGen.Core"; import "cloudevent.proto"; import "google/protobuf/any.proto"; diff --git a/protos/cloudevent.proto b/protos/cloudevent.proto index e4b4aeb1beff..8edced982ee0 100644 --- a/protos/cloudevent.proto +++ b/protos/cloudevent.proto @@ -5,7 +5,7 @@ package cloudevent; import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; -option csharp_namespace = "Microsoft.AutoGen.Abstractions"; +option csharp_namespace = "Microsoft.AutoGen.Core"; message CloudEvent {