From a7eaf6666c43b42d26cf20fd7e09cc62602e7f50 Mon Sep 17 00:00:00 2001 From: Abhishek0075 Date: Tue, 5 Mar 2024 23:33:10 +0530 Subject: [PATCH] change in two examples file --- examples/debate.py | 2 +- examples/search_with_specific_engine.py | 31 ++++++++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/examples/debate.py b/examples/debate.py index 72ab8796d..22cfbf39e 100644 --- a/examples/debate.py +++ b/examples/debate.py @@ -105,4 +105,4 @@ def main(idea: str, investment: float = 3.0, n_round: int = 10): if __name__ == "__main__": - fire.Fire(main) + fire.Fire(main) # run as python debate.py --idea="TOPIC" --investment=3.0 --n_round=5 diff --git a/examples/search_with_specific_engine.py b/examples/search_with_specific_engine.py index 97b1378ee..c9fa0395e 100644 --- a/examples/search_with_specific_engine.py +++ b/examples/search_with_specific_engine.py @@ -6,19 +6,32 @@ import asyncio from metagpt.roles import Searcher from metagpt.tools.search_engine import SearchEngine, SearchEngineType - +from metagpt.config2 import Config async def main(): question = "What are the most interesting human facts?" - kwargs = {"api_key": "", "cse_id": "", "proxy": None} - # Serper API - # await Searcher(search_engine=SearchEngine(engine=SearchEngineType.SERPER_GOOGLE, **kwargs)).run(question) - # SerpAPI - # await Searcher(search_engine=SearchEngine(engine=SearchEngineType.SERPAPI_GOOGLE, **kwargs)).run(question) - # Google API - # await Searcher(search_engine=SearchEngine(engine=SearchEngineType.DIRECT_GOOGLE, **kwargs)).run(question) + + search = Config.default().search + kwargs = {"api_key": search.api_key, "cse_id": search.cse_id, "proxy": None} + + if(search.api_type == SearchEngineType.DIRECT_GOOGLE): + # Google API + await Searcher(search_engine=SearchEngine(engine=SearchEngineType.DIRECT_GOOGLE, **kwargs)).run(question) + elif(search.api_type == SearchEngineType.SERPER_GOOGLE): + # Serper API + await Searcher(search_engine=SearchEngine(engine=SearchEngineType.SERPER_GOOGLE, **kwargs)).run(question) + elif(search.api_type == SearchEngineType.SERPAPI_GOOGLE): + # SerpAPI + await Searcher(search_engine=SearchEngine(engine=SearchEngineType.SERPAPI_GOOGLE, **kwargs)).run(question) + else: + # DDG API + await Searcher(search_engine=SearchEngine(engine=SearchEngineType.DUCK_DUCK_GO, **kwargs)).run(question) + + + + # # DDG API - await Searcher(search_engine=SearchEngine(engine=SearchEngineType.DUCK_DUCK_GO, **kwargs)).run(question) + # await Searcher(search_engine=SearchEngine(engine=SearchEngineType.DUCK_DUCK_GO, **kwargs)).run(question) if __name__ == "__main__":