[Bugfix] fix: stream Mimimax m2 tool call string arguments (#46382)
Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Flora Feng <4florafeng@gmail.com>
This commit is contained in:
co-authored by
mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Flora Feng
parent
6e3a983cf3
commit
efb5acffd5
@@ -38,13 +38,21 @@ INVOKE_END = "</invoke>"
|
|||||||
NAME_END_DQ = '">'
|
NAME_END_DQ = '">'
|
||||||
NAME_END_SQ = "'>"
|
NAME_END_SQ = "'>"
|
||||||
NAME_END_UNQUOTED = ">"
|
NAME_END_UNQUOTED = ">"
|
||||||
|
PARAM_START = "<parameter name="
|
||||||
|
PARAM_END = "</parameter>"
|
||||||
_PARAM_RE = re.compile(
|
_PARAM_RE = re.compile(
|
||||||
r"<\s*parameter\s+name\s*=\s*"
|
r"<\s*parameter\s+name\s*=\s*"
|
||||||
r"(?:\"(?P<dq_name>[^\"]*)\"|'(?P<sq_name>[^']*)'|(?P<bare_name>[^>\s]+))"
|
r"(?:\"(?P<dq_name>[^\"]*)\"|'(?P<sq_name>[^']*)'|(?P<bare_name>[^>\s]+))"
|
||||||
r"\s*>"
|
r"\s*>"
|
||||||
r"(?P<value>.*?)"
|
r"(?P<value>.*?)"
|
||||||
r"<\s*/\s*parameter\s*>",
|
r"(?:<\s*/\s*parameter\s*>|(?=<\s*parameter\s+name\s*=))",
|
||||||
|
re.DOTALL,
|
||||||
|
)
|
||||||
|
_PARTIAL_PARAM_RE = re.compile(
|
||||||
|
r"<\s*parameter\s+name\s*=\s*"
|
||||||
|
r"(?:\"(?P<dq_name>[^\"]*)\"|'(?P<sq_name>[^']*)'|(?P<bare_name>[^>\s]+))"
|
||||||
|
r"\s*>"
|
||||||
|
r"(?P<value>.*)$",
|
||||||
re.DOTALL,
|
re.DOTALL,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -63,6 +71,19 @@ def _minimax_m2_arg_converter(raw_args: str, partial: bool) -> str:
|
|||||||
continue
|
continue
|
||||||
params[name] = match.group("value").strip()
|
params[name] = match.group("value").strip()
|
||||||
|
|
||||||
|
if partial:
|
||||||
|
remaining = _PARAM_RE.sub("", raw_args)
|
||||||
|
match = _PARTIAL_PARAM_RE.search(remaining)
|
||||||
|
if match:
|
||||||
|
name = (
|
||||||
|
match.group("dq_name")
|
||||||
|
or match.group("sq_name")
|
||||||
|
or match.group("bare_name")
|
||||||
|
or ""
|
||||||
|
).strip()
|
||||||
|
if name:
|
||||||
|
params[name] = match.group("value").strip()
|
||||||
|
|
||||||
return json.dumps(params, ensure_ascii=False)
|
return json.dumps(params, ensure_ascii=False)
|
||||||
|
|
||||||
|
|
||||||
@@ -75,6 +96,8 @@ def minimax_m2_config() -> ParserEngineConfig:
|
|||||||
"THINK_START": THINK_START,
|
"THINK_START": THINK_START,
|
||||||
"THINK_END": THINK_END,
|
"THINK_END": THINK_END,
|
||||||
"TOOL_START": TOOL_CALL_START,
|
"TOOL_START": TOOL_CALL_START,
|
||||||
|
"PARAM_START": PARAM_START,
|
||||||
|
"PARAM_END": PARAM_END,
|
||||||
"TOOL_END": TOOL_CALL_END,
|
"TOOL_END": TOOL_CALL_END,
|
||||||
"INVOKE_PREFIX_DQ": INVOKE_PREFIX_DQ,
|
"INVOKE_PREFIX_DQ": INVOKE_PREFIX_DQ,
|
||||||
"INVOKE_PREFIX_SQ": INVOKE_PREFIX_SQ,
|
"INVOKE_PREFIX_SQ": INVOKE_PREFIX_SQ,
|
||||||
@@ -111,6 +134,14 @@ def minimax_m2_config() -> ParserEngineConfig:
|
|||||||
ParserState.TOOL_PREAMBLE,
|
ParserState.TOOL_PREAMBLE,
|
||||||
(),
|
(),
|
||||||
),
|
),
|
||||||
|
(ParserState.TOOL_ARGS, "PARAM_START"): Transition(
|
||||||
|
ParserState.TOOL_ARGS,
|
||||||
|
(EventType.ARG_VALUE_CHUNK,),
|
||||||
|
),
|
||||||
|
(ParserState.TOOL_ARGS, "PARAM_END"): Transition(
|
||||||
|
ParserState.TOOL_ARGS,
|
||||||
|
(EventType.ARG_VALUE_CHUNK,),
|
||||||
|
),
|
||||||
(ParserState.TOOL_PREAMBLE, "TOOL_END"): Transition(
|
(ParserState.TOOL_PREAMBLE, "TOOL_END"): Transition(
|
||||||
ParserState.CONTENT,
|
ParserState.CONTENT,
|
||||||
(),
|
(),
|
||||||
|
|||||||
Reference in New Issue
Block a user