Flatten core base and components (#4513)

* Flatten core base and components * remove extra files * dont export from deprecated locations * format * fmt
microsoft · Dec 4, 2024 · 3022369 · 3022369
1 parent 6706dce
commit 3022369
Show file tree

Hide file tree

Showing 171 changed files with 1,202 additions and 959 deletions.
diff --git a/python/packages/agbench/benchmarks/AssistantBench/Templates/MagenticOne/scenario.py b/python/packages/agbench/benchmarks/AssistantBench/Templates/MagenticOne/scenario.py
@@ -8,15 +8,15 @@
 
 from typing import List
 
-from autogen_core.base import AgentId, AgentProxy, TopicId
+from autogen_core import AgentId, AgentProxy, TopicId
 from autogen_core.application import SingleThreadedAgentRuntime
 from autogen_core.application.logging import EVENT_LOGGER_NAME
 from autogen_core.components.models import (
     ChatCompletionClient,
     UserMessage,
     LLMMessage,
 )
-from autogen_core.components import DefaultSubscription, DefaultTopicId
+from autogen_core import DefaultSubscription, DefaultTopicId
 from autogen_core.components.code_executor import LocalCommandLineCodeExecutor
 from autogen_core.components.models import AssistantMessage
 

diff --git a/python/packages/agbench/benchmarks/GAIA/Templates/MagenticOne/scenario.py b/python/packages/agbench/benchmarks/GAIA/Templates/MagenticOne/scenario.py
@@ -8,7 +8,7 @@
 
 from typing import List
 
-from autogen_core.base import AgentId, AgentProxy, TopicId
+from autogen_core import AgentId, AgentProxy, TopicId
 from autogen_core.application import SingleThreadedAgentRuntime
 from autogen_core.application.logging import EVENT_LOGGER_NAME
 from autogen_core.components.models import (
@@ -17,7 +17,7 @@
     UserMessage,
     LLMMessage,
 )
-from autogen_core.components import DefaultSubscription, DefaultTopicId
+from autogen_core import DefaultSubscription, DefaultTopicId
 from autogen_core.components.code_executor import LocalCommandLineCodeExecutor
 from autogen_core.components.models import AssistantMessage
 

diff --git a/python/packages/agbench/benchmarks/HumanEval/Templates/MagenticOne/scenario.py b/python/packages/agbench/benchmarks/HumanEval/Templates/MagenticOne/scenario.py
@@ -1,10 +1,10 @@
 import asyncio
 import logging
 
-from autogen_core.base import AgentId, AgentProxy, TopicId
+from autogen_core import AgentId, AgentProxy, TopicId
 from autogen_core.application import SingleThreadedAgentRuntime
 from autogen_core.application.logging import EVENT_LOGGER_NAME
-from autogen_core.components import DefaultSubscription, DefaultTopicId
+from autogen_core import DefaultSubscription, DefaultTopicId
 from autogen_core.components.code_executor import LocalCommandLineCodeExecutor
 from autogen_core.components.models import (
     UserMessage,
@@ -41,7 +41,7 @@ async def main() -> None:
     executor = AgentProxy(AgentId("Executor", "default"), runtime)
 
     await runtime.register(
-        "Orchestrator", 
+        "Orchestrator",
         lambda: RoundRobinOrchestrator([coder, executor]),
         subscriptions=lambda: [DefaultSubscription()],
     )

diff --git a/python/packages/agbench/benchmarks/WebArena/Templates/MagenticOne/scenario.py b/python/packages/agbench/benchmarks/WebArena/Templates/MagenticOne/scenario.py
@@ -7,10 +7,10 @@
 
 from typing import Any, Dict, List, Tuple, Union
 
-from autogen_core.base import AgentId, AgentProxy, TopicId
+from autogen_core import AgentId, AgentProxy, TopicId
 from autogen_core.application import SingleThreadedAgentRuntime
 from autogen_core.application.logging import EVENT_LOGGER_NAME
-from autogen_core.components import DefaultSubscription, DefaultTopicId
+from autogen_core import DefaultSubscription, DefaultTopicId
 from autogen_core.components.code_executor import LocalCommandLineCodeExecutor
 from autogen_core.components.models import (
     ChatCompletionClient,
@@ -105,7 +105,7 @@ async def main() -> None:
             task_prompt = task_prompt.replace(k, REPLACEMENTS[k])
         fh.write(task_prompt)
         TASK = json.loads(task_prompt)
-        if TASK["start_url"] == REDDIT: 
+        if TASK["start_url"] == REDDIT:
             TASK["start_url"] = TASK["start_url"] + "/forums/all"
 
     full_task = ""
@@ -150,7 +150,7 @@ async def main() -> None:
 
     # Round-robin orchestrator
     await runtime.register(
-        "round_robin_orc", 
+        "round_robin_orc",
         lambda: RoundRobinOrchestrator(agents=[web_surfer, login_assistant],),
         subscriptions=lambda: [DefaultSubscription()],
     )
@@ -163,7 +163,7 @@ async def main() -> None:
 
             runtime.start()
             await runtime.publish_message(
-                ResetMessage(), 
+                ResetMessage(),
                 topic_id=DefaultTopicId(),
             )
             await runtime.publish_message(
@@ -192,16 +192,16 @@ async def main() -> None:
         subscriptions=lambda: [DefaultSubscription()],
     )
     executor = AgentProxy(AgentId("ComputerTerminal", "default"), runtime)
-    
+
     await runtime.register(
         "FileSurfer",
         lambda: FileSurfer(model_client=client),
         subscriptions=lambda: [DefaultSubscription()],
     )
     file_surfer = AgentProxy(AgentId("FileSurfer", "default"), runtime)
-   
+
     await runtime.register(
-        "orchestrator", 
+        "orchestrator",
         lambda: LedgerOrchestrator(
             agents=[coder, executor, file_surfer, web_surfer],
             model_client=client,
@@ -251,7 +251,7 @@ async def main() -> None:
     page = actual_surfer._page
     cdp_session = await context.new_cdp_session(page)
     config_file = "full_task.json"
-    
+
     evaluator = evaluation_harness.evaluator_router(config_file)
     score = await evaluator(
         trajectory=evaluation_harness.make_answer_trajecotry(final_answer),
@@ -260,7 +260,7 @@ async def main() -> None:
         client=cdp_session,
     #    azure_config=llm_config,
     )
-    
+
     print("FINAL SCORE: " + str(score))
 
 

diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py
@@ -4,8 +4,7 @@
 import warnings
 from typing import Any, AsyncGenerator, Awaitable, Callable, Dict, List, Sequence
 
-from autogen_core.base import CancellationToken
-from autogen_core.components import FunctionCall
+from autogen_core import CancellationToken, FunctionCall
 from autogen_core.components.models import (
     AssistantMessage,
     ChatCompletionClient,
@@ -74,7 +73,7 @@ class AssistantAgent(BaseChatAgent):
         .. code-block:: python
 
             import asyncio
-            from autogen_core.base import CancellationToken
+            from autogen_core import CancellationToken
             from autogen_ext.models import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.messages import TextMessage
@@ -107,7 +106,7 @@ async def main() -> None:
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.messages import TextMessage
             from autogen_agentchat.ui import Console
-            from autogen_core.base import CancellationToken
+            from autogen_core import CancellationToken
 
 
             async def get_current_time() -> str:
@@ -136,7 +135,7 @@ async def main() -> None:
         .. code-block:: python
 
             import asyncio
-            from autogen_core.base import CancellationToken
+            from autogen_core import CancellationToken
             from autogen_ext.models import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.messages import TextMessage

diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_base_chat_agent.py b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_base_chat_agent.py
@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import AsyncGenerator, List, Sequence
 
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 
 from ..base import ChatAgent, Response, TaskResult
 from ..messages import AgentMessage, ChatMessage, HandoffMessage, MultiModalMessage, StopMessage, TextMessage

diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_code_executor_agent.py b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_code_executor_agent.py
@@ -1,6 +1,6 @@
 from typing import List, Sequence
 
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 from autogen_core.components.code_executor import CodeBlock, CodeExecutor, extract_markdown_code_blocks
 
 from ..base import Response
@@ -28,7 +28,7 @@ class CodeExecutorAgent(BaseChatAgent):
             from autogen_agentchat.agents import CodeExecutorAgent
             from autogen_agentchat.messages import TextMessage
             from autogen_ext.code_executors import DockerCommandLineCodeExecutor
-            from autogen_core.base import CancellationToken
+            from autogen_core import CancellationToken
 
 
             async def run_code_executor_agent() -> None:

diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_society_of_mind_agent.py b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_society_of_mind_agent.py
@@ -1,7 +1,6 @@
 from typing import AsyncGenerator, List, Sequence
 
-from autogen_core.base import CancellationToken
-from autogen_core.components import Image
+from autogen_core import CancellationToken, Image
 from autogen_core.components.models import ChatCompletionClient
 from autogen_core.components.models._types import SystemMessage
 

diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_user_proxy_agent.py b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_user_proxy_agent.py
@@ -2,7 +2,7 @@
 from inspect import iscoroutinefunction
 from typing import Awaitable, Callable, List, Optional, Sequence, Union, cast
 
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 
 from ..base import Response
 from ..messages import ChatMessage, HandoffMessage, TextMessage

diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/base/_chat_agent.py b/python/packages/autogen-agentchat/src/autogen_agentchat/base/_chat_agent.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import AsyncGenerator, List, Protocol, Sequence, runtime_checkable
 
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 
 from ..messages import AgentMessage, ChatMessage
 from ._task import TaskRunner

diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/base/_task.py b/python/packages/autogen-agentchat/src/autogen_agentchat/base/_task.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import AsyncGenerator, Protocol, Sequence
 
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 
 from ..messages import AgentMessage, ChatMessage
 

diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/messages.py b/python/packages/autogen-agentchat/src/autogen_agentchat/messages.py
@@ -1,6 +1,6 @@
 from typing import List
 
-from autogen_core.components import FunctionCall, Image
+from autogen_core import FunctionCall, Image
 from autogen_core.components.models import FunctionExecutionResult, RequestUsage
 from pydantic import BaseModel, ConfigDict
 

diff --git a/...on/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat.py b/...on/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat.py
@@ -4,17 +4,18 @@
 from abc import ABC, abstractmethod
 from typing import AsyncGenerator, Callable, List
 
-from autogen_core.application import SingleThreadedAgentRuntime
-from autogen_core.base import (
+from autogen_core import (
     AgentId,
     AgentInstantiationContext,
     AgentRuntime,
     AgentType,
     CancellationToken,
+    ClosureAgent,
     MessageContext,
+    TypeSubscription,
 )
-from autogen_core.components import ClosureAgent, TypeSubscription
-from autogen_core.components._closure_agent import ClosureContext
+from autogen_core._closure_agent import ClosureContext
+from autogen_core.application import SingleThreadedAgentRuntime
 
 from ... import EVENT_LOGGER_NAME
 from ...base import ChatAgent, TaskResult, Team, TerminationCondition
@@ -216,7 +217,7 @@ async def main() -> None:
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.conditions import MaxMessageTermination
             from autogen_agentchat.teams import RoundRobinGroupChat
-            from autogen_core.base import CancellationToken
+            from autogen_core import CancellationToken
             from autogen_ext.models import OpenAIChatCompletionClient
 
 
@@ -317,7 +318,7 @@ async def main() -> None:
             from autogen_agentchat.conditions import MaxMessageTermination
             from autogen_agentchat.ui import Console
             from autogen_agentchat.teams import RoundRobinGroupChat
-            from autogen_core.base import CancellationToken
+            from autogen_core import CancellationToken
             from autogen_ext.models import OpenAIChatCompletionClient
 
 

diff --git a/...ges/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat_manager.py b/...ges/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat_manager.py
@@ -2,8 +2,7 @@
 from abc import ABC, abstractmethod
 from typing import Any, List
 
-from autogen_core.base import MessageContext
-from autogen_core.components import DefaultTopicId, event, rpc
+from autogen_core import DefaultTopicId, MessageContext, event, rpc
 
 from ...base import TerminationCondition
 from ...messages import AgentMessage, ChatMessage, StopMessage

diff --git a/...ckages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_chat_agent_container.py b/...ckages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_chat_agent_container.py
@@ -1,7 +1,6 @@
 from typing import Any, List
 
-from autogen_core.base import MessageContext
-from autogen_core.components import DefaultTopicId, event, rpc
+from autogen_core import DefaultTopicId, MessageContext, event, rpc
 
 from ...base import ChatAgent, Response
 from ...messages import ChatMessage

diff --git a/...tchat/src/autogen_agentchat/teams/_group_chat/_magentic_one/_magentic_one_orchestrator.py b/...tchat/src/autogen_agentchat/teams/_group_chat/_magentic_one/_magentic_one_orchestrator.py
@@ -2,8 +2,7 @@
 import logging
 from typing import Any, Dict, List
 
-from autogen_core.base import AgentId, CancellationToken, MessageContext
-from autogen_core.components import DefaultTopicId, Image, event, rpc
+from autogen_core import AgentId, CancellationToken, DefaultTopicId, Image, MessageContext, event, rpc
 from autogen_core.components.models import (
     AssistantMessage,
     ChatCompletionClient,

diff --git a/...ges/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_sequential_routed_agent.py b/...ges/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_sequential_routed_agent.py
@@ -1,8 +1,7 @@
 import asyncio
 from typing import Any
 
-from autogen_core.base import MessageContext
-from autogen_core.components import RoutedAgent
+from autogen_core import MessageContext, RoutedAgent
 
 
 class FIFOLock:

diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/ui/_console.py b/python/packages/autogen-agentchat/src/autogen_agentchat/ui/_console.py
@@ -3,7 +3,7 @@
 import time
 from typing import AsyncGenerator, List, Optional, TypeVar, cast
 
-from autogen_core.components import Image
+from autogen_core import Image
 from autogen_core.components.models import RequestUsage
 
 from autogen_agentchat.base import Response, TaskResult

diff --git a/python/packages/autogen-agentchat/tests/test_assistant_agent.py b/python/packages/autogen-agentchat/tests/test_assistant_agent.py
@@ -14,7 +14,7 @@
     ToolCallMessage,
     ToolCallResultMessage,
 )
-from autogen_core.components import Image
+from autogen_core import Image
 from autogen_core.components.tools import FunctionTool
 from autogen_ext.models import OpenAIChatCompletionClient
 from openai.resources.chat.completions import AsyncCompletions

diff --git a/python/packages/autogen-agentchat/tests/test_group_chat.py b/python/packages/autogen-agentchat/tests/test_group_chat.py
@@ -29,8 +29,7 @@
     Swarm,
 )
 from autogen_agentchat.ui import Console
-from autogen_core.base import CancellationToken
-from autogen_core.components import FunctionCall
+from autogen_core import CancellationToken, FunctionCall
 from autogen_core.components.code_executor import LocalCommandLineCodeExecutor
 from autogen_core.components.models import FunctionExecutionResult
 from autogen_core.components.tools import FunctionTool

diff --git a/python/packages/autogen-agentchat/tests/test_magentic_one_group_chat.py b/python/packages/autogen-agentchat/tests/test_magentic_one_group_chat.py
@@ -16,7 +16,7 @@
 from autogen_agentchat.teams import (
     MagenticOneGroupChat,
 )
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 from autogen_ext.models import ReplayChatCompletionClient
 from utils import FileLogHandler
 

diff --git a/python/packages/autogen-agentchat/tests/test_sequential_routed_agent.py b/python/packages/autogen-agentchat/tests/test_sequential_routed_agent.py
@@ -5,9 +5,8 @@
 
 import pytest
 from autogen_agentchat.teams._group_chat._sequential_routed_agent import SequentialRoutedAgent
+from autogen_core import AgentId, DefaultTopicId, MessageContext, default_subscription, message_handler
 from autogen_core.application import SingleThreadedAgentRuntime
-from autogen_core.base import AgentId, MessageContext
-from autogen_core.components import DefaultTopicId, default_subscription, message_handler
 
 
 @dataclass

diff --git a/python/packages/autogen-agentchat/tests/test_userproxy_agent.py b/python/packages/autogen-agentchat/tests/test_userproxy_agent.py
@@ -5,7 +5,7 @@
 from autogen_agentchat.agents import UserProxyAgent
 from autogen_agentchat.base import Response
 from autogen_agentchat.messages import ChatMessage, HandoffMessage, TextMessage
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 
 
 @pytest.mark.asyncio

diff --git a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/agents.ipynb b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/agents.ipynb
@@ -35,7 +35,7 @@
    "source": [
     "from autogen_agentchat.agents import AssistantAgent\n",
     "from autogen_agentchat.messages import TextMessage\n",
-    "from autogen_core.base import CancellationToken\n",
+    "from autogen_core import CancellationToken\n",
     "from autogen_ext.models import OpenAIChatCompletionClient\n",
     "\n",
     "\n",