agentdog 1.2.0 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +5 -4
- package/dist/ai-gateway/auth.d.ts.map +1 -1
- package/dist/ai-gateway/auth.js +7 -1
- package/dist/ai-gateway/auth.js.map +1 -1
- package/dist/ai-gateway/auth.test.js +11 -4
- package/dist/ai-gateway/auth.test.js.map +1 -1
- package/dist/ai-gateway/call-log.d.ts +18 -0
- package/dist/ai-gateway/call-log.d.ts.map +1 -0
- package/dist/ai-gateway/call-log.js +136 -0
- package/dist/ai-gateway/call-log.js.map +1 -0
- package/dist/ai-gateway/call-log.test.d.ts +2 -0
- package/dist/ai-gateway/call-log.test.d.ts.map +1 -0
- package/dist/ai-gateway/call-log.test.js +136 -0
- package/dist/ai-gateway/call-log.test.js.map +1 -0
- package/dist/ai-gateway/count-tokens.d.ts.map +1 -1
- package/dist/ai-gateway/count-tokens.js +11 -1
- package/dist/ai-gateway/count-tokens.js.map +1 -1
- package/dist/ai-gateway/dialects.d.ts +1 -0
- package/dist/ai-gateway/dialects.d.ts.map +1 -1
- package/dist/ai-gateway/dialects.js +7 -0
- package/dist/ai-gateway/dialects.js.map +1 -1
- package/dist/ai-gateway/gateway-server.d.ts +2 -3
- package/dist/ai-gateway/gateway-server.d.ts.map +1 -1
- package/dist/ai-gateway/gateway-server.js +183 -67
- package/dist/ai-gateway/gateway-server.js.map +1 -1
- package/dist/ai-gateway/integration.test.js +237 -3
- package/dist/ai-gateway/integration.test.js.map +1 -1
- package/dist/ai-gateway/ir/anthropic-out.d.ts +15 -0
- package/dist/ai-gateway/ir/anthropic-out.d.ts.map +1 -0
- package/dist/ai-gateway/ir/anthropic-out.js +173 -0
- package/dist/ai-gateway/ir/anthropic-out.js.map +1 -0
- package/dist/ai-gateway/ir/anthropic-out.test.d.ts +2 -0
- package/dist/ai-gateway/ir/anthropic-out.test.d.ts.map +1 -0
- package/dist/ai-gateway/ir/anthropic-out.test.js +173 -0
- package/dist/ai-gateway/ir/anthropic-out.test.js.map +1 -0
- package/dist/ai-gateway/ir/openai-in.d.ts +3 -0
- package/dist/ai-gateway/ir/openai-in.d.ts.map +1 -0
- package/dist/ai-gateway/ir/openai-in.js +133 -0
- package/dist/ai-gateway/ir/openai-in.js.map +1 -0
- package/dist/ai-gateway/ir/openai-in.test.d.ts +2 -0
- package/dist/ai-gateway/ir/openai-in.test.d.ts.map +1 -0
- package/dist/ai-gateway/ir/openai-in.test.js +108 -0
- package/dist/ai-gateway/ir/openai-in.test.js.map +1 -0
- package/dist/ai-gateway/ir/openai-sse.d.ts +22 -0
- package/dist/ai-gateway/ir/openai-sse.d.ts.map +1 -0
- package/dist/ai-gateway/ir/openai-sse.js +166 -0
- package/dist/ai-gateway/ir/openai-sse.js.map +1 -0
- package/dist/ai-gateway/ir/openai-sse.test.d.ts +2 -0
- package/dist/ai-gateway/ir/openai-sse.test.d.ts.map +1 -0
- package/dist/ai-gateway/ir/openai-sse.test.js +119 -0
- package/dist/ai-gateway/ir/openai-sse.test.js.map +1 -0
- package/dist/ai-gateway/ir-channel.d.ts +14 -1
- package/dist/ai-gateway/ir-channel.d.ts.map +1 -1
- package/dist/ai-gateway/ir-channel.js +52 -11
- package/dist/ai-gateway/ir-channel.js.map +1 -1
- package/dist/ai-gateway/model-router.d.ts.map +1 -1
- package/dist/ai-gateway/model-router.js +3 -0
- package/dist/ai-gateway/model-router.js.map +1 -1
- package/dist/ai-gateway/model-router.test.js +10 -0
- package/dist/ai-gateway/model-router.test.js.map +1 -1
- package/dist/ai-gateway/models-list.d.ts +9 -0
- package/dist/ai-gateway/models-list.d.ts.map +1 -0
- package/dist/ai-gateway/models-list.js +42 -0
- package/dist/ai-gateway/models-list.js.map +1 -0
- package/dist/ai-gateway/models-list.test.d.ts +2 -0
- package/dist/ai-gateway/models-list.test.d.ts.map +1 -0
- package/dist/ai-gateway/models-list.test.js +47 -0
- package/dist/ai-gateway/models-list.test.js.map +1 -0
- package/dist/ai-gateway/openai-errors.d.ts +7 -0
- package/dist/ai-gateway/openai-errors.d.ts.map +1 -0
- package/dist/ai-gateway/openai-errors.js +23 -0
- package/dist/ai-gateway/openai-errors.js.map +1 -0
- package/dist/ai-gateway/openai-errors.test.d.ts +2 -0
- package/dist/ai-gateway/openai-errors.test.d.ts.map +1 -0
- package/dist/ai-gateway/openai-errors.test.js +38 -0
- package/dist/ai-gateway/openai-errors.test.js.map +1 -0
- package/dist/ai-gateway/passthrough.d.ts +1 -0
- package/dist/ai-gateway/passthrough.d.ts.map +1 -1
- package/dist/ai-gateway/passthrough.js +104 -0
- package/dist/ai-gateway/passthrough.js.map +1 -1
- package/dist/ai-gateway/passthrough.test.js +66 -1
- package/dist/ai-gateway/passthrough.test.js.map +1 -1
- package/dist/daemon/agentdog-daemon.d.ts +1 -1
- package/dist/daemon/agentdog-daemon.d.ts.map +1 -1
- package/dist/daemon/agentdog-daemon.js +27 -1
- package/dist/daemon/agentdog-daemon.js.map +1 -1
- package/dist/daemon/daemon-web-server.ai.test.js +30 -3
- package/dist/daemon/daemon-web-server.ai.test.js.map +1 -1
- package/dist/daemon/daemon-web-server.d.ts +2 -0
- package/dist/daemon/daemon-web-server.d.ts.map +1 -1
- package/dist/daemon/daemon-web-server.js +83 -11
- package/dist/daemon/daemon-web-server.js.map +1 -1
- package/dist/logging/jsonl-store.d.ts +23 -0
- package/dist/logging/jsonl-store.d.ts.map +1 -0
- package/dist/logging/jsonl-store.js +107 -0
- package/dist/logging/jsonl-store.js.map +1 -0
- package/dist/logging/jsonl-store.test.d.ts +2 -0
- package/dist/logging/jsonl-store.test.d.ts.map +1 -0
- package/dist/logging/jsonl-store.test.js +89 -0
- package/dist/logging/jsonl-store.test.js.map +1 -0
- package/dist/logging/server-log-manager.d.ts +3 -0
- package/dist/logging/server-log-manager.d.ts.map +1 -1
- package/dist/logging/server-log-manager.js +20 -0
- package/dist/logging/server-log-manager.js.map +1 -1
- package/dist/types/index.d.ts +20 -0
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +3 -2
- package/web/dist/assets/index-CHSrrPtl.css +1 -0
- package/web/dist/assets/index-gdp_c7vR.js +106 -0
- package/web/dist/assets/index-gdp_c7vR.js.map +1 -0
- package/web/dist/index.html +2 -2
- package/web/dist/assets/index-BdEVyQ8g.js +0 -118
- package/web/dist/assets/index-BdEVyQ8g.js.map +0 -1
- package/web/dist/assets/index-Bsl7BWhF.css +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai-in.test.d.ts","sourceRoot":"","sources":["../../../src/ai-gateway/ir/openai-in.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
// src/ai-gateway/ir/openai-in.test.ts
|
|
2
|
+
import { describe, it, expect } from 'vitest';
|
|
3
|
+
import { openaiToIR } from './openai-in.js';
|
|
4
|
+
import { irToOpenAI } from './openai-out.js';
|
|
5
|
+
describe('openaiToIR', () => {
|
|
6
|
+
it('system/developer 消息按序收集为 IR.system', () => {
|
|
7
|
+
const ir = openaiToIR({
|
|
8
|
+
messages: [
|
|
9
|
+
{ role: 'system', content: '你是助手' },
|
|
10
|
+
{ role: 'developer', content: '补充规则' },
|
|
11
|
+
{ role: 'user', content: 'hi' },
|
|
12
|
+
],
|
|
13
|
+
});
|
|
14
|
+
expect(ir.system).toEqual([
|
|
15
|
+
{ kind: 'text', text: '你是助手' },
|
|
16
|
+
{ kind: 'text', text: '补充规则' },
|
|
17
|
+
]);
|
|
18
|
+
expect(ir.messages).toEqual([{ role: 'user', content: [{ kind: 'text', text: 'hi' }] }]);
|
|
19
|
+
});
|
|
20
|
+
it('assistant tool_calls 解析为 toolUse(arguments 字符串转对象)', () => {
|
|
21
|
+
const ir = openaiToIR({
|
|
22
|
+
messages: [
|
|
23
|
+
{ role: 'user', content: '天气' },
|
|
24
|
+
{ role: 'assistant', content: null, tool_calls: [
|
|
25
|
+
{ id: 'call_1', type: 'function', function: { name: 'get_weather', arguments: '{"city":"北京"}' } },
|
|
26
|
+
] },
|
|
27
|
+
{ role: 'tool', tool_call_id: 'call_1', content: '晴' },
|
|
28
|
+
],
|
|
29
|
+
});
|
|
30
|
+
expect(ir.messages[1]).toEqual({
|
|
31
|
+
role: 'assistant',
|
|
32
|
+
content: [{ kind: 'toolUse', id: 'call_1', name: 'get_weather', args: { city: '北京' } }],
|
|
33
|
+
});
|
|
34
|
+
expect(ir.messages[2]).toEqual({
|
|
35
|
+
role: 'user',
|
|
36
|
+
content: [{ kind: 'toolResult', toolUseId: 'call_1', content: '晴', isError: false }],
|
|
37
|
+
});
|
|
38
|
+
});
|
|
39
|
+
it('关键容错:连续 role:tool 合并为单条 user 消息(round-trip 经 irToOpenAI 不丢配对)', () => {
|
|
40
|
+
const body = {
|
|
41
|
+
messages: [
|
|
42
|
+
{ role: 'user', content: '两个工具' },
|
|
43
|
+
{ role: 'assistant', content: null, tool_calls: [
|
|
44
|
+
{ id: 'call_1', type: 'function', function: { name: 'a', arguments: '{}' } },
|
|
45
|
+
{ id: 'call_2', type: 'function', function: { name: 'b', arguments: '{}' } },
|
|
46
|
+
] },
|
|
47
|
+
{ role: 'tool', tool_call_id: 'call_1', content: '结果1' },
|
|
48
|
+
{ role: 'tool', tool_call_id: 'call_2', content: '结果2' },
|
|
49
|
+
],
|
|
50
|
+
};
|
|
51
|
+
const ir = openaiToIR(body);
|
|
52
|
+
// 两条 tool 消息合并为一条 user 消息
|
|
53
|
+
expect(ir.messages.length).toBe(3);
|
|
54
|
+
expect(ir.messages[2].content).toEqual([
|
|
55
|
+
{ kind: 'toolResult', toolUseId: 'call_1', content: '结果1', isError: false },
|
|
56
|
+
{ kind: 'toolResult', toolUseId: 'call_2', content: '结果2', isError: false },
|
|
57
|
+
]);
|
|
58
|
+
// round-trip:重建后两条 role:tool 消息都有真实 content(回归防护)
|
|
59
|
+
const rebuilt = irToOpenAI(ir, { id: 'x', slug: 'x', dialect: 'openai', baseUrl: 'https://x', apiKey: 'k', enabled: true }, 'm');
|
|
60
|
+
const toolMessages = rebuilt.body.messages.filter((m) => m.role === 'tool');
|
|
61
|
+
expect(toolMessages).toEqual([
|
|
62
|
+
{ role: 'tool', tool_call_id: 'call_1', content: '结果1' },
|
|
63
|
+
{ role: 'tool', tool_call_id: 'call_2', content: '结果2' },
|
|
64
|
+
]);
|
|
65
|
+
});
|
|
66
|
+
it('user parts 数组:text 与 data URI 图片', () => {
|
|
67
|
+
const ir = openaiToIR({
|
|
68
|
+
messages: [{ role: 'user', content: [
|
|
69
|
+
{ type: 'text', text: '看图' },
|
|
70
|
+
{ type: 'image_url', image_url: { url: 'data:image/png;base64,QUJD' } },
|
|
71
|
+
] }],
|
|
72
|
+
});
|
|
73
|
+
expect(ir.messages[0].content).toEqual([
|
|
74
|
+
{ kind: 'text', text: '看图' },
|
|
75
|
+
{ kind: 'image', mime: 'image/png', data: 'QUJD' },
|
|
76
|
+
]);
|
|
77
|
+
});
|
|
78
|
+
it('http 图片 URL 与旧 function role 的容错', () => {
|
|
79
|
+
const ir = openaiToIR({
|
|
80
|
+
messages: [
|
|
81
|
+
{ role: 'user', content: [{ type: 'image_url', image_url: { url: 'https://x/img.png' } }] },
|
|
82
|
+
{ role: 'function', name: 'old', content: 'x' },
|
|
83
|
+
],
|
|
84
|
+
});
|
|
85
|
+
expect(ir.messages[0].content).toEqual([{ kind: 'text', text: '[unsupported image url]' }]);
|
|
86
|
+
expect(ir.messages.length).toBe(1); // function role 忽略
|
|
87
|
+
});
|
|
88
|
+
it('tools / tool_choice / 采样参数', () => {
|
|
89
|
+
const ir = openaiToIR({
|
|
90
|
+
model: 'm', max_completion_tokens: 2048, temperature: 0.5, top_p: 0.9, stop: 'END', stream: true,
|
|
91
|
+
messages: [{ role: 'user', content: 'x' }],
|
|
92
|
+
tools: [{ type: 'function', function: { name: 'f', description: 'd', parameters: { type: 'object' } } }],
|
|
93
|
+
tool_choice: { type: 'function', function: { name: 'f' } },
|
|
94
|
+
});
|
|
95
|
+
expect(ir.sampling).toEqual({ maxTokens: 2048, temperature: 0.5, topP: 0.9, stopSequences: ['END'] });
|
|
96
|
+
expect(ir.tools).toEqual([{ name: 'f', description: 'd', inputSchema: { type: 'object' } }]);
|
|
97
|
+
expect(ir.toolChoice).toEqual({ mode: 'specific', name: 'f' });
|
|
98
|
+
expect(ir.stream).toBe(true);
|
|
99
|
+
});
|
|
100
|
+
it('max_tokens 缺省 4096;tool_choice 字符串形态', () => {
|
|
101
|
+
const ir = openaiToIR({
|
|
102
|
+
messages: [{ role: 'user', content: 'x' }], tool_choice: 'required',
|
|
103
|
+
});
|
|
104
|
+
expect(ir.sampling.maxTokens).toBe(4096);
|
|
105
|
+
expect(ir.toolChoice).toEqual({ mode: 'required' });
|
|
106
|
+
});
|
|
107
|
+
});
|
|
108
|
+
//# sourceMappingURL=openai-in.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai-in.test.js","sourceRoot":"","sources":["../../../src/ai-gateway/ir/openai-in.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Response } from 'express';
|
|
2
|
+
import { IREvent } from './types.js';
|
|
3
|
+
export declare class OpenAIChunkWriter {
|
|
4
|
+
private res;
|
|
5
|
+
private model;
|
|
6
|
+
private started;
|
|
7
|
+
private finished;
|
|
8
|
+
private toolIndex;
|
|
9
|
+
private promptTokens;
|
|
10
|
+
private completionTokens;
|
|
11
|
+
private usageEmitted;
|
|
12
|
+
private stopReason;
|
|
13
|
+
private readonly id;
|
|
14
|
+
private readonly created;
|
|
15
|
+
constructor(res: Response, model: string);
|
|
16
|
+
private chunk;
|
|
17
|
+
private ensureStart;
|
|
18
|
+
write(ev: IREvent): void;
|
|
19
|
+
finish(): void;
|
|
20
|
+
}
|
|
21
|
+
export declare function aggregateIROpenAI(events: IREvent[], model: string): any;
|
|
22
|
+
//# sourceMappingURL=openai-sse.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai-sse.d.ts","sourceRoot":"","sources":["../../../src/ai-gateway/ir/openai-sse.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,qBAAa,iBAAiB;IAWhB,OAAO,CAAC,GAAG;IAAY,OAAO,CAAC,KAAK;IAVhD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,YAAY,CAAK;IACzB,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAA4C;IAC9D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAyC;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;gBAErC,GAAG,EAAE,QAAQ,EAAU,KAAK,EAAE,MAAM;IAExD,OAAO,CAAC,KAAK;IASb,OAAO,CAAC,WAAW;IAanB,KAAK,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI;IAwCxB,MAAM,IAAI,IAAI;CAkBf;AAGD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAuDvE"}
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
export class OpenAIChunkWriter {
|
|
2
|
+
res;
|
|
3
|
+
model;
|
|
4
|
+
started = false;
|
|
5
|
+
finished = false;
|
|
6
|
+
toolIndex = -1; // IR 事件流工具调用严格串行,逐个递增
|
|
7
|
+
promptTokens = 0;
|
|
8
|
+
completionTokens = 0;
|
|
9
|
+
usageEmitted = false;
|
|
10
|
+
stopReason = 'stop';
|
|
11
|
+
id = `chatcmpl-${Date.now().toString(36)}`;
|
|
12
|
+
created = Math.floor(Date.now() / 1000);
|
|
13
|
+
constructor(res, model) {
|
|
14
|
+
this.res = res;
|
|
15
|
+
this.model = model;
|
|
16
|
+
}
|
|
17
|
+
chunk(delta, finishReason = null, choices = null) {
|
|
18
|
+
const payload = {
|
|
19
|
+
id: this.id, object: 'chat.completion.chunk', created: this.created, model: this.model,
|
|
20
|
+
choices: choices ?? [{ index: 0, delta, finish_reason: finishReason }],
|
|
21
|
+
};
|
|
22
|
+
this.res.write(`data: ${JSON.stringify(payload)}\n\n`);
|
|
23
|
+
}
|
|
24
|
+
// 延迟提交后调用:写响应头 + role 帧
|
|
25
|
+
ensureStart() {
|
|
26
|
+
if (this.started) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
this.started = true;
|
|
30
|
+
this.res.writeHead(200, {
|
|
31
|
+
'content-type': 'text/event-stream',
|
|
32
|
+
'cache-control': 'no-cache',
|
|
33
|
+
connection: 'keep-alive',
|
|
34
|
+
});
|
|
35
|
+
this.chunk({ role: 'assistant', content: '' });
|
|
36
|
+
}
|
|
37
|
+
write(ev) {
|
|
38
|
+
if (this.finished) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
switch (ev.type) {
|
|
42
|
+
case 'messageStart':
|
|
43
|
+
this.ensureStart();
|
|
44
|
+
break;
|
|
45
|
+
case 'textDelta':
|
|
46
|
+
this.ensureStart();
|
|
47
|
+
this.chunk({ content: ev.text });
|
|
48
|
+
break;
|
|
49
|
+
case 'toolCallStart':
|
|
50
|
+
this.ensureStart();
|
|
51
|
+
this.toolIndex++;
|
|
52
|
+
this.chunk({ tool_calls: [{ index: this.toolIndex, id: ev.id, type: 'function', function: { name: ev.name, arguments: '' } }] });
|
|
53
|
+
break;
|
|
54
|
+
case 'toolCallDelta':
|
|
55
|
+
this.chunk({ tool_calls: [{ index: this.toolIndex, function: { arguments: ev.argsDelta } }] });
|
|
56
|
+
break;
|
|
57
|
+
case 'toolCallEnd':
|
|
58
|
+
break; // OpenAI chunk 按 index 配对,无显式关闭帧
|
|
59
|
+
case 'usage':
|
|
60
|
+
this.promptTokens = ev.input;
|
|
61
|
+
this.completionTokens = ev.output;
|
|
62
|
+
this.usageEmitted = true;
|
|
63
|
+
break;
|
|
64
|
+
case 'finish':
|
|
65
|
+
this.stopReason = ev.reason; // IR reason 与 OpenAI finish_reason 同名(stop/tool_calls/length)
|
|
66
|
+
break;
|
|
67
|
+
case 'error':
|
|
68
|
+
if (this.started) {
|
|
69
|
+
// 流内错误:尚未提交响应头由 ir-channel 兜底为 HTTP 错误
|
|
70
|
+
this.res.write(`data: ${JSON.stringify({ error: { message: ev.message, type: 'api_error' } })}\n\n`);
|
|
71
|
+
}
|
|
72
|
+
break;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
// 事件流结束:finish 帧 + 可选 usage 帧 + [DONE]
|
|
76
|
+
finish() {
|
|
77
|
+
if (this.finished) {
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
this.ensureStart();
|
|
81
|
+
this.finished = true;
|
|
82
|
+
this.chunk({}, this.stopReason);
|
|
83
|
+
if (this.usageEmitted) {
|
|
84
|
+
// usage 帧不复用 chunk()(缺 usage 字段):include_usage 约定的空 choices 帧单独写出
|
|
85
|
+
this.res.write(`data: ${JSON.stringify({
|
|
86
|
+
id: this.id, object: 'chat.completion.chunk', created: this.created, model: this.model,
|
|
87
|
+
choices: [],
|
|
88
|
+
usage: { prompt_tokens: this.promptTokens, completion_tokens: this.completionTokens, total_tokens: this.promptTokens + this.completionTokens },
|
|
89
|
+
})}\n\n`);
|
|
90
|
+
}
|
|
91
|
+
this.res.write('data: [DONE]\n\n');
|
|
92
|
+
this.res.end();
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
// 非流式:IR 事件序列聚合为单个 chat.completion JSON
|
|
96
|
+
export function aggregateIROpenAI(events, model) {
|
|
97
|
+
let text = null;
|
|
98
|
+
let currentTool = null;
|
|
99
|
+
const toolCalls = [];
|
|
100
|
+
let input = 0, output = 0;
|
|
101
|
+
let finishReason = null;
|
|
102
|
+
for (const ev of events) {
|
|
103
|
+
switch (ev.type) {
|
|
104
|
+
case 'textDelta':
|
|
105
|
+
text = (text ?? '') + ev.text;
|
|
106
|
+
break;
|
|
107
|
+
case 'toolCallStart':
|
|
108
|
+
currentTool = { id: ev.id, name: ev.name, args: '' };
|
|
109
|
+
break;
|
|
110
|
+
case 'toolCallDelta':
|
|
111
|
+
if (currentTool) {
|
|
112
|
+
currentTool.args += ev.argsDelta;
|
|
113
|
+
}
|
|
114
|
+
break;
|
|
115
|
+
case 'toolCallEnd':
|
|
116
|
+
if (currentTool) {
|
|
117
|
+
toolCalls.push(toOpenAIToolCall(currentTool));
|
|
118
|
+
currentTool = null;
|
|
119
|
+
}
|
|
120
|
+
break;
|
|
121
|
+
case 'usage':
|
|
122
|
+
input = ev.input;
|
|
123
|
+
output = ev.output;
|
|
124
|
+
break;
|
|
125
|
+
case 'finish':
|
|
126
|
+
finishReason = ev.reason;
|
|
127
|
+
break;
|
|
128
|
+
case 'error':
|
|
129
|
+
throw new Error(ev.message);
|
|
130
|
+
default:
|
|
131
|
+
break;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
if (currentTool) { // 未闭合容错
|
|
135
|
+
toolCalls.push(toOpenAIToolCall(currentTool));
|
|
136
|
+
}
|
|
137
|
+
const message = { role: 'assistant', content: text, refusal: null };
|
|
138
|
+
if (toolCalls.length > 0) {
|
|
139
|
+
message.tool_calls = toolCalls;
|
|
140
|
+
}
|
|
141
|
+
return {
|
|
142
|
+
id: `chatcmpl-${Date.now().toString(36)}`,
|
|
143
|
+
object: 'chat.completion',
|
|
144
|
+
created: Math.floor(Date.now() / 1000),
|
|
145
|
+
model,
|
|
146
|
+
choices: [{ index: 0, message, finish_reason: finishReason ?? 'stop' }],
|
|
147
|
+
usage: { prompt_tokens: input, completion_tokens: output, total_tokens: input + output },
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
function toOpenAIToolCall(tool) {
|
|
151
|
+
return { id: tool.id, type: 'function', function: { name: tool.name, arguments: normalizeArgs(tool.args) } };
|
|
152
|
+
}
|
|
153
|
+
// 截断/非法 JSON 回退 '{}'(与 aggregateIR 同策略)
|
|
154
|
+
function normalizeArgs(args) {
|
|
155
|
+
if (!args) {
|
|
156
|
+
return '{}';
|
|
157
|
+
}
|
|
158
|
+
try {
|
|
159
|
+
JSON.parse(args);
|
|
160
|
+
return args;
|
|
161
|
+
}
|
|
162
|
+
catch {
|
|
163
|
+
return '{}';
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
//# sourceMappingURL=openai-sse.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai-sse.js","sourceRoot":"","sources":["../../../src/ai-gateway/ir/openai-sse.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai-sse.test.d.ts","sourceRoot":"","sources":["../../../src/ai-gateway/ir/openai-sse.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
// src/ai-gateway/ir/openai-sse.test.ts
|
|
2
|
+
import { describe, it, expect } from 'vitest';
|
|
3
|
+
import { OpenAIChunkWriter, aggregateIROpenAI } from './openai-sse.js';
|
|
4
|
+
function mockRes() {
|
|
5
|
+
const writes = [];
|
|
6
|
+
return {
|
|
7
|
+
writes,
|
|
8
|
+
headersSent: false,
|
|
9
|
+
headers: {},
|
|
10
|
+
writableEnded: false,
|
|
11
|
+
writeHead(_s, h) { this.headersSent = true; Object.assign(this.headers, h); return this; },
|
|
12
|
+
write(c) { writes.push(c); return true; },
|
|
13
|
+
end() { this.writableEnded = true; return this; },
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
function run(events) {
|
|
17
|
+
const res = mockRes();
|
|
18
|
+
const writer = new OpenAIChunkWriter(res, 'up-model');
|
|
19
|
+
for (const ev of events)
|
|
20
|
+
writer.write(ev);
|
|
21
|
+
writer.finish();
|
|
22
|
+
return { res, chunks: res.writes.map((w) => w.trim()).filter(Boolean) };
|
|
23
|
+
}
|
|
24
|
+
describe('OpenAIChunkWriter', () => {
|
|
25
|
+
it('事件序列 → role 帧 + content 帧 + finish 帧 + usage 帧 + [DONE]', () => {
|
|
26
|
+
const { res, chunks } = run([
|
|
27
|
+
{ type: 'messageStart' },
|
|
28
|
+
{ type: 'textDelta', text: '你' },
|
|
29
|
+
{ type: 'textDelta', text: '好' },
|
|
30
|
+
{ type: 'usage', input: 12, output: 3 },
|
|
31
|
+
{ type: 'finish', reason: 'stop' },
|
|
32
|
+
]);
|
|
33
|
+
expect(res.headers['content-type']).toBe('text/event-stream');
|
|
34
|
+
expect(chunks[0]).toMatch(/^data: \{"id":"chatcmpl-/);
|
|
35
|
+
expect(JSON.parse(chunks[0].slice(6)).choices[0].delta).toEqual({ role: 'assistant', content: '' });
|
|
36
|
+
expect(JSON.parse(chunks[1].slice(6)).choices[0].delta).toEqual({ content: '你' });
|
|
37
|
+
expect(JSON.parse(chunks[2].slice(6)).choices[0].delta).toEqual({ content: '好' });
|
|
38
|
+
const finishChunk = JSON.parse(chunks[3].slice(6));
|
|
39
|
+
expect(finishChunk.choices[0]).toEqual({ index: 0, delta: {}, finish_reason: 'stop' });
|
|
40
|
+
const usageChunk = JSON.parse(chunks[4].slice(6));
|
|
41
|
+
expect(usageChunk.choices).toEqual([]);
|
|
42
|
+
expect(usageChunk.usage).toEqual({ prompt_tokens: 12, completion_tokens: 3, total_tokens: 15 });
|
|
43
|
+
expect(chunks[chunks.length - 1]).toBe('data: [DONE]');
|
|
44
|
+
// 所有帧共享同一 id/model
|
|
45
|
+
expect(JSON.parse(chunks[1].slice(6)).model).toBe('up-model');
|
|
46
|
+
expect(JSON.parse(chunks[1].slice(6)).id).toBe(JSON.parse(chunks[0].slice(6)).id);
|
|
47
|
+
});
|
|
48
|
+
it('工具调用:tool_calls index 递增、arguments 增量、finish_reason=tool_calls', () => {
|
|
49
|
+
const { chunks } = run([
|
|
50
|
+
{ type: 'messageStart' },
|
|
51
|
+
{ type: 'toolCallStart', id: 'c1', name: 'f1' },
|
|
52
|
+
{ type: 'toolCallDelta', argsDelta: '{"a":' },
|
|
53
|
+
{ type: 'toolCallDelta', argsDelta: '1}' },
|
|
54
|
+
{ type: 'toolCallEnd' },
|
|
55
|
+
{ type: 'toolCallStart', id: 'c2', name: 'f2' },
|
|
56
|
+
{ type: 'toolCallDelta', argsDelta: '{}' },
|
|
57
|
+
{ type: 'toolCallEnd' },
|
|
58
|
+
{ type: 'finish', reason: 'tool_calls' },
|
|
59
|
+
]);
|
|
60
|
+
const toolFrames = chunks.map((c) => c.startsWith('data: {') ? JSON.parse(c.slice(6)) : null).filter(Boolean)
|
|
61
|
+
.flatMap((j) => j.choices?.[0]?.delta?.tool_calls || []);
|
|
62
|
+
expect(toolFrames).toEqual([
|
|
63
|
+
{ index: 0, id: 'c1', type: 'function', function: { name: 'f1', arguments: '' } },
|
|
64
|
+
{ index: 0, function: { arguments: '{"a":' } },
|
|
65
|
+
{ index: 0, function: { arguments: '1}' } },
|
|
66
|
+
{ index: 1, id: 'c2', type: 'function', function: { name: 'f2', arguments: '' } },
|
|
67
|
+
{ index: 1, function: { arguments: '{}' } },
|
|
68
|
+
]);
|
|
69
|
+
const finishChunk = chunks.map((c) => c.startsWith('data: {') ? JSON.parse(c.slice(6)) : null).filter(Boolean)
|
|
70
|
+
.find((j) => j.choices?.[0]?.finish_reason);
|
|
71
|
+
expect(finishChunk.choices[0].finish_reason).toBe('tool_calls');
|
|
72
|
+
});
|
|
73
|
+
it('流内 error 事件 → data: {"error":...} 帧(OpenAI SSE 无标准 error 事件,取通行做法)', () => {
|
|
74
|
+
const res = mockRes();
|
|
75
|
+
const writer = new OpenAIChunkWriter(res, 'm');
|
|
76
|
+
writer.write({ type: 'messageStart' });
|
|
77
|
+
writer.write({ type: 'error', message: 'upstream failed' });
|
|
78
|
+
writer.finish();
|
|
79
|
+
expect(res.writes.join('')).toContain('"error"');
|
|
80
|
+
expect(res.writes.join('')).toContain('upstream failed');
|
|
81
|
+
expect(res.writes.join('')).toContain('data: [DONE]');
|
|
82
|
+
});
|
|
83
|
+
});
|
|
84
|
+
describe('aggregateIROpenAI', () => {
|
|
85
|
+
it('纯文本聚合', () => {
|
|
86
|
+
const json = aggregateIROpenAI([
|
|
87
|
+
{ type: 'messageStart' },
|
|
88
|
+
{ type: 'textDelta', text: '你' },
|
|
89
|
+
{ type: 'textDelta', text: '好' },
|
|
90
|
+
{ type: 'usage', input: 5, output: 2 },
|
|
91
|
+
{ type: 'finish', reason: 'stop' },
|
|
92
|
+
], 'm');
|
|
93
|
+
expect(json.object).toBe('chat.completion');
|
|
94
|
+
expect(json.choices[0].message).toEqual({ role: 'assistant', content: '你好', refusal: null });
|
|
95
|
+
expect(json.choices[0].finish_reason).toBe('stop');
|
|
96
|
+
expect(json.usage).toEqual({ prompt_tokens: 5, completion_tokens: 2, total_tokens: 7 });
|
|
97
|
+
});
|
|
98
|
+
it('纯工具调用:content 为 null、arguments 为 JSON 字符串', () => {
|
|
99
|
+
const json = aggregateIROpenAI([
|
|
100
|
+
{ type: 'toolCallStart', id: 'c1', name: 'f' },
|
|
101
|
+
{ type: 'toolCallDelta', argsDelta: '{"a":1}' },
|
|
102
|
+
{ type: 'toolCallEnd' },
|
|
103
|
+
{ type: 'finish', reason: 'tool_calls' },
|
|
104
|
+
], 'm');
|
|
105
|
+
expect(json.choices[0].message.content).toBeNull();
|
|
106
|
+
expect(json.choices[0].message.tool_calls).toEqual([
|
|
107
|
+
{ id: 'c1', type: 'function', function: { name: 'f', arguments: '{"a":1}' } },
|
|
108
|
+
]);
|
|
109
|
+
});
|
|
110
|
+
it('截断的 arguments JSON 解析失败回退 {}(与 aggregateIR 同策略)', () => {
|
|
111
|
+
const json = aggregateIROpenAI([
|
|
112
|
+
{ type: 'toolCallStart', id: 'c1', name: 'f' },
|
|
113
|
+
{ type: 'toolCallDelta', argsDelta: '{"a":' },
|
|
114
|
+
{ type: 'toolCallEnd' },
|
|
115
|
+
], 'm');
|
|
116
|
+
expect(json.choices[0].message.tool_calls[0].function.arguments).toBe('{}');
|
|
117
|
+
});
|
|
118
|
+
});
|
|
119
|
+
//# sourceMappingURL=openai-sse.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai-sse.test.js","sourceRoot":"","sources":["../../../src/ai-gateway/ir/openai-sse.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,5 +11,18 @@ export interface DialectCodec {
|
|
|
11
11
|
createState(): any;
|
|
12
12
|
parseFinal(json: any): IREvent[];
|
|
13
13
|
}
|
|
14
|
-
export
|
|
14
|
+
export interface IREventWriter {
|
|
15
|
+
write(ev: IREvent): void;
|
|
16
|
+
finish(): void;
|
|
17
|
+
}
|
|
18
|
+
export interface IngressProfile {
|
|
19
|
+
toIR(body: any): IRRequest;
|
|
20
|
+
createWriter(res: Response, model: string): IREventWriter;
|
|
21
|
+
aggregate(events: IREvent[], model: string): any;
|
|
22
|
+
sendError(res: Response, status: number, type: string, message: string, code?: string): void;
|
|
23
|
+
upstreamError(res: Response, status: number, message: string): void;
|
|
24
|
+
}
|
|
25
|
+
export declare const anthropicIngress: IngressProfile;
|
|
26
|
+
export declare const openaiIngress: IngressProfile;
|
|
27
|
+
export declare function handleIRChannel(req: Request, res: Response, provider: AIProviderConfig, model: string, codec: DialectCodec, profile: IngressProfile): Promise<void>;
|
|
15
28
|
//# sourceMappingURL=ir-channel.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ir-channel.d.ts","sourceRoot":"","sources":["../../src/ai-gateway/ir-channel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"ir-channel.d.ts","sourceRoot":"","sources":["../../src/ai-gateway/ir-channel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAWnD,MAAM,WAAW,YAAY;IAC3B,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG;QACtE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,IAAI,EAAE,GAAG,CAAC;KACzD,CAAC;IAEF,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC;IACzD,WAAW,IAAI,GAAG,CAAC;IAEnB,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,EAAE,CAAC;CAClC;AAGD,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,MAAM,IAAI,IAAI,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,SAAS,CAAC;IAC3B,YAAY,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC;IAC1D,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC;IACjD,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE7F,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACrE;AAED,eAAO,MAAM,gBAAgB,EAAE,cAM9B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,cAS3B,CAAC;AAEF,wBAAsB,eAAe,CACnC,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CAwIf"}
|
|
@@ -2,9 +2,30 @@ import { anthropicToIR } from './ir/anthropic-in.js';
|
|
|
2
2
|
import { AnthropicSSEWriter, aggregateIR } from './ir/anthropic-sse.js';
|
|
3
3
|
import { sendUpstream } from './upstream/provider-client.js';
|
|
4
4
|
import { anthropicError, mapUpstreamStatus } from './anthropic-errors.js';
|
|
5
|
+
import { openaiToIR } from './ir/openai-in.js';
|
|
6
|
+
import { OpenAIChunkWriter, aggregateIROpenAI } from './ir/openai-sse.js';
|
|
7
|
+
import { openaiError, mapUpstreamStatusToOpenAI } from './openai-errors.js';
|
|
5
8
|
import { UPSTREAM_HEADER_TIMEOUT_MS, STREAM_WATCHDOG_MS } from './passthrough.js';
|
|
6
|
-
|
|
7
|
-
|
|
9
|
+
import { patchCallLog, requestExcerptOf, responseExcerptOf } from './call-log.js';
|
|
10
|
+
export const anthropicIngress = {
|
|
11
|
+
toIR: anthropicToIR,
|
|
12
|
+
createWriter: (res, model) => new AnthropicSSEWriter(res, model),
|
|
13
|
+
aggregate: aggregateIR,
|
|
14
|
+
sendError: (res, status, type, message) => anthropicError(res, status, type, message),
|
|
15
|
+
upstreamError: (res, status, message) => anthropicError(res, status, mapUpstreamStatus(status), message),
|
|
16
|
+
};
|
|
17
|
+
export const openaiIngress = {
|
|
18
|
+
toIR: openaiToIR,
|
|
19
|
+
createWriter: (res, model) => new OpenAIChunkWriter(res, model),
|
|
20
|
+
aggregate: aggregateIROpenAI,
|
|
21
|
+
sendError: (res, status, type, message, code) => openaiError(res, status, type, message, code),
|
|
22
|
+
upstreamError: (res, status, message) => {
|
|
23
|
+
const mapped = mapUpstreamStatusToOpenAI(status);
|
|
24
|
+
openaiError(res, status, mapped.type, message, mapped.code);
|
|
25
|
+
},
|
|
26
|
+
};
|
|
27
|
+
export async function handleIRChannel(req, res, provider, model, codec, profile) {
|
|
28
|
+
const ir = profile.toIR(req.body);
|
|
8
29
|
const { url, headers, body } = codec.buildRequest(ir, provider, model);
|
|
9
30
|
const abort = new AbortController();
|
|
10
31
|
res.on('close', () => abort.abort());
|
|
@@ -24,39 +45,58 @@ export async function handleIRChannel(req, res, provider, model, codec) {
|
|
|
24
45
|
return;
|
|
25
46
|
}
|
|
26
47
|
const isTimeout = /timeout/i.test(error.message);
|
|
27
|
-
|
|
48
|
+
patchCallLog(res, {
|
|
49
|
+
error: `upstream request failed: ${error.message}`,
|
|
50
|
+
requestExcerpt: requestExcerptOf(req),
|
|
51
|
+
});
|
|
52
|
+
profile.sendError(res, isTimeout ? 504 : 502, 'api_error', `upstream request failed: ${error.message}`);
|
|
28
53
|
return;
|
|
29
54
|
}
|
|
30
|
-
//
|
|
55
|
+
// 上游错误:状态码透传,错误体转入口方言格式、message 保留原文
|
|
31
56
|
if (upstream.status !== 200) {
|
|
32
57
|
if (res.writableEnded || abort.signal.aborted) {
|
|
33
58
|
return;
|
|
34
59
|
}
|
|
35
60
|
const text = await upstream.text().catch(() => '');
|
|
36
|
-
|
|
61
|
+
patchCallLog(res, {
|
|
62
|
+
error: `upstream ${upstream.status}`,
|
|
63
|
+
responseExcerpt: responseExcerptOf(text),
|
|
64
|
+
requestExcerpt: requestExcerptOf(req),
|
|
65
|
+
});
|
|
66
|
+
profile.upstreamError(res, upstream.status, text.slice(0, 2000) || `upstream ${upstream.status}`);
|
|
37
67
|
return;
|
|
38
68
|
}
|
|
39
69
|
const state = codec.createState();
|
|
40
70
|
if (!ir.stream) {
|
|
41
|
-
//
|
|
71
|
+
// 非流式:聚合为单个响应 JSON
|
|
42
72
|
try {
|
|
43
73
|
const text = await upstream.text();
|
|
44
74
|
const events = codec.parseFinal(JSON.parse(text));
|
|
45
|
-
|
|
75
|
+
// IR 事件流中的 usage 直接记入调用流水
|
|
76
|
+
for (const ev of events) {
|
|
77
|
+
if (ev.type === 'usage') {
|
|
78
|
+
patchCallLog(res, { usage: { inputTokens: ev.input, outputTokens: ev.output } });
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
const message = profile.aggregate(events, model);
|
|
46
82
|
res.status(200).json(message);
|
|
47
83
|
}
|
|
48
84
|
catch (error) {
|
|
49
85
|
if (!res.writableEnded && !abort.signal.aborted) {
|
|
50
|
-
|
|
86
|
+
patchCallLog(res, { error: `failed to process upstream response: ${error.message}` });
|
|
87
|
+
profile.sendError(res, 502, 'api_error', `failed to process upstream response: ${error.message}`);
|
|
51
88
|
}
|
|
52
89
|
}
|
|
53
90
|
return;
|
|
54
91
|
}
|
|
55
92
|
// 流式:延迟提交——首个语义事件(textDelta/toolCallStart)前不写 message_start
|
|
56
|
-
const writer =
|
|
93
|
+
const writer = profile.createWriter(res, model);
|
|
57
94
|
const buffered = [{ type: 'messageStart' }];
|
|
58
95
|
let committed = false;
|
|
59
96
|
const emit = (ev) => {
|
|
97
|
+
if (ev.type === 'usage') {
|
|
98
|
+
patchCallLog(res, { usage: { inputTokens: ev.input, outputTokens: ev.output } });
|
|
99
|
+
}
|
|
60
100
|
if (!committed) {
|
|
61
101
|
if (ev.type === 'textDelta' || ev.type === 'toolCallStart') {
|
|
62
102
|
committed = true;
|
|
@@ -68,7 +108,7 @@ export async function handleIRChannel(req, res, provider, model, codec) {
|
|
|
68
108
|
else if (ev.type === 'error') {
|
|
69
109
|
// 首个语义事件前失败:可返回正确状态码的 JSON 错误体
|
|
70
110
|
if (!res.headersSent) {
|
|
71
|
-
|
|
111
|
+
profile.sendError(res, 502, 'api_error', ev.message);
|
|
72
112
|
}
|
|
73
113
|
}
|
|
74
114
|
else {
|
|
@@ -108,8 +148,9 @@ export async function handleIRChannel(req, res, provider, model, codec) {
|
|
|
108
148
|
}
|
|
109
149
|
catch (error) {
|
|
110
150
|
clearInterval(watchdog);
|
|
151
|
+
patchCallLog(res, { error: `upstream stream failed: ${error.message}` });
|
|
111
152
|
if (!res.headersSent && !res.writableEnded && !abort.signal.aborted) {
|
|
112
|
-
|
|
153
|
+
profile.sendError(res, 502, 'api_error', `upstream stream failed: ${error.message}`);
|
|
113
154
|
}
|
|
114
155
|
else {
|
|
115
156
|
writer.write({ type: 'error', message: error.message });
|