From cab6ee877d3660e9dcc54845e2e3f4e0bdfbe4ed Mon Sep 17 00:00:00 2001 From: geekan Date: Wed, 10 Jan 2024 21:23:03 +0800 Subject: [PATCH] fix bugs --- metagpt/actions/rebuild_sequence_view.py | 2 ++ metagpt/config2.py | 4 ++-- metagpt/subscription.py | 2 +- tests/metagpt/actions/test_debug_error.py | 2 +- tests/metagpt/actions/test_prepare_documents.py | 2 +- tests/metagpt/actions/test_rebuild_class_view.py | 3 ++- .../metagpt/actions/test_rebuild_sequence_view.py | 3 ++- tests/metagpt/actions/test_run_code.py | 6 +++--- tests/metagpt/actions/test_summarize_code.py | 2 +- tests/metagpt/actions/test_talk_action.py | 9 ++++----- tests/metagpt/actions/test_write_code_review.py | 2 +- tests/metagpt/actions/test_write_prd.py | 4 ++-- tests/metagpt/actions/test_write_teaching_plan.py | 2 +- tests/metagpt/actions/test_write_test.py | 2 +- tests/metagpt/learn/test_text_to_image.py | 4 +++- .../serialize_deserialize/test_write_code.py | 2 +- .../test_write_code_review.py | 2 +- tests/metagpt/test_config.py | 6 +----- tests/metagpt/test_role.py | 14 +++++++------- 19 files changed, 37 insertions(+), 36 deletions(-) diff --git a/metagpt/actions/rebuild_sequence_view.py b/metagpt/actions/rebuild_sequence_view.py index 8785e6245..b701e66de 100644 --- a/metagpt/actions/rebuild_sequence_view.py +++ b/metagpt/actions/rebuild_sequence_view.py @@ -12,7 +12,9 @@ from pathlib import Path from typing import List from metagpt.actions import Action +from metagpt.config2 import config from metagpt.const import GRAPH_REPO_FILE_REPO +from metagpt.context import CONTEXT from metagpt.logs import logger from metagpt.utils.common import aread, list_files from metagpt.utils.di_graph_repository import DiGraphRepository diff --git a/metagpt/config2.py b/metagpt/config2.py index 6345c1b8c..c0991a6a0 100644 --- a/metagpt/config2.py +++ b/metagpt/config2.py @@ -75,8 +75,8 @@ class Config(CLIParams, YamlModel): puppeteer_config: str = "" pyppeteer_executable_path: str = "" IFLYTEK_APP_ID: str = "" - IFLYTEK_APP_SECRET: str = "" - IFLYTEK_APP_KEY: str = "" + IFLYTEK_API_SECRET: str = "" + IFLYTEK_API_KEY: str = "" AZURE_TTS_SUBSCRIPTION_KEY: str = "" AZURE_TTS_REGION: str = "" mermaid_engine: str = "nodejs" diff --git a/metagpt/subscription.py b/metagpt/subscription.py index e2b0916ac..d225a5d87 100644 --- a/metagpt/subscription.py +++ b/metagpt/subscription.py @@ -13,7 +13,7 @@ class SubscriptionRunner(BaseModel): Example: >>> import asyncio - >>> from metagpt.subscription import SubscriptionRunner + >>> from metagpt.address import SubscriptionRunner >>> from metagpt.roles import Searcher >>> from metagpt.schema import Message diff --git a/tests/metagpt/actions/test_debug_error.py b/tests/metagpt/actions/test_debug_error.py index 922aa8613..2e57a95c9 100644 --- a/tests/metagpt/actions/test_debug_error.py +++ b/tests/metagpt/actions/test_debug_error.py @@ -144,7 +144,7 @@ async def test_debug_error(): await repo.save_file( filename=ctx.output_filename, content=output_data.model_dump_json(), relative_path=TEST_OUTPUTS_FILE_REPO ) - debug_error = DebugError(context=ctx) + debug_error = DebugError(i_context=ctx) rsp = await debug_error.run() diff --git a/tests/metagpt/actions/test_prepare_documents.py b/tests/metagpt/actions/test_prepare_documents.py index fde971f3c..317683113 100644 --- a/tests/metagpt/actions/test_prepare_documents.py +++ b/tests/metagpt/actions/test_prepare_documents.py @@ -22,7 +22,7 @@ async def test_prepare_documents(): CONTEXT.git_repo.delete_repository() CONTEXT.git_repo = None - await PrepareDocuments(g_context=CONTEXT).run(with_messages=[msg]) + await PrepareDocuments(context=CONTEXT).run(with_messages=[msg]) assert CONTEXT.git_repo doc = await CONTEXT.file_repo.get_file(filename=REQUIREMENT_FILENAME, relative_path=DOCS_FILE_REPO) assert doc diff --git a/tests/metagpt/actions/test_rebuild_class_view.py b/tests/metagpt/actions/test_rebuild_class_view.py index cc23cc8dc..94295fd55 100644 --- a/tests/metagpt/actions/test_rebuild_class_view.py +++ b/tests/metagpt/actions/test_rebuild_class_view.py @@ -12,13 +12,14 @@ import pytest from metagpt.actions.rebuild_class_view import RebuildClassView from metagpt.const import GRAPH_REPO_FILE_REPO +from metagpt.context import CONTEXT from metagpt.llm import LLM @pytest.mark.asyncio async def test_rebuild(): action = RebuildClassView( - name="RedBean", context=str(Path(__file__).parent.parent.parent.parent / "metagpt"), llm=LLM() + name="RedBean", i_context=str(Path(__file__).parent.parent.parent.parent / "metagpt"), llm=LLM() ) await action.run() graph_file_repo = CONTEXT.git_repo.new_file_repository(relative_path=GRAPH_REPO_FILE_REPO) diff --git a/tests/metagpt/actions/test_rebuild_sequence_view.py b/tests/metagpt/actions/test_rebuild_sequence_view.py index 62f64b666..8c515d976 100644 --- a/tests/metagpt/actions/test_rebuild_sequence_view.py +++ b/tests/metagpt/actions/test_rebuild_sequence_view.py @@ -11,6 +11,7 @@ import pytest from metagpt.actions.rebuild_sequence_view import RebuildSequenceView from metagpt.const import GRAPH_REPO_FILE_REPO +from metagpt.context import CONTEXT from metagpt.llm import LLM from metagpt.utils.common import aread from metagpt.utils.file_repository import FileRepository @@ -31,7 +32,7 @@ async def test_rebuild(): CONTEXT.git_repo.commit("commit1") action = RebuildSequenceView( - name="RedBean", context=str(Path(__file__).parent.parent.parent.parent / "metagpt"), llm=LLM() + name="RedBean", i_context=str(Path(__file__).parent.parent.parent.parent / "metagpt"), llm=LLM() ) await action.run() graph_file_repo = CONTEXT.git_repo.new_file_repository(relative_path=GRAPH_REPO_FILE_REPO) diff --git a/tests/metagpt/actions/test_run_code.py b/tests/metagpt/actions/test_run_code.py index ad08b5738..76397734d 100644 --- a/tests/metagpt/actions/test_run_code.py +++ b/tests/metagpt/actions/test_run_code.py @@ -26,12 +26,12 @@ async def test_run_text(): @pytest.mark.asyncio async def test_run_script(): # Successful command - out, err = await RunCode.run_script(".", command=["echo", "Hello World"]) + out, err = await RunCode().run_script(".", command=["echo", "Hello World"]) assert out.strip() == "Hello World" assert err == "" # Unsuccessful command - out, err = await RunCode.run_script(".", command=["python", "-c", "print(1/0)"]) + out, err = await RunCode().run_script(".", command=["python", "-c", "print(1/0)"]) assert "ZeroDivisionError" in err @@ -61,5 +61,5 @@ async def test_run(): ), ] for ctx, result in inputs: - rsp = await RunCode(context=ctx).run() + rsp = await RunCode(i_context=ctx).run() assert result in rsp.summary diff --git a/tests/metagpt/actions/test_summarize_code.py b/tests/metagpt/actions/test_summarize_code.py index 081636a21..b617b59ae 100644 --- a/tests/metagpt/actions/test_summarize_code.py +++ b/tests/metagpt/actions/test_summarize_code.py @@ -188,7 +188,7 @@ async def test_summarize_code(): src_file_repo = CONTEXT.git_repo.new_file_repository(relative_path=CONTEXT.src_workspace) all_files = src_file_repo.all_files ctx = CodeSummarizeContext(design_filename="1.json", task_filename="1.json", codes_filenames=all_files) - action = SummarizeCode(context=ctx) + action = SummarizeCode(i_context=ctx) rsp = await action.run() assert rsp logger.info(rsp) diff --git a/tests/metagpt/actions/test_talk_action.py b/tests/metagpt/actions/test_talk_action.py index 6d01dcc3f..b722d7c40 100644 --- a/tests/metagpt/actions/test_talk_action.py +++ b/tests/metagpt/actions/test_talk_action.py @@ -9,7 +9,7 @@ import pytest from metagpt.actions.talk_action import TalkAction -from metagpt.context import Context +from metagpt.context import CONTEXT from metagpt.schema import Message @@ -35,11 +35,10 @@ from metagpt.schema import Message ) async def test_prompt(agent_description, language, context, knowledge, history_summary): # Prerequisites - g_context = Context() - g_context.kwargs["agent_description"] = agent_description - g_context.kwargs["language"] = language + CONTEXT.kwargs.agent_description = agent_description + CONTEXT.kwargs.language = language - action = TalkAction(context=context, knowledge=knowledge, history_summary=history_summary) + action = TalkAction(i_context=context, knowledge=knowledge, history_summary=history_summary) assert "{" not in action.prompt assert "{" not in action.prompt_gpt4 diff --git a/tests/metagpt/actions/test_write_code_review.py b/tests/metagpt/actions/test_write_code_review.py index 3343b42b4..951929b76 100644 --- a/tests/metagpt/actions/test_write_code_review.py +++ b/tests/metagpt/actions/test_write_code_review.py @@ -21,7 +21,7 @@ def add(a, b): filename="math.py", design_doc=Document(content="编写一个从a加b的函数，返回a+b"), code_doc=Document(content=code) ) - context = await WriteCodeReview(context=context).run() + context = await WriteCodeReview(i_context=context).run() # 我们不能精确地预测生成的代码评审，但我们可以检查返回的是否为字符串 assert isinstance(context.code_doc.content, str) diff --git a/tests/metagpt/actions/test_write_prd.py b/tests/metagpt/actions/test_write_prd.py index faa5b77a4..1a897ac2e 100644 --- a/tests/metagpt/actions/test_write_prd.py +++ b/tests/metagpt/actions/test_write_prd.py @@ -16,14 +16,14 @@ from metagpt.roles.product_manager import ProductManager from metagpt.roles.role import RoleReactMode from metagpt.schema import Message from metagpt.utils.common import any_to_str -from metagpt.utils.file_repository import FileRepository @pytest.mark.asyncio async def test_write_prd(new_filename): product_manager = ProductManager() requirements = "开发一个基于大语言模型与私有知识库的搜索引擎，希望可以基于大语言模型进行搜索总结" - await FileRepository.save_file(filename=REQUIREMENT_FILENAME, content=requirements, relative_path=DOCS_FILE_REPO) + repo = CONTEXT.file_repo + await repo.save_file(filename=REQUIREMENT_FILENAME, content=requirements, relative_path=DOCS_FILE_REPO) product_manager.rc.react_mode = RoleReactMode.BY_ORDER prd = await product_manager.run(Message(content=requirements, cause_by=UserRequirement)) assert prd.cause_by == any_to_str(WritePRD) diff --git a/tests/metagpt/actions/test_write_teaching_plan.py b/tests/metagpt/actions/test_write_teaching_plan.py index 57a4f5eb0..3d556ab92 100644 --- a/tests/metagpt/actions/test_write_teaching_plan.py +++ b/tests/metagpt/actions/test_write_teaching_plan.py @@ -17,7 +17,7 @@ from metagpt.actions.write_teaching_plan import WriteTeachingPlanPart [("Title", "Lesson 1: Learn to draw an apple."), ("Teaching Content", "Lesson 1: Learn to draw an apple.")], ) async def test_write_teaching_plan_part(topic, context): - action = WriteTeachingPlanPart(topic=topic, context=context) + action = WriteTeachingPlanPart(topic=topic, i_context=context) rsp = await action.run() assert rsp diff --git a/tests/metagpt/actions/test_write_test.py b/tests/metagpt/actions/test_write_test.py index 9649b9abb..e09038414 100644 --- a/tests/metagpt/actions/test_write_test.py +++ b/tests/metagpt/actions/test_write_test.py @@ -26,7 +26,7 @@ async def test_write_test(): self.position = (random.randint(1, max_y - 1), random.randint(1, max_x - 1)) """ context = TestingContext(filename="food.py", code_doc=Document(filename="food.py", content=code)) - write_test = WriteTest(context=context) + write_test = WriteTest(i_context=context) context = await write_test.run() logger.info(context.model_dump_json()) diff --git a/tests/metagpt/learn/test_text_to_image.py b/tests/metagpt/learn/test_text_to_image.py index 2c43297c2..7c133149d 100644 --- a/tests/metagpt/learn/test_text_to_image.py +++ b/tests/metagpt/learn/test_text_to_image.py @@ -27,7 +27,9 @@ async def test_text_to_image(mocker): config = Config.default() assert config.METAGPT_TEXT_TO_IMAGE_MODEL_URL - data = await text_to_image("Panda emoji", size_type="512x512", model_url=config.METAGPT_TEXT_TO_IMAGE_MODEL_URL) + data = await text_to_image( + "Panda emoji", size_type="512x512", model_url=config.METAGPT_TEXT_TO_IMAGE_MODEL_URL, config=config + ) assert "base64" in data or "http" in data diff --git a/tests/metagpt/serialize_deserialize/test_write_code.py b/tests/metagpt/serialize_deserialize/test_write_code.py index 12dc49c3b..132f343bc 100644 --- a/tests/metagpt/serialize_deserialize/test_write_code.py +++ b/tests/metagpt/serialize_deserialize/test_write_code.py @@ -22,7 +22,7 @@ async def test_write_code_serdeser(): filename="test_code.py", design_doc=Document(content="write add function to calculate two numbers") ) doc = Document(content=context.model_dump_json()) - action = WriteCode(context=doc) + action = WriteCode(i_context=doc) serialized_data = action.model_dump() new_action = WriteCode(**serialized_data) diff --git a/tests/metagpt/serialize_deserialize/test_write_code_review.py b/tests/metagpt/serialize_deserialize/test_write_code_review.py index d1a9bff24..70a4f2077 100644 --- a/tests/metagpt/serialize_deserialize/test_write_code_review.py +++ b/tests/metagpt/serialize_deserialize/test_write_code_review.py @@ -20,7 +20,7 @@ def div(a: int, b: int = 0): code_doc=Document(content=code_content), ) - action = WriteCodeReview(context=context) + action = WriteCodeReview(i_context=context) serialized_data = action.model_dump() assert serialized_data["name"] == "WriteCodeReview" diff --git a/tests/metagpt/test_config.py b/tests/metagpt/test_config.py index cfde7a04c..c804702dd 100644 --- a/tests/metagpt/test_config.py +++ b/tests/metagpt/test_config.py @@ -7,7 +7,7 @@ """ from pydantic import BaseModel -from metagpt.config2 import Config, config +from metagpt.config2 import Config from metagpt.configs.llm_config import LLMType from metagpt.context import ContextMixin from tests.metagpt.provider.mock_llm_config import mock_llm_config @@ -20,10 +20,6 @@ def test_config_1(): assert llm.api_type == LLMType.OPENAI -def test_config_2(): - assert config == Config.default() - - def test_config_from_dict(): cfg = Config(llm={"default": mock_llm_config}) assert cfg diff --git a/tests/metagpt/test_role.py b/tests/metagpt/test_role.py index 351ba9051..20a366db8 100644 --- a/tests/metagpt/test_role.py +++ b/tests/metagpt/test_role.py @@ -38,11 +38,11 @@ class MockRole(Role): def test_basic(): mock_role = MockRole() - assert mock_role.subscription == {"tests.metagpt.test_role.MockRole"} + assert mock_role.addresses == ({"tests.metagpt.test_role.MockRole"}) assert mock_role.rc.watch == {"metagpt.actions.add_requirement.UserRequirement"} mock_role = MockRole(name="mock_role") - assert mock_role.subscription == {"tests.metagpt.test_role.MockRole", "mock_role"} + assert mock_role.addresses == {"tests.metagpt.test_role.MockRole", "mock_role"} @pytest.mark.asyncio @@ -53,7 +53,7 @@ async def test_react(): goal: str constraints: str desc: str - subscription: str + address: str inputs = [ { @@ -71,7 +71,7 @@ async def test_react(): role = MockRole( name=seed.name, profile=seed.profile, goal=seed.goal, constraints=seed.constraints, desc=seed.desc ) - role.subscribe({seed.subscription}) + role.set_addresses({seed.address}) assert role.rc.watch == {any_to_str(UserRequirement)} assert role.name == seed.name assert role.profile == seed.profile @@ -81,13 +81,13 @@ async def test_react(): assert role.is_idle env = Environment() env.add_role(role) - assert env.get_subscription(role) == {seed.subscription} - env.publish_message(Message(content="test", msg_to=seed.subscription)) + assert env.get_addresses(role) == {seed.address} + env.publish_message(Message(content="test", msg_to=seed.address)) assert not role.is_idle while not env.is_idle: await env.run() assert role.is_idle - env.publish_message(Message(content="test", cause_by=seed.subscription)) + env.publish_message(Message(content="test", cause_by=seed.address)) assert not role.is_idle while not env.is_idle: await env.run()