🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org
Python agentai-societiesartificial-intelligencecommunicative-aicooperative-aideep-learninglarge-language-modelsmulti-agent-systemsnatural-language-processing
Remove `model_type` from the `RolePlaying` (#229)
Zecheng Zhang2dcf1bcffb65
diff --git a/camel/societies/role_playing.py b/camel/societies/role_playing.pyindex 72fdc8eee..b4adc685f 100644--- a/camel/societies/role_playing.py+++ b/camel/societies/role_playing.py@@ -24,7 +24,7 @@ from camel.generators import SystemMessageGeneratorfrom camel.human import Humanfrom camel.messages import BaseMessagefrom camel.prompts import TextPrompt-from camel.typing import ModelType, RoleType, TaskType+from camel.typing import RoleType, TaskTypeclass RolePlaying:@@ -48,8 +48,6 @@ class RolePlaying:in the loop. (default: :obj:`False`)critic_criteria (str, optional): Critic criteria for the critic agent.If not specified, set the criteria to improve task performance.- model_type (ModelType, optional): The type of backend model to use.- (default: :obj:`ModelType.GPT_3_5_TURBO`)task_type (TaskType, optional): The type of task to perform.(default: :obj:`TaskType.AI_SOCIETY`)assistant_agent_kwargs (Dict, optional): Additional arguments to pass@@ -82,7 +80,6 @@ class RolePlaying:with_task_planner: bool = False,with_critic_in_the_loop: bool = False,critic_criteria: Optional[str] = None,- model_type: ModelType = ModelType.GPT_3_5_TURBO,task_type: TaskType = TaskType.AI_SOCIETY,assistant_agent_kwargs: Optional[Dict] = None,user_agent_kwargs: Optional[Dict] = None,@@ -97,7 +94,6 @@ class RolePlaying:self.with_task_specify = with_task_specifyself.with_task_planner = with_task_plannerself.with_critic_in_the_loop = with_critic_in_the_loop- self.model_type = model_typeself.task_type = task_typeself.task_prompt = task_prompt@@ -159,7 +155,6 @@ class RolePlaying:user_role=user_role_name))task_specify_meta_dict.update(extend_task_specify_meta_dict or {})task_specify_agent = TaskSpecifyAgent(- self.model_type,task_type=self.task_type,output_language=output_language,**(task_specify_agent_kwargs or {}),@@ -187,7 +182,6 @@ class RolePlaying:"""if self.with_task_planner:task_planner_agent = TaskPlannerAgent(- self.model_type,output_language=output_language,**(task_planner_agent_kwargs or {}),)@@ -264,14 +258,12 @@ class RolePlaying:"""self.assistant_agent = ChatAgent(init_assistant_sys_msg,- self.model_type,output_language=output_language,**(assistant_agent_kwargs or {}),)self.assistant_sys_msg = self.assistant_agent.system_messageself.user_agent = ChatAgent(init_user_sys_msg,- self.model_type,output_language=output_language,**(user_agent_kwargs or {}),)@@ -313,7 +305,6 @@ class RolePlaying:)self.critic = CriticAgent(self.critic_sys_msg,- self.model_type,**(critic_kwargs or {}),)diff --git a/examples/ai_society/role_playing.py b/examples/ai_society/role_playing.pyindex 6bf57256e..4a9e211ab 100644--- a/examples/ai_society/role_playing.py+++ b/examples/ai_society/role_playing.py@@ -20,11 +20,13 @@ from camel.utils import print_text_animateddef main(model_type=None) -> None:task_prompt = "Develop a trading bot for the stock market"role_play_session = RolePlaying(- "Python Programmer",- "Stock Trader",+ assistant_role_name="Python Programmer",+ assistant_agent_kwargs=dict(model=model_type),+ user_role_name="Stock Trader",+ user_agent_kwargs=dict(model=model_type),task_prompt=task_prompt,with_task_specify=True,- model_type=model_type,+ task_specify_agent_kwargs=dict(model=model_type),)print(diff --git a/examples/ai_society/role_playing_multi_lingual.py b/examples/ai_society/role_playing_multi_lingual.pyindex a25890b3d..b11e48cab 100644--- a/examples/ai_society/role_playing_multi_lingual.py+++ b/examples/ai_society/role_playing_multi_lingual.py@@ -20,11 +20,13 @@ from camel.utils import print_text_animateddef main(model_type=None) -> None:task_prompt = "Develop a trading bot for the stock market"role_play_session = RolePlaying(- "Python Programmer",- "Stock Trader",+ assistant_role_name="Python Programmer",+ assistant_agent_kwargs=dict(model=model_type),+ user_role_name="Stock Trader",+ user_agent_kwargs=dict(model=ModelType.GPT_3_5_TURBO),task_prompt=task_prompt,with_task_specify=True,- model_type=model_type,+ task_specify_agent_kwargs=dict(model=model_type),output_language="Chinese", # Arabic, French, Spanish, ...)diff --git a/examples/code/role_playing.py b/examples/code/role_playing.pyindex f1c8723c8..3152bac28 100644--- a/examples/code/role_playing.py+++ b/examples/code/role_playing.py@@ -24,11 +24,13 @@ def main(model_type=None) -> None:domain = "Sociology"meta_dict = {"language": language, "domain": domain}role_play_session = RolePlaying(- f"{language} Programmer",- f"Person working in {domain}",+ assistant_role_name=f"{language} Programmer",+ assistant_agent_kwargs=dict(mode=model_type),+ user_role_name=f"Person working in {domain}",+ user_agent_kwargs=dict(mode=model_type),task_prompt=task_prompt,with_task_specify=True,- model_type=model_type,+ task_specify_agent_kwargs=dict(mode=model_type),task_type=TaskType.CODE,extend_sys_msg_meta_dicts=[meta_dict, meta_dict],extend_task_specify_meta_dict=meta_dict,diff --git a/test/agents/test_role_playing.py b/test/agents/test_role_playing.pyindex b867087b4..e5f4caff5 100644--- a/test/agents/test_role_playing.py+++ b/test/agents/test_role_playing.py@@ -23,21 +23,28 @@ from camel.typing import ModelType, RoleType, TaskType@pytest.mark.parametrize("critic_role_name", ["human", "critic agent"])@pytest.mark.parametrize("with_critic_in_the_loop", [True, False])def test_role_playing_init(critic_role_name, with_critic_in_the_loop):+ # Only specify critic model if critic is not human+ critic_kwargs = dict(+ model=ModelType.GPT_4_32k) if critic_role_name != "human" else {}+role_playing = RolePlaying(assistant_role_name="assistant",+ assistant_agent_kwargs=dict(model=ModelType.GPT_3_5_TURBO_16K),user_role_name="user",+ user_agent_kwargs=dict(model=ModelType.GPT_3_5_TURBO_16K),critic_role_name=critic_role_name,task_prompt="Perform the task",with_task_specify=False,+ task_specify_agent_kwargs=dict(model=ModelType.GPT_4),with_task_planner=False,+ task_planner_agent_kwargs=dict(model=ModelType.GPT_4),with_critic_in_the_loop=with_critic_in_the_loop,- model_type=ModelType.GPT_3_5_TURBO,+ critic_kwargs=critic_kwargs,task_type=TaskType.AI_SOCIETY,)assert role_playing.with_task_specify is Falseassert role_playing.with_task_planner is Falseassert role_playing.with_critic_in_the_loop is with_critic_in_the_loop- assert role_playing.model_type == ModelType.GPT_3_5_TURBOassert role_playing.task_type == TaskType.AI_SOCIETYassert role_playing.task_prompt == "Perform the task"assert role_playing.specified_task_prompt is None@@ -49,7 +56,9 @@ def test_role_playing_init(critic_role_name, with_critic_in_the_loop):assert role_playing.user_sys_msg.role_type == RoleType.USERassert isinstance(role_playing.assistant_agent, ChatAgent)+ assert role_playing.assistant_agent.model == ModelType.GPT_3_5_TURBO_16Kassert isinstance(role_playing.user_agent, ChatAgent)+ assert role_playing.user_agent.model == ModelType.GPT_3_5_TURBO_16Kif not with_critic_in_the_loop:assert role_playing.critic is None@@ -60,6 +69,7 @@ def test_role_playing_init(critic_role_name, with_critic_in_the_loop):else:assert isinstance(role_playing.critic, CriticAgent)assert role_playing.critic_sys_msg is not None+ assert role_playing.critic.model == ModelType.GPT_4_32k@pytest.mark.model_backend@@ -73,8 +83,11 @@ def test_role_playing_step(task_type, extend_sys_msg_meta_dicts,extend_task_specify_meta_dict):role_playing = RolePlaying(assistant_role_name="AI Assistant",+ assistant_agent_kwargs=dict(model=ModelType.GPT_3_5_TURBO),user_role_name="AI User",+ user_agent_kwargs=dict(model=ModelType.GPT_3_5_TURBO),task_prompt="Perform the task",+ task_specify_agent_kwargs=dict(model=ModelType.GPT_3_5_TURBO),task_type=task_type,extend_sys_msg_meta_dicts=extend_sys_msg_meta_dicts,extend_task_specify_meta_dict=extend_task_specify_meta_dict,