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

Remove `assistant_funtions` from `RolePlaying` (#249)

Guohao Lie1258d35f565
diff --git a/camel/configs.py b/camel/configs.py
index a75c6a509..ec9d455e7 100644
--- a/camel/configs.py
+++ b/camel/configs.py
@@ -108,6 +108,7 @@ class FunctionCallingConfig(ChatGPTConfig):
cls,
function_list: List[OpenAIFunction],
function_call: Union[Dict[str, str], str] = "auto",
+ kwargs: Optional[Dict[str, Any]] = None,
):
r"""Class method for creating an instance given the function-related
arguments.
@@ -118,6 +119,8 @@ class FunctionCallingConfig(ChatGPTConfig):
function_call (Union[Dict[str, str], str], optional): Controls how
the model responds to function calls, as specified in the
creator's documentation.
+ kwargs (Optional[Dict[str, Any]]): The extra modifications to be
+ made on the original settings defined in :obj:`ChatGPTConfig`.
Return:
FunctionCallingConfig: A new instance which loads the given
@@ -127,4 +130,5 @@ class FunctionCallingConfig(ChatGPTConfig):
return cls(
functions=[func.as_dict() for func in function_list],
function_call=function_call,
+ **(kwargs or {}),
)
diff --git a/camel/societies/role_playing.py b/camel/societies/role_playing.py
index 7e0044354..eb7ad0d8c 100644
--- a/camel/societies/role_playing.py
+++ b/camel/societies/role_playing.py
@@ -20,8 +20,6 @@ from camel.agents import (
TaskSpecifyAgent,
)
from camel.agents.chat_agent import ChatAgentResponse
-from camel.configs import FunctionCallingConfig
-from camel.functions import OpenAIFunction
from camel.generators import SystemMessageGenerator
from camel.human import Human
from camel.messages import BaseMessage
@@ -73,9 +71,6 @@ class RolePlaying:
task specify meta dict with. (default: :obj:`None`)
output_language (str, optional): The language to be output by the
agents. (default: :obj:`None`)
- assistant_functions (list, optional): List of
- :obj:`OpenAIFunction` objects to be loaded. If not specified,
- function calling will be disabled. (default: :obj:`None`)
"""
def __init__(
@@ -100,7 +95,6 @@ class RolePlaying:
extend_sys_msg_meta_dicts: Optional[List[Dict]] = None,
extend_task_specify_meta_dict: Optional[Dict] = None,
output_language: Optional[str] = None,
- assistant_functions: Optional[List[OpenAIFunction]] = None,
) -> None:
self.with_task_specify = with_task_specify
self.with_task_planner = with_task_planner
@@ -109,8 +103,6 @@ class RolePlaying:
self.task_type = task_type
self.task_prompt = task_prompt
- self.assistant_functions = assistant_functions
-
self.specified_task_prompt: Optional[TextPrompt] = None
self.init_specified_task_prompt(assistant_role_name, user_role_name,
task_specify_agent_kwargs,
@@ -286,14 +278,6 @@ class RolePlaying:
output_language (str, optional): The language to be output by the
agents.
"""
- if self.assistant_functions is not None:
- assistant_config = FunctionCallingConfig.from_openai_function_list(
- function_list=self.assistant_functions,
- function_call="auto",
- )
- else:
- assistant_config = None
-
if self.model_type is not None:
if assistant_agent_kwargs is None:
assistant_agent_kwargs = {}
@@ -304,9 +288,7 @@ class RolePlaying:
self.assistant_agent = ChatAgent(
init_assistant_sys_msg,
- model_config=assistant_config,
output_language=output_language,
- function_list=self.assistant_functions,
**(assistant_agent_kwargs or {}),
)
self.assistant_sys_msg = self.assistant_agent.system_message
diff --git a/examples/function_call/role_playing_with_function.py b/examples/function_call/role_playing_with_function.py
index 09695972b..b87b87fdc 100644
--- a/examples/function_call/role_playing_with_function.py
+++ b/examples/function_call/role_playing_with_function.py
@@ -16,6 +16,7 @@ from typing import List
from colorama import Fore
from camel.agents.chat_agent import FunctionCallingRecord
+from camel.configs import FunctionCallingConfig
from camel.functions import MATH_FUNCS, SEARCH_FUNCS
from camel.societies import RolePlaying
from camel.typing import ModelType
@@ -25,15 +26,25 @@ from camel.utils import print_text_animated
def main(model_type=ModelType.GPT_4) -> None:
task_prompt = ("Assuming the current year is 2023, estimate KAUST's "
"current age and then add 10 more years to this age.")
+
+ function_list = [*MATH_FUNCS, *SEARCH_FUNCS]
+ assistant_model_config = FunctionCallingConfig.from_openai_function_list(
+ function_list=function_list,
+ kwargs=dict(temperature=0),
+ )
+
role_play_session = RolePlaying(
assistant_role_name="Searcher",
user_role_name="Professor",
- assistant_agent_kwargs=dict(model=model_type),
+ assistant_agent_kwargs=dict(
+ model=model_type,
+ model_config=assistant_model_config,
+ function_list=function_list,
+ ),
user_agent_kwargs=dict(model=model_type),
task_prompt=task_prompt,
with_task_specify=False,
task_specify_agent_kwargs=dict(model=model_type),
- assistant_functions=[*MATH_FUNCS, *SEARCH_FUNCS],
)
print(