Merge pull request #1065 from geekan/add_params_to_search_engine

add params to search engine

examples/search_with_specific_engine.py

@@ -13,7 +13,7 @@ async def main():
     question = "What are the most interesting human facts?"
 
     search = Config.default().search
-    kwargs = {"api_key": search.api_key, "cse_id": search.cse_id, "proxy": None}
+    kwargs = search.model_dump()
     await Searcher(search_engine=SearchEngine(engine=search.api_type, **kwargs)).run(question)
 
 

metagpt/actions/action_node.py

@@ -330,7 +330,7 @@ class ActionNode:
 
     def compile_to(self, i: Dict, schema, kv_sep) -> str:
         if schema == "json":
-            return json.dumps(i, indent=4)
+            return json.dumps(i, indent=4, ensure_ascii=False)
         elif schema == "markdown":
             return dict_to_markdown(i, kv_sep=kv_sep)
         else:

metagpt/configs/search_config.py

@@ -7,6 +7,8 @@
 """
 from typing import Callable, Optional
 
+from pydantic import Field
+
 from metagpt.tools import SearchEngineType
 from metagpt.utils.yaml_model import YamlModel
 
@@ -18,3 +20,11 @@ class SearchConfig(YamlModel):
     api_key: str = ""
     cse_id: str = ""  # for google
     search_func: Optional[Callable] = None
+    params: dict = Field(
+        default_factory=lambda: {
+            "engine": "google",
+            "google_domain": "google.com",
+            "gl": "us",
+            "hl": "en",
+        }
+    )

tests/metagpt/tools/test_search_engine.py

@@ -11,7 +11,6 @@ from typing import Callable
 
 import pytest
 
-from metagpt.config2 import config
 from metagpt.configs.search_config import SearchConfig
 from metagpt.logs import logger
 from metagpt.tools import SearchEngineType
@@ -53,14 +52,11 @@ async def test_search_engine(
     search_engine_config = {"engine": search_engine_type, "run_func": run_func}
 
     if search_engine_type is SearchEngineType.SERPAPI_GOOGLE:
-        assert config.search
         search_engine_config["api_key"] = "mock-serpapi-key"
     elif search_engine_type is SearchEngineType.DIRECT_GOOGLE:
-        assert config.search
         search_engine_config["api_key"] = "mock-google-key"
         search_engine_config["cse_id"] = "mock-google-cse"
     elif search_engine_type is SearchEngineType.SERPER_GOOGLE:
-        assert config.search
         search_engine_config["api_key"] = "mock-serper-key"
 
     async def test(search_engine):