* Studio: parse Mistral [TOOL_CALLS] and rehearsal tool-call shapes
Extends the rescue parsers in core/tool_healing.py and
core/inference/tool_call_parser.py to recognise two extra serialisations
local models commonly emit when bypassing native function calling:
* [TOOL_CALLS]name{json_args} (Devstral-Small-2, Mistral-Small-3.x).
* name[ARGS]{json_args} (reasoning-model rehearsal).
Both extractors use a brace-balance scan that honours escapes and
quoted strings so nested JSON args stay intact.
Also pre-strips <think>...</think> and [THINK]...[/THINK] blocks before
matching so calls emitted after a reasoning preamble are recognised
regardless of position.
Streaming gates (TOOL_XML_SIGNALS, llama_cpp.py _TOOL_XML_SIGNALS) and
the SSE strip regex (routes/inference.py _TOOL_XML_RE) gain the new
sentinels so the parser is actually invoked and the raw markup never
leaks to the UI.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Strip unclosed think blocks and catch rehearsal [ARGS] mid-buffer
The pre-existing ``_THINK_TAG_RE`` only matched closed thinking
blocks (``<think>...</think>`` or ``[THINK]...[/THINK]``). During
streaming the model is still inside the open block when the parser
runs, so any tool-shaped markup the model is REHEARSING inside that
block survived the strip and could be executed as a real call.
Switch both copies of the regex (parser + healing) to accept the
trailing block being terminated by end-of-string in addition to
the explicit closer.
The ``_TOOL_XML_SIGNALS`` list on the llama_cpp streaming buffer
included ``[ARGS]`` to catch rehearsal syntax, but the gate used a
``startswith`` check against the buffer head -- rehearsal is shaped
``name[ARGS]{json}``, so the buffer never STARTS with ``[ARGS]``
and the signal had no effect. Add a substring fallback for the
bracket-style signals so the BUFFERING window can still divert the
stream into DRAINING when rehearsal markup arrives mid-buffer.
Adds three regression tests covering rehearsal inside unclosed
``<think>`` / ``[THINK]`` blocks (must yield no calls) and the
positive case after a closed think block (still parsed).
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Studio: harden bracket-tag tool-call parsing and streaming strip
Address review findings on the Mistral [TOOL_CALLS] / rehearsal [ARGS] paths:
- Accept hyphenated tool names in the bracket parsers and strip patterns.
_MISTRAL_BRACKET_RE and _REHEARSAL_RE used \w+, which dropped or truncated
MCP function names containing dashes (mcp__srv__list-issues). Use [\w-]+ to
match the XML and Gemma parsers.
- Strip a partial bracket marker streamed before its opening brace. The
trailing-unclosed patterns required the {, so a [TOOL_CALLS]web_search or
python[ARGS] split across deltas leaked the raw marker to the UI. Match the
bare marker to end-of-text, mirroring how the bare open tags are stripped.
Closed pairs are unchanged so in-progress markup stays buffered until parsed.
- Strip a truncated bracket tail in the route-level display regex. _TOOL_XML_RE
required a balanced JSON object; a tool call truncated by EOS now strips up
to \Z, like the orphan-opening XML shapes. Complete calls still strip only
their balanced JSON so following prose survives.
Add regression tests for hyphenated names, the streaming partial-marker strip,
and the unclosed-tail route strip.
* Studio: preserve XML parameter indentation in tool_healing
The chat template emits <parameter=k>\nVALUE\n</parameter>; the parameter-start
regex consumed the wrapping newline AND the value's first-line indentation via a
trailing \s*, then str.strip() removed the rest, corrupting code/diff arguments.
Narrow the trailing class to horizontal whitespace and trim exactly one wrapping
newline (_trim_param_value), preserving indentation. Matches SGLang's qwen3_coder
detector and the same fix on the multi-format parser. Add a regression test.
* Studio: tighten Mistral/rehearsal tool-call comments
Compress the comments in the Mistral [TOOL_CALLS] / rehearsal [ARGS] healing shim
and its callers to one or two lines, keeping the bracket-tag stripping rationale,
the thinking-block handling note, and the forge attribution intact.
Comment-only: no code or behavior change (verified with comment_tools.py check
--strip-docstrings; tests green).
* Studio: fix think-strip arg corruption and nested bracket-JSON strip
Review follow-up for the Mistral/rehearsal healing shim:
- The <think>/[THINK] strip ran unconditionally over the whole content before
parsing, so a real tool argument that legitimately contained a <think> /
[THINK] literal was silently corrupted. Don't delete the blocks: compute the
reasoning-block spans and skip any tool-call candidate that STARTS inside one,
across all parse paths (JSON, Gemma, XML, bracket, rehearsal). A rehearsed call
inside reasoning is still ignored; a real call after </think> still parses.
- The bracket-tag display strip used a fixed one-level-nesting regex, so a call
with two-level-nested JSON args either leaked raw markup or, in final mode, let
the catch-all eat the trailing prose. Add a balanced-brace
_strip_bracket_tag_calls pass (any nesting depth) used by strip_tool_call_markup
and the route display strip.
Add regressions: <think>/[THINK] literal inside a real argument, rehearsal-inside-
think with a real call after, and two-level-nested bracket/rehearsal strip keeping
trailing prose.
* Studio: correct think-block comments to match span-skip behavior
The think-strip fix replaced the unconditional think-block strip with a
span-skip (the block is kept and any tool-call candidate starting inside it is
ignored), but two comments still described the old strip-first behavior. Update
the _THINK_TAG_RE comment and the parse_tool_calls_from_text docstring.
* Studio: parse Mistral arrays and call-ids, unify bracket parse/strip, keep it linear
- Parse the canonical Mistral array form (TOOL_CALLS followed by a JSON list of
calls) and emit every call; parse the v11 shape that carries an opaque CALL_ID
token between the name and ARGS (the function name is the token after
TOOL_CALLS, never the call-id); and parse a Mistral call plus a rehearsal call
in one message (the second was dropped yet still stripped from display).
- One shared balanced forward scan (_iter_bracket_spans) backs both the parser
and the strip path, so they no longer diverge. It is linear: each regex is
re-searched only once its cached match falls behind the cursor, replacing the
per-match full-tail re-scan that was O(n^2) (O(n^3) over a stream). A length cap
before the scan is a backstop.
- strip_tool_call_markup preserves think/reasoning blocks verbatim (the parser
skips tool markup inside them), stripping only the visible text around them.
- _in_think uses bisect over the sorted think spans (was a linear scan per
candidate).
- GGUF streaming strip runs the balanced bracket pre-pass before the regex
patterns so nested-arg calls do not leak or eat trailing prose, and the
BUFFERING ARGS detector requires the rehearsal name-ARGS shape.
- Tests: canonical array, array string-args, array strip keeps prose, Mistral
plus rehearsal multi-call, v11 call-id name, think-rehearsal strip
preservation, and bracket-strip linearity.
* Studio: preserve reasoning blocks in the route and streaming strip paths too
Addresses Gemini/Codex review: making strip_tool_call_markup preserve think
blocks left the route display strip and the GGUF streaming strip inconsistent,
so a rehearsed call inside a reasoning block was still deleted from the visible
text on those paths.
- Extract the think-block segmentation into one shared helper (strip_outside_think)
and route all three strip paths through it: strip_tool_call_markup,
_strip_tool_xml_for_display, and the GGUF _strip_tool_markup_streaming closure.
- Add a route-strip regression test that a rehearsal inside a reasoning block is
preserved while a real call outside it is still stripped.
* Studio: fix bracket-tag strip/buffer review findings
Address the live code-review findings on the Mistral bracket-tag / rehearsal
tool-call rescue path:
- tool_healing: a literal think block inside a tool-call argument is no longer
treated as a reasoning block. strip_outside_think now excludes think spans
that sit inside a complete tool-call span, so the call is stripped whole
instead of the split hiding its open/close pair and leaking the raw call.
- tool_healing: the rehearsal trailing-strip pattern requires a following brace
or end-of-text, so prose that merely mentions name[ARGS] is not truncated as
a phantom call. The bracket strip patterns are aligned with the parser
regexes (whitespace, v11 [CALL_ID]/[ARGS] metadata, and the [CALL_ID]
lookbehind).
- routes: strip a truncated canonical Mistral array ([TOOL_CALLS] [{... with no
closing bracket) that the balanced scan cannot remove, align the display
regex with the parser regexes, and apply the same rehearsal-prose guard.
- safetensors loop: mirror the GGUF [ARGS] rehearsal-substring check during
BUFFERING so a rehearsal name does not stream before its [ARGS] arrives.
Adds regression tests for each; existing parser suite stays green.
* Studio: hold split rehearsal tool-name prefix in both streaming loops
A reasoning-model rehearsal call can stream the tool name and its [ARGS] arm in
separate chunks (web_search then [ARGS]{...}). The buffering detector only
recognised the rehearsal once [ARGS] was present, so the bare tool name was
emitted as visible content before the call drained and executed.
Add _is_rehearsal_prefix (mirrored in the safetensors loop and the GGUF loop):
when a no-signal buffer is a bare active-tool name -- or a partial prefix of
NAME[ARGS] -- hold it as a prefix instead of streaming it, so the next chunk's
[ARGS] flips it to a drain. A whitespace in the buffer means prose, not a split
call, so ordinary text still streams.
Adds regression tests for the split rehearsal in both loops and a guard that a
plain non-tool word still streams.
* Studio: route Anthropic tool-call cleanup through the protected display strip
The Anthropic stream, non-stream, and passthrough paths cleaned content with raw
_TOOL_XML_RE.sub instead of _strip_tool_xml_for_display, so a rehearsal call
inside <think> was deleted from the reasoning and a nested [TOOL_CALLS] call
dropped its trailing prose (the OpenAI-compatible paths already use the helper).
Route all four sites (prior-assistant cleanup, streaming content events,
non-stream aggregation, passthrough conversion) through the protected helper, and
add a source-level guard test so raw _TOOL_XML_RE.sub stays confined to the
helper itself.
* Studio: stop split rehearsal tool names leaking once streaming, uncapped, or unrestricted
The split-rehearsal guard (NAME in one chunk, [ARGS]{...} in the next) only held
the name in the initial BUFFERING state. Three gaps remained where the bare tool
name still streamed as visible content before the call drained:
- STREAMING: after prose had already streamed, both loops emitted a trailing
active-tool-name token (and the GGUF/safetensors [ARGS] boundary was not pulled
back over the name). Hold the trailing rehearsal token and release it on the
next chunk, with an end-of-stream flush so a plain answer that merely ends on a
tool-name word is never dropped.
- Buffer cap: a realistic MCP name longer than the 32-char _MAX_BUFFER_CHARS cap
defeated the BUFFERING hold. A rehearsal prefix is self-bounding (it stops
matching once it grows past NAME[ARGS]), so the generic cap no longer applies to
it.
- Unrestricted mode (tools=[]): with no declared tool list, any bare identifier
may be a NAME[ARGS] rehearsal, so the prefix check now recognises one instead of
leaking the name and mis-parsing the call.
Regression tests cover the streaming, long-name, and unrestricted cases plus the
plain-prose paths that must not be held or corrupted.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Studio tools: protect think blocks in safetensors streaming, hold split rehearsal on initial flush, advertise Mistral tools
Pass-3 review follow-ups on the Mistral [TOOL_CALLS] / rehearsal [ARGS] work:
- Safetensors streaming display strip now preserves think / [THINK] reasoning
verbatim (routes through strip_outside_think like the GGUF path). A call
rehearsed inside a reasoning block was stripped mid-stream and then restored by
the final strip, a non-monotonic shrink/grow that corrupted append-by-length
stream consumers and the visible reasoning.
- The first flush out of BUFFERING (safetensors and GGUF) now applies the same
trailing-name hold the STREAMING branch uses, so a split rehearsal (prose plus a
trailing active tool name in one chunk, [ARGS]{...} in the next) no longer leaks
the bare name before the call drains.
- Safetensors capability gate no longer suppresses tools for Mistral [TOOL_CALLS]
templates, which the shared bracket-tag parser now handles end to end. Llama
python_tag stays suppressed (still unparseable).
- Route display strip applies the open-ended / bare-marker tail arms only on the
segment after the last reasoning block (closed-only regex before it), matching
strip_tool_call_markup, so a bare foo[ARGS] before a reasoning block is preserved
while complete calls are still removed in every segment.
Adds regression tests for each and updates the now-stale Mistral capability test.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Fix tool-call think-marker and bracket-wrapper edge cases
Round-1 review follow-ups on the Mistral/rehearsal tool-call healing:
- tool_healing: a reasoning marker that opens INSIDE a tool call's
arguments is argument data, not a reasoning block. Add
_think_spans_outside_tool_markup (start-inside test) and use it in
both parse_tool_calls_from_text and strip_outside_think so a literal
marker in one call's args no longer hides a later call (parse) or
leaks the raw markup (strip) when the greedy match runs past the
call's closer.
- tool_healing: strip the orphan Mistral v11 [/TOOL_CALLS] closer left
behind after the balanced scan removes the call body. Add a route arm
for the same closer in _TOOL_XML_RE / _TOOL_XML_CLOSED_RE.
- safetensors + llama_cpp streaming strip: run the open-ended (EOS
anchored) tail patterns only on the last segment; segments before a
reasoning block use the closed-only patterns, matching the final
strip and the route strip. A bare foo[ARGS] before a reasoning block
is prose, not a truncated call.
- safetensors streaming detector: validate each [ARGS] hit before
draining. A bare foo[ARGS] in prose (no active tool name in front)
no longer drains the rest of the turn; a later real NAME[ARGS] call
is still found and the prose in between is preserved.
Regression tests added for each case across the parser, strip helpers,
and both streaming loops.
* Strip incomplete-XML tool markup with literal think tags; widen render-html detector
Round-2 review follow-ups.
- tool_healing: an UNCLOSED <tool_call> / <function= call that the parser still
executes via allow_incomplete leaked its markup when an argument contained a
literal think marker. _tool_call_markup_spans only covered closed calls, so the
literal was treated as a reasoning block to preserve. Extend it to the
open-ended XML tail forms (shared as _TOOL_OPEN_XML_TAIL_PATS) so a think marker
inside an unclosed call is argument data and the call's markup is stripped. A
complete call's opener stays bounded to its closed span, and a real reasoning
block with no tool call is still preserved.
- safetensors render-html provisional card: _detect_render_html_tool_start was
XML-only, so a Mistral [TOOL_CALLS]render_html or rehearsal render_html[ARGS]
call executed but skipped the early card. Detect the earliest tool-call marker
across every serialization the loop executes and fire when it is render_html.
Regression tests added for both.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Studio tools: gate [ARGS] on active tools and skip think-block render_html rehearsal
Round 3 review fixes for the Mistral / rehearsal tool-call parsing path. Both are
asymmetric-fix bugs where one code path applied a guard the analogous paths did not.
- [ARGS] active-tool gating: the streaming state already validates a rehearsal
NAME[ARGS] against the active tool list before draining, but the BUFFERING
detection and the end-of-stream safety-net checks (safetensors and GGUF) treated
any word[ARGS] substring as a tool boundary. An answer containing a literal
foo[ARGS]{...} in prose, where foo is not an enabled tool, was drained, parsed into
a disabled foo no-op, and forced an extra generation turn. Gate those checks on the
active tool name too (unrestricted mode still accepts any name), so inactive-name
prose is neither drained nor parsed. Adds a shared _has_genuine_tool_signal helper
(safetensors) and _gguf_rehearsal_signal_pos / _gguf_has_genuine_tool_signal (GGUF).
- render_html provisional card vs think blocks: the parser skips tool candidates that
start inside a <think>/[THINK] reasoning block, but the provisional render_html
detector scanned raw content. A render_html rehearsed inside <think> followed by a
real non-render_html call emitted a provisional render_html tool_start (reusing the
later call's id) that the loop never executed. Drop candidates that start inside a
think span and use the first marker of each shape outside the blocks. Also resolve
the [TOOL_CALLS] [{...}] array shape through the parser so a nested "name" argument
key no longer fires a false provisional card ahead of the real top-level tool name.
Adds regression tests for both loops: inactive-name foo[ARGS]{...} is not drained into
a disabled no-op or a retry turn, a think-block render_html rehearsal emits no
provisional card, and the array top-level name is read correctly.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Gate ambiguous bare-rehearsal parse and strip on the active tool list
A bare NAME[ARGS]{json} is a genuine rehearsal call only when NAME is an
active tool; otherwise it is prose. The earlier round gated only detection
(so an inactive foo[ARGS] no longer drained the buffer or forced a retry
turn), but the parse and strip stayed unrestricted, which produced two
regressions:
1. An inactive foo[ARGS]{...} placed immediately before a real
web_search[ARGS]{...} in the same content span made the real call fail
to execute (parse consumed the phantom foo call).
2. An inactive foo[ARGS]{...} in a prose answer had its markup stripped
from the visible text, corrupting the sentence to " is just syntax."
Thread enabled_tool_names through the shared parser/strip so parse and
strip apply the SAME active-tool gate as detection:
- core/tool_healing.py: _iter_bracket_spans skips an inactive rehearsal
span; parse_tool_calls_from_text, _strip_bracket_tag_calls,
_strip_markup_segment and strip_tool_call_markup accept and thread the
gate; apply_tool_strip_patterns keeps an inactive rehearsal match.
- core/inference/tool_call_parser.py: wrappers forward the gate.
- core/inference/safetensors_agentic.py and core/inference/llama_cpp.py:
compute the gate from the active tool list (None when unrestricted, to
keep the legacy strip-all behavior) and thread it into every parse and
streaming/final strip site.
- routes/inference.py: _strip_tool_xml_for_display accepts the gate and
keeps an inactive rehearsal via a capture group on its rehearsal arm, so
the display cleanup does not re-strip the already-correct loop output.
The [TOOL_CALLS] control-token arms still strip unconditionally. Wire
the current turn's active tool names into the GGUF and safetensors
content-display sites.
Tests: parse and strip gate coverage in test_tool_call_parser_strict.py,
test_tool_xml_strip.py and test_safetensors_tool_loop.py; end-to-end GGUF
coverage for the real-call-after-inactive-rehearsal case and a
strengthened assertion that the inactive rehearsal prose survives intact.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Studio: render the reasoning block for safetensors and MLX like GGUF
enable_thinking chat templates (Qwen3/Qwen3.5/GLM) prefill an unclosed <think>
into the generation prompt, so the model emits only the closing </think> then
the answer. The safetensors/MLX chat stream emitted that as plain content, so
the reasoning showed inline with no collapsible thinking block, while GGUF
(which surfaces reasoning via reasoning_content) rendered one. This brings
safetensors and MLX to parity.
- _ResponsesReasoningExtractor gains a reasoning_prefilled mode that starts
inside the reasoning block and splits on the first </think>; default False
keeps GGUF and every existing caller byte-identical. It suppresses a stray
re-emitted <think> and holds partial markers back across chunk boundaries.
- _sf_reasoning_prefill_mode gates the mode on reasoning being enabled for the
request, an enable_thinking or enable_thinking_effort style, and the template
actually using the standard <think>/</think> markers. Models with a bespoke
reasoning channel (e.g. gemma's <|think|>/<|channel>) are excluded so their
answer is never swallowed; gpt-oss (Harmony) and thinking-off requests are
excluded too.
- sf_tool_stream and stream_chunks (the latter also serves MLX) feed text
through the extractor, emitting reasoning_content then content deltas, with a
per-turn reset in the tool loop and a flush before each tool_start; only the
visible delta reaches the monitor reply. The two non-streaming drains split
reasoning_content the same way.
- Tests: extractor prefilled mode (streaming and edge cases), the gate matrix
including the gemma-style exclusion, and a route-replay of the tool-loop
reasoning stream.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* studio: skip tool calls rehearsed in prefilled reasoning
Reasoning models (Qwen3.5 enable_thinking) open <think> in the prompt, so the
generated text starts inside the thought and emits only a closing </think> with
no opener. _think_spans_outside_tool_markup only found spans with an explicit
opener, so a NAME[ARGS]{...} or [TOOL_CALLS] call rehearsed in that leading
thought was parsed and executed as a real call.
Add a leading think span (offset 0 through the first close marker) when the
content opens with a bare close, so the rehearsed call is skipped and the
reasoning is preserved by strip_outside_think. Guarded by the existing call-span
check: a literal </think> inside a real call's arguments does not trigger the
span, so a genuine leading call still fires. Tests for both cases.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* studio: do not start prefilled reasoning mode when reasoning_effort is none
enable_thinking_effort models (e.g. GLM-5.2) express thinking-off via
reasoning_effort="none" rather than enable_thinking=False, but
_sf_reasoning_prefill_mode only looked at enable_thinking, so such a request
started the extractor in prefilled mode. With thinking off the model never emits
</think>, so the whole answer was captured as reasoning_content and the visible
content/stream came back empty. Thread reasoning_effort through and return False
when it is "none". Tests for none vs a real effort level.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* studio: only treat a leading bare </think> as prefilled reasoning when a real call follows
The prefilled-reasoning virtual span fired on any unmatched leading close marker,
so a non-prefilled turn that emits a real call before a stray </think> (for
example "Now web_search[ARGS]{...}</think> answer") had the call swallowed by the
span and dropped. Require that a real tool call also appear after the close (the
actual turn that follows the thought) before adding the span, so a stray close in
a normal answer no longer suppresses a genuine leading call. The rehearse-then-
call case still skips the rehearsal. Test for the stray-close case.
* Studio: trim redundant comments (comment-only, AST-verified)
* studio: keep tool_healing importable on Python 3.9
_balanced_json_span was annotated -> int | None. With no
from __future__ import annotations, that PEP 604 union is evaluated at
import time, so on Python 3.9 (which the package still supports,
requires-python >=3.9, and where external inference servers import this
module standalone) the def raises TypeError and the whole module fails
to import before any parsing runs.
Add from __future__ import annotations so annotations stay lazy strings,
matching the prevailing convention across studio/backend. No behavior
change: the module has no runtime annotation introspection.
* Studio: gate the Anthropic tool-stream display strip on declared tools
The Anthropic streaming and non-streaming tool paths called
_strip_tool_xml_for_display without enabled_tool_names, so with the default
strip-all behavior a final answer that literally contains an inactive-name
NAME[ARGS]{json} (prose, not a call) lost those bytes in the delivered text.
The GGUF and safetensors paths already pass _display_tool_name_gate(tools);
these two sites were missed when that gate was threaded through.
Compute the gate from the declared tools and pass it at both sites (threading
openai_tools into _anthropic_tool_non_streaming and its caller), so an
inactive-name rehearsal survives while an active-name one is still stripped.
Add a regression test.
* Studio: hold a split unrestricted rehearsal prefix at the bracket
In unrestricted tool mode (tools=[]) the rehearsal-prefix regex required
[A after the bracket, so a chunk boundary landing right after NAME[ (e.g.
web_search[ then ARGS]{...}) failed the prefix check and streamed the
partial tool markup web_search[ to the client before the call drained.
Restricted mode already holds this via a startswith check. Make the bracket
and each ARGS letter individually optional so NAME[ is held too, matching
the documented intent. Add a regression test.
* Studio: gate rehearsal detection and history strip on the original tool set
Two display/loop gate fixes so a spent one-shot tool is handled consistently:
- Rehearsal DETECTION (safetensors and GGUF loops) now uses the ORIGINAL tool
list, matching the strip gate, instead of the post-removal active_tools. After a
one-shot tool (render_html) runs it is dropped from active_tools; a repeat
render_html[ARGS]{...} while another tool is still active was stripped from
display yet never detected, so it was not routed to the render_html_repeat no-op
and the turn ended as a blank continuation. Detection now fires for it.
- The GGUF assistant-history sanitiser forwards the enabled-tool-name gate (like
the live-response strip), so a prior turn documenting an inactive foo[ARGS]{...}
shape is preserved in the replayed prompt context instead of being deleted.
Add regression tests for both loops and the history strip.
* Studio: thread the tool-name gate through the remaining rehearsal/history sites
Follow-up to the rehearsal-detection and history-strip gate fixes, covering the
sibling sites that were missed:
- GGUF loop: the rehearsal-prefix and trailing-name hold checks now use the
original tool list (_detect_tools) like the detection path, so a spent one-shot's
split repeat (bare render_html then [ARGS]{...}) is held instead of flushed as
visible text.
- The safetensors and Anthropic assistant-history sanitisers and the Anthropic
non-streaming passthrough now forward the enabled-tool-name gate to
_strip_tool_xml_for_display, matching the GGUF history sanitiser and the live
strips, so a prior turn documenting an inactive foo[ARGS]{...} example is
preserved in the replayed prompt / final text instead of deleted.
Add regression tests.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Tile bracket-call spans per array item and include the v11 closer
Two with_spans fixes for the Mistral bracket parser, both hit through the
client-tool passthrough healers:
- A multi-call [TOOL_CALLS] array carried its whole markup span on the first
call and zero-width spans after, so a consumer that filters promotions by
the declared tool set either re-emitted the full raw array as text next to
the promoted call or silently dropped a filtered call's bytes. The region is
now tiled across the call-producing items (each call's span covers its own
JSON object plus the separator bytes before it; the last span runs to the
region end), so promoted markup strips exactly once and a skipped call's
bytes stay visible.
- The v11 wrapper closer [/TOOL_CALLS] sat outside the reported span and
leaked as stray text after promotion; the region now extends over an
immediately-following closer.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Address review: decouple healer signals from the loop signal set
The passthrough healer buffered on every TOOL_XML_SIGNALS entry, so the bare
[ARGS] rehearsal marker this branch adds for the loops (where it is gated on
active tool names) put legitimate prose like 'Use foo[ARGS] in templates'
into the holding state and stalled the stream until finalization. The healer
can never promote a bare rehearsal call, so it now buffers only on formats
its parser promotes: <tool_call>, <|tool_call>, <function=, [TOOL_CALLS].
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Condense comments in the Mistral tool-call rescue to contract essentials
* verify_import_hoist: exempt __future__ imports and same-diff relocations
Two false positives fired on this PR's refactor. A from __future__ import
is a compiler directive whose name never appears as a runtime load, so
HOISTED-IMPORT-UNUSED can never see it used, yet the file requires it for
PEP 604 annotations on Python 3.9. TARGET-CHANGED flagged the deliberate
move of the strip-pattern constants into core.inference.tool_call_parser
as a silent re-point even though the old module-level target was removed
and the new one added in the same diff. Both get narrow exemptions; a
re-point to a pre-existing target is still caught, and the self-test
negative controls all pass unchanged.
* Drain the whole Mistral [TOOL_CALLS] array in streaming passthrough healing
StreamToolCallHealer._drain promoted only the first parsed call per pass and
dropped the rest of the buffer past that one span. For a well-formed Mistral
parallel-tool-call array streamed through client-tool passthrough
([TOOL_CALLS][{...},{...}]), the per-item spans are contiguous, so after the
first call was promoted the residue began with ,{...}] (no leading signal) and
was flushed as raw text: every call after the first was lost.
_drain now walks the contiguous run of parsed calls (adjacent tiled spans =
one array), promoting each declared call and relaying undeclared ones as data,
and stops at the first gap (prose) or incomplete trailing block so separate
blocks still stream incrementally in document order. This mirrors the
non-streaming heal_openai_message / finalize promote-or-flush loop and the
server-side safetensors loop, which already handled multi-call arrays.
Added regression tests: 2-call array in one feed and char-by-char, an
undeclared middle call kept as text, and an array followed by trailing prose.
* Drain comma-less Mistral tool-call arrays and normalize null arguments
The array branch fed the whole body to a single json.loads, which rejects the
comma-less multi-call form the repo's own Mistral/Ollama templates render (the
range loop in ollama_template_mappers.py emits the objects with no separator) and
so dropped every call. Decode elements individually with the existing
comma-tolerant raw_decode helper, now _decode_array_items, which also returns the
objects, so all calls are recovered while the span tiling is unchanged.
Also normalize a non-object array argument such as arguments null to an empty
object, matching the wrapped tool_call path, instead of serializing None to the
string "null" that auto-heal would turn into a bogus query of "null".
* Gate safetensors reasoning prefill on the rendered generation prompt
reasoning_always_on fires on any paired <think></think> in the template,
including markup that only renders PAST assistant history (Kimi-K2-Thinking)
while the generation prompt opens no <think>. Starting the reasoning extractor
in prefilled mode there captured a normal answer entirely as reasoning_content
and returned blank visible content. Prefill only when rendering the generation
prompt actually leaves <think> open (DeepSeek-R1 / QwQ / Qwen3-Thinking);
history-only templates start the extractor in normal mode and parse the model's
own <think>...</think>. Adds a Kimi-shape regression test.
* Keep bare scalar Mistral array arguments raw instead of double-encoding
A scalar string argument in the canonical Mistral [TOOL_CALLS] array
(for example [TOOL_CALLS][{"name":"web_search","arguments":"weather"}])
was run through json.dumps, turning weather into the JSON string
"weather". The downstream argument healer then wrapped that quoted
form, so a single-string tool like web_search searched for the literal
"weather" with quotes. The <tool_call> path already keeps a scalar
argument raw; mirror it here so only a dict is serialized. Add a
regression test asserting both paths yield the same healed arguments.
* Tighten tool-call rescue and reasoning-prefill comments
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
---------
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1077 lines
44 KiB
Python
1077 lines
44 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-only
|
|
# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0
|
|
#
|
|
# Bracket-tag, rehearsal, and thinking-block-strip logic adapted from forge
|
|
# (https://github.com/antoinezambelli/forge), Copyright (c) 2025-2026
|
|
# Antoine Zambelli, used under the MIT License.
|
|
|
|
"""Lightweight tool-call parsing and stripping helpers.
|
|
|
|
External inference servers import this module without pulling in the inference
|
|
orchestrator, structlog, httpx, or the rest of the studio backend. Kept in
|
|
lockstep with ``core/inference/tool_call_parser.py`` so those servers
|
|
(llama-server wrappers, llama-swap, custom shims) reuse the same logic. Any
|
|
change here must also land there.
|
|
|
|
Handles these serializations (see ``parse_tool_calls_from_text``):
|
|
|
|
* ``<tool_call>{json}</tool_call>``
|
|
* ``<|tool_call>call:name{...}<tool_call|>`` (Gemma)
|
|
* ``<function=name><parameter=k>v</parameter></function>``
|
|
* ``[TOOL_CALLS]name{json}`` (Mistral / Devstral fallback)
|
|
* ``name[ARGS]{json}`` (reasoning-model rehearsal)
|
|
"""
|
|
|
|
# PEP 604 annotations must stay import-safe on Python 3.9 (requires-python >=3.9).
|
|
from __future__ import annotations
|
|
|
|
import bisect
|
|
import json
|
|
import re
|
|
|
|
# One nesting level in the strip regexes; deeper may leak markup (still parsed).
|
|
_BRACKETED_JSON_ONE_LEVEL = r"\{[^{}]*(?:\{[^{}]*\}[^{}]*)*\}"
|
|
|
|
# Rehearsal ``name[ARGS]{..}`` strips; group 1 = name for tool-list gating. Closed =
|
|
# complete body, tail = truncated; ``(?<!\[CALL_ID\])`` keeps the v11 call-id from reading as a name.
|
|
_REHEARSAL_CLOSED_STRIP_RE = re.compile(
|
|
r"(?<!\[CALL_ID\])\b([\w-]+)\[ARGS\]\s*" + _BRACKETED_JSON_ONE_LEVEL, re.DOTALL
|
|
)
|
|
_REHEARSAL_TAIL_STRIP_RE = re.compile(r"(?<!\[CALL_ID\])\b([\w-]+)\[ARGS\]\s*(?:\{.*)?$", re.DOTALL)
|
|
|
|
# Tool-XML strip patterns; hyphen in the name class covers dashed MCP names.
|
|
# Closed-pair patterns are named so _PAT_REQUIRED_TOKEN can skip a doomed lazy rescan when
|
|
# the close token is absent: an unguarded ``<tag>.*?</tag>`` rescans to EOF from every opener
|
|
# (quadratic on a stream of unclosed openers). Also reused by the quote-aware Gemma pre-pass.
|
|
_TC_JSON_CLOSED_PAT = re.compile(r"<tool_call>.*?</tool_call>", re.DOTALL)
|
|
_TC_GEMMA_CLOSED_PAT = re.compile(r"<\|tool_call>.*?<tool_call\|>", re.DOTALL)
|
|
_TC_FUNC_CLOSED_PAT = re.compile(r"<function=[\w-]+>.*?</function>", re.DOTALL)
|
|
_TOOL_CLOSED_PATS = [
|
|
_TC_JSON_CLOSED_PAT,
|
|
_TC_GEMMA_CLOSED_PAT,
|
|
re.compile(r"<tool_call\|>"),
|
|
_TC_FUNC_CLOSED_PAT,
|
|
# Mirror the parser regexes: tolerate whitespace and v11 [CALL_ID]/[ARGS] metadata.
|
|
re.compile(
|
|
r"\[TOOL_CALLS\]\s*[\w-]+(?:\[CALL_ID\][\w-]+)?(?:\[ARGS\])?\s*"
|
|
+ _BRACKETED_JSON_ONE_LEVEL,
|
|
re.DOTALL,
|
|
),
|
|
_REHEARSAL_CLOSED_STRIP_RE,
|
|
# Drop the bare v11 [/TOOL_CALLS] closer the balanced scan leaves behind.
|
|
re.compile(r"\[/TOOL_CALLS\]"),
|
|
]
|
|
# Bare open markers strip a partial call mid-stream; the rehearsal tail needs `{` or EOF
|
|
# so prose ``foo[ARGS]`` survives. The XML open-tail forms reach EOF and are reused by
|
|
# _tool_call_markup_spans (a think tag in an unclosed call's args stays argument data).
|
|
_TOOL_OPEN_XML_TAIL_PATS = [
|
|
re.compile(r"<tool_call>.*$", re.DOTALL),
|
|
re.compile(r"<\|tool_call>.*$", re.DOTALL),
|
|
re.compile(r"<function=[\w-]+>.*$", re.DOTALL),
|
|
]
|
|
_TOOL_ALL_PATS = (
|
|
_TOOL_CLOSED_PATS
|
|
+ _TOOL_OPEN_XML_TAIL_PATS
|
|
+ [
|
|
re.compile(r"\[TOOL_CALLS\].*$", re.DOTALL),
|
|
_REHEARSAL_TAIL_STRIP_RE,
|
|
]
|
|
)
|
|
|
|
# Rehearsal strips (name in group 1); name-gated via ``enabled_tool_names``, strip-all when None.
|
|
_REHEARSAL_STRIP_PATS = frozenset({_REHEARSAL_CLOSED_STRIP_RE, _REHEARSAL_TAIL_STRIP_RE})
|
|
|
|
# Stripped before the quote-aware Gemma helper so a Gemma opener quoted in argument
|
|
# data cannot make the helper truncate the block and its tail.
|
|
_TOOL_CLOSED_BLOCK_PATS = [_TC_JSON_CLOSED_PAT, _TC_FUNC_CLOSED_PAT]
|
|
# A lazy closed-pair pattern whose close token is absent would rescan to EOF from every
|
|
# opener; skip that doomed (quadratic) pass. Shared by both strip helpers.
|
|
_PAT_REQUIRED_TOKEN = {
|
|
_TC_JSON_CLOSED_PAT: "</tool_call>",
|
|
_TC_GEMMA_CLOSED_PAT: "<tool_call|>",
|
|
_TC_FUNC_CLOSED_PAT: "</function>",
|
|
}
|
|
|
|
|
|
def strip_tool_patterns(text: str, patterns) -> str:
|
|
"""Apply ``patterns`` in order, skipping closed-pair passes with no close token."""
|
|
for pat in patterns:
|
|
token = _PAT_REQUIRED_TOKEN.get(pat)
|
|
if token is not None and token not in text:
|
|
continue
|
|
text = pat.sub("", text)
|
|
return text
|
|
|
|
|
|
def apply_tool_strip_patterns(
|
|
text: str,
|
|
patterns,
|
|
enabled_tool_names = None,
|
|
) -> str:
|
|
"""Apply strip ``patterns`` to ``text``. A bare rehearsal ``name[ARGS]{..}`` pattern
|
|
strips only when ``name`` is an enabled tool (or when ``enabled_tool_names`` is
|
|
``None``); every other pattern is removed unconditionally. A closed-pair pattern whose
|
|
close token is absent is skipped so an unclosed-marker stream stays linear."""
|
|
for pat in patterns:
|
|
token = _PAT_REQUIRED_TOKEN.get(pat)
|
|
if token is not None and token not in text:
|
|
continue
|
|
if enabled_tool_names is not None and pat in _REHEARSAL_STRIP_PATS:
|
|
text = pat.sub(lambda m: "" if m.group(1) in enabled_tool_names else m.group(0), text)
|
|
else:
|
|
text = pat.sub("", text)
|
|
return text
|
|
|
|
|
|
# Pre-compiled patterns for tool-call XML parsing.
|
|
_TC_JSON_START_RE = re.compile(r"<tool_call>\s*\{")
|
|
_TC_GEMMA_START_RE = re.compile(r"<\|tool_call>\s*call\s*:\s*([\w.\-]+)\s*\{")
|
|
_TC_FUNC_START_RE = re.compile(r"<function=([\w-]+)>\s*")
|
|
_TC_END_TAG_RE = re.compile(r"</tool_call>")
|
|
_TC_GEMMA_END_TAG_RE = re.compile(r"<tool_call\|>")
|
|
_TC_FUNC_CLOSE_RE = re.compile(r"\s*</function>\s*$")
|
|
# Horizontal-whitespace trailing class keeps the wrapping newline; _trim_param_value trims it.
|
|
_TC_PARAM_START_RE = re.compile(r"<parameter=([\w-]+)>[^\S\n]*")
|
|
_TC_PARAM_CLOSE_RE = re.compile(r"\s*</parameter>\s*$")
|
|
_GEMMA_QUOTE = '<|"|>'
|
|
_PARAM_CLOSE_TAG = "</parameter>"
|
|
_FUNC_CLOSE_TAG = "</function>"
|
|
# A bare (unquoted) Gemma value ends at `}` or at a comma that begins the next
|
|
# `key:` pair. A comma NOT followed by a key token is part of the value (e.g.
|
|
# `location:New York, NY`), so it must not terminate the value. The key token
|
|
# must be identifier-shaped (start with a letter or underscore); a comma
|
|
# followed by digits-then-colon is value text such as a timestamp or ratio
|
|
# (`meet at 10:00, 11:00 tomorrow`), not a new key.
|
|
_GEMMA_NEXT_KEY_RE = re.compile(r"\s*[A-Za-z_][\w.\-]*\s*:")
|
|
|
|
# A candidate starting inside a think block is a rehearsal (block kept so literal tags in
|
|
# real args survive); ``$`` accepts an unclosed block mid-stream.
|
|
_THINK_TAG_RE = re.compile(r"<think>.*?(?:</think>|$)|\[THINK\].*?(?:\[/THINK\]|$)", re.DOTALL)
|
|
# Bare open/close markers for prefilled-reasoning turns (template opens <think> in the prompt).
|
|
_THINK_OPEN_RE = re.compile(r"<think>|\[THINK\]")
|
|
_THINK_CLOSE_RE = re.compile(r"</think>|\[/THINK\]")
|
|
|
|
# Mistral canonical array: [TOOL_CALLS] + JSON list of {"name","arguments"} objects.
|
|
_MISTRAL_ARRAY_RE = re.compile(r"\[TOOL_CALLS\]\s*(?=\[)")
|
|
|
|
# Mistral name form + v11 [ARGS]/[CALL_ID] shapes; [CALL_ID] is metadata, not the name,
|
|
# and hyphens keep dashed MCP names whole.
|
|
_MISTRAL_BRACKET_RE = re.compile(
|
|
r"\[TOOL_CALLS\]\s*([\w-]+)(?:\[CALL_ID\][\w-]+)?(?:\[ARGS\])?\s*(?=\{)"
|
|
)
|
|
|
|
# Rehearsal ``name[ARGS]{json}`` (no [TOOL_CALLS]); the lookbehind keeps the v11 call-id
|
|
# from being taken as the function name.
|
|
_REHEARSAL_RE = re.compile(r"(?<!\[CALL_ID\])\b([\w-]+)\[ARGS\]\s*(?=\{)")
|
|
|
|
# Above this size skip the balanced scan; the linear regex catch-all bounds pathological output.
|
|
_MAX_BRACKET_SCAN_CHARS = 1_000_000
|
|
|
|
|
|
def _balanced_json_span(text: str, start: int) -> int | None:
|
|
"""Return the end index of a balanced JSON object opening at ``start``,
|
|
or ``None`` if the braces don't balance. Honors escapes and strings.
|
|
"""
|
|
if start >= len(text) or text[start] != "{":
|
|
return None
|
|
depth = 0
|
|
in_string = False
|
|
escape = False
|
|
for j in range(start, len(text)):
|
|
ch = text[j]
|
|
if escape:
|
|
escape = False
|
|
continue
|
|
if ch == "\\":
|
|
escape = True
|
|
continue
|
|
if in_string:
|
|
if ch == '"':
|
|
in_string = False
|
|
continue
|
|
if ch == '"':
|
|
in_string = True
|
|
elif ch == "{":
|
|
depth += 1
|
|
elif ch == "}":
|
|
depth -= 1
|
|
if depth == 0:
|
|
return j
|
|
return None
|
|
|
|
|
|
def _balanced_brace_end(
|
|
content: str,
|
|
brace_start: int,
|
|
*,
|
|
gemma_quotes: bool = False,
|
|
) -> int:
|
|
depth = 0
|
|
i = brace_start
|
|
in_string = False
|
|
in_gemma_string = False
|
|
while i < len(content):
|
|
if gemma_quotes and not in_string and content.startswith(_GEMMA_QUOTE, i):
|
|
in_gemma_string = not in_gemma_string
|
|
i += len(_GEMMA_QUOTE)
|
|
continue
|
|
ch = content[i]
|
|
if in_gemma_string:
|
|
i += 1
|
|
continue
|
|
if in_string:
|
|
if ch == "\\" and i + 1 < len(content):
|
|
i += 2
|
|
continue
|
|
if ch == '"':
|
|
in_string = False
|
|
elif ch == '"':
|
|
in_string = True
|
|
elif ch == "{":
|
|
depth += 1
|
|
elif ch == "}":
|
|
depth -= 1
|
|
if depth == 0:
|
|
return i
|
|
i += 1
|
|
return -1
|
|
|
|
|
|
def _balanced_bracket_end(src: str, start: int) -> int:
|
|
"""Index of the ``]`` matching the ``[`` at ``start``, or -1. Tracks nested
|
|
``[]``/``{}`` and double-quoted strings."""
|
|
depth = 0
|
|
i = start
|
|
in_string = False
|
|
while i < len(src):
|
|
ch = src[i]
|
|
if in_string:
|
|
if ch == "\\" and i + 1 < len(src):
|
|
i += 2
|
|
continue
|
|
if ch == '"':
|
|
in_string = False
|
|
elif ch == '"':
|
|
in_string = True
|
|
elif ch in "[{":
|
|
depth += 1
|
|
elif ch in "]}":
|
|
depth -= 1
|
|
if depth == 0:
|
|
return i
|
|
i += 1
|
|
return -1
|
|
|
|
|
|
def _decode_array_items(text: str, body_start: int, body_end: int):
|
|
"""Return ``(objs, ends)`` for each top-level element of the JSON array between
|
|
``body_start`` (at or before its ``[``) and ``body_end`` (exclusive): the decoded
|
|
object and its absolute exclusive end offset.
|
|
|
|
Decoding element-by-element with ``raw_decode`` tolerates the comma-less object
|
|
separators the repo's own Mistral/Ollama multi-call templates emit
|
|
(``[{...}{...}]``; see ollama_template_mappers.py). A single ``json.loads`` of the
|
|
whole body rejects that form and would drop every call. The ends also tile the
|
|
region across the calls' spans so a with_spans consumer strips each exactly once."""
|
|
decoder = json.JSONDecoder()
|
|
objs: list = []
|
|
ends: list[int] = []
|
|
i = text.find("[", body_start)
|
|
if i < 0:
|
|
return objs, ends
|
|
i += 1
|
|
while i < body_end:
|
|
while i < body_end and text[i] in " \t\r\n,":
|
|
i += 1
|
|
if i >= body_end or text[i] == "]":
|
|
break
|
|
try:
|
|
obj, rel = decoder.raw_decode(text[i:body_end])
|
|
except (json.JSONDecodeError, ValueError):
|
|
break
|
|
i += rel
|
|
objs.append(obj)
|
|
ends.append(i)
|
|
return objs, ends
|
|
|
|
|
|
def _iter_bracket_spans(
|
|
text: str,
|
|
start: int = 0,
|
|
enabled_tool_names = None,
|
|
):
|
|
"""Yield ``(span_start, span_end, kind, match)`` for each balanced bracket-tag
|
|
call from ``start`` on, in document order; ``span_end`` exclusive. ``kind`` is
|
|
``"array"`` ([TOOL_CALLS] [..]), ``"name"`` ([TOOL_CALLS]name{..}, incl. v11
|
|
[CALL_ID]/[ARGS]) or ``"rehearsal"`` (name[ARGS]{..}).
|
|
|
|
``enabled_tool_names`` (set, or None = unrestricted) gates only the ambiguous
|
|
bare rehearsal form: name[ARGS]{..} is a call ONLY when ``name`` is enabled, so a
|
|
prose ``foo[ARGS]{..}`` (foo disabled) is neither parsed nor stripped. Explicit
|
|
[TOOL_CALLS] markers stay unconditional, keeping parse/strip/detection symmetric.
|
|
|
|
Balance-only (no JSON validation) so strip and parse share one scan. The cursor
|
|
jumps past each consumed span, so a marker inside consumed JSON is never
|
|
re-matched and each regex re-searches only once its match falls behind: linear."""
|
|
n = len(text)
|
|
specs = (
|
|
("array", _MISTRAL_ARRAY_RE),
|
|
("name", _MISTRAL_BRACKET_RE),
|
|
("rehearsal", _REHEARSAL_RE),
|
|
)
|
|
nexts = {kind: rx.search(text, start) for kind, rx in specs}
|
|
cursor = start
|
|
while cursor < n:
|
|
for kind, rx in specs:
|
|
m = nexts[kind]
|
|
if m is not None and m.start() < cursor:
|
|
nexts[kind] = rx.search(text, cursor)
|
|
live = [(kind, m) for kind, m in nexts.items() if m is not None]
|
|
if not live:
|
|
return
|
|
kind, m = min(live, key = lambda km: km[1].start())
|
|
if kind == "array":
|
|
end = _balanced_bracket_end(text, m.end())
|
|
end = None if end < 0 else end
|
|
else:
|
|
end = _balanced_json_span(text, m.end())
|
|
if end is None:
|
|
# Truncated body: skip and keep scanning; the caller's catch-all strips the tail.
|
|
cursor = m.end()
|
|
continue
|
|
if (
|
|
kind == "rehearsal"
|
|
and enabled_tool_names is not None
|
|
and m.group(1) not in enabled_tool_names
|
|
):
|
|
# Inactive-name rehearsal is prose: advance past its body without yielding.
|
|
cursor = end + 1
|
|
continue
|
|
yield (m.start(), end + 1, kind, m)
|
|
cursor = end + 1
|
|
|
|
|
|
def _split_top_level_commas(src: str) -> list:
|
|
"""Split on commas that are not inside a nested ``[]``/``{}`` or a string."""
|
|
parts: list[str] = []
|
|
depth = 0
|
|
in_string = False
|
|
start = 0
|
|
i = 0
|
|
while i < len(src):
|
|
ch = src[i]
|
|
if in_string:
|
|
if ch == "\\" and i + 1 < len(src):
|
|
i += 2
|
|
continue
|
|
if ch == '"':
|
|
in_string = False
|
|
elif ch == '"':
|
|
in_string = True
|
|
elif ch in "[{":
|
|
depth += 1
|
|
elif ch in "]}":
|
|
depth -= 1
|
|
elif ch == "," and depth == 0:
|
|
parts.append(src[start:i])
|
|
start = i + 1
|
|
i += 1
|
|
parts.append(src[start:])
|
|
return parts
|
|
|
|
|
|
def _quote_gemma_array_elements(body: str) -> str:
|
|
"""Normalise the elements of a Gemma array value so json.loads succeeds.
|
|
|
|
Gemma may emit ``labels:[bug,ui]`` without per-element quotes, or arrays of
|
|
objects (``items:[{path:a}]``) whose keys/values also lack quotes; left
|
|
as-is json.loads fails and the whole call is dropped. Bare string elements
|
|
are quoted, object and nested-array elements are normalised recursively, and
|
|
quoted strings (already normalised from ``<|"|>``), numbers, and JSON
|
|
literals are preserved."""
|
|
out: list[str] = []
|
|
for element in _split_top_level_commas(body):
|
|
stripped = element.strip()
|
|
if not stripped or stripped[0] == '"':
|
|
out.append(element)
|
|
continue
|
|
if stripped[0] == "{":
|
|
# Object element: quote its keys/bare values like a top-level object.
|
|
out.append(_quote_gemma_object_keys(stripped))
|
|
continue
|
|
if stripped[0] == "[":
|
|
# Nested array: normalise its elements too.
|
|
inner_end = _balanced_bracket_end(stripped, 0)
|
|
if inner_end == len(stripped) - 1:
|
|
out.append("[" + _quote_gemma_array_elements(stripped[1:inner_end]) + "]")
|
|
else:
|
|
out.append(element)
|
|
continue
|
|
try:
|
|
json.loads(stripped)
|
|
out.append(element)
|
|
except (json.JSONDecodeError, ValueError):
|
|
out.append(json.dumps(stripped))
|
|
return ",".join(out)
|
|
|
|
|
|
def _normalise_gemma_quoted_strings(src: str) -> str:
|
|
parts: list[str] = []
|
|
i = 0
|
|
while i < len(src):
|
|
if not src.startswith(_GEMMA_QUOTE, i):
|
|
parts.append(src[i])
|
|
i += 1
|
|
continue
|
|
end = src.find(_GEMMA_QUOTE, i + len(_GEMMA_QUOTE))
|
|
if end < 0:
|
|
parts.append(src[i:])
|
|
break
|
|
raw_value = src[i + len(_GEMMA_QUOTE) : end]
|
|
parts.append(json.dumps(raw_value))
|
|
i = end + len(_GEMMA_QUOTE)
|
|
return "".join(parts)
|
|
|
|
|
|
def _quote_gemma_object_keys(src: str) -> str:
|
|
parts: list[str] = []
|
|
i = 0
|
|
in_string = False
|
|
while i < len(src):
|
|
ch = src[i]
|
|
if in_string:
|
|
parts.append(ch)
|
|
if ch == "\\" and i + 1 < len(src):
|
|
parts.append(src[i + 1])
|
|
i += 2
|
|
continue
|
|
if ch == '"':
|
|
in_string = False
|
|
i += 1
|
|
continue
|
|
if ch == '"':
|
|
in_string = True
|
|
parts.append(ch)
|
|
i += 1
|
|
continue
|
|
if ch not in "{,":
|
|
parts.append(ch)
|
|
i += 1
|
|
continue
|
|
|
|
parts.append(ch)
|
|
i += 1
|
|
key_start = i
|
|
while i < len(src) and src[i].isspace():
|
|
i += 1
|
|
key_name_start = i
|
|
while i < len(src) and (src[i].isalnum() or src[i] in "_-."):
|
|
i += 1
|
|
key_name = src[key_name_start:i]
|
|
colon_pos = i
|
|
while colon_pos < len(src) and src[colon_pos].isspace():
|
|
colon_pos += 1
|
|
if key_name and colon_pos < len(src) and src[colon_pos] == ":":
|
|
parts.append(src[key_start:key_name_start])
|
|
parts.append(json.dumps(key_name))
|
|
parts.append(src[i:colon_pos])
|
|
parts.append(":")
|
|
i = colon_pos + 1
|
|
# Gemma may emit bare string values ({unit:celsius}); quote them so
|
|
# json.loads succeeds. JSON scalars/objects/arrays/quoted stay as-is.
|
|
ws = i
|
|
while i < len(src) and src[i].isspace():
|
|
i += 1
|
|
parts.append(src[ws:i])
|
|
if i < len(src) and src[i] == "[":
|
|
# Array value: quote bare string elements (e.g. labels:[bug,ui])
|
|
# so json.loads succeeds instead of dropping the call.
|
|
arr_end = _balanced_bracket_end(src, i)
|
|
if arr_end < 0:
|
|
parts.append(src[i:])
|
|
i = len(src)
|
|
else:
|
|
parts.append("[" + _quote_gemma_array_elements(src[i + 1 : arr_end]) + "]")
|
|
i = arr_end + 1
|
|
elif i < len(src) and src[i] not in '"{':
|
|
v_start = i
|
|
# Consume the bare value up to `}` or a comma that starts the
|
|
# next key:value pair; a comma inside the value (e.g.
|
|
# `New York, NY`) does not terminate it.
|
|
while i < len(src):
|
|
if src[i] == "}":
|
|
break
|
|
if src[i] == "," and _GEMMA_NEXT_KEY_RE.match(src, i + 1):
|
|
break
|
|
i += 1
|
|
raw = src[v_start:i]
|
|
try:
|
|
json.loads(raw.strip())
|
|
parts.append(raw)
|
|
except (json.JSONDecodeError, ValueError):
|
|
# Quote bare value; empty ({k:}) becomes "" so json.loads sees {"k":""} not invalid {"k":}.
|
|
parts.append(json.dumps(raw.strip()))
|
|
else:
|
|
parts.append(src[key_start:i])
|
|
return "".join(parts)
|
|
|
|
|
|
def _gemma_arguments_to_json(args_src: str) -> dict:
|
|
"""Parse Gemma 4's native call:name{key:value} argument object."""
|
|
args_src = args_src.strip()
|
|
if not args_src:
|
|
return {}
|
|
src = _normalise_gemma_quoted_strings(args_src)
|
|
src = "{" + src + "}"
|
|
src = _quote_gemma_object_keys(src)
|
|
return json.loads(src)
|
|
|
|
|
|
def _inside_open_parameter(content: str, pos: int) -> bool:
|
|
"""Return True when ``pos`` falls inside an unclosed parameter value."""
|
|
last_param_start = -1
|
|
for match in _TC_PARAM_START_RE.finditer(content, 0, pos):
|
|
last_param_start = match.start()
|
|
if last_param_start < 0:
|
|
return False
|
|
# The parameter's OWN close tag decides: if it closes after ``pos`` the position is
|
|
# argument data (even across literal function closes); an unclosed one falls back to func close.
|
|
own_close = content.find(_PARAM_CLOSE_TAG, last_param_start)
|
|
if own_close >= 0:
|
|
return own_close > pos
|
|
func_close = content.find(_FUNC_CLOSE_TAG, last_param_start)
|
|
return func_close < 0 or pos < func_close
|
|
|
|
|
|
def _func_close_index(content: str, body_start: int, body: str) -> int:
|
|
"""Index in ``body`` of the first ``</function>`` that is not argument
|
|
data (not inside an open parameter value); -1 when every close is data.
|
|
Taking the LAST close swallowed prose between the real close and a
|
|
literal ``</function>`` mentioned later in the answer."""
|
|
idx = body.find(_FUNC_CLOSE_TAG)
|
|
while idx >= 0:
|
|
if not _inside_open_parameter(content, body_start + idx):
|
|
return idx
|
|
idx = body.find(_FUNC_CLOSE_TAG, idx + 1)
|
|
return -1
|
|
|
|
|
|
def _trim_param_value(val: str) -> str:
|
|
"""Trim the single wrapping newline the chat template adds around an XML
|
|
parameter value, preserving indentation inside VALUE (``str.strip()`` destroyed
|
|
code/diff argument indentation)."""
|
|
if val.startswith("\n"):
|
|
val = val[1:]
|
|
if val.endswith("\n"):
|
|
val = val[:-1]
|
|
return val
|
|
|
|
|
|
def _marker_coverage(content: str, markers) -> list[tuple[int, int]]:
|
|
"""Coverage ``[start, end]`` per marker, used to skip markers that are another
|
|
call's data. Closes pair to markers via a per-format stack so an inner close
|
|
is not mistaken for the outer's. Unbalanced braces cover to EOF; balanced with
|
|
a paired close cover through it (markers before the close are data); balanced
|
|
without one cover only the braces, so a later sibling is still recovered."""
|
|
n = len(content)
|
|
brace_regions = [(s, be) for (s, be, _k, _m) in markers if be >= 0]
|
|
events = [] # (position, order) with order 0 = braces-done, 1 = close marker
|
|
for idx, (_start, brace_end, _kind, _m) in enumerate(markers):
|
|
if brace_end >= 0:
|
|
events.append((brace_end, 0, _kind, idx))
|
|
for kind, close_re in (("json", _TC_END_TAG_RE), ("gemma", _TC_GEMMA_END_TAG_RE)):
|
|
for cm in close_re.finditer(content):
|
|
# A close inside another call's balanced braces is quoted data; it
|
|
# must not pop an earlier close-less marker and swallow a sibling.
|
|
if any(s < cm.start() < be for s, be in brace_regions):
|
|
continue
|
|
events.append((cm.start(), 1, kind, cm.end()))
|
|
events.sort(key = lambda e: (e[0], e[1]))
|
|
waiting = {"json": [], "gemma": []}
|
|
close_end_for: dict[int, int] = {}
|
|
for _pos, order, kind, payload in events:
|
|
if order == 0:
|
|
waiting[kind].append(payload) # marker index, now awaiting its close
|
|
elif waiting[kind]:
|
|
close_end_for[waiting[kind].pop()] = payload # innermost open marker closes here
|
|
coverage = []
|
|
for idx, (start, brace_end, _kind, _m) in enumerate(markers):
|
|
if brace_end < 0:
|
|
coverage.append((start, n))
|
|
elif idx in close_end_for:
|
|
coverage.append((start, close_end_for[idx]))
|
|
else:
|
|
coverage.append((start, brace_end))
|
|
return coverage
|
|
|
|
|
|
def _build_markers(content: str):
|
|
"""JSON/Gemma tool markers as ``(start, brace_end, kind, match)`` in document
|
|
order; ``brace_end < 0`` marks an unbalanced (to-EOF) open."""
|
|
markers = []
|
|
for start_re, gemma, kind in (
|
|
(_TC_JSON_START_RE, False, "json"),
|
|
(_TC_GEMMA_START_RE, True, "gemma"),
|
|
):
|
|
for m in start_re.finditer(content):
|
|
if _inside_open_parameter(content, m.start()):
|
|
continue
|
|
brace_end = _balanced_brace_end(content, m.end() - 1, gemma_quotes = gemma)
|
|
markers.append((m.start(), brace_end, kind, m))
|
|
markers.sort(key = lambda c: c[0])
|
|
return markers
|
|
|
|
|
|
def marker_coverage(content: str) -> list[tuple[int, int]]:
|
|
"""Coverage spans of JSON/Gemma tool markers so other parsers can treat markup
|
|
inside a marker's coverage (even a marker that failed to parse) as that call's
|
|
data rather than a sibling call."""
|
|
return _marker_coverage(content, _build_markers(content))
|
|
|
|
|
|
def parse_tool_calls_from_text(
|
|
content: str,
|
|
*,
|
|
id_offset: int = 0,
|
|
allow_incomplete: bool = True,
|
|
enabled_tool_names = None,
|
|
with_spans: bool = False,
|
|
):
|
|
"""Parse OpenAI-format tool calls from model text.
|
|
|
|
Handles formats like:
|
|
<tool_call>{"name":"web_search","arguments":{"query":"..."}}</tool_call>
|
|
<|tool_call>call:web_search{query:"..."}<tool_call|>
|
|
<tool_call><function=web_search><parameter=query>...</parameter></function></tool_call>
|
|
[TOOL_CALLS]web_search{"query":"..."} (Mistral / Devstral fallback)
|
|
web_search[ARGS]{"query":"..."} (reasoning-model rehearsal)
|
|
|
|
A call rehearsed inside a ``<think>`` / ``[THINK]`` block is skipped, not
|
|
executed; the block is kept so a literal tag in a real argument is preserved.
|
|
|
|
With ``with_spans=True`` returns ``(tool_calls, spans)`` where ``spans[i]``
|
|
is the half-open ``(start, end)`` byte range of ``tool_calls[i]``'s markup
|
|
in ``content`` (including its close tag when present), so a caller can
|
|
remove exactly the parsed markup and keep every other byte intact.
|
|
"""
|
|
# Candidates starting inside a think block are rehearsals, skipped; blocks are kept, and a
|
|
# think marker opening inside a call is argument data (excluded from spans).
|
|
_think_spans = _think_spans_outside_tool_markup(content)
|
|
_think_starts = [s for s, _e in _think_spans]
|
|
|
|
def _in_think(pos: int) -> bool:
|
|
# Spans are ordered and non-overlapping; bisect gives O(log M) per candidate.
|
|
i = bisect.bisect_right(_think_starts, pos) - 1
|
|
return i >= 0 and _think_spans[i][0] <= pos < _think_spans[i][1]
|
|
|
|
tool_calls: list[dict] = []
|
|
call_spans: list[tuple] = []
|
|
# Collect JSON/Gemma markers; _marker_coverage decides nesting so a marker inside
|
|
# another call's coverage (even one that failed to parse) is data, not executed. A
|
|
# marker opening inside a think block is a rehearsal and is skipped.
|
|
parsed_items = [] # (start, span_end, name, arguments) in document order
|
|
markers = [mk for mk in _build_markers(content) if not _in_think(mk[0])]
|
|
coverage = _marker_coverage(content, markers)
|
|
for idx, (start, brace_end, kind, m) in enumerate(markers):
|
|
if any(s <= start < e for j, (s, e) in enumerate(coverage) if j != idx):
|
|
continue
|
|
if brace_end < 0:
|
|
continue # unclosed: not parseable; the fallback still excludes its XML
|
|
if not allow_incomplete:
|
|
tail = content[brace_end + 1 :].lstrip()
|
|
close_re = _TC_END_TAG_RE if kind == "json" else _TC_GEMMA_END_TAG_RE
|
|
if close_re.match(tail) is None:
|
|
continue
|
|
try:
|
|
if kind == "json":
|
|
obj = json.loads(content[m.end() - 1 : brace_end + 1])
|
|
name = obj.get("name", "")
|
|
# Accept ``parameters`` alias for ``arguments`` (Llama-3.2 drift inside Hermes).
|
|
arguments = obj.get("arguments")
|
|
if arguments is None:
|
|
arguments = obj.get("parameters", {})
|
|
if isinstance(arguments, dict):
|
|
arguments = json.dumps(arguments)
|
|
else:
|
|
name = m.group(1)
|
|
arguments = json.dumps(_gemma_arguments_to_json(content[m.end() : brace_end]))
|
|
except (json.JSONDecodeError, ValueError):
|
|
continue
|
|
span_end = brace_end + 1
|
|
close_re = _TC_END_TAG_RE if kind == "json" else _TC_GEMMA_END_TAG_RE
|
|
ws = len(content[span_end:]) - len(content[span_end:].lstrip())
|
|
close_m = close_re.match(content, span_end + ws)
|
|
if close_m:
|
|
span_end = close_m.end()
|
|
parsed_items.append((start, span_end, name, arguments))
|
|
|
|
func_starts = [
|
|
fm
|
|
for fm in _TC_FUNC_START_RE.finditer(content)
|
|
if not _inside_open_parameter(content, fm.start())
|
|
and not _in_think(fm.start())
|
|
and not any(s <= fm.start() < e for s, e in coverage)
|
|
]
|
|
for idx, fm in enumerate(func_starts):
|
|
func_name = fm.group(1)
|
|
body_start = fm.end()
|
|
next_func = func_starts[idx + 1].start() if idx + 1 < len(func_starts) else len(content)
|
|
end_tag = _TC_END_TAG_RE.search(content[body_start:])
|
|
if end_tag:
|
|
body_end = body_start + end_tag.start()
|
|
else:
|
|
body_end = len(content)
|
|
body_end = min(body_end, next_func)
|
|
body = content[body_start:body_end]
|
|
close_idx = _func_close_index(content, body_start, body)
|
|
if close_idx >= 0:
|
|
span_end = body_start + close_idx + len(_FUNC_CLOSE_TAG)
|
|
body = body[:close_idx]
|
|
elif not allow_incomplete:
|
|
continue
|
|
else:
|
|
body = _TC_FUNC_CLOSE_RE.sub("", body)
|
|
span_end = body_end
|
|
|
|
arguments: dict = {}
|
|
param_starts = list(_TC_PARAM_START_RE.finditer(body))
|
|
if len(param_starts) == 1:
|
|
pm = param_starts[0]
|
|
val = body[pm.end() :]
|
|
if not allow_incomplete:
|
|
stripped_val = val.rstrip()
|
|
if not stripped_val.endswith(_PARAM_CLOSE_TAG):
|
|
continue
|
|
val = stripped_val[: -len(_PARAM_CLOSE_TAG)]
|
|
else:
|
|
val = _TC_PARAM_CLOSE_RE.sub("", val)
|
|
arguments[pm.group(1)] = _trim_param_value(val)
|
|
else:
|
|
valid_params = True
|
|
for pidx, pm in enumerate(param_starts):
|
|
param_name = pm.group(1)
|
|
val_start = pm.end()
|
|
next_param = (
|
|
param_starts[pidx + 1].start() if pidx + 1 < len(param_starts) else len(body)
|
|
)
|
|
val = body[val_start:next_param]
|
|
if not allow_incomplete:
|
|
stripped_val = val.rstrip()
|
|
if not stripped_val.endswith(_PARAM_CLOSE_TAG):
|
|
valid_params = False
|
|
break
|
|
val = stripped_val[: -len(_PARAM_CLOSE_TAG)]
|
|
else:
|
|
val = _TC_PARAM_CLOSE_RE.sub("", val)
|
|
arguments[param_name] = _trim_param_value(val)
|
|
if not valid_params:
|
|
continue
|
|
|
|
span_start = fm.start()
|
|
wrap_open = re.search(r"<tool_call>\s*$", content[:span_start])
|
|
wrap_close = re.match(r"\s*</tool_call>", content[span_end:])
|
|
if wrap_open and wrap_close:
|
|
span_start = wrap_open.start()
|
|
span_end += wrap_close.end()
|
|
parsed_items.append((span_start, span_end, func_name, json.dumps(arguments)))
|
|
|
|
parsed_items.sort(key = lambda item: item[0])
|
|
for start, span_end, name, arguments in parsed_items:
|
|
tool_calls.append(
|
|
{
|
|
"id": f"call_{id_offset + len(tool_calls)}",
|
|
"type": "function",
|
|
"function": {"name": name, "arguments": arguments},
|
|
}
|
|
)
|
|
call_spans.append((start, span_end))
|
|
|
|
# Patterns 3+4: Mistral [TOOL_CALLS] and bare rehearsal via one balanced scan in document
|
|
# order, so a Mistral call and a rehearsal in one message both parse.
|
|
if not tool_calls:
|
|
for start, end, kind, m in _iter_bracket_spans(
|
|
content, enabled_tool_names = enabled_tool_names
|
|
):
|
|
if _in_think(start):
|
|
continue
|
|
# Extend the region over an immediately-following v11 closer so with_spans consumers strip it too.
|
|
closer = re.match(r"\s*\[/TOOL_CALLS\]", content[end:])
|
|
region_end = end + closer.end() if closer else end
|
|
if kind == "array":
|
|
# Decode elements individually (comma-tolerant): one json.loads of the whole
|
|
# body rejects the comma-less multi-call arrays Mistral/Ollama templates emit.
|
|
payload, item_ends = _decode_array_items(content, m.end(), end)
|
|
if not payload:
|
|
continue
|
|
# Tile the region so every byte belongs to exactly one span; a with_spans consumer
|
|
# keeps skipped bytes visible and strips promoted markup exactly once.
|
|
tile_start = start
|
|
last_span_idx = -1
|
|
for item_idx, item in enumerate(payload):
|
|
if not isinstance(item, dict) or "name" not in item:
|
|
continue
|
|
args = item.get("arguments", {})
|
|
if isinstance(args, str):
|
|
# ``arguments`` may itself be a JSON string (OpenAI spec).
|
|
try:
|
|
args = json.loads(args)
|
|
except (json.JSONDecodeError, ValueError):
|
|
pass
|
|
if not isinstance(args, (dict, str)):
|
|
# ``"arguments": null`` (or any non-object scalar) becomes {} like the
|
|
# <tool_call> path, not the string "null" auto-heal would mangle to
|
|
# a bogus {"query":"null"}.
|
|
args = {}
|
|
tool_calls.append(
|
|
{
|
|
"id": f"call_{id_offset + len(tool_calls)}",
|
|
"type": "function",
|
|
"function": {
|
|
"name": item.get("name", ""),
|
|
# A bare scalar string stays raw (like the <tool_call> path);
|
|
# json.dumps would double-encode it so the arg healer wraps
|
|
# "weather" with its literal quotes.
|
|
"arguments": args if isinstance(args, str) else json.dumps(args),
|
|
},
|
|
}
|
|
)
|
|
item_end = item_ends[item_idx] if item_idx < len(item_ends) else region_end
|
|
last_span_idx = len(call_spans)
|
|
call_spans.append((tile_start, item_end))
|
|
tile_start = item_end
|
|
if last_span_idx >= 0:
|
|
tile_start, _tile_end = call_spans[last_span_idx]
|
|
call_spans[last_span_idx] = (tile_start, region_end)
|
|
else:
|
|
try:
|
|
payload = json.loads(content[m.end() : end])
|
|
except (json.JSONDecodeError, ValueError):
|
|
continue
|
|
if not isinstance(payload, dict):
|
|
continue
|
|
tool_calls.append(
|
|
{
|
|
"id": f"call_{id_offset + len(tool_calls)}",
|
|
"type": "function",
|
|
"function": {
|
|
"name": m.group(1),
|
|
"arguments": json.dumps(payload),
|
|
},
|
|
}
|
|
)
|
|
call_spans.append((start, region_end))
|
|
|
|
if with_spans:
|
|
return tool_calls, call_spans
|
|
return tool_calls
|
|
|
|
|
|
def _strip_bracket_tag_calls(text: str, enabled_tool_names = None) -> str:
|
|
"""Strip complete [TOOL_CALLS] arrays / name / bare name[ARGS]{..} calls with one
|
|
balanced forward scan, so nested JSON args are removed whole (a fixed-depth regex
|
|
left two-level args behind). Truncated tails go to the caller's catch-all. Linear.
|
|
``enabled_tool_names`` gates the rehearsal form (inactive-name prose kept; None
|
|
strips every span)."""
|
|
if len(text) > _MAX_BRACKET_SCAN_CHARS:
|
|
return text
|
|
out: list[str] = []
|
|
cursor = 0
|
|
for start, end, _kind, _m in _iter_bracket_spans(text, enabled_tool_names = enabled_tool_names):
|
|
out.append(text[cursor:start])
|
|
cursor = end
|
|
out.append(text[cursor:])
|
|
return "".join(out)
|
|
|
|
|
|
def _tool_call_markup_spans(text: str) -> list[tuple[int, int]]:
|
|
"""Spans of tool-call markup, so a literal <think>/[THINK] inside a call's args is
|
|
stripped WITH the call, not kept as a reasoning block. Covers closed XML/bracket
|
|
calls and an unclosed XML call (run via allow_incomplete); without the open-ended
|
|
span the unclosed call's markup would leak after execution."""
|
|
# Skip a lazy closed-pair pattern whose close token is absent: its finditer would rescan
|
|
# to EOF from every opener (quadratic on a stream of unclosed openers).
|
|
spans = [
|
|
m.span()
|
|
for pat in _TOOL_CLOSED_PATS
|
|
if (_PAT_REQUIRED_TOKEN.get(pat) is None or _PAT_REQUIRED_TOKEN[pat] in text)
|
|
for m in pat.finditer(text)
|
|
]
|
|
spans.extend((start, end) for start, end, _kind, _m in _iter_bracket_spans(text))
|
|
# An unclosed opener is a real incomplete call only outside closed/bracket spans.
|
|
for pat in _TOOL_OPEN_XML_TAIL_PATS:
|
|
for m in pat.finditer(text):
|
|
if not any(s <= m.start() < e for s, e in spans):
|
|
spans.append(m.span())
|
|
return spans
|
|
|
|
|
|
def _think_spans_outside_tool_markup(text: str) -> list[tuple[int, int]]:
|
|
"""<think>/[THINK] block spans, minus any whose opening marker sits INSIDE a
|
|
tool-call span (that tag is argument data, not reasoning). Keeping it would drop a
|
|
real call after it as rehearsed and leak the call's markup. START tested only, so
|
|
a greedy unclosed <think> past the call is still that call's argument data."""
|
|
think_spans = [m.span() for m in _THINK_TAG_RE.finditer(text)]
|
|
call_spans = _tool_call_markup_spans(text)
|
|
# Prefilled reasoning: the template opens <think> in the prompt, so add a leading span
|
|
# (0..close) to skip calls rehearsed there; guarded so a stray close in a normal answer is safe.
|
|
close = _THINK_CLOSE_RE.search(text)
|
|
if close is not None:
|
|
opener = _THINK_OPEN_RE.search(text)
|
|
if (
|
|
(opener is None or close.start() < opener.start())
|
|
and not any(cs <= close.start() < ce for cs, ce in call_spans)
|
|
and any(cs >= close.end() for cs, ce in call_spans)
|
|
):
|
|
think_spans = [(0, close.end())] + think_spans
|
|
if not think_spans:
|
|
return think_spans
|
|
if not call_spans:
|
|
return think_spans
|
|
return [(s, e) for (s, e) in think_spans if not any(cs <= s < ce for cs, ce in call_spans)]
|
|
|
|
|
|
def strip_outside_think(text: str, strip_segment) -> str:
|
|
"""Apply ``strip_segment(segment, is_last)`` to visible text around <think>/[THINK]
|
|
blocks, preserving the blocks verbatim (tool-looking text inside is rehearsal).
|
|
``is_last`` is True only after the final block, so trailing-tail patterns apply
|
|
only there. Shared by every strip path so they stay consistent."""
|
|
# A think marker opening inside a complete call is argument text; excluding it lets the
|
|
# stripper see the whole call. START-tested, so an unclosed match stays argument data.
|
|
think_spans = _think_spans_outside_tool_markup(text)
|
|
if not think_spans:
|
|
return strip_segment(text, True)
|
|
pieces: list[str] = []
|
|
prev = 0
|
|
for s, e in think_spans:
|
|
pieces.append(strip_segment(text[prev:s], False))
|
|
pieces.append(text[s:e])
|
|
prev = e
|
|
pieces.append(strip_segment(text[prev:], True))
|
|
return "".join(pieces)
|
|
|
|
|
|
def _strip_gemma_native_spans(text: str, *, final: bool) -> str:
|
|
"""Remove complete Gemma-native spans, brace/quote-balanced so a literal
|
|
``<tool_call|>`` in a quoted argument cannot truncate the span. An incomplete
|
|
span is dropped to EOF when ``final``, else kept (still streaming)."""
|
|
out: list[str] = []
|
|
cursor = 0
|
|
for match in _TC_GEMMA_START_RE.finditer(text):
|
|
start = match.start()
|
|
if start < cursor:
|
|
continue
|
|
brace_end = _balanced_brace_end(text, match.end() - 1, gemma_quotes = True)
|
|
if brace_end < 0:
|
|
# Unbalanced: nothing completes from here on. Drop the rest if final,
|
|
# else keep it; stop either way (rescanning would be quadratic).
|
|
if final:
|
|
out.append(text[cursor:start])
|
|
cursor = len(text)
|
|
break
|
|
# Junk between } and <tool_call|> is malformed-call markup: strip through
|
|
# the close, keep text after it. No close anywhere means stop (linear).
|
|
close = _TC_GEMMA_END_TAG_RE.search(text, brace_end + 1)
|
|
if close is None:
|
|
if final:
|
|
out.append(text[cursor:start])
|
|
cursor = len(text)
|
|
break
|
|
out.append(text[cursor:start])
|
|
cursor = close.end()
|
|
out.append(text[cursor:])
|
|
return "".join(out)
|
|
|
|
|
|
def _gemma_span_ranges(text: str) -> list:
|
|
"""``(start, end)`` of each complete Gemma-native span; same walk as
|
|
``_strip_gemma_native_spans`` without stripping."""
|
|
ranges: list[tuple] = []
|
|
cursor = 0
|
|
for match in _TC_GEMMA_START_RE.finditer(text):
|
|
start = match.start()
|
|
if start < cursor:
|
|
continue
|
|
brace_end = _balanced_brace_end(text, match.end() - 1, gemma_quotes = True)
|
|
if brace_end < 0:
|
|
break
|
|
close = _TC_GEMMA_END_TAG_RE.search(text, brace_end + 1)
|
|
if close is None:
|
|
break
|
|
ranges.append((start, close.end()))
|
|
cursor = close.end()
|
|
return ranges
|
|
|
|
|
|
def _strip_closed_blocks_outside_gemma(text: str) -> str:
|
|
"""Closed JSON/function pre-pass that skips matches starting inside a complete
|
|
Gemma span: deleting across the span boundary would mangle the Gemma close and
|
|
truncate the tail. A skipped match resumes at the covering span's end, so a
|
|
real function-XML call after the span is still stripped."""
|
|
ranges = _gemma_span_ranges(text)
|
|
if not ranges:
|
|
return strip_tool_patterns(text, _TOOL_CLOSED_BLOCK_PATS)
|
|
for pat in _TOOL_CLOSED_BLOCK_PATS:
|
|
token = _PAT_REQUIRED_TOKEN.get(pat)
|
|
if token is not None and token not in text:
|
|
continue
|
|
out: list[str] = []
|
|
pos = 0
|
|
while True:
|
|
m = pat.search(text, pos)
|
|
if m is None:
|
|
out.append(text[pos:])
|
|
break
|
|
covering = next((r for r in ranges if r[0] <= m.start() < r[1]), None)
|
|
if covering is not None:
|
|
out.append(text[pos : covering[1]])
|
|
pos = covering[1]
|
|
continue
|
|
out.append(text[pos : m.start()])
|
|
pos = m.end()
|
|
new_text = "".join(out)
|
|
if new_text != text:
|
|
text = new_text
|
|
ranges = _gemma_span_ranges(text)
|
|
return text
|
|
|
|
|
|
def _strip_markup_segment(
|
|
text: str,
|
|
*,
|
|
final: bool,
|
|
enabled_tool_names = None,
|
|
) -> str:
|
|
# Bracket-tag calls (Mistral/rehearsal) first via balanced scan (any nesting depth,
|
|
# rehearsal name-gated); then the quote-aware Gemma-native passes so a literal
|
|
# <tool_call|> in an argument cannot truncate a block; finally the regex XML/tail sweeps.
|
|
text = _strip_bracket_tag_calls(text, enabled_tool_names = enabled_tool_names)
|
|
text = _strip_closed_blocks_outside_gemma(text)
|
|
text = _strip_gemma_native_spans(text, final = final)
|
|
patterns = _TOOL_ALL_PATS if final else _TOOL_CLOSED_PATS
|
|
return apply_tool_strip_patterns(text, patterns, enabled_tool_names = enabled_tool_names)
|
|
|
|
|
|
def strip_tool_call_markup(
|
|
text: str,
|
|
*,
|
|
final: bool = False,
|
|
enabled_tool_names = None,
|
|
) -> str:
|
|
"""Strip tool-call XML markup from text.
|
|
|
|
When ``final`` is False, only fully closed tool-call blocks are removed.
|
|
When ``final`` is True, trailing incomplete tool-call blocks are removed
|
|
too, and the result is stripped of surrounding whitespace.
|
|
|
|
``<think>`` / ``[THINK]`` reasoning is preserved verbatim (see
|
|
``strip_outside_think``); the trailing-tail patterns apply only after the
|
|
last block. ``enabled_tool_names`` keeps an inactive-name ``foo[ARGS]{..}``
|
|
example visible (it is prose, not a call) so display cleanup matches detection.
|
|
"""
|
|
result = strip_outside_think(
|
|
text,
|
|
lambda seg, is_last: _strip_markup_segment(
|
|
seg, final = final and is_last, enabled_tool_names = enabled_tool_names
|
|
),
|
|
)
|
|
return result.strip() if final else result
|