From 1167f6ddf9b0661264136940ce517bc15930e4dc Mon Sep 17 00:00:00 2001 From: Debanjum Singh Solanky Date: Thu, 14 Mar 2024 15:52:21 +0530 Subject: [PATCH] Rename extract_content online results field to webpages --- src/khoj/processor/conversation/offline/chat_model.py | 4 ++-- src/khoj/processor/tools/online_search.py | 8 ++++---- src/khoj/routers/helpers.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/khoj/processor/conversation/offline/chat_model.py b/src/khoj/processor/conversation/offline/chat_model.py index 437bdd3d..d1469ecf 100644 --- a/src/khoj/processor/conversation/offline/chat_model.py +++ b/src/khoj/processor/conversation/offline/chat_model.py @@ -177,8 +177,8 @@ def converse_offline( if ConversationCommand.Online in conversation_commands: simplified_online_results = online_results.copy() for result in online_results: - if online_results[result].get("extracted_content"): - simplified_online_results[result] = online_results[result]["extracted_content"] + if online_results[result].get("webpages"): + simplified_online_results[result] = online_results[result]["webpages"] conversation_primer = f"{prompts.online_search_conversation.format(online_results=str(simplified_online_results))}\n{conversation_primer}" if not is_none_or_empty(compiled_references_message): diff --git a/src/khoj/processor/tools/online_search.py b/src/khoj/processor/tools/online_search.py index 84ca7bac..45ccf111 100644 --- a/src/khoj/processor/tools/online_search.py +++ b/src/khoj/processor/tools/online_search.py @@ -72,9 +72,9 @@ async def search_online(query: str, conversation_history: dict, location: Locati results = await asyncio.gather(*tasks) # Collect extracted info from the retrieved web pages - for subquery, extracted_webpage_content in results: - if extracted_webpage_content is not None: - response_dict[subquery]["extracted_content"] = extracted_webpage_content + for subquery, webpage_extract in results: + if webpage_extract is not None: + response_dict[subquery]["webpages"] = webpage_extract return response_dict @@ -104,7 +104,7 @@ async def read_webpages(query: str, conversation_history: dict, location: Locati results: Dict[str, Dict[str, str]] = defaultdict(dict) for url in urls: _, result = await read_webpage_and_extract_content(query, url) - results[url]["extracted_content"] = result + results[url]["webpages"] = result return results diff --git a/src/khoj/routers/helpers.py b/src/khoj/routers/helpers.py index fb2a5df5..e16f443d 100644 --- a/src/khoj/routers/helpers.py +++ b/src/khoj/routers/helpers.py @@ -334,8 +334,8 @@ async def generate_better_image_prompt( for result in online_results: if online_results[result].get("answerBox"): simplified_online_results[result] = online_results[result]["answerBox"] - elif online_results[result].get("extracted_content"): - simplified_online_results[result] = online_results[result]["extracted_content"] + elif online_results[result].get("webpages"): + simplified_online_results[result] = online_results[result]["webpages"] image_prompt = prompts.image_generation_improve_prompt.format( query=q,