Merge pull request #552 from geekan/env_refactor

feat: RFC116 & RFC135

.gitignore

@@ -59,6 +59,7 @@ cover/
 
 # Django stuff:
 *.log
+logs
 local_settings.py
 db.sqlite3
 db.sqlite3-journal

README.md

@@ -1,3 +1,4 @@
+
 # MetaGPT: The Multi-Agent Framework
 
 <p align="center">
@@ -50,9 +51,9 @@ # Step 2: Clone the repository to your local machine for latest version, and ins
 cd MetaGPT
 pip3 install -e.     # or pip3 install metagpt  # for stable version
 
-# Step 3: run the startup.py
+# Step 3: run metagpt cli
 # setup your OPENAI_API_KEY in key.yaml copy from config.yaml
-python3 startup.py "Write a cli snake game"
+metagpt "Write a cli snake game"
 
 # Step 4 [Optional]: If you want to save the artifacts like diagrams such as quadrant chart, system designs, sequence flow in the workspace, you can execute the step before Step 3. By default, the framework is compatible, and the entire process can be run completely without executing this step.
 # If executing, ensure that NPM is installed on your system. Then install mermaid-js. (If you don't have npm in your computer, please go to the Node.js official website to install Node.js https://nodejs.org/ and then you will have npm tool in your computer.)
@@ -78,7 +79,7 @@ # Step 2: Run metagpt demo with container
     -v /opt/metagpt/config/key.yaml:/app/metagpt/config/key.yaml \
     -v /opt/metagpt/workspace:/app/metagpt/workspace \
     metagpt/metagpt:latest \
