Migrate model context and models modules out of components (#4613)

* Move model context out of components

* move models out of components

* rename docs file

python/packages/autogen-core/docs/src/reference/index.md

@@ -27,8 +27,8 @@ python/autogen_agentchat.state
 
 python/autogen_core
 python/autogen_core.code_executor
-python/autogen_core.components.models
-python/autogen_core.components.model_context
+python/autogen_core.models
+python/autogen_core.model_context
 python/autogen_core.components.tools
 python/autogen_core.components.tool_agent
 python/autogen_core.exceptions

python/packages/autogen-core/docs/src/reference/python/autogen_core.model_context.rst

@@ -1,8 +1,8 @@
-autogen\_core.components.model\_context
+autogen\_core.model\_context
 =======================================
 
 
-.. automodule:: autogen_core.components.model_context
+.. automodule:: autogen_core.model_context
    :members:
    :undoc-members:
    :show-inheritance:

python/packages/autogen-core/docs/src/reference/python/autogen_core.models.rst

@@ -1,8 +1,8 @@
-autogen\_core.components.models
+autogen\_core.models
 ===============================
 
 
-.. automodule:: autogen_core.components.models
+.. automodule:: autogen_core.models
    :members:
    :undoc-members:
    :show-inheritance:

python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/models.ipynb

@@ -73,7 +73,7 @@
                 }
             ],
             "source": [
-                "from autogen_core.components.models import UserMessage\n",
+                "from autogen_core.models import UserMessage\n",
                 "\n",
                 "result = await opneai_model_client.create([UserMessage(content=\"What is the capital of France?\", source=\"user\")])\n",
                 "print(result)"

python/packages/autogen-core/docs/src/user-guide/core-user-guide/cookbook/local-llms-ollama-litellm.ipynb

@@ -49,7 +49,7 @@
     "    message_handler,\n",
     ")\n",
     "from autogen_core.components.model_context import BufferedChatCompletionContext\n",
-    "from autogen_core.components.models import (\n",
+    "from autogen_core.models import (\n",
     "    AssistantMessage,\n",
     "    ChatCompletionClient,\n",
     "    SystemMessage,\n",

python/packages/autogen-core/docs/src/user-guide/core-user-guide/cookbook/structured-output-agent.ipynb

@@ -65,7 +65,7 @@
     "import os\n",
     "from typing import Optional\n",
     "\n",
-    "from autogen_core.components.models import UserMessage\n",
+    "from autogen_core.models import UserMessage\n",
     "from autogen_ext.models import AzureOpenAIChatCompletionClient\n",
     "\n",
     "\n",

python/packages/autogen-core/docs/src/user-guide/core-user-guide/cookbook/tool-use-with-intervention.ipynb

@@ -29,13 +29,13 @@
     "    message_handler,\n",
     ")\n",
     "from autogen_core.base.intervention import DefaultInterventionHandler, DropMessage\n",
-    "from autogen_core.components.models import (\n",
+    "from autogen_core.components.tools import PythonCodeExecutionTool, ToolSchema\n",
+    "from autogen_core.models import (\n",
     "    ChatCompletionClient,\n",
     "    LLMMessage,\n",
     "    SystemMessage,\n",
     "    UserMessage,\n",
     ")\n",
-    "from autogen_core.components.tools import PythonCodeExecutionTool, ToolSchema\n",
     "from autogen_core.tool_agent import ToolAgent, ToolException, tool_agent_caller_loop\n",
     "from autogen_ext.code_executors.docker import DockerCommandLineCodeExecutor\n",
     "from autogen_ext.models import OpenAIChatCompletionClient"

python/packages/autogen-core/docs/src/user-guide/core-user-guide/cookbook/topic-subscription-scenarios.ipynb

@@ -54,7 +54,7 @@
     ")\n",
     "from autogen_core._default_subscription import DefaultSubscription\n",
     "from autogen_core._default_topic import DefaultTopicId\n",
-    "from autogen_core.components.models import (\n",
+    "from autogen_core.models import (\n",
     "    SystemMessage,\n",
     ")"
    ]

python/packages/autogen-core/docs/src/user-guide/core-user-guide/design-patterns/handoffs.ipynb

