🌟 The Multi-Agent Framework: First AI Software Company, Towards Natural Language Programming
fix #687
shenchucheng61bb7749e4c5
diff --git a/metagpt/actions/research.py b/metagpt/actions/research.pyindex bad8f139c..5086f10cf 100644--- a/metagpt/actions/research.py+++ b/metagpt/actions/research.py@@ -10,6 +10,7 @@ from pydantic import TypeAdapter, model_validatorfrom metagpt.actions import Actionfrom metagpt.config2 import configfrom metagpt.logs import logger+from metagpt.tools.search_engine import SearchEnginefrom metagpt.tools.web_browser_engine import WebBrowserEnginefrom metagpt.utils.common import OutputParserfrom metagpt.utils.text import generate_prompt_chunk, reduce_message_lengthdiff --git a/metagpt/tools/search_engine.py b/metagpt/tools/search_engine.pyindex 1372a8c7a..81629bb02 100644--- a/metagpt/tools/search_engine.py+++ b/metagpt/tools/search_engine.py@@ -6,9 +6,9 @@@File : search_engine.py"""import importlib-from typing import Callable, Coroutine, Literal, Optional, Union, overload+from typing import Annotated, Callable, Coroutine, Literal, Optional, Union, overload-from pydantic import BaseModel, ConfigDict, model_validator+from pydantic import BaseModel, ConfigDict, Field, model_validatorfrom metagpt.configs.search_config import SearchConfigfrom metagpt.logs import logger@@ -29,7 +29,9 @@ class SearchEngine(BaseModel):model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow")engine: SearchEngineType = SearchEngineType.SERPER_GOOGLE- run_func: Optional[Callable[[str, int, bool], Coroutine[None, None, Union[str, list[str]]]]] = None+ run_func: Annotated[+ Optional[Callable[[str, int, bool], Coroutine[None, None, Union[str, list[str]]]]], Field(exclude=True)+ ] = Noneapi_key: Optional[str] = Noneproxy: Optional[str] = Nonediff --git a/metagpt/tools/web_browser_engine.py b/metagpt/tools/web_browser_engine.pyindex 01339e51a..ff9ad0fa6 100644--- a/metagpt/tools/web_browser_engine.py+++ b/metagpt/tools/web_browser_engine.py@@ -3,9 +3,9 @@from __future__ import annotationsimport importlib-from typing import Any, Callable, Coroutine, Optional, Union, overload+from typing import Annotated, Any, Callable, Coroutine, Optional, Union, overload-from pydantic import BaseModel, ConfigDict, model_validator+from pydantic import BaseModel, ConfigDict, Field, model_validatorfrom metagpt.configs.browser_config import BrowserConfigfrom metagpt.tools import WebBrowserEngineType@@ -29,7 +29,10 @@ class WebBrowserEngine(BaseModel):model_config = ConfigDict(arbitrary_types_allowed=True, extra="allow")engine: WebBrowserEngineType = WebBrowserEngineType.PLAYWRIGHT- run_func: Optional[Callable[..., Coroutine[Any, Any, Union[WebPage, list[WebPage]]]]] = None+ run_func: Annotated[+ Optional[Callable[..., Coroutine[Any, Any, Union[WebPage, list[WebPage]]]]],+ Field(exclude=True),+ ] = Noneproxy: Optional[str] = None@model_validator(mode="after")diff --git a/tests/metagpt/roles/test_researcher.py b/tests/metagpt/roles/test_researcher.pyindex ba05e1296..9ce3bc23b 100644--- a/tests/metagpt/roles/test_researcher.py+++ b/tests/metagpt/roles/test_researcher.py@@ -1,3 +1,4 @@+import tempfilefrom pathlib import Pathfrom random import randomfrom tempfile import TemporaryDirectory@@ -6,6 +7,7 @@ import pytestfrom metagpt.actions.research import CollectLinksfrom metagpt.roles import researcher+from metagpt.team import Teamfrom metagpt.tools import SearchEngineTypefrom metagpt.tools.search_engine import SearchEngine@@ -57,5 +59,13 @@ def test_write_report(mocker, context):assert (researcher.RESEARCH_PATH / f"{i+1}. metagpt.md").read_text().startswith("# Research Report")+async def test_serialize():+ team = Team()+ team.hire([researcher.Researcher()])+ with tempfile.TemporaryDirectory() as dirname:+ team.serialize(Path(dirname) / "team.json")++if __name__ == "__main__":pytest.main([__file__, "-s"])