Skip to content

armgit / camel

Public Imported from GitHub
0

🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org

fix: dalle toolkit naming and daytona dependency (#2787)

Wendong-Fan2c0148749543
diff --git a/camel/toolkits/__init__.py b/camel/toolkits/__init__.py
index 0ea860286..3fc1b6cf6 100644
--- a/camel/toolkits/__init__.py
+++ b/camel/toolkits/__init__.py
@@ -96,7 +96,7 @@ __all__ = [
'SearchToolkit',
'SlackToolkit',
'WhatsAppToolkit',
- 'DalleToolkit',
+ 'OpenAIImageToolkit',
'TwitterToolkit',
'WeatherToolkit',
'RetrievalToolkit',
diff --git a/camel/toolkits/craw4ai_toolkit.py b/camel/toolkits/craw4ai_toolkit.py
index 41221e5e2..62f886b10 100644
--- a/camel/toolkits/craw4ai_toolkit.py
+++ b/camel/toolkits/craw4ai_toolkit.py
@@ -71,11 +71,11 @@ class Crawl4AIToolkit(BaseToolkit):
return f"Error scraping {url}: {e}"
async def __aenter__(self):
- """Async context manager entry."""
+ r"""Async context manager entry."""
return self
async def __aexit__(self, exc_type, exc_val, exc_tb):
- """Async context manager exit - cleanup the client."""
+ r"""Async context manager exit - cleanup the client."""
if self._client is not None:
await self._client.__aexit__(exc_type, exc_val, exc_tb)
self._client = None
diff --git a/docs/key_modules/tools.md b/docs/key_modules/tools.md
index fe0b84a5b..3e274c7b9 100644
--- a/docs/key_modules/tools.md
+++ b/docs/key_modules/tools.md
@@ -100,7 +100,7 @@ CAMEL provides a variety of built-in toolkits that you can use right away. Here'
| AudioAnalysisToolkit | A toolkit for audio processing and analysis, including transcription and question answering about audio content. |
| BrowserToolkit | A toolkit for browsing the web and interacting with web pages, including browser simulation and content extraction. |
| CodeExecutionToolkit | A toolkit for code execution which can run code in various sandboxes including internal Python, Jupyter, Docker, subprocess, or e2b. |
-| DalleToolkit | A toolkit for image generation using OpenAI's DALL-E model. |
+| OpenAIImageToolkit | A toolkit for image generation using OpenAI's DALL-E model. |
| DappierToolkit | A toolkit for searching real-time data and fetching AI recommendations across key verticals like News, Finance, Stock Market, Sports, Weather and more using the Dappier API. |
| DataCommonsToolkit | A toolkit for querying and retrieving data from the Data Commons knowledge graph, including SPARQL queries, statistical time series data, and property analysis. |
| ExcelToolkit | A toolkit for extracting and processing content from Excel files, including conversion to markdown tables. |
diff --git a/docs/mintlify/key_modules/tools.mdx b/docs/mintlify/key_modules/tools.mdx
index fe0b84a5b..3e274c7b9 100644
--- a/docs/mintlify/key_modules/tools.mdx
+++ b/docs/mintlify/key_modules/tools.mdx
@@ -100,7 +100,7 @@ CAMEL provides a variety of built-in toolkits that you can use right away. Here'
| AudioAnalysisToolkit | A toolkit for audio processing and analysis, including transcription and question answering about audio content. |
| BrowserToolkit | A toolkit for browsing the web and interacting with web pages, including browser simulation and content extraction. |
| CodeExecutionToolkit | A toolkit for code execution which can run code in various sandboxes including internal Python, Jupyter, Docker, subprocess, or e2b. |
-| DalleToolkit | A toolkit for image generation using OpenAI's DALL-E model. |
+| OpenAIImageToolkit | A toolkit for image generation using OpenAI's DALL-E model. |
| DappierToolkit | A toolkit for searching real-time data and fetching AI recommendations across key verticals like News, Finance, Stock Market, Sports, Weather and more using the Dappier API. |
| DataCommonsToolkit | A toolkit for querying and retrieving data from the Data Commons knowledge graph, including SPARQL queries, statistical time series data, and property analysis. |
| ExcelToolkit | A toolkit for extracting and processing content from Excel files, including conversion to markdown tables. |
diff --git a/docs/mintlify/reference/camel.toolkits.dalle_toolkit.mdx b/docs/mintlify/reference/camel.toolkits.dalle_toolkit.mdx
index 42cc214a7..afc724242 100644
--- a/docs/mintlify/reference/camel.toolkits.dalle_toolkit.mdx
+++ b/docs/mintlify/reference/camel.toolkits.dalle_toolkit.mdx
@@ -1,17 +1,17 @@
<a id="camel.toolkits.dalle_toolkit"></a>
-<a id="camel.toolkits.dalle_toolkit.DalleToolkit"></a>
+<a id="camel.toolkits.dalle_toolkit.OpenAIImageToolkit"></a>
-## DalleToolkit
+## OpenAIImageToolkit
```python
-class DalleToolkit(BaseToolkit):
+class OpenAIImageToolkit(BaseToolkit):
```
A class representing a toolkit for image generation using OpenAI's
DALL-E model.
-<a id="camel.toolkits.dalle_toolkit.DalleToolkit.__init__"></a>
+<a id="camel.toolkits.dalle_toolkit.OpenAIImageToolkit.__init__"></a>
### __init__
@@ -19,13 +19,13 @@ DALL-E model.
def __init__(self, timeout: Optional[float] = None):
```
-Initializes a new instance of the DalleToolkit class.
+Initializes a new instance of the OpenAIImageToolkit class.
**Parameters:**
- **timeout** (Optional[float]): The timeout value for API requests in seconds. If None, no timeout is applied. (default: :obj:`None`)
-<a id="camel.toolkits.dalle_toolkit.DalleToolkit.base64_to_image"></a>
+<a id="camel.toolkits.dalle_toolkit.OpenAIImageToolkit.base64_to_image"></a>
### base64_to_image
@@ -44,7 +44,7 @@ Converts a base64 encoded string into a PIL Image object.
Optional[Image.Image]: The PIL Image object or None if conversion
fails.
-<a id="camel.toolkits.dalle_toolkit.DalleToolkit.image_path_to_base64"></a>
+<a id="camel.toolkits.dalle_toolkit.OpenAIImageToolkit.image_path_to_base64"></a>
### image_path_to_base64
@@ -63,7 +63,7 @@ Converts the file path of an image to a Base64 encoded string.
str: A Base64 encoded string representing the content of the image
file.
-<a id="camel.toolkits.dalle_toolkit.DalleToolkit.image_to_base64"></a>
+<a id="camel.toolkits.dalle_toolkit.OpenAIImageToolkit.image_to_base64"></a>
### image_to_base64
@@ -86,7 +86,7 @@ message and returns None.
str: A base64-encoded string of the image.
-<a id="camel.toolkits.dalle_toolkit.DalleToolkit.get_dalle_img"></a>
+<a id="camel.toolkits.dalle_toolkit.OpenAIImageToolkit.get_dalle_img"></a>
### get_dalle_img
@@ -106,7 +106,7 @@ The generated image is saved to the specified directory.
str: The path to the saved image.
-<a id="camel.toolkits.dalle_toolkit.DalleToolkit.get_tools"></a>
+<a id="camel.toolkits.dalle_toolkit.OpenAIImageToolkit.get_tools"></a>
### get_tools
diff --git a/examples/usecases/multi_agent_research_assistant/README.md b/examples/usecases/multi_agent_research_assistant/README.md
index 71209cd08..d28e1ad8c 100644
--- a/examples/usecases/multi_agent_research_assistant/README.md
+++ b/examples/usecases/multi_agent_research_assistant/README.md
@@ -12,7 +12,7 @@ A powerful, AI-driven research assistant built using the [CAMEL-AI](https://www.
- `ThinkingToolkit` for planning and synthesis.
- `FileWriteToolkit` for saving reports locally.
- `LinkedInToolkit` for potential dissemination.
- - `DalleToolkit` for generating illustrative images.
+ - `OpenAIImageToolkit` for generating illustrative images.
- **Streamlit Interface**: Provides an intuitive web interface for users to input topics and receive generated reports.
## 🛠️ Installation
diff --git a/examples/vision/image_crafting.py b/examples/vision/image_crafting.py
index a9eae3fd9..b2e4e3bfa 100644
--- a/examples/vision/image_crafting.py
+++ b/examples/vision/image_crafting.py
@@ -14,7 +14,7 @@
from camel.agents.chat_agent import ChatAgent
from camel.models import ModelFactory
from camel.prompts import PromptTemplateGenerator
-from camel.toolkits import DalleToolkit
+from camel.toolkits import OpenAIImageToolkit
from camel.types import (
ModelPlatformType,
ModelType,
@@ -39,7 +39,7 @@ def main():
dalle_agent = ChatAgent(
system_message=sys_msg,
model=model,
- tools=DalleToolkit().get_tools(),
+ tools=OpenAIImageToolkit().get_tools(),
)
response = dalle_agent.step("Draw a picture of a camel.")
diff --git a/examples/vision/multi_condition_image_crafting.py b/examples/vision/multi_condition_image_crafting.py
index 6e541710e..4f87811d7 100644
--- a/examples/vision/multi_condition_image_crafting.py
+++ b/examples/vision/multi_condition_image_crafting.py
@@ -17,7 +17,7 @@ from camel.agents.chat_agent import ChatAgent
from camel.generators import PromptTemplateGenerator
from camel.messages.base import BaseMessage
from camel.models import ModelFactory
-from camel.toolkits import DalleToolkit
+from camel.toolkits import OpenAIImageToolkit
from camel.types import (
ModelPlatformType,
ModelType,
@@ -42,7 +42,7 @@ def main(image_paths: list[str]) -> list[str]:
dalle_agent = ChatAgent(
system_message=sys_msg,
model=model,
- tools=DalleToolkit().get_tools(),
+ tools=OpenAIImageToolkit().get_tools(),
)
image_list = [Image.open(image_path) for image_path in image_paths]
diff --git a/examples/vision/multi_turn_image_refining.py b/examples/vision/multi_turn_image_refining.py
index f96599157..ade1738cc 100644
--- a/examples/vision/multi_turn_image_refining.py
+++ b/examples/vision/multi_turn_image_refining.py
@@ -22,7 +22,7 @@ from camel.messages import BaseMessage
from camel.models import ModelFactory
from camel.prompts import PromptTemplateGenerator
from camel.responses import ChatAgentResponse
-from camel.toolkits import DalleToolkit
+from camel.toolkits import OpenAIImageToolkit
from camel.types import (
ModelPlatformType,
ModelType,
@@ -75,7 +75,7 @@ PROMPT: here is the updated prompt!
self.artist = ChatAgent(
system_message=self.artist_sys_msg,
model=model,
- tools=DalleToolkit().get_tools(),
+ tools=OpenAIImageToolkit().get_tools(),
)
self.artist.reset()
diff --git a/examples/workforce/eigent.py b/examples/workforce/eigent.py
index 38d1f0dbd..3691b2fb0 100644
--- a/examples/workforce/eigent.py
+++ b/examples/workforce/eigent.py
@@ -24,7 +24,6 @@ from camel.toolkits import (
AudioAnalysisToolkit,
CodeExecutionToolkit,
Crawl4AIToolkit,
- DalleToolkit,
EdgeOnePagesMCPToolkit,
ExcelToolkit,
FileWriteToolkit,
@@ -36,6 +35,7 @@ from camel.toolkits import (
LinkedInToolkit,
MarkItDownToolkit,
NotionToolkit,
+ OpenAIImageToolkit,
PPTXToolkit,
RedditToolkit,
SearchToolkit,
@@ -307,7 +307,7 @@ def multi_modal_agent_factory(model: BaseModelBackend, task_id: str):
*VideoDownloaderToolkit().get_tools(),
*AudioAnalysisToolkit().get_tools(),
*ImageAnalysisToolkit().get_tools(),
- *DalleToolkit().get_tools(),
+ *OpenAIImageToolkit().get_tools(),
send_message_to_user,
HumanToolkit().ask_human_via_console,
]
diff --git a/pyproject.toml b/pyproject.toml
index 5ba8ae95b..384fc7bfe 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -177,7 +177,7 @@ dev_tools = [
"tree-sitter>=0.23.2,<0.24",
"typer>=0.15.2",
"mcp>=1.3.0",
- "daytona-sdk>=0.20.0",
+ "daytona-sdk==0.20.0",
"aci-sdk>=1.0.0b1",
"langfuse>=2.60.5",
]
@@ -374,7 +374,7 @@ all = [
"pyautogui>=0.9.54,<0.10",
"pyobvector>=0.1.18",
"scrapegraph-py>=1.12.0,<2",
- "daytona-sdk>=0.20.0",
+ "daytona-sdk==0.20.0",
"ibm-watsonx-ai>=1.3.11",
"google-genai>=1.13.0",
"aci-sdk>=1.0.0b1",
@@ -524,7 +524,7 @@ module = [
"google_generativeai",
"google_auth_oauthlib.flow",
"googleapiclient.discovery",
- "mistralai",
+ "mistralai.*",
"cohere",
"fish-audio-sdk",
"reka-api",
diff --git a/uv.lock b/uv.lock
index 6585baa0c..e30bef016 100644
--- a/uv.lock
+++ b/uv.lock
@@ -593,16 +593,16 @@ wheels = [
[[package]]
name = "botocore"
-version = "1.39.0"
+version = "1.37.3"
source = { registry = "https://pypi.org/simple" }
dependencies = [
{ name = "jmespath" },
{ name = "python-dateutil" },
{ name = "urllib3" },
]
-sdist = { url = "https://files.pythonhosted.org/packages/56/97/c34be91a7cd625b913430199c2fe8b8718753b3c4a697ecfb587d89ec499/botocore-1.39.0.tar.gz", hash = "sha256:2b8701e529a80241b989d83262a629d0d91fbd7a06ded63ecc1c9d529a383d57", size = 14095797, upload-time = "2025-06-30T19:24:54.716Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/74/fb/b243ab806d2e1e6b8a475b731cc59a1f1e4709eded4884b988a27bbc996b/botocore-1.37.3.tar.gz", hash = "sha256:fe8403eb55a88faf9b0f9da6615e5bee7be056d75e17af66c3c8f0a3b0648da4", size = 13574648, upload-time = "2025-02-27T20:27:59.559Z" }
wheels = [
- { url = "https://files.pythonhosted.org/packages/01/b6/dcd0fd188cc28d772e0df23a31ce50af4d358ef31bfee969dc5a033482a5/botocore-1.39.0-py3-none-any.whl", hash = "sha256:d8e72850d3450aeca355b654efb32c8370bf824c1945a61cad2395dc2688581e", size = 13753356, upload-time = "2025-06-30T19:24:49.416Z" },
+ { url = "https://files.pythonhosted.org/packages/88/54/772118f15b5990173aa5264946cc8c9ff70c8f02d72ee6d63167a985188c/botocore-1.37.3-py3-none-any.whl", hash = "sha256:d01bd3bf4c80e61fa88d636ad9f5c9f60a551d71549b481386c6b4efe0bb2b2e", size = 13342066, upload-time = "2025-02-27T20:27:53.137Z" },
]
[[package]]
@@ -1046,8 +1046,8 @@ requires-dist = [
{ name = "datasets", marker = "extra == 'all'", specifier = ">=3,<4" },
{ name = "datasets", marker = "extra == 'huggingface'", specifier = ">=3,<4" },
{ name = "datasets", marker = "extra == 'owl'", specifier = ">=3,<4" },
- { name = "daytona-sdk", marker = "extra == 'all'", specifier = ">=0.20.0" },
- { name = "daytona-sdk", marker = "extra == 'dev-tools'", specifier = ">=0.20.0" },
+ { name = "daytona-sdk", marker = "extra == 'all'", specifier = "==0.20.0" },
+ { name = "daytona-sdk", marker = "extra == 'dev-tools'", specifier = "==0.20.0" },
{ name = "diffusers", marker = "extra == 'all'", specifier = ">=0.25.0,<0.26" },
{ name = "diffusers", marker = "extra == 'huggingface'", specifier = ">=0.25.0,<0.26" },
{ name = "discord-py", marker = "extra == 'all'", specifier = ">=2.3.2,<3" },