From d0486f8e11b9e1ff544444ea237b199b81e95874 Mon Sep 17 00:00:00 2001
From: shenchucheng <chuchengshen@fuzhi.ai>
Date: Sat, 11 May 2024 19:47:33 +0800
Subject: [PATCH] add cr reporter

---
 metagpt/actions/write_code.py        |  2 +-
 metagpt/actions/write_code_review.py | 16 +++++++++++-----
 metagpt/utils/report.py              |  8 ++++++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/metagpt/actions/write_code.py b/metagpt/actions/write_code.py
index 67b859d23..dc8a6dee5 100644
--- a/metagpt/actions/write_code.py
+++ b/metagpt/actions/write_code.py
@@ -153,7 +153,7 @@ class WriteCode(Action):
                 root_path = self.context.src_workspace if self.context.src_workspace else ""
                 coding_context.code_doc = Document(filename=coding_context.filename, root_path=str(root_path))
             coding_context.code_doc.content = code
-            await reporter.async_report(self.repo.workdir / coding_context.code_doc.root_relative_path, "path")
+            await reporter.async_report(coding_context.code_doc, "document")
         return coding_context
 
     @staticmethod
diff --git a/metagpt/actions/write_code_review.py b/metagpt/actions/write_code_review.py
index f0faea701..1b9f9554b 100644
--- a/metagpt/actions/write_code_review.py
+++ b/metagpt/actions/write_code_review.py
@@ -17,6 +17,7 @@ from metagpt.const import REQUIREMENT_FILENAME
 from metagpt.logs import logger
 from metagpt.schema import CodingContext
 from metagpt.utils.common import CodeParser
+from metagpt.utils.report import EditorReporter
 
 PROMPT_TEMPLATE = """
 # System
@@ -128,16 +129,21 @@ class WriteCodeReview(Action):
     i_context: CodingContext = Field(default_factory=CodingContext)
 
     @retry(wait=wait_random_exponential(min=1, max=60), stop=stop_after_attempt(6))
-    async def write_code_review_and_rewrite(self, context_prompt, cr_prompt, filename):
+    async def write_code_review_and_rewrite(self, context_prompt, cr_prompt, doc):
+        filename = doc.filename
         cr_rsp = await self._aask(context_prompt + cr_prompt)
         result = CodeParser.parse_block("Code Review Result", cr_rsp)
         if "LGTM" in result:
             return result, None
 
         # if LBTM, rewrite code
-        rewrite_prompt = f"{context_prompt}\n{cr_rsp}\n{REWRITE_CODE_TEMPLATE.format(filename=filename)}"
-        code_rsp = await self._aask(rewrite_prompt)
-        code = CodeParser.parse_code(text=code_rsp)
+        async with EditorReporter(enable_llm_stream=True) as reporter:
+            await reporter.async_report({"type": "code", "filename": filename, "src_path": doc.root_relative_path}, "meta")
+            rewrite_prompt = f"{context_prompt}\n{cr_rsp}\n{REWRITE_CODE_TEMPLATE.format(filename=filename)}"
+            code_rsp = await self._aask(rewrite_prompt)
+            code = CodeParser.parse_code(text=code_rsp)
+            doc.content = code
+            await reporter.async_report(doc, "document")
         return result, code
 
     async def run(self, *args, **kwargs) -> CodingContext:
@@ -182,7 +188,7 @@ class WriteCodeReview(Action):
                 f"len(self.i_context.code_doc.content)={len2}"
             )
             result, rewrited_code = await self.write_code_review_and_rewrite(
-                context_prompt, cr_prompt, self.i_context.code_doc.filename
+                context_prompt, cr_prompt, self.i_context.code_doc
             )
             if "LBTM" in result:
                 iterative_code = rewrited_code
diff --git a/metagpt/utils/report.py b/metagpt/utils/report.py
index a61c77381..616a52f30 100644
--- a/metagpt/utils/report.py
+++ b/metagpt/utils/report.py
@@ -131,7 +131,11 @@ class ResourceReporter(BaseModel):
 
     def _format_data(self, value, name):
         data = self.model_dump(mode="json", exclude=("callback_url", "llm_stream"))
-        data["value"] = str(value) if isinstance(value, Path) else value
+        if isinstance(value, BaseModel):
+            value = value.model_dump(mode="json")
+        elif isinstance(value, Path):
+            value = str(value)
+        data["value"] = value
         data["name"] = name
         role = CURRENT_ROLE.get(None)
         if role:
@@ -263,7 +267,7 @@ class FileReporter(ResourceReporter):
         """Report file resource synchronously."""
         return super().report(value, name)
 
-    async def async_report(self, value: Path, name: Literal["path", "meta", "content"] = "path"):
+    async def async_report(self, value: Path, name: Literal["path", "meta", "content", "document"] = "path"):
         """Report file resource asynchronously."""
         return await super().async_report(value, name)