mirror of
https://github.com/khoaliber/khoj.git
synced 2026-03-10 13:26:13 +00:00
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
This commit is contained in:
@@ -140,8 +140,8 @@ def anthropic_send_message_to_model(
|
|||||||
|
|
||||||
|
|
||||||
async def converse_anthropic(
|
async def converse_anthropic(
|
||||||
references,
|
user_query: str,
|
||||||
user_query,
|
references: list[dict],
|
||||||
online_results: Optional[Dict[str, Dict]] = None,
|
online_results: Optional[Dict[str, Dict]] = None,
|
||||||
code_results: Optional[Dict[str, Dict]] = None,
|
code_results: Optional[Dict[str, Dict]] = None,
|
||||||
operator_results: Optional[Dict[str, str]] = None,
|
operator_results: Optional[Dict[str, str]] = None,
|
||||||
|
|||||||
@@ -162,8 +162,8 @@ def gemini_send_message_to_model(
|
|||||||
|
|
||||||
|
|
||||||
async def converse_gemini(
|
async def converse_gemini(
|
||||||
references,
|
user_query: str,
|
||||||
user_query,
|
references: list[dict],
|
||||||
online_results: Optional[Dict[str, Dict]] = None,
|
online_results: Optional[Dict[str, Dict]] = None,
|
||||||
code_results: Optional[Dict[str, Dict]] = None,
|
code_results: Optional[Dict[str, Dict]] = None,
|
||||||
operator_results: Optional[Dict[str, str]] = None,
|
operator_results: Optional[Dict[str, str]] = None,
|
||||||
|
|||||||
@@ -148,8 +148,8 @@ def filter_questions(questions: List[str]):
|
|||||||
|
|
||||||
|
|
||||||
async def converse_offline(
|
async def converse_offline(
|
||||||
user_query,
|
user_query: str,
|
||||||
references=[],
|
references: list[dict] = [],
|
||||||
online_results={},
|
online_results={},
|
||||||
code_results={},
|
code_results={},
|
||||||
conversation_log={},
|
conversation_log={},
|
||||||
|
|||||||
@@ -165,8 +165,8 @@ def send_message_to_model(
|
|||||||
|
|
||||||
|
|
||||||
async def converse_openai(
|
async def converse_openai(
|
||||||
references,
|
user_query: str,
|
||||||
user_query,
|
references: list[dict],
|
||||||
online_results: Optional[Dict[str, Dict]] = None,
|
online_results: Optional[Dict[str, Dict]] = None,
|
||||||
code_results: Optional[Dict[str, Dict]] = None,
|
code_results: Optional[Dict[str, Dict]] = None,
|
||||||
operator_results: Optional[Dict[str, str]] = None,
|
operator_results: Optional[Dict[str, str]] = None,
|
||||||
|
|||||||
@@ -387,7 +387,7 @@ def gather_raw_query_files(
|
|||||||
|
|
||||||
|
|
||||||
def generate_chatml_messages_with_context(
|
def generate_chatml_messages_with_context(
|
||||||
user_message,
|
user_message: str,
|
||||||
system_message: str = None,
|
system_message: str = None,
|
||||||
conversation_log={},
|
conversation_log={},
|
||||||
model_name="gpt-4o-mini",
|
model_name="gpt-4o-mini",
|
||||||
|
|||||||
@@ -1449,8 +1449,8 @@ async def agenerate_chat_response(
|
|||||||
api_key = openai_chat_config.api_key
|
api_key = openai_chat_config.api_key
|
||||||
chat_model_name = chat_model.name
|
chat_model_name = chat_model.name
|
||||||
chat_response_generator = converse_openai(
|
chat_response_generator = converse_openai(
|
||||||
compiled_references,
|
|
||||||
query_to_run,
|
query_to_run,
|
||||||
|
compiled_references,
|
||||||
query_images=query_images,
|
query_images=query_images,
|
||||||
online_results=online_results,
|
online_results=online_results,
|
||||||
code_results=code_results,
|
code_results=code_results,
|
||||||
@@ -1479,8 +1479,8 @@ async def agenerate_chat_response(
|
|||||||
api_key = chat_model.ai_model_api.api_key
|
api_key = chat_model.ai_model_api.api_key
|
||||||
api_base_url = chat_model.ai_model_api.api_base_url
|
api_base_url = chat_model.ai_model_api.api_base_url
|
||||||
chat_response_generator = converse_anthropic(
|
chat_response_generator = converse_anthropic(
|
||||||
compiled_references,
|
|
||||||
query_to_run,
|
query_to_run,
|
||||||
|
compiled_references,
|
||||||
query_images=query_images,
|
query_images=query_images,
|
||||||
online_results=online_results,
|
online_results=online_results,
|
||||||
code_results=code_results,
|
code_results=code_results,
|
||||||
@@ -1508,8 +1508,8 @@ async def agenerate_chat_response(
|
|||||||
api_key = chat_model.ai_model_api.api_key
|
api_key = chat_model.ai_model_api.api_key
|
||||||
api_base_url = chat_model.ai_model_api.api_base_url
|
api_base_url = chat_model.ai_model_api.api_base_url
|
||||||
chat_response_generator = converse_gemini(
|
chat_response_generator = converse_gemini(
|
||||||
compiled_references,
|
|
||||||
query_to_run,
|
query_to_run,
|
||||||
|
compiled_references,
|
||||||
online_results=online_results,
|
online_results=online_results,
|
||||||
code_results=code_results,
|
code_results=code_results,
|
||||||
operator_results=operator_results,
|
operator_results=operator_results,
|
||||||
|
|||||||
Reference in New Issue
Block a user