@zimtsui/brainswitch 0.0.5 → 0.0.7
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/build/adaptor.d.ts +1 -1
- package/build/adaptor.js +15 -16
- package/build/adaptor.js.map +1 -1
- package/build/agentloop.d.ts +2 -2
- package/build/agentloop.js +3 -3
- package/build/agentloop.js.map +1 -1
- package/build/api-types/aliyun-stream.d.ts +16 -0
- package/build/api-types/aliyun-stream.js +22 -0
- package/build/api-types/aliyun-stream.js.map +1 -0
- package/build/api-types/base.d.ts +7 -2
- package/build/api-types/base.js +15 -2
- package/build/api-types/base.js.map +1 -1
- package/build/api-types/google-base.d.ts +3 -3
- package/build/api-types/google-base.js +3 -3
- package/build/api-types/google-base.js.map +1 -1
- package/build/api-types/google-rest.d.ts +13 -14
- package/build/api-types/google-rest.js +21 -38
- package/build/api-types/google-rest.js.map +1 -1
- package/build/api-types/openai-chatcompletions-base.d.ts +3 -4
- package/build/api-types/openai-chatcompletions-base.js +3 -6
- package/build/api-types/openai-chatcompletions-base.js.map +1 -1
- package/build/api-types/openai-chatcompletions-monolith-base.d.ts +3 -3
- package/build/api-types/openai-chatcompletions-monolith-base.js +8 -9
- package/build/api-types/openai-chatcompletions-monolith-base.js.map +1 -1
- package/build/api-types/openai-chatcompletions-stream-base.d.ts +3 -3
- package/build/api-types/openai-chatcompletions-stream-base.js +8 -9
- package/build/api-types/openai-chatcompletions-stream-base.js.map +1 -1
- package/build/api-types/openai-chatcompletions.d.ts +9 -6
- package/build/api-types/openai-chatcompletions.js +16 -12
- package/build/api-types/openai-chatcompletions.js.map +1 -1
- package/build/api-types/openai-responses.d.ts +6 -6
- package/build/api-types/openai-responses.js +18 -20
- package/build/api-types/openai-responses.js.map +1 -1
- package/build/api-types/openrouter-monolith.d.ts +8 -6
- package/build/api-types/openrouter-monolith.js +14 -11
- package/build/api-types/openrouter-monolith.js.map +1 -1
- package/build/api-types/openrouter-stream.d.ts +8 -6
- package/build/api-types/openrouter-stream.js +14 -11
- package/build/api-types/openrouter-stream.js.map +1 -1
- package/build/config.d.ts +1 -2
- package/build/endpoint-spec.d.ts +1 -2
- package/build/endpoint-spec.js +1 -3
- package/build/endpoint-spec.js.map +1 -1
- package/build/engine.d.ts +7 -6
- package/build/engine.js +0 -12
- package/build/engine.js.map +1 -1
- package/build/throttle.d.ts +3 -7
- package/build/throttle.js +17 -31
- package/build/throttle.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -2
- package/build/api-types/huggingface-cerebras-qwen3-thinking.d.ts +0 -15
- package/build/api-types/huggingface-cerebras-qwen3-thinking.js +0 -57
- package/build/api-types/huggingface-cerebras-qwen3-thinking.js.map +0 -1
- package/build/api-types/qwen.d.ts +0 -13
- package/build/api-types/qwen.js +0 -18
- package/build/api-types/qwen.js.map +0 -1
- package/build/assets.d.ts +0 -7
- package/build/assets.js +0 -8
- package/build/assets.js.map +0 -1
- package/build/safe-engine.d.ts +0 -6
- package/build/safe-engine.js +0 -16
- package/build/safe-engine.js.map +0 -1
- package/build/validate.d.ts +0 -34
- package/build/validate.js +0 -56
- package/build/validate.js.map +0 -1
|
@@ -3,11 +3,11 @@ import { Function } from "../function.js";
|
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
4
|
import assert from 'node:assert';
|
|
5
5
|
import { TransientError } from "./base.js";
|
|
6
|
-
import {
|
|
6
|
+
import { OpenAIChatCompletionsEngineBase } from "./openai-chatcompletions-base.js";
|
|
7
7
|
import {} from "../inference-context.js";
|
|
8
8
|
import { fetch } from 'undici';
|
|
9
|
-
import {
|
|
10
|
-
export class
|
|
9
|
+
import {} from "../engine.js";
|
|
10
|
+
export class OpenAIChatCompletionsMonolithEngineBase extends OpenAIChatCompletionsEngineBase {
|
|
11
11
|
apiURL;
|
|
12
12
|
constructor(options) {
|
|
13
13
|
super(options);
|
|
@@ -46,11 +46,10 @@ export class OpenAIChatCompletionsMonolithAPIBase extends OpenAIChatCompletionsA
|
|
|
46
46
|
ctx.signal,
|
|
47
47
|
signalTimeout,
|
|
48
48
|
]) : ctx.signal || signalTimeout;
|
|
49
|
-
const params = this.makeMonolithParams(session);
|
|
50
|
-
ctx.logger.message?.trace(params);
|
|
51
|
-
await this.throttle.requests(ctx);
|
|
52
|
-
await this.throttle.inputTokens(this.tokenize(params), ctx);
|
|
53
49
|
try {
|
|
50
|
+
const params = this.makeMonolithParams(session);
|
|
51
|
+
ctx.logger.message?.trace(params);
|
|
52
|
+
await this.throttle.requests(ctx);
|
|
54
53
|
const res = await fetch(this.apiURL, {
|
|
55
54
|
method: 'POST',
|
|
56
55
|
headers: new Headers({
|
|
@@ -68,7 +67,6 @@ export class OpenAIChatCompletionsMonolithAPIBase extends OpenAIChatCompletionsA
|
|
|
68
67
|
assert(completion.choices[0].finish_reason && ['stop', 'tool_calls'].includes(completion.choices[0].finish_reason), new TransientError('Invalid finish reason', { cause: completion.choices[0].finish_reason }));
|
|
69
68
|
assert(completion.usage);
|
|
70
69
|
assert(completion.usage.completion_tokens <= (this.tokenLimit || Number.POSITIVE_INFINITY), new TransientError('Token limit exceeded.', { cause: completion }));
|
|
71
|
-
this.throttle.outputTokens(completion.usage.completion_tokens);
|
|
72
70
|
const cost = this.calcCost(completion.usage);
|
|
73
71
|
ctx.logger.cost?.(cost);
|
|
74
72
|
const aiMessage = this.convertToAIMessage(completion.choices[0].message);
|
|
@@ -84,9 +82,10 @@ export class OpenAIChatCompletionsMonolithAPIBase extends OpenAIChatCompletionsA
|
|
|
84
82
|
}
|
|
85
83
|
catch (e) {
|
|
86
84
|
if (ctx.signal?.aborted)
|
|
87
|
-
throw
|
|
85
|
+
throw e;
|
|
88
86
|
else if (signalTimeout?.aborted) { } // 推理超时
|
|
89
87
|
else if (e instanceof TransientError) { } // 模型抽风
|
|
88
|
+
else if (e instanceof TypeError) { } // 网络故障
|
|
90
89
|
else
|
|
91
90
|
throw e;
|
|
92
91
|
ctx.logger.message?.warn(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-chatcompletions-monolith-base.js","sourceRoot":"","sources":["../../src/api-types/openai-chatcompletions-monolith-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,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"openai-chatcompletions-monolith-base.js","sourceRoot":"","sources":["../../src/api-types/openai-chatcompletions-monolith-base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { RoleMessage, type Session } from '../session.ts';
|
|
2
2
|
import { Function } from '../function.ts';
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
|
-
import {
|
|
4
|
+
import { OpenAIChatCompletionsEngineBase } from './openai-chatcompletions-base.ts';
|
|
5
5
|
import { type InferenceContext } from '../inference-context.ts';
|
|
6
|
-
import { Engine } from '../engine.ts';
|
|
7
|
-
export declare abstract class
|
|
6
|
+
import { type Engine } from '../engine.ts';
|
|
7
|
+
export declare abstract class OpenAIChatCompletionsStreamEngineBase<in out fdm extends Function.Declaration.Map = {}> extends OpenAIChatCompletionsEngineBase<fdm> {
|
|
8
8
|
private client;
|
|
9
9
|
constructor(options: Engine.Options<fdm>);
|
|
10
10
|
protected makeStreamParams(session: Session<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionCreateParamsStreaming;
|
|
@@ -2,11 +2,11 @@ import { RoleMessage } from "../session.js";
|
|
|
2
2
|
import { Function } from "../function.js";
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
4
|
import assert from 'node:assert';
|
|
5
|
-
import {
|
|
5
|
+
import { OpenAIChatCompletionsEngineBase } from "./openai-chatcompletions-base.js";
|
|
6
6
|
import {} from "../inference-context.js";
|
|
7
7
|
import { TransientError } from "./base.js";
|
|
8
|
-
import {
|
|
9
|
-
export class
|
|
8
|
+
import {} from "../engine.js";
|
|
9
|
+
export class OpenAIChatCompletionsStreamEngineBase extends OpenAIChatCompletionsEngineBase {
|
|
10
10
|
client;
|
|
11
11
|
constructor(options) {
|
|
12
12
|
super(options);
|
|
@@ -48,11 +48,10 @@ export class OpenAIChatCompletionsStreamAPIBase extends OpenAIChatCompletionsAPI
|
|
|
48
48
|
ctx.signal,
|
|
49
49
|
signalTimeout,
|
|
50
50
|
]) : ctx.signal || signalTimeout;
|
|
51
|
-
const params = this.makeStreamParams(session);
|
|
52
|
-
ctx.logger.message?.trace(params);
|
|
53
|
-
await this.throttle.requests(ctx);
|
|
54
|
-
await this.throttle.inputTokens(this.tokenize(params), ctx);
|
|
55
51
|
try {
|
|
52
|
+
const params = this.makeStreamParams(session);
|
|
53
|
+
ctx.logger.message?.trace(params);
|
|
54
|
+
await this.throttle.requests(ctx);
|
|
56
55
|
const stream = await this.client.chat.completions.create(params, { signal })
|
|
57
56
|
.catch(e => Promise.reject(new TransientError(undefined, { cause: e })));
|
|
58
57
|
let chunk = null;
|
|
@@ -78,7 +77,6 @@ export class OpenAIChatCompletionsStreamAPIBase extends OpenAIChatCompletionsAPI
|
|
|
78
77
|
if (chunk.usage)
|
|
79
78
|
cost = this.calcCost(chunk.usage);
|
|
80
79
|
const newUsage = chunk.usage || usage;
|
|
81
|
-
this.throttle.outputTokens(newUsage.completion_tokens - usage.completion_tokens);
|
|
82
80
|
finishReason = chunk.choices[0]?.finish_reason ?? finishReason;
|
|
83
81
|
ctx.logger.inference?.trace(deltaThoughts);
|
|
84
82
|
if (thinking && (deltaText || deltaToolCalls.length)) {
|
|
@@ -105,9 +103,10 @@ export class OpenAIChatCompletionsStreamAPIBase extends OpenAIChatCompletionsAPI
|
|
|
105
103
|
}
|
|
106
104
|
catch (e) {
|
|
107
105
|
if (ctx.signal?.aborted)
|
|
108
|
-
throw
|
|
106
|
+
throw e;
|
|
109
107
|
else if (signalTimeout?.aborted) { } // 推理超时
|
|
110
108
|
else if (e instanceof TransientError) { } // 模型抽风
|
|
109
|
+
else if (e instanceof TypeError) { } // 网络故障
|
|
111
110
|
else
|
|
112
111
|
throw e;
|
|
113
112
|
ctx.logger.message?.warn(e);
|
|
@@ -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,
|
|
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,8 +1,11 @@
|
|
|
1
|
-
import { Engine } from '../engine.ts';
|
|
2
|
-
import { Function } from '../function.ts';
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
1
|
+
import { type Engine } from '../engine.ts';
|
|
2
|
+
import { type Function } from '../function.ts';
|
|
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
|
+
export declare namespace OpenAIChatCompletionsEngine {
|
|
7
|
+
function create<fdm extends Function.Declaration.Map = {}>(options: Engine.Options<fdm>): Engine<Function.Declaration.From<fdm>>;
|
|
8
|
+
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>>>;
|
|
7
10
|
}
|
|
8
11
|
}
|
|
@@ -1,15 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
import {} from "../engine.js";
|
|
2
|
+
import {} from "../function.js";
|
|
3
|
+
import { OpenAIChatCompletionsMonolithEngineBase } from "./openai-chatcompletions-monolith-base.js";
|
|
4
|
+
import {} from "../inference-context.js";
|
|
5
|
+
import {} from "../session.js";
|
|
6
|
+
export var OpenAIChatCompletionsEngine;
|
|
7
|
+
(function (OpenAIChatCompletionsEngine) {
|
|
8
|
+
function create(options) {
|
|
9
|
+
return new Constructor(options);
|
|
9
10
|
}
|
|
10
|
-
|
|
11
|
-
class Constructor extends
|
|
11
|
+
OpenAIChatCompletionsEngine.create = create;
|
|
12
|
+
class Constructor extends OpenAIChatCompletionsMonolithEngineBase {
|
|
13
|
+
stateless(ctx, session) {
|
|
14
|
+
return this.monolith(ctx, session);
|
|
15
|
+
}
|
|
12
16
|
}
|
|
13
|
-
|
|
14
|
-
})(
|
|
17
|
+
OpenAIChatCompletionsEngine.Constructor = Constructor;
|
|
18
|
+
})(OpenAIChatCompletionsEngine || (OpenAIChatCompletionsEngine = {}));
|
|
15
19
|
//# sourceMappingURL=openai-chatcompletions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-chatcompletions.js","sourceRoot":"","sources":["../../src/api-types/openai-chatcompletions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
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;AACpG,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAkC,MAAM,eAAe,CAAC;AAE/D,MAAM,KAAW,2BAA2B,CAU3C;AAVD,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;QAC9G,SAAS,CAAC,GAAqB,EAAE,OAAgD;YAChG,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpC,CAAC;KACD;IAJY,uCAAW,cAIvB,CAAA;AACF,CAAC,EAVgB,2BAA2B,KAA3B,2BAA2B,QAU3C"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { EngineBase } from './base.ts';
|
|
2
2
|
import { Function } from '../function.ts';
|
|
3
3
|
import { RoleMessage, type ChatMessage, type Session } from '../session.ts';
|
|
4
|
-
import { Engine } from '../engine.ts';
|
|
4
|
+
import { type Engine } from '../engine.ts';
|
|
5
5
|
import { type InferenceContext } from '../inference-context.ts';
|
|
6
6
|
import OpenAI from 'openai';
|
|
7
|
-
export declare namespace
|
|
8
|
-
function
|
|
9
|
-
class Constructor<in out fdm extends Function.Declaration.Map = {}> extends
|
|
7
|
+
export declare namespace OpenAIResponsesEngine {
|
|
8
|
+
function create<fdm extends Function.Declaration.Map = {}>(options: Engine.Options<fdm>): Engine<Function.Declaration.From<fdm>>;
|
|
9
|
+
class Constructor<in out fdm extends Function.Declaration.Map = {}> extends EngineBase<fdm> {
|
|
10
10
|
private apiURL;
|
|
11
11
|
constructor(options: Engine.Options<fdm>);
|
|
12
|
+
stateless(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>): Promise<RoleMessage.AI<Function.Declaration.From<fdm>>>;
|
|
12
13
|
protected convertFromFunctionCall(fc: Function.Call.Distributive<Function.Declaration.From<fdm>>): OpenAI.Responses.ResponseFunctionToolCall;
|
|
13
14
|
protected convertToFunctionCall(apifc: OpenAI.Responses.ResponseFunctionToolCall): Function.Call.Distributive<Function.Declaration.From<fdm>>;
|
|
14
15
|
protected convertFromFunctionResponse(fr: Function.Response.Distributive<Function.Declaration.From<fdm>>): OpenAI.Responses.ResponseInputItem.FunctionCallOutput;
|
|
@@ -20,7 +21,6 @@ export declare namespace OpenAIResponsesAPI {
|
|
|
20
21
|
protected convertToAIMessage(output: OpenAI.Responses.ResponseOutputItem[]): OpenAIResponsesAIMessage<Function.Declaration.From<fdm>>;
|
|
21
22
|
protected validateFunctionCallByToolChoice(functionCalls: Function.Call.Distributive<Function.Declaration.From<fdm>>[]): void;
|
|
22
23
|
protected calcCost(usage: OpenAI.Responses.ResponseUsage): number;
|
|
23
|
-
protected tokenize(params: OpenAI.Responses.ResponseCreateParams): number;
|
|
24
24
|
monolith(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>, retry?: number): Promise<RoleMessage.AI<Function.Declaration.From<fdm>>>;
|
|
25
25
|
}
|
|
26
26
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { EngineBase } from "./base.js";
|
|
2
2
|
import { Function } from "../function.js";
|
|
3
3
|
import { RoleMessage } from "../session.js";
|
|
4
|
-
import {
|
|
4
|
+
import {} from "../engine.js";
|
|
5
5
|
import {} from "../inference-context.js";
|
|
6
6
|
import OpenAI from 'openai';
|
|
7
7
|
import assert from 'node:assert';
|
|
@@ -9,19 +9,21 @@ import { TransientError } from "./base.js";
|
|
|
9
9
|
import { fetch } from 'undici';
|
|
10
10
|
import Ajv from 'ajv';
|
|
11
11
|
const ajv = new Ajv();
|
|
12
|
-
export var
|
|
13
|
-
(function (
|
|
14
|
-
function
|
|
15
|
-
|
|
16
|
-
return api.monolith.bind(api);
|
|
12
|
+
export var OpenAIResponsesEngine;
|
|
13
|
+
(function (OpenAIResponsesEngine) {
|
|
14
|
+
function create(options) {
|
|
15
|
+
return new Constructor(options);
|
|
17
16
|
}
|
|
18
|
-
|
|
19
|
-
class Constructor extends
|
|
17
|
+
OpenAIResponsesEngine.create = create;
|
|
18
|
+
class Constructor extends EngineBase {
|
|
20
19
|
apiURL;
|
|
21
20
|
constructor(options) {
|
|
22
21
|
super(options);
|
|
23
22
|
this.apiURL = new URL(`${this.baseUrl}/responses`);
|
|
24
23
|
}
|
|
24
|
+
stateless(ctx, session) {
|
|
25
|
+
return this.monolith(ctx, session);
|
|
26
|
+
}
|
|
25
27
|
convertFromFunctionCall(fc) {
|
|
26
28
|
assert(fc.id);
|
|
27
29
|
return {
|
|
@@ -152,20 +154,16 @@ export var OpenAIResponsesAPI;
|
|
|
152
154
|
this.cachedPrice * cacheHitTokenCount / 1e6 +
|
|
153
155
|
this.outputPrice * usage.output_tokens / 1e6;
|
|
154
156
|
}
|
|
155
|
-
tokenize(params) {
|
|
156
|
-
return JSON.stringify(params).length;
|
|
157
|
-
}
|
|
158
157
|
async monolith(ctx, session, retry = 0) {
|
|
159
158
|
const signalTimeout = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
|
|
160
159
|
const signal = ctx.signal && signalTimeout ? AbortSignal.any([
|
|
161
160
|
ctx.signal,
|
|
162
161
|
signalTimeout,
|
|
163
162
|
]) : ctx.signal || signalTimeout;
|
|
164
|
-
const params = this.makeMonolithParams(session);
|
|
165
|
-
ctx.logger.message?.trace(params);
|
|
166
|
-
await this.throttle.requests(ctx);
|
|
167
|
-
await this.throttle.inputTokens(this.tokenize(params), ctx);
|
|
168
163
|
try {
|
|
164
|
+
const params = this.makeMonolithParams(session);
|
|
165
|
+
ctx.logger.message?.trace(params);
|
|
166
|
+
await this.throttle.requests(ctx);
|
|
169
167
|
const res = await fetch(this.apiURL, {
|
|
170
168
|
method: 'POST',
|
|
171
169
|
headers: new Headers({
|
|
@@ -191,16 +189,16 @@ export var OpenAIResponsesAPI;
|
|
|
191
189
|
const cost = this.calcCost(response.usage);
|
|
192
190
|
ctx.logger.cost?.(cost);
|
|
193
191
|
ctx.logger.message?.debug(response.usage);
|
|
194
|
-
this.throttle.outputTokens(response.usage.output_tokens);
|
|
195
192
|
const functionCalls = aiMessage.getFunctionCalls();
|
|
196
193
|
this.validateFunctionCallByToolChoice(functionCalls);
|
|
197
194
|
return aiMessage;
|
|
198
195
|
}
|
|
199
196
|
catch (e) {
|
|
200
197
|
if (ctx.signal?.aborted)
|
|
201
|
-
throw
|
|
198
|
+
throw e;
|
|
202
199
|
else if (signalTimeout?.aborted) { } // 推理超时
|
|
203
200
|
else if (e instanceof TransientError) { } // 模型抽风
|
|
201
|
+
else if (e instanceof TypeError) { } // 网络故障
|
|
204
202
|
else
|
|
205
203
|
throw e;
|
|
206
204
|
ctx.logger.message?.warn(e);
|
|
@@ -211,8 +209,8 @@ export var OpenAIResponsesAPI;
|
|
|
211
209
|
}
|
|
212
210
|
}
|
|
213
211
|
}
|
|
214
|
-
|
|
215
|
-
})(
|
|
212
|
+
OpenAIResponsesEngine.Constructor = Constructor;
|
|
213
|
+
})(OpenAIResponsesEngine || (OpenAIResponsesEngine = {}));
|
|
216
214
|
export var OpenAIResponsesAIMessage;
|
|
217
215
|
(function (OpenAIResponsesAIMessage) {
|
|
218
216
|
function create(parts, raw) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-responses.js","sourceRoot":"","sources":["../../src/api-types/openai-responses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"openai-responses.js","sourceRoot":"","sources":["../../src/api-types/openai-responses.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { Engine } from '../engine.ts';
|
|
1
|
+
import { type Engine } from '../engine.ts';
|
|
2
2
|
import { Function } from '../function.ts';
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
|
-
import { type Session } from '../session.ts';
|
|
5
|
-
import {
|
|
4
|
+
import { type Session, type RoleMessage } from '../session.ts';
|
|
5
|
+
import { OpenAIChatCompletionsMonolithEngineBase } from './openai-chatcompletions-monolith-base.ts';
|
|
6
|
+
import { type InferenceContext } from '../inference-context.ts';
|
|
6
7
|
export interface OpenRouterUsage extends OpenAI.CompletionUsage {
|
|
7
8
|
cost: number;
|
|
8
9
|
}
|
|
@@ -11,9 +12,10 @@ export interface OpenRouterMonolithParams extends OpenAI.ChatCompletionCreatePar
|
|
|
11
12
|
include: boolean;
|
|
12
13
|
};
|
|
13
14
|
}
|
|
14
|
-
export declare namespace
|
|
15
|
-
function
|
|
16
|
-
class Constructor<in out fdm extends Function.Declaration.Map = {}> extends
|
|
15
|
+
export declare namespace OpenRouterMonolithEngine {
|
|
16
|
+
function create<fdm extends Function.Declaration.Map = {}>(options: Engine.Options<fdm>): Engine<Function.Declaration.From<fdm>>;
|
|
17
|
+
class Constructor<in out fdm extends Function.Declaration.Map = {}> extends OpenAIChatCompletionsMonolithEngineBase<fdm> {
|
|
18
|
+
stateless(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>): Promise<RoleMessage.AI<Function.Declaration.From<fdm>>>;
|
|
17
19
|
protected calcCost(usage: OpenAI.CompletionUsage): number;
|
|
18
20
|
protected makeMonolithParams(session: Session<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionCreateParamsNonStreaming;
|
|
19
21
|
protected convertToFunctionCall(apifc: OpenAI.ChatCompletionMessageFunctionToolCall): Function.Call.Distributive<Function.Declaration.From<fdm>>;
|
|
@@ -1,17 +1,20 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {} from "../engine.js";
|
|
2
2
|
import { Function } from "../function.js";
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
4
|
import {} from "../session.js";
|
|
5
|
-
import {
|
|
5
|
+
import { OpenAIChatCompletionsMonolithEngineBase } from "./openai-chatcompletions-monolith-base.js";
|
|
6
|
+
import {} from "../inference-context.js";
|
|
6
7
|
const EXCHANGE_RATE_USD_CNY = 8;
|
|
7
|
-
export var
|
|
8
|
-
(function (
|
|
9
|
-
function
|
|
10
|
-
|
|
11
|
-
return api.monolith.bind(api);
|
|
8
|
+
export var OpenRouterMonolithEngine;
|
|
9
|
+
(function (OpenRouterMonolithEngine) {
|
|
10
|
+
function create(options) {
|
|
11
|
+
return new Constructor(options);
|
|
12
12
|
}
|
|
13
|
-
|
|
14
|
-
class Constructor extends
|
|
13
|
+
OpenRouterMonolithEngine.create = create;
|
|
14
|
+
class Constructor extends OpenAIChatCompletionsMonolithEngineBase {
|
|
15
|
+
stateless(ctx, session) {
|
|
16
|
+
return this.monolith(ctx, session);
|
|
17
|
+
}
|
|
15
18
|
calcCost(usage) {
|
|
16
19
|
return usage.cost * EXCHANGE_RATE_USD_CNY;
|
|
17
20
|
}
|
|
@@ -48,6 +51,6 @@ export var OpenRouterMonolithAPI;
|
|
|
48
51
|
});
|
|
49
52
|
}
|
|
50
53
|
}
|
|
51
|
-
|
|
52
|
-
})(
|
|
54
|
+
OpenRouterMonolithEngine.Constructor = Constructor;
|
|
55
|
+
})(OpenRouterMonolithEngine || (OpenRouterMonolithEngine = {}));
|
|
53
56
|
//# sourceMappingURL=openrouter-monolith.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openrouter-monolith.js","sourceRoot":"","sources":["../../src/api-types/openrouter-monolith.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
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;AAEhE,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAWhC,MAAM,KAAW,wBAAwB,CA4DxC;AA5DD,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;QAC9G,SAAS,CAAC,GAAqB,EAAE,OAAgD;YAChG,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpC,CAAC;QAEkB,QAAQ,CAAC,KAA6B;YACxD,OAAQ,KAAyB,CAAC,IAAI,GAAG,qBAAqB,CAAC;QAChE,CAAC;QAEkB,kBAAkB,CAAC,OAAgD;YACrF,MAAM,MAAM,GAA6B;gBACxC,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,QAAQ,EAAE;oBACT,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1F,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;iBACxF;gBACD,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,MAAM;oBACrD,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAChD,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,mCAAmC,CAAC,OAA+C,CAAC,CACpG;oBACD,CAAC,CAAC,SAAS;gBACZ,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC/I,MAAM,EAAE,KAAK;gBACb,KAAK,EAAE;oBACN,OAAO,EAAE,IAAI;iBACb;gBACD,qBAAqB,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,GAAC,CAAC,CAAC,CAAC,CAAC,SAAS;gBACtE,GAAG,IAAI,CAAC,aAAa;aACrB,CAAC;YACF,OAAO,MAAM,CAAC;QACf,CAAC;QAEkB,qBAAqB,CAAC,KAAmD;YAC3F,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS;gBAC3B,OAAO,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;;gBAE1C,OAAO,KAAK,CAAC,qBAAqB,CAAC;oBAClC,GAAG,KAAK;oBACR,QAAQ,EAAE;wBACT,GAAG,KAAK,CAAC,QAAQ;wBACjB,SAAS,EAAE,IAAI;qBACf;iBACD,CAAC,CAAC;QACL,CAAC;KAWD;IAtDY,oCAAW,cAsDvB,CAAA;AACF,CAAC,EA5DgB,wBAAwB,KAAxB,wBAAwB,QA4DxC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { Engine } from '../engine.ts';
|
|
1
|
+
import { type Engine } from '../engine.ts';
|
|
2
2
|
import { Function } from '../function.ts';
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
|
-
import { type Session } from '../session.ts';
|
|
5
|
-
import {
|
|
4
|
+
import { type Session, type RoleMessage } from '../session.ts';
|
|
5
|
+
import { OpenAIChatCompletionsStreamEngineBase } from './openai-chatcompletions-stream-base.ts';
|
|
6
|
+
import { type InferenceContext } from '../inference-context.ts';
|
|
6
7
|
export interface OpenRouterUsage extends OpenAI.CompletionUsage {
|
|
7
8
|
cost: number;
|
|
8
9
|
}
|
|
@@ -15,9 +16,10 @@ export interface OpenRouterStreamParams extends OpenAI.ChatCompletionCreateParam
|
|
|
15
16
|
export interface OpenRouterChatCompletionChunkChoiceDelta extends OpenAI.ChatCompletionChunk.Choice.Delta {
|
|
16
17
|
reasoning?: string;
|
|
17
18
|
}
|
|
18
|
-
export declare namespace
|
|
19
|
-
function
|
|
20
|
-
class Constructor<in out fdm extends Function.Declaration.Map = {}> extends
|
|
19
|
+
export declare namespace OpenRouterStreamEngine {
|
|
20
|
+
function create<fdm extends Function.Declaration.Map = {}>(options: Engine.Options<fdm>): Engine<Function.Declaration.From<fdm>>;
|
|
21
|
+
class Constructor<in out fdm extends Function.Declaration.Map = {}> extends OpenAIChatCompletionsStreamEngineBase<fdm> {
|
|
22
|
+
stateless(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>): Promise<RoleMessage.AI<Function.Declaration.From<fdm>>>;
|
|
21
23
|
protected calcCost(usage: OpenAI.CompletionUsage): number;
|
|
22
24
|
protected getDeltaThoughts(delta: OpenAI.ChatCompletionChunk.Choice.Delta): string;
|
|
23
25
|
protected makeStreamParams(session: Session<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionCreateParamsStreaming;
|
|
@@ -1,18 +1,21 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {} from "../engine.js";
|
|
2
2
|
import { Function } from "../function.js";
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
4
|
import {} from "../session.js";
|
|
5
5
|
import assert from 'node:assert';
|
|
6
|
-
import {
|
|
6
|
+
import { OpenAIChatCompletionsStreamEngineBase } from "./openai-chatcompletions-stream-base.js";
|
|
7
|
+
import {} from "../inference-context.js";
|
|
7
8
|
const EXCHANGE_RATE_USD_CNY = 8;
|
|
8
|
-
export var
|
|
9
|
-
(function (
|
|
10
|
-
function
|
|
11
|
-
|
|
12
|
-
return api.stream.bind(api);
|
|
9
|
+
export var OpenRouterStreamEngine;
|
|
10
|
+
(function (OpenRouterStreamEngine) {
|
|
11
|
+
function create(options) {
|
|
12
|
+
return new Constructor(options);
|
|
13
13
|
}
|
|
14
|
-
|
|
15
|
-
class Constructor extends
|
|
14
|
+
OpenRouterStreamEngine.create = create;
|
|
15
|
+
class Constructor extends OpenAIChatCompletionsStreamEngineBase {
|
|
16
|
+
stateless(ctx, session) {
|
|
17
|
+
return this.stream(ctx, session);
|
|
18
|
+
}
|
|
16
19
|
calcCost(usage) {
|
|
17
20
|
return usage.cost * EXCHANGE_RATE_USD_CNY;
|
|
18
21
|
}
|
|
@@ -59,6 +62,6 @@ export var OpenRouterStreamAPI;
|
|
|
59
62
|
});
|
|
60
63
|
}
|
|
61
64
|
}
|
|
62
|
-
|
|
63
|
-
})(
|
|
65
|
+
OpenRouterStreamEngine.Constructor = Constructor;
|
|
66
|
+
})(OpenRouterStreamEngine || (OpenRouterStreamEngine = {}));
|
|
64
67
|
//# sourceMappingURL=openrouter-stream.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openrouter-stream.js","sourceRoot":"","sources":["../../src/api-types/openrouter-stream.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"openrouter-stream.js","sourceRoot":"","sources":["../../src/api-types/openrouter-stream.ts"],"names":[],"mappings":"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"}
|
package/build/config.d.ts
CHANGED
|
@@ -9,13 +9,12 @@ export declare namespace Config {
|
|
|
9
9
|
apiKey: import("@sinclair/typebox").TString;
|
|
10
10
|
model: import("@sinclair/typebox").TString;
|
|
11
11
|
name: import("@sinclair/typebox").TString;
|
|
12
|
-
apiType: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"openai-chatcompletions">, import("@sinclair/typebox").TLiteral<"openai-responses">, import("@sinclair/typebox").TLiteral<"google">, import("@sinclair/typebox").TLiteral<"
|
|
12
|
+
apiType: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"openai-chatcompletions">, import("@sinclair/typebox").TLiteral<"openai-responses">, import("@sinclair/typebox").TLiteral<"google">, import("@sinclair/typebox").TLiteral<"aliyun-stream">, import("@sinclair/typebox").TLiteral<"openrouter-monolith">, import("@sinclair/typebox").TLiteral<"openrouter-stream">]>;
|
|
13
13
|
inputPrice: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
14
14
|
outputPrice: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
15
15
|
cachedPrice: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
16
16
|
customOptions: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TAny>>;
|
|
17
17
|
rpm: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
18
|
-
tpm: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
19
18
|
timeout: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
20
19
|
tokenLimit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
21
20
|
}>>;
|
package/build/endpoint-spec.d.ts
CHANGED
|
@@ -7,13 +7,12 @@ export declare namespace EndpointSpec {
|
|
|
7
7
|
apiKey: import("@sinclair/typebox").TString;
|
|
8
8
|
model: import("@sinclair/typebox").TString;
|
|
9
9
|
name: import("@sinclair/typebox").TString;
|
|
10
|
-
apiType: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"openai-chatcompletions">, import("@sinclair/typebox").TLiteral<"openai-responses">, import("@sinclair/typebox").TLiteral<"google">, import("@sinclair/typebox").TLiteral<"
|
|
10
|
+
apiType: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"openai-chatcompletions">, import("@sinclair/typebox").TLiteral<"openai-responses">, import("@sinclair/typebox").TLiteral<"google">, import("@sinclair/typebox").TLiteral<"aliyun-stream">, import("@sinclair/typebox").TLiteral<"openrouter-monolith">, import("@sinclair/typebox").TLiteral<"openrouter-stream">]>;
|
|
11
11
|
inputPrice: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
12
12
|
outputPrice: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
13
13
|
cachedPrice: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
14
14
|
customOptions: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TAny>>;
|
|
15
15
|
rpm: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
16
|
-
tpm: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
17
16
|
timeout: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
18
17
|
tokenLimit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
19
18
|
}>;
|