refactor(chat): unify generation flow and fix tool/streaming bugs

- Unified synchronous generate() core with callback; both streaming and
  non-streaming paths run it via spawn_blocking (context: std Mutex).
- build_prompt now passes tool definitions to the template (was dead) and
  embeds assistant tool-call history as XML matching the parser format;
  fixes double <tool_response> wrap and template set-scoping bug.
- Tokenize with AddBos::Never (template owns <s>) to remove double BOS.
- Streaming: preserve inter-word spaces (per-chunk trim removed), add
  [DONE] + usage chunk, emit error events, single-shot tool_calls delta.
- Strict model validation (400 on unknown model); health/UI/README aligned
  to minicpm5-1b-fable5-v2-thinking; auth returns JSON errors; n_ctx/
  n_batch/n_threads env-configurable.
- Added 18 unit tests; cargo check/clippy/fmt clean.
- scripts/smoke-test.sh for post-deploy verification on the VPS.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
asepharyana
2026-08-03 08:58:13 +07:00
co-authored by Claude Opus 5
parent 344bc195fa
commit b636496497
14 changed files with 883 additions and 445 deletions
+84 -1
View File
@@ -104,7 +104,7 @@ pub struct ResponseMessage {
pub tool_calls: Option<Vec<ToolCall>>,
}
#[derive(Serialize)]
#[derive(Serialize, Clone)]
pub struct Usage {
pub prompt_tokens: u32,
pub completion_tokens: u32,
@@ -139,6 +139,36 @@ pub struct ToolCallResponse {
pub function: ToolCallFunction,
}
// ═══════════════════════════════════════════════════════════════
// GENERATION FINISH REASON
// ═══════════════════════════════════════════════════════════════
/// Why a generation run stopped. Produced by the engine and rendered as the
/// OpenAI `finish_reason` at the presentation layer.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum FinishReason {
/// Natural end-of-generation (EOS token) or a stop sequence matched.
Stop,
/// `max_tokens` exhausted.
Length,
/// A complete `<tool_call>` block was emitted.
ToolCalls,
/// Generation aborted early (e.g. client disconnected).
Aborted,
}
impl FinishReason {
/// Map to the OpenAI-compatible `finish_reason` string.
pub fn as_str(&self) -> &'static str {
match self {
FinishReason::Stop => "stop",
FinishReason::Length => "length",
FinishReason::ToolCalls => "tool_calls",
FinishReason::Aborted => "stop",
}
}
}
// ═══════════════════════════════════════════════════════════════
// SSE (STREAMING) TYPES
// ═══════════════════════════════════════════════════════════════
@@ -151,6 +181,59 @@ pub struct SseChunk {
pub created: i64,
pub model: String,
pub choices: Vec<SseChoice>,
#[serde(skip_serializing_if = "Option::is_none")]
pub usage: Option<Usage>,
}
impl SseChunk {
/// A delta chunk carrying partial reasoning/content/tool-call output.
pub fn delta(id: String, created: i64, model: String, delta: SseDelta) -> Self {
Self {
id,
object: "chat.completion.chunk".into(),
created,
model,
choices: vec![SseChoice {
index: 0,
delta,
finish_reason: None,
}],
usage: None,
}
}
/// The final chunk carrying the `finish_reason` (no token deltas).
pub fn finish(id: String, created: i64, model: String, finish_reason: &str) -> Self {
Self {
id,
object: "chat.completion.chunk".into(),
created,
model,
choices: vec![SseChoice {
index: 0,
delta: SseDelta {
role: None,
content: None,
tool_calls: None,
reasoning_content: None,
},
finish_reason: Some(finish_reason.into()),
}],
usage: None,
}
}
/// A trailing chunk with token usage and empty choices (OpenAI convention).
pub fn usage(id: String, created: i64, model: String, usage: Usage) -> Self {
Self {
id,
object: "chat.completion.chunk".into(),
created,
model,
choices: vec![],
usage: Some(usage),
}
}
}
#[derive(Serialize)]