Merge branch 'u/fix#4618' of https://github.com/microsoft/autogen into u/fix#4618

Author: LittleLittleCloud

.github/workflows/docs.yml

@@ -42,6 +42,8 @@ jobs:
             { ref: "v0.4.0.dev7", dest-dir: "0.4.0.dev7" },
             { ref: "v0.4.0.dev8", dest-dir: "0.4.0.dev8" },
             { ref: "v0.4.0.dev9", dest-dir: "0.4.0.dev9" },
+            { ref: "v0.4.0.dev10", dest-dir: "0.4.0.dev10" },
+            { ref: "v0.4.0.dev11", dest-dir: "0.4.0.dev11" },
           ]
     steps:
       - name: Checkout

CONTRIBUTING.md

@@ -49,8 +49,8 @@ We will update verion numbers according to the following rules:
 
 1. Create a PR that updates the version numbers across the codebase ([example](https://github.com/microsoft/autogen/pull/4359))
     2. The docs CI will fail for the PR, but this is expected and will be resolved in the next step
-2. After merging the PR, create and push a tag that corresponds to the new verion. For example, for `0.4.0.dev9`:
-    - `git tag 0.4.0.dev9 && git push origin 0.4.0.dev9`
+2. After merging the PR, create and push a tag that corresponds to the new verion. For example, for `0.4.0.dev11`:
+    - `git tag 0.4.0.dev11 && git push origin 0.4.0.dev11`
 3. Restart the docs CI by finding the failed [job corresponding to the `push` event](https://github.com/microsoft/autogen/actions/workflows/docs.yml) and restarting all jobs
 4. Run [this](https://github.com/microsoft/autogen/actions/workflows/single-python-package.yml) workflow for each of the packages that need to be released and get an approval for the release for it to run
 

README.md

@@ -3,10 +3,9 @@
 <div align="center">
 <img src="https://microsoft.github.io/autogen/0.2/img/ag.svg" alt="AutoGen Logo" width="100">
 
-[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40pyautogen)](https://twitter.com/pyautogen) [![LinkedIn](https://img.shields.io/badge/LinkedIn-Company?style=flat&logo=linkedin&logoColor=white)](https://www.linkedin.com/company/105812540)
-[![GitHub Discussions](https://img.shields.io/badge/Discussions-Q%26A-green?logo=github)](https://github.com/microsoft/autogen/discussions) [![0.2 Docs](https://img.shields.io/badge/Docs-0.2-blue)](https://microsoft.github.io/autogen/0.2/) [![0.4 Docs](https://img.shields.io/badge/Docs-0.4-blue)](https://microsoft.github.io/autogen/dev/)
-[![PyPi autogen-core](https://img.shields.io/badge/PyPi-autogen--core-blue?logo=pypi)](https://pypi.org/project/autogen-core/0.4.0.dev9/) [![PyPi autogen-agentchat](https://img.shields.io/badge/PyPi-autogen--agentchat-blue?logo=pypi)](https://pypi.org/project/autogen-agentchat/0.4.0.dev9/) [![PyPi autogen-ext](https://img.shields.io/badge/PyPi-autogen--ext-blue?logo=pypi)](https://pypi.org/project/autogen-ext/0.4.0.dev9/)
+[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/cloudposse.svg?style=social&label=Follow%20%40pyautogen)](https://twitter.com/pyautogen) [![LinkedIn](https://img.shields.io/badge/LinkedIn-Company?style=flat&logo=linkedin&logoColor=white)](https://www.linkedin.com/company/105812540) [![Discord](https://img.shields.io/badge/discord-chat-green?logo=discord)](https://aka.ms/autogen-discord) [![GitHub Discussions](https://img.shields.io/badge/Discussions-Q%26A-green?logo=github)](https://github.com/microsoft/autogen/discussions) [![0.2 Docs](https://img.shields.io/badge/Docs-0.2-blue)](https://microsoft.github.io/autogen/0.2/) [![0.4 Docs](https://img.shields.io/badge/Docs-0.4-blue)](https://microsoft.github.io/autogen/dev/)
 
+[![PyPi autogen-core](https://img.shields.io/badge/PyPi-autogen--core-blue?logo=pypi)](https://pypi.org/project/autogen-core/0.4.0.dev11/) [![PyPi autogen-agentchat](https://img.shields.io/badge/PyPi-autogen--agentchat-blue?logo=pypi)](https://pypi.org/project/autogen-agentchat/0.4.0.dev11/) [![PyPi autogen-ext](https://img.shields.io/badge/PyPi-autogen--ext-blue?logo=pypi)](https://pypi.org/project/autogen-ext/0.4.0.dev11/)
 </div>
 
 # AutoGen
@@ -105,7 +104,7 @@ We look forward to your contributions!
 First install the packages:
 
 ```bash
-pip install 'autogen-agentchat==0.4.0.dev9' 'autogen-ext[openai]==0.4.0.dev9'
+pip install 'autogen-agentchat==0.4.0.dev11' 'autogen-ext[openai]==0.4.0.dev11'
 ```
 
 The following code uses OpenAI's GPT-4o model and you need to provide your
@@ -119,7 +118,7 @@ from autogen_agentchat.agents import AssistantAgent
 from autogen_agentchat.ui import Console
 from autogen_agentchat.conditions import TextMentionTermination
 from autogen_agentchat.teams import RoundRobinGroupChat
-from autogen_ext.models import OpenAIChatCompletionClient
+from autogen_ext.models.openai import OpenAIChatCompletionClient
 
 # Define a tool
 async def get_weather(city: str) -> str:

docs/switcher.json

@@ -56,7 +56,17 @@
     {
         "name": "0.4.0.dev9",
         "version": "0.4.0.dev9",
-        "url": "/autogen/0.4.0.dev9/",
+        "url": "/autogen/0.4.0.dev9/"
+    },
+    {
+        "name": "0.4.0.dev10",
+        "version": "0.4.0.dev10",
+        "url": "/autogen/0.4.0.dev10/"
+    },
+    {
+        "name": "0.4.0.dev11",
+        "version": "0.4.0.dev11",
+        "url": "/autogen/0.4.0.dev11/",
         "preferred": true
     }
 ]

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

@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // IAgentWorker.cs
-
 namespace Microsoft.AutoGen.Abstractions;
 
 public interface IAgentWorker

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

@@ -17,6 +17,7 @@ public static CloudEvent ToCloudEvent<T>(this T message, string source) where T
             Type = message.Descriptor.FullName,
             Source = source,
             Id = Guid.NewGuid().ToString(),
+            SpecVersion = "1.0",
             Attributes = { { "datacontenttype", new CloudEvent.Types.CloudEventAttributeValue { CeString = PROTO_DATA_CONTENT_TYPE } } }
         };
     }

dotnet/src/Microsoft.AutoGen/Agents/AgentBase.cs

@@ -131,7 +131,7 @@ protected internal async Task HandleRpcMessage(Message msg, CancellationToken ca
         {
             case Message.MessageOneofCase.CloudEvent:
                 {
-                    var activity = this.ExtractActivity(msg.CloudEvent.Type, msg.CloudEvent.Metadata);
+                    var activity = this.ExtractActivity(msg.CloudEvent.Type, msg.CloudEvent.Attributes);
                     await this.InvokeWithActivityAsync(
                         static ((AgentBase Agent, CloudEvent Item) state, CancellationToken _) => state.Agent.CallHandler(state.Item),
                         (this, msg.CloudEvent),

dotnet/src/Microsoft.AutoGen/Agents/AgentBaseExtensions.cs

@@ -2,6 +2,8 @@
 // AgentBaseExtensions.cs
 
 using System.Diagnostics;
+using Google.Protobuf.Collections;
+using static Microsoft.AutoGen.Abstractions.CloudEvent.Types;
 
 namespace Microsoft.AutoGen.Agents;
 
@@ -57,6 +59,11 @@ public static class AgentBaseExtensions
         return activity;
     }
 
+    public static Activity? ExtractActivity(this AgentBase agent, string activityName, MapField<string, CloudEventAttributeValue> metadata)
+    {
+        return ExtractActivity(agent, activityName, metadata.ToDictionary(kvp => kvp.Key, kvp => kvp.Value.CeString));
+    }
+
     /// <summary>
     /// Invokes a function asynchronously within the context of an <see cref="Activity"/>.
     /// </summary>

dotnet/src/Microsoft.AutoGen/Agents/AgentRuntime.cs

@@ -2,8 +2,10 @@
 // AgentRuntime.cs
 
 using System.Diagnostics;
+using Google.Protobuf.Collections;
 using Microsoft.AutoGen.Abstractions;
 using Microsoft.Extensions.Logging;
+using static Microsoft.AutoGen.Abstractions.CloudEvent.Types;
 
 namespace Microsoft.AutoGen.Agents;
 
@@ -28,13 +30,49 @@ internal sealed class AgentRuntime(AgentId agentId, IAgentWorker worker, ILogger
             out var traceState);
         return (traceParent, traceState);
     }
+    public (string?, string?) GetTraceIdAndState(MapField<string, CloudEventAttributeValue> metadata)
+    {
+        DistributedContextPropagator.ExtractTraceIdAndState(metadata,
+            static (object? carrier, string fieldName, out string? fieldValue, out IEnumerable<string>? fieldValues) =>
+            {
+                var metadata = (MapField<string, CloudEventAttributeValue>)carrier!;
+                fieldValues = null;
+                metadata.TryGetValue(fieldName, out var ceValue);
+                fieldValue = ceValue?.CeString;
+            },
+            out var traceParent,
+            out var traceState);
+        return (traceParent, traceState);
+    }
     public void Update(RpcRequest request, Activity? activity = null)
     {
-        DistributedContextPropagator.Inject(activity, request.Metadata, static (carrier, key, value) => ((IDictionary<string, string>)carrier!)[key] = value);
+        DistributedContextPropagator.Inject(activity, request.Metadata, static (carrier, key, value) =>
+        {
+            var metadata = (IDictionary<string, string>)carrier!;
+            if (metadata.TryGetValue(key, out _))
+            {
+                metadata[key] = value;
+            }
+            else
+            {
+                metadata.Add(key, value);
+            }
+        });
     }
     public void Update(CloudEvent cloudEvent, Activity? activity = null)
     {
-        DistributedContextPropagator.Inject(activity, cloudEvent.Metadata, static (carrier, key, value) => ((IDictionary<string, string>)carrier!)[key] = value);
+        DistributedContextPropagator.Inject(activity, cloudEvent.Attributes, static (carrier, key, value) =>
+        {
+            var mapField = (MapField<string, CloudEventAttributeValue>)carrier!;
+            if (mapField.TryGetValue(key, out var ceValue))
+            {
+                mapField[key] = new CloudEventAttributeValue { CeString = value };
+            }
+            else
+            {
+                mapField.Add(key, new CloudEventAttributeValue { CeString = value });
+            }
+        });
     }
     public async ValueTask SendResponseAsync(RpcRequest request, RpcResponse response, CancellationToken cancellationToken = default)
     {
@@ -73,4 +111,17 @@ public IDictionary<string, string> ExtractMetadata(IDictionary<string, string> m
 
         return baggage as IDictionary<string, string> ?? new Dictionary<string, string>();
     }
+
+    public IDictionary<string, string> ExtractMetadata(MapField<string, CloudEventAttributeValue> metadata)
+    {
+        var baggage = DistributedContextPropagator.ExtractBaggage(metadata, static (object? carrier, string fieldName, out string? fieldValue, out IEnumerable<string>? fieldValues) =>
+        {
+            var metadata = (MapField<string, CloudEventAttributeValue>)carrier!;
+            fieldValues = null;
+            metadata.TryGetValue(fieldName, out var ceValue);
+            fieldValue = ceValue?.CeString;
+        });
+
+        return baggage as IDictionary<string, string> ?? new Dictionary<string, string>();
+    }
 }

protos/agent_worker.proto

@@ -117,7 +117,7 @@ message Message {
     oneof message {
         RpcRequest request = 1;
         RpcResponse response = 2;
-        cloudevent.CloudEvent cloudEvent = 3;
+        io.cloudevents.v1.CloudEvent cloudEvent = 3;
         RegisterAgentTypeRequest registerAgentTypeRequest = 4;
         RegisterAgentTypeResponse registerAgentTypeResponse = 5;
         AddSubscriptionRequest addSubscriptionRequest = 6;