From 97c5222b0435096230ed8af3cb3484757781f3bc Mon Sep 17 00:00:00 2001 From: Debanjum Date: Wed, 21 May 2025 16:25:32 -0700 Subject: [PATCH] Set type hints and reorder args of all converse_[provider] methods - Query is more important and should be passed before references - Add type hints to user query and references for code readability --- src/khoj/processor/conversation/anthropic/anthropic_chat.py | 4 ++-- src/khoj/processor/conversation/google/gemini_chat.py | 4 ++-- src/khoj/processor/conversation/offline/chat_model.py | 4 ++-- src/khoj/processor/conversation/openai/gpt.py | 4 ++-- src/khoj/processor/conversation/utils.py | 2 +- src/khoj/routers/helpers.py | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/khoj/processor/conversation/anthropic/anthropic_chat.py b/src/khoj/processor/conversation/anthropic/anthropic_chat.py index 014fe4cc..0d5e6595 100644 --- a/src/khoj/processor/conversation/anthropic/anthropic_chat.py +++ b/src/khoj/processor/conversation/anthropic/anthropic_chat.py @@ -140,8 +140,8 @@ def anthropic_send_message_to_model( async def converse_anthropic( - references, - user_query, + user_query: str, + references: list[dict], online_results: Optional[Dict[str, Dict]] = None, code_results: Optional[Dict[str, Dict]] = None, operator_results: Optional[Dict[str, str]] = None, diff --git a/src/khoj/processor/conversation/google/gemini_chat.py b/src/khoj/processor/conversation/google/gemini_chat.py index 3b1cb1c3..6cbe87c8 100644 --- a/src/khoj/processor/conversation/google/gemini_chat.py +++ b/src/khoj/processor/conversation/google/gemini_chat.py @@ -162,8 +162,8 @@ def gemini_send_message_to_model( async def converse_gemini( - references, - user_query, + user_query: str, + references: list[dict], online_results: Optional[Dict[str, Dict]] = None, code_results: Optional[Dict[str, Dict]] = None, operator_results: Optional[Dict[str, str]] = None, diff --git a/src/khoj/processor/conversation/offline/chat_model.py b/src/khoj/processor/conversation/offline/chat_model.py index 2a0512f9..8a02dc63 100644 --- a/src/khoj/processor/conversation/offline/chat_model.py +++ b/src/khoj/processor/conversation/offline/chat_model.py @@ -148,8 +148,8 @@ def filter_questions(questions: List[str]): async def converse_offline( - user_query, - references=[], + user_query: str, + references: list[dict] = [], online_results={}, code_results={}, conversation_log={}, diff --git a/src/khoj/processor/conversation/openai/gpt.py b/src/khoj/processor/conversation/openai/gpt.py index bf5529b3..6290d19e 100644 --- a/src/khoj/processor/conversation/openai/gpt.py +++ b/src/khoj/processor/conversation/openai/gpt.py @@ -165,8 +165,8 @@ def send_message_to_model( async def converse_openai( - references, - user_query, + user_query: str, + references: list[dict], online_results: Optional[Dict[str, Dict]] = None, code_results: Optional[Dict[str, Dict]] = None, operator_results: Optional[Dict[str, str]] = None, diff --git a/src/khoj/processor/conversation/utils.py b/src/khoj/processor/conversation/utils.py index 6b65dd36..0c3064b9 100644 --- a/src/khoj/processor/conversation/utils.py +++ b/src/khoj/processor/conversation/utils.py @@ -387,7 +387,7 @@ def gather_raw_query_files( def generate_chatml_messages_with_context( - user_message, + user_message: str, system_message: str = None, conversation_log={}, model_name="gpt-4o-mini", diff --git a/src/khoj/routers/helpers.py b/src/khoj/routers/helpers.py index c33c3db0..b5c489b4 100644 --- a/src/khoj/routers/helpers.py +++ b/src/khoj/routers/helpers.py @@ -1449,8 +1449,8 @@ async def agenerate_chat_response( api_key = openai_chat_config.api_key chat_model_name = chat_model.name chat_response_generator = converse_openai( - compiled_references, query_to_run, + compiled_references, query_images=query_images, online_results=online_results, code_results=code_results, @@ -1479,8 +1479,8 @@ async def agenerate_chat_response( api_key = chat_model.ai_model_api.api_key api_base_url = chat_model.ai_model_api.api_base_url chat_response_generator = converse_anthropic( - compiled_references, query_to_run, + compiled_references, query_images=query_images, online_results=online_results, code_results=code_results, @@ -1508,8 +1508,8 @@ async def agenerate_chat_response( api_key = chat_model.ai_model_api.api_key api_base_url = chat_model.ai_model_api.api_base_url chat_response_generator = converse_gemini( - compiled_references, query_to_run, + compiled_references, online_results=online_results, code_results=code_results, operator_results=operator_results,