-    python startup.py "Write a cli snake game"
+    metagpt "Write a cli snake game"
 ```
 
 detail installation please refer to [docker_install](https://docs.deepwisdom.ai/guide/get_started/installation.html#install-with-docker)
@@ -117,7 +118,7 @@ ### Contact Information
 
 If you have any questions or feedback about this project, please feel free to contact us. We highly appreciate your suggestions!
 
-- **Email:** alexanderwu@fuzhi.ai
+- **Email:** alexanderwu@deepwisdom.ai
 - **GitHub Issues:** For more technical inquiries, you can also create a new issue in our [GitHub repository](https://github.com/geekan/metagpt/issues).
 
 We will respond to all questions within 2-3 business days.

config/config.yaml

@@ -7,9 +7,9 @@
 ## Or, you can configure OPENAI_PROXY to access official OPENAI_API_BASE.
 OPENAI_API_BASE: "https://api.openai.com/v1"
 #OPENAI_PROXY: "http://127.0.0.1:8118"
-#OPENAI_API_KEY: "YOUR_API_KEY"   # set the value to sk-xxx if you host the openai interface for open llm model
-OPENAI_API_MODEL: "gpt-4"
-MAX_TOKENS: 1500
+#OPENAI_API_KEY: "YOUR_API_KEY"  # set the value to sk-xxx if you host the openai interface for open llm model
+OPENAI_API_MODEL: "gpt-4-1106-preview"
+MAX_TOKENS: 4096
 RPM: 10
 
 #### if Spark
@@ -77,8 +77,8 @@ RPM: 10
 
 #### for Stable Diffusion
 ## Use SD service, based on https://github.com/AUTOMATIC1111/stable-diffusion-webui
-SD_URL: "YOUR_SD_URL"
-SD_T2I_API: "/sdapi/v1/txt2img"
+#SD_URL: "YOUR_SD_URL"
+#SD_T2I_API: "/sdapi/v1/txt2img"
 
 #### for Execution
 #LONG_TERM_MEMORY: false
@@ -93,8 +93,8 @@ SD_T2I_API: "/sdapi/v1/txt2img"
 # CALC_USAGE: false
 
 ### for Research
-MODEL_FOR_RESEARCHER_SUMMARY: gpt-3.5-turbo
-MODEL_FOR_RESEARCHER_REPORT: gpt-3.5-turbo-16k
+# MODEL_FOR_RESEARCHER_SUMMARY: gpt-3.5-turbo
+# MODEL_FOR_RESEARCHER_REPORT: gpt-3.5-turbo-16k
 
 ### choose the engine for mermaid conversion, 
 # default is nodejs, you can change it to playwright,pyppeteer or ink
@@ -108,4 +108,4 @@ MODEL_FOR_RESEARCHER_REPORT: gpt-3.5-turbo-16k
 ### repair operation on the content extracted from LLM's raw output. Warning, it improves the result but not fix all cases.
 # REPAIR_LLM_OUTPUT: false
 
-PROMPT_FORMAT: json #json or markdown
+# PROMPT_FORMAT: json #json or markdown

docs/FAQ-EN.md

@@ -98,7 +98,7 @@
 
 1.  How to change the investment amount?
 
-    1.  You can view all commands by typing `python startup.py --help`
+    1.  You can view all commands by typing `metagpt --help`
 
 1.  Which version of Python is more stable?
 
@@ -134,7 +134,7 @@
 
     1.  Configuration instructions for SD Skills: The SD interface is currently deployed based on *https://github.com/AUTOMATIC1111/stable-diffusion-webui* **For environmental configurations and model downloads, please refer to the aforementioned GitHub repository. To initiate the SD service that supports API calls, run the command specified in cmd with the parameter nowebui, i.e.,
 
-        1.  > python webui.py --enable-insecure-extension-access --port xxx --no-gradio-queue --nowebui
+        1.  > python3 webui.py --enable-insecure-extension-access --port xxx --no-gradio-queue --nowebui
         1.      Once it runs without errors, the interface will be accessible after approximately 1 minute when the model finishes loading.
         1.  Configure SD_URL and SD_T2I_API in the config.yaml/key.yaml files.
         1.  ![](https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/065295a67b0b4feea665d1372722d49d~tplv-k3u1fbpfcp-zoom-1.image)

docs/README_CN.md

@@ -47,9 +47,9 @@ # 第 2 步：克隆最新仓库到您的本地机器，并进行安装。
 cd MetaGPT
 pip3 install -e.  # 或者 pip3 install metagpt  # 安装稳定版本
 
-# 第 3 步：执行startup.py
+# 第 3 步：执行metagpt
 # 拷贝config.yaml为key.yaml，并设置你自己的OPENAI_API_KEY
-python3 startup.py "Write a cli snake game"
+metagpt "Write a cli snake game"
 
 # 第 4 步【可选的】：如果你想在执行过程中保存像象限图、系统设计、序列流程等图表这些产物，可以在第3步前执行该步骤。默认的，框架做了兼容，在不执行该步的情况下，也可以完整跑完整个流程。
 # 如果执行，确保您的系统上安装了 NPM。并使用npm安装mermaid-js
@@ -75,7 +75,7 @@ # 步骤2: 使用容器运行metagpt演示
     -v /opt/metagpt/config/key.yaml:/app/metagpt/config/key.yaml \
     -v /opt/metagpt/workspace:/app/metagpt/workspace \
     metagpt/metagpt:latest \
-    python startup.py "Write a cli snake game"
+    metagpt "Write a cli snake game"
 ```
 
 详细的安装请安装 [docker_install](https://docs.deepwisdom.ai/zhcn/guide/get_started/installation.html#%E4%BD%BF%E7%94%A8docker%E5%AE%89%E8%A3%85)
@@ -114,7 +114,7 @@ ### 联系信息
 
 如果您对这个项目有任何问题或反馈，欢迎联系我们。我们非常欢迎您的建议！
 
-- **邮箱：** alexanderwu@fuzhi.ai
+- **邮箱：** alexanderwu@deepwisdom.ai
 - **GitHub 问题：** 对于更技术性的问题，您也可以在我们的 [GitHub 仓库](https://github.com/geekan/metagpt/issues) 中创建一个新的问题。
 
 我们会在2-3个工作日内回复所有问题。

docs/README_JA.md

@@ -41,7 +41,7 @@ ## MetaGPT の能力
 
 ## 例（GPT-4 で完全生成）
 
-例えば、`python startup.py "Toutiao のような RecSys をデザインする"`と入力すると、多くの出力が得られます
+例えば、`metagpt "Toutiao のような RecSys をデザインする"`と入力すると、多くの出力が得られます
 
 ![Jinri Toutiao Recsys データと API デザイン](resources/workspace/content_rec_sys/resources/data_api_design.png)
 
@@ -60,16 +60,16 @@ ### 伝統的なインストール
 
 ```bash
 # ステップ 1: Python 3.9+ がシステムにインストールされていることを確認してください。これを確認するには:
-python --version
+python3 --version
 
 # ステップ 2: リポジトリをローカルマシンにクローンし、インストールする。
 git clone https://github.com/geekan/MetaGPT.git
 cd MetaGPT
 pip install -e.
 
-# ステップ 3: startup.py を実行する
+# ステップ 3: metagpt を実行する
 # config.yaml を key.yaml にコピーし、独自の OPENAI_API_KEY を設定します
-python3 startup.py "Write a cli snake game"
+metagpt "Write a cli snake game"
 
 # ステップ 4 [オプション]: 実行中に PRD ファイルなどのアーティファクトを保存する場合は、ステップ 3 の前にこのステップを実行できます。デフォルトでは、フレームワークには互換性があり、この手順を実行しなくてもプロセス全体を完了できます。
 # NPM がシステムにインストールされていることを確認してください。次に mermaid-js をインストールします。(お使いのコンピューターに npm がない場合は、Node.js 公式サイトで Node.js https://nodejs.org/ をインストールしてください。）
@@ -178,7 +178,7 @@ # ステップ 2: コンテナで metagpt デモを実行する
     -v /opt/metagpt/config/key.yaml:/app/metagpt/config/key.yaml \
     -v /opt/metagpt/workspace:/app/metagpt/workspace \
     metagpt/metagpt:latest \
-    python startup.py "Write a cli snake game"
+    metagpt "Write a cli snake game"
 
 # コンテナを起動し、その中でコマンドを実行することもできます
 docker run --name metagpt -d \
@@ -188,7 +188,7 @@ # コンテナを起動し、その中でコマンドを実行することもで
     metagpt/metagpt:latest
 
 docker exec -it metagpt /bin/bash
-$ python startup.py "Write a cli snake game"
+$ metagpt "Write a cli snake game"
 ```
 
 コマンド `docker run ...` は以下のことを行います:
@@ -196,7 +196,7 @@ # コンテナを起動し、その中でコマンドを実行することもで
 - 特権モードで実行し、ブラウザの実行権限を得る
 - ホスト設定ファイル `/opt/metagpt/config/key.yaml` をコンテナ `/app/metagpt/config/key.yaml` にマップします
 - ホストディレクトリ `/opt/metagpt/workspace` をコンテナディレクトリ `/app/metagpt/workspace` にマップするs
-- デモコマンド `python startup.py "Write a cli snake game"` を実行する
+- デモコマンド `metagpt "Write a cli snake game"` を実行する
 
 ### 自分でイメージをビルドする
 
@@ -225,11 +225,11 @@ ## チュートリアル: スタートアップの開始
 
 ```shell
 # スクリプトの実行
-python startup.py "Write a cli snake game"
+metagpt "Write a cli snake game"
 # プロジェクトの実施にエンジニアを雇わないこと
-python startup.py "Write a cli snake game" --implement False
+metagpt "Write a cli snake game" --no-implement
 # エンジニアを雇い、コードレビューを行う
-python startup.py "Write a cli snake game" --code_review True
+metagpt "Write a cli snake game" --code_review
 ```
 
 スクリプトを実行すると、`workspace/` ディレクトリに新しいプロジェクトが見つかります。
@@ -239,17 +239,17 @@ ### プラットフォームまたはツールの設定
 要件を述べるときに、どのプラットフォームまたはツールを使用するかを指定できます。
 
 ```shell
-python startup.py "pygame をベースとした cli ヘビゲームを書く"
+metagpt "pygame をベースとした cli ヘビゲームを書く"
 ```
 
 ### 使用方法
 
 ```
 会社名
-    startup.py - 私たちは AI で構成されたソフトウェア・スタートアップです。私たちに投資することは、無限の可能性に満ちた未来に力を与えることです。
+    metagpt - 私たちは AI で構成されたソフトウェア・スタートアップです。私たちに投資することは、無限の可能性に満ちた未来に力を与えることです。
 
 シノプシス
-    startup.py IDEA <flags>
+    metagpt IDEA <flags>
 
 説明
     私たちは AI で構成されたソフトウェア・スタートアップです。私たちに投資することは、無限の可能性に満ちた未来に力を与えることです。
@@ -317,7 +317,7 @@ ## お問い合わせ先
 
 このプロジェクトに関するご質問やご意見がございましたら、お気軽にお問い合わせください。皆様のご意見をお待ちしております！
 
-- **Email:** alexanderwu@fuzhi.ai
+- **Email:** alexanderwu@deepwisdom.ai
 - **GitHub Issues:** 技術的なお問い合わせについては、[GitHub リポジトリ](https://github.com/geekan/metagpt/issues) に新しい issue を作成することもできます。
 
 ご質問には 2-3 営業日以内に回答いたします。

docs/install/cli_install_cn.md

@@ -15,7 +15,7 @@ # 第 1 步：确保您的系统上安装了 NPM。并使用npm安装mermaid-js
 sudo npm install -g @mermaid-js/mermaid-cli
 
 # 第 2 步：确保您的系统上安装了 Python 3.9+。您可以使用以下命令进行检查：
-python --version
+python3 --version
 
 # 第 3 步：克隆仓库到您的本地机器，并进行安装。
 git clone https://github.com/geekan/MetaGPT.git

docs/install/docker_install.md

@@ -15,7 +15,7 @@ # Step 2: Run metagpt demo with container
     -v /opt/metagpt/config/key.yaml:/app/metagpt/config/key.yaml \
     -v /opt/metagpt/workspace:/app/metagpt/workspace \
     metagpt/metagpt:latest \
-    python3 startup.py "Write a cli snake game"
+    metagpt "Write a cli snake game"
 
 # You can also start a container and execute commands in it
 docker run --name metagpt -d \
@@ -25,7 +25,7 @@ # You can also start a container and execute commands in it
     metagpt/metagpt:latest
 
 docker exec -it metagpt /bin/bash
-$ python3 startup.py "Write a cli snake game"
+$ metagpt "Write a cli snake game"
 ```
 
 The command `docker run ...` do the following things:
@@ -33,7 +33,7 @@ # You can also start a container and execute commands in it
 - Run in privileged mode to have permission to run the browser
 - Map host configure file `/opt/metagpt/config/key.yaml` to container `/app/metagpt/config/key.yaml`
 - Map host directory `/opt/metagpt/workspace` to container `/app/metagpt/workspace`
-- Execute the demo command `python3 startup.py "Write a cli snake game"`
+- Execute the demo command `metagpt "Write a cli snake game"`
 
 ### Build image by yourself
 

docs/install/docker_install_cn.md

@@ -15,7 +15,7 @@ # 步骤2: 使用容器运行metagpt演示
     -v /opt/metagpt/config/key.yaml:/app/metagpt/config/key.yaml \
     -v /opt/metagpt/workspace:/app/metagpt/workspace \
     metagpt/metagpt:latest \
-    python startup.py "Write a cli snake game"
+    metagpt "Write a cli snake game"
 
 # 您也可以启动一个容器并在其中执行命令
 docker run --name metagpt -d \
@@ -25,7 +25,7 @@ # 您也可以启动一个容器并在其中执行命令
     metagpt/metagpt:latest
 
 docker exec -it metagpt /bin/bash
-$ python startup.py "Write a cli snake game"
+$ metagpt "Write a cli snake game"
 ```
 
 `docker run ...`做了以下事情:
@@ -33,7 +33,7 @@ # 您也可以启动一个容器并在其中执行命令
 - 以特权模式运行，有权限运行浏览器
 - 将主机文件 `/opt/metagpt/config/key.yaml` 映射到容器文件 `/app/metagpt/config/key.yaml`
 - 将主机目录 `/opt/metagpt/workspace` 映射到容器目录 `/app/metagpt/workspace`
-- 执行示例命令 `python startup.py "Write a cli snake game"`
+- 执行示例命令 `metagpt "Write a cli snake game"`
 
 ### 自己构建镜像
 

docs/tutorial/usage.md

@@ -19,11 +19,11 @@ ### Initiating a startup
 
 ```shell
 # Run the script
-python startup.py "Write a cli snake game"
+metagpt "Write a cli snake game"
 # Do not hire an engineer to implement the project
-python startup.py "Write a cli snake game" --implement False
+metagpt "Write a cli snake game" --no-implement
 # Hire an engineer and perform code reviews
-python startup.py "Write a cli snake game" --code_review True
+metagpt "Write a cli snake game" --code_review
 ```
 
 After running the script, you can find your new project in the `workspace/` directory.
@@ -33,17 +33,17 @@ ### Preference of Platform or Tool
 You can tell which platform or tool you want to use when stating your requirements.
 
 ```shell
-python startup.py "Write a cli snake game based on pygame"
+metagpt "Write a cli snake game based on pygame"
 ```
 
 ### Usage
 
 ```
 NAME
-    startup.py - We are a software startup comprised of AI. By investing in us, you are empowering a future filled with limitless possibilities.
+    metagpt - We are a software startup comprised of AI. By investing in us, you are empowering a future filled with limitless possibilities.
 
 SYNOPSIS
-    startup.py IDEA <flags>
+    metagpt IDEA <flags>
 
 DESCRIPTION
     We are a software startup comprised of AI. By investing in us, you are empowering a future filled with limitless possibilities.

docs/tutorial/usage_cn.md

@@ -18,9 +18,9 @@ # 复制配置文件并进行必要的修改
 ### 示例：启动一个创业公司
 
 ```shell
-python startup.py "写一个命令行贪吃蛇"
+metagpt "写一个命令行贪吃蛇"
 # 开启code review模式会花费更多的金钱, 但是会提升代码质量和成功率
-python startup.py "写一个命令行贪吃蛇" --code_review True
+metagpt "写一个命令行贪吃蛇" --code_review
 ```
 
 运行脚本后，您可以在 `workspace/` 目录中找到您的新项目。
@@ -29,17 +29,17 @@ ### 平台或工具的倾向性
 可以在阐述需求时说明想要使用的平台或工具。
 例如：
 ```shell
-python startup.py "写一个基于pygame的命令行贪吃蛇"
+metagpt "写一个基于pygame的命令行贪吃蛇"
 ```
 
 ### 使用
 
 ```
 名称
-    startup.py - 我们是一家AI软件创业公司。通过投资我们，您将赋能一个充满无限可能的未来。
+    metagpt - 我们是一家AI软件创业公司。通过投资我们，您将赋能一个充满无限可能的未来。
 
 概要
-    startup.py IDEA <flags>
+    metagpt IDEA <flags>
 
 描述
     我们是一家AI软件创业公司。通过投资我们，您将赋能一个充满无限可能的未来。

examples/agent_creator.py

@@ -1,22 +1,23 @@
-'''
+"""
 Filename: MetaGPT/examples/agent_creator.py
 Created Date: Tuesday, September 12th 2023, 3:28:37 pm
 Author: garylin2099
-'''
+"""
 import re
 
-from metagpt.const import PROJECT_ROOT, WORKSPACE_ROOT
 from metagpt.actions import Action
+from metagpt.config import CONFIG
+from metagpt.const import METAGPT_ROOT
+from metagpt.logs import logger
 from metagpt.roles import Role
 from metagpt.schema import Message
-from metagpt.logs import logger
 
-with open(PROJECT_ROOT / "examples/build_customized_agent.py", "r") as f:
+with open(METAGPT_ROOT / "examples/build_customized_agent.py", "r") as f:
     # use official example script to guide AgentCreator
     MULTI_ACTION_AGENT_CODE_EXAMPLE = f.read()
 
-class CreateAgent(Action):
 
+class CreateAgent(Action):
     PROMPT_TEMPLATE = """
     ### BACKGROUND
     You are using an agent framework called metagpt to write agents capable of different actions,
@@ -34,7 +35,6 @@ class CreateAgent(Action):
     """
 
     async def run(self, example: str, instruction: str):
-
         prompt = self.PROMPT_TEMPLATE.format(example=example, instruction=instruction)
         # logger.info(prompt)
 
@@ -46,15 +46,15 @@ class CreateAgent(Action):
 
     @staticmethod
     def parse_code(rsp):
-        pattern = r'```python(.*)```'
+        pattern = r"```python(.*)```"
         match = re.search(pattern, rsp, re.DOTALL)
         code_text = match.group(1) if match else ""
-        if not WORKSPACE_ROOT.exists():
-            WORKSPACE_ROOT.mkdir(parents=True)
-        with open(WORKSPACE_ROOT / "agent_created_agent.py", "w") as f:
+        CONFIG.workspace_path.mkdir(parents=True, exist_ok=True)
+        with open(CONFIG.workspace_path / "agent_created_agent.py", "w") as f:
             f.write(code_text)
         return code_text
 
+
 class AgentCreator(Role):
     def __init__(
         self,
@@ -78,11 +78,11 @@ class AgentCreator(Role):
 
         return msg
 
+
 if __name__ == "__main__":
     import asyncio
 
     async def main():
-
         agent_template = MULTI_ACTION_AGENT_CODE_EXAMPLE
 
         creator = AgentCreator(agent_template=agent_template)

examples/build_customized_agent.py

@@ -1,22 +1,22 @@
-'''
+"""
 Filename: MetaGPT/examples/build_customized_agent.py
 Created Date: Tuesday, September 19th 2023, 6:52:25 pm
 Author: garylin2099
-'''
+"""
+import asyncio
 import re
 import subprocess
-import asyncio
 
 import fire
 
-from metagpt.llm import LLM
 from metagpt.actions import Action
+from metagpt.llm import LLM
+from metagpt.logs import logger
 from metagpt.roles import Role
 from metagpt.schema import Message
-from metagpt.logs import logger
+
 
 class SimpleWriteCode(Action):
-
     PROMPT_TEMPLATE = """
     Write a python function that can {instruction} and provide two runnnable test cases.
     Return ```python your_code_here ``` with NO other texts,
@@ -27,7 +27,6 @@ class SimpleWriteCode(Action):
         super().__init__(name, context, llm)
 
     async def run(self, instruction: str):
-
         prompt = self.PROMPT_TEMPLATE.format(instruction=instruction)
 
         rsp = await self._aask(prompt)
@@ -38,7 +37,7 @@ class SimpleWriteCode(Action):
 
     @staticmethod
     def parse_code(rsp):
-        pattern = r'```python(.*)```'
+        pattern = r"```python(.*)```"
         match = re.search(pattern, rsp, re.DOTALL)
         code_text = match.group(1) if match else rsp
         return code_text
@@ -67,10 +66,9 @@ class SimpleCoder(Role):
 
     async def _act(self) -> Message:
         logger.info(f"{self._setting}: ready to {self._rc.todo}")
-        todo = self._rc.todo # todo will be SimpleWriteCode()
-
-        msg = self.get_memories(k=1)[0] # find the most recent messages
+        todo = self._rc.todo  # todo will be SimpleWriteCode()
 
+        msg = self.get_memories(k=1)[0]  # find the most recent messages
         code_text = await todo.run(msg.content)
         msg = Message(content=code_text, role=self.profile, cause_by=type(todo))
 
@@ -94,7 +92,7 @@ class RunnableCoder(Role):
         # todo will be first SimpleWriteCode() then SimpleRunCode()
         todo = self._rc.todo
 
-        msg = self.get_memories(k=1)[0] # find the most k recent messages
+        msg = self.get_memories(k=1)[0]  # find the most k recent messages
         result = await todo.run(msg.content)
 
         msg = Message(content=result, role=self.profile, cause_by=type(todo))
@@ -109,5 +107,6 @@ def main(msg="write a function that calculates the product of a list and run it"
     result = asyncio.run(role.run(msg))
     logger.info(result)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     fire.Fire(main)

examples/build_customized_multi_agents.py

@@ -1,27 +1,28 @@
-'''
+"""
 Filename: MetaGPT/examples/build_customized_multi_agents.py
 Created Date: Wednesday, November 15th 2023, 7:12:39 pm
 Author: garylin2099
-'''
+"""
 import re
-import asyncio
+
 import fire
 
+from metagpt.actions import Action, UserRequirement
 from metagpt.llm import LLM
-from metagpt.actions import Action, BossRequirement
-from metagpt.roles import Role
-from metagpt.team import Team
-from metagpt.schema import Message
 from metagpt.logs import logger
+from metagpt.roles import Role
+from metagpt.schema import Message
+from metagpt.team import Team
+
 
 def parse_code(rsp):
-    pattern = r'```python(.*)```'
+    pattern = r"```python(.*)```"
     match = re.search(pattern, rsp, re.DOTALL)
     code_text = match.group(1) if match else rsp
     return code_text
 
-class SimpleWriteCode(Action):
 
+class SimpleWriteCode(Action):
     PROMPT_TEMPLATE = """
     Write a python function that can {instruction}.
     Return ```python your_code_here ``` with NO other texts,
@@ -32,7 +33,6 @@ class SimpleWriteCode(Action):
         super().__init__(name, context, llm)
 
     async def run(self, instruction: str):
-
         prompt = self.PROMPT_TEMPLATE.format(instruction=instruction)
 
         rsp = await self._aask(prompt)
@@ -50,12 +50,11 @@ class SimpleCoder(Role):
         **kwargs,
     ):
         super().__init__(name, profile, **kwargs)
-        self._watch([BossRequirement])
+        self._watch([UserRequirement])
         self._init_actions([SimpleWriteCode])
 
 
 class SimpleWriteTest(Action):
-
     PROMPT_TEMPLATE = """
     Context: {context}
     Write {k} unit tests using pytest for the given function, assuming you have imported it.
@@ -67,7 +66,6 @@ class SimpleWriteTest(Action):
         super().__init__(name, context, llm)
 
     async def run(self, context: str, k: int = 3):
-
         prompt = self.PROMPT_TEMPLATE.format(context=context, k=k)
 
         rsp = await self._aask(prompt)
@@ -87,23 +85,22 @@ class SimpleTester(Role):
         super().__init__(name, profile, **kwargs)
         self._init_actions([SimpleWriteTest])
         # self._watch([SimpleWriteCode])
-        self._watch([SimpleWriteCode, SimpleWriteReview]) # feel free to try this too
+        self._watch([SimpleWriteCode, SimpleWriteReview])  # feel free to try this too
 
     async def _act(self) -> Message:
         logger.info(f"{self._setting}: ready to {self._rc.todo}")
         todo = self._rc.todo
 
         # context = self.get_memories(k=1)[0].content # use the most recent memory as context
-        context = self.get_memories() # use all memories as context
+        context = self.get_memories()  # use all memories as context
 
-        code_text = await todo.run(context, k=5) # specify arguments
+        code_text = await todo.run(context, k=5)  # specify arguments
         msg = Message(content=code_text, role=self.profile, cause_by=type(todo))
 
         return msg
 
 
 class SimpleWriteReview(Action):
-
     PROMPT_TEMPLATE = """
     Context: {context}
     Review the test cases and provide one critical comments:
@@ -113,7 +110,6 @@ class SimpleWriteReview(Action):
         super().__init__(name, context, llm)
 
     async def run(self, context: str):
-
         prompt = self.PROMPT_TEMPLATE.format(context=context)
 
         rsp = await self._aask(prompt)
@@ -154,5 +150,6 @@ async def main(
     team.start_project(idea)
     await team.run(n_round=n_round)
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     fire.Fire(main)

examples/debate.py

@@ -1,17 +1,21 @@
-'''
+"""
 Filename: MetaGPT/examples/debate.py
 Created Date: Tuesday, September 19th 2023, 6:52:25 pm
 Author: garylin2099
-'''
+@Modified By: mashenquan, 2023-11-1. In accordance with Chapter 2.1.3 of RFC 116, modify the data type of the `send_to`
+        value of the `Message` object; modify the argument type of `get_by_actions`.
+"""
 import asyncio
 import platform
+
 import fire
 
-from metagpt.team import Team
-from metagpt.actions import Action, BossRequirement
+from metagpt.actions import Action, UserRequirement
+from metagpt.logs import logger
 from metagpt.roles import Role
 from metagpt.schema import Message
-from metagpt.logs import logger
+from metagpt.team import Team
+
 
 class SpeakAloud(Action):
     """Action: Speak out aloud in a debate (quarrel)"""
@@ -31,7 +35,6 @@ class SpeakAloud(Action):
         super().__init__(name, context, llm)
 
     async def run(self, context: str, name: str, opponent_name: str):
-
         prompt = self.PROMPT_TEMPLATE.format(context=context, name=name, opponent_name=opponent_name)
         # logger.info(prompt)
 
@@ -39,6 +42,7 @@ class SpeakAloud(Action):
 
         return rsp
 
+
 class Debator(Role):
     def __init__(
         self,
@@ -49,19 +53,18 @@ class Debator(Role):
     ):
         super().__init__(name, profile, **kwargs)
         self._init_actions([SpeakAloud])
-        self._watch([BossRequirement, SpeakAloud])
-        self.name = name
+        self._watch([UserRequirement, SpeakAloud])
         self.opponent_name = opponent_name
 
     async def _observe(self) -> int:
         await super()._observe()
         # accept messages sent (from opponent) to self, disregard own messages from the last round
-        self._rc.news = [msg for msg in self._rc.news if msg.send_to == self.name]
+        self._rc.news = [msg for msg in self._rc.news if msg.send_to == {self.name}]
         return len(self._rc.news)
 
     async def _act(self) -> Message:
         logger.info(f"{self._setting}: ready to {self._rc.todo}")
-        todo = self._rc.todo # An instance of SpeakAloud
+        todo = self._rc.todo  # An instance of SpeakAloud
 
         memories = self.get_memories()
         context = "\n".join(f"{msg.sent_from}: {msg.content}" for msg in memories)
@@ -76,25 +79,25 @@ class Debator(Role):
             sent_from=self.name,
             send_to=self.opponent_name,
         )
-
         self._rc.memory.add(msg)
 
         return msg
 
+
 async def debate(idea: str, investment: float = 3.0, n_round: int = 5):
-    """Run a team of presidents and watch they quarrel. :) """
+    """Run a team of presidents and watch they quarrel. :)"""
     Biden = Debator(name="Biden", profile="Democrat", opponent_name="Trump")
     Trump = Debator(name="Trump", profile="Republican", opponent_name="Biden")
     team = Team()
     team.hire([Biden, Trump])
     team.invest(investment)
-    team.start_project(idea, send_to="Biden") # send debate topic to Biden and let him speak first
+    team.run_project(idea, send_to="Biden")  # send debate topic to Biden and let him speak first
     await team.run(n_round=n_round)
 
 
 def main(idea: str, investment: float = 3.0, n_round: int = 10):
     """
-    :param idea: Debate topic, such as "Topic: The U.S. should commit more in climate change fighting" 
+    :param idea: Debate topic, such as "Topic: The U.S. should commit more in climate change fighting"
                  or "Trump: Climate change is a hoax"
     :param investment: contribute a certain dollar amount to watch the debate
     :param n_round: maximum rounds of the debate
@@ -105,5 +108,5 @@ def main(idea: str, investment: float = 3.0, n_round: int = 10):
     asyncio.run(debate(idea, investment, n_round))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     fire.Fire(main)

examples/invoice_ocr.py

@@ -19,19 +19,15 @@ async def main():
         Path("../tests/data/invoices/invoice-1.pdf"),
         Path("../tests/data/invoices/invoice-2.png"),
         Path("../tests/data/invoices/invoice-3.jpg"),
-        Path("../tests/data/invoices/invoice-4.zip")
+        Path("../tests/data/invoices/invoice-4.zip"),
     ]
     # The absolute path of the file
     absolute_file_paths = [Path.cwd() / path for path in relative_paths]
 
     for path in absolute_file_paths:
         role = InvoiceOCRAssistant()
-        await role.run(Message(
-            content="Invoicing date",
-            instruct_content={"file_path": path}
-        ))
+        await role.run(Message(content="Invoicing date", instruct_content={"file_path": path}))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     asyncio.run(main())
-

examples/llm_hello_world.py

@@ -14,11 +14,11 @@ from metagpt.logs import logger
 async def main():
     llm = LLM()
     claude = Claude()
-    logger.info(await claude.aask('你好，请进行自我介绍'))
-    logger.info(await llm.aask('hello world'))
-    logger.info(await llm.aask_batch(['hi', 'write python hello world.']))
+    logger.info(await claude.aask("你好，请进行自我介绍"))
+    logger.info(await llm.aask("hello world"))
+    logger.info(await llm.aask_batch(["hi", "write python hello world."]))
 
-    hello_msg = [{'role': 'user', 'content': 'count from 1 to 10. split by newline.'}]
+    hello_msg = [{"role": "user", "content": "count from 1 to 10. split by newline."}]
     logger.info(await llm.acompletion(hello_msg))
     logger.info(await llm.acompletion_batch([hello_msg]))
     logger.info(await llm.acompletion_batch_text([hello_msg]))
@@ -27,5 +27,5 @@ async def main():
     await llm.acompletion_text(hello_msg, stream=True)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     asyncio.run(main())

examples/research.py

@@ -12,5 +12,5 @@ async def main():
     print(f"save report to {RESEARCH_PATH / f'{topic}.md'}.")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     asyncio.run(main())

examples/search_google.py

@@ -15,5 +15,5 @@ async def main():
     await Searcher().run("What are some good sun protection products?")
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     asyncio.run(main())

examples/search_with_specific_engine.py

@@ -6,11 +6,12 @@ from metagpt.tools import SearchEngineType
 
 async def main():
     # Serper API
-    #await Searcher(engine = SearchEngineType.SERPER_GOOGLE).run(["What are some good sun protection products?","What are some of the best beaches?"])
+    # await Searcher(engine = SearchEngineType.SERPER_GOOGLE).run(["What are some good sun protection products?","What are some of the best beaches?"])
     # SerpAPI
-    #await Searcher(engine=SearchEngineType.SERPAPI_GOOGLE).run("What are the best ski brands for skiers?")
+    # await Searcher(engine=SearchEngineType.SERPAPI_GOOGLE).run("What are the best ski brands for skiers?")
     # Google API
     await Searcher(engine=SearchEngineType.DIRECT_GOOGLE).run("What are the most interesting human facts?")
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     asyncio.run(main())

examples/sk_agent.py

@@ -13,7 +13,7 @@ from semantic_kernel.planning import SequentialPlanner
 # from semantic_kernel.planning import SequentialPlanner
 from semantic_kernel.planning.action_planner.action_planner import ActionPlanner
 
-from metagpt.actions import BossRequirement
+from metagpt.actions import UserRequirement
 from metagpt.const import SKILL_DIRECTORY
 from metagpt.roles.sk_agent import SkAgent
 from metagpt.schema import Message
@@ -39,7 +39,7 @@ async def basic_planner_example():
     role.import_semantic_skill_from_directory(SKILL_DIRECTORY, "WriterSkill")
     role.import_skill(TextSkill(), "TextSkill")
     # using BasicPlanner
-    await role.run(Message(content=task, cause_by=BossRequirement))
+    await role.run(Message(content=task, cause_by=UserRequirement))
 
 
 async def sequential_planner_example():
@@ -53,7 +53,7 @@ async def sequential_planner_example():
     role.import_semantic_skill_from_directory(SKILL_DIRECTORY, "WriterSkill")
     role.import_skill(TextSkill(), "TextSkill")
     # using BasicPlanner
-    await role.run(Message(content=task, cause_by=BossRequirement))
+    await role.run(Message(content=task, cause_by=UserRequirement))
 
 
 async def basic_planner_web_search_example():
@@ -64,7 +64,7 @@ async def basic_planner_web_search_example():
     role.import_skill(SkSearchEngine(), "WebSearchSkill")
     # role.import_semantic_skill_from_directory(skills_directory, "QASkill")
 
-    await role.run(Message(content=task, cause_by=BossRequirement))
+    await role.run(Message(content=task, cause_by=UserRequirement))
 
 
 async def action_planner_example():
@@ -75,7 +75,7 @@ async def action_planner_example():
     role.import_skill(TimeSkill(), "time")
     role.import_skill(TextSkill(), "text")
     task = "What is the sum of 110 and 990?"
-    await role.run(Message(content=task, cause_by=BossRequirement))  # it will choose mathskill.Add
+    await role.run(Message(content=task, cause_by=UserRequirement))  # it will choose mathskill.Add
 
 
 if __name__ == "__main__":

examples/use_off_the_shelf_agent.py

@@ -1,12 +1,13 @@
-'''
+"""
 Filename: MetaGPT/examples/use_off_the_shelf_agent.py
 Created Date: Tuesday, September 19th 2023, 6:52:25 pm
 Author: garylin2099
-'''
+"""
 import asyncio
 
-from metagpt.roles.product_manager import ProductManager
 from metagpt.logs import logger
+from metagpt.roles.product_manager import ProductManager
+
 
 async def main():
     msg = "Write a PRD for a snake game"
@@ -14,5 +15,6 @@ async def main():
     result = await role.run(msg)
     logger.info(result.content[:100])
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     asyncio.run(main())

examples/write_tutorial.py

@@ -16,6 +16,5 @@ async def main():
     await role.run(topic)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     asyncio.run(main())
-

metagpt/actions/__init__.py

@@ -9,7 +9,7 @@ from enum import Enum
 
 from metagpt.actions.action import Action
 from metagpt.actions.action_output import ActionOutput
-from metagpt.actions.add_requirement import BossRequirement
+from metagpt.actions.add_requirement import UserRequirement
 from metagpt.actions.debug_error import DebugError
 from metagpt.actions.design_api import WriteDesign
 from metagpt.actions.design_api_review import DesignReview
@@ -28,7 +28,7 @@ from metagpt.actions.write_test import WriteTest
 class ActionType(Enum):
     """All types of Actions, used for indexing."""
 
-    ADD_REQUIREMENT = BossRequirement
+    ADD_REQUIREMENT = UserRequirement
     WRITE_PRD = WritePRD
     WRITE_PRD_REVIEW = WritePRDReview
     WRITE_DESIGN = WriteDesign

metagpt/actions/action.py

@@ -14,9 +14,9 @@ from tenacity import retry, stop_after_attempt, wait_random_exponential
 from metagpt.actions.action_output import ActionOutput
 from metagpt.llm import LLM
 from metagpt.logs import logger
+from metagpt.provider.postprecess.llm_output_postprecess import llm_output_postprecess
 from metagpt.utils.common import OutputParser
 from metagpt.utils.utils import general_after_log
-from metagpt.provider.postprecess.llm_output_postprecess import llm_output_postprecess
 
 
 class Action(ABC):
@@ -26,16 +26,24 @@ class Action(ABC):
             llm = LLM()
         self.llm = llm
         self.context = context
-        self.prefix = ""
-        self.profile = ""
-        self.desc = ""
-        self.content = ""
-        self.instruct_content = None
+        self.prefix = ""  # aask*时会加上prefix，作为system_message
+        self.profile = ""  # FIXME: USELESS
+        self.desc = ""  # for skill manager
+        self.nodes = ...
+
+        # Output, useless
+        # self.content = ""
+        # self.instruct_content = None
+        # self.env = None
+
+    # def set_env(self, env):
+    #     self.env = env
 
     def set_prefix(self, prefix, profile):
         """Set prefix for later usage"""
         self.prefix = prefix
         self.profile = profile
+        return self
 
     def __str__(self):
         return self.__class__.__name__
@@ -63,10 +71,6 @@ class Action(ABC):
         system_msgs: Optional[list[str]] = None,
         format="markdown",  # compatible to original format
     ) -> ActionOutput:
-        """Append default prefix"""
-        if not system_msgs:
-            system_msgs = []
-        system_msgs.append(self.prefix)
         content = await self.llm.aask(prompt, system_msgs)
         logger.debug(f"llm raw output:\n{content}")
         output_class = ActionOutput.create_model_class(output_class_name, output_data_mapping)

metagpt/actions/action_node.py

@@ -0,0 +1,346 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+@Time    : 2023/12/11 18:45
+@Author  : alexanderwu
+@File    : action_node.py
+"""
+import json
+import re
+from typing import Any, Dict, List, Optional, Type
+
+from pydantic import BaseModel, create_model, root_validator, validator
+from tenacity import retry, stop_after_attempt, wait_random_exponential
+
+from metagpt.actions import ActionOutput
+from metagpt.llm import BaseGPTAPI
+from metagpt.logs import logger
+from metagpt.utils.common import OutputParser
+from metagpt.utils.custom_decoder import CustomDecoder
+
+CONSTRAINT = """
+- Language: Please use the same language as the user input.
+- Format: output wrapped inside [CONTENT][/CONTENT] as format example, nothing else.
+"""
+
+SIMPLE_TEMPLATE = """
+## context
+{context}
+
+-----
+
+## format example
+{example}
+
+## nodes: "<node>: <type>  # <comment>"
+{instruction}
+
+## constraint
+{constraint}
+
+## action
+Fill in the above nodes based on the format example.
+"""
+
+
+def dict_to_markdown(d, prefix="-", postfix="\n"):
+    markdown_str = ""
+    for key, value in d.items():
+        markdown_str += f"{prefix} {key}: {value}{postfix}"
+    return markdown_str
+
+
+class ActionNode:
+    """ActionNode is a tree of nodes."""
+    mode: str
+
+    # Action Context
+    context: str  # all the context, including all necessary info
+    llm: BaseGPTAPI  # LLM with aask interface
+    children: dict[str, "ActionNode"]
+
+    # Action Input
+    key: str  # Product Requirement / File list / Code
+    expected_type: Type  # such as str / int / float etc.
+    # context: str  # everything in the history.
+    instruction: str  # the instructions should be followed.
+    example: Any  # example for In Context-Learning.
+
+    # Action Output
+    content: str
+    instruct_content: BaseModel
+
+    def __init__(self, key: str, expected_type: Type, instruction: str, example: str, content: str = "",
+                 children: dict[str, "ActionNode"] = None):
+        self.key = key
+        self.expected_type = expected_type
+        self.instruction = instruction
+        self.example = example
+        self.content = content
+        self.children = children if children is not None else {}
+
+    def __str__(self):
+        return (
+            f"{self.key}, {self.expected_type}, {self.instruction}, {self.example}" f", {self.content}, {self.children}"
+        )
+
+    def __repr__(self):
+        return self.__str__()
+
+    def add_child(self, node: "ActionNode"):
+        """增加子ActionNode"""
+        self.children[node.key] = node
+
+    def add_children(self, nodes: List["ActionNode"]):
+        """批量增加子ActionNode"""
+        for node in nodes:
+            self.add_child(node)
+
+    @classmethod
+    def from_children(cls, key, nodes: List["ActionNode"]):
+        """直接从一系列的子nodes初始化"""
+        obj = cls(key, str, "", "")
+        obj.add_children(nodes)
+        return obj
+
+    def get_children_mapping(self) -> Dict[str, Type]:
+        """获得子ActionNode的字典，以key索引"""
+        return {k: (v.expected_type, ...) for k, v in self.children.items()}
+
+    def get_self_mapping(self) -> Dict[str, Type]:
+        """get self key: type mapping"""
+        return {self.key: (self.expected_type, ...)}
+
+    def get_mapping(self, mode="children") -> Dict[str, Type]:
+        """get key: type mapping under mode"""
+        if mode == "children" or (mode == "auto" and self.children):
+            return self.get_children_mapping()
+        return self.get_self_mapping()
+
+    @classmethod
+    def create_model_class(cls, class_name: str, mapping: Dict[str, Type]):
+        """基于pydantic v1的模型动态生成，用来检验结果类型正确性"""
+        new_class = create_model(class_name, **mapping)
+
+        @validator("*", allow_reuse=True)
+        def check_name(v, field):
+            if field.name not in mapping.keys():
+                raise ValueError(f"Unrecognized block: {field.name}")
+            return v
+
+        @root_validator(pre=True, allow_reuse=True)
+        def check_missing_fields(values):
+            required_fields = set(mapping.keys())
+            missing_fields = required_fields - set(values.keys())
+            if missing_fields:
+                raise ValueError(f"Missing fields: {missing_fields}")
+            return values
+
+        new_class.__validator_check_name = classmethod(check_name)
+        new_class.__root_validator_check_missing_fields = classmethod(check_missing_fields)
+        return new_class
+
+    @classmethod
+    def create_model_class_v2(cls, class_name: str, mapping: Dict[str, Type]):
+        """基于pydantic v2的模型动态生成，用来检验结果类型正确性，待验证"""
+        new_class = create_model(class_name, **mapping)
+
+        @model_validator(mode="before")
+        def check_missing_fields(data):
+            required_fields = set(mapping.keys())
+            missing_fields = required_fields - set(data.keys())
+            if missing_fields:
+                raise ValueError(f"Missing fields: {missing_fields}")
+            return data
+
+        @field_validator("*")
+        def check_name(v: Any, field: str) -> Any:
+            if field not in mapping.keys():
+                raise ValueError(f"Unrecognized block: {field}")
+            return v
+
+        new_class.__model_validator_check_missing_fields = classmethod(check_missing_fields)
+        new_class.__field_validator_check_name = classmethod(check_name)
+        return new_class
+
+    def create_children_class(self):
+        """使用object内有的字段直接生成model_class"""
+        class_name = f"{self.key}_AN"
+        mapping = self.get_children_mapping()
+        return self.create_model_class(class_name, mapping)
+
+    def to_dict(self, format_func=None, mode="auto") -> Dict:
+        """将当前节点与子节点都按照node: format的格式组织成字典"""
+
+        # 如果没有提供格式化函数，使用默认的格式化方式
+        if format_func is None:
+            format_func = lambda node: f"{node.instruction}"
+
+        # 使用提供的格式化函数来格式化当前节点的值
+        formatted_value = format_func(self)
+
+        # 创建当前节点的键值对
+        if mode == "children" or (mode == "auto" and self.children):
+            node_dict = {}
+        else:
+            node_dict = {self.key: formatted_value}
+
+        if mode == "root":
+            return node_dict
+
+        # 遍历子节点并递归调用 to_dict 方法
+        for child_key, child_node in self.children.items():
+            node_dict.update(child_node.to_dict(format_func))
+
+        return node_dict
+
+    def compile_to(self, i: Dict, to) -> str:
+        if to == "json":
+            return json.dumps(i, indent=4)
+        elif to == "markdown":
+            return dict_to_markdown(i)
+        else:
+            return str(i)
+
+    def tagging(self, text, to, tag="") -> str:
+        if not tag:
+            return text
+        if to == "json":
+            return f"[{tag}]\n" + text + f"\n[/{tag}]"
+        else:
+            return f"[{tag}]\n" + text + f"\n[/{tag}]"
+
+    def _compile_f(self, to, mode, tag, format_func) -> str:
+        nodes = self.to_dict(format_func=format_func, mode=mode)
+        text = self.compile_to(nodes, to)
+        return self.tagging(text, to, tag)
+
+    def compile_instruction(self, to="raw", mode="children", tag="") -> str:
+        """compile to raw/json/markdown template with all/root/children nodes"""
+        format_func = lambda i: f"{i.expected_type}  # {i.instruction}"
+        return self._compile_f(to, mode, tag, format_func)
+
+    def compile_example(self, to="raw", mode="children", tag="") -> str:
+        """compile to raw/json/markdown examples with all/root/children nodes"""
+
+        # 这里不能使用f-string，因为转译为str后再json.dumps会额外加上引号，无法作为有效的example
+        # 错误示例："File list": "['main.py', 'const.py', 'game.py']", 注意这里值不是list，而是str
+        format_func = lambda i: i.example
+        return self._compile_f(to, mode, tag, format_func)
+
+    def compile(self, context, to="json", mode="children", template=SIMPLE_TEMPLATE) -> str:
+        """
+        mode: all/root/children
+            mode="children": 编译所有子节点为一个统一模板，包括instruction与example
+            mode="all": NotImplemented
+            mode="root": NotImplemented
+        """
+
+        # FIXME: json instruction会带来格式问题，如："Project name": "web_2048  # 项目名称使用下划线",
+        self.instruction = self.compile_instruction(to="markdown", mode=mode)
+        self.example = self.compile_example(to=to, tag="CONTENT", mode=mode)
+        prompt = template.format(
+            context=context, example=self.example, instruction=self.instruction, constraint=CONSTRAINT
+        )
+        return prompt
+
+    @retry(wait=wait_random_exponential(min=1, max=10), stop=stop_after_attempt(6))
+    async def _aask_v1(
+        self,
+        prompt: str,
+        output_class_name: str,
+        output_data_mapping: dict,
+        system_msgs: Optional[list[str]] = None,
+        format="markdown",  # compatible to original format
+    ) -> ActionOutput:
+        content = await self.llm.aask(prompt, system_msgs)
+        logger.debug(content)
+        output_class = ActionOutput.create_model_class(output_class_name, output_data_mapping)
+
+        if format == "json":
+            pattern = r"\[CONTENT\](\s*\{.*?\}\s*)\[/CONTENT\]"
+            matches = re.findall(pattern, content, re.DOTALL)
+
+            for match in matches:
+                if match:
+                    content = match
+                    break
+
+            parsed_data = CustomDecoder(strict=False).decode(content)
+
+        else:  # using markdown parser
+            parsed_data = OutputParser.parse_data_with_mapping(content, output_data_mapping)
+
+        logger.debug(parsed_data)
+        instruct_content = output_class(**parsed_data)
+        return ActionOutput(content, instruct_content)
+
+    def get(self, key):
+        return self.instruct_content.dict()[key]
+
+    def set_recursive(self, name, value):
+        setattr(self, name, value)
+        for _, i in self.children.items():
+            i.set_recursive(name, value)
+
+    def set_llm(self, llm):
+        self.set_recursive("llm", llm)
+
+    def set_context(self, context):
+        self.set_recursive("context", context)
+
+    async def simple_fill(self, to, mode):
+        prompt = self.compile(context=self.context, to=to, mode=mode)
+        mapping = self.get_mapping(mode)
+
+        class_name = f"{self.key}_AN"
+        output = await self._aask_v1(prompt, class_name, mapping, format=to)
+        self.content = output.content
+        self.instruct_content = output.instruct_content
+        return self
+
+    async def fill(self, context, llm, to="json", mode="auto", strgy="simple"):
+        """Fill the node(s) with mode.
+
+        :param context: Everything we should know when filling node.
+        :param llm: Large Language Model with pre-defined system message.
+        :param to: json/markdown, determine example and output format.
+         - json: it's easy to open source LLM with json format
+         - markdown: when generating code, markdown is always better
+        :param mode: auto/children/root
+         - auto: automated fill children's nodes and gather outputs, if no children, fill itself
+         - children: fill children's nodes and gather outputs
+         - root: fill root's node and gather output
+        :param strgy: simple/complex
+         - simple: run only once
+         - complex: run each node
+        :return: self
+        """
+        self.set_llm(llm)
+        self.set_context(context)
+
+        if strgy == "simple":
+            return await self.simple_fill(to, mode)
+        elif strgy == "complex":
+            # 这里隐式假设了拥有children
+            tmp = {}
+            for _, i in self.children.items():
+                child = await i.simple_fill(to, mode)
+                tmp.update(child.instruct_content.dict())
+            cls = self.create_children_class()
+            self.instruct_content = cls(**tmp)
+            return self
+
+
+def action_node_from_tuple_example():
+    # 示例：列表中包含元组
+    list_of_tuples = [("key1", str, "Instruction 1", "Example 1")]
+
+    # 从列表中创建 ActionNode 实例
+    nodes = [ActionNode(*data) for data in list_of_tuples]
+    for i in nodes:
+        logger.info(i)
+
+
+if __name__ == "__main__":
+    action_node_from_tuple_example()

metagpt/actions/action_output.py

@@ -23,10 +23,10 @@ class ActionOutput:
     def create_model_class(cls, class_name: str, mapping: Dict[str, Type]):
         new_class = create_model(class_name, **mapping)
 
-        @validator('*', allow_reuse=True)
+        @validator("*", allow_reuse=True)
         def check_name(v, field):
             if field.name not in mapping.keys():
-                raise ValueError(f'Unrecognized block: {field.name}')
+                raise ValueError(f"Unrecognized block: {field.name}")
             return v
 
         @root_validator(pre=True, allow_reuse=True)
@@ -34,10 +34,9 @@ class ActionOutput:
             required_fields = set(mapping.keys())
             missing_fields = required_fields - set(values.keys())
             if missing_fields:
-                raise ValueError(f'Missing fields: {missing_fields}')
+                raise ValueError(f"Missing fields: {missing_fields}")
             return values
 
         new_class.__validator_check_name = classmethod(check_name)
         new_class.__root_validator_check_missing_fields = classmethod(check_missing_fields)
         return new_class
-    

metagpt/actions/add_requirement.py

@@ -8,7 +8,8 @@
 from metagpt.actions import Action
 
 
-class BossRequirement(Action):
-    """Boss Requirement without any implementation details"""
+class UserRequirement(Action):
+    """User Requirement without any implementation details"""
+
     async def run(self, *args, **kwargs):
         raise NotImplementedError

metagpt/actions/azure_tts.py

@@ -18,16 +18,13 @@ class AzureTTS(Action):
 
     # Parameters reference: https://learn.microsoft.com/zh-cn/azure/cognitive-services/speech-service/language-support?tabs=tts#voice-styles-and-roles
     def synthesize_speech(self, lang, voice, role, text, output_file):
-        subscription_key = self.config.get('AZURE_TTS_SUBSCRIPTION_KEY')
-        region = self.config.get('AZURE_TTS_REGION')
-        speech_config = SpeechConfig(
-            subscription=subscription_key, region=region)
+        subscription_key = self.config.get("AZURE_TTS_SUBSCRIPTION_KEY")
+        region = self.config.get("AZURE_TTS_REGION")
+        speech_config = SpeechConfig(subscription=subscription_key, region=region)
 
         speech_config.speech_synthesis_voice_name = voice
         audio_config = AudioConfig(filename=output_file)
-        synthesizer = SpeechSynthesizer(
-            speech_config=speech_config,
-            audio_config=audio_config)
+        synthesizer = SpeechSynthesizer(speech_config=speech_config, audio_config=audio_config)
 
         # if voice=="zh-CN-YunxiNeural":
         ssml_string = f"""
@@ -45,9 +42,4 @@ class AzureTTS(Action):
 
 if __name__ == "__main__":
     azure_tts = AzureTTS("azure_tts")
-    azure_tts.synthesize_speech(
-        "zh-CN",
-        "zh-CN-YunxiNeural",
-        "Boy",
-        "Hello, I am Kaka",
-        "output.wav")
+    azure_tts.synthesize_speech("zh-CN", "zh-CN-YunxiNeural", "Boy", "Hello, I am Kaka", "output.wav")

metagpt/actions/clone_function.py

@@ -1,5 +1,5 @@
-from pathlib import Path
 import traceback
+from pathlib import Path
 
 from metagpt.actions.write_code import WriteCode
 from metagpt.logs import logger
@@ -42,7 +42,7 @@ class CloneFunction(WriteCode):
         prompt = CLONE_PROMPT.format(source_code=source_code, template_func=template_func)
         logger.info(f"query for CloneFunction: \n {prompt}")
         code = await self.write_code(prompt)
-        logger.info(f'CloneFunction code is \n {highlight(code)}')
+        logger.info(f"CloneFunction code is \n {highlight(code)}")
         return code
 
 
@@ -61,5 +61,5 @@ def run_function_script(code_script_path: str, func_name: str, *args, **kwargs):
     """Run function code from script."""
     if isinstance(code_script_path, str):
         code_path = Path(code_script_path)
-    code = code_path.read_text(encoding='utf-8')
+    code = code_path.read_text(encoding="utf-8")
     return run_function_code(code, func_name, *args, **kwargs)

metagpt/actions/debug_error.py

@@ -4,12 +4,19 @@
 @Time    : 2023/5/11 17:46
 @Author  : alexanderwu
 @File    : debug_error.py
+@Modified By: mashenquan, 2023/11/27.
+        1. Divide the context into three components: legacy code, unit test code, and console log.
+        2. According to Section 2.2.3.1 of RFC 135, replace file data in the message with the file name.
 """
 import re
 
-from metagpt.logs import logger
 from metagpt.actions.action import Action
+from metagpt.config import CONFIG
+from metagpt.const import TEST_CODES_FILE_REPO, TEST_OUTPUTS_FILE_REPO
+from metagpt.logs import logger
+from metagpt.schema import RunCodeResult
 from metagpt.utils.common import CodeParser
+from metagpt.utils.file_repository import FileRepository
 
 PROMPT_TEMPLATE = """
 NOTICE
@@ -19,33 +26,56 @@ Based on the message, first, figure out your own role, i.e. Engineer or QaEngine
 then rewrite the development code or the test code based on your role, the error, and the summary, such that all bugs are fixed and the code performs well.
 Attention: Use '##' to split sections, not '#', and '## <SECTION_NAME>' SHOULD WRITE BEFORE the test case or script and triple quotes.
 The message is as follows:
-{context}
+# Legacy Code
+```python
+{code}
+```
+---
+# Unit Test Code
+```python
+{test_code}
+```
+---
+# Console logs
+```text
+{logs}
+```
 ---
 Now you should start rewriting the code:
 ## file name of the code to rewrite: Write code with triple quote. Do your best to implement THIS IN ONLY ONE FILE.
 """
+
+
 class DebugError(Action):
     def __init__(self, name="DebugError", context=None, llm=None):
         super().__init__(name, context, llm)
 
-    # async def run(self, code, error):
-    #     prompt = f"Here is a piece of Python code:\n\n{code}\n\nThe following error occurred during execution:" \
-    #              f"\n\n{error}\n\nPlease try to fix the error in this code."
-    #     fixed_code = await self._aask(prompt)
-    #     return fixed_code
-    
-    async def run(self, context):
-        if "PASS" in context:
-            return "", "the original code works fine, no need to debug"
-        
-        file_name = re.search("## File To Rewrite:\s*(.+\\.py)", context).group(1)
+    async def run(self, *args, **kwargs) -> str:
+        output_doc = await FileRepository.get_file(
+            filename=self.context.output_filename, relative_path=TEST_OUTPUTS_FILE_REPO
+        )
+        if not output_doc:
+            return ""
+        output_detail = RunCodeResult.loads(output_doc.content)
+        pattern = r"Ran (\d+) tests in ([\d.]+)s\n\nOK"
+        matches = re.search(pattern, output_detail.stderr)
+        if matches:
+            return ""
 
-        logger.info(f"Debug and rewrite {file_name}")
+        logger.info(f"Debug and rewrite {self.context.test_filename}")
+        code_doc = await FileRepository.get_file(
+            filename=self.context.code_filename, relative_path=CONFIG.src_workspace
+        )
+        if not code_doc:
+            return ""
+        test_doc = await FileRepository.get_file(
+            filename=self.context.test_filename, relative_path=TEST_CODES_FILE_REPO
+        )
+        if not test_doc:
+            return ""
+        prompt = PROMPT_TEMPLATE.format(code=code_doc.content, test_code=test_doc.content, logs=output_detail.stderr)
 
-        prompt = PROMPT_TEMPLATE.format(context=context)
-        
         rsp = await self._aask(prompt)
-
         code = CodeParser.parse_code(block="", text=rsp)
 
-        return file_name, code
+        return code

metagpt/actions/design_api.py

@@ -4,149 +4,41 @@
 @Time    : 2023/5/11 19:26
 @Author  : alexanderwu
 @File    : design_api.py
+@Modified By: mashenquan, 2023/11/27.
+            1. According to Section 2.2.3.1 of RFC 135, replace file data in the message with the file name.
+            2. According to the design in Section 2.2.3.5.3 of RFC 135, add incremental iteration functionality.
+@Modified By: mashenquan, 2023/12/5. Move the generation logic of the project name to WritePRD.
 """
-import shutil
+import json
 from pathlib import Path
-from typing import List
 
 from metagpt.actions import Action, ActionOutput
+from metagpt.actions.design_api_an import DESIGN_API_NODE
 from metagpt.config import CONFIG
-from metagpt.const import WORKSPACE_ROOT
+from metagpt.const import (
+    DATA_API_DESIGN_FILE_REPO,
+    PRDS_FILE_REPO,
+    SEQ_FLOW_FILE_REPO,
+    SYSTEM_DESIGN_FILE_REPO,
+    SYSTEM_DESIGN_PDF_FILE_REPO,
+)
 from metagpt.logs import logger
-from metagpt.utils.common import CodeParser
-from metagpt.utils.get_template import get_template
-from metagpt.utils.json_to_markdown import json_to_markdown
+from metagpt.schema import Document, Documents
+from metagpt.utils.file_repository import FileRepository
+
+# from metagpt.utils.get_template import get_template
 from metagpt.utils.mermaid import mermaid_to_file
 
-templates = {
-    "json": {
-        "PROMPT_TEMPLATE": """
-# Context
+# from typing import List
+
+
+NEW_REQ_TEMPLATE = """
+### Legacy Content
+{old_design}
+
+### New Requirements
 {context}
-
-## Format example
-{format_example}
------
-Role: You are an architect; the goal is to design a SOTA PEP8-compliant python system; make the best use of good open source tools
-Requirement: Fill in the following missing information based on the context, each section name is a key in json
-Max Output: 8192 chars or 2048 tokens. Try to use them up.
-
-## Implementation approach: Provide as Plain text. Analyze the difficult points of the requirements, select the appropriate open-source framework.
-
-## Python package name: Provide as Python str with python triple quote, concise and clear, characters only use a combination of all lowercase and underscores
-
-## File list: Provided as Python list[str], the list of ONLY REQUIRED files needed to write the program(LESS IS MORE!). Only need relative paths, comply with PEP8 standards. ALWAYS write a main.py or app.py here
-
-## Data structures and interface definitions: Use mermaid classDiagram code syntax, including classes (INCLUDING __init__ method) and functions (with type annotations), CLEARLY MARK the RELATIONSHIPS between classes, and comply with PEP8 standards. The data structures SHOULD BE VERY DETAILED and the API should be comprehensive with a complete design. 
-
-## Program call flow: Use sequenceDiagram code syntax, COMPLETE and VERY DETAILED, using CLASSES AND API DEFINED ABOVE accurately, covering the CRUD AND INIT of each object, SYNTAX MUST BE CORRECT.
-
-## Anything UNCLEAR: Provide as Plain text. Make clear here.
-
-output a properly formatted JSON, wrapped inside [CONTENT][/CONTENT] like format example,
-and only output the json inside this tag, nothing else
-""",
-        "FORMAT_EXAMPLE": """
-[CONTENT]
-{
-    "Implementation approach": "We will ...",
-    "Python package name": "snake_game",
-    "File list": ["main.py"],
-    "Data structures and interface definitions": '
-    classDiagram
-        class Game{
-            +int score
-        }
-        ...
-        Game "1" -- "1" Food: has
-    ',
-    "Program call flow": '
-    sequenceDiagram
-        participant M as Main
-        ...
-        G->>M: end game
-    ',
-    "Anything UNCLEAR": "The requirement is clear to me."
-}
-[/CONTENT]
-""",
-    },
-    "markdown": {
-        "PROMPT_TEMPLATE": """
-# Context
-{context}
-
-## Format example
-{format_example}
------
-Role: You are an architect; the goal is to design a SOTA PEP8-compliant python system; make the best use of good open source tools
-Requirement: Fill in the following missing information based on the context, note that all sections are response with code form separately
-Max Output: 8192 chars or 2048 tokens. Try to use them up.
-Attention: Use '##' to split sections, not '#', and '## <SECTION_NAME>' SHOULD WRITE BEFORE the code and triple quote.
-
-## Implementation approach: Provide as Plain text. Analyze the difficult points of the requirements, select the appropriate open-source framework.
-
-## Python package name: Provide as Python str with python triple quote, concise and clear, characters only use a combination of all lowercase and underscores
-
-## File list: Provided as Python list[str], the list of ONLY REQUIRED files needed to write the program(LESS IS MORE!). Only need relative paths, comply with PEP8 standards. ALWAYS write a main.py or app.py here
-
-## Data structures and interface definitions: Use mermaid classDiagram code syntax, including classes (INCLUDING __init__ method) and functions (with type annotations), CLEARLY MARK the RELATIONSHIPS between classes, and comply with PEP8 standards. The data structures SHOULD BE VERY DETAILED and the API should be comprehensive with a complete design. 
-
-## Program call flow: Use sequenceDiagram code syntax, COMPLETE and VERY DETAILED, using CLASSES AND API DEFINED ABOVE accurately, covering the CRUD AND INIT of each object, SYNTAX MUST BE CORRECT.
-
-## Anything UNCLEAR: Provide as Plain text. Make clear here.
-
-""",
-        "FORMAT_EXAMPLE": """
----
-## Implementation approach
-We will ...
-
-## Python package name
-```python
-"snake_game"
-```
-
-## File list
-```python
-[
-    "main.py",
-]
-```
-
-## Data structures and interface definitions
-```mermaid
-classDiagram
-    class Game{
-        +int score
-    }
-    ...
-    Game "1" -- "1" Food: has
-```
-
-## Program call flow
-```mermaid
-sequenceDiagram
-    participant M as Main
-    ...
-    G->>M: end game
-```
-
-## Anything UNCLEAR
-The requirement is clear to me.
----
-""",
-    },
-}
-
-OUTPUT_MAPPING = {
-    "Implementation approach": (str, ...),
-    "Python package name": (str, ...),
-    "File list": (List[str], ...),
-    "Data structures and interface definitions": (str, ...),
-    "Program call flow": (str, ...),
-    "Anything UNCLEAR": (str, ...),
-}
+"""
 
 
 class WriteDesign(Action):
@@ -158,60 +50,91 @@ class WriteDesign(Action):
             "clearly and in detail."
         )
 
-    def recreate_workspace(self, workspace: Path):
-        try:
-            shutil.rmtree(workspace)
-        except FileNotFoundError:
-            pass  # Folder does not exist, but we don't care
-        workspace.mkdir(parents=True, exist_ok=True)
+    async def run(self, with_messages, format=CONFIG.prompt_format):
+        # Use `git diff` to identify which PRD documents have been modified in the `docs/prds` directory.
+        prds_file_repo = CONFIG.git_repo.new_file_repository(PRDS_FILE_REPO)
+        changed_prds = prds_file_repo.changed_files
+        # Use `git diff` to identify which design documents in the `docs/system_designs` directory have undergone
+        # changes.
+        system_design_file_repo = CONFIG.git_repo.new_file_repository(SYSTEM_DESIGN_FILE_REPO)
+        changed_system_designs = system_design_file_repo.changed_files
 
-    async def _save_prd(self, docs_path, resources_path, context):
-        prd_file = docs_path / "prd.md"
-        if context[-1].instruct_content and context[-1].instruct_content.dict()["Competitive Quadrant Chart"]:
-            quadrant_chart = context[-1].instruct_content.dict()["Competitive Quadrant Chart"]
-            await mermaid_to_file(quadrant_chart, resources_path / "competitive_analysis")
+        # For those PRDs and design documents that have undergone changes, regenerate the design content.
+        changed_files = Documents()
+        for filename in changed_prds.keys():
+            doc = await self._update_system_design(
+                filename=filename, prds_file_repo=prds_file_repo, system_design_file_repo=system_design_file_repo
+            )
+            changed_files.docs[filename] = doc
 
-        if context[-1].instruct_content:
-            logger.info(f"Saving PRD to {prd_file}")
-            prd_file.write_text(json_to_markdown(context[-1].instruct_content.dict()))
+        for filename in changed_system_designs.keys():
+            if filename in changed_files.docs:
+                continue
+            doc = await self._update_system_design(
+                filename=filename, prds_file_repo=prds_file_repo, system_design_file_repo=system_design_file_repo
+            )
+            changed_files.docs[filename] = doc
+        if not changed_files.docs:
+            logger.info("Nothing has changed.")
+        # Wait until all files under `docs/system_designs/` are processed before sending the publish message,
+        # leaving room for global optimization in subsequent steps.
+        return ActionOutput(content=changed_files.json(), instruct_content=changed_files)
 
-    async def _save_system_design(self, docs_path, resources_path, system_design):
-        data_api_design = system_design.instruct_content.dict()[
-            "Data structures and interface definitions"
-        ]  # CodeParser.parse_code(block="Data structures and interface definitions", text=content)
-        seq_flow = system_design.instruct_content.dict()[
-            "Program call flow"
-        ]  # CodeParser.parse_code(block="Program call flow", text=content)
-        await mermaid_to_file(data_api_design, resources_path / "data_api_design")
-        await mermaid_to_file(seq_flow, resources_path / "seq_flow")
-        system_design_file = docs_path / "system_design.md"
-        logger.info(f"Saving System Designs to {system_design_file}")
-        system_design_file.write_text((json_to_markdown(system_design.instruct_content.dict())))
+    async def _new_system_design(self, context, format=CONFIG.prompt_format):
+        node = await DESIGN_API_NODE.fill(context=context, llm=self.llm, to=format)
+        return node
 
-    async def _save(self, context, system_design):
-        if isinstance(system_design, ActionOutput):
-            ws_name = system_design.instruct_content.dict()["Python package name"]
+    async def _merge(self, prd_doc, system_design_doc, format=CONFIG.prompt_format):
+        context = NEW_REQ_TEMPLATE.format(old_design=system_design_doc.content, context=prd_doc.content)
+        node = await DESIGN_API_NODE.fill(context=context, llm=self.llm, to=format)
+        system_design_doc.content = node.instruct_content.json(ensure_ascii=False)
+        return system_design_doc
+
+    async def _update_system_design(self, filename, prds_file_repo, system_design_file_repo) -> Document:
+        prd = await prds_file_repo.get(filename)
+        old_system_design_doc = await system_design_file_repo.get(filename)
+        if not old_system_design_doc:
+            system_design = await self._new_system_design(context=prd.content)
+            doc = Document(
+                root_path=SYSTEM_DESIGN_FILE_REPO,
+                filename=filename,
+                content=system_design.instruct_content.json(ensure_ascii=False),
+            )
         else:
-            ws_name = CodeParser.parse_str(block="Python package name", text=system_design)
-        workspace = WORKSPACE_ROOT / ws_name
-        self.recreate_workspace(workspace)
-        docs_path = workspace / "docs"
-        resources_path = workspace / "resources"
-        docs_path.mkdir(parents=True, exist_ok=True)
-        resources_path.mkdir(parents=True, exist_ok=True)
-        await self._save_prd(docs_path, resources_path, context)
-        await self._save_system_design(docs_path, resources_path, system_design)
-
-    async def run(self, context, format=CONFIG.prompt_format):
-        prompt_template, format_example = get_template(templates, format)
-        prompt = prompt_template.format(context=context, format_example=format_example)
-        # system_design = await self._aask(prompt)
-        system_design = await self._aask_v1(prompt, "system_design", OUTPUT_MAPPING, format=format)
-        # fix Python package name, we can't system_design.instruct_content.python_package_name = "xxx" since "Python package name" contain space, have to use setattr
-        setattr(
-            system_design.instruct_content,
-            "Python package name",
-            system_design.instruct_content.dict()["Python package name"].strip().strip("'").strip('"'),
+            doc = await self._merge(prd_doc=prd, system_design_doc=old_system_design_doc)
+        await system_design_file_repo.save(
+            filename=filename, content=doc.content, dependencies={prd.root_relative_path}
         )
-        await self._save(context, system_design)
-        return system_design
+        await self._save_data_api_design(doc)
+        await self._save_seq_flow(doc)
+        await self._save_pdf(doc)
+        return doc
+
+    @staticmethod
+    async def _save_data_api_design(design_doc):
+        m = json.loads(design_doc.content)
+        data_api_design = m.get("Data structures and interfaces")
+        if not data_api_design:
+            return
+        pathname = CONFIG.git_repo.workdir / DATA_API_DESIGN_FILE_REPO / Path(design_doc.filename).with_suffix("")
+        await WriteDesign._save_mermaid_file(data_api_design, pathname)
+        logger.info(f"Save class view to {str(pathname)}")
+
+    @staticmethod
+    async def _save_seq_flow(design_doc):
+        m = json.loads(design_doc.content)
+        seq_flow = m.get("Program call flow")
+        if not seq_flow:
+            return
+        pathname = CONFIG.git_repo.workdir / Path(SEQ_FLOW_FILE_REPO) / Path(design_doc.filename).with_suffix("")
+        await WriteDesign._save_mermaid_file(seq_flow, pathname)
+        logger.info(f"Saving sequence flow to {str(pathname)}")
+
+    @staticmethod
+    async def _save_pdf(design_doc):
+        await FileRepository.save_as(doc=design_doc, with_suffix=".md", relative_path=SYSTEM_DESIGN_PDF_FILE_REPO)
+
+    @staticmethod
+    async def _save_mermaid_file(data: str, pathname: Path):
+        pathname.parent.mkdir(parents=True, exist_ok=True)
+        await mermaid_to_file(data, pathname)

metagpt/actions/design_api_an.py

@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+@Time    : 2023/12/12 22:24
+@Author  : alexanderwu
+@File    : design_api_an.py
+"""
+from metagpt.actions.action_node import ActionNode
+from metagpt.logs import logger
+from metagpt.utils.mermaid import MMC1, MMC2
+
+IMPLEMENTATION_APPROACH = ActionNode(
+    key="Implementation approach",
+    expected_type=str,
+    instruction="Analyze the difficult points of the requirements, select the appropriate open-source framework",
+    example="We will ...",
+)
+
+PROJECT_NAME = ActionNode(
+    key="Project name", expected_type=str, instruction="The project name with underline", example="game_2048"
+)
+
+FILE_LIST = ActionNode(
+    key="File list",
+    expected_type=list[str],
+    instruction="Only need relative paths. ALWAYS write a main.py or app.py here",
+    example=["main.py", "game.py"],
+)
+
+DATA_STRUCTURES_AND_INTERFACES = ActionNode(
+    key="Data structures and interfaces",
+    expected_type=str,
+    instruction="Use mermaid classDiagram code syntax, including classes, method(__init__ etc.) and functions with type"
+    " annotations, CLEARLY MARK the RELATIONSHIPS between classes, and comply with PEP8 standards. "
+    "The data structures SHOULD BE VERY DETAILED and the API should be comprehensive with a complete design.",
+    example=MMC1,
+)
+
+PROGRAM_CALL_FLOW = ActionNode(
+    key="Program call flow",
+    expected_type=str,
+    instruction="Use sequenceDiagram code syntax, COMPLETE and VERY DETAILED, using CLASSES AND API DEFINED ABOVE "
+    "accurately, covering the CRUD AND INIT of each object, SYNTAX MUST BE CORRECT.",
+    example=MMC2,
+)
+
+ANYTHING_UNCLEAR = ActionNode(
+    key="Anything UNCLEAR",
+    expected_type=str,
+    instruction="Mention unclear project aspects, then try to clarify it.",
+    example="Clarification needed on third-party API integration, ...",
+)
+
+NODES = [
+    IMPLEMENTATION_APPROACH,
+    # PROJECT_NAME,
+    FILE_LIST,
+    DATA_STRUCTURES_AND_INTERFACES,
+    PROGRAM_CALL_FLOW,
+    ANYTHING_UNCLEAR,
+]
+
+DESIGN_API_NODE = ActionNode.from_children("DesignAPI", NODES)
+
+
+def main():
+    prompt = DESIGN_API_NODE.compile(context="")
+    logger.info(prompt)
+
+
+if __name__ == "__main__":
+    main()

metagpt/actions/design_api_review.py

@@ -13,10 +13,11 @@ class DesignReview(Action):
         super().__init__(name, context, llm)
 
     async def run(self, prd, api_design):
-        prompt = f"Here is the Product Requirement Document (PRD):\n\n{prd}\n\nHere is the list of APIs designed " \
-                 f"based on this PRD:\n\n{api_design}\n\nPlease review whether this API design meets the requirements" \
-                 f" of the PRD, and whether it complies with good design practices."
+        prompt = (
+            f"Here is the Product Requirement Document (PRD):\n\n{prd}\n\nHere is the list of APIs designed "
+            f"based on this PRD:\n\n{api_design}\n\nPlease review whether this API design meets the requirements"
+            f" of the PRD, and whether it complies with good design practices."
+        )
 
         api_review = await self._aask(prompt)
         return api_review
-    

metagpt/actions/design_filenames.py

@@ -17,8 +17,10 @@ Do not add any other explanations, just return a Python string list."""
 class DesignFilenames(Action):
     def __init__(self, name, context=None, llm=None):
         super().__init__(name, context, llm)
-        self.desc = "Based on the PRD, consider system design, and carry out the basic design of the corresponding " \
-                    "APIs, data structures, and database tables. Please give your design, feedback clearly and in detail."
+        self.desc = (
+            "Based on the PRD, consider system design, and carry out the basic design of the corresponding "
+            "APIs, data structures, and database tables. Please give your design, feedback clearly and in detail."
+        )
 
     async def run(self, prd):
         prompt = f"The following is the Product Requirement Document (PRD):\n\n{prd}\n\n{PROMPT}"
@@ -26,4 +28,3 @@ class DesignFilenames(Action):
         logger.debug(prompt)
         logger.debug(design_filenames)
         return design_filenames
-    

metagpt/actions/detail_mining.py

@@ -6,7 +6,6 @@
 @File    : detail_mining.py
 """
 from metagpt.actions import Action, ActionOutput
-from metagpt.logs import logger
 
 PROMPT_TEMPLATE = """
 ##TOPIC
@@ -41,8 +40,8 @@ OUTPUT_MAPPING = {
 
 
 class DetailMining(Action):
-    """This class allows LLM to further mine noteworthy details based on specific "##TOPIC"(discussion topic) and "##RECORD" (discussion records), thereby deepening the discussion.
-    """
+    """This class allows LLM to further mine noteworthy details based on specific "##TOPIC"(discussion topic) and "##RECORD" (discussion records), thereby deepening the discussion."""
+
     def __init__(self, name="", context=None, llm=None):
         super().__init__(name, context, llm)
 

metagpt/actions/fix_bug.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+"""
+@Time    : 2023-12-12
+@Author  : mashenquan
+@File    : fix_bug.py
+"""
+from metagpt.actions import Action
+
+
+class FixBug(Action):
+    """Fix bug action without any implementation details"""
+
+    async def run(self, *args, **kwargs):
+        raise NotImplementedError

metagpt/actions/invoice_ocr.py

@@ -10,8 +10,8 @@
 
 import os
 import zipfile
-from pathlib import Path
 from datetime import datetime
+from pathlib import Path
 
 import pandas as pd
 from paddleocr import PaddleOCR
@@ -19,7 +19,10 @@ from paddleocr import PaddleOCR
 from metagpt.actions import Action
 from metagpt.const import INVOICE_OCR_TABLE_PATH
 from metagpt.logs import logger
-from metagpt.prompts.invoice_ocr import EXTRACT_OCR_MAIN_INFO_PROMPT, REPLY_OCR_QUESTION_PROMPT
+from metagpt.prompts.invoice_ocr import (
+    EXTRACT_OCR_MAIN_INFO_PROMPT,
+    REPLY_OCR_QUESTION_PROMPT,
+)
 from metagpt.utils.common import OutputParser
 from metagpt.utils.file import File
 
@@ -183,4 +186,3 @@ class ReplyQuestion(Action):
         prompt = REPLY_OCR_QUESTION_PROMPT.format(query=query, ocr_result=ocr_result, language=self.language)
         resp = await self._aask(prompt=prompt)
         return resp
-

metagpt/actions/prepare_documents.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+@Time    : 2023/11/20
+@Author  : mashenquan
+@File    : prepare_documents.py
+@Desc: PrepareDocuments Action: initialize project folder and add new requirements to docs/requirements.txt.
+        RFC 135 2.2.3.5.1.
+"""
+import shutil
+from pathlib import Path
+
+from metagpt.actions import Action, ActionOutput
+from metagpt.config import CONFIG
+from metagpt.const import DEFAULT_WORKSPACE_ROOT, DOCS_FILE_REPO, REQUIREMENT_FILENAME
+from metagpt.schema import Document
+from metagpt.utils.file_repository import FileRepository
+from metagpt.utils.git_repository import GitRepository
+
+
+class PrepareDocuments(Action):
+    def __init__(self, name="", context=None, llm=None):
+        super().__init__(name, context, llm)
+
+    async def run(self, with_messages, **kwargs):
+        if not CONFIG.git_repo:
+            # Create and initialize the workspace folder, initialize the Git environment.
+            project_name = CONFIG.project_name or FileRepository.new_filename()
+            workdir = CONFIG.project_path
+            if not workdir and CONFIG.workspace_path:
+                workdir = Path(CONFIG.workspace_path) / project_name
+            workdir = Path(workdir or DEFAULT_WORKSPACE_ROOT / project_name)
+            if not CONFIG.inc and workdir.exists():
+                shutil.rmtree(workdir)
+            CONFIG.git_repo = GitRepository()
+            CONFIG.git_repo.open(local_path=workdir, auto_init=True)
+
+        # Write the newly added requirements from the main parameter idea to `docs/requirement.txt`.
+        doc = Document(root_path=DOCS_FILE_REPO, filename=REQUIREMENT_FILENAME, content=with_messages[0].content)
+        await FileRepository.save_file(filename=REQUIREMENT_FILENAME, content=doc.content, relative_path=DOCS_FILE_REPO)
+
+        # Send a Message notification to the WritePRD action, instructing it to process requirements using
+        # `docs/requirement.txt` and `docs/prds/`.
+        return ActionOutput(content=doc.content, instruct_content=doc)

metagpt/actions/prepare_interview.py

@@ -38,4 +38,3 @@ class PrepareInterview(Action):
         prompt = PROMPT_TEMPLATE.format(context=context)
         question_list = await self._aask_v1(prompt)
         return question_list
-

metagpt/actions/project_management.py

@@ -4,186 +4,122 @@
 @Time    : 2023/5/11 19:12
 @Author  : alexanderwu
 @File    : project_management.py
+@Modified By: mashenquan, 2023/11/27.
+        1. Divide the context into three components: legacy code, unit test code, and console log.
+        2. Move the document storage operations related to WritePRD from the save operation of WriteDesign.
+        3. According to the design in Section 2.2.3.5.4 of RFC 135, add incremental iteration functionality.
 """
-from typing import List
+import json
 
+from metagpt.actions import ActionOutput
 from metagpt.actions.action import Action
+from metagpt.actions.project_management_an import PM_NODE
 from metagpt.config import CONFIG
-from metagpt.const import WORKSPACE_ROOT
-from metagpt.utils.common import CodeParser
-from metagpt.utils.get_template import get_template
-from metagpt.utils.json_to_markdown import json_to_markdown
+from metagpt.const import (
+    PACKAGE_REQUIREMENTS_FILENAME,
+    SYSTEM_DESIGN_FILE_REPO,
+    TASK_FILE_REPO,
+    TASK_PDF_FILE_REPO,
+)
+from metagpt.logs import logger
+from metagpt.schema import Document, Documents
+from metagpt.utils.file_repository import FileRepository
 
-templates = {
-    "json": {
-        "PROMPT_TEMPLATE": """
-# Context
+# from typing import List
+
+# from metagpt.utils.get_template import get_template
+
+NEW_REQ_TEMPLATE = """
+### Legacy Content
+{old_tasks}
+
+### New Requirements
 {context}
-
-## Format example
-{format_example}
------
-Role: You are a project manager; the goal is to break down tasks according to PRD/technical design, give a task list, and analyze task dependencies to start with the prerequisite modules
-Requirements: Based on the context, fill in the following missing information, each section name is a key in json. Here the granularity of the task is a file, if there are any missing files, you can supplement them
-Attention: Use '##' to split sections, not '#', and '## <SECTION_NAME>' SHOULD WRITE BEFORE the code and triple quote.
-
-## Required Python third-party packages: Provided in requirements.txt format
-
-## Required Other language third-party packages: Provided in requirements.txt format
-
-## Full API spec: Use OpenAPI 3.0. Describe all APIs that may be used by both frontend and backend.
-
-## Logic Analysis: Provided as a Python list[list[str]. the first is filename, the second is class/method/function should be implemented in this file. Analyze the dependencies between the files, which work should be done first
-
-## Task list: Provided as Python list[str]. Each str is a filename, the more at the beginning, the more it is a prerequisite dependency, should be done first
-
-## Shared Knowledge: Anything that should be public like utils' functions, config's variables details that should make clear first. 
-
-## Anything UNCLEAR: Provide as Plain text. Make clear here. For example, don't forget a main entry. don't forget to init 3rd party libs.
-
-output a properly formatted JSON, wrapped inside [CONTENT][/CONTENT] like format example,
-and only output the json inside this tag, nothing else
-""",
-        "FORMAT_EXAMPLE": '''
-{
-    "Required Python third-party packages": [
-        "flask==1.1.2",
-        "bcrypt==3.2.0"
-    ],
-    "Required Other language third-party packages": [
-        "No third-party ..."
-    ],
-    "Full API spec": """
-        openapi: 3.0.0
-        ...
-        description: A JSON object ...
-     """,
-    "Logic Analysis": [
-        ["game.py","Contains..."]
-    ],
-    "Task list": [
-        "game.py"
-    ],
-    "Shared Knowledge": """
-        'game.py' contains ...
-    """,
-    "Anything UNCLEAR": "We need ... how to start."
-}
-''',
-    },
-    "markdown": {
-        "PROMPT_TEMPLATE": """
-# Context
-{context}
-
-## Format example
-{format_example}
------
-Role: You are a project manager; the goal is to break down tasks according to PRD/technical design, give a task list, and analyze task dependencies to start with the prerequisite modules
-Requirements: Based on the context, fill in the following missing information, note that all sections are returned in Python code triple quote form seperatedly. Here the granularity of the task is a file, if there are any missing files, you can supplement them
-Attention: Use '##' to split sections, not '#', and '## <SECTION_NAME>' SHOULD WRITE BEFORE the code and triple quote.
-
-## Required Python third-party packages: Provided in requirements.txt format
-
-## Required Other language third-party packages: Provided in requirements.txt format
-
-## Full API spec: Use OpenAPI 3.0. Describe all APIs that may be used by both frontend and backend.
-
-## Logic Analysis: Provided as a Python list[list[str]. the first is filename, the second is class/method/function should be implemented in this file. Analyze the dependencies between the files, which work should be done first
-
-## Task list: Provided as Python list[str]. Each str is a filename, the more at the beginning, the more it is a prerequisite dependency, should be done first
-
-## Shared Knowledge: Anything that should be public like utils' functions, config's variables details that should make clear first. 
-
-## Anything UNCLEAR: Provide as Plain text. Make clear here. For example, don't forget a main entry. don't forget to init 3rd party libs.
-
-""",
-        "FORMAT_EXAMPLE": '''
----
-## Required Python third-party packages
-```python
 """
-flask==1.1.2
-bcrypt==3.2.0
-"""
-```
-
-## Required Other language third-party packages
-```python
-"""
-No third-party ...
-"""
-```
-
-## Full API spec
-```python
-"""
-openapi: 3.0.0
-...
-description: A JSON object ...
-"""
-```
-
-## Logic Analysis
-```python
-[
-    ["game.py", "Contains ..."],
-]
-```
-
-## Task list
-```python
-[
-    "game.py",
-]
-```
-
-## Shared Knowledge
-```python
-"""
-'game.py' contains ...
-"""
-```
-
-## Anything UNCLEAR
-We need ... how to start.
----
-''',
-    },
-}
-OUTPUT_MAPPING = {
-    "Required Python third-party packages": (List[str], ...),
-    "Required Other language third-party packages": (List[str], ...),
-    "Full API spec": (str, ...),
-    "Logic Analysis": (List[List[str]], ...),
-    "Task list": (List[str], ...),
-    "Shared Knowledge": (str, ...),
-    "Anything UNCLEAR": (str, ...),
-}
 
 
 class WriteTasks(Action):
     def __init__(self, name="CreateTasks", context=None, llm=None):
         super().__init__(name, context, llm)
 
-    def _save(self, context, rsp):
-        if context[-1].instruct_content:
-            ws_name = context[-1].instruct_content.dict()["Python package name"]
+    async def run(self, with_messages, format=CONFIG.prompt_format):
+        system_design_file_repo = CONFIG.git_repo.new_file_repository(SYSTEM_DESIGN_FILE_REPO)
+        changed_system_designs = system_design_file_repo.changed_files
+
+        tasks_file_repo = CONFIG.git_repo.new_file_repository(TASK_FILE_REPO)
+        changed_tasks = tasks_file_repo.changed_files
+        change_files = Documents()
+        # Rewrite the system designs that have undergone changes based on the git head diff under
+        # `docs/system_designs/`.
+        for filename in changed_system_designs:
+            task_doc = await self._update_tasks(
+                filename=filename, system_design_file_repo=system_design_file_repo, tasks_file_repo=tasks_file_repo
+            )
+            change_files.docs[filename] = task_doc
+
+        # Rewrite the task files that have undergone changes based on the git head diff under `docs/tasks/`.
+        for filename in changed_tasks:
+            if filename in change_files.docs:
+                continue
+            task_doc = await self._update_tasks(
+                filename=filename, system_design_file_repo=system_design_file_repo, tasks_file_repo=tasks_file_repo
+            )
+            change_files.docs[filename] = task_doc
+
+        if not change_files.docs:
+            logger.info("Nothing has changed.")
+        # Wait until all files under `docs/tasks/` are processed before sending the publish_message, leaving room for
+        # global optimization in subsequent steps.
+        return ActionOutput(content=change_files.json(), instruct_content=change_files)
+
+    async def _update_tasks(self, filename, system_design_file_repo, tasks_file_repo):
+        system_design_doc = await system_design_file_repo.get(filename)
+        task_doc = await tasks_file_repo.get(filename)
+        if task_doc:
+            task_doc = await self._merge(system_design_doc=system_design_doc, task_doc=task_doc)
         else:
-            ws_name = CodeParser.parse_str(block="Python package name", text=context[-1].content)
-        file_path = WORKSPACE_ROOT / ws_name / "docs/api_spec_and_tasks.md"
-        file_path.write_text(json_to_markdown(rsp.instruct_content.dict()))
+            rsp = await self._run_new_tasks(context=system_design_doc.content)
+            task_doc = Document(
+                root_path=TASK_FILE_REPO, filename=filename, content=rsp.instruct_content.json(ensure_ascii=False)
+            )
+        await tasks_file_repo.save(
+            filename=filename, content=task_doc.content, dependencies={system_design_doc.root_relative_path}
+        )
+        await self._update_requirements(task_doc)
+        await self._save_pdf(task_doc=task_doc)
+        return task_doc
 
-        # Write requirements.txt
-        requirements_path = WORKSPACE_ROOT / ws_name / "requirements.txt"
-        requirements_path.write_text("\n".join(rsp.instruct_content.dict().get("Required Python third-party packages")))
+    async def _run_new_tasks(self, context, format=CONFIG.prompt_format):
+        node = await PM_NODE.fill(context, self.llm, format)
+        # prompt_template, format_example = get_template(templates, format)
+        # prompt = prompt_template.format(context=context, format_example=format_example)
+        # rsp = await self._aask_v1(prompt, "task", OUTPUT_MAPPING, format=format)
+        return node
 
-    async def run(self, context, format=CONFIG.prompt_format):
-        prompt_template, format_example = get_template(templates, format)
-        prompt = prompt_template.format(context=context, format_example=format_example)
-        rsp = await self._aask_v1(prompt, "task", OUTPUT_MAPPING, format=format)
-        self._save(context, rsp)
-        return rsp
+    async def _merge(self, system_design_doc, task_doc, format=CONFIG.prompt_format) -> Document:
+        context = NEW_REQ_TEMPLATE.format(context=system_design_doc.content, old_tasks=task_doc.content)
+        node = await PM_NODE.fill(context, self.llm, format)
+        task_doc.content = node.instruct_content.json(ensure_ascii=False)
+        return task_doc
+
+    @staticmethod
+    async def _update_requirements(doc):
+        m = json.loads(doc.content)
+        packages = set(m.get("Required Python third-party packages", set()))
+        file_repo = CONFIG.git_repo.new_file_repository()
+        requirement_doc = await file_repo.get(filename=PACKAGE_REQUIREMENTS_FILENAME)
+        if not requirement_doc:
+            requirement_doc = Document(filename=PACKAGE_REQUIREMENTS_FILENAME, root_path=".", content="")
+        lines = requirement_doc.content.splitlines()
+        for pkg in lines:
+            if pkg == "":
+                continue
+            packages.add(pkg)
+        await file_repo.save(PACKAGE_REQUIREMENTS_FILENAME, content="\n".join(packages))
+
+    @staticmethod
+    async def _save_pdf(task_doc):
+        await FileRepository.save_as(doc=task_doc, with_suffix=".md", relative_path=TASK_PDF_FILE_REPO)
 
 
 class AssignTasks(Action):

metagpt/actions/project_management_an.py

@@ -0,0 +1,85 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+@Time    : 2023/12/14 15:28
+@Author  : alexanderwu
+@File    : project_management_an.py
+"""
+from metagpt.actions.action_node import ActionNode
+from metagpt.logs import logger
+
+REQUIRED_PYTHON_PACKAGES = ActionNode(
+    key="Required Python packages",
+    expected_type=list[str],
+    instruction="Provide required Python packages in requirements.txt format.",
+    example=["flask==1.1.2", "bcrypt==3.2.0"],
+)
+
+REQUIRED_OTHER_LANGUAGE_PACKAGES = ActionNode(
+    key="Required Other language third-party packages",
+    expected_type=list[str],
+    instruction="List down the required packages for languages other than Python.",
+    example=["No third-party dependencies required"],
+)
+
+LOGIC_ANALYSIS = ActionNode(
+    key="Logic Analysis",
+    expected_type=list[list[str]],
+    instruction="Provide a list of files with the classes/methods/functions to be implemented, "
+    "including dependency analysis and imports.",
+    example=[
+        ["game.py", "Contains Game class and ... functions"],
+        ["main.py", "Contains main function, from game import Game"],
+    ],
+)
+
+TASK_LIST = ActionNode(
+    key="Task list",
+    expected_type=list[str],
+    instruction="Break down the tasks into a list of filenames, prioritized by dependency order.",
+    example=["game.py", "main.py"],
+)
+
+FULL_API_SPEC = ActionNode(
+    key="Full API spec",
+    expected_type=str,
+    instruction="Describe all APIs using OpenAPI 3.0 spec that may be used by both frontend and backend. If front-end "
+                "and back-end communication is not required, leave it blank.",
+    example="openapi: 3.0.0 ...",
+)
+
+SHARED_KNOWLEDGE = ActionNode(
+    key="Shared Knowledge",
+    expected_type=str,
+    instruction="Detail any shared knowledge, like common utility functions or configuration variables.",
+    example="'game.py' contains functions shared across the project.",
+)
+
+ANYTHING_UNCLEAR_PM = ActionNode(
+    key="Anything UNCLEAR",
+    expected_type=str,
+    instruction="Mention any unclear aspects in the project management context and try to clarify them.",
+    example="Clarification needed on how to start and initialize third-party libraries.",
+)
+
+NODES = [
+    REQUIRED_PYTHON_PACKAGES,
+    REQUIRED_OTHER_LANGUAGE_PACKAGES,
+    LOGIC_ANALYSIS,
+    TASK_LIST,
+    FULL_API_SPEC,
+    SHARED_KNOWLEDGE,
+    ANYTHING_UNCLEAR_PM,
+]
+
+
+PM_NODE = ActionNode.from_children("PM_NODE", NODES)
+
+
+def main():
+    prompt = PM_NODE.compile(context="")
+    logger.info(prompt)
+
+
+if __name__ == "__main__":
+    main()

metagpt/actions/research.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import asyncio
-import json
 from typing import Callable
 
 from pydantic import parse_obj_as
@@ -49,7 +48,7 @@ based on the link credibility. If two results have equal credibility, prioritize
 ranked results' indices in JSON format, like [0, 1, 3, 4, ...], without including other words.
 """
 
-WEB_BROWSE_AND_SUMMARIZE_PROMPT = '''### Requirements
+WEB_BROWSE_AND_SUMMARIZE_PROMPT = """### Requirements
 1. Utilize the text in the "Reference Information" section to respond to the question "{query}".
 2. If the question cannot be directly answered using the text, but the text is related to the research topic, please provide \
 a comprehensive summary of the text.
@@ -58,10 +57,10 @@ a comprehensive summary of the text.
 
 ### Reference Information
 {content}
-'''
+"""
 
 
-CONDUCT_RESEARCH_PROMPT = '''### Reference Information
+CONDUCT_RESEARCH_PROMPT = """### Reference Information
 {content}
 
 ### Requirements
@@ -73,11 +72,12 @@ above. The report must meet the following requirements:
 - Present data and findings in an intuitive manner, utilizing feature comparative tables, if applicable.
 - The report should have a minimum word count of 2,000 and be formatted with Markdown syntax following APA style guidelines.
 - Include all source URLs in APA format at the end of the report.
-'''
+"""
 
 
 class CollectLinks(Action):
     """Action class to collect links from a search engine."""
+
     def __init__(
         self,
         name: str = "",
@@ -114,19 +114,24 @@ class CollectLinks(Action):
             keywords = OutputParser.extract_struct(keywords, list)
             keywords = parse_obj_as(list[str], keywords)
         except Exception as e:
-            logger.exception(f"fail to get keywords related to the research topic \"{topic}\" for {e}")
+            logger.exception(f"fail to get keywords related to the research topic '{topic}' for {e}")
             keywords = [topic]
         results = await asyncio.gather(*(self.search_engine.run(i, as_string=False) for i in keywords))
 
         def gen_msg():
             while True:
-                search_results = "\n".join(f"#### Keyword: {i}\n Search Result: {j}\n" for (i, j) in zip(keywords, results))
-                prompt = SUMMARIZE_SEARCH_PROMPT.format(decomposition_nums=decomposition_nums, search_results=search_results)
+                search_results = "\n".join(
+                    f"#### Keyword: {i}\n Search Result: {j}\n" for (i, j) in zip(keywords, results)
+                )
+                prompt = SUMMARIZE_SEARCH_PROMPT.format(
+                    decomposition_nums=decomposition_nums, search_results=search_results
+                )
                 yield prompt
                 remove = max(results, key=len)
                 remove.pop()
                 if len(remove) == 0:
                     break
+
         prompt = reduce_message_length(gen_msg(), self.llm.model, system_text, CONFIG.max_tokens_rsp)
         logger.debug(prompt)
         queries = await self._aask(prompt, [system_text])
@@ -172,6 +177,7 @@ class CollectLinks(Action):
 
 class WebBrowseAndSummarize(Action):
     """Action class to explore the web and provide summaries of articles and webpages."""
+
     def __init__(
         self,
         *args,
@@ -214,7 +220,9 @@ class WebBrowseAndSummarize(Action):
         for u, content in zip([url, *urls], contents):
             content = content.inner_text
             chunk_summaries = []
-            for prompt in generate_prompt_chunk(content, prompt_template, self.llm.model, system_text, CONFIG.max_tokens_rsp):
+            for prompt in generate_prompt_chunk(
+                content, prompt_template, self.llm.model, system_text, CONFIG.max_tokens_rsp
+            ):
                 logger.debug(prompt)
                 summary = await self._aask(prompt, [system_text])
                 if summary == "Not relevant.":
@@ -238,6 +246,7 @@ class WebBrowseAndSummarize(Action):
 
 class ConductResearch(Action):
     """Action class to conduct research and generate a research report."""
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if CONFIG.model_for_researcher_report:

metagpt/actions/run_code.py

@@ -4,14 +4,25 @@
 @Time    : 2023/5/11 17:46
 @Author  : alexanderwu
 @File    : run_code.py
+@Modified By: mashenquan, 2023/11/27.
+            1. Mark the location of Console logs in the PROMPT_TEMPLATE with markdown code-block formatting to enhance
+            the understanding for the LLM.
+            2. Fix bug: Add the "install dependency" operation.
+            3. Encapsulate the input of RunCode into RunCodeContext and encapsulate the output of RunCode into
+            RunCodeResult to standardize and unify parameter passing between WriteCode, RunCode, and DebugError.
+            4. According to section 2.2.3.5.7 of RFC 135, change the method of transferring file content
+            (code files, unit test files, log files) from using the message to using the file name.
+            5. Merged the `Config` class of send18:dev branch to take over the set/get operations of the Environment
+            class.
 """
-import os
 import subprocess
 import traceback
 from typing import Tuple
 
 from metagpt.actions.action import Action
+from metagpt.config import CONFIG
 from metagpt.logs import logger
+from metagpt.schema import RunCodeResult
 
 PROMPT_TEMPLATE = """
 Role: You are a senior development and qa engineer, your role is summarize the code running result.
@@ -51,8 +62,14 @@ CONTEXT = """
 ## Running Command
 {command}
 ## Running Output
-standard output: {outs};
-standard errors: {errs};
+standard output: 
+```text
+{outs}
+```
+standard errors: 
+```text
+{errs}
+```
 """
 
 
@@ -77,17 +94,19 @@ class RunCode(Action):
         additional_python_paths = [str(path) for path in additional_python_paths]
 
         # Copy the current environment variables
-        env = os.environ.copy()
+        env = CONFIG.new_environ()
 
         # Modify the PYTHONPATH environment variable
         additional_python_paths = [working_directory] + additional_python_paths
         additional_python_paths = ":".join(additional_python_paths)
         env["PYTHONPATH"] = additional_python_paths + ":" + env.get("PYTHONPATH", "")
+        RunCode._install_dependencies(working_directory=working_directory, env=env)
 
         # Start the subprocess
         process = subprocess.Popen(
             command, cwd=working_directory, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env
         )
+        logger.info(" ".join(command))
 
         try:
             # Wait for the process to complete, with a timeout
@@ -98,31 +117,46 @@ class RunCode(Action):
             stdout, stderr = process.communicate()
         return stdout.decode("utf-8"), stderr.decode("utf-8")
 
-    async def run(
-        self, code, mode="script", code_file_name="", test_code="", test_file_name="", command=[], **kwargs
-    ) -> str:
-        logger.info(f"Running {' '.join(command)}")
-        if mode == "script":
-            outs, errs = await self.run_script(command=command, **kwargs)
-        elif mode == "text":
-            outs, errs = await self.run_text(code=code)
+    async def run(self, *args, **kwargs) -> RunCodeResult:
+        logger.info(f"Running {' '.join(self.context.command)}")
+        if self.context.mode == "script":
+            outs, errs = await self.run_script(
+                command=self.context.command,
+                working_directory=self.context.working_directory,
+                additional_python_paths=self.context.additional_python_paths,
+            )
+        elif self.context.mode == "text":
+            outs, errs = await self.run_text(code=self.context.code)
 
         logger.info(f"{outs=}")
         logger.info(f"{errs=}")
 
         context = CONTEXT.format(
-            code=code,
-            code_file_name=code_file_name,
-            test_code=test_code,
-            test_file_name=test_file_name,
-            command=" ".join(command),
+            code=self.context.code,
+            code_file_name=self.context.code_filename,
+            test_code=self.context.test_code,
+            test_file_name=self.context.test_filename,
+            command=" ".join(self.context.command),
             outs=outs[:500],  # outs might be long but they are not important, truncate them to avoid token overflow
             errs=errs[:10000],  # truncate errors to avoid token overflow
         )
 
         prompt = PROMPT_TEMPLATE.format(context=context)
         rsp = await self._aask(prompt)
+        return RunCodeResult(summary=rsp, stdout=outs, stderr=errs)
 
-        result = context + rsp
+    @staticmethod
+    def _install_dependencies(working_directory, env):
+        install_command = ["python", "-m", "pip", "install", "-r", "requirements.txt"]
+        logger.info(" ".join(install_command))
+        try:
+            subprocess.run(install_command, check=True, cwd=working_directory, env=env)
+        except subprocess.CalledProcessError as e:
+            logger.warning(f"{e}")
 
-        return result
+        install_pytest_command = ["python", "-m", "pip", "install", "pytest"]
+        logger.info(" ".join(install_pytest_command))
+        try:
+            subprocess.run(install_pytest_command, check=True, cwd=working_directory, env=env)
+        except subprocess.CalledProcessError as e:
+            logger.warning(f"{e}")

metagpt/actions/summarize_code.py

@@ -0,0 +1,120 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+@Author  : alexanderwu
+@File    : summarize_code.py
+@Modified By: mashenquan, 2023/12/5. Archive the summarization content of issue discovery for use in WriteCode.
+"""
+from pathlib import Path
+
+from tenacity import retry, stop_after_attempt, wait_random_exponential
+
+from metagpt.actions.action import Action
+from metagpt.config import CONFIG
+from metagpt.const import SYSTEM_DESIGN_FILE_REPO, TASK_FILE_REPO
+from metagpt.logs import logger
+from metagpt.utils.file_repository import FileRepository
+
+PROMPT_TEMPLATE = """
+NOTICE
+Role: You are a professional software engineer, and your main task is to review the code.
+Language: Please use the same language as the user requirement, but the title and code should be still in English. For example, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
+ATTENTION: Use '##' to SPLIT SECTIONS, not '#'. Output format carefully referenced "Format example".
+
+-----
+# System Design
+```text
+{system_design}
+```
+-----
+# Tasks
+```text
+{tasks}
+```
+-----
+{code_blocks}
+
+## Code Review All: Please read all historical files and find possible bugs in the files, such as unimplemented functions, calling errors, unreferences, etc.
+
+## Call flow: mermaid code, based on the implemented function, use mermaid to draw a complete call chain
+
+## Summary: Summary based on the implementation of historical files
+
+## TODOs: Python dict[str, str], write down the list of files that need to be modified and the reasons. We will modify them later.
+
+"""
+
+FORMAT_EXAMPLE = """
+
+## Code Review All
+
+### a.py
+- It fulfills less of xxx requirements...
+- Field yyy is not given...
+-...
+
+### b.py
+...
+
+### c.py
+...
+
+## Call flow
+```mermaid
+flowchart TB
+    c1-->a2
+    subgraph one
+    a1-->a2
+    end
+    subgraph two
+    b1-->b2
+    end
+    subgraph three
+    c1-->c2
+    end
+```
+
+## Summary
+- a.py:...
+- b.py:...
+- c.py:...
+- ...
+
+## TODOs
+{
+    "a.py": "implement requirement xxx...",
+}
+
+"""
+
+
+class SummarizeCode(Action):
+    def __init__(self, name="SummarizeCode", context=None, llm=None):
+        super().__init__(name, context, llm)
+
+    @retry(stop=stop_after_attempt(2), wait=wait_random_exponential(min=1, max=60))
+    async def summarize_code(self, prompt):
+        code_rsp = await self._aask(prompt)
+        return code_rsp
+
+    async def run(self):
+        design_pathname = Path(self.context.design_filename)
+        design_doc = await FileRepository.get_file(filename=design_pathname.name, relative_path=SYSTEM_DESIGN_FILE_REPO)
+        task_pathname = Path(self.context.task_filename)
+        task_doc = await FileRepository.get_file(filename=task_pathname.name, relative_path=TASK_FILE_REPO)
+        src_file_repo = CONFIG.git_repo.new_file_repository(relative_path=CONFIG.src_workspace)
+        code_blocks = []
+        for filename in self.context.codes_filenames:
+            code_doc = await src_file_repo.get(filename)
+            code_block = f"```python\n{code_doc.content}\n```\n-----"
+            code_blocks.append(code_block)
+        format_example = FORMAT_EXAMPLE
+        prompt = PROMPT_TEMPLATE.format(
+            system_design=design_doc.content,
+            tasks=task_doc.content,
+            code_blocks="\n".join(code_blocks),
+            format_example=format_example,
+        )
+        logger.info("Summarize code..")
+        rsp = await self.summarize_code(prompt)
+        return rsp

metagpt/actions/write_code.py

@@ -4,79 +4,147 @@
 @Time    : 2023/5/11 17:45
 @Author  : alexanderwu
 @File    : write_code.py
+@Modified By: mashenquan, 2023-11-1. In accordance with Chapter 2.1.3 of RFC 116, modify the data type of the `cause_by`
+            value of the `Message` object.
+@Modified By: mashenquan, 2023-11-27.
+        1. Mark the location of Design, Tasks, Legacy Code and Debug logs in the PROMPT_TEMPLATE with markdown
+        code-block formatting to enhance the understanding for the LLM.
+        2. Following the think-act principle, solidify the task parameters when creating the WriteCode object, rather
+        than passing them in when calling the run function.
+        3. Encapsulate the input of RunCode into RunCodeContext and encapsulate the output of RunCode into
+        RunCodeResult to standardize and unify parameter passing between WriteCode, RunCode, and DebugError.
 """
-from metagpt.actions import WriteDesign
-from metagpt.actions.action import Action
-from metagpt.const import WORKSPACE_ROOT
-from metagpt.logs import logger
-from metagpt.schema import Message
-from metagpt.utils.common import CodeParser
+import json
+
 from tenacity import retry, stop_after_attempt, wait_random_exponential
 
+from metagpt.actions.action import Action
+from metagpt.config import CONFIG
+from metagpt.const import (
+    BUGFIX_FILENAME,
+    CODE_SUMMARIES_FILE_REPO,
+    DOCS_FILE_REPO,
+    TASK_FILE_REPO,
+    TEST_OUTPUTS_FILE_REPO,
+)
+from metagpt.logs import logger
+from metagpt.schema import CodingContext, Document, RunCodeResult
+from metagpt.utils.common import CodeParser
+from metagpt.utils.file_repository import FileRepository
+
 PROMPT_TEMPLATE = """
 NOTICE
-Role: You are a professional engineer; the main goal is to write PEP8 compliant, elegant, modular, easy to read and maintain Python 3.9 code (but you can also use other programming language)
+Role: You are a professional engineer; the main goal is to write google-style, elegant, modular, easy to read and maintain code
+Language: Please use the same language as the user requirement, but the title and code should be still in English. For example, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
 ATTENTION: Use '##' to SPLIT SECTIONS, not '#'. Output format carefully referenced "Format example".
 
-## Code: {filename} Write code with triple quote, based on the following list and context.
-1. Do your best to implement THIS ONLY ONE FILE. ONLY USE EXISTING API. IF NO API, IMPLEMENT IT.
-2. Requirement: Based on the context, implement one following code file, note to return only in code form, your code will be part of the entire project, so please implement complete, reliable, reusable code snippets
-3. Attention1: If there is any setting, ALWAYS SET A DEFAULT VALUE, ALWAYS USE STRONG TYPE AND EXPLICIT VARIABLE.
-4. Attention2: YOU MUST FOLLOW "Data structures and interface definitions". DONT CHANGE ANY DESIGN.
-5. Think before writing: What should be implemented and provided in this document?
-6. CAREFULLY CHECK THAT YOU DONT MISS ANY NECESSARY CLASS/FUNCTION IN THIS FILE.
-7. Do not use public member functions that do not exist in your design.
-
------
 # Context
-{context}
------
-## Format example
------
+## Design
+{design}
+
+## Tasks
+{tasks}
+
+## Legacy Code
+```Code
+{code}
+```
+
+## Debug logs
+```text
+{logs}
+
+{summary_log}
+```
+
+## Bug Feedback logs
+```text
+{feedback}
+```
+
+# Format example
 ## Code: {filename}
 ```python
 ## {filename}
 ...
 ```
------
+
+# Instruction: Based on the context, follow "Format example", write code.
+
+## Code: {filename}. Write code with triple quoto, based on the following attentions and context.
+1. Only One file: do your best to implement THIS ONLY ONE FILE.
+2. COMPLETE CODE: Your code will be part of the entire project, so please implement complete, reliable, reusable code snippets.
+3. Set default value: If there is any setting, ALWAYS SET A DEFAULT VALUE, ALWAYS USE STRONG TYPE AND EXPLICIT VARIABLE. AVOID circular import.
+4. Follow design: YOU MUST FOLLOW "Data structures and interfaces". DONT CHANGE ANY DESIGN. Do not use public member functions that do not exist in your design.
+5. CAREFULLY CHECK THAT YOU DONT MISS ANY NECESSARY CLASS/FUNCTION IN THIS FILE.
+6. Before using a external variable/module, make sure you import it first.
+7. Write out EVERY CODE DETAIL, DON'T LEAVE TODO.
+
 """
 
 
 class WriteCode(Action):
-    def __init__(self, name="WriteCode", context: list[Message] = None, llm=None):
+    def __init__(self, name="WriteCode", context=None, llm=None):
         super().__init__(name, context, llm)
 
-    def _is_invalid(self, filename):
-        return any(i in filename for i in ["mp3", "wav"])
-
-    def _save(self, context, filename, code):
-        # logger.info(filename)
-        # logger.info(code_rsp)
-        if self._is_invalid(filename):
-            return
-
-        design = [i for i in context if i.cause_by == WriteDesign][0]
-
-        ws_name = CodeParser.parse_str(block="Python package name", text=design.content)
-        ws_path = WORKSPACE_ROOT / ws_name
-        if f"{ws_name}/" not in filename and all(i not in filename for i in ["requirements.txt", ".md"]):
-            ws_path = ws_path / ws_name
-        code_path = ws_path / filename
-        code_path.parent.mkdir(parents=True, exist_ok=True)
-        code_path.write_text(code)
-        logger.info(f"Saving Code to {code_path}")
-
     @retry(wait=wait_random_exponential(min=1, max=60), stop=stop_after_attempt(6))
-    async def write_code(self, prompt):
+    async def write_code(self, prompt) -> str:
         code_rsp = await self._aask(prompt)
         code = CodeParser.parse_code(block="", text=code_rsp)
         return code
 
-    async def run(self, context, filename):
-        prompt = PROMPT_TEMPLATE.format(context=context, filename=filename)
-        logger.info(f'Writing {filename}..')
+    async def run(self, *args, **kwargs) -> CodingContext:
+        bug_feedback = await FileRepository.get_file(filename=BUGFIX_FILENAME, relative_path=DOCS_FILE_REPO)
+        coding_context = CodingContext.loads(self.context.content)
+        test_doc = await FileRepository.get_file(
+            filename="test_" + coding_context.filename + ".json", relative_path=TEST_OUTPUTS_FILE_REPO
+        )
+        summary_doc = None
+        if coding_context.design_doc and coding_context.design_doc.filename:
+            summary_doc = await FileRepository.get_file(
+                filename=coding_context.design_doc.filename, relative_path=CODE_SUMMARIES_FILE_REPO
+            )
+        logs = ""
+        if test_doc:
+            test_detail = RunCodeResult.loads(test_doc.content)
+            logs = test_detail.stderr
+
+        if bug_feedback:
+            code_context = coding_context.code_doc.content
+        else:
+            code_context = await self.get_codes(coding_context.task_doc, exclude=self.context.filename)
+
+        prompt = PROMPT_TEMPLATE.format(
+            design=coding_context.design_doc.content if coding_context.design_doc else "",
+            tasks=coding_context.task_doc.content if coding_context.task_doc else "",
+            code=code_context,
+            logs=logs,
+            feedback=bug_feedback.content if bug_feedback else "",
+            filename=self.context.filename,
+            summary_log=summary_doc.content if summary_doc else "",
+        )
+        logger.info(f"Writing {coding_context.filename}..")
         code = await self.write_code(prompt)
-        # code_rsp = await self._aask_v1(prompt, "code_rsp", OUTPUT_MAPPING)
-        # self._save(context, filename, code)
-        return code
-    
+        if not coding_context.code_doc:
+            coding_context.code_doc = Document(filename=coding_context.filename, root_path=CONFIG.src_workspace)
+        coding_context.code_doc.content = code
+        return coding_context
+
+    @staticmethod
+    async def get_codes(task_doc, exclude) -> str:
+        if not task_doc:
+            return ""
+        if not task_doc.content:
+            task_doc.content = FileRepository.get_file(filename=task_doc.filename, relative_path=TASK_FILE_REPO)
+        m = json.loads(task_doc.content)
+        code_filenames = m.get("Task list", [])
+        codes = []
+        src_file_repo = CONFIG.git_repo.new_file_repository(relative_path=CONFIG.src_workspace)
+        for filename in code_filenames:
+            if filename == exclude:
+                continue
+            doc = await src_file_repo.get(filename=filename)
+            if not doc:
+                continue
+            codes.append(f"----- {filename}\n" + doc.content)
+        return "\n".join(codes)

metagpt/actions/write_code_review.py

@@ -4,57 +4,114 @@
 @Time    : 2023/5/11 17:45
 @Author  : alexanderwu
 @File    : write_code_review.py
+@Modified By: mashenquan, 2023/11/27. Following the think-act principle, solidify the task parameters when creating the
+        WriteCode object, rather than passing them in when calling the run function.
 """
 
-from metagpt.actions.action import Action
-from metagpt.logs import logger
-from metagpt.schema import Message
-from metagpt.utils.common import CodeParser
 from tenacity import retry, stop_after_attempt, wait_random_exponential
 
+from metagpt.actions import WriteCode
+from metagpt.actions.action import Action
+from metagpt.config import CONFIG
+from metagpt.logs import logger
+from metagpt.schema import CodingContext
+from metagpt.utils.common import CodeParser
+
 PROMPT_TEMPLATE = """
-NOTICE
-Role: You are a professional software engineer, and your main task is to review the code. You need to ensure that the code conforms to the PEP8 standards, is elegantly designed and modularized, easy to read and maintain, and is written in Python 3.9 (or in another programming language).
+# System
+Role: You are a professional software engineer, and your main task is to review and revise the code. You need to ensure that the code conforms to the google-style standards, is elegantly designed and modularized, easy to read and maintain.
+Language: Please use the same language as the user requirement, but the title and code should be still in English. For example, if the user speaks Chinese, the specific text of your answer should also be in Chinese.
 ATTENTION: Use '##' to SPLIT SECTIONS, not '#'. Output format carefully referenced "Format example".
 
-## Code Review: Based on the following context and code, and following the check list, Provide key, clear, concise, and specific code modification suggestions, up to 5.
-```
-1. Check 0: Is the code implemented as per the requirements?
-2. Check 1: Are there any issues with the code logic?
-3. Check 2: Does the existing code follow the "Data structures and interface definitions"?
-4. Check 3: Is there a function in the code that is omitted or not fully implemented that needs to be implemented?
-5. Check 4: Does the code have unnecessary or lack dependencies?
-```
-
-## Rewrite Code: {filename} Base on "Code Review" and the source code, rewrite code with triple quotes. Do your utmost to optimize THIS SINGLE FILE. 
------
 # Context
 {context}
 
-## Code: {filename}
-```
+## Code to be Reviewed: {filename}
+```Code
 {code}
 ```
------
+"""
+
+
+EXAMPLE_AND_INSTRUCTION = """
 
-## Format example
------
 {format_example}
------
+
+
+# Instruction: Based on the actual code situation, follow one of the "Format example".
+
+## Code Review: Ordered List. Based on the "Code to be Reviewed", provide key, clear, concise, and specific answer. If any answer is no, explain how to fix it step by step.
+1. Is the code implemented as per the requirements? If not, how to achieve it? Analyse it step by step.
+2. Is the code logic completely correct? If there are errors, please indicate how to correct them.
+3. Does the existing code follow the "Data structures and interfaces"?
+4. Are all functions implemented? If there is no implementation, please indicate how to achieve it step by step.
+5. Have all necessary pre-dependencies been imported? If not, indicate which ones need to be imported
+6. Are methods from other files being reused correctly?
+
+## Actions: Ordered List. Things that should be done after CR, such as implementing class A and function B
+
+## Code Review Result: str. If the code doesn't have bugs, we don't need to rewrite it, so answer LGTM and stop. ONLY ANSWER LGTM/LBTM.
+LGTM/LBTM
 
 """
 
 FORMAT_EXAMPLE = """
-
-## Code Review
-1. The code ...
+# Format example 1
+## Code Review: {filename}
+1. No, we should fix the logic of class A due to ...
 2. ...
 3. ...
-4. ...
+4. No, function B is not implemented, ...
 5. ...
+6. ...
 
-## Rewrite Code: {filename}
-```python
+## Actions
+1. Fix the `handle_events` method to update the game state only if a move is successful.
+   ```python
+   def handle_events(self):
+       for event in pygame.event.get():
+           if event.type == pygame.QUIT:
+               return False
+           if event.type == pygame.KEYDOWN:
+               moved = False
+               if event.key == pygame.K_UP:
+                   moved = self.game.move('UP')
+               elif event.key == pygame.K_DOWN:
+                   moved = self.game.move('DOWN')
+               elif event.key == pygame.K_LEFT:
+                   moved = self.game.move('LEFT')
+               elif event.key == pygame.K_RIGHT:
+                   moved = self.game.move('RIGHT')
+               if moved:
+                   # Update the game state only if a move was successful
+                   self.render()
+       return True
+   ```
+2. Implement function B
+
+## Code Review Result
+LBTM
+
+# Format example 2
+## Code Review: {filename}
+1. Yes.
+2. Yes.
+3. Yes.
+4. Yes.
+5. Yes.
+6. Yes.
+
+## Actions
+pass
+
+## Code Review Result
+LGTM
+"""
+
+REWRITE_CODE_TEMPLATE = """
+# Instruction: rewrite code based on the Code Review and Actions
+## Rewrite Code: CodeBlock. If it still has some bugs, rewrite {filename} with triple quotes. Do your utmost to optimize THIS SINGLE FILE. Return all completed codes and prohibit the return of unfinished codes.
+```Code
 ## {filename}
 ...
 ```
@@ -62,21 +119,53 @@ FORMAT_EXAMPLE = """
 
 
 class WriteCodeReview(Action):
-    def __init__(self, name="WriteCodeReview", context: list[Message] = None, llm=None):
+    def __init__(self, name="WriteCodeReview", context=None, llm=None):
         super().__init__(name, context, llm)
 
     @retry(wait=wait_random_exponential(min=1, max=60), stop=stop_after_attempt(6))
-    async def write_code(self, prompt):
-        code_rsp = await self._aask(prompt)
-        code = CodeParser.parse_code(block="", text=code_rsp)
-        return code
+    async def write_code_review_and_rewrite(self, context_prompt, cr_prompt, 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
 
-    async def run(self, context, code, filename):
-        format_example = FORMAT_EXAMPLE.format(filename=filename)
-        prompt = PROMPT_TEMPLATE.format(context=context, code=code, filename=filename, format_example=format_example)
-        logger.info(f'Code review {filename}..')
-        code = await self.write_code(prompt)
+        # 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(block="", text=code_rsp)
+        return result, code
+
+    async def run(self, *args, **kwargs) -> CodingContext:
+        iterative_code = self.context.code_doc.content
+        k = CONFIG.code_review_k_times or 1
+        for i in range(k):
+            format_example = FORMAT_EXAMPLE.format(filename=self.context.code_doc.filename)
+            task_content = self.context.task_doc.content if self.context.task_doc else ""
+            code_context = await WriteCode.get_codes(self.context.task_doc, exclude=self.context.filename)
+            context = "\n".join(
+                [
+                    "## System Design\n" + str(self.context.design_doc) + "\n",
+                    "## Tasks\n" + task_content + "\n",
+                    "## Code Files\n" + code_context + "\n",
+                ]
+            )
+            context_prompt = PROMPT_TEMPLATE.format(
+                context=context,
+                code=iterative_code,
+                filename=self.context.code_doc.filename,
+            )
+            cr_prompt = EXAMPLE_AND_INSTRUCTION.format(format_example=format_example, )
+            logger.info(
+                f"Code review and rewrite {self.context.code_doc.filename}: {i+1}/{k} | {len(iterative_code)=}, {len(self.context.code_doc.content)=}"
+            )
+            result, rewrited_code = await self.write_code_review_and_rewrite(context_prompt, cr_prompt, self.context.code_doc.filename)
+            if "LBTM" in result:
+                iterative_code = rewrited_code
+            elif "LGTM" in result:
+                self.context.code_doc.content = iterative_code
+                return self.context
         # code_rsp = await self._aask_v1(prompt, "code_rsp", OUTPUT_MAPPING)
         # self._save(context, filename, code)
-        return code
-    
+        # 如果rewrited_code是None（原code perfect），那么直接返回code
+        self.context.code_doc.content = iterative_code
+        return self.context

metagpt/actions/write_docstring.py

@@ -16,7 +16,7 @@ Options:
                                 Default: 'google'
 
 Example:
-    python3 -m metagpt.actions.write_docstring startup.py --overwrite False --style=numpy
+    python3 -m metagpt.actions.write_docstring ./metagpt/startup.py --overwrite False --style=numpy
 
 This script uses the 'fire' library to create a command-line interface. It generates docstrings for the given Python code using
 the specified docstring style and adds them to the code.
@@ -28,7 +28,7 @@ from metagpt.actions.action import Action
 from metagpt.utils.common import OutputParser
 from metagpt.utils.pycst import merge_docstring
 
-PYTHON_DOCSTRING_SYSTEM = '''### Requirements
+PYTHON_DOCSTRING_SYSTEM = """### Requirements
 1. Add docstrings to the given code following the {style} style.
 2. Replace the function body with an Ellipsis object(...) to reduce output.
 3. If the types are already annotated, there is no need to include them in the docstring.
@@ -48,7 +48,7 @@ class ExampleError(Exception):
 ```python
 {example}
 ```
-'''
+"""
 
 # https://www.sphinx-doc.org/en/master/usage/extensions/napoleon.html
 
@@ -162,7 +162,8 @@ class WriteDocstring(Action):
         self.desc = "Write docstring for code."
 
     async def run(
-        self, code: str,
+        self,
+        code: str,
         system_text: str = PYTHON_DOCSTRING_SYSTEM,
         style: Literal["google", "numpy", "sphinx"] = "google",
     ) -> str:

metagpt/actions/write_prd.py

@@ -4,238 +4,195 @@
 @Time    : 2023/5/11 17:45
 @Author  : alexanderwu
 @File    : write_prd.py
+@Modified By: mashenquan, 2023/11/27.
+            1. According to Section 2.2.3.1 of RFC 135, replace file data in the message with the file name.
+            2. According to the design in Section 2.2.3.5.2 of RFC 135, add incremental iteration functionality.
+            3. Move the document storage operations related to WritePRD from the save operation of WriteDesign.
+@Modified By: mashenquan, 2023/12/5. Move the generation logic of the project name to WritePRD.
 """
-from typing import List
+from __future__ import annotations
+
+import json
+from pathlib import Path
 
 from metagpt.actions import Action, ActionOutput
-from metagpt.actions.search_and_summarize import SearchAndSummarize
+from metagpt.actions.action_node import ActionNode
+from metagpt.actions.fix_bug import FixBug
+from metagpt.actions.write_prd_an import (
+    WP_IS_RELATIVE_NODE,
+    WP_ISSUE_TYPE_NODE,
+    WRITE_PRD_NODE,
+)
 from metagpt.config import CONFIG
+from metagpt.const import (
+    BUGFIX_FILENAME,
+    COMPETITIVE_ANALYSIS_FILE_REPO,
+    DOCS_FILE_REPO,
+    PRD_PDF_FILE_REPO,
+    PRDS_FILE_REPO,
+    REQUIREMENT_FILENAME,
+)
 from metagpt.logs import logger
-from metagpt.utils.get_template import get_template
+from metagpt.schema import BugFixContext, Document, Documents, Message
+from metagpt.utils.common import CodeParser
+from metagpt.utils.file_repository import FileRepository
 
-templates = {
-    "json": {
-        "PROMPT_TEMPLATE": """
-# Context
-## Original Requirements
+# from metagpt.utils.get_template import get_template
+from metagpt.utils.mermaid import mermaid_to_file
+
+# from typing import List
+
+
+CONTEXT_TEMPLATE = """
+### Project Name
+{project_name}
+
+### Original Requirements
 {requirements}
 
-## Search Information
-{search_information}
+### Search Information
+-
+"""
 
-## mermaid quadrantChart code syntax example. DONT USE QUOTE IN CODE DUE TO INVALID SYNTAX. Replace the <Campain X> with REAL COMPETITOR NAME
-```mermaid
-quadrantChart
-    title Reach and engagement of campaigns
-    x-axis Low Reach --> High Reach
-    y-axis Low Engagement --> High Engagement
-    quadrant-1 We should expand
-    quadrant-2 Need to promote
-    quadrant-3 Re-evaluate
-    quadrant-4 May be improved
-    "Campaign: A": [0.3, 0.6]
-    "Campaign B": [0.45, 0.23]
-    "Campaign C": [0.57, 0.69]
-    "Campaign D": [0.78, 0.34]
-    "Campaign E": [0.40, 0.34]
-    "Campaign F": [0.35, 0.78]
-    "Our Target Product": [0.5, 0.6]
-```
+NEW_REQ_TEMPLATE = """
+### Legacy Content
+{old_prd}
 
-## Format example
-{format_example}
------
-Role: You are a professional product manager; the goal is to design a concise, usable, efficient product
-Requirements: According to the context, fill in the following missing information, each section name is a key in json ,If the requirements are unclear, ensure minimum viability and avoid excessive design
-
-## Original Requirements: Provide as Plain text, place the polished complete original requirements here
-
-## Product Goals: Provided as Python list[str], up to 3 clear, orthogonal product goals. If the requirement itself is simple, the goal should also be simple
-
-## User Stories: Provided as Python list[str], up to 5 scenario-based user stories, If the requirement itself is simple, the user stories should also be less
-
-## Competitive Analysis: Provided as Python list[str], up to 7 competitive product analyses, consider as similar competitors as possible
-
-## Competitive Quadrant Chart: Use mermaid quadrantChart code syntax. up to 14 competitive products. Translation: Distribute these competitor scores evenly between 0 and 1, trying to conform to a normal distribution centered around 0.5 as much as possible.
-
-## Requirement Analysis: Provide as Plain text. Be simple. LESS IS MORE. Make your requirements less dumb. Delete the parts unnessasery.
-
-## Requirement Pool: Provided as Python list[list[str], the parameters are requirement description, priority(P0/P1/P2), respectively, comply with PEP standards; no more than 5 requirements and consider to make its difficulty lower
-
-## UI Design draft: Provide as Plain text. Be simple. Describe the elements and functions, also provide a simple style description and layout description.
-## Anything UNCLEAR: Provide as Plain text. Make clear here.
-
-output a properly formatted JSON, wrapped inside [CONTENT][/CONTENT] like format example,
-and only output the json inside this tag, nothing else
-""",
-        "FORMAT_EXAMPLE": """
-[CONTENT]
-{
-    "Original Requirements": "",
-    "Search Information": "",
-    "Requirements": "",
-    "Product Goals": [],
-    "User Stories": [],
-    "Competitive Analysis": [],
-    "Competitive Quadrant Chart": "quadrantChart
-                title Reach and engagement of campaigns
-                x-axis Low Reach --> High Reach
-                y-axis Low Engagement --> High Engagement
-                quadrant-1 We should expand
-                quadrant-2 Need to promote
-                quadrant-3 Re-evaluate
-                quadrant-4 May be improved
-                Campaign A: [0.3, 0.6]
-                Campaign B: [0.45, 0.23]
-                Campaign C: [0.57, 0.69]
-                Campaign D: [0.78, 0.34]
-                Campaign E: [0.40, 0.34]
-                Campaign F: [0.35, 0.78]",
-    "Requirement Analysis": "",
-    "Requirement Pool": [["P0","P0 requirement"],["P1","P1 requirement"]],
-    "UI Design draft": "",
-    "Anything UNCLEAR": "",
-}
-[/CONTENT]
-""",
-    },
-    "markdown": {
-        "PROMPT_TEMPLATE": """
-# Context
-## Original Requirements
+### New Requirements
 {requirements}
-
-## Search Information
-{search_information}
-
-## mermaid quadrantChart code syntax example. DONT USE QUOTE IN CODE DUE TO INVALID SYNTAX. Replace the <Campain X> with REAL COMPETITOR NAME
-```mermaid
-quadrantChart
-    title Reach and engagement of campaigns
-    x-axis Low Reach --> High Reach
-    y-axis Low Engagement --> High Engagement
-    quadrant-1 We should expand
-    quadrant-2 Need to promote
-    quadrant-3 Re-evaluate
-    quadrant-4 May be improved
-    "Campaign: A": [0.3, 0.6]
-    "Campaign B": [0.45, 0.23]
-    "Campaign C": [0.57, 0.69]
-    "Campaign D": [0.78, 0.34]
-    "Campaign E": [0.40, 0.34]
-    "Campaign F": [0.35, 0.78]
-    "Our Target Product": [0.5, 0.6]
-```
-
-## Format example
-{format_example}
------
-Role: You are a professional product manager; the goal is to design a concise, usable, efficient product
-Requirements: According to the context, fill in the following missing information, note that each sections are returned in Python code triple quote form seperatedly. If the requirements are unclear, ensure minimum viability and avoid excessive design
-ATTENTION: Use '##' to SPLIT SECTIONS, not '#'. AND '## <SECTION_NAME>' SHOULD WRITE BEFORE the code and triple quote. Output carefully referenced "Format example" in format.
-
-## Original Requirements: Provide as Plain text, place the polished complete original requirements here
-
-## Product Goals: Provided as Python list[str], up to 3 clear, orthogonal product goals. If the requirement itself is simple, the goal should also be simple
-
-## User Stories: Provided as Python list[str], up to 5 scenario-based user stories, If the requirement itself is simple, the user stories should also be less
-
-## Competitive Analysis: Provided as Python list[str], up to 7 competitive product analyses, consider as similar competitors as possible
-
-## Competitive Quadrant Chart: Use mermaid quadrantChart code syntax. up to 14 competitive products. Translation: Distribute these competitor scores evenly between 0 and 1, trying to conform to a normal distribution centered around 0.5 as much as possible.
-
-## Requirement Analysis: Provide as Plain text. Be simple. LESS IS MORE. Make your requirements less dumb. Delete the parts unnessasery.
-
-## Requirement Pool: Provided as Python list[list[str], the parameters are requirement description, priority(P0/P1/P2), respectively, comply with PEP standards; no more than 5 requirements and consider to make its difficulty lower
-
-## UI Design draft: Provide as Plain text. Be simple. Describe the elements and functions, also provide a simple style description and layout description.
-## Anything UNCLEAR: Provide as Plain text. Make clear here.
-""",
-        "FORMAT_EXAMPLE": """
----
-## Original Requirements
-The boss ... 
-
-## Product Goals
-```python
-[
-    "Create a ...",
-]
-```
-
-## User Stories
-```python
-[
-    "As a user, ...",
-]
-```
-
-## Competitive Analysis
-```python
-[
-    "Python Snake Game: ...",
-]
-```
-
-## Competitive Quadrant Chart
-```mermaid
-quadrantChart
-    title Reach and engagement of campaigns
-    ...
-    "Our Target Product": [0.6, 0.7]
-```
-
-## Requirement Analysis
-The product should be a ...
-
-## Requirement Pool
-```python
-[
-    ["End game ...", "P0"]
-]
-```
-
-## UI Design draft
-Give a basic function description, and a draft
-
-## Anything UNCLEAR
-There are no unclear points.
----
-""",
-    },
-}
-
-OUTPUT_MAPPING = {
-    "Original Requirements": (str, ...),
-    "Product Goals": (List[str], ...),
-    "User Stories": (List[str], ...),
-    "Competitive Analysis": (List[str], ...),
-    "Competitive Quadrant Chart": (str, ...),
-    "Requirement Analysis": (str, ...),
-    "Requirement Pool": (List[List[str]], ...),
-    "UI Design draft": (str, ...),
-    "Anything UNCLEAR": (str, ...),
-}
+"""
 
 
 class WritePRD(Action):
     def __init__(self, name="", context=None, llm=None):
         super().__init__(name, context, llm)
 
-    async def run(self, requirements, format=CONFIG.prompt_format, *args, **kwargs) -> ActionOutput:
-        sas = SearchAndSummarize()
-        # rsp = await sas.run(context=requirements, system_text=SEARCH_AND_SUMMARIZE_SYSTEM_EN_US)
-        rsp = ""
-        info = f"### Search Results\n{sas.result}\n\n### Search Summary\n{rsp}"
-        if sas.result:
-            logger.info(sas.result)
-            logger.info(rsp)
+    async def run(self, with_messages, format=CONFIG.prompt_format, *args, **kwargs) -> ActionOutput | Message:
+        # Determine which requirement documents need to be rewritten: Use LLM to assess whether new requirements are
+        # related to the PRD. If they are related, rewrite the PRD.
+        docs_file_repo = CONFIG.git_repo.new_file_repository(relative_path=DOCS_FILE_REPO)
+        requirement_doc = await docs_file_repo.get(filename=REQUIREMENT_FILENAME)
+        if await self._is_bugfix(requirement_doc.content):
+            await docs_file_repo.save(filename=BUGFIX_FILENAME, content=requirement_doc.content)
+            await docs_file_repo.save(filename=REQUIREMENT_FILENAME, content="")
+            bug_fix = BugFixContext(filename=BUGFIX_FILENAME)
+            return Message(
+                content=bug_fix.json(),
+                instruct_content=bug_fix,
+                role="",
+                cause_by=FixBug,
+                sent_from=self,
+                send_to="Alex",  # the name of Engineer
+            )
+        else:
+            await docs_file_repo.delete(filename=BUGFIX_FILENAME)
 
-        prompt_template, format_example = get_template(templates, format)
-        prompt = prompt_template.format(
-            requirements=requirements, search_information=info, format_example=format_example
+        prds_file_repo = CONFIG.git_repo.new_file_repository(PRDS_FILE_REPO)
+        prd_docs = await prds_file_repo.get_all()
+        change_files = Documents()
+        for prd_doc in prd_docs:
+            prd_doc = await self._update_prd(
+                requirement_doc=requirement_doc, prd_doc=prd_doc, prds_file_repo=prds_file_repo, *args, **kwargs
+            )
+            if not prd_doc:
+                continue
+            change_files.docs[prd_doc.filename] = prd_doc
+            logger.info(f"rewrite prd: {prd_doc.filename}")
+        # If there is no existing PRD, generate one using 'docs/requirement.txt'.
+        if not change_files.docs:
+            prd_doc = await self._update_prd(
+                requirement_doc=requirement_doc, prd_doc=None, prds_file_repo=prds_file_repo, *args, **kwargs
+            )
+            if prd_doc:
+                change_files.docs[prd_doc.filename] = prd_doc
+                logger.debug(f"new prd: {prd_doc.filename}")
+        # Once all files under 'docs/prds/' have been compared with the newly added requirements, trigger the
+        # 'publish' message to transition the workflow to the next stage. This design allows room for global
+        # optimization in subsequent steps.
+        return ActionOutput(content=change_files.json(), instruct_content=change_files)
+
+    async def _run_new_requirement(self, requirements, format=CONFIG.prompt_format) -> ActionOutput:
+        # sas = SearchAndSummarize()
+        # # rsp = await sas.run(context=requirements, system_text=SEARCH_AND_SUMMARIZE_SYSTEM_EN_US)
+        # rsp = ""
+        # info = f"### Search Results\n{sas.result}\n\n### Search Summary\n{rsp}"
+        # if sas.result:
+        #     logger.info(sas.result)
+        #     logger.info(rsp)
+        project_name = CONFIG.project_name if CONFIG.project_name else ""
+        context = CONTEXT_TEMPLATE.format(requirements=requirements, project_name=project_name)
+        node = await WRITE_PRD_NODE.fill(context=context, llm=self.llm, to=format)
+        await self._rename_workspace(node)
+        return node
+
+    async def _is_relative(self, new_requirement_doc, old_prd_doc) -> bool:
+        context = NEW_REQ_TEMPLATE.format(old_prd=old_prd_doc.content, requirements=new_requirement_doc.content)
+        node = await WP_IS_RELATIVE_NODE.fill(context, self.llm)
+        return node.get("is_relative") == "YES"
+
+    async def _merge(self, new_requirement_doc, prd_doc, format=CONFIG.prompt_format) -> Document:
+        if not CONFIG.project_name:
+            CONFIG.project_name = Path(CONFIG.project_path).name
+        prompt = NEW_REQ_TEMPLATE.format(requirements=new_requirement_doc.content, old_prd=prd_doc.content)
+        node = await WRITE_PRD_NODE.fill(context=prompt, llm=self.llm, to=format)
+        prd_doc.content = node.instruct_content.json(ensure_ascii=False)
+        await self._rename_workspace(node)
+        return prd_doc
+
+    async def _update_prd(self, requirement_doc, prd_doc, prds_file_repo, *args, **kwargs) -> Document | None:
+        if not prd_doc:
+            prd = await self._run_new_requirement(requirements=[requirement_doc.content], *args, **kwargs)
+            new_prd_doc = Document(
+                root_path=PRDS_FILE_REPO,
+                filename=FileRepository.new_filename() + ".json",
+                content=prd.instruct_content.json(ensure_ascii=False),
+            )
+        elif await self._is_relative(requirement_doc, prd_doc):
+            new_prd_doc = await self._merge(requirement_doc, prd_doc)
+        else:
+            return None
+        await prds_file_repo.save(filename=new_prd_doc.filename, content=new_prd_doc.content)
+        await self._save_competitive_analysis(new_prd_doc)
+        await self._save_pdf(new_prd_doc)
+        return new_prd_doc
+
+    @staticmethod
+    async def _save_competitive_analysis(prd_doc):
+        m = json.loads(prd_doc.content)
+        quadrant_chart = m.get("Competitive Quadrant Chart")
+        if not quadrant_chart:
+            return
+        pathname = (
+            CONFIG.git_repo.workdir / Path(COMPETITIVE_ANALYSIS_FILE_REPO) / Path(prd_doc.filename).with_suffix("")
         )
-        logger.debug(prompt)
-        # prd = await self._aask_v1(prompt, "prd", OUTPUT_MAPPING)
-        prd = await self._aask_v1(prompt, "prd", OUTPUT_MAPPING, format=format)
-        return prd
+        if not pathname.parent.exists():
+            pathname.parent.mkdir(parents=True, exist_ok=True)
+        await mermaid_to_file(quadrant_chart, pathname)
+
+    @staticmethod
+    async def _save_pdf(prd_doc):
+        await FileRepository.save_as(doc=prd_doc, with_suffix=".md", relative_path=PRD_PDF_FILE_REPO)
+
+    @staticmethod
+    async def _rename_workspace(prd):
+        if CONFIG.project_path:  # Updating on the old version has already been specified if it's valid. According to
+            # Section 2.2.3.10 of RFC 135
+            if not CONFIG.project_name:
+                CONFIG.project_name = Path(CONFIG.project_path).name
+                return
+
+        if not CONFIG.project_name:
+            if isinstance(prd, ActionOutput) or isinstance(prd, ActionNode):
+                ws_name = prd.instruct_content.dict()["Project Name"]
+            else:
+                ws_name = CodeParser.parse_str(block="Project Name", text=prd)
+            CONFIG.project_name = ws_name
+        CONFIG.git_repo.rename_root(CONFIG.project_name)
+
+    async def _is_bugfix(self, context) -> bool:
+        src_workspace_path = CONFIG.git_repo.workdir / CONFIG.git_repo.workdir.name
+        code_files = CONFIG.git_repo.get_files(relative_path=src_workspace_path)
+        if not code_files:
+            return False
+        node = await WP_ISSUE_TYPE_NODE.fill(context, self.llm)
+        return node.get("issue_type") == "BUG"

metagpt/actions/write_prd_an.py

@@ -0,0 +1,158 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+@Time    : 2023/12/14 11:40
+@Author  : alexanderwu
+@File    : write_prd_an.py
+"""
+
+from metagpt.actions.action_node import ActionNode
+from metagpt.logs import logger
+
+LANGUAGE = ActionNode(
+    key="Language",
+    expected_type=str,
+    instruction="Provide the language used in the project, typically matching the user's requirement language.",
+    example="en_us",
+)
+
+PROGRAMMING_LANGUAGE = ActionNode(
+    key="Programming Language",
+    expected_type=str,
+    instruction="Python/JavaScript or other mainstream programming language.",
+    example="Python",
+)
+
+ORIGINAL_REQUIREMENTS = ActionNode(
+    key="Original Requirements",
+    expected_type=str,
+    instruction="Place the polished, complete original requirements here.",
+    example="The game should have a leaderboard and multiple difficulty levels.",
+)
+
+PROJECT_NAME = ActionNode(
+    key="Project Name",
+    expected_type=str,
+    instruction="Name the project using snake case style, like 'game_2048' or 'simple_crm'.",
+    example="game_2048",
+)
+
+PRODUCT_GOALS = ActionNode(
+    key="Product Goals",
+    expected_type=list[str],
+    instruction="Provide up to three clear, orthogonal product goals.",
+    example=["Create an engaging user experience", "Ensure high performance", "Provide customizable features"],
+)
+
+USER_STORIES = ActionNode(
+    key="User Stories",
+    expected_type=list[str],
+    instruction="Provide up to five scenario-based user stories.",
+    example=[
+        "As a user, I want to be able to choose difficulty levels",
+        "As a player, I want to see my score after each game",
+    ],
+)
+
+COMPETITIVE_ANALYSIS = ActionNode(
+    key="Competitive Analysis",
+    expected_type=list[str],
+    instruction="Provide analyses for up to seven competitive products.",
+    example=["Python Snake Game: Simple interface, lacks advanced features"],
+)
+
+COMPETITIVE_QUADRANT_CHART = ActionNode(
+    key="Competitive Quadrant Chart",
+    expected_type=str,
+    instruction="Use mermaid quadrantChart syntax. Distribute scores evenly between 0 and 1",
+    example="""quadrantChart
+    title "Reach and engagement of campaigns"
+    x-axis "Low Reach" --> "High Reach"
+    y-axis "Low Engagement" --> "High Engagement"
+    quadrant-1 "We should expand"
+    quadrant-2 "Need to promote"
+    quadrant-3 "Re-evaluate"
+    quadrant-4 "May be improved"
+    "Campaign A": [0.3, 0.6]
+    "Campaign B": [0.45, 0.23]
+    "Campaign C": [0.57, 0.69]
+    "Campaign D": [0.78, 0.34]
+    "Campaign E": [0.40, 0.34]
+    "Campaign F": [0.35, 0.78]
+    "Our Target Product": [0.5, 0.6]""",
+)
+
+REQUIREMENT_ANALYSIS = ActionNode(
+    key="Requirement Analysis",
+    expected_type=str,
+    instruction="Provide a detailed analysis of the requirements.",
+    example="The product should be user-friendly.",
+)
+
+REQUIREMENT_POOL = ActionNode(
+    key="Requirement Pool",
+    expected_type=list[list[str]],
+    instruction="List down the requirements with their priority (P0, P1, P2).",
+    example=[["P0", "..."], ["P1", "..."]],
+)
+
+UI_DESIGN_DRAFT = ActionNode(
+    key="UI Design draft",
+    expected_type=str,
+    instruction="Provide a simple description of UI elements, functions, style, and layout.",
+    example="Basic function description with a simple style and layout.",
+)
+
+ANYTHING_UNCLEAR = ActionNode(
+    key="Anything UNCLEAR",
+    expected_type=str,
+    instruction="Mention any aspects of the project that are unclear and try to clarify them.",
+    example="...",
+)
+
+ISSUE_TYPE = ActionNode(
+    key="issue_type",
+    expected_type=str,
+    instruction="Answer BUG/REQUIREMENT. If it is a bugfix, answer BUG, otherwise answer Requirement",
+    example="BUG",
+)
+
+IS_RELATIVE = ActionNode(
+    key="is_relative",
+    expected_type=str,
+    instruction="Answer YES/NO. If the requirement is related to the old PRD, answer YES, otherwise NO",
+    example="YES",
+)
+
+REASON = ActionNode(
+    key="reason", expected_type=str, instruction="Explain the reasoning process from question to answer", example="..."
+)
+
+
+NODES = [
+    LANGUAGE,
+    PROGRAMMING_LANGUAGE,
+    ORIGINAL_REQUIREMENTS,
+    PROJECT_NAME,
+    PRODUCT_GOALS,
+    USER_STORIES,
+    COMPETITIVE_ANALYSIS,
+    COMPETITIVE_QUADRANT_CHART,
+    REQUIREMENT_ANALYSIS,
+    REQUIREMENT_POOL,
+    UI_DESIGN_DRAFT,
+    ANYTHING_UNCLEAR,
+]
+
+WRITE_PRD_NODE = ActionNode.from_children("WritePRD", NODES)
+WP_ISSUE_TYPE_NODE = ActionNode.from_children("WP_ISSUE_TYPE", [ISSUE_TYPE, REASON])
+WP_IS_RELATIVE_NODE = ActionNode.from_children("WP_IS_RELATIVE", [IS_RELATIVE, REASON])
+
+
+def main():
+    prompt = WRITE_PRD_NODE.compile(context="")
+    logger.info(prompt)
+
+
+if __name__ == "__main__":
+    main()

metagpt/actions/write_prd_review.py

@@ -25,4 +25,3 @@ class WritePRDReview(Action):
         prompt = self.prd_review_prompt_template.format(prd=self.prd)
         review = await self._aask(prompt)
         return review
-    

metagpt/actions/write_test.py

@@ -3,10 +3,15 @@
 """
 @Time    : 2023/5/11 22:12
 @Author  : alexanderwu
-@File    : environment.py
+@File    : write_test.py
+@Modified By: mashenquan, 2023-11-27. Following the think-act principle, solidify the task parameters when creating the
+        WriteTest object, rather than passing them in when calling the run function.
 """
 from metagpt.actions.action import Action
+from metagpt.config import CONFIG
+from metagpt.const import TEST_CODES_FILE_REPO
 from metagpt.logs import logger
+from metagpt.schema import Document, TestingContext
 from metagpt.utils.common import CodeParser
 
 PROMPT_TEMPLATE = """
@@ -15,7 +20,7 @@ NOTICE
 2. Requirement: Based on the context, develop a comprehensive test suite that adequately covers all relevant aspects of the code file under review. Your test suite will be part of the overall project QA, so please develop complete, robust, and reusable test cases.
 3. Attention1: Use '##' to split sections, not '#', and '## <SECTION_NAME>' SHOULD WRITE BEFORE the test case or script.
 4. Attention2: If there are any settings in your tests, ALWAYS SET A DEFAULT VALUE, ALWAYS USE STRONG TYPE AND EXPLICIT VARIABLE.
-5. Attention3: YOU MUST FOLLOW "Data structures and interface definitions". DO NOT CHANGE ANY DESIGN. Make sure your tests respect the existing design and ensure its validity.
+5. Attention3: YOU MUST FOLLOW "Data structures and interfaces". DO NOT CHANGE ANY DESIGN. Make sure your tests respect the existing design and ensure its validity.
 6. Think before writing: What should be tested and validated in this document? What edge cases could exist? What might fail?
 7. CAREFULLY CHECK THAT YOU DON'T MISS ANY NECESSARY TEST CASES/SCRIPTS IN THIS FILE.
 Attention: Use '##' to split sections, not '#', and '## <SECTION_NAME>' SHOULD WRITE BEFORE the test case or script and triple quotes.
@@ -47,12 +52,16 @@ class WriteTest(Action):
             code = code_rsp
         return code
 
-    async def run(self, code_to_test, test_file_name, source_file_path, workspace):
+    async def run(self, *args, **kwargs) -> TestingContext:
+        if not self.context.test_doc:
+            self.context.test_doc = Document(
+                filename="test_" + self.context.code_doc.filename, root_path=TEST_CODES_FILE_REPO
+            )
         prompt = PROMPT_TEMPLATE.format(
-            code_to_test=code_to_test,
-            test_file_name=test_file_name,
-            source_file_path=source_file_path,
-            workspace=workspace,
+            code_to_test=self.context.code_doc.content,
+            test_file_name=self.context.test_doc.filename,
+            source_file_path=self.context.code_doc.root_relative_path,
+            workspace=CONFIG.git_repo.workdir,
         )
-        code = await self.write_code(prompt)
-        return code
+        self.context.test_doc.content = await self.write_code(prompt)
+        return self.context

metagpt/actions/write_tutorial.py

@@ -10,7 +10,7 @@
 from typing import Dict
 
 from metagpt.actions import Action
-from metagpt.prompts.tutorial_assistant import DIRECTORY_PROMPT, CONTENT_PROMPT
+from metagpt.prompts.tutorial_assistant import CONTENT_PROMPT, DIRECTORY_PROMPT
 from metagpt.utils.common import OutputParser
 
 
@@ -65,4 +65,3 @@ class WriteContent(Action):
         """
         prompt = CONTENT_PROMPT.format(topic=topic, language=self.language, directory=self.directory)
         return await self._aask(prompt=prompt)
-

metagpt/config.py

@@ -2,13 +2,18 @@
 # -*- coding: utf-8 -*-
 """
 Provide configuration, singleton
+@Modified By: mashenquan, 2023/11/27.
+        1. According to Section 2.2.3.11 of RFC 135, add git repository support.
+        2. Add the parameter `src_workspace` for the old version project path.
 """
 import os
+from copy import deepcopy
+from pathlib import Path
+from typing import Any
 
-import openai
 import yaml
 
-from metagpt.const import PROJECT_ROOT
+from metagpt.const import DEFAULT_WORKSPACE_ROOT, METAGPT_ROOT, OPTIONS
 from metagpt.logs import logger
 from metagpt.tools import SearchEngineType, WebBrowserEngineType
 from metagpt.utils.singleton import Singleton
@@ -35,34 +40,37 @@ class Config(metaclass=Singleton):
     """
 
     _instance = None
-    key_yaml_file = PROJECT_ROOT / "config/key.yaml"
-    default_yaml_file = PROJECT_ROOT / "config/config.yaml"
+    home_yaml_file = Path.home() / ".metagpt/config.yaml"
+    key_yaml_file = METAGPT_ROOT / "config/key.yaml"
+    default_yaml_file = METAGPT_ROOT / "config/config.yaml"
 
     def __init__(self, yaml_file=default_yaml_file):
-        self._configs = {}
-        self._init_with_config_files_and_env(self._configs, yaml_file)
-        logger.info("Config loading done.")
+        self._init_with_config_files_and_env(yaml_file)
+        logger.debug("Config loading done.")
+        self._update()
+
+    def _update(self):
+        # logger.info("Config loading done.")
         self.global_proxy = self._get("GLOBAL_PROXY")
         self.openai_api_key = self._get("OPENAI_API_KEY")
         self.anthropic_api_key = self._get("Anthropic_API_KEY")
         self.zhipuai_api_key = self._get("ZHIPUAI_API_KEY")
-
         self.open_llm_api_base = self._get("OPEN_LLM_API_BASE")
         self.open_llm_api_model = self._get("OPEN_LLM_API_MODEL")
-
         self.fireworks_api_key = self._get("FIREWORKS_API_KEY")
-        if (not self.openai_api_key or "YOUR_API_KEY" == self.openai_api_key) and \
-                (not self.anthropic_api_key or "YOUR_API_KEY" == self.anthropic_api_key) and \
-                (not self.zhipuai_api_key or "YOUR_API_KEY" == self.zhipuai_api_key) and \
-                (not self.open_llm_api_base) and \
-                (not self.fireworks_api_key or "YOUR_API_KEY" == self.fireworks_api_key):
-            raise NotConfiguredException("Set OPENAI_API_KEY or Anthropic_API_KEY or ZHIPUAI_API_KEY first "
-                                         "or FIREWORKS_API_KEY or OPEN_LLM_API_BASE")
+        if (
+            (not self.openai_api_key or "YOUR_API_KEY" == self.openai_api_key)
+            and (not self.anthropic_api_key or "YOUR_API_KEY" == self.anthropic_api_key)
+            and (not self.zhipuai_api_key or "YOUR_API_KEY" == self.zhipuai_api_key)
+            and (not self.open_llm_api_base)
+            and (not self.fireworks_api_key or "YOUR_API_KEY" == self.fireworks_api_key)
+        ):
+            raise NotConfiguredException(
+                "Set OPENAI_API_KEY or Anthropic_API_KEY or ZHIPUAI_API_KEY first "
+                "or FIREWORKS_API_KEY or OPEN_LLM_API_BASE"
+            )
         self.openai_api_base = self._get("OPENAI_API_BASE")
-        openai_proxy = self._get("OPENAI_PROXY") or self.global_proxy
-        if openai_proxy:
-            openai.proxy = openai_proxy
-            openai.api_base = self.openai_api_base
+        self.openai_proxy = self._get("OPENAI_PROXY") or self.global_proxy
         self.openai_api_type = self._get("OPENAI_API_TYPE")
         self.openai_api_version = self._get("OPENAI_API_VERSION")
         self.openai_api_rpm = self._get("RPM", 3)
@@ -95,6 +103,7 @@ class Config(metaclass=Singleton):
             logger.warning("LONG_TERM_MEMORY is True")
         self.max_budget = self._get("MAX_BUDGET", 10.0)
         self.total_cost = 0.0
+        self.code_review_k_times = 2
 
         self.puppeteer_config = self._get("PUPPETEER_CONFIG", "")
         self.mmdc = self._get("MMDC", "mmdc")
@@ -105,13 +114,19 @@ class Config(metaclass=Singleton):
         self.pyppeteer_executable_path = self._get("PYPPETEER_EXECUTABLE_PATH", "")
 
         self.repair_llm_output = self._get("REPAIR_LLM_OUTPUT", False)
-        self.prompt_format = self._get("PROMPT_FORMAT", "markdown")
+        self.prompt_format = self._get("PROMPT_FORMAT", "json")
+        self.workspace_path = Path(self._get("WORKSPACE_PATH", DEFAULT_WORKSPACE_ROOT))
+        self._ensure_workspace_exists()
 
-    def _init_with_config_files_and_env(self, configs: dict, yaml_file):
+    def _ensure_workspace_exists(self):
+        self.workspace_path.mkdir(parents=True, exist_ok=True)
+        logger.debug(f"WORKSPACE_PATH set to {self.workspace_path}")
+
+    def _init_with_config_files_and_env(self, yaml_file):
         """Load from config/key.yaml, config/config.yaml, and env in decreasing order of priority"""
-        configs.update(os.environ)
+        configs = dict(os.environ)
 
-        for _yaml_file in [yaml_file, self.key_yaml_file]:
+        for _yaml_file in [yaml_file, self.key_yaml_file, self.home_yaml_file]:
             if not _yaml_file.exists():
                 continue
 
@@ -120,11 +135,13 @@ class Config(metaclass=Singleton):
                 yaml_data = yaml.safe_load(file)
                 if not yaml_data:
                     continue
-                os.environ.update({k: v for k, v in yaml_data.items() if isinstance(v, str)})
                 configs.update(yaml_data)
+        OPTIONS.set(configs)
 
-    def _get(self, *args, **kwargs):
-        return self._configs.get(*args, **kwargs)
+    @staticmethod
+    def _get(*args, **kwargs):
+        m = OPTIONS.get()
+        return m.get(*args, **kwargs)
 
     def get(self, key, *args, **kwargs):
         """Search for a value in config/key.yaml, config/config.yaml, and env; raise an error if not found"""
@@ -133,5 +150,33 @@ class Config(metaclass=Singleton):
             raise ValueError(f"Key '{key}' not found in environment variables or in the YAML file")
         return value
 
+    def __setattr__(self, name: str, value: Any) -> None:
+        OPTIONS.get()[name] = value
+
+    def __getattr__(self, name: str) -> Any:
+        m = OPTIONS.get()
+        return m.get(name)
+
+    def set_context(self, options: dict):
+        """Update current config"""
+        if not options:
+            return
+        opts = deepcopy(OPTIONS.get())
+        opts.update(options)
+        OPTIONS.set(opts)
+        self._update()
+
+    @property
+    def options(self):
+        """Return all key-values"""
+        return OPTIONS.get()
+
+    def new_environ(self):
+        """Return a new os.environ object"""
+        env = os.environ.copy()
+        m = self.options
+        env.update({k: v for k, v in m.items() if isinstance(v, str)})
+        return env
+
 
 CONFIG = Config()

metagpt/const.py

@@ -4,45 +4,92 @@
 @Time    : 2023/5/1 11:59
 @Author  : alexanderwu
 @File    : const.py
+@Modified By: mashenquan, 2023-11-1. According to Section 2.2.1 and 2.2.2 of RFC 116, added key definitions for
+        common properties in the Message.
+@Modified By: mashenquan, 2023-11-27. Defines file repository paths according to Section 2.2.3.4 of RFC 135.
+@Modified By: mashenquan, 2023/12/5. Add directories for code summarization..
 """
+import contextvars
+import os
 from pathlib import Path
+
 from loguru import logger
 
-def get_project_root():
-    """Search upwards to find the project root directory."""
-    current_path = Path.cwd()
-    while True:
-        if (
-            (current_path / ".git").exists()
-            or (current_path / ".project_root").exists()
-            or (current_path / ".gitignore").exists()
-        ):
-            # use metagpt with git clone will land here
-            logger.info(f"PROJECT_ROOT set to {str(current_path)}")
-            return current_path
-        parent_path = current_path.parent
-        if parent_path == current_path:
-            # use metagpt with pip install will land here
-            cwd = Path.cwd()
-            logger.info(f"PROJECT_ROOT set to current working directory: {str(cwd)}")
-            return cwd
-        current_path = parent_path
+import metagpt
+
+OPTIONS = contextvars.ContextVar("OPTIONS")
 
 
-PROJECT_ROOT = get_project_root()
-DATA_PATH = PROJECT_ROOT / "data"
-WORKSPACE_ROOT = PROJECT_ROOT / "workspace"
-PROMPT_PATH = PROJECT_ROOT / "metagpt/prompts"
-UT_PATH = PROJECT_ROOT / "data/ut"
-SWAGGER_PATH = UT_PATH / "files/api/"
-UT_PY_PATH = UT_PATH / "files/ut/"
-API_QUESTIONS_PATH = UT_PATH / "files/question/"
-YAPI_URL = "http://yapi.deepwisdomai.com/"
-TMP = PROJECT_ROOT / "tmp"
+def get_metagpt_package_root():
+    """Get the root directory of the installed package."""
+    package_root = Path(metagpt.__file__).parent.parent
+    logger.info(f"Package root set to {str(package_root)}")
+    return package_root
+
+
+def get_metagpt_root():
+    """Get the project root directory."""
+    # Check if a project root is specified in the environment variable
+    project_root_env = os.getenv("METAGPT_PROJECT_ROOT")
+    if project_root_env:
+        project_root = Path(project_root_env)
+        logger.info(f"PROJECT_ROOT set from environment variable to {str(project_root)}")
+    else:
+        # Fallback to package root if no environment variable is set
+        project_root = get_metagpt_package_root()
+    return project_root
+
+
+# METAGPT PROJECT ROOT AND VARS
+
+METAGPT_ROOT = get_metagpt_root()
+DEFAULT_WORKSPACE_ROOT = METAGPT_ROOT / "workspace"
+
+DATA_PATH = METAGPT_ROOT / "data"
 RESEARCH_PATH = DATA_PATH / "research"
 TUTORIAL_PATH = DATA_PATH / "tutorial_docx"
 INVOICE_OCR_TABLE_PATH = DATA_PATH / "invoice_table"
+UT_PATH = DATA_PATH / "ut"
+SWAGGER_PATH = UT_PATH / "files/api/"
+UT_PY_PATH = UT_PATH / "files/ut/"
+API_QUESTIONS_PATH = UT_PATH / "files/question/"
 
-SKILL_DIRECTORY = PROJECT_ROOT / "metagpt/skills"
+TMP = METAGPT_ROOT / "tmp"
+
+SOURCE_ROOT = METAGPT_ROOT / "metagpt"
+PROMPT_PATH = SOURCE_ROOT / "prompts"
+SKILL_DIRECTORY = SOURCE_ROOT / "skills"
+
+
+# REAL CONSTS
 
 MEM_TTL = 24 * 30 * 3600
+
+
+MESSAGE_ROUTE_FROM = "sent_from"
+MESSAGE_ROUTE_TO = "send_to"
+MESSAGE_ROUTE_CAUSE_BY = "cause_by"
+MESSAGE_META_ROLE = "role"
+MESSAGE_ROUTE_TO_ALL = "<all>"
+MESSAGE_ROUTE_TO_NONE = "<none>"
+
+REQUIREMENT_FILENAME = "requirement.txt"
+BUGFIX_FILENAME = "bugfix.txt"
+PACKAGE_REQUIREMENTS_FILENAME = "requirements.txt"
+
+DOCS_FILE_REPO = "docs"
+PRDS_FILE_REPO = "docs/prds"
+SYSTEM_DESIGN_FILE_REPO = "docs/system_design"
+TASK_FILE_REPO = "docs/tasks"
+COMPETITIVE_ANALYSIS_FILE_REPO = "resources/competitive_analysis"
+DATA_API_DESIGN_FILE_REPO = "resources/data_api_design"
+SEQ_FLOW_FILE_REPO = "resources/seq_flow"
+SYSTEM_DESIGN_PDF_FILE_REPO = "resources/system_design"
+PRD_PDF_FILE_REPO = "resources/prd"
+TASK_PDF_FILE_REPO = "resources/api_spec_and_tasks"
+TEST_CODES_FILE_REPO = "tests"
+TEST_OUTPUTS_FILE_REPO = "test_outputs"
+CODE_SUMMARIES_FILE_REPO = "docs/code_summaries"
+CODE_SUMMARIES_PDF_FILE_REPO = "resources/code_summaries"
+
+YAPI_URL = "http://yapi.deepwisdomai.com/"

metagpt/document.py

@@ -0,0 +1,256 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+@Time    : 2023/6/8 14:03
+@Author  : alexanderwu
+@File    : document.py
+@Desc    : Classes and Operations Related to Files in the File System.
+"""
+from enum import Enum
+from pathlib import Path
+from typing import Optional, Union
+
+import pandas as pd
+from langchain.document_loaders import (
+    TextLoader,
+    UnstructuredPDFLoader,
+    UnstructuredWordDocumentLoader,
+)
+from langchain.text_splitter import CharacterTextSplitter
+from pydantic import BaseModel, Field
+from tqdm import tqdm
+
+from metagpt.config import CONFIG
+from metagpt.logs import logger
+from metagpt.repo_parser import RepoParser
+
+
+def validate_cols(content_col: str, df: pd.DataFrame):
+    if content_col not in df.columns:
+        raise ValueError("Content column not found in DataFrame.")
+
+
+def read_data(data_path: Path):
+    suffix = data_path.suffix
+    if ".xlsx" == suffix:
+        data = pd.read_excel(data_path)
+    elif ".csv" == suffix:
+        data = pd.read_csv(data_path)
+    elif ".json" == suffix:
+        data = pd.read_json(data_path)
+    elif suffix in (".docx", ".doc"):
+        data = UnstructuredWordDocumentLoader(str(data_path), mode="elements").load()
+    elif ".txt" == suffix:
+        data = TextLoader(str(data_path)).load()
+        text_splitter = CharacterTextSplitter(separator="\n", chunk_size=256, chunk_overlap=0)
+        texts = text_splitter.split_documents(data)
+        data = texts
+    elif ".pdf" == suffix:
+        data = UnstructuredPDFLoader(str(data_path), mode="elements").load()
+    else:
+        raise NotImplementedError("File format not supported.")
+    return data
+
+
+class DocumentStatus(Enum):
+    """Indicates document status, a mechanism similar to RFC/PEP"""
+
+    DRAFT = "draft"
+    UNDERREVIEW = "underreview"
+    APPROVED = "approved"
+    DONE = "done"
+
+
+class Document(BaseModel):
+    """
+    Document: Handles operations related to document files.
+    """
+
+    path: Path = Field(default=None)
+    name: str = Field(default="")
+    content: str = Field(default="")
+
+    # metadata? in content perhaps.
+    author: str = Field(default="")
+    status: DocumentStatus = Field(default=DocumentStatus.DRAFT)
+    reviews: list = Field(default_factory=list)
+
+    @classmethod
+    def from_path(cls, path: Path):
+        """
+        Create a Document instance from a file path.
+        """
+        if not path.exists():
+            raise FileNotFoundError(f"File {path} not found.")
+        content = path.read_text()
+        return cls(content=content, path=path)
+
+    @classmethod
+    def from_text(cls, text: str, path: Optional[Path] = None):
+        """
+        Create a Document from a text string.
+        """
+        return cls(content=text, path=path)
+
+    def to_path(self, path: Optional[Path] = None):
+        """
+        Save content to the specified file path.
+        """
+        if path is not None:
+            self.path = path
+
+        if self.path is None:
+            raise ValueError("File path is not set.")
+
+        self.path.parent.mkdir(parents=True, exist_ok=True)
+        self.path.write_text(self.content, encoding="utf-8")
+
+    def persist(self):
+        """
+        Persist document to disk.
+        """
+        return self.to_path()
+
+
+class IndexableDocument(Document):
+    """
+    Advanced document handling: For vector databases or search engines.
+    """
+
+    data: Union[pd.DataFrame, list]
+    content_col: Optional[str] = Field(default="")
+    meta_col: Optional[str] = Field(default="")
+
+    class Config:
+        arbitrary_types_allowed = True
+
+    @classmethod
+    def from_path(cls, data_path: Path, content_col="content", meta_col="metadata"):
+        if not data_path.exists():
+            raise FileNotFoundError(f"File {data_path} not found.")
+        data = read_data(data_path)
+        content = data_path.read_text()
+        if isinstance(data, pd.DataFrame):
+            validate_cols(content_col, data)
+        return cls(data=data, content=content, content_col=content_col, meta_col=meta_col)
+
+    def _get_docs_and_metadatas_by_df(self) -> (list, list):
+        df = self.data
+        docs = []
+        metadatas = []
+        for i in tqdm(range(len(df))):
+            docs.append(df[self.content_col].iloc[i])
+            if self.meta_col:
+                metadatas.append({self.meta_col: df[self.meta_col].iloc[i]})
+            else:
+                metadatas.append({})
+        return docs, metadatas
+
+    def _get_docs_and_metadatas_by_langchain(self) -> (list, list):
+        data = self.data
+        docs = [i.page_content for i in data]
+        metadatas = [i.metadata for i in data]
+        return docs, metadatas
+
+    def get_docs_and_metadatas(self) -> (list, list):
+        if isinstance(self.data, pd.DataFrame):
+            return self._get_docs_and_metadatas_by_df()
+        elif isinstance(self.data, list):
+            return self._get_docs_and_metadatas_by_langchain()
+        else:
+            raise NotImplementedError("Data type not supported for metadata extraction.")
+
+
+class RepoMetadata(BaseModel):
+    name: str = Field(default="")
+    n_docs: int = Field(default=0)
+    n_chars: int = Field(default=0)
+    symbols: list = Field(default_factory=list)
+
+
+class Repo(BaseModel):
+    # Name of this repo.
+    name: str = Field(default="")
+    # metadata: RepoMetadata = Field(default=RepoMetadata)
+    docs: dict[Path, Document] = Field(default_factory=dict)
+    codes: dict[Path, Document] = Field(default_factory=dict)
+    assets: dict[Path, Document] = Field(default_factory=dict)
+    path: Path = Field(default=None)
+
+    def _path(self, filename):
+        return self.path / filename
+
+    @classmethod
+    def from_path(cls, path: Path):
+        """Load documents, code, and assets from a repository path."""
+        path.mkdir(parents=True, exist_ok=True)
+        repo = Repo(path=path, name=path.name)
+        for file_path in path.rglob("*"):
+            # FIXME: These judgments are difficult to support multiple programming languages and need to be more general
+            if file_path.is_file() and file_path.suffix in [".json", ".txt", ".md", ".py", ".js", ".css", ".html"]:
+                repo._set(file_path.read_text(), file_path)
+        return repo
+
+    def to_path(self):
+        """Persist all documents, code, and assets to the given repository path."""
+        for doc in self.docs.values():
+            doc.to_path()
+        for code in self.codes.values():
+            code.to_path()
+        for asset in self.assets.values():
+            asset.to_path()
+
+    def _set(self, content: str, path: Path):
+        """Add a document to the appropriate category based on its file extension."""
+        suffix = path.suffix
+        doc = Document(content=content, path=path, name=str(path.relative_to(self.path)))
+
+        # FIXME: These judgments are difficult to support multiple programming languages and need to be more general
+        if suffix.lower() == ".md":
+            self.docs[path] = doc
+        elif suffix.lower() in [".py", ".js", ".css", ".html"]:
+            self.codes[path] = doc
+        else:
+            self.assets[path] = doc
+        return doc
+
+    def set(self, content: str, filename: str):
+        """Set a document and persist it to disk."""
+        path = self._path(filename)
+        doc = self._set(content, path)
+        doc.to_path()
+
+    def get(self, filename: str) -> Optional[Document]:
+        """Get a document by its filename."""
+        path = self._path(filename)
+        return self.docs.get(path) or self.codes.get(path) or self.assets.get(path)
+
+    def get_text_documents(self) -> list[Document]:
+        return list(self.docs.values()) + list(self.codes.values())
+
+    def eda(self) -> RepoMetadata:
+        n_docs = sum(len(i) for i in [self.docs, self.codes, self.assets])
+        n_chars = sum(sum(len(j.content) for j in i.values()) for i in [self.docs, self.codes, self.assets])
+        symbols = RepoParser(base_directory=self.path).generate_symbols()
+        return RepoMetadata(name=self.name, n_docs=n_docs, n_chars=n_chars, symbols=symbols)
+
+
+def set_existing_repo(path=CONFIG.workspace_path / "t1"):
+    repo1 = Repo.from_path(path)
+    repo1.set("wtf content", "doc/wtf_file.md")
+    repo1.set("wtf code", "code/wtf_file.py")
+    logger.info(repo1)  # check doc
+
+
+def load_existing_repo(path=CONFIG.workspace_path / "web_tetris"):
+    repo = Repo.from_path(path)
+    logger.info(repo)
+    logger.info(repo.eda())
+
+
+def main():
+    load_existing_repo()
+
+
+if __name__ == "__main__":
+    main()

metagpt/document_store/base_store.py

@@ -28,20 +28,20 @@ class BaseStore(ABC):
 
 
 class LocalStore(BaseStore, ABC):
-    def __init__(self, raw_data: Path, cache_dir: Path = None):
-        if not raw_data:
+    def __init__(self, raw_data_path: Path, cache_dir: Path = None):
+        if not raw_data_path:
             raise FileNotFoundError
         self.config = Config()
-        self.raw_data = raw_data
+        self.raw_data_path = raw_data_path
         if not cache_dir:
-            cache_dir = raw_data.parent
+            cache_dir = raw_data_path.parent
         self.cache_dir = cache_dir
         self.store = self._load()
         if not self.store:
             self.store = self.write()
 
     def _get_index_and_store_fname(self):
-        fname = self.raw_data.name.split('.')[0]
+        fname = self.raw_data_path.name.split(".")[0]
         index_file = self.cache_dir / f"{fname}.index"
         store_file = self.cache_dir / f"{fname}.pkl"
         return index_file, store_file
@@ -53,4 +53,3 @@ class LocalStore(BaseStore, ABC):
     @abstractmethod
     def _write(self, docs, metadatas):
         raise NotImplementedError
-    

metagpt/document_store/chromadb_store.py

@@ -10,6 +10,7 @@ import chromadb
 
 class ChromaStore:
     """If inherited from BaseStore, or importing other modules from metagpt, a Python exception occurs, which is strange."""
+
     def __init__(self, name):
         client = chromadb.Client()
         collection = client.create_collection(name)
@@ -22,7 +23,7 @@ class ChromaStore:
             query_texts=[query],
             n_results=n_results,
             where=metadata_filter,  # optional filter
-            where_document=document_filter  # optional filter
+            where_document=document_filter,  # optional filter
         )
         return results
 

metagpt/document_store/document.py

@@ -4,6 +4,7 @@
 @Time    : 2023/6/8 14:03
 @Author  : alexanderwu
 @File    : document.py
+@Desc    : Classes and Operations Related to Vector Files in the Vector Database. Still under design.
 """
 from pathlib import Path
 
@@ -24,20 +25,20 @@ def validate_cols(content_col: str, df: pd.DataFrame):
 
 def read_data(data_path: Path):
     suffix = data_path.suffix
-    if '.xlsx' == suffix:
+    if ".xlsx" == suffix:
         data = pd.read_excel(data_path)
-    elif '.csv' == suffix:
+    elif ".csv" == suffix:
         data = pd.read_csv(data_path)
-    elif '.json' == suffix:
+    elif ".json" == suffix:
         data = pd.read_json(data_path)
-    elif suffix in ('.docx', '.doc'):
-        data = UnstructuredWordDocumentLoader(str(data_path), mode='elements').load()
-    elif '.txt' == suffix:
+    elif suffix in (".docx", ".doc"):
+        data = UnstructuredWordDocumentLoader(str(data_path), mode="elements").load()
+    elif ".txt" == suffix:
         data = TextLoader(str(data_path)).load()
-        text_splitter = CharacterTextSplitter(separator='\n', chunk_size=256, chunk_overlap=0)
+        text_splitter = CharacterTextSplitter(separator="\n", chunk_size=256, chunk_overlap=0)
         texts = text_splitter.split_documents(data)
         data = texts
-    elif '.pdf' == suffix:
+    elif ".pdf" == suffix:
         data = UnstructuredPDFLoader(str(data_path), mode="elements").load()
     else:
         raise NotImplementedError
@@ -45,8 +46,7 @@ def read_data(data_path: Path):
 
 
 class Document:
-
-    def __init__(self, data_path, content_col='content', meta_col='metadata'):
+    def __init__(self, data_path, content_col="content", meta_col="metadata"):
         self.data = read_data(data_path)
         if isinstance(self.data, pd.DataFrame):
             validate_cols(content_col, self.data)
@@ -79,4 +79,3 @@ class Document:
             return self._get_docs_and_metadatas_by_langchain()
         else:
             raise NotImplementedError
-        

metagpt/document_store/faiss_store.py

@@ -15,16 +15,16 @@ from langchain.embeddings import OpenAIEmbeddings
 from langchain.vectorstores import FAISS
 
 from metagpt.const import DATA_PATH
+from metagpt.document import IndexableDocument
 from metagpt.document_store.base_store import LocalStore
-from metagpt.document_store.document import Document
 from metagpt.logs import logger
 
 
 class FaissStore(LocalStore):
-    def __init__(self, raw_data: Path, cache_dir=None, meta_col="source", content_col="output"):
+    def __init__(self, raw_data_path: Path, cache_dir=None, meta_col="source", content_col="output"):
         self.meta_col = meta_col
         self.content_col = content_col
-        super().__init__(raw_data, cache_dir)
+        super().__init__(raw_data_path, cache_dir)
 
     def _load(self) -> Optional["FaissStore"]:
         index_file, store_file = self._get_index_and_store_fname()
@@ -64,9 +64,9 @@ class FaissStore(LocalStore):
 
     def write(self):
         """Initialize the index and library based on the Document (JSON / XLSX, etc.) file provided by the user."""
-        if not self.raw_data.exists():
+        if not self.raw_data_path.exists():
             raise FileNotFoundError
-        doc = Document(self.raw_data, self.content_col, self.meta_col)
+        doc = IndexableDocument.from_path(self.raw_data_path, self.content_col, self.meta_col)
         docs, metadatas = doc.get_docs_and_metadatas()
 
         self.store = self._write(docs, metadatas)

metagpt/document_store/milvus_store.py

@@ -12,12 +12,7 @@ from pymilvus import Collection, CollectionSchema, DataType, FieldSchema, connec
 
 from metagpt.document_store.base_store import BaseStore
 
-type_mapping = {
-    int: DataType.INT64,
-    str: DataType.VARCHAR,
-    float: DataType.DOUBLE,
-    np.ndarray: DataType.FLOAT_VECTOR
-}
+type_mapping = {int: DataType.INT64, str: DataType.VARCHAR, float: DataType.DOUBLE, np.ndarray: DataType.FLOAT_VECTOR}
 
 
 def columns_to_milvus_schema(columns: dict, primary_col_name: str = "", desc: str = ""):
@@ -52,17 +47,11 @@ class MilvusStore(BaseStore):
         self.collection = None
 
     def _create_collection(self, name, schema):
-        collection = Collection(
-            name=name,
-            schema=schema,
-            using='default',
-            shards_num=2,
-            consistency_level="Strong"
-        )
+        collection = Collection(name=name, schema=schema, using="default", shards_num=2, consistency_level="Strong")
         return collection
 
     def create_collection(self, name, columns):
-        schema = columns_to_milvus_schema(columns, 'idx')
+        schema = columns_to_milvus_schema(columns, "idx")
         self.collection = self._create_collection(name, schema)
         return self.collection
 
@@ -72,7 +61,7 @@ class MilvusStore(BaseStore):
     def load_collection(self):
         self.collection.load()
 
-    def build_index(self, field='emb'):
+    def build_index(self, field="emb"):
         self.collection.create_index(field, {"index_type": "FLAT", "metric_type": "L2", "params": {}})
 
     def search(self, query: list[list[float]], *args, **kwargs):
@@ -85,11 +74,11 @@ class MilvusStore(BaseStore):
         search_params = {"metric_type": "L2", "params": {"nprobe": 10}}
         results = self.collection.search(
             data=query,
-            anns_field=kwargs.get('field', 'emb'),
+            anns_field=kwargs.get("field", "emb"),
             param=search_params,
             limit=10,
             expr=None,
-            consistency_level="Strong"
+            consistency_level="Strong",
         )
         # FIXME: results contain id, but to get the actual value from the id, we still need to call the query interface
         return results

metagpt/document_store/qdrant_store.py

@@ -10,13 +10,14 @@ from metagpt.document_store.base_store import BaseStore
 @dataclass
 class QdrantConnection:
     """
-   Args:
-       url: qdrant url
-       host: qdrant host
-       port: qdrant port
-       memory: qdrant service use memory mode
-       api_key: qdrant cloud api_key
-   """
+    Args:
+        url: qdrant url
+        host: qdrant host
+        port: qdrant port
+        memory: qdrant service use memory mode
+        api_key: qdrant cloud api_key
+    """
+
     url: str = None
     host: str = None
     port: int = None
@@ -31,9 +32,7 @@ class QdrantStore(BaseStore):
         elif connect.url:
             self.client = QdrantClient(url=connect.url, api_key=connect.api_key)
         elif connect.host and connect.port:
-            self.client = QdrantClient(
-                host=connect.host, port=connect.port, api_key=connect.api_key
-            )
+            self.client = QdrantClient(host=connect.host, port=connect.port, api_key=connect.api_key)
         else:
             raise Exception("please check QdrantConnection.")
 
@@ -58,15 +57,11 @@ class QdrantStore(BaseStore):
         try:
             self.client.get_collection(collection_name)
             if force_recreate:
-                res = self.client.recreate_collection(
-                    collection_name, vectors_config=vectors_config, **kwargs
-                )
+                res = self.client.recreate_collection(collection_name, vectors_config=vectors_config, **kwargs)
                 return res
             return True
         except:  # noqa: E722
-            return self.client.recreate_collection(
-                collection_name, vectors_config=vectors_config, **kwargs
-            )
+            return self.client.recreate_collection(collection_name, vectors_config=vectors_config, **kwargs)
 
     def has_collection(self, collection_name: str):
         try:

metagpt/environment.py

@@ -4,60 +4,77 @@
 @Time    : 2023/5/11 22:12
 @Author  : alexanderwu
 @File    : environment.py
+@Modified By: mashenquan, 2023-11-1. According to Chapter 2.2.2 of RFC 116:
+    1. Remove the functionality of `Environment` class as a public message buffer.
+    2. Standardize the message forwarding behavior of the `Environment` class.
+    3. Add the `is_idle` property.
+@Modified By: mashenquan, 2023-11-4. According to the routing feature plan in Chapter 2.2.3.2 of RFC 113, the routing
+    functionality is to be consolidated into the `Environment` class.
 """
 import asyncio
-from typing import Iterable
+from typing import Iterable, Set
 
 from pydantic import BaseModel, Field
 
-from metagpt.memory import Memory
+from metagpt.logs import logger
 from metagpt.roles import Role
 from metagpt.schema import Message
+from metagpt.utils.common import is_subscribed
 
 
 class Environment(BaseModel):
     """环境，承载一批角色，角色可以向环境发布消息，可以被其他角色观察到
-       Environment, hosting a batch of roles, roles can publish messages to the environment, and can be observed by other roles
-    
+    Environment, hosting a batch of roles, roles can publish messages to the environment, and can be observed by other roles
+
     """
 
     roles: dict[str, Role] = Field(default_factory=dict)
-    memory: Memory = Field(default_factory=Memory)
-    history: str = Field(default='')
+    members: dict[Role, Set] = Field(default_factory=dict)
+    history: str = Field(default="")  # For debug
 
     class Config:
         arbitrary_types_allowed = True
 
     def add_role(self, role: Role):
         """增加一个在当前环境的角色
-           Add a role in the current environment
+        Add a role in the current environment
         """
         role.set_env(self)
         self.roles[role.profile] = role
 
     def add_roles(self, roles: Iterable[Role]):
         """增加一批在当前环境的角色
-            Add a batch of characters in the current environment
+        Add a batch of characters in the current environment
         """
         for role in roles:
             self.add_role(role)
 
-    def publish_message(self, message: Message):
-        """向当前环境发布信息
-          Post information to the current environment
+    def publish_message(self, message: Message) -> bool:
         """
-        # self.message_queue.put(message)
-        self.memory.add(message)
-        self.history += f"\n{message}"
+        Distribute the message to the recipients.
+        In accordance with the Message routing structure design in Chapter 2.2.1 of RFC 116, as already planned
+        in RFC 113 for the entire system, the routing information in the Message is only responsible for
+        specifying the message recipient, without concern for where the message recipient is located. How to
+        route the message to the message recipient is a problem addressed by the transport framework designed
+        in RFC 113.
+        """
+        logger.debug(f"publish_message: {message.dump()}")
+        found = False
+        # According to the routing feature plan in Chapter 2.2.3.2 of RFC 113
+        for role, subscription in self.members.items():
+            if is_subscribed(message, subscription):
+                role.put_message(message)
+                found = True
+        if not found:
+            logger.warning(f"Message no recipients: {message.dump()}")
+        self.history += f"\n{message}"  # For debug
+
+        return True
 
     async def run(self, k=1):
         """处理一次所有信息的运行
         Process all Role runs at once
         """
-        # while not self.message_queue.empty():
-        # message = self.message_queue.get()
-        # rsp = await self.manager.handle(message, self)
-        # self.message_queue.put(rsp)
         for _ in range(k):
             futures = []
             for role in self.roles.values():
@@ -65,15 +82,32 @@ class Environment(BaseModel):
                 futures.append(future)
 
             await asyncio.gather(*futures)
+            logger.debug(f"is idle: {self.is_idle}")
 
     def get_roles(self) -> dict[str, Role]:
         """获得环境内的所有角色
-           Process all Role runs at once
+        Process all Role runs at once
         """
         return self.roles
 
     def get_role(self, name: str) -> Role:
         """获得环境内的指定角色
-           get all the environment roles
+        get all the environment roles
         """
         return self.roles.get(name, None)
+
+    @property
+    def is_idle(self):
+        """If true, all actions have been executed."""
+        for r in self.roles.values():
+            if not r.is_idle:
+                return False
+        return True
+
+    def get_subscription(self, obj):
+        """Get the labels for messages to be consumed by the object."""
+        return self.members.get(obj, {})
+
+    def set_subscription(self, obj, tags):
+        """Set the labels for message to be consumed by the object"""
+        self.members[obj] = tags

metagpt/inspect_module.py

@@ -12,17 +12,17 @@ import metagpt  # replace with your module
 
 
 def print_classes_and_functions(module):
-    """FIXME: NOT WORK.. """
+    """FIXME: NOT WORK.."""
     for name, obj in inspect.getmembers(module):
         if inspect.isclass(obj):
-            print(f'Class: {name}')
+            print(f"Class: {name}")
         elif inspect.isfunction(obj):
-            print(f'Function: {name}')
+            print(f"Function: {name}")
         else:
             print(name)
 
     print(dir(module))
 
 
-if __name__ == '__main__':
-    print_classes_and_functions(metagpt)
+if __name__ == "__main__":
+    print_classes_and_functions(metagpt)

metagpt/llm.py

@@ -7,17 +7,19 @@
 """
 
 from metagpt.config import CONFIG
-from metagpt.provider.anthropic_api import Claude2 as Claude
-from metagpt.provider.openai_api import OpenAIGPTAPI
-from metagpt.provider.zhipuai_api import ZhiPuAIGPTAPI
-from metagpt.provider.spark_api import SparkAPI
-from metagpt.provider.open_llm_api import OpenLLMGPTAPI
+from metagpt.provider.base_gpt_api import BaseGPTAPI
 from metagpt.provider.fireworks_api import FireWorksGPTAPI
 from metagpt.provider.human_provider import HumanProvider
+from metagpt.provider.open_llm_api import OpenLLMGPTAPI
+from metagpt.provider.openai_api import OpenAIGPTAPI
+from metagpt.provider.spark_api import SparkAPI
+from metagpt.provider.zhipuai_api import ZhiPuAIGPTAPI
+
+_ = HumanProvider()  # Avoid pre-commit error
 
 
-def LLM() -> "BaseGPTAPI":
-    """ initialize different LLM instance according to the key field existence"""
+def LLM() -> BaseGPTAPI:
+    """initialize different LLM instance according to the key field existence"""
     # TODO a little trick, can use registry to initialize LLM instance further
     if CONFIG.openai_api_key:
         llm = OpenAIGPTAPI()

metagpt/logs.py

@@ -11,19 +11,17 @@ from datetime import datetime
 
 from loguru import logger as _logger
 
-from metagpt.const import PROJECT_ROOT
+from metagpt.const import METAGPT_ROOT
 
 
 def define_log_level(print_level="INFO", logfile_level="DEBUG"):
-    """调整日志级别到level之上
-       Adjust the log level to above level
-    """
+    """Adjust the log level to above level"""
     current_date = datetime.now()
     formatted_date = current_date.strftime("%Y%m%d")
 
     _logger.remove()
     _logger.add(sys.stderr, level=print_level)
-    _logger.add(PROJECT_ROOT / f"logs/{formatted_date}.log", level=logfile_level)
+    _logger.add(METAGPT_ROOT / f"logs/{formatted_date}.txt", level=logfile_level)
     return _logger
 
 

metagpt/management/skill_manager.py

@@ -19,8 +19,8 @@ class SkillManager:
 
     def __init__(self):
         self._llm = LLM()
-        self._store = ChromaStore('skill_manager')
-        self._skills: dict[str: Skill] = {}
+        self._store = ChromaStore("skill_manager")
+        self._skills: dict[str:Skill] = {}
 
     def add_skill(self, skill: Skill):
         """
@@ -54,7 +54,7 @@ class SkillManager:
         :param desc: Skill description
         :return: Multiple skills
         """
-        return self._store.search(desc, n_results=n_results)['ids'][0]
+        return self._store.search(desc, n_results=n_results)["ids"][0]
 
     def retrieve_skill_scored(self, desc: str, n_results: int = 2) -> dict:
         """
@@ -75,6 +75,6 @@ class SkillManager:
         logger.info(text)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     manager = SkillManager()
     manager.generate_skill_desc(Action())

metagpt/manager.py

@@ -14,11 +14,11 @@ class Manager:
     def __init__(self, llm: LLM = LLM()):
         self.llm = llm  # Large Language Model
         self.role_directions = {
-            "BOSS": "Product Manager",
+            "User": "Product Manager",
             "Product Manager": "Architect",
             "Architect": "Engineer",
             "Engineer": "QA Engineer",
-            "QA Engineer": "Product Manager"
+            "QA Engineer": "Product Manager",
         }
         self.prompt_template = """
         Given the following message:
@@ -51,7 +51,7 @@ class Manager:
         # chosen_role_name = self.llm.ask(self.prompt_template.format(context))
 
         # FIXME: 现在通过简单的字典决定流向，但之后还是应该有思考过程
-        #The direction of flow is now determined by a simple dictionary, but there should still be a thought process afterwards
+        # The direction of flow is now determined by a simple dictionary, but there should still be a thought process afterwards
         next_role_profile = self.role_directions[message.role]
         # logger.debug(f"{next_role_profile}")
         for _, role in roles.items():

metagpt/memory/__init__.py

@@ -7,10 +7,11 @@
 """
 
 from metagpt.memory.memory import Memory
-from metagpt.memory.longterm_memory import LongTermMemory
+
+# from metagpt.memory.longterm_memory import LongTermMemory
 
 
 __all__ = [
     "Memory",
-    "LongTermMemory",
+    # "LongTermMemory",
 ]

metagpt/memory/longterm_memory.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# @Desc   : the implement of Long-term memory
+"""
+@Desc   : the implement of Long-term memory
+"""
 
 from metagpt.logs import logger
 from metagpt.memory import Memory
@@ -28,7 +30,7 @@ class LongTermMemory(Memory):
             logger.warning(f"It may the first time to run Agent {role_id}, the long-term memory is empty")
         else:
             logger.warning(
-                f"Agent {role_id} has existed memory storage with {len(messages)} messages " f"and has recovered them."
+                f"Agent {role_id} has existing memory storage with {len(messages)} messages " f"and has recovered them."
             )
         self.msg_from_recover = True
         self.add_batch(messages)
@@ -68,4 +70,3 @@ class LongTermMemory(Memory):
     def clear(self):
         super(LongTermMemory, self).clear()
         self.memory_storage.clean()
-        

metagpt/memory/memory.py

@@ -4,12 +4,13 @@
 @Time    : 2023/5/20 12:15
 @Author  : alexanderwu
 @File    : memory.py
+@Modified By: mashenquan, 2023-11-1. According to RFC 116: Updated the type of index key.
 """
 from collections import defaultdict
-from typing import Iterable, Type
+from typing import Iterable, Set
 
-from metagpt.actions import Action
 from metagpt.schema import Message
+from metagpt.utils.common import any_to_str, any_to_str_set
 
 
 class Memory:
@@ -18,7 +19,7 @@ class Memory:
     def __init__(self):
         """Initialize an empty storage list and an empty index dictionary"""
         self.storage: list[Message] = []
-        self.index: dict[Type[Action], list[Message]] = defaultdict(list)
+        self.index: dict[str, list[Message]] = defaultdict(list)
 
     def add(self, message: Message):
         """Add a new message to storage, while updating the index"""
@@ -73,16 +74,17 @@ class Memory:
             news.append(i)
         return news
 
-    def get_by_action(self, action: Type[Action]) -> list[Message]:
+    def get_by_action(self, action) -> list[Message]:
         """Return all messages triggered by a specified Action"""
-        return self.index[action]
+        index = any_to_str(action)
+        return self.index[index]
 
-    def get_by_actions(self, actions: Iterable[Type[Action]]) -> list[Message]:
+    def get_by_actions(self, actions: Set) -> list[Message]:
         """Return all messages triggered by specified Actions"""
         rsp = []
-        for action in actions:
+        indices = any_to_str_set(actions)
+        for action in indices:
             if action not in self.index:
                 continue
             rsp += self.index[action]
         return rsp
-    

metagpt/memory/memory_storage.py

@@ -2,16 +2,16 @@
 # -*- coding: utf-8 -*-
 # @Desc   : the implement of memory storage
 
-from typing import List
 from pathlib import Path
+from typing import List
 
 from langchain.vectorstores.faiss import FAISS
 
 from metagpt.const import DATA_PATH, MEM_TTL
+from metagpt.document_store.faiss_store import FaissStore
 from metagpt.logs import logger
 from metagpt.schema import Message
-from metagpt.utils.serialize import serialize_message, deserialize_message
-from metagpt.document_store.faiss_store import FaissStore
+from metagpt.utils.serialize import deserialize_message, serialize_message
 
 
 class MemoryStorage(FaissStore):
@@ -34,7 +34,7 @@ class MemoryStorage(FaissStore):
 
     def recover_memory(self, role_id: str) -> List[Message]:
         self.role_id = role_id
-        self.role_mem_path = Path(DATA_PATH / f'role_mem/{self.role_id}/')
+        self.role_mem_path = Path(DATA_PATH / f"role_mem/{self.role_id}/")
         self.role_mem_path.mkdir(parents=True, exist_ok=True)
 
         self.store = self._load()
@@ -51,18 +51,18 @@ class MemoryStorage(FaissStore):
 
     def _get_index_and_store_fname(self):
         if not self.role_mem_path:
-            logger.error(f'You should call {self.__class__.__name__}.recover_memory fist when using LongTermMemory')
+            logger.error(f"You should call {self.__class__.__name__}.recover_memory fist when using LongTermMemory")
             return None, None
-        index_fpath = Path(self.role_mem_path / f'{self.role_id}.index')
-        storage_fpath = Path(self.role_mem_path / f'{self.role_id}.pkl')
+        index_fpath = Path(self.role_mem_path / f"{self.role_id}.index")
+        storage_fpath = Path(self.role_mem_path / f"{self.role_id}.pkl")
         return index_fpath, storage_fpath
 
     def persist(self):
         super(MemoryStorage, self).persist()
-        logger.debug(f'Agent {self.role_id} persist memory into local')
+        logger.debug(f"Agent {self.role_id} persist memory into local")
 
     def add(self, message: Message) -> bool:
-        """ add message into memory storage"""
+        """add message into memory storage"""
         docs = [message.content]
         metadatas = [{"message_ser": serialize_message(message)}]
         if not self.store:
@@ -79,10 +79,7 @@ class MemoryStorage(FaissStore):
         if not self.store:
             return []
 
-        resp = self.store.similarity_search_with_score(
-            query=message.content,
-            k=k
-        )
+        resp = self.store.similarity_search_with_score(query=message.content, k=k)
         # filter the result which score is smaller than the threshold
         filtered_resp = []
         for item, score in resp:
@@ -104,4 +101,3 @@ class MemoryStorage(FaissStore):
 
         self.store = None
         self._initialized = False
-        

metagpt/prompts/invoice_ocr.py

@@ -10,7 +10,9 @@
 
 COMMON_PROMPT = "Now I will provide you with the OCR text recognition results for the invoice."
 
-EXTRACT_OCR_MAIN_INFO_PROMPT = COMMON_PROMPT + """
+EXTRACT_OCR_MAIN_INFO_PROMPT = (
+    COMMON_PROMPT
+    + """
 Please extract the payee, city, total cost, and invoicing date of the invoice.
 
 The OCR data of the invoice are as follows:
@@ -22,8 +24,11 @@ Mandatory restrictions are returned according to the following requirements:
 2. The returned JSON dictionary must be returned in {language}
 3. Mandatory requirement to output in JSON format: {{"收款人":"x","城市":"x","总费用/元":"","开票日期":""}}.
 """
+)
 
-REPLY_OCR_QUESTION_PROMPT = COMMON_PROMPT + """
+REPLY_OCR_QUESTION_PROMPT = (
+    COMMON_PROMPT
+    + """
 Please answer the question: {query}
 
 The OCR data of the invoice are as follows:
@@ -34,6 +39,6 @@ Mandatory restrictions are returned according to the following requirements:
 2. Enforce restrictions on not returning OCR data sent to you.
 3. Return with markdown syntax layout.
 """
+)
 
 INVOICE_OCR_SUCCESS = "Successfully completed OCR text recognition invoice."
-

metagpt/prompts/sales.py

@@ -54,10 +54,12 @@ Conversation history:
 {salesperson_name}: 
 """
 
-conversation_stages = {'1' : "Introduction: Start the conversation by introducing yourself and your company. Be polite and respectful while keeping the tone of the conversation professional. Your greeting should be welcoming. Always clarify in your greeting the reason why you are contacting the prospect.",
-'2': "Qualification: Qualify the prospect by confirming if they are the right person to talk to regarding your product/service. Ensure that they have the authority to make purchasing decisions.",
-'3': "Value proposition: Briefly explain how your product/service can benefit the prospect. Focus on the unique selling points and value proposition of your product/service that sets it apart from competitors.",
-'4': "Needs analysis: Ask open-ended questions to uncover the prospect's needs and pain points. Listen carefully to their responses and take notes.",
-'5': "Solution presentation: Based on the prospect's needs, present your product/service as the solution that can address their pain points.",
-'6': "Objection handling: Address any objections that the prospect may have regarding your product/service. Be prepared to provide evidence or testimonials to support your claims.",
-'7': "Close: Ask for the sale by proposing a next step. This could be a demo, a trial or a meeting with decision-makers. Ensure to summarize what has been discussed and reiterate the benefits."}
+conversation_stages = {
+    "1": "Introduction: Start the conversation by introducing yourself and your company. Be polite and respectful while keeping the tone of the conversation professional. Your greeting should be welcoming. Always clarify in your greeting the reason why you are contacting the prospect.",
+    "2": "Qualification: Qualify the prospect by confirming if they are the right person to talk to regarding your product/service. Ensure that they have the authority to make purchasing decisions.",
+    "3": "Value proposition: Briefly explain how your product/service can benefit the prospect. Focus on the unique selling points and value proposition of your product/service that sets it apart from competitors.",
+    "4": "Needs analysis: Ask open-ended questions to uncover the prospect's needs and pain points. Listen carefully to their responses and take notes.",
+    "5": "Solution presentation: Based on the prospect's needs, present your product/service as the solution that can address their pain points.",
+    "6": "Objection handling: Address any objections that the prospect may have regarding your product/service. Be prepared to provide evidence or testimonials to support your claims.",
+    "7": "Close: Ask for the sale by proposing a next step. This could be a demo, a trial or a meeting with decision-makers. Ensure to summarize what has been discussed and reiterate the benefits.",
+}

metagpt/prompts/tutorial_assistant.py

@@ -12,7 +12,9 @@ You are now a seasoned technical professional in the field of the internet.
 We need you to write a technical tutorial with the topic "{topic}".
 """
 
-DIRECTORY_PROMPT = COMMON_PROMPT + """
+DIRECTORY_PROMPT = (
+    COMMON_PROMPT
+    + """
 Please provide the specific table of contents for this tutorial, strictly following the following requirements:
 1. The output must be strictly in the specified language, {language}.
 2. Answer strictly in the dictionary format like {{"title": "xxx", "directory": [{{"dir 1": ["sub dir 1", "sub dir 2"]}}, {{"dir 2": ["sub dir 3", "sub dir 4"]}}]}}.
@@ -20,8 +22,11 @@ Please provide the specific table of contents for this tutorial, strictly follow
 4. Do not have extra spaces or line breaks.
 5. Each directory title has practical significance.
 """
+)
 
-CONTENT_PROMPT = COMMON_PROMPT + """
+CONTENT_PROMPT = (
+    COMMON_PROMPT
+    + """
 Now I will give you the module directory titles for the topic. 
 Please output the detailed principle content of this title in detail. 
 If there are code examples, please provide them according to standard code specifications. 
@@ -36,4 +41,5 @@ Strictly limit output according to the following requirements:
 3. The output must be strictly in the specified language, {language}.
 4. Do not have redundant output, including concluding remarks.
 5. Strict requirement not to output the topic "{topic}".
-"""
+"""
+)

metagpt/provider/anthropic_api.py

@@ -32,4 +32,3 @@ class Claude2:
             max_tokens_to_sample=1000,
         )
         return res.completion
-    

metagpt/provider/base_chatbot.py

@@ -12,6 +12,7 @@ from dataclasses import dataclass
 @dataclass
 class BaseChatbot(ABC):
     """Abstract GPT class"""
+
     mode: str = "API"
     use_system_prompt: bool = True
 
@@ -26,4 +27,3 @@ class BaseChatbot(ABC):
     @abstractmethod
     def ask_code(self, msgs: list) -> str:
         """Ask GPT multiple questions and get a piece of code"""
-        

metagpt/provider/base_gpt_api.py

@@ -38,15 +38,19 @@ class BaseGPTAPI(BaseChatbot):
         rsp = self.completion(message)
         return self.get_choice_text(rsp)
 
-    async def aask(self, msg: str, system_msgs: Optional[list[str]] = None) -> str:
+    async def aask(self, msg: str, system_msgs: Optional[list[str]] = None, stream=True) -> str:
         if system_msgs:
-            message = self._system_msgs(system_msgs) + [self._user_msg(msg)] if self.use_system_prompt \
+            message = (
+                self._system_msgs(system_msgs) + [self._user_msg(msg)]
+                if self.use_system_prompt
                 else [self._user_msg(msg)]
+            )
         else:
-            message = [self._default_system_msg(), self._user_msg(msg)] if self.use_system_prompt \
-                else [self._user_msg(msg)]
-        rsp = await self.acompletion_text(message, stream=True)
+            message = (
+                [self._default_system_msg(), self._user_msg(msg)] if self.use_system_prompt else [self._user_msg(msg)]
+            )
         logger.debug(message)
+        rsp = await self.acompletion_text(message, stream=stream)
         # logger.debug(rsp)
         return rsp
 

metagpt/provider/fireworks_api.py

@@ -5,11 +5,10 @@
 import openai
 
 from metagpt.config import CONFIG
-from metagpt.provider.openai_api import OpenAIGPTAPI, CostManager, RateLimiter
+from metagpt.provider.openai_api import CostManager, OpenAIGPTAPI, RateLimiter
 
 
 class FireWorksGPTAPI(OpenAIGPTAPI):
-
     def __init__(self):
         self.__init_fireworks(CONFIG)
         self.llm = openai

metagpt/provider/general_api_requestor.py

@@ -2,10 +2,10 @@
 # -*- coding: utf-8 -*-
 # @Desc   : General Async API for http-based LLM model
 
-from typing import AsyncGenerator, Tuple, Union, Optional, Literal
-import aiohttp
 import asyncio
+from typing import AsyncGenerator, Tuple, Union
 
+import aiohttp
 from openai.api_requestor import APIRequestor
 
 from metagpt.logs import logger
@@ -26,9 +26,7 @@ class GeneralAPIRequestor(APIRequestor):
         )
     """
 
-    def _interpret_response_line(
-        self, rbody: str, rcode: int, rheaders, stream: bool
-    ) -> str:
+    def _interpret_response_line(self, rbody: str, rcode: int, rheaders, stream: bool) -> str:
         # just do nothing to meet the APIRequestor process and return the raw data
         # due to the openai sdk will convert the data into OpenAIResponse which we don't need in general cases.
 
@@ -39,11 +37,9 @@ class GeneralAPIRequestor(APIRequestor):
     ) -> Tuple[Union[str, AsyncGenerator[str, None]], bool]:
         if stream and "text/event-stream" in result.headers.get("Content-Type", ""):
             return (
-                   self._interpret_response_line(
-                       line, result.status, result.headers, stream=True
-                   )
-                   async for line in result.content
-               ), True
+                self._interpret_response_line(line, result.status, result.headers, stream=True)
+                async for line in result.content
+            ), True
         else:
             try:
                 await result.read()

metagpt/provider/human_provider.py

@@ -1,11 +1,13 @@
-'''
+"""
 Filename: MetaGPT/metagpt/provider/human_provider.py
 Created Date: Wednesday, November 8th 2023, 11:55:46 pm
 Author: garylin2099
-'''
+"""
 from typing import Optional
-from metagpt.provider.base_gpt_api import BaseGPTAPI
+
 from metagpt.logs import logger
+from metagpt.provider.base_gpt_api import BaseGPTAPI
+
 
 class HumanProvider(BaseGPTAPI):
     """Humans provide themselves as a 'model', which actually takes in human input as its response.

metagpt/provider/open_llm_api.py

@@ -4,13 +4,13 @@
 
 import openai
 
-from metagpt.logs import logger
 from metagpt.config import CONFIG
-from metagpt.provider.openai_api import OpenAIGPTAPI, CostManager, RateLimiter
+from metagpt.logs import logger
+from metagpt.provider.openai_api import CostManager, OpenAIGPTAPI, RateLimiter
 
 
 class OpenLLMCostManager(CostManager):
-    """ open llm model is self-host, it's free and without cost"""
+    """open llm model is self-host, it's free and without cost"""
 
     def update_cost(self, prompt_tokens, completion_tokens, model):
         """
@@ -32,7 +32,6 @@ class OpenLLMCostManager(CostManager):
 
 
 class OpenLLMGPTAPI(OpenAIGPTAPI):
-
     def __init__(self):
         self.__init_openllm(CONFIG)
         self.llm = openai

metagpt/provider/openai_api.py

@@ -115,7 +115,7 @@ class CostManager(metaclass=Singleton):
     def get_total_cost(self):
         """
         Get the total cost of API calls.
-    
+
         Returns:
         float: The total cost of API calls.
         """
@@ -157,6 +157,8 @@ class OpenAIGPTAPI(BaseGPTAPI, RateLimiter):
         if config.openai_api_type:
             openai.api_type = config.openai_api_type
             openai.api_version = config.openai_api_version
+        if config.openai_proxy:
+            openai.proxy = config.openai_proxy
         self.rpm = int(config.get("RPM", 10))
 
     async def _achat_completion_stream(self, messages: list[dict]) -> str:

metagpt/provider/postprecess/base_postprecess_plugin.py

@@ -5,13 +5,15 @@
 from typing import Union
 
 from metagpt.logs import logger
-from metagpt.utils.repair_llm_raw_output import RepairType
-from metagpt.utils.repair_llm_raw_output import repair_llm_raw_output, extract_content_from_output, \
-    retry_parse_json_text
+from metagpt.utils.repair_llm_raw_output import (
+    RepairType,
+    extract_content_from_output,
+    repair_llm_raw_output,
+    retry_parse_json_text,
+)
 
 
 class BasePostPrecessPlugin(object):
-
     model = None  # the plugin of the `model`, use to judge in `llm_postprecess`
 
     def run_repair_llm_output(self, output: str, schema: dict, req_key: str = "[/CONTENT]") -> Union[dict, list]:
@@ -33,15 +35,15 @@ class BasePostPrecessPlugin(object):
         return parsed_data
 
     def run_repair_llm_raw_output(self, content: str, req_keys: list[str], repair_type: str = None) -> str:
-        """ inherited class can re-implement the function"""
+        """inherited class can re-implement the function"""
         return repair_llm_raw_output(content, req_keys=req_keys, repair_type=repair_type)
 
     def run_extract_content_from_output(self, content: str, right_key: str) -> str:
-        """ inherited class can re-implement the function"""
+        """inherited class can re-implement the function"""
         return extract_content_from_output(content, right_key=right_key)
 
     def run_retry_parse_json_text(self, content: str) -> Union[dict, list]:
-        """ inherited class can re-implement the function"""
+        """inherited class can re-implement the function"""
         logger.info(f"extracted json CONTENT from output:\n{content}")
         parsed_data = retry_parse_json_text(output=content)  # should use output=content
         return parsed_data
@@ -64,9 +66,5 @@ class BasePostPrecessPlugin(object):
         assert "/" in req_key
 
         # current, postprocess only deal the repair_llm_raw_output
-        new_output = self.run_repair_llm_output(
-            output=output,
-            schema=schema,
-            req_key=req_key
-        )
+        new_output = self.run_repair_llm_output(output=output, schema=schema, req_key=req_key)
         return new_output

metagpt/provider/postprecess/llm_output_postprecess.py

@@ -7,17 +7,14 @@ from typing import Union
 from metagpt.provider.postprecess.base_postprecess_plugin import BasePostPrecessPlugin
 
 
-def llm_output_postprecess(output: str, schema: dict, req_key: str = "[/CONTENT]",
-                           model_name: str = None) -> Union[dict, str]:
+def llm_output_postprecess(
+    output: str, schema: dict, req_key: str = "[/CONTENT]", model_name: str = None
+) -> Union[dict, str]:
     """
     default use BasePostPrecessPlugin if there is not matched plugin.
     """
     # TODO choose different model's plugin according to the model_name
     postprecess_plugin = BasePostPrecessPlugin()
 
-    result = postprecess_plugin.run(
-        output=output,
-        schema=schema,
-        req_key=req_key
-    )
+    result = postprecess_plugin.run(output=output, schema=schema, req_key=req_key)
     return result

metagpt/provider/spark_api.py

@@ -14,8 +14,7 @@ import json
 import ssl
 from time import mktime
 from typing import Optional
-from urllib.parse import urlencode
-from urllib.parse import urlparse
+from urllib.parse import urlencode, urlparse
 from wsgiref.handlers import format_date_time
 
 import websocket  # 使用websocket_client
@@ -26,9 +25,8 @@ from metagpt.provider.base_gpt_api import BaseGPTAPI
 
 
 class SparkAPI(BaseGPTAPI):
-
     def __init__(self):
-        logger.warning('当前方法无法支持异步运行。当你使用acompletion时，并不能并行访问。')
+        logger.warning("当前方法无法支持异步运行。当你使用acompletion时，并不能并行访问。")
 
     def ask(self, msg: str) -> str:
         message = [self._default_system_msg(), self._user_msg(msg)]
@@ -49,7 +47,7 @@ class SparkAPI(BaseGPTAPI):
 
     async def acompletion_text(self, messages: list[dict], stream=False) -> str:
         # 不支持
-        logger.error('该功能禁用。')
+        logger.error("该功能禁用。")
         w = GetMessageFromWeb(messages)
         return w.run()
 
@@ -93,29 +91,26 @@ class GetMessageFromWeb:
             signature_origin += "GET " + self.path + " HTTP/1.1"
 
             # 进行hmac-sha256进行加密
-            signature_sha = hmac.new(self.api_secret.encode('utf-8'), signature_origin.encode('utf-8'),
-                                     digestmod=hashlib.sha256).digest()
+            signature_sha = hmac.new(
+                self.api_secret.encode("utf-8"), signature_origin.encode("utf-8"), digestmod=hashlib.sha256
+            ).digest()
 
-            signature_sha_base64 = base64.b64encode(signature_sha).decode(encoding='utf-8')
+            signature_sha_base64 = base64.b64encode(signature_sha).decode(encoding="utf-8")
 
             authorization_origin = f'api_key="{self.api_key}", algorithm="hmac-sha256", headers="host date request-line", signature="{signature_sha_base64}"'
 
-            authorization = base64.b64encode(authorization_origin.encode('utf-8')).decode(encoding='utf-8')
+            authorization = base64.b64encode(authorization_origin.encode("utf-8")).decode(encoding="utf-8")
 
             # 将请求的鉴权参数组合为字典
-            v = {
-                "authorization": authorization,
-                "date": date,
-                "host": self.host
-            }
+            v = {"authorization": authorization, "date": date, "host": self.host}
             # 拼接鉴权参数，生成url
-            url = self.spark_url + '?' + urlencode(v)
+            url = self.spark_url + "?" + urlencode(v)
             # 此处打印出建立连接时候的url,参考本demo的时候可取消上方打印的注释，比对相同参数时生成的url与自己代码生成的url是否一致
             return url
 
     def __init__(self, text):
         self.text = text
-        self.ret = ''
+        self.ret = ""
         self.spark_appid = CONFIG.spark_appid
         self.spark_api_secret = CONFIG.spark_api_secret
         self.spark_api_key = CONFIG.spark_api_key
@@ -124,15 +119,15 @@ class GetMessageFromWeb:
 
     def on_message(self, ws, message):
         data = json.loads(message)
-        code = data['header']['code']
+        code = data["header"]["code"]
 
         if code != 0:
             ws.close()  # 请求错误，则关闭socket
-            logger.critical(f'回答获取失败，响应信息反序列化之后为： {data}')
+            logger.critical(f"回答获取失败，响应信息反序列化之后为： {data}")
             return
         else:
             choices = data["payload"]["choices"]
-            seq = choices["seq"]  # 服务端是流式返回，seq为返回的数据序号
+            # seq = choices["seq"]  # 服务端是流式返回，seq为返回的数据序号
             status = choices["status"]  # 服务端是流式返回，status用于判断信息是否传送完毕
             content = choices["text"][0]["content"]  # 本次接收到的回答文本
             self.ret += content
@@ -142,7 +137,7 @@ class GetMessageFromWeb:
     # 收到websocket错误的处理
     def on_error(self, ws, error):
         # on_message方法处理接收到的信息，出现任何错误，都会调用这个方法
-        logger.critical(f'通讯连接出错，【错误提示: {error}】')
+        logger.critical(f"通讯连接出错，【错误提示: {error}】")
 
     # 收到websocket关闭的处理
     def on_close(self, ws, one, two):
@@ -150,17 +145,12 @@ class GetMessageFromWeb:
 
     # 处理请求数据
     def gen_params(self):
-
         data = {
-            "header": {
-                "app_id": self.spark_appid,
-                "uid": "1234"
-            },
+            "header": {"app_id": self.spark_appid, "uid": "1234"},
             "parameter": {
                 "chat": {
                     # domain为必传参数
                     "domain": self.domain,
-
                     # 以下为可微调，非必传参数
                     # 注意：官方建议，temperature和top_k修改一个即可
                     "max_tokens": 2048,  # 默认2048，模型回答的tokens的最大长度，即允许它输出文本的最长字数
@@ -168,11 +158,7 @@ class GetMessageFromWeb:
                     "top_k": 4,  # 取值为[1，6],默认为4。从k个候选中随机选择一个（非等概率）
                 }
             },
-            "payload": {
-                "message": {
-                    "text": self.text
-                }
-            }
+            "payload": {"message": {"text": self.text}},
         }
         return data
 
@@ -189,17 +175,12 @@ class GetMessageFromWeb:
         return self._run(self.text)
 
     def _run(self, text_list):
-
-        ws_param = self.WsParam(
-            self.spark_appid,
-            self.spark_api_key,
-            self.spark_api_secret,
-            self.spark_url,
-            text_list)
+        ws_param = self.WsParam(self.spark_appid, self.spark_api_key, self.spark_api_secret, self.spark_url, text_list)
         ws_url = ws_param.create_url()
 
         websocket.enableTrace(False)  # 默认禁用 WebSocket 的跟踪功能
-        ws = websocket.WebSocketApp(ws_url, on_message=self.on_message, on_error=self.on_error, on_close=self.on_close,
-                                    on_open=self.on_open)
+        ws = websocket.WebSocketApp(
+            ws_url, on_message=self.on_message, on_error=self.on_error, on_close=self.on_close, on_open=self.on_open
+        )
         ws.run_forever(sslopt={"cert_reqs": ssl.CERT_NONE})
         return self.ret

metagpt/provider/zhipuai/async_sse_client.py

@@ -3,11 +3,10 @@
 # @Desc   : async_sse_client to make keep the use of Event to access response
 #           refs to `https://github.com/zhipuai/zhipuai-sdk-python/blob/main/zhipuai/utils/sse_client.py`
 
-from zhipuai.utils.sse_client import SSEClient, Event, _FIELD_SEPARATOR
+from zhipuai.utils.sse_client import _FIELD_SEPARATOR, Event, SSEClient
 
 
 class AsyncSSEClient(SSEClient):
-
     async def _aread(self):
         data = b""
         async for chunk in self._event_source:
@@ -37,9 +36,7 @@ class AsyncSSEClient(SSEClient):
 
                 # Ignore unknown fields.
                 if field not in event.__dict__:
-                    self._logger.debug(
-                        "Saw invalid field %s while parsing " "Server Side Event", field
-                    )
+                    self._logger.debug("Saw invalid field %s while parsing " "Server Side Event", field)
                     continue
 
                 if len(data) > 1:

metagpt/provider/zhipuai/zhipu_model_api.py

@@ -3,15 +3,14 @@
 # @Desc   : zhipu model api to support sync & async for invoke & sse_invoke
 
 import zhipuai
-from zhipuai.model_api.api import ModelAPI, InvokeType
+from zhipuai.model_api.api import InvokeType, ModelAPI
 from zhipuai.utils.http_client import headers as zhipuai_default_headers
 
-from metagpt.provider.zhipuai.async_sse_client import AsyncSSEClient
 from metagpt.provider.general_api_requestor import GeneralAPIRequestor
+from metagpt.provider.zhipuai.async_sse_client import AsyncSSEClient
 
 
 class ZhiPuModelAPI(ModelAPI):
-
     @classmethod
     def get_header(cls) -> dict:
         token = cls._generate_token()
@@ -21,9 +20,7 @@ class ZhiPuModelAPI(ModelAPI):
     @classmethod
     def get_sse_header(cls) -> dict:
         token = cls._generate_token()
-        headers = {
-            "Authorization": token
-        }
+        headers = {"Authorization": token}
         return headers
 
     @classmethod
@@ -52,28 +49,24 @@ class ZhiPuModelAPI(ModelAPI):
             headers=headers,
             stream=stream,
             params=kwargs,
-            request_timeout=zhipuai.api_timeout_seconds
+            request_timeout=zhipuai.api_timeout_seconds,
         )
 
         return result
 
     @classmethod
     async def ainvoke(cls, **kwargs) -> dict:
-        """ async invoke different from raw method `async_invoke` which get the final result by task_id"""
+        """async invoke different from raw method `async_invoke` which get the final result by task_id"""
         headers = cls.get_header()
-        resp = await cls.arequest(invoke_type=InvokeType.SYNC,
-                                  stream=False,
-                                  method="post",
-                                  headers=headers,
-                                  kwargs=kwargs)
+        resp = await cls.arequest(
+            invoke_type=InvokeType.SYNC, stream=False, method="post", headers=headers, kwargs=kwargs
+        )
         return resp
 
     @classmethod
     async def asse_invoke(cls, **kwargs) -> AsyncSSEClient:
-        """ async sse_invoke """
+        """async sse_invoke"""
         headers = cls.get_sse_header()
-        return AsyncSSEClient(await cls.arequest(invoke_type=InvokeType.SSE,
-                                                 stream=True,
-                                                 method="post",
-                                                 headers=headers,
-                                                 kwargs=kwargs))
+        return AsyncSSEClient(
+            await cls.arequest(invoke_type=InvokeType.SSE, stream=True, method="post", headers=headers, kwargs=kwargs)
+        )

metagpt/provider/zhipuai_api.py

@@ -2,19 +2,19 @@
 # -*- coding: utf-8 -*-
 # @Desc   : zhipuai LLM from https://open.bigmodel.cn/dev/api#sdk
 
-from enum import Enum
 import json
+from enum import Enum
+
+import openai
+import zhipuai
+from requests import ConnectionError
 from tenacity import (
     after_log,
     retry,
     retry_if_exception_type,
     stop_after_attempt,
-    wait_fixed,
+    wait_random_exponential,
 )
-from requests import ConnectionError
-
-import openai
-import zhipuai
 
 from metagpt.config import CONFIG
 from metagpt.logs import logger
@@ -50,15 +50,11 @@ class ZhiPuAIGPTAPI(BaseGPTAPI):
         openai.api_key = zhipuai.api_key  # due to use openai sdk, set the api_key but it will't be used.
 
     def _const_kwargs(self, messages: list[dict]) -> dict:
-        kwargs = {
-            "model": self.model,
-            "prompt": messages,
-            "temperature": 0.3
-        }
+        kwargs = {"model": self.model, "prompt": messages, "temperature": 0.3}
         return kwargs
 
     def _update_costs(self, usage: dict):
-        """ update each request's token cost """
+        """update each request's token cost"""
         if CONFIG.calc_usage:
             try:
                 prompt_tokens = int(usage.get("prompt_tokens", 0))
@@ -68,7 +64,7 @@ class ZhiPuAIGPTAPI(BaseGPTAPI):
                 logger.error("zhipuai updats costs failed!", e)
 
     def get_choice_text(self, resp: dict) -> str:
-        """ get the first text of choice from llm response """
+        """get the first text of choice from llm response"""
         assist_msg = resp.get("data", {}).get("choices", [{"role": "error"}])[-1]
         assert assist_msg["role"] == "assistant"
         return assist_msg.get("content")
@@ -126,13 +122,13 @@ class ZhiPuAIGPTAPI(BaseGPTAPI):
 
     @retry(
         stop=stop_after_attempt(3),
-        wait=wait_fixed(1),
+        wait=wait_random_exponential(min=1, max=60),
         after=after_log(logger, logger.level("WARNING").name),
         retry=retry_if_exception_type(ConnectionError),
-        retry_error_callback=log_and_reraise
+        retry_error_callback=log_and_reraise,
     )
     async def acompletion_text(self, messages: list[dict], stream=False) -> str:
-        """ response in async with stream or non-stream mode """
+        """response in async with stream or non-stream mode"""
         if stream:
             return await self._achat_completion_stream(messages)
         resp = await self._achat_completion(messages)

metagpt/repo_parser.py

@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+@Time    : 2023/11/17 17:58
+@Author  : alexanderwu
+@File    : repo_parser.py
+"""
+import ast
+import json
+from pathlib import Path
+from pprint import pformat
+
+import pandas as pd
+from pydantic import BaseModel, Field
+
+from metagpt.config import CONFIG
+from metagpt.logs import logger
+
+
+class RepoParser(BaseModel):
+    base_directory: Path = Field(default=None)
+
+    def parse_file(self, file_path):
+        """Parse a Python file in the repository."""
+        try:
+            return ast.parse(file_path.read_text()).body
+        except:
+            return []
+
+    def extract_class_and_function_info(self, tree, file_path):
+        """Extract class, function, and global variable information from the AST."""
+        file_info = {
+            "file": str(file_path.relative_to(self.base_directory)),
+            "classes": [],
+            "functions": [],
+            "globals": [],
+        }
+
+        for node in tree:
+            if isinstance(node, ast.ClassDef):
+                class_methods = [m.name for m in node.body if is_func(m)]
+                file_info["classes"].append({"name": node.name, "methods": class_methods})
+            elif is_func(node):
+                file_info["functions"].append(node.name)
+            elif isinstance(node, (ast.Assign, ast.AnnAssign)):
+                for target in node.targets if isinstance(node, ast.Assign) else [node.target]:
+                    if isinstance(target, ast.Name):
+                        file_info["globals"].append(target.id)
+        return file_info
+
+    def generate_symbols(self):
+        files_classes = []
+        directory = self.base_directory
+        for path in directory.rglob("*.py"):
+            tree = self.parse_file(path)
+            file_info = self.extract_class_and_function_info(tree, path)
+            files_classes.append(file_info)
+
+        return files_classes
+
+    def generate_json_structure(self, output_path):
+        """Generate a JSON file documenting the repository structure."""
+        files_classes = self.generate_symbols()
+        output_path.write_text(json.dumps(files_classes, indent=4))
+
+    def generate_dataframe_structure(self, output_path):
+        """Generate a DataFrame documenting the repository structure and save as CSV."""
+        files_classes = self.generate_symbols()
+        df = pd.DataFrame(files_classes)
+        df.to_csv(output_path, index=False)
+
+    def generate_structure(self, output_path=None, mode="json"):
+        """Generate the structure of the repository as a specified format."""
+        output_file = self.base_directory / f"{self.base_directory.name}-structure.{mode}"
+        output_path = Path(output_path) if output_path else output_file
+
+        if mode == "json":
+            self.generate_json_structure(output_path)
+        elif mode == "csv":
+            self.generate_dataframe_structure(output_path)
+
+
+def is_func(node):
+    return isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef))
+
+
+def main():
+    repo_parser = RepoParser(base_directory=CONFIG.workspace_path / "web_2048")
+    symbols = repo_parser.generate_symbols()
+    logger.info(pformat(symbols))
+
+
+if __name__ == "__main__":
+    main()

metagpt/roles/architect.py

@@ -26,8 +26,9 @@ class Architect(Role):
         self,
         name: str = "Bob",
         profile: str = "Architect",
-        goal: str = "Design a concise, usable, complete python system",
-        constraints: str = "Try to specify good open source tools as much as possible",
+        goal: str = "design a concise, usable, complete software system",
+        constraints: str = "make sure the architecture is simple enough and use appropriate open source libraries."
+                           "Use same language as user requirement"
     ) -> None:
         """Initializes the Architect with given attributes."""
         super().__init__(name, profile, goal, constraints)

metagpt/roles/customer_service.py

@@ -24,12 +24,5 @@ DESC = """
 
 
 class CustomerService(Sales):
-    def __init__(
-            self,
-            name="Xiaomei",
-            profile="Human customer service",
-            desc=DESC,
-            store=None
-    ):
+    def __init__(self, name="Xiaomei", profile="Human customer service", desc=DESC, store=None):
         super().__init__(name, profile, desc=desc, store=store)
-        

metagpt/roles/engineer.py

@@ -4,46 +4,54 @@
 @Time    : 2023/5/11 14:43
 @Author  : alexanderwu
 @File    : engineer.py
+@Modified By: mashenquan, 2023-11-1. In accordance with Chapter 2.2.1 and 2.2.2 of RFC 116:
+    1. Modify the data type of the `cause_by` value in the `Message` to a string, and utilize the new message
+        distribution feature for message filtering.
+    2. Consolidate message reception and processing logic within `_observe`.
+    3. Fix bug: Add logic for handling asynchronous message processing when messages are not ready.
+    4. Supplemented the external transmission of internal messages.
+@Modified By: mashenquan, 2023-11-27.
+    1. According to Section 2.2.3.1 of RFC 135, replace file data in the message with the file name.
+    2. According to the design in Section 2.2.3.5.5 of RFC 135, add incremental iteration functionality.
+@Modified By: mashenquan, 2023-12-5. Enhance the workflow to navigate to WriteCode or QaEngineer based on the results
+    of SummarizeCode.
 """
-import asyncio
-import shutil
-from collections import OrderedDict
-from pathlib import Path
+from __future__ import annotations
 
-from metagpt.actions import WriteCode, WriteCodeReview, WriteDesign, WriteTasks
-from metagpt.const import WORKSPACE_ROOT
+import json
+from collections import defaultdict
+from pathlib import Path
+from typing import Set
+
+from metagpt.actions import Action, WriteCode, WriteCodeReview, WriteTasks
+from metagpt.actions.fix_bug import FixBug
+from metagpt.actions.summarize_code import SummarizeCode
+from metagpt.config import CONFIG
+from metagpt.const import (
+    CODE_SUMMARIES_FILE_REPO,
+    CODE_SUMMARIES_PDF_FILE_REPO,
+    SYSTEM_DESIGN_FILE_REPO,
+    TASK_FILE_REPO,
+)
 from metagpt.logs import logger
 from metagpt.roles import Role
-from metagpt.schema import Message
-from metagpt.utils.common import CodeParser
-from metagpt.utils.special_tokens import FILENAME_CODE_SEP, MSG_SEP
+from metagpt.schema import (
+    CodeSummarizeContext,
+    CodingContext,
+    Document,
+    Documents,
+    Message,
+)
+from metagpt.utils.common import any_to_str, any_to_str_set
 
+IS_PASS_PROMPT = """
+{context}
 
-async def gather_ordered_k(coros, k) -> list:
-    tasks = OrderedDict()
-    results = [None] * len(coros)
-    done_queue = asyncio.Queue()
-
-    for i, coro in enumerate(coros):
-        if len(tasks) >= k:
-            done, _ = await asyncio.wait(tasks.keys(), return_when=asyncio.FIRST_COMPLETED)
-            for task in done:
-                index = tasks.pop(task)
-                await done_queue.put((index, task.result()))
-        task = asyncio.create_task(coro)
-        tasks[task] = i
-
-    if tasks:
-        done, _ = await asyncio.wait(tasks.keys())
-        for task in done:
-            index = tasks[task]
-            await done_queue.put((index, task.result()))
-
-    while not done_queue.empty():
-        index, result = await done_queue.get()
-        results[index] = result
-
-    return results
+----
+Does the above log indicate anything that needs to be done?
+If there are any tasks to be completed, please answer 'NO' along with the to-do list in JSON format;
+otherwise, answer 'YES' in JSON format.
+"""
 
 
 class Engineer(Role):
@@ -57,119 +65,36 @@ class Engineer(Role):
         constraints (str): Constraints for the engineer.
         n_borg (int): Number of borgs.
         use_code_review (bool): Whether to use code review.
-        todos (list): List of tasks.
     """
 
     def __init__(
         self,
         name: str = "Alex",
         profile: str = "Engineer",
-        goal: str = "Write elegant, readable, extensible, efficient code",
-        constraints: str = "The code should conform to standards like PEP8 and be modular and maintainable",
+        goal: str = "write elegant, readable, extensible, efficient code",
+        constraints: str = "the code should conform to standards like google-style and be modular and maintainable. "
+                           "Use same language as user requirement",
         n_borg: int = 1,
         use_code_review: bool = False,
     ) -> None:
         """Initializes the Engineer role with given attributes."""
         super().__init__(name, profile, goal, constraints)
-        self._init_actions([WriteCode])
         self.use_code_review = use_code_review
-        if self.use_code_review:
-            self._init_actions([WriteCode, WriteCodeReview])
-        self._watch([WriteTasks])
-        self.todos = []
+        self._init_actions([WriteCode])
+        self._watch([WriteTasks, SummarizeCode, WriteCode, WriteCodeReview, FixBug])
+        self.code_todos = []
+        self.summarize_todos = []
         self.n_borg = n_borg
 
-    @classmethod
-    def parse_tasks(self, task_msg: Message) -> list[str]:
-        if task_msg.instruct_content:
-            return task_msg.instruct_content.dict().get("Task list")
-        return CodeParser.parse_file_list(block="Task list", text=task_msg.content)
+    @staticmethod
+    def _parse_tasks(task_msg: Document) -> list[str]:
+        m = json.loads(task_msg.content)
+        return m.get("Task list")
 
-    @classmethod
-    def parse_code(self, code_text: str) -> str:
-        return CodeParser.parse_code(block="", text=code_text)
-
-    @classmethod
-    def parse_workspace(cls, system_design_msg: Message) -> str:
-        if system_design_msg.instruct_content:
-            return system_design_msg.instruct_content.dict().get("Python package name").strip().strip("'").strip('"')
-        return CodeParser.parse_str(block="Python package name", text=system_design_msg.content)
-
-    def get_workspace(self) -> Path:
-        msg = self._rc.memory.get_by_action(WriteDesign)[-1]
-        if not msg:
-            return WORKSPACE_ROOT / "src"
-        workspace = self.parse_workspace(msg)
-        # Codes are written in workspace/{package_name}/{package_name}
-        return WORKSPACE_ROOT / workspace / workspace
-
-    def recreate_workspace(self):
-        workspace = self.get_workspace()
-        try:
-            shutil.rmtree(workspace)
-        except FileNotFoundError:
-            pass  # The folder does not exist, but we don't care
-        workspace.mkdir(parents=True, exist_ok=True)
-
-    def write_file(self, filename: str, code: str):
-        workspace = self.get_workspace()
-        filename = filename.replace('"', "").replace("\n", "")
-        file = workspace / filename
-        file.parent.mkdir(parents=True, exist_ok=True)
-        file.write_text(code)
-        return file
-
-    def recv(self, message: Message) -> None:
-        self._rc.memory.add(message)
-        if message in self._rc.important_memory:
-            self.todos = self.parse_tasks(message)
-
-    async def _act_mp(self) -> Message:
-        # self.recreate_workspace()
-        todo_coros = []
-        for todo in self.todos:
-            todo_coro = WriteCode().run(
-                context=self._rc.memory.get_by_actions([WriteTasks, WriteDesign]), filename=todo
-            )
-            todo_coros.append(todo_coro)
-
-        rsps = await gather_ordered_k(todo_coros, self.n_borg)
-        for todo, code_rsp in zip(self.todos, rsps):
-            _ = self.parse_code(code_rsp)
-            logger.info(todo)
-            logger.info(code_rsp)
-            # self.write_file(todo, code)
-            msg = Message(content=code_rsp, role=self.profile, cause_by=type(self._rc.todo))
-            self._rc.memory.add(msg)
-            del self.todos[0]
-
-        logger.info(f"Done {self.get_workspace()} generating.")
-        msg = Message(content="all done.", role=self.profile, cause_by=type(self._rc.todo))
-        return msg
-
-    async def _act_sp(self) -> Message:
-        code_msg_all = []  # gather all code info, will pass to qa_engineer for tests later
-        for todo in self.todos:
-            code = await WriteCode().run(context=self._rc.history, filename=todo)
-            # logger.info(todo)
-            # logger.info(code_rsp)
-            # code = self.parse_code(code_rsp)
-            file_path = self.write_file(todo, code)
-            msg = Message(content=code, role=self.profile, cause_by=type(self._rc.todo))
-            self._rc.memory.add(msg)
-
-            code_msg = todo + FILENAME_CODE_SEP + str(file_path)
-            code_msg_all.append(code_msg)
-
-        logger.info(f"Done {self.get_workspace()} generating.")
-        msg = Message(
-            content=MSG_SEP.join(code_msg_all), role=self.profile, cause_by=type(self._rc.todo), send_to="QaEngineer"
-        )
-        return msg
-
-    async def _act_sp_precision(self) -> Message:
-        code_msg_all = []  # gather all code info, will pass to qa_engineer for tests later
-        for todo in self.todos:
+    async def _act_sp_with_cr(self, review=False) -> Set[str]:
+        changed_files = set()
+        src_file_repo = CONFIG.git_repo.new_file_repository(CONFIG.src_workspace)
+        for todo in self.code_todos:
             """
             # Select essential information from the historical data to reduce the length of the prompt (summarized from human experience):
             1. All from Architect
@@ -177,37 +102,202 @@ class Engineer(Role):
             3. Do we need other codes (currently needed)?
             TODO: The goal is not to need it. After clear task decomposition, based on the design idea, you should be able to write a single file without needing other codes. If you can't, it means you need a clearer definition. This is the key to writing longer code.
             """
-            context = []
-            msg = self._rc.memory.get_by_actions([WriteDesign, WriteTasks, WriteCode])
-            for m in msg:
-                context.append(m.content)
-            context_str = "\n".join(context)
-            # Write code
-            code = await WriteCode().run(context=context_str, filename=todo)
+            coding_context = await todo.run()
             # Code review
-            if self.use_code_review:
-                try:
-                    rewrite_code = await WriteCodeReview().run(context=context_str, code=code, filename=todo)
-                    code = rewrite_code
-                except Exception as e:
-                    logger.error("code review failed!", e)
-                    pass
-            file_path = self.write_file(todo, code)
-            msg = Message(content=code, role=self.profile, cause_by=WriteCode)
+            if review:
+                action = WriteCodeReview(context=coding_context, llm=self._llm)
+                self._init_action_system_message(action)
+                coding_context = await action.run()
+            await src_file_repo.save(
+                coding_context.filename,
+                dependencies={coding_context.design_doc.root_relative_path, coding_context.task_doc.root_relative_path},
+                content=coding_context.code_doc.content,
+            )
+            msg = Message(
+                content=coding_context.json(), instruct_content=coding_context, role=self.profile, cause_by=WriteCode
+            )
             self._rc.memory.add(msg)
 
-            code_msg = todo + FILENAME_CODE_SEP + str(file_path)
-            code_msg_all.append(code_msg)
+            changed_files.add(coding_context.code_doc.filename)
+        if not changed_files:
+            logger.info("Nothing has changed.")
+        return changed_files
 
-        logger.info(f"Done {self.get_workspace()} generating.")
-        msg = Message(
-            content=MSG_SEP.join(code_msg_all), role=self.profile, cause_by=type(self._rc.todo), send_to="QaEngineer"
-        )
-        return msg
-
-    async def _act(self) -> Message:
+    async def _act(self) -> Message | None:
         """Determines the mode of action based on whether code review is used."""
-        logger.info(f"{self._setting}: ready to WriteCode")
-        if self.use_code_review:
-            return await self._act_sp_precision()
-        return await self._act_sp()
+        if self._rc.todo is None:
+            return None
+        if isinstance(self._rc.todo, WriteCode):
+            return await self._act_write_code()
+        if isinstance(self._rc.todo, SummarizeCode):
+            return await self._act_summarize()
+        return None
+
+    async def _act_write_code(self):
+        changed_files = await self._act_sp_with_cr(review=self.use_code_review)
+        return Message(
+            content="\n".join(changed_files),
+            role=self.profile,
+            cause_by=WriteCodeReview if self.use_code_review else WriteCode,
+            send_to=self,
+            sent_from=self,
+        )
+
+    async def _act_summarize(self):
+        code_summaries_file_repo = CONFIG.git_repo.new_file_repository(CODE_SUMMARIES_FILE_REPO)
+        code_summaries_pdf_file_repo = CONFIG.git_repo.new_file_repository(CODE_SUMMARIES_PDF_FILE_REPO)
+        tasks = []
+        src_relative_path = CONFIG.src_workspace.relative_to(CONFIG.git_repo.workdir)
+        for todo in self.summarize_todos:
+            summary = await todo.run()
+            summary_filename = Path(todo.context.design_filename).with_suffix(".md").name
+            dependencies = {todo.context.design_filename, todo.context.task_filename}
+            for filename in todo.context.codes_filenames:
+                rpath = src_relative_path / filename
+                dependencies.add(str(rpath))
+            await code_summaries_pdf_file_repo.save(
+                filename=summary_filename, content=summary, dependencies=dependencies
+            )
+            is_pass, reason = await self._is_pass(summary)
+            if not is_pass:
+                todo.context.reason = reason
+                tasks.append(todo.context.dict())
+                await code_summaries_file_repo.save(
+                    filename=Path(todo.context.design_filename).name,
+                    content=todo.context.json(),
+                    dependencies=dependencies,
+                )
+            else:
+                await code_summaries_file_repo.delete(filename=Path(todo.context.design_filename).name)
+
+        logger.info(f"--max-auto-summarize-code={CONFIG.max_auto_summarize_code}")
+        if not tasks or CONFIG.max_auto_summarize_code == 0:
+            return Message(
+                content="",
+                role=self.profile,
+                cause_by=SummarizeCode,
+                sent_from=self,
+                send_to="Edward",  # The name of QaEngineer
+            )
+        # The maximum number of times the 'SummarizeCode' action is automatically invoked, with -1 indicating unlimited.
+        # This parameter is used for debugging the workflow.
+        CONFIG.max_auto_summarize_code -= 1 if CONFIG.max_auto_summarize_code > 0 else 0
+        return Message(
+            content=json.dumps(tasks), role=self.profile, cause_by=SummarizeCode, send_to=self, sent_from=self
+        )
+
+    async def _is_pass(self, summary) -> (str, str):
+        rsp = await self._llm.aask(msg=IS_PASS_PROMPT.format(context=summary), stream=False)
+        logger.info(rsp)
+        if "YES" in rsp:
+            return True, rsp
+        return False, rsp
+
+    async def _think(self) -> Action | None:
+        if not CONFIG.src_workspace:
+            CONFIG.src_workspace = CONFIG.git_repo.workdir / CONFIG.git_repo.workdir.name
+        write_code_filters = any_to_str_set([WriteTasks, SummarizeCode, FixBug])
+        summarize_code_filters = any_to_str_set([WriteCode, WriteCodeReview])
+        if not self._rc.news:
+            return None
+        msg = self._rc.news[0]
+        if msg.cause_by in write_code_filters:
+            logger.debug(f"TODO WriteCode:{msg.json()}")
+            await self._new_code_actions(bug_fix=msg.cause_by == any_to_str(FixBug))
+            return self._rc.todo
+        if msg.cause_by in summarize_code_filters and msg.sent_from == any_to_str(self):
+            logger.debug(f"TODO SummarizeCode:{msg.json()}")
+            await self._new_summarize_actions()
+            return self._rc.todo
+        return None
+
+    @staticmethod
+    async def _new_coding_context(
+        filename, src_file_repo, task_file_repo, design_file_repo, dependency
+    ) -> CodingContext:
+        old_code_doc = await src_file_repo.get(filename)
+        if not old_code_doc:
+            old_code_doc = Document(root_path=str(src_file_repo.root_path), filename=filename, content="")
+        dependencies = {Path(i) for i in await dependency.get(old_code_doc.root_relative_path)}
+        task_doc = None
+        design_doc = None
+        for i in dependencies:
+            if str(i.parent) == TASK_FILE_REPO:
+                task_doc = await task_file_repo.get(i.name)
+            elif str(i.parent) == SYSTEM_DESIGN_FILE_REPO:
+                design_doc = await design_file_repo.get(i.name)
+        # FIXME: design doc没有加载进来，是None
+        context = CodingContext(filename=filename, design_doc=design_doc, task_doc=task_doc, code_doc=old_code_doc)
+        return context
+
+    @staticmethod
+    async def _new_coding_doc(filename, src_file_repo, task_file_repo, design_file_repo, dependency):
+        context = await Engineer._new_coding_context(
+            filename, src_file_repo, task_file_repo, design_file_repo, dependency
+        )
+        coding_doc = Document(root_path=str(src_file_repo.root_path), filename=filename, content=context.json())
+        return coding_doc
+
+    async def _new_code_actions(self, bug_fix=False):
+        # Prepare file repos
+        src_file_repo = CONFIG.git_repo.new_file_repository(CONFIG.src_workspace)
+        changed_src_files = src_file_repo.all_files if bug_fix else src_file_repo.changed_files
+        task_file_repo = CONFIG.git_repo.new_file_repository(TASK_FILE_REPO)
+        changed_task_files = task_file_repo.changed_files
+        design_file_repo = CONFIG.git_repo.new_file_repository(SYSTEM_DESIGN_FILE_REPO)
+
+        changed_files = Documents()
+        # Recode caused by upstream changes.
+        for filename in changed_task_files:
+            design_doc = await design_file_repo.get(filename)
+            task_doc = await task_file_repo.get(filename)
+            task_list = self._parse_tasks(task_doc)
+            for task_filename in task_list:
+                old_code_doc = await src_file_repo.get(task_filename)
+                if not old_code_doc:
+                    old_code_doc = Document(root_path=str(src_file_repo.root_path), filename=task_filename, content="")
+                context = CodingContext(
+                    filename=task_filename, design_doc=design_doc, task_doc=task_doc, code_doc=old_code_doc
+                )
+                coding_doc = Document(
+                    root_path=str(src_file_repo.root_path), filename=task_filename, content=context.json()
+                )
+                if task_filename in changed_files.docs:
+                    logger.warning(
+                        f"Log to expose potential conflicts: {coding_doc.json()} & "
+                        f"{changed_files.docs[task_filename].json()}"
+                    )
+                changed_files.docs[task_filename] = coding_doc
+        self.code_todos = [WriteCode(context=i, llm=self._llm) for i in changed_files.docs.values()]
+        # Code directly modified by the user.
+        dependency = await CONFIG.git_repo.get_dependency()
+        for filename in changed_src_files:
+            if filename in changed_files.docs:
+                continue
+            coding_doc = await self._new_coding_doc(
+                filename=filename,
+                src_file_repo=src_file_repo,
+                task_file_repo=task_file_repo,
+                design_file_repo=design_file_repo,
+                dependency=dependency,
+            )
+            changed_files.docs[filename] = coding_doc
+            self.code_todos.append(WriteCode(context=coding_doc, llm=self._llm))
+
+        if self.code_todos:
+            self._rc.todo = self.code_todos[0]
+
+    async def _new_summarize_actions(self):
+        src_file_repo = CONFIG.git_repo.new_file_repository(CONFIG.src_workspace)
+        src_files = src_file_repo.all_files
+        # Generate a SummarizeCode action for each pair of (system_design_doc, task_doc).
+        summarizations = defaultdict(list)
+        for filename in src_files:
+            dependencies = await src_file_repo.get_dependency(filename=filename)
+            ctx = CodeSummarizeContext.loads(filenames=dependencies)
+            summarizations[ctx].append(filename)
+        for ctx, filenames in summarizations.items():
+            ctx.codes_filenames = filenames
+            self.summarize_todos.append(SummarizeCode(context=ctx, llm=self._llm))
+        if self.summarize_todos:
+            self._rc.todo = self.summarize_todos[0]

metagpt/roles/invoice_ocr_assistant.py

@@ -9,7 +9,7 @@
 
 import pandas as pd
 
-from metagpt.actions.invoice_ocr import InvoiceOCR, GenerateTable, ReplyQuestion
+from metagpt.actions.invoice_ocr import GenerateTable, InvoiceOCR, ReplyQuestion
 from metagpt.prompts.invoice_ocr import INVOICE_OCR_SUCCESS
 from metagpt.roles import Role
 from metagpt.schema import Message

metagpt/roles/product_manager.py

@@ -4,8 +4,12 @@
 @Time    : 2023/5/11 14:43
 @Author  : alexanderwu
 @File    : product_manager.py
+@Modified By: mashenquan, 2023/11/27. Add `PrepareDocuments` action according to Section 2.2.3.5.1 of RFC 135.
 """
-from metagpt.actions import BossRequirement, WritePRD
+
+from metagpt.actions import UserRequirement, WritePRD
+from metagpt.actions.prepare_documents import PrepareDocuments
+from metagpt.config import CONFIG
 from metagpt.roles import Role
 
 
@@ -24,8 +28,8 @@ class ProductManager(Role):
         self,
         name: str = "Alice",
         profile: str = "Product Manager",
-        goal: str = "Efficiently create a successful product",
-        constraints: str = "",
+        goal: str = "efficiently create a successful product",
+        constraints: str = "use same language as user requirement",
     ) -> None:
         """
         Initializes the ProductManager role with given attributes.
@@ -37,5 +41,17 @@ class ProductManager(Role):
             constraints (str): Constraints or limitations for the product manager.
         """
         super().__init__(name, profile, goal, constraints)
-        self._init_actions([WritePRD])
-        self._watch([BossRequirement])
+
+        self._init_actions([PrepareDocuments, WritePRD])
+        self._watch([UserRequirement, PrepareDocuments])
+
+    async def _think(self) -> None:
+        """Decide what to do"""
+        if CONFIG.git_repo:
+            self._set_state(1)
+        else:
+            self._set_state(0)
+        return self._rc.todo
+
+    async def _observe(self, ignore_memory=False) -> int:
+        return await super(ProductManager, self)._observe(ignore_memory=True)

metagpt/roles/project_manager.py

@@ -25,8 +25,9 @@ class ProjectManager(Role):
         self,
         name: str = "Eve",
         profile: str = "Project Manager",
-        goal: str = "Improve team efficiency and deliver with quality and quantity",
-        constraints: str = "",
+        goal: str = "break down tasks according to PRD/technical design, generate a task list, and analyze task "
+            "dependencies to start with the prerequisite modules",
+        constraints: str = "use same language as user requirement",
     ) -> None:
         """
         Initializes the ProjectManager role with given attributes.

metagpt/roles/prompt.py

@@ -23,6 +23,7 @@ SUFFIX = """Let's begin!
 Question: {input}
 Thoughts: {agent_scratchpad}"""
 
+
 class PromptString(Enum):
     REFLECTION_QUESTIONS = "Here are some statements:\n{memory_descriptions}\n\nBased solely on the information above, what are the 3 most prominent high-level questions we can answer about the topic in the statements?\n\n{format_instructions}"
 
@@ -32,7 +33,7 @@ class PromptString(Enum):
 
     RECENT_ACTIVITY = "Based on the following memory, produce a brief summary of what {full_name} has been up to recently. Do not invent details not explicitly stated in the memory. For any conversation, be sure to mention whether the conversation has concluded or is still ongoing.\n\nMemory: {memory_descriptions}"
 
-    MAKE_PLANS = "You are a plan-generating AI. Your job is to assist the character in formulating new plans based on new information. Given the character's information (profile, objectives, recent activities, current plans, and location context) and their current thought process, produce a new set of plans for them. The final plan should comprise at least {time_window} of activities and no more than 5 individual plans. List the plans in the order they should be executed, with each plan detailing its description, location, start time, stop criteria, and maximum duration.\n\nSample plan: {{\"index\": 1, \"description\": \"Cook dinner\", \"location_id\": \"0a3bc22b-36aa-48ab-adb0-18616004caed\",\"start_time\": \"2022-12-12T20:00:00+00:00\",\"max_duration_hrs\": 1.5, \"stop_condition\": \"Dinner is fully prepared\"}}\'\n\nFor each plan, choose the most appropriate location name from this list: {allowed_location_descriptions}\n\n{format_instructions}\n\nAlways prioritize completing any unfinished conversations.\n\nLet's begin!\n\nName: {full_name}\nProfile: {private_bio}\nObjectives: {directives}\nLocation Context: {location_context}\nCurrent Plans: {current_plans}\nRecent Activities: {recent_activity}\nThought Process: {thought_process}\nIt's essential to encourage the character to collaborate with other characters in their plans.\n\n"
+    MAKE_PLANS = 'You are a plan-generating AI. Your job is to assist the character in formulating new plans based on new information. Given the character\'s information (profile, objectives, recent activities, current plans, and location context) and their current thought process, produce a new set of plans for them. The final plan should comprise at least {time_window} of activities and no more than 5 individual plans. List the plans in the order they should be executed, with each plan detailing its description, location, start time, stop criteria, and maximum duration.\n\nSample plan: {{"index": 1, "description": "Cook dinner", "location_id": "0a3bc22b-36aa-48ab-adb0-18616004caed","start_time": "2022-12-12T20:00:00+00:00","max_duration_hrs": 1.5, "stop_condition": "Dinner is fully prepared"}}\'\n\nFor each plan, choose the most appropriate location name from this list: {allowed_location_descriptions}\n\n{format_instructions}\n\nAlways prioritize completing any unfinished conversations.\n\nLet\'s begin!\n\nName: {full_name}\nProfile: {private_bio}\nObjectives: {directives}\nLocation Context: {location_context}\nCurrent Plans: {current_plans}\nRecent Activities: {recent_activity}\nThought Process: {thought_process}\nIt\'s essential to encourage the character to collaborate with other characters in their plans.\n\n'
 
     EXECUTE_PLAN = "You are a role-playing AI, playing the role of {your_name}, in front of a live audience. Every word you say can be observed by the audience, so make sure you speak often and make it interesting. You cannot interact directly with the audience.\n\nBased on the following context and tools, proceed as if you are {your_name}. Your primary task is to complete the task given below, however, if you are currently in a conversation with another character, you should always complete the conversation first and then proceed with the task. Do not start working while you are engaged in an unfinished conversation. Use your best judgment to determine whether a conversation involves you and whether it is unfinished. You don't need to respond to every message you receive.\n\nThis is a personal profile of your character:\n{your_private_bio}\n\nThis is a description of your location and other nearby characters you can converse with:\n\n{location_context}\n\nThese are some relevant memories:\n```\n{relevant_memories}\n```\n\nThis is some relevant conversation history:\n```\n{conversation_history}\n```\n\nThese are the tools you can use:\n{tools}\n\nYour response should follow the format below:\n\nTask: The task you must complete\nThoughts: What you should think about doing\nAction: The action to take, must be one of these words: [{tool_names}]\nAction Input: Input for the action\nObservation: The result of the action\n... (This Thoughts/Action/Action Input/Observation can be repeated N times)\nThoughts: 'I have completed the task'\nFinal Response: The final response to the task\n\nIf you are not ready with a final response, then you must take an action.\n\nIf you are certain that you cannot complete the task with the tools provided, return 'Final Response: Need Help', however, if you are in conversation with another character, responses like 'I don't know' are valid. During conversations, you should never break character or admit you are an AI.\nIf the task is completed and no specific response is required, return 'Final Response: Done'\nLet's begin!\n\nTask: {input}\n\n{agent_scratchpad}"
 
@@ -40,6 +41,6 @@ class PromptString(Enum):
 
     GOSSIP = "You are {full_name}. \n{memory_descriptions}\n\nBased on the statements above, say a thing or two of interest to others at your location: {other_agent_names}.\nAlways specify their names when referring to others."
 
-    HAS_HAPPENED = "Given the descriptions of the observations of the following characters and the events they are awaiting, indicate whether the character has witnessed the event.\n{format_instructions}\n\nExample:\n\nObservations:\nJoe entered the office at 2023-05-04 08:00:00+00:00\nJoe said hi to Sally at 2023-05-04 08:05:00+00:00\nSally said hello to Joe at 2023-05-04 08:05:30+00:00\nRebecca started working at 2023-05-04 08:10:00+00:00\nJoe made some breakfast at 2023-05-04 08:15:00+00:00\n\nAwaiting: Sally responded to Joe\n\nYour response: '{{\"has_happened\": true, \"date_occured\": 2023-05-04 08:05:30+00:00}}'\n\nLet's begin!\n\nObservations:\n{memory_descriptions}\n\nAwaiting: {event_description}\n"
+    HAS_HAPPENED = 'Given the descriptions of the observations of the following characters and the events they are awaiting, indicate whether the character has witnessed the event.\n{format_instructions}\n\nExample:\n\nObservations:\nJoe entered the office at 2023-05-04 08:00:00+00:00\nJoe said hi to Sally at 2023-05-04 08:05:00+00:00\nSally said hello to Joe at 2023-05-04 08:05:30+00:00\nRebecca started working at 2023-05-04 08:10:00+00:00\nJoe made some breakfast at 2023-05-04 08:15:00+00:00\n\nAwaiting: Sally responded to Joe\n\nYour response: \'{{"has_happened": true, "date_occured": 2023-05-04 08:05:30+00:00}}\'\n\nLet\'s begin!\n\nObservations:\n{memory_descriptions}\n\nAwaiting: {event_description}\n'
 
     OUTPUT_FORMAT = "\n\n(Remember! Make sure your output always adheres to one of the following two formats:\n\nA. If you have completed the task:\nThoughts: 'I have completed the task'\nFinal Response: <str>\n\nB. If you haven't completed the task:\nThoughts: <str>\nAction: <str>\nAction Input: <str>\nObservation: <str>)\n"

metagpt/roles/qa_engineer.py

@@ -4,24 +4,29 @@
 @Time    : 2023/5/11 14:43
 @Author  : alexanderwu
 @File    : qa_engineer.py
+@Modified By: mashenquan, 2023-11-1. In accordance with Chapter 2.2.1 and 2.2.2 of RFC 116, modify the data
+        type of the `cause_by` value in the `Message` to a string, and utilize the new message filtering feature.
+@Modified By: mashenquan, 2023-11-27.
+        1. Following the think-act principle, solidify the task parameters when creating the
+        WriteTest/RunCode/DebugError object, rather than passing them in when calling the run function.
+        2. According to Section 2.2.3.5.7 of RFC 135, change the method of transferring files from using the Message
+        to using file references.
+@Modified By: mashenquan, 2023-12-5. Enhance the workflow to navigate to WriteCode or QaEngineer based on the results
+    of SummarizeCode.
 """
-import os
-from pathlib import Path
-
-from metagpt.actions import (
-    DebugError,
-    RunCode,
-    WriteCode,
-    WriteCodeReview,
-    WriteDesign,
-    WriteTest,
+from metagpt.actions import DebugError, RunCode, WriteTest
+from metagpt.actions.summarize_code import SummarizeCode
+from metagpt.config import CONFIG
+from metagpt.const import (
+    MESSAGE_ROUTE_TO_NONE,
+    TEST_CODES_FILE_REPO,
+    TEST_OUTPUTS_FILE_REPO,
 )
-from metagpt.const import WORKSPACE_ROOT
 from metagpt.logs import logger
 from metagpt.roles import Role
-from metagpt.schema import Message
-from metagpt.utils.common import CodeParser, parse_recipient
-from metagpt.utils.special_tokens import FILENAME_CODE_SEP, MSG_SEP
+from metagpt.schema import Document, Message, RunCodeContext, TestingContext
+from metagpt.utils.common import any_to_str_set, parse_recipient
+from metagpt.utils.file_repository import FileRepository
 
 
 class QaEngineer(Role):
@@ -37,120 +42,103 @@ class QaEngineer(Role):
         self._init_actions(
             [WriteTest]
         )  # FIXME: a bit hack here, only init one action to circumvent _think() logic, will overwrite _think() in future updates
-        self._watch([WriteCode, WriteCodeReview, WriteTest, RunCode, DebugError])
+        self._watch([SummarizeCode, WriteTest, RunCode, DebugError])
         self.test_round = 0
         self.test_round_allowed = test_round_allowed
 
-    @classmethod
-    def parse_workspace(cls, system_design_msg: Message) -> str:
-        if system_design_msg.instruct_content:
-            return system_design_msg.instruct_content.dict().get("Python package name")
-        return CodeParser.parse_str(block="Python package name", text=system_design_msg.content)
-
-    def get_workspace(self, return_proj_dir=True) -> Path:
-        msg = self._rc.memory.get_by_action(WriteDesign)[-1]
-        if not msg:
-            return WORKSPACE_ROOT / "src"
-        workspace = self.parse_workspace(msg)
-        # project directory: workspace/{package_name}, which contains package source code folder, tests folder, resources folder, etc.
-        if return_proj_dir:
-            return WORKSPACE_ROOT / workspace
-        # development codes directory: workspace/{package_name}/{package_name}
-        return WORKSPACE_ROOT / workspace / workspace
-
-    def write_file(self, filename: str, code: str):
-        workspace = self.get_workspace() / "tests"
-        file = workspace / filename
-        file.parent.mkdir(parents=True, exist_ok=True)
-        file.write_text(code)
-
     async def _write_test(self, message: Message) -> None:
-        code_msgs = message.content.split(MSG_SEP)
-        # result_msg_all = []
-        for code_msg in code_msgs:
+        src_file_repo = CONFIG.git_repo.new_file_repository(CONFIG.src_workspace)
+        changed_files = set(src_file_repo.changed_files.keys())
+        # Unit tests only.
+        if CONFIG.reqa_file and CONFIG.reqa_file not in changed_files:
+            changed_files.add(CONFIG.reqa_file)
+        tests_file_repo = CONFIG.git_repo.new_file_repository(TEST_CODES_FILE_REPO)
+        for filename in changed_files:
             # write tests
-            file_name, file_path = code_msg.split(FILENAME_CODE_SEP)
-            code_to_test = open(file_path, "r").read()
-            if "test" in file_name:
-                continue  # Engineer might write some test files, skip testing a test file
-            test_file_name = "test_" + file_name
-            test_file_path = self.get_workspace() / "tests" / test_file_name
-            logger.info(f"Writing {test_file_name}..")
-            test_code = await WriteTest().run(
-                code_to_test=code_to_test,
-                test_file_name=test_file_name,
-                # source_file_name=file_name,
-                source_file_path=file_path,
-                workspace=self.get_workspace(),
+            if not filename or "test" in filename:
+                continue
+            code_doc = await src_file_repo.get(filename)
+            test_doc = await tests_file_repo.get("test_" + code_doc.filename)
+            if not test_doc:
+                test_doc = Document(
+                    root_path=str(tests_file_repo.root_path), filename="test_" + code_doc.filename, content=""
+                )
+            logger.info(f"Writing {test_doc.filename}..")
+            context = TestingContext(filename=test_doc.filename, test_doc=test_doc, code_doc=code_doc)
+            context = await WriteTest(context=context, llm=self._llm).run()
+            await tests_file_repo.save(
+                filename=context.test_doc.filename,
+                content=context.test_doc.content,
+                dependencies={context.code_doc.root_relative_path},
             )
-            self.write_file(test_file_name, test_code)
 
             # prepare context for run tests in next round
-            command = ["python", f"tests/{test_file_name}"]
-            file_info = {
-                "file_name": file_name,
-                "file_path": str(file_path),
-                "test_file_name": test_file_name,
-                "test_file_path": str(test_file_path),
-                "command": command,
-            }
-            msg = Message(
-                content=str(file_info),
-                role=self.profile,
-                cause_by=WriteTest,
-                sent_from=self.profile,
-                send_to=self.profile,
+            run_code_context = RunCodeContext(
+                command=["python", context.test_doc.root_relative_path],
+                code_filename=context.code_doc.filename,
+                test_filename=context.test_doc.filename,
+                working_directory=str(CONFIG.git_repo.workdir),
+                additional_python_paths=[str(CONFIG.src_workspace)],
+            )
+            self.publish_message(
+                Message(
+                    content=run_code_context.json(),
+                    role=self.profile,
+                    cause_by=WriteTest,
+                    sent_from=self,
+                    send_to=self,
+                )
             )
-            self._publish_message(msg)
 
-        logger.info(f"Done {self.get_workspace()}/tests generating.")
+        logger.info(f"Done {str(tests_file_repo.workdir)} generating.")
 
     async def _run_code(self, msg):
-        file_info = eval(msg.content)
-        development_file_path = file_info["file_path"]
-        test_file_path = file_info["test_file_path"]
-        if not os.path.exists(development_file_path) or not os.path.exists(test_file_path):
+        run_code_context = RunCodeContext.loads(msg.content)
+        src_doc = await CONFIG.git_repo.new_file_repository(CONFIG.src_workspace).get(run_code_context.code_filename)
+        if not src_doc:
             return
-
-        development_code = open(development_file_path, "r").read()
-        test_code = open(test_file_path, "r").read()
-        proj_dir = self.get_workspace()
-        development_code_dir = self.get_workspace(return_proj_dir=False)
-
-        result_msg = await RunCode().run(
-            mode="script",
-            code=development_code,
-            code_file_name=file_info["file_name"],
-            test_code=test_code,
-            test_file_name=file_info["test_file_name"],
-            command=file_info["command"],
-            working_directory=proj_dir,  # workspace/package_name, will run tests/test_xxx.py here
-            additional_python_paths=[development_code_dir],  # workspace/package_name/package_name,
-            # import statement inside package code needs this
+        test_doc = await CONFIG.git_repo.new_file_repository(TEST_CODES_FILE_REPO).get(run_code_context.test_filename)
+        if not test_doc:
+            return
+        run_code_context.code = src_doc.content
+        run_code_context.test_code = test_doc.content
+        result = await RunCode(context=run_code_context, llm=self._llm).run()
+        run_code_context.output_filename = run_code_context.test_filename + ".json"
+        await CONFIG.git_repo.new_file_repository(TEST_OUTPUTS_FILE_REPO).save(
+            filename=run_code_context.output_filename,
+            content=result.json(),
+            dependencies={src_doc.root_relative_path, test_doc.root_relative_path},
+        )
+        run_code_context.code = None
+        run_code_context.test_code = None
+        recipient = parse_recipient(result.summary)  # the recipient might be Engineer or myself
+        mappings = {"Engineer": "Alex", "QaEngineer": "Edward"}
+        self.publish_message(
+            Message(
+                content=run_code_context.json(),
+                role=self.profile,
+                cause_by=RunCode,
+                sent_from=self,
+                send_to=mappings.get(recipient, MESSAGE_ROUTE_TO_NONE),
+            )
         )
 
-        recipient = parse_recipient(result_msg)  # the recipient might be Engineer or myself
-        content = str(file_info) + FILENAME_CODE_SEP + result_msg
-        msg = Message(content=content, role=self.profile, cause_by=RunCode, sent_from=self.profile, send_to=recipient)
-        self._publish_message(msg)
-
     async def _debug_error(self, msg):
-        file_info, context = msg.content.split(FILENAME_CODE_SEP)
-        file_name, code = await DebugError().run(context)
-        if file_name:
-            self.write_file(file_name, code)
-            recipient = msg.sent_from  # send back to the one who ran the code for another run, might be one's self
-            msg = Message(
-                content=file_info, role=self.profile, cause_by=DebugError, sent_from=self.profile, send_to=recipient
+        run_code_context = RunCodeContext.loads(msg.content)
+        code = await DebugError(context=run_code_context, llm=self._llm).run()
+        await FileRepository.save_file(
+            filename=run_code_context.test_filename, content=code, relative_path=TEST_CODES_FILE_REPO
+        )
+        run_code_context.output = None
+        self.publish_message(
+            Message(
+                content=run_code_context.json(),
+                role=self.profile,
+                cause_by=DebugError,
+                sent_from=self,
+                send_to=self,
             )
-            self._publish_message(msg)
-
-    async def _observe(self) -> int:
-        await super()._observe()
-        self._rc.news = [
-            msg for msg in self._rc.news if msg.send_to == self.profile
-        ]  # only relevant msgs count as observed news
-        return len(self._rc.news)
+        )
 
     async def _act(self) -> Message:
         if self.test_round > self.test_round_allowed:
@@ -159,28 +147,35 @@ class QaEngineer(Role):
                 role=self.profile,
                 cause_by=WriteTest,
                 sent_from=self.profile,
-                send_to="",
+                send_to=MESSAGE_ROUTE_TO_NONE,
             )
             return result_msg
 
+        code_filters = any_to_str_set({SummarizeCode})
+        test_filters = any_to_str_set({WriteTest, DebugError})
+        run_filters = any_to_str_set({RunCode})
         for msg in self._rc.news:
             # Decide what to do based on observed msg type, currently defined by human,
             # might potentially be moved to _think, that is, let the agent decides for itself
-            if msg.cause_by in [WriteCode, WriteCodeReview]:
+            if msg.cause_by in code_filters:
                 # engineer wrote a code, time to write a test for it
                 await self._write_test(msg)
-            elif msg.cause_by in [WriteTest, DebugError]:
+            elif msg.cause_by in test_filters:
                 # I wrote or debugged my test code, time to run it
                 await self._run_code(msg)
-            elif msg.cause_by == RunCode:
+            elif msg.cause_by in run_filters:
                 # I ran my test code, time to fix bugs, if any
                 await self._debug_error(msg)
         self.test_round += 1
-        result_msg = Message(
+        return Message(
             content=f"Round {self.test_round} of tests done",
             role=self.profile,
             cause_by=WriteTest,
             sent_from=self.profile,
-            send_to="",
+            send_to=MESSAGE_ROUTE_TO_NONE,
         )
-        return result_msg
+
+    async def _observe(self, ignore_memory=False) -> int:
+        # This role has events that trigger and execute themselves based on conditions, and cannot rely on the
+        # content of memory to activate.
+        return await super(QaEngineer, self)._observe(ignore_memory=True)

metagpt/roles/researcher.py

@@ -1,4 +1,9 @@
 #!/usr/bin/env python
+"""
+@Modified By: mashenquan, 2023-11-1. According to Chapter 2.2.1 and 2.2.2 of RFC 116, change the data type of
+        the `cause_by` value in the `Message` to a string to support the new message distribution feature.
+"""
+
 
 import asyncio
 
@@ -49,18 +54,18 @@ class Researcher(Role):
         research_system_text = get_research_system_text(topic, self.language)
         if isinstance(todo, CollectLinks):
             links = await todo.run(topic, 4, 4)
-            ret = Message("", Report(topic=topic, links=links), role=self.profile, cause_by=type(todo))
+            ret = Message("", Report(topic=topic, links=links), role=self.profile, cause_by=todo)
         elif isinstance(todo, WebBrowseAndSummarize):
             links = instruct_content.links
             todos = (todo.run(*url, query=query, system_text=research_system_text) for (query, url) in links.items())
             summaries = await asyncio.gather(*todos)
             summaries = list((url, summary) for i in summaries for (url, summary) in i.items() if summary)
-            ret = Message("", Report(topic=topic, summaries=summaries), role=self.profile, cause_by=type(todo))
+            ret = Message("", Report(topic=topic, summaries=summaries), role=self.profile, cause_by=todo)
         else:
             summaries = instruct_content.summaries
             summary_text = "\n---\n".join(f"url: {url}\nsummary: {summary}" for (url, summary) in summaries)
             content = await self._rc.todo.run(topic, summary_text, system_text=research_system_text)
-            ret = Message("", Report(topic=topic, content=content), role=self.profile, cause_by=type(self._rc.todo))
+            ret = Message("", Report(topic=topic, content=content), role=self.profile, cause_by=self._rc.todo)
         self._rc.memory.add(ret)
         return ret
 

metagpt/roles/role.py

@@ -4,24 +4,36 @@
 @Time    : 2023/5/11 14:42
 @Author  : alexanderwu
 @File    : role.py
+@Modified By: mashenquan, 2023-11-1. According to Chapter 2.2.1 and 2.2.2 of RFC 116:
+    1. Merge the `recv` functionality into the `_observe` function. Future message reading operations will be
+    consolidated within the `_observe` function.
+    2. Standardize the message filtering for string label matching. Role objects can access the message labels
+    they've subscribed to through the `subscribed_tags` property.
+    3. Move the message receive buffer from the global variable `self._rc.env.memory` to the role's private variable
+    `self._rc.msg_buffer` for easier message identification and asynchronous appending of messages.
+    4. Standardize the way messages are passed: `publish_message` sends messages out, while `put_message` places
+    messages into the Role object's private message receive buffer. There are no other message transmit methods.
+    5. Standardize the parameters for the `run` function: the `test_message` parameter is used for testing purposes
+    only. In the normal workflow, you should use `publish_message` or `put_message` to transmit messages.
+@Modified By: mashenquan, 2023-11-4. According to the routing feature plan in Chapter 2.2.3.2 of RFC 113, the routing
+    functionality is to be consolidated into the `Environment` class.
 """
 from __future__ import annotations
 
-from typing import Iterable, Type, Union
 from enum import Enum
+from typing import Iterable, Set, Type
 
 from pydantic import BaseModel, Field
 
-# from metagpt.environment import Environment
-from metagpt.config import CONFIG
 from metagpt.actions import Action, ActionOutput
+from metagpt.actions.action_node import ActionNode
 from metagpt.llm import LLM, HumanProvider
 from metagpt.logs import logger
-from metagpt.memory import Memory, LongTermMemory
-from metagpt.schema import Message
+from metagpt.memory import Memory
+from metagpt.schema import Message, MessageQueue
+from metagpt.utils.common import any_to_str
 from metagpt.utils.repair_llm_raw_output import extract_state_value_from_output
 
-
 PREFIX_TEMPLATE = """You are a {profile}, named {name}, your goal is {goal}, and the constraint is {constraints}. """
 
 STATE_TEMPLATE = """Here are your conversation records. You can decide which stage you should enter or stay in based on these records.
@@ -64,6 +76,7 @@ class RoleReactMode(str, Enum):
 
 class RoleSetting(BaseModel):
     """Role Settings"""
+
     name: str
     profile: str
     goal: str
@@ -80,23 +93,28 @@ class RoleSetting(BaseModel):
 
 class RoleContext(BaseModel):
     """Role Runtime Context"""
-    env: 'Environment' = Field(default=None)
+
+    env: "Environment" = Field(default=None)
+    msg_buffer: MessageQueue = Field(default_factory=MessageQueue)  # Message Buffer with Asynchronous Updates
     memory: Memory = Field(default_factory=Memory)
-    long_term_memory: LongTermMemory = Field(default_factory=LongTermMemory)
+    # long_term_memory: LongTermMemory = Field(default_factory=LongTermMemory)
     state: int = Field(default=-1)  # -1 indicates initial or termination state where todo is None
     todo: Action = Field(default=None)
-    watch: set[Type[Action]] = Field(default_factory=set)
+    watch: set[str] = Field(default_factory=set)
     news: list[Type[Message]] = Field(default=[])
-    react_mode: RoleReactMode = RoleReactMode.REACT  # see `Role._set_react_mode` for definitions of the following two attributes
+    react_mode: RoleReactMode = (
+        RoleReactMode.REACT
+    )  # see `Role._set_react_mode` for definitions of the following two attributes
     max_react_loop: int = 1
 
     class Config:
         arbitrary_types_allowed = True
 
     def check(self, role_id: str):
-        if hasattr(CONFIG, "long_term_memory") and CONFIG.long_term_memory:
-            self.long_term_memory.recover_memory(role_id, self)
-            self.memory = self.long_term_memory  # use memory to act as long_term_memory for unify operation
+        # if hasattr(CONFIG, "long_term_memory") and CONFIG.long_term_memory:
+        #     self.long_term_memory.recover_memory(role_id, self)
+        #     self.memory = self.long_term_memory  # use memory to act as long_term_memory for unify operation
+        pass
 
     @property
     def important_memory(self) -> list[Message]:
@@ -113,17 +131,23 @@ class Role:
 
     def __init__(self, name="", profile="", goal="", constraints="", desc="", is_human=False):
         self._llm = LLM() if not is_human else HumanProvider()
-        self._setting = RoleSetting(name=name, profile=profile, goal=goal,
-                                    constraints=constraints, desc=desc, is_human=is_human)
+        self._setting = RoleSetting(
+            name=name, profile=profile, goal=goal, constraints=constraints, desc=desc, is_human=is_human
+        )
+        self._llm.system_prompt = self._get_prefix()
         self._states = []
         self._actions = []
         self._role_id = str(self._setting)
         self._rc = RoleContext()
+        self._subscription = {any_to_str(self), name} if name else {any_to_str(self)}
 
     def _reset(self):
         self._states = []
         self._actions = []
 
+    def _init_action_system_message(self, action: Action):
+        action.set_prefix(self._get_prefix(), self.profile)
+
     def _init_actions(self, actions):
         self._reset()
         for idx, action in enumerate(actions):
@@ -131,11 +155,14 @@ class Role:
                 i = action("", llm=self._llm)
             else:
                 if self._setting.is_human and not isinstance(action.llm, HumanProvider):
-                    logger.warning(f"is_human attribute does not take effect, "
-                                   f"as Role's {str(action)} was initialized using LLM, "
-                                   f"try passing in Action classes instead of initialized instances")
+                    logger.warning(
+                        f"is_human attribute does not take effect, "
+                        f"as Role's {str(action)} was initialized using LLM, "
+                        f"try passing in Action classes instead of initialized instances"
+                    )
                 i = action
-            i.set_prefix(self._get_prefix(), self.profile)
+            # i.set_env(self._rc.env)
+            self._init_action_system_message(i)
             self._actions.append(i)
             self._states.append(f"{idx}. {action}")
 
@@ -161,26 +188,51 @@ class Role:
             self._rc.max_react_loop = max_react_loop
 
     def _watch(self, actions: Iterable[Type[Action]]):
-        """Listen to the corresponding behaviors"""
-        self._rc.watch.update(actions)
+        """Watch Actions of interest. Role will select Messages caused by these Actions from its personal message
+        buffer during _observe.
+        """
+        tags = {any_to_str(t) for t in actions}
+        self._rc.watch.update(tags)
         # check RoleContext after adding watch actions
         self._rc.check(self._role_id)
 
+    def subscribe(self, tags: Set[str]):
+        """Used to receive Messages with certain tags from the environment. Message will be put into personal message
+        buffer to be further processed in _observe. By default, a Role subscribes Messages with a tag of its own name
+        or profile.
+        """
+        self._subscription = tags
+        if self._rc.env:  # According to the routing feature plan in Chapter 2.2.3.2 of RFC 113
+            self._rc.env.set_subscription(self, self._subscription)
+
     def _set_state(self, state: int):
         """Update the current state."""
         self._rc.state = state
         logger.debug(self._actions)
         self._rc.todo = self._actions[self._rc.state] if state >= 0 else None
 
-    def set_env(self, env: 'Environment'):
-        """Set the environment in which the role works. The role can talk to the environment and can also receive messages by observing."""
+    def set_env(self, env: "Environment"):
+        """Set the environment in which the role works. The role can talk to the environment and can also receive
+        messages by observing."""
         self._rc.env = env
+        if env:
+            env.set_subscription(self, self._subscription)
 
     @property
     def profile(self):
         """Get the role description (position)"""
         return self._setting.profile
 
+    @property
+    def name(self):
+        """Get virtual user name"""
+        return self._setting.name
+
+    @property
+    def subscription(self) -> Set:
+        """The labels for messages to be consumed by the Role object."""
+        return self._subscription
+
     def _get_prefix(self):
         """Get the role prefix"""
         if self._setting.desc:
@@ -194,15 +246,18 @@ class Role:
             self._set_state(0)
             return
         prompt = self._get_prefix()
-        prompt += STATE_TEMPLATE.format(history=self._rc.history, states="\n".join(self._states),
-                                        n_states=len(self._states) - 1, previous_state=self._rc.state)
+        prompt += STATE_TEMPLATE.format(
+            history=self._rc.history,
+            states="\n".join(self._states),
+            n_states=len(self._states) - 1,
+            previous_state=self._rc.state,
+        )
         # print(prompt)
         next_state = await self._llm.aask(prompt)
         next_state = extract_state_value_from_output(next_state)
         logger.debug(f"{prompt=}")
-        if (not next_state.isdigit() and next_state != "-1") \
-            or int(next_state) not in range(-1, len(self._states)):
-            logger.warning(f'Invalid answer of state, {next_state=}, will be set to -1')
+        if (not next_state.isdigit() and next_state != "-1") or int(next_state) not in range(-1, len(self._states)):
+            logger.warning(f"Invalid answer of state, {next_state=}, will be set to -1")
             next_state = -1
         else:
             next_state = int(next_state)
@@ -211,55 +266,64 @@ class Role:
         self._set_state(next_state)
 
     async def _act(self) -> Message:
-        # prompt = self.get_prefix()
-        # prompt += ROLE_TEMPLATE.format(name=self.profile, state=self.states[self.state], result=response,
-        #                                history=self.history)
-
         logger.info(f"{self._setting}: ready to {self._rc.todo}")
         response = await self._rc.todo.run(self._rc.important_memory)
-        # logger.info(response)
-        if isinstance(response, ActionOutput):
-            msg = Message(content=response.content, instruct_content=response.instruct_content,
-                        role=self.profile, cause_by=type(self._rc.todo))
+        if isinstance(response, ActionOutput) or isinstance(response, ActionNode):
+            msg = Message(
+                content=response.content,
+                instruct_content=response.instruct_content,
+                role=self.profile,
+                cause_by=self._rc.todo,
+                sent_from=self,
+            )
+        elif isinstance(response, Message):
+            msg = response
         else:
-            msg = Message(content=response, role=self.profile, cause_by=type(self._rc.todo))
+            msg = Message(content=response, role=self.profile, cause_by=self._rc.todo, sent_from=self)
         self._rc.memory.add(msg)
-        # logger.debug(f"{response}")
 
         return msg
 
-    async def _observe(self) -> int:
-        """Observe from the environment, obtain important information, and add it to memory"""
-        if not self._rc.env:
-            return 0
-        env_msgs = self._rc.env.memory.get()
-
-        observed = self._rc.env.memory.get_by_actions(self._rc.watch)
-        
-        self._rc.news = self._rc.memory.find_news(observed)  # find news (previously unseen messages) from observed messages
-
-        for i in env_msgs:
-            self.recv(i)
+    async def _observe(self, ignore_memory=False) -> int:
+        """Prepare new messages for processing from the message buffer and other sources."""
+        # Read unprocessed messages from the msg buffer.
+        news = self._rc.msg_buffer.pop_all()
+        # Store the read messages in your own memory to prevent duplicate processing.
+        old_messages = [] if ignore_memory else self._rc.memory.get()
+        self._rc.memory.add_batch(news)
+        # Filter out messages of interest.
+        self._rc.news = [n for n in news if n.cause_by in self._rc.watch and n not in old_messages]
 
+        # Design Rules:
+        # If you need to further categorize Message objects, you can do so using the Message.set_meta function.
+        # msg_buffer is a receiving buffer, avoid adding message data and operations to msg_buffer.
         news_text = [f"{i.role}: {i.content[:20]}..." for i in self._rc.news]
         if news_text:
-            logger.debug(f'{self._setting} observed: {news_text}')
+            logger.debug(f"{self._setting} observed: {news_text}")
         return len(self._rc.news)
 
-    def _publish_message(self, msg):
+    def publish_message(self, msg):
         """If the role belongs to env, then the role's messages will be broadcast to env"""
+        if not msg:
+            return
         if not self._rc.env:
             # If env does not exist, do not publish the message
             return
         self._rc.env.publish_message(msg)
 
+    def put_message(self, message):
+        """Place the message into the Role object's private message buffer."""
+        if not message:
+            return
+        self._rc.msg_buffer.push(message)
+
     async def _react(self) -> Message:
         """Think first, then act, until the Role _think it is time to stop and requires no more todo.
-        This is the standard think-act loop in the ReAct paper, which alternates thinking and acting in task solving, i.e. _think -> _act -> _think -> _act -> ... 
+        This is the standard think-act loop in the ReAct paper, which alternates thinking and acting in task solving, i.e. _think -> _act -> _think -> _act -> ...
         Use llm to select actions in _think dynamically
         """
         actions_taken = 0
-        rsp = Message("No actions taken yet") # will be overwritten after Role _act
+        rsp = Message("No actions taken yet")  # will be overwritten after Role _act
         while actions_taken < self._rc.max_react_loop:
             # think
             await self._think()
@@ -267,16 +331,16 @@ class Role:
                 break
             # act
             logger.debug(f"{self._setting}: {self._rc.state=}, will do {self._rc.todo}")
-            rsp = await self._act()
+            rsp = await self._act()  # 这个rsp是否需要publish_message？
             actions_taken += 1
-        return rsp # return output from the last action
+        return rsp  # return output from the last action
 
     async def _act_by_order(self) -> Message:
         """switch action each time by order defined in _init_actions, i.e. _act (Action1) -> _act (Action2) -> ..."""
         for i in range(len(self._states)):
             self._set_state(i)
             rsp = await self._act()
-        return rsp # return output from the last action
+        return rsp  # return output from the last action
 
     async def _plan_and_act(self) -> Message:
         """first plan, then execute an action sequence, i.e. _think (of a plan) -> _act -> _act -> ... Use llm to come up with the plan dynamically."""
@@ -291,43 +355,56 @@ class Role:
             rsp = await self._act_by_order()
         elif self._rc.react_mode == RoleReactMode.PLAN_AND_ACT:
             rsp = await self._plan_and_act()
-        self._set_state(state=-1) # current reaction is complete, reset state to -1 and todo back to None
+        self._set_state(state=-1)  # current reaction is complete, reset state to -1 and todo back to None
         return rsp
 
-    def recv(self, message: Message) -> None:
-        """add message to history."""
-        # self._history += f"\n{message}"
-        # self._context = self._history
-        if message in self._rc.memory.get():
-            return
-        self._rc.memory.add(message)
+    # # Replaced by run()
+    # def recv(self, message: Message) -> None:
+    #     """add message to history."""
+    #     # self._history += f"\n{message}"
+    #     # self._context = self._history
+    #     if message in self._rc.memory.get():
+    #         return
+    #     self._rc.memory.add(message)
 
-    async def handle(self, message: Message) -> Message:
-        """Receive information and reply with actions"""
-        # logger.debug(f"{self.name=}, {self.profile=}, {message.role=}")
-        self.recv(message)
-
-        return await self._react()
+    # # Replaced by run()
+    # async def handle(self, message: Message) -> Message:
+    #     """Receive information and reply with actions"""
+    #     # logger.debug(f"{self.name=}, {self.profile=}, {message.role=}")
+    #     self.recv(message)
+    #
+    #     return await self._react()
 
     def get_memories(self, k=0) -> list[Message]:
         """A wrapper to return the most recent k memories of this role, return all when k=0"""
         return self._rc.memory.get(k=k)
 
-    async def run(self, message=None):
+    async def run(self, with_message=None):
         """Observe, and think and act based on the results of the observation"""
-        if message:
-            if isinstance(message, str):
-                message = Message(message)
-            if isinstance(message, Message):
-                self.recv(message)
-            if isinstance(message, list):
-                self.recv(Message("\n".join(message)))
-        elif not await self._observe():
+        if with_message:
+            msg = None
+            if isinstance(with_message, str):
+                msg = Message(with_message)
+            elif isinstance(with_message, Message):
+                msg = with_message
+            elif isinstance(with_message, list):
+                msg = Message("\n".join(with_message))
+            self.put_message(msg)
+
+        if not await self._observe():
             # If there is no new information, suspend and wait
             logger.debug(f"{self._setting}: no news. waiting.")
             return
 
         rsp = await self.react()
-        # Publish the reply to the environment, waiting for the next subscriber to process
-        self._publish_message(rsp)
+
+        # Reset the next action to be taken.
+        self._rc.todo = None
+        # Send the response message to the Environment object to have it relay the message to the subscribers.
+        self.publish_message(rsp)
         return rsp
+
+    @property
+    def is_idle(self) -> bool:
+        """If true, all actions have been executed."""
+        return not self._rc.news and not self._rc.todo and self._rc.msg_buffer.empty()