feat: merge send18

metagpt/utils/common.py

@@ -18,10 +18,9 @@ import os
 import platform
 import re
 from typing import List, Tuple, Union
+
+from metagpt.config import CONFIG
 from metagpt.const import MESSAGE_ROUTE_TO_ALL
-from pathlib import Path
-from typing import List, Tuple
-import yaml
 from metagpt.logs import logger
 
 
@@ -186,7 +185,7 @@ class OutputParser:
 
         if start_index != -1 and end_index != -1:
             # Extract the structure part
-            structure_text = text[start_index: end_index + 1]
+            structure_text = text[start_index : end_index + 1]
 
             try:
                 # Attempt to convert the text to a Python data type using ast.literal_eval
@@ -371,3 +370,21 @@ def any_to_name(val):
     :return: The name of the value.
     """
     return any_to_str(val).split(".")[-1]
+
+
+def format_value(value):
+    """Fill parameters inside `value` with `options`."""
+    if not isinstance(value, str):
+        return value
+    if "{" not in value:
+        return value
+
+    merged_opts = CONFIG.options or {}
+    try:
+        return value.format(**merged_opts)
+    except KeyError as e:
+        logger.warning(f"Parameter is missing:{e}")
+
+    for k, v in merged_opts.items():
+        value = value.replace("{" + f"{k}" + "}", str(v))
+    return value

metagpt/utils/cost_manager.py

@@ -6,10 +6,12 @@
 @Desc    : mashenquan, 2023/8/28. Separate the `CostManager` class to support user-level cost accounting.
 """
 
+from typing import NamedTuple
+
 from pydantic import BaseModel
+
 from metagpt.logs import logger
 from metagpt.utils.token_counter import TOKEN_COSTS
-from typing import NamedTuple
 
 
 class Costs(NamedTuple):
@@ -39,8 +41,9 @@ class CostManager(BaseModel):
         """
         self.total_prompt_tokens += prompt_tokens
         self.total_completion_tokens += completion_tokens
-        cost = (prompt_tokens * TOKEN_COSTS[model]["prompt"] + completion_tokens * TOKEN_COSTS[model][
-            "completion"]) / 1000
+        cost = (
+            prompt_tokens * TOKEN_COSTS[model]["prompt"] + completion_tokens * TOKEN_COSTS[model]["completion"]
+        ) / 1000
         self.total_cost += cost
         logger.info(
             f"Total running cost: ${self.total_cost:.3f} | Max budget: ${self.max_budget:.3f} | "

metagpt/utils/git_repository.py

@@ -8,13 +8,15 @@
 """
 from __future__ import annotations
 
-from gitignore_parser import parse_gitignore, rule_from_pattern, handle_negation
 import shutil
 from enum import Enum
 from pathlib import Path
 from typing import Dict, List
+
 from git.repo import Repo
 from git.repo.fun import is_git_dir
+from gitignore_parser import parse_gitignore
+
 from metagpt.const import DEFAULT_WORKSPACE_ROOT
 from metagpt.logs import logger
 from metagpt.utils.dependency_file import DependencyFile
@@ -236,8 +238,9 @@ class GitRepository:
                     rpath = file_path.relative_to(root_relative_path)
                     files.append(str(rpath))
                 else:
-                    subfolder_files = self.get_files(relative_path=file_path, root_relative_path=root_relative_path,
-                                                     filter_ignored=False)
+                    subfolder_files = self.get_files(
+                        relative_path=file_path, root_relative_path=root_relative_path, filter_ignored=False
+                    )
                     files.extend(subfolder_files)
         except Exception as e:
             logger.error(f"Error: {e}")

metagpt/utils/mermaid.py

@@ -7,22 +7,15 @@
 @Modified By: mashenquan, 2023/8/20. Remove global configuration `CONFIG`, enable configuration support for business isolation.
 """
 import asyncio
-<<<<<<< HEAD
 import os
 from pathlib import Path
 
-from metagpt.config import CONFIG
-from metagpt.const import METAGPT_ROOT
-=======
-from pathlib import Path
-
-# from metagpt.utils.common import check_cmd_exists
 import aiofiles
 
-from metagpt.config import CONFIG, Config
-from metagpt.const import PROJECT_ROOT
->>>>>>> send18/dev
+from metagpt.config import CONFIG
+from metagpt.const import METAGPT_ROOT
 from metagpt.logs import logger
+from metagpt.utils.common import check_cmd_exists
 
 
 async def mermaid_to_file(mermaid_code, output_file_without_suffix, width=2048, height=2048) -> int:
@@ -43,7 +36,6 @@ async def mermaid_to_file(mermaid_code, output_file_without_suffix, width=2048,
         await f.write(mermaid_code)
     # tmp.write_text(mermaid_code, encoding="utf-8")
 
-<<<<<<< HEAD
     engine = CONFIG.mermaid_engine.lower()
     if engine == "nodejs":
         if check_cmd_exists(CONFIG.mmdc) != 0:
@@ -100,25 +92,6 @@ async def mermaid_to_file(mermaid_code, output_file_without_suffix, width=2048,
             logger.warning(f"Unsupported mermaid engine: {engine}")
     return 0
 
-=======
-    # if check_cmd_exists("mmdc") != 0:
-    #     logger.warning("RUN `npm install -g @mermaid-js/mermaid-cli` to install mmdc")
-    #     return -1
-
-    # for suffix in ["pdf", "svg", "png"]:
-    for suffix in ["png"]:
-        output_file = f"{output_file_without_suffix}.{suffix}"
-        # Call the `mmdc` command to convert the Mermaid code to a PNG
-        logger.info(f"Generating {output_file}..")
-        cmds = [CONFIG.mmdc, "-i", str(tmp), "-o", output_file, "-w", str(width), "-H", str(height)]
-
-        if CONFIG.puppeteer_config:
-            cmds.extend(["-p", CONFIG.puppeteer_config])
-        process = await asyncio.create_subprocess_exec(*cmds)
-        await process.wait()
-    return process.returncode
->>>>>>> send18/dev
-
 
 if __name__ == "__main__":
     MMC1 = """classDiagram
@@ -171,22 +144,7 @@ if __name__ == "__main__":
         S-->>SE: return summary
         SE-->>M: return summary"""
 
-<<<<<<< HEAD
-if __name__ == "__main__":
     loop = asyncio.new_event_loop()
     result = loop.run_until_complete(mermaid_to_file(MMC1, METAGPT_ROOT / f"{CONFIG.mermaid_engine}/1"))
-    result = loop.run_until_complete(mermaid_to_file(MMC2, METAGPT_ROOT / f"{CONFIG.mermaid_engine}/1"))
+    result = loop.run_until_complete(mermaid_to_file(MMC2, METAGPT_ROOT / f"{CONFIG.mermaid_engine}/2"))
     loop.close()
-=======
-    conf = Config()
-    asyncio.run(
-        mermaid_to_file(
-            options=conf.runtime_options, mermaid_code=MMC1, output_file_without_suffix=PROJECT_ROOT / "tmp/1.png"
-        )
-    )
-    asyncio.run(
-        mermaid_to_file(
-            options=conf.runtime_options, mermaid_code=MMC2, output_file_without_suffix=PROJECT_ROOT / "tmp/2.png"
-        )
-    )
->>>>>>> send18/dev