Merge branch 'mgx_ops' into 'data_analyst_ldy'

# Conflicts:
#   metagpt/roles/di/data_analyst.py

metagpt/prompts/di/engineer2.py

@@ -11,7 +11,11 @@ EXTRA_INSTRUCTION = """
 11. Write out EVERY CODE DETAIL, DON'T LEAVE TODO.
 12. To modify code in a file, read the entire file, make changes, and update the file with the complete code, ensuring that no line numbers are included in the final write.
 13. When a system design or project schedule is provided, at the end of the plan, add a CodeRview Task for each file; for example, if there are three files, add three CodeRview Tasks. For each CodeRview Task, just call ReviewAndRewriteCode.run.
-14. When you are making plan.it is hightly recommand to plan all the coding plan and reviews plan in first response.
+14. When planning, initially list the files for coding, then outline all coding and review tasks in your first response.
+15. Note 'Task for {file_name} completed.' — signifies the {file_name} coding task is done.
+16. Avoid re-reviewing or re-coding the same code. When you decide to take a write or review action, include the command 'finish current task' in the same response.
+17. When coding JavaScript, avoid using '\'' in strings.
+18. If you plan to read a file, do not include other plans in the same response.
 """
 
 

metagpt/prompts/di/role_zero.py

@@ -10,8 +10,11 @@ Note:
 4. Don't forget to append task first when all existing tasks are finished and new tasks are required.
 5. Avoid repeating tasks you have already completed. And end loop when all requirements are met.
 """
-# To ensure compatibility with hard-coded experience, do not add any other content between "# Example" and "# Available Commands".
+# To ensure compatibility with hard-coded experience, do not add any other content between "# Example" and "# Instruction".
 CMD_PROMPT = """
+# Latest Observation
+{latest_observation}
+
 # Data Structure
 class Task(BaseModel):
     task_id: str = ""
@@ -42,10 +45,16 @@ Special Command: Use {{"command_name": "end"}} to do nothing or indicate complet
 Pay close attention to the Example provided, you can reuse the example for your current situation if it fits.
 You may use any of the available commands to create a plan or update the plan. You may output mutiple commands, they will be executed sequentially.
 If you finish current task, you will automatically take the next task in the existing plan, use Plan.finish_task, DON'T append a new task.
-Pay close attention to what you have done. Be different with your previous action.
+Review the latest plan's outcome, focusing on achievements. If your completed task matches the current, consider it finished.
+In your response, include at least one command.
 
 # Your commands in a json array, in the following output format with correct command_name and args. If there is nothing to do, use the pass or end command:
 Some text indicating your thoughts before JSON is required, such as what tasks have been completed, what tasks are next, how you should update the plan status, respond to inquiry, or seek for help. Then a json array of commands. You must output ONE and ONLY ONE json array. DON'T output multiple json arrays with thoughts between them.
