@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
|
@@ -16,7 +16,7 @@ export class MonolithTransport extends Transport {
|
|
|
16
16
|
makeParams(session) {
|
|
17
17
|
const tools = this.ctx.toolCodec.encodeFunctionDeclarationMap(this.ctx.fdm);
|
|
18
18
|
return {
|
|
19
|
-
model: this.ctx.model,
|
|
19
|
+
model: this.ctx.inferenceParams.model,
|
|
20
20
|
stream: false,
|
|
21
21
|
messages: [
|
|
22
22
|
...(session.developerMessage ? this.ctx.messageCodec.encodeRoleMessage(session.developerMessage) : []),
|
|
@@ -24,25 +24,24 @@ export class MonolithTransport extends Transport {
|
|
|
24
24
|
],
|
|
25
25
|
tools: tools.length ? tools : undefined,
|
|
26
26
|
tool_choice: tools.length ? ChoiceCodec.encode(this.ctx.choice) : undefined,
|
|
27
|
-
parallel_tool_calls: tools.length ? this.ctx.parallelToolCall : undefined,
|
|
28
|
-
|
|
29
|
-
...this.ctx.additionalOptions,
|
|
27
|
+
parallel_tool_calls: tools.length ? this.ctx.inferenceParams.parallelToolCall : undefined,
|
|
28
|
+
...this.ctx.inferenceParams.additionalOptions,
|
|
30
29
|
};
|
|
31
30
|
}
|
|
32
31
|
async fetch(wfctx, session, signal) {
|
|
33
32
|
await this.ctx.throttle.requests(wfctx);
|
|
34
33
|
// Prepare request
|
|
35
34
|
const params = this.makeParams(session);
|
|
36
|
-
loggers.message.
|
|
35
|
+
loggers.message.debug(params);
|
|
37
36
|
// Send request
|
|
38
|
-
const res = await Undici.fetch(this.ctx.
|
|
37
|
+
const res = await Undici.fetch(new URL(`${this.ctx.providerSpec.baseUrl}/chat/completions`), {
|
|
39
38
|
method: 'POST',
|
|
40
39
|
headers: {
|
|
41
40
|
'Content-Type': 'application/json',
|
|
42
|
-
'Authorization': `Bearer ${this.ctx.apiKey}`,
|
|
41
|
+
'Authorization': `Bearer ${this.ctx.providerSpec.apiKey}`,
|
|
43
42
|
},
|
|
44
43
|
body: JSON.stringify(params),
|
|
45
|
-
dispatcher: this.ctx.
|
|
44
|
+
dispatcher: this.ctx.providerSpec.dispatcher,
|
|
46
45
|
signal,
|
|
47
46
|
}).catch(e => {
|
|
48
47
|
if (e instanceof TypeError)
|
|
@@ -66,7 +65,7 @@ export class MonolithTransport extends Transport {
|
|
|
66
65
|
throw new Error(res.statusText, { cause: res });
|
|
67
66
|
}
|
|
68
67
|
const completion = await res.json();
|
|
69
|
-
loggers.message.
|
|
68
|
+
loggers.message.debug(completion);
|
|
70
69
|
// Validate response
|
|
71
70
|
const choice = completion.choices[0];
|
|
72
71
|
if (choice) { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monolith.js","sourceRoot":"","sources":["../../../../src/compatible-engine.d/openai-chatcompletions/transport.d/monolith.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"monolith.js","sourceRoot":"","sources":["../../../../src/compatible-engine.d/openai-chatcompletions/transport.d/monolith.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ import type { OpenAIChatCompletionsToolCodec } from '../../../api-types/openai-c
|
|
|
9
9
|
import { Throttle } from '../../../throttle.ts';
|
|
10
10
|
import { type MessageCodec } from '../message-codec.ts';
|
|
11
11
|
import type { Verbatim } from '../../../verbatim.ts';
|
|
12
|
-
import { Validator } from '../../../compatible-engine/validation.ts';
|
|
13
12
|
import type { Structuring } from '../../../compatible-engine/structuring.ts';
|
|
14
13
|
export declare abstract class StreamTransport<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> extends Transport<fdm, vdm> {
|
|
15
14
|
protected ctx: StreamTransport.Context<fdm, vdm>;
|
|
@@ -28,10 +27,8 @@ export declare namespace StreamTransport {
|
|
|
28
27
|
fdm: fdm;
|
|
29
28
|
throttle: Throttle;
|
|
30
29
|
choice: Structuring.Choice.From<fdm, vdm>;
|
|
31
|
-
parallelToolCall: boolean;
|
|
32
30
|
messageCodec: MessageCodec<fdm, vdm>;
|
|
33
31
|
toolCodec: OpenAIChatCompletionsToolCodec<fdm>;
|
|
34
32
|
billing: OpenAIChatCompletionsBilling;
|
|
35
|
-
validator: Validator.From<fdm, vdm>;
|
|
36
33
|
}
|
|
37
34
|
}
|
|
@@ -12,9 +12,7 @@ export class StreamTransport extends Transport {
|
|
|
12
12
|
this.client = new OpenAI({
|
|
13
13
|
baseURL: this.ctx.providerSpec.baseUrl,
|
|
14
14
|
apiKey: this.ctx.providerSpec.apiKey,
|
|
15
|
-
fetchOptions: {
|
|
16
|
-
dispatcher: this.ctx.providerSpec.proxyAgent,
|
|
17
|
-
},
|
|
15
|
+
fetchOptions: { dispatcher: this.ctx.providerSpec.dispatcher },
|
|
18
16
|
});
|
|
19
17
|
}
|
|
20
18
|
makeParams(session) {
|
|
@@ -27,12 +25,11 @@ export class StreamTransport extends Transport {
|
|
|
27
25
|
],
|
|
28
26
|
tools: tools.length ? tools : undefined,
|
|
29
27
|
tool_choice: tools.length ? ChoiceCodec.encode(this.ctx.choice) : undefined,
|
|
30
|
-
parallel_tool_calls: tools.length ? this.ctx.parallelToolCall : undefined,
|
|
28
|
+
parallel_tool_calls: tools.length ? this.ctx.inferenceParams.parallelToolCall : undefined,
|
|
31
29
|
stream: true,
|
|
32
30
|
stream_options: {
|
|
33
|
-
include_usage: true
|
|
31
|
+
include_usage: true,
|
|
34
32
|
},
|
|
35
|
-
max_completion_tokens: this.ctx.inferenceParams.maxTokens ?? undefined,
|
|
36
33
|
...this.ctx.inferenceParams.additionalOptions,
|
|
37
34
|
};
|
|
38
35
|
}
|
|
@@ -78,9 +75,14 @@ export class StreamTransport extends Transport {
|
|
|
78
75
|
await this.ctx.throttle.requests(wfctx);
|
|
79
76
|
// Prepare request
|
|
80
77
|
const params = this.makeParams(session);
|
|
81
|
-
loggers.message.
|
|
78
|
+
loggers.message.debug(params);
|
|
82
79
|
// Send request
|
|
83
|
-
const stream = await this.client.chat.completions.create(params, {
|
|
80
|
+
const stream = await this.client.chat.completions.create(params, {
|
|
81
|
+
signal,
|
|
82
|
+
fetchOptions: {
|
|
83
|
+
dispatcher: this.ctx.providerSpec.dispatcher,
|
|
84
|
+
}
|
|
85
|
+
});
|
|
84
86
|
// Get response
|
|
85
87
|
let stock = null;
|
|
86
88
|
let thoughts = null;
|
|
@@ -163,7 +165,7 @@ export class StreamTransport extends Transport {
|
|
|
163
165
|
else
|
|
164
166
|
throw new ResponseInvalid('Content missing', { cause: completion });
|
|
165
167
|
if (thoughts)
|
|
166
|
-
loggers.inference.
|
|
168
|
+
loggers.inference.debug(thoughts);
|
|
167
169
|
if (choice.message.content)
|
|
168
170
|
loggers.inference.info(choice.message.content);
|
|
169
171
|
this.handleFinishReason(completion, choice.finish_reason);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../../src/compatible-engine.d/openai-chatcompletions/transport.d/stream.ts"],"names":[],"mappings":"AAEA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,eAAe,EAA2C,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC5G,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../../src/compatible-engine.d/openai-chatcompletions/transport.d/stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ 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
10
|
import type { Verbatim } from '../../verbatim.ts';
|
|
11
|
-
import { Validator } from '../../compatible-engine/validation.ts';
|
|
12
11
|
import type { Structuring } from '../../compatible-engine/structuring.ts';
|
|
13
12
|
import type { Engine } from '../../engine.ts';
|
|
14
13
|
export declare class Transport<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> implements Engine.Transport<RoleMessage.User.From<fdm>, RoleMessage.Ai.From<fdm, vdm>, RoleMessage.Developer, Session.From<fdm, vdm>> {
|
|
@@ -26,10 +25,8 @@ export declare namespace Transport {
|
|
|
26
25
|
fdm: fdm;
|
|
27
26
|
throttle: Throttle;
|
|
28
27
|
choice: Structuring.Choice.From<fdm, vdm>;
|
|
29
|
-
parallelToolCall: 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
|
}
|
|
@@ -20,8 +20,7 @@ export class Transport {
|
|
|
20
20
|
instructions: session.developerMessage && this.ctx.messageCodec.encodeDeveloperMessage(session.developerMessage),
|
|
21
21
|
tools: tools.length ? tools : undefined,
|
|
22
22
|
tool_choice: tools.length ? ChoiceCodec.encode(this.ctx.choice) : undefined,
|
|
23
|
-
parallel_tool_calls: tools.length ? this.ctx.parallelToolCall : undefined,
|
|
24
|
-
max_output_tokens: this.ctx.inferenceSpec.maxTokens,
|
|
23
|
+
parallel_tool_calls: tools.length ? this.ctx.inferenceSpec.parallelToolCall : undefined,
|
|
25
24
|
...this.ctx.inferenceSpec.additionalOptions,
|
|
26
25
|
};
|
|
27
26
|
}
|
|
@@ -40,7 +39,7 @@ export class Transport {
|
|
|
40
39
|
await this.ctx.throttle.requests(wfctx);
|
|
41
40
|
// Prepare request
|
|
42
41
|
const params = this.makeParams(session);
|
|
43
|
-
loggers.message.
|
|
42
|
+
loggers.message.debug(params);
|
|
44
43
|
// Send request
|
|
45
44
|
const res = await Undici.fetch(this.apiURL, {
|
|
46
45
|
method: 'POST',
|
|
@@ -49,7 +48,7 @@ export class Transport {
|
|
|
49
48
|
'Authorization': `Bearer ${this.ctx.providerSpec.apiKey}`,
|
|
50
49
|
},
|
|
51
50
|
body: JSON.stringify(params),
|
|
52
|
-
dispatcher: this.ctx.providerSpec.
|
|
51
|
+
dispatcher: this.ctx.providerSpec.dispatcher,
|
|
53
52
|
signal,
|
|
54
53
|
}).catch(e => {
|
|
55
54
|
if (e instanceof TypeError)
|
|
@@ -73,7 +72,7 @@ export class Transport {
|
|
|
73
72
|
throw new Error(res.statusText, { cause: res });
|
|
74
73
|
}
|
|
75
74
|
const response = await res.json();
|
|
76
|
-
loggers.message.
|
|
75
|
+
loggers.message.debug(response);
|
|
77
76
|
// Validate response
|
|
78
77
|
if (response.status === 'incomplete' && response.incomplete_details?.reason === 'max_output_tokens')
|
|
79
78
|
throw new ResponseInvalid('Token limit exceeded.', { cause: response });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/compatible-engine.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/compatible-engine.d/openai-responses/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@ import { CompatibleEngine } from '../compatible-engine.ts';
|
|
|
2
2
|
import { Function } from '../function.ts';
|
|
3
3
|
import { ToolCodec } from '../api-types/openai-responses/tool-codec.ts';
|
|
4
4
|
import { Billing } from '../api-types/openai-responses/billing.ts';
|
|
5
|
-
import { Validator } from '../compatible-engine/validation.ts';
|
|
6
5
|
import * as MessageCodecModule from './openai-responses/message-codec.ts';
|
|
7
6
|
import * as TransportModule from './openai-responses/transport.ts';
|
|
8
7
|
import type { Verbatim } from '../verbatim.ts';
|
|
@@ -13,9 +12,7 @@ export declare namespace OpenAIResponsesCompatibleEngine {
|
|
|
13
12
|
protected toolCodec: ToolCodec<fdm>;
|
|
14
13
|
protected messageCodec: OpenAIResponsesCompatibleEngine.MessageCodec<fdm, vdm>;
|
|
15
14
|
protected billing: Billing;
|
|
16
|
-
protected validator: Validator.From<fdm, vdm>;
|
|
17
15
|
protected transport: OpenAIResponsesCompatibleEngine.Transport<fdm, vdm>;
|
|
18
|
-
protected parallelToolCall: boolean;
|
|
19
16
|
constructor(options: OpenAIResponsesCompatibleEngine.Options<fdm, vdm>);
|
|
20
17
|
}
|
|
21
18
|
interface Options<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> extends CompatibleEngine.Options<fdm, vdm> {
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { CompatibleEngine } from "../compatible-engine.js";
|
|
2
2
|
import { ToolCodec } from "../api-types/openai-responses/tool-codec.js";
|
|
3
3
|
import { Billing } from "../api-types/openai-responses/billing.js";
|
|
4
|
-
import { Validator } from "../compatible-engine/validation.js";
|
|
5
4
|
import * as MessageCodecModule from "./openai-responses/message-codec.js";
|
|
6
5
|
import * as TransportModule from "./openai-responses/transport.js";
|
|
7
6
|
import * as ChoiceCodecModule from "./openai-responses/choice-codec.js";
|
|
@@ -11,30 +10,24 @@ export var OpenAIResponsesCompatibleEngine;
|
|
|
11
10
|
toolCodec;
|
|
12
11
|
messageCodec;
|
|
13
12
|
billing;
|
|
14
|
-
validator;
|
|
15
13
|
transport;
|
|
16
|
-
parallelToolCall;
|
|
17
14
|
constructor(options) {
|
|
18
15
|
super(options);
|
|
19
|
-
this.parallelToolCall = options.parallelToolCall ?? false;
|
|
20
16
|
this.toolCodec = new ToolCodec({ fdm: this.fdm });
|
|
21
17
|
this.messageCodec = new OpenAIResponsesCompatibleEngine.MessageCodec({
|
|
22
18
|
toolCodec: this.toolCodec,
|
|
23
19
|
vdm: this.vdm,
|
|
24
20
|
});
|
|
25
21
|
this.billing = new Billing({ pricing: this.pricing });
|
|
26
|
-
this.validator = new Validator({ choice: this.choice });
|
|
27
22
|
this.transport = new OpenAIResponsesCompatibleEngine.Transport({
|
|
28
23
|
inferenceSpec: this.inferenceParams,
|
|
29
24
|
providerSpec: this.providerSpec,
|
|
30
25
|
fdm: this.fdm,
|
|
31
26
|
throttle: this.throttle,
|
|
32
27
|
choice: this.choice,
|
|
33
|
-
parallelToolCall: this.parallelToolCall,
|
|
34
28
|
messageCodec: this.messageCodec,
|
|
35
29
|
toolCodec: this.toolCodec,
|
|
36
30
|
billing: this.billing,
|
|
37
|
-
validator: this.validator,
|
|
38
31
|
});
|
|
39
32
|
}
|
|
40
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-responses.js","sourceRoot":"","sources":["../../src/compatible-engine.d/openai-responses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,0CAA0C,CAAC;AACnE,OAAO,
|
|
1
|
+
{"version":3,"file":"openai-responses.js","sourceRoot":"","sources":["../../src/compatible-engine.d/openai-responses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,0CAA0C,CAAC;AACnE,OAAO,KAAK,kBAAkB,MAAM,qCAAqC,CAAC;AAC1E,OAAO,KAAK,eAAe,MAAM,iCAAiC,CAAC;AAEnE,OAAO,KAAK,iBAAiB,MAAM,oCAAoC,CAAC;AAQxE,MAAM,KAAW,+BAA+B,CAwC/C;AAxCD,WAAiB,+BAA+B;IAC5C,MAAa,QAGX,SAAQ,gBAAgB,CAAC,QAAkB;QAC/B,SAAS,CAAiB;QAC1B,YAAY,CAAyD;QACrE,OAAO,CAAU;QACR,SAAS,CAAsD;QAElF,YAAmB,OAA0D;YACzE,KAAK,CAAC,OAAO,CAAC,CAAC;YACf,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC,YAAY,GAAG,IAAI,+BAA+B,CAAC,YAAY,CAAC;gBACjE,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,GAAG,EAAE,IAAI,CAAC,GAAG;aAChB,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,+BAA+B,CAAC,SAAS,CAAC;gBAC3D,aAAa,EAAE,IAAI,CAAC,eAAe;gBACnC,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO,EAAE,IAAI,CAAC,OAAO;aACxB,CAAC,CAAC;QACP,CAAC;KAEJ;IA7BY,wCAAQ,WA6BpB,CAAA;IAOa,4CAAY,GAAG,kBAAkB,CAAC,YAAY,CAAC;IAC/C,yCAAS,GAAG,eAAe,CAAC,SAAS,CAAC;IACtC,2CAAW,GAAG,iBAAiB,CAAC;AAClD,CAAC,EAxCgB,+BAA+B,KAA/B,+BAA+B,QAwC/C"}
|
|
@@ -8,6 +8,8 @@ export type CompatibleEngine<fdm extends Function.Decl.Map.Proto, vdm extends Ve
|
|
|
8
8
|
export declare namespace CompatibleEngine {
|
|
9
9
|
abstract class Instance<in out fdm extends Function.Decl.Map.Proto, in out vdm extends Verbatim.Decl.Map.Proto> extends Engine.Instance<fdm, vdm, CompatibleEngine.RoleMessage.User.From<fdm>, CompatibleEngine.RoleMessage.Ai.From<fdm, vdm>, CompatibleEngine.RoleMessage.Developer, CompatibleEngine.Session.From<fdm, vdm>> {
|
|
10
10
|
protected choice: CompatibleEngine.Structuring.Choice.From<fdm, vdm>;
|
|
11
|
+
protected structuringValidator: CompatibleEngine.StructuringValidator.From<fdm, vdm>;
|
|
12
|
+
protected partsValidator: CompatibleEngine.PartsValidator.From<fdm, vdm>;
|
|
11
13
|
constructor(options: CompatibleEngine.Options<fdm, vdm>);
|
|
12
14
|
appendUserMessage(session: CompatibleEngine.Session.From<fdm, vdm>, message: CompatibleEngine.RoleMessage.User.From<fdm>): CompatibleEngine.Session.From<fdm, vdm>;
|
|
13
15
|
pushUserMessage(session: CompatibleEngine.Session.From<fdm, vdm>, message: CompatibleEngine.RoleMessage.User.From<fdm>): CompatibleEngine.Session.From<fdm, vdm>;
|
|
@@ -17,6 +19,7 @@ export declare namespace CompatibleEngine {
|
|
|
17
19
|
}
|
|
18
20
|
export import Session = SessionModule.Session;
|
|
19
21
|
export import RoleMessage = SessionModule.RoleMessage;
|
|
20
|
-
export import
|
|
22
|
+
export import StructuringValidator = ValidationModule.StructuringValidator;
|
|
23
|
+
export import PartsValidator = ValidationModule.PartsValidator;
|
|
21
24
|
export import Structuring = StructuringModule.Structuring;
|
|
22
25
|
}
|
|
@@ -6,9 +6,13 @@ export var CompatibleEngine;
|
|
|
6
6
|
(function (CompatibleEngine) {
|
|
7
7
|
class Instance extends Engine.Instance {
|
|
8
8
|
choice;
|
|
9
|
+
structuringValidator;
|
|
10
|
+
partsValidator;
|
|
9
11
|
constructor(options) {
|
|
10
12
|
super(options);
|
|
11
13
|
this.choice = options.structuringChoice ?? CompatibleEngine.Structuring.Choice.AUTO;
|
|
14
|
+
this.structuringValidator = new CompatibleEngine.StructuringValidator({ choice: this.choice });
|
|
15
|
+
this.partsValidator = new CompatibleEngine.PartsValidator();
|
|
12
16
|
}
|
|
13
17
|
appendUserMessage(session, message) {
|
|
14
18
|
return {
|
|
@@ -23,7 +27,8 @@ export var CompatibleEngine;
|
|
|
23
27
|
}
|
|
24
28
|
CompatibleEngine.Instance = Instance;
|
|
25
29
|
CompatibleEngine.RoleMessage = SessionModule.RoleMessage;
|
|
26
|
-
CompatibleEngine.
|
|
30
|
+
CompatibleEngine.StructuringValidator = ValidationModule.StructuringValidator;
|
|
31
|
+
CompatibleEngine.PartsValidator = ValidationModule.PartsValidator;
|
|
27
32
|
CompatibleEngine.Structuring = StructuringModule.Structuring;
|
|
28
33
|
})(CompatibleEngine || (CompatibleEngine = {}));
|
|
29
34
|
//# sourceMappingURL=compatible-engine.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compatible-engine.js","sourceRoot":"","sources":["../src/compatible-engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,KAAK,iBAAiB,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,gBAAgB,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,aAAa,MAAM,gCAAgC,CAAC;AAQhE,MAAM,KAAW,gBAAgB,
|
|
1
|
+
{"version":3,"file":"compatible-engine.js","sourceRoot":"","sources":["../src/compatible-engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,KAAK,iBAAiB,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,gBAAgB,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,aAAa,MAAM,gCAAgC,CAAC;AAQhE,MAAM,KAAW,gBAAgB,CAqDhC;AArDD,WAAiB,gBAAgB;IAC7B,MAAsB,QAGpB,SAAQ,MAAM,CAAC,QAMhB;QACa,MAAM,CAAqD;QAClD,oBAAoB,CAAuD;QAC3E,cAAc,CAAiD;QAElF,YAAmB,OAA2C;YAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;YACf,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,iBAAiB,IAAI,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC;YACpF,IAAI,CAAC,oBAAoB,GAAG,IAAI,gBAAgB,CAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YAC/F,IAAI,CAAC,cAAc,GAAG,IAAI,gBAAgB,CAAC,cAAc,EAAE,CAAC;QAChE,CAAC;QAEe,iBAAiB,CAC7B,OAAgD,EAChD,OAAoD;YAEpD,OAAO;gBACH,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC;aACnD,CAAC;QACN,CAAC;QAEe,eAAe,CAC3B,OAAgD,EAChD,OAAoD;YAEpD,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,OAAO,OAAO,CAAC;QACnB,CAAC;KACJ;IAtCqB,yBAAQ,WAsC7B,CAAA;IAUa,4BAAW,GAAG,aAAa,CAAC,WAAW,CAAC;IACxC,qCAAoB,GAAG,gBAAgB,CAAC,oBAAoB,CAAC;IAC7D,+BAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC;IACjD,4BAAW,GAAG,iBAAiB,CAAC,WAAW,CAAC;AAC9D,CAAC,EArDgB,gBAAgB,KAAhB,gBAAgB,QAqDhC"}
|
package/build/config.d.ts
CHANGED
|
@@ -17,7 +17,6 @@ export declare namespace Config {
|
|
|
17
17
|
additionalOptions: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TAny>>;
|
|
18
18
|
rpm: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
19
19
|
timeout: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
20
|
-
maxTokens: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
21
20
|
}>>;
|
|
22
21
|
}>;
|
|
23
22
|
}>;
|
package/build/endpoint-spec.d.ts
CHANGED
|
@@ -15,6 +15,5 @@ export declare namespace EndpointSpec {
|
|
|
15
15
|
additionalOptions: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TAny>>;
|
|
16
16
|
rpm: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
17
17
|
timeout: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
18
|
-
maxTokens: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
|
|
19
18
|
}>;
|
|
20
19
|
}
|
package/build/endpoint-spec.js
CHANGED
|
@@ -20,7 +20,6 @@ export var EndpointSpec;
|
|
|
20
20
|
additionalOptions: Type.Optional(Type.Record(Type.String(), Type.Any())),
|
|
21
21
|
rpm: Type.Optional(Type.Number({ minimum: 1 })),
|
|
22
22
|
timeout: Type.Optional(Type.Number({ minimum: 0 })),
|
|
23
|
-
maxTokens: Type.Optional(Type.Number({ minimum: 0 })),
|
|
24
23
|
});
|
|
25
24
|
})(EndpointSpec || (EndpointSpec = {}));
|
|
26
25
|
//# sourceMappingURL=endpoint-spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint-spec.js","sourceRoot":"","sources":["../src/endpoint-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAe,MAAM,mBAAmB,CAAC;AAItD,MAAM,KAAW,YAAY,
|
|
1
|
+
{"version":3,"file":"endpoint-spec.js","sourceRoot":"","sources":["../src/endpoint-spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAe,MAAM,mBAAmB,CAAC;AAItD,MAAM,KAAW,YAAY,CAqB5B;AArBD,WAAiB,YAAY;IACZ,mBAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC9B,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE;QACtB,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;QACrB,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;QACpB,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE;QACnB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC;YAChB,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;YACtB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;YACtB,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;SAC5B,CAAC;QACF,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACxC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACzC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACxC,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC/C,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACxE,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;QAC/C,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;KACtD,CAAC,CAAC;AACP,CAAC,EArBgB,YAAY,KAAZ,YAAY,QAqB5B"}
|
|
@@ -1,7 +1,12 @@
|
|
|
1
|
-
export interface
|
|
2
|
-
|
|
3
|
-
validateMessageParts(aiMessage: aim): void;
|
|
1
|
+
export interface StructuringValidator<out userm, in aim> {
|
|
2
|
+
validate(aiMessage: aim): userm | void;
|
|
4
3
|
}
|
|
5
|
-
export declare namespace
|
|
6
|
-
type From<userm, aim> =
|
|
4
|
+
export declare namespace StructuringValidator {
|
|
5
|
+
type From<userm, aim> = StructuringValidator<userm, aim>;
|
|
6
|
+
}
|
|
7
|
+
export interface PartsValidator<out userm, in aim> {
|
|
8
|
+
validate(aiMessage: aim): void;
|
|
9
|
+
}
|
|
10
|
+
export declare namespace PartsValidator {
|
|
11
|
+
type From<userm, aim> = PartsValidator<userm, aim>;
|
|
7
12
|
}
|
package/build/engine.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Function } from './function.ts';
|
|
2
2
|
import { EndpointSpec } from './endpoint-spec.ts';
|
|
3
3
|
import { Throttle } from './throttle.ts';
|
|
4
|
-
import {
|
|
4
|
+
import { Dispatcher } from 'undici';
|
|
5
5
|
import { type InferenceContext } from './inference-context.ts';
|
|
6
6
|
import * as SessionModule from './engine/session.ts';
|
|
7
7
|
import { Verbatim } from "./verbatim.js";
|
|
@@ -15,13 +15,14 @@ export interface Pricing {
|
|
|
15
15
|
export interface ProviderSpec {
|
|
16
16
|
baseUrl: string;
|
|
17
17
|
apiKey: string;
|
|
18
|
-
|
|
18
|
+
dispatcher: Dispatcher;
|
|
19
19
|
}
|
|
20
20
|
export interface InferenceParams {
|
|
21
21
|
model: string;
|
|
22
22
|
additionalOptions?: Record<string, unknown>;
|
|
23
|
-
|
|
23
|
+
parallelToolCall?: boolean;
|
|
24
24
|
timeout?: number;
|
|
25
|
+
retry: number;
|
|
25
26
|
}
|
|
26
27
|
export type Engine<fdm extends Function.Decl.Map.Proto, vdm extends Verbatim.Decl.Map.Proto, userm, aim, devm, session extends Engine.Session<userm, aim, devm>> = Engine.Instance<fdm, vdm, userm, aim, devm, session>;
|
|
27
28
|
export declare namespace Engine {
|
|
@@ -33,9 +34,8 @@ export declare namespace Engine {
|
|
|
33
34
|
fdm: fdm;
|
|
34
35
|
vdm: vdm;
|
|
35
36
|
protected throttle: Throttle;
|
|
36
|
-
protected abstract
|
|
37
|
-
protected
|
|
38
|
-
protected abstract validator: Engine.Validator.From<userm, aim>;
|
|
37
|
+
protected abstract structuringValidator: Engine.StructuringValidator.From<userm, aim>;
|
|
38
|
+
protected abstract partsValidator: Engine.PartsValidator.From<userm, aim>;
|
|
39
39
|
protected abstract transport: Engine.Transport<userm, aim, devm, session>;
|
|
40
40
|
constructor(options: Engine.Options<fdm, vdm>);
|
|
41
41
|
protected infer(wfctx: InferenceContext, session: session, signal?: AbortSignal): Promise<aim>;
|
|
@@ -64,7 +64,8 @@ export declare namespace Engine {
|
|
|
64
64
|
retry?: number;
|
|
65
65
|
}
|
|
66
66
|
export import Session = SessionModule.Session;
|
|
67
|
-
export import
|
|
67
|
+
export import StructuringValidator = ValidationModule.StructuringValidator;
|
|
68
|
+
export import PartsValidator = ValidationModule.PartsValidator;
|
|
68
69
|
export import Transport = TransportModule.Transport;
|
|
69
70
|
}
|
|
70
71
|
export declare class InferenceTimeout extends Error {
|
package/build/engine.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ProxyAgent } from 'undici';
|
|
1
|
+
import { Agent, ProxyAgent } from 'undici';
|
|
2
2
|
import { env } from 'node:process';
|
|
3
3
|
import { loggers } from "./telemetry.js";
|
|
4
4
|
export var Engine;
|
|
@@ -11,35 +11,43 @@ export var Engine;
|
|
|
11
11
|
fdm;
|
|
12
12
|
vdm;
|
|
13
13
|
throttle;
|
|
14
|
-
retry;
|
|
15
14
|
constructor(options) {
|
|
16
15
|
const proxyUrl = options.proxy || env.https_proxy || env.HTTPS_PROXY;
|
|
16
|
+
const dispatcher = proxyUrl
|
|
17
|
+
? new ProxyAgent({
|
|
18
|
+
uri: proxyUrl,
|
|
19
|
+
headersTimeout: 0,
|
|
20
|
+
bodyTimeout: 0,
|
|
21
|
+
})
|
|
22
|
+
: new Agent({
|
|
23
|
+
headersTimeout: 0,
|
|
24
|
+
bodyTimeout: 0,
|
|
25
|
+
});
|
|
17
26
|
this.providerSpec = {
|
|
18
27
|
baseUrl: options.baseUrl,
|
|
19
28
|
apiKey: options.apiKey,
|
|
20
|
-
|
|
29
|
+
dispatcher,
|
|
21
30
|
};
|
|
22
31
|
this.name = options.name;
|
|
23
32
|
this.inferenceParams = {
|
|
24
33
|
model: options.model,
|
|
25
34
|
additionalOptions: options.additionalOptions,
|
|
26
35
|
timeout: options.timeout,
|
|
27
|
-
|
|
36
|
+
parallelToolCall: options.parallelToolCall,
|
|
37
|
+
retry: options.retry ?? 3,
|
|
28
38
|
};
|
|
29
|
-
const inputPrice = options.inputPrice ?? 0;
|
|
30
39
|
this.pricing = {
|
|
31
|
-
inputPrice,
|
|
40
|
+
inputPrice: options.inputPrice ?? 0,
|
|
32
41
|
outputPrice: options.outputPrice ?? 0,
|
|
33
|
-
cachePrice: options.cachePrice ?? inputPrice,
|
|
42
|
+
cachePrice: options.cachePrice ?? options.inputPrice ?? 0,
|
|
34
43
|
};
|
|
35
44
|
this.fdm = options.functionDeclarationMap;
|
|
36
45
|
this.vdm = options.verbatimDeclarationMap;
|
|
37
46
|
this.throttle = options.throttle;
|
|
38
|
-
this.retry = options.retry ?? 3;
|
|
39
47
|
}
|
|
40
48
|
async infer(wfctx, session, signal) {
|
|
41
49
|
const aiMessage = await this.transport.fetch(wfctx, session, signal);
|
|
42
|
-
this.
|
|
50
|
+
this.partsValidator.validate(aiMessage);
|
|
43
51
|
return aiMessage;
|
|
44
52
|
}
|
|
45
53
|
/**
|
|
@@ -51,13 +59,15 @@ export var Engine;
|
|
|
51
59
|
async stateless(wfctx, session, validate = () => Promise.resolve(true)) {
|
|
52
60
|
for (let retry = 0;; retry++) {
|
|
53
61
|
const signalTimeout = this.inferenceParams.timeout ? AbortSignal.timeout(this.inferenceParams.timeout) : undefined;
|
|
54
|
-
const
|
|
55
|
-
|
|
56
|
-
signalTimeout
|
|
57
|
-
|
|
62
|
+
const signals = [];
|
|
63
|
+
if (signalTimeout)
|
|
64
|
+
signals.push(signalTimeout);
|
|
65
|
+
if (wfctx.signal)
|
|
66
|
+
signals.push(wfctx.signal);
|
|
67
|
+
const signal = AbortSignal.any(signals);
|
|
58
68
|
try {
|
|
59
69
|
const response = await this.infer(wfctx, session, signal);
|
|
60
|
-
const rejection = this.
|
|
70
|
+
const rejection = this.structuringValidator.validate(response);
|
|
61
71
|
if (rejection)
|
|
62
72
|
throw new ResponseInvalid.Recoverable();
|
|
63
73
|
if (await validate(response)) { }
|
|
@@ -73,7 +83,7 @@ export var Engine;
|
|
|
73
83
|
else if (e instanceof CustomRetry) { } // 自定义重试
|
|
74
84
|
else
|
|
75
85
|
throw e;
|
|
76
|
-
if (retry < this.retry)
|
|
86
|
+
if (retry < this.inferenceParams.retry)
|
|
77
87
|
loggers.message.warn(e);
|
|
78
88
|
else
|
|
79
89
|
throw e;
|
|
@@ -86,13 +96,15 @@ export var Engine;
|
|
|
86
96
|
async stateful(wfctx, session, validate = () => Promise.resolve(true)) {
|
|
87
97
|
for (let retry = 0;; retry++) {
|
|
88
98
|
const signalTimeout = this.inferenceParams.timeout ? AbortSignal.timeout(this.inferenceParams.timeout) : undefined;
|
|
89
|
-
const
|
|
90
|
-
|
|
91
|
-
signalTimeout
|
|
92
|
-
|
|
99
|
+
const signals = [];
|
|
100
|
+
if (signalTimeout)
|
|
101
|
+
signals.push(signalTimeout);
|
|
102
|
+
if (wfctx.signal)
|
|
103
|
+
signals.push(wfctx.signal);
|
|
104
|
+
const signal = AbortSignal.any(signals);
|
|
93
105
|
try {
|
|
94
106
|
const response = await this.infer(wfctx, session, signal);
|
|
95
|
-
const rejection = this.
|
|
107
|
+
const rejection = this.structuringValidator.validate(response);
|
|
96
108
|
if (rejection) {
|
|
97
109
|
session.chatMessages.push(response, rejection);
|
|
98
110
|
throw new ResponseInvalid.Recoverable();
|
|
@@ -111,7 +123,7 @@ export var Engine;
|
|
|
111
123
|
else if (e instanceof CustomRetry) { } // 自定义重试
|
|
112
124
|
else
|
|
113
125
|
throw e;
|
|
114
|
-
if (retry < this.retry) { }
|
|
126
|
+
if (retry < this.inferenceParams.retry) { }
|
|
115
127
|
else
|
|
116
128
|
throw e;
|
|
117
129
|
loggers.message.warn(e);
|