茂道 commited on
Commit
46e192e
·
1 Parent(s): e5f93a6

update prompt

Browse files
werewolf/seer/seer_agent.py CHANGED
@@ -41,7 +41,7 @@ class SeerAgent(BasicRoleAgent):
41
  self.memory.append_history('主持人: 现在进入第{}天。'.format(str(req.round)))
42
  self.memory.append_history('主持人: 每个玩家描述自己的信息。')
43
  elif req.status == STATUS_VOTE: # 投票环节
44
- self.memory.append_history(req.name + ': ' + req.message)
45
  elif req.status == STATUS_VOTE_RESULT: # 投票环节
46
  out_player = req.name if req.name else req.message
47
  if out_player:
 
41
  self.memory.append_history('主持人: 现在进入第{}天。'.format(str(req.round)))
42
  self.memory.append_history('主持人: 每个玩家描述自己的信息。')
43
  elif req.status == STATUS_VOTE: # 投票环节
44
+ self.memory.append_history(f'第{req.round}天的投票环节,{req.name} 投了 {req.message}')
45
  elif req.status == STATUS_VOTE_RESULT: # 投票环节
46
  out_player = req.name if req.name else req.message
47
  if out_player:
werewolf/villager/villager_agent.py CHANGED
@@ -33,7 +33,7 @@ class VillagerAgent(BasicRoleAgent):
33
  self.memory.append_history('主持人: 现在进入第{}天。'.format(str(req.round)))
34
  self.memory.append_history('主持人: 每个玩家描述自己的信息。')
35
  elif req.status == STATUS_VOTE: # 投票环节
36
- self.memory.append_history(req.name + ': ' + req.message)
37
  elif req.status == STATUS_VOTE_RESULT: # 投票环节
38
  out_player = req.name if req.name else req.message
39
  if out_player:
 
33
  self.memory.append_history('主持人: 现在进入第{}天。'.format(str(req.round)))
34
  self.memory.append_history('主持人: 每个玩家描述自己的信息。')
35
  elif req.status == STATUS_VOTE: # 投票环节
36
+ self.memory.append_history(f'第{req.round}天的投票环节,{req.name} 投了 {req.message}')
37
  elif req.status == STATUS_VOTE_RESULT: # 投票环节
38
  out_player = req.name if req.name else req.message
39
  if out_player:
werewolf/witch/witch_agent.py CHANGED
@@ -41,8 +41,8 @@ class WitchAgent(BasicRoleAgent):
41
  self.memory.append_history('主持人: 现在进入第{}天。'.format(str(req.round)))
42
  self.memory.append_history('主持人: 每个玩家描述自己的信息。')
43
  elif req.status == STATUS_VOTE: # 投票环节
44
- self.memory.append_history(req.name + ': ' + req.message)
45
- elif req.status == STATUS_VOTE_RESULT: # 投票环节
46
  out_player = req.name if req.name else req.message
47
  if out_player:
48
  self.memory.append_history('主持人: 投票结果是:{}。'.format(out_player))
@@ -63,10 +63,10 @@ class WitchAgent(BasicRoleAgent):
63
  skill_info = "女巫有{}瓶毒药和{}瓶解药".format("1" if has_poison else "0", "1" if has_antidote else "0")
64
 
65
  prompt = format_prompt(DESC_PROMPT,
66
- {"name": self.memory.load_variable("name"),
67
- "skill_info": skill_info,
68
- "history": "\n".join(self.memory.load_history())
69
- })
70
  logger.info("prompt:" + prompt)
71
  result = self.llm_caller(prompt)
72
  logger.info("witch interact result: {}".format(result))
@@ -77,20 +77,19 @@ class WitchAgent(BasicRoleAgent):
77
  choices = [name for name in req.message.split(",") if name != self.memory.load_variable("name")] # 排除自己
78
  self.memory.set_variable("choices", choices)
79
  prompt = format_prompt(VOTE_PROMPT, {"name": self.memory.load_variable("name"),
80
- "choices": choices,
81
- "history": "\n".join(self.memory.load_history())
82
- })
83
  logger.info("prompt:" + prompt)
84
  result = self.llm_caller(prompt)
85
  logger.info("witch interact result: {}".format(result))
86
  return AgentResp(success=True, result=result, errMsg=None)
87
-
88
  elif req.status == STATUS_SKILL:
89
  has_poison = self.memory.load_variable("has_poison")
90
  has_antidote = self.memory.load_variable("has_antidote")
91
  tonight_killed = req.message
92
 
