[Bugfix][Rust Frontend] Alias qwen3_xml to qwen3_coder and add qwen3_json for the Qwen JSON format (#60136)

Signed-off-by: Bugen Zhao <i@bugenzhao.com>
Co-authored-by: Bugen Zhao <i@bugenzhao.com>
This commit is contained in:
Liana Koleva
2026-10-12 20:20:53 +08:00
committed by GitHub
co-authored by Bugen Zhao
parent 8d7b93fec2
commit aa1d44df16
12 changed files with 103 additions and 68 deletions
+1 -1
View File
@@ -53,7 +53,7 @@ harness = false
required-features = ["test-util"]
[[bench]]
name = "qwen3_xml"
name = "qwen3_json"
harness = false
required-features = ["test-util"]
@@ -6,7 +6,7 @@ use std::time::Duration;
use criterion::{BatchSize, Criterion, Throughput, black_box, criterion_group, criterion_main};
use tool_parser::parsers::QwenParser as ExternalQwenParser;
use vllm_parser::tool::test_utils::{split_by_chars, test_tools};
use vllm_parser::tool::{Qwen3XmlToolParser, Tool, ToolParser};
use vllm_parser::tool::{Qwen3JsonToolParser, Tool, ToolParser};
mod utils;
use utils::{feed_external_parser, feed_parser, openai_tools};
@@ -27,12 +27,12 @@ fn mixed_fixture() -> String {
}
fn long_normal_text_fixture() -> String {
let line = "This is ordinary assistant text with no Qwen XML tool markers at all.\n";
let line = "This is ordinary assistant text with no Qwen3 JSON tool markers at all.\n";
line.repeat(LONG_NORMAL_TEXT_REPEATS)
}
fn native_parser(tools: &[Tool]) -> Box<dyn ToolParser> {
Qwen3XmlToolParser::create(tools).expect("Qwen XML parser should initialize")
Qwen3JsonToolParser::create(tools).expect("Qwen3 JSON parser should initialize")
}
fn run_stream_group(
@@ -98,14 +98,14 @@ fn run_stream_group(
group.finish();
}
fn bench_qwen3_xml(c: &mut Criterion) {
fn bench_qwen3_json(c: &mut Criterion) {
let tools = test_tools();
let mixed_text = mixed_fixture();
let long_normal_text = long_normal_text_fixture();
run_stream_group(
c,
"qwen3_xml/mixed_text_tool_call",
"qwen3_json/mixed_text_tool_call",
&tools,
&mixed_text,
CHUNK_CHARS,
@@ -115,7 +115,7 @@ fn bench_qwen3_xml(c: &mut Criterion) {
run_stream_group(
c,
"qwen3_xml/long_normal_text",
"qwen3_json/long_normal_text",
&tools,
&long_normal_text,
CHUNK_CHARS,
@@ -124,5 +124,5 @@ fn bench_qwen3_xml(c: &mut Criterion) {
);
}
criterion_group!(benches, bench_qwen3_xml);
criterion_group!(benches, bench_qwen3_json);
criterion_main!(benches);
+1 -1
View File
@@ -9,7 +9,7 @@ pub use internlm2::Internlm2ToolParser;
pub use llama::Llama3JsonToolParser;
pub use mistral::MistralToolParser;
pub use phi4mini::Phi4MiniJsonToolParser;
pub use qwen::Qwen3XmlToolParser;
pub use qwen::Qwen3JsonToolParser;
mod granite4;
mod hermes;
+39 -38
View File
@@ -4,8 +4,8 @@
use super::{JsonToolCallConfig, JsonToolCallParser, JsonToolCallWhitespace};
use crate::tool::{Result, StructuralTagBuilder, Tool, ToolParser, ToolParserOutput};
const QWEN_XML_CONFIG: JsonToolCallConfig = JsonToolCallConfig {
parser_name: "Qwen XML",
const QWEN3_JSON_CONFIG: JsonToolCallConfig = JsonToolCallConfig {
parser_name: "Qwen3 JSON",
start_marker: "<tool_call>",
framed_start_marker: Some("\n<tool_call>"),
end_marker: "</tool_call>",
@@ -15,7 +15,8 @@ const QWEN_XML_CONFIG: JsonToolCallConfig = JsonToolCallConfig {
arguments_key: &["arguments"],
};
/// Tool parser for Qwen XML-wrapped JSON tool calls.
/// Tool parser for Qwen2.5, QwQ and Qwen3 JSON tool calls wrapped in
/// `<tool_call>` tags.
///
/// Example tool call content:
///
@@ -30,20 +31,20 @@ const QWEN_XML_CONFIG: JsonToolCallConfig = JsonToolCallConfig {
///
/// Note: parallel calls are represented as repeated
/// `<tool_call>...</tool_call>` blocks, not as multiple calls inside one tag.
pub struct Qwen3XmlToolParser {
pub struct Qwen3JsonToolParser {
inner: JsonToolCallParser,
}
impl Qwen3XmlToolParser {
/// Create a Qwen XML tool parser.
impl Qwen3JsonToolParser {
/// Create a Qwen3 JSON tool parser.
fn new(_tools: &[Tool]) -> Self {
Self {
inner: JsonToolCallParser::new(QWEN_XML_CONFIG),
inner: JsonToolCallParser::new(QWEN3_JSON_CONFIG),
}
}
}
impl ToolParser for Qwen3XmlToolParser {
impl ToolParser for Qwen3JsonToolParser {
fn create(tools: &[Tool]) -> Result<Box<dyn ToolParser>>
where
Self: Sized + 'static,
@@ -73,7 +74,7 @@ mod tests {
use expect_test::expect;
use thiserror_ext::AsReport;
use super::Qwen3XmlToolParser;
use super::Qwen3JsonToolParser;
use crate::tool::test_utils::{collect_stream, split_by_chars, test_tools};
use crate::tool::tests::assert_tool_framing_preserves_body_whitespace;
use crate::tool::{ToolParser, ToolParserOutput, ToolParserTestExt as _};
@@ -85,8 +86,8 @@ mod tests {
}
#[test]
fn qwen_xml_parse_complete_without_tool_call_keeps_text() {
let mut parser = Qwen3XmlToolParser::new(&test_tools());
fn qwen3_json_parse_complete_without_tool_call_keeps_text() {
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let output = parser.parse_complete("Hello, world!").unwrap();
assert_eq!(output.normal_text(), "Hello, world!");
@@ -94,8 +95,8 @@ mod tests {
}
#[test]
fn qwen_xml_parse_complete_extracts_raw_json_arguments() {
let mut parser = Qwen3XmlToolParser::new(&test_tools());
fn qwen3_json_parse_complete_extracts_raw_json_arguments() {
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let arguments = r#"{ "location": "Tokyo", "days": "3" }"#;
let output = parser
.parse_complete(&format!(
@@ -112,8 +113,8 @@ mod tests {
}
#[test]
fn qwen_xml_does_not_validate_or_normalize_arguments() {
let mut parser = Qwen3XmlToolParser::new(&test_tools());
fn qwen3_json_does_not_validate_or_normalize_arguments() {
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let arguments = r#"{"location":"Tokyo",}"#;
let output = parser.parse_complete(&build_tool_call("get_weather", arguments)).unwrap();
@@ -121,8 +122,8 @@ mod tests {
}
#[test]
fn qwen_xml_streaming_emits_argument_deltas() {
let mut parser = Qwen3XmlToolParser::new(&test_tools());
fn qwen3_json_streaming_emits_argument_deltas() {
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let chunks = [
"<tool_call>",
"\n{\"name\": \"get_weather\", \"arguments\": ",
@@ -154,13 +155,13 @@ mod tests {
}
#[test]
fn qwen_xml_streaming_handles_split_markers() {
fn qwen3_json_streaming_handles_split_markers() {
let input = format!(
"hello {}",
build_tool_call("get_weather", r#"{"location":"Tokyo"}"#)
);
let chunks = split_by_chars(&input, 5);
let mut parser = Qwen3XmlToolParser::new(&test_tools());
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let output = collect_stream(&mut parser, &chunks);
@@ -170,8 +171,8 @@ mod tests {
}
#[test]
fn qwen_xml_keeps_end_marker_literal_inside_json_string() {
let mut parser = Qwen3XmlToolParser::new(&test_tools());
fn qwen3_json_keeps_end_marker_literal_inside_json_string() {
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let arguments = r#"{"text":"literal </tool_call> inside"}"#;
let output = parser.parse_complete(&build_tool_call("echo", arguments)).unwrap();
@@ -180,8 +181,8 @@ mod tests {
}
#[test]
fn qwen_xml_decodes_escaped_function_name() {
let mut parser = Qwen3XmlToolParser::new(&test_tools());
fn qwen3_json_decodes_escaped_function_name() {
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let output = parser
.parse_complete(
r#"<tool_call>
@@ -194,8 +195,8 @@ mod tests {
}
#[test]
fn qwen_xml_requires_newline_after_tool_call_start() {
let mut parser = Qwen3XmlToolParser::new(&test_tools());
fn qwen3_json_requires_newline_after_tool_call_start() {
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let input = r#"<tool_call>{"name":"get_weather","arguments":{}}
</tool_call>"#;
@@ -206,12 +207,12 @@ mod tests {
}
#[test]
fn qwen_xml_streams_start_marker_without_newline_as_text() {
fn qwen3_json_streams_start_marker_without_newline_as_text() {
for chunk in [
"<tool_call>{\"name\":\"get_weather\"",
"hi\n<tool_call>{\"name\":\"get_weather\"",
] {
let mut parser = Qwen3XmlToolParser::new(&test_tools());
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let mut output = ToolParserOutput::default();
parser.parse_into(chunk, &mut output).unwrap();
@@ -223,8 +224,8 @@ mod tests {
}
#[test]
fn qwen_xml_requires_newline_before_tool_call_end() {
let mut parser = Qwen3XmlToolParser::new(&test_tools());
fn qwen3_json_requires_newline_before_tool_call_end() {
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let error = parser
.parse_complete(
r#"<tool_call>
@@ -236,14 +237,14 @@ mod tests {
}
#[test]
fn qwen_xml_streaming_extracts_multiple_tool_calls() {
fn qwen3_json_streaming_extracts_multiple_tool_calls() {
let input = format!(
"{}{}",
build_tool_call("get_weather", r#"{"location":"Shanghai"}"#),
build_tool_call("add", r#"{"x":1,"y":2}"#),
);
let chunks = split_by_chars(&input, 7);
let mut parser = Qwen3XmlToolParser::new(&test_tools());
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let output = collect_stream(&mut parser, &chunks);
@@ -275,8 +276,8 @@ mod tests {
}
#[test]
fn qwen_xml_finish_fails_incomplete_tool_call() {
let mut parser = Qwen3XmlToolParser::new(&test_tools());
fn qwen3_json_finish_fails_incomplete_tool_call() {
let mut parser = Qwen3JsonToolParser::new(&test_tools());
parser
.parse_chunk(
r#"<tool_call>
@@ -286,13 +287,13 @@ mod tests {
let error = parser.finish().unwrap_err();
expect!["tool parser parsing failed: incomplete Qwen XML tool call"]
expect!["tool parser parsing failed: incomplete Qwen3 JSON tool call"]
.assert_eq(&error.to_report_string());
}
#[test]
fn qwen_xml_malformed_field_order_fails_fast() {
let mut parser = Qwen3XmlToolParser::new(&test_tools());
fn qwen3_json_malformed_field_order_fails_fast() {
let mut parser = Qwen3JsonToolParser::new(&test_tools());
let error = parser
.parse_chunk(
r#"<tool_call>
@@ -302,14 +303,14 @@ mod tests {
.unwrap_err();
expect![[r#"
tool parser parsing failed: near "{\"arguments\":{},\"name\":\"get_weather\"}\n</tool_call>": invalid Qwen XML
tool parser parsing failed: near "{\"arguments\":{},\"name\":\"get_weather\"}\n</tool_call>": invalid Qwen3 JSON
expected `name`"#]]
.assert_eq(&error.to_report_string());
}
#[test]
fn tool_framing_preserves_body_whitespace_across_chunk_boundaries() {
assert_tool_framing_preserves_body_whitespace::<Qwen3XmlToolParser>(
assert_tool_framing_preserves_body_whitespace::<Qwen3JsonToolParser>(
"\n",
"<tool_call>\n{\"name\":\"get_weather\",\"arguments\":{}}\n</tool_call>",
);
+1 -1
View File
@@ -29,7 +29,7 @@ pub use glm_xml::{Glm45MoeToolParser, Glm47MoeToolParser};
pub(crate) use hy::{HyDialect, HyToolMarkers, HyToolParser};
pub use json::{
Granite4ToolParser, HermesToolParser, Internlm2ToolParser, Llama3JsonToolParser,
MistralToolParser, Phi4MiniJsonToolParser, Qwen3XmlToolParser,
MistralToolParser, Phi4MiniJsonToolParser, Qwen3JsonToolParser,
};
pub use kimi_k2::KimiK2ToolParser;
pub use mimo::MiMoToolParser;
+8 -8
View File
@@ -186,7 +186,7 @@ mod tests {
use crate::tool::{
DeepSeekV3ToolParser, DeepSeekV4ToolParser, DeepSeekV31ToolParser, DeepSeekV32ToolParser,
Glm47MoeToolParser, KimiK2ToolParser, MinimaxM2ToolParser, Qwen3CoderToolParser,
Qwen3XmlToolParser, Tool, ToolParser,
Qwen3JsonToolParser, Tool, ToolParser,
};
use crate::unified::{UnifiedParser, UnifiedParserEvent, UnifiedParserOutput};
@@ -463,7 +463,7 @@ mod tests {
#[test]
fn combined_parser_emits_tool_calls_from_visible_content() {
let tool = Qwen3XmlToolParser::create(&test_tools()).unwrap();
let tool = Qwen3JsonToolParser::create(&test_tools()).unwrap();
let mut parser = CombinedParser::new(None, Some(tool));
let output = collect(
@@ -515,7 +515,7 @@ mod tests {
#[test]
fn split_parser_wrappers_match_builder_full_formats() {
assert_builder_parity::<Qwen3ReasoningParser, Qwen3XmlToolParser>("qwen3");
assert_builder_parity::<Qwen3ReasoningParser, Qwen3JsonToolParser>("qwen3");
assert_builder_parity::<Qwen3ReasoningParser, Qwen3CoderToolParser>("qwen3.5");
assert_builder_parity::<DeepSeekR1ReasoningParser, DeepSeekV3ToolParser>("deepseek-r1");
assert_builder_parity::<DeepSeekV3ReasoningParser, DeepSeekV31ToolParser>("deepseek-v3.1");
@@ -538,7 +538,7 @@ mod tests {
answer: None,
};
let reasoning = Qwen3ReasoningParser::create(Arc::new(tokenizer())).unwrap();
let tool = Qwen3XmlToolParser::create(&tools).unwrap();
let tool = Qwen3JsonToolParser::create(&tools).unwrap();
let visible = tool.build_visible_format(&ctx).unwrap().unwrap();
let mut parser = CombinedParser::new(Some(reasoning), Some(tool));
parser.initialize(&[]).unwrap();
@@ -640,7 +640,7 @@ mod tests {
};
let tokenizer = Arc::new(tokenizer());
let reasoning = Qwen3ReasoningParser::create(tokenizer.clone()).unwrap();
let tool = Qwen3XmlToolParser::create(&tools).unwrap();
let tool = Qwen3JsonToolParser::create(&tools).unwrap();
let mut parser = CombinedParser::new(Some(reasoning), Some(tool));
parser.initialize(&[]).unwrap();
let outside = parser.build_output_grammar(&ctx).unwrap().unwrap().format;
@@ -682,7 +682,7 @@ mod tests {
fn qwen3_parser(tools: &[Tool], with_tool: bool) -> CombinedParser {
let reasoning = Qwen3ReasoningParser::create(Arc::new(tokenizer())).unwrap();
let tool = with_tool.then(|| Qwen3XmlToolParser::create(tools).unwrap());
let tool = with_tool.then(|| Qwen3JsonToolParser::create(tools).unwrap());
let mut parser = CombinedParser::new(Some(reasoning), tool);
parser.initialize(&[]).unwrap();
parser
@@ -702,7 +702,7 @@ mod tests {
])
};
let required = ToolChoice::required();
let required_calls = Qwen3XmlToolParser::create(&tools)
let required_calls = Qwen3JsonToolParser::create(&tools)
.unwrap()
.build_visible_format(&grammar_ctx(&tools, &required, None))
.unwrap()
@@ -748,7 +748,7 @@ mod tests {
let ctx = grammar_ctx(&tools, &auto, Some(&answer));
assert!(parser.build_output_grammar(&ctx).unwrap().is_none());
let parser = CombinedParser::new(None, Some(Qwen3XmlToolParser::create(&tools).unwrap()));
let parser = CombinedParser::new(None, Some(Qwen3JsonToolParser::create(&tools).unwrap()));
let ctx = grammar_ctx(&tools, &none, Some(&answer));
let alone = parser.build_output_grammar(&ctx).unwrap().unwrap();
assert_eq!(alone, BuiltOutputGrammar::final_output_only(answer.clone()));