From 939811e9b56c31891cefa79252d06e76ca1ac4a0 Mon Sep 17 00:00:00 2001 From: sabaimran Date: Mon, 24 Jun 2024 09:10:03 +0530 Subject: [PATCH] Fix conversation look up logic --- src/khoj/routers/api_chat.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py index c9fbc28d..25c6510c 100644 --- a/src/khoj/routers/api_chat.py +++ b/src/khoj/routers/api_chat.py @@ -890,8 +890,18 @@ async def chat( _custom_filters.append("site:khoj.dev") conversation_commands.append(ConversationCommand.Online) - conversation = await ConversationAdapters.aget_conversation_by_user(user, conversation_id=conversation_id) + conversation = await ConversationAdapters.aget_conversation_by_user( + user, request.user.client_app, conversation_id, title + ) conversation_id = conversation.id if conversation else None + + if not conversation: + return Response( + content=f"No conversation found with requested id, title", media_type="text/plain", status_code=400 + ) + else: + meta_log = conversation.conversation_log + if ConversationCommand.Summarize in conversation_commands: file_filters = conversation.file_filters llm_response = "" @@ -933,17 +943,6 @@ async def chat( ) return StreamingResponse(content=llm_response, media_type="text/event-stream", status_code=200) - conversation = await ConversationAdapters.aget_conversation_by_user( - user, request.user.client_app, conversation_id, title - ) - conversation_id = conversation.id if conversation else None - if not conversation: - return Response( - content=f"No conversation found with requested id, title", media_type="text/plain", status_code=400 - ) - else: - meta_log = conversation.conversation_log - is_automated_task = conversation_commands == [ConversationCommand.AutomatedTask] if conversation_commands == [ConversationCommand.Default] or is_automated_task: