node-llama-cpp 3.5.0 → 3.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/ChatWrapper.d.ts +3 -5
- package/dist/ChatWrapper.js +57 -5
- package/dist/ChatWrapper.js.map +1 -1
- package/dist/bindings/AddonTypes.d.ts +1 -1
- package/dist/bindings/Llama.js +2 -0
- package/dist/bindings/Llama.js.map +1 -1
- package/dist/bindings/utils/compileLLamaCpp.js +2 -0
- package/dist/bindings/utils/compileLLamaCpp.js.map +1 -1
- package/dist/chatWrappers/AlpacaChatWrapper.js.map +1 -1
- package/dist/chatWrappers/DeepSeekChatWrapper.d.ts +37 -0
- package/dist/chatWrappers/DeepSeekChatWrapper.js +294 -0
- package/dist/chatWrappers/DeepSeekChatWrapper.js.map +1 -0
- package/dist/chatWrappers/FalconChatWrapper.js.map +1 -1
- package/dist/chatWrappers/FunctionaryChatWrapper.js +40 -14
- package/dist/chatWrappers/FunctionaryChatWrapper.js.map +1 -1
- package/dist/chatWrappers/GeneralChatWrapper.js.map +1 -1
- package/dist/chatWrappers/Llama2ChatWrapper.js.map +1 -1
- package/dist/chatWrappers/Llama3_1ChatWrapper.d.ts +0 -3
- package/dist/chatWrappers/Llama3_1ChatWrapper.js +24 -13
- package/dist/chatWrappers/Llama3_1ChatWrapper.js.map +1 -1
- package/dist/chatWrappers/Llama3_2LightweightChatWrapper.js +22 -11
- package/dist/chatWrappers/Llama3_2LightweightChatWrapper.js.map +1 -1
- package/dist/chatWrappers/MistralChatWrapper.d.ts +2 -1
- package/dist/chatWrappers/MistralChatWrapper.js +39 -28
- package/dist/chatWrappers/MistralChatWrapper.js.map +1 -1
- package/dist/chatWrappers/QwenChatWrapper.d.ts +21 -0
- package/dist/chatWrappers/QwenChatWrapper.js +162 -0
- package/dist/chatWrappers/QwenChatWrapper.js.map +1 -0
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.d.ts +41 -3
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js +343 -126
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/TemplateChatWrapper.d.ts +17 -1
- package/dist/chatWrappers/generic/TemplateChatWrapper.js +10 -2
- package/dist/chatWrappers/generic/TemplateChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/utils/UniqueIdGenerator.d.ts +7 -0
- package/dist/chatWrappers/generic/utils/UniqueIdGenerator.js +30 -0
- package/dist/chatWrappers/generic/utils/UniqueIdGenerator.js.map +1 -0
- package/dist/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.d.ts +5 -4
- package/dist/chatWrappers/generic/utils/extractFunctionCallSettingsFromJinjaTemplate.d.ts +19 -0
- package/dist/chatWrappers/generic/utils/extractFunctionCallSettingsFromJinjaTemplate.js +446 -0
- package/dist/chatWrappers/generic/utils/extractFunctionCallSettingsFromJinjaTemplate.js.map +1 -0
- package/dist/chatWrappers/generic/utils/extractSegmentSettingsFromTokenizerAndChatTemplate.d.ts +2 -0
- package/dist/chatWrappers/generic/utils/extractSegmentSettingsFromTokenizerAndChatTemplate.js +38 -0
- package/dist/chatWrappers/generic/utils/extractSegmentSettingsFromTokenizerAndChatTemplate.js.map +1 -0
- package/dist/chatWrappers/generic/utils/getFirstValidResult.d.ts +6 -0
- package/dist/chatWrappers/generic/utils/getFirstValidResult.js +19 -0
- package/dist/chatWrappers/generic/utils/getFirstValidResult.js.map +1 -0
- package/dist/chatWrappers/generic/utils/squashChatHistoryItems.d.ts +2 -0
- package/dist/chatWrappers/generic/utils/squashChatHistoryItems.js +35 -0
- package/dist/chatWrappers/generic/utils/squashChatHistoryItems.js.map +1 -0
- package/dist/chatWrappers/generic/utils/templateSegmentOptionsToChatWrapperSettings.d.ts +22 -0
- package/dist/chatWrappers/generic/utils/templateSegmentOptionsToChatWrapperSettings.js +28 -0
- package/dist/chatWrappers/generic/utils/templateSegmentOptionsToChatWrapperSettings.js.map +1 -0
- package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.d.ts +3 -0
- package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.js +25 -0
- package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.js.map +1 -1
- package/dist/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.js +197 -30
- package/dist/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.js.map +1 -1
- package/dist/chatWrappers/utils/resolveChatWrapper.d.ts +48 -3
- package/dist/chatWrappers/utils/resolveChatWrapper.js +15 -5
- package/dist/chatWrappers/utils/resolveChatWrapper.js.map +1 -1
- package/dist/cli/commands/ChatCommand.js +38 -7
- package/dist/cli/commands/ChatCommand.js.map +1 -1
- package/dist/cli/recommendedModels.js +93 -10
- package/dist/cli/recommendedModels.js.map +1 -1
- package/dist/cli/utils/resolveModelRecommendationFileOptions.d.ts +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/evaluator/LlamaChat/LlamaChat.d.ts +87 -5
- package/dist/evaluator/LlamaChat/LlamaChat.js +781 -196
- package/dist/evaluator/LlamaChat/LlamaChat.js.map +1 -1
- package/dist/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js +55 -1
- package/dist/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.d.ts +22 -7
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js +28 -8
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.js +1 -1
- package/dist/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.d.ts +1 -1
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.js.map +1 -1
- package/dist/evaluator/LlamaCompletion.js +61 -48
- package/dist/evaluator/LlamaCompletion.js.map +1 -1
- package/dist/evaluator/LlamaGrammar.d.ts +2 -2
- package/dist/evaluator/LlamaGrammar.js +5 -3
- package/dist/evaluator/LlamaGrammar.js.map +1 -1
- package/dist/evaluator/LlamaModel/LlamaModel.d.ts +3 -1
- package/dist/evaluator/LlamaModel/LlamaModel.js +4 -1
- package/dist/evaluator/LlamaModel/LlamaModel.js.map +1 -1
- package/dist/evaluator/LlamaRankingContext.js +1 -1
- package/dist/evaluator/LlamaRankingContext.js.map +1 -1
- package/dist/gguf/types/GgufMetadataTypes.d.ts +1 -1
- package/dist/gguf/types/GgufMetadataTypes.js.map +1 -1
- package/dist/index.d.ts +8 -5
- package/dist/index.js +4 -2
- package/dist/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types.d.ts +40 -2
- package/dist/types.js +7 -1
- package/dist/types.js.map +1 -1
- package/dist/utils/LlamaText.js +8 -9
- package/dist/utils/LlamaText.js.map +1 -1
- package/dist/utils/OpenAIFormat.d.ts +177 -0
- package/dist/utils/OpenAIFormat.js +488 -0
- package/dist/utils/OpenAIFormat.js.map +1 -0
- package/dist/utils/TokenStreamRegulator.d.ts +2 -0
- package/dist/utils/TokenStreamRegulator.js +12 -0
- package/dist/utils/TokenStreamRegulator.js.map +1 -1
- package/dist/utils/getChatWrapperSegmentDefinition.d.ts +2 -0
- package/dist/utils/getChatWrapperSegmentDefinition.js +7 -0
- package/dist/utils/getChatWrapperSegmentDefinition.js.map +1 -0
- package/dist/utils/optionsMatrix.d.ts +58 -0
- package/dist/utils/optionsMatrix.js +97 -0
- package/dist/utils/optionsMatrix.js.map +1 -0
- package/dist/utils/parseModelUri.js +1 -1
- package/dist/utils/parseModelUri.js.map +1 -1
- package/dist/utils/resolveModelFile.js +2 -0
- package/dist/utils/resolveModelFile.js.map +1 -1
- package/llama/addon/AddonContext.cpp +11 -9
- package/llama/binariesGithubRelease.json +1 -1
- package/llama/gitRelease.bundle +0 -0
- package/llama/grammars/README.md +4 -4
- package/llama/llama.cpp.info.json +2 -2
- package/package.json +48 -45
- package/templates/packed/electron-typescript-react.json +1 -1
- package/templates/packed/node-typescript.json +1 -1
|
@@ -0,0 +1,446 @@
|
|
|
1
|
+
import { splitText } from "lifecycle-utils";
|
|
2
|
+
import { LlamaText, SpecialToken, SpecialTokensText } from "../../../utils/LlamaText.js";
|
|
3
|
+
import { getFirstValidResult } from "./getFirstValidResult.js";
|
|
4
|
+
export function extractFunctionCallSettingsFromJinjaTemplate({ idsGenerator, renderTemplate }) {
|
|
5
|
+
const idToStaticContent = new Map();
|
|
6
|
+
const bosTokenId = idsGenerator.generateId();
|
|
7
|
+
const eosTokenId = idsGenerator.generateId();
|
|
8
|
+
const eotTokenId = idsGenerator.generateId();
|
|
9
|
+
idToStaticContent.set(bosTokenId, new SpecialToken("BOS"));
|
|
10
|
+
idToStaticContent.set(eosTokenId, new SpecialToken("EOS"));
|
|
11
|
+
idToStaticContent.set(eotTokenId, new SpecialToken("EOT"));
|
|
12
|
+
const contentIds = new Set();
|
|
13
|
+
const addContentId = (id) => {
|
|
14
|
+
contentIds.add(id);
|
|
15
|
+
return id;
|
|
16
|
+
};
|
|
17
|
+
const systemMessage = addContentId(idsGenerator.generateId());
|
|
18
|
+
const userMessage1 = addContentId(idsGenerator.generateId());
|
|
19
|
+
const modelMessage1 = addContentId(idsGenerator.generateId());
|
|
20
|
+
const func1name = addContentId(idsGenerator.generateId());
|
|
21
|
+
const func1description = addContentId(idsGenerator.generateId());
|
|
22
|
+
const func1params = addContentId(idsGenerator.generateId(true));
|
|
23
|
+
const func1result = addContentId(idsGenerator.generateId(true));
|
|
24
|
+
const func2name = addContentId(idsGenerator.generateId());
|
|
25
|
+
const func2description = addContentId(idsGenerator.generateId());
|
|
26
|
+
const func2params = addContentId(idsGenerator.generateId(true));
|
|
27
|
+
const func2result = addContentId(idsGenerator.generateId(true));
|
|
28
|
+
const modelMessage2 = addContentId(idsGenerator.generateId());
|
|
29
|
+
const func1StringifyParam = addContentId(idsGenerator.generateId());
|
|
30
|
+
const func1StringifyResult = addContentId(idsGenerator.generateId());
|
|
31
|
+
const functions1 = {
|
|
32
|
+
[func1name]: {
|
|
33
|
+
description: func1description,
|
|
34
|
+
params: {
|
|
35
|
+
type: "number"
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
const functions2 = {
|
|
40
|
+
...functions1,
|
|
41
|
+
[func2name]: {
|
|
42
|
+
description: func2description,
|
|
43
|
+
params: {
|
|
44
|
+
type: "number"
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
const baseChatHistory = [{
|
|
49
|
+
type: "system",
|
|
50
|
+
text: systemMessage
|
|
51
|
+
}, {
|
|
52
|
+
type: "user",
|
|
53
|
+
text: userMessage1
|
|
54
|
+
}];
|
|
55
|
+
const chatHistory1Call = [...baseChatHistory, {
|
|
56
|
+
type: "model",
|
|
57
|
+
response: [
|
|
58
|
+
modelMessage1,
|
|
59
|
+
{
|
|
60
|
+
type: "functionCall",
|
|
61
|
+
name: func1name,
|
|
62
|
+
// convert to number since this will go through JSON.stringify,
|
|
63
|
+
// and we want to avoid escaping characters in the rendered output
|
|
64
|
+
params: Number(func1params),
|
|
65
|
+
result: Number(func1result),
|
|
66
|
+
startsNewChunk: true
|
|
67
|
+
},
|
|
68
|
+
modelMessage2
|
|
69
|
+
]
|
|
70
|
+
}];
|
|
71
|
+
const chatHistory2Calls = [...baseChatHistory, {
|
|
72
|
+
type: "model",
|
|
73
|
+
response: [
|
|
74
|
+
modelMessage1,
|
|
75
|
+
{
|
|
76
|
+
type: "functionCall",
|
|
77
|
+
name: func1name,
|
|
78
|
+
// convert to number since this will go through JSON.stringify,
|
|
79
|
+
// and we want to avoid escaping characters in the rendered output
|
|
80
|
+
params: Number(func1params),
|
|
81
|
+
result: Number(func1result),
|
|
82
|
+
startsNewChunk: true
|
|
83
|
+
},
|
|
84
|
+
{
|
|
85
|
+
type: "functionCall",
|
|
86
|
+
name: func2name,
|
|
87
|
+
params: Number(func2params),
|
|
88
|
+
result: Number(func2result),
|
|
89
|
+
startsNewChunk: false
|
|
90
|
+
},
|
|
91
|
+
modelMessage2
|
|
92
|
+
]
|
|
93
|
+
}];
|
|
94
|
+
const chatHistory2CallsNewChunk = [...baseChatHistory, {
|
|
95
|
+
type: "model",
|
|
96
|
+
response: [
|
|
97
|
+
modelMessage1,
|
|
98
|
+
{
|
|
99
|
+
type: "functionCall",
|
|
100
|
+
name: func1name,
|
|
101
|
+
// convert to number since this will go through JSON.stringify,
|
|
102
|
+
// and we want to avoid escaping characters in the rendered output
|
|
103
|
+
params: Number(func1params),
|
|
104
|
+
result: Number(func1result),
|
|
105
|
+
startsNewChunk: true
|
|
106
|
+
},
|
|
107
|
+
{
|
|
108
|
+
type: "functionCall",
|
|
109
|
+
name: func2name,
|
|
110
|
+
params: Number(func2params),
|
|
111
|
+
result: Number(func2result),
|
|
112
|
+
startsNewChunk: true
|
|
113
|
+
},
|
|
114
|
+
modelMessage2
|
|
115
|
+
]
|
|
116
|
+
}];
|
|
117
|
+
const additionalParams = {
|
|
118
|
+
"bos_token": bosTokenId,
|
|
119
|
+
"eos_token": eosTokenId,
|
|
120
|
+
"eot_token": eotTokenId
|
|
121
|
+
};
|
|
122
|
+
let combineModelMessageAndToolCalls = true;
|
|
123
|
+
let stringifyParams = true;
|
|
124
|
+
let stringifyResult = true;
|
|
125
|
+
try {
|
|
126
|
+
const paramsObjectTest = renderTemplate({
|
|
127
|
+
chatHistory: [...baseChatHistory, {
|
|
128
|
+
type: "model",
|
|
129
|
+
response: [
|
|
130
|
+
modelMessage1,
|
|
131
|
+
{
|
|
132
|
+
type: "functionCall",
|
|
133
|
+
name: func1name,
|
|
134
|
+
params: { [func1StringifyParam]: "test" },
|
|
135
|
+
result: func1StringifyResult,
|
|
136
|
+
startsNewChunk: true
|
|
137
|
+
},
|
|
138
|
+
modelMessage2
|
|
139
|
+
]
|
|
140
|
+
}],
|
|
141
|
+
functions: functions1,
|
|
142
|
+
additionalParams,
|
|
143
|
+
stringifyFunctionParams: false,
|
|
144
|
+
stringifyFunctionResults: false,
|
|
145
|
+
combineModelMessageAndToolCalls
|
|
146
|
+
});
|
|
147
|
+
stringifyParams = (!paramsObjectTest.includes(`"${func1StringifyParam}":`) &&
|
|
148
|
+
!paramsObjectTest.includes(`'${func1StringifyParam}':`));
|
|
149
|
+
}
|
|
150
|
+
catch (err) {
|
|
151
|
+
// do nothing
|
|
152
|
+
}
|
|
153
|
+
try {
|
|
154
|
+
const resultObjectTest = renderTemplate({
|
|
155
|
+
chatHistory: [...baseChatHistory, {
|
|
156
|
+
type: "model",
|
|
157
|
+
response: [
|
|
158
|
+
modelMessage1,
|
|
159
|
+
{
|
|
160
|
+
type: "functionCall",
|
|
161
|
+
name: func1name,
|
|
162
|
+
params: func1StringifyParam,
|
|
163
|
+
result: { [func1StringifyResult]: "test" },
|
|
164
|
+
startsNewChunk: true
|
|
165
|
+
},
|
|
166
|
+
modelMessage2
|
|
167
|
+
]
|
|
168
|
+
}],
|
|
169
|
+
functions: functions1,
|
|
170
|
+
additionalParams,
|
|
171
|
+
stringifyFunctionParams: false,
|
|
172
|
+
stringifyFunctionResults: false,
|
|
173
|
+
combineModelMessageAndToolCalls
|
|
174
|
+
});
|
|
175
|
+
stringifyResult = (!resultObjectTest.includes(`"${func1StringifyResult}":`) &&
|
|
176
|
+
!resultObjectTest.includes(`'${func1StringifyResult}':`));
|
|
177
|
+
}
|
|
178
|
+
catch (err) {
|
|
179
|
+
// do nothing
|
|
180
|
+
}
|
|
181
|
+
combineModelMessageAndToolCalls = renderTemplate({
|
|
182
|
+
chatHistory: chatHistory1Call,
|
|
183
|
+
functions: functions1,
|
|
184
|
+
additionalParams,
|
|
185
|
+
stringifyFunctionParams: true,
|
|
186
|
+
stringifyFunctionResults: true,
|
|
187
|
+
combineModelMessageAndToolCalls
|
|
188
|
+
}).includes(modelMessage1);
|
|
189
|
+
let textBetween2TextualModelResponses = LlamaText();
|
|
190
|
+
if (!combineModelMessageAndToolCalls) {
|
|
191
|
+
try {
|
|
192
|
+
const betweenModelTextualResponsesTest = renderTemplate({
|
|
193
|
+
chatHistory: [...baseChatHistory, {
|
|
194
|
+
type: "model",
|
|
195
|
+
response: [modelMessage1]
|
|
196
|
+
}, {
|
|
197
|
+
type: "model",
|
|
198
|
+
response: [modelMessage2]
|
|
199
|
+
}],
|
|
200
|
+
functions: {},
|
|
201
|
+
additionalParams,
|
|
202
|
+
stringifyFunctionParams: false,
|
|
203
|
+
stringifyFunctionResults: false,
|
|
204
|
+
combineModelMessageAndToolCalls,
|
|
205
|
+
squashModelTextResponses: false
|
|
206
|
+
});
|
|
207
|
+
const textDiff = getTextBetweenIds(betweenModelTextualResponsesTest, modelMessage1, modelMessage2).text ?? "";
|
|
208
|
+
textBetween2TextualModelResponses = reviveSeparatorText(textDiff, idToStaticContent, contentIds);
|
|
209
|
+
}
|
|
210
|
+
catch (err) {
|
|
211
|
+
// do nothing
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
let usedNewChunkFor2Calls = false;
|
|
215
|
+
const rendered1Call = renderTemplate({
|
|
216
|
+
chatHistory: chatHistory1Call,
|
|
217
|
+
functions: functions1,
|
|
218
|
+
additionalParams,
|
|
219
|
+
stringifyFunctionParams: stringifyParams,
|
|
220
|
+
stringifyFunctionResults: stringifyResult,
|
|
221
|
+
combineModelMessageAndToolCalls
|
|
222
|
+
});
|
|
223
|
+
const rendered2Calls = getFirstValidResult([
|
|
224
|
+
() => renderTemplate({
|
|
225
|
+
chatHistory: chatHistory2Calls,
|
|
226
|
+
functions: functions2,
|
|
227
|
+
additionalParams,
|
|
228
|
+
stringifyFunctionParams: stringifyParams,
|
|
229
|
+
stringifyFunctionResults: stringifyResult,
|
|
230
|
+
combineModelMessageAndToolCalls
|
|
231
|
+
}),
|
|
232
|
+
() => {
|
|
233
|
+
usedNewChunkFor2Calls = true;
|
|
234
|
+
return renderTemplate({
|
|
235
|
+
chatHistory: chatHistory2CallsNewChunk,
|
|
236
|
+
functions: functions2,
|
|
237
|
+
additionalParams,
|
|
238
|
+
stringifyFunctionParams: stringifyParams,
|
|
239
|
+
stringifyFunctionResults: stringifyResult,
|
|
240
|
+
combineModelMessageAndToolCalls
|
|
241
|
+
});
|
|
242
|
+
}
|
|
243
|
+
]);
|
|
244
|
+
const modelMessage1ToFunc1Name = getTextBetweenIds(rendered2Calls, modelMessage1, func1name);
|
|
245
|
+
const func1NameToFunc1Params = getTextBetweenIds(rendered2Calls, func1name, func1params, modelMessage1ToFunc1Name.endIndex);
|
|
246
|
+
const func1ResultIndex = rendered2Calls.indexOf(func1result, func1NameToFunc1Params.endIndex);
|
|
247
|
+
const func2NameIndex = rendered2Calls.indexOf(func2name, modelMessage1ToFunc1Name.endIndex);
|
|
248
|
+
if (modelMessage1ToFunc1Name.text == null ||
|
|
249
|
+
func1NameToFunc1Params.text == null ||
|
|
250
|
+
func1ResultIndex < 0 ||
|
|
251
|
+
func2NameIndex < 0)
|
|
252
|
+
return { settings: null, stringifyParams, stringifyResult, combineModelMessageAndToolCalls };
|
|
253
|
+
const supportsParallelCalls = func1ResultIndex > func2NameIndex;
|
|
254
|
+
if (!supportsParallelCalls || usedNewChunkFor2Calls) {
|
|
255
|
+
const prefix = getTextBetweenIds(rendered1Call, modelMessage1, func1name);
|
|
256
|
+
const paramsPrefix = getTextBetweenIds(rendered1Call, func1name, func1params, prefix.endIndex);
|
|
257
|
+
const resultPrefix = getTextBetweenIds(rendered1Call, func1params, func1result, paramsPrefix.endIndex);
|
|
258
|
+
const resultSuffix = getTextBetweenIds(rendered1Call, func1result, modelMessage2, resultPrefix.endIndex);
|
|
259
|
+
if (prefix.text == null || prefix.text === "" || paramsPrefix.text == null || resultPrefix.text == null || resultSuffix.text == null)
|
|
260
|
+
return { settings: null, stringifyParams, stringifyResult, combineModelMessageAndToolCalls };
|
|
261
|
+
return {
|
|
262
|
+
stringifyParams,
|
|
263
|
+
stringifyResult,
|
|
264
|
+
combineModelMessageAndToolCalls,
|
|
265
|
+
settings: {
|
|
266
|
+
call: {
|
|
267
|
+
optionalPrefixSpace: true,
|
|
268
|
+
prefix: removeCommonRevivedPrefix(reviveSeparatorText(prefix.text, idToStaticContent, contentIds), !combineModelMessageAndToolCalls
|
|
269
|
+
? textBetween2TextualModelResponses
|
|
270
|
+
: LlamaText()),
|
|
271
|
+
paramsPrefix: reviveSeparatorText(paramsPrefix.text, idToStaticContent, contentIds),
|
|
272
|
+
suffix: "",
|
|
273
|
+
emptyCallParamsPlaceholder: {}
|
|
274
|
+
},
|
|
275
|
+
result: {
|
|
276
|
+
prefix: reviveSeparatorText(resultPrefix.text, new Map([
|
|
277
|
+
...idToStaticContent.entries(),
|
|
278
|
+
[func1name, LlamaText("{{functionName}}")],
|
|
279
|
+
[func1params, LlamaText("{{functionParams}}")]
|
|
280
|
+
]), contentIds),
|
|
281
|
+
suffix: reviveSeparatorText(resultSuffix.text, new Map([
|
|
282
|
+
...idToStaticContent.entries(),
|
|
283
|
+
[func1name, LlamaText("{{functionName}}")],
|
|
284
|
+
[func1params, LlamaText("{{functionParams}}")]
|
|
285
|
+
]), contentIds)
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
};
|
|
289
|
+
}
|
|
290
|
+
const func1ParamsToFunc2Name = getTextBetweenIds(rendered2Calls, func1params, func2name, func1NameToFunc1Params.endIndex);
|
|
291
|
+
const func2ParamsToFunc1Result = getTextBetweenIds(rendered2Calls, func2params, func1result, func1ParamsToFunc2Name.endIndex);
|
|
292
|
+
const func1ResultToFunc2Result = getTextBetweenIds(rendered2Calls, func1result, func2result, func2ParamsToFunc1Result.endIndex);
|
|
293
|
+
const func2ResultToModelMessage2 = getTextBetweenIds(rendered2Calls, func2result, modelMessage2, func1ResultToFunc2Result.endIndex);
|
|
294
|
+
if (func1ParamsToFunc2Name.text == null || func2ParamsToFunc1Result.text == null || func1ResultToFunc2Result.text == null ||
|
|
295
|
+
func2ResultToModelMessage2.text == null)
|
|
296
|
+
return { settings: null, stringifyParams, stringifyResult, combineModelMessageAndToolCalls };
|
|
297
|
+
const callPrefixLength = findCommonEndLength(modelMessage1ToFunc1Name.text, func1ParamsToFunc2Name.text);
|
|
298
|
+
const callPrefixText = func1ParamsToFunc2Name.text.slice(-callPrefixLength);
|
|
299
|
+
const parallelismCallPrefix = modelMessage1ToFunc1Name.text.slice(0, -callPrefixLength);
|
|
300
|
+
const callSuffixLength = findCommandStartLength(func1ParamsToFunc2Name.text, func2ParamsToFunc1Result.text);
|
|
301
|
+
const callSuffixText = func1ParamsToFunc2Name.text.slice(0, callSuffixLength);
|
|
302
|
+
const parallelismBetweenCallsText = func1ParamsToFunc2Name.text.slice(callSuffixLength, -callPrefixLength);
|
|
303
|
+
const callParamsPrefixText = func1NameToFunc1Params.text;
|
|
304
|
+
const resultPrefixLength = findCommonEndLength(func2ParamsToFunc1Result.text, func1ResultToFunc2Result.text);
|
|
305
|
+
const resultPrefixText = func2ParamsToFunc1Result.text.slice(-resultPrefixLength);
|
|
306
|
+
const resultSuffixLength = findCommandStartLength(func1ResultToFunc2Result.text, func2ResultToModelMessage2.text);
|
|
307
|
+
const resultSuffixText = func1ResultToFunc2Result.text.slice(0, resultSuffixLength);
|
|
308
|
+
const parallelismResultBetweenResultsText = func1ResultToFunc2Result.text.slice(resultSuffixLength, -resultPrefixLength);
|
|
309
|
+
const parallelismResultSuffixText = func2ResultToModelMessage2.text.slice(resultSuffixLength);
|
|
310
|
+
const resolveParallelismBetweenSectionsParts = (betweenSectionsText) => {
|
|
311
|
+
const { index: endTokenIndex, text: endTokenId } = findFirstTextMatch(betweenSectionsText, [eosTokenId, eosTokenId]);
|
|
312
|
+
if (endTokenIndex >= 0 && endTokenId != null)
|
|
313
|
+
return {
|
|
314
|
+
parallelismCallSuffixText: betweenSectionsText.slice(0, endTokenIndex + endTokenId.length),
|
|
315
|
+
parallelismResultPrefix: betweenSectionsText.slice(endTokenIndex + endTokenId.length)
|
|
316
|
+
};
|
|
317
|
+
const bosIndex = betweenSectionsText.indexOf(bosTokenId);
|
|
318
|
+
if (bosIndex >= 0)
|
|
319
|
+
return {
|
|
320
|
+
parallelismCallSuffixText: betweenSectionsText.slice(0, bosIndex),
|
|
321
|
+
parallelismResultPrefix: betweenSectionsText.slice(bosIndex)
|
|
322
|
+
};
|
|
323
|
+
return {
|
|
324
|
+
parallelismCallSuffixText: betweenSectionsText,
|
|
325
|
+
parallelismResultPrefix: ""
|
|
326
|
+
};
|
|
327
|
+
};
|
|
328
|
+
const { parallelismCallSuffixText, parallelismResultPrefix } = resolveParallelismBetweenSectionsParts(func2ParamsToFunc1Result.text.slice(callSuffixLength, -resultPrefixLength));
|
|
329
|
+
return {
|
|
330
|
+
stringifyParams,
|
|
331
|
+
stringifyResult,
|
|
332
|
+
combineModelMessageAndToolCalls,
|
|
333
|
+
settings: {
|
|
334
|
+
call: {
|
|
335
|
+
optionalPrefixSpace: true,
|
|
336
|
+
prefix: reviveSeparatorText(callPrefixText, idToStaticContent, contentIds),
|
|
337
|
+
paramsPrefix: reviveSeparatorText(callParamsPrefixText, idToStaticContent, contentIds),
|
|
338
|
+
suffix: reviveSeparatorText(callSuffixText, idToStaticContent, contentIds),
|
|
339
|
+
emptyCallParamsPlaceholder: {}
|
|
340
|
+
},
|
|
341
|
+
result: {
|
|
342
|
+
prefix: reviveSeparatorText(resultPrefixText, new Map([
|
|
343
|
+
...idToStaticContent.entries(),
|
|
344
|
+
[func1name, LlamaText("{{functionName}}")],
|
|
345
|
+
[func1params, LlamaText("{{functionParams}}")]
|
|
346
|
+
]), contentIds),
|
|
347
|
+
suffix: reviveSeparatorText(resultSuffixText, new Map([
|
|
348
|
+
...idToStaticContent.entries(),
|
|
349
|
+
[func1name, LlamaText("{{functionName}}")],
|
|
350
|
+
[func1params, LlamaText("{{functionParams}}")]
|
|
351
|
+
]), contentIds)
|
|
352
|
+
},
|
|
353
|
+
parallelism: {
|
|
354
|
+
call: {
|
|
355
|
+
sectionPrefix: removeCommonRevivedPrefix(reviveSeparatorText(parallelismCallPrefix, idToStaticContent, contentIds), !combineModelMessageAndToolCalls
|
|
356
|
+
? textBetween2TextualModelResponses
|
|
357
|
+
: LlamaText()),
|
|
358
|
+
betweenCalls: reviveSeparatorText(parallelismBetweenCallsText, idToStaticContent, contentIds),
|
|
359
|
+
sectionSuffix: reviveSeparatorText(parallelismCallSuffixText, idToStaticContent, contentIds)
|
|
360
|
+
},
|
|
361
|
+
result: {
|
|
362
|
+
sectionPrefix: reviveSeparatorText(parallelismResultPrefix, idToStaticContent, contentIds),
|
|
363
|
+
betweenResults: reviveSeparatorText(parallelismResultBetweenResultsText, idToStaticContent, contentIds),
|
|
364
|
+
sectionSuffix: reviveSeparatorText(parallelismResultSuffixText, idToStaticContent, contentIds)
|
|
365
|
+
}
|
|
366
|
+
}
|
|
367
|
+
}
|
|
368
|
+
};
|
|
369
|
+
}
|
|
370
|
+
function getTextBetweenIds(text, startId, endId, startIndex = 0) {
|
|
371
|
+
const foundStartIndex = text.indexOf(startId, startIndex);
|
|
372
|
+
if (foundStartIndex < 0)
|
|
373
|
+
return { text: undefined, endIndex: -1 };
|
|
374
|
+
const foundEndIndex = text.indexOf(endId, foundStartIndex + startId.length);
|
|
375
|
+
if (foundEndIndex < 0)
|
|
376
|
+
return { text: undefined, endIndex: -1 };
|
|
377
|
+
return {
|
|
378
|
+
text: text.slice(foundStartIndex + startId.length, foundEndIndex),
|
|
379
|
+
endIndex: foundEndIndex
|
|
380
|
+
};
|
|
381
|
+
}
|
|
382
|
+
function reviveSeparatorText(text, idMap, contentIds) {
|
|
383
|
+
return LlamaText(splitText(text, [...new Set([...idMap.keys(), ...contentIds])])
|
|
384
|
+
.map((item) => {
|
|
385
|
+
if (typeof item === "string")
|
|
386
|
+
return new SpecialTokensText(item);
|
|
387
|
+
const mappedItem = idMap.get(item.separator);
|
|
388
|
+
if (mappedItem != null)
|
|
389
|
+
return mappedItem;
|
|
390
|
+
if (contentIds.has(item.separator))
|
|
391
|
+
throw new Error("Content ID found in separator text");
|
|
392
|
+
return new SpecialTokensText(item.separator);
|
|
393
|
+
}));
|
|
394
|
+
}
|
|
395
|
+
function removeCommonRevivedPrefix(target, matchStart) {
|
|
396
|
+
for (let commonStartLength = 0; commonStartLength < target.values.length && commonStartLength < matchStart.values.length; commonStartLength++) {
|
|
397
|
+
const targetValue = target.values[commonStartLength];
|
|
398
|
+
const matchStartValue = matchStart.values[commonStartLength];
|
|
399
|
+
if (typeof targetValue === "string" && typeof matchStartValue === "string") {
|
|
400
|
+
if (targetValue === matchStartValue)
|
|
401
|
+
continue;
|
|
402
|
+
}
|
|
403
|
+
else if (targetValue instanceof SpecialTokensText && matchStartValue instanceof SpecialTokensText) {
|
|
404
|
+
const commonLength = findCommandStartLength(targetValue.value, matchStartValue.value);
|
|
405
|
+
if (commonLength === targetValue.value.length && commonLength === matchStartValue.value.length)
|
|
406
|
+
continue;
|
|
407
|
+
return LlamaText([
|
|
408
|
+
new SpecialTokensText(targetValue.value.slice(commonLength)),
|
|
409
|
+
...target.values.slice(commonStartLength + 1)
|
|
410
|
+
]);
|
|
411
|
+
}
|
|
412
|
+
else if (targetValue instanceof SpecialToken && matchStartValue instanceof SpecialToken) {
|
|
413
|
+
if (targetValue.value === matchStartValue.value)
|
|
414
|
+
continue;
|
|
415
|
+
}
|
|
416
|
+
return LlamaText(target.values.slice(commonStartLength));
|
|
417
|
+
}
|
|
418
|
+
return LlamaText(target.values.slice(matchStart.values.length));
|
|
419
|
+
}
|
|
420
|
+
function findCommandStartLength(text1, text2) {
|
|
421
|
+
let commonStartLength = 0;
|
|
422
|
+
while (commonStartLength < text1.length && commonStartLength < text2.length) {
|
|
423
|
+
if (text1[commonStartLength] !== text2[commonStartLength])
|
|
424
|
+
break;
|
|
425
|
+
commonStartLength++;
|
|
426
|
+
}
|
|
427
|
+
return commonStartLength;
|
|
428
|
+
}
|
|
429
|
+
function findCommonEndLength(text1, text2) {
|
|
430
|
+
let commonEndLength = 0;
|
|
431
|
+
while (commonEndLength < text1.length && commonEndLength < text2.length) {
|
|
432
|
+
if (text1[text1.length - commonEndLength - 1] !== text2[text2.length - commonEndLength - 1])
|
|
433
|
+
break;
|
|
434
|
+
commonEndLength++;
|
|
435
|
+
}
|
|
436
|
+
return commonEndLength;
|
|
437
|
+
}
|
|
438
|
+
function findFirstTextMatch(text, matchTexts, startIndex = 0) {
|
|
439
|
+
for (const matchText of matchTexts) {
|
|
440
|
+
const index = text.indexOf(matchText, startIndex);
|
|
441
|
+
if (index >= 0)
|
|
442
|
+
return { index, text: matchText };
|
|
443
|
+
}
|
|
444
|
+
return { index: -1, text: undefined };
|
|
445
|
+
}
|
|
446
|
+
//# sourceMappingURL=extractFunctionCallSettingsFromJinjaTemplate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"extractFunctionCallSettingsFromJinjaTemplate.js","sourceRoot":"","sources":["../../../../src/chatWrappers/generic/utils/extractFunctionCallSettingsFromJinjaTemplate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { LlamaText, SpecialTokensText } from "../../../utils/LlamaText.js";
|
|
2
|
+
import { removeUndefinedFields } from "../../../utils/removeNullFields.js";
|
|
3
|
+
export function extractSegmentSettingsFromTokenizerAndChatTemplate(chatTemplate, tokenizer) {
|
|
4
|
+
function tryMatchPrefixSuffixPair(tryMatchGroups) {
|
|
5
|
+
if (chatTemplate != null) {
|
|
6
|
+
for (const [prefix, suffix] of tryMatchGroups) {
|
|
7
|
+
if (chatTemplate.includes(prefix) && chatTemplate.includes(suffix))
|
|
8
|
+
return {
|
|
9
|
+
prefix: LlamaText(new SpecialTokensText(prefix)),
|
|
10
|
+
suffix: LlamaText(new SpecialTokensText(suffix))
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
if (tokenizer != null) {
|
|
15
|
+
for (const [prefix, suffix] of tryMatchGroups) {
|
|
16
|
+
const thinkTokens = tokenizer(prefix, true, "trimLeadingSpace");
|
|
17
|
+
const thinkEndTokens = tokenizer(suffix, true, "trimLeadingSpace");
|
|
18
|
+
const [thinkToken] = thinkTokens;
|
|
19
|
+
const [thinkEndToken] = thinkEndTokens;
|
|
20
|
+
if (thinkTokens.length === 1 && thinkEndTokens.length === 1 &&
|
|
21
|
+
thinkToken != null && thinkEndToken != null) {
|
|
22
|
+
return {
|
|
23
|
+
prefix: LlamaText(new SpecialTokensText(prefix)),
|
|
24
|
+
suffix: LlamaText(new SpecialTokensText(suffix))
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
return removeUndefinedFields({
|
|
32
|
+
thought: tryMatchPrefixSuffixPair([
|
|
33
|
+
["<think>", "</think>"], // DeepSeek, QwQ
|
|
34
|
+
["<thought>", "</thought>"] // EXAONE Deep
|
|
35
|
+
])
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=extractSegmentSettingsFromTokenizerAndChatTemplate.js.map
|
package/dist/chatWrappers/generic/utils/extractSegmentSettingsFromTokenizerAndChatTemplate.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"extractSegmentSettingsFromTokenizerAndChatTemplate.js","sourceRoot":"","sources":["../../../../src/chatWrappers/generic/utils/extractSegmentSettingsFromTokenizerAndChatTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAE,iBAAiB,EAAC,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAC,qBAAqB,EAAC,MAAM,oCAAoC,CAAC;AAEzE,MAAM,UAAU,kDAAkD,CAC9D,YAAgC,EAAE,SAAqB;IAEvD,SAAS,wBAAwB,CAAC,cAAkD;QAChF,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACvB,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;gBAC5C,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAC9D,OAAO;wBACH,MAAM,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;wBAChD,MAAM,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;qBACnD,CAAC;YACV,CAAC;QACL,CAAC;QAED,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;YACpB,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;gBAC5C,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;gBAChE,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;gBAEnE,MAAM,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;gBACjC,MAAM,CAAC,aAAa,CAAC,GAAG,cAAc,CAAC;gBAEvC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC;oBACvD,UAAU,IAAI,IAAI,IAAI,aAAa,IAAI,IAAI,EAC7C,CAAC;oBACC,OAAO;wBACH,MAAM,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;wBAChD,MAAM,EAAE,SAAS,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;qBACnD,CAAC;gBACN,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,qBAAqB,CAAC;QACzB,OAAO,EAAE,wBAAwB,CAAC;YAC9B,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,gBAAgB;YACzC,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,cAAc;SAC7C,CAAC;KACL,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Call the functions in the array one by one and return the result of the first one that doesn't throw an error.
|
|
3
|
+
*
|
|
4
|
+
* If all functions throw an error, throw the error of the last function.
|
|
5
|
+
*/
|
|
6
|
+
export declare function getFirstValidResult<const T extends (() => any)[]>(options: T): ReturnType<T[number]>;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Call the functions in the array one by one and return the result of the first one that doesn't throw an error.
|
|
3
|
+
*
|
|
4
|
+
* If all functions throw an error, throw the error of the last function.
|
|
5
|
+
*/
|
|
6
|
+
export function getFirstValidResult(options) {
|
|
7
|
+
for (let i = 0; i < options.length; i++) {
|
|
8
|
+
if (i === options.length - 1)
|
|
9
|
+
return options[i]();
|
|
10
|
+
try {
|
|
11
|
+
return options[i]();
|
|
12
|
+
}
|
|
13
|
+
catch (err) {
|
|
14
|
+
// do nothing
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
throw new Error("All options failed");
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=getFirstValidResult.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getFirstValidResult.js","sourceRoot":"","sources":["../../../../src/chatWrappers/generic/utils/getFirstValidResult.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAgC,OAAU;IACzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,IAAI,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC;YACxB,OAAO,OAAO,CAAC,CAAC,CAAE,EAAE,CAAC;QAEzB,IAAI,CAAC;YACD,OAAO,OAAO,CAAC,CAAC,CAAE,EAAE,CAAC;QACzB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,aAAa;QACjB,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { LlamaText } from "../../../utils/LlamaText.js";
|
|
2
|
+
export function squashChatHistoryItems(history) {
|
|
3
|
+
const res = [];
|
|
4
|
+
for (const item of history) {
|
|
5
|
+
const lastItem = res.at(-1);
|
|
6
|
+
if (lastItem == null) {
|
|
7
|
+
res.push(structuredClone(item));
|
|
8
|
+
continue;
|
|
9
|
+
}
|
|
10
|
+
if (lastItem.type === "system" && item.type === "system")
|
|
11
|
+
lastItem.text = LlamaText.joinValues("\n\n", [
|
|
12
|
+
LlamaText.fromJSON(lastItem.text),
|
|
13
|
+
LlamaText.fromJSON(item.text)
|
|
14
|
+
]).toJSON();
|
|
15
|
+
else if (lastItem.type === "user" && item.type === "user")
|
|
16
|
+
lastItem.text += "\n\n" + item.text;
|
|
17
|
+
else if (lastItem.type === "model" && item.type === "model") {
|
|
18
|
+
const responsesToAdd = ["\n\n", ...item.response];
|
|
19
|
+
while (typeof responsesToAdd[0] === "string" && typeof lastItem.response.at(-1) === "string") {
|
|
20
|
+
const lastResponses = lastItem.response.pop();
|
|
21
|
+
if (typeof lastResponses !== "string") {
|
|
22
|
+
lastItem.response.push(lastResponses);
|
|
23
|
+
break;
|
|
24
|
+
}
|
|
25
|
+
lastItem.response.push(lastResponses + responsesToAdd.shift());
|
|
26
|
+
}
|
|
27
|
+
while (responsesToAdd.length > 0)
|
|
28
|
+
lastItem.response.push(responsesToAdd.shift());
|
|
29
|
+
}
|
|
30
|
+
else
|
|
31
|
+
res.push(structuredClone(item));
|
|
32
|
+
}
|
|
33
|
+
return res;
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=squashChatHistoryItems.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"squashChatHistoryItems.js","sourceRoot":"","sources":["../../../../src/chatWrappers/generic/utils/squashChatHistoryItems.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAEtD,MAAM,UAAU,sBAAsB,CAAC,OAAmC;IACtE,MAAM,GAAG,GAAsB,EAAE,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACnB,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;YAChC,SAAS;QACb,CAAC;QAED,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;YACpD,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE;gBACzC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACjC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;aAChC,CAAC,CAAC,MAAM,EAAE,CAAC;aACX,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM;YACrD,QAAQ,CAAC,IAAI,IAAI,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;aACnC,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC1D,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;YAElD,OAAO,OAAO,cAAc,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,OAAO,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC3F,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAG,CAAC;gBAC/C,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;oBACpC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBACtC,MAAM;gBACV,CAAC;gBAED,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,GAAG,cAAc,CAAC,KAAK,EAAG,CAAC,CAAC;YACpE,CAAC;YAED,OAAO,cAAc,CAAC,MAAM,GAAG,CAAC;gBAC5B,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAG,CAAC,CAAC;QACxD,CAAC;;YACG,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { ChatWrapperSettings } from "../../../types.js";
|
|
2
|
+
export declare function templateSegmentOptionsToChatWrapperSettings(templateOptions?: TemplateChatWrapperSegmentsOptions): ChatWrapperSettings["segments"];
|
|
3
|
+
export type TemplateChatWrapperSegmentsOptions = {
|
|
4
|
+
/** Template for a thought segment */
|
|
5
|
+
thoughtTemplate?: `${string}{{content}}${string}`;
|
|
6
|
+
/**
|
|
7
|
+
* Automatically reopen a thought segment after function calls.
|
|
8
|
+
*
|
|
9
|
+
* Useful for aligning the output of models that assume that a thought segment is already open after function calls.
|
|
10
|
+
*
|
|
11
|
+
* Defaults to `false`.
|
|
12
|
+
*/
|
|
13
|
+
reopenThoughtAfterFunctionCalls?: boolean;
|
|
14
|
+
/** Consider all segments to be closed when this text is detected */
|
|
15
|
+
closeAllSegmentsTemplate?: string;
|
|
16
|
+
/**
|
|
17
|
+
* After function calls, reiterate the stack of the active segments to remind the model of the context.
|
|
18
|
+
*
|
|
19
|
+
* Defaults to `false`.
|
|
20
|
+
*/
|
|
21
|
+
reiterateStackAfterFunctionCalls?: boolean;
|
|
22
|
+
};
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { parseTextTemplate } from "../../../utils/parseTextTemplate.js";
|
|
2
|
+
import { removeUndefinedFields } from "../../../utils/removeNullFields.js";
|
|
3
|
+
export function templateSegmentOptionsToChatWrapperSettings(templateOptions) {
|
|
4
|
+
if (templateOptions == null)
|
|
5
|
+
return {};
|
|
6
|
+
function getThoughtSegmentOptions() {
|
|
7
|
+
if (templateOptions?.thoughtTemplate == null)
|
|
8
|
+
return undefined;
|
|
9
|
+
const parsedThoughtTemplate = parseTextTemplate(templateOptions.thoughtTemplate, [{
|
|
10
|
+
text: "{{content}}",
|
|
11
|
+
key: "content"
|
|
12
|
+
}]);
|
|
13
|
+
const prefix = parsedThoughtTemplate.content.prefix;
|
|
14
|
+
if (prefix.length === 0)
|
|
15
|
+
throw new Error("Thought template must have text before \"{{content}}\"");
|
|
16
|
+
return removeUndefinedFields({
|
|
17
|
+
prefix,
|
|
18
|
+
suffix: parsedThoughtTemplate.content.suffix || undefined,
|
|
19
|
+
reopenAfterFunctionCalls: templateOptions.reopenThoughtAfterFunctionCalls
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
return removeUndefinedFields({
|
|
23
|
+
closeAllSegments: templateOptions.closeAllSegmentsTemplate || undefined,
|
|
24
|
+
reiterateStackAfterFunctionCalls: templateOptions.reiterateStackAfterFunctionCalls,
|
|
25
|
+
thought: getThoughtSegmentOptions()
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=templateSegmentOptionsToChatWrapperSettings.js.map
|