This commit is contained in:
Timothy Jaeryang Baek
2026-06-29 00:19:47 -05:00
parent 2560533c1a
commit cfb49c4c18

View File

@@ -2985,7 +2985,15 @@ async def process_chat_payload(request, form_data, user, metadata, model):
# restore to the true original (before file-source injection) rather
# than a snapshot that already has the RAG template baked in.
system_message = get_system_message(form_data['messages'])
metadata['system_prompt'] = get_content_from_message(system_message) if system_message else None
system_content = get_content_from_message(system_message) if system_message else ''
model_system_prompt = await resolve_system_prompt(
(form_data.get('params') or {}).get('system'),
metadata,
user,
)
if model_system_prompt:
system_content = f'{model_system_prompt}\n{system_content}' if system_content else model_system_prompt
metadata['system_prompt'] = system_content or None
metadata['user_prompt'] = get_last_user_message(form_data['messages'])
metadata['sources'] = sources[:] if sources else []
@@ -4864,10 +4872,19 @@ async def streaming_chat_response_handler(response, ctx):
original_user_message,
form_data['messages'],
)
replace_system_message_content(
original_system_content or '',
form_data['messages'],
)
if original_system_content is not None:
if get_system_message(form_data['messages']):
replace_system_message_content(
original_system_content,
form_data['messages'],
)
else:
form_data['messages'] = add_or_update_system_message(
original_system_content,
form_data['messages'],
)
else:
replace_system_message_content('', form_data['messages'])
# Build context: file sources with content,
# tool sources as citation markers only.