+Output should adhere to the following format.
+Firstly, describe the actions you have taken recently.
+Secondly, describe the messages you have received recently, with a particular emphasis on messages from users.
+Thirdly, describe your current task . Review the histroy, if you find that the current task is identical to a previously completed one, it indicates that the current task has already been accomplished. If all tasks are finished and current task is empty, use the end command to terminate.
+Then, articulate your thoughts and list the commands, adhering closely to the instructions provided.
 ```json
 [
     {{
@@ -67,12 +76,18 @@ JSON_REPAIR_PROMPT = """
 ```json
 
 ```
+Do not use escape characters in json data, particularly within file paths.
 Help check if there are any formatting issues with the JSON data? If so, please help format it.
+If no issues are detected, the original json data should be returned unchanged.
+Output the JSON data in a format that can be loaded by the json.loads() function.
 """
 
 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:
+Decide if the latest user message previously is a quick question.
+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.
+Time- or location-sensitive questions such as wheather or news inquiry are NOT quick questions.
+Software development tasks are NOT quick questions.
+However, these programming-related tasks are quick questions: writing trivial code snippets (fewer than 30 lines), filling a single function or class, explaining concepts, writing tutorials and documentation.
+Respond with a concise thought then a YES if the question is a quick question, otherwise, a NO. Your response:
 """

metagpt/prompts/di/swe_agent.py

@@ -124,12 +124,9 @@ Thought: The bug has been fixed. Let's submit the changes.
 ##### Push the changes from the local repository to the remote repository.
 Thought: All changes have been saved, let's push the code to the remote repository.
 {{
-    "command_name": "git_push",
+    "command_name": "Bash.run",
     "args": {{
-        "local_path": "/workspace/MetaGPT",
-        "app_name": "github",
-        "comments": "Fix Issue #1275: produced TypeError: openai.types.completion_usage.CompletionUsage() argument after ** must be a mapping, not NoneType"",
-        "new_branch": "test-fix"
+        "cmd": "git push origin test-fix"
     }}
 }}
 ->
@@ -220,7 +217,7 @@ IMPORTANT_TIPS = """
     - Based on feedback of observation or bash command in trajectory to guide adjustments in your search strategy.
 
 13. Save the code change:
-  - If you need to submit changes to the remote repository, first use the regular git commit command to save the changes locally, then select a command from the `Available Commands: [git_push, git_create_pull]` to submit the changes to the remote repository.
+  - If you need to submit changes to the remote repository, first use the regular git commit command to save the changes locally, then use git push for pushing, and if requested, `git_create_pull` in Available Commands for creating pull request.
 
   - If you don't need to submit code changes to the remote repository. use the command Bash.run('submit') to commit the changes locally. 
 

metagpt/prompts/di/team_leader.py

@@ -13,15 +13,26 @@ When creating a new plan involving multiple members, create all tasks at once.
 If plan is created, you should track the progress based on team member feedback message, and update plan accordingly, such as Plan.finish_current_task, Plan.reset_task, Plan.replace_task, etc.
 You should use TeamLeader.publish_team_message to team members, asking them to start their task. DONT omit any necessary info such as path, link, environment, programming language, framework, requirement, constraint from original content to team members because you are their sole info source.
 Pay close attention to new user message, review the conversation history, use RoleZero.reply_to_human to respond to the user directly, DON'T ask your team members.
-
+Pay close attention to messages from team members. If a team member has finished a task, do not ask them to repeat it; instead, mark the current task as completed.
 Note:
-1. If the requirement is a pure DATA-RELATED requirement, such as bug fixes, issue reporting, environment setup, terminal operations, pip install, web browsing, web scraping, web searching, web imitation, data science, data analysis, machine learning, deep learning, text-to-image etc. DON'T decompose it, assign a single task with the original user requirement as instruction directly to Data Analyst.
+1. If the requirement is a pure DATA-RELATED requirement, such as web browsing, web scraping, web searching, web imitation, data science, data analysis, machine learning, deep learning, text-to-image etc. DON'T decompose it, assign a single task with the original user requirement as instruction directly to Data Analyst.
 2. If the requirement is developing a software, game, app, or website, excluding the above data-related tasks, you should decompose the requirement into multiple tasks and assign them to different team members based on their expertise, usually the sequence of Product Manager -> Architect -> Project Manager -> Engineer -> (optional: QaEngine if present) -> (optional: DataAnalyst if user requests deployment), each assigned ONE task. When publishing message to Product Manager, you should directly copy the full original user requirement.
 3. If the requirement contains both DATA-RELATED part mentioned in 1 and software development part mentioned in 2, you should decompose the software development part and assign them to different team members based on their expertise, and assign the DATA-RELATED part to Data Analyst David directly.
 4. If the requirement is a common-sense, logical, or math problem, you should respond directly without assigning any task to team members.
 5. If you think the requirement is not clear or ambiguous, you should ask the user for clarification immediately. Assign tasks only after all info is clear.
 6. It is helpful for Engineer to have both the system design and the project schedule for writing the code, so include paths of both files (if available) and remind Engineer to definitely read them when publishing message to Engineer.
 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.
+8. If the receiver message reads 'from {{team member}} to {{\'<all>\'}}, it indicates that someone has completed the current task. Note this in your thoughts.
+9. Do not use the 'end' command when the current task remains unfinished; instead, use the 'finish_current_task' command to indicate completion before switching to the next task.
+10. If you have made a plan, simply follow it without creating a new one.
+11. Do not use escape characters in json data, particularly within file paths.
+"""
+
+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 = """