@zimtsui/typechat 0.0.118 → 0.0.120
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.js +7 -7
- package/build/adaptor.js.map +1 -1
- package/build/config.d.ts +2 -1
- package/build/endpoint-spec.d.ts +2 -1
- package/build/endpoint-spec.js +2 -1
- package/build/endpoint-spec.js.map +1 -1
- package/build/engine/exceptions.d.ts +20 -0
- package/build/engine/exceptions.js +38 -0
- package/build/engine/exceptions.js.map +1 -0
- package/build/engine/parts-validator.js +3 -2
- package/build/engine/parts-validator.js.map +1 -1
- package/build/engine.d.ts +16 -16
- package/build/engine.js +22 -23
- package/build/engine.js.map +1 -1
- package/build/engines/anthropic/tool-codec.js +3 -2
- package/build/engines/anthropic/tool-codec.js.map +1 -1
- package/build/engines/anthropic/transport.js +85 -76
- package/build/engines/anthropic/transport.js.map +1 -1
- package/build/engines/anthropic.d.ts +3 -5
- package/build/engines/anthropic.js +3 -2
- package/build/engines/anthropic.js.map +1 -1
- package/build/engines/google/message-codec.js +2 -2
- package/build/engines/google/message-codec.js.map +1 -1
- package/build/engines/google/tool-codec.js +3 -2
- package/build/engines/google/tool-codec.js.map +1 -1
- package/build/engines/google/transport.js +9 -6
- package/build/engines/google/transport.js.map +1 -1
- package/build/engines/google.d.ts +6 -5
- package/build/engines/google.js +17 -5
- package/build/engines/google.js.map +1 -1
- package/build/engines/openai-chatcompletions/message-codec.d.ts +2 -1
- package/build/engines/openai-chatcompletions/message-codec.js +5 -2
- package/build/engines/openai-chatcompletions/message-codec.js.map +1 -1
- package/build/engines/openai-chatcompletions/message.d.ts +19 -0
- package/build/engines/openai-chatcompletions/message.js.map +1 -0
- package/build/engines/openai-chatcompletions/tool-codec.js +4 -3
- package/build/engines/openai-chatcompletions/tool-codec.js.map +1 -1
- package/build/engines/openai-chatcompletions/transport.js +37 -38
- package/build/engines/openai-chatcompletions/transport.js.map +1 -1
- package/build/engines/openai-chatcompletions.d.ts +7 -6
- package/build/engines/openai-chatcompletions.js +9 -4
- package/build/engines/openai-chatcompletions.js.map +1 -1
- package/build/engines/{dashscope → openai-compatible}/message-codec.js +1 -1
- package/build/engines/openai-compatible/message-codec.js.map +1 -0
- package/build/engines/openai-compatible/message.js +20 -0
- package/build/engines/openai-compatible/message.js.map +1 -0
- package/build/engines/openai-compatible/tool-choice-codec.js.map +1 -0
- package/build/engines/{dashscope → openai-compatible}/transport.js +22 -16
- package/build/engines/openai-compatible/transport.js.map +1 -0
- package/build/engines/openai-compatible.d.ts +22 -0
- package/build/engines/openai-compatible.js +50 -0
- package/build/engines/openai-compatible.js.map +1 -0
- package/build/engines/openai-responses/message-codec.js +1 -1
- package/build/engines/openai-responses/message-codec.js.map +1 -1
- package/build/engines/openai-responses/tool-choice-validator.js +4 -4
- package/build/engines/openai-responses/tool-choice-validator.js.map +1 -1
- package/build/engines/openai-responses/tool-codec.js +4 -3
- package/build/engines/openai-responses/tool-codec.js.map +1 -1
- package/build/engines/openai-responses/transport.d.ts +1 -2
- package/build/engines/openai-responses/transport.js +22 -13
- package/build/engines/openai-responses/transport.js.map +1 -1
- package/build/engines/openai-responses.d.ts +5 -10
- package/build/engines/openai-responses.js +16 -18
- package/build/engines/openai-responses.js.map +1 -1
- package/build/exports.d.ts +1 -1
- package/build/exports.js +1 -1
- package/build/exports.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/build/engine/recoverable.d.ts +0 -12
- package/build/engine/recoverable.js +0 -29
- package/build/engine/recoverable.js.map +0 -1
- package/build/engines/dashscope/message-codec.js.map +0 -1
- package/build/engines/dashscope/message.js.map +0 -1
- package/build/engines/dashscope/tool-choice-codec.js.map +0 -1
- package/build/engines/dashscope/transport.js.map +0 -1
- package/build/engines/dashscope.d.ts +0 -36
- package/build/engines/dashscope.js +0 -78
- package/build/engines/dashscope.js.map +0 -1
- /package/build/engines/{dashscope → openai-chatcompletions}/message.js +0 -0
- /package/build/engines/{dashscope → openai-compatible}/message-codec.d.ts +0 -0
- /package/build/engines/{dashscope → openai-compatible}/message.d.ts +0 -0
- /package/build/engines/{dashscope → openai-compatible}/tool-choice-codec.d.ts +0 -0
- /package/build/engines/{dashscope → openai-compatible}/tool-choice-codec.js +0 -0
- /package/build/engines/{dashscope → openai-compatible}/transport.d.ts +0 -0
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Engine } from '../../engine.ts';
|
|
2
|
+
import { Function } from '../../function.ts';
|
|
3
|
+
import OpenAI from 'openai';
|
|
4
|
+
declare const NOMINAL: unique symbol;
|
|
5
|
+
export declare namespace RoleMessage {
|
|
6
|
+
class Ai<in out fdu extends Function.Decl.Proto> extends Engine.RoleMessage.Ai<fdu> {
|
|
7
|
+
protected raw: OpenAI.ChatCompletionMessage;
|
|
8
|
+
protected [NOMINAL]: never;
|
|
9
|
+
constructor(parts: unknown[], raw: OpenAI.ChatCompletionMessage);
|
|
10
|
+
getRaw(): OpenAI.ChatCompletionMessage;
|
|
11
|
+
}
|
|
12
|
+
namespace Ai {
|
|
13
|
+
type From<fdm extends Function.Decl.Map.Proto> = Ai<Function.Decl.From<fdm>>;
|
|
14
|
+
}
|
|
15
|
+
export import Part = Engine.RoleMessage.Part;
|
|
16
|
+
export import User = Engine.RoleMessage.User;
|
|
17
|
+
export import Developer = Engine.RoleMessage.Developer;
|
|
18
|
+
}
|
|
19
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAIzC,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC;AAGzB,MAAM,KAAW,WAAW,CA0B3B;AA1BD,WAAiB,WAAW;IACxB,MAAa,EAEX,SAAQ,MAAM,CAAC,WAAW,CAAC,EAAO;QAIlB;QAFd,YACI,KAAgB,EACN,GAAiC;YAE3C,KAAK,CAAC,KAAK,CAAC,CAAC;YAFH,QAAG,GAAH,GAAG,CAA8B;QAG/C,CAAC;QAEM,MAAM;YACT,OAAO,IAAI,CAAC,GAAG,CAAC;QACpB,CAAC;KACJ;IAdY,cAAE,KAcd,CAAA;IAQa,gBAAI,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,gBAAI,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,qBAAS,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC;AAC3D,CAAC,EA1BgB,WAAW,KAAX,WAAW,QA0B3B"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Parse, ParseError } from 'typebox/schema';
|
|
2
2
|
import { Function } from "../../function.js";
|
|
3
|
+
import { Engine } from "../../engine.js";
|
|
3
4
|
export class ToolCodec {
|
|
4
5
|
fdm;
|
|
5
6
|
apiFds;
|
|
@@ -25,13 +26,13 @@ export class ToolCodec {
|
|
|
25
26
|
const fditem = this.fdm[apifc.function.name];
|
|
26
27
|
if (fditem) { }
|
|
27
28
|
else
|
|
28
|
-
throw new
|
|
29
|
+
throw new Engine.Exceptions.InferenceError('Unknown function call', { cause: apifc });
|
|
29
30
|
const args = (() => {
|
|
30
31
|
try {
|
|
31
32
|
return JSON.parse(apifc.function.arguments);
|
|
32
33
|
}
|
|
33
34
|
catch (e) {
|
|
34
|
-
throw new
|
|
35
|
+
throw new Engine.Exceptions.InferenceError('Invalid JSON of function call', { cause: apifc });
|
|
35
36
|
}
|
|
36
37
|
})();
|
|
37
38
|
try {
|
|
@@ -39,7 +40,7 @@ export class ToolCodec {
|
|
|
39
40
|
}
|
|
40
41
|
catch (e) {
|
|
41
42
|
if (e instanceof ParseError)
|
|
42
|
-
throw new
|
|
43
|
+
throw new Engine.Exceptions.InferenceError('Invalid arguments of function call.', { cause: e });
|
|
43
44
|
else
|
|
44
45
|
throw e;
|
|
45
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/tool-codec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/tool-codec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import OpenAI from 'openai';
|
|
2
|
+
import { Engine } from "../../engine.js";
|
|
2
3
|
import { loggers } from "../../telemetry.js";
|
|
3
4
|
import * as ToolChoiceCodec from "./tool-choice-codec.js";
|
|
4
5
|
import * as Undici from 'undici';
|
|
@@ -18,6 +19,7 @@ export class Transport {
|
|
|
18
19
|
apiKey: options.providerSpec.apiKey,
|
|
19
20
|
fetch: Undici.fetch,
|
|
20
21
|
fetchOptions: { dispatcher: options.providerSpec.dispatcher },
|
|
22
|
+
defaultHeaders: new Headers(options.inferenceParams.additionalHeaders),
|
|
21
23
|
});
|
|
22
24
|
this.inferenceParams = options.inferenceParams;
|
|
23
25
|
this.providerSpec = options.providerSpec;
|
|
@@ -53,10 +55,10 @@ export class Transport {
|
|
|
53
55
|
throw new Error();
|
|
54
56
|
if (apifc.function?.name) { }
|
|
55
57
|
else
|
|
56
|
-
throw new
|
|
58
|
+
throw new Engine.Exceptions.InferenceError('Function name missing.', { cause: apifc });
|
|
57
59
|
if (apifc.function?.arguments) { }
|
|
58
60
|
else
|
|
59
|
-
throw new
|
|
61
|
+
throw new Engine.Exceptions.InferenceError('Function arguments missing.', { cause: apifc });
|
|
60
62
|
return {
|
|
61
63
|
id: apifc.id,
|
|
62
64
|
type: 'function',
|
|
@@ -70,7 +72,7 @@ export class Transport {
|
|
|
70
72
|
const stockChoice = stock?.choices[0];
|
|
71
73
|
if (stockChoice?.finish_reason) { }
|
|
72
74
|
else
|
|
73
|
-
throw new
|
|
75
|
+
throw new Engine.Exceptions.InferenceError('Finish reason missing', { cause: stock });
|
|
74
76
|
return {
|
|
75
77
|
id: stock.id,
|
|
76
78
|
object: 'chat.completion',
|
|
@@ -91,12 +93,12 @@ export class Transport {
|
|
|
91
93
|
};
|
|
92
94
|
}
|
|
93
95
|
async fetch(wfctx, session, signal) {
|
|
96
|
+
await this.throttle.requests(wfctx);
|
|
97
|
+
const params = this.makeParams(session);
|
|
98
|
+
loggers.message.debug(params);
|
|
99
|
+
let stock = null;
|
|
94
100
|
try {
|
|
95
|
-
await this.throttle.requests(wfctx);
|
|
96
|
-
const params = this.makeParams(session);
|
|
97
|
-
loggers.message.debug(params);
|
|
98
101
|
const stream = await this.client.chat.completions.create(params, { signal });
|
|
99
|
-
let stock = null;
|
|
100
102
|
for await (const chunk of stream) {
|
|
101
103
|
loggers.stream.trace(chunk);
|
|
102
104
|
stock ??= {
|
|
@@ -138,40 +140,37 @@ export class Transport {
|
|
|
138
140
|
}
|
|
139
141
|
stock.usage ??= chunk.usage;
|
|
140
142
|
}
|
|
141
|
-
if (stock) { }
|
|
142
|
-
else
|
|
143
|
-
throw new Error();
|
|
144
|
-
const completion = this.mergeCompletion(stock);
|
|
145
|
-
loggers.message.debug(completion);
|
|
146
|
-
const choice = completion.choices[0];
|
|
147
|
-
if (choice) { }
|
|
148
|
-
else
|
|
149
|
-
throw new SyntaxError('Content missing', { cause: completion });
|
|
150
|
-
if (choice.message.content)
|
|
151
|
-
loggers.inference.info(choice.message.content);
|
|
152
|
-
if (choice.finish_reason === 'length')
|
|
153
|
-
throw new SyntaxError('Token limit exceeded.', { cause: completion });
|
|
154
|
-
if (['stop', 'tool_calls'].includes(choice.finish_reason)) { }
|
|
155
|
-
else
|
|
156
|
-
throw new SyntaxError('Abnormal finish reason', { cause: choice.finish_reason });
|
|
157
|
-
if (completion.usage) { }
|
|
158
|
-
else
|
|
159
|
-
throw new Error();
|
|
160
|
-
const cost = this.billing.charge(completion.usage);
|
|
161
|
-
if (choice.message.tool_calls)
|
|
162
|
-
loggers.message.info(choice.message.tool_calls);
|
|
163
|
-
loggers.message.info(completion.usage);
|
|
164
|
-
wfctx.cost?.(cost);
|
|
165
|
-
return this.messageCodec.decodeAiMessage(choice.message);
|
|
166
143
|
}
|
|
167
144
|
catch (e) {
|
|
168
|
-
if (e instanceof OpenAI.
|
|
169
|
-
throw new
|
|
170
|
-
|
|
171
|
-
throw new TypeError('OpenAI API connection error', { cause: e });
|
|
172
|
-
else
|
|
173
|
-
throw e;
|
|
145
|
+
if (e instanceof OpenAI.APIConnectionError)
|
|
146
|
+
throw new Engine.Exceptions.ConnectionError(undefined, { cause: e });
|
|
147
|
+
throw e;
|
|
174
148
|
}
|
|
149
|
+
if (stock) { }
|
|
150
|
+
else
|
|
151
|
+
throw new Error();
|
|
152
|
+
const completion = this.mergeCompletion(stock);
|
|
153
|
+
loggers.message.debug(completion);
|
|
154
|
+
const choice = completion.choices[0];
|
|
155
|
+
if (choice) { }
|
|
156
|
+
else
|
|
157
|
+
throw new Engine.Exceptions.InferenceError('Content missing', { cause: completion });
|
|
158
|
+
if (choice.message.content)
|
|
159
|
+
loggers.inference.info(choice.message.content);
|
|
160
|
+
if (choice.finish_reason === 'length')
|
|
161
|
+
throw new Engine.Exceptions.InferenceError('Token limit exceeded.', { cause: completion });
|
|
162
|
+
if (['stop', 'tool_calls'].includes(choice.finish_reason)) { }
|
|
163
|
+
else
|
|
164
|
+
throw new Engine.Exceptions.InferenceError('Abnormal finish reason', { cause: choice.finish_reason });
|
|
165
|
+
if (completion.usage) { }
|
|
166
|
+
else
|
|
167
|
+
throw new Error();
|
|
168
|
+
const cost = this.billing.charge(completion.usage);
|
|
169
|
+
if (choice.message.tool_calls)
|
|
170
|
+
loggers.message.info(choice.message.tool_calls);
|
|
171
|
+
loggers.message.info(completion.usage);
|
|
172
|
+
wfctx.cost?.(cost);
|
|
173
|
+
return this.messageCodec.decodeAiMessage(choice.message);
|
|
175
174
|
}
|
|
176
175
|
}
|
|
177
176
|
//# sourceMappingURL=transport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/transport.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/engines/openai-chatcompletions/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,22 @@
|
|
|
1
1
|
import { Function } from '../function.ts';
|
|
2
2
|
import { Engine } from '../engine.ts';
|
|
3
3
|
import { MessageCodec } from './openai-chatcompletions/message-codec.ts';
|
|
4
|
-
import
|
|
4
|
+
import * as TransportModule from './openai-chatcompletions/transport.ts';
|
|
5
|
+
import * as MessageModule from './openai-chatcompletions/message.ts';
|
|
5
6
|
import { ToolCodec } from './openai-chatcompletions/tool-codec.ts';
|
|
6
7
|
import { Billing } from './openai-chatcompletions/billing.ts';
|
|
7
8
|
export type OpenAIChatCompletionsEngine<fdm extends Function.Decl.Map.Proto> = OpenAIChatCompletionsEngine.Instance<fdm>;
|
|
8
9
|
export declare namespace OpenAIChatCompletionsEngine {
|
|
9
10
|
class Instance<in out fdm extends Function.Decl.Map.Proto> extends Engine.Instance<fdm> {
|
|
10
|
-
protected options:
|
|
11
|
+
protected options: Engine.Options<fdm>;
|
|
11
12
|
protected toolCodec: ToolCodec<fdm>;
|
|
12
13
|
protected messageCodec: MessageCodec<fdm>;
|
|
13
14
|
protected billing: Billing;
|
|
14
15
|
protected transport: Transport<fdm>;
|
|
15
|
-
constructor(options:
|
|
16
|
+
constructor(options: Engine.Options<fdm>);
|
|
16
17
|
clone(): Engine<fdm>;
|
|
17
18
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
export import RoleMessage = MessageModule.RoleMessage;
|
|
20
|
+
export import Transport = TransportModule.Transport;
|
|
21
|
+
function createEngine<fdm extends Function.Decl.Map.Proto>(options: Engine.Options<fdm>): Engine<fdm>;
|
|
21
22
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Engine } from "../engine.js";
|
|
2
2
|
import { MessageCodec } from "./openai-chatcompletions/message-codec.js";
|
|
3
|
-
import
|
|
3
|
+
import * as TransportModule from "./openai-chatcompletions/transport.js";
|
|
4
|
+
import * as MessageModule from "./openai-chatcompletions/message.js";
|
|
4
5
|
import { ToolCodec } from "./openai-chatcompletions/tool-codec.js";
|
|
5
6
|
import { Billing } from "./openai-chatcompletions/billing.js";
|
|
6
7
|
export var OpenAIChatCompletionsEngine;
|
|
@@ -19,7 +20,7 @@ export var OpenAIChatCompletionsEngine;
|
|
|
19
20
|
toolCodec: this.toolCodec,
|
|
20
21
|
});
|
|
21
22
|
this.billing = new Billing({ pricing: this.pricing });
|
|
22
|
-
this.transport = new Transport({
|
|
23
|
+
this.transport = new OpenAIChatCompletionsEngine.Transport({
|
|
23
24
|
inferenceParams: this.inferenceOptions,
|
|
24
25
|
providerSpec: this.providerSpecs,
|
|
25
26
|
fdm: this.fdm,
|
|
@@ -38,8 +39,12 @@ export var OpenAIChatCompletionsEngine;
|
|
|
38
39
|
}
|
|
39
40
|
}
|
|
40
41
|
OpenAIChatCompletionsEngine.Instance = Instance;
|
|
41
|
-
OpenAIChatCompletionsEngine.
|
|
42
|
+
OpenAIChatCompletionsEngine.RoleMessage = MessageModule.RoleMessage;
|
|
43
|
+
OpenAIChatCompletionsEngine.Transport = TransportModule.Transport;
|
|
44
|
+
createEngine;
|
|
45
|
+
function createEngine(options) {
|
|
42
46
|
return new Instance(options);
|
|
43
|
-
}
|
|
47
|
+
}
|
|
48
|
+
OpenAIChatCompletionsEngine.createEngine = createEngine;
|
|
44
49
|
})(OpenAIChatCompletionsEngine || (OpenAIChatCompletionsEngine = {}));
|
|
45
50
|
//# sourceMappingURL=openai-chatcompletions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-chatcompletions.js","sourceRoot":"","sources":["../../src/engines/openai-chatcompletions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"openai-chatcompletions.js","sourceRoot":"","sources":["../../src/engines/openai-chatcompletions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AACzE,OAAO,KAAK,eAAe,MAAM,uCAAuC,CAAC;AACzE,OAAO,KAAK,aAAa,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAQ9D,MAAM,KAAW,2BAA2B,CA8C3C;AA9CD,WAAiB,2BAA2B;IACxC,MAAa,QAEX,SAAQ,MAAM,CAAC,QAAa;QAMG;QALnB,SAAS,CAAiB;QAC1B,YAAY,CAAoB;QAChC,OAAO,CAAU;QACR,SAAS,CAAiB;QAE7C,YAA6B,OAA4B;YACrD,KAAK,CAAC,OAAO,CAAC,CAAC;YADU,YAAO,GAAP,OAAO,CAAqB;YAErD,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC;gBACjC,SAAS,EAAE,IAAI,CAAC,SAAS;aAC5B,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,SAAS,GAAG,IAAI,4BAAA,SAAS,CAAC;gBAC3B,eAAe,EAAE,IAAI,CAAC,gBAAgB;gBACtC,YAAY,EAAE,IAAI,CAAC,aAAa;gBAChC,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO,EAAE,IAAI,CAAC,OAAO;aACxB,CAAC,CAAC;QACP,CAAC;QAEe,KAAK;YACjB,MAAM,MAAM,GAAG,IAAI,2BAA2B,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtE,MAAM,CAAC,oBAAoB,GAAG,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC7D,MAAM,CAAC,mBAAmB,GAAG,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC3D,OAAO,MAAM,CAAC;QAClB,CAAC;KAEJ;IAlCY,oCAAQ,WAkCpB,CAAA;IAEa,uCAAW,GAAG,aAAa,CAAC,WAAW,CAAC;IACxC,qCAAS,GAAG,eAAe,CAAC,SAAS,CAAC;IAEpD,YAAoC,CAAC;IACrC,SAAgB,YAAY,CAE1B,OAA4B;QAC1B,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAJe,wCAAY,eAI3B,CAAA;AACL,CAAC,EA9CgB,2BAA2B,KAA3B,2BAA2B,QA8C3C"}
|
|
@@ -15,7 +15,7 @@ export class MessageCodec {
|
|
|
15
15
|
if (part.type === 'output_text')
|
|
16
16
|
parts.push(new RoleMessage.Part.Text(part.text));
|
|
17
17
|
else if (part.type === 'refusal')
|
|
18
|
-
throw new
|
|
18
|
+
throw new Engine.Exceptions.InferenceError('Refusal', { cause: raw });
|
|
19
19
|
else
|
|
20
20
|
throw new Error();
|
|
21
21
|
else if (item.type === 'function_call')
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"message-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-compatible/message-codec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { Engine } from "../../engine.js";
|
|
2
|
+
const NOMINAL = Symbol();
|
|
3
|
+
export var RoleMessage;
|
|
4
|
+
(function (RoleMessage) {
|
|
5
|
+
class Ai extends Engine.RoleMessage.Ai {
|
|
6
|
+
raw;
|
|
7
|
+
constructor(parts, raw) {
|
|
8
|
+
super(parts);
|
|
9
|
+
this.raw = raw;
|
|
10
|
+
}
|
|
11
|
+
getRaw() {
|
|
12
|
+
return this.raw;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
RoleMessage.Ai = Ai;
|
|
16
|
+
RoleMessage.Part = Engine.RoleMessage.Part;
|
|
17
|
+
RoleMessage.User = Engine.RoleMessage.User;
|
|
18
|
+
RoleMessage.Developer = Engine.RoleMessage.Developer;
|
|
19
|
+
})(RoleMessage || (RoleMessage = {}));
|
|
20
|
+
//# sourceMappingURL=message.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../src/engines/openai-compatible/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAIzC,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC;AAGzB,MAAM,KAAW,WAAW,CA0B3B;AA1BD,WAAiB,WAAW;IACxB,MAAa,EAEX,SAAQ,MAAM,CAAC,WAAW,CAAC,EAAO;QAIlB;QAFd,YACI,KAAgB,EACN,GAA8B;YAExC,KAAK,CAAC,KAAK,CAAC,CAAC;YAFH,QAAG,GAAH,GAAG,CAA2B;QAG5C,CAAC;QAEM,MAAM;YACT,OAAO,IAAI,CAAC,GAAG,CAAC;QACpB,CAAC;KACJ;IAdY,cAAE,KAcd,CAAA;IAQa,gBAAI,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,gBAAI,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;IAC/B,qBAAS,GAAG,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC;AAC3D,CAAC,EA1BgB,WAAW,KAAX,WAAW,QA0B3B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-choice-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-compatible/tool-choice-codec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIlD,MAAM,UAAU,MAAM,CAClB,UAAsB;IAEtB,IAAI,UAAU,KAAK,UAAU,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;SAC7C,IAAI,UAAU,KAAK,UAAU,CAAC,QAAQ;QAAE,OAAO,MAAM,CAAC;SACtD,IAAI,UAAU,KAAK,UAAU,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;SACpD,IAAI,UAAU,KAAK,UAAU,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;;QAClD,MAAM,IAAI,KAAK,EAAE,CAAC;AAC3B,CAAC"}
|
|
@@ -21,9 +21,7 @@ export class Transport {
|
|
|
21
21
|
apiKey: options.providerSpec.apiKey,
|
|
22
22
|
fetch: Undici.fetch,
|
|
23
23
|
fetchOptions: { dispatcher: options.providerSpec.dispatcher },
|
|
24
|
-
defaultHeaders: new Headers(
|
|
25
|
-
'x-dashscope-session-cache': 'enable',
|
|
26
|
-
}),
|
|
24
|
+
defaultHeaders: new Headers(options.inferenceParams.additionalHeaders),
|
|
27
25
|
});
|
|
28
26
|
this.inferenceParams = options.inferenceParams;
|
|
29
27
|
this.providerSpec = options.providerSpec;
|
|
@@ -52,6 +50,7 @@ export class Transport {
|
|
|
52
50
|
}
|
|
53
51
|
return {
|
|
54
52
|
model: this.inferenceParams.model,
|
|
53
|
+
include: ['reasoning.encrypted_content'],
|
|
55
54
|
store: true,
|
|
56
55
|
stream: true,
|
|
57
56
|
input,
|
|
@@ -68,7 +67,7 @@ export class Transport {
|
|
|
68
67
|
if (item.type === 'message') {
|
|
69
68
|
if (item.content.every(part => part.type === 'output_text')) { }
|
|
70
69
|
else
|
|
71
|
-
throw new
|
|
70
|
+
throw new Engine.Exceptions.InferenceError('Refusal', { cause: output });
|
|
72
71
|
loggers.inference.info(item.content.map(part => part.text).join(''));
|
|
73
72
|
}
|
|
74
73
|
else if (item.type === 'function_call')
|
|
@@ -82,17 +81,24 @@ export class Transport {
|
|
|
82
81
|
const params = this.makeParams(session);
|
|
83
82
|
loggers.message.debug(params);
|
|
84
83
|
let response = null;
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
84
|
+
try {
|
|
85
|
+
const stream = await this.client.responses.create(params, { signal });
|
|
86
|
+
for await (const event of stream) {
|
|
87
|
+
loggers.stream.trace(event);
|
|
88
|
+
if (event.type === 'response.completed')
|
|
89
|
+
response = event.response;
|
|
90
|
+
else if (event.type === 'response.incomplete')
|
|
91
|
+
response = event.response;
|
|
92
|
+
else if (event.type === 'response.failed')
|
|
93
|
+
response = event.response;
|
|
94
|
+
else if (event.type === 'error')
|
|
95
|
+
throw new Engine.Exceptions.InferenceError('Response stream error', { cause: event });
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
if (e instanceof OpenAI.APIConnectionError)
|
|
100
|
+
throw new Engine.Exceptions.ConnectionError(undefined, { cause: e });
|
|
101
|
+
throw e;
|
|
96
102
|
}
|
|
97
103
|
if (response) { }
|
|
98
104
|
else
|
|
@@ -100,7 +106,7 @@ export class Transport {
|
|
|
100
106
|
loggers.message.debug(response);
|
|
101
107
|
if (response.status === 'completed') { }
|
|
102
108
|
else
|
|
103
|
-
throw new
|
|
109
|
+
throw new Engine.Exceptions.InferenceError('Abnormal response status', { cause: response });
|
|
104
110
|
if (response.usage) { }
|
|
105
111
|
else
|
|
106
112
|
throw new Error();
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/engines/openai-compatible/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Engine } from '../engine.ts';
|
|
2
|
+
import { Function } from '../function.ts';
|
|
3
|
+
import { MessageCodec } from './openai-compatible/message-codec.ts';
|
|
4
|
+
import { ToolCodec } from './openai-responses/tool-codec.ts';
|
|
5
|
+
import { Billing } from './openai-responses/billing.ts';
|
|
6
|
+
import * as TransportModule from './openai-compatible/transport.ts';
|
|
7
|
+
import * as MessageModule from './openai-compatible/message.ts';
|
|
8
|
+
export type OpenAICompatibleEngine<fdm extends Function.Decl.Map.Proto> = OpenAICompatibleEngine.Instance<fdm>;
|
|
9
|
+
export declare namespace OpenAICompatibleEngine {
|
|
10
|
+
class Instance<in out fdm extends Function.Decl.Map.Proto> extends Engine.Instance<fdm> {
|
|
11
|
+
protected options: Engine.Options<fdm>;
|
|
12
|
+
protected toolCodec: ToolCodec<fdm>;
|
|
13
|
+
protected messageCodec: MessageCodec<fdm>;
|
|
14
|
+
protected billing: Billing;
|
|
15
|
+
protected transport: Transport<fdm>;
|
|
16
|
+
constructor(options: Engine.Options<fdm>);
|
|
17
|
+
clone(): OpenAICompatibleEngine<fdm>;
|
|
18
|
+
}
|
|
19
|
+
function createEngine<fdm extends Function.Decl.Map.Proto>(options: Engine.Options<fdm>): Engine<fdm>;
|
|
20
|
+
export import RoleMessage = MessageModule.RoleMessage;
|
|
21
|
+
export import Transport = TransportModule.Transport;
|
|
22
|
+
}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { Engine } from "../engine.js";
|
|
2
|
+
import { MessageCodec } from "./openai-compatible/message-codec.js";
|
|
3
|
+
import { ToolCodec } from "./openai-responses/tool-codec.js";
|
|
4
|
+
import { Billing } from "./openai-responses/billing.js";
|
|
5
|
+
import * as TransportModule from "./openai-compatible/transport.js";
|
|
6
|
+
import * as MessageModule from "./openai-compatible/message.js";
|
|
7
|
+
export var OpenAICompatibleEngine;
|
|
8
|
+
(function (OpenAICompatibleEngine) {
|
|
9
|
+
class Instance extends Engine.Instance {
|
|
10
|
+
options;
|
|
11
|
+
toolCodec;
|
|
12
|
+
messageCodec;
|
|
13
|
+
billing;
|
|
14
|
+
transport;
|
|
15
|
+
constructor(options) {
|
|
16
|
+
super(options);
|
|
17
|
+
this.options = options;
|
|
18
|
+
this.toolCodec = new ToolCodec({ fdm: this.fdm });
|
|
19
|
+
this.messageCodec = new MessageCodec({
|
|
20
|
+
toolCodec: this.toolCodec,
|
|
21
|
+
});
|
|
22
|
+
this.billing = new Billing({ pricing: this.pricing });
|
|
23
|
+
this.transport = new OpenAICompatibleEngine.Transport({
|
|
24
|
+
inferenceParams: this.inferenceOptions,
|
|
25
|
+
providerSpec: this.providerSpecs,
|
|
26
|
+
fdm: this.fdm,
|
|
27
|
+
throttle: this.throttle,
|
|
28
|
+
toolChoice: this.toolChoice,
|
|
29
|
+
messageCodec: this.messageCodec,
|
|
30
|
+
toolCodec: this.toolCodec,
|
|
31
|
+
billing: this.billing,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
clone() {
|
|
35
|
+
const engine = new OpenAICompatibleEngine.Instance(this.options);
|
|
36
|
+
engine.middlewaresStateless = [...this.middlewaresStateless];
|
|
37
|
+
engine.middlewaresStateful = [...this.middlewaresStateful];
|
|
38
|
+
return engine;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
OpenAICompatibleEngine.Instance = Instance;
|
|
42
|
+
createEngine;
|
|
43
|
+
function createEngine(options) {
|
|
44
|
+
return new Instance(options);
|
|
45
|
+
}
|
|
46
|
+
OpenAICompatibleEngine.createEngine = createEngine;
|
|
47
|
+
OpenAICompatibleEngine.RoleMessage = MessageModule.RoleMessage;
|
|
48
|
+
OpenAICompatibleEngine.Transport = TransportModule.Transport;
|
|
49
|
+
})(OpenAICompatibleEngine || (OpenAICompatibleEngine = {}));
|
|
50
|
+
//# sourceMappingURL=openai-compatible.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai-compatible.js","sourceRoot":"","sources":["../../src/engines/openai-compatible.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,KAAK,eAAe,MAAM,kCAAkC,CAAC;AAEpE,OAAO,KAAK,aAAa,MAAM,gCAAgC,CAAC;AAOhE,MAAM,KAAW,sBAAsB,CA+CtC;AA/CD,WAAiB,sBAAsB;IACnC,MAAa,QAEX,SAAQ,MAAM,CAAC,QAAa;QAMG;QALnB,SAAS,CAAiB;QAC1B,YAAY,CAAoB;QAChC,OAAO,CAAU;QACR,SAAS,CAAiB;QAE7C,YAA6B,OAA4B;YACrD,KAAK,CAAC,OAAO,CAAC,CAAC;YADU,YAAO,GAAP,OAAO,CAAqB;YAGrD,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC;gBACjC,SAAS,EAAE,IAAI,CAAC,SAAS;aAC5B,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YACtD,IAAI,CAAC,SAAS,GAAG,IAAI,uBAAA,SAAS,CAAC;gBAC3B,eAAe,EAAE,IAAI,CAAC,gBAAgB;gBACtC,YAAY,EAAE,IAAI,CAAC,aAAa;gBAChC,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO,EAAE,IAAI,CAAC,OAAO;aACxB,CAAC,CAAC;QACP,CAAC;QAEe,KAAK;YACjB,MAAM,MAAM,GAAG,IAAI,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACjE,MAAM,CAAC,oBAAoB,GAAG,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC7D,MAAM,CAAC,mBAAmB,GAAG,CAAC,GAAG,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC3D,OAAO,MAAM,CAAC;QAClB,CAAC;KAEJ;IAnCY,+BAAQ,WAmCpB,CAAA;IAED,YAAoC,CAAC;IACrC,SAAgB,YAAY,CAE1B,OAA4B;QAC1B,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAJe,mCAAY,eAI3B,CAAA;IAEa,kCAAW,GAAG,aAAa,CAAC,WAAW,CAAC;IACxC,gCAAS,GAAG,eAAe,CAAC,SAAS,CAAC;AACxD,CAAC,EA/CgB,sBAAsB,KAAtB,sBAAsB,QA+CtC"}
|
|
@@ -16,7 +16,7 @@ export class MessageCodec {
|
|
|
16
16
|
if (part.type === 'output_text')
|
|
17
17
|
parts.push(new RoleMessage.Part.Text(part.text));
|
|
18
18
|
else if (part.type === 'refusal')
|
|
19
|
-
throw new
|
|
19
|
+
throw new Engine.Exceptions.InferenceError('Refusal', { cause: raw });
|
|
20
20
|
else
|
|
21
21
|
throw new Error();
|
|
22
22
|
else if (item.type === 'function_call')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-responses/message-codec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGvC,MAAM,OAAO,YAAY;IAGX,SAAS,CAAiB;IACpC,YAAmB,OAAkC;QACjD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACvC,CAAC;IAEM,eAAe,CAClB,GAA8B;QAE9B,MAAM,KAAK,GAAc,EAAE,CAAC;QAC5B,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;gBACvB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO;oBAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,aAAa;wBAC3B,KAAK,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;yBAChD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;wBAC5B,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"message-codec.js","sourceRoot":"","sources":["../../../src/engines/openai-responses/message-codec.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,25 +24,25 @@ export class ToolChoiceValidator extends Engine.ToolChoiceValidator {
|
|
|
24
24
|
if (tcalls.length) { }
|
|
25
25
|
else
|
|
26
26
|
return new RoleMessage.User([
|
|
27
|
-
RoleMessage.Part.Text
|
|
27
|
+
new RoleMessage.Part.Text(XmlCodec.System.encode(`Error: Tool call required, but not found.`)),
|
|
28
28
|
]);
|
|
29
29
|
}
|
|
30
30
|
else if (this.toolChoice === ToolChoice.ANYONE) {
|
|
31
31
|
if (tcalls.length) { }
|
|
32
32
|
else
|
|
33
33
|
return new RoleMessage.User([
|
|
34
|
-
RoleMessage.Part.Text
|
|
34
|
+
new RoleMessage.Part.Text(XmlCodec.System.encode(`Error: Tool call required, but not found.`)),
|
|
35
35
|
]);
|
|
36
36
|
if (tcalls.length > 1)
|
|
37
37
|
return new RoleMessage.User([
|
|
38
38
|
...tress,
|
|
39
|
-
RoleMessage.Part.Text
|
|
39
|
+
new RoleMessage.Part.Text(XmlCodec.System.encode(`Error: Only 1 tool call allowed, but multiple found.`)),
|
|
40
40
|
]);
|
|
41
41
|
}
|
|
42
42
|
else if (this.toolChoice === ToolChoice.NONE) {
|
|
43
43
|
if (tcalls.length)
|
|
44
44
|
return new RoleMessage.User([
|
|
45
|
-
RoleMessage.Part.Text
|
|
45
|
+
new RoleMessage.Part.Text(XmlCodec.System.encode(`Error: No tool call allowed.`)),
|
|
46
46
|
]);
|
|
47
47
|
}
|
|
48
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-choice-validator.js","sourceRoot":"","sources":["../../../src/engines/openai-responses/tool-choice-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,QAAQ,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,MAAM,OAAO,mBAEX,SAAQ,MAAM,CAAC,mBAAwB;IACrC,YAAmB,OAAoC;QACnD,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAEe,QAAQ,CACpB,SAA8B;QAE9B,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CACpB,KAAK,CAAC,EAAE,CAAC,KAAK,YAAY,IAAI,CAAC,UAAU,CAAC,IAAI;YAC1C,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAC3B,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO;gBACrB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC;aAC1D,CAAC;YACF,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC;aACZ,CAAC,CACrD,CAAC;QAEF,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC1C,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA,CAAC;;gBACjB,OAAO,IAAI,WAAW,CAAC,IAAI,CAAQ;oBAC/B,WAAW,CAAC,IAAI,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"tool-choice-validator.js","sourceRoot":"","sources":["../../../src/engines/openai-responses/tool-choice-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,QAAQ,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,MAAM,OAAO,mBAEX,SAAQ,MAAM,CAAC,mBAAwB;IACrC,YAAmB,OAAoC;QACnD,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAEe,QAAQ,CACpB,SAA8B;QAE9B,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CACpB,KAAK,CAAC,EAAE,CAAC,KAAK,YAAY,IAAI,CAAC,UAAU,CAAC,IAAI;YAC1C,CAAC,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAC3B,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,OAAO;gBACrB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC;aAC1D,CAAC;YACF,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC;aACZ,CAAC,CACrD,CAAC;QAEF,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC1C,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA,CAAC;;gBACjB,OAAO,IAAI,WAAW,CAAC,IAAI,CAAQ;oBAC/B,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CACrB,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,2CAA2C,CAAC,CACtE;iBACJ,CAAC,CAAC;QAEX,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YAC/C,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA,CAAC;;gBACjB,OAAO,IAAI,WAAW,CAAC,IAAI,CAAQ;oBAC/B,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CACrB,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,2CAA2C,CAAC,CACtE;iBACJ,CAAC,CAAC;YACP,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;gBACjB,OAAO,IAAI,WAAW,CAAC,IAAI,CAAM;oBAC7B,GAAG,KAAK;oBACR,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CACrB,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,sDAAsD,CAAC,CACjF;iBACJ,CAAC,CAAC;QAEX,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;YAC7C,IAAI,MAAM,CAAC,MAAM;gBACb,OAAO,IAAI,WAAW,CAAC,IAAI,CAAM;oBAC7B,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,CACrB,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,8BAA8B,CAAC,CACzD;iBACJ,CAAC,CAAC;QACX,CAAC;IACL,CAAC;CACJ"}
|