Rysweet 4671 remove iagent base (#4673)

* refactor renaming agent base and removing unused stuff Authored-by: Kosta Petan <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Kosta Petan <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ryan Sweet <[email protected]> Co-authored-by: Victor Dibia <[email protected]>
microsoft · Dec 12, 2024 · 7d4bf9b · 7d4bf9b
1 parent b9d682c
commit 7d4bf9b
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 54 deletions.
diff --git a/dotnet/samples/dev-team/DevTeam.Backend/Agents/Sandbox.cs b/dotnet/samples/dev-team/DevTeam.Backend/Agents/Sandbox.cs
@@ -3,7 +3,7 @@
 
 // namespace DevTeam.Backend;
 
-// public sealed class Sandbox : AgentBase
+// public sealed class Sandbox : Agent
 // {
 //     private const string ReminderName = "SandboxRunReminder";
 //     private readonly IManageAzure _azService;

diff --git a/dotnet/src/Microsoft.AutoGen/Abstractions/IAgentBase.cs b/dotnet/src/Microsoft.AutoGen/Abstractions/IAgentBase.cs
diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Agent.cs b/dotnet/src/Microsoft.AutoGen/Agents/Agent.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Agent.cs
 
+using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Reflection;
 using System.Text;
@@ -12,16 +13,15 @@
 
 namespace Microsoft.AutoGen.Agents;
 
-public abstract class Agent : IAgentBase, IHandle
+public abstract class Agent : IHandle
 {
     public static readonly ActivitySource s_source = new("AutoGen.Agent");
     public AgentId AgentId => _runtime.AgentId;
     private readonly object _lock = new();
-    private readonly Dictionary<string, TaskCompletionSource<RpcResponse>> _pendingRequests = [];
+    private readonly ConcurrentDictionary<string, TaskCompletionSource<RpcResponse>> _pendingRequests = [];
 
     private readonly Channel<object> _mailbox = Channel.CreateUnbounded<object>();
     private readonly IAgentRuntime _runtime;
-    public string Route { get; set; } = "base";
 
     protected internal ILogger<Agent> _logger;
     public IAgentRuntime Context => _runtime;
@@ -235,18 +235,15 @@ protected async Task<RpcResponse> RequestAsync(AgentId target, string method, Di
         activity?.SetTag("peer.service", target.ToString());
 
         var completion = new TaskCompletionSource<RpcResponse>(TaskCreationOptions.RunContinuationsAsynchronously);
-        _runtime.Update(request, activity);
+        Context!.Update(request, activity);
         await this.InvokeWithActivityAsync(
-            static async ((Agent Agent, RpcRequest Request, TaskCompletionSource<RpcResponse>) state, CancellationToken ct) =>
+            static async (state, ct) =>
             {
                 var (self, request, completion) = state;
 
-                lock (self._lock)
-                {
-                    self._pendingRequests[request.RequestId] = completion;
-                }
+                self._pendingRequests.AddOrUpdate(request.RequestId, _ => completion, (_, __) => completion);
 
-                await state.Agent._runtime.SendRequestAsync(state.Agent, state.Request).ConfigureAwait(false);
+                await state.Item1.Context!.SendRequestAsync(state.Item1, state.request, ct).ConfigureAwait(false);
 
                 await completion.Task.ConfigureAwait(false);
             },

diff --git a/dotnet/src/Microsoft.AutoGen/Agents/AgentRuntime.cs b/dotnet/src/Microsoft.AutoGen/Agents/AgentRuntime.cs
@@ -14,8 +14,8 @@ internal sealed class AgentRuntime(AgentId agentId, IAgentWorker worker, ILogger
     private readonly IAgentWorker worker = worker;
 
     public AgentId AgentId { get; } = agentId;
-    public ILogger<Agent> Logger { get; } = logger;
-    public IAgentBase? AgentInstance { get; set; }
+    private ILogger<Agent> Logger { get; } = logger;
+    public Agent? AgentInstance { get; set; }
     private DistributedContextPropagator DistributedContextPropagator { get; } = distributedContextPropagator;
     public (string?, string?) GetTraceIdAndState(IDictionary<string, string> metadata)
     {
@@ -79,7 +79,7 @@ public async ValueTask SendResponseAsync(RpcRequest request, RpcResponse respons
         response.RequestId = request.RequestId;
         await worker.SendResponseAsync(response, cancellationToken).ConfigureAwait(false);
     }
-    public async ValueTask SendRequestAsync(IAgentBase agent, RpcRequest request, CancellationToken cancellationToken = default)
+    public async ValueTask SendRequestAsync(Agent agent, RpcRequest request, CancellationToken cancellationToken = default)
     {
         await worker.SendRequestAsync(agent, request, cancellationToken).ConfigureAwait(false);
     }

diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Agents/AIAgent/InferenceAgent.cs b/dotnet/src/Microsoft.AutoGen/Agents/Agents/AIAgent/InferenceAgent.cs
@@ -2,7 +2,6 @@
 // InferenceAgent.cs
 
 using Google.Protobuf;
-using Microsoft.AutoGen.Abstractions;
 using Microsoft.Extensions.AI;
 namespace Microsoft.AutoGen.Agents;
 public abstract class InferenceAgent<T>(

diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Agents/AIAgent/SKAiAgent.cs b/dotnet/src/Microsoft.AutoGen/Agents/Agents/AIAgent/SKAiAgent.cs
@@ -3,7 +3,6 @@
 
 using System.Globalization;
 using System.Text;
-using Microsoft.AutoGen.Abstractions;
 using Microsoft.SemanticKernel;
 using Microsoft.SemanticKernel.Connectors.OpenAI;
 using Microsoft.SemanticKernel.Memory;

diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/ConsoleAgent/IHandleConsole.cs b/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/ConsoleAgent/IHandleConsole.cs
@@ -8,7 +8,6 @@ namespace Microsoft.AutoGen.Agents;
 
 public interface IHandleConsole : IHandle<Output>, IHandle<Input>
 {
-    string Route { get; }
     AgentId AgentId { get; }
     ValueTask PublishMessageAsync<T>(T message, string? source = null, CancellationToken token = default) where T : IMessage;
 

diff --git a/...oft.AutoGen/Abstractions/IAgentRuntime.cs → ...Microsoft.AutoGen/Agents/IAgentRuntime.cs b/...oft.AutoGen/Abstractions/IAgentRuntime.cs → ...Microsoft.AutoGen/Agents/IAgentRuntime.cs
@@ -2,17 +2,18 @@
 // IAgentRuntime.cs
 
 using System.Diagnostics;
+using Microsoft.AutoGen.Abstractions;
 
-namespace Microsoft.AutoGen.Abstractions;
+namespace Microsoft.AutoGen.Agents;
 
 public interface IAgentRuntime
 {
     AgentId AgentId { get; }
-    IAgentBase? AgentInstance { get; set; }
+    Agent? AgentInstance { get; set; }
     ValueTask StoreAsync(AgentState value, CancellationToken cancellationToken = default);
     ValueTask<AgentState> ReadAsync(AgentId agentId, CancellationToken cancellationToken = default);
     ValueTask SendResponseAsync(RpcRequest request, RpcResponse response, CancellationToken cancellationToken = default);
-    ValueTask SendRequestAsync(IAgentBase agent, RpcRequest request, CancellationToken cancellationToken = default);
+    ValueTask SendRequestAsync(Agent agent, RpcRequest request, CancellationToken cancellationToken = default);
     ValueTask SendMessageAsync(Message message, CancellationToken cancellationToken = default);
     ValueTask PublishEventAsync(CloudEvent @event, CancellationToken cancellationToken = default);
     void Update(RpcRequest request, Activity? activity);

diff --git a/...soft.AutoGen/Abstractions/IAgentWorker.cs → .../Microsoft.AutoGen/Agents/IAgentWorker.cs b/...soft.AutoGen/Abstractions/IAgentWorker.cs → .../Microsoft.AutoGen/Agents/IAgentWorker.cs
@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // IAgentWorker.cs
-namespace Microsoft.AutoGen.Abstractions;
+using Microsoft.AutoGen.Abstractions;
+namespace Microsoft.AutoGen.Agents;
 
 public interface IAgentWorker
 {
     ValueTask PublishEventAsync(CloudEvent evt, CancellationToken cancellationToken = default);
-    ValueTask SendRequestAsync(IAgentBase agent, RpcRequest request, CancellationToken cancellationToken = default);
+    ValueTask SendRequestAsync(Agent agent, RpcRequest request, CancellationToken cancellationToken = default);
     ValueTask SendResponseAsync(RpcResponse response, CancellationToken cancellationToken = default);
     ValueTask SendMessageAsync(Message message, CancellationToken cancellationToken = default);
     ValueTask StoreAsync(AgentState value, CancellationToken cancellationToken = default);

diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/AgentWorker.cs b/dotnet/src/Microsoft.AutoGen/Agents/Services/AgentWorker.cs
@@ -16,11 +16,11 @@ public class AgentWorker :
      IAgentWorker
 {
     private readonly ConcurrentDictionary<string, Type> _agentTypes = new();
-    private readonly ConcurrentDictionary<(string Type, string Key), IAgentBase> _agents = new();
+    private readonly ConcurrentDictionary<(string Type, string Key), Agent> _agents = new();
     private readonly ILogger<AgentWorker> _logger;
     private readonly Channel<object> _mailbox = Channel.CreateUnbounded<object>();
     private readonly ConcurrentDictionary<string, AgentState> _agentStates = new();
-    private readonly ConcurrentDictionary<string, (IAgentBase Agent, string OriginalRequestId)> _pendingClientRequests = new();
+    private readonly ConcurrentDictionary<string, (Agent Agent, string OriginalRequestId)> _pendingClientRequests = new();
     private readonly CancellationTokenSource _shutdownCts;
     private readonly IServiceProvider _serviceProvider;
     private readonly IEnumerable<Tuple<string, Type>> _configuredAgentTypes;
@@ -54,7 +54,7 @@ public async ValueTask PublishEventAsync(CloudEvent cloudEvent, CancellationToke
             agent.ReceiveMessage(new Message { CloudEvent = cloudEvent });
         }
     }
-    public async ValueTask SendRequestAsync(IAgentBase agent, RpcRequest request, CancellationToken cancellationToken = default)
+    public async ValueTask SendRequestAsync(Agent agent, RpcRequest request, CancellationToken cancellationToken = default)
     {
         var requestId = Guid.NewGuid().ToString();
         _pendingClientRequests[requestId] = (agent, request.RequestId);
@@ -190,7 +190,7 @@ public async Task StopAsync(CancellationToken cancellationToken)
         {
         }
     }
-    private IAgentBase GetOrActivateAgent(AgentId agentId)
+    private Agent GetOrActivateAgent(AgentId agentId)
     {
         if (!_agents.TryGetValue((agentId.Type, agentId.Key), out var agent))
         {

diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcAgentWorker.cs b/dotnet/src/Microsoft.AutoGen/Agents/Services/Grpc/GrpcAgentWorker.cs
@@ -25,8 +25,8 @@ public sealed class GrpcAgentWorker(
 {
     private readonly object _channelLock = new();
     private readonly ConcurrentDictionary<string, Type> _agentTypes = new();
-    private readonly ConcurrentDictionary<(string Type, string Key), IAgentBase> _agents = new();
-    private readonly ConcurrentDictionary<string, (IAgentBase Agent, string OriginalRequestId)> _pendingRequests = new();
+    private readonly ConcurrentDictionary<(string Type, string Key), Agent> _agents = new();
+    private readonly ConcurrentDictionary<string, (Agent Agent, string OriginalRequestId)> _pendingRequests = new();
     private readonly Channel<(Message Message, TaskCompletionSource WriteCompletionSource)> _outboundMessagesChannel = Channel.CreateBounded<(Message, TaskCompletionSource)>(new BoundedChannelOptions(1024)
     {
         AllowSynchronousContinuations = true,
@@ -187,7 +187,7 @@ private async Task RunWritePump()
             item.WriteCompletionSource.TrySetCanceled();
         }
     }
-    private IAgentBase GetOrActivateAgent(AgentId agentId)
+    private Agent GetOrActivateAgent(AgentId agentId)
     {
         if (!_agents.TryGetValue((agentId.Type, agentId.Key), out var agent))
         {
@@ -275,7 +275,7 @@ await WriteChannelAsync(new Message
         await WriteChannelAsync(new Message { Response = response }, cancellationToken).ConfigureAwait(false);
     }
     // new is intentional
-    public new async ValueTask SendRequestAsync(IAgentBase agent, RpcRequest request, CancellationToken cancellationToken = default)
+    public new async ValueTask SendRequestAsync(Agent agent, RpcRequest request, CancellationToken cancellationToken = default)
     {
         var requestId = Guid.NewGuid().ToString();
         _pendingRequests[requestId] = (agent, request.RequestId);

diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/HostBuilderExtensions.cs b/dotnet/src/Microsoft.AutoGen/Agents/Services/HostBuilderExtensions.cs
@@ -60,7 +60,8 @@ public static IHostApplicationBuilder AddAgentWorker(this IHostApplicationBuilde
 
             var eventsMap = AppDomain.CurrentDomain.GetAssemblies()
                                     .SelectMany(assembly => assembly.GetTypes())
-                                    .Where(type => type != null && ReflectionHelper.IsSubclassOfGeneric(type, typeof(Agent)) && !type.IsAbstract)
+                                    .Where(type => ReflectionHelper.IsSubclassOfGeneric(type, typeof(Agent)) && !type.IsAbstract)
+
                                     .Select(t => (t, t.GetInterfaces()
                                                   .Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IHandle<>))
                                                   .Select(i => (GetMessageDescriptor(i.GetGenericArguments().First())?.FullName ?? "")).ToHashSet()))