93
-
94
  skill_info = "女巫有{}瓶毒药和{}瓶解药".format("1" if has_poison else "0", "1" if has_antidote else "0")
95
  prompt = format_prompt(SKILL_PROMPT, {
96
  "name": self.memory.load_variable("name"),
@@ -98,7 +97,7 @@ class WitchAgent(BasicRoleAgent):
98
  "skill_info": skill_info,
99
  "history": "\n".join(self.memory.load_history())
100
  })
101
-
102
  logger.info("prompt:" + prompt)
103
  result = self.llm_caller(prompt)
104
  logger.info("witch skill result: {}".format(result))
@@ -116,4 +115,4 @@ class WitchAgent(BasicRoleAgent):
116
 
117
  return AgentResp(success=True, result=result, skillTargetPlayer=skill_target_person, errMsg=None)
118
  else:
119
- raise NotImplementedError
 
41
  self.memory.append_history('主持人: 现在进入第{}天。'.format(str(req.round)))
42
  self.memory.append_history('主持人: 每个玩家描述自己的信息。')
43
  elif req.status == STATUS_VOTE: # 投票环节
44
+ self.memory.append_history(f'第{req.round}天的投票环节,{req.name} 投了 {req.message}')
45
+ elif req.status == STATUS_VOTE_RESULT: # 投票结果
46
  out_player = req.name if req.name else req.message
47
  if out_player:
48
  self.memory.append_history('主持人: 投票结果是:{}。'.format(out_player))
 
63
  skill_info = "女巫有{}瓶毒药和{}瓶解药".format("1" if has_poison else "0", "1" if has_antidote else "0")
64
 
65
  prompt = format_prompt(DESC_PROMPT,
66
+ {"name": self.memory.load_variable("name"),
67
+ "skill_info": skill_info,
68
+ "history": "\n".join(self.memory.load_history())
69
+ })
70
  logger.info("prompt:" + prompt)
71
  result = self.llm_caller(prompt)
72
  logger.info("witch interact result: {}".format(result))
 
77
  choices = [name for name in req.message.split(",") if name != self.memory.load_variable("name")] # 排除自己
78
  self.memory.set_variable("choices", choices)
79
  prompt = format_prompt(VOTE_PROMPT, {"name": self.memory.load_variable("name"),
80
+ "choices": choices,
81
+ "history": "\n".join(self.memory.load_history())
82
+ })
83
  logger.info("prompt:" + prompt)
84
  result = self.llm_caller(prompt)
85
  logger.info("witch interact result: {}".format(result))
86
  return AgentResp(success=True, result=result, errMsg=None)
87
+
88
  elif req.status == STATUS_SKILL:
89
  has_poison = self.memory.load_variable("has_poison")
90
  has_antidote = self.memory.load_variable("has_antidote")
91
  tonight_killed = req.message
92
 
 
93
  skill_info = "女巫有{}瓶毒药和{}瓶解药".format("1" if has_poison else "0", "1" if has_antidote else "0")
94
  prompt = format_prompt(SKILL_PROMPT, {
95
  "name": self.memory.load_variable("name"),
 
97
  "skill_info": skill_info,
98
  "history": "\n".join(self.memory.load_history())
99
  })
100
+
101
  logger.info("prompt:" + prompt)
102
  result = self.llm_caller(prompt)
103
  logger.info("witch skill result: {}".format(result))
 
115
 
116
  return AgentResp(success=True, result=result, skillTargetPlayer=skill_target_person, errMsg=None)
117
  else:
118
+ raise NotImplementedError
werewolf/wolf/wolf_agent.py CHANGED
@@ -47,7 +47,7 @@ class WolfAgent(BasicRoleAgent):
47
  self.memory.append_history('主持人: 现在进入第{}天。'.format(str(req.round)))
48
  self.memory.append_history('主持人: 每个玩家描述自己的信息。')
49
  elif req.status == STATUS_VOTE: # 投票环节
50
- self.memory.append_history(req.name + ': ' + req.message)
51
  elif req.status == STATUS_VOTE_RESULT: # 投票环节
52
  out_player = req.name if req.name else req.message
53
  if out_player:
 
47
  self.memory.append_history('主持人: 现在进入第{}天。'.format(str(req.round)))
48
  self.memory.append_history('主持人: 每个玩家描述自己的信息。')
49
  elif req.status == STATUS_VOTE: # 投票环节
50
+ self.memory.append_history(f'第{req.round}天的投票环节,{req.name} 投了 {req.message}')
51
  elif req.status == STATUS_VOTE_RESULT: # 投票环节
52
  out_player = req.name if req.name else req.message
53
  if out_player: