Improve function call (camel-ai#279) (camel-ai#393)

Co-authored-by: Tianqi Xu <[email protected]>
Co-authored-by: Guohao Li <[email protected]>
Co-authored-by: lig <[email protected]>

Author: 3 people

camel/agents/chat_agent.py

@@ -122,7 +122,7 @@ def __init__(
         self.func_dict: Dict[str, Callable] = {}
         if function_list is not None:
             for func in function_list:
-                self.func_dict[func.name] = func.func
+                self.func_dict[func.get_function_name()] = func.func
         self.model_config = model_config or ChatGPTConfig()
 
         self.model_backend: BaseModelBackend = ModelFactory.create(

camel/configs.py

@@ -128,7 +128,9 @@ def from_openai_function_list(
                 :obj:`function_call` argument.
         """
         return cls(
-            functions=[func.as_dict() for func in function_list],
+            functions=[
+                func.get_openai_function_schema() for func in function_list
+            ],
             function_call=function_call,
             **(kwargs or {}),
         )

camel/functions/__init__.py

@@ -12,14 +12,20 @@
 # limitations under the License.
 # =========== Copyright 2023 @ CAMEL-AI.org. All Rights Reserved. ===========
 
+from .openai_function import (
+    OpenAIFunction,
+    get_openai_tool_schema,
+    get_openai_function_schema,
+)
 from .math_functions import MATH_FUNCS
-from .openai_function import OpenAIFunction
 from .search_functions import SEARCH_FUNCS
 from .weather_functions import WEATHER_FUNCS
 from .unstructured_io_fuctions import UnstructuredModules
 
 __all__ = [
     'OpenAIFunction',
+    'get_openai_tool_schema',
+    'get_openai_function_schema',
     'MATH_FUNCS',
     'SEARCH_FUNCS',
     'WEATHER_FUNCS',

camel/functions/math_functions.py

@@ -21,8 +21,8 @@ def add(a: int, b: int) -> int:
     r"""Adds two numbers.
 
     Args:
-        a (integer): The first number to be added.
-        b (integer): The second number to be added.
+        a (int): The first number to be added.
+        b (int): The second number to be added.
 
     Returns:
         integer: The sum of the two numbers.
@@ -34,8 +34,8 @@ def sub(a: int, b: int) -> int:
     r"""Do subtraction between two numbers.
 
     Args:
-        a (integer): The minuend in subtraction.
-        b (integer): The subtrahend in subtraction.
+        a (int): The minuend in subtraction.
+        b (int): The subtrahend in subtraction.
 
     Returns:
         integer: The result of subtracting :obj:`b` from :obj:`a`.
@@ -47,8 +47,8 @@ def mul(a: int, b: int) -> int:
     r"""Multiplies two integers.
 
     Args:
-        a (integer): The multiplier in the multiplication.
-        b (integer): The multiplicand in the multiplication.
+        a (int): The multiplier in the multiplication.
+        b (int): The multiplicand in the multiplication.
 
     Returns:
         integer: The product of the two numbers.