node-llama-cpp 3.0.0-beta.22 → 3.0.0-beta.24
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/{llamaBins → bins}/linux-arm64/_nlcBuildMetadata.json +1 -1
- package/bins/linux-arm64/llama-addon.node +0 -0
- package/{llamaBins → bins}/linux-armv7l/_nlcBuildMetadata.json +1 -1
- package/bins/linux-armv7l/llama-addon.node +0 -0
- package/{llamaBins → bins}/linux-x64/_nlcBuildMetadata.json +1 -1
- package/bins/linux-x64/llama-addon.node +0 -0
- package/{llamaBins → bins}/linux-x64-cuda/_nlcBuildMetadata.json +1 -1
- package/{llamaBins → bins}/linux-x64-cuda/llama-addon.node +0 -0
- package/{llamaBins → bins}/linux-x64-vulkan/_nlcBuildMetadata.json +1 -1
- package/bins/linux-x64-vulkan/llama-addon.node +0 -0
- package/{llamaBins → bins}/mac-arm64-metal/_nlcBuildMetadata.json +1 -1
- package/bins/mac-arm64-metal/default.metallib +0 -0
- package/bins/mac-arm64-metal/llama-addon.node +0 -0
- package/{llamaBins → bins}/mac-x64/_nlcBuildMetadata.json +1 -1
- package/bins/mac-x64/llama-addon.node +0 -0
- package/{llamaBins → bins}/win-arm64/_nlcBuildMetadata.json +1 -1
- package/{llamaBins → bins}/win-arm64/llama-addon.exp +0 -0
- package/{llamaBins → bins}/win-arm64/llama-addon.lib +0 -0
- package/bins/win-arm64/llama-addon.node +0 -0
- package/{llamaBins → bins}/win-x64/_nlcBuildMetadata.json +1 -1
- package/{llamaBins → bins}/win-x64/llama-addon.exp +0 -0
- package/{llamaBins → bins}/win-x64/llama-addon.lib +0 -0
- package/bins/win-x64/llama-addon.node +0 -0
- package/{llamaBins → bins}/win-x64-cuda/_nlcBuildMetadata.json +1 -1
- package/{llamaBins → bins}/win-x64-cuda/llama-addon.exp +0 -0
- package/{llamaBins → bins}/win-x64-cuda/llama-addon.lib +0 -0
- package/{llamaBins → bins}/win-x64-cuda/llama-addon.node +0 -0
- package/{llamaBins → bins}/win-x64-vulkan/_nlcBuildMetadata.json +1 -1
- package/{llamaBins → bins}/win-x64-vulkan/llama-addon.exp +0 -0
- package/{llamaBins → bins}/win-x64-vulkan/llama-addon.lib +0 -0
- package/bins/win-x64-vulkan/llama-addon.node +0 -0
- package/dist/ChatWrapper.d.ts +8 -26
- package/dist/ChatWrapper.js +100 -52
- package/dist/ChatWrapper.js.map +1 -1
- package/dist/{apiDocsOverrides.js → apiDocsIndex.js} +3 -1
- package/dist/apiDocsIndex.js.map +1 -0
- package/dist/bindings/AddonTypes.d.ts +1 -1
- package/dist/bindings/Llama.d.ts +1 -1
- package/dist/bindings/Llama.js +5 -1
- package/dist/bindings/Llama.js.map +1 -1
- package/dist/bindings/getLlama.js.map +1 -1
- package/dist/bindings/types.d.ts +1 -0
- package/dist/bindings/utils/asyncEvery.js.map +1 -1
- package/dist/bindings/utils/asyncSome.js.map +1 -1
- package/dist/bindings/utils/clearAllLocalBuilds.js.map +1 -1
- package/dist/bindings/utils/cloneLlamaCppRepo.js.map +1 -1
- package/dist/bindings/utils/compileLLamaCpp.d.ts +2 -0
- package/dist/bindings/utils/compileLLamaCpp.js +5 -1
- package/dist/bindings/utils/compileLLamaCpp.js.map +1 -1
- package/dist/bindings/utils/detectAvailableComputeLayers.js +2 -1
- package/dist/bindings/utils/detectAvailableComputeLayers.js.map +1 -1
- package/dist/bindings/utils/detectGlibc.js +3 -3
- package/dist/bindings/utils/detectGlibc.js.map +1 -1
- package/dist/bindings/utils/getBestComputeLayersAvailable.d.ts +1 -0
- package/dist/bindings/utils/getBestComputeLayersAvailable.js.map +1 -1
- package/dist/bindings/utils/getBuildFolderNameForBuildOptions.js.map +1 -1
- package/dist/bindings/utils/getExampleUsageCodeOfGetLlama.js.map +1 -1
- package/dist/bindings/utils/getGpuTypesToUseForOption.d.ts +1 -0
- package/dist/bindings/utils/getGpuTypesToUseForOption.js.map +1 -1
- package/dist/bindings/utils/getLinuxDistroInfo.js.map +1 -1
- package/dist/bindings/utils/getPlatform.js.map +1 -1
- package/dist/bindings/utils/getPlatformInfo.js.map +1 -1
- package/dist/bindings/utils/hasBuildingFromSourceDependenciesInstalled.js.map +1 -1
- package/dist/bindings/utils/lastBuildInfo.js.map +1 -1
- package/dist/bindings/utils/logBinaryUsageExampleToConsole.js.map +1 -1
- package/dist/bindings/utils/logDistroInstallInstruction.js.map +1 -1
- package/dist/bindings/utils/resolveCustomCmakeOptions.js +2 -0
- package/dist/bindings/utils/resolveCustomCmakeOptions.js.map +1 -1
- package/dist/bindings/utils/testBindingBinary.js.map +1 -1
- package/dist/bindings/utils/testCmakeBinary.d.ts +1 -0
- package/dist/chatWrappers/ChatMLChatWrapper.d.ts +2 -14
- package/dist/chatWrappers/ChatMLChatWrapper.js +10 -10
- package/dist/chatWrappers/ChatMLChatWrapper.js.map +1 -1
- package/dist/chatWrappers/FalconChatWrapper.d.ts +2 -9
- package/dist/chatWrappers/FalconChatWrapper.js +10 -10
- package/dist/chatWrappers/FalconChatWrapper.js.map +1 -1
- package/dist/chatWrappers/FunctionaryChatWrapper.d.ts +8 -32
- package/dist/chatWrappers/FunctionaryChatWrapper.js +274 -82
- package/dist/chatWrappers/FunctionaryChatWrapper.js.map +1 -1
- package/dist/chatWrappers/GemmaChatWrapper.d.ts +3 -14
- package/dist/chatWrappers/GemmaChatWrapper.js +20 -12
- package/dist/chatWrappers/GemmaChatWrapper.js.map +1 -1
- package/dist/chatWrappers/GeneralChatWrapper.d.ts +2 -9
- package/dist/chatWrappers/GeneralChatWrapper.js +10 -10
- package/dist/chatWrappers/GeneralChatWrapper.js.map +1 -1
- package/dist/chatWrappers/Llama2ChatWrapper.d.ts +2 -10
- package/dist/chatWrappers/Llama2ChatWrapper.js +9 -9
- package/dist/chatWrappers/Llama2ChatWrapper.js.map +1 -1
- package/dist/chatWrappers/Llama3ChatWrapper.d.ts +10 -25
- package/dist/chatWrappers/Llama3ChatWrapper.js +71 -26
- package/dist/chatWrappers/Llama3ChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.d.ts +6 -12
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js +25 -13
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/TemplateChatWrapper.d.ts +14 -24
- package/dist/chatWrappers/generic/TemplateChatWrapper.js +21 -21
- package/dist/chatWrappers/generic/TemplateChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.d.ts +11 -21
- package/dist/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.js +1 -1
- package/dist/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.js.map +1 -1
- package/dist/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.js +8 -4
- package/dist/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.js.map +1 -1
- package/dist/chatWrappers/utils/resolveChatWrapper.js +30 -1
- package/dist/chatWrappers/utils/resolveChatWrapper.js.map +1 -1
- package/dist/cli/commands/BuildCommand.d.ts +6 -1
- package/dist/cli/commands/BuildCommand.js +14 -3
- package/dist/cli/commands/BuildCommand.js.map +1 -1
- package/dist/cli/commands/ChatCommand.js +1 -1
- package/dist/cli/commands/ChatCommand.js.map +1 -1
- package/dist/cli/commands/ClearCommand.js.map +1 -1
- package/dist/cli/commands/CompleteCommand.js.map +1 -1
- package/dist/cli/commands/DownloadCommand.d.ts +1 -0
- package/dist/cli/commands/DownloadCommand.js +1 -1
- package/dist/cli/commands/DownloadCommand.js.map +1 -1
- package/dist/cli/commands/InfillCommand.js.map +1 -1
- package/dist/cli/commands/InitCommand.js.map +1 -1
- package/dist/cli/commands/OnPostInstallCommand.js.map +1 -1
- package/dist/cli/commands/PullCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectGgufCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectGpuCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectMeasureCommand.js.map +1 -1
- package/dist/cli/recommendedModels.js +48 -27
- package/dist/cli/recommendedModels.js.map +1 -1
- package/dist/cli/utils/ConsoleInteraction.js.map +1 -1
- package/dist/cli/utils/ConsoleTable.js.map +1 -1
- package/dist/cli/utils/basicChooseFromListConsoleInteraction.js.map +1 -1
- package/dist/cli/utils/consolePromptQuestion.js.map +1 -1
- package/dist/cli/utils/getReadablePath.js +1 -1
- package/dist/cli/utils/getReadablePath.js.map +1 -1
- package/dist/cli/utils/interactivelyAskForModel.js.map +1 -1
- package/dist/cli/utils/printCommonInfoLines.js.map +1 -1
- package/dist/cli/utils/printInfoLine.js.map +1 -1
- package/dist/cli/utils/projectTemplates.js.map +1 -1
- package/dist/cli/utils/resolveCommandGgufPath.js.map +1 -1
- package/dist/cli/utils/resolveHeaderFlag.js.map +1 -1
- package/dist/cli/utils/splitAnsiToLines.js.map +1 -1
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/evaluator/LlamaChat/LlamaChat.d.ts +79 -8
- package/dist/evaluator/LlamaChat/LlamaChat.js +1212 -481
- package/dist/evaluator/LlamaChat/LlamaChat.js.map +1 -1
- package/dist/evaluator/LlamaChat/utils/FunctionCallNameGrammar.d.ts +11 -0
- package/dist/evaluator/LlamaChat/utils/FunctionCallNameGrammar.js +55 -0
- package/dist/evaluator/LlamaChat/utils/FunctionCallNameGrammar.js.map +1 -0
- package/dist/evaluator/LlamaChat/utils/FunctionCallParamsGrammar.d.ts +16 -0
- package/dist/evaluator/LlamaChat/utils/FunctionCallParamsGrammar.js +45 -0
- package/dist/evaluator/LlamaChat/utils/FunctionCallParamsGrammar.js.map +1 -0
- package/dist/evaluator/LlamaChat/utils/LlamaFunctionCallValidationError.d.ts +8 -0
- package/dist/evaluator/LlamaChat/utils/LlamaFunctionCallValidationError.js +12 -0
- package/dist/evaluator/LlamaChat/utils/LlamaFunctionCallValidationError.js.map +1 -0
- package/dist/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js +24 -16
- package/dist/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.d.ts +110 -5
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js +226 -39
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.d.ts +39 -0
- package/dist/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.js +186 -0
- package/dist/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.js.map +1 -0
- package/dist/evaluator/LlamaCompletion.d.ts +17 -29
- package/dist/evaluator/LlamaCompletion.js +32 -19
- package/dist/evaluator/LlamaCompletion.js.map +1 -1
- package/dist/evaluator/LlamaContext/LlamaContext.d.ts +1 -2
- package/dist/evaluator/LlamaContext/LlamaContext.js +1 -1
- package/dist/evaluator/LlamaContext/LlamaContext.js.map +1 -1
- package/dist/evaluator/LlamaContext/utils/batchItemsPrioritizationStrategies/firstInFirstOutStrategy.js.map +1 -1
- package/dist/evaluator/LlamaContext/utils/batchItemsPrioritizationStrategies/maximumParallelismStrategy.js.map +1 -1
- package/dist/evaluator/LlamaEmbeddingContext.js.map +1 -1
- package/dist/evaluator/LlamaGrammar.d.ts +3 -3
- package/dist/evaluator/LlamaGrammar.js +1 -1
- package/dist/evaluator/LlamaGrammar.js.map +1 -1
- package/dist/evaluator/{LlamaModel.d.ts → LlamaModel/LlamaModel.d.ts} +20 -14
- package/dist/evaluator/{LlamaModel.js → LlamaModel/LlamaModel.js} +100 -18
- package/dist/evaluator/LlamaModel/LlamaModel.js.map +1 -0
- package/dist/evaluator/LlamaModel/utils/TokenAttributes.d.ts +29 -0
- package/dist/evaluator/LlamaModel/utils/TokenAttributes.js +65 -0
- package/dist/evaluator/LlamaModel/utils/TokenAttributes.js.map +1 -0
- package/dist/evaluator/TokenBias.d.ts +1 -1
- package/dist/evaluator/TokenMeter.js.map +1 -1
- package/dist/gguf/fileReaders/GgufFsFileReader.js +2 -1
- package/dist/gguf/fileReaders/GgufFsFileReader.js.map +1 -1
- package/dist/gguf/fileReaders/GgufNetworkFetchFileReader.js.map +1 -1
- package/dist/gguf/insights/GgufInsights.d.ts +6 -0
- package/dist/gguf/insights/GgufInsights.js +20 -0
- package/dist/gguf/insights/GgufInsights.js.map +1 -1
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.d.ts +1 -1
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.js +1 -1
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.js.map +1 -1
- package/dist/gguf/insights/utils/resolveContextContextSizeOption.js.map +1 -1
- package/dist/gguf/insights/utils/resolveModelGpuLayersOption.d.ts +1 -1
- package/dist/gguf/insights/utils/resolveModelGpuLayersOption.js.map +1 -1
- package/dist/gguf/insights/utils/scoreLevels.js.map +1 -1
- package/dist/gguf/parser/GgufV2Parser.js.map +1 -1
- package/dist/gguf/parser/parseGguf.js.map +1 -1
- package/dist/gguf/readGgufFileInfo.js.map +1 -1
- package/dist/gguf/types/GgufMetadataTypes.d.ts +2 -1
- package/dist/gguf/types/GgufMetadataTypes.js.map +1 -1
- package/dist/gguf/utils/convertMetadataKeyValueRecordToNestedObject.js.map +1 -1
- package/dist/gguf/utils/getGgufFileTypeName.js.map +1 -1
- package/dist/gguf/utils/normalizeGgufDownloadUrl.js.map +1 -1
- package/dist/gguf/utils/resolveBinarySplitGgufPartUrls.js.map +1 -1
- package/dist/gguf/utils/resolveSplitGgufParts.js.map +1 -1
- package/dist/index.d.ts +14 -10
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/dist/types.d.ts +68 -8
- package/dist/types.js.map +1 -1
- package/dist/utils/DisposeGuard.js.map +1 -1
- package/dist/utils/LlamaText.d.ts +22 -3
- package/dist/utils/LlamaText.js +107 -7
- package/dist/utils/LlamaText.js.map +1 -1
- package/dist/utils/LruCache.d.ts +12 -0
- package/dist/utils/LruCache.js +44 -0
- package/dist/utils/LruCache.js.map +1 -0
- package/dist/utils/ReplHistory.js.map +1 -1
- package/dist/utils/StopGenerationDetector.d.ts +25 -9
- package/dist/utils/StopGenerationDetector.js +70 -4
- package/dist/utils/StopGenerationDetector.js.map +1 -1
- package/dist/utils/TokenStreamRegulator.d.ts +1 -0
- package/dist/utils/TokenStreamRegulator.js +3 -0
- package/dist/utils/TokenStreamRegulator.js.map +1 -1
- package/dist/utils/appendUserMessageToChatHistory.js.map +1 -1
- package/dist/utils/clearTempFolder.js.map +1 -1
- package/dist/utils/cmake.js.map +1 -1
- package/dist/utils/createModelDownloader.d.ts +6 -0
- package/dist/utils/createModelDownloader.js +5 -2
- package/dist/utils/createModelDownloader.js.map +1 -1
- package/dist/utils/findBestOption.js.map +1 -1
- package/dist/utils/findCharacterRemovalCountToFitChatHistoryInContext.d.ts +1 -0
- package/dist/utils/findCharacterRemovalCountToFitChatHistoryInContext.js +5 -4
- package/dist/utils/findCharacterRemovalCountToFitChatHistoryInContext.js.map +1 -1
- package/dist/utils/gbnfJson/GbnfGrammarGenerator.js.map +1 -1
- package/dist/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.js +1 -1
- package/dist/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfRepetition.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfWhitespace.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/gbnfConsts.d.ts +1 -1
- package/dist/utils/gbnfJson/types.d.ts +3 -0
- package/dist/utils/gbnfJson/types.js.map +1 -1
- package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.js.map +1 -1
- package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js.map +1 -1
- package/dist/utils/getGrammarsFolder.js.map +1 -1
- package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js.map +1 -1
- package/dist/utils/gitReleaseBundles.js.map +1 -1
- package/dist/utils/isUrl.js.map +1 -1
- package/dist/utils/parseModelFileName.js.map +1 -1
- package/dist/utils/parseTextTemplate.js.map +1 -1
- package/dist/utils/prettyPrintObject.js.map +1 -1
- package/dist/utils/removeNullFields.js.map +1 -1
- package/dist/utils/resolveGithubRelease.d.ts +1 -1
- package/dist/utils/resolveGithubRelease.js.map +1 -1
- package/dist/utils/safeEventCallback.d.ts +6 -0
- package/dist/utils/safeEventCallback.js +29 -0
- package/dist/utils/safeEventCallback.js.map +1 -0
- package/dist/utils/spawnCommand.js.map +1 -1
- package/dist/utils/truncateTextAndRoundToWords.d.ts +2 -0
- package/dist/utils/truncateTextAndRoundToWords.js +30 -0
- package/dist/utils/truncateTextAndRoundToWords.js.map +1 -1
- package/dist/utils/waitForLockfileRelease.js.map +1 -1
- package/dist/utils/withLockfile.js.map +1 -1
- package/dist/utils/withOra.js.map +1 -1
- package/dist/utils/withProgressLog.js.map +1 -1
- package/dist/utils/withStatusLogs.js.map +1 -1
- package/dist/utils/wrapAbortSignal.d.ts +2 -0
- package/dist/utils/wrapAbortSignal.js +9 -0
- package/dist/utils/wrapAbortSignal.js.map +1 -0
- package/llama/addon.cpp +9 -9
- package/llama/binariesGithubRelease.json +1 -1
- package/llama/gitRelease.bundle +0 -0
- package/llama/llama.cpp.info.json +1 -1
- package/package.json +33 -35
- package/templates/packed/electron-typescript-react.json +1 -1
- package/templates/packed/node-typescript.json +1 -1
- package/dist/apiDocsOverrides.js.map +0 -1
- package/dist/evaluator/LlamaChat/utils/FunctionCallGrammar.d.ts +0 -22
- package/dist/evaluator/LlamaChat/utils/FunctionCallGrammar.js +0 -122
- package/dist/evaluator/LlamaChat/utils/FunctionCallGrammar.js.map +0 -1
- package/dist/evaluator/LlamaModel.js.map +0 -1
- package/llamaBins/linux-arm64/llama-addon.node +0 -0
- package/llamaBins/linux-armv7l/llama-addon.node +0 -0
- package/llamaBins/linux-x64/llama-addon.node +0 -0
- package/llamaBins/linux-x64-vulkan/llama-addon.node +0 -0
- package/llamaBins/mac-arm64-metal/default.metallib +0 -0
- package/llamaBins/mac-arm64-metal/llama-addon.node +0 -0
- package/llamaBins/mac-x64/llama-addon.node +0 -0
- package/llamaBins/win-arm64/llama-addon.node +0 -0
- package/llamaBins/win-x64/llama-addon.node +0 -0
- package/llamaBins/win-x64-vulkan/llama-addon.node +0 -0
- /package/dist/{apiDocsOverrides.d.ts → apiDocsIndex.d.ts} +0 -0
|
@@ -39,16 +39,20 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
39
39
|
this.joinAdjacentMessagesOfTheSameType = joinAdjacentMessagesOfTheSameType;
|
|
40
40
|
this.trimLeadingWhitespaceInResponses = trimLeadingWhitespaceInResponses;
|
|
41
41
|
this.settings = {
|
|
42
|
-
...
|
|
43
|
-
functions: parseFunctionCallMessageTemplate(functionCallMessageTemplate) ?? ChatWrapper.
|
|
42
|
+
...ChatWrapper.defaultSettings,
|
|
43
|
+
functions: parseFunctionCallMessageTemplate(functionCallMessageTemplate) ?? ChatWrapper.defaultSettings.functions
|
|
44
44
|
};
|
|
45
45
|
if (this.convertUnsupportedSystemMessagesToUserMessages != null && !this.convertUnsupportedSystemMessagesToUserMessages.format.includes("{{message}}"))
|
|
46
46
|
throw new Error('convertUnsupportedSystemMessagesToUserMessages format must include "{{message}}"');
|
|
47
47
|
this._jinjaTemplate = new Template(this.template);
|
|
48
|
-
this._runSanityTest();
|
|
48
|
+
const { supportsSystemMessages } = this._runSanityTest();
|
|
49
|
+
this.settings = {
|
|
50
|
+
...this.settings,
|
|
51
|
+
supportsSystemMessages
|
|
52
|
+
};
|
|
49
53
|
}
|
|
50
|
-
|
|
51
|
-
const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(
|
|
54
|
+
generateContextState({ chatHistory, availableFunctions, documentFunctionParams }) {
|
|
55
|
+
const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(chatHistory, availableFunctions, {
|
|
52
56
|
documentParams: documentFunctionParams
|
|
53
57
|
});
|
|
54
58
|
if (this.convertUnsupportedSystemMessagesToUserMessages == null) {
|
|
@@ -74,14 +78,17 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
74
78
|
}
|
|
75
79
|
/** @internal */
|
|
76
80
|
_generateContextText(history, { convertSystemMessagesToUserMessagesFormat }) {
|
|
81
|
+
let transformedSystemMessagesToUserMessages = false;
|
|
77
82
|
const transformedHistory = convertSystemMessagesToUserMessagesFormat == null
|
|
78
83
|
? history
|
|
79
84
|
: history.map((item) => {
|
|
80
|
-
if (item.type === "system")
|
|
85
|
+
if (item.type === "system") {
|
|
86
|
+
transformedSystemMessagesToUserMessages = true;
|
|
81
87
|
return {
|
|
82
88
|
type: "user",
|
|
83
|
-
text: convertSystemMessagesToUserMessagesFormat.
|
|
89
|
+
text: LlamaText.joinValues(LlamaText.fromJSON(item.text), convertSystemMessagesToUserMessagesFormat.split("{{message}}")).toString()
|
|
84
90
|
};
|
|
91
|
+
}
|
|
85
92
|
return item;
|
|
86
93
|
});
|
|
87
94
|
const resultItems = [];
|
|
@@ -89,7 +96,7 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
89
96
|
let currentAggregateFocus = null;
|
|
90
97
|
function flush() {
|
|
91
98
|
if (currentTexts.length > 0 && currentAggregateFocus != null)
|
|
92
|
-
resultItems.push({ role: currentAggregateFocus, content:
|
|
99
|
+
resultItems.push({ role: currentAggregateFocus, content: LlamaText.joinValues("\n\n", currentTexts) });
|
|
93
100
|
currentTexts.length = 0;
|
|
94
101
|
}
|
|
95
102
|
for (const item of transformedHistory) {
|
|
@@ -97,13 +104,13 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
97
104
|
if (!this.joinAdjacentMessagesOfTheSameType || currentAggregateFocus !== "system")
|
|
98
105
|
flush();
|
|
99
106
|
currentAggregateFocus = "system";
|
|
100
|
-
currentTexts.push(item.text);
|
|
107
|
+
currentTexts.push(LlamaText.fromJSON(item.text));
|
|
101
108
|
}
|
|
102
109
|
else if (item.type === "user") {
|
|
103
110
|
if (!this.joinAdjacentMessagesOfTheSameType || currentAggregateFocus !== "user")
|
|
104
111
|
flush();
|
|
105
112
|
currentAggregateFocus = "user";
|
|
106
|
-
currentTexts.push(item.text);
|
|
113
|
+
currentTexts.push(LlamaText(item.text));
|
|
107
114
|
}
|
|
108
115
|
else if (item.type === "model") {
|
|
109
116
|
if (!this.joinAdjacentMessagesOfTheSameType || currentAggregateFocus !== "model")
|
|
@@ -117,7 +124,7 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
117
124
|
const lastItemIsModelMessage = currentAggregateFocus === "model";
|
|
118
125
|
flush();
|
|
119
126
|
const idsGenerator = new UniqueTemplateId(this.template + this.modelRoleName + this.userRoleName + this.systemRoleName +
|
|
120
|
-
(convertSystemMessagesToUserMessagesFormat ?? "") + resultItems.map(({ content }) => content).join("\n\n"));
|
|
127
|
+
(convertSystemMessagesToUserMessagesFormat ?? "") + resultItems.map(({ content }) => content.toString()).join("\n\n"));
|
|
121
128
|
const jinjaItems = [];
|
|
122
129
|
const jinjaRoleMap = {
|
|
123
130
|
system: this.systemRoleName,
|
|
@@ -244,7 +251,8 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
244
251
|
return message;
|
|
245
252
|
}))
|
|
246
253
|
])
|
|
247
|
-
]
|
|
254
|
+
],
|
|
255
|
+
transformedSystemMessagesToUserMessages
|
|
248
256
|
};
|
|
249
257
|
}
|
|
250
258
|
/**
|
|
@@ -253,9 +261,13 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
253
261
|
*/
|
|
254
262
|
_runSanityTest() {
|
|
255
263
|
try {
|
|
264
|
+
let supportsSystemMessages = true;
|
|
256
265
|
for (const chatHistory of chatHistoriesForSanityTest) {
|
|
257
|
-
this.
|
|
266
|
+
const { transformedSystemMessagesToUserMessages } = this.generateContextState({ chatHistory });
|
|
267
|
+
if (transformedSystemMessagesToUserMessages)
|
|
268
|
+
supportsSystemMessages = false;
|
|
258
269
|
}
|
|
270
|
+
return { supportsSystemMessages };
|
|
259
271
|
}
|
|
260
272
|
catch (err) {
|
|
261
273
|
throw new Error("The provided Jinja template failed that sanity test: " + String(err));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JinjaTemplateChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/generic/JinjaTemplateChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAC,YAAY,EAAE,SAAS,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAyC,gCAAgC,EAAC,MAAM,mDAAmD,CAAC;AA+C3I,MAAM,2DAA2D,GAAgC;IAC7F,MAAM,EAAE,2CAA2C;CACtD,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,OAAO,wBAAyB,SAAQ,WAAW;IACrC,WAAW,GAAG,eAAe,CAAC;IACrB,QAAQ,CAAsB;IAEvC,QAAQ,CAAS;IACjB,aAAa,CAAS;IACtB,YAAY,CAAS;IACrB,cAAc,CAAS;IACvB,8CAA8C,CAA+B;IAC7E,iCAAiC,CAAU;IAC3C,gCAAgC,CAAU;IAE1D,gBAAgB,CAAkB,cAAc,CAAW;IAE3D,YAAmB,EACf,QAAQ,EACR,aAAa,GAAG,WAAW,EAC3B,YAAY,GAAG,MAAM,EACrB,cAAc,GAAG,QAAQ,EACzB,8CAA8C,GAAG,2DAA2D,EAC5G,2BAA2B,EAC3B,iCAAiC,GAAG,IAAI,EACxC,gCAAgC,GAAG,IAAI,EACT;QAC9B,KAAK,EAAE,CAAC;QAER,IAAI,QAAQ,IAAI,IAAI;YAChB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAE/C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,8CAA8C;YAC/C,2DAA2D,CAAC,8CAA8C,CAAC,CAAC;QAChH,IAAI,CAAC,iCAAiC,GAAG,iCAAiC,CAAC;QAC3E,IAAI,CAAC,gCAAgC,GAAG,gCAAgC,CAAC;QAEzE,IAAI,CAAC,QAAQ,GAAG;YACZ,GAAG,KAAK,CAAC,QAAQ;YACjB,SAAS,EAAE,gCAAgC,CAAC,2BAA2B,CAAC,IAAI,WAAW,CAAC,cAAc,CAAC,SAAS;SACnH,CAAC;QAEF,IAAI,IAAI,CAAC,8CAA8C,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,8CAA8C,CAAC,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;YAClJ,MAAM,IAAI,KAAK,CAAC,kFAAkF,CAAC,CAAC;QAExG,IAAI,CAAC,cAAc,GAAG,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAEe,mBAAmB,CAAC,OAAmC,EAAE,EAAC,kBAAkB,EAAE,sBAAsB,KAGhH,EAAE;QAIF,MAAM,oBAAoB,GAAG,IAAI,CAAC,2CAA2C,CAAC,OAAO,EAAE,kBAAkB,EAAE;YACvG,cAAc,EAAE,sBAAsB;SACzC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,8CAA8C,IAAI,IAAI,EAAE;YAC7D,OAAO,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,EAAE;gBACnD,yCAAyC,EAAE,SAAS;aACvD,CAAC,CAAC;SACN;aAAM,IAAI,IAAI,CAAC,8CAA8C,CAAC,GAAG,KAAK,QAAQ,EAAE;YAC7E,OAAO,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,EAAE;gBACnD,yCAAyC,EAAE,IAAI,CAAC,8CAA8C,CAAC,MAAM;aACxG,CAAC,CAAC;SACN;QAED,IAAI;YACA,OAAO,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,EAAE;gBACnD,yCAAyC,EAAE,SAAS;aACvD,CAAC,CAAC;SACN;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,EAAE;gBACnD,yCAAyC,EAAE,IAAI,CAAC,8CAA8C,CAAC,MAAM;aACxG,CAAC,CAAC;SACN;IACL,CAAC;IAED,gBAAgB;IACR,oBAAoB,CAAC,OAAmC,EAAE,EAC9D,yCAAyC,EAG5C;QAKG,MAAM,kBAAkB,GAAG,yCAAyC,IAAI,IAAI;YACxE,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACnB,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ;oBACtB,OAAO;wBACH,IAAI,EAAE,MAAM;wBACZ,IAAI,EAAE,yCAAyC,CAAC,UAAU,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC;qBAC7D,CAAC;gBAEhC,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC,CAAC;QAEP,MAAM,WAAW,GAGZ,EAAE,CAAC;QAER,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,IAAI,qBAAqB,GAAuC,IAAI,CAAC;QAErE,SAAS,KAAK;YACV,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,qBAAqB,IAAI,IAAI;gBACxD,WAAW,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,qBAAqB,EAAE,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;YAExF,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5B,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,kBAAkB,EAAE;YACnC,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACxB,IAAI,CAAC,IAAI,CAAC,iCAAiC,IAAI,qBAAqB,KAAK,QAAQ;oBAC7E,KAAK,EAAE,CAAC;gBAEZ,qBAAqB,GAAG,QAAQ,CAAC;gBACjC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAChC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE;gBAC7B,IAAI,CAAC,IAAI,CAAC,iCAAiC,IAAI,qBAAqB,KAAK,MAAM;oBAC3E,KAAK,EAAE,CAAC;gBAEZ,qBAAqB,GAAG,MAAM,CAAC;gBAC/B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAChC;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC9B,IAAI,CAAC,IAAI,CAAC,iCAAiC,IAAI,qBAAqB,KAAK,OAAO;oBAC5E,KAAK,EAAE,CAAC;gBAEZ,qBAAqB,GAAG,OAAO,CAAC;gBAChC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;aACpE;;gBACG,KAAK,CAAC,IAAoB,CAAC,CAAC;SACnC;QAED,MAAM,sBAAsB,GAAG,qBAAqB,KAAK,OAAO,CAAC;QACjE,KAAK,EAAE,CAAC;QAER,MAAM,YAAY,GAAG,IAAI,gBAAgB,CACrC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,cAAc;YAC5E,CAAC,yCAAyC,IAAI,EAAE,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAC,OAAO,EAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAC3G,CAAC;QAEF,MAAM,UAAU,GAGX,EAAE,CAAC;QACR,MAAM,YAAY,GAAG;YACjB,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,IAAI,EAAE,IAAI,CAAC,YAAY;YACvB,KAAK,EAAE,IAAI,CAAC,aAAa;SACnB,CAAC;QACX,MAAM,WAAW,GAAG,IAAI,GAAG,EAAiC,CAAC;QAC7D,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QAErC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YAClC,MAAM,EAAE,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;YAErC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACnB,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;YACxC,UAAU,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;gBACnC,OAAO,EAAE,EAAE;aACd,CAAC,CAAC;YAEH,IAAI,UAAU,CAAC,IAAI,KAAK,OAAO;gBAC3B,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SAC/B;QAED,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;QAC7C,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;QAC7C,MAAM,UAAU,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;QAE7C,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QACrD,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QACrD,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QAErD,MAAM,eAAe,GAAG,GAAG,EAAE;YACzB,IAAI;gBACA,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;oBAC9B,QAAQ,EAAE,UAAU;oBACpB,WAAW,EAAE,UAAU;oBACvB,WAAW,EAAE,UAAU;oBACvB,WAAW,EAAE,UAAU;iBAC1B,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;oBAC9B,QAAQ,EAAE,UAAU;oBACpB,WAAW,EAAE,UAAU;oBACvB,WAAW,EAAE,UAAU;oBACvB,WAAW,EAAE,UAAU;oBACvB,uBAAuB,EAAE,IAAI;iBAChC,CAAC,CAAC;aACN;QACL,CAAC,CAAC;QAEF,MAAM,gCAAgC,GAAG,CAAC,KAA6C,EAAE,EAAE;YACvF,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;YAE3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;gBACtB,IAAI,OAAO,IAAI,KAAK,QAAQ;oBACxB,SAAS;gBAEb,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACzC;YAED,IAAI,cAAc,CAAC,IAAI,KAAK,CAAC;gBACzB,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;QACtG,CAAC,CAAC;QAEF,MAAM,4BAA4B,GAAG,GAAG,EAAE;YACtC,MAAM,eAAe,GAAG,SAAS,CAAC,eAAe,EAAE,EAAE,CAAC,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAE9E,IAAI,sBAAsB,EAAE;gBACxB,IAAI,sBAAsB,GAAG,CAAC,CAAC,CAAC;gBAEhC,KAAK,IAAI,CAAC,GAAG,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;oBAClD,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;oBAEhC,IAAI,OAAO,IAAI,KAAK,QAAQ;wBACxB,SAAS;oBAEb,IAAI,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACrC,sBAAsB,GAAG,CAAC,CAAC;wBAC3B,MAAM;qBACT;yBAAM,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBACvC,gCAAgC,CAAC,eAAe,CAAC,CAAC;wBAClD,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;qBACtF;iBACJ;gBAED,IAAI,sBAAsB,GAAG,CAAC,EAAE;oBAC5B,gCAAgC,CAAC,eAAe,CAAC,CAAC;oBAClD,MAAM,IAAI,KAAK,CAAC,2EAA2E,CAAC,CAAC;iBAChG;gBAED,OAAO;oBACH,eAAe,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,sBAAsB,GAAG,CAAC,CAAC;oBACrE,wBAAwB,EAAE,eAAe,CAAC,KAAK,CAAC,sBAAsB,GAAG,CAAC,CAAC;iBAC9E,CAAC;aACL;YAED,OAAO;gBACH,eAAe;gBACf,wBAAwB,EAAE,EAAE;aAC/B,CAAC;QACN,CAAC,CAAC;QAEF,MAAM,EAAC,eAAe,EAAE,wBAAwB,EAAC,GAAG,4BAA4B,EAAE,CAAC;QAEnF,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,WAAW,GAAG,SAAS,CACzB,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,IAAI,OAAO,IAAI,KAAK,QAAQ;gBACxB,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,2EAA2E;YAEnH,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEhD,IAAI,OAAO,IAAI,IAAI;gBACf,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,aAAa,CAAC,CAAC;YAErE,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAE/C,OAAO,OAAO,CAAC;QACnB,CAAC,CAAC,CACL,CAAC;QAEF,IAAI,uBAAuB,CAAC,IAAI,KAAK,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAElG,OAAO;YACH,WAAW;YACX,eAAe,EAAE,CAAC,IAAI,CAAC,gCAAgC;gBACnD,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC;oBACE,gCAAgC;oBAChC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;yBACd,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;oBACxD,SAAS,CAAC,IAAI,CAAC;oBACf,SAAS,CAAC,MAAM,CAAC;oBACjB,SAAS,CAAC,KAAK,CAAC;oBAChB,SAAS,CAAC,KAAK,CAAC;iBACnB;YACL,sBAAsB,EAAE;gBACpB,SAAS,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;gBAClC,GAAG,CACC,wBAAwB,CAAC,MAAM,KAAK,CAAC;oBACjC,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC;wBACE,SAAS,CACL,wBAAwB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;4BAClC,IAAI,OAAO,IAAI,KAAK,QAAQ;gCACxB,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;4BAEvC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;4BAEhD,IAAI,OAAO,IAAI,IAAI;gCACf,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,aAAa,CAAC,CAAC;4BAErE,OAAO,OAAO,CAAC;wBACnB,CAAC,CAAC,CACL;qBACJ,CACR;aACJ;SACJ,CAAC;IACN,CAAC;IAED;;;OAGG;IACK,cAAc;QAClB,IAAI;YACA,KAAK,MAAM,WAAW,IAAI,0BAA0B,EAAE;gBAClD,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;aACzC;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,uDAAuD,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;SAC1F;IACL,CAAC;CACJ;AAED,MAAM,gBAAgB;IACF,QAAQ,CAAS;IAChB,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE1C,YAAmB,QAAgB;QAC/B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAEM,UAAU;QACb,IAAI,EAAU,CAAC;QAEf,GAAG;YACC,EAAE,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE;iBACpB,QAAQ,CAAC,EAAE,CAAC;iBACZ,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;SACxB,QAAQ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;QAE1D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAElB,OAAO,EAAE,CAAC;IACd,CAAC;IAEM,QAAQ,CAAC,EAAU;QACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;CACJ;AAED,SAAS,2DAA2D,CAChE,8CAAkI;IAElI,IAAI,8CAA8C,KAAK,KAAK;QACxD,OAAO,SAAS,CAAC;IAErB,IAAI,8CAA8C,KAAK,IAAI;QACvD,OAAO;YACH,GAAG,2DAA2D;YAC9D,GAAG,EAAE,QAAQ;SAChB,CAAC;IAEN,IAAI,8CAA8C,KAAK,MAAM;QACzD,OAAO;YACH,GAAG,2DAA2D;YAC9D,GAAG,EAAE,UAAU;SAClB,CAAC;IAEN,IAAI,OAAO,8CAA8C,KAAK,QAAQ;QAClE,OAAO;YACH,GAAG,8CAA8C;YACjD,GAAG,EAAE,8CAA8C,CAAC,GAAG,IAAI,UAAU;SACxE,CAAC;IAEN,OAAO,EAAC,GAAG,2DAA2D,EAAE,GAAG,EAAE,UAAU,EAAC,CAAC;AAC7F,CAAC;AAED,MAAM,0BAA0B,GAAwB;IACpD,CAAC;YACG,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,+BAA+B;SACxC,EAAE;YACC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,sDAAsD;SAC/D,EAAE;YACC,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,CAAC,EAAE,CAAC;SACjB,CAAC;IAEF,CAAC;YACG,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,+BAA+B;SACxC,EAAE;YACC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,sDAAsD;SAC/D,EAAE;YACC,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,CAAC,qDAAqD,CAAC;SACpE,CAAC;IAEF,CAAC;YACG,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,+BAA+B;SACxC,EAAE;YACC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,sDAAsD;SAC/D,EAAE;YACC,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,CAAC,qDAAqD,CAAC;SACpE,EAAE;YACC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,uDAAuD;SAChE,EAAE;YACC,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,CAAC,EAAE,CAAC;SACjB,CAAC;IAEF,CAAC;YACG,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,+BAA+B;SACxC,EAAE;YACC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,sDAAsD;SAC/D,EAAE;YACC,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,CAAC,qDAAqD,CAAC;SACpE,EAAE;YACC,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,uDAAuD;SAChE,EAAE;YACC,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,CAAC,sDAAsD,CAAC;SACrE,CAAC;CACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"JinjaTemplateChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/generic/JinjaTemplateChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { LlamaText } from "../../utils/LlamaText.js";
|
|
1
|
+
import { ChatWrapperGenerateContextStateOptions, ChatWrapperGeneratedContextState, ChatWrapperSettings } from "../../types.js";
|
|
3
2
|
import { ChatWrapper } from "../../ChatWrapper.js";
|
|
4
3
|
import { ChatHistoryFunctionCallMessageTemplate } from "./utils/chatHistoryFunctionCallMessageTemplate.js";
|
|
5
4
|
export type TemplateChatWrapperOptions = {
|
|
6
|
-
template:
|
|
7
|
-
historyTemplate:
|
|
5
|
+
template: `${"" | `${string}{{systemPrompt}}`}${string}{{history}}${string}{{completion}}${string}`;
|
|
6
|
+
historyTemplate: `${string}{{roleName}}${string}{{message}}${string}`;
|
|
8
7
|
modelRoleName: string;
|
|
9
8
|
userRoleName: string;
|
|
10
9
|
systemRoleName?: string;
|
|
11
10
|
functionCallMessageTemplate?: ChatHistoryFunctionCallMessageTemplate;
|
|
12
11
|
joinAdjacentMessagesOfTheSameType?: boolean;
|
|
13
12
|
};
|
|
14
|
-
type ChatTemplate = `${`${string}{{systemPrompt}}` | ""}${string}{{history}}${string}{{completion}}${string}`;
|
|
15
|
-
type ChatHistoryTemplate = `${string}{{roleName}}${string}{{message}}${string}`;
|
|
16
13
|
/**
|
|
17
14
|
* A chat wrapper based on a simple template.
|
|
18
15
|
* @example
|
|
@@ -23,21 +20,21 @@ type ChatHistoryTemplate = `${string}{{roleName}}${string}{{message}}${string}`;
|
|
|
23
20
|
* modelRoleName: "model",
|
|
24
21
|
* userRoleName: "user",
|
|
25
22
|
* systemRoleName: "system", // optional
|
|
26
|
-
* // functionCallMessageTemplate:
|
|
27
|
-
* // "[[call: {{functionName}}({{functionParams}})]]",
|
|
28
|
-
* // " [[result: {{functionCallResult}}]]"
|
|
29
|
-
* //
|
|
23
|
+
* // functionCallMessageTemplate: { // optional
|
|
24
|
+
* // call: "[[call: {{functionName}}({{functionParams}})]]",
|
|
25
|
+
* // result: " [[result: {{functionCallResult}}]]"
|
|
26
|
+
* // }
|
|
30
27
|
* });
|
|
31
28
|
* ```
|
|
32
29
|
*
|
|
33
|
-
*
|
|
30
|
+
* **<span v-pre>`{{systemPrompt}}`</span>** is optional and is replaced with the first system message
|
|
34
31
|
* (when is does, that system message is not included in the history).
|
|
35
32
|
*
|
|
36
|
-
*
|
|
33
|
+
* **<span v-pre>`{{history}}`</span>** is replaced with the chat history.
|
|
37
34
|
* Each message in the chat history is converted using template passed to `historyTemplate`, and all messages are joined together.
|
|
38
35
|
*
|
|
39
|
-
*
|
|
40
|
-
* The text that comes after
|
|
36
|
+
* **<span v-pre>`{{completion}}`</span>** is where the model's response is generated.
|
|
37
|
+
* The text that comes after <span v-pre>`{{completion}}`</span> is used to determine when the model has finished generating the response,
|
|
41
38
|
* and thus is mandatory.
|
|
42
39
|
*
|
|
43
40
|
* **`functionCallMessageTemplate`** is used to specify the format in which functions can be called by the model and
|
|
@@ -46,19 +43,12 @@ type ChatHistoryTemplate = `${string}{{roleName}}${string}{{message}}${string}`;
|
|
|
46
43
|
export declare class TemplateChatWrapper extends ChatWrapper {
|
|
47
44
|
readonly wrapperName = "Template";
|
|
48
45
|
readonly settings: ChatWrapperSettings;
|
|
49
|
-
readonly template:
|
|
50
|
-
readonly historyTemplate:
|
|
46
|
+
readonly template: TemplateChatWrapperOptions["template"];
|
|
47
|
+
readonly historyTemplate: TemplateChatWrapperOptions["historyTemplate"];
|
|
51
48
|
readonly modelRoleName: string;
|
|
52
49
|
readonly userRoleName: string;
|
|
53
50
|
readonly systemRoleName: string;
|
|
54
51
|
readonly joinAdjacentMessagesOfTheSameType: boolean;
|
|
55
52
|
constructor({ template, historyTemplate, modelRoleName, userRoleName, systemRoleName, functionCallMessageTemplate, joinAdjacentMessagesOfTheSameType }: TemplateChatWrapperOptions);
|
|
56
|
-
|
|
57
|
-
availableFunctions?: ChatModelFunctions;
|
|
58
|
-
documentFunctionParams?: boolean;
|
|
59
|
-
}): {
|
|
60
|
-
contextText: LlamaText;
|
|
61
|
-
stopGenerationTriggers: LlamaText[];
|
|
62
|
-
};
|
|
53
|
+
generateContextState({ chatHistory, availableFunctions, documentFunctionParams }: ChatWrapperGenerateContextStateOptions): ChatWrapperGeneratedContextState;
|
|
63
54
|
}
|
|
64
|
-
export {};
|
|
@@ -12,21 +12,21 @@ import { parseFunctionCallMessageTemplate } from "./utils/chatHistoryFunctionCal
|
|
|
12
12
|
* modelRoleName: "model",
|
|
13
13
|
* userRoleName: "user",
|
|
14
14
|
* systemRoleName: "system", // optional
|
|
15
|
-
* // functionCallMessageTemplate:
|
|
16
|
-
* // "[[call: {{functionName}}({{functionParams}})]]",
|
|
17
|
-
* // " [[result: {{functionCallResult}}]]"
|
|
18
|
-
* //
|
|
15
|
+
* // functionCallMessageTemplate: { // optional
|
|
16
|
+
* // call: "[[call: {{functionName}}({{functionParams}})]]",
|
|
17
|
+
* // result: " [[result: {{functionCallResult}}]]"
|
|
18
|
+
* // }
|
|
19
19
|
* });
|
|
20
20
|
* ```
|
|
21
21
|
*
|
|
22
|
-
*
|
|
22
|
+
* **<span v-pre>`{{systemPrompt}}`</span>** is optional and is replaced with the first system message
|
|
23
23
|
* (when is does, that system message is not included in the history).
|
|
24
24
|
*
|
|
25
|
-
*
|
|
25
|
+
* **<span v-pre>`{{history}}`</span>** is replaced with the chat history.
|
|
26
26
|
* Each message in the chat history is converted using template passed to `historyTemplate`, and all messages are joined together.
|
|
27
27
|
*
|
|
28
|
-
*
|
|
29
|
-
* The text that comes after
|
|
28
|
+
* **<span v-pre>`{{completion}}`</span>** is where the model's response is generated.
|
|
29
|
+
* The text that comes after <span v-pre>`{{completion}}`</span> is used to determine when the model has finished generating the response,
|
|
30
30
|
* and thus is mandatory.
|
|
31
31
|
*
|
|
32
32
|
* **`functionCallMessageTemplate`** is used to specify the format in which functions can be called by the model and
|
|
@@ -56,12 +56,12 @@ export class TemplateChatWrapper extends ChatWrapper {
|
|
|
56
56
|
this._parsedChatTemplate = parseChatTemplate(template);
|
|
57
57
|
this._parsedChatHistoryTemplate = parseChatHistoryTemplate(historyTemplate);
|
|
58
58
|
this.settings = {
|
|
59
|
-
...
|
|
60
|
-
functions: parseFunctionCallMessageTemplate(functionCallMessageTemplate) ?? ChatWrapper.
|
|
59
|
+
...ChatWrapper.defaultSettings,
|
|
60
|
+
functions: parseFunctionCallMessageTemplate(functionCallMessageTemplate) ?? ChatWrapper.defaultSettings.functions
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
|
-
|
|
64
|
-
const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(
|
|
63
|
+
generateContextState({ chatHistory, availableFunctions, documentFunctionParams }) {
|
|
64
|
+
const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(chatHistory, availableFunctions, {
|
|
65
65
|
documentParams: documentFunctionParams
|
|
66
66
|
});
|
|
67
67
|
const resultItems = [];
|
|
@@ -72,9 +72,9 @@ export class TemplateChatWrapper extends ChatWrapper {
|
|
|
72
72
|
function flush() {
|
|
73
73
|
if (systemTexts.length > 0 || userTexts.length > 0 || modelTexts.length > 0)
|
|
74
74
|
resultItems.push({
|
|
75
|
-
system:
|
|
76
|
-
user:
|
|
77
|
-
model:
|
|
75
|
+
system: LlamaText.joinValues("\n\n", systemTexts),
|
|
76
|
+
user: LlamaText.joinValues("\n\n", userTexts),
|
|
77
|
+
model: LlamaText.joinValues("\n\n", modelTexts)
|
|
78
78
|
});
|
|
79
79
|
systemTexts.length = 0;
|
|
80
80
|
userTexts.length = 0;
|
|
@@ -85,13 +85,13 @@ export class TemplateChatWrapper extends ChatWrapper {
|
|
|
85
85
|
if (!this.joinAdjacentMessagesOfTheSameType || currentAggregateFocus !== "system")
|
|
86
86
|
flush();
|
|
87
87
|
currentAggregateFocus = "system";
|
|
88
|
-
systemTexts.push(item.text);
|
|
88
|
+
systemTexts.push(LlamaText.fromJSON(item.text));
|
|
89
89
|
}
|
|
90
90
|
else if (item.type === "user") {
|
|
91
91
|
if (!this.joinAdjacentMessagesOfTheSameType || (currentAggregateFocus !== "system" && currentAggregateFocus !== "user"))
|
|
92
92
|
flush();
|
|
93
93
|
currentAggregateFocus = "user";
|
|
94
|
-
userTexts.push(item.text);
|
|
94
|
+
userTexts.push(LlamaText(item.text));
|
|
95
95
|
}
|
|
96
96
|
else if (item.type === "model") {
|
|
97
97
|
if (!this.joinAdjacentMessagesOfTheSameType)
|
|
@@ -116,7 +116,7 @@ export class TemplateChatWrapper extends ChatWrapper {
|
|
|
116
116
|
const isLastItem = index === resultItems.length - 1;
|
|
117
117
|
const res = LlamaText([
|
|
118
118
|
isFirstItem
|
|
119
|
-
? system.length === 0
|
|
119
|
+
? system.values.length === 0
|
|
120
120
|
? new SpecialTokensText((this._parsedChatTemplate.systemPromptPrefix ?? "") + this._parsedChatTemplate.historyPrefix)
|
|
121
121
|
: this._parsedChatTemplate.systemPromptPrefix != null
|
|
122
122
|
? LlamaText([
|
|
@@ -125,13 +125,13 @@ export class TemplateChatWrapper extends ChatWrapper {
|
|
|
125
125
|
new SpecialTokensText(this._parsedChatTemplate.historyPrefix)
|
|
126
126
|
])
|
|
127
127
|
: getHistoryItem("system", system, this._parsedChatTemplate.historyPrefix)
|
|
128
|
-
: system.length === 0
|
|
128
|
+
: system.values.length === 0
|
|
129
129
|
? LlamaText([])
|
|
130
130
|
: getHistoryItem("system", system),
|
|
131
|
-
user.length === 0
|
|
131
|
+
user.values.length === 0
|
|
132
132
|
? LlamaText([])
|
|
133
133
|
: getHistoryItem("user", user),
|
|
134
|
-
model.length === 0
|
|
134
|
+
model.values.length === 0
|
|
135
135
|
? LlamaText([])
|
|
136
136
|
: !isLastItem
|
|
137
137
|
? getHistoryItem("model", model)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TemplateChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/generic/TemplateChatWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAE,SAAS,EAAkB,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AACpG,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAyC,gCAAgC,EAAC,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"TemplateChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/generic/TemplateChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
optionalPrefixSpace: boolean;
|
|
4
|
-
prefix: string;
|
|
5
|
-
paramsPrefix: string;
|
|
6
|
-
suffix: string;
|
|
7
|
-
};
|
|
8
|
-
result: {
|
|
9
|
-
prefix: string;
|
|
10
|
-
suffix: string;
|
|
11
|
-
};
|
|
12
|
-
} | null;
|
|
1
|
+
import { ChatWrapperSettings } from "../../../types.js";
|
|
2
|
+
export declare function parseFunctionCallMessageTemplate(template?: ChatHistoryFunctionCallMessageTemplate): ChatWrapperSettings["functions"] | null;
|
|
13
3
|
/**
|
|
14
4
|
* Template format for how functions can be called by the model and how their results are fed to the model after the function call.
|
|
15
5
|
* Consists of an array with two elements:
|
|
@@ -18,16 +8,16 @@ export declare function parseFunctionCallMessageTemplate(template?: ChatHistoryF
|
|
|
18
8
|
*
|
|
19
9
|
* For example:
|
|
20
10
|
* ```typescript
|
|
21
|
-
* const template: ChatHistoryFunctionCallMessageTemplate =
|
|
22
|
-
* "[[call: {{functionName}}({{functionParams}})]]"
|
|
23
|
-
* " [[result: {{functionCallResult}}]]"
|
|
24
|
-
*
|
|
11
|
+
* const template: ChatHistoryFunctionCallMessageTemplate = {
|
|
12
|
+
* call: "[[call: {{functionName}}({{functionParams}})]]",
|
|
13
|
+
* result: " [[result: {{functionCallResult}}]]"
|
|
14
|
+
* };
|
|
25
15
|
* ```
|
|
26
16
|
*
|
|
27
|
-
* It's mandatory for the call template to have text before
|
|
17
|
+
* It's mandatory for the call template to have text before <span v-pre>`{{functionName}}`</span> in order for the chat wrapper know when
|
|
28
18
|
* to activate the function calling grammar.
|
|
29
19
|
*/
|
|
30
|
-
export type ChatHistoryFunctionCallMessageTemplate =
|
|
31
|
-
call: `${string}{{functionName}}${string}{{functionParams}}${string}
|
|
32
|
-
result: `${string}{{functionCallResult}}${string}
|
|
33
|
-
|
|
20
|
+
export type ChatHistoryFunctionCallMessageTemplate = {
|
|
21
|
+
call: `${string}{{functionName}}${string}{{functionParams}}${string}`;
|
|
22
|
+
result: `${string}{{functionCallResult}}${string}`;
|
|
23
|
+
};
|
|
@@ -2,7 +2,7 @@ import { parseTextTemplate } from "../../../utils/parseTextTemplate.js";
|
|
|
2
2
|
export function parseFunctionCallMessageTemplate(template) {
|
|
3
3
|
if (template == null)
|
|
4
4
|
return null;
|
|
5
|
-
const
|
|
5
|
+
const { call: functionCallTemplate, result: functionCallResultTemplate } = template;
|
|
6
6
|
if (functionCallTemplate == null || functionCallResultTemplate == null)
|
|
7
7
|
throw new Error("Both function call and function call result templates are required");
|
|
8
8
|
const parsedFunctionCallTemplate = parseTextTemplate(functionCallTemplate, [{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatHistoryFunctionCallMessageTemplate.js","sourceRoot":"","sources":["../../../../src/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"chatHistoryFunctionCallMessageTemplate.js","sourceRoot":"","sources":["../../../../src/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAC,MAAM,qCAAqC,CAAC;AAGtE,MAAM,UAAU,gCAAgC,CAC5C,QAAiD;IAEjD,IAAI,QAAQ,IAAI,IAAI;QAChB,OAAO,IAAI,CAAC;IAEhB,MAAM,EACF,IAAI,EAAE,oBAAoB,EAC1B,MAAM,EAAE,0BAA0B,EACrC,GAAG,QAAQ,CAAC;IAEb,IAAI,oBAAoB,IAAI,IAAI,IAAI,0BAA0B,IAAI,IAAI;QAClE,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;IAE1F,MAAM,0BAA0B,GAAG,iBAAiB,CAAC,oBAAoB,EAAE,CAAC;YACxE,IAAI,EAAE,kBAAkB;YACxB,GAAG,EAAE,cAAc;SACtB,EAAE;YACC,IAAI,EAAE,oBAAoB;YAC1B,GAAG,EAAE,gBAAgB;SACxB,CAAC,CAAC,CAAC;IACJ,MAAM,gCAAgC,GAAG,iBAAiB,CAAC,0BAA0B,EAAE,CAAC;YACpF,IAAI,EAAE,wBAAwB;YAC9B,GAAG,EAAE,oBAAoB;SAC5B,CAAC,CAAC,CAAC;IAEJ,MAAM,UAAU,GAAG,0BAA0B,CAAC,YAAY,CAAC,MAAM,CAAC;IAClE,MAAM,gBAAgB,GAAG,0BAA0B,CAAC,cAAc,CAAC,MAAM,CAAC;IAC1E,MAAM,UAAU,GAAG,0BAA0B,CAAC,cAAc,CAAC,MAAM,CAAC;IAEpE,MAAM,YAAY,GAAG,gCAAgC,CAAC,kBAAkB,CAAC,MAAM,CAAC;IAChF,MAAM,YAAY,GAAG,gCAAgC,CAAC,kBAAkB,CAAC,MAAM,CAAC;IAEhF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;IAEzF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAC;IAE1F,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAC;IAEtG,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,+EAA+E,CAAC,CAAC;IAErG,OAAO;QACH,IAAI,EAAE;YACF,mBAAmB,EAAE,IAAI;YACzB,MAAM,EAAE,UAAU;YAClB,YAAY,EAAE,gBAAgB;YAC9B,MAAM,EAAE,UAAU;SACrB;QACD,MAAM,EAAE;YACJ,MAAM,EAAE,YAAY;YACpB,MAAM,EAAE,YAAY;SACvB;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -48,13 +48,17 @@ export function isJinjaTemplateEquivalentToSpecializedChatWrapper(jinjaTemplateW
|
|
|
48
48
|
if (index === 0 && array.length > 1 && array[1].type === "user") {
|
|
49
49
|
array[1] = {
|
|
50
50
|
type: "user",
|
|
51
|
-
text:
|
|
51
|
+
text: LlamaText([
|
|
52
|
+
LlamaText.joinValues(LlamaText.fromJSON(item.text), convertSystemMessagesToUserMessagesTemplate.split("{{message}}")),
|
|
53
|
+
"\n\n",
|
|
54
|
+
array[1].text
|
|
55
|
+
]).toString()
|
|
52
56
|
};
|
|
53
57
|
return null;
|
|
54
58
|
}
|
|
55
59
|
return {
|
|
56
60
|
type: "user",
|
|
57
|
-
text: convertSystemMessagesToUserMessagesTemplate.
|
|
61
|
+
text: LlamaText.joinValues(LlamaText.fromJSON(item.text), convertSystemMessagesToUserMessagesTemplate.split("{{message}}")).toString()
|
|
58
62
|
};
|
|
59
63
|
}
|
|
60
64
|
return item;
|
|
@@ -80,8 +84,8 @@ export function isJinjaTemplateEquivalentToSpecializedChatWrapper(jinjaTemplateW
|
|
|
80
84
|
}
|
|
81
85
|
function checkEquivalence(jinjaChatWrapper, specializedChatWrapper, testChatHistories, tokenizer) {
|
|
82
86
|
for (const testChatHistory of testChatHistories) {
|
|
83
|
-
const jinjaRes = jinjaChatWrapper.
|
|
84
|
-
const specializedWrapperRes = specializedChatWrapper.
|
|
87
|
+
const jinjaRes = jinjaChatWrapper.generateContextState({ chatHistory: testChatHistory });
|
|
88
|
+
const specializedWrapperRes = specializedChatWrapper.generateContextState({ chatHistory: testChatHistory });
|
|
85
89
|
if (!compareContextTexts(jinjaRes.contextText, specializedWrapperRes.contextText, tokenizer))
|
|
86
90
|
return false;
|
|
87
91
|
const jinjaHasAllSpecializedStopGenerationTriggers = jinjaRes.stopGenerationTriggers
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isJinjaTemplateEquivalentToSpecializedChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,wBAAwB,EAAkC,MAAM,wCAAwC,CAAC;AACjH,OAAO,EAAC,YAAY,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAC,aAAa,EAAC,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAC,sBAAsB,EAAC,MAAM,uCAAuC,CAAC;AAE7E,MAAM,UAAU,iDAAiD,CAC7D,2BAA4D,EAC5D,sBAAmC,EACnC,SAAqB;IAErB,MAAM,kDAAkD,GACpD,2BAA2B,CAAC,8CAA8C,IAAI,IAAI;QAClF,2BAA2B,CAAC,8CAA8C,KAAK,MAAM,CAAC;IAE1F,IAAI;
|
|
1
|
+
{"version":3,"file":"isJinjaTemplateEquivalentToSpecializedChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,7 +107,8 @@ export function resolveChatWrapper({ type = "auto", bosString, filename, fileInf
|
|
|
107
107
|
...(customWrapperSettings?.jinjaTemplate ?? {}),
|
|
108
108
|
template: modelJinjaTemplate
|
|
109
109
|
};
|
|
110
|
-
|
|
110
|
+
const chatWrapperNamesToCheck = orderChatWrapperNamesByAssumedCompatibilityWithModel(specializedChatWrapperTypeNames, { filename, fileInfo });
|
|
111
|
+
for (const specializedChatWrapperTypeName of chatWrapperNamesToCheck) {
|
|
111
112
|
const Wrapper = chatWrappers[specializedChatWrapperTypeName];
|
|
112
113
|
const wrapperSettings = customWrapperSettings?.[specializedChatWrapperTypeName];
|
|
113
114
|
const testOptionConfigurations = Wrapper._getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate?.() ?? [];
|
|
@@ -211,4 +212,32 @@ export function isTemplateChatWrapperType(type) {
|
|
|
211
212
|
function isClassReference(value, classReference) {
|
|
212
213
|
return value === classReference;
|
|
213
214
|
}
|
|
215
|
+
function orderChatWrapperNamesByAssumedCompatibilityWithModel(chatWrapperNames, { filename, fileInfo }) {
|
|
216
|
+
const rankPoints = {
|
|
217
|
+
modelName: 3,
|
|
218
|
+
modelNamePosition: 4,
|
|
219
|
+
fileName: 2,
|
|
220
|
+
fileNamePosition: 3
|
|
221
|
+
};
|
|
222
|
+
function getPointsForTextMatch(pattern, fullText, existsPoints, positionPoints) {
|
|
223
|
+
if (fullText == null)
|
|
224
|
+
return 0;
|
|
225
|
+
const index = fullText.toLowerCase().indexOf(pattern.toLowerCase());
|
|
226
|
+
if (index >= 0)
|
|
227
|
+
return existsPoints + (((index + 1) / fullText.length) * positionPoints);
|
|
228
|
+
return 0;
|
|
229
|
+
}
|
|
230
|
+
const modelName = fileInfo?.metadata?.general?.name;
|
|
231
|
+
return chatWrapperNames
|
|
232
|
+
.slice()
|
|
233
|
+
.sort((a, b) => {
|
|
234
|
+
let aPoints = 0;
|
|
235
|
+
let bPoints = 0;
|
|
236
|
+
aPoints += getPointsForTextMatch(a, modelName, rankPoints.modelName, rankPoints.modelNamePosition);
|
|
237
|
+
bPoints += getPointsForTextMatch(b, modelName, rankPoints.modelName, rankPoints.modelNamePosition);
|
|
238
|
+
aPoints += getPointsForTextMatch(a, filename, rankPoints.fileName, rankPoints.fileNamePosition);
|
|
239
|
+
bPoints += getPointsForTextMatch(b, filename, rankPoints.fileName, rankPoints.fileNamePosition);
|
|
240
|
+
return bPoints - aPoints;
|
|
241
|
+
});
|
|
242
|
+
}
|
|
214
243
|
//# sourceMappingURL=resolveChatWrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/resolveChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,sBAAsB,EAAC,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAC,wBAAwB,EAAkC,MAAM,wCAAwC,CAAC;AACjH,OAAO,EAAC,mBAAmB,EAAC,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAC,mBAAmB,EAAC,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAC,iDAAiD,EAAC,MAAM,wDAAwD,CAAC;AAIzH,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC,MAAM,CAAC;IACzD,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO;CAC7F,CAAC,CAAC;AAGZ,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC,MAAM,CAAC;IACtD,UAAU,EAAE,eAAe;CACrB,CAAC,CAAC;AAGZ,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CAAC,MAAM,CAAC;IACxD,MAAM;IACN,GAAG,+BAA+B;IAClC,GAAG,4BAA4B;CACzB,CAAC,CAAC;AAGZ,MAAM,YAAY,GAAG;IACjB,SAAS,EAAE,kBAAkB;IAC7B,YAAY,EAAE,iBAAiB;IAC/B,YAAY,EAAE,iBAAiB;IAC/B,YAAY,EAAE,iBAAiB;IAC/B,aAAa,EAAE,sBAAsB;IACrC,QAAQ,EAAE,iBAAiB;IAC3B,YAAY,EAAE,iBAAiB;IAC/B,OAAO,EAAE,gBAAgB;IACzB,UAAU,EAAE,mBAAmB;IAC/B,eAAe,EAAE,wBAAwB;CACiD,CAAC;AAC/F,MAAM,uBAAuB,GAAG,IAAI,GAAG,CACnC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;KACvB,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAC5B,CAAC,OAAO,EAAE,UAAuC,CAAC,CACrD,CAAC,CACT,CAAC;AA2BF;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,kBAAkB,CAAC,EAC/B,IAAI,GAAG,MAAM,EACb,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,qBAAqB,EACrB,WAAW,GAAG,IAAI,EAClB,mCAAmC,GAAG,IAAI,EAC1C,OAAO,GAAG,KAAK,EACS;IACxB,SAAS,4BAA4B,CACjC,sBAAyB,EACzB,kBAA+C,EAAE;QAEjD,MAAM,qBAAqB,GAAG,uBAAuB,CAAC,GAAG,CAAC,sBAAsB,CAAmC,CAAC;QACpH,MAAM,mBAAmB,GAAG,qBAAqB,EAAE,CAAC,qBAAqB,CAAC,CAAC;QAE3E,OAAO,IAAK,sBAA8B,CAAC;YACvC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC;SACjC,CAAC,CAAC;IACP,CAAC;IAED,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,IAAI,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"resolveChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/resolveChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import process from "process";
|
|
2
3
|
import { CommandModule } from "yargs";
|
|
3
4
|
import { BuildGpu } from "../../bindings/types.js";
|
|
@@ -8,5 +9,9 @@ type BuildCommand = {
|
|
|
8
9
|
noUsageExample?: boolean;
|
|
9
10
|
};
|
|
10
11
|
export declare const BuildCommand: CommandModule<object, BuildCommand>;
|
|
11
|
-
export declare function BuildLlamaCppCommand({ arch, nodeTarget, gpu, noUsageExample,
|
|
12
|
+
export declare function BuildLlamaCppCommand({ arch, nodeTarget, gpu, noUsageExample,
|
|
13
|
+
/** @internal */
|
|
14
|
+
noCustomCmakeBuildOptionsInBinaryFolderName,
|
|
15
|
+
/** @internal */
|
|
16
|
+
ciMode }: BuildCommand): Promise<void>;
|
|
12
17
|
export {};
|