node-llama-cpp 3.6.0 → 3.8.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/dist/ChatWrapper.d.ts +3 -5
- package/dist/ChatWrapper.js +20 -13
- package/dist/ChatWrapper.js.map +1 -1
- package/dist/bindings/AddonTypes.d.ts +3 -1
- package/dist/bindings/Llama.js +2 -0
- package/dist/bindings/Llama.js.map +1 -1
- package/dist/bindings/getLlama.d.ts +30 -1
- package/dist/bindings/getLlama.js +32 -8
- package/dist/bindings/getLlama.js.map +1 -1
- package/dist/bindings/utils/compileLLamaCpp.js +7 -0
- package/dist/bindings/utils/compileLLamaCpp.js.map +1 -1
- package/dist/bindings/utils/getLlamaGpuTypes.d.ts +13 -0
- package/dist/bindings/utils/getLlamaGpuTypes.js +30 -0
- package/dist/bindings/utils/getLlamaGpuTypes.js.map +1 -0
- package/dist/bindings/utils/testBindingBinary.js +26 -2
- package/dist/bindings/utils/testBindingBinary.js.map +1 -1
- package/dist/chatWrappers/AlpacaChatWrapper.js.map +1 -1
- package/dist/chatWrappers/DeepSeekChatWrapper.js +6 -6
- package/dist/chatWrappers/DeepSeekChatWrapper.js.map +1 -1
- package/dist/chatWrappers/FalconChatWrapper.js.map +1 -1
- package/dist/chatWrappers/FunctionaryChatWrapper.js +1 -1
- 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.js +19 -9
- package/dist/chatWrappers/Llama3_1ChatWrapper.js.map +1 -1
- package/dist/chatWrappers/Llama3_2LightweightChatWrapper.js +21 -10
- 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 +28 -0
- package/dist/chatWrappers/QwenChatWrapper.js +201 -0
- package/dist/chatWrappers/QwenChatWrapper.js.map +1 -0
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.d.ts +32 -3
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js +337 -126
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.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/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 +5 -3
- package/dist/chatWrappers/utils/resolveChatWrapper.js +11 -5
- package/dist/chatWrappers/utils/resolveChatWrapper.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectGpuCommand.js +1 -0
- package/dist/cli/commands/inspect/commands/InspectGpuCommand.js.map +1 -1
- package/dist/cli/recommendedModels.js +13 -4
- package/dist/cli/recommendedModels.js.map +1 -1
- package/dist/config.d.ts +1 -0
- package/dist/config.js +1 -0
- package/dist/config.js.map +1 -1
- package/dist/evaluator/LlamaChat/LlamaChat.d.ts +44 -0
- package/dist/evaluator/LlamaChat/LlamaChat.js +31 -6
- package/dist/evaluator/LlamaChat/LlamaChat.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.d.ts +19 -2
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js +16 -3
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.d.ts +1 -8
- package/dist/evaluator/LlamaContext/LlamaContext.d.ts +25 -1
- package/dist/evaluator/LlamaContext/LlamaContext.js +59 -1
- package/dist/evaluator/LlamaContext/LlamaContext.js.map +1 -1
- package/dist/evaluator/LlamaGrammar.js +3 -1
- package/dist/evaluator/LlamaGrammar.js.map +1 -1
- package/dist/evaluator/LlamaModel/LlamaModel.d.ts +2 -0
- package/dist/evaluator/LlamaModel/LlamaModel.js +3 -0
- 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/fileReaders/GgufNetworkFetchFileReader.d.ts +5 -2
- package/dist/gguf/fileReaders/GgufNetworkFetchFileReader.js +5 -3
- package/dist/gguf/fileReaders/GgufNetworkFetchFileReader.js.map +1 -1
- package/dist/gguf/insights/GgufInsights.js +24 -10
- package/dist/gguf/insights/GgufInsights.js.map +1 -1
- package/dist/gguf/insights/utils/resolveModelGpuLayersOption.js +57 -13
- package/dist/gguf/insights/utils/resolveModelGpuLayersOption.js.map +1 -1
- package/dist/gguf/parser/GgufV2Parser.js +24 -17
- package/dist/gguf/parser/GgufV2Parser.js.map +1 -1
- package/dist/gguf/readGgufFileInfo.d.ts +11 -2
- package/dist/gguf/readGgufFileInfo.js +6 -5
- package/dist/gguf/readGgufFileInfo.js.map +1 -1
- package/dist/gguf/types/GgufMetadataTypes.d.ts +23 -2
- package/dist/gguf/types/GgufMetadataTypes.js +17 -0
- package/dist/gguf/types/GgufMetadataTypes.js.map +1 -1
- package/dist/gguf/utils/normalizeGgufDownloadUrl.d.ts +2 -1
- package/dist/gguf/utils/normalizeGgufDownloadUrl.js +4 -2
- package/dist/gguf/utils/normalizeGgufDownloadUrl.js.map +1 -1
- package/dist/index.d.ts +5 -3
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types.d.ts +8 -0
- package/dist/types.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/createModelDownloader.d.ts +12 -3
- package/dist/utils/createModelDownloader.js +9 -5
- package/dist/utils/createModelDownloader.js.map +1 -1
- package/dist/utils/modelDownloadEndpoints.d.ts +13 -0
- package/dist/utils/modelDownloadEndpoints.js +27 -0
- package/dist/utils/modelDownloadEndpoints.js.map +1 -0
- package/dist/utils/modelFileAccessTokens.d.ts +5 -0
- package/dist/utils/{modelFileAccesTokens.js → modelFileAccessTokens.js} +4 -4
- package/dist/utils/modelFileAccessTokens.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.d.ts +5 -2
- package/dist/utils/parseModelUri.js +24 -22
- package/dist/utils/parseModelUri.js.map +1 -1
- package/dist/utils/resolveModelDestination.d.ts +2 -1
- package/dist/utils/resolveModelDestination.js +3 -3
- package/dist/utils/resolveModelDestination.js.map +1 -1
- package/dist/utils/resolveModelFile.d.ts +7 -1
- package/dist/utils/resolveModelFile.js +5 -4
- package/dist/utils/resolveModelFile.js.map +1 -1
- package/dist/utils/transformPromisable.d.ts +14 -0
- package/dist/utils/transformPromisable.js +32 -0
- package/dist/utils/transformPromisable.js.map +1 -1
- package/llama/CMakeLists.txt +12 -1
- package/llama/addon/AddonContext.cpp +150 -10
- package/llama/addon/AddonContext.h +3 -0
- package/llama/addon/AddonSampler.cpp +0 -1
- package/llama/binariesGithubRelease.json +1 -1
- package/llama/gitRelease.bundle +0 -0
- package/llama/gpuInfo/vulkan-gpu-info.cpp +0 -1
- package/llama/grammars/README.md +7 -7
- package/llama/llama.cpp.info.json +1 -1
- package/package.json +54 -52
- package/templates/packed/electron-typescript-react.json +1 -1
- package/templates/packed/node-typescript.json +1 -1
- package/dist/utils/modelFileAccesTokens.d.ts +0 -4
- package/dist/utils/modelFileAccesTokens.js.map +0 -1
|
@@ -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"}
|
|
@@ -67,4 +67,7 @@ export declare class ChatModelFunctionsDocumentationGenerator {
|
|
|
67
67
|
getLlama3_2LightweightFunctionSignatures({ documentParams }?: {
|
|
68
68
|
documentParams?: boolean;
|
|
69
69
|
}): string;
|
|
70
|
+
getQwenFunctionSignatures({ documentParams }?: {
|
|
71
|
+
documentParams?: boolean;
|
|
72
|
+
}): string;
|
|
70
73
|
}
|
|
@@ -145,5 +145,30 @@ export class ChatModelFunctionsDocumentationGenerator {
|
|
|
145
145
|
.join("\n\n");
|
|
146
146
|
return functionsLines;
|
|
147
147
|
}
|
|
148
|
+
/* eslint-enable @stylistic/max-len */
|
|
149
|
+
getQwenFunctionSignatures({ documentParams = true } = {}) {
|
|
150
|
+
return this._convertToJinjaTools({ documentParams })
|
|
151
|
+
.map((tool) => jsonDumps(tool))
|
|
152
|
+
.join("\n");
|
|
153
|
+
}
|
|
154
|
+
/** @internal */
|
|
155
|
+
_convertToJinjaTools({ documentParams = true } = {}) {
|
|
156
|
+
const chatModelFunctions = this.chatModelFunctions;
|
|
157
|
+
if (!this.hasAnyFunctions || chatModelFunctions == null)
|
|
158
|
+
return [];
|
|
159
|
+
return [...Object.entries(chatModelFunctions)]
|
|
160
|
+
.map(([functionName, functionDefinition]) => {
|
|
161
|
+
return {
|
|
162
|
+
type: "function",
|
|
163
|
+
function: {
|
|
164
|
+
name: functionName,
|
|
165
|
+
description: functionDefinition.description,
|
|
166
|
+
parameters: documentParams
|
|
167
|
+
? functionDefinition.params
|
|
168
|
+
: undefined
|
|
169
|
+
}
|
|
170
|
+
};
|
|
171
|
+
});
|
|
172
|
+
}
|
|
148
173
|
}
|
|
149
174
|
//# sourceMappingURL=ChatModelFunctionsDocumentationGenerator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatModelFunctionsDocumentationGenerator.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ChatModelFunctionsDocumentationGenerator.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,16 @@
|
|
|
1
|
+
import { splitText } from "lifecycle-utils";
|
|
1
2
|
import { JinjaTemplateChatWrapper } from "../generic/JinjaTemplateChatWrapper.js";
|
|
2
|
-
import { SpecialToken, LlamaText } from "../../utils/LlamaText.js";
|
|
3
|
+
import { SpecialToken, LlamaText, SpecialTokensText } from "../../utils/LlamaText.js";
|
|
3
4
|
import { compareTokens } from "../../utils/compareTokens.js";
|
|
4
5
|
import { StopGenerationDetector } from "../../utils/StopGenerationDetector.js";
|
|
6
|
+
import { jsonDumps } from "./jsonDumps.js";
|
|
5
7
|
export function isJinjaTemplateEquivalentToSpecializedChatWrapper(jinjaTemplateWrapperOptions, specializedChatWrapper, tokenizer) {
|
|
8
|
+
const getCheckChatHistories = (jinjaChatWrapper) => [
|
|
9
|
+
...testChatHistories,
|
|
10
|
+
...((jinjaChatWrapper.usingJinjaFunctionCallTemplate || jinjaTemplateWrapperOptions.functionCallMessageTemplate === "auto")
|
|
11
|
+
? testChatHistoriesWithFunctionCalls
|
|
12
|
+
: [])
|
|
13
|
+
];
|
|
6
14
|
const canTestMultipleConvertSystemMessagesToUserMessages = jinjaTemplateWrapperOptions.convertUnsupportedSystemMessagesToUserMessages == null ||
|
|
7
15
|
jinjaTemplateWrapperOptions.convertUnsupportedSystemMessagesToUserMessages === "auto";
|
|
8
16
|
try {
|
|
@@ -13,7 +21,8 @@ export function isJinjaTemplateEquivalentToSpecializedChatWrapper(jinjaTemplateW
|
|
|
13
21
|
: jinjaTemplateWrapperOptions.convertUnsupportedSystemMessagesToUserMessages,
|
|
14
22
|
trimLeadingWhitespaceInResponses: false
|
|
15
23
|
});
|
|
16
|
-
|
|
24
|
+
const checkChatHistories = getCheckChatHistories(jinjaChatWrapper);
|
|
25
|
+
if (checkEquivalence(jinjaChatWrapper, specializedChatWrapper, checkChatHistories, tokenizer))
|
|
17
26
|
return true;
|
|
18
27
|
}
|
|
19
28
|
catch (err) {
|
|
@@ -27,7 +36,8 @@ export function isJinjaTemplateEquivalentToSpecializedChatWrapper(jinjaTemplateW
|
|
|
27
36
|
: jinjaTemplateWrapperOptions.convertUnsupportedSystemMessagesToUserMessages,
|
|
28
37
|
trimLeadingWhitespaceInResponses: true
|
|
29
38
|
});
|
|
30
|
-
|
|
39
|
+
const checkChatHistories = getCheckChatHistories(jinjaChatWrapperWithLeadingWhitespaceTrimming);
|
|
40
|
+
if (checkEquivalence(jinjaChatWrapperWithLeadingWhitespaceTrimming, specializedChatWrapper, checkChatHistories, tokenizer))
|
|
31
41
|
return true;
|
|
32
42
|
}
|
|
33
43
|
catch (err) {
|
|
@@ -36,30 +46,6 @@ export function isJinjaTemplateEquivalentToSpecializedChatWrapper(jinjaTemplateW
|
|
|
36
46
|
if (!canTestMultipleConvertSystemMessagesToUserMessages)
|
|
37
47
|
return false;
|
|
38
48
|
const convertSystemMessagesToUserMessagesTemplate = "### System message\n\n{{message}}\n\n----";
|
|
39
|
-
const transformedTestChatHistories = testChatHistories
|
|
40
|
-
.map((history) => (history
|
|
41
|
-
.slice()
|
|
42
|
-
.map((item, index, array) => {
|
|
43
|
-
if (item.type === "system") {
|
|
44
|
-
if (index === 0 && array.length > 1 && array[1].type === "user") {
|
|
45
|
-
array[1] = {
|
|
46
|
-
type: "user",
|
|
47
|
-
text: LlamaText([
|
|
48
|
-
LlamaText.joinValues(LlamaText.fromJSON(item.text), convertSystemMessagesToUserMessagesTemplate.split("{{message}}")),
|
|
49
|
-
"\n\n",
|
|
50
|
-
array[1].text
|
|
51
|
-
]).toString()
|
|
52
|
-
};
|
|
53
|
-
return null;
|
|
54
|
-
}
|
|
55
|
-
return {
|
|
56
|
-
type: "user",
|
|
57
|
-
text: LlamaText.joinValues(LlamaText.fromJSON(item.text), convertSystemMessagesToUserMessagesTemplate.split("{{message}}")).toString()
|
|
58
|
-
};
|
|
59
|
-
}
|
|
60
|
-
return item;
|
|
61
|
-
})
|
|
62
|
-
.filter((item) => item != null)));
|
|
63
49
|
try {
|
|
64
50
|
const jinjaChatWrapper = new JinjaTemplateChatWrapper({
|
|
65
51
|
...jinjaTemplateWrapperOptions,
|
|
@@ -69,7 +55,9 @@ export function isJinjaTemplateEquivalentToSpecializedChatWrapper(jinjaTemplateW
|
|
|
69
55
|
},
|
|
70
56
|
trimLeadingWhitespaceInResponses: false
|
|
71
57
|
});
|
|
72
|
-
|
|
58
|
+
const checkChatHistories = getCheckChatHistories(jinjaChatWrapper);
|
|
59
|
+
const transformedCheckChatHistories = convertTestChatHistoriesSystemMessagesToUserMessages(checkChatHistories, convertSystemMessagesToUserMessagesTemplate);
|
|
60
|
+
if (checkEquivalence(jinjaChatWrapper, specializedChatWrapper, transformedCheckChatHistories, tokenizer))
|
|
73
61
|
return true;
|
|
74
62
|
}
|
|
75
63
|
catch (err) {
|
|
@@ -84,7 +72,9 @@ export function isJinjaTemplateEquivalentToSpecializedChatWrapper(jinjaTemplateW
|
|
|
84
72
|
},
|
|
85
73
|
trimLeadingWhitespaceInResponses: true
|
|
86
74
|
});
|
|
87
|
-
|
|
75
|
+
const checkChatHistories = getCheckChatHistories(jinjaChatWrapperWithLeadingWhitespaceTrimming);
|
|
76
|
+
const transformedCheckChatHistories = convertTestChatHistoriesSystemMessagesToUserMessages(checkChatHistories, convertSystemMessagesToUserMessagesTemplate);
|
|
77
|
+
if (checkEquivalence(jinjaChatWrapperWithLeadingWhitespaceTrimming, specializedChatWrapper, transformedCheckChatHistories, tokenizer))
|
|
88
78
|
return true;
|
|
89
79
|
}
|
|
90
80
|
catch (err) {
|
|
@@ -95,7 +85,19 @@ export function isJinjaTemplateEquivalentToSpecializedChatWrapper(jinjaTemplateW
|
|
|
95
85
|
function checkEquivalence(jinjaChatWrapper, specializedChatWrapper, testChatHistories, tokenizer) {
|
|
96
86
|
for (const testChatHistory of testChatHistories) {
|
|
97
87
|
const jinjaRes = jinjaChatWrapper.generateContextState({ chatHistory: testChatHistory });
|
|
98
|
-
|
|
88
|
+
jinjaRes.contextText = convertFunctionNameAndParamsToRegularText(jinjaRes.contextText, testChatHistory);
|
|
89
|
+
const convertedSettings = convertChatWrapperSettingsToUseSpecialTokensText(specializedChatWrapper.settings);
|
|
90
|
+
const originalSpecializedSettings = specializedChatWrapper.settings;
|
|
91
|
+
if (convertedSettings != null)
|
|
92
|
+
specializedChatWrapper.settings = convertedSettings;
|
|
93
|
+
let specializedWrapperRes;
|
|
94
|
+
try {
|
|
95
|
+
specializedWrapperRes = specializedChatWrapper.generateContextState({ chatHistory: testChatHistory });
|
|
96
|
+
}
|
|
97
|
+
finally {
|
|
98
|
+
if (convertedSettings != null)
|
|
99
|
+
specializedChatWrapper.settings = originalSpecializedSettings;
|
|
100
|
+
}
|
|
99
101
|
if (!compareContextTexts(jinjaRes.contextText, specializedWrapperRes.contextText, tokenizer))
|
|
100
102
|
return false;
|
|
101
103
|
const jinjaHasAllSpecializedStopGenerationTriggers = jinjaRes.stopGenerationTriggers
|
|
@@ -156,6 +158,113 @@ function compareContextTexts(text1, text2, tokenizer) {
|
|
|
156
158
|
: [normalizedText2];
|
|
157
159
|
return texts1.some((text1) => (texts2.some((text2) => (compare(text1, text2)))));
|
|
158
160
|
}
|
|
161
|
+
function convertTestChatHistoriesSystemMessagesToUserMessages(chatHistories, template) {
|
|
162
|
+
return chatHistories
|
|
163
|
+
.map((history) => (history
|
|
164
|
+
.slice()
|
|
165
|
+
.map((item, index, array) => {
|
|
166
|
+
if (item.type === "system") {
|
|
167
|
+
if (index === 0 && array.length > 1 && array[1].type === "user") {
|
|
168
|
+
array[1] = {
|
|
169
|
+
type: "user",
|
|
170
|
+
text: LlamaText([
|
|
171
|
+
LlamaText.joinValues(LlamaText.fromJSON(item.text), template.split("{{message}}")),
|
|
172
|
+
"\n\n",
|
|
173
|
+
array[1].text
|
|
174
|
+
]).toString()
|
|
175
|
+
};
|
|
176
|
+
return null;
|
|
177
|
+
}
|
|
178
|
+
return {
|
|
179
|
+
type: "user",
|
|
180
|
+
text: LlamaText.joinValues(LlamaText.fromJSON(item.text), template.split("{{message}}")).toString()
|
|
181
|
+
};
|
|
182
|
+
}
|
|
183
|
+
return item;
|
|
184
|
+
})
|
|
185
|
+
.filter((item) => item != null)));
|
|
186
|
+
}
|
|
187
|
+
function convertChatWrapperSettingsToUseSpecialTokensText(settings) {
|
|
188
|
+
if (settings?.functions == null)
|
|
189
|
+
return null;
|
|
190
|
+
function convertToSpecialTokensText(value, keepTexts) {
|
|
191
|
+
if (value == null)
|
|
192
|
+
return value;
|
|
193
|
+
return LlamaText(LlamaText(value).values
|
|
194
|
+
.map((item) => {
|
|
195
|
+
if (typeof item !== "string")
|
|
196
|
+
return item;
|
|
197
|
+
if (keepTexts == null || keepTexts.length === 0)
|
|
198
|
+
return new SpecialTokensText(item);
|
|
199
|
+
return splitText(item, keepTexts).map((textPart) => {
|
|
200
|
+
if (typeof textPart === "string")
|
|
201
|
+
return new SpecialTokensText(textPart);
|
|
202
|
+
return textPart.separator;
|
|
203
|
+
});
|
|
204
|
+
}));
|
|
205
|
+
}
|
|
206
|
+
return {
|
|
207
|
+
...settings,
|
|
208
|
+
functions: {
|
|
209
|
+
...settings.functions,
|
|
210
|
+
call: {
|
|
211
|
+
...settings.functions.call,
|
|
212
|
+
prefix: convertToSpecialTokensText(settings.functions.call.prefix),
|
|
213
|
+
suffix: convertToSpecialTokensText(settings.functions.call.suffix),
|
|
214
|
+
paramsPrefix: convertToSpecialTokensText(settings.functions.call.paramsPrefix)
|
|
215
|
+
},
|
|
216
|
+
result: {
|
|
217
|
+
...settings.functions.result,
|
|
218
|
+
prefix: convertToSpecialTokensText(settings.functions.result.prefix, ["{{functionName}}", "{{functionParams}}"]),
|
|
219
|
+
suffix: convertToSpecialTokensText(settings.functions.result.suffix, ["{{functionName}}", "{{functionParams}}"])
|
|
220
|
+
},
|
|
221
|
+
parallelism: settings.functions.parallelism == null
|
|
222
|
+
? settings.functions.parallelism
|
|
223
|
+
: {
|
|
224
|
+
...settings.functions.parallelism,
|
|
225
|
+
call: {
|
|
226
|
+
...settings.functions.parallelism.call,
|
|
227
|
+
sectionPrefix: convertToSpecialTokensText(settings.functions.parallelism.call.sectionPrefix),
|
|
228
|
+
betweenCalls: convertToSpecialTokensText(settings.functions.parallelism.call.betweenCalls),
|
|
229
|
+
sectionSuffix: convertToSpecialTokensText(settings.functions.parallelism.call.sectionSuffix)
|
|
230
|
+
},
|
|
231
|
+
result: settings.functions.parallelism.result == null
|
|
232
|
+
? settings.functions.parallelism.result
|
|
233
|
+
: {
|
|
234
|
+
...settings.functions.parallelism.result,
|
|
235
|
+
sectionPrefix: convertToSpecialTokensText(settings.functions.parallelism.result.sectionPrefix),
|
|
236
|
+
betweenResults: convertToSpecialTokensText(settings.functions.parallelism.result.betweenResults),
|
|
237
|
+
sectionSuffix: convertToSpecialTokensText(settings.functions.parallelism.result.sectionSuffix)
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
};
|
|
242
|
+
}
|
|
243
|
+
function convertFunctionNameAndParamsToRegularText(contextText, chatHistory) {
|
|
244
|
+
const ensureRegularTextItems = new Set();
|
|
245
|
+
for (const item of chatHistory) {
|
|
246
|
+
if (item.type !== "model")
|
|
247
|
+
continue;
|
|
248
|
+
for (const response of item.response) {
|
|
249
|
+
if (typeof response === "string" || response.type !== "functionCall")
|
|
250
|
+
continue;
|
|
251
|
+
ensureRegularTextItems.add(response.name);
|
|
252
|
+
if (response.params !== undefined && response.params !== "")
|
|
253
|
+
ensureRegularTextItems.add(jsonDumps(response.params));
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
const ensureRegularTextItemsArray = [...ensureRegularTextItems];
|
|
257
|
+
return LlamaText(contextText.values.map((item) => {
|
|
258
|
+
if (!(item instanceof SpecialTokensText))
|
|
259
|
+
return item;
|
|
260
|
+
return splitText(item.value, ensureRegularTextItemsArray)
|
|
261
|
+
.map((textPart) => {
|
|
262
|
+
if (typeof textPart === "string")
|
|
263
|
+
return new SpecialTokensText(textPart);
|
|
264
|
+
return textPart.separator;
|
|
265
|
+
});
|
|
266
|
+
}));
|
|
267
|
+
}
|
|
159
268
|
const testChatHistories = [
|
|
160
269
|
[{
|
|
161
270
|
type: "system",
|
|
@@ -210,6 +319,64 @@ const testChatHistories = [
|
|
|
210
319
|
response: ["Result2 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"]
|
|
211
320
|
}]
|
|
212
321
|
];
|
|
322
|
+
const testChatHistoriesWithFunctionCalls = [
|
|
323
|
+
[{
|
|
324
|
+
type: "system",
|
|
325
|
+
text: "System message ~!@#$%^&*()\n*"
|
|
326
|
+
}, {
|
|
327
|
+
type: "user",
|
|
328
|
+
text: "Message 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
|
|
329
|
+
}, {
|
|
330
|
+
type: "model",
|
|
331
|
+
response: ["Result 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"]
|
|
332
|
+
}, {
|
|
333
|
+
type: "user",
|
|
334
|
+
text: "Message2 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
|
|
335
|
+
}, {
|
|
336
|
+
type: "model",
|
|
337
|
+
response: [
|
|
338
|
+
"Result2 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~",
|
|
339
|
+
{
|
|
340
|
+
type: "functionCall",
|
|
341
|
+
name: "func1name",
|
|
342
|
+
params: { param1: "value1" },
|
|
343
|
+
result: "func1result"
|
|
344
|
+
},
|
|
345
|
+
"Result3 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
|
|
346
|
+
]
|
|
347
|
+
}],
|
|
348
|
+
[{
|
|
349
|
+
type: "system",
|
|
350
|
+
text: "System message ~!@#$%^&*()\n*"
|
|
351
|
+
}, {
|
|
352
|
+
type: "user",
|
|
353
|
+
text: "Message 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
|
|
354
|
+
}, {
|
|
355
|
+
type: "model",
|
|
356
|
+
response: ["Result 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"]
|
|
357
|
+
}, {
|
|
358
|
+
type: "user",
|
|
359
|
+
text: "Message2 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
|
|
360
|
+
}, {
|
|
361
|
+
type: "model",
|
|
362
|
+
response: [
|
|
363
|
+
"Result2 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~",
|
|
364
|
+
{
|
|
365
|
+
type: "functionCall",
|
|
366
|
+
name: "func1name",
|
|
367
|
+
params: { param1: "value1" },
|
|
368
|
+
result: "func1result"
|
|
369
|
+
},
|
|
370
|
+
{
|
|
371
|
+
type: "functionCall",
|
|
372
|
+
name: "func2name",
|
|
373
|
+
params: { param1: "value2" },
|
|
374
|
+
result: "func2result"
|
|
375
|
+
},
|
|
376
|
+
"Result3 1234567890!@#$%^&*()_+-=[]{}|\\:;\"',./<>?`~"
|
|
377
|
+
]
|
|
378
|
+
}]
|
|
379
|
+
];
|
|
213
380
|
function removeLeadingBos(llamaText) {
|
|
214
381
|
if (llamaText.values.length === 0)
|
|
215
382
|
return llamaText;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isJinjaTemplateEquivalentToSpecializedChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"isJinjaTemplateEquivalentToSpecializedChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,16 +14,18 @@ import { DeepSeekChatWrapper } from "../DeepSeekChatWrapper.js";
|
|
|
14
14
|
import { MistralChatWrapper } from "../MistralChatWrapper.js";
|
|
15
15
|
import { Tokenizer } from "../../types.js";
|
|
16
16
|
import { LlamaModel } from "../../evaluator/LlamaModel/LlamaModel.js";
|
|
17
|
+
import { QwenChatWrapper } from "../QwenChatWrapper.js";
|
|
17
18
|
import type { GgufFileInfo } from "../../gguf/types/GgufFileInfoTypes.js";
|
|
18
|
-
export declare const specializedChatWrapperTypeNames: readonly ["general", "deepSeek", "llama3.2-lightweight", "llama3.1", "llama3", "llama2Chat", "mistral", "alpacaChat", "functionary", "chatML", "falconChat", "gemma"];
|
|
19
|
+
export declare const specializedChatWrapperTypeNames: readonly ["general", "deepSeek", "qwen", "llama3.2-lightweight", "llama3.1", "llama3", "llama2Chat", "mistral", "alpacaChat", "functionary", "chatML", "falconChat", "gemma"];
|
|
19
20
|
export type SpecializedChatWrapperTypeName = (typeof specializedChatWrapperTypeNames)[number];
|
|
20
21
|
export declare const templateChatWrapperTypeNames: readonly ["template", "jinjaTemplate"];
|
|
21
22
|
export type TemplateChatWrapperTypeName = (typeof templateChatWrapperTypeNames)[number];
|
|
22
|
-
export declare const resolvableChatWrapperTypeNames: readonly ["auto", "general", "deepSeek", "llama3.2-lightweight", "llama3.1", "llama3", "llama2Chat", "mistral", "alpacaChat", "functionary", "chatML", "falconChat", "gemma", "template", "jinjaTemplate"];
|
|
23
|
+
export declare const resolvableChatWrapperTypeNames: readonly ["auto", "general", "deepSeek", "qwen", "llama3.2-lightweight", "llama3.1", "llama3", "llama2Chat", "mistral", "alpacaChat", "functionary", "chatML", "falconChat", "gemma", "template", "jinjaTemplate"];
|
|
23
24
|
export type ResolvableChatWrapperTypeName = (typeof resolvableChatWrapperTypeNames)[number];
|
|
24
25
|
export declare const chatWrappers: Readonly<{
|
|
25
26
|
readonly general: typeof GeneralChatWrapper;
|
|
26
27
|
readonly deepSeek: typeof DeepSeekChatWrapper;
|
|
28
|
+
readonly qwen: typeof QwenChatWrapper;
|
|
27
29
|
readonly "llama3.1": typeof Llama3_1ChatWrapper;
|
|
28
30
|
readonly "llama3.2-lightweight": typeof Llama3_2LightweightChatWrapper;
|
|
29
31
|
readonly llama3: typeof Llama3ChatWrapper;
|
|
@@ -77,7 +79,7 @@ export type ResolveChatWrapperWithModelOptions = {
|
|
|
77
79
|
*/
|
|
78
80
|
type?: "auto" | SpecializedChatWrapperTypeName | TemplateChatWrapperTypeName;
|
|
79
81
|
customWrapperSettings?: {
|
|
80
|
-
[wrapper in keyof typeof chatWrappers]?: ConstructorParameters<(typeof chatWrappers)[wrapper]>[0];
|
|
82
|
+
[wrapper in keyof typeof chatWrappers]?: typeof JinjaTemplateChatWrapper extends (typeof chatWrappers)[wrapper] ? Partial<ConstructorParameters<(typeof chatWrappers)[wrapper]>[0]> : ConstructorParameters<(typeof chatWrappers)[wrapper]>[0];
|
|
81
83
|
};
|
|
82
84
|
/**
|
|
83
85
|
* Defaults to `true`.
|
|
@@ -16,11 +16,12 @@ import { DeepSeekChatWrapper } from "../DeepSeekChatWrapper.js";
|
|
|
16
16
|
import { MistralChatWrapper } from "../MistralChatWrapper.js";
|
|
17
17
|
import { includesText } from "../../utils/includesText.js";
|
|
18
18
|
import { LlamaModel } from "../../evaluator/LlamaModel/LlamaModel.js";
|
|
19
|
+
import { QwenChatWrapper } from "../QwenChatWrapper.js";
|
|
19
20
|
import { isJinjaTemplateEquivalentToSpecializedChatWrapper } from "./isJinjaTemplateEquivalentToSpecializedChatWrapper.js";
|
|
20
21
|
import { getModelLinageNames } from "./getModelLinageNames.js";
|
|
21
22
|
export const specializedChatWrapperTypeNames = Object.freeze([
|
|
22
|
-
"general", "deepSeek", "llama3.2-lightweight", "llama3.1", "llama3", "llama2Chat", "mistral", "alpacaChat", "functionary",
|
|
23
|
-
"falconChat", "gemma"
|
|
23
|
+
"general", "deepSeek", "qwen", "llama3.2-lightweight", "llama3.1", "llama3", "llama2Chat", "mistral", "alpacaChat", "functionary",
|
|
24
|
+
"chatML", "falconChat", "gemma"
|
|
24
25
|
]);
|
|
25
26
|
export const templateChatWrapperTypeNames = Object.freeze([
|
|
26
27
|
"template", "jinjaTemplate"
|
|
@@ -33,6 +34,7 @@ export const resolvableChatWrapperTypeNames = Object.freeze([
|
|
|
33
34
|
export const chatWrappers = Object.freeze({
|
|
34
35
|
"general": GeneralChatWrapper,
|
|
35
36
|
"deepSeek": DeepSeekChatWrapper,
|
|
37
|
+
"qwen": QwenChatWrapper,
|
|
36
38
|
"llama3.1": Llama3_1ChatWrapper,
|
|
37
39
|
"llama3.2-lightweight": Llama3_2LightweightChatWrapper,
|
|
38
40
|
"llama3": Llama3ChatWrapper,
|
|
@@ -52,6 +54,7 @@ export function resolveChatWrapper(options, modelOptions) {
|
|
|
52
54
|
if (options instanceof LlamaModel)
|
|
53
55
|
return resolveChatWrapper({
|
|
54
56
|
...(modelOptions ?? {}),
|
|
57
|
+
customWrapperSettings: modelOptions?.customWrapperSettings,
|
|
55
58
|
bosString: options.tokens.bosString,
|
|
56
59
|
filename: options.filename,
|
|
57
60
|
fileInfo: options.fileInfo,
|
|
@@ -89,6 +92,7 @@ export function resolveChatWrapper(options, modelOptions) {
|
|
|
89
92
|
else {
|
|
90
93
|
try {
|
|
91
94
|
return new JinjaTemplateChatWrapper({
|
|
95
|
+
tokenizer,
|
|
92
96
|
...(customWrapperSettings?.jinjaTemplate ?? {}),
|
|
93
97
|
template: jinjaTemplate
|
|
94
98
|
});
|
|
@@ -113,6 +117,7 @@ export function resolveChatWrapper(options, modelOptions) {
|
|
|
113
117
|
const modelJinjaTemplate = customWrapperSettings?.jinjaTemplate?.template ?? fileInfo?.metadata?.tokenizer?.chat_template;
|
|
114
118
|
if (modelJinjaTemplate != null && modelJinjaTemplate.trim() !== "") {
|
|
115
119
|
const jinjaTemplateChatWrapperOptions = {
|
|
120
|
+
tokenizer,
|
|
116
121
|
...(customWrapperSettings?.jinjaTemplate ?? {}),
|
|
117
122
|
template: modelJinjaTemplate
|
|
118
123
|
};
|
|
@@ -136,7 +141,7 @@ export function resolveChatWrapper(options, modelOptions) {
|
|
|
136
141
|
const applyConfig = testConfigurationOrPair instanceof Array
|
|
137
142
|
? (testConfigurationOrPair[1] ?? {})
|
|
138
143
|
: testConfigurationOrPair;
|
|
139
|
-
const
|
|
144
|
+
const additionalJinjaOptions = testConfigurationOrPair instanceof Array
|
|
140
145
|
? testConfigurationOrPair[2]
|
|
141
146
|
: undefined;
|
|
142
147
|
const testChatWrapperSettings = {
|
|
@@ -149,12 +154,13 @@ export function resolveChatWrapper(options, modelOptions) {
|
|
|
149
154
|
};
|
|
150
155
|
const chatWrapper = new Wrapper(testChatWrapperSettings);
|
|
151
156
|
const jinjaTemplateChatWrapperOptionsWithAdditionalParameters = {
|
|
157
|
+
...(additionalJinjaOptions ?? {}),
|
|
152
158
|
...jinjaTemplateChatWrapperOptions,
|
|
153
|
-
additionalRenderParameters:
|
|
159
|
+
additionalRenderParameters: additionalJinjaOptions?.additionalRenderParameters == null
|
|
154
160
|
? jinjaTemplateChatWrapperOptions.additionalRenderParameters
|
|
155
161
|
: {
|
|
156
162
|
...(jinjaTemplateChatWrapperOptions.additionalRenderParameters ?? {}),
|
|
157
|
-
...
|
|
163
|
+
...additionalJinjaOptions.additionalRenderParameters
|
|
158
164
|
}
|
|
159
165
|
};
|
|
160
166
|
if (isJinjaTemplateEquivalentToSpecializedChatWrapper(jinjaTemplateChatWrapperOptionsWithAdditionalParameters, chatWrapper, tokenizer))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/resolveChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resolveChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/resolveChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -133,6 +133,7 @@ export const InspectGpuCommand = {
|
|
|
133
133
|
};
|
|
134
134
|
async function getLlamaForGpu(gpu) {
|
|
135
135
|
try {
|
|
136
|
+
// if you're reading this line, then you're probably looking for the `dryRun` option on `getLlama`
|
|
136
137
|
return await getLlamaForOptions({
|
|
137
138
|
gpu: gpu,
|
|
138
139
|
build: "never",
|