@zimtsui/brainswitch 0.0.21 → 0.0.23
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/aliyun.js +0 -2
- package/build/api-types/aliyun.js.map +1 -1
- package/build/api-types/anthropic.d.ts +1 -2
- package/build/api-types/anthropic.js +84 -113
- package/build/api-types/anthropic.js.map +1 -1
- package/build/api-types/base.d.ts +16 -3
- package/build/api-types/base.js +45 -3
- package/build/api-types/base.js.map +1 -1
- package/build/api-types/google-base.d.ts +0 -1
- package/build/api-types/google-base.js +4 -13
- package/build/api-types/google-base.js.map +1 -1
- package/build/api-types/google-rest.d.ts +1 -1
- package/build/api-types/google-rest.js +56 -77
- package/build/api-types/google-rest.js.map +1 -1
- package/build/api-types/openai-chatcompletions-base.js +7 -14
- package/build/api-types/openai-chatcompletions-base.js.map +1 -1
- package/build/api-types/openai-chatcompletions-monolith-base.d.ts +1 -1
- package/build/api-types/openai-chatcompletions-monolith-base.js +36 -57
- package/build/api-types/openai-chatcompletions-monolith-base.js.map +1 -1
- package/build/api-types/openai-chatcompletions-stream-base.d.ts +1 -1
- package/build/api-types/openai-chatcompletions-stream-base.js +84 -106
- package/build/api-types/openai-chatcompletions-stream-base.js.map +1 -1
- package/build/api-types/openai-chatcompletions.js.map +1 -1
- package/build/api-types/openai-responses.d.ts +1 -2
- package/build/api-types/openai-responses.js +33 -64
- package/build/api-types/openai-responses.js.map +1 -1
- package/build/api-types/openrouter-monolith.js +0 -1
- package/build/api-types/openrouter-monolith.js.map +1 -1
- package/build/api-types/openrouter-stream.js +0 -1
- package/build/api-types/openrouter-stream.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/build/api-types/minimax.d.ts +0 -34
- package/build/api-types/minimax.js +0 -49
- package/build/api-types/minimax.js.map +0 -1
|
@@ -6,7 +6,7 @@ import assert from 'node:assert';
|
|
|
6
6
|
import { GoogleAiMessage, GoogleEngineBase } from "./google-base.js";
|
|
7
7
|
import { fetch } from 'undici';
|
|
8
8
|
import {} from "../inference-context.js";
|
|
9
|
-
import {
|
|
9
|
+
import { ResponseInvalid } from "./base.js";
|
|
10
10
|
export var GoogleRestfulEngine;
|
|
11
11
|
(function (GoogleRestfulEngine) {
|
|
12
12
|
function create(options) {
|
|
@@ -19,83 +19,62 @@ export var GoogleRestfulEngine;
|
|
|
19
19
|
super(options);
|
|
20
20
|
this.apiURL = new URL(`${this.baseUrl}/v1beta/models/${this.model}:generateContent`);
|
|
21
21
|
}
|
|
22
|
-
async
|
|
23
|
-
const
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
if (
|
|
62
|
-
|
|
63
|
-
assert(response.candidates[0].finishReason === Google.FinishReason.STOP, new TransientError('Abnormal finish reason', { cause: response }));
|
|
64
|
-
for (const part of response.candidates[0].content.parts) {
|
|
65
|
-
if (part.text)
|
|
66
|
-
ctx.logger.inference?.debug(part.text + '\n');
|
|
67
|
-
if (part.functionCall)
|
|
68
|
-
ctx.logger.message?.debug(part.functionCall);
|
|
69
|
-
}
|
|
70
|
-
assert(response.usageMetadata?.promptTokenCount, new Error('Prompt token count absent', { cause: response }));
|
|
71
|
-
ctx.logger.message?.debug(response.usageMetadata);
|
|
72
|
-
const candidatesTokenCount = response.usageMetadata.candidatesTokenCount ?? 0;
|
|
73
|
-
const cacheHitTokenCount = response.usageMetadata.cachedContentTokenCount ?? 0;
|
|
74
|
-
const cacheMissTokenCount = response.usageMetadata.promptTokenCount - cacheHitTokenCount;
|
|
75
|
-
const thinkingTokenCount = response.usageMetadata.thoughtsTokenCount ?? 0;
|
|
76
|
-
const cost = this.inputPrice * cacheMissTokenCount / 1e6 +
|
|
77
|
-
this.cachedPrice * cacheHitTokenCount / 1e6 +
|
|
78
|
-
this.outputPrice * candidatesTokenCount / 1e6 +
|
|
79
|
-
this.outputPrice * thinkingTokenCount / 1e6;
|
|
80
|
-
ctx.logger.cost?.(cost);
|
|
81
|
-
const aiMessage = this.convertToAiMessage(response.candidates[0].content);
|
|
82
|
-
this.validateFunctionCallByToolChoice(aiMessage);
|
|
83
|
-
return aiMessage;
|
|
84
|
-
}
|
|
85
|
-
catch (e) {
|
|
86
|
-
if (ctx.signal?.aborted)
|
|
87
|
-
throw e;
|
|
88
|
-
else if (signalTimeout?.aborted) { } // 推理超时
|
|
89
|
-
else if (e instanceof TransientError) { } // 模型抽风
|
|
90
|
-
else if (e instanceof TypeError) { } // 网络故障
|
|
91
|
-
else
|
|
92
|
-
throw e;
|
|
93
|
-
ctx.logger.message?.warn(e);
|
|
94
|
-
if (retry < 3)
|
|
95
|
-
return this.stateless(ctx, session, retry + 1);
|
|
96
|
-
else
|
|
97
|
-
throw e;
|
|
22
|
+
async fetch(ctx, session, signal) {
|
|
23
|
+
const systemInstruction = session.developerMessage && this.convertFromDeveloperMessage(session.developerMessage);
|
|
24
|
+
const contents = this.convertFromChatMessages(session.chatMessages);
|
|
25
|
+
await this.throttle.requests(ctx);
|
|
26
|
+
const reqbody = {
|
|
27
|
+
contents,
|
|
28
|
+
tools: Object.keys(this.fdm).length ? [{
|
|
29
|
+
functionDeclarations: Object.entries(this.fdm).map(fdentry => this.convertFromFunctionDeclarationEntry(fdentry)),
|
|
30
|
+
}] : undefined,
|
|
31
|
+
toolConfig: Object.keys(this.fdm).length && this.toolChoice ? {
|
|
32
|
+
functionCallingConfig: this.convertFromFunctionCallMode(this.toolChoice),
|
|
33
|
+
} : undefined,
|
|
34
|
+
systemInstruction,
|
|
35
|
+
generationConfig: this.maxTokens || this.additionalOptions ? {
|
|
36
|
+
maxOutputTokens: this.maxTokens ?? undefined,
|
|
37
|
+
...this.additionalOptions,
|
|
38
|
+
} : undefined,
|
|
39
|
+
};
|
|
40
|
+
ctx.logger.message?.trace(reqbody);
|
|
41
|
+
const res = await fetch(this.apiURL, {
|
|
42
|
+
method: 'POST',
|
|
43
|
+
headers: new Headers({
|
|
44
|
+
'Content-Type': 'application/json',
|
|
45
|
+
'x-goog-api-key': this.apiKey,
|
|
46
|
+
}),
|
|
47
|
+
body: JSON.stringify(reqbody),
|
|
48
|
+
dispatcher: this.proxyAgent,
|
|
49
|
+
signal,
|
|
50
|
+
});
|
|
51
|
+
ctx.logger.message?.trace(res);
|
|
52
|
+
assert(res.ok, new Error(undefined, { cause: res }));
|
|
53
|
+
const response = await res.json();
|
|
54
|
+
assert(response.candidates?.[0]?.content?.parts?.length, new ResponseInvalid('Content missing', { cause: response }));
|
|
55
|
+
if (response.candidates[0].finishReason === Google.FinishReason.MAX_TOKENS)
|
|
56
|
+
throw new ResponseInvalid('Token limit exceeded.', { cause: response });
|
|
57
|
+
assert(response.candidates[0].finishReason === Google.FinishReason.STOP, new ResponseInvalid('Abnormal finish reason', { cause: response }));
|
|
58
|
+
for (const part of response.candidates[0].content.parts) {
|
|
59
|
+
if (part.text)
|
|
60
|
+
ctx.logger.inference?.debug(part.text + '\n');
|
|
61
|
+
if (part.functionCall)
|
|
62
|
+
ctx.logger.message?.debug(part.functionCall);
|
|
98
63
|
}
|
|
64
|
+
assert(response.usageMetadata?.promptTokenCount, new Error('Prompt token count absent', { cause: response }));
|
|
65
|
+
ctx.logger.message?.debug(response.usageMetadata);
|
|
66
|
+
const candidatesTokenCount = response.usageMetadata.candidatesTokenCount ?? 0;
|
|
67
|
+
const cacheHitTokenCount = response.usageMetadata.cachedContentTokenCount ?? 0;
|
|
68
|
+
const cacheMissTokenCount = response.usageMetadata.promptTokenCount - cacheHitTokenCount;
|
|
69
|
+
const thinkingTokenCount = response.usageMetadata.thoughtsTokenCount ?? 0;
|
|
70
|
+
const cost = this.inputPrice * cacheMissTokenCount / 1e6 +
|
|
71
|
+
this.cachedPrice * cacheHitTokenCount / 1e6 +
|
|
72
|
+
this.outputPrice * candidatesTokenCount / 1e6 +
|
|
73
|
+
this.outputPrice * thinkingTokenCount / 1e6;
|
|
74
|
+
ctx.logger.cost?.(cost);
|
|
75
|
+
const aiMessage = this.convertToAiMessage(response.candidates[0].content);
|
|
76
|
+
this.validateFunctionCallByToolChoice(aiMessage.getFunctionCalls());
|
|
77
|
+
return aiMessage;
|
|
99
78
|
}
|
|
100
79
|
}
|
|
101
80
|
GoogleRestfulEngine.Constructor = Constructor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google-rest.js","sourceRoot":"","sources":["../../src/api-types/google-rest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAgB,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"google-rest.js","sourceRoot":"","sources":["../../src/api-types/google-rest.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,7 @@ import { RoleMessage } from "../session.js";
|
|
|
3
3
|
import { Function } from "../function.js";
|
|
4
4
|
import OpenAI from 'openai';
|
|
5
5
|
import assert from 'node:assert';
|
|
6
|
-
import { EngineBase,
|
|
7
|
-
import {} from "../inference-context.js";
|
|
6
|
+
import { EngineBase, ResponseInvalid } from "./base.js";
|
|
8
7
|
import { Ajv } from 'ajv';
|
|
9
8
|
const ajv = new Ajv();
|
|
10
9
|
export class OpenAIChatCompletionsEngineBase extends EngineBase {
|
|
@@ -37,16 +36,16 @@ export class OpenAIChatCompletionsEngineBase extends EngineBase {
|
|
|
37
36
|
}
|
|
38
37
|
convertToFunctionCall(apifc) {
|
|
39
38
|
const fditem = this.fdm[apifc.function.name];
|
|
40
|
-
assert(fditem, new
|
|
39
|
+
assert(fditem, new ResponseInvalid('Unknown function call', { cause: apifc }));
|
|
41
40
|
const args = (() => {
|
|
42
41
|
try {
|
|
43
42
|
return JSON.parse(apifc.function.arguments);
|
|
44
43
|
}
|
|
45
44
|
catch (e) {
|
|
46
|
-
return new
|
|
45
|
+
return new ResponseInvalid('Invalid JSON of function call', { cause: apifc });
|
|
47
46
|
}
|
|
48
47
|
})();
|
|
49
|
-
assert(ajv.validate(fditem.paraschema, args), new
|
|
48
|
+
assert(ajv.validate(fditem.paraschema, args), new ResponseInvalid('Function call not conforming to schema', { cause: apifc }));
|
|
50
49
|
return Function.Call.create({
|
|
51
50
|
id: apifc.id,
|
|
52
51
|
name: apifc.function.name,
|
|
@@ -121,13 +120,7 @@ export class OpenAIChatCompletionsEngineBase extends EngineBase {
|
|
|
121
120
|
}
|
|
122
121
|
validateFunctionCallByToolChoice(fcs) {
|
|
123
122
|
// https://community.openai.com/t/function-call-with-finish-reason-of-stop/437226/7
|
|
124
|
-
|
|
125
|
-
assert(fcs.length, new TransientError());
|
|
126
|
-
else if (this.toolChoice instanceof Array)
|
|
127
|
-
for (const fc of fcs)
|
|
128
|
-
assert(this.toolChoice.includes(fc.name), new TransientError());
|
|
129
|
-
else if (this.toolChoice === Function.ToolChoice.NONE)
|
|
130
|
-
assert(!fcs.length, new TransientError());
|
|
123
|
+
return super.validateFunctionCallByToolChoice(fcs);
|
|
131
124
|
}
|
|
132
125
|
calcCost(usage) {
|
|
133
126
|
const cacheHitTokenCount = usage.prompt_tokens_details?.cached_tokens ?? 0;
|
|
@@ -141,8 +134,8 @@ export class OpenAIChatCompletionsEngineBase extends EngineBase {
|
|
|
141
134
|
}
|
|
142
135
|
handleFinishReason(completion, finishReason) {
|
|
143
136
|
if (finishReason === 'length')
|
|
144
|
-
throw new
|
|
145
|
-
assert(['stop', 'tool_calls'].includes(finishReason), new
|
|
137
|
+
throw new ResponseInvalid('Token limit exceeded.', { cause: completion });
|
|
138
|
+
assert(['stop', 'tool_calls'].includes(finishReason), new ResponseInvalid('Abnormal finish reason', { cause: finishReason }));
|
|
146
139
|
}
|
|
147
140
|
}
|
|
148
141
|
//# sourceMappingURL=openai-chatcompletions-base.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-chatcompletions-base.js","sourceRoot":"","sources":["../../src/api-types/openai-chatcompletions-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"openai-chatcompletions-base.js","sourceRoot":"","sources":["../../src/api-types/openai-chatcompletions-base.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,5 +8,5 @@ export declare abstract class OpenAIChatCompletionsMonolithEngineBase<in out fdm
|
|
|
8
8
|
private apiURL;
|
|
9
9
|
constructor(options: Engine.Options<fdm>);
|
|
10
10
|
protected makeParams(session: Session<Function.Declaration.From<fdm>>): OpenAI.ChatCompletionCreateParamsNonStreaming;
|
|
11
|
-
|
|
11
|
+
protected fetch(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>, signal?: AbortSignal): Promise<RoleMessage.Ai<Function.Declaration.From<fdm>>>;
|
|
12
12
|
}
|
|
@@ -2,7 +2,7 @@ import { RoleMessage } from "../session.js";
|
|
|
2
2
|
import { Function } from "../function.js";
|
|
3
3
|
import OpenAI from 'openai';
|
|
4
4
|
import assert from 'node:assert';
|
|
5
|
-
import {
|
|
5
|
+
import { ResponseInvalid } from "./base.js";
|
|
6
6
|
import { OpenAIChatCompletionsEngineBase } from "./openai-chatcompletions-base.js";
|
|
7
7
|
import {} from "../inference-context.js";
|
|
8
8
|
import { fetch } from 'undici';
|
|
@@ -26,65 +26,44 @@ export class OpenAIChatCompletionsMonolithEngineBase extends OpenAIChatCompletio
|
|
|
26
26
|
tools: tools.length ? tools : undefined,
|
|
27
27
|
tool_choice: fdentries.length ? this.convertFromToolChoice(this.toolChoice) : undefined,
|
|
28
28
|
parallel_tool_calls: tools.length ? this.parallel : undefined,
|
|
29
|
-
max_completion_tokens: this.
|
|
29
|
+
max_completion_tokens: this.maxTokens ?? undefined,
|
|
30
30
|
...this.additionalOptions,
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
|
-
async
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
const apifcs = choice.message.tool_calls;
|
|
68
|
-
if (apifcs?.length)
|
|
69
|
-
ctx.logger.message?.debug(apifcs);
|
|
70
|
-
ctx.logger.message?.debug(completion.usage);
|
|
71
|
-
this.validateFunctionCallByToolChoice(aiMessage.getFunctionCalls());
|
|
72
|
-
return aiMessage;
|
|
73
|
-
}
|
|
74
|
-
catch (e) {
|
|
75
|
-
if (ctx.signal?.aborted)
|
|
76
|
-
throw e;
|
|
77
|
-
else if (signalTimeout?.aborted) { } // 推理超时
|
|
78
|
-
else if (e instanceof TransientError) { } // 模型抽风
|
|
79
|
-
else if (e instanceof TypeError) { } // 网络故障
|
|
80
|
-
else
|
|
81
|
-
throw e;
|
|
82
|
-
ctx.logger.message?.warn(e);
|
|
83
|
-
if (retry < 3)
|
|
84
|
-
return await this.stateless(ctx, session, retry + 1);
|
|
85
|
-
else
|
|
86
|
-
throw e;
|
|
87
|
-
}
|
|
33
|
+
async fetch(ctx, session, signal) {
|
|
34
|
+
const params = this.makeParams(session);
|
|
35
|
+
ctx.logger.message?.trace(params);
|
|
36
|
+
await this.throttle.requests(ctx);
|
|
37
|
+
const res = await fetch(this.apiURL, {
|
|
38
|
+
method: 'POST',
|
|
39
|
+
headers: new Headers({
|
|
40
|
+
'Content-Type': 'application/json',
|
|
41
|
+
'Authorization': `Bearer ${this.apiKey}`,
|
|
42
|
+
}),
|
|
43
|
+
body: JSON.stringify(params),
|
|
44
|
+
dispatcher: this.proxyAgent,
|
|
45
|
+
signal,
|
|
46
|
+
});
|
|
47
|
+
assert(res.ok, new Error(undefined, { cause: res }));
|
|
48
|
+
const completion = await res.json();
|
|
49
|
+
ctx.logger.message?.trace(completion);
|
|
50
|
+
const choice = completion.choices[0];
|
|
51
|
+
assert(choice, new ResponseInvalid('Content missing', { cause: completion }));
|
|
52
|
+
this.handleFinishReason(completion, choice.finish_reason);
|
|
53
|
+
assert(completion.usage);
|
|
54
|
+
const cost = this.calcCost(completion.usage);
|
|
55
|
+
ctx.logger.cost?.(cost);
|
|
56
|
+
const aiMessage = this.convertToAiMessage(choice.message);
|
|
57
|
+
// logging
|
|
58
|
+
const text = aiMessage.getText();
|
|
59
|
+
if (text)
|
|
60
|
+
ctx.logger.inference?.debug(text + '\n');
|
|
61
|
+
const apifcs = choice.message.tool_calls;
|
|
62
|
+
if (apifcs?.length)
|
|
63
|
+
ctx.logger.message?.debug(apifcs);
|
|
64
|
+
ctx.logger.message?.debug(completion.usage);
|
|
65
|
+
this.validateFunctionCallByToolChoice(aiMessage.getFunctionCalls());
|
|
66
|
+
return aiMessage;
|
|
88
67
|
}
|
|
89
68
|
}
|
|
90
69
|
//# sourceMappingURL=openai-chatcompletions-monolith-base.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-chatcompletions-monolith-base.js","sourceRoot":"","sources":["../../src/api-types/openai-chatcompletions-monolith-base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"openai-chatcompletions-monolith-base.js","sourceRoot":"","sources":["../../src/api-types/openai-chatcompletions-monolith-base.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,5 +11,5 @@ export declare abstract class OpenAIChatCompletionsStreamEngineBase<in out fdm e
|
|
|
11
11
|
protected convertToFunctionCallFromDelta(apifc: OpenAI.ChatCompletionChunk.Choice.Delta.ToolCall): Function.Call.Distributive<Function.Declaration.From<fdm>>;
|
|
12
12
|
protected abstract getDeltaThoughts(delta: OpenAI.ChatCompletionChunk.Choice.Delta): string | null;
|
|
13
13
|
protected convertCompletionStockToCompletion(stock: OpenAI.ChatCompletionChunk): OpenAI.ChatCompletion;
|
|
14
|
-
|
|
14
|
+
protected fetch(ctx: InferenceContext, session: Session<Function.Declaration.From<fdm>>, signal?: AbortSignal): Promise<RoleMessage.Ai<Function.Declaration.From<fdm>>>;
|
|
15
15
|
}
|