From 4db80f9b4af2c03b263f4b8783eb104b7af24369 Mon Sep 17 00:00:00 2001 From: Caldalis <2726397382@qq.com> Date: Sun, 17 May 2026 21:37:20 +0800 Subject: [PATCH 1/2] resolve Pillow dependency conflict with crawl4ai --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index aa7e6dc93..77e1f4563 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ tiktoken~=0.9.0 html2text~=2024.2.26 gymnasium~=1.1.1 -pillow~=11.1.0 +pillow>=10.4,<11.0 browsergym~=0.13.3 uvicorn~=0.34.0 unidiff~=0.7.5 From 16cb9e931599637de7ec2040cb2f11c690c73a39 Mon Sep 17 00:00:00 2001 From: Caldalis <2726397382@qq.com> Date: Sun, 17 May 2026 22:11:17 +0800 Subject: [PATCH 2/2] sync README config examples and make Daytona optional --- README.md | 18 +++++++++++------- README_ja.md | 18 +++++++++++------- README_ko.md | 18 +++++++++++------- README_zh.md | 18 +++++++++++------- app/config.py | 2 +- 5 files changed, 45 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index d4a84374f..1ff70d46c 100644 --- a/README.md +++ b/README.md @@ -103,19 +103,23 @@ cp config/config.example.toml config/config.toml ```toml # Global LLM configuration [llm] -model = "gpt-4o" -base_url = "https://api.openai.com/v1" -api_key = "sk-..." # Replace with your actual API key -max_tokens = 4096 +model = "claude-3-7-sonnet-20250219" +base_url = "https://api.anthropic.com/v1/" +api_key = "YOUR_API_KEY" +max_tokens = 8192 temperature = 0.0 # Optional configuration for specific LLM models [llm.vision] -model = "gpt-4o" -base_url = "https://api.openai.com/v1" -api_key = "sk-..." # Replace with your actual API key +model = "claude-3-7-sonnet-20250219" +base_url = "https://api.anthropic.com/v1/" +api_key = "YOUR_API_KEY" +max_tokens = 8192 +temperature = 0.0 ``` +Provider-specific templates are also available in `config/`: `config.example-model-anthropic.toml`, `config.example-model-azure.toml`, `config.example-model-google.toml`, `config.example-model-jiekouai.toml`, `config.example-model-ollama.toml`, and `config.example-model-ppio.toml`. For Daytona sandbox settings, see `config.example-daytona.toml`. + ## Quick Start One line for run OpenManus: diff --git a/README_ja.md b/README_ja.md index d5fd281e5..f1dfc435f 100644 --- a/README_ja.md +++ b/README_ja.md @@ -103,19 +103,23 @@ cp config/config.example.toml config/config.toml ```toml # グローバルLLM設定 [llm] -model = "gpt-4o" -base_url = "https://api.openai.com/v1" -api_key = "sk-..." # 実際のAPIキーに置き換えてください -max_tokens = 4096 +model = "claude-3-7-sonnet-20250219" +base_url = "https://api.anthropic.com/v1/" +api_key = "YOUR_API_KEY" +max_tokens = 8192 temperature = 0.0 # 特定のLLMモデル用のオプション設定 [llm.vision] -model = "gpt-4o" -base_url = "https://api.openai.com/v1" -api_key = "sk-..." # 実際のAPIキーに置き換えてください +model = "claude-3-7-sonnet-20250219" +base_url = "https://api.anthropic.com/v1/" +api_key = "YOUR_API_KEY" +max_tokens = 8192 +temperature = 0.0 ``` +`config/`には、プロバイダー別テンプレートとして `config.example-model-anthropic.toml`、`config.example-model-azure.toml`、`config.example-model-google.toml`、`config.example-model-jiekouai.toml`、`config.example-model-ollama.toml`、`config.example-model-ppio.toml` もあります。Daytona サンドボックス設定は `config.example-daytona.toml` を参照してください。 + ## クイックスタート OpenManusを実行する一行コマンド： diff --git a/README_ko.md b/README_ko.md index 5080f43e7..5508fca25 100644 --- a/README_ko.md +++ b/README_ko.md @@ -103,19 +103,23 @@ cp config/config.example.toml config/config.toml ```toml # 전역 LLM 설정 [llm] -model = "gpt-4o" -base_url = "https://api.openai.com/v1" -api_key = "sk-..." # 실제 API 키로 변경하세요 -max_tokens = 4096 +model = "claude-3-7-sonnet-20250219" +base_url = "https://api.anthropic.com/v1/" +api_key = "YOUR_API_KEY" +max_tokens = 8192 temperature = 0.0 # 특정 LLM 모델에 대한 선택적 설정 [llm.vision] -model = "gpt-4o" -base_url = "https://api.openai.com/v1" -api_key = "sk-..." # 실제 API 키로 변경하세요 +model = "claude-3-7-sonnet-20250219" +base_url = "https://api.anthropic.com/v1/" +api_key = "YOUR_API_KEY" +max_tokens = 8192 +temperature = 0.0 ``` +`config/`에는 제공자별 템플릿인 `config.example-model-anthropic.toml`, `config.example-model-azure.toml`, `config.example-model-google.toml`, `config.example-model-jiekouai.toml`, `config.example-model-ollama.toml`, `config.example-model-ppio.toml`도 있습니다. Daytona 샌드박스 설정은 `config.example-daytona.toml`을 참고하세요. + ## 빠른 시작 OpenManus를 실행하는 한 줄 명령어: diff --git a/README_zh.md b/README_zh.md index 680ccc1d9..e8bfd7984 100644 --- a/README_zh.md +++ b/README_zh.md @@ -104,19 +104,23 @@ cp config/config.example.toml config/config.toml ```toml # 全局 LLM 配置 [llm] -model = "gpt-4o" -base_url = "https://api.openai.com/v1" -api_key = "sk-..." # 替换为真实 API 密钥 -max_tokens = 4096 +model = "claude-3-7-sonnet-20250219" +base_url = "https://api.anthropic.com/v1/" +api_key = "YOUR_API_KEY" +max_tokens = 8192 temperature = 0.0 # 可选特定 LLM 模型配置 [llm.vision] -model = "gpt-4o" -base_url = "https://api.openai.com/v1" -api_key = "sk-..." # 替换为真实 API 密钥 +model = "claude-3-7-sonnet-20250219" +base_url = "https://api.anthropic.com/v1/" +api_key = "YOUR_API_KEY" +max_tokens = 8192 +temperature = 0.0 ``` +`config/` 中还提供了不同服务商的配置模板：`config.example-model-anthropic.toml`、`config.example-model-azure.toml`、`config.example-model-google.toml`、`config.example-model-jiekouai.toml`、`config.example-model-ollama.toml` 和 `config.example-model-ppio.toml`。Daytona 沙箱配置请参考 `config.example-daytona.toml`。 + ## 快速启动 一行命令运行 OpenManus： diff --git a/app/config.py b/app/config.py index a881e2a5e..bcfda0f60 100644 --- a/app/config.py +++ b/app/config.py @@ -106,7 +106,7 @@ class SandboxSettings(BaseModel): class DaytonaSettings(BaseModel): - daytona_api_key: str + daytona_api_key: str = Field("", description="Daytona API key") daytona_server_url: Optional[str] = Field( "https://app.daytona.io/api", description="" )