change routing & add team info for quick question

metagpt/prompts/di/role_zero.py

@@ -65,7 +65,8 @@ Help check if there are any formatting issues with the JSON data? If so, please
 
 QUICK_THINK_PROMPT = """
 Decide if the latest user message is a quick question.
-Quick questions include common-sense, logical, math questions, greetings, or casual chat that you can answer directly, excluding software development tasks.
-Respond with "#YES#, (then start your actual response to the question...)" if so, otherwise, simply respond with "#NO#".
-Your response:
+Quick questions include common-sense, logical, math, multiple-choice questions, greetings, or casual chat that you can answer directly.
+Questions about you or your team info are also quick questions.
+Programming or software development tasks are NOT quick questions except for filling a single function or class. 
+Respond with YES if so, otherwise, NO. Your response:
 """

metagpt/prompts/di/team_leader.py

@@ -24,6 +24,13 @@ Note:
 7. If the requirement is writing a TRD and software framework, you should assign it to Architect. When publishing message to Architect, you should directly copy the full original user requirement.
 """
 
+QUICK_THINK_SYSTEM_PROMPT = """
+{role_info}
+Your team member:
+{team_info}
+However, you MUST respond to the user message by yourself directly, DON'T ask your team members.
+"""
+
 FINISH_CURRENT_TASK_CMD = """
 ```json
 [

metagpt/roles/di/role_zero.py

@@ -209,18 +209,20 @@ class RoleZero(Role):
         return rsp  # return output from the last action
 
     async def _quick_think(self) -> Message:
-        msg = self.rc.news[-1]
         rsp_msg = None
-        if msg.cause_by != any_to_str(UserRequirement):
+        if self.rc.news[-1].cause_by != any_to_str(UserRequirement):
             # Agents themselves won't generate quick questions, use this rule to reduce extra llm calls
             return rsp_msg
 
-        context = self.llm.format_msg(self.get_memories(k=4) + [UserMessage(content=QUICK_THINK_PROMPT)])
+        # routing
+        memory = self.get_memories(k=4)
+        context = self.llm.format_msg(memory + [UserMessage(content=QUICK_THINK_PROMPT)])
+        # print(context)
         rsp = await self.llm.aask(context)
 
-        pattern = r"#YES#,? ?"
-        if re.search(pattern, rsp):
-            answer = re.sub(pattern, "", rsp).strip()
+        if "yes" in rsp.lower():
+            # llm call with the original context
+            answer = await self.llm.aask(self.llm.format_msg(memory))
             self.rc.memory.add(AIMessage(content=answer, cause_by=RunCommand))
             await self.reply_to_human(content=answer)
             rsp_msg = AIMessage(

metagpt/roles/di/team_leader.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from metagpt.actions.di.run_command import RunCommand
 from metagpt.prompts.di.team_leader import (
     FINISH_CURRENT_TASK_CMD,
+    QUICK_THINK_SYSTEM_PROMPT,
     SYSTEM_PROMPT,
     TL_INSTRUCTION,
 )
@@ -16,6 +17,7 @@ from metagpt.tools.tool_registry import register_tool
 class TeamLeader(RoleZero):
     name: str = "Tim"
     profile: str = "Team Leader"
+    goal: str = "Manage a team to assist users"
     system_msg: list[str] = [SYSTEM_PROMPT]
 
     # TeamLeader only reacts once each time, but may encounter errors or need to ask human, thus allowing 2 more turns
@@ -33,16 +35,26 @@ class TeamLeader(RoleZero):
             }
         )
 
-    def set_instruction(self):
+    def _get_team_info(self) -> str:
+        if not self.rc.env:
+            return ""
         team_info = ""
         for role in self.rc.env.roles.values():
             # if role.profile == "Team Leader":
             #     continue
             team_info += f"{role.name}: {role.profile}, {role.goal}\n"
-        self.instruction = TL_INSTRUCTION.format(team_info=team_info)
+        return team_info
+
+    async def _quick_think(self) -> Message:
+        # insert team info for quick question
+        self.llm.system_prompt = QUICK_THINK_SYSTEM_PROMPT.format(
+            role_info=super()._get_prefix(),
+            team_info=self._get_team_info(),
+        )
+        return await super()._quick_think()
 
     async def _think(self) -> bool:
-        self.set_instruction()
+        self.instruction = TL_INSTRUCTION.format(team_info=self._get_team_info())
         return await super()._think()
 
     def publish_message(self, msg: Message, send_to="no one"):