Skip to content

Commit bb44381

Browse files
lspinheirolpinheiromsjackgerrits
authored and
ekzhu
committed
Add models.openai and tools.langchain namespaces (#4601)
* add models.openai namespace * refactor tools namespace * update lock file * revert pyproject changes * update docs and add cast * update ext models doc ref * increase underline * add reply models namespace * update imports * fix test * linting * fix missing conflicts * revert pydantic changes * rename to replay * replay * fix reply * Fix test * formatting * example --------- Co-authored-by: Leonardo Pinheiro <[email protected]> Co-authored-by: Jack Gerrits <[email protected]> Co-authored-by: Jack Gerrits <[email protected]>
1 parent 43a876b commit bb44381

File tree

63 files changed

+634
-621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+634
-621
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class AssistantAgent(BaseChatAgent):
121121
122122
import asyncio
123123
from autogen_core import CancellationToken
124-
from autogen_ext.models import OpenAIChatCompletionClient
124+
from autogen_ext.models.openai import OpenAIChatCompletionClient
125125
from autogen_agentchat.agents import AssistantAgent
126126
from autogen_agentchat.messages import TextMessage
127127
@@ -149,7 +149,7 @@ async def main() -> None:
149149
.. code-block:: python
150150
151151
import asyncio
152-
from autogen_ext.models import OpenAIChatCompletionClient
152+
from autogen_ext.models.openai import OpenAIChatCompletionClient
153153
from autogen_agentchat.agents import AssistantAgent
154154
from autogen_agentchat.messages import TextMessage
155155
from autogen_agentchat.ui import Console
@@ -183,7 +183,7 @@ async def main() -> None:
183183
184184
import asyncio
185185
from autogen_core import CancellationToken
186-
from autogen_ext.models import OpenAIChatCompletionClient
186+
from autogen_ext.models.openai import OpenAIChatCompletionClient
187187
from autogen_agentchat.agents import AssistantAgent
188188
from autogen_agentchat.messages import TextMessage
189189

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class SocietyOfMindAgent(BaseChatAgent):
4040
4141
import asyncio
4242
from autogen_agentchat.agents import AssistantAgent, SocietyOfMindAgent
43-
from autogen_ext.models import OpenAIChatCompletionClient
43+
from autogen_ext.models.openai import OpenAIChatCompletionClient
4444
from autogen_agentchat.teams import RoundRobinGroupChat
4545
from autogen_agentchat.conditions import MaxMessageTermination
4646

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ class Handoff(BaseModel):
1515
target: str
1616
"""The name of the target agent to handoff to."""
1717

18-
description: str = Field(default=None)
18+
description: str = Field(default="")
1919
"""The description of the handoff such as the condition under which it should happen and the target agent's ability.
2020
If not provided, it is generated from the target agent's name."""
2121

22-
name: str = Field(default=None)
22+
name: str = Field(default="")
2323
"""The name of this handoff configuration. If not provided, it is generated from the target agent's name."""
2424

25-
message: str = Field(default=None)
25+
message: str = Field(default="")
2626
"""The message to the target agent.
2727
If not provided, it is generated from the target agent's name."""
2828

2929
@model_validator(mode="before")
3030
@classmethod
3131
def set_defaults(cls, values: Dict[str, Any]) -> Dict[str, Any]:
32-
if values.get("description") is None:
32+
if not values.get("description"):
3333
values["description"] = f"Handoff to {values['target']}."
34-
if values.get("name") is None:
34+
if not values.get("name"):
3535
values["name"] = f"transfer_to_{values['target']}".lower()
3636
else:
3737
name = values["name"]
@@ -40,7 +40,7 @@ def set_defaults(cls, values: Dict[str, Any]) -> Dict[str, Any]:
4040
# Check if name is a valid identifier.
4141
if not name.isidentifier():
4242
raise ValueError(f"Handoff name must be a valid identifier: {values['name']}")
43-
if values.get("message") is None:
43+
if not values.get("message"):
4444
values["message"] = (
4545
f"Transferred to {values['target']}, adopting the role of {values['target']} immediately."
4646
)

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ async def run(
188188
from autogen_agentchat.agents import AssistantAgent
189189
from autogen_agentchat.conditions import MaxMessageTermination
190190
from autogen_agentchat.teams import RoundRobinGroupChat
191-
from autogen_ext.models import OpenAIChatCompletionClient
191+
from autogen_ext.models.openai import OpenAIChatCompletionClient
192192
193193
194194
async def main() -> None:
@@ -219,7 +219,7 @@ async def main() -> None:
219219
from autogen_agentchat.conditions import MaxMessageTermination
220220
from autogen_agentchat.teams import RoundRobinGroupChat
221221
from autogen_core import CancellationToken
222-
from autogen_ext.models import OpenAIChatCompletionClient
222+
from autogen_ext.models.openai import OpenAIChatCompletionClient
223223
224224
225225
async def main() -> None:
@@ -286,7 +286,7 @@ async def run_stream(
286286
from autogen_agentchat.agents import AssistantAgent
287287
from autogen_agentchat.conditions import MaxMessageTermination
288288
from autogen_agentchat.teams import RoundRobinGroupChat
289-
from autogen_ext.models import OpenAIChatCompletionClient
289+
from autogen_ext.models.openai import OpenAIChatCompletionClient
290290
291291
292292
async def main() -> None:
@@ -320,7 +320,7 @@ async def main() -> None:
320320
from autogen_agentchat.ui import Console
321321
from autogen_agentchat.teams import RoundRobinGroupChat
322322
from autogen_core import CancellationToken
323-
from autogen_ext.models import OpenAIChatCompletionClient
323+
from autogen_ext.models.openai import OpenAIChatCompletionClient
324324
325325
326326
async def main() -> None:
@@ -437,7 +437,7 @@ async def reset(self) -> None:
437437
from autogen_agentchat.agents import AssistantAgent
438438
from autogen_agentchat.conditions import MaxMessageTermination
439439
from autogen_agentchat.teams import RoundRobinGroupChat
440-
from autogen_ext.models import OpenAIChatCompletionClient
440+
from autogen_ext.models.openai import OpenAIChatCompletionClient
441441
442442
443443
async def main() -> None:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class MagenticOneGroupChat(BaseGroupChat):
3838
.. code-block:: python
3939
4040
import asyncio
41-
from autogen_ext.models import OpenAIChatCompletionClient
41+
from autogen_ext.models.openai import OpenAIChatCompletionClient
4242
from autogen_agentchat.agents import AssistantAgent
4343
from autogen_agentchat.teams import MagenticOneGroupChat
4444
from autogen_agentchat.ui import Console

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class RoundRobinGroupChat(BaseGroupChat):
8383
.. code-block:: python
8484
8585
import asyncio
86-
from autogen_ext.models import OpenAIChatCompletionClient
86+
from autogen_ext.models.openai import OpenAIChatCompletionClient
8787
from autogen_agentchat.agents import AssistantAgent
8888
from autogen_agentchat.teams import RoundRobinGroupChat
8989
from autogen_agentchat.conditions import TextMentionTermination
@@ -113,7 +113,7 @@ async def get_weather(location: str) -> str:
113113
.. code-block:: python
114114
115115
import asyncio
116-
from autogen_ext.models import OpenAIChatCompletionClient
116+
from autogen_ext.models.openai import OpenAIChatCompletionClient
117117
from autogen_agentchat.agents import AssistantAgent
118118
from autogen_agentchat.teams import RoundRobinGroupChat
119119
from autogen_agentchat.conditions import TextMentionTermination

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ class SelectorGroupChat(BaseGroupChat):
219219
.. code-block:: python
220220
221221
import asyncio
222-
from autogen_ext.models import OpenAIChatCompletionClient
222+
from autogen_ext.models.openai import OpenAIChatCompletionClient
223223
from autogen_agentchat.agents import AssistantAgent
224224
from autogen_agentchat.teams import SelectorGroupChat
225225
from autogen_agentchat.conditions import TextMentionTermination
@@ -273,7 +273,7 @@ async def book_trip() -> str:
273273
274274
import asyncio
275275
from typing import Sequence
276-
from autogen_ext.models import OpenAIChatCompletionClient
276+
from autogen_ext.models.openai import OpenAIChatCompletionClient
277277
from autogen_agentchat.agents import AssistantAgent
278278
from autogen_agentchat.teams import SelectorGroupChat
279279
from autogen_agentchat.conditions import TextMentionTermination

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class Swarm(BaseGroupChat):
108108
.. code-block:: python
109109
110110
import asyncio
111-
from autogen_ext.models import OpenAIChatCompletionClient
111+
from autogen_ext.models.openai import OpenAIChatCompletionClient
112112
from autogen_agentchat.agents import AssistantAgent
113113
from autogen_agentchat.teams import Swarm
114114
from autogen_agentchat.conditions import MaxMessageTermination
@@ -143,7 +143,7 @@ async def main() -> None:
143143
.. code-block:: python
144144
145145
import asyncio
146-
from autogen_ext.models import OpenAIChatCompletionClient
146+
from autogen_ext.models.openai import OpenAIChatCompletionClient
147147
from autogen_agentchat.agents import AssistantAgent
148148
from autogen_agentchat.teams import Swarm
149149
from autogen_agentchat.conditions import HandoffTermination, MaxMessageTermination

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
)
1717
from autogen_core import Image
1818
from autogen_core.tools import FunctionTool
19-
from autogen_ext.models import OpenAIChatCompletionClient
19+
from autogen_ext.models.openai import OpenAIChatCompletionClient
2020
from openai.resources.chat.completions import AsyncCompletions
2121
from openai.types.chat.chat_completion import ChatCompletion, Choice
2222
from openai.types.chat.chat_completion_chunk import ChatCompletionChunk

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
from autogen_core import AgentId, CancellationToken
3636
from autogen_core.tools import FunctionTool
3737
from autogen_ext.code_executors.local import LocalCommandLineCodeExecutor
38-
from autogen_ext.models import OpenAIChatCompletionClient, ReplayChatCompletionClient
38+
from autogen_ext.models.openai import OpenAIChatCompletionClient
39+
from autogen_ext.models.replay import ReplayChatCompletionClient
3940
from openai.resources.chat.completions import AsyncCompletions
4041
from openai.types.chat.chat_completion import ChatCompletion, Choice
4142
from openai.types.chat.chat_completion_chunk import ChatCompletionChunk

‎python/packages/autogen-agentchat/tests/test_magentic_one_group_chat.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
)
1919
from autogen_agentchat.teams._group_chat._magentic_one._magentic_one_orchestrator import MagenticOneOrchestrator
2020
from autogen_core import AgentId, CancellationToken
21-
from autogen_ext.models import ReplayChatCompletionClient
21+
from autogen_ext.models.replay import ReplayChatCompletionClient
2222
from utils import FileLogHandler
2323

2424
logger = logging.getLogger(EVENT_LOGGER_NAME)

‎python/packages/autogen-agentchat/tests/test_society_of_mind_agent.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from autogen_agentchat.agents import AssistantAgent, SocietyOfMindAgent
66
from autogen_agentchat.conditions import MaxMessageTermination
77
from autogen_agentchat.teams import RoundRobinGroupChat
8-
from autogen_ext.models import OpenAIChatCompletionClient
8+
from autogen_ext.models.openai import OpenAIChatCompletionClient
99
from openai.resources.chat.completions import AsyncCompletions
1010
from openai.types.chat.chat_completion import ChatCompletion, Choice
1111
from openai.types.chat.chat_completion_chunk import ChatCompletionChunk

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ python/autogen_ext.agents.web_surfer
4545
python/autogen_ext.agents.file_surfer
4646
python/autogen_ext.agents.video_surfer
4747
python/autogen_ext.agents.video_surfer.tools
48-
python/autogen_ext.models
49-
python/autogen_ext.tools
48+
python/autogen_ext.models.openai
49+
python/autogen_ext.models.replay
50+
python/autogen_ext.tools.langchain
5051
python/autogen_ext.code_executors.local
5152
python/autogen_ext.code_executors.docker
5253
python/autogen_ext.code_executors.azure

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

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
autogen\_ext.models.openai
2+
==========================
3+
4+
5+
.. automodule:: autogen_ext.models.openai
6+
:members:
7+
:undoc-members:
8+
:show-inheritance:

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

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
autogen\_ext.models.replay
2+
==========================
3+
4+
5+
.. automodule:: autogen_ext.models.replay
6+
:members:
7+
:undoc-members:
8+
:show-inheritance:

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

-8
This file was deleted.

‎python/packages/autogen-core/docs/src/reference/python/autogen_ext.tools.rst renamed to ‎python/packages/autogen-core/docs/src/reference/python/autogen_ext.tools.langchain.rst

File renamed without changes.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"from autogen_agentchat.teams import RoundRobinGroupChat\n",
2828
"from autogen_agentchat.ui import Console\n",
2929
"from autogen_core.tools import FunctionTool\n",
30-
"from autogen_ext.models import OpenAIChatCompletionClient"
30+
"from autogen_ext.models.openai import OpenAIChatCompletionClient"
3131
]
3232
},
3333
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"from autogen_agentchat.teams import RoundRobinGroupChat\n",
2828
"from autogen_agentchat.ui import Console\n",
2929
"from autogen_core.tools import FunctionTool\n",
30-
"from autogen_ext.models import OpenAIChatCompletionClient"
30+
"from autogen_ext.models.openai import OpenAIChatCompletionClient"
3131
]
3232
},
3333
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"from autogen_agentchat.conditions import TextMentionTermination\n",
2222
"from autogen_agentchat.teams import RoundRobinGroupChat\n",
2323
"from autogen_agentchat.ui import Console\n",
24-
"from autogen_ext.models import OpenAIChatCompletionClient"
24+
"from autogen_ext.models.openai import OpenAIChatCompletionClient"
2525
]
2626
},
2727
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"from autogen_agentchat.conditions import TextMentionTermination\n",
7777
"from autogen_agentchat.teams import RoundRobinGroupChat\n",
7878
"from autogen_agentchat.ui import Console\n",
79-
"from autogen_ext.models import OpenAIChatCompletionClient\n",
79+
"from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
8080
"\n",
8181
"\n",
8282
"# Define a tool\n",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"from autogen_agentchat.agents import AssistantAgent\n",
3434
"from autogen_agentchat.messages import TextMessage\n",
3535
"from autogen_core import CancellationToken\n",
36-
"from autogen_ext.models import OpenAIChatCompletionClient\n",
36+
"from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
3737
"\n",
3838
"\n",
3939
"# Define a tool that searches the web for information.\n",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"metadata": {},
4545
"outputs": [],
4646
"source": [
47-
"from autogen_ext.models import OpenAIChatCompletionClient\n",
47+
"from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
4848
"\n",
4949
"opneai_model_client = OpenAIChatCompletionClient(\n",
5050
" model=\"gpt-4o-2024-08-06\",\n",
@@ -128,7 +128,7 @@
128128
"metadata": {},
129129
"outputs": [],
130130
"source": [
131-
"from autogen_ext.models import AzureOpenAIChatCompletionClient\n",
131+
"from autogen_ext.models.openai import AzureOpenAIChatCompletionClient\n",
132132
"from azure.identity import DefaultAzureCredential, get_bearer_token_provider\n",
133133
"\n",
134134
"# Create the token provider\n",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"from autogen_agentchat.messages import AgentMessage\n",
6868
"from autogen_agentchat.teams import SelectorGroupChat\n",
6969
"from autogen_agentchat.ui import Console\n",
70-
"from autogen_ext.models import OpenAIChatCompletionClient"
70+
"from autogen_ext.models.openai import OpenAIChatCompletionClient"
7171
]
7272
},
7373
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"from autogen_agentchat.teams import RoundRobinGroupChat\n",
4040
"from autogen_agentchat.ui import Console\n",
4141
"from autogen_core import CancellationToken\n",
42-
"from autogen_ext.models import OpenAIChatCompletionClient\n",
42+
"from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
4343
"\n",
4444
"assistant_agent = AssistantAgent(\n",
4545
" name=\"assistant_agent\",\n",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"from autogen_agentchat.messages import HandoffMessage\n",
101101
"from autogen_agentchat.teams import Swarm\n",
102102
"from autogen_agentchat.ui import Console\n",
103-
"from autogen_ext.models import OpenAIChatCompletionClient"
103+
"from autogen_ext.models.openai import OpenAIChatCompletionClient"
104104
]
105105
},
106106
{

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"from autogen_agentchat.agents import AssistantAgent\n",
3434
"from autogen_agentchat.conditions import TextMentionTermination\n",
3535
"from autogen_agentchat.teams import RoundRobinGroupChat\n",
36-
"from autogen_ext.models import OpenAIChatCompletionClient\n",
36+
"from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
3737
"\n",
3838
"# Create an OpenAI model client.\n",
3939
"model_client = OpenAIChatCompletionClient(\n",
@@ -260,7 +260,7 @@
260260
"from autogen_agentchat.conditions import MaxMessageTermination, TextMentionTermination\n",
261261
"from autogen_agentchat.teams import RoundRobinGroupChat\n",
262262
"from autogen_agentchat.ui import Console\n",
263-
"from autogen_ext.models import OpenAIChatCompletionClient\n",
263+
"from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
264264
"\n",
265265
"# Create an OpenAI model client.\n",
266266
"model_client = OpenAIChatCompletionClient(\n",
@@ -633,7 +633,7 @@
633633
"from autogen_agentchat.base import Handoff\n",
634634
"from autogen_agentchat.conditions import HandoffTermination, TextMentionTermination\n",
635635
"from autogen_agentchat.teams import RoundRobinGroupChat\n",
636-
"from autogen_ext.models import OpenAIChatCompletionClient\n",
636+
"from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
637637
"\n",
638638
"# Create an OpenAI model client.\n",
639639
"model_client = OpenAIChatCompletionClient(\n",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"from autogen_agentchat.conditions import MaxMessageTermination, TextMentionTermination\n",
5959
"from autogen_agentchat.teams import RoundRobinGroupChat\n",
6060
"from autogen_agentchat.ui import Console\n",
61-
"from autogen_ext.models import OpenAIChatCompletionClient\n",
61+
"from autogen_ext.models.openai import OpenAIChatCompletionClient\n",
6262
"\n",
6363
"model_client = OpenAIChatCompletionClient(\n",
6464
" model=\"gpt-4o\",\n",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pip install azure-identity
1515
## Using the Model Client
1616

1717
```python
18-
from autogen_ext.models import AzureOpenAIChatCompletionClient
18+
from autogen_ext.models.openai import AzureOpenAIChatCompletionClient
1919
from azure.identity import DefaultAzureCredential, get_bearer_token_provider
2020

2121
# Create the token provider

0 commit comments

Comments
 (0)