Merge branch 'feat-reporter' into 'feat-stream'

Feat reporter

See merge request pub/MetaGPT!77

metagpt/actions/design_api.py

@@ -24,9 +24,9 @@ from metagpt.actions.design_api_an import (
 )
 from metagpt.const import DATA_API_DESIGN_FILE_REPO, SEQ_FLOW_FILE_REPO
 from metagpt.logs import logger
-from metagpt.report import DocsReporter
 from metagpt.schema import Document, Documents, Message
 from metagpt.utils.mermaid import mermaid_to_file
+from metagpt.utils.report import DocsReporter
 
 NEW_REQ_TEMPLATE = """
 ### Legacy Content

metagpt/actions/di/execute_nb_code.py

@@ -27,7 +27,7 @@ from rich.syntax import Syntax
 from metagpt.actions import Action
 from metagpt.const import DEFAULT_WORKSPACE_ROOT
 from metagpt.logs import logger
-from metagpt.report import NotebookReporter
+from metagpt.utils.report import NotebookReporter
 
 INSTALL_KEEPLEN = 500
 

metagpt/actions/project_management.py

@@ -18,8 +18,8 @@ from metagpt.actions.action_output import ActionOutput
 from metagpt.actions.project_management_an import PM_NODE, REFINED_PM_NODE
 from metagpt.const import PACKAGE_REQUIREMENTS_FILENAME
 from metagpt.logs import logger
-from metagpt.report import DocsReporter
 from metagpt.schema import Document, Documents
+from metagpt.utils.report import DocsReporter
 
 NEW_REQ_TEMPLATE = """
 ### Legacy Content

metagpt/actions/write_code.py

@@ -25,10 +25,10 @@ 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, REQUIREMENT_FILENAME
 from metagpt.logs import logger
-from metagpt.report import EditorReporter
 from metagpt.schema import CodingContext, Document, RunCodeResult
 from metagpt.utils.common import CodeParser
 from metagpt.utils.project_repo import ProjectRepo
+from metagpt.utils.report import EditorReporter
 
 PROMPT_TEMPLATE = """
 NOTICE

metagpt/actions/write_prd.py

@@ -33,11 +33,11 @@ from metagpt.const import (
     REQUIREMENT_FILENAME,
 )
 from metagpt.logs import logger
-from metagpt.report import DocsReporter
 from metagpt.schema import BugFixContext, Document, Documents, Message
 from metagpt.utils.common import CodeParser
 from metagpt.utils.file_repository import FileRepository
 from metagpt.utils.mermaid import mermaid_to_file
+from metagpt.utils.report import DocsReporter
 
 CONTEXT_TEMPLATE = """
 ### Project Name

metagpt/schema.py

@@ -48,9 +48,9 @@ from metagpt.const import (
 )
 from metagpt.logs import logger
 from metagpt.repo_parser import DotClassInfo
-from metagpt.report import TaskReporter
 from metagpt.utils.common import any_to_str, any_to_str_set, import_class
 from metagpt.utils.exceptions import handle_exception
+from metagpt.utils.report import TaskReporter
 from metagpt.utils.serialize import (
     actionoutout_schema_to_mapping,
     actionoutput_mapping_to_str,

metagpt/tools/libs/browser.py

@@ -1,8 +1,8 @@
 from playwright.async_api import async_playwright
 
 from metagpt.const import DEFAULT_WORKSPACE_ROOT
-from metagpt.report import BrowserReporter
 from metagpt.tools.tool_registry import register_tool
+from metagpt.utils.report import BrowserReporter
 
 
 @register_tool()

metagpt/tools/libs/deployer.py

@@ -1,5 +1,5 @@
-from metagpt.report import ServerReporter
 from metagpt.tools.tool_registry import register_tool
+from metagpt.utils.report import ServerReporter
 
 
 # An un-implemented tool reserved for deploying a local service to public

metagpt/tools/libs/file_manager.py

@@ -4,8 +4,8 @@ import subprocess
 
 from pydantic import BaseModel, Field
 
-from metagpt.report import EditorReporter
 from metagpt.tools.tool_registry import register_tool
+from metagpt.utils.report import EditorReporter
 
 
 class FileBlock(BaseModel):

metagpt/tools/libs/terminal.py

@@ -2,8 +2,8 @@ import subprocess
 import threading
 from queue import Queue
 
-from metagpt.report import END_MARKER_VALUE, TerminalReporter
 from metagpt.tools.tool_registry import register_tool
+from metagpt.utils.report import END_MARKER_VALUE, TerminalReporter
 
 
 @register_tool()

metagpt/utils/report.py

@@ -89,7 +89,7 @@ class ResourceReporter(BaseModel):
                 ...     print(value, name)
                 ```
         """
-        cls._report = fn
+        cls._async_report = fn
 
     def _report(self, value: Any, name: str):
         if not self.callback_url:
@@ -146,14 +146,14 @@ class ResourceReporter(BaseModel):
 
     async def __aexit__(self, *args, **kwargs):
         """Exit the asynchronous streaming callback context."""
-        await self.async_report(None, END_MARKER_NAME)
         self.is_chunk = False
         if self.enable_llm_stream:
             self._llm_task.cancel()
             self._llm_task = None
+        await self.async_report(None, END_MARKER_NAME)
 
     async def _llm_stream_report(self, queue: asyncio.Queue):
-        while True:
+        while self.is_chunk:
             await self.async_report(await queue.get(), "content")
 
     async def wait_llm_stream_report(self):

tests/metagpt/test_reporter.py

@@ -5,7 +5,7 @@ import aiohttp.web
 import pytest
 
 from metagpt.logs import log_llm_stream
-from metagpt.report import (
+from metagpt.utils.report import (
     END_MARKER_NAME,
     BlockType,
     BrowserReporter,