@zimtsui/typechat 0.0.92 → 0.0.93
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/api-types/openai-chatcompletions/tool-codec.d.ts +0 -1
- package/build/compatible-engine/validation.d.ts +14 -7
- package/build/compatible-engine/validation.js +14 -5
- package/build/compatible-engine/validation.js.map +1 -1
- package/build/compatible-engine.d/aliyun.d.ts +0 -3
- package/build/compatible-engine.d/aliyun.js +0 -8
- package/build/compatible-engine.d/aliyun.js.map +1 -1
- package/build/compatible-engine.d/anthropic/choice-codec.d.ts +1 -1
- package/build/compatible-engine.d/anthropic/choice-codec.js +7 -6
- package/build/compatible-engine.d/anthropic/choice-codec.js.map +1 -1
- package/build/compatible-engine.d/anthropic/transport.d.ts +0 -3
- package/build/compatible-engine.d/anthropic/transport.js +14 -11
- package/build/compatible-engine.d/anthropic/transport.js.map +1 -1
- package/build/compatible-engine.d/anthropic.d.ts +0 -3
- package/build/compatible-engine.d/anthropic.js +0 -7
- package/build/compatible-engine.d/anthropic.js.map +1 -1
- package/build/compatible-engine.d/google/transport.d.ts +0 -2
- package/build/compatible-engine.d/google/transport.js +13 -14
- package/build/compatible-engine.d/google/transport.js.map +1 -1
- package/build/compatible-engine.d/google.d.ts +0 -3
- package/build/compatible-engine.d/google.js +1 -8
- package/build/compatible-engine.d/google.js.map +1 -1
- package/build/compatible-engine.d/openai-chatcompletions/transport.d/monolith.d.ts +3 -10
- package/build/compatible-engine.d/openai-chatcompletions/transport.d/monolith.js +8 -9
- package/build/compatible-engine.d/openai-chatcompletions/transport.d/monolith.js.map +1 -1
- package/build/compatible-engine.d/openai-chatcompletions/transport.d/stream.d.ts +0 -3
- package/build/compatible-engine.d/openai-chatcompletions/transport.d/stream.js +11 -9
- package/build/compatible-engine.d/openai-chatcompletions/transport.d/stream.js.map +1 -1
- package/build/compatible-engine.d/openai-responses/transport.d.ts +0 -3
- package/build/compatible-engine.d/openai-responses/transport.js +4 -5
- package/build/compatible-engine.d/openai-responses/transport.js.map +1 -1
- package/build/compatible-engine.d/openai-responses.d.ts +0 -3
- package/build/compatible-engine.d/openai-responses.js +0 -7
- package/build/compatible-engine.d/openai-responses.js.map +1 -1
- package/build/compatible-engine.d.ts +4 -1
- package/build/compatible-engine.js +6 -1
- package/build/compatible-engine.js.map +1 -1
- package/build/config.d.ts +0 -1
- package/build/endpoint-spec.d.ts +0 -1
- package/build/endpoint-spec.js +0 -1
- package/build/endpoint-spec.js.map +1 -1
- package/build/engine/validation.d.ts +10 -5
- package/build/engine.d.ts +8 -7
- package/build/engine.js +33 -21
- package/build/engine.js.map +1 -1
- package/build/native-engines.d/google/transport.d.ts +0 -2
- package/build/native-engines.d/google/transport.js +16 -18
- package/build/native-engines.d/google/transport.js.map +1 -1
- package/build/native-engines.d/google/validation.d.ts +16 -10
- package/build/native-engines.d/google/validation.js +19 -15
- package/build/native-engines.d/google/validation.js.map +1 -1
- package/build/native-engines.d/google.d.ts +4 -3
- package/build/native-engines.d/google.js +7 -8
- package/build/native-engines.d/google.js.map +1 -1
- package/build/native-engines.d/openai-responses/transport.d.ts +0 -3
- package/build/native-engines.d/openai-responses/transport.js +4 -5
- package/build/native-engines.d/openai-responses/transport.js.map +1 -1
- package/build/native-engines.d/openai-responses/validation.d.ts +15 -7
- package/build/native-engines.d/openai-responses/validation.js +12 -5
- package/build/native-engines.d/openai-responses/validation.js.map +1 -1
- package/build/native-engines.d/openai-responses.d.ts +4 -3
- package/build/native-engines.d/openai-responses.js +6 -7
- package/build/native-engines.d/openai-responses.js.map +1 -1
- package/build/repetition.d.ts +1 -0
- package/build/repetition.js +90 -0
- package/build/repetition.js.map +1 -0
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
package/build/engine.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"engine.js","sourceRoot":"","sources":["../src/engine.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ import { Throttle } from '../../throttle.ts';
|
|
|
6
6
|
import type { MessageCodec } from './message-codec.ts';
|
|
7
7
|
import type { ToolCodec } from '../../api-types/google/tool-codec.ts';
|
|
8
8
|
import type { Billing } from '../../api-types/google/billing.ts';
|
|
9
|
-
import type { Validator } from './validation.ts';
|
|
10
9
|
import type { Verbatim } from '../../verbatim.ts';
|
|
11
10
|
import type { Structuring } from '../../compatible-engine/structuring.ts';
|
|
12
11
|
import type { Engine } from '../../engine.ts';
|
|
@@ -29,6 +28,5 @@ export declare namespace GoogleNativeTransport {
|
|
|
29
28
|
messageCodec: MessageCodec<fdm, vdm>;
|
|
30
29
|
toolCodec: ToolCodec<fdm>;
|
|
31
30
|
billing: Billing;
|
|
32
|
-
validator: Validator.From<fdm, vdm>;
|
|
33
31
|
}
|
|
34
32
|
}
|
|
@@ -15,29 +15,27 @@ export class GoogleNativeTransport {
|
|
|
15
15
|
const systemInstruction = session.developerMessage && this.ctx.messageCodec.encodeDeveloperMessage(session.developerMessage);
|
|
16
16
|
const contents = this.ctx.messageCodec.encodeChatMessages(session.chatMessages);
|
|
17
17
|
await this.ctx.throttle.requests(wfctx);
|
|
18
|
-
const
|
|
19
|
-
const
|
|
20
|
-
if (
|
|
21
|
-
|
|
18
|
+
const apifds = this.ctx.toolCodec.encodeFunctionDeclarationMap(this.ctx.fdm);
|
|
19
|
+
const apiTools = [];
|
|
20
|
+
if (apifds.length)
|
|
21
|
+
apiTools.push({ functionDeclarations: apifds });
|
|
22
22
|
if (this.ctx.urlContext)
|
|
23
|
-
|
|
23
|
+
apiTools.push({ urlContext: {} });
|
|
24
24
|
if (this.ctx.googleSearch)
|
|
25
|
-
|
|
25
|
+
apiTools.push({ googleSearch: {} });
|
|
26
26
|
if (this.ctx.codeExecution)
|
|
27
|
-
|
|
27
|
+
apiTools.push({ codeExecution: {} });
|
|
28
|
+
const apiToolConfig = {};
|
|
29
|
+
if (apifds.length)
|
|
30
|
+
apiToolConfig.functionCallingConfig = ChoiceCodec.encode(this.ctx.choice);
|
|
28
31
|
const reqbody = {
|
|
29
32
|
contents,
|
|
30
|
-
tools:
|
|
31
|
-
toolConfig:
|
|
32
|
-
functionCallingConfig: ChoiceCodec.encode(this.ctx.choice),
|
|
33
|
-
} : undefined,
|
|
33
|
+
tools: apiTools.length ? apiTools : undefined,
|
|
34
|
+
toolConfig: apiToolConfig,
|
|
34
35
|
systemInstruction,
|
|
35
|
-
generationConfig: this.ctx.inferenceParams.
|
|
36
|
-
maxOutputTokens: this.ctx.inferenceParams.maxTokens ?? undefined,
|
|
37
|
-
...this.ctx.inferenceParams.additionalOptions,
|
|
38
|
-
} : undefined,
|
|
36
|
+
generationConfig: this.ctx.inferenceParams.additionalOptions,
|
|
39
37
|
};
|
|
40
|
-
loggers.message.
|
|
38
|
+
loggers.message.debug(reqbody);
|
|
41
39
|
const res = await Undici.fetch(this.apiURL, {
|
|
42
40
|
method: 'POST',
|
|
43
41
|
headers: {
|
|
@@ -45,7 +43,7 @@ export class GoogleNativeTransport {
|
|
|
45
43
|
'x-goog-api-key': this.ctx.providerSpec.apiKey,
|
|
46
44
|
},
|
|
47
45
|
body: JSON.stringify(reqbody),
|
|
48
|
-
dispatcher: this.ctx.providerSpec.
|
|
46
|
+
dispatcher: this.ctx.providerSpec.dispatcher,
|
|
49
47
|
signal,
|
|
50
48
|
}).catch(e => {
|
|
51
49
|
if (e instanceof TypeError)
|
|
@@ -53,7 +51,7 @@ export class GoogleNativeTransport {
|
|
|
53
51
|
else
|
|
54
52
|
throw e;
|
|
55
53
|
});
|
|
56
|
-
loggers.message.
|
|
54
|
+
loggers.message.debug(res);
|
|
57
55
|
if (res.ok) { }
|
|
58
56
|
else {
|
|
59
57
|
const contentType = res.headers.get('Content-Type');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/native-engines.d/google/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAA2C,MAAM,iBAAiB,CAAC;AAGzG,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAIjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/native-engines.d/google/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,18 +2,16 @@ import { Structuring } from '../../compatible-engine/structuring.ts';
|
|
|
2
2
|
import { Function } from '../../function.ts';
|
|
3
3
|
import { Verbatim } from '../../verbatim.ts';
|
|
4
4
|
import { RoleMessage } from './session.ts';
|
|
5
|
-
import {
|
|
5
|
+
import { StructuringValidator as CompatibleStructuringValidator, PartsValidator as CompatiblePartsValidator } from '../../compatible-engine/validation.ts';
|
|
6
6
|
import { Engine } from '../../engine.ts';
|
|
7
|
-
export declare class
|
|
8
|
-
protected ctx:
|
|
9
|
-
protected
|
|
10
|
-
constructor(ctx:
|
|
11
|
-
|
|
12
|
-
validateStructuring(fcs: Function.Call.Of<fdu>[], vrs: Verbatim.Request.Of<vdu>[]): void | RoleMessage.User<fdu>;
|
|
13
|
-
validateMessageStructuring(message: RoleMessage.Ai<fdu, vdu>): void | RoleMessage.User<fdu>;
|
|
7
|
+
export declare class StructuringValidator<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> implements Engine.StructuringValidator<RoleMessage.User<fdu>, RoleMessage.Ai<fdu, vdu>> {
|
|
8
|
+
protected ctx: StructuringValidator.Context<fdu, vdu>;
|
|
9
|
+
protected compatibleStructuringValidator: CompatibleStructuringValidator<fdu, vdu>;
|
|
10
|
+
constructor(ctx: StructuringValidator.Context<fdu, vdu>);
|
|
11
|
+
validate(message: RoleMessage.Ai<fdu, vdu>): void | RoleMessage.User<fdu>;
|
|
14
12
|
}
|
|
15
|
-
export declare namespace
|
|
16
|
-
type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> =
|
|
13
|
+
export declare namespace StructuringValidator {
|
|
14
|
+
type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = StructuringValidator<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;
|
|
17
15
|
interface Context<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> {
|
|
18
16
|
choice: Structuring.Choice<fdu, vdu>;
|
|
19
17
|
}
|
|
@@ -21,3 +19,11 @@ export declare namespace Validator {
|
|
|
21
19
|
type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = Context<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;
|
|
22
20
|
}
|
|
23
21
|
}
|
|
22
|
+
export declare class PartsValidator<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> implements Engine.PartsValidator<RoleMessage.User<fdu>, RoleMessage.Ai<fdu, vdu>> {
|
|
23
|
+
protected compatiblePartsValidator: CompatiblePartsValidator<fdu, vdu>;
|
|
24
|
+
constructor();
|
|
25
|
+
validate(message: RoleMessage.Ai<fdu, vdu>): void;
|
|
26
|
+
}
|
|
27
|
+
export declare namespace PartsValidator {
|
|
28
|
+
type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = PartsValidator<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;
|
|
29
|
+
}
|
|
@@ -1,25 +1,29 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RoleMessage } from "./session.js";
|
|
2
|
+
import { StructuringValidator as CompatibleStructuringValidator, PartsValidator as CompatiblePartsValidator, } from "../../compatible-engine/validation.js";
|
|
2
3
|
import { ResponseInvalid } from "../../engine.js";
|
|
3
|
-
export class
|
|
4
|
+
export class StructuringValidator {
|
|
4
5
|
ctx;
|
|
5
|
-
|
|
6
|
+
compatibleStructuringValidator;
|
|
6
7
|
constructor(ctx) {
|
|
7
8
|
this.ctx = ctx;
|
|
8
|
-
this.
|
|
9
|
+
this.compatibleStructuringValidator = new CompatibleStructuringValidator({ choice: this.ctx.choice });
|
|
9
10
|
}
|
|
10
|
-
|
|
11
|
-
const parts = message.getParts();
|
|
12
|
-
if (parts.length) { }
|
|
13
|
-
else
|
|
14
|
-
throw new ResponseInvalid('Empty message.');
|
|
15
|
-
}
|
|
16
|
-
validateStructuring(fcs, vrs) {
|
|
17
|
-
return this.compatibleValidator.validateStructuring(fcs, vrs);
|
|
18
|
-
}
|
|
19
|
-
validateMessageStructuring(message) {
|
|
11
|
+
validate(message) {
|
|
20
12
|
const fcs = message.getFunctionCalls();
|
|
21
13
|
const vrs = message.getVerbatimRequests();
|
|
22
|
-
return this.validateStructuring(fcs, vrs);
|
|
14
|
+
return this.compatibleStructuringValidator.validateStructuring(fcs, vrs);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
export class PartsValidator {
|
|
18
|
+
compatiblePartsValidator;
|
|
19
|
+
constructor() {
|
|
20
|
+
this.compatiblePartsValidator = new CompatiblePartsValidator();
|
|
21
|
+
}
|
|
22
|
+
validate(message) {
|
|
23
|
+
if (message.getParts().length) { }
|
|
24
|
+
else
|
|
25
|
+
throw new ResponseInvalid('Empty message.');
|
|
26
|
+
this.compatiblePartsValidator.validateMessageTextParts(message.getChatParts().filter(part => part instanceof RoleMessage.Part.Text));
|
|
23
27
|
}
|
|
24
28
|
}
|
|
25
29
|
//# sourceMappingURL=validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/native-engines.d/google/validation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/native-engines.d/google/validation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EACH,oBAAoB,IAAI,8BAA8B,EACtD,cAAc,IAAI,wBAAwB,GAC7C,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAU,MAAM,iBAAiB,CAAC;AAI1D,MAAM,OAAO,oBAAoB;IAKA;IADnB,8BAA8B,CAA2C;IACnF,YAA6B,GAA2C;QAA3C,QAAG,GAAH,GAAG,CAAwC;QACpE,IAAI,CAAC,8BAA8B,GAAG,IAAI,8BAA8B,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1G,CAAC;IAEM,QAAQ,CACX,OAAiC;QAEjC,MAAM,GAAG,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC,8BAA8B,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC7E,CAAC;CACJ;AAuBD,MAAM,OAAO,cAAc;IAIb,wBAAwB,CAAqC;IACvE;QACI,IAAI,CAAC,wBAAwB,GAAG,IAAI,wBAAwB,EAAE,CAAC;IACnE,CAAC;IAEM,QAAQ,CACX,OAAiC;QAEjC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,CAAA,CAAC;;YAAM,MAAM,IAAI,eAAe,CAAC,gBAAgB,CAAC,CAAC;QACnF,IAAI,CAAC,wBAAwB,CAAC,wBAAwB,CAClD,OAAO,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,YAAY,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAC/E,CAAC;IACN,CAAC;CACJ"}
|
|
@@ -21,9 +21,9 @@ export declare namespace GoogleNativeEngine {
|
|
|
21
21
|
protected compatibleMessageCodec: CompatibleMessageCodec<fdm, vdm>;
|
|
22
22
|
protected messageCodec: GoogleNativeEngine.MessageCodec<fdm, vdm>;
|
|
23
23
|
protected billing: Billing;
|
|
24
|
-
protected
|
|
24
|
+
protected structuringValidator: GoogleNativeEngine.StructuringValidator.From<fdm, vdm>;
|
|
25
|
+
protected partsValidator: GoogleNativeEngine.PartsValidator.From<fdm, vdm>;
|
|
25
26
|
protected transport: GoogleNativeTransport<fdm, vdm>;
|
|
26
|
-
protected parallelToolCall: boolean;
|
|
27
27
|
constructor(options: GoogleNativeEngine.Options<fdm, vdm>);
|
|
28
28
|
protected infer(wfctx: InferenceContext, session: GoogleNativeEngine.Session.From<fdm, vdm>, signal?: AbortSignal): Promise<GoogleNativeEngine.RoleMessage.Ai.From<fdm, vdm>>;
|
|
29
29
|
appendUserMessage(session: GoogleNativeEngine.Session.From<fdm, vdm>, message: GoogleNativeEngine.RoleMessage.User.From<fdm>): GoogleNativeEngine.Session.From<fdm, vdm>;
|
|
@@ -37,6 +37,7 @@ export declare namespace GoogleNativeEngine {
|
|
|
37
37
|
}
|
|
38
38
|
export import Session = SessionModule.Session;
|
|
39
39
|
export import RoleMessage = SessionModule.RoleMessage;
|
|
40
|
-
export import
|
|
40
|
+
export import StructuringValidator = ValidationModule.StructuringValidator;
|
|
41
|
+
export import PartsValidator = ValidationModule.PartsValidator;
|
|
41
42
|
export import MessageCodec = MessageCodecModule.MessageCodec;
|
|
42
43
|
}
|
|
@@ -18,14 +18,12 @@ export var GoogleNativeEngine;
|
|
|
18
18
|
compatibleMessageCodec;
|
|
19
19
|
messageCodec;
|
|
20
20
|
billing;
|
|
21
|
-
|
|
21
|
+
structuringValidator;
|
|
22
|
+
partsValidator;
|
|
22
23
|
transport;
|
|
23
|
-
parallelToolCall;
|
|
24
24
|
constructor(options) {
|
|
25
25
|
super(options);
|
|
26
|
-
|
|
27
|
-
if (this.parallelToolCall) { }
|
|
28
|
-
else
|
|
26
|
+
if (options.parallelToolCall === false)
|
|
29
27
|
throw new Error('Parallel tool calling is required by Google engine.');
|
|
30
28
|
this.choice = options.structuringChoice ?? Structuring.Choice.AUTO;
|
|
31
29
|
this.codeExecution = options.codeExecution ?? false;
|
|
@@ -45,7 +43,8 @@ export var GoogleNativeEngine;
|
|
|
45
43
|
vdm: this.vdm,
|
|
46
44
|
});
|
|
47
45
|
this.billing = new Billing({ pricing: this.pricing });
|
|
48
|
-
this.
|
|
46
|
+
this.structuringValidator = new GoogleNativeEngine.StructuringValidator({ choice: this.choice });
|
|
47
|
+
this.partsValidator = new GoogleNativeEngine.PartsValidator();
|
|
49
48
|
this.transport = new GoogleNativeTransport({
|
|
50
49
|
inferenceParams: this.inferenceParams,
|
|
51
50
|
providerSpec: this.providerSpec,
|
|
@@ -58,7 +57,6 @@ export var GoogleNativeEngine;
|
|
|
58
57
|
messageCodec: this.messageCodec,
|
|
59
58
|
toolCodec: this.toolCodec,
|
|
60
59
|
billing: this.billing,
|
|
61
|
-
validator: this.validator,
|
|
62
60
|
});
|
|
63
61
|
}
|
|
64
62
|
infer(wfctx, session, signal) {
|
|
@@ -77,7 +75,8 @@ export var GoogleNativeEngine;
|
|
|
77
75
|
}
|
|
78
76
|
GoogleNativeEngine.Instance = Instance;
|
|
79
77
|
GoogleNativeEngine.RoleMessage = SessionModule.RoleMessage;
|
|
80
|
-
GoogleNativeEngine.
|
|
78
|
+
GoogleNativeEngine.StructuringValidator = ValidationModule.StructuringValidator;
|
|
79
|
+
GoogleNativeEngine.PartsValidator = ValidationModule.PartsValidator;
|
|
81
80
|
GoogleNativeEngine.MessageCodec = MessageCodecModule.MessageCodec;
|
|
82
81
|
})(GoogleNativeEngine || (GoogleNativeEngine = {}));
|
|
83
82
|
//# sourceMappingURL=google.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/native-engines.d/google.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,aAAa,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,KAAK,gBAAgB,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,YAAY,IAAI,sBAAsB,EAAE,MAAM,gDAAgD,CAAC;AACxG,OAAO,KAAK,kBAAkB,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAQlE,MAAM,KAAW,kBAAkB,CAyGlC;AAzGD,WAAiB,kBAAkB;IAC/B,MAAa,QAGX,SAAQ,MAAM,CAAC,QAMhB;QACa,MAAM,CAAoC;QAC1C,aAAa,CAAU;QACvB,UAAU,CAAU;QACpB,YAAY,CAAU;QAEtB,SAAS,CAAiB;QAC1B,sBAAsB,CAAmC;QACzD,YAAY,CAA4C;QACxD,OAAO,CAAU;QACR,
|
|
1
|
+
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/native-engines.d/google.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ import { Throttle } from '../../throttle.ts';
|
|
|
7
7
|
import type { MessageCodec } from './message-codec.ts';
|
|
8
8
|
import type { ToolCodec } from '../../api-types/openai-responses/tool-codec.ts';
|
|
9
9
|
import type { Billing } from '../../api-types/openai-responses/billing.ts';
|
|
10
|
-
import type { Validator } from './validation.ts';
|
|
11
10
|
import type { Verbatim } from '../../verbatim.ts';
|
|
12
11
|
import { Structuring } from './structuring.ts';
|
|
13
12
|
export declare class Transport<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> {
|
|
@@ -25,11 +24,9 @@ export declare namespace Transport {
|
|
|
25
24
|
fdm: fdm;
|
|
26
25
|
throttle: Throttle;
|
|
27
26
|
choice: Structuring.Choice.From<fdm, vdm>;
|
|
28
|
-
parallelToolCall: boolean;
|
|
29
27
|
applyPatch: boolean;
|
|
30
28
|
messageCodec: MessageCodec<fdm, vdm>;
|
|
31
29
|
toolCodec: ToolCodec<fdm>;
|
|
32
30
|
billing: Billing;
|
|
33
|
-
validator: Validator.From<fdm, vdm>;
|
|
34
31
|
}
|
|
35
32
|
}
|
|
@@ -22,8 +22,7 @@ export class Transport {
|
|
|
22
22
|
instructions: session.developerMessage && this.ctx.messageCodec.encodeDeveloperMessage(session.developerMessage),
|
|
23
23
|
tools: tools.length ? tools : undefined,
|
|
24
24
|
tool_choice: tools.length ? ChoiceCodec.encode(this.ctx.choice) : undefined,
|
|
25
|
-
parallel_tool_calls: tools.length ? this.ctx.parallelToolCall : undefined,
|
|
26
|
-
max_output_tokens: this.ctx.inferenceParams.maxTokens,
|
|
25
|
+
parallel_tool_calls: tools.length ? this.ctx.inferenceParams.parallelToolCall : undefined,
|
|
27
26
|
...this.ctx.inferenceParams.additionalOptions,
|
|
28
27
|
};
|
|
29
28
|
}
|
|
@@ -44,7 +43,7 @@ export class Transport {
|
|
|
44
43
|
await this.ctx.throttle.requests(wfctx);
|
|
45
44
|
// Prepare request
|
|
46
45
|
const params = this.makeParams(session);
|
|
47
|
-
loggers.message.
|
|
46
|
+
loggers.message.debug(params);
|
|
48
47
|
// Send request
|
|
49
48
|
const res = await Undici.fetch(this.apiURL, {
|
|
50
49
|
method: 'POST',
|
|
@@ -53,7 +52,7 @@ export class Transport {
|
|
|
53
52
|
'Authorization': `Bearer ${this.ctx.providerSpec.apiKey}`,
|
|
54
53
|
},
|
|
55
54
|
body: JSON.stringify(params),
|
|
56
|
-
dispatcher: this.ctx.providerSpec.
|
|
55
|
+
dispatcher: this.ctx.providerSpec.dispatcher,
|
|
57
56
|
signal,
|
|
58
57
|
}).catch(e => {
|
|
59
58
|
if (e instanceof TypeError)
|
|
@@ -77,7 +76,7 @@ export class Transport {
|
|
|
77
76
|
throw new Error(res.statusText, { cause: res });
|
|
78
77
|
}
|
|
79
78
|
const response = await res.json();
|
|
80
|
-
loggers.message.
|
|
79
|
+
loggers.message.debug(response);
|
|
81
80
|
// Validate response
|
|
82
81
|
if (response.status === 'incomplete' && response.incomplete_details?.reason === 'max_output_tokens')
|
|
83
82
|
throw new ResponseInvalid('Token limit exceeded.', { cause: response });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/native-engines.d/openai-responses/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,eAAe,EAA2C,MAAM,iBAAiB,CAAC;AAIzG,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/native-engines.d/openai-responses/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,14 @@ import { Function } from '../../function.ts';
|
|
|
3
3
|
import { Verbatim } from '../../verbatim.ts';
|
|
4
4
|
import { RoleMessage } from './session.ts';
|
|
5
5
|
import type { Engine } from '../../engine.ts';
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
6
|
+
import { PartsValidator as CompatiblePartsValidator } from '../../compatible-engine/validation.ts';
|
|
7
|
+
export declare class StructuringValidator<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> implements Engine.StructuringValidator<RoleMessage.User<fdu>, RoleMessage.Ai<fdu, vdu>> {
|
|
8
|
+
protected ctx: StructuringValidator.Context<fdu, vdu>;
|
|
9
|
+
constructor(ctx: StructuringValidator.Context<fdu, vdu>);
|
|
10
|
+
validate(message: RoleMessage.Ai<fdu, vdu>): RoleMessage.User<fdu> | undefined;
|
|
11
11
|
}
|
|
12
|
-
export declare namespace
|
|
13
|
-
type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> =
|
|
12
|
+
export declare namespace StructuringValidator {
|
|
13
|
+
type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = StructuringValidator<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;
|
|
14
14
|
interface Context<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> {
|
|
15
15
|
choice: Structuring.Choice<fdu, vdu>;
|
|
16
16
|
}
|
|
@@ -18,3 +18,11 @@ export declare namespace Validator {
|
|
|
18
18
|
type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = Context<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
+
export declare class PartsValidator<in out fdu extends Function.Decl.Proto, in out vdu extends Verbatim.Decl.Proto> implements Engine.PartsValidator<RoleMessage.User<fdu>, RoleMessage.Ai<fdu, vdu>> {
|
|
22
|
+
protected compatiblePartsValidator: CompatiblePartsValidator<fdu, vdu>;
|
|
23
|
+
constructor();
|
|
24
|
+
validate(message: RoleMessage.Ai<fdu, vdu>): void;
|
|
25
|
+
}
|
|
26
|
+
export declare namespace PartsValidator {
|
|
27
|
+
type From<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto> = PartsValidator<Function.Decl.From<fdm>, Verbatim.Decl.From<vdm>>;
|
|
28
|
+
}
|
|
@@ -3,12 +3,13 @@ import { Function } from "../../function.js";
|
|
|
3
3
|
import { RoleMessage } from "./session.js";
|
|
4
4
|
import { ResponseInvalid } from "../../engine.js";
|
|
5
5
|
import * as VerbatimCodec from "../../verbatim/codec.js";
|
|
6
|
-
|
|
6
|
+
import { PartsValidator as CompatiblePartsValidator } from "../../compatible-engine/validation.js";
|
|
7
|
+
export class StructuringValidator {
|
|
7
8
|
ctx;
|
|
8
9
|
constructor(ctx) {
|
|
9
10
|
this.ctx = ctx;
|
|
10
11
|
}
|
|
11
|
-
|
|
12
|
+
validate(message) {
|
|
12
13
|
const tcs = message.getToolCalls();
|
|
13
14
|
const vrs = message.getVerbatimRequests();
|
|
14
15
|
if (this.ctx.choice === Structuring.Choice.TCall.REQUIRED) {
|
|
@@ -85,11 +86,17 @@ export class Validator {
|
|
|
85
86
|
]);
|
|
86
87
|
}
|
|
87
88
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
}
|
|
90
|
+
export class PartsValidator {
|
|
91
|
+
compatiblePartsValidator;
|
|
92
|
+
constructor() {
|
|
93
|
+
this.compatiblePartsValidator = new CompatiblePartsValidator();
|
|
94
|
+
}
|
|
95
|
+
validate(message) {
|
|
96
|
+
if (message.getParts().length) { }
|
|
91
97
|
else
|
|
92
98
|
throw new ResponseInvalid('Empty message.');
|
|
99
|
+
this.compatiblePartsValidator.validateMessageTextParts(message.getTextParts());
|
|
93
100
|
}
|
|
94
101
|
}
|
|
95
102
|
//# sourceMappingURL=validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/native-engines.d/openai-responses/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,KAAK,aAAa,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/native-engines.d/openai-responses/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,9 +21,9 @@ export declare namespace OpenAIResponsesNativeEngine {
|
|
|
21
21
|
protected compatibleMessageCodec: CompatibleMessageCodec<fdm, vdm>;
|
|
22
22
|
protected messageCodec: OpenAIResponsesNativeEngine.MessageCodec<fdm, vdm>;
|
|
23
23
|
protected billing: Billing;
|
|
24
|
-
protected
|
|
24
|
+
protected structuringValidator: OpenAIResponsesNativeEngine.StructuringValidator.From<fdm, vdm>;
|
|
25
|
+
protected partsValidator: OpenAIResponsesNativeEngine.PartsValidator.From<fdm, vdm>;
|
|
25
26
|
protected transport: OpenAIResponsesNativeEngine.Transport<fdm, vdm>;
|
|
26
|
-
protected parallelToolCall: boolean;
|
|
27
27
|
constructor(options: OpenAIResponsesNativeEngine.Options<fdm, vdm>);
|
|
28
28
|
protected infer(wfctx: InferenceContext, session: OpenAIResponsesNativeEngine.Session.From<fdm, vdm>, signal?: AbortSignal): Promise<OpenAIResponsesNativeEngine.RoleMessage.Ai.From<fdm, vdm>>;
|
|
29
29
|
appendUserMessage(session: OpenAIResponsesNativeEngine.Session.From<fdm, vdm>, message: OpenAIResponsesNativeEngine.RoleMessage.User.From<fdm>): OpenAIResponsesNativeEngine.Session.From<fdm, vdm>;
|
|
@@ -40,5 +40,6 @@ export declare namespace OpenAIResponsesNativeEngine {
|
|
|
40
40
|
export import MessageCodec = MessageCodecModule.MessageCodec;
|
|
41
41
|
export import Structuring = StructuringModule.Structuring;
|
|
42
42
|
export import Transport = TransportModule.Transport;
|
|
43
|
-
export import
|
|
43
|
+
export import StructuringValidator = ValidationModule.StructuringValidator;
|
|
44
|
+
export import PartsValidator = ValidationModule.PartsValidator;
|
|
44
45
|
}
|
|
@@ -18,12 +18,11 @@ export var OpenAIResponsesNativeEngine;
|
|
|
18
18
|
compatibleMessageCodec;
|
|
19
19
|
messageCodec;
|
|
20
20
|
billing;
|
|
21
|
-
|
|
21
|
+
structuringValidator;
|
|
22
|
+
partsValidator;
|
|
22
23
|
transport;
|
|
23
|
-
parallelToolCall;
|
|
24
24
|
constructor(options) {
|
|
25
25
|
super(options);
|
|
26
|
-
this.parallelToolCall = options.parallelToolCall ?? false;
|
|
27
26
|
this.applyPatch = options.applyPatch ?? false;
|
|
28
27
|
this.choice = options.structuringChoice ?? OpenAIResponsesNativeEngine.Structuring.Choice.AUTO;
|
|
29
28
|
this.toolCodec = new ToolCodec({ fdm: this.fdm });
|
|
@@ -37,19 +36,18 @@ export var OpenAIResponsesNativeEngine;
|
|
|
37
36
|
vdm: this.vdm,
|
|
38
37
|
});
|
|
39
38
|
this.billing = new Billing({ pricing: this.pricing });
|
|
40
|
-
this.
|
|
39
|
+
this.structuringValidator = new OpenAIResponsesNativeEngine.StructuringValidator({ choice: this.choice });
|
|
40
|
+
this.partsValidator = new OpenAIResponsesNativeEngine.PartsValidator();
|
|
41
41
|
this.transport = new OpenAIResponsesNativeEngine.Transport({
|
|
42
42
|
inferenceParams: this.inferenceParams,
|
|
43
43
|
providerSpec: this.providerSpec,
|
|
44
44
|
fdm: this.fdm,
|
|
45
45
|
throttle: this.throttle,
|
|
46
46
|
choice: this.choice,
|
|
47
|
-
parallelToolCall: this.parallelToolCall,
|
|
48
47
|
applyPatch: this.applyPatch,
|
|
49
48
|
messageCodec: this.messageCodec,
|
|
50
49
|
toolCodec: this.toolCodec,
|
|
51
50
|
billing: this.billing,
|
|
52
|
-
validator: this.validator,
|
|
53
51
|
});
|
|
54
52
|
}
|
|
55
53
|
infer(wfctx, session, signal) {
|
|
@@ -73,6 +71,7 @@ export var OpenAIResponsesNativeEngine;
|
|
|
73
71
|
OpenAIResponsesNativeEngine.MessageCodec = MessageCodecModule.MessageCodec;
|
|
74
72
|
OpenAIResponsesNativeEngine.Structuring = StructuringModule.Structuring;
|
|
75
73
|
OpenAIResponsesNativeEngine.Transport = TransportModule.Transport;
|
|
76
|
-
OpenAIResponsesNativeEngine.
|
|
74
|
+
OpenAIResponsesNativeEngine.StructuringValidator = ValidationModule.StructuringValidator;
|
|
75
|
+
OpenAIResponsesNativeEngine.PartsValidator = ValidationModule.PartsValidator;
|
|
77
76
|
})(OpenAIResponsesNativeEngine || (OpenAIResponsesNativeEngine = {}));
|
|
78
77
|
//# sourceMappingURL=openai-responses.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-responses.js","sourceRoot":"","sources":["../../src/native-engines.d/openai-responses.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,aAAa,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,0CAA0C,CAAC;AACnE,OAAO,EAAE,YAAY,IAAI,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAClH,OAAO,KAAK,gBAAgB,MAAM,kCAAkC,CAAC;AAErE,OAAO,KAAK,iBAAiB,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,UAAU,MAAM,4BAA4B,CAAC;AACzD,OAAO,KAAK,iBAAiB,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,kBAAkB,MAAM,qCAAqC,CAAC;AAC1E,OAAO,KAAK,eAAe,MAAM,iCAAiC,CAAC;AAQnE,MAAM,KAAW,2BAA2B,
|
|
1
|
+
{"version":3,"file":"openai-responses.js","sourceRoot":"","sources":["../../src/native-engines.d/openai-responses.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function isRepeating(str: string, len: number, count: number): boolean;
|