@zimtsui/brainswitch 0.0.15 → 0.0.17
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 +32 -24
- package/build/adaptor.d.ts +1 -1
- package/build/adaptor.js +10 -6
- package/build/adaptor.js.map +1 -1
- package/build/agentloop.d.ts +1 -1
- package/build/agentloop.js +3 -3
- package/build/agentloop.js.map +1 -1
- package/build/api-types/{aliyun-stream.d.ts → aliyun.d.ts} +1 -4
- package/build/api-types/{aliyun-stream.js → aliyun.js} +6 -9
- package/build/api-types/aliyun.js.map +1 -0
- package/build/api-types/anthropic.d.ts +43 -0
- package/build/api-types/anthropic.js +288 -0
- package/build/api-types/anthropic.js.map +1 -0
- package/build/api-types/base.d.ts +3 -2
- package/build/api-types/base.js +8 -8
- package/build/api-types/base.js.map +1 -1
- package/build/api-types/google-base.d.ts +1 -0
- package/build/api-types/google-base.js +4 -1
- package/build/api-types/google-base.js.map +1 -1
- package/build/api-types/google-rest.d.ts +2 -3
- package/build/api-types/google-rest.js +10 -11
- package/build/api-types/google-rest.js.map +1 -1
- package/build/api-types/minimax.d.ts +34 -0
- package/build/api-types/minimax.js +49 -0
- package/build/api-types/minimax.js.map +1 -0
- package/build/api-types/openai-chatcompletions-base.d.ts +4 -1
- package/build/api-types/openai-chatcompletions-base.js +21 -2
- package/build/api-types/openai-chatcompletions-base.js.map +1 -1
- package/build/api-types/openai-chatcompletions-monolith-base.d.ts +2 -3
- package/build/api-types/openai-chatcompletions-monolith-base.js +19 -28
- package/build/api-types/openai-chatcompletions-monolith-base.js.map +1 -1
- package/build/api-types/openai-chatcompletions-stream-base.d.ts +4 -3
- package/build/api-types/openai-chatcompletions-stream-base.js +128 -52
- package/build/api-types/openai-chatcompletions-stream-base.js.map +1 -1
- package/build/api-types/openai-chatcompletions.d.ts +0 -3
- package/build/api-types/openai-chatcompletions.js +0 -5
- package/build/api-types/openai-chatcompletions.js.map +1 -1
- package/build/api-types/openai-responses.d.ts +4 -3
- package/build/api-types/openai-responses.js +27 -11
- package/build/api-types/openai-responses.js.map +1 -1
- package/build/api-types/openrouter-monolith.d.ts +8 -5
- package/build/api-types/openrouter-monolith.js +12 -19
- package/build/api-types/openrouter-monolith.js.map +1 -1
- package/build/api-types/openrouter-stream.d.ts +5 -6
- package/build/api-types/openrouter-stream.js +8 -15
- package/build/api-types/openrouter-stream.js.map +1 -1
- package/build/config.d.ts +4 -4
- package/build/endpoint-spec.d.ts +4 -4
- package/build/endpoint-spec.js +5 -4
- package/build/endpoint-spec.js.map +1 -1
- package/build/engine.d.ts +2 -1
- package/build/session.d.ts +2 -0
- package/build/session.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -1
- package/build/api-types/aliyun-stream.js.map +0 -1
|
@@ -18,22 +18,24 @@ export class OpenAIChatCompletionsStreamEngineBase extends OpenAIChatCompletions
|
|
|
18
18
|
},
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
makeParams(session) {
|
|
22
|
+
const fdentries = Object.entries(this.fdm);
|
|
23
|
+
const tools = fdentries.map(fdentry => this.convertFromFunctionDeclarationEntry(fdentry));
|
|
22
24
|
return {
|
|
23
25
|
model: this.model,
|
|
24
26
|
messages: [
|
|
25
27
|
...(session.developerMessage ? this.convertFromRoleMessage(session.developerMessage) : []),
|
|
26
28
|
...session.chatMessages.flatMap(chatMessage => this.convertFromRoleMessage(chatMessage)),
|
|
27
29
|
],
|
|
28
|
-
tools:
|
|
29
|
-
|
|
30
|
-
|
|
30
|
+
tools: tools.length ? tools : undefined,
|
|
31
|
+
tool_choice: fdentries.length ? this.convertFromToolChoice(this.toolChoice) : undefined,
|
|
32
|
+
parallel_tool_calls: tools.length ? this.parallel : undefined,
|
|
31
33
|
stream: true,
|
|
32
34
|
stream_options: {
|
|
33
35
|
include_usage: true
|
|
34
36
|
},
|
|
35
|
-
max_completion_tokens: this.tokenLimit
|
|
36
|
-
...this.
|
|
37
|
+
max_completion_tokens: this.tokenLimit ?? undefined,
|
|
38
|
+
...this.additionalOptions,
|
|
37
39
|
};
|
|
38
40
|
}
|
|
39
41
|
convertToFunctionCallFromDelta(apifc) {
|
|
@@ -42,64 +44,138 @@ export class OpenAIChatCompletionsStreamEngineBase extends OpenAIChatCompletions
|
|
|
42
44
|
assert(apifc.function?.arguments);
|
|
43
45
|
return this.convertToFunctionCall(apifc);
|
|
44
46
|
}
|
|
45
|
-
|
|
47
|
+
convertCompletionStockToCompletion(stock) {
|
|
48
|
+
const stockChoice = stock?.choices[0];
|
|
49
|
+
assert(stockChoice?.finish_reason);
|
|
50
|
+
const completion = {
|
|
51
|
+
id: stock.id,
|
|
52
|
+
object: 'chat.completion',
|
|
53
|
+
created: stock.created,
|
|
54
|
+
model: stock.model,
|
|
55
|
+
choices: [{
|
|
56
|
+
index: 0,
|
|
57
|
+
finish_reason: stockChoice.finish_reason,
|
|
58
|
+
message: {
|
|
59
|
+
role: 'assistant',
|
|
60
|
+
content: stockChoice.delta.content ?? null,
|
|
61
|
+
tool_calls: stockChoice.delta.tool_calls?.map(apifc => {
|
|
62
|
+
assert(apifc.id !== undefined);
|
|
63
|
+
assert(apifc.function?.name !== undefined);
|
|
64
|
+
assert(apifc.function?.arguments !== undefined);
|
|
65
|
+
return {
|
|
66
|
+
id: apifc.id,
|
|
67
|
+
function: {
|
|
68
|
+
name: apifc.function.name,
|
|
69
|
+
arguments: apifc.function.arguments,
|
|
70
|
+
},
|
|
71
|
+
type: 'function',
|
|
72
|
+
};
|
|
73
|
+
}),
|
|
74
|
+
refusal: stockChoice.delta.refusal ?? null,
|
|
75
|
+
},
|
|
76
|
+
logprobs: stockChoice.logprobs ?? null,
|
|
77
|
+
}],
|
|
78
|
+
usage: stock.usage ?? undefined,
|
|
79
|
+
};
|
|
80
|
+
return completion;
|
|
81
|
+
}
|
|
82
|
+
async stateless(ctx, session, retry = 0) {
|
|
46
83
|
const signalTimeout = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
|
|
47
84
|
const signal = ctx.signal && signalTimeout ? AbortSignal.any([
|
|
48
85
|
ctx.signal,
|
|
49
86
|
signalTimeout,
|
|
50
87
|
]) : ctx.signal || signalTimeout;
|
|
51
88
|
try {
|
|
52
|
-
const params = this.
|
|
89
|
+
const params = this.makeParams(session);
|
|
53
90
|
ctx.logger.message?.trace(params);
|
|
54
91
|
await this.throttle.requests(ctx);
|
|
55
92
|
const stream = await this.client.chat.completions.create(params, { signal })
|
|
56
93
|
.catch(e => Promise.reject(new TransientError(undefined, { cause: e })));
|
|
57
|
-
let
|
|
58
|
-
let
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
94
|
+
let stock = null;
|
|
95
|
+
let thoughts = null, thinking = false;
|
|
96
|
+
for await (const chunk of stream) {
|
|
97
|
+
stock ??= {
|
|
98
|
+
id: chunk.id,
|
|
99
|
+
created: chunk.created,
|
|
100
|
+
model: chunk.model,
|
|
101
|
+
choices: [],
|
|
102
|
+
object: 'chat.completion.chunk',
|
|
103
|
+
};
|
|
104
|
+
// choice
|
|
105
|
+
const deltaChoice = chunk.choices[0];
|
|
106
|
+
if (deltaChoice) {
|
|
107
|
+
if (!stock.choices.length)
|
|
108
|
+
stock.choices.push({
|
|
109
|
+
index: 0,
|
|
110
|
+
finish_reason: null,
|
|
111
|
+
delta: {},
|
|
112
|
+
});
|
|
113
|
+
// thoughts
|
|
114
|
+
const deltaThoughts = this.getDeltaThoughts(deltaChoice.delta);
|
|
115
|
+
if (deltaThoughts) {
|
|
116
|
+
if (!thinking) {
|
|
117
|
+
thinking = true;
|
|
118
|
+
ctx.logger.inference?.trace('<think>\n');
|
|
119
|
+
}
|
|
120
|
+
ctx.logger.inference?.trace(deltaThoughts);
|
|
121
|
+
thoughts ??= '';
|
|
122
|
+
thoughts += deltaThoughts;
|
|
123
|
+
}
|
|
124
|
+
// content
|
|
125
|
+
if (deltaChoice.delta.content) {
|
|
126
|
+
if (thinking) {
|
|
127
|
+
thinking = false;
|
|
128
|
+
ctx.logger.inference?.trace('\n</think>\n');
|
|
129
|
+
}
|
|
130
|
+
ctx.logger.inference?.debug(deltaChoice.delta.content);
|
|
131
|
+
stock.choices[0].delta.content ??= '';
|
|
132
|
+
stock.choices[0].delta.content += deltaChoice.delta.content;
|
|
133
|
+
}
|
|
134
|
+
// function calls
|
|
135
|
+
if (deltaChoice.delta.tool_calls) {
|
|
136
|
+
if (thinking) {
|
|
137
|
+
thinking = false;
|
|
138
|
+
ctx.logger.inference?.trace('\n</think>\n');
|
|
139
|
+
}
|
|
140
|
+
stock.choices[0].delta.tool_calls ??= [];
|
|
141
|
+
for (const deltaToolCall of deltaChoice.delta.tool_calls) {
|
|
142
|
+
const toolCalls = stock.choices[0].delta.tool_calls;
|
|
143
|
+
toolCalls[deltaToolCall.index] ??= { index: deltaToolCall.index };
|
|
144
|
+
toolCalls[deltaToolCall.index].id ??= deltaToolCall.id;
|
|
145
|
+
if (deltaToolCall.function) {
|
|
146
|
+
toolCalls[deltaToolCall.index].function ??= {};
|
|
147
|
+
toolCalls[deltaToolCall.index].function.name ??= deltaToolCall.function.name;
|
|
148
|
+
if (deltaToolCall.function.arguments) {
|
|
149
|
+
toolCalls[deltaToolCall.index].function.arguments ??= '';
|
|
150
|
+
toolCalls[deltaToolCall.index].function.arguments += deltaToolCall.function?.arguments || '';
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
// finish reason
|
|
156
|
+
stock.choices[0].finish_reason ??= deltaChoice.finish_reason;
|
|
85
157
|
}
|
|
86
|
-
|
|
87
|
-
usage
|
|
158
|
+
// usage
|
|
159
|
+
stock.usage ??= chunk.usage;
|
|
88
160
|
}
|
|
89
|
-
assert(
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
assert(
|
|
93
|
-
if (
|
|
94
|
-
ctx.logger.
|
|
95
|
-
|
|
161
|
+
assert(stock);
|
|
162
|
+
const completion = this.convertCompletionStockToCompletion(stock);
|
|
163
|
+
const choice = completion.choices[0];
|
|
164
|
+
assert(choice, new TransientError('No choices', { cause: completion }));
|
|
165
|
+
if (choice.message.content)
|
|
166
|
+
ctx.logger.inference?.debug('\n');
|
|
167
|
+
this.handleFinishReason(completion, choice.finish_reason);
|
|
168
|
+
assert(completion.usage);
|
|
169
|
+
const cost = this.calcCost(completion.usage);
|
|
96
170
|
ctx.logger.cost?.(cost);
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
const
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
171
|
+
const aiMessage = this.convertToAiMessage(choice.message);
|
|
172
|
+
// logging
|
|
173
|
+
const apifcs = choice.message.tool_calls;
|
|
174
|
+
if (apifcs?.length)
|
|
175
|
+
ctx.logger.message?.debug(apifcs);
|
|
176
|
+
ctx.logger.message?.debug(completion.usage);
|
|
177
|
+
this.validateFunctionCallByToolChoice(aiMessage.getFunctionCalls());
|
|
178
|
+
return aiMessage;
|
|
103
179
|
}
|
|
104
180
|
catch (e) {
|
|
105
181
|
if (ctx.signal?.aborted)
|
|
@@ -111,7 +187,7 @@ export class OpenAIChatCompletionsStreamEngineBase extends OpenAIChatCompletions
|
|
|
111
187
|
throw e;
|
|
112
188
|
ctx.logger.message?.warn(e);
|
|
113
189
|
if (retry < 3)
|
|
114
|
-
return this.
|
|
190
|
+
return this.stateless(ctx, session, retry + 1);
|
|
115
191
|
else
|
|
116
192
|
throw e;
|
|
117
193
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-chatcompletions-stream-base.js","sourceRoot":"","sources":["../../src/api-types/openai-chatcompletions-stream-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAe,MAAM,cAAc,CAAC;AAG3C,MAAM,OAAgB,qCAAwF,SAAQ,+BAAoC;IACjJ,MAAM,CAAS;IAEvB,YAAmB,OAA4B;QAC9C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC;YACxB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE;gBACb,UAAU,EAAE,IAAI,CAAC,UAAU;aAC3B;SACD,CAAC,CAAC;IACJ,CAAC;IAES,
|
|
1
|
+
{"version":3,"file":"openai-chatcompletions-stream-base.js","sourceRoot":"","sources":["../../src/api-types/openai-chatcompletions-stream-base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import { type Engine } from '../engine.ts';
|
|
2
2
|
import { type Function } from '../function.ts';
|
|
3
3
|
import { OpenAIChatCompletionsMonolithEngineBase } from './openai-chatcompletions-monolith-base.ts';
|
|
4
|
-
import { type InferenceContext } from '../inference-context.ts';
|
|
5
|
-
import { type Session, type RoleMessage } from '../session.ts';
|
|
6
4
|
export declare namespace OpenAIChatCompletionsEngine {
|
|
7
5
|
function create<fdm extends Function.Declaration.Map = {}>(options: Engine.Options<fdm>): Engine<Function.Declaration.From<fdm>>;
|
|
8
6
|
class Constructor<in out fdm extends Function.Declaration.Map = {}> extends OpenAIChatCompletionsMonolithEngineBase<fdm> {
|
|
9
|
-
stateless(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>): Promise<RoleMessage.Ai<Function.Declaration.From<fdm>>>;
|
|
10
7
|
}
|
|
11
8
|
}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import {} from "../engine.js";
|
|
2
2
|
import {} from "../function.js";
|
|
3
3
|
import { OpenAIChatCompletionsMonolithEngineBase } from "./openai-chatcompletions-monolith-base.js";
|
|
4
|
-
import {} from "../inference-context.js";
|
|
5
|
-
import {} from "../session.js";
|
|
6
4
|
export var OpenAIChatCompletionsEngine;
|
|
7
5
|
(function (OpenAIChatCompletionsEngine) {
|
|
8
6
|
function create(options) {
|
|
@@ -10,9 +8,6 @@ export var OpenAIChatCompletionsEngine;
|
|
|
10
8
|
}
|
|
11
9
|
OpenAIChatCompletionsEngine.create = create;
|
|
12
10
|
class Constructor extends OpenAIChatCompletionsMonolithEngineBase {
|
|
13
|
-
stateless(ctx, session) {
|
|
14
|
-
return this.monolith(ctx, session);
|
|
15
|
-
}
|
|
16
11
|
}
|
|
17
12
|
OpenAIChatCompletionsEngine.Constructor = Constructor;
|
|
18
13
|
})(OpenAIChatCompletionsEngine || (OpenAIChatCompletionsEngine = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-chatcompletions.js","sourceRoot":"","sources":["../../src/api-types/openai-chatcompletions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAiB,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,uCAAuC,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-chatcompletions.js","sourceRoot":"","sources":["../../src/api-types/openai-chatcompletions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAiB,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,uCAAuC,EAAE,MAAM,2CAA2C,CAAC;AAEpG,MAAM,KAAW,2BAA2B,CAM3C;AAND,WAAiB,2BAA2B;IAC3C,SAAgB,MAAM,CAA4C,OAA4B;QAC7F,OAAO,IAAI,WAAW,CAAM,OAAO,CAAC,CAAC;IACtC,CAAC;IAFe,kCAAM,SAErB,CAAA;IAED,MAAa,WAA8D,SAAQ,uCAA4C;KAAG;IAArH,uCAAW,cAA0G,CAAA;AACnI,CAAC,EANgB,2BAA2B,KAA3B,2BAA2B,QAM3C"}
|
|
@@ -7,9 +7,9 @@ import OpenAI from 'openai';
|
|
|
7
7
|
export declare namespace OpenAIResponsesEngine {
|
|
8
8
|
function create<fdm extends Function.Declaration.Map = {}>(options: Engine.Options<fdm>): Engine<Function.Declaration.From<fdm>>;
|
|
9
9
|
class Constructor<in out fdm extends Function.Declaration.Map = {}> extends EngineBase<fdm> {
|
|
10
|
-
|
|
10
|
+
protected apiURL: URL;
|
|
11
|
+
protected parallel: boolean;
|
|
11
12
|
constructor(options: Engine.Options<fdm>);
|
|
12
|
-
stateless(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>): Promise<RoleMessage.Ai<Function.Declaration.From<fdm>>>;
|
|
13
13
|
protected convertFromFunctionCall(fc: Function.Call.Distributive<Function.Declaration.From<fdm>>): OpenAI.Responses.ResponseFunctionToolCall;
|
|
14
14
|
protected convertToFunctionCall(apifc: OpenAI.Responses.ResponseFunctionToolCall): Function.Call.Distributive<Function.Declaration.From<fdm>>;
|
|
15
15
|
protected convertFromFunctionResponse(fr: Function.Response.Distributive<Function.Declaration.From<fdm>>): OpenAI.Responses.ResponseInputItem.FunctionCallOutput;
|
|
@@ -17,12 +17,13 @@ export declare namespace OpenAIResponsesEngine {
|
|
|
17
17
|
protected convertFromAiMessage(aiMessage: RoleMessage.Ai<Function.Declaration.From<fdm>>): OpenAI.Responses.ResponseInput;
|
|
18
18
|
protected convertFromChatMessage(chatMessage: ChatMessage<Function.Declaration.From<fdm>>): OpenAI.Responses.ResponseInput;
|
|
19
19
|
protected convertFromFunctionDeclarationEntry(fdentry: Function.Declaration.Entry.From<fdm>): OpenAI.Responses.FunctionTool;
|
|
20
|
+
protected convertFromToolChoice(mode: Function.ToolChoice<fdm>): OpenAI.Responses.ToolChoiceOptions | OpenAI.Responses.ToolChoiceAllowed;
|
|
20
21
|
protected makeMonolithParams(session: Session<Function.Declaration.From<fdm>>): OpenAI.Responses.ResponseCreateParamsNonStreaming;
|
|
21
22
|
protected logApiAiMessage(ctx: InferenceContext, output: OpenAI.Responses.ResponseOutputItem[]): void;
|
|
22
23
|
protected convertToAiMessage(output: OpenAI.Responses.ResponseOutputItem[]): OpenAIResponsesAiMessage<Function.Declaration.From<fdm>>;
|
|
23
24
|
protected validateFunctionCallByToolChoice(functionCalls: Function.Call.Distributive<Function.Declaration.From<fdm>>[]): void;
|
|
24
25
|
protected calcCost(usage: OpenAI.Responses.ResponseUsage): number;
|
|
25
|
-
|
|
26
|
+
stateless(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>, retry?: number): Promise<RoleMessage.Ai<Function.Declaration.From<fdm>>>;
|
|
26
27
|
}
|
|
27
28
|
}
|
|
28
29
|
export type OpenAIResponsesAiMessage<fdu extends Function.Declaration> = OpenAIResponsesAiMessage.Constructor<fdu>;
|
|
@@ -17,12 +17,11 @@ export var OpenAIResponsesEngine;
|
|
|
17
17
|
OpenAIResponsesEngine.create = create;
|
|
18
18
|
class Constructor extends EngineBase {
|
|
19
19
|
apiURL;
|
|
20
|
+
parallel;
|
|
20
21
|
constructor(options) {
|
|
21
22
|
super(options);
|
|
22
23
|
this.apiURL = new URL(`${this.baseUrl}/responses`);
|
|
23
|
-
|
|
24
|
-
stateless(ctx, session) {
|
|
25
|
-
return this.monolith(ctx, session);
|
|
24
|
+
this.parallel = options.parallelFunctionCall ?? false;
|
|
26
25
|
}
|
|
27
26
|
convertFromFunctionCall(fc) {
|
|
28
27
|
assert(fc.id);
|
|
@@ -34,7 +33,7 @@ export var OpenAIResponsesEngine;
|
|
|
34
33
|
};
|
|
35
34
|
}
|
|
36
35
|
convertToFunctionCall(apifc) {
|
|
37
|
-
const fditem = this.
|
|
36
|
+
const fditem = this.fdm[apifc.name];
|
|
38
37
|
assert(fditem, new TransientError('Invalid function call', { cause: apifc }));
|
|
39
38
|
const args = (() => {
|
|
40
39
|
try {
|
|
@@ -107,19 +106,35 @@ export var OpenAIResponsesEngine;
|
|
|
107
106
|
type: 'function',
|
|
108
107
|
};
|
|
109
108
|
}
|
|
109
|
+
convertFromToolChoice(mode) {
|
|
110
|
+
if (mode === Function.ToolChoice.NONE)
|
|
111
|
+
return 'none';
|
|
112
|
+
else if (mode === Function.ToolChoice.REQUIRED)
|
|
113
|
+
return 'required';
|
|
114
|
+
else if (mode === Function.ToolChoice.AUTO)
|
|
115
|
+
return 'auto';
|
|
116
|
+
else {
|
|
117
|
+
return {
|
|
118
|
+
type: 'allowed_tools',
|
|
119
|
+
mode: 'required',
|
|
120
|
+
tools: mode.map(name => ({ type: 'function', name })),
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
}
|
|
110
124
|
makeMonolithParams(session) {
|
|
125
|
+
const fdentries = Object.entries(this.fdm);
|
|
126
|
+
const tools = fdentries.map(fdentry => this.convertFromFunctionDeclarationEntry(fdentry));
|
|
111
127
|
return {
|
|
112
128
|
model: this.model,
|
|
113
129
|
include: ['reasoning.encrypted_content'],
|
|
114
130
|
store: false,
|
|
115
131
|
input: session.chatMessages.flatMap(chatMessage => this.convertFromChatMessage(chatMessage)),
|
|
116
132
|
instructions: session.developerMessage?.getOnlyText(),
|
|
117
|
-
tools:
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
parallel_tool_calls: Object.keys(this.functionDeclarationMap).length ? false : undefined,
|
|
133
|
+
tools: tools.length ? tools : undefined,
|
|
134
|
+
tool_choice: fdentries.length ? this.convertFromToolChoice(this.toolChoice) : undefined,
|
|
135
|
+
parallel_tool_calls: fdentries.length ? this.parallel : undefined,
|
|
121
136
|
max_output_tokens: this.tokenLimit ? this.tokenLimit + 1 : undefined,
|
|
122
|
-
...this.
|
|
137
|
+
...this.additionalOptions,
|
|
123
138
|
};
|
|
124
139
|
}
|
|
125
140
|
logApiAiMessage(ctx, output) {
|
|
@@ -163,7 +178,7 @@ export var OpenAIResponsesEngine;
|
|
|
163
178
|
this.cachedPrice * cacheHitTokenCount / 1e6 +
|
|
164
179
|
this.outputPrice * usage.output_tokens / 1e6;
|
|
165
180
|
}
|
|
166
|
-
async
|
|
181
|
+
async stateless(ctx, session, retry = 0) {
|
|
167
182
|
const signalTimeout = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
|
|
168
183
|
const signal = ctx.signal && signalTimeout ? AbortSignal.any([
|
|
169
184
|
ctx.signal,
|
|
@@ -186,6 +201,7 @@ export var OpenAIResponsesEngine;
|
|
|
186
201
|
assert(res.ok, new Error(undefined, { cause: res }));
|
|
187
202
|
const response = await res.json();
|
|
188
203
|
ctx.logger.message?.trace(response);
|
|
204
|
+
assert(response.status === 'completed', new TransientError('Abnormal response status', { cause: response }));
|
|
189
205
|
this.logApiAiMessage(ctx, response.output);
|
|
190
206
|
assert(response.usage);
|
|
191
207
|
assert(response.usage.output_tokens <= (this.tokenLimit || Number.POSITIVE_INFINITY), new TransientError('Token limit exceeded.', { cause: response }));
|
|
@@ -206,7 +222,7 @@ export var OpenAIResponsesEngine;
|
|
|
206
222
|
throw e;
|
|
207
223
|
ctx.logger.message?.warn(e);
|
|
208
224
|
if (retry < 3)
|
|
209
|
-
return await this.
|
|
225
|
+
return await this.stateless(ctx, session, retry + 1);
|
|
210
226
|
else
|
|
211
227
|
throw e;
|
|
212
228
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-responses.js","sourceRoot":"","sources":["../../src/api-types/openai-responses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAkC,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAe,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAChE,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;AAGtB,MAAM,KAAW,qBAAqB,
|
|
1
|
+
{"version":3,"file":"openai-responses.js","sourceRoot":"","sources":["../../src/api-types/openai-responses.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { type Engine } from '../engine.ts';
|
|
2
2
|
import { Function } from '../function.ts';
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
|
-
import { type Session
|
|
4
|
+
import { type Session } from '../session.ts';
|
|
5
5
|
import { OpenAIChatCompletionsMonolithEngineBase } from './openai-chatcompletions-monolith-base.ts';
|
|
6
|
-
import { type InferenceContext } from '../inference-context.ts';
|
|
7
6
|
export interface OpenRouterUsage extends OpenAI.CompletionUsage {
|
|
8
7
|
cost: number;
|
|
9
8
|
}
|
|
@@ -11,13 +10,17 @@ export interface OpenRouterMonolithParams extends OpenAI.ChatCompletionCreatePar
|
|
|
11
10
|
usage?: {
|
|
12
11
|
include: boolean;
|
|
13
12
|
};
|
|
13
|
+
reasoning?: {};
|
|
14
|
+
}
|
|
15
|
+
export interface OpenRouterChatCompletionChoice extends OpenAI.ChatCompletion.Choice {
|
|
16
|
+
reasoning?: string;
|
|
14
17
|
}
|
|
15
18
|
export declare namespace OpenRouterMonolithEngine {
|
|
16
19
|
function create<fdm extends Function.Declaration.Map = {}>(options: Engine.Options<fdm>): Engine<Function.Declaration.From<fdm>>;
|
|
17
20
|
class Constructor<in out fdm extends Function.Declaration.Map = {}> extends OpenAIChatCompletionsMonolithEngineBase<fdm> {
|
|
18
|
-
|
|
19
|
-
protected calcCost(usage:
|
|
20
|
-
protected
|
|
21
|
+
constructor(options: Engine.Options<fdm>);
|
|
22
|
+
protected calcCost(usage: OpenRouterUsage): number;
|
|
23
|
+
protected makeParams(session: Session<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionCreateParamsNonStreaming;
|
|
21
24
|
protected convertToFunctionCall(apifc: OpenAI.ChatCompletionMessageFunctionToolCall): Function.Call.Distributive<Function.Declaration.From<fdm>>;
|
|
22
25
|
}
|
|
23
26
|
}
|
|
@@ -4,6 +4,7 @@ import OpenAI from 'openai';
|
|
|
4
4
|
import {} from "../session.js";
|
|
5
5
|
import { OpenAIChatCompletionsMonolithEngineBase } from "./openai-chatcompletions-monolith-base.js";
|
|
6
6
|
import {} from "../inference-context.js";
|
|
7
|
+
import assert from 'node:assert';
|
|
7
8
|
const EXCHANGE_RATE_USD_CNY = 8;
|
|
8
9
|
export var OpenRouterMonolithEngine;
|
|
9
10
|
(function (OpenRouterMonolithEngine) {
|
|
@@ -12,37 +13,29 @@ export var OpenRouterMonolithEngine;
|
|
|
12
13
|
}
|
|
13
14
|
OpenRouterMonolithEngine.create = create;
|
|
14
15
|
class Constructor extends OpenAIChatCompletionsMonolithEngineBase {
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
constructor(options) {
|
|
17
|
+
super(options);
|
|
18
|
+
assert(options.inputPrice === undefined, new Error('OpenRouter does not support `inputPrice` option'));
|
|
19
|
+
assert(options.outputPrice === undefined, new Error('OpenRouter does not support `outputPrice` option'));
|
|
20
|
+
assert(options.cachePrice === undefined, new Error('OpenRouter does not support `cachePrice` option'));
|
|
17
21
|
}
|
|
18
22
|
calcCost(usage) {
|
|
19
23
|
return usage.cost * EXCHANGE_RATE_USD_CNY;
|
|
20
24
|
}
|
|
21
|
-
|
|
25
|
+
makeParams(session) {
|
|
22
26
|
const params = {
|
|
23
|
-
|
|
24
|
-
messages: [
|
|
25
|
-
...(session.developerMessage ? this.convertFromRoleMessage(session.developerMessage) : []),
|
|
26
|
-
...session.chatMessages.flatMap(chatMessage => this.convertFromRoleMessage(chatMessage)),
|
|
27
|
-
],
|
|
28
|
-
tools: Object.keys(this.functionDeclarationMap).length
|
|
29
|
-
? Object.entries(this.functionDeclarationMap).map(fdentry => this.convertFromFunctionDeclarationEntry(fdentry))
|
|
30
|
-
: undefined,
|
|
31
|
-
tool_choice: Object.keys(this.functionDeclarationMap).length && this.toolChoice ? this.convertFromFunctionCallMode(this.toolChoice) : undefined,
|
|
32
|
-
stream: false,
|
|
27
|
+
...super.makeParams(session),
|
|
33
28
|
usage: {
|
|
34
29
|
include: true,
|
|
35
30
|
},
|
|
36
|
-
|
|
37
|
-
...this.customOptions,
|
|
31
|
+
...this.additionalOptions,
|
|
38
32
|
};
|
|
39
33
|
return params;
|
|
40
34
|
}
|
|
41
35
|
convertToFunctionCall(apifc) {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
return super.convertToFunctionCall({
|
|
36
|
+
return apifc.function.arguments
|
|
37
|
+
? super.convertToFunctionCall(apifc)
|
|
38
|
+
: super.convertToFunctionCall({
|
|
46
39
|
...apifc,
|
|
47
40
|
function: {
|
|
48
41
|
...apifc.function,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openrouter-monolith.js","sourceRoot":"","sources":["../../src/api-types/openrouter-monolith.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAkC,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,uCAAuC,EAAE,MAAM,2CAA2C,CAAC;AACpG,OAAO,EAAyB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"openrouter-monolith.js","sourceRoot":"","sources":["../../src/api-types/openrouter-monolith.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAkC,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,uCAAuC,EAAE,MAAM,2CAA2C,CAAC;AACpG,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAChE,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAehC,MAAM,KAAW,wBAAwB,CA2DxC;AA3DD,WAAiB,wBAAwB;IACxC,SAAgB,MAAM,CAA4C,OAA4B;QAC7F,OAAO,IAAI,WAAW,CAAM,OAAO,CAAC,CAAC;IACtC,CAAC;IAFe,+BAAM,SAErB,CAAA;IAED,MAAa,WAA8D,SAAQ,uCAA4C;QAC9H,YAAmB,OAA4B;YAC9C,KAAK,CAAC,OAAO,CAAC,CAAC;YACf,MAAM,CACL,OAAO,CAAC,UAAU,KAAK,SAAS,EAChC,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAC5D,CAAC;YACO,MAAM,CACd,OAAO,CAAC,WAAW,KAAK,SAAS,EACjC,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAC7D,CAAC;YACO,MAAM,CACd,OAAO,CAAC,UAAU,KAAK,SAAS,EAChC,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAC5D,CAAC;QACH,CAAC;QAEkB,QAAQ,CAAC,KAAsB;YACjD,OAAO,KAAK,CAAC,IAAI,GAAG,qBAAqB,CAAC;QAC3C,CAAC;QAEkB,UAAU,CAAC,OAAgD;YAC7E,MAAM,MAAM,GAA6B;gBACxC,GAAG,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC;gBAC5B,KAAK,EAAE;oBACN,OAAO,EAAE,IAAI;iBACb;gBACD,GAAG,IAAI,CAAC,iBAAiB;aACzB,CAAC;YACF,OAAO,MAAM,CAAC;QACf,CAAC;QAEkB,qBAAqB,CAAC,KAAmD;YAC3F,OAAO,KAAK,CAAC,QAAQ,CAAC,SAAS;gBAC9B,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC;gBACpC,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC;oBAC7B,GAAG,KAAK;oBACR,QAAQ,EAAE;wBACT,GAAG,KAAK,CAAC,QAAQ;wBACjB,SAAS,EAAE,IAAI;qBACf;iBACD,CAAC,CAAC;QACL,CAAC;KAWD;IArDY,oCAAW,cAqDvB,CAAA;AACF,CAAC,EA3DgB,wBAAwB,KAAxB,wBAAwB,QA2DxC"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { type Engine } from '../engine.ts';
|
|
2
2
|
import { Function } from '../function.ts';
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
|
-
import { type Session
|
|
4
|
+
import { type Session } from '../session.ts';
|
|
5
5
|
import { OpenAIChatCompletionsStreamEngineBase } from './openai-chatcompletions-stream-base.ts';
|
|
6
|
-
import { type InferenceContext } from '../inference-context.ts';
|
|
7
6
|
export interface OpenRouterUsage extends OpenAI.CompletionUsage {
|
|
8
7
|
cost: number;
|
|
9
8
|
}
|
|
@@ -19,10 +18,10 @@ export interface OpenRouterChatCompletionChunkChoiceDelta extends OpenAI.ChatCom
|
|
|
19
18
|
export declare namespace OpenRouterStreamEngine {
|
|
20
19
|
function create<fdm extends Function.Declaration.Map = {}>(options: Engine.Options<fdm>): Engine<Function.Declaration.From<fdm>>;
|
|
21
20
|
class Constructor<in out fdm extends Function.Declaration.Map = {}> extends OpenAIChatCompletionsStreamEngineBase<fdm> {
|
|
22
|
-
|
|
23
|
-
protected calcCost(usage:
|
|
24
|
-
protected getDeltaThoughts(delta:
|
|
25
|
-
protected
|
|
21
|
+
constructor(options: Engine.Options<fdm>);
|
|
22
|
+
protected calcCost(usage: OpenRouterUsage): number;
|
|
23
|
+
protected getDeltaThoughts(delta: OpenRouterChatCompletionChunkChoiceDelta): string;
|
|
24
|
+
protected makeParams(session: Session<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionCreateParamsStreaming;
|
|
26
25
|
protected convertToFunctionCallFromDelta(apifc: OpenAI.ChatCompletionChunk.Choice.Delta.ToolCall): Function.Call.Distributive<Function.Declaration.From<fdm>>;
|
|
27
26
|
protected convertToFunctionCall(apifc: OpenAI.ChatCompletionMessageFunctionToolCall): Function.Call.Distributive<Function.Declaration.From<fdm>>;
|
|
28
27
|
}
|