@@ -65,7 +65,8 @@
     "    TypeSubscription,\n",
     "    message_handler,\n",
     ")\n",
-    "from autogen_core.components.models import (\n",
+    "from autogen_core.components.tools import FunctionTool, Tool\n",
+    "from autogen_core.models import (\n",
     "    AssistantMessage,\n",
     "    ChatCompletionClient,\n",
     "    FunctionExecutionResult,\n",
@@ -74,7 +75,6 @@
     "    SystemMessage,\n",
     "    UserMessage,\n",
     ")\n",
-    "from autogen_core.components.tools import FunctionTool, Tool\n",
     "from autogen_ext.models import OpenAIChatCompletionClient\n",
     "from pydantic import BaseModel"
    ]
@@ -120,7 +120,7 @@
     "\n",
     "We start with the `AIAgent` class, which is the class for all AI agents \n",
     "(i.e., Triage, Sales, and Issue and Repair Agents) in the multi-agent chatbot.\n",
-    "An `AIAgent` uses a {py:class}`~autogen_core.components.models.ChatCompletionClient`\n",
+    "An `AIAgent` uses a {py:class}`~autogen_core.models.ChatCompletionClient`\n",
     "to generate responses.\n",
     "It can use regular tools directly or delegate tasks to other agents using `delegate_tools`.\n",
     "It subscribes to topic type `agent_topic_type` to receive messages from the customer,\n",

python/packages/autogen-core/docs/src/user-guide/core-user-guide/design-patterns/mixture-of-agents.ipynb

@@ -39,7 +39,7 @@
                 "from typing import List\n",
                 "\n",
                 "from autogen_core import AgentId, MessageContext, RoutedAgent, SingleThreadedAgentRuntime, message_handler\n",
-                "from autogen_core.components.models import ChatCompletionClient, SystemMessage, UserMessage\n",
+                "from autogen_core.models import ChatCompletionClient, SystemMessage, UserMessage\n",
                 "from autogen_ext.models import OpenAIChatCompletionClient"
             ]
         },

python/packages/autogen-core/docs/src/user-guide/core-user-guide/design-patterns/multi-agent-debate.ipynb

@@ -52,7 +52,7 @@
                 "    default_subscription,\n",
                 "    message_handler,\n",
                 ")\n",
-                "from autogen_core.components.models import (\n",
+                "from autogen_core.models import (\n",
                 "    AssistantMessage,\n",
                 "    ChatCompletionClient,\n",
                 "    LLMMessage,\n",

python/packages/autogen-core/docs/src/user-guide/core-user-guide/design-patterns/reflection.ipynb

@@ -101,7 +101,7 @@
     "from typing import Dict, List, Union\n",
     "\n",
     "from autogen_core import MessageContext, RoutedAgent, TopicId, default_subscription, message_handler\n",
-    "from autogen_core.components.models import (\n",
+    "from autogen_core.models import (\n",
     "    AssistantMessage,\n",
     "    ChatCompletionClient,\n",
     "    LLMMessage,\n",
@@ -258,7 +258,7 @@
     "- It stores message histories for different `CodeWritingTask` in a dictionary,\n",
     "so each task has its own history.\n",
     "- When making an LLM inference request using its model client, it transforms\n",
-    "the message history into a list of {py:class}`autogen_core.components.models.LLMMessage` objects\n",
+    "the message history into a list of {py:class}`autogen_core.models.LLMMessage` objects\n",
     "to pass to the model client.\n",
     "\n",
     "The reviewer agent subscribes to the `CodeReviewTask` message and publishes the `CodeReviewResult` message."

python/packages/autogen-core/docs/src/user-guide/core-user-guide/design-patterns/sequential-workflow.ipynb

@@ -57,7 +57,7 @@
     "    message_handler,\n",
     "    type_subscription,\n",
     ")\n",
-    "from autogen_core.components.models import ChatCompletionClient, SystemMessage, UserMessage\n",
+    "from autogen_core.models import ChatCompletionClient, SystemMessage, UserMessage\n",
     "from autogen_ext.models import OpenAIChatCompletionClient"
    ]
   },

