Flatten core base and components (#4513)

* Flatten core base and components

* remove extra files

* dont export from deprecated locations

* format

* fmt

python/packages/autogen-ext/tests/code_executors/test_aca_dynamic_sessions.py

@@ -8,7 +8,7 @@ import tempfile
 
 import pytest
 from anyio import open_file
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 from autogen_core.components.code_executor import CodeBlock
 from autogen_ext.code_executors import ACADynamicSessionsCodeExecutor
 from azure.identity import DefaultAzureCredential

python/packages/autogen-ext/tests/code_executors/test_aca_user_defined_functions.py

@@ -5,7 +5,7 @@ import os
 
 import polars
 import pytest
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 from autogen_core.components.code_executor import (
     CodeBlock,
     FunctionWithRequirements,

python/packages/autogen-ext/tests/code_executors/test_docker_commandline_code_executor.py

@@ -8,7 +8,7 @@ from typing import AsyncGenerator, TypeAlias
 import pytest
 import pytest_asyncio
 from aiofiles import open
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 from autogen_core.components.code_executor import CodeBlock
 from autogen_ext.code_executors import DockerCommandLineCodeExecutor
 

python/packages/autogen-ext/tests/models/test_openai_model_client.py

@@ -3,8 +3,7 @@ from typing import Annotated, Any, AsyncGenerator, List, Tuple
 from unittest.mock import MagicMock
 
 import pytest
-from autogen_core.base import CancellationToken
-from autogen_core.components import Image
+from autogen_core import CancellationToken, Image
 from autogen_core.components.models import (
     AssistantMessage,
     CreateResult,

python/packages/autogen-ext/tests/models/test_reply_chat_completion_client.py

@@ -3,9 +3,8 @@ from dataclasses import dataclass
 from typing import List
 
 import pytest
+from autogen_core import AgentId, DefaultTopicId, MessageContext, RoutedAgent, default_subscription, message_handler
 from autogen_core.application import SingleThreadedAgentRuntime
-from autogen_core.base import AgentId, MessageContext
-from autogen_core.components import DefaultTopicId, RoutedAgent, default_subscription, message_handler
 from autogen_core.components.models import ChatCompletionClient, CreateResult, SystemMessage, UserMessage
 from autogen_ext.models import ReplayChatCompletionClient
 

python/packages/autogen-ext/tests/test_openai_assistant_agent.py

@@ -4,7 +4,7 @@ from typing import List, Literal, Optional, Union
 
 import pytest
 from autogen_agentchat.messages import TextMessage
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 from autogen_core.components.tools._base import BaseTool, Tool
 from autogen_ext.agents import OpenAIAssistantAgent
 from azure.identity import DefaultAzureCredential, get_bearer_token_provider

python/packages/autogen-ext/tests/test_tools.py

@@ -1,7 +1,7 @@
 from typing import Optional, Type
 
 import pytest
-from autogen_core.base import CancellationToken
+from autogen_core import CancellationToken
 from autogen_ext.tools import LangChainToolAdapter  # type: ignore
 from langchain_core.callbacks.manager import AsyncCallbackManagerForToolRun, CallbackManagerForToolRun
 from langchain_core.tools import BaseTool as LangChainTool