klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-02 21:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove model type check to construct structured messages

Browse Source 
All model types use a normalized, chatml structured message format
This check isn't used since offline model support was dropped.
This commit is contained in:
Debanjum
2025-08-25 14:13:26 -07:00
parent 386a17371d
commit 0fb6020f30
1 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/khoj/processor/conversation/utils.py
View File

@@ -23,7 +23,6 @@ from transformers import AutoTokenizer, PreTrainedTokenizer, PreTrainedTokenizer
from khoj.database.adapters import ConversationAdapters from khoj.database.adapters import ConversationAdapters
from khoj.database.models import ( from khoj.database.models import (
ChatMessageModel, ChatMessageModel,
ChatModel,
ClientApplication, ClientApplication,
Intent, Intent,
KhojUser, KhojUser,
@@ -528,29 +527,18 @@ def construct_structured_message(
Assume vision is enabled and chat model provider supports messages in chatml format, unless specified otherwise. Assume vision is enabled and chat model provider supports messages in chatml format, unless specified otherwise.
""" """
if not model_type or model_type in [ constructed_messages: List[dict[str, Any]] = []
ChatModel.ModelType.OPENAI, if not is_none_or_empty(message):
ChatModel.ModelType.GOOGLE, constructed_messages += [{"type": "text", "text": message}] if isinstance(message, str) else message
ChatModel.ModelType.ANTHROPIC, # Drop image message passed by caller if chat model does not have vision enabled
]: if not vision_enabled:
constructed_messages: List[dict[str, Any]] = [] constructed_messages = [m for m in constructed_messages if m.get("type") != "image_url"]
if not is_none_or_empty(message):
constructed_messages += [{"type": "text", "text": message}] if isinstance(message, str) else message
# Drop image message passed by caller if chat model does not have vision enabled
if not vision_enabled:
constructed_messages = [m for m in constructed_messages if m.get("type") != "image_url"]
if not is_none_or_empty(attached_file_context):
constructed_messages += [{"type": "text", "text": attached_file_context}]
if vision_enabled and images:
for image in images:
constructed_messages += [{"type": "image_url", "image_url": {"url": image}}]
return constructed_messages
message = message if isinstance(message, str) else "\n\n".join(m["text"] for m in message)
if not is_none_or_empty(attached_file_context): if not is_none_or_empty(attached_file_context):
return f"{attached_file_context}\n\n{message}" constructed_messages += [{"type": "text", "text": attached_file_context}]
if vision_enabled and images:
return message for image in images:
constructed_messages += [{"type": "image_url", "image_url": {"url": image}}]
return constructed_messages
def gather_raw_query_files( def gather_raw_query_files(