Merge branch 'dev' into code_intepreter

metagpt/actions/design_api.py

@@ -117,4 +117,4 @@ class WriteDesign(Action):
 
     async def _save_mermaid_file(self, data: str, pathname: Path):
         pathname.parent.mkdir(parents=True, exist_ok=True)
-        await mermaid_to_file(self.config.mermaid_engine, data, pathname)
+        await mermaid_to_file(self.config.mermaid.engine, data, pathname)

metagpt/actions/write_prd.py

@@ -159,7 +159,7 @@ class WritePRD(Action):
             return
         pathname = self.repo.workdir / COMPETITIVE_ANALYSIS_FILE_REPO / Path(prd_doc.filename).stem
         pathname.parent.mkdir(parents=True, exist_ok=True)
-        await mermaid_to_file(self.config.mermaid_engine, quadrant_chart, pathname)
+        await mermaid_to_file(self.config.mermaid.engine, quadrant_chart, pathname)
 
     async def _rename_workspace(self, prd):
         if not self.project_name:

metagpt/config2.py

@@ -67,14 +67,9 @@ class Config(CLIParams, YamlModel):
     code_review_k_times: int = 2
 
     # Will be removed in the future
-    llm_for_researcher_summary: str = "gpt3"
-    llm_for_researcher_report: str = "gpt3"
     METAGPT_TEXT_TO_IMAGE_MODEL_URL: str = ""
     language: str = "English"
     redis_key: str = "placeholder"
-    mmdc: str = "mmdc"
-    puppeteer_config: str = ""
-    pyppeteer_executable_path: str = ""
     IFLYTEK_APP_ID: str = ""
     IFLYTEK_API_SECRET: str = ""
     IFLYTEK_API_KEY: str = ""
@@ -86,7 +81,7 @@ class Config(CLIParams, YamlModel):
 
     @classmethod
     def from_home(cls, path):
-        """Load config from ~/.metagpt/config.yaml"""
+        """Load config from ~/.metagpt/config2.yaml"""
         pathname = CONFIG_ROOT / path
         if not pathname.exists():
             return None

metagpt/configs/llm_config.py

@@ -74,5 +74,5 @@ class LLMConfig(YamlModel):
     @classmethod
     def check_llm_key(cls, v):
         if v in ["", None, "YOUR_API_KEY"]:
-            raise ValueError("Please set your API key in config.yaml")
+            raise ValueError("Please set your API key in config2.yaml")
         return v

metagpt/configs/mermaid_config.py

@@ -14,5 +14,6 @@ class MermaidConfig(YamlModel):
     """Config for Mermaid"""
 
     engine: Literal["nodejs", "ink", "playwright", "pyppeteer"] = "nodejs"
-    path: str = ""
-    puppeteer_config: str = ""  # Only for nodejs engine
+    path: str = "mmdc"  # mmdc
+    puppeteer_config: str = ""
+    pyppeteer_path: str = "/usr/bin/google-chrome-stable"

metagpt/utils/mermaid.py

@@ -35,10 +35,10 @@ async def mermaid_to_file(engine, mermaid_code, output_file_without_suffix, widt
     # tmp.write_text(mermaid_code, encoding="utf-8")
 
     if engine == "nodejs":
-        if check_cmd_exists(config.mmdc) != 0:
+        if check_cmd_exists(config.mermaid.path) != 0:
             logger.warning(
                 "RUN `npm install -g @mermaid-js/mermaid-cli` to install mmdc,"
-                "or consider changing MERMAID_ENGINE to `playwright`, `pyppeteer`, or `ink`."
+                "or consider changing engine to `playwright`, `pyppeteer`, or `ink`."
             )
             return -1
 
@@ -47,11 +47,11 @@ async def mermaid_to_file(engine, mermaid_code, output_file_without_suffix, widt
             # Call the `mmdc` command to convert the Mermaid code to a PNG
             logger.info(f"Generating {output_file}..")
 
-            if config.puppeteer_config:
+            if config.mermaid.puppeteer_config:
                 commands = [
-                    config.mmdc,
+                    config.mermaid.path,
                     "-p",
-                    config.puppeteer_config,
+                    config.mermaid.puppeteer_config,
                     "-i",
                     str(tmp),
                     "-o",
@@ -62,7 +62,7 @@ async def mermaid_to_file(engine, mermaid_code, output_file_without_suffix, widt
                     str(height),
                 ]
             else:
-                commands = [config.mmdc, "-i", str(tmp), "-o", output_file, "-w", str(width), "-H", str(height)]
+                commands = [config.mermaid.path, "-i", str(tmp), "-o", output_file, "-w", str(width), "-H", str(height)]
             process = await asyncio.create_subprocess_shell(
                 " ".join(commands), stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE
             )

metagpt/utils/mmdc_pyppeteer.py

@@ -30,14 +30,14 @@ async def mermaid_to_file(mermaid_code, output_file_without_suffix, width=2048,
     suffixes = ["png", "svg", "pdf"]
     __dirname = os.path.dirname(os.path.abspath(__file__))
 
-    if config.pyppeteer_executable_path:
+    if config.mermaid.pyppeteer_path:
         browser = await launch(
             headless=True,
-            executablePath=config.pyppeteer_executable_path,
+            executablePath=config.mermaid.pyppeteer_path,
             args=["--disable-extensions", "--no-sandbox"],
         )
     else:
-        logger.error("Please set the environment variable:PYPPETEER_EXECUTABLE_PATH.")
+        logger.error("Please set the var mermaid.pyppeteer_path in the config2.yaml.")
         return -1
     page = await browser.newPage()
     device_scale_factor = 1.0

metagpt/utils/yaml_model.py

@@ -42,7 +42,7 @@ class YamlModelWithoutDefault(YamlModel):
     @model_validator(mode="before")
     @classmethod
     def check_not_default_config(cls, values):
-        """Check if there is any default config in config.yaml"""
+        """Check if there is any default config in config2.yaml"""
         if any(["YOUR" in v for v in values]):
-            raise ValueError("Please set your config in config.yaml")
+            raise ValueError("Please set your config in config2.yaml")
         return values