camel-ai 0.2.61__py3-none-any.whl → 0.2.64__py3-none-any.whl

camel/tasks/task.py

@@ -14,7 +14,7 @@
 
 import re
 from enum import Enum
-from typing import Callable, Dict, List, Literal, Optional, Union
+from typing import Any, Callable, Dict, List, Literal, Optional, Union
 
 from pydantic import BaseModel
 
@@ -69,14 +69,23 @@ class Task(BaseModel):
     r"""Task is specific assignment that can be passed to a agent.
 
     Attributes:
-        content: string content for task.
-        id: An unique string identifier for the task. This should
-        ideally be provided by the provider/model which created the task.
-        state: The state which should be OPEN, RUNNING, DONE or DELETED.
-        type: task type
-        parent: The parent task, None for root task.
-        subtasks: The childrent sub-tasks for the task.
-        result: The answer for the task.
+        content (str): string content for task.
+        id (str): An unique string identifier for the task. This should
+            ideally be provided by the provider/model which created the task.
+            (default: :obj: `""`)
+        state (TaskState): The state which should be OPEN, RUNNING, DONE or
+            DELETED. (default: :obj: `TaskState.OPEN`)
+        type (Optional[str]): task type. (default: :obj: `None`)
+        parent (Optional[Task]): The parent task, None for root task.
+            (default: :obj: `None`)
+        subtasks (List[Task]): The childrent sub-tasks for the task.
+            (default: :obj: `[]`)
+        result (Optional[str]): The answer for the task.
+            (default: :obj: `""`)
+        failure_count (int): The failure count for the task.
+            (default: :obj: `0`)
+        additional_info (Optional[Dict[str, Any]]): Additional information for
+            the task. (default: :obj: `None`)
     """
 
     content: str
@@ -95,7 +104,7 @@ class Task(BaseModel):
 
     failure_count: int = 0
 
-    additional_info: Optional[str] = None
+    additional_info: Optional[Dict[str, Any]] = None
 
     @classmethod
     def from_message(cls, message: BaseMessage) -> "Task":

camel/toolkits/__init__.py

@@ -62,6 +62,7 @@ from .mcp_toolkit import MCPToolkit
 from .browser_toolkit import BrowserToolkit
 from .async_browser_toolkit import AsyncBrowserToolkit
 from .file_write_toolkit import FileWriteToolkit
+from .pptx_toolkit import PPTXToolkit
 from .terminal_toolkit import TerminalToolkit
 from .pubmed_toolkit import PubMedToolkit
 from .data_commons_toolkit import DataCommonsToolkit
@@ -124,6 +125,7 @@ __all__ = [
     'BrowserToolkit',
     'AsyncBrowserToolkit',
     'FileWriteToolkit',
+    'PPTXToolkit',
     'TerminalToolkit',
     'PubMedToolkit',
     'DataCommonsToolkit',

camel/toolkits/code_execution.py

@@ -20,10 +20,13 @@ from camel.interpreters import (
     JupyterKernelInterpreter,
     SubprocessInterpreter,
 )
+from camel.logger import get_logger
 from camel.toolkits import FunctionTool
 from camel.toolkits.base import BaseToolkit
 from camel.utils import MCPServer
 
+logger = get_logger(__name__)
+
 
 @MCPServer()
 class CodeExecutionToolkit(BaseToolkit):
@@ -36,10 +39,10 @@ class CodeExecutionToolkit(BaseToolkit):
             (default: :obj:`False`)
         unsafe_mode (bool):  If `True`, the interpreter runs the code
             by `eval()` without any security check. (default: :obj:`False`)
-        import_white_list ( Optional[List[str]]): A list of allowed imports.
+        import_white_list (Optional[List[str]]): A list of allowed imports.
             (default: :obj:`None`)
-        require_confirm (bool): Whether to require confirmation before executing code.
-            (default: :obj:`False`)
+        require_confirm (bool): Whether to require confirmation before
+            executing code. (default: :obj:`False`)
     """
 
     def __init__(
@@ -97,18 +100,41 @@ class CodeExecutionToolkit(BaseToolkit):
                 f"The sandbox type `{sandbox}` is not supported."
             )
 
-    def execute_code(self, code: str) -> str:
+    def execute_code(self, code: str, code_type: str = "python") -> str:
         r"""Execute a given code snippet.
 
         Args:
             code (str): The input code to the Code Interpreter tool call.
+            code_type (str): The type of the code to be executed
+                (e.g. node.js, python, etc). (default: obj:`python`)
 
         Returns:
             str: The text output from the Code Interpreter tool call.
         """
-        output = self.interpreter.run(code, "python")
-        # ruff: noqa: E501
-        content = f"Executed the code below:\n```py\n{code}\n```\n> Executed Results:\n{output}"
+        output = self.interpreter.run(code, code_type)
+        content = (
+            f"Executed the code below:\n```{code_type}\n{code}\n```\n"
+            f"> Executed Results:\n{output}"
+        )
+        if self.verbose:
+            print(content)
+        return content
+
+    def execute_command(self, command: str) -> Union[str, tuple[str, str]]:
+        r"""Execute a command can be used to resolve the dependency of the
+        code.
+
+        Args:
+            command (str): The command to execute.
+
+        Returns:
+            Union[str, tuple[str, str]]: The output of the command.
+        """
+        output = self.interpreter.execute_command(command)
+        content = (
+            f"Executed the command below:\n```sh\n{command}\n```\n"
+            f"> Executed Results:\n{output}"
+        )
         if self.verbose:
             print(content)
         return content
@@ -121,4 +147,7 @@ class CodeExecutionToolkit(BaseToolkit):
             List[FunctionTool]: A list of FunctionTool objects
                 representing the functions in the toolkit.
         """
-        return [FunctionTool(self.execute_code)]
+        return [
+            FunctionTool(self.execute_code),
+            FunctionTool(self.execute_command),
+        ]

camel/toolkits/file_write_toolkit.py

@@ -338,8 +338,10 @@ class FileWriteToolkit(BaseToolkit):
 
         Args:
             content (Union[str, List[List[str]]]): The content to write to the
-                file. For all formats, content must be a string or list in the
-                appropriate format.
+                file. Content format varies by file type:
+                - Text formats (txt, md, html, yaml): string
+                - CSV: string or list of lists
+                - JSON: string or serializable object
             filename (str): The name or path of the file. If a relative path is
                 supplied, it is resolved to self.output_dir.
             encoding (Optional[str]): The character encoding to use. (default: