A programming framework for agentic AI
Migrate team one to new subscriptions (#560)
Jack Gerrits19f83debb140
diff --git a/python/packages/autogen-core/src/autogen_core/components/__init__.py b/python/packages/autogen-core/src/autogen_core/components/__init__.pyindex bc7395b57..9ad8bdb35 100644--- a/python/packages/autogen-core/src/autogen_core/components/__init__.py+++ b/python/packages/autogen-core/src/autogen_core/components/__init__.py@@ -3,7 +3,7 @@ The :mod:`autogen_core.components` module provides building blocks for creating"""from ._closure_agent import ClosureAgent-from ._default_subscription import DefaultSubscription, default_subscription+from ._default_subscription import DefaultSubscription, default_subscription, type_subscriptionfrom ._default_topic import DefaultTopicIdfrom ._image import Imagefrom ._routed_agent import RoutedAgent, TypeRoutedAgent, event, message_handler, rpc@@ -23,4 +23,5 @@ __all__ = ["DefaultSubscription","DefaultTopicId","default_subscription",+ "type_subscription",]diff --git a/python/packages/team-one/examples/example.py b/python/packages/team-one/examples/example.pyindex e94e888b5..c20749cd0 100644--- a/python/packages/team-one/examples/example.py+++ b/python/packages/team-one/examples/example.py@@ -10,7 +10,6 @@ import loggingfrom autogen_core.application import SingleThreadedAgentRuntimefrom autogen_core.application.logging import EVENT_LOGGER_NAMEfrom autogen_core.base import AgentId, AgentProxy-from autogen_core.components import DefaultSubscriptionfrom autogen_core.components.code_executor._impl.docker_command_line_code_executor import DockerCommandLineCodeExecutorfrom team_one.agents.coder import Coder, Executorfrom team_one.agents.orchestrator import LedgerOrchestrator@@ -25,32 +24,30 @@ async def main() -> None:async with DockerCommandLineCodeExecutor() as code_executor:# Register agents.- await runtime.register(- "Coder", lambda: Coder(model_client=create_completion_client_from_env()), lambda: [DefaultSubscription()]- )+ await Coder.register(runtime, "Coder", lambda: Coder(model_client=create_completion_client_from_env()))coder = AgentProxy(AgentId("Coder", "default"), runtime)- await runtime.register(+ await Executor.register(+ runtime,"Executor",lambda: Executor("A agent for executing code", executor=code_executor),- lambda: [DefaultSubscription()],)executor = AgentProxy(AgentId("Executor", "default"), runtime)- await runtime.register(+ await UserProxy.register(+ runtime,"UserProxy",lambda: UserProxy(description="The current user interacting with you."),- lambda: [DefaultSubscription()],)user_proxy = AgentProxy(AgentId("UserProxy", "default"), runtime)# TODO: doesn't work for more than default key- await runtime.register(+ await LedgerOrchestrator.register(+ runtime,"orchestrator",lambda: LedgerOrchestrator(model_client=create_completion_client_from_env(), agents=[coder, executor, user_proxy]),- lambda: [DefaultSubscription()],)runtime.start()diff --git a/python/packages/team-one/examples/example_coder.py b/python/packages/team-one/examples/example_coder.pyindex b62f2b801..8d0690528 100644--- a/python/packages/team-one/examples/example_coder.py+++ b/python/packages/team-one/examples/example_coder.py@@ -10,7 +10,6 @@ import loggingfrom autogen_core.application import SingleThreadedAgentRuntimefrom autogen_core.application.logging import EVENT_LOGGER_NAMEfrom autogen_core.base import AgentId, AgentProxy-from autogen_core.components import DefaultSubscriptionfrom autogen_core.components.code_executor._impl.docker_command_line_code_executor import DockerCommandLineCodeExecutorfrom team_one.agents.coder import Coder, Executorfrom team_one.agents.orchestrator import RoundRobinOrchestrator@@ -25,29 +24,27 @@ async def main() -> None:async with DockerCommandLineCodeExecutor() as code_executor:# Register agents.- await runtime.register(- "Coder", lambda: Coder(model_client=create_completion_client_from_env()), lambda: [DefaultSubscription()]- )+ await Coder.register(runtime, "Coder", lambda: Coder(model_client=create_completion_client_from_env()))coder = AgentProxy(AgentId("Coder", "default"), runtime)- await runtime.register(+ await Executor.register(+ runtime,"Executor",lambda: Executor("A agent for executing code", executor=code_executor),- lambda: [DefaultSubscription()],)executor = AgentProxy(AgentId("Executor", "default"), runtime)- await runtime.register(+ await UserProxy.register(+ runtime,"UserProxy",lambda: UserProxy(description="The current user interacting with you."),- lambda: [DefaultSubscription()],)user_proxy = AgentProxy(AgentId("UserProxy", "default"), runtime)- await runtime.register(+ await RoundRobinOrchestrator.register(+ runtime,"orchestrator",lambda: RoundRobinOrchestrator([coder, executor, user_proxy]),- lambda: [DefaultSubscription()],)runtime.start()diff --git a/python/packages/team-one/examples/example_file_surfer.py b/python/packages/team-one/examples/example_file_surfer.pyindex b7a81a9d3..ce510dd05 100644--- a/python/packages/team-one/examples/example_file_surfer.py+++ b/python/packages/team-one/examples/example_file_surfer.py@@ -8,7 +8,6 @@ import loggingfrom autogen_core.application import SingleThreadedAgentRuntimefrom autogen_core.application.logging import EVENT_LOGGER_NAMEfrom autogen_core.base import AgentId, AgentProxy-from autogen_core.components import DefaultSubscriptionfrom team_one.agents.file_surfer import FileSurferfrom team_one.agents.orchestrator import RoundRobinOrchestratorfrom team_one.agents.user_proxy import UserProxy@@ -24,14 +23,14 @@ async def main() -> None:client = create_completion_client_from_env()# Register agents.- await runtime.register("file_surfer", lambda: FileSurfer(model_client=client), lambda: [DefaultSubscription()])+ await FileSurfer.register(runtime, "file_surfer", lambda: FileSurfer(model_client=client))file_surfer = AgentProxy(AgentId("file_surfer", "default"), runtime)- await runtime.register("UserProxy", lambda: UserProxy(), lambda: [DefaultSubscription()])+ await UserProxy.register(runtime, "UserProxy", lambda: UserProxy())user_proxy = AgentProxy(AgentId("UserProxy", "default"), runtime)- await runtime.register(- "orchestrator", lambda: RoundRobinOrchestrator([file_surfer, user_proxy]), lambda: [DefaultSubscription()]+ await RoundRobinOrchestrator.register(+ runtime, "orchestrator", lambda: RoundRobinOrchestrator([file_surfer, user_proxy]))runtime.start()diff --git a/python/packages/team-one/examples/example_reflexagents.py b/python/packages/team-one/examples/example_reflexagents.pyindex b49050fb5..4ac82eb60 100644--- a/python/packages/team-one/examples/example_reflexagents.py+++ b/python/packages/team-one/examples/example_reflexagents.py@@ -7,7 +7,7 @@ import loggingfrom autogen_core.application import SingleThreadedAgentRuntimefrom autogen_core.application.logging import EVENT_LOGGER_NAMEfrom autogen_core.base import AgentId, AgentProxy-from autogen_core.components import DefaultSubscription, DefaultTopicId+from autogen_core.components import DefaultTopicIdfrom autogen_core.components.models import UserMessagefrom team_one.agents.orchestrator import RoundRobinOrchestratorfrom team_one.agents.reflex_agents import ReflexAgent@@ -18,17 +18,17 @@ from team_one.utils import LogHandlerasync def main() -> None:runtime = SingleThreadedAgentRuntime()- await runtime.register("fake_agent_1", lambda: ReflexAgent("First reflect agent"), lambda: [DefaultSubscription()])+ await ReflexAgent.register(runtime, "fake_agent_1", lambda: ReflexAgent("First reflect agent"))fake1 = AgentProxy(AgentId("fake_agent_1", "default"), runtime)- await runtime.register("fake_agent_2", lambda: ReflexAgent("Second reflect agent"), lambda: [DefaultSubscription()])+ await ReflexAgent.register(runtime, "fake_agent_2", lambda: ReflexAgent("Second reflect agent"))fake2 = AgentProxy(AgentId("fake_agent_2", "default"), runtime)- await runtime.register("fake_agent_3", lambda: ReflexAgent("Third reflect agent"), lambda: [DefaultSubscription()])+ await ReflexAgent.register(runtime, "fake_agent_3", lambda: ReflexAgent("Third reflect agent"))fake3 = AgentProxy(AgentId("fake_agent_3", "default"), runtime)- await runtime.register(- "orchestrator", lambda: RoundRobinOrchestrator([fake1, fake2, fake3]), lambda: [DefaultSubscription()]+ await RoundRobinOrchestrator.register(+ runtime, "orchestrator", lambda: RoundRobinOrchestrator([fake1, fake2, fake3]))task_message = UserMessage(content="Test Message", source="User")diff --git a/python/packages/team-one/examples/example_userproxy.py b/python/packages/team-one/examples/example_userproxy.pyindex 84773bcc5..becc28431 100644--- a/python/packages/team-one/examples/example_userproxy.py+++ b/python/packages/team-one/examples/example_userproxy.py@@ -12,7 +12,6 @@ from autogen_core.application.logging import EVENT_LOGGER_NAMEfrom autogen_core.base import AgentId, AgentProxy# from typing import Any, Dict, List, Tuple, Union-from autogen_core.components import DefaultSubscriptionfrom team_one.agents.coder import Coderfrom team_one.agents.orchestrator import RoundRobinOrchestratorfrom team_one.agents.user_proxy import UserProxy@@ -28,15 +27,13 @@ async def main() -> None:client = create_completion_client_from_env()# Register agents.- await runtime.register("Coder", lambda: Coder(model_client=client), lambda: [DefaultSubscription()])+ await Coder.register(runtime, "Coder", lambda: Coder(model_client=client))coder = AgentProxy(AgentId("Coder", "default"), runtime)- await runtime.register("UserProxy", lambda: UserProxy(), lambda: [DefaultSubscription()])+ await UserProxy.register(runtime, "UserProxy", lambda: UserProxy())user_proxy = AgentProxy(AgentId("UserProxy", "default"), runtime)- await runtime.register(- "orchestrator", lambda: RoundRobinOrchestrator([coder, user_proxy]), lambda: [DefaultSubscription()]- )+ await RoundRobinOrchestrator.register(runtime, "orchestrator", lambda: RoundRobinOrchestrator([coder, user_proxy]))runtime.start()await runtime.send_message(RequestReplyMessage(), user_proxy.id)diff --git a/python/packages/team-one/examples/example_websurfer.py b/python/packages/team-one/examples/example_websurfer.pyindex e5778ee74..b9de3c901 100644--- a/python/packages/team-one/examples/example_websurfer.py+++ b/python/packages/team-one/examples/example_websurfer.py@@ -10,7 +10,6 @@ import osfrom autogen_core.application import SingleThreadedAgentRuntimefrom autogen_core.application.logging import EVENT_LOGGER_NAMEfrom autogen_core.base import AgentId, AgentProxy-from autogen_core.components import DefaultSubscriptionfrom team_one.agents.multimodal_web_surfer import MultimodalWebSurferfrom team_one.agents.orchestrator import RoundRobinOrchestratorfrom team_one.agents.user_proxy import UserProxy@@ -28,14 +27,14 @@ async def main() -> None:client = create_completion_client_from_env(model="gpt-4o")# Register agents.- await runtime.register("WebSurfer", lambda: MultimodalWebSurfer(), lambda: [DefaultSubscription()])+ await MultimodalWebSurfer.register(runtime, "WebSurfer", MultimodalWebSurfer)web_surfer = AgentProxy(AgentId("WebSurfer", "default"), runtime)- await runtime.register("UserProxy", lambda: UserProxy(), lambda: [DefaultSubscription()])+ await UserProxy.register(runtime, "UserProxy", UserProxy)user_proxy = AgentProxy(AgentId("UserProxy", "default"), runtime)- await runtime.register(- "orchestrator", lambda: RoundRobinOrchestrator([web_surfer, user_proxy]), lambda: [DefaultSubscription()]+ await RoundRobinOrchestrator.register(+ runtime, "orchestrator", lambda: RoundRobinOrchestrator([web_surfer, user_proxy]))runtime.start()diff --git a/python/packages/team-one/pyproject.toml b/python/packages/team-one/pyproject.tomlindex 848f7bc22..05a962d8d 100644--- a/python/packages/team-one/pyproject.toml+++ b/python/packages/team-one/pyproject.toml@@ -74,5 +74,5 @@ include = [[tool.pyright]-extend = "../../pyproject.toml"+extends = "../../pyproject.toml"include = ["src", "tests", "examples"]\ No newline at end of filediff --git a/python/packages/team-one/src/team_one/agents/coder.py b/python/packages/team-one/src/team_one/agents/coder.pyindex 01db3bc9b..43b23f269 100644--- a/python/packages/team-one/src/team_one/agents/coder.py+++ b/python/packages/team-one/src/team_one/agents/coder.py@@ -1,8 +1,9 @@import re-from typing import List, Optional, Tuple, Union+from typing import List, Tuple, Unionfrom autogen_core.base import CancellationToken-from autogen_core.components.code_executor import CodeBlock, CodeExecutor, DockerCommandLineCodeExecutor+from autogen_core.components import default_subscription+from autogen_core.components.code_executor import CodeBlock, CodeExecutorfrom autogen_core.components.models import (ChatCompletionClient,SystemMessage,@@ -14,6 +15,7 @@ from ..utils import message_content_to_strfrom .base_worker import BaseWorker+@default_subscriptionclass Coder(BaseWorker):"""An agent that uses tools to write, execute, and debug Python code."""@@ -52,6 +54,7 @@ Reply "TERMINATE" in the end when everything is done.""")return "TERMINATE" in response.content, response.content+@default_subscriptionclass Executor(BaseWorker):DEFAULT_DESCRIPTION = "A computer terminal that performs no other action than running Python scripts (provided to it quoted in ```python code blocks), or sh shell scripts (provided to it quoted in ```sh code blocks)"diff --git a/python/packages/team-one/src/team_one/agents/file_surfer/file_surfer.py b/python/packages/team-one/src/team_one/agents/file_surfer/file_surfer.pyindex 483c5b4fe..6cd9f9591 100644--- a/python/packages/team-one/src/team_one/agents/file_surfer/file_surfer.py+++ b/python/packages/team-one/src/team_one/agents/file_surfer/file_surfer.py@@ -3,7 +3,7 @@ import timefrom typing import List, Optional, Tuplefrom autogen_core.base import CancellationToken-from autogen_core.components import FunctionCall+from autogen_core.components import FunctionCall, default_subscriptionfrom autogen_core.components.models import (ChatCompletionClient,SystemMessage,@@ -17,6 +17,7 @@ from ..base_worker import BaseWorkerfrom ._tools import TOOL_FIND_NEXT, TOOL_FIND_ON_PAGE_CTRL_F, TOOL_OPEN_LOCAL_FILE, TOOL_PAGE_DOWN, TOOL_PAGE_UP+@default_subscriptionclass FileSurfer(BaseWorker):"""An agent that uses tools to read and navigate local files."""diff --git a/python/packages/team-one/src/team_one/agents/multimodal_web_surfer/multimodal_web_surfer.py b/python/packages/team-one/src/team_one/agents/multimodal_web_surfer/multimodal_web_surfer.pyindex a92731d72..a250f321a 100644--- a/python/packages/team-one/src/team_one/agents/multimodal_web_surfer/multimodal_web_surfer.py+++ b/python/packages/team-one/src/team_one/agents/multimodal_web_surfer/multimodal_web_surfer.py@@ -13,7 +13,7 @@ from urllib.parse import quote_plus # parse_qs, quote, unquote, urlparse, urlunimport aiofilesfrom autogen_core.application.logging import EVENT_LOGGER_NAMEfrom autogen_core.base import CancellationToken-from autogen_core.components import FunctionCall+from autogen_core.components import FunctionCall, default_subscriptionfrom autogen_core.components import Image as AGImagefrom autogen_core.components.models import (AssistantMessage,@@ -75,6 +75,7 @@ class DEFAULT_CHANNEL(metaclass=SentinelMeta):pass+@default_subscriptionclass MultimodalWebSurfer(BaseWorker):"""(In preview) A multimodal agent that acts as a web surfer that can search the web and visit web pages."""diff --git a/python/packages/team-one/src/team_one/agents/orchestrator.py b/python/packages/team-one/src/team_one/agents/orchestrator.pyindex 72a8f4dca..16b264348 100644--- a/python/packages/team-one/src/team_one/agents/orchestrator.py+++ b/python/packages/team-one/src/team_one/agents/orchestrator.py@@ -2,6 +2,7 @@ import jsonfrom typing import Any, Dict, List, Optionalfrom autogen_core.base import AgentProxy, MessageContext, TopicId+from autogen_core.components import default_subscriptionfrom autogen_core.components.models import (AssistantMessage,ChatCompletionClient,@@ -23,6 +24,7 @@ from .orchestrator_prompts import ()+@default_subscriptionclass RoundRobinOrchestrator(BaseOrchestrator):def __init__(self,@@ -37,6 +39,7 @@ class RoundRobinOrchestrator(BaseOrchestrator):return self._agents[self._current_index]+@default_subscriptionclass LedgerOrchestrator(BaseOrchestrator):DEFAULT_SYSTEM_MESSAGES = [SystemMessage(ORCHESTRATOR_SYSTEM_MESSAGE),diff --git a/python/packages/team-one/src/team_one/agents/reflex_agents.py b/python/packages/team-one/src/team_one/agents/reflex_agents.pyindex 52439541e..8d6535c6c 100644--- a/python/packages/team-one/src/team_one/agents/reflex_agents.py+++ b/python/packages/team-one/src/team_one/agents/reflex_agents.py@@ -1,10 +1,11 @@from autogen_core.base import MessageContext, TopicId-from autogen_core.components import RoutedAgent, message_handler+from autogen_core.components import RoutedAgent, default_subscription, message_handlerfrom autogen_core.components.models import UserMessagefrom ..messages import BroadcastMessage, RequestReplyMessage+@default_subscriptionclass ReflexAgent(RoutedAgent):def __init__(self, description: str) -> None:super().__init__(description)diff --git a/python/packages/team-one/src/team_one/agents/user_proxy.py b/python/packages/team-one/src/team_one/agents/user_proxy.pyindex e48cdb83f..b4cb4a0d5 100755--- a/python/packages/team-one/src/team_one/agents/user_proxy.py+++ b/python/packages/team-one/src/team_one/agents/user_proxy.py@@ -2,11 +2,13 @@ import asynciofrom typing import Tuplefrom autogen_core.base import CancellationToken+from autogen_core.components import default_subscriptionfrom ..messages import UserContentfrom .base_worker import BaseWorker+@default_subscriptionclass UserProxy(BaseWorker):"""An agent that allows the user to play the role of an agent in the conversation."""diff --git a/python/packages/team-one/tests/headless_web_surfer/test_web_surfer.py b/python/packages/team-one/tests/headless_web_surfer/test_web_surfer.pyindex c234b455c..75542450b 100644--- a/python/packages/team-one/tests/headless_web_surfer/test_web_surfer.py+++ b/python/packages/team-one/tests/headless_web_surfer/test_web_surfer.py@@ -96,7 +96,8 @@ async def test_web_surfer() -> None:# Register agents.# Register agents.- await runtime.register(+ await MultimodalWebSurfer.register(+ runtime,"WebSurfer",lambda: MultimodalWebSurfer(),)@@ -168,18 +169,22 @@ async def test_web_surfer_oai() -> None:client = create_completion_client_from_env()# Register agents.- await runtime.register(+ await MultimodalWebSurfer.register(+ runtime,"WebSurfer",lambda: MultimodalWebSurfer(),)web_surfer = AgentProxy(AgentId("WebSurfer", "default"), runtime)- await runtime.register(+ await UserProxy.register(+ runtime,"UserProxy",lambda: UserProxy(),)user_proxy = AgentProxy(AgentId("UserProxy", "default"), runtime)- await runtime.register("orchestrator", lambda: RoundRobinOrchestrator([web_surfer, user_proxy]))+ await RoundRobinOrchestrator.register(+ runtime, "orchestrator", lambda: RoundRobinOrchestrator([web_surfer, user_proxy])+ )runtime.start()actual_surfer = await runtime.try_get_underlying_agent_instance(web_surfer.id, MultimodalWebSurfer)@@ -233,9 +238,8 @@ async def test_web_surfer_bing() -> None:client = create_completion_client_from_env(env)# Register agents.-- # Register agents.- await runtime.register(+ await MultimodalWebSurfer.register(+ runtime,"WebSurfer",lambda: MultimodalWebSurfer(),)