Update app.py
Browse files
app.py
CHANGED
|
@@ -47,10 +47,14 @@ def duckduckgo_search(query: str, max_results: int = 10) -> List[Dict[str, str]]
|
|
| 47 |
results = list(ddgs.text(query, max_results=max_results))
|
| 48 |
return results
|
| 49 |
|
| 50 |
-
def get_web_search_results(query: str, model: str, num_calls: int = 3, temperature: float = 0.2, max_results: int = 10) -> Dict[str, any]:
|
| 51 |
try:
|
| 52 |
# Perform web search
|
| 53 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 54 |
|
| 55 |
if not search_results:
|
| 56 |
return {"error": f"No results found for query: {query}"}
|
|
@@ -160,7 +164,7 @@ def respond(message, history, model, temperature, num_calls, use_web_search, sea
|
|
| 160 |
|
| 161 |
final_summary = ""
|
| 162 |
for _ in range(num_calls):
|
| 163 |
-
search_results = get_web_search_results(rephrased_query,
|
| 164 |
if not search_results:
|
| 165 |
final_summary += f"No search results found for the query: {rephrased_query}\n\n"
|
| 166 |
elif "error" in search_results[0]:
|
|
|
|
| 47 |
results = list(ddgs.text(query, max_results=max_results))
|
| 48 |
return results
|
| 49 |
|
| 50 |
+
def get_web_search_results(query: str, model: str, num_calls: int = 3, temperature: float = 0.2, max_results: int = 10, search_method: str = "DDGS.chat") -> Dict[str, any]:
|
| 51 |
try:
|
| 52 |
# Perform web search
|
| 53 |
+
if search_method == "DDGS.text":
|
| 54 |
+
search_results = duckduckgo_search(query, max_results)
|
| 55 |
+
else: # Default to DDGS.chat
|
| 56 |
+
with DDGS() as ddgs:
|
| 57 |
+
search_results = list(ddgs.text(query, max_results=max_results))
|
| 58 |
|
| 59 |
if not search_results:
|
| 60 |
return {"error": f"No results found for query: {query}"}
|
|
|
|
| 164 |
|
| 165 |
final_summary = ""
|
| 166 |
for _ in range(num_calls):
|
| 167 |
+
search_results = get_web_search_results(rephrased_query, model, num_calls, temperature, max_results=10, search_method=search_method)
|
| 168 |
if not search_results:
|
| 169 |
final_summary += f"No search results found for the query: {rephrased_query}\n\n"
|
| 170 |
elif "error" in search_results[0]:
|