@zimtsui/brainswitch 0.0.40 → 0.0.42
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 +9 -20
- package/build/adaptor.d.ts +4 -2
- package/build/adaptor.js +27 -10
- package/build/adaptor.js.map +1 -1
- package/build/agentloop.d.ts +1 -1
- package/build/agentloop.js +2 -4
- package/build/agentloop.js.map +1 -1
- package/build/api-types/anthropic.d.ts +18 -22
- package/build/api-types/anthropic.js +81 -72
- package/build/api-types/anthropic.js.map +1 -1
- package/build/api-types/google.d.ts +13 -18
- package/build/api-types/google.js +32 -33
- package/build/api-types/google.js.map +1 -1
- package/build/api-types/openai-chat-completions.d.ts +17 -19
- package/build/api-types/openai-chat-completions.js +101 -85
- package/build/api-types/openai-chat-completions.js.map +1 -1
- package/build/api-types/openai-responses.d.ts +13 -13
- package/build/api-types/openai-responses.js +59 -51
- package/build/api-types/openai-responses.js.map +1 -1
- package/build/compatible-engine.d.ts +19 -24
- package/build/compatible-engine.js +54 -56
- package/build/compatible-engine.js.map +1 -1
- package/build/compatible-engines.d/aliyun.d.ts +38 -55
- package/build/compatible-engines.d/aliyun.js +91 -143
- package/build/compatible-engines.d/aliyun.js.map +1 -1
- package/build/compatible-engines.d/anthropic.d.ts +35 -60
- package/build/compatible-engines.d/anthropic.js +233 -282
- package/build/compatible-engines.d/anthropic.js.map +1 -1
- package/build/compatible-engines.d/google.d.ts +38 -59
- package/build/compatible-engines.d/google.js +172 -231
- package/build/compatible-engines.d/google.js.map +1 -1
- package/build/compatible-engines.d/openai-chatcompletions.d/monolith.d.ts +7 -14
- package/build/compatible-engines.d/openai-chatcompletions.d/monolith.js +64 -66
- package/build/compatible-engines.d/openai-chatcompletions.d/monolith.js.map +1 -1
- package/build/compatible-engines.d/openai-chatcompletions.d/stream.d.ts +10 -16
- package/build/compatible-engines.d/openai-chatcompletions.d/stream.js +169 -165
- package/build/compatible-engines.d/openai-chatcompletions.d/stream.js.map +1 -1
- package/build/compatible-engines.d/openai-chatcompletions.d.ts +12 -18
- package/build/compatible-engines.d/openai-chatcompletions.js +64 -64
- package/build/compatible-engines.d/openai-chatcompletions.js.map +1 -1
- package/build/compatible-engines.d/openai-responses.d.ts +46 -68
- package/build/compatible-engines.d/openai-responses.js +222 -274
- package/build/compatible-engines.d/openai-responses.js.map +1 -1
- package/build/engine.d.ts +10 -24
- package/build/engine.js +25 -38
- package/build/engine.js.map +1 -1
- package/build/exports.d.ts +1 -0
- package/build/exports.js +1 -0
- package/build/exports.js.map +1 -1
- package/build/frontmatter.js +2 -2
- package/build/frontmatter.js.map +1 -1
- package/build/function.js +9 -4
- package/build/function.js.map +1 -1
- package/build/inference-context.d.ts +1 -10
- package/build/inference-context.js +0 -2
- package/build/inference-context.js.map +1 -1
- package/build/native-engines.d/google/agentloop.d.ts +1 -1
- package/build/native-engines.d/google/agentloop.js +2 -4
- package/build/native-engines.d/google/agentloop.js.map +1 -1
- package/build/native-engines.d/google/engine.d.ts +56 -73
- package/build/native-engines.d/google/engine.js +265 -295
- package/build/native-engines.d/google/engine.js.map +1 -1
- package/build/native-engines.d/google/exports.d.ts +3 -2
- package/build/native-engines.d/google/exports.js +3 -2
- package/build/native-engines.d/google/exports.js.map +1 -1
- package/build/native-engines.d/google/session.js +6 -3
- package/build/native-engines.d/google/session.js.map +1 -1
- package/build/native-engines.d/openai-responses/agentloop.d.ts +1 -1
- package/build/native-engines.d/openai-responses/agentloop.js +2 -5
- package/build/native-engines.d/openai-responses/agentloop.js.map +1 -1
- package/build/native-engines.d/openai-responses/engine.d.ts +59 -78
- package/build/native-engines.d/openai-responses/engine.js +285 -321
- package/build/native-engines.d/openai-responses/engine.js.map +1 -1
- package/build/native-engines.d/openai-responses/exports.d.ts +4 -2
- package/build/native-engines.d/openai-responses/exports.js +4 -2
- package/build/native-engines.d/openai-responses/exports.js.map +1 -1
- package/build/native-engines.d/openai-responses/session.js +21 -8
- package/build/native-engines.d/openai-responses/session.js.map +1 -1
- package/build/session.js +12 -5
- package/build/session.js.map +1 -1
- package/build/telemetry.d.ts +6 -0
- package/build/telemetry.js +3 -0
- package/build/telemetry.js.map +1 -0
- package/build/throttle.d.ts +1 -1
- package/build/throttle.js +6 -6
- package/build/throttle.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -1,67 +1,65 @@
|
|
|
1
1
|
import { RoleMessage } from "./session.js";
|
|
2
2
|
import { Function } from "./function.js";
|
|
3
3
|
import {} from "./inference-context.js";
|
|
4
|
-
import {
|
|
4
|
+
import { USER_ABORTION, InferenceTimeout, ResponseInvalid } from "./engine.js";
|
|
5
5
|
export var CompatibleEngine;
|
|
6
6
|
(function (CompatibleEngine) {
|
|
7
|
-
let
|
|
8
|
-
(function (
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
}
|
|
26
|
-
catch (e) {
|
|
27
|
-
if (ctx.signal?.aborted)
|
|
28
|
-
throw new UserAbortion(); // 用户中止
|
|
29
|
-
else if (signalTimeout?.aborted)
|
|
30
|
-
e = new InferenceTimeout(undefined, { cause: e }); // 推理超时
|
|
31
|
-
else if (e instanceof ResponseInvalid) { } // 模型抽风
|
|
32
|
-
else if (e instanceof TypeError) { } // 网络故障
|
|
33
|
-
else
|
|
34
|
-
throw e;
|
|
35
|
-
if (retry < 3)
|
|
36
|
-
ctx.logger.message?.warn(e);
|
|
37
|
-
else
|
|
38
|
-
throw e;
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
async stateful(ctx, session) {
|
|
43
|
-
const response = await this.stateless(ctx, session);
|
|
44
|
-
session.chatMessages.push(response);
|
|
45
|
-
return response;
|
|
46
|
-
}
|
|
47
|
-
appendUserMessage(session, message) {
|
|
48
|
-
return {
|
|
49
|
-
...session,
|
|
50
|
-
chatMessages: [...session.chatMessages, message],
|
|
51
|
-
};
|
|
52
|
-
}
|
|
53
|
-
pushUserMessage(session, message) {
|
|
54
|
-
session.chatMessages.push(message);
|
|
55
|
-
return session;
|
|
7
|
+
let OwnProps;
|
|
8
|
+
(function (OwnProps) {
|
|
9
|
+
function init(options) {
|
|
10
|
+
return {
|
|
11
|
+
toolChoice: options.toolChoice ?? Function.ToolChoice.AUTO,
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
OwnProps.init = init;
|
|
15
|
+
})(OwnProps = CompatibleEngine.OwnProps || (CompatibleEngine.OwnProps = {}));
|
|
16
|
+
async function stateless(wfctx, session) {
|
|
17
|
+
for (let retry = 0;; retry++) {
|
|
18
|
+
const signalTimeout = this.timeout ? AbortSignal.timeout(this.timeout) : undefined;
|
|
19
|
+
const signal = wfctx.signal && signalTimeout ? AbortSignal.any([
|
|
20
|
+
wfctx.signal,
|
|
21
|
+
signalTimeout,
|
|
22
|
+
]) : wfctx.signal || signalTimeout;
|
|
23
|
+
try {
|
|
24
|
+
return await this.fetch(wfctx, session, signal);
|
|
56
25
|
}
|
|
57
|
-
|
|
58
|
-
|
|
26
|
+
catch (e) {
|
|
27
|
+
if (wfctx.signal?.aborted)
|
|
28
|
+
throw USER_ABORTION; // 用户中止
|
|
29
|
+
else if (signalTimeout?.aborted)
|
|
30
|
+
e = new InferenceTimeout(undefined, { cause: e }); // 推理超时
|
|
31
|
+
else if (e instanceof ResponseInvalid) { } // 模型抽风
|
|
32
|
+
else if (e instanceof TypeError) { } // 网络故障
|
|
33
|
+
else
|
|
34
|
+
throw e;
|
|
35
|
+
if (retry < 3)
|
|
36
|
+
this.logger.message?.warn(e);
|
|
37
|
+
else
|
|
38
|
+
throw e;
|
|
59
39
|
}
|
|
60
40
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
function
|
|
64
|
-
|
|
41
|
+
}
|
|
42
|
+
CompatibleEngine.stateless = stateless;
|
|
43
|
+
async function stateful(wfctx, session) {
|
|
44
|
+
const response = await this.stateless(wfctx, session);
|
|
45
|
+
session.chatMessages.push(response);
|
|
46
|
+
return response;
|
|
47
|
+
}
|
|
48
|
+
CompatibleEngine.stateful = stateful;
|
|
49
|
+
function appendUserMessage(session, message) {
|
|
50
|
+
return {
|
|
51
|
+
...session,
|
|
52
|
+
chatMessages: [...session.chatMessages, message],
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
CompatibleEngine.appendUserMessage = appendUserMessage;
|
|
56
|
+
function pushUserMessage(session, message) {
|
|
57
|
+
session.chatMessages.push(message);
|
|
58
|
+
return session;
|
|
59
|
+
}
|
|
60
|
+
CompatibleEngine.pushUserMessage = pushUserMessage;
|
|
61
|
+
function validateToolCallsByToolChoice(toolCalls) {
|
|
62
|
+
Function.Call.validate(toolCalls, this.toolChoice, new ResponseInvalid('Invalid function call', { cause: toolCalls }));
|
|
65
63
|
}
|
|
66
64
|
CompatibleEngine.validateToolCallsByToolChoice = validateToolCallsByToolChoice;
|
|
67
65
|
})(CompatibleEngine || (CompatibleEngine = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compatible-engine.js","sourceRoot":"","sources":["../src/compatible-engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAyB,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"compatible-engine.js","sourceRoot":"","sources":["../src/compatible-engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,69 +1,51 @@
|
|
|
1
|
-
import type OpenAI from 'openai';
|
|
2
1
|
import { Function } from '../function.ts';
|
|
3
|
-
import { Engine } from '../engine.ts';
|
|
4
2
|
import { CompatibleEngine } from '../compatible-engine.ts';
|
|
5
|
-
import { OpenAIChatCompletionsEngine } from '../api-types/openai-chat-completions.ts';
|
|
6
|
-
import { OpenAIChatCompletionsCompatibleEngine } from './openai-chatcompletions.ts';
|
|
7
3
|
import { OpenAIChatCompletionsCompatibleStreamEngine } from './openai-chatcompletions.d/stream.ts';
|
|
8
4
|
import { type InferenceContext } from '../inference-context.ts';
|
|
9
5
|
import { type Session, RoleMessage } from '../session.ts';
|
|
6
|
+
import * as Undici from 'undici';
|
|
7
|
+
import { Throttle } from '../throttle.ts';
|
|
8
|
+
import OpenAI from 'openai';
|
|
9
|
+
import { type Logger } from '../telemetry.ts';
|
|
10
10
|
export declare namespace AliyunEngine {
|
|
11
|
+
interface Options<in out fdm extends Function.Declaration.Map> extends OpenAIChatCompletionsCompatibleStreamEngine.Options<fdm> {
|
|
12
|
+
}
|
|
13
|
+
interface OwnProps {
|
|
14
|
+
client: OpenAI;
|
|
15
|
+
}
|
|
16
|
+
namespace OwnProps {
|
|
17
|
+
function init<fdm extends Function.Declaration.Map>(this: OpenAIChatCompletionsCompatibleStreamEngine.Underhood<fdm>, options: Options<fdm>): OwnProps;
|
|
18
|
+
}
|
|
11
19
|
interface ChatCompletionChunkChoiceDelta extends OpenAI.ChatCompletionChunk.Choice.Delta {
|
|
12
20
|
reasoning_content?: string;
|
|
13
21
|
}
|
|
14
|
-
interface
|
|
22
|
+
interface Underhood<in out fdm extends Function.Declaration.Map> extends OpenAIChatCompletionsCompatibleStreamEngine.Underhood<fdm> {
|
|
15
23
|
getDeltaThoughts(delta: OpenAI.ChatCompletionChunk.Choice.Delta): string;
|
|
16
24
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
get name(): string;
|
|
40
|
-
set name(value: string);
|
|
41
|
-
get inputPrice(): number;
|
|
42
|
-
set inputPrice(value: number);
|
|
43
|
-
get outputPrice(): number;
|
|
44
|
-
set outputPrice(value: number);
|
|
45
|
-
get cachedPrice(): number;
|
|
46
|
-
set cachedPrice(value: number);
|
|
47
|
-
get fdm(): fdm;
|
|
48
|
-
set fdm(value: fdm);
|
|
49
|
-
get additionalOptions(): Record<string, unknown> | undefined;
|
|
50
|
-
set additionalOptions(value: Record<string, unknown> | undefined);
|
|
51
|
-
get throttle(): import("../throttle.ts").Throttle;
|
|
52
|
-
set throttle(value: import("../throttle.ts").Throttle);
|
|
53
|
-
get timeout(): number | undefined;
|
|
54
|
-
set timeout(value: number | undefined);
|
|
55
|
-
get maxTokens(): number | undefined;
|
|
56
|
-
set maxTokens(value: number | undefined);
|
|
57
|
-
get proxyAgent(): import("undici").ProxyAgent | undefined;
|
|
58
|
-
set proxyAgent(value: import("undici").ProxyAgent | undefined);
|
|
59
|
-
get toolChoice(): Function.ToolChoice<fdm>;
|
|
60
|
-
set toolChoice(value: Function.ToolChoice<fdm>);
|
|
61
|
-
stateless(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>): Promise<RoleMessage.Ai<Function.Declaration.From<fdm, Extract<keyof fdm, string>>>>;
|
|
62
|
-
stateful(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>): Promise<RoleMessage.Ai<Function.Declaration.From<fdm, Extract<keyof fdm, string>>>>;
|
|
25
|
+
function getDeltaThoughts(delta: OpenAI.ChatCompletionChunk.Choice.Delta): string;
|
|
26
|
+
class Instance<in out fdm extends Function.Declaration.Map> implements AliyunEngine.Underhood<fdm> {
|
|
27
|
+
baseUrl: string;
|
|
28
|
+
apiKey: string;
|
|
29
|
+
model: string;
|
|
30
|
+
name: string;
|
|
31
|
+
inputPrice: number;
|
|
32
|
+
outputPrice: number;
|
|
33
|
+
cachePrice: number;
|
|
34
|
+
fdm: fdm;
|
|
35
|
+
additionalOptions?: Record<string, unknown>;
|
|
36
|
+
throttle: Throttle;
|
|
37
|
+
timeout?: number;
|
|
38
|
+
maxTokens?: number;
|
|
39
|
+
proxyAgent?: Undici.ProxyAgent;
|
|
40
|
+
logger: Logger;
|
|
41
|
+
toolChoice: Function.ToolChoice<fdm>;
|
|
42
|
+
parallelToolCall: boolean;
|
|
43
|
+
client: OpenAI;
|
|
44
|
+
constructor(options: AliyunEngine.Options<fdm>);
|
|
45
|
+
stateless(wfctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>): Promise<RoleMessage.Ai<Function.Declaration.From<fdm, Extract<keyof fdm, string>>>>;
|
|
46
|
+
stateful(wfctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>): Promise<RoleMessage.Ai<Function.Declaration.From<fdm, Extract<keyof fdm, string>>>>;
|
|
63
47
|
appendUserMessage(session: Session<Function.Declaration.From<fdm>>, message: RoleMessage.User<Function.Declaration.From<fdm>>): Session<Function.Declaration.From<fdm, Extract<keyof fdm, string>>>;
|
|
64
48
|
pushUserMessage(session: Session<Function.Declaration.From<fdm>>, message: RoleMessage.User<Function.Declaration.From<fdm>>): Session<Function.Declaration.From<fdm, Extract<keyof fdm, string>>>;
|
|
65
|
-
get parallel(): boolean;
|
|
66
|
-
set parallel(value: boolean);
|
|
67
49
|
convertFromFunctionCall(fc: Function.Call.Distributive<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionMessageToolCall;
|
|
68
50
|
convertFromFunctionResponse(fr: Function.Response.Distributive<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionToolMessageParam;
|
|
69
51
|
convertFromToolChoice(mode: Function.ToolChoice<fdm>): OpenAI.ChatCompletionToolChoiceOption;
|
|
@@ -72,7 +54,7 @@ export declare namespace AliyunEngine {
|
|
|
72
54
|
calcCost(usage: OpenAI.CompletionUsage): number;
|
|
73
55
|
extractContent(completionContent: string): string;
|
|
74
56
|
handleFinishReason(completion: OpenAI.ChatCompletion, finishReason: OpenAI.ChatCompletion.Choice['finish_reason']): void;
|
|
75
|
-
fetch(
|
|
57
|
+
fetch(wfctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>, signal?: AbortSignal): Promise<RoleMessage.Ai<Function.Declaration.From<fdm, Extract<keyof fdm, string>>>>;
|
|
76
58
|
convertToAiMessage(message: OpenAI.ChatCompletionMessage): RoleMessage.Ai<Function.Declaration.From<fdm>>;
|
|
77
59
|
convertFromAiMessage(aiMessage: RoleMessage.Ai<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionAssistantMessageParam;
|
|
78
60
|
convertFromDeveloperMessage(developerMessage: RoleMessage.Developer): OpenAI.ChatCompletionSystemMessageParam;
|
|
@@ -82,7 +64,8 @@ export declare namespace AliyunEngine {
|
|
|
82
64
|
makeParams(session: Session<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionCreateParamsStreaming;
|
|
83
65
|
convertToFunctionCallFromDelta(apifc: OpenAI.ChatCompletionChunk.Choice.Delta.ToolCall): Function.Call.Distributive<Function.Declaration.From<fdm>>;
|
|
84
66
|
convertCompletionStockToCompletion(stock: OpenAI.ChatCompletionChunk): OpenAI.ChatCompletion;
|
|
85
|
-
fetchRaw(
|
|
67
|
+
fetchRaw(wfctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>, signal?: AbortSignal): Promise<RoleMessage.Ai<Function.Declaration.From<fdm>>>;
|
|
68
|
+
getDeltaThoughts(delta: OpenAI.ChatCompletionChunk.Choice.Delta): string;
|
|
86
69
|
}
|
|
87
70
|
function create<fdm extends Function.Declaration.Map>(options: CompatibleEngine.Options<fdm>): CompatibleEngine<fdm>;
|
|
88
71
|
}
|
|
@@ -1,198 +1,146 @@
|
|
|
1
1
|
import { Function } from "../function.js";
|
|
2
|
-
import { Engine } from "../engine.js";
|
|
3
|
-
import { CompatibleEngine } from "../compatible-engine.js";
|
|
4
2
|
import { OpenAIChatCompletionsEngine } from "../api-types/openai-chat-completions.js";
|
|
5
3
|
import { OpenAIChatCompletionsCompatibleEngine } from "./openai-chatcompletions.js";
|
|
4
|
+
import { CompatibleEngine } from "../compatible-engine.js";
|
|
6
5
|
import { OpenAIChatCompletionsCompatibleStreamEngine } from "./openai-chatcompletions.d/stream.js";
|
|
7
6
|
import {} from "../inference-context.js";
|
|
8
7
|
import { RoleMessage } from "../session.js";
|
|
8
|
+
import * as Undici from 'undici';
|
|
9
|
+
import { Throttle } from "../throttle.js";
|
|
10
|
+
import { Engine } from "../engine.js";
|
|
11
|
+
import OpenAI from 'openai';
|
|
12
|
+
import {} from "../telemetry.js";
|
|
9
13
|
export var AliyunEngine;
|
|
10
14
|
(function (AliyunEngine) {
|
|
11
|
-
let
|
|
12
|
-
(function (
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
15
|
+
let OwnProps;
|
|
16
|
+
(function (OwnProps) {
|
|
17
|
+
function init(options) {
|
|
18
|
+
return {
|
|
19
|
+
client: new OpenAI({
|
|
20
|
+
baseURL: this.baseUrl,
|
|
21
|
+
apiKey: this.apiKey,
|
|
22
|
+
fetchOptions: {
|
|
23
|
+
dispatcher: this.proxyAgent,
|
|
24
|
+
},
|
|
25
|
+
}),
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
OwnProps.init = init;
|
|
29
|
+
})(OwnProps = AliyunEngine.OwnProps || (AliyunEngine.OwnProps = {}));
|
|
30
|
+
function getDeltaThoughts(delta) {
|
|
31
|
+
return delta.reasoning_content ?? '';
|
|
32
|
+
}
|
|
33
|
+
AliyunEngine.getDeltaThoughts = getDeltaThoughts;
|
|
20
34
|
class Instance {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
35
|
+
baseUrl;
|
|
36
|
+
apiKey;
|
|
37
|
+
model;
|
|
38
|
+
name;
|
|
39
|
+
inputPrice;
|
|
40
|
+
outputPrice;
|
|
41
|
+
cachePrice;
|
|
42
|
+
fdm;
|
|
43
|
+
additionalOptions;
|
|
44
|
+
throttle;
|
|
45
|
+
timeout;
|
|
46
|
+
maxTokens;
|
|
47
|
+
proxyAgent;
|
|
48
|
+
logger;
|
|
49
|
+
toolChoice;
|
|
50
|
+
parallelToolCall;
|
|
51
|
+
client;
|
|
27
52
|
constructor(options) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
this.
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
get name() {
|
|
54
|
-
return this.engineBase.name;
|
|
55
|
-
}
|
|
56
|
-
set name(value) {
|
|
57
|
-
this.engineBase.name = value;
|
|
58
|
-
}
|
|
59
|
-
get inputPrice() {
|
|
60
|
-
return this.engineBase.inputPrice;
|
|
61
|
-
}
|
|
62
|
-
set inputPrice(value) {
|
|
63
|
-
this.engineBase.inputPrice = value;
|
|
64
|
-
}
|
|
65
|
-
get outputPrice() {
|
|
66
|
-
return this.engineBase.outputPrice;
|
|
67
|
-
}
|
|
68
|
-
set outputPrice(value) {
|
|
69
|
-
this.engineBase.outputPrice = value;
|
|
70
|
-
}
|
|
71
|
-
get cachedPrice() {
|
|
72
|
-
return this.engineBase.cachedPrice;
|
|
73
|
-
}
|
|
74
|
-
set cachedPrice(value) {
|
|
75
|
-
this.engineBase.cachedPrice = value;
|
|
76
|
-
}
|
|
77
|
-
get fdm() {
|
|
78
|
-
return this.engineBase.fdm;
|
|
79
|
-
}
|
|
80
|
-
set fdm(value) {
|
|
81
|
-
this.engineBase.fdm = value;
|
|
82
|
-
}
|
|
83
|
-
get additionalOptions() {
|
|
84
|
-
return this.engineBase.additionalOptions;
|
|
85
|
-
}
|
|
86
|
-
set additionalOptions(value) {
|
|
87
|
-
this.engineBase.additionalOptions = value;
|
|
88
|
-
}
|
|
89
|
-
get throttle() {
|
|
90
|
-
return this.engineBase.throttle;
|
|
91
|
-
}
|
|
92
|
-
set throttle(value) {
|
|
93
|
-
this.engineBase.throttle = value;
|
|
94
|
-
}
|
|
95
|
-
get timeout() {
|
|
96
|
-
return this.engineBase.timeout;
|
|
97
|
-
}
|
|
98
|
-
set timeout(value) {
|
|
99
|
-
this.engineBase.timeout = value;
|
|
100
|
-
}
|
|
101
|
-
get maxTokens() {
|
|
102
|
-
return this.engineBase.maxTokens;
|
|
103
|
-
}
|
|
104
|
-
set maxTokens(value) {
|
|
105
|
-
this.engineBase.maxTokens = value;
|
|
106
|
-
}
|
|
107
|
-
get proxyAgent() {
|
|
108
|
-
return this.engineBase.proxyAgent;
|
|
109
|
-
}
|
|
110
|
-
set proxyAgent(value) {
|
|
111
|
-
this.engineBase.proxyAgent = value;
|
|
112
|
-
}
|
|
113
|
-
get toolChoice() {
|
|
114
|
-
return this.compatibleEngineBase.toolChoice;
|
|
115
|
-
}
|
|
116
|
-
set toolChoice(value) {
|
|
117
|
-
this.compatibleEngineBase.toolChoice = value;
|
|
118
|
-
}
|
|
119
|
-
stateless(ctx, session) {
|
|
120
|
-
return this.compatibleEngineBase.stateless(ctx, session);
|
|
121
|
-
}
|
|
122
|
-
stateful(ctx, session) {
|
|
123
|
-
return this.compatibleEngineBase.stateful(ctx, session);
|
|
53
|
+
({
|
|
54
|
+
baseUrl: this.baseUrl,
|
|
55
|
+
apiKey: this.apiKey,
|
|
56
|
+
model: this.model,
|
|
57
|
+
name: this.name,
|
|
58
|
+
inputPrice: this.inputPrice,
|
|
59
|
+
outputPrice: this.outputPrice,
|
|
60
|
+
cachePrice: this.cachePrice,
|
|
61
|
+
fdm: this.fdm,
|
|
62
|
+
additionalOptions: this.additionalOptions,
|
|
63
|
+
throttle: this.throttle,
|
|
64
|
+
timeout: this.timeout,
|
|
65
|
+
maxTokens: this.maxTokens,
|
|
66
|
+
proxyAgent: this.proxyAgent,
|
|
67
|
+
logger: this.logger,
|
|
68
|
+
} = (Engine.OwnProps.init).call(this, options));
|
|
69
|
+
({ toolChoice: this.toolChoice } = (CompatibleEngine.OwnProps.init).call(this, options));
|
|
70
|
+
({ parallelToolCall: this.parallelToolCall } = (OpenAIChatCompletionsEngine.OwnProps.init).call(this, options));
|
|
71
|
+
({ client: this.client } = (AliyunEngine.OwnProps.init).call(this, options));
|
|
72
|
+
}
|
|
73
|
+
stateless(wfctx, session) {
|
|
74
|
+
return (CompatibleEngine.stateless).call(this, wfctx, session);
|
|
75
|
+
}
|
|
76
|
+
stateful(wfctx, session) {
|
|
77
|
+
return (CompatibleEngine.stateful).call(this, wfctx, session);
|
|
124
78
|
}
|
|
125
79
|
appendUserMessage(session, message) {
|
|
126
|
-
return
|
|
80
|
+
return (CompatibleEngine.appendUserMessage).call(this, session, message);
|
|
127
81
|
}
|
|
128
82
|
pushUserMessage(session, message) {
|
|
129
|
-
return
|
|
130
|
-
}
|
|
131
|
-
get parallel() {
|
|
132
|
-
return this.openAIChatCompletionsEngineBase.parallel;
|
|
133
|
-
}
|
|
134
|
-
set parallel(value) {
|
|
135
|
-
this.openAIChatCompletionsEngineBase.parallel = value;
|
|
83
|
+
return (CompatibleEngine.pushUserMessage).call(this, session, message);
|
|
136
84
|
}
|
|
137
85
|
convertFromFunctionCall(fc) {
|
|
138
|
-
return
|
|
86
|
+
return (OpenAIChatCompletionsEngine.convertFromFunctionCall).call(this, fc);
|
|
139
87
|
}
|
|
140
88
|
convertFromFunctionResponse(fr) {
|
|
141
|
-
return
|
|
89
|
+
return (OpenAIChatCompletionsEngine.convertFromFunctionResponse).call(this, fr);
|
|
142
90
|
}
|
|
143
91
|
convertFromToolChoice(mode) {
|
|
144
|
-
return
|
|
92
|
+
return (OpenAIChatCompletionsEngine.convertFromToolChoice).call(this, mode);
|
|
145
93
|
}
|
|
146
94
|
convertToFunctionCall(apifc) {
|
|
147
|
-
return
|
|
95
|
+
return (OpenAIChatCompletionsEngine.convertToFunctionCall).call(this, apifc);
|
|
148
96
|
}
|
|
149
97
|
convertFromFunctionDeclarationEntry(fdentry) {
|
|
150
|
-
return
|
|
98
|
+
return (OpenAIChatCompletionsEngine.convertFromFunctionDeclarationEntry).call(this, fdentry);
|
|
151
99
|
}
|
|
152
100
|
calcCost(usage) {
|
|
153
|
-
return
|
|
101
|
+
return (OpenAIChatCompletionsEngine.calcCost).call(this, usage);
|
|
154
102
|
}
|
|
155
103
|
extractContent(completionContent) {
|
|
156
|
-
return
|
|
104
|
+
return (OpenAIChatCompletionsEngine.extractContent).call(this, completionContent);
|
|
157
105
|
}
|
|
158
106
|
handleFinishReason(completion, finishReason) {
|
|
159
|
-
return
|
|
107
|
+
return (OpenAIChatCompletionsEngine.handleFinishReason).call(this, completion, finishReason);
|
|
160
108
|
}
|
|
161
|
-
fetch(
|
|
162
|
-
return
|
|
109
|
+
fetch(wfctx, session, signal) {
|
|
110
|
+
return (OpenAIChatCompletionsCompatibleEngine.fetch).call(this, wfctx, session, signal);
|
|
163
111
|
}
|
|
164
112
|
convertToAiMessage(message) {
|
|
165
|
-
return
|
|
113
|
+
return (OpenAIChatCompletionsCompatibleEngine.convertToAiMessage).call(this, message);
|
|
166
114
|
}
|
|
167
115
|
convertFromAiMessage(aiMessage) {
|
|
168
|
-
return
|
|
116
|
+
return (OpenAIChatCompletionsCompatibleEngine.convertFromAiMessage).call(this, aiMessage);
|
|
169
117
|
}
|
|
170
118
|
convertFromDeveloperMessage(developerMessage) {
|
|
171
|
-
return
|
|
119
|
+
return (OpenAIChatCompletionsCompatibleEngine.convertFromDeveloperMessage).call(this, developerMessage);
|
|
172
120
|
}
|
|
173
121
|
convertFromUserMessage(userMessage) {
|
|
174
|
-
return
|
|
122
|
+
return (OpenAIChatCompletionsCompatibleEngine.convertFromUserMessage).call(this, userMessage);
|
|
175
123
|
}
|
|
176
124
|
convertFromRoleMessage(roleMessage) {
|
|
177
|
-
return
|
|
125
|
+
return (OpenAIChatCompletionsCompatibleEngine.convertFromRoleMessage).call(this, roleMessage);
|
|
178
126
|
}
|
|
179
127
|
validateToolCallsByToolChoice(toolCalls) {
|
|
180
|
-
return
|
|
128
|
+
return (OpenAIChatCompletionsCompatibleEngine.validateToolCallsByToolChoice).call(this, toolCalls);
|
|
181
129
|
}
|
|
182
130
|
makeParams(session) {
|
|
183
|
-
return
|
|
131
|
+
return (OpenAIChatCompletionsCompatibleStreamEngine.makeParams).call(this, session);
|
|
184
132
|
}
|
|
185
133
|
convertToFunctionCallFromDelta(apifc) {
|
|
186
|
-
return
|
|
134
|
+
return (OpenAIChatCompletionsCompatibleStreamEngine.convertToFunctionCallFromDelta).call(this, apifc);
|
|
187
135
|
}
|
|
188
136
|
convertCompletionStockToCompletion(stock) {
|
|
189
|
-
return
|
|
137
|
+
return (OpenAIChatCompletionsCompatibleStreamEngine.convertCompletionStockToCompletion).call(this, stock);
|
|
190
138
|
}
|
|
191
|
-
fetchRaw(
|
|
192
|
-
return
|
|
139
|
+
fetchRaw(wfctx, session, signal) {
|
|
140
|
+
return (OpenAIChatCompletionsCompatibleStreamEngine.fetchRaw).call(this, wfctx, session, signal);
|
|
193
141
|
}
|
|
194
142
|
getDeltaThoughts(delta) {
|
|
195
|
-
return
|
|
143
|
+
return (AliyunEngine.getDeltaThoughts).call(this, delta);
|
|
196
144
|
}
|
|
197
145
|
}
|
|
198
146
|
AliyunEngine.Instance = Instance;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aliyun.js","sourceRoot":"","sources":["../../src/compatible-engines.d/aliyun.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"aliyun.js","sourceRoot":"","sources":["../../src/compatible-engines.d/aliyun.ts"],"names":[],"mappings":"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"}
|