Merge branch 'main' into final_answer_prompt

Author: afourney

README.md

@@ -181,7 +181,7 @@ var app = await App.PublishMessageAsync("HelloAgents", new NewMessageReceived
 await App.RuntimeApp!.WaitForShutdownAsync();
 await app.WaitForShutdownAsync();
 
-[TopicSubscription("HelloAgents")]
+[TopicSubscription("agents")]
 public class HelloAgent(
     IAgentContext context,
     [FromKeyedServices("EventTypes")] EventTypes typeRegistry) : ConsoleAgent(

dotnet/Directory.Packages.props

@@ -14,6 +14,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Aspire.Hosting" Version="9.0.0" />
+    <PackageVersion Include="Aspire.Hosting.Python" Version="9.0.0" />
     <PackageVersion Include="AspNetCore.Authentication.ApiKey" Version="8.0.1" />
     <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="8.0.1-preview.8.24267.1" />
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />

dotnet/samples/Hello/Hello.AppHost/Hello.AppHost.csproj

@@ -14,6 +14,7 @@
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting.AppHost" />
     <PackageReference Include="Aspire.Hosting" />
+    <PackageReference Include="Aspire.Hosting.Python" />
   </ItemGroup>
 
   <ItemGroup>

dotnet/samples/Hello/Hello.AppHost/Program.cs

@@ -5,15 +5,23 @@
 
 var builder = DistributedApplication.CreateBuilder(args);
 var backend = builder.AddProject<Projects.Backend>("backend").WithExternalHttpEndpoints();
-builder.AddProject<Projects.HelloAgent>("client")
+var client = builder.AddProject<Projects.HelloAgent>("HelloAgentsDotNET")
     .WithReference(backend)
-    .WithEnvironment("AGENT_HOST", $"{backend.GetEndpoint("https").Property(EndpointProperty.Url)}")
+    .WithEnvironment("AGENT_HOST", backend.GetEndpoint("https"))
+    .WithEnvironment("STAY_ALIVE_ON_GOODBYE", "true")
     .WaitFor(backend);
-
+#pragma warning disable ASPIREHOSTINGPYTHON001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+// xlang is over http for now - in prod use TLS between containers
+builder.AddPythonApp("HelloAgentsPython", "../../../../python/packages/autogen-core/samples/xlang/hello_python_agent", "hello_python_agent.py", "../../../../../.venv")
+    .WithReference(backend)
+    .WithEnvironment("AGENT_HOST", backend.GetEndpoint("http"))
+    .WithEnvironment("STAY_ALIVE_ON_GOODBYE", "true")
+    .WithEnvironment("GRPC_DNS_RESOLVER", "native")
+    .WithOtlpExporter()
+    .WaitFor(client);
+#pragma warning restore ASPIREHOSTINGPYTHON001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
 using var app = builder.Build();
-
 await app.StartAsync();
 var url = backend.GetEndpoint("http").Url;
 Console.WriteLine("Backend URL: " + url);
-
 await app.WaitForShutdownAsync();

dotnet/samples/Hello/HelloAIAgents/HelloAIAgent.cs

@@ -6,7 +6,7 @@
 using Microsoft.Extensions.AI;
 
 namespace Hello;
-[TopicSubscription("HelloAgents")]
+[TopicSubscription("agents")]
 public class HelloAIAgent(
     IAgentRuntime context,
     [FromKeyedServices("EventTypes")] EventTypes typeRegistry,

dotnet/samples/Hello/HelloAIAgents/Program.cs

@@ -30,7 +30,7 @@
 
 namespace Hello
 {
-    [TopicSubscription("HelloAgents")]
+    [TopicSubscription("agents")]
     public class HelloAgent(
         IAgentRuntime context,
         [FromKeyedServices("EventTypes")] EventTypes typeRegistry,

dotnet/samples/Hello/HelloAgent/Program.cs

@@ -6,25 +6,17 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-// step 1: create in-memory agent runtime
-
-// step 2: register HelloAgent to that agent runtime
-
-// step 3: start the agent runtime
-
-// step 4: send a message to the agent
-
-// step 5: wait for the agent runtime to shutdown
+var local = true;
+if (Environment.GetEnvironmentVariable("AGENT_HOST") != null) { local = false; }
 var app = await AgentsApp.PublishMessageAsync("HelloAgents", new NewMessageReceived
 {
     Message = "World"
-}, local: true);
-//var app = await AgentsApp.StartAsync();
+}, local: local).ConfigureAwait(false);
 await app.WaitForShutdownAsync();
 
 namespace Hello
 {
-    [TopicSubscription("HelloAgents")]
+    [TopicSubscription("agents")]
     public class HelloAgent(
         IAgentRuntime context, IHostApplicationLifetime hostApplicationLifetime,
         [FromKeyedServices("EventTypes")] EventTypes typeRegistry) : AgentBase(
@@ -53,7 +45,10 @@ public async Task Handle(ConversationClosed item)
             var goodbye = $"*********************  {item.UserId} said {item.UserMessage}  ************************";
             var evt = new Output { Message = goodbye };
             await PublishMessageAsync(evt).ConfigureAwait(true);
-            await PublishMessageAsync(new Shutdown()).ConfigureAwait(false);
+            if (Environment.GetEnvironmentVariable("STAY_ALIVE_ON_GOODBYE") != "true")
+            {
+                await PublishMessageAsync(new Shutdown()).ConfigureAwait(false);
+            }
         }
 
         public async Task Handle(Shutdown item)

dotnet/samples/Hello/HelloAgentState/Program.cs

@@ -15,7 +15,7 @@
 
 namespace Hello
 {
-    [TopicSubscription("HelloAgents")]
+    [TopicSubscription("agents")]
     public class HelloAgent(
         IAgentRuntime context,
         IHostApplicationLifetime hostApplicationLifetime,

dotnet/samples/Hello/protos/agent_events.proto

@@ -0,0 +1,43 @@
+syntax = "proto3";
+
+package HelloAgents;
+
+option csharp_namespace = "Microsoft.AutoGen.Abstractions";
+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;
+}

dotnet/src/Microsoft.AutoGen/Abstractions/MessageExtensions.cs

@@ -8,15 +8,16 @@ namespace Microsoft.AutoGen.Abstractions;
 
 public static class MessageExtensions
 {
+    private const string PROTO_DATA_CONTENT_TYPE = "application/x-protobuf";
     public static CloudEvent ToCloudEvent<T>(this T message, string source) where T : IMessage
     {
         return new CloudEvent
         {
             ProtoData = Any.Pack(message),
             Type = message.Descriptor.FullName,
             Source = source,
-            Id = Guid.NewGuid().ToString()
-
+            Id = Guid.NewGuid().ToString(),
+            Attributes = { { "datacontenttype", new CloudEvent.Types.CloudEventAttributeValue { CeString = PROTO_DATA_CONTENT_TYPE } } }
         };
     }
     public static T FromCloudEvent<T>(this CloudEvent cloudEvent) where T : IMessage, new()