A programming framework for agentic AI
Add staging to workflow target; fix circular imports in autogen_agentchat (#3651)
Eric Zhu25d006c09e3b
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.ymlindex c87c11bc2..3b66dd20c 100644--- a/.github/workflows/checks.yml+++ b/.github/workflows/checks.yml@@ -4,9 +4,11 @@ on:push:branches:- main+ - stagingpull_request:branches:- main+ - stagingjobs:format:diff --git a/.github/workflows/dotnet-build-test-packages.yml b/.github/workflows/dotnet-build-test-packages.ymlindex c9d9d55d1..1188a981a 100644--- a/.github/workflows/dotnet-build-test-packages.yml+++ b/.github/workflows/dotnet-build-test-packages.yml@@ -5,9 +5,11 @@ on:push:branches:- main+ - stagingpull_request:branches:- main+ - stagingjobs:build:diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.ymlindex 9f458eca0..7c9eeebf7 100644--- a/.github/workflows/dotnet-build.yml+++ b/.github/workflows/dotnet-build.yml@@ -6,9 +6,9 @@ name: dotnet-cion:workflow_dispatch:pull_request:- branches: [ "main" ]+ branches: [ "main", "staging" ]push:- branches: [ "main" ]+ branches: [ "main", "staging" ]merge_group:types: [checks_requested]diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/__init__.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/__init__.pyindex e69de29bb..be58b192e 100644--- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/__init__.py+++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/__init__.py@@ -0,0 +1,7 @@+from ._logging import EVENT_LOGGER_NAME, ConsoleLogHandler, FileLogHandler++__all__ = [+ "EVENT_LOGGER_NAME",+ "ConsoleLogHandler",+ "FileLogHandler",+]diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_base_team.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_base_team.pyindex 5a76d7f9b..470e6caab 100644--- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_base_team.py+++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_base_team.py@@ -1,11 +1,9 @@-from dataclasses import dataclassimport logging+from dataclasses import dataclassfrom typing import List, Protocol-from autogen_agentchat.agents._base_chat_agent import ChatMessage-from autogen_core.application.logging import EVENT_LOGGER_NAME--from ..logging import ConsoleLogHandler, EVENT_LOGGER_NAME+from ..agents import ChatMessage+from ._logging import EVENT_LOGGER_NAME, ConsoleLogHandlerlogger = logging.getLogger(EVENT_LOGGER_NAME)logger.setLevel(logging.INFO)diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_events.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_events.pysimilarity index 94%rename from python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_events.pyrename to python/packages/autogen-agentchat/src/autogen_agentchat/teams/_events.pyindex 2f20d72fc..01554fb25 100644--- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_events.py+++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_events.py@@ -1,7 +1,8 @@from typing import Optional+from pydantic import BaseModel-from ...agents import ChatMessage+from ..agents import ChatMessageclass ContentPublishEvent(BaseModel):diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/logging.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_logging.pysimilarity index 93%rename from python/packages/autogen-agentchat/src/autogen_agentchat/logging.pyrename to python/packages/autogen-agentchat/src/autogen_agentchat/teams/_logging.pyindex ce7b0a19c..8e8ff89d2 100644--- a/python/packages/autogen-agentchat/src/autogen_agentchat/logging.py+++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_logging.py@@ -1,15 +1,16 @@-from datetime import datetimeimport jsonimport loggingimport sys-from typing import Union, List, Dict, Any, Sequencefrom dataclasses import asdict, is_dataclass+from datetime import datetime+from typing import Any, Dict, List, Sequence, Union-from .teams.group_chat._events import ContentPublishEvent-from .agents import ChatMessage, TextMessage, MultiModalMessage, ToolCallMessage, ToolCallResultMessage, StopMessagefrom autogen_core.components import FunctionCall, Imagefrom autogen_core.components.models import FunctionExecutionResult+from ..agents import ChatMessage, MultiModalMessage, StopMessage, TextMessage, ToolCallMessage, ToolCallResultMessage+from ._events import ContentPublishEvent+EVENT_LOGGER_NAME = "autogen_agentchat.events"ContentType = Union[str, List[Union[str, Image]], List[FunctionCall], List[FunctionExecutionResult]]diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_base_chat_agent_container.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_base_chat_agent_container.pyindex ef3af5d7e..409d0e0c9 100644--- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_base_chat_agent_container.py+++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_base_chat_agent_container.py@@ -1,17 +1,16 @@-import loggingimport asyncio+import loggingfrom typing import List-from autogen_core.base import AgentId, AgentType, MessageContextfrom autogen_core.components import DefaultTopicId, eventfrom autogen_core.components.models import FunctionExecutionResultfrom autogen_core.components.tool_agent import ToolExceptionfrom ...agents import BaseChatAgent, MultiModalMessage, StopMessage, TextMessage, ToolCallMessage, ToolCallResultMessage-from ._events import ContentPublishEvent, ContentRequestEvent+from .._events import ContentPublishEvent, ContentRequestEvent+from .._logging import EVENT_LOGGER_NAMEfrom ._sequential_routed_agent import SequentialRoutedAgent-from ...logging import EVENT_LOGGER_NAMEclass BaseChatAgentContainer(SequentialRoutedAgent):diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_base_group_chat_manager.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_base_group_chat_manager.pyindex 0a5e5061f..04a618209 100644--- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_base_group_chat_manager.py+++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_base_group_chat_manager.py@@ -4,10 +4,10 @@ from typing import Listfrom autogen_core.base import MessageContext, TopicIdfrom autogen_core.components import event-from ...agents import StopMessage, TextMessage, ChatMessage-from ._events import ContentPublishEvent, ContentRequestEvent+from ...agents import ChatMessage, StopMessage, TextMessage+from .._events import ContentPublishEvent, ContentRequestEvent+from .._logging import EVENT_LOGGER_NAMEfrom ._sequential_routed_agent import SequentialRoutedAgent-from ...logging import EVENT_LOGGER_NAMEclass BaseGroupChatManager(SequentialRoutedAgent):diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_round_robin_group_chat.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_round_robin_group_chat.pyindex 5aaf02264..86cb3ed14 100644--- a/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_round_robin_group_chat.py+++ b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_round_robin_group_chat.py@@ -1,18 +1,18 @@import uuidfrom typing import Callable, List-from autogen_agentchat.agents._base_chat_agent import ChatMessagefrom autogen_core.application import SingleThreadedAgentRuntimefrom autogen_core.base import AgentId, AgentInstantiationContext, AgentRuntime, AgentType, MessageContext, TopicIdfrom autogen_core.components import ClosureAgent, TypeSubscriptionfrom autogen_core.components.tool_agent import ToolAgentfrom autogen_core.components.tools import Tool+from autogen_agentchat.agents._base_chat_agent import ChatMessagefrom ...agents import BaseChatAgent, TextMessagefrom .._base_team import BaseTeam, TeamRunResult+from .._events import ContentPublishEvent, ContentRequestEventfrom ._base_chat_agent_container import BaseChatAgentContainer-from ._events import ContentPublishEvent, ContentRequestEventfrom ._round_robin_group_chat_manager import RoundRobinGroupChatManagerdiff --git a/python/packages/autogen-magentic-one/src/autogen_magentic_one/agents/base_agent.py b/python/packages/autogen-magentic-one/src/autogen_magentic_one/agents/base_agent.pyindex 5a3138077..cfca93d33 100644--- a/python/packages/autogen-magentic-one/src/autogen_magentic_one/agents/base_agent.py+++ b/python/packages/autogen-magentic-one/src/autogen_magentic_one/agents/base_agent.py@@ -10,9 +10,9 @@ from autogen_magentic_one.messages import (AgentEvent,BroadcastMessage,DeactivateMessage,+ MagenticOneMessages,RequestReplyMessage,ResetMessage,- MagenticOneMessages,)diff --git a/python/packages/autogen-magentic-one/src/autogen_magentic_one/agents/orchestrator.py b/python/packages/autogen-magentic-one/src/autogen_magentic_one/agents/orchestrator.pyindex 2d4c70c97..13c3e6b3e 100644--- a/python/packages/autogen-magentic-one/src/autogen_magentic_one/agents/orchestrator.py+++ b/python/packages/autogen-magentic-one/src/autogen_magentic_one/agents/orchestrator.py@@ -1,7 +1,7 @@import jsonfrom typing import Any, Dict, List, Optional-from autogen_core.base import AgentProxy, MessageContext, TopicId, CancellationToken+from autogen_core.base import AgentProxy, CancellationToken, MessageContext, TopicIdfrom autogen_core.components import default_subscriptionfrom autogen_core.components.models import (AssistantMessage,diff --git a/python/packages/autogen-magentic-one/tests/headless_web_surfer/test_web_surfer.py b/python/packages/autogen-magentic-one/tests/headless_web_surfer/test_web_surfer.pyindex b659afbc0..05a66b6ad 100644--- a/python/packages/autogen-magentic-one/tests/headless_web_surfer/test_web_surfer.py+++ b/python/packages/autogen-magentic-one/tests/headless_web_surfer/test_web_surfer.py@@ -15,8 +15,6 @@ from autogen_core.components.models import (UserMessage,)from autogen_core.components.tools._base import ToolSchema-from conftest import MOCK_CHAT_COMPLETION_KWARGS, reason-from openai import AuthenticationErrorfrom autogen_magentic_one.agents.multimodal_web_surfer import MultimodalWebSurferfrom autogen_magentic_one.agents.multimodal_web_surfer.tool_definitions import (TOOL_PAGE_DOWN,@@ -34,6 +32,8 @@ from autogen_magentic_one.utils import (ENVIRON_KEY_CHAT_COMPLETION_PROVIDER,create_completion_client_from_env,)+from conftest import MOCK_CHAT_COMPLETION_KWARGS, reason+from openai import AuthenticationErrorpytest_plugins = ("pytest_asyncio",)