A programming framework for agentic AI
bring back grpc service (#5377)
Ryan Sweetedbd20167b1d
diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.ymlindex 8539502b9..ca55a6f14 100644--- a/.github/workflows/dotnet-build.yml+++ b/.github/workflows/dotnet-build.yml@@ -65,6 +65,18 @@ jobs:- uses: actions/checkout@v4with:lfs: true+ - uses: astral-sh/setup-uv@v5+ with:+ enable-cache: true+ version: "0.5.18"+ - uses: actions/setup-python@v5+ with:+ python-version: "3.11"+ - run: uv sync --locked --all-extras+ working-directory: ./python+ - name: Prepare python venv+ run: |+ source ${{ github.workspace }}/python/.venv/bin/activate- name: Setup .NET 8.0uses: actions/setup-dotnet@v4with:diff --git a/dotnet/AutoGen.sln b/dotnet/AutoGen.slnindex a267a11e6..cb590f21d 100644--- a/dotnet/AutoGen.sln+++ b/dotnet/AutoGen.sln@@ -122,6 +122,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GettingStartedGrpc", "samplEndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Core.Grpc.Tests", "test\Microsoft.AutoGen.Core.Grpc.Tests\Microsoft.AutoGen.Core.Grpc.Tests.csproj", "{23A028D3-5EB1-4FA0-9CD1-A1340B830579}"EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.RuntimeGateway.Grpc", "src\Microsoft.AutoGen\RuntimeGateway.Grpc\Microsoft.AutoGen.RuntimeGateway.Grpc.csproj", "{BE420A71-7615-4DFD-BE94-9409397949F1}"+EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.RuntimeGateway.Grpc.Tests", "test\Microsoft.AutoGen.RuntimeGateway.Grpc.Tests\Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.csproj", "{CDD859F3-1B60-4ECE-8472-54DF8EFCA682}"+EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Integration.Tests", "test\Microsoft.AutoGen.Integration.Tests\Microsoft.AutoGen.Integration.Tests.csproj", "{7A11022E-4E5D-4A4A-AADF-E715C2ECF800}"+EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.AgentHost", "src\Microsoft.AutoGen\AgentHost\Microsoft.AutoGen.AgentHost.csproj", "{50C2E8D5-68AB-45A3-B96F-355E1F8AC039}"+EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hello.AppHost", "samples\Hello\Hello.AppHost\Hello.AppHost.csproj", "{B8E77E57-C983-4EEA-9589-906271486D80}"+EndProject+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.AutoGen", "Microsoft.AutoGen", "{81BA12F2-2D2F-42C1-AF83-FBDAA1A78A45}"+EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.Agents", "src\Microsoft.AutoGen\Agents\Microsoft.AutoGen.Agents.csproj", "{EF954ED3-87D5-40F1-8557-E7179F43EA0E}"+EndProject+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloAgent.AppHost", "test\Microsoft.AutoGen.Integration.Tests.AppHosts\HelloAgent.AppHost\HelloAgent.AppHost.csproj", "{50082F76-917F-42EE-8869-8C72630423A7}"+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.AgentChat", "src\Microsoft.AutoGen\AgentChat\Microsoft.AutoGen.AgentChat.csproj", "{7F828599-56E8-4597-8F68-EE26FD631417}"EndProjectProject("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AutoGen.AgentChat.Tests", "test\Microsoft.AutoGen.AgentChat.Tests\Microsoft.AutoGen.AgentChat.Tests.csproj", "{217A4F86-8ADD-4998-90BA-880092A019F5}"@@ -320,6 +336,34 @@ Global{23A028D3-5EB1-4FA0-9CD1-A1340B830579}.Debug|Any CPU.Build.0 = Debug|Any CPU{23A028D3-5EB1-4FA0-9CD1-A1340B830579}.Release|Any CPU.ActiveCfg = Release|Any CPU{23A028D3-5EB1-4FA0-9CD1-A1340B830579}.Release|Any CPU.Build.0 = Release|Any CPU+ {BE420A71-7615-4DFD-BE94-9409397949F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {BE420A71-7615-4DFD-BE94-9409397949F1}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {BE420A71-7615-4DFD-BE94-9409397949F1}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {BE420A71-7615-4DFD-BE94-9409397949F1}.Release|Any CPU.Build.0 = Release|Any CPU+ {CDD859F3-1B60-4ECE-8472-54DF8EFCA682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {CDD859F3-1B60-4ECE-8472-54DF8EFCA682}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {CDD859F3-1B60-4ECE-8472-54DF8EFCA682}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {CDD859F3-1B60-4ECE-8472-54DF8EFCA682}.Release|Any CPU.Build.0 = Release|Any CPU+ {7A11022E-4E5D-4A4A-AADF-E715C2ECF800}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {7A11022E-4E5D-4A4A-AADF-E715C2ECF800}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {7A11022E-4E5D-4A4A-AADF-E715C2ECF800}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {7A11022E-4E5D-4A4A-AADF-E715C2ECF800}.Release|Any CPU.Build.0 = Release|Any CPU+ {50C2E8D5-68AB-45A3-B96F-355E1F8AC039}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {50C2E8D5-68AB-45A3-B96F-355E1F8AC039}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {50C2E8D5-68AB-45A3-B96F-355E1F8AC039}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {50C2E8D5-68AB-45A3-B96F-355E1F8AC039}.Release|Any CPU.Build.0 = Release|Any CPU+ {B8E77E57-C983-4EEA-9589-906271486D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {B8E77E57-C983-4EEA-9589-906271486D80}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {B8E77E57-C983-4EEA-9589-906271486D80}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {B8E77E57-C983-4EEA-9589-906271486D80}.Release|Any CPU.Build.0 = Release|Any CPU+ {EF954ED3-87D5-40F1-8557-E7179F43EA0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {EF954ED3-87D5-40F1-8557-E7179F43EA0E}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {EF954ED3-87D5-40F1-8557-E7179F43EA0E}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {EF954ED3-87D5-40F1-8557-E7179F43EA0E}.Release|Any CPU.Build.0 = Release|Any CPU+ {50082F76-917F-42EE-8869-8C72630423A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU+ {50082F76-917F-42EE-8869-8C72630423A7}.Debug|Any CPU.Build.0 = Debug|Any CPU+ {50082F76-917F-42EE-8869-8C72630423A7}.Release|Any CPU.ActiveCfg = Release|Any CPU+ {50082F76-917F-42EE-8869-8C72630423A7}.Release|Any CPU.Build.0 = Release|Any CPU{7F828599-56E8-4597-8F68-EE26FD631417}.Debug|Any CPU.ActiveCfg = Debug|Any CPU{7F828599-56E8-4597-8F68-EE26FD631417}.Debug|Any CPU.Build.0 = Debug|Any CPU{7F828599-56E8-4597-8F68-EE26FD631417}.Release|Any CPU.ActiveCfg = Release|Any CPU@@ -383,6 +427,14 @@ Global{3D83C6DB-ACEA-48F3-959F-145CCD2EE135} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}{C3740DF1-18B1-4607-81E4-302F0308C848} = {CE0AA8D5-12B8-4628-9589-DAD8CB0DDCF6}{23A028D3-5EB1-4FA0-9CD1-A1340B830579} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}+ {BE420A71-7615-4DFD-BE94-9409397949F1} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}+ {CDD859F3-1B60-4ECE-8472-54DF8EFCA682} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}+ {7A11022E-4E5D-4A4A-AADF-E715C2ECF800} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}+ {50C2E8D5-68AB-45A3-B96F-355E1F8AC039} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}+ {B8E77E57-C983-4EEA-9589-906271486D80} = {F42F9C8E-7BD9-4687-9B63-AFFA461AF5C1}+ {81BA12F2-2D2F-42C1-AF83-FBDAA1A78A45} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}+ {EF954ED3-87D5-40F1-8557-E7179F43EA0E} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}+ {50082F76-917F-42EE-8869-8C72630423A7} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}{7F828599-56E8-4597-8F68-EE26FD631417} = {18BF8DD7-0585-48BF-8F97-AD333080CE06}{217A4F86-8ADD-4998-90BA-880092A019F5} = {F823671B-3ECA-4AE6-86DA-25E920D3FE64}EndGlobalSectiondiff --git a/dotnet/src/Microsoft.AutoGen/AgentHost/Host.cs b/dotnet/src/Microsoft.AutoGen/AgentHost/Host.csindex 1ecf42c79..0176b3faa 100644--- a/dotnet/src/Microsoft.AutoGen/AgentHost/Host.cs+++ b/dotnet/src/Microsoft.AutoGen/AgentHost/Host.cs@@ -4,7 +4,7 @@ using System.Threading.Tasks;using Microsoft.AspNetCore.Builder;using Microsoft.Extensions.Hosting;-namespace Microsoft.AutoGen.Runtime.Grpc;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc;public static class Host{diff --git a/dotnet/src/Microsoft.AutoGen/AgentHost/Microsoft.AutoGen.AgentHost.csproj b/dotnet/src/Microsoft.AutoGen/AgentHost/Microsoft.AutoGen.AgentHost.csprojindex 33b051ad9..dea603ebc 100644--- a/dotnet/src/Microsoft.AutoGen/AgentHost/Microsoft.AutoGen.AgentHost.csproj+++ b/dotnet/src/Microsoft.AutoGen/AgentHost/Microsoft.AutoGen.AgentHost.csproj@@ -15,7 +15,7 @@<PackageReference Include="Microsoft.Extensions.Hosting" /></ItemGroup><ItemGroup>- <ProjectReference Include="..\Runtime.Grpc\Microsoft.AutoGen.Runtime.Grpc.csproj" />+ <ProjectReference Include="..\RuntimeGateway.Grpc\Microsoft.AutoGen.RuntimeGateway.Grpc.csproj" /><ProjectReference Include="..\Extensions\Aspire\Microsoft.AutoGen.Extensions.Aspire.csproj" /></ItemGroup></Project>\ No newline at end of filediff --git a/dotnet/src/Microsoft.AutoGen/AgentHost/Program.cs b/dotnet/src/Microsoft.AutoGen/AgentHost/Program.csindex 024ca0d43..3e32c50a3 100644--- a/dotnet/src/Microsoft.AutoGen/AgentHost/Program.cs+++ b/dotnet/src/Microsoft.AutoGen/AgentHost/Program.cs@@ -2,5 +2,5 @@// Program.csusing Microsoft.Extensions.Hosting;-var app = await Microsoft.AutoGen.Runtime.Grpc.Host.StartAsync(local: false, useGrpc: true).ConfigureAwait(false);+var app = await Microsoft.AutoGen.RuntimeGateway.Grpc.Host.StartAsync(local: false, useGrpc: true).ConfigureAwait(false);await app.WaitForShutdownAsync();diff --git a/dotnet/src/Microsoft.AutoGen/Agents/AIAgent/InferenceAgent.cs b/dotnet/src/Microsoft.AutoGen/Agents/AIAgent/InferenceAgent.csnew file mode 100644index 000000000..d3dc10001--- /dev/null+++ b/dotnet/src/Microsoft.AutoGen/Agents/AIAgent/InferenceAgent.cs@@ -0,0 +1,44 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// InferenceAgent.cs+using Google.Protobuf;+using Microsoft.AutoGen.Contracts;+using Microsoft.AutoGen.Core;+using Microsoft.Extensions.AI;+using Microsoft.Extensions.Logging;+namespace Microsoft.AutoGen.Agents;+/// <summary>+/// Base class for inference agents using the Microsoft.Extensions.AI library.+/// </summary>+/// <typeparam name="T"></typeparam>+/// <param name="id"></param>+/// <param name="runtime"></param>+/// <param name="name"></param>+/// <param name="logger"></param>+/// <param name="client"></param>+public abstract class InferenceAgent<T>(+ AgentId id,+ IAgentRuntime runtime,+ string name,+ ILogger<InferenceAgent<T>>? logger,+ IChatClient client)+ : BaseAgent(id, runtime, name, logger)+ where T : IMessage, new()+{+ protected IChatClient ChatClient { get; } = client;+ private ILogger<InferenceAgent<T>>? Logger => _logger as ILogger<InferenceAgent<T>>;+ private Task<ChatCompletion> CompleteAsync(+ IList<ChatMessage> chatMessages,+ ChatOptions? options = null,+ CancellationToken cancellationToken = default)+ {+ return ChatClient.CompleteAsync(chatMessages, options, cancellationToken);+ }+ private IAsyncEnumerable<StreamingChatCompletionUpdate> CompleteStreamingAsync(+ IList<ChatMessage> chatMessages,+ ChatOptions? options = null,+ CancellationToken cancellationToken = default)+ {+ return ChatClient.CompleteStreamingAsync(chatMessages, options, cancellationToken);+ }++}diff --git a/dotnet/src/Microsoft.AutoGen/Agents/IOAgent/ConsoleAgent/IHandleConsole.cs b/dotnet/src/Microsoft.AutoGen/Agents/IOAgent/ConsoleAgent/IHandleConsole.csnew file mode 100644index 000000000..651be8731--- /dev/null+++ b/dotnet/src/Microsoft.AutoGen/Agents/IOAgent/ConsoleAgent/IHandleConsole.cs@@ -0,0 +1,65 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// IHandleConsole.cs+using Google.Protobuf;+using Microsoft.AutoGen.Contracts;++namespace Microsoft.AutoGen.Agents;+/// <summary>+/// Default interface methods for an event handler for Input and Output that writes or reads from the console+/// Can be used inside your agents by inheriting from this interface+/// public class MyAgent : BaseAgent, IHandleConsole+/// </summary>+public interface IHandleConsole : IHandle<Output>, IHandle<Input>, IProcessIO+{+ /// <summary>+ /// Prototype for Publish Message Async method+ /// </summary>+ /// <typeparam name="T"></typeparam>+ /// <param name="message"></param>+ /// <param name="topic"></param>+ /// <param name="messageId"></param>+ /// <param name="token"></param>+ /// <returns>ValueTask</returns>+ ValueTask PublishMessageAsync<T>(T message, TopicId topic, string? messageId, CancellationToken token = default) where T : IMessage;++ /// <summary>+ /// Receives events of type Output and writes them to the console+ /// then runs the ProcessOutputAsync method which you should implement in your agent+ /// </summary>+ /// <param name="item"></param>+ /// <param name="messageContext"></param>+ /// <returns>ValueTask</returns>+ async ValueTask IHandle<Output>.HandleAsync(Output item, MessageContext messageContext)+ {+ // Assuming item has a property `Message` that we want to write to the console+ Console.WriteLine(item.Message);+ await ProcessOutputAsync(item.Message);++ var evt = new OutputWritten+ {+ Route = "console"+ };+ await PublishMessageAsync(evt, new TopicId("OutputWritten"), null, token: CancellationToken.None).ConfigureAwait(false);+ }++ /// <summary>+ /// Receives events of type Input and reads from the console, then runs the ProcessInputAsync method+ /// which you should implement in your agent+ /// </summary>+ /// <param name="item"></param>+ /// <param name="messageContext"></param>+ /// <returns></returns>+ async ValueTask IHandle<Input>.HandleAsync(Input item, MessageContext messageContext)+ {+ Console.WriteLine("Please enter input:");+ string content = Console.ReadLine() ?? string.Empty;++ await ProcessInputAsync(content);++ var evt = new InputProcessed+ {+ Route = "console"+ };+ await PublishMessageAsync(evt, new TopicId("InputProcessed"), null, token: CancellationToken.None).ConfigureAwait(false);+ }+}diff --git a/dotnet/src/Microsoft.AutoGen/Agents/IOAgent/FileAgent/IHandleFileIO.cs b/dotnet/src/Microsoft.AutoGen/Agents/IOAgent/FileAgent/IHandleFileIO.csnew file mode 100644index 000000000..b3d670004--- /dev/null+++ b/dotnet/src/Microsoft.AutoGen/Agents/IOAgent/FileAgent/IHandleFileIO.cs@@ -0,0 +1,75 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// IHandleFileIO.cs++using Google.Protobuf;+using Microsoft.AutoGen.Contracts;+using Microsoft.Extensions.Logging;++namespace Microsoft.AutoGen.Agents;+/// <summary>+/// Default interface methods for an event handler for Input and Output that writes or reads from a file+/// Can be used inside your agents by inheriting from this interface+/// public class MyAgent : BaseAgent, IHandleFileIO+/// </summary>+public interface IHandleFileIO : IHandle<Input>, IHandle<Output>, IProcessIO+{+ // A Logger instance to log messages+ ILogger LogTarget { get; }+ // The path to the input file+ string InputPath { get; }+ // The path to the output file+ string OutputPath { get; }+ // The route of the agent (used in the post-process events)+ const string Route = "Microsoft.AutoGen.Agents.IHandleFileIO";++ /// <summary>+ /// Prototype for Publish Message Async method+ /// </summary>+ /// <typeparam name="T"></typeparam>+ /// <param name="message"></param>+ /// <param name="topic"></param>+ /// <param name="messageId"></param>+ /// <param name="token"></param>+ /// <returns>ValueTask</returns>+ ValueTask PublishMessageAsync<T>(T message, TopicId topic, string? messageId, CancellationToken token = default) where T : IMessage;+ async ValueTask IHandle<Input>.HandleAsync(Input item, MessageContext messageContext)+ {++ // validate that the file exists+ if (!File.Exists(InputPath))+ {+ var errorMessage = $"File not found: {InputPath}";+ LogTarget.LogError(errorMessage);+ //publish IOError event+ var err = new IOError+ {+ Message = errorMessage+ };+ await PublishMessageAsync(err, new TopicId("IOError"), null, token: CancellationToken.None).ConfigureAwait(false);+ return;+ }+ string content;+ using (var reader = new StreamReader(item.Message))+ {+ content = await reader.ReadToEndAsync(CancellationToken.None);+ }+ await ProcessInputAsync(content);+ var evt = new InputProcessed+ {+ Route = Route+ };+ await PublishMessageAsync(evt, new TopicId("InputProcessed"), null, token: CancellationToken.None).ConfigureAwait(false);+ }+ async ValueTask IHandle<Output>.HandleAsync(Output item, MessageContext messageContext)+ {+ using (var writer = new StreamWriter(OutputPath, append: true))+ {+ await writer.WriteLineAsync(item.Message);+ }+ var evt = new OutputWritten+ {+ Route = Route+ };+ await PublishMessageAsync(evt, new TopicId("OutputWritten"), null, token: CancellationToken.None).ConfigureAwait(false);+ }+}diff --git a/dotnet/src/Microsoft.AutoGen/Agents/IOAgent/IProcessIO.cs b/dotnet/src/Microsoft.AutoGen/Agents/IOAgent/IProcessIO.csnew file mode 100644index 000000000..e348f3e1c--- /dev/null+++ b/dotnet/src/Microsoft.AutoGen/Agents/IOAgent/IProcessIO.cs@@ -0,0 +1,23 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// IProcessIO.cs++namespace Microsoft.AutoGen.Agents;++/// <summary>+/// Default Interface methods for processing input and output shared by IOAgents that should be implemented in your agent+/// </summary>+public interface IProcessIO+{+ /// <summary>+ /// Implement this method in your agent to process the input+ /// </summary>+ /// <param name="message"></param>+ /// <returns>Task</returns>+ static Task ProcessOutputAsync(string message) { return Task.CompletedTask; }+ /// <summary>+ /// Implement this method in your agent to process the output+ /// </summary>+ /// <param name="message"></param>+ /// <returns>Task</returns>+ static Task<string> ProcessInputAsync(string message) { return Task.FromResult(message); }+}diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj b/dotnet/src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csprojnew file mode 100644index 000000000..5032e95a1--- /dev/null+++ b/dotnet/src/Microsoft.AutoGen/Agents/Microsoft.AutoGen.Agents.csproj@@ -0,0 +1,24 @@+<Project Sdk="Microsoft.NET.Sdk">++ <PropertyGroup>+ <TargetFramework>net8.0</TargetFramework>+ <ImplicitUsings>enable</ImplicitUsings>+ <Nullable>enable</Nullable>+ </PropertyGroup>++ <Import Project="$(RepoRoot)/nuget/nuget-package.props" />++ <ItemGroup>+ <ProjectReference Include="..\Contracts\Microsoft.AutoGen.Contracts.csproj" />+ <ProjectReference Include="..\Core\Microsoft.AutoGen.Core.csproj" />+ <ProjectReference Include="..\Extensions\Aspire\Microsoft.AutoGen.Extensions.Aspire.csproj" />+ </ItemGroup>+ <ItemGroup>+ <PackageReference Include="Microsoft.SemanticKernel" />+ <PackageReference Include="Microsoft.Extensions.AI.Abstractions" />+ <PackageReference Include="Grpc.Tools" PrivateAssets="All" />+ </ItemGroup>+ <ItemGroup>+ <Protobuf Include="protos\agent_events.proto" GrpcServices="Client;Server" Link="Protos\agent_events.proto" />+ </ItemGroup>+</Project>diff --git a/dotnet/src/Microsoft.AutoGen/Agents/protos/agent_events.proto b/dotnet/src/Microsoft.AutoGen/Agents/protos/agent_events.protonew file mode 100644index 000000000..414d79f96--- /dev/null+++ b/dotnet/src/Microsoft.AutoGen/Agents/protos/agent_events.proto@@ -0,0 +1,43 @@+syntax = "proto3";++package agents;++option csharp_namespace = "Microsoft.AutoGen.Agents";+message TextMessage {+ string textMessage = 1;+ string source = 2;+}+message Input {+ string message = 1;+}+message InputProcessed {+ string route = 1;+}+message Output {+ string message = 1;+}+message OutputWritten {+ string route = 1;+}+message IOError {+ string message = 1;+}+message NewMessageReceived {+ string message = 1;+}+message ResponseGenerated {+ string response = 1;+}+message GoodBye {+ string message = 1;+}+message MessageStored {+ string message = 1;+}+message ConversationClosed {+ string user_id = 1;+ string user_message = 2;+}+message Shutdown {+ string message = 1;+}diff --git a/dotnet/src/Microsoft.AutoGen/Core.Grpc/GrpcAgentRuntime.cs b/dotnet/src/Microsoft.AutoGen/Core.Grpc/GrpcAgentRuntime.csindex f3dc619fd..324874a00 100644--- a/dotnet/src/Microsoft.AutoGen/Core.Grpc/GrpcAgentRuntime.cs+++ b/dotnet/src/Microsoft.AutoGen/Core.Grpc/GrpcAgentRuntime.cs@@ -155,6 +155,7 @@ public sealed class GrpcAgentRuntime : IHostedService, IAgentRuntime, IMessageSivar messageContext = new MessageContext(request.RequestId, cancellationToken){+Sender = request.Source?.FromProtobuf() ?? null,Topic = null,IsRpc = true@@ -275,6 +276,7 @@ public sealed class GrpcAgentRuntime : IHostedService, IAgentRuntime, IMessageSivar request = new RpcRequest{RequestId = Guid.NewGuid().ToString(),+Source = sender?.ToProtobuf() ?? null,Target = recepient.ToProtobuf(),Payload = payload,diff --git a/dotnet/src/Microsoft.AutoGen/Core/AgentRuntimeExtensions.cs b/dotnet/src/Microsoft.AutoGen/Core/AgentRuntimeExtensions.csindex fd7a479ad..dfda55295 100644--- a/dotnet/src/Microsoft.AutoGen/Core/AgentRuntimeExtensions.cs+++ b/dotnet/src/Microsoft.AutoGen/Core/AgentRuntimeExtensions.cs@@ -62,7 +62,7 @@ public static class AgentRuntimeExtensionsvar classSubscriptions = runtimeType.GetCustomAttributes<TypeSubscriptionAttribute>().Select(t => t.Bind(agentType));subscriptions.AddRange(classSubscriptions);- var prefixSubscriptions = runtimeType.GetCustomAttributes<TopicPrefixSubscriptionAttribute>().Select(t => t.Bind(agentType));+ var prefixSubscriptions = runtimeType.GetCustomAttributes<TypePrefixSubscriptionAttribute>().Select(t => t.Bind(agentType));subscriptions.AddRange(prefixSubscriptions);}diff --git a/dotnet/src/Microsoft.AutoGen/Core/TypePrefixSubscriptionAttribute.cs b/dotnet/src/Microsoft.AutoGen/Core/TypePrefixSubscriptionAttribute.csindex 57105c8b9..be48ab8b1 100644--- a/dotnet/src/Microsoft.AutoGen/Core/TypePrefixSubscriptionAttribute.cs+++ b/dotnet/src/Microsoft.AutoGen/Core/TypePrefixSubscriptionAttribute.cs@@ -6,7 +6,7 @@ using Microsoft.AutoGen.Contracts;namespace Microsoft.AutoGen.Core;[AttributeUsage(AttributeTargets.All)]-public class TopicPrefixSubscriptionAttribute(string topic) : Attribute, IUnboundSubscriptionDefinition+public class TypePrefixSubscriptionAttribute(string topic) : Attribute, IUnboundSubscriptionDefinition{public string Topic { get; } = topic;diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IAgentGrain.cs b/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IAgentGrain.csdeleted file mode 100644index 947b6b0cb..000000000--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IAgentGrain.cs+++ /dev/null@@ -1,10 +0,0 @@-// Copyright (c) Microsoft Corporation. All rights reserved.-// IAgentGrain.cs--namespace Microsoft.AutoGen.Runtime.Grpc.Abstractions;--internal interface IAgentGrain : IGrainWithStringKey-{- ValueTask<Contracts.AgentState> ReadStateAsync();- ValueTask<string> WriteStateAsync(Contracts.AgentState state, string eTag);-}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Grpc/GrpcGatewayService.cs b/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Grpc/GrpcGatewayService.csdeleted file mode 100644index 948192294..000000000--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Grpc/GrpcGatewayService.cs+++ /dev/null@@ -1,61 +0,0 @@-// Copyright (c) Microsoft Corporation. All rights reserved.-// GrpcGatewayService.cs--using Grpc.Core;-using Microsoft.AutoGen.Contracts;--namespace Microsoft.AutoGen.Runtime.Grpc;--// gRPC service which handles communication between the agent worker and the cluster.-public sealed class GrpcGatewayService(GrpcGateway gateway) : AgentRpc.AgentRpcBase-{- private readonly GrpcGateway Gateway = (GrpcGateway)gateway;-- public override async Task OpenChannel(IAsyncStreamReader<Message> requestStream, IServerStreamWriter<Message> responseStream, ServerCallContext context)- {- try- {- await Gateway.ConnectToWorkerProcess(requestStream, responseStream, context).ConfigureAwait(true);- }- catch- {- if (context.CancellationToken.IsCancellationRequested)- {- return;- }- throw;- }- }- public override async Task<GetStateResponse> GetState(AgentId request, ServerCallContext context)- {- var state = await Gateway.ReadAsync(request);- return new GetStateResponse { AgentState = state };- }- public override async Task<SaveStateResponse> SaveState(AgentState request, ServerCallContext context)- {- await Gateway.StoreAsync(request);- return new SaveStateResponse- {- Success = true // TODO: Implement error handling- };- }- public override async Task<AddSubscriptionResponse> AddSubscription(AddSubscriptionRequest request, ServerCallContext context)- {- request.RequestId = context.Peer;- return await Gateway.SubscribeAsync(request).ConfigureAwait(true);- }- public override async Task<RemoveSubscriptionResponse> RemoveSubscription(RemoveSubscriptionRequest request, ServerCallContext context)- {- return await Gateway.UnsubscribeAsync(request).ConfigureAwait(true);- }- public override async Task<GetSubscriptionsResponse> GetSubscriptions(GetSubscriptionsRequest request, ServerCallContext context)- {- var subscriptions = await Gateway.GetSubscriptionsAsync(request);- return new GetSubscriptionsResponse { Subscriptions = { subscriptions } };- }- public override async Task<RegisterAgentTypeResponse> RegisterAgent(RegisterAgentTypeRequest request, ServerCallContext context)- {- request.RequestId = context.Peer;- return await Gateway.RegisterAgentTypeAsync(request).ConfigureAwait(true);- }-}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/AgentStateGrain.cs b/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/AgentStateGrain.csdeleted file mode 100644index 97869cd91..000000000--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/AgentStateGrain.cs+++ /dev/null@@ -1,46 +0,0 @@-// Copyright (c) Microsoft Corporation. All rights reserved.-// AgentStateGrain.cs--using Microsoft.AutoGen.Runtime.Grpc.Abstractions;--namespace Microsoft.AutoGen.Runtime.Grpc;--internal sealed class AgentStateGrain([PersistentState("state", "AgentStateStore")] IPersistentState<AgentState> state) : Grain, IAgentState, IAgentGrain-{- /// <inheritdoc />- public async ValueTask<string> WriteStateAsync(AgentState newState, string eTag, CancellationToken cancellationToken = default)- {- // etags for optimistic concurrency control- // if the Etag is null, its a new state- // if the passed etag is null or empty, we should not check the current state's Etag - caller doesnt care- // if both etags are set, they should match or it means that the state has changed since the last read.- if ((string.IsNullOrEmpty(state.Etag)) || (string.IsNullOrEmpty(eTag)) || (string.Equals(state.Etag, eTag, StringComparison.Ordinal)))- {- state.State = newState;- await state.WriteStateAsync().ConfigureAwait(false);- }- else- {- //TODO - this is probably not the correct behavior to just throw - I presume we want to somehow let the caller know that the state has changed and they need to re-read it- throw new ArgumentException(- "The provided ETag does not match the current ETag. The state has been modified by another request.");- }- return state.Etag;- }-- /// <inheritdoc />- public ValueTask<AgentState> ReadStateAsync(CancellationToken cancellationToken = default)- {- return ValueTask.FromResult(state.State);- }-- ValueTask<AgentState> IAgentGrain.ReadStateAsync()- {- return ReadStateAsync();- }-- ValueTask<string> IAgentGrain.WriteStateAsync(AgentState state, string eTag)- {- return WriteStateAsync(state, eTag);- }-}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/ISubscriptionsGrain.cs b/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/ISubscriptionsGrain.csdeleted file mode 100644index 60c17b7c6..000000000--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/ISubscriptionsGrain.cs+++ /dev/null@@ -1,10 +0,0 @@-// Copyright (c) Microsoft Corporation. All rights reserved.-// ISubscriptionsGrain.cs--namespace Microsoft.AutoGen.Runtime.Grpc;-public interface ISubscriptionsGrain : IGrainWithIntegerKey-{- ValueTask SubscribeAsync(string agentType, string topic);- ValueTask UnsubscribeAsync(string agentType, string topic);- ValueTask<Dictionary<string, List<string>>> GetSubscriptions(string agentType);-}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/SubscriptionsGrain.cs b/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/SubscriptionsGrain.csdeleted file mode 100644index 632cc7cef..000000000--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/SubscriptionsGrain.cs+++ /dev/null@@ -1,50 +0,0 @@-// Copyright (c) Microsoft Corporation. All rights reserved.-// SubscriptionsGrain.cs--namespace Microsoft.AutoGen.Runtime.Grpc;--internal sealed class SubscriptionsGrain([PersistentState("state", "PubSubStore")] IPersistentState<SubscriptionsState> state) : Grain, ISubscriptionsGrain-{- private readonly Dictionary<string, List<string>> _subscriptions = new();- public ValueTask<Dictionary<string, List<string>>> GetSubscriptions(string? agentType = null)- {- //if agentType is null, return all subscriptions else filter on agentType- if (agentType != null)- {- return new ValueTask<Dictionary<string, List<string>>>(_subscriptions.Where(x => x.Value.Contains(agentType)).ToDictionary(x => x.Key, x => x.Value));- }- return new ValueTask<Dictionary<string, List<string>>>(_subscriptions);- }- public async ValueTask SubscribeAsync(string agentType, string topic)- {- if (!_subscriptions.TryGetValue(topic, out var subscriptions))- {- subscriptions = _subscriptions[topic] = [];- }- if (!subscriptions.Contains(agentType))- {- subscriptions.Add(agentType);- }- _subscriptions[topic] = subscriptions;- state.State.Subscriptions = _subscriptions;- await state.WriteStateAsync().ConfigureAwait(false);- }- public async ValueTask UnsubscribeAsync(string agentType, string topic)- {- if (!_subscriptions.TryGetValue(topic, out var subscriptions))- {- subscriptions = _subscriptions[topic] = [];- }- if (!subscriptions.Contains(agentType))- {- subscriptions.Remove(agentType);- }- _subscriptions[topic] = subscriptions;- state.State.Subscriptions = _subscriptions;- await state.WriteStateAsync();- }-}-public sealed class SubscriptionsState-{- public Dictionary<string, List<string>> Subscriptions { get; set; } = new();-}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AgentStateSurrogate.cs b/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AgentStateSurrogate.csdeleted file mode 100644index a5291f942..000000000--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AgentStateSurrogate.cs+++ /dev/null@@ -1,55 +0,0 @@-// Copyright (c) Microsoft Corporation. All rights reserved.-// AgentStateSurrogate.cs--using Google.Protobuf;-using Microsoft.AutoGen.Contracts;--namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;--[GenerateSerializer]-public struct AgentStateSurrogate-{- [Id(0)]- public string Id;- [Id(1)]- public string TextData;- [Id(2)]- public ByteString BinaryData;- [Id(3)]- public AgentId AgentId;- [Id(4)]- public string Etag;- [Id(5)]- public ByteString ProtoData;-}--[RegisterConverter]-public sealed class AgentStateSurrogateConverter :- IConverter<AgentState, AgentStateSurrogate>-{- public AgentState ConvertFromSurrogate(- in AgentStateSurrogate surrogate)- {- var agentState = new AgentState- {- AgentId = surrogate.AgentId,- BinaryData = surrogate.BinaryData,- TextData = surrogate.TextData,- ETag = surrogate.Etag- };- //agentState.ProtoData = surrogate.ProtoData;- return agentState;- }-- public AgentStateSurrogate ConvertToSurrogate(- in AgentState value) =>- new AgentStateSurrogate- {- AgentId = value.AgentId,- BinaryData = value.BinaryData,- TextData = value.TextData,- Etag = value.ETag,- //ProtoData = value.ProtoData.Value- };-}-diff --git a/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/AgentsRegistryState.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/AgentsRegistryState.csnew file mode 100644index 000000000..2baa70b33--- /dev/null+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/AgentsRegistryState.cs@@ -0,0 +1,15 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// AgentsRegistryState.cs+using System.Collections.Concurrent;+using Microsoft.AutoGen.Protobuf;++namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Abstractions;+public class AgentsRegistryState+{+ public ConcurrentDictionary<string, HashSet<string>> AgentsToTopicsMap { get; set; } = [];+ public ConcurrentDictionary<string, HashSet<string>> AgentsToTopicsPrefixMap { get; set; } = [];+ public ConcurrentDictionary<string, HashSet<string>> TopicToAgentTypesMap { get; set; } = [];+ public ConcurrentDictionary<string, HashSet<string>> TopicPrefixToAgentTypesMap { get; set; } = [];+ public ConcurrentDictionary<string, HashSet<Subscription>> GuidSubscriptionsMap { get; set; } = [];+ public string Etag { get; set; } = Guid.NewGuid().ToString();+}diff --git a/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IConnection.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IConnection.csnew file mode 100644index 000000000..a5044ff69--- /dev/null+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IConnection.cs@@ -0,0 +1,7 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// IConnection.cs++namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Abstractions;+public interface IConnection+{+}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IGateway.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IGateway.cssimilarity index 58%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IGateway.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IGateway.csindex 33bb94f7c..b8aeae041 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IGateway.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IGateway.cs@@ -1,18 +1,15 @@// Copyright (c) Microsoft Corporation. All rights reserved.// IGateway.cs-using Microsoft.AutoGen.Contracts;+using Grpc.Core;+using Microsoft.AutoGen.Protobuf;-namespace Microsoft.AutoGen.Runtime.Grpc.Abstractions;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Abstractions;public interface IGateway : IGrainObserver{ValueTask<RpcResponse> InvokeRequestAsync(RpcRequest request);- ValueTask BroadcastEventAsync(CloudEvent evt);- ValueTask StoreAsync(Contracts.AgentState value);- ValueTask<Contracts.AgentState> ReadAsync(AgentId agentId);- ValueTask<RegisterAgentTypeResponse> RegisterAgentTypeAsync(RegisterAgentTypeRequest request);+ ValueTask<RegisterAgentTypeResponse> RegisterAgentTypeAsync(RegisterAgentTypeRequest request, ServerCallContext context);ValueTask<AddSubscriptionResponse> SubscribeAsync(AddSubscriptionRequest request);ValueTask<RemoveSubscriptionResponse> UnsubscribeAsync(RemoveSubscriptionRequest request);ValueTask<List<Subscription>> GetSubscriptionsAsync(GetSubscriptionsRequest request);- Task SendMessageAsync(IConnection connection, CloudEvent cloudEvent);}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IGatewayRegistry.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IGatewayRegistry.cssimilarity index 93%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IGatewayRegistry.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IGatewayRegistry.csindex cb3778418..3d47696da 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IGatewayRegistry.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IGatewayRegistry.cs@@ -1,9 +1,8 @@// Copyright (c) Microsoft Corporation. All rights reserved.// IGatewayRegistry.cs+using Microsoft.AutoGen.Protobuf;-using Microsoft.AutoGen.Contracts;--namespace Microsoft.AutoGen.Runtime.Grpc.Abstractions;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Abstractions;/// <summary>/// Interface for managing agent registration, placement, and subscriptions.@@ -30,7 +29,7 @@ public interface IGatewayRegistry : IRegistry/// <param name="request">The request containing agent type details.</param>/// <param name="worker">The worker to register the agent type with.</param>/// <returns>A task representing the asynchronous operation.</returns>- ValueTask RegisterAgentTypeAsync(RegisterAgentTypeRequest request, IGateway worker);+ ValueTask RegisterAgentTypeAsync(RegisterAgentTypeRequest request, string clientId, IGateway worker);/// <summary>/// Adds a new worker to the registry.diff --git a/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IRegistry.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IRegistry.csnew file mode 100644index 000000000..215ace6e5--- /dev/null+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IRegistry.cs@@ -0,0 +1,38 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// IRegistry.cs+using Microsoft.AutoGen.Protobuf;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Abstractions;++public interface IRegistry+{++ /// <summary>+ /// Gets a list of agents subscribed to and handling the specified topic and event type.+ /// </summary>+ /// <param name="topic">The topic to check subscriptions for.</param>+ /// <param name="key">The event type to check subscriptions for.</param>+ /// <returns>A task representing the asynchronous operation, with the list of agent IDs as the result.</returns>+ ValueTask<List<string>> GetSubscribedAndHandlingAgentsAsync(string topic, string key);++ /// <summary>+ /// Subscribes an agent to a topic.+ /// </summary>+ /// <param name="request">The subscription request.</param>+ /// <returns>A task representing the asynchronous operation.</returns>+ /// <remarks>removing CancellationToken from here as it is not compatible with Orleans Serialization</remarks>+ ValueTask SubscribeAsync(AddSubscriptionRequest request);++ /// <summary>+ /// Unsubscribes an agent from a topic.+ /// </summary>+ /// <param name="request">The unsubscription request.</param>+ /// <returns>A task representing the asynchronous operation.</returns>+ /// <remarks>removing CancellationToken from here as it is not compatible with Orleans Serialization</remarks>+ ValueTask UnsubscribeAsync(RemoveSubscriptionRequest request); // TODO: This should have its own request type.++ /// <summary>+ /// Gets the subscriptions for a specified agent type.+ /// </summary>+ /// <returns>A task representing the asynchronous operation, with the subscriptions as the result.</returns>+ ValueTask<List<Subscription>> GetSubscriptionsAsync(GetSubscriptionsRequest request);+}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IRegistryGrain.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IRegistryGrain.cssimilarity index 63%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IRegistryGrain.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IRegistryGrain.csindex 81b598586..a44da1ce5 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Abstractions/IRegistryGrain.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Abstractions/IRegistryGrain.cs@@ -1,11 +1,11 @@// Copyright (c) Microsoft Corporation. All rights reserved.// IRegistryGrain.cs-namespace Microsoft.AutoGen.Runtime.Grpc.Abstractions;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Abstractions;/// <summary>/// Orleans specific interface, needed to mark the key/// </summary>-[Alias("Microsoft.AutoGen.Runtime.Grpc.Abstractions.IRegistryGrain")]+[Alias("Microsoft.AutoGen.RuntimeGateway.Grpc.Abstractions.IRegistryGrain")]public interface IRegistryGrain : IGatewayRegistry, IGrainWithIntegerKey{ }diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Microsoft.AutoGen.Runtime.Grpc.csproj b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Microsoft.AutoGen.RuntimeGateway.Grpc.csprojsimilarity index 84%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Microsoft.AutoGen.Runtime.Grpc.csprojrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Microsoft.AutoGen.RuntimeGateway.Grpc.csprojindex b874a657d..f9a568e89 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Microsoft.AutoGen.Runtime.Grpc.csproj+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Microsoft.AutoGen.RuntimeGateway.Grpc.csproj@@ -7,6 +7,7 @@<ItemGroup><ProjectReference Include="..\Contracts\Microsoft.AutoGen.Contracts.csproj" /><ProjectReference Include="..\Core\Microsoft.AutoGen.Core.csproj" />+ <ProjectReference Include="..\Core.Grpc\Microsoft.AutoGen.Core.Grpc.csproj" /></ItemGroup><ItemGroup><PackageReference Include="Microsoft.Orleans.Reminders" />@@ -29,4 +30,9 @@<PackageReference Include="Microsoft.Orleans.Streaming.EventHubs" /><PackageReference Include="OrleansDashboard" /></ItemGroup>+ <ItemGroup>+ <PackageReference Include="Grpc.AspNetCore" />+ <PackageReference Include="Grpc.Net.ClientFactory" />+ <PackageReference Include="Grpc.Tools" PrivateAssets="All" />+ </ItemGroup></Project>\ No newline at end of filediff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/AgentWorkerHostingExtensions.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/AgentWorkerHostingExtensions.cssimilarity index 79%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/AgentWorkerHostingExtensions.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/AgentWorkerHostingExtensions.csindex 3b130ca4b..37b9e1f1b 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/AgentWorkerHostingExtensions.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/AgentWorkerHostingExtensions.cs@@ -3,12 +3,11 @@using System.Diagnostics;using Microsoft.AspNetCore.Builder;-using Microsoft.AutoGen.Core;using Microsoft.Extensions.DependencyInjection;using Microsoft.Extensions.DependencyInjection.Extensions;using Microsoft.Extensions.Hosting;-namespace Microsoft.AutoGen.Runtime.Grpc;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc;public static class AgentWorkerHostingExtensions{public static WebApplicationBuilder AddAgentService(this WebApplicationBuilder builder)@@ -18,10 +17,6 @@ public static class AgentWorkerHostingExtensionsbuilder.Services.TryAddSingleton(DistributedContextPropagator.Current);builder.Services.AddGrpc();- builder.Services.AddKeyedSingleton("AgentsMetadata", (sp, key) =>- {- return ReflectionHelper.GetAgentsMetadata(AppDomain.CurrentDomain.GetAssemblies());- });builder.Services.AddSingleton<GrpcGateway>();builder.Services.AddSingleton<IHostedService>(sp => (IHostedService)sp.GetRequiredService<GrpcGateway>());diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Grpc/GrpcGateway.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Grpc/GrpcGateway.cssimilarity index 58%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Grpc/GrpcGateway.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Grpc/GrpcGateway.csindex 26c99c894..e657ac36f 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Grpc/GrpcGateway.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Grpc/GrpcGateway.cs@@ -4,46 +4,81 @@using System.Collections.Concurrent;using Grpc.Core;using Microsoft.AutoGen.Contracts;-using Microsoft.AutoGen.Runtime.Grpc.Abstractions;+using Microsoft.AutoGen.Protobuf;+using Microsoft.AutoGen.RuntimeGateway.Grpc.Abstractions;using Microsoft.Extensions.Hosting;using Microsoft.Extensions.Logging;-namespace Microsoft.AutoGen.Runtime.Grpc;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc;+/// <summary>+/// Represents the gRPC gateway service that handles communication between the agent worker and the cluster.+/// </summary>public sealed class GrpcGateway : BackgroundService, IGateway{private static readonly TimeSpan s_agentResponseTimeout = TimeSpan.FromSeconds(30);private readonly ILogger<GrpcGateway> _logger;private readonly IClusterClient _clusterClient;- //private readonly ConcurrentDictionary<string, AgentState> _agentState = new();private readonly IRegistryGrain _gatewayRegistry;private readonly IGateway _reference;- // The agents supported by each worker process.private readonly ConcurrentDictionary<string, List<GrpcWorkerConnection>> _supportedAgentTypes = [];- public readonly ConcurrentDictionary<IConnection, IConnection> _workers = new();- internal readonly ConcurrentDictionary<string, GrpcWorkerConnection> _workersByConnection = new();- private readonly ConcurrentDictionary<string, Subscription> _subscriptionsByAgentType = new();- private readonly ConcurrentDictionary<string, List<string>> _subscriptionsByTopic = new();- private readonly ISubscriptionsGrain _subscriptions;-- // The mapping from agent id to worker process.+ public readonly ConcurrentDictionary<string, GrpcWorkerConnection> _workers = new();private readonly ConcurrentDictionary<(string Type, string Key), GrpcWorkerConnection> _agentDirectory = new();- // RPCprivate readonly ConcurrentDictionary<(GrpcWorkerConnection, string), TaskCompletionSource<RpcResponse>> _pendingRequests = new();++ /// <summary>+ /// Initializes a new instance of the <see cref="GrpcGateway"/> class.+ /// </summary>+ /// <param name="clusterClient">The cluster client.</param>+ /// <param name="logger">The logger.</param>public GrpcGateway(IClusterClient clusterClient, ILogger<GrpcGateway> logger){_logger = logger;_clusterClient = clusterClient;_reference = clusterClient.CreateObjectReference<IGateway>(this);_gatewayRegistry = clusterClient.GetGrain<IRegistryGrain>(0);- _subscriptions = clusterClient.GetGrain<ISubscriptionsGrain>(0);}++ /// <summary>+ /// Executes the background service.+ /// </summary>+ /// <param name="stoppingToken">The cancellation token.</param>+ /// <returns>A task that represents the asynchronous operation.</returns>+ protected override async Task ExecuteAsync(CancellationToken stoppingToken)+ {+ while (!stoppingToken.IsCancellationRequested)+ {+ try+ {+ await _gatewayRegistry.AddWorkerAsync(_reference);+ }+ catch (Exception exception)+ {+ _logger.LogWarning(exception, "Error adding worker to registry.");+ }+ await Task.Delay(TimeSpan.FromSeconds(15), stoppingToken);+ }+ try+ {+ await _gatewayRegistry.RemoveWorkerAsync(_reference);+ }+ catch (Exception exception)+ {+ _logger.LogWarning(exception, "Error removing worker from registry.");+ }+ }++ /// <summary>+ /// Invokes a request asynchronously.+ /// </summary>+ /// <param name="request">The RPC request.</param>+ /// <param name="cancellationToken">The cancellation token.</param>+ /// <returns>A task that represents the asynchronous operation. The task result contains the RPC response.</returns>public async ValueTask<RpcResponse> InvokeRequestAsync(RpcRequest request, CancellationToken cancellationToken = default){var agentId = (request.Target.Type, request.Target.Key);if (!_agentDirectory.TryGetValue(agentId, out var connection) || connection.Completion.IsCompleted == true){- // Activate the agent on a compatible worker process.if (_supportedAgentTypes.TryGetValue(request.Target.Type, out var workers)){connection = workers[Random.Shared.Next(workers.Count)];@@ -54,109 +89,143 @@ public sealed class GrpcGateway : BackgroundService, IGatewayreturn new(new RpcResponse { Error = "Agent not found." });}}- // Proxy the request to the agent.var originalRequestId = request.RequestId;var newRequestId = Guid.NewGuid().ToString();var completion = _pendingRequests[(connection, newRequestId)] = new(TaskCreationOptions.RunContinuationsAsynchronously);request.RequestId = newRequestId;await connection.ResponseStream.WriteAsync(new Message { Request = request }, cancellationToken).ConfigureAwait(false);- // Wait for the response and send it back to the caller.var response = await completion.Task.WaitAsync(s_agentResponseTimeout);response.RequestId = originalRequestId;return response;}- public async ValueTask StoreAsync(AgentState value, CancellationToken cancellationToken = default)- {- _ = value.AgentId ?? throw new ArgumentNullException(nameof(value.AgentId));- var agentState = _clusterClient.GetGrain<IAgentGrain>($"{value.AgentId.Type}:{value.AgentId.Key}");- await agentState.WriteStateAsync(value, value.ETag);- }- public async ValueTask<AgentState> ReadAsync(AgentId agentId, CancellationToken cancellationToken = default)- {- var agentState = _clusterClient.GetGrain<IAgentGrain>($"{agentId.Type}:{agentId.Key}");- return await agentState.ReadStateAsync();- }- public async ValueTask<RegisterAgentTypeResponse> RegisterAgentTypeAsync(RegisterAgentTypeRequest request, CancellationToken cancellationToken = default)++ /// <summary>+ /// Registers an agent type asynchronously.+ /// </summary>+ /// <param name="request">The register agent type request.</param>+ /// <param name="context">The server call context.</param>+ /// <param name="cancellationToken">The cancellation token.</param>+ /// <returns>A task that represents the asynchronous operation. The task result contains the register agent type response.</returns>+ public async ValueTask<RegisterAgentTypeResponse> RegisterAgentTypeAsync(RegisterAgentTypeRequest request, ServerCallContext context, CancellationToken cancellationToken = default){try{- var connection = _workersByConnection[request.RequestId];+ var clientId = context.RequestHeaders.Get("client-id")?.Value ??+ throw new RpcException(new Status(StatusCode.InvalidArgument, "Grpc Client ID is required."));+ if (!_workers.TryGetValue(clientId, out var connection))+ {+ throw new RpcException(new Status(StatusCode.InvalidArgument, $"Grpc Worker Connection not found for ClientId {clientId}."));+ }connection.AddSupportedType(request.Type);_supportedAgentTypes.GetOrAdd(request.Type, _ => []).Add(connection);- await _gatewayRegistry.RegisterAgentTypeAsync(request, _reference).ConfigureAwait(true);- return new RegisterAgentTypeResponse- {- Success = true,- RequestId = request.RequestId- };+ await _gatewayRegistry.RegisterAgentTypeAsync(request, clientId, _reference).ConfigureAwait(true);+ return new RegisterAgentTypeResponse { };}catch (Exception ex){- return new RegisterAgentTypeResponse- {- Success = false,- RequestId = request.RequestId,- Error = ex.Message- };+ throw new RpcException(new Status(StatusCode.Internal, ex.Message));}}++ /// <summary>+ /// Subscribes to a topic asynchronously.+ /// </summary>+ /// <param name="request">The add subscription request.</param>+ /// <param name="cancellationToken">The cancellation token.</param>+ /// <returns>A task that represents the asynchronous operation. The task result contains the add subscription response.</returns>public async ValueTask<AddSubscriptionResponse> SubscribeAsync(AddSubscriptionRequest request, CancellationToken cancellationToken = default){try{await _gatewayRegistry.SubscribeAsync(request).ConfigureAwait(true);- return new AddSubscriptionResponse- {- Success = true,- RequestId = request.RequestId- };+ return new AddSubscriptionResponse { };}catch (Exception ex){- return new AddSubscriptionResponse- {- Success = false,- RequestId = request.RequestId,- Error = ex.Message- };+ throw new RpcException(new Status(StatusCode.Internal, ex.Message));}}- protected override async Task ExecuteAsync(CancellationToken stoppingToken)++ /// <summary>+ /// Unsubscribes from a topic asynchronously.+ /// </summary>+ /// <param name="request">The remove subscription request.</param>+ /// <param name="cancellationToken">The cancellation token.</param>+ /// <returns>A task that represents the asynchronous operation. The task result contains the remove subscription response.</returns>+ public async ValueTask<RemoveSubscriptionResponse> UnsubscribeAsync(RemoveSubscriptionRequest request, CancellationToken cancellationToken = default){- while (!stoppingToken.IsCancellationRequested)- {- try- {- await _gatewayRegistry.AddWorkerAsync(_reference);- }- catch (Exception exception)- {- _logger.LogWarning(exception, "Error adding worker to registry.");- }- await Task.Delay(TimeSpan.FromSeconds(15), stoppingToken);- }try{- await _gatewayRegistry.RemoveWorkerAsync(_reference);+ await _gatewayRegistry.UnsubscribeAsync(request).ConfigureAwait(true);+ return new RemoveSubscriptionResponse { };}- catch (Exception exception)+ catch (Exception ex){- _logger.LogWarning(exception, "Error removing worker from registry.");+ throw new RpcException(new Status(StatusCode.Internal, ex.Message));}}++ /// <summary>+ /// Gets the subscriptions asynchronously.+ /// </summary>+ /// <param name="request">The get subscriptions request.</param>+ /// <param name="cancellationToken">The cancellation token.</param>+ /// <returns>A task that represents the asynchronous operation. The task result contains the list of subscriptions.</returns>+ public ValueTask<List<Subscription>> GetSubscriptionsAsync(GetSubscriptionsRequest request, CancellationToken cancellationToken = default)+ {+ return _gatewayRegistry.GetSubscriptionsAsync(request);+ }++ async ValueTask<RpcResponse> IGateway.InvokeRequestAsync(RpcRequest request)+ {+ return await InvokeRequestAsync(request, default).ConfigureAwait(false);+ }++ ValueTask<RegisterAgentTypeResponse> IGateway.RegisterAgentTypeAsync(RegisterAgentTypeRequest request, ServerCallContext context)+ {+ return RegisterAgentTypeAsync(request, context, default);+ }++ ValueTask<AddSubscriptionResponse> IGateway.SubscribeAsync(AddSubscriptionRequest request)+ {+ return SubscribeAsync(request, default);+ }++ ValueTask<RemoveSubscriptionResponse> IGateway.UnsubscribeAsync(RemoveSubscriptionRequest request)+ {+ return UnsubscribeAsync(request, default);+ }++ ValueTask<List<Subscription>> IGateway.GetSubscriptionsAsync(GetSubscriptionsRequest request)+ {+ return GetSubscriptionsAsync(request);+ }++ /// <summary>+ /// Connects to a worker process.+ /// </summary>+ /// <param name="requestStream">The request stream.</param>+ /// <param name="responseStream">The response stream.</param>+ /// <param name="context">The server call context.</param>+ /// <returns>A task that represents the asynchronous operation.</returns>internal async Task ConnectToWorkerProcess(IAsyncStreamReader<Message> requestStream, IServerStreamWriter<Message> responseStream, ServerCallContext context){_logger.LogInformation("Received new connection from {Peer}.", context.Peer);+ var clientId = (context.RequestHeaders.Get("client-id")?.Value) ??+ throw new RpcException(new Status(StatusCode.InvalidArgument, "Client ID is required."));var workerProcess = new GrpcWorkerConnection(this, requestStream, responseStream, context);- _workers.GetOrAdd(workerProcess, workerProcess);- _workersByConnection.GetOrAdd(context.Peer, workerProcess);+ _workers.GetOrAdd(clientId, workerProcess);await workerProcess.Connect().ConfigureAwait(false);}- internal async Task SendMessageAsync(GrpcWorkerConnection connection, CloudEvent cloudEvent, CancellationToken cancellationToken = default)- {- await connection.ResponseStream.WriteAsync(new Message { CloudEvent = cloudEvent }, cancellationToken).ConfigureAwait(false);- }++ /// <summary>+ /// Handles received messages from a worker connection.+ /// </summary>+ /// <param name="connection">The worker connection.</param>+ /// <param name="message">The received message.</param>+ /// <param name="cancellationToken">The cancellation token.</param>+ /// <returns>A task that represents the asynchronous operation.</returns>internal async Task OnReceivedMessageAsync(GrpcWorkerConnection connection, Message message, CancellationToken cancellationToken = default){_logger.LogInformation("Received message {Message} from connection {Connection}.", message, connection);@@ -171,18 +240,17 @@ public sealed class GrpcGateway : BackgroundService, IGatewaycase Message.MessageOneofCase.CloudEvent:await DispatchEventAsync(message.CloudEvent, cancellationToken);break;- case Message.MessageOneofCase.RegisterAgentTypeRequest:- await RegisterAgentTypeAsync(connection, message.RegisterAgentTypeRequest);- break;- case Message.MessageOneofCase.AddSubscriptionRequest:- await AddSubscriptionAsync(connection, message.AddSubscriptionRequest);- break;default:- // if it wasn't recognized return bad requestawait RespondBadRequestAsync(connection, $"Unknown message type for message '{message}'.");break;};}++ /// <summary>+ /// Dispatches a response to a pending request.+ /// </summary>+ /// <param name="connection">The worker connection.</param>+ /// <param name="response">The RPC response.</param>private void DispatchResponse(GrpcWorkerConnection connection, RpcResponse response){if (!_pendingRequests.TryRemove((connection, response.RequestId), out var completion))@@ -190,26 +258,15 @@ public sealed class GrpcGateway : BackgroundService, IGateway_logger.LogWarning("Received response for unknown request id: {RequestId}.", response.RequestId);return;}- // Complete the request.completion.SetResult(response);}- private async ValueTask RegisterAgentTypeAsync(GrpcWorkerConnection connection, RegisterAgentTypeRequest msg)- {- connection.AddSupportedType(msg.Type);- _supportedAgentTypes.GetOrAdd(msg.Type, _ => []).Add(connection);- await _gatewayRegistry.RegisterAgentTypeAsync(msg, _reference).ConfigureAwait(true);- Message response = new()- {- RegisterAgentTypeResponse = new()- {- RequestId = msg.RequestId,- Error = "",- Success = true- }- };- await connection.ResponseStream.WriteAsync(response).ConfigureAwait(false);- }+ /// <summary>+ /// Dispatches an event to the appropriate agents.+ /// </summary>+ /// <param name="evt">The cloud event.</param>+ /// <param name="cancellationToken">The cancellation token.</param>+ /// <returns>A task that represents the asynchronous operation.</returns>private async ValueTask DispatchEventAsync(CloudEvent evt, CancellationToken cancellationToken = default){var registry = _clusterClient.GetGrain<IRegistryGrain>(0);@@ -227,7 +284,7 @@ public sealed class GrpcGateway : BackgroundService, IGatewayvar activeConnections = connections.Where(c => c.Completion?.IsCompleted == false).ToList();foreach (var connection in activeConnections){- tasks.Add(this.SendMessageAsync(connection, evt, cancellationToken));+ tasks.Add(this.WriteResponseAsync(connection, evt, cancellationToken));}}}@@ -238,6 +295,13 @@ public sealed class GrpcGateway : BackgroundService, IGateway_logger.LogWarning("No agent types found for event type {EventType}.", evt.Type);}}++ /// <summary>+ /// Dispatches a request to the appropriate agent.+ /// </summary>+ /// <param name="connection">The worker connection.</param>+ /// <param name="request">The RPC request.</param>+ /// <returns>A task that represents the asynchronous operation.</returns>private async ValueTask DispatchRequestAsync(GrpcWorkerConnection connection, RpcRequest request){var requestId = request.RequestId;@@ -260,6 +324,14 @@ public sealed class GrpcGateway : BackgroundService, IGatewayreturn await gateway.InvokeRequestAsync(request).ConfigureAwait(true);}).ConfigureAwait(false);}++ /// <summary>+ /// Invokes a request delegate.+ /// </summary>+ /// <param name="connection">The worker connection.</param>+ /// <param name="request">The RPC request.</param>+ /// <param name="func">The function to invoke.</param>+ /// <returns>A task that represents the asynchronous operation.</returns>private static async Task InvokeRequestDelegate(GrpcWorkerConnection connection, RpcRequest request, Func<RpcRequest, Task<RpcResponse>> func){try@@ -273,9 +345,16 @@ public sealed class GrpcGateway : BackgroundService, IGatewayawait connection.ResponseStream.WriteAsync(new Message { Response = new RpcResponse { RequestId = request.RequestId, Error = ex.Message } }).ConfigureAwait(false);}}++ /// <summary>+ /// Handles the removal of a worker process.+ /// </summary>+ /// <param name="workerProcess">The worker process.</param>internal void OnRemoveWorkerProcess(GrpcWorkerConnection workerProcess){- _workers.TryRemove(workerProcess, out _);+ var clientId = workerProcess.ServerCallContext.RequestHeaders.Get("client-id")?.Value ??+ throw new RpcException(new Status(StatusCode.InvalidArgument, "Grpc Client ID is required."));+ _workers.TryRemove(clientId, out _);var types = workerProcess.GetSupportedTypes();foreach (var type in types){@@ -284,7 +363,6 @@ public sealed class GrpcGateway : BackgroundService, IGatewaysupported.Remove(workerProcess);}}- // Any agents activated on that worker are also gone.foreach (var pair in _agentDirectory){if (pair.Value == workerProcess)@@ -293,39 +371,24 @@ public sealed class GrpcGateway : BackgroundService, IGateway}}}++ /// <summary>+ /// Responds with a bad request error.+ /// </summary>+ /// <param name="connection">The worker connection.</param>+ /// <param name="error">The error message.</param>+ /// <returns>A task that represents the asynchronous operation.</returns>private static async ValueTask RespondBadRequestAsync(GrpcWorkerConnection connection, string error){throw new RpcException(new Status(StatusCode.InvalidArgument, error));}- private async ValueTask AddSubscriptionAsync(GrpcWorkerConnection connection, AddSubscriptionRequest request)- {- var topic = "";- var agentType = "";- if (request.Subscription.TypePrefixSubscription is not null)- {- topic = request.Subscription.TypePrefixSubscription.TopicTypePrefix;- agentType = request.Subscription.TypePrefixSubscription.AgentType;- }- else if (request.Subscription.TypeSubscription is not null)- {- topic = request.Subscription.TypeSubscription.TopicType;- agentType = request.Subscription.TypeSubscription.AgentType;- }- _subscriptionsByAgentType[agentType] = request.Subscription;- _subscriptionsByTopic.GetOrAdd(topic, _ => []).Add(agentType);- await _subscriptions.SubscribeAsync(topic, agentType);- //var response = new SubscriptionResponse { RequestId = request.RequestId, Error = "", Success = true };- Message response = new()- {- AddSubscriptionResponse = new()- {- RequestId = request.RequestId,- Error = "",- Success = true- }- };- await connection.ResponseStream.WriteAsync(response).ConfigureAwait(false);- }++ /// <summary>+ /// Dispatches an event to the specified agent types.+ /// </summary>+ /// <param name="agentTypes">The agent types.</param>+ /// <param name="evt">The cloud event.</param>+ /// <returns>A task that represents the asynchronous operation.</returns>private async ValueTask DispatchEventToAgentsAsync(IEnumerable<string> agentTypes, CloudEvent evt){var tasks = new List<Task>(agentTypes.Count());@@ -335,86 +398,33 @@ public sealed class GrpcGateway : BackgroundService, IGateway{foreach (var connection in connections){- tasks.Add(this.SendMessageAsync(connection, evt));+ tasks.Add(this.WriteResponseAsync(connection, evt));}}}await Task.WhenAll(tasks).ConfigureAwait(false);}- public async ValueTask BroadcastEventAsync(CloudEvent evt, CancellationToken cancellationToken = default)- {- var tasks = new List<Task>(_workers.Count);- foreach (var (_, connection) in _supportedAgentTypes)- {- tasks.Add(this.SendMessageAsync((IConnection)connection[0], evt, default));- }- await Task.WhenAll(tasks).ConfigureAwait(false);- }- Task IGateway.SendMessageAsync(IConnection connection, CloudEvent cloudEvent)- {- return this.SendMessageAsync(connection, cloudEvent, default);- }- public async Task SendMessageAsync(IConnection connection, CloudEvent cloudEvent, CancellationToken cancellationToken = default)+ /// <summary>+ /// Writes a response to a worker connection.+ /// </summary>+ /// <param name="connection">The worker connection.</param>+ /// <param name="cloudEvent">The cloud event.</param>+ /// <param name="cancellationToken">The cancellation token.</param>+ /// <returns>A task that represents the asynchronous operation.</returns>+ private async Task WriteResponseAsync(GrpcWorkerConnection connection, CloudEvent cloudEvent, CancellationToken cancellationToken = default){- var queue = (GrpcWorkerConnection)connection;- await queue.ResponseStream.WriteAsync(new Message { CloudEvent = cloudEvent }, cancellationToken).ConfigureAwait(false);+ await connection.ResponseStream.WriteAsync(new Message { CloudEvent = cloudEvent }, cancellationToken).ConfigureAwait(false);}- public async ValueTask<RemoveSubscriptionResponse> UnsubscribeAsync(RemoveSubscriptionRequest request, CancellationToken cancellationToken = default)- {- try- {- await _gatewayRegistry.UnsubscribeAsync(request).ConfigureAwait(true);- return new RemoveSubscriptionResponse-- {- Success = true,- };- }- catch (Exception ex)- {- return new RemoveSubscriptionResponse- {- Success = false,- Error = ex.Message- };- }- }- public ValueTask<List<Subscription>> GetSubscriptionsAsync(GetSubscriptionsRequest request, CancellationToken cancellationToken = default)- {- return _gatewayRegistry.GetSubscriptionsAsync(request);- }- async ValueTask<RpcResponse> IGateway.InvokeRequestAsync(RpcRequest request)- {- return await InvokeRequestAsync(request, default).ConfigureAwait(false);- }- async ValueTask IGateway.BroadcastEventAsync(CloudEvent evt)- {- await BroadcastEventAsync(evt, default).ConfigureAwait(false);- }- ValueTask IGateway.StoreAsync(AgentState value)- {- return StoreAsync(value, default);- }- ValueTask<AgentState> IGateway.ReadAsync(AgentId agentId)- {- return ReadAsync(agentId, default);- }- ValueTask<RegisterAgentTypeResponse> IGateway.RegisterAgentTypeAsync(RegisterAgentTypeRequest request)- {- return RegisterAgentTypeAsync(request, default);- }- ValueTask<AddSubscriptionResponse> IGateway.SubscribeAsync(AddSubscriptionRequest request)- {- return SubscribeAsync(request, default);- }- ValueTask<RemoveSubscriptionResponse> IGateway.UnsubscribeAsync(RemoveSubscriptionRequest request)- {- return UnsubscribeAsync(request, default);- }- ValueTask<List<Subscription>> IGateway.GetSubscriptionsAsync(GetSubscriptionsRequest request)- {- return GetSubscriptionsAsync(request);+ /// <summary>+ /// Writes a response to a worker connection.+ /// </summary>+ /// <param name="connection">The worker connection.</param>+ /// <param name="cloudEvent">The cloud event.</param>+ /// <returns>A task that represents the asynchronous operation.</returns>+ public async Task WriteResponseAsync(IConnection connection, CloudEvent cloudEvent)+ {+ await WriteResponseAsync((GrpcWorkerConnection)connection, cloudEvent, default).ConfigureAwait(false);}}diff --git a/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Grpc/GrpcGatewayService.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Grpc/GrpcGatewayService.csnew file mode 100644index 000000000..1f04647db--- /dev/null+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Grpc/GrpcGatewayService.cs@@ -0,0 +1,110 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// GrpcGatewayService.cs+using Grpc.Core;+using Microsoft.AutoGen.Protobuf;++namespace Microsoft.AutoGen.RuntimeGateway.Grpc;++/// <summary>+/// Represents the gRPC service which handles communication between the agent worker and the cluster.+/// </summary>+public sealed class GrpcGatewayService(GrpcGateway gateway) : AgentRpc.AgentRpcBase+{+ private readonly GrpcGateway Gateway = (GrpcGateway)gateway;++ /// <summary>+ /// Method run on first connect from a worker process.+ /// </summary>+ /// <param name="requestStream">The request stream.</param>+ /// <param name="responseStream">The response stream.</param>+ /// <param name="context">The server call context.</param>+ /// <returns>A task that represents the asynchronous operation.</returns>+ public override async Task OpenChannel(IAsyncStreamReader<Message> requestStream, IServerStreamWriter<Message> responseStream, ServerCallContext context)+ {+ try+ {+ await Gateway.ConnectToWorkerProcess(requestStream, responseStream, context).ConfigureAwait(true);+ }+ catch+ {+ if (context.CancellationToken.IsCancellationRequested)+ {+ return;+ }+ throw;+ }+ }++ /// <summary>+ /// Adds a subscription.+ /// </summary>+ /// <param name="request">The add subscription request.</param>+ /// <param name="context">The server call context.</param>+ /// <returns>A task that represents the asynchronous operation. The task result contains the add subscription response.</returns>+ public override async Task<AddSubscriptionResponse> AddSubscription(AddSubscriptionRequest request, ServerCallContext context)+ {+ try+ {+ return await Gateway.SubscribeAsync(request).ConfigureAwait(true);+ }+ catch (Exception e)+ {+ throw new RpcException(new Status(StatusCode.Internal, e.Message));+ }+ }++ /// <summary>+ /// Removes a subscription.+ /// </summary>+ /// <param name="request">The remove subscription request.</param>+ /// <param name="context">The server call context.</param>+ /// <returns>A task that represents the asynchronous operation. The task result contains the remove subscription response.</returns>+ public override async Task<RemoveSubscriptionResponse> RemoveSubscription(RemoveSubscriptionRequest request, ServerCallContext context)+ {+ try+ {+ return await Gateway.UnsubscribeAsync(request).ConfigureAwait(true);+ }+ catch (Exception e)+ {+ throw new RpcException(new Status(StatusCode.Internal, e.Message));+ }+ }++ /// <summary>+ /// Gets the subscriptions.+ /// </summary>+ /// <param name="request">The get subscriptions request.</param>+ /// <param name="context">The server call context.</param>+ /// <returns>A task that represents the asynchronous operation. The task result contains the get subscriptions response.</returns>+ public override async Task<GetSubscriptionsResponse> GetSubscriptions(GetSubscriptionsRequest request, ServerCallContext context)+ {+ try+ {+ var subscriptions = await Gateway.GetSubscriptionsAsync(request);+ return new GetSubscriptionsResponse { Subscriptions = { subscriptions } };+ }+ catch (Exception e)+ {+ throw new RpcException(new Status(StatusCode.Internal, e.Message));+ }+ }++ /// <summary>+ /// Registers an agent type (factory)+ /// </summary>+ /// <param name="request">The register agent type request.</param>+ /// <param name="context">The server call context.</param>+ /// <returns>A task that represents the asynchronous operation. The task result contains the register agent type response.</returns>+ public override async Task<RegisterAgentTypeResponse> RegisterAgent(RegisterAgentTypeRequest request, ServerCallContext context)+ {+ try+ {+ return await Gateway.RegisterAgentTypeAsync(request, context).ConfigureAwait(true);+ }+ catch (Exception e)+ {+ throw new RpcException(new Status(StatusCode.Internal, e.Message));+ }+ }+}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Grpc/GrpcWorkerConnection.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Grpc/GrpcWorkerConnection.cssimilarity index 91%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Grpc/GrpcWorkerConnection.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Grpc/GrpcWorkerConnection.csindex cba0f8c47..0cdfc9a28 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Grpc/GrpcWorkerConnection.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Grpc/GrpcWorkerConnection.cs@@ -1,12 +1,13 @@// Copyright (c) Microsoft Corporation. All rights reserved.// GrpcWorkerConnection.cs-using System.Threading.Channels;using Grpc.Core;+using Microsoft.AutoGen.Protobuf;+using Microsoft.AutoGen.RuntimeGateway.Grpc.Abstractions;-namespace Microsoft.AutoGen.Runtime.Grpc;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc;-internal sealed class GrpcWorkerConnection : IAsyncDisposable, IConnection+public sealed class GrpcWorkerConnection : IAsyncDisposable, IConnection{private static long s_nextConnectionId;private Task _readTask = Task.CompletedTask;@@ -102,9 +103,9 @@ internal sealed class GrpcWorkerConnection : IAsyncDisposable, IConnectionawait Task.CompletedTask.ConfigureAwait(ConfigureAwaitOptions.ForceYielding);try{- await foreach (var message in _outboundMessages.Reader.ReadAllAsync(_shutdownCancellationToken.Token))+ await foreach (var message in _outboundMessages.Reader.ReadAllAsync(_shutdownCancellationToken.Token).ConfigureAwait(false)){- await ResponseStream.WriteAsync(message);+ await ResponseStream.WriteAsync(message).ConfigureAwait(false);}}catch (OperationCanceledException)diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/OrleansRuntimeHostingExtenions.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/OrleansRuntimeHostingExtenions.cssimilarity index 98%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/OrleansRuntimeHostingExtenions.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/OrleansRuntimeHostingExtenions.csindex e83db26ad..9abf9ac04 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/OrleansRuntimeHostingExtenions.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/OrleansRuntimeHostingExtenions.cs@@ -9,7 +9,7 @@ using Microsoft.Extensions.Hosting;using Orleans.Configuration;using Orleans.Serialization;-namespace Microsoft.AutoGen.Runtime.Grpc;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc;public static class OrleansRuntimeHostingExtenions{diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/RegistryGrain.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/RegistryGrain.cssimilarity index 75%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/RegistryGrain.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/RegistryGrain.csindex 9de7065fd..522c20614 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/RegistryGrain.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/RegistryGrain.cs@@ -1,9 +1,9 @@// Copyright (c) Microsoft Corporation. All rights reserved.// RegistryGrain.cs-using Microsoft.AutoGen.Contracts;-using Microsoft.AutoGen.Runtime.Grpc.Abstractions;+using Microsoft.AutoGen.Protobuf;+using Microsoft.AutoGen.RuntimeGateway.Grpc.Abstractions;-namespace Microsoft.AutoGen.Runtime.Grpc;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc;internal sealed class RegistryGrain([PersistentState("state", "AgentRegistryStore")] IPersistentState<AgentsRegistryState> state) : Grain, IRegistryGrain{private readonly Dictionary<IGateway, WorkerState> _workerStates = new();@@ -16,7 +16,7 @@ internal sealed class RegistryGrain([PersistentState("state", "AgentRegistryStorthis.RegisterGrainTimer(static state => state.PurgeInactiveWorkers(), this, TimeSpan.FromSeconds(30), TimeSpan.FromSeconds(30));return base.OnActivateAsync(cancellationToken);}- public ValueTask<List<string>> GetSubscribedAndHandlingAgentsAsync(string topic, string eventType)+ public ValueTask<List<string>> GetSubscribedAndHandlingAgentsAsync(string topic, string key){List<string> agents = [];// get all agent types that are subscribed to the topic@@ -29,19 +29,19 @@ internal sealed class RegistryGrain([PersistentState("state", "AgentRegistryStor}*/agents.AddRange(subscribedAgentTypes.ToList());}- if (state.State.TopicToAgentTypesMap.TryGetValue(eventType, out var eventHandlingAgents))+ if (state.State.TopicToAgentTypesMap.TryGetValue(key, out var eventHandlingAgents)){agents.AddRange(eventHandlingAgents.ToList());}- if (state.State.TopicToAgentTypesMap.TryGetValue(topic + "." + eventType, out var combo))+ if (state.State.TopicToAgentTypesMap.TryGetValue(topic + "." + key, out var combo)){agents.AddRange(combo.ToList());}- // instead of an exact match, we can also check for a prefix match where key starts with the eventType- if (state.State.TopicToAgentTypesMap.Keys.Any(key => key.StartsWith(eventType)))+ // instead of an exact match, we can also check for a prefix match from the TopicPrefixToAgentTypesMap+ if (state.State.TopicPrefixToAgentTypesMap.Keys.Any(key => key.StartsWith(topic))){- state.State.TopicToAgentTypesMap.Where(- kvp => kvp.Key.StartsWith(eventType))+ state.State.TopicPrefixToAgentTypesMap.Where(+ kvp => kvp.Key.StartsWith(topic)).SelectMany(kvp => kvp.Value).Distinct().ToList()@@ -51,7 +51,6 @@ internal sealed class RegistryGrain([PersistentState("state", "AgentRegistryStor});}agents = agents.Distinct().ToList();-return new ValueTask<List<string>>(agents);}public ValueTask<(IGateway? Worker, bool NewPlacement)> GetOrPlaceAgent(AgentId agentId)@@ -94,18 +93,8 @@ internal sealed class RegistryGrain([PersistentState("state", "AgentRegistryStor}return ValueTask.CompletedTask;}- public async ValueTask RegisterAgentTypeAsync(RegisterAgentTypeRequest registration, IGateway gateway)+ public async ValueTask RegisterAgentTypeAsync(RegisterAgentTypeRequest registration, string clientId, IGateway gateway){- if (!_supportedAgentTypes.TryGetValue(registration.Type, out var supportedAgentTypes))- {- supportedAgentTypes = _supportedAgentTypes[registration.Type] = [];- }-- if (!supportedAgentTypes.Contains(gateway))- {- supportedAgentTypes.Add(gateway);- }-var workerState = GetOrAddWorker(gateway);workerState.SupportedTypes.Add(registration.Type);@@ -159,9 +148,7 @@ internal sealed class RegistryGrain([PersistentState("state", "AgentRegistryStorworkerState.LastSeen = DateTimeOffset.UtcNow;return workerState;}-public ValueTask<IGateway?> GetCompatibleWorkerAsync(string type) => new(GetCompatibleWorkerCore(type));-private IGateway? GetCompatibleWorkerCore(string type){if (_supportedAgentTypes.TryGetValue(type, out var workers))@@ -178,9 +165,27 @@ internal sealed class RegistryGrain([PersistentState("state", "AgentRegistryStorsubscription.Subscription.Id = guid;switch (subscription.Subscription.SubscriptionCase){- //TODO: this doesnt look rightcase Subscription.SubscriptionOneofCase.TypePrefixSubscription:- break;+ {+ // add the topic to the set of topics for the agent type+ state.State.AgentsToTopicsMap.TryGetValue(subscription.Subscription.TypePrefixSubscription.AgentType, out var topics);+ if (topics is null)+ {+ topics = new HashSet<string>();+ state.State.AgentsToTopicsPrefixMap[subscription.Subscription.TypePrefixSubscription.AgentType] = topics;+ }+ topics.Add(subscription.Subscription.TypePrefixSubscription.TopicTypePrefix);++ // add the agent type to the set of agent types for the topic+ state.State.TopicPrefixToAgentTypesMap.TryGetValue(subscription.Subscription.TypePrefixSubscription.TopicTypePrefix, out var agents);+ if (agents is null)+ {+ agents = new HashSet<string>();+ state.State.TopicPrefixToAgentTypesMap[subscription.Subscription.TypePrefixSubscription.TopicTypePrefix] = agents;+ }+ agents.Add(subscription.Subscription.TypePrefixSubscription.AgentType);+ break;+ }case Subscription.SubscriptionOneofCase.TypeSubscription:{// add the topic to the set of topics for the agent type@@ -200,20 +205,19 @@ internal sealed class RegistryGrain([PersistentState("state", "AgentRegistryStorstate.State.TopicToAgentTypesMap[subscription.Subscription.TypeSubscription.TopicType] = agents;}agents.Add(subscription.Subscription.TypeSubscription.AgentType);-- // add the subscription by Guid- state.State.GuidSubscriptionsMap.TryGetValue(guid, out var existingSubscriptions);- if (existingSubscriptions is null)- {- existingSubscriptions = new HashSet<Subscription>();- state.State.GuidSubscriptionsMap[guid] = existingSubscriptions;- }- existingSubscriptions.Add(subscription.Subscription);break;}default:throw new InvalidOperationException("Invalid subscription type");}+ // add the subscription by Guid+ state.State.GuidSubscriptionsMap.TryGetValue(guid, out var existingSubscriptions);+ if (existingSubscriptions is null)+ {+ existingSubscriptions = new HashSet<Subscription>();+ state.State.GuidSubscriptionsMap[guid] = existingSubscriptions;+ }+ existingSubscriptions.Add(subscription.Subscription);await state.WriteStateAsync().ConfigureAwait(false);}public async ValueTask UnsubscribeAsync(RemoveSubscriptionRequest request)@@ -239,17 +243,25 @@ internal sealed class RegistryGrain([PersistentState("state", "AgentRegistryStor// remove the agent type from the set of agent types for the topicstate.State.TopicToAgentTypesMap.TryGetValue(subscription.TypeSubscription.TopicType, out var agents);agents?.Remove(subscription.TypeSubscription.AgentType);-- //remove the subscription by Guid- state.State.GuidSubscriptionsMap.TryGetValue(guid, out var existingSubscriptions);- existingSubscriptions?.Remove(subscription);break;}case Subscription.SubscriptionOneofCase.TypePrefixSubscription:- break;+ {+ // remove the topic from the set of topics for the agent type+ state.State.AgentsToTopicsPrefixMap.TryGetValue(subscription.TypePrefixSubscription.AgentType, out var topics);+ topics?.Remove(subscription.TypePrefixSubscription.TopicTypePrefix);++ // remove the agent type from the set of agent types for the topic+ state.State.TopicPrefixToAgentTypesMap.TryGetValue(subscription.TypePrefixSubscription.TopicTypePrefix, out var agents);+ agents?.Remove(subscription.TypePrefixSubscription.AgentType);+ break;+ }default:throw new InvalidOperationException("Invalid subscription type");}+ //remove the subscription by Guid+ state.State.GuidSubscriptionsMap.TryGetValue(guid, out var existingSubscriptions);+ existingSubscriptions?.Remove(subscription);}state.State.GuidSubscriptionsMap.Remove(guid, out _);}@@ -265,17 +277,6 @@ internal sealed class RegistryGrain([PersistentState("state", "AgentRegistryStor}return new(subscriptions);}- public ValueTask RegisterAgentTypeAsync(RegisterAgentTypeRequest request, IAgentRuntime worker)- {- var (_, _) = (request, worker);- var e = "RegisterAgentTypeAsync(RegisterAgentTypeRequest request, IAgentRuntime worker) is not implemented when using the Grpc runtime.";- throw new NotImplementedException(e);- }- public ValueTask UnregisterAgentTypeAsync(string type, IAgentRuntime worker)- {- var e = "UnregisterAgentTypeAsync(string type, IAgentRuntime worker) is not implemented when using the Grpc runtime.";- throw new NotImplementedException(e);- }private sealed class WorkerState{public HashSet<string> SupportedTypes { get; set; } = [];diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AddSubscriptionRequestSurrogate.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/AddSubscriptionRequestSurrogate.cssimilarity index 86%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AddSubscriptionRequestSurrogate.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/AddSubscriptionRequestSurrogate.csindex 37e3af1b9..793301cf4 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AddSubscriptionRequestSurrogate.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/AddSubscriptionRequestSurrogate.cs@@ -1,7 +1,8 @@// Copyright (c) Microsoft Corporation. All rights reserved.// AddSubscriptionRequestSurrogate.cs+using Microsoft.AutoGen.Protobuf;-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct AddSubscriptionRequestSurrogate@@ -21,7 +22,6 @@ public sealed class AddSubscriptionRequestSurrogateConverter :{var request = new AddSubscriptionRequest(){- RequestId = surrogate.RequestId,Subscription = surrogate.Subscription};return request;@@ -31,7 +31,6 @@ public sealed class AddSubscriptionRequestSurrogateConverter :in AddSubscriptionRequest value) =>new AddSubscriptionRequestSurrogate{- RequestId = value.RequestId,Subscription = value.Subscription};}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AddSubscriptionResponseSurrogate.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/AddSubscriptionResponseSurrogate.cssimilarity index 61%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AddSubscriptionResponseSurrogate.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/AddSubscriptionResponseSurrogate.csindex 4c15784e0..6a07a114d 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AddSubscriptionResponseSurrogate.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/AddSubscriptionResponseSurrogate.cs@@ -1,7 +1,9 @@// Copyright (c) Microsoft Corporation. All rights reserved.// AddSubscriptionResponseSurrogate.cs-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+using Microsoft.AutoGen.Protobuf;++namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct AddSubscriptionResponseSurrogate@@ -20,20 +22,10 @@ public sealed class AddSubscriptionResponseSurrogateConverter :{public AddSubscriptionResponse ConvertFromSurrogate(in AddSubscriptionResponseSurrogate surrogate) =>- new AddSubscriptionResponse- {- RequestId = surrogate.RequestId,- Success = surrogate.Success,- Error = surrogate.Error- };+ new AddSubscriptionResponse { };public AddSubscriptionResponseSurrogate ConvertToSurrogate(in AddSubscriptionResponse value) =>- new AddSubscriptionResponseSurrogate- {- RequestId = value.RequestId,- Success = value.Success,- Error = value.Error- };+ new AddSubscriptionResponseSurrogate { };}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AgentIdSurrogate.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/AgentIdSurrogate.cssimilarity index 88%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AgentIdSurrogate.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/AgentIdSurrogate.csindex ddef9e997..af7728d12 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/AgentIdSurrogate.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/AgentIdSurrogate.cs@@ -3,9 +3,9 @@// Copyright (c) Microsoft Corporation. All rights reserved.// AgentIdSurrogate.cs-using Microsoft.AutoGen.Contracts;+using Microsoft.AutoGen.Protobuf;-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct AgentIdSurrogatediff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/CloudEventSurrogate.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/CloudEventSurrogate.cssimilarity index 91%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/CloudEventSurrogate.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/CloudEventSurrogate.csindex 22359a089..a69f7cfc8 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/CloudEventSurrogate.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/CloudEventSurrogate.cs@@ -1,10 +1,10 @@// Copyright (c) Microsoft Corporation. All rights reserved.// CloudEventSurrogate.cs-using Google.Protobuf;using Google.Protobuf.WellKnownTypes;+using Microsoft.AutoGen.Contracts;-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;// TODO: Add the rest of the properties[GenerateSerializer]diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/GetSubscriptionsRequest.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/GetSubscriptionsRequest.cssimilarity index 88%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/GetSubscriptionsRequest.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/GetSubscriptionsRequest.csindex ab4722ff8..e53948041 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/GetSubscriptionsRequest.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/GetSubscriptionsRequest.cs@@ -1,7 +1,9 @@// Copyright (c) Microsoft Corporation. All rights reserved.// GetSubscriptionsRequest.cs-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+using Microsoft.AutoGen.Protobuf;++namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct GetSubscriptionsRequestSurrogatediff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeRequestSurrogate.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeRequestSurrogate.cssimilarity index 89%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeRequestSurrogate.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeRequestSurrogate.csindex fa50e597f..9bcba2391 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeRequestSurrogate.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeRequestSurrogate.cs@@ -2,8 +2,9 @@// RegisterAgentTypeRequestSurrogate.csusing Google.Protobuf.Collections;+using Microsoft.AutoGen.Protobuf;-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct RegisterAgentTypeRequestSurrogate@@ -27,7 +28,6 @@ public sealed class RegisterAgentTypeRequestSurrogateConverter :{var request = new RegisterAgentTypeRequest(){- RequestId = surrogate.RequestId,Type = surrogate.Type};/* future@@ -40,7 +40,6 @@ public sealed class RegisterAgentTypeRequestSurrogateConverter :in RegisterAgentTypeRequest value) =>new RegisterAgentTypeRequestSurrogate{- RequestId = value.RequestId,Type = value.Type,/* futureEvents = value.Events,diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeResponseSurrogate.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeResponseSurrogate.cssimilarity index 62%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeResponseSurrogate.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeResponseSurrogate.csindex 2c7d6788a..c91fb3833 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeResponseSurrogate.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RegisterAgentTypeResponseSurrogate.cs@@ -1,7 +1,9 @@// Copyright (c) Microsoft Corporation. All rights reserved.// RegisterAgentTypeResponseSurrogate.cs-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+using Microsoft.AutoGen.Protobuf;++namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct RegisterAgentTypeResponseSurrogate@@ -20,20 +22,10 @@ public sealed class RegisterAgentTypeResponseSurrogateConverter :{public RegisterAgentTypeResponse ConvertFromSurrogate(in RegisterAgentTypeResponseSurrogate surrogate) =>- new RegisterAgentTypeResponse- {- RequestId = surrogate.RequestId,- Success = surrogate.Success,- Error = surrogate.Error- };+ new RegisterAgentTypeResponse { };public RegisterAgentTypeResponseSurrogate ConvertToSurrogate(in RegisterAgentTypeResponse value) =>- new RegisterAgentTypeResponseSurrogate- {- RequestId = value.RequestId,- Success = value.Success,- Error = value.Error- };+ new RegisterAgentTypeResponseSurrogate { };}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionRequest.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionRequest.cssimilarity index 89%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionRequest.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionRequest.csindex 27299728b..9b397c2bb 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionRequest.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionRequest.cs@@ -1,7 +1,8 @@// Copyright (c) Microsoft Corporation. All rights reserved.// RemoveSubscriptionRequest.cs+using Microsoft.AutoGen.Protobuf;-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct RemoveSubscriptionRequestSurrogatediff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionResponse.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionResponse.cssimilarity index 67%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionResponse.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionResponse.csindex 88253c99b..eec771629 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionResponse.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RemoveSubscriptionResponse.cs@@ -1,7 +1,8 @@// Copyright (c) Microsoft Corporation. All rights reserved.// RemoveSubscriptionResponse.cs+using Microsoft.AutoGen.Protobuf;-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct RemoveSubscriptionResponseSurrogate@@ -20,18 +21,10 @@ public sealed class SubscriptionResponseSurrogateConverter :{public RemoveSubscriptionResponse ConvertFromSurrogate(in RemoveSubscriptionResponseSurrogate surrogate) =>- new RemoveSubscriptionResponse- {- Success = surrogate.Success,- Error = surrogate.Error- };+ new RemoveSubscriptionResponse { };public RemoveSubscriptionResponseSurrogate ConvertToSurrogate(in RemoveSubscriptionResponse value) =>- new RemoveSubscriptionResponseSurrogate- {- Success = value.Success,- Error = value.Error- };+ new RemoveSubscriptionResponseSurrogate { };}diff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RpcRequestSurrogate.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RpcRequestSurrogate.cssimilarity index 92%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RpcRequestSurrogate.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RpcRequestSurrogate.csindex 9791a68d7..4b9fdb250 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RpcRequestSurrogate.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RpcRequestSurrogate.cs@@ -2,9 +2,9 @@// RpcRequestSurrogate.csusing Google.Protobuf.Collections;-using Microsoft.AutoGen.Contracts;+using Microsoft.AutoGen.Protobuf;-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct RpcRequestSurrogatediff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RpcResponseSurrogate.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RpcResponseSurrogate.cssimilarity index 91%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RpcResponseSurrogate.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RpcResponseSurrogate.csindex 5c9fac246..999ae2bf6 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/RpcResponseSurrogate.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/RpcResponseSurrogate.cs@@ -1,9 +1,9 @@// Copyright (c) Microsoft Corporation. All rights reserved.// RpcResponseSurrogate.cs-using Google.Protobuf.Collections;+using Microsoft.AutoGen.Protobuf;-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct RpcResponseSurrogatediff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/SubscriptionSurrogate.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/SubscriptionSurrogate.cssimilarity index 92%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/SubscriptionSurrogate.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/SubscriptionSurrogate.csindex 1fd56c176..6942ada72 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/SubscriptionSurrogate.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/SubscriptionSurrogate.cs@@ -1,9 +1,8 @@// Copyright (c) Microsoft Corporation. All rights reserved.// SubscriptionSurrogate.cs+using Microsoft.AutoGen.Protobuf;-using Microsoft.AutoGen.Contracts;--namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct SubscriptionSurrogatediff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/TypePrefixSubscriptionSurrogate.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/TypePrefixSubscriptionSurrogate.cssimilarity index 90%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/TypePrefixSubscriptionSurrogate.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/TypePrefixSubscriptionSurrogate.csindex ca4d72131..c38d84641 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/TypePrefixSubscriptionSurrogate.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/TypePrefixSubscriptionSurrogate.cs@@ -1,9 +1,9 @@// Copyright (c) Microsoft Corporation. All rights reserved.// TypePrefixSubscriptionSurrogate.cs-using Microsoft.AutoGen.Contracts;+using Microsoft.AutoGen.Protobuf;-namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct TypePrefixSubscriptionSurrogatediff --git a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/TypeSubscriptionSurrogate.cs b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/TypeSubscriptionSurrogate.cssimilarity index 89%rename from dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/TypeSubscriptionSurrogate.csrename to dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/TypeSubscriptionSurrogate.csindex 57fa202eb..958c1c4d6 100644--- a/dotnet/src/Microsoft.AutoGen/Runtime.Grpc/Services/Orleans/Surrogates/TypeSubscriptionSurrogate.cs+++ b/dotnet/src/Microsoft.AutoGen/RuntimeGateway.Grpc/Services/Orleans/Surrogates/TypeSubscriptionSurrogate.cs@@ -1,9 +1,8 @@// Copyright (c) Microsoft Corporation. All rights reserved.// TypeSubscriptionSurrogate.cs-using Microsoft.AutoGen.Contracts;--namespace Microsoft.AutoGen.Runtime.Grpc.Orleans.Surrogates;+using Microsoft.AutoGen.Protobuf;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Orleans.Surrogates;[GenerateSerializer]public struct TypeSubscriptionSurrogatediff --git a/dotnet/test/Microsoft.AutoGen.Integration.Tests.AppHosts/HelloAgent.AppHost/HelloAgent.AppHost.csproj b/dotnet/test/Microsoft.AutoGen.Integration.Tests.AppHosts/HelloAgent.AppHost/HelloAgent.AppHost.csprojindex 1442ebe3d..441d48d18 100644--- a/dotnet/test/Microsoft.AutoGen.Integration.Tests.AppHosts/HelloAgent.AppHost/HelloAgent.AppHost.csproj+++ b/dotnet/test/Microsoft.AutoGen.Integration.Tests.AppHosts/HelloAgent.AppHost/HelloAgent.AppHost.csproj@@ -16,6 +16,6 @@</ItemGroup><ItemGroup>- <ProjectReference Include="..\..\..\samples\AgentChat\Hello\HelloAgent\HelloAgent.csproj" />+ <ProjectReference Include="..\..\..\samples\Hello\HelloAgent\HelloAgent.csproj" /></ItemGroup></Project>diff --git a/dotnet/test/Microsoft.AutoGen.Integration.Tests/Microsoft.AutoGen.Integration.Tests.csproj b/dotnet/test/Microsoft.AutoGen.Integration.Tests/Microsoft.AutoGen.Integration.Tests.csprojindex 320aa44de..b3d7cbf87 100644--- a/dotnet/test/Microsoft.AutoGen.Integration.Tests/Microsoft.AutoGen.Integration.Tests.csproj+++ b/dotnet/test/Microsoft.AutoGen.Integration.Tests/Microsoft.AutoGen.Integration.Tests.csproj@@ -28,15 +28,15 @@</ItemGroup><ItemGroup>- <ProjectReference Include="..\..\samples\AgentChat\Hello\Hello.AppHost\Hello.AppHost.csproj" />- <ProjectReference Include="..\..\samples\AgentChat\Hello\HelloAgent\HelloAgent.csproj" />+ <ProjectReference Include="..\..\samples\Hello\Hello.AppHost\Hello.AppHost.csproj" />+ <ProjectReference Include="..\..\samples\Hello\HelloAgent\HelloAgent.csproj" /><ProjectReference Include="..\Microsoft.AutoGen.Integration.Tests.AppHosts\HelloAgent.AppHost\HelloAgent.AppHost.csproj" /></ItemGroup><!-- Properties, Items, and targets to ensure Python apps are initialized --><PropertyGroup><PythonVirtualEnvironmentName>.venv</PythonVirtualEnvironmentName>- <PythonVenvRoot>$(RepoRoot)..\python</PythonVenvRoot>+ <PythonRoot>$(RepoRoot)..\python</PythonRoot></PropertyGroup>@@ -44,10 +44,17 @@<PropertyGroup><VenvDir>$(PythonVenvRoot)\$(PythonVirtualEnvironmentName)\</VenvDir><CreateVenv Condition="!Exists('$(VenvDir)')">True</CreateVenv>+ <Uv>~/.local/bin/uv</Uv>+ <CheckUvPath Condition="!Exists('$(Uv)')">True</CheckUvPath>+ <UvPath Condition="'$(CheckUvPath)' == 'True'">uv</UvPath>+ <UvPath Condition="'$(CheckUvPath)' == 'False'">$(Uv)</UvPath></PropertyGroup><Message Importance="Normal" Text="Initializing virtual environment for $(PythonVenvRoot)" />- <Exec Command="uv sync --all-extras" WorkingDirectory="$(PythonVenvRoot)" Condition=" '$(CreateVenv)' == 'True' " />+ <Exec Command="$(UvPath) sync --all-extras" WorkingDirectory="$(PythonRoot)" Condition=" '$(CreateVenv)' == 'True' " ConsoleToMsBuild="true">+ <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />+ </Exec>+ <!--Message Importance="Normal" Text="$(OutputOfExec)" />--></Target>diff --git a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/GrpcGatewayServiceTests.cs b/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/GrpcGatewayServiceTests.csdeleted file mode 100644index fcae1ec3d..000000000--- a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/GrpcGatewayServiceTests.cs+++ /dev/null@@ -1,187 +0,0 @@-// Copyright (c) Microsoft Corporation. All rights reserved.-// GrpcGatewayServiceTests.cs--using FluentAssertions;-using Microsoft.AutoGen.Contracts;-using Microsoft.AutoGen.Core;-using Microsoft.AutoGen.Runtime.Grpc.Tests.Helpers.Grpc;-using Microsoft.AutoGen.Runtime.Grpc.Tests.Helpers.Orleans;-using Microsoft.Extensions.Logging;-using Moq;-using NewMessageReceived = Tests.Events.NewMessageReceived;--namespace Microsoft.AutoGen.Runtime.Grpc.Tests;-[Collection(ClusterCollection.Name)]-[Trait("Category", "GRPC")]-public class GrpcGatewayServiceTests-{- private readonly ClusterFixture _fixture;-- public GrpcGatewayServiceTests(ClusterFixture fixture)- {- _fixture = fixture;- }- [Fact]- public async Task Test_OpenChannel()- {- var logger = Mock.Of<ILogger<GrpcGateway>>();- var gateway = new GrpcGateway(_fixture.Cluster.Client, logger);- var service = new GrpcGatewayService(gateway);- var client = new TestGrpcClient();-- gateway._workers.Count.Should().Be(0);- var task = OpenChannel(service, client);- gateway._workers.Count.Should().Be(1);- client.Dispose();- await task;- }-- [Fact]- public async Task Test_Message_Exchange_Through_Gateway()- {- var logger = Mock.Of<ILogger<GrpcGateway>>();- var gateway = new GrpcGateway(_fixture.Cluster.Client, logger);- var service = new GrpcGatewayService(gateway);- var client = new TestGrpcClient();- var task = OpenChannel(service: service, client);- await service.RegisterAgent(await CreateRegistrationRequest(service, typeof(PBAgent), client.CallContext.Peer), client.CallContext);- await service.RegisterAgent(await CreateRegistrationRequest(service, typeof(GMAgent), client.CallContext.Peer), client.CallContext);-- var inputEvent = new NewMessageReceived { Message = $"Start-{client.CallContext.Peer}" }.ToCloudEvent("gh-gh-gh", "gh-gh-gh");-- client.AddMessage(new Message { CloudEvent = inputEvent });- var newMessageReceived = await client.ReadNext();- newMessageReceived!.CloudEvent.Type.Should().Be(GetFullName(typeof(NewMessageReceived)));- newMessageReceived.CloudEvent.Source.Should().Be("gh-gh-gh");- var secondMessage = await client.ReadNext();- secondMessage!.CloudEvent.Type.Should().Be(GetFullName(typeof(NewMessageReceived)));-- // Simulate an agent, by publishing a new message in the request stream- var helloEvent = new Hello { Message = $"Hello test-{client.CallContext.Peer}" }.ToCloudEvent("gh-gh-gh", "gh-gh-gh");- client.AddMessage(new Message { CloudEvent = helloEvent });- var helloMessageReceived = await client.ReadNext();- helloMessageReceived!.CloudEvent.Type.Should().Be(GetFullName(typeof(Hello)));- helloMessageReceived.CloudEvent.Source.Should().Be("gh-gh-gh");- client.Dispose();- await task;- }-- [Fact]- public async Task Test_RegisterAgent_Should_Succeed()- {- var logger = Mock.Of<ILogger<GrpcGateway>>();- var gateway = new GrpcGateway(_fixture.Cluster.Client, logger);- var service = new GrpcGatewayService(gateway);- var client = new TestGrpcClient();- var task = OpenChannel(service: service, client);- var response = await service.RegisterAgent(await CreateRegistrationRequest(service, typeof(PBAgent), client.CallContext.Peer), client.CallContext);- response.Success.Should().BeTrue();- client.Dispose();- await task;- }-- [Fact]- public async Task Test_RegisterAgent_Should_Fail_For_Wrong_ConnectionId()- {- var logger = Mock.Of<ILogger<GrpcGateway>>();- var gateway = new GrpcGateway(_fixture.Cluster.Client, logger);- var service = new GrpcGatewayService(gateway);- var client = new TestGrpcClient();- var response = await service.RegisterAgent(await CreateRegistrationRequest(service, typeof(PBAgent), "faulty_connection_id"), client.CallContext);- response.Success.Should().BeFalse();- client.Dispose();- }-- [Fact]- public async Task Test_SaveState()- {- var logger = Mock.Of<ILogger<GrpcGateway>>();- var gateway = new GrpcGateway(_fixture.Cluster.Client, logger);- var service = new GrpcGatewayService(gateway);- var callContext = TestServerCallContext.Create();- var response = await service.SaveState(new AgentState { AgentId = new AgentId { Key = "Test", Type = "test" } }, callContext);- response.Should().NotBeNull();- }-- [Fact]- public async Task Test_GetState()- {- var logger = Mock.Of<ILogger<GrpcGateway>>();- var gateway = new GrpcGateway(_fixture.Cluster.Client, logger);- var service = new GrpcGatewayService(gateway);- var callContext = TestServerCallContext.Create();- var response = await service.GetState(new AgentId { Key = "", Type = "" }, callContext);- response.Should().NotBeNull();- }-- private async Task<RegisterAgentTypeRequest> CreateRegistrationRequest(GrpcGatewayService service, Type type, string requestId)- {- var registration = new RegisterAgentTypeRequest- {- Type = type.Name,- RequestId = requestId- };- var assembly = type.Assembly;- var eventTypes = ReflectionHelper.GetAgentsMetadata(assembly);- var events = eventTypes.GetEventsForAgent(type)?.ToList();- var topics = eventTypes.GetTopicsForAgent(type)?.ToList();- if (events is not null && topics is not null) { events.AddRange(topics); }- var client = new TestGrpcClient();-- if (events != null)- {- foreach (var e in events)- {- var subscriptionRequest = new Message- {- AddSubscriptionRequest = new AddSubscriptionRequest- {- RequestId = Guid.NewGuid().ToString(),- Subscription = new Subscription- {- TypeSubscription = new TypeSubscription- {- AgentType = type.Name,- TopicType = type.Name + "." + e- }- }- }- };- await service.AddSubscription(subscriptionRequest.AddSubscriptionRequest, client.CallContext);- }- }- var topicTypes = type.GetCustomAttributes(typeof(TopicSubscriptionAttribute), true).Cast<TopicSubscriptionAttribute>().Select(t => t.Topic).ToList();- if (topicTypes != null)- {- foreach (var topicType in topicTypes)- {- var subscriptionRequest = new Message- {- AddSubscriptionRequest = new AddSubscriptionRequest- {- RequestId = Guid.NewGuid().ToString(),- Subscription = new Subscription- {- TypeSubscription = new TypeSubscription- {- AgentType = type.Name,- TopicType = topicType- }- }- }- };- await service.AddSubscription(subscriptionRequest.AddSubscriptionRequest, client.CallContext);- }- }- return registration;- }-- private Task OpenChannel(GrpcGatewayService service, TestGrpcClient client)- {- return service.OpenChannel(client.RequestStream, client.ResponseStream, client.CallContext);- }- private string GetFullName(Type type)- {- return ReflectionHelper.GetMessageDescriptor(type)!.FullName;- }-}diff --git a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/TestAgent.cs b/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/TestAgent.csdeleted file mode 100644index e479a2cd7..000000000--- a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/TestAgent.cs+++ /dev/null@@ -1,46 +0,0 @@-// Copyright (c) Microsoft Corporation. All rights reserved.-// TestAgent.cs--using System.Collections.Concurrent;-using Microsoft.AutoGen.Contracts;-using Microsoft.AutoGen.Core;-using Microsoft.Extensions.DependencyInjection;-using Microsoft.Extensions.Logging;--namespace Microsoft.AutoGen.Runtime.Grpc.Tests;--[TopicSubscription("gh-gh-gh")]-public class PBAgent([FromKeyedServices("AgentsMetadata")] AgentsMetadata eventTypes, ILogger<Agent>? logger = null)- : Agent(eventTypes, logger)- , IHandle<NewMessageReceived>- , IHandle<GoodBye>-{- public async Task Handle(NewMessageReceived item, CancellationToken cancellationToken = default)- {- ReceivedMessages[AgentId.Key] = item.Message;- var hello = new Hello { Message = item.Message };- await PublishMessageAsync(hello);- }- public Task Handle(GoodBye item, CancellationToken cancellationToken)- {- _logger.LogInformation($"Received GoodBye message {item.Message}");- return Task.CompletedTask;- }-- public static ConcurrentDictionary<string, object> ReceivedMessages { get; private set; } = new();-}--[TopicSubscription("gh-gh-gh")]-public class GMAgent([FromKeyedServices("AgentsMetadata")] AgentsMetadata eventTypes, ILogger<Agent>? logger = null)- : Agent(eventTypes, logger)- , IHandle<Hello>-{- public async Task Handle(Hello item, CancellationToken cancellationToken)- {- _logger.LogInformation($"Received Hello message {item.Message}");- ReceivedMessages[AgentId.Key] = item.Message;- await PublishMessageAsync(new GoodBye { Message = "" });- }-- public static ConcurrentDictionary<string, object> ReceivedMessages { get; private set; } = new();-}diff --git a/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/GrpcGatewayServiceTests.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/GrpcGatewayServiceTests.csnew file mode 100644index 000000000..e9009c923--- /dev/null+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/GrpcGatewayServiceTests.cs@@ -0,0 +1,241 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// GrpcGatewayServiceTests.cs++using FluentAssertions;+using Microsoft.AutoGen.Contracts;+using Microsoft.AutoGen.Core;+using Microsoft.AutoGen.Protobuf;+using Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.Helpers.Grpc;+using Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.Helpers.Orleans;+using Microsoft.Extensions.Logging;+using Moq;+using NewMessageReceived = Tests.Events.NewMessageReceived;++namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests;+[Collection(ClusterCollection.Name)]+[Trait("Category", "UnitV2")]+public class GrpcGatewayServiceTests+{+ private readonly ClusterFixture _fixture;++ public GrpcGatewayServiceTests(ClusterFixture fixture)+ {+ _fixture = fixture;+ }+ [Fact]+ public async Task Test_OpenChannel()+ {+ var logger = Mock.Of<ILogger<GrpcGateway>>();+ var gateway = new GrpcGateway(_fixture.Cluster.Client, logger);+ var service = new GrpcGatewayService(gateway);+ var client = new TestGrpcClient();++ gateway._workers.Count.Should().Be(0);+ var task = OpenChannel(service, client);+ gateway._workers.Count.Should().Be(1);+ client.Dispose();+ await task;+ }++ [Fact]+ public async Task Test_Message_Exchange_Through_Gateway()+ {+ var logger = Mock.Of<ILogger<GrpcGateway>>();+ var gateway = new GrpcGateway(_fixture.Cluster.Client, logger);+ var service = new GrpcGatewayService(gateway);+ var client = new TestGrpcClient();+ var task = OpenChannel(service: service, client);+ await service.RegisterAgent(await CreateRegistrationRequest(service, typeof(PBAgent)), client.CallContext);+ await service.RegisterAgent(await CreateRegistrationRequest(service, typeof(GMAgent)), client.CallContext);++ //var inputEvent = new NewMessageReceived { Message = $"Start-{client.CallContext.Peer}" }.ToCloudEvent("gh-gh-gh", "gh-gh-gh");+ var newMessage = new NewMessageReceived { Message = $"Start-{client.CallContext.Peer}" };+ var eventType = GetFullName(typeof(NewMessageReceived));+ var inputEvent = CloudEventExtensions.CreateCloudEvent(+ Google.Protobuf.WellKnownTypes.Any.Pack(newMessage),+ new TopicId(eventType, "gh-gh-gh"),+ eventType,+ null,+ Guid.NewGuid().ToString());++ client.AddMessage(new Message { CloudEvent = inputEvent });+ var newMessageReceived = await client.ReadNext();+ newMessageReceived!.CloudEvent.Type.Should().Be(GetFullName(typeof(NewMessageReceived)));+ newMessageReceived.CloudEvent.Source.Should().Be("gh-gh-gh");+ var secondMessage = await client.ReadNext();+ secondMessage!.CloudEvent.Type.Should().Be(GetFullName(typeof(NewMessageReceived)));++ // Simulate an agent, by publishing a new message in the request stream+ //var helloEvent = new Hello { Message = $"Hello test-{client.CallContext.Peer}" }.ToCloudEvent("gh-gh-gh", "gh-gh-gh");+ var hello = new Hello { Message = $"Hello test-{client.CallContext.Peer}" };+ var eventTypeHello = GetFullName(typeof(Hello));+ var helloEvent = CloudEventExtensions.CreateCloudEvent(+ Google.Protobuf.WellKnownTypes.Any.Pack(message: hello),+ new TopicId(eventTypeHello, "gh-gh-gh"),+ eventTypeHello,+ null,+ Guid.NewGuid().ToString()+ );+ client.AddMessage(new Message { CloudEvent = helloEvent });+ var helloMessageReceived = await client.ReadNext();+ helloMessageReceived!.CloudEvent.Type.Should().Be(GetFullName(typeof(Hello)));+ helloMessageReceived.CloudEvent.Source.Should().Be("gh-gh-gh");+ client.Dispose();+ await task;+ }++ [Fact]+ public async Task Test_RegisterAgent_Should_Succeed()+ {+ var logger = Mock.Of<ILogger<GrpcGateway>>();+ var gateway = new GrpcGateway(_fixture.Cluster.Client, logger);+ var service = new GrpcGatewayService(gateway);+ var client = new TestGrpcClient();+ var task = OpenChannel(service: service, client);+ var response = await service.RegisterAgent(await CreateRegistrationRequest(service, typeof(PBAgent)), client.CallContext);+ response.GetType().Should().Be(typeof(RegisterAgentTypeResponse));+ client.Dispose();+ await task;+ }++ private async Task<RegisterAgentTypeRequest> CreateRegistrationRequest(GrpcGatewayService service, Type type)+ {+ var registration = new RegisterAgentTypeRequest+ {+ Type = type.Name,+ };+ var assembly = type.Assembly;+ var eventTypes = ReflectionHelper.GetAgentsMetadata(assembly);+ var events = eventTypes.GetEventsForAgent(type)?.ToList();+ var topics = eventTypes.GetTopicsForAgent(type)?.ToList();+ var topicsPrefix = eventTypes.GetTopicsPrefixForAgent(type)?.ToList();+ if (events is not null && topics is not null) { events.AddRange(topics); }+ var client = new TestGrpcClient();++ if (events != null)+ {+ foreach (var e in events)+ {+ var subscriptionRequest = new AddSubscriptionRequest+ {+ Subscription = new Subscription+ {+ Id = Guid.NewGuid().ToString(),+ TypeSubscription = new Protobuf.TypeSubscription+ {+ AgentType = type.Name,+ TopicType = type.Name + "." + e+ }+ }++ };+ await service.AddSubscription(subscriptionRequest, client.CallContext);+ }+ }+ var topicTypes = type.GetCustomAttributes(typeof(TypeSubscriptionAttribute), true).Cast<TypeSubscriptionAttribute>().Select(t => t.Topic).ToList();+ if (topicTypes != null)+ {+ foreach (var topicType in topicTypes)+ {+ var subscriptionRequest = new AddSubscriptionRequest+ {+ Subscription = new Subscription+ {+ Id = Guid.NewGuid().ToString(),+ TypeSubscription = new Protobuf.TypeSubscription+ {+ AgentType = type.Name,+ TopicType = topicType+ }+ }++ };+ await service.AddSubscription(subscriptionRequest, client.CallContext);+ }+ }+ var topicPrefixTypes = type.GetCustomAttributes(typeof(TypePrefixSubscriptionAttribute), true).Cast<TypePrefixSubscriptionAttribute>().Select(t => t.Topic).ToList();+ if (topicPrefixTypes != null)+ {+ foreach (var topicType in topicPrefixTypes)+ {+ var subscriptionRequest = new AddSubscriptionRequest+ {+ Subscription = new Subscription+ {+ Id = Guid.NewGuid().ToString(),+ TypePrefixSubscription = new Protobuf.TypePrefixSubscription+ {+ AgentType = type.Name,+ TopicTypePrefix = topicType+ }+ }++ };+ await service.AddSubscription(subscriptionRequest, client.CallContext);+ }+ }+ return registration;+ }++ private Task OpenChannel(GrpcGatewayService service, TestGrpcClient client)+ {+ return service.OpenChannel(client.RequestStream, client.ResponseStream, client.CallContext);+ }+ private string GetFullName(Type type)+ {+ return ReflectionHelper.GetMessageDescriptor(type)!.FullName;+ }+ /// duplicate code here because I could not get InternalsVisibleTo to work+ internal static class Constants+ {+ public const string DATA_CONTENT_TYPE_PROTOBUF_VALUE = "application/x-protobuf";+ public const string DATA_CONTENT_TYPE_JSON_VALUE = "application/json";+ public const string DATA_CONTENT_TYPE_TEXT_VALUE = "text/plain";++ public const string DATA_CONTENT_TYPE_ATTR = "datacontenttype";+ public const string DATA_SCHEMA_ATTR = "dataschema";+ public const string AGENT_SENDER_TYPE_ATTR = "agagentsendertype";+ public const string AGENT_SENDER_KEY_ATTR = "agagentsenderkey";++ public const string MESSAGE_KIND_ATTR = "agmsgkind";+ public const string MESSAGE_KIND_VALUE_PUBLISH = "publish";+ public const string MESSAGE_KIND_VALUE_RPC_REQUEST = "rpc_request";+ public const string MESSAGE_KIND_VALUE_RPC_RESPONSE = "rpc_response";+ }+ internal static class CloudEventExtensions+ {+ // Convert an ISubscrptionDefinition to a Protobuf Subscription+ internal static CloudEvent CreateCloudEvent(Google.Protobuf.WellKnownTypes.Any payload, TopicId topic, string dataType, Contracts.AgentId? sender, string messageId)+ {+ var attributes = new Dictionary<string, CloudEvent.Types.CloudEventAttributeValue>+ {+ {+ Constants.DATA_CONTENT_TYPE_ATTR, new CloudEvent.Types.CloudEventAttributeValue { CeString = Constants.DATA_CONTENT_TYPE_PROTOBUF_VALUE }+ },+ {+ Constants.DATA_SCHEMA_ATTR, new CloudEvent.Types.CloudEventAttributeValue { CeString = dataType }+ },+ {+ Constants.MESSAGE_KIND_ATTR, new CloudEvent.Types.CloudEventAttributeValue { CeString = Constants.MESSAGE_KIND_VALUE_PUBLISH }+ }+ };++ if (sender != null)+ {+ var senderNonNull = (Contracts.AgentId)sender;+ attributes.Add(Constants.AGENT_SENDER_TYPE_ATTR, new CloudEvent.Types.CloudEventAttributeValue { CeString = senderNonNull.Type });+ attributes.Add(Constants.AGENT_SENDER_KEY_ATTR, new CloudEvent.Types.CloudEventAttributeValue { CeString = senderNonNull.Key });+ }++ return new CloudEvent+ {+ ProtoData = payload,+ Type = topic.Type,+ Source = topic.Source,+ Id = messageId,+ Attributes = { attributes }+ };++ }+ }+}diff --git a/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/AgentTypes.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/AgentTypes.csnew file mode 100644index 000000000..d8e286b1f--- /dev/null+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/AgentTypes.cs@@ -0,0 +1,18 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// AgentTypes.cs+using Microsoft.AutoGen.Core;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests;+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(BaseAgent))+ && !type.IsAbstract)+ .ToDictionary(type => type.Name, type => type);++ return new AgentTypes(agents);+ }+}diff --git a/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/AgentsMetadata.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/AgentsMetadata.csnew file mode 100644index 000000000..016bfc329--- /dev/null+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/AgentsMetadata.cs@@ -0,0 +1,104 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// AgentsMetadata.cs++using System.Collections.Concurrent;+using Google.Protobuf.Reflection;++namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests;++/// <summary>+/// Represents a collection of event types and their associated metadata.+/// </summary>+public sealed class AgentsMetadata+{+ /// <summary>+ /// Initializes a new instance of the <see cref="AgentsMetadata"/> class.+ /// </summary>+ /// <param name="typeRegistry">The type registry containing protobuf type information.</param>+ /// <param name="types">A dictionary mapping event names to their corresponding types.</param>+ /// <param name="eventsMap">A dictionary mapping types to a set of event names associated with those types.</param>+ /// <param name="topicsMap">A dictionary mapping types to a set of topics associated with those types.</param>+ /// <param name="topicsPrefixMap">A dictionary mapping types to a set of topics associated with those types.</param>+ /// </summary>+ public AgentsMetadata(+ TypeRegistry typeRegistry,+ Dictionary<string, Type> types,+ Dictionary<Type, HashSet<string>> eventsMap,+ Dictionary<Type, HashSet<string>> topicsMap,+ Dictionary<Type, HashSet<string>> topicsPrefixMap)+ {+ TypeRegistry = typeRegistry;+ _types = new(types);+ _eventsMap = new(eventsMap);+ _topicsMap = new(topicsMap);+ _topicsPrefixMap = new(topicsPrefixMap);+ }++ /// <summary>+ /// Gets the type registry containing protobuf type information.+ /// </summary>+ public TypeRegistry TypeRegistry { get; }++ private ConcurrentDictionary<string, Type> _types;++ private ConcurrentDictionary<Type, HashSet<string>> _eventsMap;+ private ConcurrentDictionary<Type, HashSet<string>> _topicsMap;+ private ConcurrentDictionary<Type, HashSet<string>> _topicsPrefixMap;++ /// <summary>+ /// Checks if a given type handles a specific event name.+ /// </summary>+ /// <param name="type">The type to check.</param>+ /// <param name="eventName">The event name to check.</param>+ /// <returns><c>true</c> if the type handles the event name; otherwise, <c>false</c>.</returns>+ public bool CheckIfTypeHandles(Type type, string eventName)+ {+ if (_eventsMap.TryGetValue(type, out var events))+ {+ return events.Contains(eventName);+ }+ return false;+ }++ /// <summary>+ /// Gets the event type by its name.+ /// </summary>+ /// <param name="type">The name of the event type.</param>+ /// <returns>The event type if found; otherwise, <c>null</c>.</returns>+ public Type? GetEventTypeByName(string type)+ {+ if (_types.TryGetValue(type, out var eventType))+ {+ return eventType;+ }+ return null;+ }++ public HashSet<string>? GetEventsForAgent(Type agent)+ {+ if (_eventsMap.TryGetValue(agent, out var events))+ {+ return events;+ }+ return null;+ }++ public HashSet<string>? GetTopicsForAgent(Type agent)+ {+ if (_topicsMap.TryGetValue(agent, out var topics))+ {+ return topics;+ }+ return null;+ }++ public HashSet<string>? GetTopicsPrefixForAgent(Type type)+ {+ if (_topicsPrefixMap.TryGetValue(type, out var topics))+ {+ return topics;+ }+ return null;+ }+}+diff --git a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestAsyncStreamReader.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestAsyncStreamReader.cssimilarity index 96%rename from dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestAsyncStreamReader.csrename to dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestAsyncStreamReader.csindex 4f26711d1..a0708a13b 100644--- a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestAsyncStreamReader.cs+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestAsyncStreamReader.cs@@ -16,7 +16,7 @@using System.Threading.Channels;using Grpc.Core;-namespace Microsoft.AutoGen.Runtime.Grpc.Tests.Helpers.Grpc;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.Helpers.Grpc;public class TestAsyncStreamReader<T> : IDisposable, IAsyncStreamReader<T>where T : classdiff --git a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestGrpcClient.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestGrpcClient.cssimilarity index 91%rename from dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestGrpcClient.csrename to dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestGrpcClient.csindex e47f26eda..8c325678c 100644--- a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestGrpcClient.cs+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestGrpcClient.cs@@ -1,15 +1,12 @@// Copyright (c) Microsoft Corporation. All rights reserved.// TestGrpcClient.cs--using Microsoft.AutoGen.Contracts;--namespace Microsoft.AutoGen.Runtime.Grpc.Tests.Helpers.Grpc;+using Microsoft.AutoGen.Protobuf;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.Helpers.Grpc;internal sealed class TestGrpcClient : IDisposable{public TestAsyncStreamReader<Message> RequestStream { get; }public TestServerStreamWriter<Message> ResponseStream { get; }public TestServerCallContext CallContext { get; }-private CancellationTokenSource CallContextCancellation = new();public TestGrpcClient(){@@ -28,7 +25,6 @@ internal sealed class TestGrpcClient : IDisposable{RequestStream.AddMessage(message);}-public void Dispose(){CallContextCancellation.Cancel();@@ -36,3 +32,4 @@ internal sealed class TestGrpcClient : IDisposableResponseStream.Dispose();}}+diff --git a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestServerCallContext.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestServerCallContext.cssimilarity index 94%rename from dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestServerCallContext.csrename to dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestServerCallContext.csindex 47f251556..491eb112b 100644--- a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestServerCallContext.cs+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestServerCallContext.cs@@ -15,7 +15,7 @@using Grpc.Core;-namespace Microsoft.AutoGen.Runtime.Grpc.Tests.Helpers.Grpc;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.Helpers.Grpc;public class TestServerCallContext : ServerCallContext{@@ -68,6 +68,7 @@ public class TestServerCallContext : ServerCallContextpublic static TestServerCallContext Create(Metadata? requestHeaders = null, CancellationToken cancellationToken = default){+ requestHeaders ??= new Metadata() { { "client-id", Guid.NewGuid().ToString() } };return new TestServerCallContext(requestHeaders ?? new Metadata(), cancellationToken);}}diff --git a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestServerStreamWriter.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestServerStreamWriter.cssimilarity index 97%rename from dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestServerStreamWriter.csrename to dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestServerStreamWriter.csindex ca2aeab2e..92074b2fa 100644--- a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Grpc/TestServerStreamWriter.cs+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Grpc/TestServerStreamWriter.cs@@ -16,7 +16,7 @@using System.Threading.Channels;using Grpc.Core;-namespace Microsoft.AutoGen.Runtime.Grpc.Tests.Helpers.Grpc;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.Helpers.Grpc;public class TestServerStreamWriter<T> : IDisposable, IServerStreamWriter<T> where T : class{diff --git a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Orleans/ClusterCollection.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Orleans/ClusterCollection.cssimilarity index 78%rename from dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Orleans/ClusterCollection.csrename to dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Orleans/ClusterCollection.csindex d61dc7b21..e391a47f3 100644--- a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Orleans/ClusterCollection.cs+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Orleans/ClusterCollection.cs@@ -1,7 +1,7 @@// Copyright (c) Microsoft Corporation. All rights reserved.// ClusterCollection.cs-namespace Microsoft.AutoGen.Runtime.Grpc.Tests.Helpers.Orleans;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.Helpers.Orleans;[CollectionDefinition(Name)]public sealed class ClusterCollection : ICollectionFixture<ClusterFixture>diff --git a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Orleans/ClusterFixture.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Orleans/ClusterFixture.cssimilarity index 87%rename from dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Orleans/ClusterFixture.csrename to dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Orleans/ClusterFixture.csindex 9db2f7f65..cb1320a25 100644--- a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Orleans/ClusterFixture.cs+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Orleans/ClusterFixture.cs@@ -3,7 +3,7 @@using Orleans.TestingHost;-namespace Microsoft.AutoGen.Runtime.Grpc.Tests.Helpers.Orleans;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.Helpers.Orleans;public sealed class ClusterFixture : IDisposable{diff --git a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Orleans/SiloBuilderConfigurator.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Orleans/SiloBuilderConfigurator.cssimilarity index 89%rename from dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Orleans/SiloBuilderConfigurator.csrename to dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Orleans/SiloBuilderConfigurator.csindex bb960f7b1..731ab8369 100644--- a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Helpers/Orleans/SiloBuilderConfigurator.cs+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/Orleans/SiloBuilderConfigurator.cs@@ -4,7 +4,7 @@using Orleans.Serialization;using Orleans.TestingHost;-namespace Microsoft.AutoGen.Runtime.Grpc.Tests.Helpers.Orleans;+namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.Helpers.Orleans;public class SiloBuilderConfigurator : ISiloConfigurator{diff --git a/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/ReflectionHelper.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/ReflectionHelper.csnew file mode 100644index 000000000..12e9b799b--- /dev/null+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Helpers/ReflectionHelper.cs@@ -0,0 +1,70 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// ReflectionHelper.cs+using System.Reflection;+using Google.Protobuf;+using Google.Protobuf.Reflection;+using Microsoft.AutoGen.Contracts;+using Microsoft.AutoGen.Core;++namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests;+public sealed class ReflectionHelper+{+ public static bool IsSubclassOfGeneric(Type type, Type genericBaseType)+ {+ while (type != null && type != typeof(object))+ {+ if (genericBaseType == (type.IsGenericType ? type.GetGenericTypeDefinition() : type))+ {+ return true;+ }+ if (type.BaseType == null)+ {+ return false;+ }+ type = type.BaseType;+ }+ return false;+ }+ public static AgentsMetadata GetAgentsMetadata(params Assembly[] assemblies)+ {+ var interfaceType = typeof(IMessage);+ var pairs = assemblies+ .SelectMany(assembly => assembly.GetTypes())+ .Where(type => interfaceType.IsAssignableFrom(type) && type.IsClass && !type.IsAbstract)+ .Select(t => (t, GetMessageDescriptor(t)));++ var descriptors = pairs.Select(t => t.Item2);+ var typeRegistry = TypeRegistry.FromMessages(descriptors);+ var types = pairs.ToDictionary(item => item.Item2?.FullName ?? "", item => item.t);++ var eventsMap = assemblies+ .SelectMany(assembly => assembly.GetTypes())+ .Where(type => IsSubclassOfGeneric(type, typeof(BaseAgent)) && !type.IsAbstract)+ .Select(t => (t, t.GetInterfaces()+ .Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IHandle<>))+ .Select(i => GetMessageDescriptor(i.GetGenericArguments().First())?.FullName ?? "").ToHashSet()))+ .ToDictionary(item => item.t, item => item.Item2);+ var topicsMap = assemblies+ .SelectMany(assembly => assembly.GetTypes())+ .Where(type => IsSubclassOfGeneric(type, typeof(BaseAgent)) && !type.IsAbstract)+ .Select(t => (t, t.GetCustomAttributes<TypeSubscriptionAttribute>().Select(a => a.Topic).ToHashSet()))+ .ToDictionary(item => item.t, item => item.Item2);+ var topicsPrefixMap = assemblies+ .SelectMany(assembly => assembly.GetTypes())+ .Where(type => IsSubclassOfGeneric(type, typeof(BaseAgent)) && !type.IsAbstract)+ .Select(t => (t, t.GetCustomAttributes<TypePrefixSubscriptionAttribute>().Select(a => a.Topic).ToHashSet()))+ .ToDictionary(item => item.t, item => item.Item2);+ return new AgentsMetadata(typeRegistry, types, eventsMap, topicsMap, topicsPrefixMap);+ }++ /// <summary>+ /// Gets the message descriptor for the specified type.+ /// </summary>+ /// <param name="type">The type to get the message descriptor for.</param>+ /// <returns>The message descriptor if found; otherwise, <c>null</c>.</returns>+ public static MessageDescriptor? GetMessageDescriptor(Type type)+ {+ var property = type.GetProperty("Descriptor", BindingFlags.Static | BindingFlags.Public);+ return property?.GetValue(null) as MessageDescriptor;+ }+}diff --git a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Microsoft.AutoGen.Runtime.Grpc.Tests.csproj b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.csprojsimilarity index 74%rename from dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Microsoft.AutoGen.Runtime.Grpc.Tests.csprojrename to dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.csprojindex c8b00ee26..066a49c2d 100644--- a/dotnet/test/Microsoft.AutoGen.Runtime.Grpc.Tests/Microsoft.AutoGen.Runtime.Grpc.Tests.csproj+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests.csproj@@ -8,17 +8,13 @@</PropertyGroup><ItemGroup>- <PackageReference Include="coverlet.collector">- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>- <PrivateAssets>all</PrivateAssets>- </PackageReference><PackageReference Include="Microsoft.AspNetCore.TestHost" /><PackageReference Include="Microsoft.Orleans.TestingHost" /></ItemGroup><ItemGroup><ProjectReference Include="..\..\src\Microsoft.AutoGen\Core\Microsoft.AutoGen.Core.csproj" />- <ProjectReference Include="..\..\src\Microsoft.AutoGen\Runtime.Grpc\Microsoft.AutoGen.Runtime.Grpc.csproj" />+ <ProjectReference Include="..\..\src\Microsoft.AutoGen\RuntimeGateway.Grpc\Microsoft.AutoGen.RuntimeGateway.Grpc.csproj" /><ProjectReference Include="..\Microsoft.AutoGen.Tests.Shared\Microsoft.AutoGen.Tests.Shared.csproj" /></ItemGroup>diff --git a/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/TestAgent.cs b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/TestAgent.csnew file mode 100644index 000000000..493b03704--- /dev/null+++ b/dotnet/test/Microsoft.AutoGen.RuntimeGateway.Grpc.Tests/TestAgent.cs@@ -0,0 +1,45 @@+// Copyright (c) Microsoft Corporation. All rights reserved.+// TestAgent.cs+using System.Collections.Concurrent;+using Microsoft.AutoGen.Contracts;+using Microsoft.AutoGen.Core;+using Microsoft.AutoGen.Protobuf;+using Microsoft.Extensions.Logging;++namespace Microsoft.AutoGen.RuntimeGateway.Grpc.Tests;++[TypeSubscription("gh-gh-gh")]+public class PBAgent(Contracts.AgentId id, IAgentRuntime runtime, ILogger<BaseAgent>? logger = null)+ : BaseAgent(id, runtime, "Test Agent", logger),+ IHandle<NewMessageReceived>,+ IHandle<GoodBye>+{+ public async ValueTask HandleAsync(NewMessageReceived item, MessageContext messageContext)+ {+ var key = messageContext.MessageId ?? Guid.NewGuid().ToString();+ ReceivedMessages.AddOrUpdate(key, item.Message, (k, v) => item.Message);+ var hello = new Hello { Message = item.Message };+ var typeFullName = typeof(Hello).FullName ?? throw new InvalidOperationException("Type full name is null");+ await PublishMessageAsync(hello, new TopicId(typeFullName), "gh-gh-gh");+ }+ public async ValueTask HandleAsync(GoodBye item, MessageContext context)+ {+ _logger.LogInformation($"Received GoodBye message {item.Message}");+ }+ public static ConcurrentDictionary<string, object> ReceivedMessages { get; private set; } = new();+}++[TypeSubscription("gh-gh-gh")]+public class GMAgent(Contracts.AgentId id, IAgentRuntime runtime, ILogger<BaseAgent>? logger = null)+ : BaseAgent(id, runtime, "Test Agent", logger),+ IHandle<Hello>+{+ public async ValueTask HandleAsync(Hello item, MessageContext messageContext)+ {+ var key = messageContext.MessageId ?? Guid.NewGuid().ToString();+ ReceivedMessages.AddOrUpdate(key, item.Message, (k, v) => item.Message);+ var typeFullName = typeof(GoodBye).FullName ?? throw new InvalidOperationException("Type full name is null");+ await PublishMessageAsync(new GoodBye { Message = "" }, new TopicId(typeFullName, "gh-gh-gh"));+ }+ public static ConcurrentDictionary<string, object> ReceivedMessages { get; private set; } = new();+}diff --git a/python/pyproject.toml b/python/pyproject.tomlindex 29cf8f963..832f7518a 100644--- a/python/pyproject.toml+++ b/python/pyproject.toml@@ -103,7 +103,7 @@ gen-proto = []-gen-proto-samples = "python -m grpc_tools.protoc --python_out=./samples/core_xlang_hello_python_agent/protos --grpc_python_out=./samples/core_xlang_hello_python_agent/protos --mypy_out=./samples/core_xlang_hello_python_agent/protos --mypy_grpc_out=./samples/core_xlang_hello_python_agent/protos --proto_path ../protos/ agent_events.proto"+gen-proto-samples = "python -m grpc_tools.protoc --python_out=./samples/core_xlang_hello_python_agent/protos --grpc_python_out=./samples/core_xlang_hello_python_agent/protos --mypy_out=./samples/core_xlang_hello_python_agent/protos --mypy_grpc_out=./samples/core_xlang_hello_python_agent/protos --proto_path ../dotnet/src/Microsoft.AutoGen/Agents/protos/ agent_events.proto"[[tool.poe.tasks.gen-test-proto.sequence]]cmd = "python -m grpc_tools.protoc --python_out=./packages/autogen-core/tests/protos --grpc_python_out=./packages/autogen-core/tests/protos --mypy_out=./packages/autogen-core/tests/protos --mypy_grpc_out=./packages/autogen-core/tests/protos --proto_path ./packages/autogen-core/tests/protos serialization_test.proto"diff --git a/python/samples/core_xlang_hello_python_agent/protos/agent_events_pb2.py b/python/samples/core_xlang_hello_python_agent/protos/agent_events_pb2.pyindex fdd428049..4d65bcefd 100644--- a/python/samples/core_xlang_hello_python_agent/protos/agent_events_pb2.py+++ b/python/samples/core_xlang_hello_python_agent/protos/agent_events_pb2.py@@ -24,14 +24,14 @@ _sym_db = _symbol_database.Default()-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12\x61gent_events.proto\x12\x06\x61gents\"2\n\x0bTextMessage\x12\x13\n\x0btextMessage\x18\x01 \x01(\t\x12\x0e\n\x06source\x18\x02 \x01(\t\"\x18\n\x05Input\x12\x0f\n\x07message\x18\x01 \x01(\t\"\x1f\n\x0eInputProcessed\x12\r\n\x05route\x18\x01 \x01(\t\"\x19\n\x06Output\x12\x0f\n\x07message\x18\x01 \x01(\t\"\x1e\n\rOutputWritten\x12\r\n\x05route\x18\x01 \x01(\t\"\x1a\n\x07IOError\x12\x0f\n\x07message\x18\x01 \x01(\t\"%\n\x12NewMessageReceived\x12\x0f\n\x07message\x18\x01 \x01(\t\"%\n\x11ResponseGenerated\x12\x10\n\x08response\x18\x01 \x01(\t\"\x1a\n\x07GoodBye\x12\x0f\n\x07message\x18\x01 \x01(\t\" \n\rMessageStored\x12\x0f\n\x07message\x18\x01 \x01(\t\";\n\x12\x43onversationClosed\x12\x0f\n\x07user_id\x18\x01 \x01(\t\x12\x14\n\x0cuser_message\x18\x02 \x01(\t\"\x1b\n\x08Shutdown\x12\x0f\n\x07message\x18\x01 \x01(\tB\x1e\xaa\x02\x1bMicrosoft.AutoGen.Contractsb\x06proto3')+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x12\x61gent_events.proto\x12\x06\x61gents\"2\n\x0bTextMessage\x12\x13\n\x0btextMessage\x18\x01 \x01(\t\x12\x0e\n\x06source\x18\x02 \x01(\t\"\x18\n\x05Input\x12\x0f\n\x07message\x18\x01 \x01(\t\"\x1f\n\x0eInputProcessed\x12\r\n\x05route\x18\x01 \x01(\t\"\x19\n\x06Output\x12\x0f\n\x07message\x18\x01 \x01(\t\"\x1e\n\rOutputWritten\x12\r\n\x05route\x18\x01 \x01(\t\"\x1a\n\x07IOError\x12\x0f\n\x07message\x18\x01 \x01(\t\"%\n\x12NewMessageReceived\x12\x0f\n\x07message\x18\x01 \x01(\t\"%\n\x11ResponseGenerated\x12\x10\n\x08response\x18\x01 \x01(\t\"\x1a\n\x07GoodBye\x12\x0f\n\x07message\x18\x01 \x01(\t\" \n\rMessageStored\x12\x0f\n\x07message\x18\x01 \x01(\t\";\n\x12\x43onversationClosed\x12\x0f\n\x07user_id\x18\x01 \x01(\t\x12\x14\n\x0cuser_message\x18\x02 \x01(\t\"\x1b\n\x08Shutdown\x12\x0f\n\x07message\x18\x01 \x01(\tB\x1b\xaa\x02\x18Microsoft.AutoGen.Agentsb\x06proto3')_globals = globals()_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'agent_events_pb2', _globals)if not _descriptor._USE_C_DESCRIPTORS:_globals['DESCRIPTOR']._loaded_options = None- _globals['DESCRIPTOR']._serialized_options = b'\252\002\033Microsoft.AutoGen.Contracts'+ _globals['DESCRIPTOR']._serialized_options = b'\252\002\030Microsoft.AutoGen.Agents'_globals['_TEXTMESSAGE']._serialized_start=30_globals['_TEXTMESSAGE']._serialized_end=80_globals['_INPUT']._serialized_start=82diff --git a/python/uv.lock b/python/uv.lockindex dbe382896..eab21f4ab 100644--- a/python/uv.lock+++ b/python/uv.lock@@ -4308,7 +4308,6 @@ name = "nvidia-cublas-cu12"version = "12.4.5.8"source = { registry = "https://pypi.org/simple" }wheels = [- { url = "https://files.pythonhosted.org/packages/7f/7f/7fbae15a3982dc9595e49ce0f19332423b260045d0a6afe93cdbe2f1f624/nvidia_cublas_cu12-12.4.5.8-py3-none-manylinux2014_aarch64.whl", hash = "sha256:0f8aa1706812e00b9f19dfe0cdb3999b092ccb8ca168c0db5b8ea712456fd9b3", size = 363333771 },{ url = "https://files.pythonhosted.org/packages/ae/71/1c91302526c45ab494c23f61c7a84aa568b8c1f9d196efa5993957faf906/nvidia_cublas_cu12-12.4.5.8-py3-none-manylinux2014_x86_64.whl", hash = "sha256:2fc8da60df463fdefa81e323eef2e36489e1c94335b5358bcb38360adf75ac9b", size = 363438805 },]@@ -4317,7 +4316,6 @@ name = "nvidia-cuda-cupti-cu12"version = "12.4.127"source = { registry = "https://pypi.org/simple" }wheels = [- { url = "https://files.pythonhosted.org/packages/93/b5/9fb3d00386d3361b03874246190dfec7b206fd74e6e287b26a8fcb359d95/nvidia_cuda_cupti_cu12-12.4.127-py3-none-manylinux2014_aarch64.whl", hash = "sha256:79279b35cf6f91da114182a5ce1864997fd52294a87a16179ce275773799458a", size = 12354556 },{ url = "https://files.pythonhosted.org/packages/67/42/f4f60238e8194a3106d06a058d494b18e006c10bb2b915655bd9f6ea4cb1/nvidia_cuda_cupti_cu12-12.4.127-py3-none-manylinux2014_x86_64.whl", hash = "sha256:9dec60f5ac126f7bb551c055072b69d85392b13311fcc1bcda2202d172df30fb", size = 13813957 },]@@ -4326,7 +4324,6 @@ name = "nvidia-cuda-nvrtc-cu12"version = "12.4.127"source = { registry = "https://pypi.org/simple" }wheels = [- { url = "https://files.pythonhosted.org/packages/77/aa/083b01c427e963ad0b314040565ea396f914349914c298556484f799e61b/nvidia_cuda_nvrtc_cu12-12.4.127-py3-none-manylinux2014_aarch64.whl", hash = "sha256:0eedf14185e04b76aa05b1fea04133e59f465b6f960c0cbf4e37c3cb6b0ea198", size = 24133372 },{ url = "https://files.pythonhosted.org/packages/2c/14/91ae57cd4db3f9ef7aa99f4019cfa8d54cb4caa7e00975df6467e9725a9f/nvidia_cuda_nvrtc_cu12-12.4.127-py3-none-manylinux2014_x86_64.whl", hash = "sha256:a178759ebb095827bd30ef56598ec182b85547f1508941a3d560eb7ea1fbf338", size = 24640306 },]@@ -4335,7 +4332,6 @@ name = "nvidia-cuda-runtime-cu12"version = "12.4.127"source = { registry = "https://pypi.org/simple" }wheels = [- { url = "https://files.pythonhosted.org/packages/a1/aa/b656d755f474e2084971e9a297def515938d56b466ab39624012070cb773/nvidia_cuda_runtime_cu12-12.4.127-py3-none-manylinux2014_aarch64.whl", hash = "sha256:961fe0e2e716a2a1d967aab7caee97512f71767f852f67432d572e36cb3a11f3", size = 894177 },{ url = "https://files.pythonhosted.org/packages/ea/27/1795d86fe88ef397885f2e580ac37628ed058a92ed2c39dc8eac3adf0619/nvidia_cuda_runtime_cu12-12.4.127-py3-none-manylinux2014_x86_64.whl", hash = "sha256:64403288fa2136ee8e467cdc9c9427e0434110899d07c779f25b5c068934faa5", size = 883737 },]@@ -4358,7 +4354,6 @@ dependencies = [{ name = "nvidia-nvjitlink-cu12", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },]wheels = [- { url = "https://files.pythonhosted.org/packages/7a/8a/0e728f749baca3fbeffad762738276e5df60851958be7783af121a7221e7/nvidia_cufft_cu12-11.2.1.3-py3-none-manylinux2014_aarch64.whl", hash = "sha256:5dad8008fc7f92f5ddfa2101430917ce2ffacd86824914c82e28990ad7f00399", size = 211422548 },{ url = "https://files.pythonhosted.org/packages/27/94/3266821f65b92b3138631e9c8e7fe1fb513804ac934485a8d05776e1dd43/nvidia_cufft_cu12-11.2.1.3-py3-none-manylinux2014_x86_64.whl", hash = "sha256:f083fc24912aa410be21fa16d157fed2055dab1cc4b6934a0e03cba69eb242b9", size = 211459117 },]@@ -4367,7 +4362,6 @@ name = "nvidia-curand-cu12"version = "10.3.5.147"source = { registry = "https://pypi.org/simple" }wheels = [- { url = "https://files.pythonhosted.org/packages/80/9c/a79180e4d70995fdf030c6946991d0171555c6edf95c265c6b2bf7011112/nvidia_curand_cu12-10.3.5.147-py3-none-manylinux2014_aarch64.whl", hash = "sha256:1f173f09e3e3c76ab084aba0de819c49e56614feae5c12f69883f4ae9bb5fad9", size = 56314811 },{ url = "https://files.pythonhosted.org/packages/8a/6d/44ad094874c6f1b9c654f8ed939590bdc408349f137f9b98a3a23ccec411/nvidia_curand_cu12-10.3.5.147-py3-none-manylinux2014_x86_64.whl", hash = "sha256:a88f583d4e0bb643c49743469964103aa59f7f708d862c3ddb0fc07f851e3b8b", size = 56305206 },]@@ -4381,7 +4375,6 @@ dependencies = [{ name = "nvidia-nvjitlink-cu12", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },]wheels = [- { url = "https://files.pythonhosted.org/packages/46/6b/a5c33cf16af09166845345275c34ad2190944bcc6026797a39f8e0a282e0/nvidia_cusolver_cu12-11.6.1.9-py3-none-manylinux2014_aarch64.whl", hash = "sha256:d338f155f174f90724bbde3758b7ac375a70ce8e706d70b018dd3375545fc84e", size = 127634111 },{ url = "https://files.pythonhosted.org/packages/3a/e1/5b9089a4b2a4790dfdea8b3a006052cfecff58139d5a4e34cb1a51df8d6f/nvidia_cusolver_cu12-11.6.1.9-py3-none-manylinux2014_x86_64.whl", hash = "sha256:19e33fa442bcfd085b3086c4ebf7e8debc07cfe01e11513cc6d332fd918ac260", size = 127936057 },]@@ -4393,7 +4386,6 @@ dependencies = [{ name = "nvidia-nvjitlink-cu12", marker = "(platform_machine != 'aarch64' and sys_platform == 'linux') or (sys_platform != 'darwin' and sys_platform != 'linux')" },]wheels = [- { url = "https://files.pythonhosted.org/packages/96/a9/c0d2f83a53d40a4a41be14cea6a0bf9e668ffcf8b004bd65633f433050c0/nvidia_cusparse_cu12-12.3.1.170-py3-none-manylinux2014_aarch64.whl", hash = "sha256:9d32f62896231ebe0480efd8a7f702e143c98cfaa0e8a76df3386c1ba2b54df3", size = 207381987 },{ url = "https://files.pythonhosted.org/packages/db/f7/97a9ea26ed4bbbfc2d470994b8b4f338ef663be97b8f677519ac195e113d/nvidia_cusparse_cu12-12.3.1.170-py3-none-manylinux2014_x86_64.whl", hash = "sha256:ea4f11a2904e2a8dc4b1833cc1b5181cde564edd0d5cd33e3c168eff2d1863f1", size = 207454763 },]@@ -4410,7 +4402,6 @@ name = "nvidia-nvjitlink-cu12"version = "12.4.127"source = { registry = "https://pypi.org/simple" }wheels = [- { url = "https://files.pythonhosted.org/packages/02/45/239d52c05074898a80a900f49b1615d81c07fceadd5ad6c4f86a987c0bc4/nvidia_nvjitlink_cu12-12.4.127-py3-none-manylinux2014_aarch64.whl", hash = "sha256:4abe7fef64914ccfa909bc2ba39739670ecc9e820c83ccc7a6ed414122599b83", size = 20552510 },{ url = "https://files.pythonhosted.org/packages/ff/ff/847841bacfbefc97a00036e0fce5a0f086b640756dc38caea5e1bb002655/nvidia_nvjitlink_cu12-12.4.127-py3-none-manylinux2014_x86_64.whl", hash = "sha256:06b3b9b25bf3f8af351d664978ca26a16d2c5127dbd53c0497e28d1fb9611d57", size = 21066810 },]@@ -4419,7 +4410,6 @@ name = "nvidia-nvtx-cu12"version = "12.4.127"source = { registry = "https://pypi.org/simple" }wheels = [- { url = "https://files.pythonhosted.org/packages/06/39/471f581edbb7804b39e8063d92fc8305bdc7a80ae5c07dbe6ea5c50d14a5/nvidia_nvtx_cu12-12.4.127-py3-none-manylinux2014_aarch64.whl", hash = "sha256:7959ad635db13edf4fc65c06a6e9f9e55fc2f92596db928d169c0bb031e88ef3", size = 100417 },{ url = "https://files.pythonhosted.org/packages/87/20/199b8713428322a2f22b722c62b8cc278cc53dffa9705d744484b5035ee9/nvidia_nvtx_cu12-12.4.127-py3-none-manylinux2014_x86_64.whl", hash = "sha256:781e950d9b9f60d8241ccea575b32f5105a5baf4c2351cab5256a24869f12a1a", size = 99144 },]