mirror of
https://github.com/khoj-ai/khoj.git
synced 2024-11-23 15:38:55 +01:00
Fix Khoj responses when code generated charts in response context
The current fix should improve Khoj responses when charts in response context. It truncates code context before sharing with response chat actors. Previously Khoj would respond with it not being able to create chart but than have a generated chart in it's response in default mode. The truncate code context was added to research chat actor for decision making but it wasn't added to conversation response generation chat actors. When khoj generated charts with code for its response, the images in the context would exceed context window limits. So the truncation logic to drop all past context, including chat history, context gathered for current response. This would result in chat response generator 'forgetting' all for the current response when code generated images, charts in response context.
This commit is contained in:
parent
5475a262d4
commit
b9a889ab69
4 changed files with 29 additions and 7 deletions
|
@ -19,7 +19,11 @@ from khoj.processor.conversation.utils import (
|
||||||
generate_chatml_messages_with_context,
|
generate_chatml_messages_with_context,
|
||||||
messages_to_print,
|
messages_to_print,
|
||||||
)
|
)
|
||||||
from khoj.utils.helpers import ConversationCommand, is_none_or_empty
|
from khoj.utils.helpers import (
|
||||||
|
ConversationCommand,
|
||||||
|
is_none_or_empty,
|
||||||
|
truncate_code_context,
|
||||||
|
)
|
||||||
from khoj.utils.rawconfig import LocationData
|
from khoj.utils.rawconfig import LocationData
|
||||||
from khoj.utils.yaml import yaml_dump
|
from khoj.utils.yaml import yaml_dump
|
||||||
|
|
||||||
|
@ -197,7 +201,9 @@ def converse_anthropic(
|
||||||
if ConversationCommand.Online in conversation_commands or ConversationCommand.Webpage in conversation_commands:
|
if ConversationCommand.Online in conversation_commands or ConversationCommand.Webpage in conversation_commands:
|
||||||
context_message += f"{prompts.online_search_conversation.format(online_results=yaml_dump(online_results))}\n\n"
|
context_message += f"{prompts.online_search_conversation.format(online_results=yaml_dump(online_results))}\n\n"
|
||||||
if ConversationCommand.Code in conversation_commands and not is_none_or_empty(code_results):
|
if ConversationCommand.Code in conversation_commands and not is_none_or_empty(code_results):
|
||||||
context_message += f"{prompts.code_executed_context.format(code_results=str(code_results))}\n\n"
|
context_message += (
|
||||||
|
f"{prompts.code_executed_context.format(code_results=truncate_code_context(code_results))}\n\n"
|
||||||
|
)
|
||||||
context_message = context_message.strip()
|
context_message = context_message.strip()
|
||||||
|
|
||||||
# Setup Prompt with Primer or Conversation History
|
# Setup Prompt with Primer or Conversation History
|
||||||
|
|
|
@ -19,7 +19,11 @@ from khoj.processor.conversation.utils import (
|
||||||
generate_chatml_messages_with_context,
|
generate_chatml_messages_with_context,
|
||||||
messages_to_print,
|
messages_to_print,
|
||||||
)
|
)
|
||||||
from khoj.utils.helpers import ConversationCommand, is_none_or_empty
|
from khoj.utils.helpers import (
|
||||||
|
ConversationCommand,
|
||||||
|
is_none_or_empty,
|
||||||
|
truncate_code_context,
|
||||||
|
)
|
||||||
from khoj.utils.rawconfig import LocationData
|
from khoj.utils.rawconfig import LocationData
|
||||||
from khoj.utils.yaml import yaml_dump
|
from khoj.utils.yaml import yaml_dump
|
||||||
|
|
||||||
|
@ -208,7 +212,9 @@ def converse_gemini(
|
||||||
if ConversationCommand.Online in conversation_commands or ConversationCommand.Webpage in conversation_commands:
|
if ConversationCommand.Online in conversation_commands or ConversationCommand.Webpage in conversation_commands:
|
||||||
context_message += f"{prompts.online_search_conversation.format(online_results=yaml_dump(online_results))}\n\n"
|
context_message += f"{prompts.online_search_conversation.format(online_results=yaml_dump(online_results))}\n\n"
|
||||||
if ConversationCommand.Code in conversation_commands and not is_none_or_empty(code_results):
|
if ConversationCommand.Code in conversation_commands and not is_none_or_empty(code_results):
|
||||||
context_message += f"{prompts.code_executed_context.format(code_results=str(code_results))}\n\n"
|
context_message += (
|
||||||
|
f"{prompts.code_executed_context.format(code_results=truncate_code_context(code_results))}\n\n"
|
||||||
|
)
|
||||||
context_message = context_message.strip()
|
context_message = context_message.strip()
|
||||||
|
|
||||||
# Setup Prompt with Primer or Conversation History
|
# Setup Prompt with Primer or Conversation History
|
||||||
|
|
|
@ -24,6 +24,7 @@ from khoj.utils.helpers import (
|
||||||
in_debug_mode,
|
in_debug_mode,
|
||||||
is_none_or_empty,
|
is_none_or_empty,
|
||||||
is_promptrace_enabled,
|
is_promptrace_enabled,
|
||||||
|
truncate_code_context,
|
||||||
)
|
)
|
||||||
from khoj.utils.rawconfig import LocationData
|
from khoj.utils.rawconfig import LocationData
|
||||||
from khoj.utils.yaml import yaml_dump
|
from khoj.utils.yaml import yaml_dump
|
||||||
|
@ -211,7 +212,9 @@ def converse_offline(
|
||||||
|
|
||||||
context_message += f"{prompts.online_search_conversation_offline.format(online_results=yaml_dump(simplified_online_results))}\n\n"
|
context_message += f"{prompts.online_search_conversation_offline.format(online_results=yaml_dump(simplified_online_results))}\n\n"
|
||||||
if ConversationCommand.Code in conversation_commands and not is_none_or_empty(code_results):
|
if ConversationCommand.Code in conversation_commands and not is_none_or_empty(code_results):
|
||||||
context_message += f"{prompts.code_executed_context.format(code_results=str(code_results))}\n\n"
|
context_message += (
|
||||||
|
f"{prompts.code_executed_context.format(code_results=truncate_code_context(code_results))}\n\n"
|
||||||
|
)
|
||||||
context_message = context_message.strip()
|
context_message = context_message.strip()
|
||||||
|
|
||||||
# Setup Prompt with Primer or Conversation History
|
# Setup Prompt with Primer or Conversation History
|
||||||
|
|
|
@ -17,7 +17,11 @@ from khoj.processor.conversation.utils import (
|
||||||
generate_chatml_messages_with_context,
|
generate_chatml_messages_with_context,
|
||||||
messages_to_print,
|
messages_to_print,
|
||||||
)
|
)
|
||||||
from khoj.utils.helpers import ConversationCommand, is_none_or_empty
|
from khoj.utils.helpers import (
|
||||||
|
ConversationCommand,
|
||||||
|
is_none_or_empty,
|
||||||
|
truncate_code_context,
|
||||||
|
)
|
||||||
from khoj.utils.rawconfig import LocationData
|
from khoj.utils.rawconfig import LocationData
|
||||||
from khoj.utils.yaml import yaml_dump
|
from khoj.utils.yaml import yaml_dump
|
||||||
|
|
||||||
|
@ -196,7 +200,10 @@ def converse(
|
||||||
if not is_none_or_empty(online_results):
|
if not is_none_or_empty(online_results):
|
||||||
context_message += f"{prompts.online_search_conversation.format(online_results=yaml_dump(online_results))}\n\n"
|
context_message += f"{prompts.online_search_conversation.format(online_results=yaml_dump(online_results))}\n\n"
|
||||||
if not is_none_or_empty(code_results):
|
if not is_none_or_empty(code_results):
|
||||||
context_message += f"{prompts.code_executed_context.format(code_results=str(code_results))}\n\n"
|
context_message += (
|
||||||
|
f"{prompts.code_executed_context.format(code_results=truncate_code_context(code_results))}\n\n"
|
||||||
|
)
|
||||||
|
|
||||||
context_message = context_message.strip()
|
context_message = context_message.strip()
|
||||||
|
|
||||||
# Setup Prompt with Primer or Conversation History
|
# Setup Prompt with Primer or Conversation History
|
||||||
|
|
Loading…
Reference in a new issue