diff --git a/.github/workflows/fulltest.yaml b/.github/workflows/fulltest.yaml
index f5c6049e1..70c800481 100644
--- a/.github/workflows/fulltest.yaml
+++ b/.github/workflows/fulltest.yaml
@@ -54,7 +54,6 @@ jobs:
export ALLOW_OPENAI_API_CALL=0
echo "${{ secrets.METAGPT_KEY_YAML }}" | base64 -d > config/key.yaml
mkdir -p ~/.metagpt && echo "${{ secrets.METAGPT_CONFIG2_YAML }}" | base64 -d > ~/.metagpt/config2.yaml
- echo "${{ secrets.SPARK_YAML }}" | base64 -d > ~/.metagpt/spark.yaml
pytest tests/ --doctest-modules --cov=./metagpt/ --cov-report=xml:cov.xml --cov-report=html:htmlcov --durations=20 | tee unittest.txt
- name: Show coverage report
run: |
diff --git a/.github/workflows/unittest.yaml b/.github/workflows/unittest.yaml
index 2e7e3ce2b..afa9faba7 100644
--- a/.github/workflows/unittest.yaml
+++ b/.github/workflows/unittest.yaml
@@ -31,7 +31,7 @@ jobs:
- name: Test with pytest
run: |
export ALLOW_OPENAI_API_CALL=0
- mkdir -p ~/.metagpt && cp tests/config2.yaml ~/.metagpt/config2.yaml && cp tests/spark.yaml ~/.metagpt/spark.yaml
+ mkdir -p ~/.metagpt && cp tests/config2.yaml ~/.metagpt/config2.yaml
pytest tests/ --doctest-modules --cov=./metagpt/ --cov-report=xml:cov.xml --cov-report=html:htmlcov --durations=20 | tee unittest.txt
- name: Show coverage report
run: |
diff --git a/README.md b/README.md
index 42718129f..72ce03412 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,9 @@ # MetaGPT: The Multi-Agent Framework
## News
-🚀 Feb. 08, 2024: [v0.7.0](https://github.com/geekan/MetaGPT/releases/tag/v0.7.0) released, supporting assigning different LLMs to different Roles. We also introduced [Interpreter](https://github.com/geekan/MetaGPT/blob/main/examples/mi/README.md), a powerful agent capable of solving a wide range of real-world problems.
+🚀 March. 01, 2024: Our Data Interpreter paper is on arxiv. Find all design and benchmark details [here](https://arxiv.org/abs/2402.18679)!
+
+🚀 Feb. 08, 2024: [v0.7.0](https://github.com/geekan/MetaGPT/releases/tag/v0.7.0) released, supporting assigning different LLMs to different Roles. We also introduced [Data Interpreter](https://github.com/geekan/MetaGPT/blob/main/examples/di/README.md), a powerful agent capable of solving a wide range of real-world problems.
🚀 Jan. 16, 2024: Our paper [MetaGPT: Meta Programming for A Multi-Agent Collaborative Framework
](https://arxiv.org/abs/2308.00352) accepted for oral presentation **(top 1.2%)** at ICLR 2024, **ranking #1** in the LLM-based Agent category.
@@ -97,6 +99,45 @@ ### Usage
detail installation please refer to [cli_install](https://docs.deepwisdom.ai/main/en/guide/get_started/installation.html#install-stable-version)
or [docker_install](https://docs.deepwisdom.ai/main/en/guide/get_started/installation.html#install-with-docker)
+### Docker installation
+⏬ Step 1: Download metagpt image and prepare config2.yaml :: click to expand ::
+
+
+```bash
+docker pull metagpt/metagpt:latest
+mkdir -p /opt/metagpt/{config,workspace}
+docker run --rm metagpt/metagpt:latest cat /app/metagpt/config/config2.yaml > /opt/metagpt/config/config2.yaml
+vim /opt/metagpt/config/config2.yaml # Change the config
+```
+
+
+⏬ Step 2: Run metagpt container :: click to expand ::
+
+
+```bash
+docker run --name metagpt -d \
+ --privileged \
+ -v /opt/metagpt/config/config2.yaml:/app/metagpt/config/config2.yaml \
+ -v /opt/metagpt/workspace:/app/metagpt/workspace \
+ metagpt/metagpt:latest
+```
+
+
+⏬ Step 3: Use metagpt :: click to expand ::
+
+
+```bash
+docker exec -it metagpt /bin/bash
+$ metagpt "Create a 2048 game" # this will create a repo in ./workspace
+```
+
+
+
goal : str
name : str
profile : str
|}>, shape="record", style="solid"];',
+ "metagpt.roles.architect.Architect",
+ "Architect|constraints : str\ngoal : str\nname : str\nprofile : str\n|",
+ ),
+ (
+ '"metagpt.actions.skill_action.ArgumentsParingAction" [color="black", fontcolor="black", label=<{ArgumentsParingAction|args : Optional[Dict]
ask : str
prompt
rsp : Optional[Message]
skill
|parse_arguments(skill_name, txt): dict
run(with_message): Message
}>, shape="record", style="solid"];',
+ "metagpt.actions.skill_action.ArgumentsParingAction",
+ "ArgumentsParingAction|args : Optional[Dict]\nask : str\nprompt\nrsp : Optional[Message]\nskill\n|parse_arguments(skill_name, txt): dict\nrun(with_message): Message\n",
+ ),
+ (
+ '"metagpt.strategy.base.BaseEvaluator" [color="black", fontcolor="black", label=<{BaseEvaluator|
|status_verify()
}>, shape="record", style="solid"];',
+ "metagpt.strategy.base.BaseEvaluator",
+ "BaseEvaluator|\n|status_verify()\n",
+ ),
+ (
+ '"metagpt.configs.browser_config.BrowserConfig" [color="black", fontcolor="black", label=<{BrowserConfig|browser : Literal[\'chrome\', \'firefox\', \'edge\', \'ie\']
driver : Literal[\'chromium\', \'firefox\', \'webkit\']
engine
path : str
|}>, shape="record", style="solid"];',
+ "metagpt.configs.browser_config.BrowserConfig",
+ "BrowserConfig|browser : Literal['chrome', 'firefox', 'edge', 'ie']\ndriver : Literal['chromium', 'firefox', 'webkit']\nengine\npath : str\n|",
+ ),
+ (
+ '"metagpt.tools.search_engine_serpapi.SerpAPIWrapper" [color="black", fontcolor="black", label=<{SerpAPIWrapper|aiosession : Optional[aiohttp.ClientSession]
model_config
params : dict
search_engine : Optional[Any]
serpapi_api_key : Optional[str]
|check_serpapi_api_key(val: str)
get_params(query: str): Dict[str, str]
results(query: str, max_results: int): dict
run(query, max_results: int, as_string: bool): str
}>, shape="record", style="solid"];',
+ "metagpt.tools.search_engine_serpapi.SerpAPIWrapper",
+ "SerpAPIWrapper|aiosession : Optional[aiohttp.ClientSession]\nmodel_config\nparams : dict\nsearch_engine : Optional[Any]\nserpapi_api_key : Optional[str]\n|check_serpapi_api_key(val: str)\nget_params(query: str): Dict[str, str]\nresults(query: str, max_results: int): dict\nrun(query, max_results: int, as_string: bool): str\n",
+ ),
+ ],
+)
+def test_split_class_line(line, package_name, info):
+ p, i = RepoParser._split_class_line(line)
+ assert p == package_name
+ assert i == info
+
+
+@pytest.mark.parametrize(
+ ("v", "name", "args", "return_args"),
+ [
+ (
+ "arequest(method, url, params, headers, files, stream: Literal[True], request_id: Optional[str], request_timeout: Optional[Union[float, Tuple[float, float]]]): Tuple[AsyncGenerator[OpenAIResponse, None], bool, str]",
+ "arequest",
+ [
+ DotClassAttribute(name="method", description="method"),
+ DotClassAttribute(name="url", description="url"),
+ DotClassAttribute(name="params", description="params"),
+ DotClassAttribute(name="headers", description="headers"),
+ DotClassAttribute(name="files", description="files"),
+ DotClassAttribute(name="stream", type_="Literal[True]", description="stream: Literal[True]"),
+ DotClassAttribute(name="request_id", type_="Optional[str]", description="request_id: Optional[str]"),
+ DotClassAttribute(
+ name="request_timeout",
+ type_="Optional[Union[float,Tuple[float,float]]]",
+ description="request_timeout: Optional[Union[float, Tuple[float, float]]]",
+ ),
+ ],
+ DotReturn(
+ type_="Tuple[AsyncGenerator[OpenAIResponse,None],bool,str]",
+ compositions=["AsyncGenerator", "OpenAIResponse"],
+ description="Tuple[AsyncGenerator[OpenAIResponse, None], bool, str]",
+ ),
+ ),
+ (
+ "update(subject: str, predicate: str, object_: str)",
+ "update",
+ [
+ DotClassAttribute(name="subject", type_="str", description="subject: str"),
+ DotClassAttribute(name="predicate", type_="str", description="predicate: str"),
+ DotClassAttribute(name="object_", type_="str", description="object_: str"),
+ ],
+ DotReturn(description=""),
+ ),
+ ],
+)
+def test_parse_method(v, name, args, return_args):
+ method = DotClassMethod.parse(v)
+ assert method.name == name
+ assert method.args == args
+ assert method.return_args == return_args
+ assert method.description == v
+
+ json_data = method.model_dump_json()
+ v = DotClassMethod.model_validate_json(json_data)
+ assert v == method
+
+
+if __name__ == "__main__":
+ pytest.main([__file__, "-s"])
diff --git a/tests/metagpt/test_schema.py b/tests/metagpt/test_schema.py
index a8fa27151..22f6ae9fb 100644
--- a/tests/metagpt/test_schema.py
+++ b/tests/metagpt/test_schema.py
@@ -18,9 +18,6 @@ from metagpt.actions.write_code import WriteCode
from metagpt.const import SYSTEM_DESIGN_FILE_REPO, TASK_FILE_REPO
from metagpt.schema import (
AIMessage,
- ClassAttribute,
- ClassMethod,
- ClassView,
CodeSummarizeContext,
Document,
Message,
@@ -28,6 +25,9 @@ from metagpt.schema import (
Plan,
SystemMessage,
Task,
+ UMLClassAttribute,
+ UMLClassMethod,
+ UMLClassView,
UserMessage,
)
from metagpt.utils.common import any_to_str
@@ -159,27 +159,26 @@ def test_CodeSummarizeContext(file_list, want):
def test_class_view():
- attr_a = ClassAttribute(name="a", value_type="int", default_value="0", visibility="+", abstraction=True)
- assert attr_a.get_mermaid(align=1) == "\t+int a=0*"
- attr_b = ClassAttribute(name="b", value_type="str", default_value="0", visibility="#", static=True)
- assert attr_b.get_mermaid(align=0) == '#str b="0"$'
- class_view = ClassView(name="A")
+ attr_a = UMLClassAttribute(name="a", value_type="int", default_value="0", visibility="+")
+ assert attr_a.get_mermaid(align=1) == "\t+int a=0"
+ attr_b = UMLClassAttribute(name="b", value_type="str", default_value="0", visibility="#")
+ assert attr_b.get_mermaid(align=0) == '#str b="0"'
+ class_view = UMLClassView(name="A")
class_view.attributes = [attr_a, attr_b]
- method_a = ClassMethod(name="run", visibility="+", abstraction=True)
- assert method_a.get_mermaid(align=1) == "\t+run()*"
- method_b = ClassMethod(
+ method_a = UMLClassMethod(name="run", visibility="+")
+ assert method_a.get_mermaid(align=1) == "\t+run()"
+ method_b = UMLClassMethod(
name="_test",
visibility="#",
- static=True,
- args=[ClassAttribute(name="a", value_type="str"), ClassAttribute(name="b", value_type="int")],
+ args=[UMLClassAttribute(name="a", value_type="str"), UMLClassAttribute(name="b", value_type="int")],
return_type="str",
)
- assert method_b.get_mermaid(align=0) == "#_test(str a,int b):str$"
+ assert method_b.get_mermaid(align=0) == "#_test(str a,int b) str"
class_view.methods = [method_a, method_b]
assert (
class_view.get_mermaid(align=0)
- == 'class A{\n\t+int a=0*\n\t#str b="0"$\n\t+run()*\n\t#_test(str a,int b):str$\n}\n'
+ == 'class A{\n\t+int a=0\n\t#str b="0"\n\t+run()\n\t#_test(str a,int b) str\n}\n'
)
diff --git a/tests/metagpt/utils/test_common.py b/tests/metagpt/utils/test_common.py
index 9b1fa878e..b365f424f 100644
--- a/tests/metagpt/utils/test_common.py
+++ b/tests/metagpt/utils/test_common.py
@@ -178,7 +178,7 @@ class TestGetProjectRoot:
],
)
def test_split_namespace(self, val, want):
- res = split_namespace(val)
+ res = split_namespace(val, maxsplit=-1)
assert res == want
def test_read_json_file(self):
diff --git a/tests/metagpt/utils/test_repair_llm_raw_output.py b/tests/metagpt/utils/test_repair_llm_raw_output.py
index e28423b91..7a29ea3ee 100644
--- a/tests/metagpt/utils/test_repair_llm_raw_output.py
+++ b/tests/metagpt/utils/test_repair_llm_raw_output.py
@@ -211,6 +211,11 @@ value
output = repair_invalid_json(output, "Expecting ',' delimiter: line 4 column 1")
assert output == target_output
+ raw_output = '{"key": "url "http" \\"https\\" "}'
+ target_output = '{"key": "url \\"http\\" \\"https\\" "}'
+ output = repair_invalid_json(raw_output, "Expecting ',' delimiter: line 1 column 15 (char 14)")
+ assert output == target_output
+
def test_retry_parse_json_text():
from metagpt.utils.repair_llm_raw_output import retry_parse_json_text
diff --git a/tests/metagpt/utils/test_s3.py b/tests/metagpt/utils/test_s3.py
index b26ebe94d..34c21612c 100644
--- a/tests/metagpt/utils/test_s3.py
+++ b/tests/metagpt/utils/test_s3.py
@@ -13,6 +13,7 @@ import aiofiles
import pytest
from metagpt.config2 import Config
+from metagpt.configs.s3_config import S3Config
from metagpt.utils.common import aread
from metagpt.utils.s3 import S3
@@ -30,6 +31,14 @@ async def test_s3(mocker):
mock_client.__aenter__.return_value = mock_client
mock_client.__aexit__.return_value = None
mocker.patch.object(aioboto3.Session, "client", return_value=mock_client)
+ mock_config = mocker.Mock()
+ mock_config.s3 = S3Config(
+ access_key="mock_access_key",
+ secret_key="mock_secret_key",
+ endpoint="http://mock.endpoint",
+ bucket="mock_bucket",
+ )
+ mocker.patch.object(Config, "default", return_value=mock_config)
# Prerequisites
s3 = Config.default().s3
diff --git a/tests/metagpt/utils/test_save_code.py b/tests/metagpt/utils/test_save_code.py
index 9df2650f3..aceecec3b 100644
--- a/tests/metagpt/utils/test_save_code.py
+++ b/tests/metagpt/utils/test_save_code.py
@@ -6,7 +6,7 @@
import nbformat
import pytest
-from metagpt.actions.mi.execute_nb_code import ExecuteNbCode
+from metagpt.actions.di.execute_nb_code import ExecuteNbCode
from metagpt.utils.common import read_json_file
from metagpt.utils.save_code import DATA_PATH, save_code_file
diff --git a/tests/metagpt/utils/test_visual_graph_repo.py b/tests/metagpt/utils/test_visual_graph_repo.py
new file mode 100644
index 000000000..7f696b4bc
--- /dev/null
+++ b/tests/metagpt/utils/test_visual_graph_repo.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+@Time : 2024/1/4
+@Author : mashenquan
+@File : test_visual_graph_repo.py
+@Desc : Unit tests for testing and demonstrating the usage of VisualDiGraphRepo.
+"""
+
+import re
+from pathlib import Path
+
+import pytest
+
+from metagpt.utils.common import remove_affix, split_namespace
+from metagpt.utils.visual_graph_repo import VisualDiGraphRepo
+
+
+@pytest.mark.asyncio
+async def test_visual_di_graph_repo(context, mocker):
+ filename = Path(__file__).parent / "../../data/graph_db/networkx.sequence_view.json"
+ repo = await VisualDiGraphRepo.load_from(filename=filename)
+
+ class_view = await repo.get_mermaid_class_view()
+ assert class_view
+ await context.repo.resources.graph_repo.save(filename="class_view.md", content=f"```mermaid\n{class_view}\n```\n")
+
+ sequence_views = await repo.get_mermaid_sequence_views()
+ assert sequence_views
+ for ns, sqv in sequence_views:
+ filename = re.sub(r"[:/\\\.]+", "_", ns) + ".sequence_view.md"
+ sqv = sqv.strip(" `")
+ await context.repo.resources.graph_repo.save(filename=filename, content=f"```mermaid\n{sqv}\n```\n")
+
+ sequence_view_vers = await repo.get_mermaid_sequence_view_versions()
+ assert sequence_view_vers
+ for ns, sqv in sequence_view_vers:
+ ver, sqv = split_namespace(sqv)
+ filename = re.sub(r"[:/\\\.]+", "_", ns) + f".{ver}.sequence_view_ver.md"
+ sqv = remove_affix(sqv).strip(" `")
+ await context.repo.resources.graph_repo.save(filename=filename, content=f"```mermaid\n{sqv}\n```\n")
+
+
+if __name__ == "__main__":
+ pytest.main([__file__, "-s"])
diff --git a/tests/mock/mock_llm.py b/tests/mock/mock_llm.py
index 50e75dabf..b2052e2b3 100644
--- a/tests/mock/mock_llm.py
+++ b/tests/mock/mock_llm.py
@@ -3,7 +3,7 @@ from typing import Optional, Union
from metagpt.config2 import config
from metagpt.configs.llm_config import LLMType
-from metagpt.logs import log_llm_stream, logger
+from metagpt.logs import logger
from metagpt.provider.azure_openai_api import AzureOpenAILLM
from metagpt.provider.openai_api import OpenAILLM
from metagpt.schema import Message
@@ -24,17 +24,8 @@ class MockLLM(OriginalLLM):
async def acompletion_text(self, messages: list[dict], stream=False, timeout=3) -> str:
"""Overwrite original acompletion_text to cancel retry"""
if stream:
- resp = self._achat_completion_stream(messages, timeout=timeout)
-
- collected_messages = []
- async for i in resp:
- log_llm_stream(i)
- collected_messages.append(i)
-
- full_reply_content = "".join(collected_messages)
- usage = self._calc_usage(messages, full_reply_content)
- self._update_costs(usage)
- return full_reply_content
+ resp = await self._achat_completion_stream(messages, timeout=timeout)
+ return resp
rsp = await self._achat_completion(messages, timeout=timeout)
return self.get_choice_text(rsp)
diff --git a/tests/spark.yaml b/tests/spark.yaml
deleted file mode 100644
index a5bbd98bd..000000000
--- a/tests/spark.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-llm:
- api_type: "spark"
- app_id: "xxx"
- api_key: "xxx"
- api_secret: "xxx"
- domain: "generalv2"
- base_url: "wss://spark-api.xf-yun.com/v3.1/chat"
\ No newline at end of file