[Frontend][Bugfix] Use default tool call IDs for Kimi K3 for conversation-level uniqueness (#50420)

Signed-off-by: Bugen Zhao <i@bugenzhao.com>
This commit is contained in:
Bugen Zhao
2026-07-31 10:02:17 +08:00
committed by GitHub
parent f1899b2ffd
commit ab98034d4c
5 changed files with 55 additions and 53 deletions
@@ -126,7 +126,7 @@ pub(super) fn render_request(request: &ChatRequest, tokenizer: &dyn Tokenizer) -
resolved.sort_by_key(|item| (item.0, item.1));
}
for (xtml_index, (_, _, content, name)) in resolved.into_iter().enumerate() {
for (position, _, content, name) in resolved {
let tool_name = name.as_deref().ok_or_else(|| {
Error::ChatTemplate(
"Kimi K3 tool messages need a resolvable tool name: \
@@ -135,7 +135,7 @@ pub(super) fn render_request(request: &ChatRequest, tokenizer: &dyn Tokenizer) -
.to_string(),
)
})?;
write_tool_message(out, tool_name, xtml_index + 1, &content)?;
write_tool_message(out, tool_name, position, &content)?;
}
Ok(())
};
+30 -1
View File
@@ -14,11 +14,11 @@ use vllm_tokenizer::Tokenizer;
use vllm_tokenizer::test_utils::TestTokenizer;
use super::KimiK3ChatRenderer;
use crate::AssistantContentBlock;
use crate::ChatRenderer;
use crate::renderer::kimi_k3::encoding::{CLOSE, END_OF_MSG, IMAGE_PLACEHOLDER, OPEN, SEP};
use crate::renderer::test_utils::{FixtureRequestOptions, fixture_chat_request};
use crate::request::{ChatContentPart, ChatMessage, GenerationPromptMode, ReasoningEffort};
use crate::{AssistantContentBlock, AssistantToolCall};
const OPEN_ID: u32 = 256;
const CLOSE_ID: u32 = 257;
@@ -178,6 +178,35 @@ fn non_thinking_history_omits_reasoning_channel() {
));
}
#[test]
fn partial_tool_results_keep_assistant_call_position() {
let mut request = crate::request::ChatRequest::for_test();
request.messages = vec![
ChatMessage::assistant_blocks(vec![
AssistantContentBlock::ToolCall(AssistantToolCall {
id: "call-a".to_string(),
name: "weather".to_string(),
arguments: "{}".to_string(),
}),
AssistantContentBlock::ToolCall(AssistantToolCall {
id: "call-b".to_string(),
name: "search".to_string(),
arguments: "{}".to_string(),
}),
]),
ChatMessage::tool_response("result-b", "call-b"),
];
request.chat_options.generation_prompt_mode = GenerationPromptMode::NoGenerationPrompt;
let rendered = render_request(&request);
assert!(rendered.contains("<|open|>call tool=\"search\" index=\"2\"<|sep|>"));
assert!(
rendered
.contains("<|open|>message role=\"tool\" tool=\"search\" index=\"2\"<|sep|>result-b")
);
}
#[test]
fn defaults_thinking_effort_to_max() {
let rendered = render_request(&crate::request::ChatRequest::for_test());