sij/khoj
1
0
Fork 0
mirror of https://github.com/khoj-ai/khoj.git synced 2024-11-27 17:35:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Mark context messages with user role as context role isn't being used

Browse source 
Context role was added to allow change message truncation order based
on context role as well.

Revert it for now since currently this is not currently being done.
This commit is contained in:
Debanjum 2024-10-27 23:55:47 -07:00
parent bc059eeb0b
commit ee0789eb3d
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/khoj/processor/conversation/utils.py
View file

@ -174,7 +174,7 @@ def generate_chatml_messages_with_context(
model_type="", model_type="",
context_message="", context_message="",
): ):
"""Generate messages for ChatGPT with context from previous conversation""" """Generate chat messages with appropriate context from previous conversation to send to the chat model"""
# Set max prompt size from user config or based on pre-configured for model and machine specs # Set max prompt size from user config or based on pre-configured for model and machine specs
if not max_prompt_size: if not max_prompt_size:
if loaded_model: if loaded_model:
@ -199,7 +199,7 @@ def generate_chatml_messages_with_context(
if not is_none_or_empty(chat.get("onlineContext")): if not is_none_or_empty(chat.get("onlineContext")):
message_context += f"{prompts.online_search_conversation.format(online_results=chat.get('onlineContext'))}" message_context += f"{prompts.online_search_conversation.format(online_results=chat.get('onlineContext'))}"
if not is_none_or_empty(message_context): if not is_none_or_empty(message_context):
reconstructed_context_message = ChatMessage(content=message_context, role="context") reconstructed_context_message = ChatMessage(content=message_context, role="user")
chatml_messages.insert(0, reconstructed_context_message) chatml_messages.insert(0, reconstructed_context_message)
role = "user" if chat["by"] == "you" else "assistant" role = "user" if chat["by"] == "you" else "assistant"
@ -220,7 +220,7 @@ def generate_chatml_messages_with_context(
) )
) )
if not is_none_or_empty(context_message): if not is_none_or_empty(context_message):
messages.append(ChatMessage(content=context_message, role="context")) messages.append(ChatMessage(content=context_message, role="user"))
if len(chatml_messages) > 0: if len(chatml_messages) > 0:
messages += chatml_messages messages += chatml_messages
if not is_none_or_empty(system_message): if not is_none_or_empty(system_message):
@ -229,11 +229,6 @@ def generate_chatml_messages_with_context(
# Truncate oldest messages from conversation history until under max supported prompt size by model # Truncate oldest messages from conversation history until under max supported prompt size by model
messages = truncate_messages(messages, max_prompt_size, model_name, loaded_model, tokenizer_name) messages = truncate_messages(messages, max_prompt_size, model_name, loaded_model, tokenizer_name)
# Reset context message role to assistant
for message in messages:
if message.role == "context":
message.role = "user"
# Return message in chronological order # Return message in chronological order
return messages[::-1] return messages[::-1]