Merge branch 'main' into lpinheiro/chore/remove-deprecated-code

Author: jackgerrits

dotnet/src/Microsoft.AutoGen/Agents/Services/Orleans/SubscriptionsGrain.cs

@@ -6,8 +6,13 @@ namespace Microsoft.AutoGen.Agents;
 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)
+    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 ValueTask Subscribe(string agentType, string topic)

python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py

@@ -279,8 +279,9 @@ async def on_messages_stream(
                 return
 
             # Generate an inference result based on the current model context.
+            llm_messages = self._system_messages + self._model_context
             result = await self._model_client.create(
-                self._model_context, tools=self._tools + self._handoff_tools, cancellation_token=cancellation_token
+                llm_messages, tools=self._tools + self._handoff_tools, cancellation_token=cancellation_token
             )
             self._model_context.append(AssistantMessage(content=result.content, source=self.name))