ORromu commited on
Commit
d3d4389
·
verified ·
1 Parent(s): bfd1e55

Update tool.py

Browse files
Files changed (1) hide show
  1. tool.py +3 -8
tool.py CHANGED
@@ -5,7 +5,6 @@ from langchain_community.document_loaders.wikipedia import WikipediaLoader
5
  from langchain_community.document_loaders.arxiv import ArxivLoader
6
  from langchain_community.document_loaders.pubmed import PubMedLoader
7
  from langchain_community.tools.google_search.tool import GoogleSearchRun
8
- from langchain_community.tools.duckduckgo_search.tool import DuckDuckGoSearchResults
9
  from typing import Optional
10
 
11
  import os
@@ -93,17 +92,13 @@ def TavilySearchTool(query: str) -> str:
93
  ])
94
  return {"web_results": formatted_search_docs}
95
 
96
- google = GoogleSearchRun()
97
- duckduckgo = DuckDuckGoSearchResults()
98
- tavily = TavilySearchResults(max_results=3)
99
-
100
  @tool
101
  def combined_web_search(query: str) -> str:
102
  """Search Google, DuckDuckGo, and Tavily for a query and return combined results."""
103
 
104
- google_docs = google.invoke(query)[:3]
105
- duck_docs = duckduckgo.invoke(query)[:3]
106
- tavily_docs = tavily.invoke(query)[:3]
107
 
108
  all_docs = google_docs + duck_docs + tavily_docs
109
 
 
5
  from langchain_community.document_loaders.arxiv import ArxivLoader
6
  from langchain_community.document_loaders.pubmed import PubMedLoader
7
  from langchain_community.tools.google_search.tool import GoogleSearchRun
 
8
  from typing import Optional
9
 
10
  import os
 
92
  ])
93
  return {"web_results": formatted_search_docs}
94
 
 
 
 
 
95
  @tool
96
  def combined_web_search(query: str) -> str:
97
  """Search Google, DuckDuckGo, and Tavily for a query and return combined results."""
98
 
99
+ google_docs = GoogleSearchAPIWrapper(k=5).run(query)
100
+ duck_docs = DuckDuckGoSearchAPIWrapper().results(query = query, max_results=5)
101
+ tavily_docs = TavilySearchResults(max_results=5).invoke(query=query)
102
 
103
  all_docs = google_docs + duck_docs + tavily_docs
104