[Rust Frontend] Add reasoning/tool parser & renderer roundtrip tests (#43582)
Signed-off-by: Bugen Zhao <i@bugenzhao.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
use winnow::ascii::{multispace0 as ws0, multispace1 as ws1};
|
||||
use winnow::combinator::{alt, delimited, repeat, seq, terminated};
|
||||
use winnow::combinator::{alt, delimited, eof, repeat, seq, terminated};
|
||||
use winnow::prelude::*;
|
||||
use winnow::stream::Partial;
|
||||
use winnow::token::{literal, rest, take_until};
|
||||
@@ -183,16 +183,17 @@ fn tool_block_end_event(input: &mut MinimaxM2Input<'_>) -> ModalResult<MinimaxM2
|
||||
|
||||
/// Parse a complete MiniMax M2 invoke block.
|
||||
fn invoke_event(input: &mut MinimaxM2Input<'_>) -> ModalResult<MinimaxM2Event> {
|
||||
let (name, raw_params) = seq!(
|
||||
let (name, body) = seq!(
|
||||
_: ws0,
|
||||
_: literal(INVOKE_START),
|
||||
_: (ws1, literal("name=")),
|
||||
attr_value,
|
||||
partial_attr_value,
|
||||
_: literal(">"),
|
||||
repeat(0.., terminated(parameter, ws0)),
|
||||
take_until(0.., INVOKE_END),
|
||||
_: literal(INVOKE_END),
|
||||
)
|
||||
.parse_next(input)?;
|
||||
let raw_params = parse_invoke_params(body)?;
|
||||
|
||||
Ok(MinimaxM2Event::Invoke {
|
||||
name: name.trim().to_string(),
|
||||
@@ -200,8 +201,14 @@ fn invoke_event(input: &mut MinimaxM2Input<'_>) -> ModalResult<MinimaxM2Event> {
|
||||
})
|
||||
}
|
||||
|
||||
/// Parse all parameter blocks inside a complete MiniMax M2 invoke body.
|
||||
fn parse_invoke_params(invoke_body: &str) -> ModalResult<Vec<(String, String)>> {
|
||||
let mut input = invoke_body;
|
||||
delimited(ws0, repeat(0.., terminated(parameter, ws0)), eof).parse_next(&mut input)
|
||||
}
|
||||
|
||||
/// Parse a MiniMax M2 parameter block.
|
||||
fn parameter(input: &mut MinimaxM2Input<'_>) -> ModalResult<(String, String)> {
|
||||
fn parameter(input: &mut &str) -> ModalResult<(String, String)> {
|
||||
let (name, value) = seq!(
|
||||
_: literal(PARAMETER_START),
|
||||
_: (ws1, literal("name=")),
|
||||
@@ -216,7 +223,17 @@ fn parameter(input: &mut MinimaxM2Input<'_>) -> ModalResult<(String, String)> {
|
||||
}
|
||||
|
||||
/// Parse a quoted or unquoted XML attribute value.
|
||||
fn attr_value<'i>(input: &mut MinimaxM2Input<'i>) -> ModalResult<&'i str> {
|
||||
fn attr_value<'i>(input: &mut &'i str) -> ModalResult<&'i str> {
|
||||
alt((
|
||||
delimited(literal("\""), take_until(1.., "\""), literal("\"")),
|
||||
delimited(literal("'"), take_until(1.., "'"), literal("'")),
|
||||
take_until(1.., ">"),
|
||||
))
|
||||
.parse_next(input)
|
||||
}
|
||||
|
||||
/// Parse a quoted or unquoted XML attribute value from partial streaming input.
|
||||
fn partial_attr_value<'i>(input: &mut MinimaxM2Input<'i>) -> ModalResult<&'i str> {
|
||||
alt((
|
||||
delimited(literal("\""), take_until(1.., "\""), literal("\"")),
|
||||
delimited(literal("'"), take_until(1.., "'"), literal("'")),
|
||||
@@ -470,6 +487,31 @@ mod tests {
|
||||
assert_eq!(result.calls[1].tool_index, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn minimax_m2_streaming_handles_template_whitespace_and_split_parameters() {
|
||||
let text = concat!(
|
||||
"I will call the tools.\n",
|
||||
"<minimax:tool_call>\n",
|
||||
"<invoke name=\"get_weather\">\n",
|
||||
"<parameter name=\"city\">Seattle</parameter>\n",
|
||||
"</invoke>\n",
|
||||
"<invoke name=\"get_weather\">\n",
|
||||
"<parameter name=\"city\">NYC</parameter>\n",
|
||||
"</invoke>\n",
|
||||
"</minimax:tool_call>",
|
||||
);
|
||||
let chunks = split_by_chars(text, 7);
|
||||
let mut parser = MinimaxM2ToolParser::new(&test_tools());
|
||||
let result = collect_stream(&mut parser, &chunks);
|
||||
|
||||
assert_eq!(result.normal_text, "I will call the tools.\n");
|
||||
assert_eq!(result.calls.len(), 2);
|
||||
assert_eq!(result.calls[0].tool_index, 0);
|
||||
assert_eq!(result.calls[0].name.as_deref(), Some("get_weather"));
|
||||
assert_eq!(result.calls[1].tool_index, 1);
|
||||
assert_eq!(result.calls[1].name.as_deref(), Some("get_weather"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn minimax_m2_streaming_ignores_text_after_tool_block() {
|
||||
let text = format!(
|
||||
|
||||
@@ -224,10 +224,11 @@ fn convert_value(param_type: &JsonParamType, value: &str) -> Option<Value> {
|
||||
|
||||
/// Convert one raw string value to a JSON number.
|
||||
fn convert_number(value: &str) -> Option<Value> {
|
||||
if let Ok(parsed) = value.parse::<i64>() {
|
||||
return Some(Value::Number(Number::from(parsed)));
|
||||
}
|
||||
Number::from_f64(value.parse::<f64>().ok()?).map(Value::Number)
|
||||
serde_json::from_str::<Number>(value)
|
||||
.or_else(|_| value.parse::<i64>().map(Number::from))
|
||||
.or_else(|_| value.parse::<f64>().ok().and_then(Number::from_f64).ok_or(()))
|
||||
.ok()
|
||||
.map(Value::Number)
|
||||
}
|
||||
|
||||
/// Convert one raw string value to a boolean.
|
||||
@@ -304,7 +305,7 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn number_conversion_parses_int_then_float() {
|
||||
fn number_conversion_preserves_json_number_spelling_with_legacy_fallback() {
|
||||
let params = ToolSchema::from_schema(&json!({
|
||||
"type": "object",
|
||||
"properties": {
|
||||
@@ -312,17 +313,23 @@ mod tests {
|
||||
}
|
||||
}));
|
||||
|
||||
assert_eq!(params.convert("value", "5"), json!(5));
|
||||
assert_eq!(params.convert("value", "5.0"), json!(5.0));
|
||||
assert_eq!(params.convert("value", "5."), json!(5.0));
|
||||
assert_eq!(params.convert("value", "+1"), json!(1));
|
||||
assert_eq!(params.convert("value", "+1.0"), json!(1.0));
|
||||
assert_eq!(converted_number_text(¶ms, "5"), "5");
|
||||
assert_eq!(converted_number_text(¶ms, "5.0"), "5.0");
|
||||
assert_eq!(converted_number_text(¶ms, "5.00"), "5.00");
|
||||
assert_eq!(converted_number_text(¶ms, "1e0"), "1e+0");
|
||||
assert_eq!(converted_number_text(¶ms, "5."), "5.0");
|
||||
assert_eq!(converted_number_text(¶ms, "+1"), "1");
|
||||
assert_eq!(converted_number_text(¶ms, "+1.0"), "1.0");
|
||||
assert_eq!(
|
||||
params.convert("value", "9223372036854775807.5"),
|
||||
json!(9223372036854775808.0)
|
||||
converted_number_text(¶ms, "9223372036854775807.5"),
|
||||
"9223372036854775807.5"
|
||||
);
|
||||
}
|
||||
|
||||
fn converted_number_text(params: &ToolSchema, value: &str) -> String {
|
||||
serde_json::to_string(¶ms.convert("value", value)).unwrap()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn converts_upstream_aliases() {
|
||||
let params = ToolSchema::from_schema(&json!({
|
||||
|
||||
Reference in New Issue
Block a user