fix bugs in ioagents and add extensions for AgentTypes

microsoft · Oct 8, 2024 · 48856d5 · 48856d5
1 parent 8b12b77
commit 48856d5
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 34 deletions.
diff --git a/dotnet/samples/Hello/Program.cs b/dotnet/samples/Hello/Program.cs
@@ -1,14 +1,11 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.AutoGen.Agents.Abstractions;
 using Microsoft.AutoGen.Agents.Client;
-using Runtime = Microsoft.AutoGen.Agents.Runtime;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Hosting;
 
-// start the server runtime
-var app = await Runtime.Host.StartAsync(true);
 // start the client worker
-var clientApp = await App.StartAsync<HelloAgent>("HelloAgent");
+var clientApp = await App.StartAsync(local: true);
 // get the client
 var client = clientApp.Services.GetRequiredService<AgentClient>();
 
@@ -23,7 +20,6 @@
 await client.PublishEventAsync(evt);
 
 await clientApp.WaitForShutdownAsync();
-await app.WaitForShutdownAsync();
 
 [TopicSubscription("HelloAgents")]
 public class HelloAgent(

diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs b/dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/ConsoleAgent/ConsoleAgent.cs
@@ -3,7 +3,7 @@
 
 namespace Microsoft.AutoGen.Agents.Client;
 
-public class ConsoleAgent : IOAgent<AgentState>,
+public abstract class ConsoleAgent : IOAgent<AgentState>,
         IUseConsole,
         IHandle<Input>,
         IHandle<Output>

diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/FileAgent/FileAgent.cs b/dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/FileAgent/FileAgent.cs
@@ -1,27 +1,26 @@
 using Microsoft.AutoGen.Agents.Abstractions;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.AutoGen.Agents.Client;
 
 [TopicSubscription("FileIO")]
-public class FileAgent : IOAgent<AgentState>,
+public abstract class FileAgent(
+    IAgentContext context, 
+    [FromKeyedServices("EventTypes")] EventTypes typeRegistry, 
+    string inputPath = "input.txt",
+    string outputPath = "output.txt"
+    ) : IOAgent<AgentState>(context, typeRegistry),
         IUseFiles,
         IHandle<Input>,
         IHandle<Output>
 {
-    public FileAgent(IAgentContext context, EventTypes typeRegistry, string filePath) : base(context, typeRegistry)
-    {
-        _filePath = filePath;
-    }
-    private readonly string _filePath;
-
     public override async Task Handle(Input item)
     {
-
         // validate that the file exists
-        if (!File.Exists(_filePath))
+        if (!File.Exists(inputPath))
         {
-            string errorMessage = $"File not found: {_filePath}";
+            var errorMessage = $"File not found: {inputPath}";
             Logger.LogError(errorMessage);
             //publish IOError event
             var err = new IOError
@@ -31,36 +30,30 @@ public override async Task Handle(Input item)
             await PublishEvent(err);
             return;
         }
-
         string content;
         using (var reader = new StreamReader(item.Message))
         {
             content = await reader.ReadToEndAsync();
         }
-
         await ProcessInput(content);
-
         var evt = new InputProcessed
         {
             Route = _route
         }.ToCloudEvent(this.AgentId.Key);
         await PublishEvent(evt);
     }
-
     public override async Task Handle(Output item)
     {
-        using (var writer = new StreamWriter(_filePath, append: true))
+        using (var writer = new StreamWriter(outputPath, append: true))
         {
             await writer.WriteLineAsync(item.Message);
         }
-
         var evt = new OutputWritten
         {
             Route = _route
         }.ToCloudEvent(this.AgentId.Key);
         await PublishEvent(evt);
     }
-
     public override async Task<string> ProcessInput(string message)
     {
         var evt = new InputProcessed
@@ -70,14 +63,12 @@ public override async Task<string> ProcessInput(string message)
         await PublishEvent(evt);
         return message;
     }
-
     public override Task ProcessOutput(string message)
     {
         // Implement your output processing logic here
         return Task.CompletedTask;
     }
 }
-
 public interface IUseFiles
 {
 }
diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs b/dotnet/src/Microsoft.AutoGen.Agents.Client/Agents/IOAgent/WebAPIAgent/WebAPIAgent.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.AutoGen.Agents.Client;
 
-public class WebAPIAgent : IOAgent<AgentState>,
+public abstract class WebAPIAgent : IOAgent<AgentState>,
         IUseWebAPI,
         IHandle<Input>,
         IHandle<Output>
@@ -16,8 +16,8 @@ public class WebAPIAgent : IOAgent<AgentState>,
     public WebAPIAgent(
     IAgentContext context,
     [FromKeyedServices("EventTypes")] EventTypes typeRegistry,
-    string url,
-    ILogger<WebAPIAgent> logger) : base(
+    ILogger<WebAPIAgent> logger,
+    string url = "/agents/webio") : base(
         context,
         typeRegistry)
     {

diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/App.cs b/dotnet/src/Microsoft.AutoGen.Agents.Client/App.cs
@@ -4,10 +4,23 @@ namespace Microsoft.AutoGen.Agents.Client;
 
 public static class App
 {
-    public static async Task<WebApplication> StartAsync<T>(string name) where T : AgentBase
+    // need a variable to store the runtime instance
+    public static WebApplication? RuntimeApp { get; set; }
+    public static async Task<WebApplication> StartAsync(AgentTypes? agentTypes = null, bool local = false)
     {
+        if (RuntimeApp == null)
+        {
+            // start the server runtime
+            RuntimeApp = await Runtime.Host.StartAsync(local);
+        }
         var clientBuilder = WebApplication.CreateBuilder();
-        clientBuilder.AddAgentWorker().AddAgent<T>(name);
+        var appBuilder = clientBuilder.AddAgentWorker();
+        agentTypes ??= AgentTypes.GetAgentTypesFromAssembly()
+                   ?? throw new InvalidOperationException("No agent types found in the assembly");
+        foreach (var type in agentTypes.Types)
+        {
+            appBuilder.AddAgent(type.Key, type.Value);
+        }
         var clientApp = clientBuilder.Build();
         await clientApp.StartAsync().ConfigureAwait(false);
         return clientApp;

diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/HostBuilderExtensions.cs b/dotnet/src/Microsoft.AutoGen.Agents.Client/HostBuilderExtensions.cs
@@ -15,7 +15,7 @@ namespace Microsoft.AutoGen.Agents.Client;
 public static class HostBuilderExtensions
 {
     private const string _defaultAgentServiceAddress = "https://localhost:5001";
-    public static AgentApplicationBuilder AddAgentWorker(this IHostApplicationBuilder builder, string agentServiceAddress =_defaultAgentServiceAddress, bool local = false)
+    public static AgentApplicationBuilder AddAgentWorker(this IHostApplicationBuilder builder, string agentServiceAddress = _defaultAgentServiceAddress, bool local = false)
     {
         builder.Services.AddGrpcClient<AgentRpc.AgentRpcClient>(options =>
         {
@@ -66,7 +66,7 @@ public static AgentApplicationBuilder AddAgentWorker(this IHostApplicationBuilde
 
             var eventsMap = AppDomain.CurrentDomain.GetAssemblies()
                                     .SelectMany(assembly => assembly.GetTypes())
-                                    .Where(type => IsSubclassOfGeneric(type, typeof(AgentBase)) && !type.IsAbstract)
+                                    .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()))
@@ -82,8 +82,10 @@ public static AgentApplicationBuilder AddAgentWorker(this IHostApplicationBuilde
         var property = type.GetProperty("Descriptor", BindingFlags.Static | BindingFlags.Public);
         return property?.GetValue(null) as MessageDescriptor;
     }
-
-    private static bool IsSubclassOfGeneric(Type type, Type genericBaseType)
+}
+public sealed class ReflectionHelper
+{
+    public static bool IsSubclassOfGeneric(Type type, Type genericBaseType)
     {
         while (type != null && type != typeof(object))
         {
@@ -100,7 +102,21 @@ private static bool IsSubclassOfGeneric(Type type, Type genericBaseType)
         return false;
     }
 }
+public sealed class AgentTypes(Dictionary<string, Type> types)
+{
+    public Dictionary<string, Type> Types { get; } = types;
+    public static AgentTypes? GetAgentTypesFromAssembly()
+    {
+        var agents = AppDomain.CurrentDomain.GetAssemblies()
+                                .SelectMany(assembly => assembly.GetTypes())
+                                .Where(type => ReflectionHelper.IsSubclassOfGeneric(type, typeof(AgentBase)) 
+                                    && !type.IsAbstract
+                                    && !type.Name.Equals("AgentClient"))
+                                .ToDictionary(type => type.Name, type => type);
 
+        return new AgentTypes(agents);
+    }
+}
 public sealed class EventTypes(TypeRegistry typeRegistry, Dictionary<string, Type> types, Dictionary<Type, HashSet<string>> eventsMap)
 {
     public TypeRegistry TypeRegistry { get; } = typeRegistry;
@@ -116,5 +132,10 @@ public AgentApplicationBuilder AddAgent<
         builder.Services.AddKeyedSingleton("AgentTypes", (sp, key) => Tuple.Create(typeName, typeof(TAgent)));
         return this;
     }
+    public AgentApplicationBuilder AddAgent(string typeName, Type agentType)
+    {
+        builder.Services.AddKeyedSingleton("AgentTypes", (sp, key) => Tuple.Create(typeName, agentType));
+        return this;
+    }
 }
 
diff --git a/dotnet/src/Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj b/dotnet/src/Microsoft.AutoGen.Agents.Client/Microsoft.AutoGen.Agents.Client.csproj
@@ -13,6 +13,7 @@
 
 	<ItemGroup>
 		<ProjectReference Include="../Microsoft.AutoGen.Agents/Microsoft.AutoGen.Agents.csproj" />
+		<ProjectReference Include="..\Microsoft.AutoGen.Agents.Runtime\Microsoft.AutoGen.Agents.Runtime.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>