refactor missing imports

python/packages/agbench/benchmarks/AssistantBench/Templates/MagenticOne/scenario.py

@@ -12,9 +12,7 @@
 from autogen_core.application import SingleThreadedAgentRuntime
 from autogen_core.application.logging import EVENT_LOGGER_NAME
 from autogen_core.components.models import (
-    AzureOpenAIChatCompletionClient,
     ChatCompletionClient,
-    ModelCapabilities,
     UserMessage,
     LLMMessage,
 )

python/packages/agbench/benchmarks/GAIA/Templates/MagenticOne/scenario.py

@@ -12,7 +12,6 @@
 from autogen_core.application import SingleThreadedAgentRuntime
 from autogen_core.application.logging import EVENT_LOGGER_NAME
 from autogen_core.components.models import (
-    AzureOpenAIChatCompletionClient,
     ChatCompletionClient,
     ModelCapabilities,
     UserMessage,

python/packages/agbench/benchmarks/HumanEval/Templates/MagenticOne/scenario.py

@@ -7,8 +7,6 @@
 from autogen_core.components import DefaultSubscription, DefaultTopicId
 from autogen_core.components.code_executor import LocalCommandLineCodeExecutor
 from autogen_core.components.models import (
-    AzureOpenAIChatCompletionClient,
-    ModelCapabilities,
     UserMessage,
 )
 

python/packages/agbench/benchmarks/WebArena/Templates/MagenticOne/scenario.py

@@ -13,9 +13,7 @@
 from autogen_core.components import DefaultSubscription, DefaultTopicId
 from autogen_core.components.code_executor import LocalCommandLineCodeExecutor
 from autogen_core.components.models import (
-    AzureOpenAIChatCompletionClient,
     ChatCompletionClient,
-    ModelCapabilities,
     UserMessage,
     SystemMessage,
     LLMMessage,

python/packages/autogen-agentchat/tests/test_group_chat.py

@@ -24,8 +24,9 @@
 from autogen_core.base import CancellationToken
 from autogen_core.components import FunctionCall
 from autogen_core.components.code_executor import LocalCommandLineCodeExecutor
-from autogen_core.components.models import FunctionExecutionResult, OpenAIChatCompletionClient
+from autogen_core.components.models import FunctionExecutionResult
 from autogen_core.components.tools import FunctionTool
+from autogen_ext.models import OpenAIChatCompletionClient
 from openai.resources.chat.completions import AsyncCompletions
 from openai.types.chat.chat_completion import ChatCompletion, Choice
 from openai.types.chat.chat_completion_chunk import ChatCompletionChunk

python/packages/autogen-core/docs/src/user-guide/core-user-guide/cookbook/azure-openai-with-aad-auth.md

@@ -15,7 +15,7 @@ pip install azure-identity
 ## Using the Model Client
 
 ```python
-from autogen_core.components.models import AzureOpenAIChatCompletionClient
+from autogen_ext.models import AzureOpenAIChatCompletionClient
 from azure.identity import DefaultAzureCredential, get_bearer_token_provider
 
 # Create the token provider

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

@@ -65,7 +65,8 @@
     "import os\n",
     "from typing import Optional\n",
     "\n",
-    "from autogen_core.components.models import AzureOpenAIChatCompletionClient, UserMessage\n",
+    "from autogen_core.components.models import UserMessage\n",
+    "from autogen_ext.models import AzureOpenAIChatCompletionClient\n",
     "\n",
     "\n",
     "# Function to get environment variable and ensure it is not None\n",

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

@@ -26,13 +26,13 @@
     "from autogen_core.components.models import (\n",
     "    ChatCompletionClient,\n",
     "    LLMMessage,\n",
-    "    OpenAIChatCompletionClient,\n",
     "    SystemMessage,\n",
     "    UserMessage,\n",
     ")\n",
     "from autogen_core.components.tool_agent import ToolAgent, ToolException, tool_agent_caller_loop\n",
     "from autogen_core.components.tools import PythonCodeExecutionTool, ToolSchema\n",
-    "from autogen_ext.code_executors import DockerCommandLineCodeExecutor"
+    "from autogen_ext.code_executors import DockerCommandLineCodeExecutor\n",
+    "from autogen_ext.models import OpenAIChatCompletionClient"
    ]
   },
   {

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

@@ -86,11 +86,11 @@
     "    AssistantMessage,\n",
     "    ChatCompletionClient,\n",
     "    LLMMessage,\n",
-    "    OpenAIChatCompletionClient,\n",
     "    SystemMessage,\n",
     "    UserMessage,\n",
     ")\n",
     "from autogen_core.components.tools import FunctionTool\n",
+    "from autogen_ext.models import OpenAIChatCompletionClient\n",
     "from IPython.display import display  # type: ignore\n",
     "from pydantic import BaseModel\n",
     "from rich.console import Console\n",

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

@@ -65,11 +65,11 @@
     "    FunctionExecutionResult,\n",
     "    FunctionExecutionResultMessage,\n",
     "    LLMMessage,\n",
-    "    OpenAIChatCompletionClient,\n",
     "    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"
    ]
   },

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

@@ -184,7 +184,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from autogen_core.components.models import AzureOpenAIChatCompletionClient\n",
+    "from autogen_ext.models import AzureOpenAIChatCompletionClient\n",
     "from azure.identity import DefaultAzureCredential, get_bearer_token_provider\n",
     "\n",
     "# Create the token provider\n",

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

@@ -165,7 +165,7 @@ def tool2(test1: int, test2: List[int]) -> str:
 
     mockcalculate_vision_tokens = MagicMock()
     monkeypatch.setattr(
-        "autogen_core.components.models._openai_client.calculate_vision_tokens", mockcalculate_vision_tokens
+        "autogen_ext.models._openai._openai_client.calculate_vision_tokens", mockcalculate_vision_tokens
     )
 
     num_tokens = client.count_tokens(messages, tools=tools)

python/packages/autogen-magentic-one/pyproject.toml

@@ -18,6 +18,7 @@ classifiers = [
 
 dependencies = [
     "autogen-core",
+    "autogen-ext",
     "beautifulsoup4",
     "aiofiles",
     "requests",

python/packages/autogen-magentic-one/src/autogen_magentic_one/utils.py

@@ -8,11 +8,10 @@
 from autogen_core.application.logging.events import LLMCallEvent
 from autogen_core.components import Image
 from autogen_core.components.models import (
-    AzureOpenAIChatCompletionClient,
     ChatCompletionClient,
     ModelCapabilities,
-    OpenAIChatCompletionClient,
 )
+from autogen_ext.models import AzureOpenAIChatCompletionClient, OpenAIChatCompletionClient
 
 from .messages import (
     AgentEvent,