refactor(open-sse): translator DRY + schema enums, bug fixes, dead code cleanup
- Bug B1-B7: media UI m.kind||m.type, serviceKinds, gemini mediaPriority, schema kind, models/info lookup by kind - Dead code D1-D6: safeParseJSON, drop PROVIDER_ENDPOINTS, orphan fetcher, GITHUB_CONFIG derive, getProviderConfig internal, legacy kiro file - Translator concerns: toOpenAIUsage, toOpenAIFinish (gemini/kiro/ollama + fix kiro tool finish), thinking effort maps - Reorg helpers/ → concerns/ (logic) + formats/ (per-format) + schema/ (pure enums: roles/blocks/finishReasons/defaults) - Wire ~280 hardcoded role/block/finish/default literals to schema enums across 20+ files - collapseTextParts + extractTextContent dedup - Normalize translator fn names to openaiToXRequest / xToOpenAIResponse - Golden tests lock behavior; 0 regression (byte-for-byte providers/alias, 26=26 known fails) Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
decolua
@@ -14,7 +14,9 @@ Components:
|
||||
- `formats.js` — `FORMATS` enum (openai, claude, gemini, gemini-cli, openai-responses, antigravity, kiro, cursor, commandcode, ollama, vertex).
|
||||
- `request/<from>-to-<to>.js` — one-way request translation.
|
||||
- `response/<from>-to-<to>.js` — one-way SSE response translation.
|
||||
- `helpers/` — `openaiHelper.js` (filterToOpenAIFormat), `toolCallHelper.js` (id/arguments), `claudeHelper.js`, `geminiHelper.js`.
|
||||
- `schema/` — pure data enums (no logic): `roles.js` (ROLE, GEMINI_ROLE), `blocks.js` (OPENAI_BLOCK, CLAUDE_BLOCK, RESPONSES_ITEM, valid-type lists), `finishReasons.js` (OPENAI_FINISH, CLAUDE_STOP, GEMINI_FINISH), `defaults.js` (MODEL_FALLBACK, DEFAULT_IMAGE_MIME). Import via `schema/index.js`.
|
||||
- `concerns/` — cross-format translation LOGIC: `chunk.js`, `usage.js`, `reasoning.js`, `thinking.js` (effort↔budget/level), `toolCall.js`, `finishReason.js` (mapping fns), `image.js`, `json.js`.
|
||||
- `formats/` — per-format logic: `openai.js` (filterToOpenAIFormat), `claude.js`, `gemini.js`, `responsesApi.js`, `maxTokens.js`.
|
||||
|
||||
**OpenAI-bridge pitfalls** (source of most bugs): going through OpenAI easily loses `thinking`/`reasoning`, image URLs (non-base64), `input_audio`, `is_error`; tool `id`/`index` become unstable (parallel tool calls), non-text system blocks, `tool_choice:"none"`.
|
||||
|
||||
|
||||
@@ -365,7 +365,7 @@ exports[`GOLDEN response stream: Kiro → OpenAI > text + reasoning + toolUse +
|
||||
"choices": [
|
||||
{
|
||||
"delta": {},
|
||||
"finish_reason": "stop",
|
||||
"finish_reason": "tool_calls",
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
|
||||
@@ -0,0 +1,226 @@
|
||||
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
|
||||
|
||||
exports[`GOLDEN response stream: CommandCode → OpenAI > text + reasoning + tool + finish-step usage 1`] = `
|
||||
[
|
||||
{
|
||||
"choices": [
|
||||
{
|
||||
"delta": {
|
||||
"content": "Hello",
|
||||
"role": "assistant",
|
||||
},
|
||||
"finish_reason": null,
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
"created": 0,
|
||||
"id": "chatcmpl-<TS>",
|
||||
"model": "commandcode",
|
||||
"object": "chat.completion.chunk",
|
||||
},
|
||||
{
|
||||
"choices": [
|
||||
{
|
||||
"delta": {
|
||||
"reasoning_content": "thinking",
|
||||
},
|
||||
"finish_reason": null,
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
"created": 0,
|
||||
"id": "chatcmpl-<TS>",
|
||||
"model": "commandcode",
|
||||
"object": "chat.completion.chunk",
|
||||
},
|
||||
{
|
||||
"choices": [
|
||||
{
|
||||
"delta": {
|
||||
"tool_calls": [
|
||||
{
|
||||
"function": {
|
||||
"arguments": "",
|
||||
"name": "get_weather",
|
||||
},
|
||||
"id": "t1",
|
||||
"index": 0,
|
||||
"type": "function",
|
||||
},
|
||||
],
|
||||
},
|
||||
"finish_reason": null,
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
"created": 0,
|
||||
"id": "chatcmpl-<TS>",
|
||||
"model": "commandcode",
|
||||
"object": "chat.completion.chunk",
|
||||
},
|
||||
{
|
||||
"choices": [
|
||||
{
|
||||
"delta": {
|
||||
"tool_calls": [
|
||||
{
|
||||
"function": {
|
||||
"arguments": "{"city":"NYC"}",
|
||||
},
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
},
|
||||
"finish_reason": null,
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
"created": 0,
|
||||
"id": "chatcmpl-<TS>",
|
||||
"model": "commandcode",
|
||||
"object": "chat.completion.chunk",
|
||||
},
|
||||
{
|
||||
"choices": [
|
||||
{
|
||||
"delta": {},
|
||||
"finish_reason": "tool_calls",
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
"created": 0,
|
||||
"id": "chatcmpl-<TS>",
|
||||
"model": "commandcode",
|
||||
"object": "chat.completion.chunk",
|
||||
"usage": {
|
||||
"completion_tokens": 5,
|
||||
"prompt_tokens": 10,
|
||||
"total_tokens": 15,
|
||||
},
|
||||
},
|
||||
]
|
||||
`;
|
||||
|
||||
exports[`GOLDEN response stream: Kiro → OpenAI (finish after tool) > toolUse then stop — lock current finish_reason behavior 1`] = `
|
||||
[
|
||||
{
|
||||
"choices": [
|
||||
{
|
||||
"delta": {
|
||||
"content": "Hi",
|
||||
"role": "assistant",
|
||||
},
|
||||
"finish_reason": null,
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
"created": 0,
|
||||
"id": "chatcmpl-<TS>",
|
||||
"model": "kiro",
|
||||
"object": "chat.completion.chunk",
|
||||
},
|
||||
{
|
||||
"choices": [
|
||||
{
|
||||
"delta": {
|
||||
"tool_calls": [
|
||||
{
|
||||
"function": {
|
||||
"arguments": "{"q":"x"}",
|
||||
"name": "search",
|
||||
},
|
||||
"id": "tu_1",
|
||||
"index": 0,
|
||||
"type": "function",
|
||||
},
|
||||
],
|
||||
},
|
||||
"finish_reason": null,
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
"created": 0,
|
||||
"id": "chatcmpl-<TS>",
|
||||
"model": "kiro",
|
||||
"object": "chat.completion.chunk",
|
||||
},
|
||||
{
|
||||
"choices": [
|
||||
{
|
||||
"delta": {},
|
||||
"finish_reason": "tool_calls",
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
"created": 0,
|
||||
"id": "chatcmpl-<TS>",
|
||||
"model": "kiro",
|
||||
"object": "chat.completion.chunk",
|
||||
"usage": {
|
||||
"completion_tokens": 3,
|
||||
"prompt_tokens": 7,
|
||||
"total_tokens": 10,
|
||||
},
|
||||
},
|
||||
]
|
||||
`;
|
||||
|
||||
exports[`GOLDEN response stream: Ollama → OpenAI (finish after tool) > tool_calls then done_reason=stop — lock current finish_reason 1`] = `
|
||||
[
|
||||
{
|
||||
"choices": [
|
||||
{
|
||||
"delta": {
|
||||
"tool_calls": [
|
||||
{
|
||||
"function": {
|
||||
"arguments": "{"q":"x"}",
|
||||
"name": "search",
|
||||
},
|
||||
"id": "call_0_<TS>",
|
||||
"index": 0,
|
||||
"type": "function",
|
||||
},
|
||||
],
|
||||
},
|
||||
"finish_reason": null,
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
"created": 0,
|
||||
"id": "chatcmpl-<TS>",
|
||||
"model": "qwen3",
|
||||
"object": "chat.completion.chunk",
|
||||
},
|
||||
{
|
||||
"choices": [
|
||||
{
|
||||
"delta": {},
|
||||
"finish_reason": "tool_calls",
|
||||
"index": 0,
|
||||
},
|
||||
],
|
||||
"created": 0,
|
||||
"id": "chatcmpl-<TS>",
|
||||
"model": "qwen3",
|
||||
"object": "chat.completion.chunk",
|
||||
"usage": {
|
||||
"completion_tokens": 2,
|
||||
"prompt_tokens": 5,
|
||||
"total_tokens": 7,
|
||||
},
|
||||
},
|
||||
]
|
||||
`;
|
||||
|
||||
exports[`GOLDEN usage math: Claude prompt = input + cache (lock) > prompt_tokens sums input + cache_read + cache_creation 1`] = `
|
||||
{
|
||||
"completion_tokens": 5,
|
||||
"prompt_tokens": 15,
|
||||
"prompt_tokens_details": {
|
||||
"cache_creation_tokens": 2,
|
||||
"cached_tokens": 3,
|
||||
},
|
||||
"total_tokens": 20,
|
||||
}
|
||||
`;
|
||||
106
tests/translator/golden-translator-concerns.test.js
Normal file
106
tests/translator/golden-translator-concerns.test.js
Normal file
@@ -0,0 +1,106 @@
|
||||
// P0 GOLDEN (refactor2): lock OUTPUT translateResponse/Request cho các concern
|
||||
// SẮP refactor ở P1-P4 (usage field-map, finishReasonMap, reasoningDelta).
|
||||
// Bổ sung coverage còn thiếu so với golden-response-stream.test.js:
|
||||
// - commandcode usage/finish
|
||||
// - passthrough openai→openai (request + response)
|
||||
// - kiro/ollama finish_reason sau tool (lock behavior HIỆN TẠI, kể cả bug đã biết)
|
||||
// Sau refactor chạy lại phải khớp y hệt. Lệch = regression.
|
||||
import { describe, it, expect } from "vitest";
|
||||
import "./registerAll.js";
|
||||
import { translateRequest, translateResponse, initState } from "../../open-sse/translator/index.js";
|
||||
import { FORMATS } from "../../open-sse/translator/formats.js";
|
||||
|
||||
// Strip volatile id/created so snapshots are stable across runs.
|
||||
function stripVolatile(chunks) {
|
||||
return JSON.parse(JSON.stringify(chunks), (key, val) => {
|
||||
if (key === "created") return 0;
|
||||
if (key === "id" && typeof val === "string") {
|
||||
return val
|
||||
.replace(/-\d{10,}-(\d+)$/, "-<TS>-$1")
|
||||
.replace(/^chatcmpl-\d{10,}$/, "chatcmpl-<TS>")
|
||||
.replace(/^call_(\d+)_\d{10,}$/, "call_$1_<TS>")
|
||||
.replace(/^call_\d{10,}_(\d+)$/, "call_<TS>_$1");
|
||||
}
|
||||
return val;
|
||||
});
|
||||
}
|
||||
|
||||
function runStream(targetFormat, sourceFormat, events) {
|
||||
const state = initState(sourceFormat);
|
||||
const all = [];
|
||||
for (const ev of events) {
|
||||
const out = translateResponse(targetFormat, sourceFormat, ev, state);
|
||||
if (Array.isArray(out)) all.push(...out);
|
||||
else if (out) all.push(out);
|
||||
}
|
||||
return stripVolatile(all);
|
||||
}
|
||||
|
||||
describe("GOLDEN response stream: CommandCode → OpenAI", () => {
|
||||
it("text + reasoning + tool + finish-step usage", () => {
|
||||
const events = [
|
||||
{ type: "text-delta", text: "Hello" },
|
||||
{ type: "reasoning-delta", text: "thinking" },
|
||||
{ type: "tool-input-start", id: "t1", toolName: "get_weather" },
|
||||
{ type: "tool-input-delta", id: "t1", delta: '{"city":"NYC"}' },
|
||||
{ type: "finish-step", finishReason: "tool-calls", usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 } },
|
||||
{ type: "finish" },
|
||||
];
|
||||
expect(runStream(FORMATS.COMMANDCODE, FORMATS.OPENAI, events)).toMatchSnapshot();
|
||||
});
|
||||
});
|
||||
|
||||
describe("GOLDEN response stream: Kiro → OpenAI (finish after tool)", () => {
|
||||
it("toolUse then stop — lock current finish_reason behavior", () => {
|
||||
const events = [
|
||||
{ assistantResponseEvent: { content: "Hi" }, _eventType: "assistantResponseEvent" },
|
||||
{ toolUseEvent: { toolUseId: "tu_1", name: "search", input: { q: "x" } }, _eventType: "toolUseEvent" },
|
||||
{ usageEvent: { inputTokens: 7, outputTokens: 3 }, _eventType: "usageEvent" },
|
||||
{ _eventType: "messageStopEvent" },
|
||||
];
|
||||
expect(runStream(FORMATS.KIRO, FORMATS.OPENAI, events)).toMatchSnapshot();
|
||||
});
|
||||
});
|
||||
|
||||
describe("GOLDEN response stream: Ollama → OpenAI (finish after tool)", () => {
|
||||
it("tool_calls then done_reason=stop — lock current finish_reason", () => {
|
||||
const events = [
|
||||
{ model: "qwen3", message: { role: "assistant", tool_calls: [{ function: { name: "search", arguments: { q: "x" } } }] } },
|
||||
{ model: "qwen3", done: true, done_reason: "stop", prompt_eval_count: 5, eval_count: 2 },
|
||||
];
|
||||
expect(runStream(FORMATS.OLLAMA, FORMATS.OPENAI, events)).toMatchSnapshot();
|
||||
});
|
||||
});
|
||||
|
||||
describe("GOLDEN passthrough: same format = no translation", () => {
|
||||
it("response openai→openai returns chunk unchanged", () => {
|
||||
const chunk = { id: "chatcmpl-x", object: "chat.completion.chunk", created: 1, model: "gpt-4o", choices: [{ index: 0, delta: { content: "hi" }, finish_reason: null }] };
|
||||
const state = initState(FORMATS.OPENAI);
|
||||
const out = translateResponse(FORMATS.OPENAI, FORMATS.OPENAI, chunk, state);
|
||||
expect(out).toEqual([chunk]);
|
||||
});
|
||||
|
||||
it("request openai→openai keeps messages (filterToOpenAIFormat normalize)", () => {
|
||||
const body = { model: "gpt-4o", messages: [{ role: "user", content: "hi" }] };
|
||||
const out = translateRequest(FORMATS.OPENAI, FORMATS.OPENAI, "gpt-4o", body, true);
|
||||
expect(out.messages).toEqual([{ role: "user", content: "hi" }]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("GOLDEN usage math: Claude prompt = input + cache (lock)", () => {
|
||||
it("prompt_tokens sums input + cache_read + cache_creation", () => {
|
||||
const events = [
|
||||
{ type: "message_start", message: { id: "msg_1", model: "claude-opus-4-6" } },
|
||||
{ type: "content_block_start", index: 0, content_block: { type: "text" } },
|
||||
{ type: "content_block_delta", index: 0, delta: { type: "text_delta", text: "ok" } },
|
||||
{ type: "content_block_stop", index: 0 },
|
||||
{ type: "message_delta", delta: { stop_reason: "end_turn" }, usage: { input_tokens: 10, output_tokens: 5, cache_read_input_tokens: 3, cache_creation_input_tokens: 2 } },
|
||||
{ type: "message_stop" },
|
||||
];
|
||||
const out = runStream(FORMATS.CLAUDE, FORMATS.OPENAI, events);
|
||||
const finalChunk = out.find(c => c.usage);
|
||||
expect(finalChunk.usage.prompt_tokens).toBe(15); // 10 + 3 + 2
|
||||
expect(finalChunk.usage.completion_tokens).toBe(5);
|
||||
expect(finalChunk.usage).toMatchSnapshot();
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user