fix: Fusion strip stream_options + reasoning model test probe
- combos: strip stream_options from Fusion panel fan-out to avoid DeepSeek 400 (#3024) - dashboard: raise model-test probe budget to 1024 + soft-pass reasoning-only responses (#3010)
This commit is contained in:
@@ -530,7 +530,10 @@ export async function handleFusionChat({ body, models, handleSingleModel, log, c
|
||||
log.info("FUSION", `Combo "${comboName}" | panel=${panel.length} [${panel.join(", ")}] | judge=${judge} | quorum=${minPanel}`);
|
||||
|
||||
// 1. Fan out to the panel in parallel: non-streaming, tools stripped (we want prose).
|
||||
const { tools, tool_choice, ...rest } = body;
|
||||
const { tools, tool_choice, stream_options, ...rest } = body;
|
||||
// Fusion runs panel models non-streaming; drop stream_options too, or providers
|
||||
// like DeepSeek reject it with "stream_options should be set along with stream = true".
|
||||
// See issue #3024.
|
||||
const panelBody = { ...rest, stream: false };
|
||||
|
||||
// Flatten tool turns to prose so panel models keep context without emitting tool_calls.
|
||||
|
||||
@@ -135,9 +135,11 @@ export async function pingModelByKind(model, kind, baseUrl = `http://127.0.0.1:$
|
||||
headers,
|
||||
body: JSON.stringify({
|
||||
model,
|
||||
// Claude-on-Copilot returns empty choices at max_tokens:1 (budget is spent
|
||||
// before a content token emits), so a 1-token probe yields a false negative.
|
||||
max_tokens: 16,
|
||||
// 1024 tokens: reasoning models (ClinePass/kimi-k3, deepseek-v4-pro, etc.) spend
|
||||
// their budget on chain-of-thought before emitting an answer. A tiny probe like
|
||||
// max_tokens:16 starves the answer and yields a false "no choices" failure.
|
||||
// See issue #3010.
|
||||
max_tokens: 1024,
|
||||
stream: false,
|
||||
messages: [{ role: "user", content: "hi" }],
|
||||
}),
|
||||
@@ -180,6 +182,21 @@ export async function pingModelByKind(model, kind, baseUrl = `http://127.0.0.1:$
|
||||
}
|
||||
|
||||
const hasChoices = Array.isArray(parsed?.choices) && parsed.choices.length > 0;
|
||||
|
||||
// Soft-pass (issue #3010): a reasoning model may burn its whole budget on
|
||||
// chain-of-thought and return finish_reason:"length" with empty content but
|
||||
// non-empty reasoning/thinking. That's a successful connection, not a failure.
|
||||
const firstChoice = parsed?.choices?.[0] || {};
|
||||
const hasReasoning =
|
||||
firstChoice.message?.reasoning ||
|
||||
firstChoice.message?.reasoning_content ||
|
||||
firstChoice.message?.thinking ||
|
||||
firstChoice.message?.thinking_content;
|
||||
const contentEmpty = !String(firstChoice.message?.content || "").trim();
|
||||
if (hasChoices && firstChoice.finish_reason === "length" && contentEmpty && hasReasoning) {
|
||||
return { ok: true, latencyMs, error: null, status: res.status, note: "reasoning-only response (length-limited)" };
|
||||
}
|
||||
|
||||
if (!hasChoices) {
|
||||
return {
|
||||
ok: false,
|
||||
|
||||
83
tests/unit/fusion-strip-stream-options-3024.test.js
Normal file
83
tests/unit/fusion-strip-stream-options-3024.test.js
Normal file
@@ -0,0 +1,83 @@
|
||||
// Issue #3024 — Fusion combo must strip `stream_options` from panel requests
|
||||
// when running non-streaming, or DeepSeek rejects with
|
||||
// "stream_options should be set along with stream = true".
|
||||
|
||||
import { describe, it, expect, vi } from "vitest";
|
||||
import { handleFusionChat } from "../../open-sse/services/combo.js";
|
||||
|
||||
// Minimal logger stub (combo.js calls log.info/warn).
|
||||
const log = { info: () => {}, warn: () => {}, error: () => {} };
|
||||
|
||||
function makeBody(extra = {}) {
|
||||
return {
|
||||
model: "combo/gemseek",
|
||||
stream: true,
|
||||
stream_options: { include_usage: true },
|
||||
messages: [{ role: "user", content: "hi" }],
|
||||
...extra,
|
||||
};
|
||||
}
|
||||
|
||||
describe("Fusion strips stream_options (#3024)", () => {
|
||||
it("removes stream_options before fanning out to panel models", async () => {
|
||||
let capturedPanelBody = null;
|
||||
const handleSingleModel = vi.fn(async (panelBody, model, isPanel) => {
|
||||
if (isPanel) capturedPanelBody = panelBody;
|
||||
// Simulate a successful non-stream JSON answer for the panel.
|
||||
if (isPanel) {
|
||||
return new Response(JSON.stringify({ choices: [{ message: { content: `ans-${model}` } }] }), {
|
||||
status: 200,
|
||||
headers: { "Content-Type": "application/json" },
|
||||
});
|
||||
}
|
||||
// Judge leg: return a final answer.
|
||||
return new Response(JSON.stringify({ choices: [{ message: { content: "final" } }] }), {
|
||||
status: 200,
|
||||
headers: { "Content-Type": "application/json" },
|
||||
});
|
||||
});
|
||||
|
||||
const res = await handleFusionChat({
|
||||
body: makeBody(),
|
||||
models: ["ds/deepseek-v4-flash", "gemini/gemini-3.5-flash-lite"],
|
||||
handleSingleModel,
|
||||
log,
|
||||
comboName: "GemSeek",
|
||||
judgeModel: "gemini/gemini-3.5-flash-lite",
|
||||
});
|
||||
|
||||
expect(res).toBeInstanceOf(Response);
|
||||
expect(capturedPanelBody).not.toBeNull();
|
||||
// Critical assertion: stream_options must NOT leak into panel requests.
|
||||
expect(capturedPanelBody.stream_options).toBeUndefined();
|
||||
expect(capturedPanelBody.stream).toBe(false);
|
||||
// Ensure the original client body still had it (proves we stripped deliberately).
|
||||
expect(makeBody().stream_options).toBeDefined();
|
||||
});
|
||||
|
||||
it("does not throw for a 2-model fusion with stream_options present", async () => {
|
||||
const handleSingleModel = vi.fn(async (panelBody, model, isPanel) => {
|
||||
if (isPanel) {
|
||||
return new Response(JSON.stringify({ choices: [{ message: { content: "ok" } }] }), {
|
||||
status: 200,
|
||||
headers: { "Content-Type": "application/json" },
|
||||
});
|
||||
}
|
||||
return new Response(JSON.stringify({ choices: [{ message: { content: "final" } }] }), {
|
||||
status: 200,
|
||||
headers: { "Content-Type": "application/json" },
|
||||
});
|
||||
});
|
||||
|
||||
const res = await handleFusionChat({
|
||||
body: makeBody({ stream_options: { include_usage: true } }),
|
||||
models: ["ds/deepseek-v4-pro", "ds/deepseek-v4-flash"],
|
||||
handleSingleModel,
|
||||
log,
|
||||
comboName: "GemSeek",
|
||||
judgeModel: "ds/deepseek-v4-pro",
|
||||
});
|
||||
|
||||
expect(res.status).toBe(200);
|
||||
});
|
||||
});
|
||||
77
tests/unit/ping-reasoning-models-3010.test.js
Normal file
77
tests/unit/ping-reasoning-models-3010.test.js
Normal file
@@ -0,0 +1,77 @@
|
||||
// Issue #3010 — Dashboard "Test" button fails for reasoning models because of a
|
||||
// tiny max_tokens probe. pingModelByKind must use a sane budget (1024) and treat a
|
||||
// reasoning-only (length-limited) response as a successful connection.
|
||||
//
|
||||
// The route module pulls in Next.js-only deps (@/lib/localDb, etc.) that don't
|
||||
// resolve under raw vitest, so we mock them and exercise the exported function.
|
||||
|
||||
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
|
||||
|
||||
// Mock the heavy Next.js-dependent imports BEFORE importing ping.js.
|
||||
vi.mock("@/lib/localDb", () => ({ getApiKeys: vi.fn(async () => [{ key: "test-key", isActive: true }]) }));
|
||||
vi.mock("@/shared/constants/config", () => ({ UPDATER_CONFIG: { appPort: 20127 } }));
|
||||
vi.mock("@/shared/utils/machineId", () => ({ getConsistentMachineId: vi.fn(async () => "cli-token") }));
|
||||
|
||||
const { pingModelByKind } = await import("../../src/app/api/models/test/ping.js");
|
||||
|
||||
describe("pingModelByKind reasoning models (#3010)", () => {
|
||||
let fetchMock;
|
||||
|
||||
beforeEach(() => {
|
||||
fetchMock = vi.fn();
|
||||
vi.stubGlobal("fetch", fetchMock);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
vi.unstubAllGlobals();
|
||||
});
|
||||
|
||||
function jsonResponse(obj) {
|
||||
return {
|
||||
ok: true,
|
||||
status: 200,
|
||||
text: async () => JSON.stringify(obj),
|
||||
json: async () => obj,
|
||||
};
|
||||
}
|
||||
|
||||
it("uses a 1024-token budget for the chat completions probe", async () => {
|
||||
fetchMock.mockResolvedValue(jsonResponse({ choices: [{ message: { content: "Hi there!" } }] }));
|
||||
|
||||
await pingModelByKind("cline-pass/kimi-k3", "llm", "http://127.0.0.1:20127");
|
||||
|
||||
expect(fetchMock).toHaveBeenCalledTimes(1);
|
||||
const body = JSON.parse(fetchMock.mock.calls[0][1].body);
|
||||
expect(body.max_tokens).toBe(1024);
|
||||
});
|
||||
|
||||
it("treats a reasoning-only (length-limited) response as ok:true", async () => {
|
||||
fetchMock.mockResolvedValue(
|
||||
jsonResponse({
|
||||
choices: [
|
||||
{
|
||||
finish_reason: "length",
|
||||
message: { content: "", reasoning: "The user said hi — a simple greeting..." },
|
||||
},
|
||||
],
|
||||
})
|
||||
);
|
||||
|
||||
const result = await pingModelByKind("cline-pass/kimi-k3", "llm", "http://127.0.0.1:20127");
|
||||
expect(result.ok).toBe(true);
|
||||
expect(result.note).toMatch(/reasoning-only/);
|
||||
});
|
||||
|
||||
it("still fails when there are no choices and no reasoning", async () => {
|
||||
fetchMock.mockResolvedValue(jsonResponse({ choices: [] }));
|
||||
const result = await pingModelByKind("some/model", "llm", "http://127.0.0.1:20127");
|
||||
expect(result.ok).toBe(false);
|
||||
expect(result.error).toMatch(/no completion choices/);
|
||||
});
|
||||
|
||||
it("passes a normal answer with the larger budget", async () => {
|
||||
fetchMock.mockResolvedValue(jsonResponse({ choices: [{ message: { content: "Hello!" } }] }));
|
||||
const result = await pingModelByKind("openai/gpt-4o", "llm", "http://127.0.0.1:20127");
|
||||
expect(result.ok).toBe(true);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user