feat: merge gitlab:mgx_ops

metagpt/actions/di/execute_nb_code.py

@@ -65,7 +65,7 @@ class ExecuteNbCode(Action):
     """execute notebook code block, return result to llm, and display it."""
 
     nb: NotebookNode
-    nb_client: NotebookClient = None
+    nb_client: RealtimeOutputNotebookClient = None
     console: Console
     interaction: str
     timeout: int = 600
@@ -78,11 +78,15 @@ class ExecuteNbCode(Action):
             interaction=("ipython" if self.is_ipython() else "terminal"),
         )
         self.reporter = NotebookReporter()
+        self.set_nb_client()
+
+    def set_nb_client(self):
         self.nb_client = RealtimeOutputNotebookClient(
-            nb,
-            timeout=timeout,
+            self.nb,
+            timeout=self.timeout,
             resources={"metadata": {"path": DEFAULT_WORKSPACE_ROOT}},
             notebook_reporter=self.reporter,
+            coalesce_streams=True,
         )
 
     async def build(self):
@@ -118,7 +122,7 @@ class ExecuteNbCode(Action):
         # sleep 1s to wait for the kernel to be cleaned up completely
         await asyncio.sleep(1)
         await self.build()
-        self.nb_client = NotebookClient(self.nb, timeout=self.timeout)
+        self.set_nb_client()
 
     def add_code_cell(self, code: str):
         self.nb.cells.append(new_code_cell(source=code))

metagpt/actions/write_code.py

@@ -161,7 +161,7 @@ class WriteCode(Action):
                     filename=coding_context.filename, root_path=str(self.repo.src_relative_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

metagpt/actions/write_code_review.py

@@ -18,6 +18,7 @@ from metagpt.logs import logger
 from metagpt.schema import CodingContext, Document
 from metagpt.utils.common import CodeParser
 from metagpt.utils.project_repo import ProjectRepo
+from metagpt.utils.report import EditorReporter
 
 PROMPT_TEMPLATE = """
 # System
@@ -131,16 +132,23 @@ class WriteCodeReview(Action):
     input_args: Optional[BaseModel] = Field(default=None, exclude=True)
 
     @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:
@@ -185,7 +193,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