[Bugfix][DeepSeek V4] Handle trailing system messages in prompt rendering (#51262)

Signed-off-by: jiahaoliang <gzliangjiahao@gmail.com>
Signed-off-by: Jiahao Liang <gzliangjiahao@gmail.com>
Co-authored-by: Chauncey <chaunceyjiang@gmail.com>
This commit is contained in:
Jiahao Liang
2026-08-25 07:49:44 +00:00
committed by GitHub
co-authored by Chauncey
parent 23310bc3de
commit 59d7fc92ea
4 changed files with 150 additions and 3 deletions
@@ -110,7 +110,7 @@ pub(super) fn render_request(request: &ChatRequest) -> Result<String> {
}
}
if is_user_like_entry(message)
if (is_user_like_entry(message) || matches!(message, ChatMessage::System { .. }))
&& next_rendered_entry_is_assistant_or_end(request.messages.as_slice(), message_index)
{
write_assistant_transition(
@@ -423,7 +423,7 @@ fn write_tool_result(out: &mut String, content: &ChatContent) -> Result<()> {
Ok(())
}
/// Append the assistant transition token after a user-like turn.
/// Append the assistant transition token after a user-like or system turn.
fn write_assistant_transition(
out: &mut String,
thinking_mode: ThinkingMode,
@@ -195,6 +195,68 @@ fn reasoning_effort_none_disables_thinking() {
.assert_eq(&rendered);
}
#[test]
fn system_to_assistant_transitions_in_chat_and_thinking_modes() {
let rendered = [false, true].map(|enable_thinking| {
let mut request = ChatRequest {
messages: vec![
ChatMessage::system("rules"),
ChatMessage::assistant_blocks(vec![
AssistantContentBlock::Reasoning {
text: "reason".to_string(),
},
AssistantContentBlock::Text {
text: "answer".to_string(),
},
]),
],
..ChatRequest::for_test()
};
request
.chat_options
.template_kwargs
.insert("enable_thinking".to_string(), Value::Bool(enable_thinking));
request.chat_options.reasoning_effort = Some(ReasoningEffort::Low);
render_request(&request)
});
expect![[r#"
[
"<|begin▁of▁sentence|>rules<|Assistant|></think>answer<|end▁of▁sentence|>",
"<|begin▁of▁sentence|>rules<|Assistant|><think>reason</think>answer<|end▁of▁sentence|>",
]
"#]]
.assert_debug_eq(&rendered);
}
#[test]
fn trailing_system_transitions_in_chat_and_thinking_modes() {
let rendered = [false, true].map(|enable_thinking| {
let mut request = ChatRequest {
messages: vec![
ChatMessage::system("rules"),
ChatMessage::user("question"),
ChatMessage::system("final rules"),
],
..ChatRequest::for_test()
};
request
.chat_options
.template_kwargs
.insert("enable_thinking".to_string(), Value::Bool(enable_thinking));
request.chat_options.reasoning_effort = Some(ReasoningEffort::Low);
render_request(&request)
});
expect![[r#"
[
"<|begin▁of▁sentence|>rules<|User|>questionfinal rules<|Assistant|></think>",
"<|begin▁of▁sentence|>rules<|User|>questionfinal rules<|Assistant|><think>",
]
"#]]
.assert_debug_eq(&rendered);
}
#[test]
fn reasoning_effort_template_kwarg_is_ignored() {
let mut request = ChatRequest {