Add models.openai and tools.langchain namespaces

python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py

@@ -81,7 +81,7 @@ class AssistantAgent(BaseChatAgent):
 
             import asyncio
             from autogen_core import CancellationToken
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.messages import TextMessage
 
@@ -109,7 +109,7 @@ async def main() -> None:
         .. code-block:: python
 
             import asyncio
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.messages import TextMessage
             from autogen_agentchat.ui import Console
@@ -143,7 +143,7 @@ async def main() -> None:
 
             import asyncio
             from autogen_core import CancellationToken
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.messages import TextMessage
 

python/packages/autogen-agentchat/src/autogen_agentchat/agents/_society_of_mind_agent.py

@@ -40,7 +40,7 @@ class SocietyOfMindAgent(BaseChatAgent):
 
         import asyncio
         from autogen_agentchat.agents import AssistantAgent, SocietyOfMindAgent
-        from autogen_ext.models import OpenAIChatCompletionClient
+        from autogen_ext.models.openai import OpenAIChatCompletionClient
         from autogen_agentchat.teams import RoundRobinGroupChat
         from autogen_agentchat.conditions import MaxMessageTermination
 

python/packages/autogen-agentchat/src/autogen_agentchat/base/_handoff.py

@@ -15,23 +15,23 @@ class Handoff(BaseModel):
     target: str
     """The name of the target agent to handoff to."""
 
-    description: str = Field(default=None)
+    description: str = Field(default="")
     """The description of the handoff such as the condition under which it should happen and the target agent's ability.
     If not provided, it is generated from the target agent's name."""
 
-    name: str = Field(default=None)
+    name: str = Field(default="")
     """The name of this handoff configuration. If not provided, it is generated from the target agent's name."""
 
-    message: str = Field(default=None)
+    message: str = Field(default="")
     """The message to the target agent.
     If not provided, it is generated from the target agent's name."""
 
     @model_validator(mode="before")
     @classmethod
     def set_defaults(cls, values: Dict[str, Any]) -> Dict[str, Any]:
-        if values.get("description") is None:
+        if not values.get("description"):
             values["description"] = f"Handoff to {values['target']}."
-        if values.get("name") is None:
+        if not values.get("name"):
             values["name"] = f"transfer_to_{values['target']}".lower()
         else:
             name = values["name"]
@@ -40,7 +40,7 @@ def set_defaults(cls, values: Dict[str, Any]) -> Dict[str, Any]:
             # Check if name is a valid identifier.
             if not name.isidentifier():
                 raise ValueError(f"Handoff name must be a valid identifier: {values['name']}")
-        if values.get("message") is None:
+        if not values.get("message"):
             values["message"] = (
                 f"Transferred to {values['target']}, adopting the role of {values['target']} immediately."
             )

python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_base_group_chat.py

