Skip to content

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.yml
index c87c11bc2..3b66dd20c 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -4,9 +4,11 @@ on:
push:
branches:
- main
+ - staging
pull_request:
branches:
- main
+ - staging
jobs:
format:
diff --git a/.github/workflows/dotnet-build-test-packages.yml b/.github/workflows/dotnet-build-test-packages.yml
index 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
+ - staging
pull_request:
branches:
- main
+ - staging
jobs:
build:
diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml
index 9f458eca0..7c9eeebf7 100644
--- a/.github/workflows/dotnet-build.yml
+++ b/.github/workflows/dotnet-build.yml
@@ -6,9 +6,9 @@ name: dotnet-ci
on:
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__.py
index 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.py
index 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 dataclass
import logging
+from dataclasses import dataclass
from 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, ConsoleLogHandler
logger = 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.py
similarity index 94%
rename from python/packages/autogen-agentchat/src/autogen_agentchat/teams/group_chat/_events.py
rename to python/packages/autogen-agentchat/src/autogen_agentchat/teams/_events.py
index 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 ChatMessage
class ContentPublishEvent(BaseModel):
diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/logging.py b/python/packages/autogen-agentchat/src/autogen_agentchat/teams/_logging.py
similarity index 93%
rename from python/packages/autogen-agentchat/src/autogen_agentchat/logging.py
rename to python/packages/autogen-agentchat/src/autogen_agentchat/teams/_logging.py
index 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 datetime
import json
import logging
import sys
-from typing import Union, List, Dict, Any, Sequence
from 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, StopMessage
from autogen_core.components import FunctionCall, Image
from 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.py
index 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 logging
import asyncio
+import logging
from typing import List
-
from autogen_core.base import AgentId, AgentType, MessageContext
from autogen_core.components import DefaultTopicId, event
from autogen_core.components.models import FunctionExecutionResult
from autogen_core.components.tool_agent import ToolException
from ...agents import BaseChatAgent, MultiModalMessage, StopMessage, TextMessage, ToolCallMessage, ToolCallResultMessage
-from ._events import ContentPublishEvent, ContentRequestEvent
+from .._events import ContentPublishEvent, ContentRequestEvent
+from .._logging import EVENT_LOGGER_NAME
from ._sequential_routed_agent import SequentialRoutedAgent
-from ...logging import EVENT_LOGGER_NAME
class 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.py
index 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 List
from autogen_core.base import MessageContext, TopicId
from 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_NAME
from ._sequential_routed_agent import SequentialRoutedAgent
-from ...logging import EVENT_LOGGER_NAME
class 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.py
index 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 uuid
from typing import Callable, List
-from autogen_agentchat.agents._base_chat_agent import ChatMessage
from autogen_core.application import SingleThreadedAgentRuntime
from autogen_core.base import AgentId, AgentInstantiationContext, AgentRuntime, AgentType, MessageContext, TopicId
from autogen_core.components import ClosureAgent, TypeSubscription
from autogen_core.components.tool_agent import ToolAgent
from autogen_core.components.tools import Tool
+from autogen_agentchat.agents._base_chat_agent import ChatMessage
from ...agents import BaseChatAgent, TextMessage
from .._base_team import BaseTeam, TeamRunResult
+from .._events import ContentPublishEvent, ContentRequestEvent
from ._base_chat_agent_container import BaseChatAgentContainer
-from ._events import ContentPublishEvent, ContentRequestEvent
from ._round_robin_group_chat_manager import RoundRobinGroupChatManager
diff --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.py
index 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.py
index 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 json
from typing import Any, Dict, List, Optional
-from autogen_core.base import AgentProxy, MessageContext, TopicId, CancellationToken
+from autogen_core.base import AgentProxy, CancellationToken, MessageContext, TopicId
from autogen_core.components import default_subscription
from 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.py
index 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 AuthenticationError
from autogen_magentic_one.agents.multimodal_web_surfer import MultimodalWebSurfer
from 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 AuthenticationError
pytest_plugins = ("pytest_asyncio",)