feat: synthesize the execution of tool calling (#1140)

Co-authored-by: Wendong-Fan <[email protected]> Co-authored-by: Wendong <[email protected]>
camel-ai · Nov 14, 2024 · c7e726f · c7e726f
1 parent bd0ad2f
commit c7e726f
Show file tree

Hide file tree

Showing 9 changed files with 408 additions and 103 deletions.
diff --git a/camel/agents/chat_agent.py b/camel/agents/chat_agent.py
@@ -193,6 +193,7 @@ def __init__(
         self.func_dict = {
             tool.get_function_name(): tool.func for tool in all_tools
         }
+        self.tool_dict = {tool.get_function_name(): tool for tool in all_tools}
 
         # If the user hasn't configured tools in `BaseModelBackend`,
         # the tools set from `ChatAgent` will be used.
@@ -882,6 +883,7 @@ def _structure_output_with_function(
 
         # Replace the original tools with the structuring function
         self.func_dict = {func.get_function_name(): func.func}
+        self.tool_dict = {func.get_function_name(): func}
         self.model_backend.model_config_dict = original_model_dict.copy()
         self.model_backend.model_config_dict["tools"] = [
             func.get_openai_tool_schema()
@@ -1182,19 +1184,10 @@ def step_tool_call(
         if choice.message.tool_calls is None:
             raise RuntimeError("Tool call is None")
         func_name = choice.message.tool_calls[0].function.name
-        func = self.func_dict[func_name]
 
-        args_str: str = choice.message.tool_calls[0].function.arguments
-        args = json.loads(args_str)
-
-        # Pass the extracted arguments to the indicated function
-        try:
-            result = func(**args)
-        except Exception:
-            raise ValueError(
-                f"Execution of function {func.__name__} failed with "
-                f"arguments being {args}."
-            )
+        args = json.loads(choice.message.tool_calls[0].function.arguments)
+        tool = self.tool_dict[func_name]
+        result = tool(**args)
 
         assist_msg = FunctionCallingMessage(
             role_name=self.role_name,
@@ -1243,19 +1236,10 @@ async def step_tool_call_async(
         if choice.message.tool_calls is None:
             raise RuntimeError("Tool call is None")
         func_name = choice.message.tool_calls[0].function.name
-        func = self.func_dict[func_name]
 
-        args_str: str = choice.message.tool_calls[0].function.arguments
-        args = json.loads(args_str)
-
-        # Pass the extracted arguments to the indicated function
-        try:
-            result = await func(**args)
-        except Exception:
-            raise ValueError(
-                f"Execution of function {func.__name__} failed with "
-                f"arguments being {args}."
-            )
+        args = json.loads(choice.message.tool_calls[0].function.arguments)
+        tool = self.tool_dict[func_name]
+        result = await tool(**args)
 
         assist_msg = FunctionCallingMessage(
             role_name=self.role_name,

diff --git a/camel/toolkits/__init__.py b/camel/toolkits/__init__.py
@@ -14,7 +14,6 @@
 # ruff: noqa: I001
 from .function_tool import (
     FunctionTool,
-    OpenAIFunction,
     get_openai_function_schema,
     get_openai_tool_schema,
     generate_docstring,
@@ -44,7 +43,6 @@
 __all__ = [
     'BaseToolkit',
     'FunctionTool',
-    'OpenAIFunction',
     'get_openai_function_schema',
     'get_openai_tool_schema',
     "generate_docstring",