ag2 0.9.1.post0__tar.gz → 0.9.3__tar.gz

{ag2-0.9.1.post0 → ag2-0.9.3}/.devcontainer/devcontainer.json

@@ -30,7 +30,7 @@
         },
         "AZURE_API_VERSION": {
             "description": "This key is required to specify the version of the Azure API you are using. Set this along with AZURE_OPENAI_API_KEY, AZURE_API_ENDPOINT for Azure OpenAI services. These variables can be configured later as environment variables in the codespace terminal."
-        },
+        }
     },
     "shutdownAction": "stopContainer",
     "workspaceFolder": "/workspaces/ag2",
@@ -46,7 +46,7 @@
         "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
         "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
         "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
-        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}"
     },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

{ag2-0.9.1.post0 → ag2-0.9.3}/.devcontainer/python-3.10/devcontainer.json

@@ -30,7 +30,7 @@
         },
         "AZURE_API_VERSION": {
             "description": "This key is required to specify the version of the Azure API you are using. Set this along with AZURE_OPENAI_API_KEY, AZURE_API_ENDPOINT for Azure OpenAI services. These variables can be configured later as environment variables in the codespace terminal."
-        },
+        }
     },
     "shutdownAction": "stopContainer",
     "workspaceFolder": "/workspaces/ag2",
@@ -46,7 +46,7 @@
         "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
         "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
         "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
-        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}"
     },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

{ag2-0.9.1.post0 → ag2-0.9.3}/.devcontainer/python-3.11/devcontainer.json

@@ -30,7 +30,7 @@
         },
         "AZURE_API_VERSION": {
             "description": "This key is required to specify the version of the Azure API you are using. Set this along with AZURE_OPENAI_API_KEY, AZURE_API_ENDPOINT for Azure OpenAI services. These variables can be configured later as environment variables in the codespace terminal."
-        },
+        }
     },
     "shutdownAction": "stopContainer",
     "workspaceFolder": "/workspaces/ag2",
@@ -46,7 +46,7 @@
         "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
         "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
         "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
-        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}"
     },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

{ag2-0.9.1.post0 → ag2-0.9.3}/.devcontainer/python-3.12/devcontainer.json

@@ -30,7 +30,7 @@
         },
         "AZURE_API_VERSION": {
             "description": "This key is required to specify the version of the Azure API you are using. Set this along with AZURE_OPENAI_API_KEY, AZURE_API_ENDPOINT for Azure OpenAI services. These variables can be configured later as environment variables in the codespace terminal."
-        },
+        }
     },
     "shutdownAction": "stopContainer",
     "workspaceFolder": "/workspaces/ag2",
@@ -46,7 +46,7 @@
         "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
         "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
         "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
-        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}"
     },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

{ag2-0.9.1.post0 → ag2-0.9.3}/.devcontainer/python-3.13/devcontainer.json

@@ -30,7 +30,7 @@
         },
         "AZURE_API_VERSION": {
             "description": "This key is required to specify the version of the Azure API you are using. Set this along with AZURE_OPENAI_API_KEY, AZURE_API_ENDPOINT for Azure OpenAI services. These variables can be configured later as environment variables in the codespace terminal."
-        },
+        }
     },
     "shutdownAction": "stopContainer",
     "workspaceFolder": "/workspaces/ag2",
@@ -46,7 +46,7 @@
         "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
         "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
         "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
-        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}"
     },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

{ag2-0.9.1.post0 → ag2-0.9.3}/.github/PULL_REQUEST_TEMPLATE.md

@@ -12,6 +12,6 @@
 
 ## Checks
 
-- [ ] I've included any doc changes needed for https://docs.ag2.ai/. See https://docs.ag2.ai/docs/contributor-guide/documentation to build and test documentation locally.
+- [ ] I've included any doc changes needed for https://docs.ag2.ai/. See https://docs.ag2.ai/latest/docs/contributor-guide/documentation/ to build and test documentation locally.
 - [ ] I've added tests (if relevant) corresponding to the changes introduced in this PR.
 - [ ] I've made sure all auto checks have passed.

{ag2-0.9.1.post0 → ag2-0.9.3}/.github/workflows/build-mkdocs.yml

@@ -62,7 +62,7 @@ jobs:
           echo $VERSION
           echo $IS_RC
 
-          if [ "$IS_RC" == "False" ]; then
+          if [ "$IS_RC" == "False" ] || [ "$VERSION" == "0.9.1post0" ]; then
             cd website/mkdocs && mike deploy -F mkdocs.yml --update-aliases $VERSION latest
             mike set-default --push --allow-empty -F mkdocs.yml latest
           else

{ag2-0.9.1.post0 → ag2-0.9.3}/.github/workflows/deploy-website-mintlify.yml

@@ -1,5 +1,12 @@
 name: mintlify docs
 
+
+# WORKFLOW DISABLED
+# This workflow is temporarily disabled via "if: false" at the job level
+# and will be completely removed in a future PR as part of the mintlify
+# cleanup task. It's preserved here temporarily for reference purposes.
+# To re-enable, remove the "if: false" condition from the job.
+
 on:
   push:
     branches: [main]
@@ -17,6 +24,8 @@ permissions:
   contents: write
 jobs:
   mintlify-release:
+    # DISABLED: This workflow will be removed as part of the mintlify cleanup task
+    if: false
     uses: ./.github/workflows/build-docs.yml
     with:
       python-version: "3.10"

{ag2-0.9.1.post0 → ag2-0.9.3}/.gitignore

@@ -197,3 +197,7 @@ client_secret*.json
 *token*.json
 *credentials.json
 notebook/*_server.py
+
+
+notebook/mcp/wikipedia_articles
+notebook/mcp/arxiv_papers

{ag2-0.9.1.post0 → ag2-0.9.3}/MAINTAINERS.md

@@ -23,6 +23,7 @@
 | Alec Solder  | [alecsolder](https://github.com/alecsolder)               | -                | swarms, reasoning, function calling |
 | Marc Willhaus | [willhama](https://github.com/willhama)               | -                | - |
 | George Sideris | [giorgossideris](https://github.com/giorgossideris)               | -                | reasoning, RAG |
+| Beibin Li | [BeibinLi](https://github.com/BeibinLi)               | GenAI, Meta               | multimodal, reasoning, optiguide |
 
 **Pending Maintainers list (Marked with \*, Waiting for explicit approval from the maintainers)**
 | Name            | GitHub Handle                                              | Organization           | Features                                |

{ag2-0.9.1.post0 → ag2-0.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ag2
-Version: 0.9.1.post0
+Version: 0.9.3
 Summary: A programming framework for agentic AI
 Project-URL: Homepage, https://ag2.ai/
 Project-URL: Documentation, https://docs.ag2.ai
@@ -72,7 +72,7 @@ Requires-Dist: azure-cosmos>=4.2.0; extra == 'cosmosdb'
 Provides-Extra: crawl4ai
 Requires-Dist: crawl4ai<0.5,>=0.4.247; extra == 'crawl4ai'
 Provides-Extra: deepseek
-Requires-Dist: openai>=1.66.2; extra == 'deepseek'
+Requires-Dist: openai>=1.87.0; extra == 'deepseek'
 Provides-Extra: dev
 Requires-Dist: cairosvg; extra == 'dev'
 Requires-Dist: codespell==2.4.1; extra == 'dev'
@@ -96,7 +96,7 @@ Requires-Dist: mypy==1.15.0; extra == 'dev'
 Requires-Dist: nbclient==0.10.2; extra == 'dev'
 Requires-Dist: nbconvert==7.16.6; extra == 'dev'
 Requires-Dist: nbformat==5.10.4; extra == 'dev'
-Requires-Dist: openai>=1.66.2; extra == 'dev'
+Requires-Dist: openai>=1.87.0; extra == 'dev'
 Requires-Dist: pandas==2.2.3; extra == 'dev'
 Requires-Dist: pdoc3==0.11.6; extra == 'dev'
 Requires-Dist: pillow; extra == 'dev'
@@ -130,6 +130,8 @@ Requires-Dist: pillow; extra == 'docs'
 Requires-Dist: pyyaml==6.0.2; extra == 'docs'
 Requires-Dist: termcolor==3.0.1; extra == 'docs'
 Requires-Dist: typer==0.15.2; extra == 'docs'
+Provides-Extra: duckduckgo
+Requires-Dist: duckduckgo-search>=8.0.2; extra == 'duckduckgo'
 Provides-Extra: flaml
 Requires-Dist: flaml; extra == 'flaml'
 Requires-Dist: numpy<2.0.0,>=1.24.0; (python_version < '3.13') and extra == 'flaml'
@@ -138,14 +140,14 @@ Provides-Extra: gemini
 Requires-Dist: google-api-core; extra == 'gemini'
 Requires-Dist: google-auth; extra == 'gemini'
 Requires-Dist: google-cloud-aiplatform; extra == 'gemini'
-Requires-Dist: google-genai>=1.2.0; extra == 'gemini'
+Requires-Dist: google-genai>=1.20.0; extra == 'gemini'
 Requires-Dist: jsonschema; extra == 'gemini'
 Requires-Dist: pillow; extra == 'gemini'
 Provides-Extra: gemini-realtime
 Requires-Dist: google-api-core; extra == 'gemini-realtime'
 Requires-Dist: google-auth; extra == 'gemini-realtime'
 Requires-Dist: google-cloud-aiplatform; extra == 'gemini-realtime'
-Requires-Dist: google-genai>=1.2.0; extra == 'gemini-realtime'
+Requires-Dist: google-genai>=1.20.0; extra == 'gemini-realtime'
 Requires-Dist: jsonschema; extra == 'gemini-realtime'
 Requires-Dist: pillow; extra == 'gemini-realtime'
 Requires-Dist: websockets<16,>=14.0; extra == 'gemini-realtime'
@@ -198,7 +200,13 @@ Provides-Extra: mathchat
 Requires-Dist: sympy; extra == 'mathchat'
 Requires-Dist: wolframalpha; extra == 'mathchat'
 Provides-Extra: mcp
-Requires-Dist: mcp<1.6,>=1.4.0; (python_version >= '3.10') and extra == 'mcp'
+Requires-Dist: mcp>=1.9.4; (python_version >= '3.10') and extra == 'mcp'
+Provides-Extra: mcp-proxy-gen
+Requires-Dist: fastapi-code-generator>=0.5.4; extra == 'mcp-proxy-gen'
+Requires-Dist: fastapi<1,>=0.112; extra == 'mcp-proxy-gen'
+Requires-Dist: pyyaml; extra == 'mcp-proxy-gen'
+Requires-Dist: requests; extra == 'mcp-proxy-gen'
+Requires-Dist: typer; extra == 'mcp-proxy-gen'
 Provides-Extra: mistral
 Requires-Dist: mistralai>=1.0.1; extra == 'mistral'
 Provides-Extra: neo4j
@@ -210,9 +218,9 @@ Provides-Extra: ollama
 Requires-Dist: fix-busted-json>=0.0.18; extra == 'ollama'
 Requires-Dist: ollama>=0.4.7; extra == 'ollama'
 Provides-Extra: openai
-Requires-Dist: openai>=1.66.2; extra == 'openai'
+Requires-Dist: openai>=1.87.0; extra == 'openai'
 Provides-Extra: openai-realtime
-Requires-Dist: openai>=1.66.2; extra == 'openai-realtime'
+Requires-Dist: openai>=1.87.0; extra == 'openai-realtime'
 Requires-Dist: openai[realtime]; extra == 'openai-realtime'
 Provides-Extra: rag
 Requires-Dist: chromadb<1,>=0.5; extra == 'rag'
@@ -276,6 +284,8 @@ Requires-Dist: protobuf==5.29.3; extra == 'retrievechat-qdrant'
 Requires-Dist: pypdf; extra == 'retrievechat-qdrant'
 Requires-Dist: qdrant-client; extra == 'retrievechat-qdrant'
 Requires-Dist: sentence-transformers<=4.1.0; extra == 'retrievechat-qdrant'
+Provides-Extra: tavily
+Requires-Dist: tavily-python>=0.7.4; extra == 'tavily'
 Provides-Extra: teachable
 Requires-Dist: chromadb; extra == 'teachable'
 Provides-Extra: test
@@ -303,7 +313,7 @@ Requires-Dist: mock==5.2.0; extra == 'types'
 Requires-Dist: mypy==1.15.0; extra == 'types'
 Requires-Dist: nbconvert==7.16.6; extra == 'types'
 Requires-Dist: nbformat==5.10.4; extra == 'types'
-Requires-Dist: openai>=1.66.2; extra == 'types'
+Requires-Dist: openai>=1.87.0; extra == 'types'
 Requires-Dist: pandas==2.2.3; extra == 'types'
 Requires-Dist: pytest-asyncio==0.26.0; extra == 'types'
 Requires-Dist: pytest-cov==6.1.1; extra == 'types'
@@ -613,7 +623,7 @@ teacher.initiate_chat(
 
 When executed, this code creates a collaborative system where the teacher initiates the conversation, and the lesson planner and reviewer agents work together to create and refine a lesson plan. The GroupChatManager orchestrates the conversation, selecting the next agent to respond based on the context of the discussion.
 
-For workflows requiring more structured processes, explore the Swarm pattern in the detailed [documentation](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/conversation-patterns-deep-dive).
+For workflows requiring more structured processes, explore the Group Chat pattern in the detailed [documentation](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/orchestration/group-chat/introduction).
 
 ### Tools
 
@@ -672,9 +682,9 @@ AG2 supports more advanced concepts to help you build your AI agent workflows. Y
 
 - [Structured Output](https://docs.ag2.ai/latest/docs/user-guide/basic-concepts/structured-outputs)
 - [Ending a conversation](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/orchestration/ending-a-chat/)
-- [Retrieval Augmented Generation (RAG)](https://docs.ag2.ai/docs/user-guide/advanced-concepts/rag)
+- [Retrieval Augmented Generation (RAG)](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/rag/)
 - [Code Execution](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/code-execution)
-- [Tools with Secrets](https://docs.ag2.ai/latest/docs/user-guide/basic-concepts/introducing-tools/tools-with-secrets)
+- [Tools with Secrets](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/tools/tools-with-secrets/)
 
 ## Announcements
 

{ag2-0.9.1.post0 → ag2-0.9.3}/README.md

@@ -292,7 +292,7 @@ teacher.initiate_chat(
 
 When executed, this code creates a collaborative system where the teacher initiates the conversation, and the lesson planner and reviewer agents work together to create and refine a lesson plan. The GroupChatManager orchestrates the conversation, selecting the next agent to respond based on the context of the discussion.
 
-For workflows requiring more structured processes, explore the Swarm pattern in the detailed [documentation](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/conversation-patterns-deep-dive).
+For workflows requiring more structured processes, explore the Group Chat pattern in the detailed [documentation](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/orchestration/group-chat/introduction).
 
 ### Tools
 
@@ -351,9 +351,9 @@ AG2 supports more advanced concepts to help you build your AI agent workflows. Y
 
 - [Structured Output](https://docs.ag2.ai/latest/docs/user-guide/basic-concepts/structured-outputs)
 - [Ending a conversation](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/orchestration/ending-a-chat/)
-- [Retrieval Augmented Generation (RAG)](https://docs.ag2.ai/docs/user-guide/advanced-concepts/rag)
+- [Retrieval Augmented Generation (RAG)](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/rag/)
 - [Code Execution](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/code-execution)
-- [Tools with Secrets](https://docs.ag2.ai/latest/docs/user-guide/basic-concepts/introducing-tools/tools-with-secrets)
+- [Tools with Secrets](https://docs.ag2.ai/latest/docs/user-guide/advanced-concepts/tools/tools-with-secrets/)
 
 ## Announcements
 

{ag2-0.9.1.post0 → ag2-0.9.3}/announcements.md

@@ -24,7 +24,7 @@ We adopt the Apache 2.0 license from v0.3. This enhances our commitment to open-
 
 🎉 Dec 31, 2023: [AutoGen: Enabling Next-Gen LLM Applications via Multi-Agent Conversation Framework](https://arxiv.org/abs/2308.08155) is selected by [TheSequence: My Five Favorite AI Papers of 2023](https://thesequence.substack.com/p/my-five-favorite-ai-papers-of-2023).
 
-🔥 Nov 24: pyautogen [v0.2](https://github.com/ag2ai/ag2/releases/tag/v0.2.0) is released with many updates and new features compared to v0.1.1. It switches to using openai-python v1. Please read the [migration guide](https://docs.ag2.ai/docs/installation/Installation).
+🔥 Nov 24: pyautogen [v0.2](https://github.com/ag2ai/ag2/releases/tag/v0.2.0) is released with many updates and new features compared to v0.1.1. It switches to using openai-python v1. Please read the [migration guide](https://docs.ag2.ai/latest/docs/user-guide/basic-concepts/installing-ag2/).
 
 🔥 Nov 11: OpenAI's Assistants are available in AutoGen and interoperatable with other AutoGen agents! Checkout our [blogpost](https://docs.ag2.ai/latest/docs/blog/2023/11/13/OAI-assistants/) for details and examples.
 

{ag2-0.9.1.post0 → ag2-0.9.3}/autogen/agentchat/contrib/capabilities/transforms.py

@@ -60,15 +60,23 @@ class MessageHistoryLimiter:
     It trims the conversation history by removing older messages, retaining only the most recent messages.
     """
 
-    def __init__(self, max_messages: Optional[int] = None, keep_first_message: bool = False):
+    def __init__(
+        self,
+        max_messages: Optional[int] = None,
+        keep_first_message: bool = False,
+        exclude_names: Optional[list[str]] = None,
+    ):
         """Args:
         max_messages Optional[int]: Maximum number of messages to keep in the context. Must be greater than 0 if not None.
         keep_first_message bool: Whether to keep the original first message in the conversation history.
             Defaults to False.
+        exclude_names Optional[list[str]]: List of message sender names to exclude from the message history.
+            Messages from these senders will be filtered out before applying the message limit. Defaults to None.
         """
         self._validate_max_messages(max_messages)
         self._max_messages = max_messages
         self._keep_first_message = keep_first_message
+        self._exclude_names = exclude_names
 
     def apply_transform(self, messages: list[dict[str, Any]]) -> list[dict[str, Any]]:
         """Truncates the conversation history to the specified maximum number of messages.
@@ -83,25 +91,30 @@ class MessageHistoryLimiter:
         Returns:
             List[Dict]: A new list containing the most recent messages up to the specified maximum.
         """
-        if self._max_messages is None or len(messages) <= self._max_messages:
-            return messages
+
+        exclude_names = getattr(self, "_exclude_names", None)
+
+        filtered = [msg for msg in messages if msg.get("name") not in exclude_names] if exclude_names else messages
+
+        if self._max_messages is None or len(filtered) <= self._max_messages:
+            return filtered
 
         truncated_messages = []
         remaining_count = self._max_messages
 
         # Start with the first message if we need to keep it
-        if self._keep_first_message:
-            truncated_messages = [messages[0]]
+        if self._keep_first_message and filtered:
+            truncated_messages = [filtered[0]]
             remaining_count -= 1
 
         # Loop through messages in reverse
-        for i in range(len(messages) - 1, 0, -1):
+        for i in range(len(filtered) - 1, 0, -1):
             if remaining_count > 1:
-                truncated_messages.insert(1 if self._keep_first_message else 0, messages[i])
+                truncated_messages.insert(1 if self._keep_first_message else 0, filtered[i])
             if remaining_count == 1:  # noqa: SIM102
                 # If there's only 1 slot left and it's a 'tools' message, ignore it.
-                if messages[i].get("role") != "tool":
-                    truncated_messages.insert(1, messages[i])
+                if filtered[i].get("role") != "tool":
+                    truncated_messages.insert(1, filtered[i])
 
             remaining_count -= 1
             if remaining_count == 0:

{ag2-0.9.1.post0 → ag2-0.9.3}/autogen/agentchat/conversable_agent.py

@@ -2321,6 +2321,21 @@ class ConversableAgent(LLMAgent):
 
         return False, None
 
+    def _run_async_in_thread(self, coro):
+        """Run an async coroutine in a separate thread with its own event loop."""
+        result = {}
+
+        def runner():
+            loop = asyncio.new_event_loop()
+            asyncio.set_event_loop(loop)
+            result["value"] = loop.run_until_complete(coro)
+            loop.close()
+
+        t = threading.Thread(target=runner)
+        t.start()
+        t.join()
+        return result["value"]
+
     def generate_function_call_reply(
         self,
         messages: Optional[list[dict[str, Any]]] = None,
@@ -2342,18 +2357,8 @@ class ConversableAgent(LLMAgent):
             func_call = message["function_call"]
             func = self._function_map.get(func_call.get("name", None), None)
             if inspect.iscoroutinefunction(func):
-                try:
-                    # get the running loop if it was already created
-                    loop = asyncio.get_running_loop()
-                    close_loop = False
-                except RuntimeError:
-                    # create a loop if there is no running loop
-                    loop = asyncio.new_event_loop()
-                    close_loop = True
-
-                _, func_return = loop.run_until_complete(self.a_execute_function(func_call, call_id=call_id))
-                if close_loop:
-                    loop.close()
+                coro = self.a_execute_function(func_call, call_id=call_id)
+                _, func_return = self._run_async_in_thread(coro)
             else:
                 _, func_return = self.execute_function(message["function_call"], call_id=call_id)
             return True, func_return
@@ -2409,18 +2414,8 @@ class ConversableAgent(LLMAgent):
             tool_call_id = tool_call.get("id", None)
             func = self._function_map.get(function_call.get("name", None), None)
             if inspect.iscoroutinefunction(func):
-                try:
-                    # get the running loop if it was already created
-                    loop = asyncio.get_running_loop()
-                    close_loop = False
-                except RuntimeError:
-                    # create a loop if there is no running loop
-                    loop = asyncio.new_event_loop()
-                    close_loop = True
-
-                _, func_return = loop.run_until_complete(self.a_execute_function(function_call, call_id=tool_call_id))
-                if close_loop:
-                    loop.close()
+                coro = self.a_execute_function(function_call, call_id=tool_call_id)
+                _, func_return = self._run_async_in_thread(coro)
             else:
                 _, func_return = self.execute_function(function_call, call_id=tool_call_id)
             content = func_return.get("content", "")
@@ -3130,12 +3125,16 @@ class ConversableAgent(LLMAgent):
             arguments = {}
             content = f"Error: Function {func_name} not found."
 
-        if verbose:
-            iostream.send(
-                ExecutedFunctionEvent(
-                    func_name=func_name, call_id=call_id, arguments=arguments, content=content, recipient=self
-                )
+        iostream.send(
+            ExecutedFunctionEvent(
+                func_name=func_name,
+                call_id=call_id,
+                arguments=arguments,
+                content=content,
+                recipient=self,
+                is_exec_success=is_exec_success,
             )
+        )
 
         return is_exec_success, {
             "name": func_name,
@@ -3198,12 +3197,16 @@ class ConversableAgent(LLMAgent):
             arguments = {}
             content = f"Error: Function {func_name} not found."
 
-        if verbose:
-            iostream.send(
-                ExecutedFunctionEvent(
-                    func_name=func_name, call_id=call_id, arguments=arguments, content=content, recipient=self
-                )
+        iostream.send(
+            ExecutedFunctionEvent(
+                func_name=func_name,
+                call_id=call_id,
+                arguments=arguments,
+                content=content,
+                recipient=self,
+                is_exec_success=is_exec_success,
             )
+        )
 
         return is_exec_success, {
             "name": func_name,

{ag2-0.9.1.post0 → ag2-0.9.3}/autogen/agentchat/group/group_utils.py

@@ -82,6 +82,46 @@ def link_agents_to_group_manager(agents: list[Agent], group_chat_manager: Agent)
         agent._group_manager = group_chat_manager  # type: ignore[attr-defined]
 
 
+def _evaluate_after_works_conditions(
+    agent: "ConversableAgent",
+    groupchat: GroupChat,
+    user_agent: Optional["ConversableAgent"],
+) -> Optional[Union[Agent, str]]:
+    """Evaluate after_works context conditions for an agent.
+
+    Args:
+        agent: The agent to evaluate after_works conditions for
+        groupchat: The current group chat
+        user_agent: Optional user proxy agent
+
+    Returns:
+        The resolved speaker selection result if a condition matches, None otherwise
+    """
+    if not hasattr(agent, "handoffs") or not agent.handoffs.after_works:  # type: ignore[attr-defined]
+        return None
+
+    for after_work_condition in agent.handoffs.after_works:  # type: ignore[attr-defined]
+        # Check if condition is available
+        is_available = (
+            after_work_condition.available.is_available(agent, groupchat.messages)
+            if after_work_condition.available
+            else True
+        )
+
+        # Evaluate the condition (None condition means always true)
+        if is_available and (
+            after_work_condition.condition is None or after_work_condition.condition.evaluate(agent.context_variables)
+        ):
+            # Condition matched, resolve and return
+            return after_work_condition.target.resolve(
+                groupchat,
+                agent,
+                user_agent,
+            ).get_speaker_selection_result(groupchat)
+
+    return None
+
+
 def _run_oncontextconditions(
     agent: "ConversableAgent",
     messages: Optional[list[dict[str, Any]]] = None,
@@ -94,7 +134,9 @@ def _run_oncontextconditions(
             on_condition.available.is_available(agent, messages if messages else []) if on_condition.available else True
         )
 
-        if is_available and on_condition.condition.evaluate(agent.context_variables):
+        if is_available and (
+            on_condition.condition is None or on_condition.condition.evaluate(agent.context_variables)
+        ):
             # Condition has been met, we'll set the Tool Executor's next target
             # attribute and that will be picked up on the next iteration when
             # _determine_next_agent is called
@@ -161,12 +203,13 @@ def ensure_handoff_agents_in_group(agents: list["ConversableAgent"]) -> None:
                 and context_conditions.target.agent_name not in agent_names
             ):
                 raise ValueError("Agent in OnContextCondition Hand-offs must be in the agents list")
-        if (
-            agent.handoffs.after_work is not None
-            and isinstance(agent.handoffs.after_work, (AgentTarget, AgentNameTarget))
-            and agent.handoffs.after_work.agent_name not in agent_names
-        ):
-            raise ValueError("Agent in after work target Hand-offs must be in the agents list")
+        # Check after_works targets
+        for after_work_condition in agent.handoffs.after_works:
+            if (
+                isinstance(after_work_condition.target, (AgentTarget, AgentNameTarget))
+                and after_work_condition.target.agent_name not in agent_names
+            ):
+                raise ValueError("Agent in after work target Hand-offs must be in the agents list")
 
 
 def prepare_exclude_transit_messages(agents: list["ConversableAgent"]) -> None:
@@ -320,17 +363,19 @@ def setup_context_variables(
     tool_execution: "ConversableAgent",
     agents: list["ConversableAgent"],
     manager: GroupChatManager,
+    user_agent: Optional["ConversableAgent"],
     context_variables: ContextVariables,
 ) -> None:
-    """Assign a common context_variables reference to all agents in the group, including the tool executor and group chat manager.
+    """Assign a common context_variables reference to all agents in the group, including the tool executor, group chat manager, and user proxy agent.
 
     Args:
         tool_execution: The tool execution agent.
         agents: List of all agents in the conversation.
         manager: GroupChatManager instance.
+        user_agent: Optional user proxy agent.
         context_variables: Context variables to assign to all agents.
     """
-    for agent in agents + [tool_execution] + [manager]:
+    for agent in agents + [tool_execution] + [manager] + ([user_agent] if user_agent else []):
         agent.context_variables = context_variables
 
 
@@ -426,22 +471,25 @@ def determine_next_agent(
 
     # If the user last spoke, return to the agent prior to them (if they don't have an after work, otherwise it's treated like any other agent)
     if user_agent and last_speaker == user_agent:
-        if user_agent.handoffs.after_work is None:
+        if not user_agent.handoffs.after_works:
             return last_agent_speaker
         else:
             last_agent_speaker = user_agent
 
     # AFTER WORK:
 
-    # Get the appropriate After Work condition (from the agent if they have one, otherwise the group level one)
-    after_work_condition = (
-        last_agent_speaker.handoffs.after_work  # type: ignore[attr-defined]
-        if last_agent_speaker.handoffs.after_work is not None  # type: ignore[attr-defined]
-        else group_after_work
+    # First, try to evaluate after_works context conditions
+    after_works_result = _evaluate_after_works_conditions(
+        last_agent_speaker,  # type: ignore[arg-type]
+        groupchat,
+        user_agent,
     )
+    if after_works_result is not None:
+        return after_works_result
 
+    # If no after_works conditions matched, use the group-level after_work
     # Resolve the next agent, termination, or speaker selection method
-    resolved_speaker_selection_result = after_work_condition.resolve(
+    resolved_speaker_selection_result = group_after_work.resolve(
         groupchat,
         last_agent_speaker,  # type: ignore[arg-type]
         user_agent,
@@ -525,10 +573,7 @@ def create_group_manager(
                 if (
                     len(agent.handoffs.get_context_conditions_by_target_type(GroupManagerTarget)) > 0
                     or len(agent.handoffs.get_llm_conditions_by_target_type(GroupManagerTarget)) > 0
-                    or (
-                        agent.handoffs.after_work is not None
-                        and isinstance(agent.handoffs.after_work, GroupManagerTarget)
-                    )
+                    or any(isinstance(aw.target, GroupManagerTarget) for aw in agent.handoffs.after_works)
                 ):
                     has_group_manager_target = True
                     break