Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ag2-wrapper/PROGRESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

## 遇到的问题
- 测试 TwoAgentChat 时遇到了环境问题
- 需要正确激活 conda 环境 'ag2',以访问 ag2/pyautogen
- 需要正确激活 conda 环境 'ag2',以访问 ag2/ag2
- OpenRouter API 连接测试已成功
- 修复了LLM驱动代理的异步/同步问题:
- 将`generate_reply`和`_process_received_message`方法彻底重写为完全同步版本,避免任何异步调用
Expand Down Expand Up @@ -62,4 +62,4 @@ OpenRouter API测试成功完成。
# 运行LLM驱动代理测试(需要在conda ag2环境中执行)
cd /home/wangbo/document/wangbo/dev/ag2-wrapper && python tests/test_llm_driven_agent.py
```
注意:需要在conda环境'ag2'中运行,以访问ag2/pyautogen包。环境变量OPENROUTER_API_KEY需要已设置。
注意:需要在conda环境'ag2'中运行,以访问ag2/ag2包。环境变量OPENROUTER_API_KEY需要已设置。
2 changes: 1 addition & 1 deletion ag2-wrapper/ag2_wrapper/core/wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"未找到autogen包。请确保已正确安装:\n"
"$ pip install ag2[openai]\n"
"或者\n"
"$ pip install pyautogen\n"
"$ pip install ag2\n"
)

# 设置日志
Expand Down
6 changes: 3 additions & 3 deletions ag2-wrapper/docs/user-guide/models/ollama.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ pip install ag2[ollama]
```

<Tip>
If you have been using `autogen` or `pyautogen`, all you need to do is upgrade it using:
If you have been using `autogen` or `ag2`, all you need to do is upgrade it using:
```bash
pip install -U autogen[ollama]
```
or
```bash
pip install -U pyautogen[ollama]
pip install -U ag2[ollama]
```
as `pyautogen`, `autogen`, and `ag2` are aliases for the same PyPI package.
as `ag2`, `autogen`, and `ag2` are aliases for the same PyPI package.
</Tip>

See the sample `OAI_CONFIG_LIST` below showing how the Ollama client class is used by specifying the `api_type` as `ollama`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ pip install ag2[openai,crawl4ai]
```

<Tip>
If you have been using `autogen` or `pyautogen`, all you need to do is upgrade it using:
If you have been using `autogen` or `ag2`, all you need to do is upgrade it using:
```bash
pip install -U autogen[openai,browser-use]
```
or
```bash
pip install -U pyautogen[openai,browser-use]
pip install -U ag2[openai,browser-use]
```
as `pyautogen`, `autogen`, and `ag2` are aliases for the same PyPI package.
as `ag2`, `autogen`, and `ag2` are aliases for the same PyPI package.
</Tip>

And then setup Playwright:
Expand Down
2 changes: 1 addition & 1 deletion ag2-wrapper/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
google-generativeai>=0.3.0
autogen==0.7.5
pyautogen==0.7.5
ag2==0.7.5
docker>=6.0
httpx==0.27.2