Merge branch 'general_new' into 'dev'

Planner and Code Interpreter

See merge request agents/data_agents_opt!33

metagpt/actions/ask_review.py

@@ -0,0 +1,62 @@
+from typing import List
+
+from metagpt.actions import Action
+from metagpt.schema import Message, Plan
+from metagpt.logs import logger
+
+
+class ReviewConst:
+    TASK_REVIEW_TRIGGER = "task"
+    CODE_REVIEW_TRIGGER = "code"
+    CONTINUE_WORD = ["confirm", "continue", "c", "yes", "y"]
+    CHANGE_WORD = ["change"]
+    EXIT_WORD = ["exit"]
+    TASK_REVIEW_INSTRUCTION = (
+        f"If you want to change, add, delete a task or merge tasks in the plan, say '{CHANGE_WORD[0]} task task_id or current task, ... (things to change)' "
+        f"If you confirm the output from the current task and wish to continue, type: {CONTINUE_WORD[0]}"
+    )
+    CODE_REVIEW_INSTRUCTION = (
+        f"If you want the codes to be rewritten, say '{CHANGE_WORD[0]} ... (your change advice)' "
+        f"If you want to leave it as is, type: {CONTINUE_WORD[0]} or {CONTINUE_WORD[1]}"
+    )
+    EXIT_INSTRUCTION = f"If you want to terminate the process, type: {EXIT_WORD[0]}"
+
+
+class AskReview(Action):
+    async def run(
+        self, context: List[Message], plan: Plan = None, trigger: str = "task"
+    ):
+        logger.info("Current overall plan:")
+        logger.info(
+            "\n".join(
+                [
+                    f"{task.task_id}: {task.instruction}, is_finished: {task.is_finished}"
+                    for task in plan.tasks
+                ]
+            )
+        )
+
+        logger.info("most recent context:")
+        latest_action = context[-1].cause_by.__name__ if context[-1].cause_by else ""
+        review_instruction = (
+            ReviewConst.TASK_REVIEW_INSTRUCTION
+            if trigger == ReviewConst.TASK_REVIEW_TRIGGER
+            else ReviewConst.CODE_REVIEW_INSTRUCTION
+        )
+        prompt = (
+            f"This is a <{trigger}> review. Please review output from {latest_action}\n"
+            f"{review_instruction}\n"
+            f"{ReviewConst.EXIT_INSTRUCTION}\n"
+            "Please type your review below:\n"
+        )
+
+        rsp = input(prompt)
+
+        if rsp.lower() in ReviewConst.EXIT_WORD:
+            exit()
+
+        # Confirmation can be one of "confirm", "continue", "c", "yes", "y" exactly, or sentences containing "confirm".
+        # One could say "confirm this task, but change the next task to ..."
+        confirmed = rsp.lower() in ReviewConst.CONTINUE_WORD or ReviewConst.CONTINUE_WORD[0] in rsp.lower()
+
+        return rsp, confirmed

metagpt/actions/ml_da_action.py

@@ -10,62 +10,6 @@ from metagpt.prompts.ml_engineer import (
     PRINT_DATA_COLUMNS
 )
 
-class ReviewConst:
-    TASK_REVIEW_TRIGGER = "task"
-    CODE_REVIEW_TRIGGER = "code"
-    CONTINUE_WORD = ["confirm", "continue", "c", "yes", "y"]
-    CHANGE_WORD = ["change"]
-    EXIT_WORD = ["exit"]
-    TASK_REVIEW_INSTRUCTION = (
-        f"If you want to change, add, delete a task or merge tasks in the plan, say '{CHANGE_WORD[0]} task task_id or current task, ... (things to change)' "
-        f"If you confirm the output from the current task and wish to continue, type: {CONTINUE_WORD[0]}"
-    )
-    CODE_REVIEW_INSTRUCTION = (
-        f"If you want the codes to be rewritten, say '{CHANGE_WORD[0]} ... (your change advice)' "
-        f"If you want to leave it as is, type: {CONTINUE_WORD[0]} or {CONTINUE_WORD[1]}"
-    )
-    EXIT_INSTRUCTION = f"If you want to terminate the process, type: {EXIT_WORD[0]}"
-
-
-class AskReview(Action):
-    async def run(
-        self, context: List[Message], plan: Plan = None, trigger: str = "task"
-    ):
-        logger.info("Current overall plan:")
-        logger.info(
-            "\n".join(
-                [
-                    f"{task.task_id}: {task.instruction}, is_finished: {task.is_finished}"
-                    for task in plan.tasks
-                ]
-            )
-        )
-
-        logger.info("most recent context:")
-        latest_action = context[-1].cause_by.__name__ if context[-1].cause_by else ""
-        review_instruction = (
-            ReviewConst.TASK_REVIEW_INSTRUCTION
-            if trigger == ReviewConst.TASK_REVIEW_TRIGGER
-            else ReviewConst.CODE_REVIEW_INSTRUCTION
-        )
-        prompt = (
-            f"This is a <{trigger}> review. Please review output from {latest_action}\n"
-            f"{review_instruction}\n"
-            f"{ReviewConst.EXIT_INSTRUCTION}\n"
-            "Please type your review below:\n"
-        )
-
-        rsp = input(prompt)
-
-        if rsp.lower() in ReviewConst.EXIT_WORD:
-            exit()
-
-        # Confirmation can be one of "confirm", "continue", "c", "yes", "y" exactly, or sentences containing "confirm".
-        # One could say "confirm this task, but change the next task to ..."
-        confirmed = rsp.lower() in ReviewConst.CONTINUE_WORD or ReviewConst.CONTINUE_WORD[0] in rsp.lower()
-
-        return rsp, confirmed
-
 
 class SummarizeAnalysis(Action):
     PROMPT_TEMPLATE = """

metagpt/actions/write_analysis_code.py

@@ -277,7 +277,7 @@ class MakeTools(WriteCodeByGenerate):
         saved_path.write_text(tool_code, encoding='utf-8')
 
     @retry(stop=stop_after_attempt(3), wait=wait_fixed(1))
-    async def run(self, code: str | List[dict], code_desc: str = None, **kwargs) -> str:
+    async def run(self, code: Union[str, List[dict]], code_desc: str = None, **kwargs) -> str:
         # 拼接code prompt
         code_prompt = f"The following code is about {code_desc}, convert it to be a General Function, {code}"
         if not self.context:

metagpt/actions/write_plan.py

@@ -10,7 +10,7 @@ from copy import deepcopy
 import traceback
 
 from metagpt.actions import Action
-from metagpt.prompts.ml_engineer import ASSIGN_TASK_TYPE_PROMPT, ASSIGN_TASK_TYPE
+from metagpt.prompts.ml_engineer import ASSIGN_TASK_TYPE_PROMPT, ASSIGN_TASK_TYPE_CONFIG
 from metagpt.schema import Message, Task, Plan
 from metagpt.utils.common import CodeParser, create_func_config
 from metagpt.logs import logger
@@ -50,7 +50,7 @@ class WritePlan(Action):
             [f"Task {task['task_id']}: {task['instruction']}" for task in tasks]
         )
         prompt = ASSIGN_TASK_TYPE_PROMPT.format(task_list=task_list)
-        tool_config = create_func_config(ASSIGN_TASK_TYPE)
+        tool_config = create_func_config(ASSIGN_TASK_TYPE_CONFIG)
         rsp = await self.llm.aask_code(prompt, **tool_config)
         task_type_list = rsp["task_type"]
         for task, task_type in zip(tasks, task_type_list):