diff --git a/metagpt/actions/write_code.py b/metagpt/actions/write_code.py index 0b86ac1bb..feb15657d 100644 --- a/metagpt/actions/write_code.py +++ b/metagpt/actions/write_code.py @@ -23,11 +23,7 @@ from tenacity import retry, stop_after_attempt, wait_random_exponential from metagpt.actions.action import Action from metagpt.actions.project_management_an import REFINED_TASK_LIST, TASK_LIST from metagpt.actions.write_code_plan_and_change_an import REFINED_TEMPLATE -from metagpt.const import ( - BUGFIX_FILENAME, - CODE_PLAN_AND_CHANGE_FILENAME, - REQUIREMENT_FILENAME, -) +from metagpt.const import BUGFIX_FILENAME, REQUIREMENT_FILENAME from metagpt.logs import logger from metagpt.schema import CodingContext, Document, RunCodeResult from metagpt.utils.common import CodeParser @@ -98,8 +94,6 @@ class WriteCode(Action): bug_feedback = await self.repo.docs.get(filename=BUGFIX_FILENAME) coding_context = CodingContext.loads(self.i_context.content) test_doc = await self.repo.test_outputs.get(filename="test_" + coding_context.filename + ".json") - code_plan_and_change_doc = await self.repo.docs.code_plan_and_change.get(filename=CODE_PLAN_AND_CHANGE_FILENAME) - code_plan_and_change = code_plan_and_change_doc.content if code_plan_and_change_doc else "" requirement_doc = await self.repo.docs.get(filename=REQUIREMENT_FILENAME) summary_doc = None if coding_context.design_doc and coding_context.design_doc.filename: @@ -111,7 +105,7 @@ class WriteCode(Action): if bug_feedback: code_context = coding_context.code_doc.content - elif code_plan_and_change: + elif self.config.inc: code_context = await self.get_codes( coding_context.task_doc, exclude=self.i_context.filename, project_repo=self.repo, use_inc=True ) @@ -122,10 +116,10 @@ class WriteCode(Action): project_repo=self.repo.with_src_path(self.context.src_workspace), ) - if code_plan_and_change: + if self.config.inc: prompt = REFINED_TEMPLATE.format( user_requirement=requirement_doc.content if requirement_doc else "", - code_plan_and_change=code_plan_and_change, + code_plan_and_change=str(coding_context.code_plan_and_change_doc), design=coding_context.design_doc.content if coding_context.design_doc else "", task=coding_context.task_doc.content if coding_context.task_doc else "", code=code_context, diff --git a/metagpt/actions/write_code_review.py b/metagpt/actions/write_code_review.py index da636eb36..ac6fe7045 100644 --- a/metagpt/actions/write_code_review.py +++ b/metagpt/actions/write_code_review.py @@ -13,7 +13,7 @@ from tenacity import retry, stop_after_attempt, wait_random_exponential from metagpt.actions import WriteCode from metagpt.actions.action import Action -from metagpt.const import CODE_PLAN_AND_CHANGE_FILENAME, REQUIREMENT_FILENAME +from metagpt.const import REQUIREMENT_FILENAME from metagpt.logs import logger from metagpt.schema import CodingContext from metagpt.utils.common import CodeParser @@ -149,29 +149,21 @@ class WriteCodeReview(Action): use_inc=self.config.inc, ) - if not self.config.inc: - context = "\n".join( - [ - "## System Design\n" + str(self.i_context.design_doc) + "\n", - "## Task\n" + task_content + "\n", - "## Code Files\n" + code_context + "\n", - ] - ) - else: + ctx_list = [ + "## System Design\n" + str(self.i_context.design_doc) + "\n", + "## Task\n" + task_content + "\n", + "## Code Files\n" + code_context + "\n", + ] + if self.config.inc: requirement_doc = await self.repo.docs.get(filename=REQUIREMENT_FILENAME) - code_plan_and_change_doc = await self.repo.get(filename=CODE_PLAN_AND_CHANGE_FILENAME) - context = "\n".join( - [ - "## User New Requirements\n" + str(requirement_doc) + "\n", - "## Code Plan And Change\n" + str(code_plan_and_change_doc) + "\n", - "## System Design\n" + str(self.i_context.design_doc) + "\n", - "## Task\n" + task_content + "\n", - "## Code Files\n" + code_context + "\n", - ] - ) + insert_ctx_list = [ + "## User New Requirements\n" + str(requirement_doc) + "\n", + "## Code Plan And Change\n" + str(self.i_context.code_plan_and_change_doc) + "\n", + ] + ctx_list = insert_ctx_list + ctx_list context_prompt = PROMPT_TEMPLATE.format( - context=context, + context="\n".join(ctx_list), code=iterative_code, filename=self.i_context.code_doc.filename, ) diff --git a/metagpt/const.py b/metagpt/const.py index a1c650ce3..8fde31ed3 100644 --- a/metagpt/const.py +++ b/metagpt/const.py @@ -82,7 +82,6 @@ MESSAGE_ROUTE_TO_NONE = "" REQUIREMENT_FILENAME = "requirement.txt" BUGFIX_FILENAME = "bugfix.txt" PACKAGE_REQUIREMENTS_FILENAME = "requirements.txt" -CODE_PLAN_AND_CHANGE_FILENAME = "code_plan_and_change.json" DOCS_FILE_REPO = "docs" PRDS_FILE_REPO = "docs/prd" diff --git a/metagpt/roles/engineer.py b/metagpt/roles/engineer.py index 40ade2110..7037ca0b3 100644 --- a/metagpt/roles/engineer.py +++ b/metagpt/roles/engineer.py @@ -20,7 +20,6 @@ from __future__ import annotations import json -import os from collections import defaultdict from pathlib import Path from typing import Set @@ -32,7 +31,6 @@ from metagpt.actions.summarize_code import SummarizeCode from metagpt.actions.write_code_plan_and_change_an import WriteCodePlanAndChange from metagpt.const import ( CODE_PLAN_AND_CHANGE_FILE_REPO, - CODE_PLAN_AND_CHANGE_FILENAME, REQUIREMENT_FILENAME, SYSTEM_DESIGN_FILE_REPO, TASK_FILE_REPO, @@ -119,10 +117,10 @@ class Engineer(Role): dependencies = {coding_context.design_doc.root_relative_path, coding_context.task_doc.root_relative_path} if self.config.inc: - dependencies.add(os.path.join(CODE_PLAN_AND_CHANGE_FILE_REPO, CODE_PLAN_AND_CHANGE_FILENAME)) + dependencies.add(coding_context.code_plan_and_change_doc.root_relative_path) await self.project_repo.srcs.save( filename=coding_context.filename, - dependencies=dependencies, + dependencies=list(dependencies), content=coding_context.code_doc.content, ) msg = Message( @@ -215,11 +213,12 @@ class Engineer(Role): self.rc.todo.i_context.design_filename, self.rc.todo.i_context.task_filename, } + code_plan_and_change_filepath = Path(self.rc.todo.i_context.design_filename) await self.project_repo.docs.code_plan_and_change.save( - filename=self.rc.todo.i_context.filename, content=code_plan_and_change, dependencies=dependencies + filename=code_plan_and_change_filepath.name, content=code_plan_and_change, dependencies=dependencies ) await self.project_repo.resources.code_plan_and_change.save( - filename=Path(self.rc.todo.i_context.filename).with_suffix(".md").name, + filename=code_plan_and_change_filepath.with_suffix(".md").name, content=node.content, dependencies=dependencies, ) @@ -269,15 +268,24 @@ class Engineer(Role): dependencies = {Path(i) for i in await dependency.get(old_code_doc.root_relative_path)} task_doc = None design_doc = None + code_plan_and_change_doc = None for i in dependencies: if str(i.parent) == TASK_FILE_REPO: task_doc = await self.project_repo.docs.task.get(i.name) elif str(i.parent) == SYSTEM_DESIGN_FILE_REPO: design_doc = await self.project_repo.docs.system_design.get(i.name) + elif str(i.parent) == CODE_PLAN_AND_CHANGE_FILE_REPO: + code_plan_and_change_doc = await self.project_repo.docs.code_plan_and_change.get(i.name) if not task_doc or not design_doc: logger.error(f'Detected source code "{filename}" from an unknown origin.') raise ValueError(f'Detected source code "{filename}" from an unknown origin.') - context = CodingContext(filename=filename, design_doc=design_doc, task_doc=task_doc, code_doc=old_code_doc) + context = CodingContext( + filename=filename, + design_doc=design_doc, + task_doc=task_doc, + code_doc=old_code_doc, + code_plan_and_change_doc=code_plan_and_change_doc, + ) return context async def _new_coding_doc(self, filename, dependency): @@ -296,6 +304,7 @@ class Engineer(Role): for filename in changed_task_files: design_doc = await self.project_repo.docs.system_design.get(filename) task_doc = await self.project_repo.docs.task.get(filename) + code_plan_and_change_doc = await self.project_repo.docs.code_plan_and_change.get(filename) task_list = self._parse_tasks(task_doc) for task_filename in task_list: old_code_doc = await self.project_repo.srcs.get(task_filename) @@ -303,9 +312,18 @@ class Engineer(Role): old_code_doc = Document( root_path=str(self.project_repo.src_relative_path), filename=task_filename, content="" ) - context = CodingContext( - filename=task_filename, design_doc=design_doc, task_doc=task_doc, code_doc=old_code_doc - ) + if not code_plan_and_change_doc: + context = CodingContext( + filename=task_filename, design_doc=design_doc, task_doc=task_doc, code_doc=old_code_doc + ) + else: + context = CodingContext( + filename=task_filename, + design_doc=design_doc, + task_doc=task_doc, + code_doc=old_code_doc, + code_plan_and_change_doc=code_plan_and_change_doc, + ) coding_doc = Document( root_path=str(self.project_repo.src_relative_path), filename=task_filename, diff --git a/metagpt/schema.py b/metagpt/schema.py index ee194afbd..ff21baff0 100644 --- a/metagpt/schema.py +++ b/metagpt/schema.py @@ -37,7 +37,6 @@ from pydantic import ( ) from metagpt.const import ( - CODE_PLAN_AND_CHANGE_FILENAME, MESSAGE_ROUTE_CAUSE_BY, MESSAGE_ROUTE_FROM, MESSAGE_ROUTE_TO, @@ -419,6 +418,7 @@ class CodingContext(BaseContext): design_doc: Optional[Document] = None task_doc: Optional[Document] = None code_doc: Optional[Document] = None + code_plan_and_change_doc: Optional[Document] = None class TestingContext(BaseContext): @@ -473,7 +473,6 @@ class BugFixContext(BaseContext): class CodePlanAndChangeContext(BaseModel): - filename: str = CODE_PLAN_AND_CHANGE_FILENAME requirement: str = "" prd_filename: str = "" design_filename: str = ""