@@ -188,7 +188,7 @@ async def run(
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.conditions import MaxMessageTermination
             from autogen_agentchat.teams import RoundRobinGroupChat
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
 
 
             async def main() -> None:
@@ -219,7 +219,7 @@ async def main() -> None:
             from autogen_agentchat.conditions import MaxMessageTermination
             from autogen_agentchat.teams import RoundRobinGroupChat
             from autogen_core import CancellationToken
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
 
 
             async def main() -> None:
@@ -286,7 +286,7 @@ async def run_stream(
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.conditions import MaxMessageTermination
             from autogen_agentchat.teams import RoundRobinGroupChat
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
 
 
             async def main() -> None:
@@ -320,7 +320,7 @@ async def main() -> None:
             from autogen_agentchat.ui import Console
             from autogen_agentchat.teams import RoundRobinGroupChat
             from autogen_core import CancellationToken
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
 
 
             async def main() -> None:
@@ -437,7 +437,7 @@ async def reset(self) -> None:
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.conditions import MaxMessageTermination
             from autogen_agentchat.teams import RoundRobinGroupChat
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
 
 
             async def main() -> None:

python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_magentic_one/_magentic_one_group_chat.py

@@ -38,7 +38,7 @@ class MagenticOneGroupChat(BaseGroupChat):
         .. code-block:: python
 
             import asyncio
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.teams import MagenticOneGroupChat
             from autogen_agentchat.ui import Console

python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_round_robin_group_chat.py

@@ -83,7 +83,7 @@ class RoundRobinGroupChat(BaseGroupChat):
         .. code-block:: python
 
             import asyncio
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.teams import RoundRobinGroupChat
             from autogen_agentchat.conditions import TextMentionTermination
@@ -113,7 +113,7 @@ async def get_weather(location: str) -> str:
         .. code-block:: python
 
             import asyncio
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.teams import RoundRobinGroupChat
             from autogen_agentchat.conditions import TextMentionTermination

python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_selector_group_chat.py

@@ -219,7 +219,7 @@ class SelectorGroupChat(BaseGroupChat):
         .. code-block:: python
 
             import asyncio
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.teams import SelectorGroupChat
             from autogen_agentchat.conditions import TextMentionTermination
@@ -273,7 +273,7 @@ async def book_trip() -> str:
 
             import asyncio
             from typing import Sequence
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.teams import SelectorGroupChat
             from autogen_agentchat.conditions import TextMentionTermination

python/packages/autogen-agentchat/src/autogen_agentchat/teams/_group_chat/_swarm_group_chat.py

@@ -108,7 +108,7 @@ class Swarm(BaseGroupChat):
         .. code-block:: python
 
             import asyncio
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.teams import Swarm
             from autogen_agentchat.conditions import MaxMessageTermination
@@ -143,7 +143,7 @@ async def main() -> None:
         .. code-block:: python
 
             import asyncio
-            from autogen_ext.models import OpenAIChatCompletionClient
+            from autogen_ext.models.openai import OpenAIChatCompletionClient
             from autogen_agentchat.agents import AssistantAgent
             from autogen_agentchat.teams import Swarm
             from autogen_agentchat.conditions import HandoffTermination, MaxMessageTermination

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

@@ -16,7 +16,7 @@
 )
 from autogen_core import Image
 from autogen_core.components.tools import FunctionTool
-from autogen_ext.models import OpenAIChatCompletionClient
+from autogen_ext.models.openai 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-agentchat/tests/test_group_chat.py

@@ -36,7 +36,8 @@
 from autogen_core.components.models import FunctionExecutionResult
 from autogen_core.components.tools import FunctionTool
 from autogen_ext.code_executors.local import LocalCommandLineCodeExecutor
-from autogen_ext.models import OpenAIChatCompletionClient, ReplayChatCompletionClient
+from autogen_ext.models import ReplayChatCompletionClient
+from autogen_ext.models.openai 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-agentchat/tests/test_society_of_mind_agent.py

@@ -5,7 +5,7 @@
 from autogen_agentchat.agents import AssistantAgent, SocietyOfMindAgent
 from autogen_agentchat.conditions import MaxMessageTermination
 from autogen_agentchat.teams import RoundRobinGroupChat
-from autogen_ext.models import OpenAIChatCompletionClient
+from autogen_ext.models.openai 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/reference/index.md

@@ -45,8 +45,8 @@ python/autogen_ext.agents.web_surfer
 python/autogen_ext.agents.file_surfer
 python/autogen_ext.agents.video_surfer
 python/autogen_ext.agents.video_surfer.tools
-python/autogen_ext.models
-python/autogen_ext.tools
+python/autogen_ext.models.openai
+python/autogen_ext.tools.langchain
 python/autogen_ext.code_executors.local
 python/autogen_ext.code_executors.docker
 python/autogen_ext.code_executors.azure

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

@@ -0,0 +1,8 @@
+autogen\_ext.models.openai
+==========================
+
+
+.. automodule:: autogen_ext.models.openai
+   :members:
+   :undoc-members:
+   :show-inheritance:

python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/examples/company-research.ipynb

@@ -26,7 +26,7 @@
     "from autogen_agentchat.conditions import TextMentionTermination\n",
     "from autogen_agentchat.teams import RoundRobinGroupChat\n",
     "from autogen_core.components.tools import FunctionTool\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient"
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient"
    ]
   },
   {

python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/examples/literature-review.ipynb

@@ -26,7 +26,7 @@
     "from autogen_agentchat.conditions import TextMentionTermination\n",
     "from autogen_agentchat.teams import RoundRobinGroupChat\n",
     "from autogen_core.components.tools import FunctionTool\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient"
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient"
    ]
   },
   {

python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/examples/travel-planning.ipynb

@@ -20,7 +20,7 @@
     "from autogen_agentchat.agents import CodingAssistantAgent\n",
     "from autogen_agentchat.conditions import TextMentionTermination\n",
     "from autogen_agentchat.teams import RoundRobinGroupChat\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient"
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient"
    ]
   },
   {

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

@@ -76,7 +76,7 @@
                 "from autogen_agentchat.conditions import TextMentionTermination\n",
                 "from autogen_agentchat.teams import RoundRobinGroupChat\n",
                 "from autogen_agentchat.ui import Console\n",
-                "from autogen_ext.models import OpenAIChatCompletionClient\n",
+                "from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
                 "\n",
                 "\n",
                 "# Define a tool\n",

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

@@ -33,7 +33,7 @@
     "from autogen_agentchat.agents import AssistantAgent\n",
     "from autogen_agentchat.messages import TextMessage\n",
     "from autogen_core import CancellationToken\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient\n",
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
     "\n",
     "\n",
     "# Define a tool that searches the web for information.\n",

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

@@ -44,7 +44,7 @@
             "metadata": {},
             "outputs": [],
             "source": [
-                "from autogen_ext.models import OpenAIChatCompletionClient\n",
+                "from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
                 "\n",
                 "opneai_model_client = OpenAIChatCompletionClient(\n",
                 "    model=\"gpt-4o-2024-08-06\",\n",
@@ -128,7 +128,7 @@
             "metadata": {},
             "outputs": [],
             "source": [
-                "from autogen_ext.models import AzureOpenAIChatCompletionClient\n",
+                "from autogen_ext.models.openai import AzureOpenAIChatCompletionClient\n",
                 "from azure.identity import DefaultAzureCredential, get_bearer_token_provider\n",
                 "\n",
                 "# Create the token provider\n",

python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/tutorial/selector-group-chat.ipynb

@@ -67,7 +67,7 @@
     "from autogen_agentchat.messages import AgentMessage\n",
     "from autogen_agentchat.teams import SelectorGroupChat\n",
     "from autogen_agentchat.ui import Console\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient"
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient"
    ]
   },
   {

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

@@ -39,7 +39,7 @@
     "from autogen_agentchat.teams import RoundRobinGroupChat\n",
     "from autogen_agentchat.ui import Console\n",
     "from autogen_core import CancellationToken\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient\n",
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
     "\n",
     "assistant_agent = AssistantAgent(\n",
     "    name=\"assistant_agent\",\n",

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

@@ -100,7 +100,7 @@
     "from autogen_agentchat.messages import HandoffMessage\n",
     "from autogen_agentchat.teams import Swarm\n",
     "from autogen_agentchat.ui import Console\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient"
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient"
    ]
   },
   {

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

@@ -59,7 +59,7 @@
     "from autogen_agentchat.agents import AssistantAgent\n",
     "from autogen_agentchat.conditions import TextMentionTermination\n",
     "from autogen_agentchat.teams import RoundRobinGroupChat\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient\n",
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
     "\n",
     "# Create an OpenAI model client.\n",
     "model_client = OpenAIChatCompletionClient(\n",
@@ -287,7 +287,7 @@
     "from autogen_agentchat.conditions import MaxMessageTermination, TextMentionTermination\n",
     "from autogen_agentchat.teams import RoundRobinGroupChat\n",
     "from autogen_agentchat.ui import Console\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient\n",
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
     "\n",
     "# Create an OpenAI model client.\n",
     "model_client = OpenAIChatCompletionClient(\n",
@@ -664,7 +664,7 @@
     "from autogen_agentchat.base import Handoff\n",
     "from autogen_agentchat.conditions import HandoffTermination, TextMentionTermination\n",
     "from autogen_agentchat.teams import RoundRobinGroupChat\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient\n",
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
     "\n",
     "# Create an OpenAI model client.\n",
     "model_client = OpenAIChatCompletionClient(\n",

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

@@ -58,7 +58,7 @@
     "from autogen_agentchat.conditions import MaxMessageTermination, TextMentionTermination\n",
     "from autogen_agentchat.teams import RoundRobinGroupChat\n",
     "from autogen_agentchat.ui import Console\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient\n",
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
     "\n",
     "model_client = OpenAIChatCompletionClient(\n",
     "    model=\"gpt-4o\",\n",

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_ext.models import AzureOpenAIChatCompletionClient
+from autogen_ext.models.openai 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/local-llms-ollama-litellm.ipynb

@@ -55,7 +55,7 @@
     "    SystemMessage,\n",
     "    UserMessage,\n",
     ")\n",
-    "from autogen_ext.models import OpenAIChatCompletionClient"
+    "from autogen_ext.models.openai import OpenAIChatCompletionClient"
    ]
   },
   {

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

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