From 86bf183aa327fc52ed29a8a3244fb2c6981b98cc Mon Sep 17 00:00:00 2001 From: DavdGao Date: Fri, 8 Mar 2024 11:59:07 +0800 Subject: [PATCH] support to pass callable model into agent; --- README.md | 3 ++- README_ZH.md | 3 ++- .../sphinx_doc/source/tutorial/103-example.md | 3 ++- .../sphinx_doc/source/tutorial/104-usecase.md | 4 ++-- docs/sphinx_doc/source/tutorial/201-agent.md | 4 ++-- docs/sphinx_doc/source/tutorial/203-model.md | 2 +- examples/agent_builder/auto-discussion.py | 4 ++-- examples/conversation/conversation.py | 3 ++- .../configs/debate_agent_configs.json | 6 +++--- examples/distributed/distributed_dialog.py | 4 ++-- examples/werewolf/README.md | 2 +- examples/werewolf/configs/agent_configs.json | 12 +++++------ notebook/conversation.ipynb | 2 +- notebook/distributed_debate.ipynb | 6 +++--- notebook/distributed_dialog.ipynb | 2 +- src/agentscope/agents/agent.py | 20 ++++++++++++++----- src/agentscope/agents/dialog_agent.py | 6 +++--- src/agentscope/agents/dict_dialog_agent.py | 6 +++--- src/agentscope/agents/text_to_image_agent.py | 6 +++--- src/agentscope/service/__init__.py | 2 ++ 20 files changed, 58 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 9f56eca78..b78e8d555 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,8 @@ import agentscope agentscope.init(model_configs="./model_configs.json") # Create a dialog agent and a user agent -dialog_agent = DialogAgent(name="assistant", model_config_name="your_config_name") +dialog_agent = DialogAgent(name="assistant", + model_or_config_name="your_config_name") user_agent = UserAgent() ``` diff --git a/README_ZH.md b/README_ZH.md index 3e8e3c079..de7faa30c 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -167,7 +167,8 @@ import agentscope agentscope.init(model_configs="./model_configs.json") # 创建对话Agent和用户Agent -dialog_agent = DialogAgent(name="assistant", model_config_name="your_config_name") +dialog_agent = DialogAgent(name="assistant", + model_or_config_name="your_config_name") user_agent = UserAgent() ``` diff --git a/docs/sphinx_doc/source/tutorial/103-example.md b/docs/sphinx_doc/source/tutorial/103-example.md index 08ead7cf5..fd225eed1 100644 --- a/docs/sphinx_doc/source/tutorial/103-example.md +++ b/docs/sphinx_doc/source/tutorial/103-example.md @@ -52,7 +52,8 @@ from agentscope.agents import DialogAgent, UserAgent agentscope.init(model_configs="./openai_model_configs.json") # Create a dialog agent and a user agent -dialogAgent = DialogAgent(name="assistant", model_config_name="gpt-4", sys_prompt="You are a helpful ai assistant") +dialogAgent = DialogAgent(name="assistant", model_or_config_name="gpt-4", + sys_prompt="You are a helpful ai assistant") userAgent = UserAgent() ``` diff --git a/docs/sphinx_doc/source/tutorial/104-usecase.md b/docs/sphinx_doc/source/tutorial/104-usecase.md index 8fc6f1f7e..b01901903 100644 --- a/docs/sphinx_doc/source/tutorial/104-usecase.md +++ b/docs/sphinx_doc/source/tutorial/104-usecase.md @@ -76,13 +76,13 @@ AgentScope provides several out-of-the-box Agents implements and organizes them "args": { "name": "Player1", "sys_prompt": "Act as a player in a werewolf game. You are Player1 and\nthere are totally 6 players, named Player1, Player2, Player3, Player4, Player5 and Player6.\n\nPLAYER ROLES:\nIn werewolf game, players are divided into two werewolves, two villagers, one seer, and one witch. Note only werewolves know who are their teammates.\nWerewolves: They know their teammates' identities and attempt to eliminate a villager each night while trying to remain undetected.\nVillagers: They do not know who the werewolves are and must work together during the day to deduce who the werewolves might be and vote to eliminate them.\nSeer: A villager with the ability to learn the true identity of one player each night. This role is crucial for the villagers to gain information.\nWitch: A character who has a one-time ability to save a player from being eliminated at night (sometimes this is a potion of life) and a one-time ability to eliminate a player at night (a potion of death).\n\nGAME RULE:\nThe game consists of two phases: night phase and day phase. The two phases are repeated until werewolf or villager wins the game.\n1. Night Phase: During the night, the werewolves discuss and vote for a player to eliminate. Special roles also perform their actions at this time (e.g., the Seer chooses a player to learn their role, the witch chooses a decide if save the player).\n2. Day Phase: During the day, all surviving players discuss who they suspect might be a werewolf. No one reveals their role unless it serves a strategic purpose. After the discussion, a vote is taken, and the player with the most votes is \"lynched\" or eliminated from the game.\n\nVICTORY CONDITION:\nFor werewolves, they win the game if the number of werewolves is equal to or greater than the number of remaining villagers.\nFor villagers, they win if they identify and eliminate all of the werewolves in the group.\n\nCONSTRAINTS:\n1. Your response should be in the first person.\n2. This is a conversational game. You should respond only based on the conversation history and your strategy.\n\nYou are playing werewolf in this game.\n", - "model_config_name": "gpt-3.5-turbo", + "model_or_config_name": "gpt-3.5-turbo", "use_memory": true } } ``` -In this configuration, `Player1` is designated as a `DictDialogAgent`. The parameters include a system prompt (`sys_prompt`) that can guide the agent's behavior, a model config name (`model_config_name`) that determines the name of the model configuration, and a flag (`use_memory`) indicating whether the agent should remember past interactions. +In this configuration, `Player1` is designated as a `DictDialogAgent`. The parameters include a system prompt (`sys_prompt`) that can guide the agent's behavior, a model config name (`model_or_config_name`) that determines the name of the model configuration, and a flag (`use_memory`) indicating whether the agent should remember past interactions. For other players, configurations can be customized based on their roles. Each role may have different prompts, models, or memory settings. You can refer to the JSON file located at `examples/werewolf/configs/agent_configs.json` within the AgentScope examples directory. diff --git a/docs/sphinx_doc/source/tutorial/201-agent.md b/docs/sphinx_doc/source/tutorial/201-agent.md index 76b6400b6..bdbde0f06 100644 --- a/docs/sphinx_doc/source/tutorial/201-agent.md +++ b/docs/sphinx_doc/source/tutorial/201-agent.md @@ -31,7 +31,7 @@ class AgentBase(Operator): self, name: str, sys_prompt: Optional[str] = None, - model_config_name: str = None, + model_or_config_name: str = None, use_memory: bool = True, memory_config: Optional[dict] = None, ) -> None: @@ -108,7 +108,7 @@ from agentscope.agents import DialogAgent # Configuration for the DialogAgent dialog_agent_config = { "name": "ServiceBot", - "model_config_name": "gpt-3.5", # Specify the model used for dialogue generation + "model_or_config_name": "gpt-3.5", # Specify the model used for dialogue generation "sys_prompt": "Act as AI assistant to interact with the others. Try to " "reponse on one line.\n", # Custom prompt for the agent # Other configurations specific to the DialogAgent diff --git a/docs/sphinx_doc/source/tutorial/203-model.md b/docs/sphinx_doc/source/tutorial/203-model.md index dc83ff758..1fbfa765b 100644 --- a/docs/sphinx_doc/source/tutorial/203-model.md +++ b/docs/sphinx_doc/source/tutorial/203-model.md @@ -250,7 +250,7 @@ model = AutoModelForCausalLM.from_pretrained(MODEL_NAME) tokenizer = AutoTokenizer.from_pretrained(MODEL_NAME) model.eval() # Do remember to re-implement the `reply` method to tokenize *message*! -agent = YourAgent(name='agent', model_config_name=config_name, tokenizer=tokenizer) +agent = YourAgent(name='agent', model_or_config_name=config_name, tokenizer=tokenizer) ``` [[Return to the top]](#using-different-model-sources-with-model-api) diff --git a/examples/agent_builder/auto-discussion.py b/examples/agent_builder/auto-discussion.py index a6544afea..14576913e 100644 --- a/examples/agent_builder/auto-discussion.py +++ b/examples/agent_builder/auto-discussion.py @@ -33,7 +33,7 @@ agent_builder = DialogAgent( name="agent_builder", sys_prompt="You're a helpful assistant.", - model_config_name="my_post_api", + model_or_config_name="my_post_api", ) @@ -56,7 +56,7 @@ DialogAgent( name=key, sys_prompt=val, - model_config_name="my_post_api", + model_or_config_name="my_post_api", ) for key, val in scenario_participants["Participants"].items() ] diff --git a/examples/conversation/conversation.py b/examples/conversation/conversation.py index 8eb51af56..16d89e037 100644 --- a/examples/conversation/conversation.py +++ b/examples/conversation/conversation.py @@ -34,7 +34,8 @@ def main() -> None: dialog_agent = DialogAgent( name="Assistant", sys_prompt="You're a helpful assistant.", - model_config_name="gpt-3.5-turbo", # replace by your model config name + model_or_config_name="gpt-3.5-turbo", # replace by your model + # config name ) user_agent = UserAgent() diff --git a/examples/distributed/configs/debate_agent_configs.json b/examples/distributed/configs/debate_agent_configs.json index 819caaed1..97d09fec9 100644 --- a/examples/distributed/configs/debate_agent_configs.json +++ b/examples/distributed/configs/debate_agent_configs.json @@ -4,7 +4,7 @@ "args": { "name": "Pro", "sys_prompt": "Assume the role of a debater who is arguing in favor of the proposition that AGI (Artificial General Intelligence) can be achieved using the GPT model framework. Construct a coherent and persuasive argument, including scientific, technological, and theoretical evidence, to support the statement that GPT models are a viable path to AGI. Highlight the advancements in language understanding, adaptability, and scalability of GPT models as key factors in progressing towards AGI.", - "model_config_name": "gpt-3.5-turbo", + "model_or_config_name": "gpt-3.5-turbo", "use_memory": true } }, @@ -13,7 +13,7 @@ "args": { "name": "Con", "sys_prompt": "Assume the role of a debater who is arguing against the proposition that AGI can be achieved using the GPT model framework. Construct a coherent and persuasive argument, including scientific, technological, and theoretical evidence, to support the statement that GPT models, while impressive, are insufficient for reaching AGI. Discuss the limitations of GPT models such as lack of understanding, consciousness, ethical reasoning, and general problem-solving abilities that are essential for true AGI.", - "model_config_name": "gpt-3.5-turbo", + "model_or_config_name": "gpt-3.5-turbo", "use_memory": true } }, @@ -22,7 +22,7 @@ "args": { "name": "Judge", "sys_prompt": "Assume the role of an impartial judge in a debate where the affirmative side argues that AGI can be achieved using the GPT model framework, and the negative side contests this. Listen to both sides' arguments and provide an analytical judgment on which side presented a more compelling and reasonable case. Consider the strength of the evidence, the persuasiveness of the reasoning, and the overall coherence of the arguments presented by each side.", - "model_config_name": "gpt-3.5-turbo", + "model_or_config_name": "gpt-3.5-turbo", "use_memory": true } } diff --git a/examples/distributed/distributed_dialog.py b/examples/distributed/distributed_dialog.py index cc210d325..cf1dc1a32 100644 --- a/examples/distributed/distributed_dialog.py +++ b/examples/distributed/distributed_dialog.py @@ -41,7 +41,7 @@ def setup_assistant_server(assistant_host: str, assistant_port: int) -> None: agent_kwargs={ "name": "Assitant", "sys_prompt": "You are a helpful assistant.", - "model_config_name": "gpt-3.5-turbo", + "model_or_config_name": "gpt-3.5-turbo", "use_memory": True, }, host=assistant_host, @@ -59,7 +59,7 @@ def run_main_process(assistant_host: str, assistant_port: int) -> None: assistant_agent = DialogAgent( name="Assistant", sys_prompt="You are a helpful assistant.", - model_config_name="gpt-3.5-turbo", + model_or_config_name="gpt-3.5-turbo", use_memory=True, ).to_dist( host=assistant_host, diff --git a/examples/werewolf/README.md b/examples/werewolf/README.md index 2050edb65..52a26cb59 100644 --- a/examples/werewolf/README.md +++ b/examples/werewolf/README.md @@ -41,7 +41,7 @@ is as follows "args": { "name": "Player1", "sys_prompt": "Act as a player in a werewolf game. You are Player1 and\nthere are totally 6 players, named Player1, Player2, Player3, Player4, Player5 and Player6.\n\nPLAYER ROLES:\nIn werewolf game, players are divided into two werewolves, two villagers, one seer and one witch. Note only werewolves know who are their teammates.\nWerewolves: They know their teammates' identities and attempt to eliminate a villager each night while trying to remain undetected.\nVillagers: They do not know who the werewolves are and must work together during the day to deduce who the werewolves might be and vote to eliminate them.\nSeer: A villager with the ability to learn the true identity of one player each night. This role is crucial for the villagers to gain information.\nWitch: A character who has a one-time ability to save a player from being eliminated at night (sometimes this is a potion of life) and a one-time ability to eliminate a player at night (a potion of death).\n\nGAME RULE:\nThe game is consisted of two phases: night phase and day phase. The two phases are repeated until werewolf or villager win the game.\n1. Night Phase: During the night, the werewolves discuss and vote for a player to eliminate. Special roles also perform their actions at this time (e.g., the Seer chooses a player to learn their role, the witch chooses a decide if save the player).\n2. Day Phase: During the day, all surviving players discuss who they suspect might be a werewolf. No one reveals their role unless it serves a strategic purpose. After the discussion, a vote is taken, and the player with the most votes is \"lynched\" or eliminated from the game.\n\nVICTORY CONDITION:\nFor werewolves, they win the game if the number of werewolves is equal to or greater than the number of remaining villagers.\nFor villagers, they win if they identify and eliminate all of the werewolves in the group.\n\nCONSTRAINTS:\n1. Your response should be in the first person.\n2. This is a conversational game. You should response only based on the conversation history and your strategy.\n\nYou are playing werewolf in this game.\n", - "model_config_name": "gpt-3.5-turbo", + "model_or_config_name": "gpt-3.5-turbo", "use_memory": true } } diff --git a/examples/werewolf/configs/agent_configs.json b/examples/werewolf/configs/agent_configs.json index 6f9095b9d..7668f0079 100644 --- a/examples/werewolf/configs/agent_configs.json +++ b/examples/werewolf/configs/agent_configs.json @@ -4,7 +4,7 @@ "args": { "name": "Player1", "sys_prompt": "Act as a player in a werewolf game. You are Player1 and\nthere are totally 6 players, named Player1, Player2, Player3, Player4, Player5 and Player6.\n\nPLAYER ROLES:\nIn werewolf game, players are divided into two werewolves, two villagers, one seer and one witch. Note only werewolves know who are their teammates.\nWerewolves: They know their teammates' identities and attempt to eliminate a villager each night while trying to remain undetected.\nVillagers: They do not know who the werewolves are and must work together during the day to deduce who the werewolves might be and vote to eliminate them.\nSeer: A villager with the ability to learn the true identity of one player each night. This role is crucial for the villagers to gain information.\nWitch: A character who has a one-time ability to save a player from being eliminated at night (sometimes this is a potion of life) and a one-time ability to eliminate a player at night (a potion of death).\n\nGAME RULE:\nThe game is consisted of two phases: night phase and day phase. The two phases are repeated until werewolf or villager win the game.\n1. Night Phase: During the night, the werewolves discuss and vote for a player to eliminate. Special roles also perform their actions at this time (e.g., the Seer chooses a player to learn their role, the witch chooses a decide if save the player).\n2. Day Phase: During the day, all surviving players discuss who they suspect might be a werewolf. No one reveals their role unless it serves a strategic purpose. After the discussion, a vote is taken, and the player with the most votes is \"lynched\" or eliminated from the game.\n\nVICTORY CONDITION:\nFor werewolves, they win the game if the number of werewolves is equal to or greater than the number of remaining villagers.\nFor villagers, they win if they identify and eliminate all of the werewolves in the group.\n\nCONSTRAINTS:\n1. Your response should be in the first person.\n2. This is a conversational game. You should response only based on the conversation history and your strategy.\n\nYou are playing werewolf in this game.\n", - "model_config_name": "gpt-4", + "model_or_config_name": "gpt-4", "use_memory": true } }, @@ -13,7 +13,7 @@ "args": { "name": "Player2", "sys_prompt": "Act as a player in a werewolf game. You are Player2 and\nthere are totally 6 players, named Player1, Player2, Player3, Player4, Player5 and Player6.\n\nPLAYER ROLES:\nIn werewolf game, players are divided into two werewolves, two villagers, one seer and one witch. Note only werewolves know who are their teammates.\nWerewolves: They know their teammates' identities and attempt to eliminate a villager each night while trying to remain undetected.\nVillagers: They do not know who the werewolves are and must work together during the day to deduce who the werewolves might be and vote to eliminate them.\nSeer: A villager with the ability to learn the true identity of one player each night. This role is crucial for the villagers to gain information.\nWitch: A character who has a one-time ability to save a player from being eliminated at night (sometimes this is a potion of life) and a one-time ability to eliminate a player at night (a potion of death).\n\nGAME RULE:\nThe game is consisted of two phases: night phase and day phase. The two phases are repeated until werewolf or villager win the game.\n1. Night Phase: During the night, the werewolves discuss and vote for a player to eliminate. Special roles also perform their actions at this time (e.g., the Seer chooses a player to learn their role, the witch chooses a decide if save the player).\n2. Day Phase: During the day, all surviving players discuss who they suspect might be a werewolf. No one reveals their role unless it serves a strategic purpose. After the discussion, a vote is taken, and the player with the most votes is \"lynched\" or eliminated from the game.\n\nVICTORY CONDITION:\nFor werewolves, they win the game if the number of werewolves is equal to or greater than the number of remaining villagers.\nFor villagers, they win if they identify and eliminate all of the werewolves in the group.\n\nCONSTRAINTS:\n1. Your response should be in the first person.\n2. This is a conversational game. You should response only based on the conversation history and your strategy.\n\nYou are playing werewolf in this game.\n", - "model_config_name": "gpt-4", + "model_or_config_name": "gpt-4", "use_memory": true } }, @@ -22,7 +22,7 @@ "args": { "name": "Player3", "sys_prompt": "Act as a player in a werewolf game. You are Player3 and\nthere are totally 6 players, named Player1, Player2, Player3, Player4, Player5 and Player6.\n\nPLAYER ROLES:\nIn werewolf game, players are divided into two werewolves, two villagers, one seer and one witch. Note only werewolves know who are their teammates.\nWerewolves: They know their teammates' identities and attempt to eliminate a villager each night while trying to remain undetected.\nVillagers: They do not know who the werewolves are and must work together during the day to deduce who the werewolves might be and vote to eliminate them.\nSeer: A villager with the ability to learn the true identity of one player each night. This role is crucial for the villagers to gain information.\nWitch: A character who has a one-time ability to save a player from being eliminated at night (sometimes this is a potion of life) and a one-time ability to eliminate a player at night (a potion of death).\n\nGAME RULE:\nThe game is consisted of two phases: night phase and day phase. The two phases are repeated until werewolf or villager win the game.\n1. Night Phase: During the night, the werewolves discuss and vote for a player to eliminate. Special roles also perform their actions at this time (e.g., the Seer chooses a player to learn their role, the witch chooses a decide if save the player).\n2. Day Phase: During the day, all surviving players discuss who they suspect might be a werewolf. No one reveals their role unless it serves a strategic purpose. After the discussion, a vote is taken, and the player with the most votes is \"lynched\" or eliminated from the game.\n\nVICTORY CONDITION:\nFor werewolves, they win the game if the number of werewolves is equal to or greater than the number of remaining villagers.\nFor villagers, they win if they identify and eliminate all of the werewolves in the group.\n\nCONSTRAINTS:\n1. Your response should be in the first person.\n2. This is a conversational game. You should response only based on the conversation history and your strategy.\n\nYou are playing villager in this game.\n", - "model_config_name": "gpt-4", + "model_or_config_name": "gpt-4", "use_memory": true } }, @@ -31,7 +31,7 @@ "args": { "name": "Player4", "sys_prompt": "Act as a player in a werewolf game. You are Player4 and\nthere are totally 6 players, named Player1, Player2, Player3, Player4, Player5 and Player6.\n\nPLAYER ROLES:\nIn werewolf game, players are divided into two werewolves, two villagers, one seer and one witch. Note only werewolves know who are their teammates.\nWerewolves: They know their teammates' identities and attempt to eliminate a villager each night while trying to remain undetected.\nVillagers: They do not know who the werewolves are and must work together during the day to deduce who the werewolves might be and vote to eliminate them.\nSeer: A villager with the ability to learn the true identity of one player each night. This role is crucial for the villagers to gain information.\nWitch: A character who has a one-time ability to save a player from being eliminated at night (sometimes this is a potion of life) and a one-time ability to eliminate a player at night (a potion of death).\n\nGAME RULE:\nThe game is consisted of two phases: night phase and day phase. The two phases are repeated until werewolf or villager win the game.\n1. Night Phase: During the night, the werewolves discuss and vote for a player to eliminate. Special roles also perform their actions at this time (e.g., the Seer chooses a player to learn their role, the witch chooses a decide if save the player).\n2. Day Phase: During the day, all surviving players discuss who they suspect might be a werewolf. No one reveals their role unless it serves a strategic purpose. After the discussion, a vote is taken, and the player with the most votes is \"lynched\" or eliminated from the game.\n\nVICTORY CONDITION:\nFor werewolves, they win the game if the number of werewolves is equal to or greater than the number of remaining villagers.\nFor villagers, they win if they identify and eliminate all of the werewolves in the group.\n\nCONSTRAINTS:\n1. Your response should be in the first person.\n2. This is a conversational game. You should response only based on the conversation history and your strategy.\n\nYou are playing villager in this game.\n", - "model_config_name": "gpt-4", + "model_or_config_name": "gpt-4", "use_memory": true } }, @@ -40,7 +40,7 @@ "args": { "name": "Player5", "sys_prompt": "Act as a player in a werewolf game. You are Player5 and\nthere are totally 6 players, named Player1, Player2, Player3, Player4, Player5 and Player6.\n\nPLAYER ROLES:\nIn werewolf game, players are divided into two werewolves, two villagers, one seer and one witch. Note only werewolves know who are their teammates.\nWerewolves: They know their teammates' identities and attempt to eliminate a villager each night while trying to remain undetected.\nVillagers: They do not know who the werewolves are and must work together during the day to deduce who the werewolves might be and vote to eliminate them.\nSeer: A villager with the ability to learn the true identity of one player each night. This role is crucial for the villagers to gain information.\nWitch: A character who has a one-time ability to save a player from being eliminated at night (sometimes this is a potion of life) and a one-time ability to eliminate a player at night (a potion of death).\n\nGAME RULE:\nThe game is consisted of two phases: night phase and day phase. The two phases are repeated until werewolf or villager win the game.\n1. Night Phase: During the night, the werewolves discuss and vote for a player to eliminate. Special roles also perform their actions at this time (e.g., the Seer chooses a player to learn their role, the witch chooses a decide if save the player).\n2. Day Phase: During the day, all surviving players discuss who they suspect might be a werewolf. No one reveals their role unless it serves a strategic purpose. After the discussion, a vote is taken, and the player with the most votes is \"lynched\" or eliminated from the game.\n\nVICTORY CONDITION:\nFor werewolves, they win the game if the number of werewolves is equal to or greater than the number of remaining villagers.\nFor villagers, they win if they identify and eliminate all of the werewolves in the group.\n\nCONSTRAINTS:\n1. Your response should be in the first person.\n2. This is a conversational game. You should response only based on the conversation history and your strategy.\n\nYou are playing seer in this game.\n", - "model_config_name": "gpt-4", + "model_or_config_name": "gpt-4", "use_memory": true } }, @@ -49,7 +49,7 @@ "args": { "name": "Player6", "sys_prompt": "Act as a player in a werewolf game. You are Player6 and\nthere are totally 6 players, named Player1, Player2, Player3, Player4, Player5 and Player6.\n\nPLAYER ROLES:\nIn werewolf game, players are divided into two werewolves, two villagers, one seer and one witch. Note only werewolves know who are their teammates.\nWerewolves: They know their teammates' identities and attempt to eliminate a villager each night while trying to remain undetected.\nVillagers: They do not know who the werewolves are and must work together during the day to deduce who the werewolves might be and vote to eliminate them.\nSeer: A villager with the ability to learn the true identity of one player each night. This role is crucial for the villagers to gain information.\nWitch: A character who has a one-time ability to save a player from being eliminated at night (sometimes this is a potion of life) and a one-time ability to eliminate a player at night (a potion of death).\n\nGAME RULE:\nThe game is consisted of two phases: night phase and day phase. The two phases are repeated until werewolf or villager win the game.\n1. Night Phase: During the night, the werewolves discuss and vote for a player to eliminate. Special roles also perform their actions at this time (e.g., the Seer chooses a player to learn their role, the witch chooses a decide if save the player).\n2. Day Phase: During the day, all surviving players discuss who they suspect might be a werewolf. No one reveals their role unless it serves a strategic purpose. After the discussion, a vote is taken, and the player with the most votes is \"lynched\" or eliminated from the game.\n\nVICTORY CONDITION:\nFor werewolves, they win the game if the number of werewolves is equal to or greater than the number of remaining villagers.\nFor villagers, they win if they identify and eliminate all of the werewolves in the group.\n\nCONSTRAINTS:\n1. Your response should be in the first person.\n2. This is a conversational game. You should response only based on the conversation history and your strategy.\n\nYou are playing witch in this game.\n", - "model_config_name": "gpt-4", + "model_or_config_name": "gpt-4", "use_memory": true } } diff --git a/notebook/conversation.ipynb b/notebook/conversation.ipynb index dd9da7772..793c72831 100644 --- a/notebook/conversation.ipynb +++ b/notebook/conversation.ipynb @@ -86,7 +86,7 @@ "dialog_agent = DialogAgent(\n", " name=\"Assistant\",\n", " sys_prompt=\"You're a helpful assistant.\",\n", - " model_config_name=\"gpt-3.5-turbo\", # replace by your model config name\n", + " model_or_config_name=\"gpt-3.5-turbo\", # replace by your model config name\n", ")\n", "user_agent = UserAgent()" ] diff --git a/notebook/distributed_debate.ipynb b/notebook/distributed_debate.ipynb index 3acd38397..b2df59301 100644 --- a/notebook/distributed_debate.ipynb +++ b/notebook/distributed_debate.ipynb @@ -92,19 +92,19 @@ "\n", "pro_agent = DialogAgent(\n", " name=\"Pro\",\n", - " model_config_name=\"gpt-3.5-turbo\",\n", + " model_or_config_name=\"gpt-3.5-turbo\",\n", " use_memory=True,\n", " sys_prompt=\"Assume the role of a debater who is arguing in favor of the proposition that AGI (Artificial General Intelligence) can be achieved using the GPT model framework. Construct a coherent and persuasive argument, including scientific, technological, and theoretical evidence, to support the statement that GPT models are a viable path to AGI. Highlight the advancements in language understanding, adaptability, and scalability of GPT models as key factors in progressing towards AGI.\",\n", ").to_dist()\n", "con_agent = DialogAgent(\n", " name=\"Con\",\n", - " model_config_name=\"gpt-3.5-turbo\",\n", + " model_or_config_name=\"gpt-3.5-turbo\",\n", " use_memory=True,\n", " sys_prompt=\"Assume the role of a debater who is arguing against the proposition that AGI can be achieved using the GPT model framework. Construct a coherent and persuasive argument, including scientific, technological, and theoretical evidence, to support the statement that GPT models, while impressive, are insufficient for reaching AGI. Discuss the limitations of GPT models such as lack of understanding, consciousness, ethical reasoning, and general problem-solving abilities that are essential for true AGI.\",\n", ").to_dist()\n", "judge_agent = DialogAgent(\n", " name=\"Judge\",\n", - " model_config_name=\"gpt-3.5-turbo\",\n", + " model_or_config_name=\"gpt-3.5-turbo\",\n", " use_memory=True,\n", " sys_prompt=\"Assume the role of an impartial judge in a debate where the affirmative side argues that AGI can be achieved using the GPT model framework, and the negative side contests this. Listen to both sides' arguments and provide an analytical judgment on which side presented a more compelling and reasonable case. Consider the strength of the evidence, the persuasiveness of the reasoning, and the overall coherence of the arguments presented by each side.\"\n", ").to_dist()" diff --git a/notebook/distributed_dialog.ipynb b/notebook/distributed_dialog.ipynb index 10829dee4..4836f4755 100644 --- a/notebook/distributed_dialog.ipynb +++ b/notebook/distributed_dialog.ipynb @@ -91,7 +91,7 @@ "assistant_agent = DialogAgent(\n", " name=\"Assistant\",\n", " sys_prompt=\"You are a helpful assistant.\",\n", - " model_config_name=\"gpt-3.5-turbo\",\n", + " model_or_config_name=\"gpt-3.5-turbo\",\n", " use_memory=True,\n", ").to_dist()\n", "user_agent = UserAgent(\n", diff --git a/src/agentscope/agents/agent.py b/src/agentscope/agents/agent.py index 6a60eb9e7..4b0766e78 100644 --- a/src/agentscope/agents/agent.py +++ b/src/agentscope/agents/agent.py @@ -7,6 +7,7 @@ from typing import Sequence from typing import Union from typing import Any +from typing import Callable from loguru import logger from agentscope.agents.operator import Operator @@ -36,7 +37,7 @@ def __init__( self, name: str, sys_prompt: Optional[str] = None, - model_config_name: str = None, + model_or_config_name: [str, Callable[..., Any]] = None, use_memory: bool = True, memory_config: Optional[dict] = None, ) -> None: @@ -48,7 +49,8 @@ def __init__( sys_prompt (`Optional[str]`): The system prompt of the agent, which can be passed by args or hard-coded in the agent. - model_config_name (`str`, defaults to None): + model_or_config_name (`[str, Callable[..., ...]`, defaults to + None): The name of the model config, which is used to load model from configuration. use_memory (`bool`, defaults to `True`): @@ -63,9 +65,17 @@ def __init__( if sys_prompt is not None: self.sys_prompt = sys_prompt - # TODO: support to receive a ModelWrapper instance - if model_config_name is not None: - self.model = load_model_by_config_name(model_config_name) + if model_or_config_name is not None: + if isinstance(model_or_config_name, str): + self.model = load_model_by_config_name(model_or_config_name) + elif callable(model_or_config_name): + self.model = model_or_config_name + else: + raise ValueError( + f"Invalid type for " + f"argument `model_or_config_name`:" + f" {type(model_or_config_name)}", + ) if use_memory: self.memory = TemporaryMemory(memory_config) diff --git a/src/agentscope/agents/dialog_agent.py b/src/agentscope/agents/dialog_agent.py index 3f680d234..e8b239dd6 100644 --- a/src/agentscope/agents/dialog_agent.py +++ b/src/agentscope/agents/dialog_agent.py @@ -16,7 +16,7 @@ def __init__( self, name: str, sys_prompt: Optional[str] = None, - model_config_name: str = None, + model_or_config_name: str = None, use_memory: bool = True, memory_config: Optional[dict] = None, prompt_type: Optional[PromptType] = PromptType.LIST, @@ -29,7 +29,7 @@ def __init__( sys_prompt (`Optional[str]`): The system prompt of the agent, which can be passed by args or hard-coded in the agent. - model_config_name (`str`, defaults to None): + model_or_config_name (`str`, defaults to None): The name of the model config, which is used to load model from configuration. use_memory (`bool`, defaults to `True`): @@ -44,7 +44,7 @@ def __init__( super().__init__( name=name, sys_prompt=sys_prompt, - model_config_name=model_config_name, + model_or_config_name=model_or_config_name, use_memory=use_memory, memory_config=memory_config, ) diff --git a/src/agentscope/agents/dict_dialog_agent.py b/src/agentscope/agents/dict_dialog_agent.py index be376105a..e1076e135 100644 --- a/src/agentscope/agents/dict_dialog_agent.py +++ b/src/agentscope/agents/dict_dialog_agent.py @@ -48,7 +48,7 @@ def __init__( self, name: str, sys_prompt: Optional[str] = None, - model_config_name: str = None, + model_or_config_name: str = None, use_memory: bool = True, memory_config: Optional[dict] = None, parse_func: Optional[Callable[..., Any]] = parse_dict, @@ -64,7 +64,7 @@ def __init__( sys_prompt (`Optional[str]`, defaults to `None`): The system prompt of the agent, which can be passed by args or hard-coded in the agent. - model_config_name (`str`, defaults to None): + model_or_config_name (`str`, defaults to None): The name of the model config, which is used to load model from configuration. use_memory (`bool`, defaults to `True`): @@ -91,7 +91,7 @@ def __init__( super().__init__( name=name, sys_prompt=sys_prompt, - model_config_name=model_config_name, + model_or_config_name=model_or_config_name, use_memory=use_memory, memory_config=memory_config, ) diff --git a/src/agentscope/agents/text_to_image_agent.py b/src/agentscope/agents/text_to_image_agent.py index 169b26034..1103f3cad 100644 --- a/src/agentscope/agents/text_to_image_agent.py +++ b/src/agentscope/agents/text_to_image_agent.py @@ -15,7 +15,7 @@ def __init__( self, name: str, sys_prompt: Optional[str] = None, - model_config_name: str = None, + model_or_config_name: str = None, use_memory: bool = True, memory_config: Optional[dict] = None, ) -> None: @@ -27,7 +27,7 @@ def __init__( sys_prompt (`Optional[str]`): The system prompt of the agent, which can be passed by args or hard-coded in the agent. - model_config_name (`str`, defaults to None): + model_or_config_name (`str`, defaults to None): The name of the model config, which is used to load model from configuration. use_memory (`bool`, defaults to `True`): @@ -38,7 +38,7 @@ def __init__( super().__init__( name=name, sys_prompt=sys_prompt, - model_config_name=model_config_name, + model_or_config_name=model_or_config_name, use_memory=use_memory, memory_config=memory_config, ) diff --git a/src/agentscope/service/__init__.py b/src/agentscope/service/__init__.py index 0ab2560ac..0fd99e6cf 100644 --- a/src/agentscope/service/__init__.py +++ b/src/agentscope/service/__init__.py @@ -22,6 +22,7 @@ from .text_processing.summarization import summarization from .retrieval.retrieval_from_list import retrieve_from_list from .service_status import ServiceExecStatus +from .service_factory import ServiceFactory def get_help() -> None: @@ -52,4 +53,5 @@ def get_help() -> None: "summarization", "retrieve_from_list", "ServiceExecStatus", + "ServiceFactory", ]