Some checks failed
build-prerelease / Build cortex binary (push) Blocked by required conditions
CI / Clippy (push) Waiting to run
CI / Test (push) Waiting to run
CI / CUDA type-check (push) Failing after 17s
build-prerelease / Resolve version stamps (push) Successful in 32s
CI / Format (push) Successful in 32s
build-prerelease / Build neuron-ada (push) Has been cancelled
build-prerelease / Package cortex RPM (push) Has been cancelled
build-prerelease / Package helexa-neuron-ada RPM (push) Has been cancelled
build-prerelease / Package helexa-neuron-ampere RPM (push) Has been cancelled
build-prerelease / Package helexa-neuron-blackwell RPM (push) Has been cancelled
build-prerelease / Publish to rpm.lair.cafe (unstable) (push) Has been cancelled
build-prerelease / Build neuron-blackwell (push) Has been cancelled
CI / Build cortex SRPM (push) Has been cancelled
build-prerelease / Build neuron-ampere (push) Has been cancelled
CI / Build neuron SRPM (push) Has been cancelled
CI / Publish cortex to COPR (push) Has been cancelled
CI / Publish neuron to COPR (push) Has been cancelled
CI / Bump version in source (push) Has been cancelled
Closes #6. Same model-agnostic seam as #8 but for tool-call markers (`<tool_call>` / `</tool_call>` on Qwen3-Coder, Hermes-format, DeepSeek-Coder, gpt-oss, …). Lets Zed's tool-use feature and any other vanilla OpenAI chat client get structured `tool_calls` deltas out of cortex without having to parse markers themselves. ## Implementation 1. **Tokenizer probe at load time** (`detect_tool_call_token_pair` in `wire::event`) — same shape as the reasoning-marker probe from #8. Both open AND close must resolve to single token ids; non-tool-use models get `None` and pass through unchanged. Stored on `LoadedModel.tool_call_tokens` and the TP analogue. 2. **New `InferenceEvent::ToolCall` variant** — carries `index` (call slot, per-turn counter), generated `id` (`call_<hex>_<idx>`), `name`, and the complete `arguments` JSON string. One event per parsed call. 3. **Token-level state machine** in all three streaming paths (CPU `run_inference_streaming`, CUDA single-GPU `stream_inference_via_worker`, CUDA TP `chat_completion_tp_stream`) layered on top of #8's reasoning routing: - `<tool_call>` token → enter buffering state, clear buffer. - Tokens while buffering → accumulate into `tool_call_buf` via the decoder (so multi-byte UTF-8 still buffers correctly) without emitting anything visible. - `</tool_call>` token → take the buffer, parse with `parse_tool_call_body` (extract `name` + `arguments`), emit a structured `ToolCall` event with a fresh `call_<hex>` id and the parsed fields. - On parse failure → fall back to re-emitting the original `<tool_call>{buf}</tool_call>` block as plain text content so helexa-acp's existing `ToolCallParser` repair passes still have a chance to recover the call. 4. **OpenAI chat projector** emits the OpenAI streaming `tool_calls` delta shape on `InferenceEvent::ToolCall` — `{tool_calls: [{index, id, type:"function", function:{name, arguments}}]}`. One chunk per call slot. 5. **OpenAI Responses projector** drops `ToolCall` events for now (Responses-side function_call event family routing tracked under #7); the chat path is what unblocks Zed's tool use today. ## Acceptance - Vanilla OpenAI chat clients (Zed's tool-use feature, any other OpenAI-compatible tool-call consumer) get structured tool_calls deltas against cortex+neuron without having to parse `<tool_call>` markers in content. - helexa-acp continues to work — when neuron parses cleanly, it consumes the structured deltas through its existing decoder. When the model emits malformed JSON, neuron falls back to text pass-through and helexa-acp's `ToolCallParser` recovers via the same path it always did. - Models without tool-call markers in their tokenizer pass through unchanged. - No hardcoded model knowledge — entirely driven by tokenizer metadata. ## Tests 2 new detection tests in `wire::event` (Qwen3-style marker detection, no-marker case). The streaming paths themselves stay covered by the existing chat-completions integration tests; full end-to-end exercise of the new path requires GPU-loaded models and lives outside the CI test surface. 215 workspace tests pass; clippy + fmt clean across the workspace. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
307 lines
12 KiB
Rust
307 lines
12 KiB
Rust
//! Format-agnostic inference event stream.
|
|
//!
|
|
//! The candle harness emits a sequence of these for every streaming
|
|
//! request. Wire-format projections in sibling modules
|
|
//! ([`super::openai_chat`], the eventual `openai_responses` /
|
|
//! `anthropic_messages` projections) read this stream and produce
|
|
//! the chunks / events their HTTP clients expect.
|
|
//!
|
|
//! Design notes:
|
|
//!
|
|
//! - [`Start`] carries no token of its own. It only signals "the
|
|
//! model has accepted the prompt and is about to begin emitting
|
|
//! text". OpenAI chat materialises this as a `role: assistant`
|
|
//! chunk; OpenAI Responses as the `response.created` +
|
|
//! `response.output_item.added` pair; Anthropic as
|
|
//! `message_start`. All three of those would otherwise have to
|
|
//! peek at the *first* token to know when to emit, which couples
|
|
//! the wire layer to the producer's pacing.
|
|
//! - [`TextDelta`] is *visible* output. Reasoning / `<think>`
|
|
//! blocks go through a future [`ReasoningDelta`] variant once
|
|
//! the harness learns to split them (today they pass through as
|
|
//! plain text inside `TextDelta`; helexa-acp picks them apart on
|
|
//! the consumer side).
|
|
//! - [`Finish`] is the only place a stream is allowed to end
|
|
//! cleanly. Projections rely on this to emit final usage
|
|
//! bookkeeping; absence means the producer crashed and the
|
|
//! consumer should treat the stream as truncated.
|
|
//!
|
|
//! [`Start`]: InferenceEvent::Start
|
|
//! [`TextDelta`]: InferenceEvent::TextDelta
|
|
//! [`Finish`]: InferenceEvent::Finish
|
|
|
|
/// One unit of output from the inference loop.
|
|
///
|
|
/// Producers send these on an `mpsc::Sender<InferenceEvent>`;
|
|
/// projection layers in sibling modules consume them and emit
|
|
/// wire-format-specific frames downstream.
|
|
#[derive(Debug, Clone)]
|
|
pub enum InferenceEvent {
|
|
/// The producer has accepted the prompt and is about to emit
|
|
/// the first token. Sent at most once per stream.
|
|
Start,
|
|
/// A piece of visible assistant text. Multiple deltas
|
|
/// concatenate into the complete reply.
|
|
TextDelta(String),
|
|
/// Reasoning / scratchpad text the model emitted inside a
|
|
/// `<think>` block (or equivalent). The harness routes
|
|
/// content between marker tokens here so wire projectors can
|
|
/// decide what to do with it (chat completions drops by
|
|
/// default; Responses API has a dedicated event family).
|
|
ReasoningDelta(String),
|
|
/// A tool call has been parsed out of a `<tool_call>{json}</tool_call>`
|
|
/// block. Carries the parsed name + arguments JSON string
|
|
/// (Anthropic / OpenAI projectors emit their own wire shape
|
|
/// from this).
|
|
///
|
|
/// `index` is the call slot — incremented per tool call in a
|
|
/// turn so wire formats that order calls by index
|
|
/// (OpenAI chat completions) can correlate.
|
|
ToolCall {
|
|
index: usize,
|
|
id: String,
|
|
name: String,
|
|
/// Complete JSON arguments string. The model could in
|
|
/// principle stream these token-by-token, but our
|
|
/// extraction buffers the whole block until `</tool_call>`
|
|
/// arrives and emits exactly one event per call.
|
|
arguments: String,
|
|
},
|
|
/// The stream is complete. Carries the reason so wire formats
|
|
/// that use it (OpenAI's `finish_reason`, Anthropic's
|
|
/// `stop_reason`) can render it without re-parsing.
|
|
Finish { reason: FinishReason },
|
|
}
|
|
|
|
/// Why a stream stopped. Stays small on purpose — anything that
|
|
/// doesn't map cleanly to one of these collapses to [`Stop`].
|
|
///
|
|
/// Mappings to wire formats:
|
|
///
|
|
/// | variant | OpenAI `finish_reason` | OpenAI Responses `status` | Anthropic `stop_reason` |
|
|
/// |---------|------------------------|---------------------------|-------------------------|
|
|
/// | `Stop` | `"stop"` | `"completed"` | `"end_turn"` |
|
|
/// | `Length`| `"length"` | `"incomplete"` | `"max_tokens"` |
|
|
/// | `ToolCalls` | `"tool_calls"` | `"completed"` | `"tool_use"` |
|
|
///
|
|
/// [`Stop`]: FinishReason::Stop
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum FinishReason {
|
|
/// Model emitted EOS naturally.
|
|
Stop,
|
|
/// Hit `max_tokens` before EOS.
|
|
Length,
|
|
/// Stopped because the model called a tool and is waiting for
|
|
/// the result. Not yet emitted by the candle harness —
|
|
/// reserved for the day tool-call extraction lands.
|
|
#[allow(dead_code)]
|
|
ToolCalls,
|
|
}
|
|
|
|
impl FinishReason {
|
|
/// String form used by OpenAI chat completions and OpenAI
|
|
/// completions. Wire modules can call this directly or do their
|
|
/// own mapping for non-string formats.
|
|
pub fn as_openai_str(self) -> &'static str {
|
|
match self {
|
|
FinishReason::Stop => "stop",
|
|
FinishReason::Length => "length",
|
|
FinishReason::ToolCalls => "tool_calls",
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Open/close token IDs for the reasoning marker a loaded model uses
|
|
/// (or `None` for non-reasoning models). The harness reads this once
|
|
/// at load time from the tokenizer's added-tokens table, then the
|
|
/// inference loop checks `next_token` against the pair to flip
|
|
/// between [`InferenceEvent::TextDelta`] and
|
|
/// [`InferenceEvent::ReasoningDelta`].
|
|
///
|
|
/// `open` and `close` text are kept alongside the IDs so wire
|
|
/// projectors that want to re-emit the literal markers (the
|
|
/// opt-in `include_thinking` path on chat completions) don't have
|
|
/// to reach back into the tokenizer for the strings.
|
|
#[derive(Debug, Clone)]
|
|
pub struct ReasoningTokenPair {
|
|
pub open_id: u32,
|
|
pub close_id: u32,
|
|
pub open_text: String,
|
|
pub close_text: String,
|
|
}
|
|
|
|
/// Known reasoning-marker conventions. Each is a `(open, close)`
|
|
/// pair of literal token strings. Each modern reasoning model
|
|
/// declares its markers in the tokenizer's `added_tokens` table;
|
|
/// at load time we probe for whichever pair the loaded tokenizer
|
|
/// has and stash both IDs.
|
|
///
|
|
/// Ordering matters only for tie-breaking when a model declares
|
|
/// multiple pairs (shouldn't happen in practice); the first hit
|
|
/// wins.
|
|
const KNOWN_REASONING_MARKERS: &[(&str, &str)] = &[
|
|
// Qwen3, DeepSeek-R1, gpt-oss, and most other open-weight
|
|
// reasoning models.
|
|
("<think>", "</think>"),
|
|
// Mistral Magistral.
|
|
("[THINK]", "[/THINK]"),
|
|
// Some older derivatives; harmless to probe.
|
|
("<thought>", "</thought>"),
|
|
("<reasoning>", "</reasoning>"),
|
|
];
|
|
|
|
/// Open/close token IDs for the model's tool-call marker
|
|
/// convention (or `None` for models that don't emit structured
|
|
/// tool calls). Same shape as [`ReasoningTokenPair`]: probed once
|
|
/// at load time, consumed by the inference loop to switch between
|
|
/// "emit visible deltas" and "buffer JSON for the next tool
|
|
/// call".
|
|
#[derive(Debug, Clone)]
|
|
pub struct ToolCallTokenPair {
|
|
pub open_id: u32,
|
|
pub close_id: u32,
|
|
pub open_text: String,
|
|
pub close_text: String,
|
|
}
|
|
|
|
/// Tool-call marker conventions. Open-weight tool-use models
|
|
/// converged on `<tool_call>` / `</tool_call>` (Qwen3-Coder /
|
|
/// -Instruct, the Hermes function-call format, DeepSeek-Coder,
|
|
/// gpt-oss). The pair lives alongside the reasoning markers in
|
|
/// the same `added_tokens` table.
|
|
const KNOWN_TOOL_CALL_MARKERS: &[(&str, &str)] = &[("<tool_call>", "</tool_call>")];
|
|
|
|
/// Probe a tokenizer for known tool-call marker pairs. Mirrors
|
|
/// [`detect_reasoning_token_pair`] — both open AND close must
|
|
/// resolve for the pair to be returned. `None` means the model
|
|
/// doesn't emit structured tool calls (or its tokenizer split
|
|
/// the markers across tokens).
|
|
pub fn detect_tool_call_token_pair<F>(token_to_id: F) -> Option<ToolCallTokenPair>
|
|
where
|
|
F: Fn(&str) -> Option<u32>,
|
|
{
|
|
for (open_text, close_text) in KNOWN_TOOL_CALL_MARKERS {
|
|
let open_id = token_to_id(open_text);
|
|
let close_id = token_to_id(close_text);
|
|
if let (Some(open_id), Some(close_id)) = (open_id, close_id) {
|
|
return Some(ToolCallTokenPair {
|
|
open_id,
|
|
close_id,
|
|
open_text: (*open_text).into(),
|
|
close_text: (*close_text).into(),
|
|
});
|
|
}
|
|
}
|
|
None
|
|
}
|
|
|
|
/// Inspect a tokenizer for known reasoning-marker pairs and return
|
|
/// the first match. The tokenizer types this trait is defined over
|
|
/// just need to expose `token_to_id(&str) -> Option<u32>` so this
|
|
/// stays decoupled from the candle crate — the production caller
|
|
/// passes a `tokenizers::Tokenizer`, but tests can fake one.
|
|
///
|
|
/// Returns `None` when no known marker pair is fully declared
|
|
/// (both open AND close token ids must resolve). That's the
|
|
/// pass-through case — non-reasoning models, or reasoning models
|
|
/// whose tokenizer split the markers across multiple tokens (rare
|
|
/// in practice; modern reasoning tokenizers list them as
|
|
/// `added_tokens`).
|
|
pub fn detect_reasoning_token_pair<F>(token_to_id: F) -> Option<ReasoningTokenPair>
|
|
where
|
|
F: Fn(&str) -> Option<u32>,
|
|
{
|
|
for (open_text, close_text) in KNOWN_REASONING_MARKERS {
|
|
let open_id = token_to_id(open_text);
|
|
let close_id = token_to_id(close_text);
|
|
if let (Some(open_id), Some(close_id)) = (open_id, close_id) {
|
|
return Some(ReasoningTokenPair {
|
|
open_id,
|
|
close_id,
|
|
open_text: (*open_text).into(),
|
|
close_text: (*close_text).into(),
|
|
});
|
|
}
|
|
}
|
|
None
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use std::collections::HashMap;
|
|
|
|
fn lookup<'a>(map: &'a HashMap<&'static str, u32>) -> impl Fn(&str) -> Option<u32> + 'a {
|
|
|s| map.get(s).copied()
|
|
}
|
|
|
|
#[test]
|
|
fn detects_qwen3_style_think_markers() {
|
|
let mut m = HashMap::new();
|
|
m.insert("<think>", 151648);
|
|
m.insert("</think>", 151649);
|
|
let pair = detect_reasoning_token_pair(lookup(&m)).expect("pair detected");
|
|
assert_eq!(pair.open_id, 151648);
|
|
assert_eq!(pair.close_id, 151649);
|
|
assert_eq!(pair.open_text, "<think>");
|
|
assert_eq!(pair.close_text, "</think>");
|
|
}
|
|
|
|
#[test]
|
|
fn detects_mistral_magistral_markers() {
|
|
let mut m = HashMap::new();
|
|
m.insert("[THINK]", 100);
|
|
m.insert("[/THINK]", 101);
|
|
let pair = detect_reasoning_token_pair(lookup(&m)).expect("pair detected");
|
|
assert_eq!(pair.open_text, "[THINK]");
|
|
}
|
|
|
|
#[test]
|
|
fn returns_none_when_only_open_marker_present() {
|
|
// A pathological tokenizer that has `<think>` but not
|
|
// `</think>` shouldn't half-detect. Pass-through.
|
|
let mut m = HashMap::new();
|
|
m.insert("<think>", 1);
|
|
assert!(detect_reasoning_token_pair(lookup(&m)).is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn returns_none_for_non_reasoning_tokenizer() {
|
|
let m: HashMap<&'static str, u32> = HashMap::new();
|
|
assert!(detect_reasoning_token_pair(lookup(&m)).is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn detects_tool_call_markers() {
|
|
let mut m = HashMap::new();
|
|
m.insert("<tool_call>", 151657);
|
|
m.insert("</tool_call>", 151658);
|
|
let pair = detect_tool_call_token_pair(lookup(&m)).expect("pair detected");
|
|
assert_eq!(pair.open_id, 151657);
|
|
assert_eq!(pair.close_id, 151658);
|
|
assert_eq!(pair.open_text, "<tool_call>");
|
|
assert_eq!(pair.close_text, "</tool_call>");
|
|
}
|
|
|
|
#[test]
|
|
fn returns_none_for_non_tool_use_tokenizer() {
|
|
let m: HashMap<&'static str, u32> = HashMap::new();
|
|
assert!(detect_tool_call_token_pair(lookup(&m)).is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn first_match_wins_when_multiple_pairs_declared() {
|
|
// Hypothetical tokenizer with both Qwen-style AND Mistral-style
|
|
// markers — the `<think>` pair is earlier in the convention
|
|
// table so it wins.
|
|
let mut m = HashMap::new();
|
|
m.insert("<think>", 1);
|
|
m.insert("</think>", 2);
|
|
m.insert("[THINK]", 3);
|
|
m.insert("[/THINK]", 4);
|
|
let pair = detect_reasoning_token_pair(lookup(&m)).unwrap();
|
|
assert_eq!(pair.open_id, 1);
|
|
assert_eq!(pair.close_id, 2);
|
|
}
|
|
}
|