@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,181 +1,185 @@
|
|
|
1
1
|
import { RoleMessage } from "../../session.js";
|
|
2
2
|
import { Function } from "../../function.js";
|
|
3
|
-
import OpenAI from 'openai';
|
|
4
|
-
import assert from 'node:assert';
|
|
5
3
|
import { OpenAIChatCompletionsCompatibleEngine } from "../openai-chatcompletions.js";
|
|
6
4
|
import {} from "../../inference-context.js";
|
|
7
5
|
import { ResponseInvalid } from "../../engine.js";
|
|
8
6
|
export var OpenAIChatCompletionsCompatibleStreamEngine;
|
|
9
7
|
(function (OpenAIChatCompletionsCompatibleStreamEngine) {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
this.
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
8
|
+
function makeParams(session) {
|
|
9
|
+
const fdentries = Object.entries(this.fdm);
|
|
10
|
+
const tools = fdentries.map(fdentry => this.convertFromFunctionDeclarationEntry(fdentry));
|
|
11
|
+
return {
|
|
12
|
+
model: this.model,
|
|
13
|
+
messages: [
|
|
14
|
+
...(session.developerMessage ? this.convertFromRoleMessage(session.developerMessage) : []),
|
|
15
|
+
...session.chatMessages.flatMap(chatMessage => this.convertFromRoleMessage(chatMessage)),
|
|
16
|
+
],
|
|
17
|
+
tools: tools.length ? tools : undefined,
|
|
18
|
+
tool_choice: tools.length ? this.convertFromToolChoice(this.toolChoice) : undefined,
|
|
19
|
+
parallel_tool_calls: tools.length ? this.parallelToolCall : undefined,
|
|
20
|
+
stream: true,
|
|
21
|
+
stream_options: {
|
|
22
|
+
include_usage: true
|
|
23
|
+
},
|
|
24
|
+
max_completion_tokens: this.maxTokens ?? undefined,
|
|
25
|
+
...this.additionalOptions,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
OpenAIChatCompletionsCompatibleStreamEngine.makeParams = makeParams;
|
|
29
|
+
function convertToFunctionCallFromDelta(apifc) {
|
|
30
|
+
if (apifc.id) { }
|
|
31
|
+
else
|
|
32
|
+
throw new Error();
|
|
33
|
+
if (apifc.function?.name) { }
|
|
34
|
+
else
|
|
35
|
+
throw new Error();
|
|
36
|
+
if (apifc.function?.arguments) { }
|
|
37
|
+
else
|
|
38
|
+
throw new Error();
|
|
39
|
+
return this.convertToFunctionCall(apifc);
|
|
40
|
+
}
|
|
41
|
+
OpenAIChatCompletionsCompatibleStreamEngine.convertToFunctionCallFromDelta = convertToFunctionCallFromDelta;
|
|
42
|
+
function convertCompletionStockToCompletion(stock) {
|
|
43
|
+
const stockChoice = stock?.choices[0];
|
|
44
|
+
if (stockChoice?.finish_reason) { }
|
|
45
|
+
else
|
|
46
|
+
throw new ResponseInvalid('Finish reason missing', { cause: stock });
|
|
47
|
+
const completion = {
|
|
48
|
+
id: stock.id,
|
|
49
|
+
object: 'chat.completion',
|
|
50
|
+
created: stock.created,
|
|
51
|
+
model: stock.model,
|
|
52
|
+
choices: [{
|
|
53
|
+
index: 0,
|
|
54
|
+
finish_reason: stockChoice.finish_reason,
|
|
55
|
+
message: {
|
|
56
|
+
role: 'assistant',
|
|
57
|
+
content: stockChoice.delta.content ?? null,
|
|
58
|
+
tool_calls: stockChoice.delta.tool_calls?.map(apifc => {
|
|
59
|
+
if (apifc.id) { }
|
|
60
|
+
else
|
|
61
|
+
throw new Error();
|
|
62
|
+
if (apifc.function?.name) { }
|
|
63
|
+
else
|
|
64
|
+
throw new Error();
|
|
65
|
+
if (apifc.function?.arguments) { }
|
|
66
|
+
else
|
|
67
|
+
throw new Error();
|
|
68
|
+
return {
|
|
69
|
+
id: apifc.id,
|
|
70
|
+
function: {
|
|
71
|
+
name: apifc.function.name,
|
|
72
|
+
arguments: apifc.function.arguments,
|
|
73
|
+
},
|
|
74
|
+
type: 'function',
|
|
75
|
+
};
|
|
76
|
+
}),
|
|
77
|
+
refusal: stockChoice.delta.refusal ?? null,
|
|
22
78
|
},
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
let thoughts = null, thinking = false;
|
|
93
|
-
for await (const chunk of stream) {
|
|
94
|
-
stock ??= {
|
|
95
|
-
id: chunk.id,
|
|
96
|
-
created: chunk.created,
|
|
97
|
-
model: chunk.model,
|
|
98
|
-
choices: [],
|
|
99
|
-
object: 'chat.completion.chunk',
|
|
100
|
-
};
|
|
101
|
-
// choice
|
|
102
|
-
const deltaChoice = chunk.choices[0];
|
|
103
|
-
if (deltaChoice) {
|
|
104
|
-
if (!stock.choices.length)
|
|
105
|
-
stock.choices.push({
|
|
106
|
-
index: 0,
|
|
107
|
-
finish_reason: null,
|
|
108
|
-
delta: {},
|
|
109
|
-
});
|
|
110
|
-
// thoughts
|
|
111
|
-
const deltaThoughts = this.instance.getDeltaThoughts(deltaChoice.delta);
|
|
112
|
-
if (deltaThoughts) {
|
|
113
|
-
if (!thinking) {
|
|
114
|
-
thinking = true;
|
|
115
|
-
ctx.logger.inference?.trace('<think>\n');
|
|
116
|
-
}
|
|
117
|
-
ctx.logger.inference?.trace(deltaThoughts);
|
|
118
|
-
thoughts ??= '';
|
|
119
|
-
thoughts += deltaThoughts;
|
|
120
|
-
}
|
|
121
|
-
// content
|
|
122
|
-
if (deltaChoice.delta.content) {
|
|
123
|
-
if (thinking) {
|
|
124
|
-
thinking = false;
|
|
125
|
-
ctx.logger.inference?.trace('\n</think>\n');
|
|
126
|
-
}
|
|
127
|
-
ctx.logger.inference?.debug(deltaChoice.delta.content);
|
|
128
|
-
stock.choices[0].delta.content ??= '';
|
|
129
|
-
stock.choices[0].delta.content += deltaChoice.delta.content;
|
|
130
|
-
}
|
|
131
|
-
// function calls
|
|
132
|
-
if (deltaChoice.delta.tool_calls) {
|
|
133
|
-
if (thinking) {
|
|
134
|
-
thinking = false;
|
|
135
|
-
ctx.logger.inference?.trace('\n</think>\n');
|
|
136
|
-
}
|
|
137
|
-
stock.choices[0].delta.tool_calls ??= [];
|
|
138
|
-
for (const deltaToolCall of deltaChoice.delta.tool_calls) {
|
|
139
|
-
const toolCalls = stock.choices[0].delta.tool_calls;
|
|
140
|
-
toolCalls[deltaToolCall.index] ??= { index: deltaToolCall.index };
|
|
141
|
-
toolCalls[deltaToolCall.index].id ??= deltaToolCall.id;
|
|
142
|
-
if (deltaToolCall.function) {
|
|
143
|
-
toolCalls[deltaToolCall.index].function ??= {};
|
|
144
|
-
toolCalls[deltaToolCall.index].function.name ??= deltaToolCall.function.name;
|
|
145
|
-
if (deltaToolCall.function.arguments) {
|
|
146
|
-
toolCalls[deltaToolCall.index].function.arguments ??= '';
|
|
147
|
-
toolCalls[deltaToolCall.index].function.arguments += deltaToolCall.function?.arguments || '';
|
|
148
|
-
}
|
|
149
|
-
}
|
|
79
|
+
logprobs: stockChoice.logprobs ?? null,
|
|
80
|
+
}],
|
|
81
|
+
usage: stock.usage ?? undefined,
|
|
82
|
+
};
|
|
83
|
+
return completion;
|
|
84
|
+
}
|
|
85
|
+
OpenAIChatCompletionsCompatibleStreamEngine.convertCompletionStockToCompletion = convertCompletionStockToCompletion;
|
|
86
|
+
async function fetchRaw(wfctx, session, signal) {
|
|
87
|
+
const params = this.makeParams(session);
|
|
88
|
+
this.logger.message?.trace(params);
|
|
89
|
+
await this.throttle.requests(wfctx);
|
|
90
|
+
const stream = await this.client.chat.completions.create(params, { signal });
|
|
91
|
+
let stock = null;
|
|
92
|
+
let thoughts = null, thinking = false;
|
|
93
|
+
for await (const chunk of stream) {
|
|
94
|
+
stock ??= {
|
|
95
|
+
id: chunk.id,
|
|
96
|
+
created: chunk.created,
|
|
97
|
+
model: chunk.model,
|
|
98
|
+
choices: [],
|
|
99
|
+
object: 'chat.completion.chunk',
|
|
100
|
+
};
|
|
101
|
+
// choice
|
|
102
|
+
const deltaChoice = chunk.choices[0];
|
|
103
|
+
if (deltaChoice) {
|
|
104
|
+
if (!stock.choices.length)
|
|
105
|
+
stock.choices.push({
|
|
106
|
+
index: 0,
|
|
107
|
+
finish_reason: null,
|
|
108
|
+
delta: {},
|
|
109
|
+
});
|
|
110
|
+
// thoughts
|
|
111
|
+
const deltaThoughts = this.getDeltaThoughts(deltaChoice.delta);
|
|
112
|
+
if (deltaThoughts) {
|
|
113
|
+
if (!thinking) {
|
|
114
|
+
thinking = true;
|
|
115
|
+
this.logger.inference?.trace('<think>\n');
|
|
116
|
+
}
|
|
117
|
+
this.logger.inference?.trace(deltaThoughts);
|
|
118
|
+
thoughts ??= '';
|
|
119
|
+
thoughts += deltaThoughts;
|
|
120
|
+
}
|
|
121
|
+
// content
|
|
122
|
+
if (deltaChoice.delta.content) {
|
|
123
|
+
if (thinking) {
|
|
124
|
+
thinking = false;
|
|
125
|
+
this.logger.inference?.trace('\n</think>\n');
|
|
126
|
+
}
|
|
127
|
+
this.logger.inference?.debug(deltaChoice.delta.content);
|
|
128
|
+
stock.choices[0].delta.content ??= '';
|
|
129
|
+
stock.choices[0].delta.content += deltaChoice.delta.content;
|
|
130
|
+
}
|
|
131
|
+
// function calls
|
|
132
|
+
if (deltaChoice.delta.tool_calls) {
|
|
133
|
+
if (thinking) {
|
|
134
|
+
thinking = false;
|
|
135
|
+
this.logger.inference?.trace('\n</think>\n');
|
|
136
|
+
}
|
|
137
|
+
stock.choices[0].delta.tool_calls ??= [];
|
|
138
|
+
for (const deltaToolCall of deltaChoice.delta.tool_calls) {
|
|
139
|
+
const toolCalls = stock.choices[0].delta.tool_calls;
|
|
140
|
+
toolCalls[deltaToolCall.index] ??= { index: deltaToolCall.index };
|
|
141
|
+
toolCalls[deltaToolCall.index].id ??= deltaToolCall.id;
|
|
142
|
+
if (deltaToolCall.function) {
|
|
143
|
+
toolCalls[deltaToolCall.index].function ??= {};
|
|
144
|
+
toolCalls[deltaToolCall.index].function.name ??= deltaToolCall.function.name;
|
|
145
|
+
if (deltaToolCall.function.arguments) {
|
|
146
|
+
toolCalls[deltaToolCall.index].function.arguments ??= '';
|
|
147
|
+
toolCalls[deltaToolCall.index].function.arguments += deltaToolCall.function?.arguments || '';
|
|
150
148
|
}
|
|
151
149
|
}
|
|
152
|
-
// finish reason
|
|
153
|
-
stock.choices[0].finish_reason ??= deltaChoice.finish_reason;
|
|
154
150
|
}
|
|
155
|
-
// usage
|
|
156
|
-
stock.usage ??= chunk.usage;
|
|
157
151
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
const choice = completion.choices[0];
|
|
161
|
-
assert(choice, new ResponseInvalid('Content missing', { cause: completion }));
|
|
162
|
-
if (choice.message.content)
|
|
163
|
-
ctx.logger.inference?.debug('\n');
|
|
164
|
-
this.instance.handleFinishReason(completion, choice.finish_reason);
|
|
165
|
-
assert(completion.usage);
|
|
166
|
-
const cost = this.instance.calcCost(completion.usage);
|
|
167
|
-
ctx.logger.cost?.(cost);
|
|
168
|
-
const aiMessage = this.instance.convertToAiMessage(choice.message);
|
|
169
|
-
// logging
|
|
170
|
-
const apifcs = choice.message.tool_calls;
|
|
171
|
-
if (apifcs?.length)
|
|
172
|
-
ctx.logger.message?.debug(apifcs);
|
|
173
|
-
ctx.logger.message?.debug(completion.usage);
|
|
174
|
-
this.instance.validateToolCallsByToolChoice(aiMessage.getFunctionCalls());
|
|
175
|
-
return aiMessage;
|
|
152
|
+
// finish reason
|
|
153
|
+
stock.choices[0].finish_reason ??= deltaChoice.finish_reason;
|
|
176
154
|
}
|
|
155
|
+
// usage
|
|
156
|
+
stock.usage ??= chunk.usage;
|
|
177
157
|
}
|
|
178
|
-
|
|
179
|
-
|
|
158
|
+
if (stock) { }
|
|
159
|
+
else
|
|
160
|
+
throw new Error();
|
|
161
|
+
const completion = this.convertCompletionStockToCompletion(stock);
|
|
162
|
+
const choice = completion.choices[0];
|
|
163
|
+
if (choice) { }
|
|
164
|
+
else
|
|
165
|
+
throw new ResponseInvalid('Content missing', { cause: completion });
|
|
166
|
+
if (choice.message.content)
|
|
167
|
+
this.logger.inference?.debug('\n');
|
|
168
|
+
this.handleFinishReason(completion, choice.finish_reason);
|
|
169
|
+
if (completion.usage) { }
|
|
170
|
+
else
|
|
171
|
+
throw new Error();
|
|
172
|
+
const cost = this.calcCost(completion.usage);
|
|
173
|
+
wfctx.cost?.(cost);
|
|
174
|
+
const aiMessage = this.convertToAiMessage(choice.message);
|
|
175
|
+
// logging
|
|
176
|
+
const apifcs = choice.message.tool_calls;
|
|
177
|
+
if (apifcs?.length)
|
|
178
|
+
this.logger.message?.debug(apifcs);
|
|
179
|
+
this.logger.message?.debug(completion.usage);
|
|
180
|
+
this.validateToolCallsByToolChoice(aiMessage.getFunctionCalls());
|
|
181
|
+
return aiMessage;
|
|
182
|
+
}
|
|
183
|
+
OpenAIChatCompletionsCompatibleStreamEngine.fetchRaw = fetchRaw;
|
|
180
184
|
})(OpenAIChatCompletionsCompatibleStreamEngine || (OpenAIChatCompletionsCompatibleStreamEngine = {}));
|
|
181
185
|
//# sourceMappingURL=stream.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../src/compatible-engines.d/openai-chatcompletions.d/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../src/compatible-engines.d/openai-chatcompletions.d/stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,29 +5,23 @@ import OpenAI from 'openai';
|
|
|
5
5
|
import type { InferenceContext } from '../inference-context.ts';
|
|
6
6
|
import { type OpenAIChatCompletionsEngine } from '../api-types/openai-chat-completions.ts';
|
|
7
7
|
export declare namespace OpenAIChatCompletionsCompatibleEngine {
|
|
8
|
-
interface
|
|
9
|
-
|
|
8
|
+
interface Options<in out fdm extends Function.Declaration.Map> extends OpenAIChatCompletionsEngine.Options<fdm>, CompatibleEngine.Options<fdm> {
|
|
9
|
+
}
|
|
10
|
+
interface Underhood<in out fdm extends Function.Declaration.Map> extends CompatibleEngine.Underhood<fdm>, OpenAIChatCompletionsEngine.Underhood<fdm> {
|
|
11
|
+
fetch(wfctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>, signal?: AbortSignal): Promise<RoleMessage.Ai<Function.Declaration.From<fdm>>>;
|
|
10
12
|
convertToAiMessage(message: OpenAI.ChatCompletionMessage): RoleMessage.Ai<Function.Declaration.From<fdm>>;
|
|
11
13
|
convertFromDeveloperMessage(developerMessage: RoleMessage.Developer): OpenAI.ChatCompletionSystemMessageParam;
|
|
12
14
|
convertFromUserMessage(userMessage: RoleMessage.User<Function.Declaration.From<fdm>>): [OpenAI.ChatCompletionUserMessageParam] | OpenAI.ChatCompletionToolMessageParam[];
|
|
13
15
|
convertFromAiMessage(aiMessage: RoleMessage.Ai<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionAssistantMessageParam;
|
|
14
16
|
convertFromRoleMessage(roleMessage: RoleMessage): OpenAI.ChatCompletionMessageParam[];
|
|
15
17
|
validateToolCallsByToolChoice(toolCalls: Function.Call.Distributive<Function.Declaration.From<fdm>>[]): void;
|
|
18
|
+
fetchRaw(wfctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>, signal?: AbortSignal): Promise<RoleMessage.Ai<Function.Declaration.From<fdm>>>;
|
|
16
19
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
fetch(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>, signal?: AbortSignal): Promise<RoleMessage.Ai<Function.Declaration.From<fdm>>>;
|
|
25
|
-
convertToAiMessage(message: OpenAI.ChatCompletionMessage): RoleMessage.Ai<Function.Declaration.From<fdm>>;
|
|
26
|
-
convertFromDeveloperMessage(developerMessage: RoleMessage.Developer): OpenAI.ChatCompletionSystemMessageParam;
|
|
27
|
-
convertFromUserMessage(userMessage: RoleMessage.User<Function.Declaration.From<fdm>>): [OpenAI.ChatCompletionUserMessageParam] | OpenAI.ChatCompletionToolMessageParam[];
|
|
28
|
-
convertFromAiMessage(aiMessage: RoleMessage.Ai<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionAssistantMessageParam;
|
|
29
|
-
convertFromRoleMessage(roleMessage: RoleMessage): OpenAI.ChatCompletionMessageParam[];
|
|
30
|
-
validateToolCallsByToolChoice(toolCalls: Function.Call.Distributive<Function.Declaration.From<fdm>>[]): void;
|
|
31
|
-
}
|
|
32
|
-
}
|
|
20
|
+
function fetch<fdm extends Function.Declaration.Map>(this: OpenAIChatCompletionsCompatibleEngine.Underhood<fdm>, wfctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>, signal?: AbortSignal): Promise<RoleMessage.Ai<Function.Declaration.From<fdm>>>;
|
|
21
|
+
function convertToAiMessage<fdm extends Function.Declaration.Map>(this: OpenAIChatCompletionsCompatibleEngine.Underhood<fdm>, message: OpenAI.ChatCompletionMessage): RoleMessage.Ai<Function.Declaration.From<fdm>>;
|
|
22
|
+
function convertFromDeveloperMessage(developerMessage: RoleMessage.Developer): OpenAI.ChatCompletionSystemMessageParam;
|
|
23
|
+
function convertFromUserMessage<fdm extends Function.Declaration.Map>(this: OpenAIChatCompletionsEngine.Underhood<fdm>, userMessage: RoleMessage.User<Function.Declaration.From<fdm>>): [OpenAI.ChatCompletionUserMessageParam] | OpenAI.ChatCompletionToolMessageParam[];
|
|
24
|
+
function convertFromAiMessage<fdm extends Function.Declaration.Map>(this: OpenAIChatCompletionsEngine.Underhood<fdm>, aiMessage: RoleMessage.Ai<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionAssistantMessageParam;
|
|
25
|
+
function convertFromRoleMessage<fdm extends Function.Declaration.Map>(this: OpenAIChatCompletionsCompatibleEngine.Underhood<fdm>, roleMessage: RoleMessage): OpenAI.ChatCompletionMessageParam[];
|
|
26
|
+
function validateToolCallsByToolChoice<fdm extends Function.Declaration.Map>(this: OpenAIChatCompletionsCompatibleEngine.Underhood<fdm>, toolCalls: Function.Call.Distributive<Function.Declaration.From<fdm>>[]): void;
|
|
33
27
|
}
|
|
@@ -3,74 +3,74 @@ import { ResponseInvalid } from "../engine.js";
|
|
|
3
3
|
import { RoleMessage } from "../session.js";
|
|
4
4
|
import { Function } from "../function.js";
|
|
5
5
|
import OpenAI from 'openai';
|
|
6
|
-
import assert from 'node:assert';
|
|
7
6
|
import {} from "../api-types/openai-chat-completions.js";
|
|
8
7
|
export var OpenAIChatCompletionsCompatibleEngine;
|
|
9
8
|
(function (OpenAIChatCompletionsCompatibleEngine) {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const parts = [];
|
|
22
|
-
if (message.content)
|
|
23
|
-
parts.push(RoleMessage.Part.Text.create(this.instance.extractContent(message.content)));
|
|
24
|
-
if (message.tool_calls)
|
|
25
|
-
parts.push(...message.tool_calls.map(apifc => {
|
|
26
|
-
assert(apifc.type === 'function');
|
|
27
|
-
return this.instance.convertToFunctionCall(apifc);
|
|
28
|
-
}));
|
|
29
|
-
assert(parts.length, new ResponseInvalid('Content or tool calls not found in Response', { cause: message }));
|
|
30
|
-
return RoleMessage.Ai.create(parts);
|
|
31
|
-
}
|
|
32
|
-
convertFromDeveloperMessage(developerMessage) {
|
|
33
|
-
return {
|
|
34
|
-
role: 'system',
|
|
35
|
-
content: developerMessage.getOnlyText(),
|
|
36
|
-
};
|
|
37
|
-
}
|
|
38
|
-
convertFromUserMessage(userMessage) {
|
|
39
|
-
const textParts = userMessage.getParts().filter(part => part instanceof RoleMessage.Part.Text.Instance);
|
|
40
|
-
const frs = userMessage.getFunctionResponses();
|
|
41
|
-
if (textParts.length && !frs.length)
|
|
42
|
-
return [{ role: 'user', content: textParts.map(part => ({ type: 'text', text: part.text })) }];
|
|
43
|
-
else if (!textParts.length && frs.length)
|
|
44
|
-
return frs.map(fr => this.instance.convertFromFunctionResponse(fr));
|
|
9
|
+
async function fetch(wfctx, session, signal) {
|
|
10
|
+
return await this.fetchRaw(wfctx, session, signal).catch(e => Promise.reject(e instanceof OpenAI.APIError ? new ResponseInvalid(undefined, { cause: e }) : e));
|
|
11
|
+
}
|
|
12
|
+
OpenAIChatCompletionsCompatibleEngine.fetch = fetch;
|
|
13
|
+
function convertToAiMessage(message) {
|
|
14
|
+
const parts = [];
|
|
15
|
+
if (message.content)
|
|
16
|
+
parts.push(RoleMessage.Part.Text.create(this.extractContent(message.content)));
|
|
17
|
+
if (message.tool_calls)
|
|
18
|
+
parts.push(...message.tool_calls.map(apifc => {
|
|
19
|
+
if (apifc.type === 'function') { }
|
|
45
20
|
else
|
|
46
21
|
throw new Error();
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
22
|
+
return this.convertToFunctionCall(apifc);
|
|
23
|
+
}));
|
|
24
|
+
if (parts.length) { }
|
|
25
|
+
else
|
|
26
|
+
throw new ResponseInvalid('Content or tool calls not found in Response', { cause: message });
|
|
27
|
+
return RoleMessage.Ai.create(parts);
|
|
28
|
+
}
|
|
29
|
+
OpenAIChatCompletionsCompatibleEngine.convertToAiMessage = convertToAiMessage;
|
|
30
|
+
function convertFromDeveloperMessage(developerMessage) {
|
|
31
|
+
return {
|
|
32
|
+
role: 'system',
|
|
33
|
+
content: developerMessage.getOnlyText(),
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
OpenAIChatCompletionsCompatibleEngine.convertFromDeveloperMessage = convertFromDeveloperMessage;
|
|
37
|
+
function convertFromUserMessage(userMessage) {
|
|
38
|
+
const textParts = userMessage.getParts().filter(part => part instanceof RoleMessage.Part.Text.Instance);
|
|
39
|
+
const frs = userMessage.getFunctionResponses();
|
|
40
|
+
if (textParts.length && !frs.length)
|
|
41
|
+
return [{ role: 'user', content: textParts.map(part => ({ type: 'text', text: part.text })) }];
|
|
42
|
+
else if (!textParts.length && frs.length)
|
|
43
|
+
return frs.map(fr => this.convertFromFunctionResponse(fr));
|
|
44
|
+
else
|
|
45
|
+
throw new Error();
|
|
46
|
+
}
|
|
47
|
+
OpenAIChatCompletionsCompatibleEngine.convertFromUserMessage = convertFromUserMessage;
|
|
48
|
+
function convertFromAiMessage(aiMessage) {
|
|
49
|
+
const parts = aiMessage.getParts();
|
|
50
|
+
const textParts = parts.filter(part => part instanceof RoleMessage.Part.Text.Instance);
|
|
51
|
+
const fcParts = parts.filter(part => part instanceof Function.Call);
|
|
52
|
+
return {
|
|
53
|
+
role: 'assistant',
|
|
54
|
+
content: textParts.length ? textParts.map(part => part.text).join('') : undefined,
|
|
55
|
+
tool_calls: fcParts.length ? fcParts.map(fc => this.convertFromFunctionCall(fc)) : undefined,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
OpenAIChatCompletionsCompatibleEngine.convertFromAiMessage = convertFromAiMessage;
|
|
59
|
+
function convertFromRoleMessage(roleMessage) {
|
|
60
|
+
if (roleMessage instanceof RoleMessage.Developer.Instance)
|
|
61
|
+
return [this.convertFromDeveloperMessage(roleMessage)];
|
|
62
|
+
else if (roleMessage instanceof RoleMessage.User.Instance)
|
|
63
|
+
return this.convertFromUserMessage(roleMessage);
|
|
64
|
+
else if (roleMessage instanceof RoleMessage.Ai.Instance)
|
|
65
|
+
return [this.convertFromAiMessage(roleMessage)];
|
|
66
|
+
else
|
|
67
|
+
throw new Error();
|
|
68
|
+
}
|
|
69
|
+
OpenAIChatCompletionsCompatibleEngine.convertFromRoleMessage = convertFromRoleMessage;
|
|
70
|
+
function validateToolCallsByToolChoice(toolCalls) {
|
|
71
|
+
// https://community.openai.com/t/function-call-with-finish-reason-of-stop/437226/7
|
|
72
|
+
Function.Call.validate(toolCalls, this.toolChoice, new ResponseInvalid('Invalid function call', { cause: toolCalls }));
|
|
73
|
+
}
|
|
74
|
+
OpenAIChatCompletionsCompatibleEngine.validateToolCallsByToolChoice = validateToolCallsByToolChoice;
|
|
75
75
|
})(OpenAIChatCompletionsCompatibleEngine || (OpenAIChatCompletionsCompatibleEngine = {}));
|
|
76
76
|
//# sourceMappingURL=openai-chatcompletions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-chatcompletions.js","sourceRoot":"","sources":["../../src/compatible-engines.d/openai-chatcompletions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAgB,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-chatcompletions.js","sourceRoot":"","sources":["../../src/compatible-engines.d/openai-chatcompletions.ts"],"names":[],"mappings":"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"}
|