python/packages/autogen-core/docs/src/user-guide/core-user-guide/framework/model-clients.ipynb

@@ -6,9 +6,9 @@
    "source": [
     "# Model Clients\n",
     "\n",
-    "AutoGen provides the {py:mod}`autogen_core.components.models` module with a suite of built-in\n",
+    "AutoGen provides the {py:mod}`autogen_core.models` module with a suite of built-in\n",
     "model clients for using ChatCompletion API.\n",
-    "All model clients implement the {py:class}`~autogen_core.components.models.ChatCompletionClient` protocol class."
+    "All model clients implement the {py:class}`~autogen_core.models.ChatCompletionClient` protocol class."
    ]
   },
   {
@@ -32,7 +32,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from autogen_core.components.models import UserMessage\n",
+    "from autogen_core.models import UserMessage\n",
     "from autogen_ext.models import OpenAIChatCompletionClient\n",
     "\n",
     "# Create an OpenAI model client.\n",
@@ -47,7 +47,7 @@
    "metadata": {},
    "source": [
     "You can call the {py:meth}`~autogen_ext.models.OpenAIChatCompletionClient.create` method to create a\n",
-    "chat completion request, and await for an {py:class}`~autogen_core.components.models.CreateResult` object in return."
+    "chat completion request, and await for an {py:class}`~autogen_core.models.CreateResult` object in return."
    ]
   },
   {
@@ -168,7 +168,7 @@
    "source": [
     "```{note}\n",
     "The last response in the streaming response is always the final response\n",
-    "of the type {py:class}`~autogen_core.components.models.CreateResult`.\n",
+    "of the type {py:class}`~autogen_core.models.CreateResult`.\n",
     "```\n",
     "\n",
     "**NB the default usage response is to return zero values**"
@@ -333,7 +333,7 @@
     "from dataclasses import dataclass\n",
     "\n",
     "from autogen_core import MessageContext, RoutedAgent, SingleThreadedAgentRuntime, message_handler\n",
-    "from autogen_core.components.models import ChatCompletionClient, SystemMessage, UserMessage\n",
+    "from autogen_core.models import ChatCompletionClient, SystemMessage, UserMessage\n",
     "from autogen_ext.models import OpenAIChatCompletionClient\n",
     "\n",
     "\n",
@@ -474,7 +474,7 @@
    "outputs": [],
    "source": [
     "from autogen_core.components.model_context import BufferedChatCompletionContext\n",
-    "from autogen_core.components.models import AssistantMessage\n",
+    "from autogen_core.models import AssistantMessage\n",
     "\n",
     "\n",
     "class SimpleAgentWithContext(RoutedAgent):\n",

python/packages/autogen-core/docs/src/user-guide/core-user-guide/framework/tools.ipynb

@@ -163,13 +163,13 @@
     "    SingleThreadedAgentRuntime,\n",
     "    message_handler,\n",
     ")\n",
-    "from autogen_core.components.models import (\n",
+    "from autogen_core.components.tools import FunctionTool, Tool, ToolSchema\n",
+    "from autogen_core.models import (\n",
     "    ChatCompletionClient,\n",
     "    LLMMessage,\n",
     "    SystemMessage,\n",
     "    UserMessage,\n",
     ")\n",
-    "from autogen_core.components.tools import FunctionTool, Tool, ToolSchema\n",
     "from autogen_core.tool_agent import ToolAgent, tool_agent_caller_loop\n",
     "from autogen_ext.models import OpenAIChatCompletionClient\n",
     "\n",
@@ -267,7 +267,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "This example uses the {py:class}`autogen_core.components.models.OpenAIChatCompletionClient`,\n",
+    "This example uses the {py:class}`autogen_core.models.OpenAIChatCompletionClient`,\n",
     "for Azure OpenAI and other clients, see [Model Clients](./model-clients.ipynb).\n",
     "Let's test the agent with a question about stock price."
    ]

python/packages/autogen-core/docs/src/user-guide/core-user-guide/quickstart.ipynb

@@ -37,7 +37,7 @@
                 "\n",
                 "from autogen_core import DefaultTopicId, MessageContext, RoutedAgent, default_subscription, message_handler\n",
                 "from autogen_core.code_executor import CodeBlock, CodeExecutor\n",
-                "from autogen_core.components.models import (\n",
+                "from autogen_core.models import (\n",
                 "    AssistantMessage,\n",
                 "    ChatCompletionClient,\n",
                 "    LLMMessage,\n",

python/packages/autogen-core/samples/chess_game.py

@@ -15,9 +15,9 @@ from autogen_core import (
     DefaultTopicId,
     SingleThreadedAgentRuntime,
 )
-from autogen_core.components.model_context import BufferedChatCompletionContext
-from autogen_core.components.models import SystemMessage
 from autogen_core.components.tools import FunctionTool
+from autogen_core.model_context import BufferedChatCompletionContext
+from autogen_core.models import SystemMessage
 from chess import BLACK, SQUARE_NAMES, WHITE, Board, Move
 from chess import piece_name as get_piece_name
 from common.agents._chat_completion_agent import ChatCompletionAgent

python/packages/autogen-core/samples/common/agents/_chat_completion_agent.py

@@ -11,8 +11,9 @@ from autogen_core import (
     RoutedAgent,
     message_handler,
 )
-from autogen_core.components.model_context import ChatCompletionContext
-from autogen_core.components.models import (
+from autogen_core.components.tools import Tool
+from autogen_core.model_context import ChatCompletionContext
+from autogen_core.models import (
     AssistantMessage,
     ChatCompletionClient,
     FunctionExecutionResult,
@@ -20,7 +21,6 @@ from autogen_core.components.models import (
     SystemMessage,
     UserMessage,
 )
-from autogen_core.components.tools import Tool
 
 from ..types import (
     FunctionCallMessage,

python/packages/autogen-core/samples/common/patterns/_group_chat_manager.py

@@ -2,8 +2,8 @@ import logging
 from typing import Any, Callable, List, Mapping
 
 from autogen_core import AgentId, AgentProxy, MessageContext, RoutedAgent, message_handler
-from autogen_core.components.model_context import ChatCompletionContext
-from autogen_core.components.models import ChatCompletionClient, UserMessage
+from autogen_core.model_context import ChatCompletionContext
+from autogen_core.models import ChatCompletionClient, UserMessage
 
 from ..types import (
     MultiModalMessage,

python/packages/autogen-core/samples/common/patterns/_group_chat_utils.py

@@ -4,8 +4,8 @@ import re
 from typing import Dict, List
 
 from autogen_core import AgentProxy
-from autogen_core.components.model_context import ChatCompletionContext
-from autogen_core.components.models import ChatCompletionClient, SystemMessage, UserMessage
+from autogen_core.model_context import ChatCompletionContext
+from autogen_core.models import ChatCompletionClient, SystemMessage, UserMessage
 
 
 async def select_speaker(context: ChatCompletionContext, client: ChatCompletionClient, agents: List[AgentProxy]) -> int:

python/packages/autogen-core/samples/common/types.py

@@ -5,7 +5,7 @@ from enum import Enum
 from typing import List, Union
 
 from autogen_core import FunctionCall, Image
-from autogen_core.components.models import FunctionExecutionResultMessage
+from autogen_core.models import FunctionExecutionResultMessage
 
 
 @dataclass(kw_only=True)

python/packages/autogen-core/samples/common/utils.py

@@ -1,7 +1,7 @@
 import os
 from typing import Any, List, Optional, Union
 
-from autogen_core.components.models import (
+from autogen_core.models import (
     AssistantMessage,
     ChatCompletionClient,
     FunctionExecutionResult,

python/packages/autogen-core/samples/distributed-group-chat/_agents.py

@@ -5,7 +5,7 @@ from uuid import uuid4
 
 from _types import GroupChatMessage, MessageChunk, RequestToSpeak, UIAgentConfig
 from autogen_core import DefaultTopicId, MessageContext, RoutedAgent, message_handler
-from autogen_core.components.models import (
+from autogen_core.models import (
     AssistantMessage,
     ChatCompletionClient,
     LLMMessage,

python/packages/autogen-core/samples/distributed-group-chat/_types.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from typing import Dict
 
-from autogen_core.components.models import (
+from autogen_core.models import (
     LLMMessage,
 )
 from autogen_ext.models import AzureOpenAIClientConfiguration

python/packages/autogen-core/samples/slow_human_in_loop.py

@@ -42,14 +42,14 @@ from autogen_core import (
     type_subscription,
 )
 from autogen_core.base.intervention import DefaultInterventionHandler
-from autogen_core.components.model_context import BufferedChatCompletionContext
-from autogen_core.components.models import (
+from autogen_core.components.tools import BaseTool
+from autogen_core.model_context import BufferedChatCompletionContext
+from autogen_core.models import (
     AssistantMessage,
     ChatCompletionClient,
     SystemMessage,
     UserMessage,
 )
-from autogen_core.components.tools import BaseTool
 from common.types import TextMessage
 from common.utils import get_chat_completion_client_from_envs
 from pydantic import BaseModel, Field

python/packages/autogen-core/src/autogen_core/components/model_context/__init__.py

@@ -1,9 +1,32 @@
-from ._buffered_chat_completion_context import BufferedChatCompletionContext
-from ._chat_completion_context import ChatCompletionContext
-from ._head_and_tail_chat_completion_context import HeadAndTailChatCompletionContext
+from typing_extensions import deprecated
+
+from ...model_context import BufferedChatCompletionContext as BufferedChatCompletionContextAlias
+from ...model_context import ChatCompletionContext as ChatCompletionContextAlias
+from ...model_context import HeadAndTailChatCompletionContext as HeadAndTailChatCompletionContextAlias
 
 __all__ = [
     "ChatCompletionContext",
     "BufferedChatCompletionContext",
     "HeadAndTailChatCompletionContext",
 ]
+
+
+@deprecated(
+    "autogen_core.components.model_context.BufferedChatCompletionContextAlias moved to autogen_core.model_context.BufferedChatCompletionContextAlias. This alias will be removed in 0.4.0."
+)
+class BufferedChatCompletionContext(BufferedChatCompletionContextAlias):
+    pass
+
+
+@deprecated(
+    "autogen_core.components.model_context.HeadAndTailChatCompletionContextAlias moved to autogen_core.model_context.HeadAndTailChatCompletionContextAlias. This alias will be removed in 0.4.0."
+)
+class HeadAndTailChatCompletionContext(HeadAndTailChatCompletionContextAlias):
+    pass
+
+
+@deprecated(
+    "autogen_core.components.model_context.ChatCompletionContextAlias moved to autogen_core.model_context.ChatCompletionContextAlias. This alias will be removed in 0.4.0."
+)
+class ChatCompletionContext(ChatCompletionContextAlias):
+    pass

python/packages/autogen-core/src/autogen_core/components/models/__init__.py

@@ -1,17 +1,124 @@
-from ._model_client import ChatCompletionClient, ModelCapabilities
-from ._types import (
-    AssistantMessage,
-    ChatCompletionTokenLogprob,
-    CreateResult,
-    FinishReasons,
-    FunctionExecutionResult,
-    FunctionExecutionResultMessage,
-    LLMMessage,
-    RequestUsage,
-    SystemMessage,
-    TopLogprob,
-    UserMessage,
+from typing_extensions import deprecated
+
+from ...models import (
+    AssistantMessage as AssistantMessageAlias,
 )
+from ...models import ChatCompletionClient as ChatCompletionClientAlias
+from ...models import (
+    ChatCompletionTokenLogprob as ChatCompletionTokenLogprobAlias,
+)
+from ...models import (
+    CreateResult as CreateResultAlias,
+)
+from ...models import (
+    FinishReasons as FinishReasonsAlias,
+)
+from ...models import (
+    FunctionExecutionResult as FunctionExecutionResultAlias,
+)
+from ...models import (
+    FunctionExecutionResultMessage as FunctionExecutionResultMessageAlias,
+)
+from ...models import (
+    LLMMessage as LLMMessageAlias,
+)
+from ...models import ModelCapabilities as ModelCapabilitiesAlias
+from ...models import (
+    RequestUsage as RequestUsageAlias,
+)
+from ...models import (
+    SystemMessage as SystemMessageAlias,
+)
+from ...models import (
+    TopLogprob as TopLogprobAlias,
+)
+from ...models import (
+    UserMessage as UserMessageAlias,
+)
+
+
+@deprecated(
+    "autogen_core.models.ChatCompletionClient moved to autogen_core.models.ChatCompletionClient. This alias will be removed in 0.4.0."
+)
+class ChatCompletionClient(ChatCompletionClientAlias):
+    pass
+
+
+@deprecated(
+    "autogen_core.models.ModelCapabilities moved to autogen_core.models.ModelCapabilities. This alias will be removed in 0.4.0."
+)
+class ModelCapabilities(ModelCapabilitiesAlias):
+    pass
+
+
+@deprecated(
+    "autogen_core.models.SystemMessage moved to autogen_core.models.SystemMessage. This alias will be removed in 0.4.0."
+)
+class SystemMessage(SystemMessageAlias):
+    pass
+
+
+@deprecated(
+    "autogen_core.models.UserMessage moved to autogen_core.models.UserMessage. This alias will be removed in 0.4.0."
+)
+class UserMessage(UserMessageAlias):
+    pass
+
+
+@deprecated(
+    "autogen_core.models.AssistantMessage moved to autogen_core.models.AssistantMessage. This alias will be removed in 0.4.0."
+)
+class AssistantMessage(AssistantMessageAlias):
+    pass
+
+
+@deprecated(
+    "autogen_core.models.FunctionExecutionResult moved to autogen_core.models.FunctionExecutionResult. This alias will be removed in 0.4.0."
+)
+class FunctionExecutionResult(FunctionExecutionResultAlias):
+    pass
+
+
+@deprecated(
+    "autogen_core.models.FunctionExecutionResultMessage moved to autogen_core.models.FunctionExecutionResultMessage. This alias will be removed in 0.4.0."
+)
+class FunctionExecutionResultMessage(FunctionExecutionResultMessageAlias):
+    pass
+
+
+LLMMessage = LLMMessageAlias
+
+
+@deprecated(
+    "autogen_core.models.RequestUsage moved to autogen_core.models.RequestUsage. This alias will be removed in 0.4.0."
+)
+class RequestUsage(RequestUsageAlias):
+    pass
+
+
+FinishReasons = FinishReasonsAlias
+
+
+@deprecated(
+    "autogen_core.models.CreateResult moved to autogen_core.models.CreateResult. This alias will be removed in 0.4.0."
+)
+class CreateResult(CreateResultAlias):
+    pass
+
+
+@deprecated(
+    "autogen_core.models.TopLogprob moved to autogen_core.models.TopLogprob. This alias will be removed in 0.4.0."
+)
+class TopLogprob(TopLogprobAlias):
+    pass
+
+
+@deprecated(
+    "autogen_core.models.ChatCompletionTokenLogprob moved to autogen_core.models.ChatCompletionTokenLogprob. This alias will be removed in 0.4.0."
+)
+class ChatCompletionTokenLogprob(ChatCompletionTokenLogprobAlias):
+    pass
+
 
 __all__ = [
     "ModelCapabilities",

python/packages/autogen-core/src/autogen_core/components/tool_agent/_caller_loop.py

@@ -2,7 +2,7 @@ import asyncio
 from typing import List
 
 from ... import AgentId, AgentRuntime, BaseAgent, CancellationToken, FunctionCall
-from ..models import (
+from ...models import (
     AssistantMessage,
     ChatCompletionClient,
     FunctionExecutionResult,

python/packages/autogen-core/src/autogen_core/components/tool_agent/_tool_agent.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from typing import List
 
 from ... import FunctionCall, MessageContext, RoutedAgent, message_handler
-from ..models import FunctionExecutionResult
+from ...models import FunctionExecutionResult
 from ..tools import Tool
 
 __all__ = [

python/packages/autogen-core/src/autogen_core/model_context/__init__.py

@@ -0,0 +1,9 @@
+from ._buffered_chat_completion_context import BufferedChatCompletionContext
+from ._chat_completion_context import ChatCompletionContext
+from ._head_and_tail_chat_completion_context import HeadAndTailChatCompletionContext
+
+__all__ = [
+    "ChatCompletionContext",
+    "BufferedChatCompletionContext",
+    "HeadAndTailChatCompletionContext",
+]

python/packages/autogen-core/src/autogen_core/model_context/_head_and_tail_chat_completion_context.py

@@ -1,6 +1,6 @@
 from typing import Any, List, Mapping
 
-from ..._types import FunctionCall
+from .._types import FunctionCall
 from ..models import AssistantMessage, FunctionExecutionResultMessage, LLMMessage, UserMessage
 from ._chat_completion_context import ChatCompletionContext
 

python/packages/autogen-core/src/autogen_core/models/__init__.py

@@ -0,0 +1,30 @@
+from ._model_client import ChatCompletionClient, ModelCapabilities
+from ._types import (
+    AssistantMessage,
+    ChatCompletionTokenLogprob,
+    CreateResult,
+    FinishReasons,
+    FunctionExecutionResult,
+    FunctionExecutionResultMessage,
+    LLMMessage,
+    RequestUsage,
+    SystemMessage,
+    TopLogprob,
+    UserMessage,
+)
+
+__all__ = [
+    "ModelCapabilities",
+    "ChatCompletionClient",
+    "SystemMessage",
+    "UserMessage",
+    "AssistantMessage",
+    "FunctionExecutionResult",
+    "FunctionExecutionResultMessage",
+    "LLMMessage",
+    "RequestUsage",
+    "FinishReasons",
+    "CreateResult",
+    "TopLogprob",
+    "ChatCompletionTokenLogprob",
+]

python/packages/autogen-core/src/autogen_core/models/_model_client.py

@@ -11,8 +11,8 @@ from typing_extensions import (
     Union,
 )
 
-from ... import CancellationToken
-from ..tools import Tool, ToolSchema
+from .. import CancellationToken
+from ..components.tools import Tool, ToolSchema
 from ._types import CreateResult, LLMMessage, RequestUsage
 
 

python/packages/autogen-core/src/autogen_core/models/_types.py

@@ -4,7 +4,7 @@ from typing import List, Literal, Optional, Union
 from pydantic import BaseModel, Field
 from typing_extensions import Annotated
 
-from ... import FunctionCall, Image
+from .. import FunctionCall, Image
 
 
 class SystemMessage(BaseModel):

python/packages/autogen-core/tests/test_model_context.py

@@ -1,8 +1,8 @@
 from typing import List
 
 import pytest
-from autogen_core.components.model_context import BufferedChatCompletionContext, HeadAndTailChatCompletionContext
-from autogen_core.components.models import AssistantMessage, LLMMessage, UserMessage
+from autogen_core.model_context import BufferedChatCompletionContext, HeadAndTailChatCompletionContext
+from autogen_core.models import AssistantMessage, LLMMessage, UserMessage
 
 
 @pytest.mark.asyncio

python/packages/autogen-core/tests/test_tool_agent.py

@@ -4,7 +4,15 @@ from typing import Any, AsyncGenerator, List, Mapping, Optional, Sequence, Union
 
 import pytest
 from autogen_core import AgentId, CancellationToken, FunctionCall, SingleThreadedAgentRuntime
-from autogen_core.components.models import (
+from autogen_core.components.tool_agent import (
+    InvalidToolArgumentsException,
+    ToolAgent,
+    ToolExecutionException,
+    ToolNotFoundException,
+    tool_agent_caller_loop,
+)
+from autogen_core.components.tools import FunctionTool, Tool, ToolSchema
+from autogen_core.models import (
     AssistantMessage,
     ChatCompletionClient,
     CreateResult,
@@ -15,14 +23,6 @@ from autogen_core.components.models import (
     RequestUsage,
     UserMessage,
 )
-from autogen_core.components.tool_agent import (
-    InvalidToolArgumentsException,
-    ToolAgent,
-    ToolExecutionException,
-    ToolNotFoundException,
-    tool_agent_caller_loop,
-)
-from autogen_core.components.tools import FunctionTool, Tool, ToolSchema
 
 
 def _pass_function(input: str) -> str: