From 21d19163bac87d2d9dfbe085d4ffba3bf4c80ab0 Mon Sep 17 00:00:00 2001 From: Debanjum Date: Sat, 19 Apr 2025 20:49:10 +0530 Subject: [PATCH] Just pass user rather than whole request object to doc search func --- src/khoj/routers/api.py | 4 +--- src/khoj/routers/api_chat.py | 3 +-- src/khoj/routers/research.py | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/khoj/routers/api.py b/src/khoj/routers/api.py index 01fc0a94..efba17ec 100644 --- a/src/khoj/routers/api.py +++ b/src/khoj/routers/api.py @@ -352,7 +352,7 @@ def set_user_name( async def extract_references_and_questions( - request: Request, + user: KhojUser, meta_log: dict, q: str, n: int, @@ -367,8 +367,6 @@ async def extract_references_and_questions( query_files: str = None, tracer: dict = {}, ): - user = request.user.object if request.user.is_authenticated else None - # Initialize Variables compiled_references: List[dict[str, str]] = [] inferred_queries: List[str] = [] diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py index 2f709ffb..03f367dd 100644 --- a/src/khoj/routers/api_chat.py +++ b/src/khoj/routers/api_chat.py @@ -889,7 +889,6 @@ async def chat( if conversation_commands == [ConversationCommand.Research]: async for research_result in execute_information_collection( - request=request, user=user, query=defiltered_query, conversation_id=conversation_id, @@ -1025,7 +1024,7 @@ async def chat( if not ConversationCommand.Research in conversation_commands: try: async for result in extract_references_and_questions( - request, + user, meta_log, q, (n or 7), diff --git a/src/khoj/routers/research.py b/src/khoj/routers/research.py index 057d7c9e..fa855b9c 100644 --- a/src/khoj/routers/research.py +++ b/src/khoj/routers/research.py @@ -193,7 +193,6 @@ async def apick_next_tool( async def execute_information_collection( - request: Request, user: KhojUser, query: str, conversation_id: str, @@ -251,7 +250,7 @@ async def execute_information_collection( c["query"] for iteration in previous_iterations if iteration.context for c in iteration.context } async for result in extract_references_and_questions( - request, + user, construct_tool_chat_history(previous_iterations, ConversationCommand.Notes), this_iteration.query, 7,