node-llama-cpp 3.0.0-beta.44 → 3.0.0-beta.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +33 -21
- package/bins/_linux-arm64.moved.txt +1 -0
- package/bins/_linux-armv7l.moved.txt +1 -0
- package/bins/_linux-x64-vulkan.moved.txt +1 -0
- package/bins/_linux-x64.moved.txt +1 -0
- package/bins/_mac-arm64-metal.moved.txt +1 -0
- package/bins/_mac-x64.moved.txt +1 -0
- package/bins/_win-arm64.moved.txt +1 -0
- package/bins/_win-x64-vulkan.moved.txt +1 -0
- package/bins/_win-x64.moved.txt +1 -0
- package/dist/ChatWrapper.d.ts +11 -1
- package/dist/ChatWrapper.js +1 -1
- package/dist/ChatWrapper.js.map +1 -1
- package/dist/bindings/AddonTypes.d.ts +30 -19
- package/dist/bindings/Llama.d.ts +11 -0
- package/dist/bindings/Llama.js +37 -6
- package/dist/bindings/Llama.js.map +1 -1
- package/dist/bindings/consts.d.ts +1 -1
- package/dist/bindings/consts.js +2 -0
- package/dist/bindings/consts.js.map +1 -1
- package/dist/bindings/getLlama.d.ts +41 -5
- package/dist/bindings/getLlama.js +14 -3
- package/dist/bindings/getLlama.js.map +1 -1
- package/dist/bindings/types.d.ts +2 -2
- package/dist/bindings/types.js +2 -0
- package/dist/bindings/types.js.map +1 -1
- package/dist/bindings/utils/cloneLlamaCppRepo.js.map +1 -1
- package/dist/bindings/utils/compileLLamaCpp.d.ts +0 -1
- package/dist/bindings/utils/compileLLamaCpp.js +45 -7
- package/dist/bindings/utils/compileLLamaCpp.js.map +1 -1
- package/dist/bindings/utils/getBestComputeLayersAvailable.d.ts +0 -1
- package/dist/bindings/utils/getBuildFolderNameForBuildOptions.js +2 -2
- package/dist/bindings/utils/getBuildFolderNameForBuildOptions.js.map +1 -1
- package/dist/bindings/utils/getGpuTypesToUseForOption.d.ts +0 -1
- package/dist/bindings/utils/testCmakeBinary.d.ts +0 -1
- package/dist/chatWrappers/AlpacaChatWrapper.js +4 -3
- package/dist/chatWrappers/AlpacaChatWrapper.js.map +1 -1
- package/dist/chatWrappers/ChatMLChatWrapper.js +1 -1
- package/dist/chatWrappers/ChatMLChatWrapper.js.map +1 -1
- package/dist/chatWrappers/FalconChatWrapper.js +5 -4
- package/dist/chatWrappers/FalconChatWrapper.js.map +1 -1
- package/dist/chatWrappers/FunctionaryChatWrapper.d.ts +2 -2
- package/dist/chatWrappers/FunctionaryChatWrapper.js +200 -12
- package/dist/chatWrappers/FunctionaryChatWrapper.js.map +1 -1
- package/dist/chatWrappers/GemmaChatWrapper.js +1 -1
- package/dist/chatWrappers/GemmaChatWrapper.js.map +1 -1
- package/dist/chatWrappers/GeneralChatWrapper.js +5 -4
- package/dist/chatWrappers/GeneralChatWrapper.js.map +1 -1
- package/dist/chatWrappers/Llama2ChatWrapper.js +5 -6
- package/dist/chatWrappers/Llama2ChatWrapper.js.map +1 -1
- package/dist/chatWrappers/Llama3ChatWrapper.js +1 -1
- package/dist/chatWrappers/Llama3ChatWrapper.js.map +1 -1
- package/dist/chatWrappers/Llama3_1ChatWrapper.d.ts +13 -9
- package/dist/chatWrappers/Llama3_1ChatWrapper.js +92 -38
- package/dist/chatWrappers/Llama3_1ChatWrapper.js.map +1 -1
- package/dist/chatWrappers/MistralChatWrapper.d.ts +15 -0
- package/dist/chatWrappers/MistralChatWrapper.js +169 -0
- package/dist/chatWrappers/MistralChatWrapper.js.map +1 -0
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.d.ts +25 -1
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js +50 -12
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/TemplateChatWrapper.d.ts +22 -16
- package/dist/chatWrappers/generic/TemplateChatWrapper.js +28 -24
- package/dist/chatWrappers/generic/TemplateChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/utils/chatHistoryFunctionCallMessageTemplate.d.ts +1 -1
- package/dist/chatWrappers/utils/chunkChatItems.d.ts +10 -0
- package/dist/chatWrappers/utils/chunkChatItems.js +44 -0
- package/dist/chatWrappers/utils/chunkChatItems.js.map +1 -0
- package/dist/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.js +37 -26
- package/dist/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.js.map +1 -1
- package/dist/chatWrappers/utils/jsonDumps.d.ts +1 -1
- package/dist/chatWrappers/utils/jsonDumps.js +2 -2
- package/dist/chatWrappers/utils/jsonDumps.js.map +1 -1
- package/dist/chatWrappers/utils/resolveChatWrapper.d.ts +30 -6
- package/dist/chatWrappers/utils/resolveChatWrapper.js +71 -25
- package/dist/chatWrappers/utils/resolveChatWrapper.js.map +1 -1
- package/dist/cli/cli.js +2 -6
- package/dist/cli/cli.js.map +1 -1
- package/dist/cli/commands/ChatCommand.d.ts +2 -1
- package/dist/cli/commands/ChatCommand.js +83 -53
- package/dist/cli/commands/ChatCommand.js.map +1 -1
- package/dist/cli/commands/CompleteCommand.d.ts +2 -1
- package/dist/cli/commands/CompleteCommand.js +58 -30
- package/dist/cli/commands/CompleteCommand.js.map +1 -1
- package/dist/cli/commands/DebugCommand.js +1 -1
- package/dist/cli/commands/DebugCommand.js.map +1 -1
- package/dist/cli/commands/InfillCommand.d.ts +2 -1
- package/dist/cli/commands/InfillCommand.js +58 -30
- package/dist/cli/commands/InfillCommand.js.map +1 -1
- package/dist/cli/commands/InitCommand.js +1 -1
- package/dist/cli/commands/PullCommand.d.ts +2 -1
- package/dist/cli/commands/PullCommand.js +85 -44
- package/dist/cli/commands/PullCommand.js.map +1 -1
- package/dist/cli/commands/inspect/InspectCommand.js +5 -3
- package/dist/cli/commands/inspect/InspectCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectEstimateCommand.d.ts +12 -0
- package/dist/cli/commands/inspect/commands/InspectEstimateCommand.js +225 -0
- package/dist/cli/commands/inspect/commands/InspectEstimateCommand.js.map +1 -0
- package/dist/cli/commands/inspect/commands/InspectGgufCommand.js +17 -4
- package/dist/cli/commands/inspect/commands/InspectGgufCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectGpuCommand.js +31 -9
- package/dist/cli/commands/inspect/commands/InspectGpuCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectMeasureCommand.js +7 -4
- package/dist/cli/commands/inspect/commands/InspectMeasureCommand.js.map +1 -1
- package/dist/cli/commands/source/SourceCommand.d.ts +4 -0
- package/dist/cli/commands/source/SourceCommand.js +19 -0
- package/dist/cli/commands/source/SourceCommand.js.map +1 -0
- package/dist/cli/commands/{BuildCommand.d.ts → source/commands/BuildCommand.d.ts} +1 -2
- package/dist/cli/commands/{BuildCommand.js → source/commands/BuildCommand.js} +21 -19
- package/dist/cli/commands/source/commands/BuildCommand.js.map +1 -0
- package/dist/cli/commands/{ClearCommand.js → source/commands/ClearCommand.js} +6 -6
- package/dist/cli/commands/source/commands/ClearCommand.js.map +1 -0
- package/dist/cli/commands/{DownloadCommand.d.ts → source/commands/DownloadCommand.d.ts} +1 -2
- package/dist/cli/commands/{DownloadCommand.js → source/commands/DownloadCommand.js} +26 -22
- package/dist/cli/commands/source/commands/DownloadCommand.js.map +1 -0
- package/dist/cli/recommendedModels.js +192 -23
- package/dist/cli/recommendedModels.js.map +1 -1
- package/dist/cli/utils/ConsoleInteraction.d.ts +0 -1
- package/dist/cli/utils/ConsoleTable.js.map +1 -1
- package/dist/cli/utils/basicChooseFromListConsoleInteraction.js.map +1 -1
- package/dist/cli/utils/interactivelyAskForModel.js +6 -17
- package/dist/cli/utils/interactivelyAskForModel.js.map +1 -1
- package/dist/cli/utils/printCommonInfoLines.js +6 -3
- package/dist/cli/utils/printCommonInfoLines.js.map +1 -1
- package/dist/cli/utils/renderModelCompatibilityPercentageWithColors.d.ts +6 -0
- package/dist/cli/utils/renderModelCompatibilityPercentageWithColors.js +14 -0
- package/dist/cli/utils/renderModelCompatibilityPercentageWithColors.js.map +1 -0
- package/dist/cli/utils/resolveModelRecommendationFileOptions.d.ts +1 -1
- package/dist/cli/utils/withCliCommandDescriptionDocsUrl.js.map +1 -1
- package/dist/commands.d.ts +3 -3
- package/dist/commands.js +3 -3
- package/dist/commands.js.map +1 -1
- package/dist/config.d.ts +7 -3
- package/dist/config.js +10 -6
- package/dist/config.js.map +1 -1
- package/dist/evaluator/LlamaChat/LlamaChat.d.ts +17 -2
- package/dist/evaluator/LlamaChat/LlamaChat.js +24 -12
- package/dist/evaluator/LlamaChat/LlamaChat.js.map +1 -1
- package/dist/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js +3 -1
- package/dist/evaluator/LlamaChat/utils/contextShiftStrategies/eraseFirstResponseAndKeepFirstSystemChatContextShiftStrategy.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.d.ts +21 -13
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js +15 -14
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.d.ts +1 -0
- package/dist/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.d.ts +7 -2
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.js +5 -0
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.js.map +1 -1
- package/dist/evaluator/LlamaCompletion.d.ts +18 -4
- package/dist/evaluator/LlamaCompletion.js +51 -22
- package/dist/evaluator/LlamaCompletion.js.map +1 -1
- package/dist/evaluator/LlamaContext/LlamaContext.d.ts +21 -0
- package/dist/evaluator/LlamaContext/LlamaContext.js +261 -133
- package/dist/evaluator/LlamaContext/LlamaContext.js.map +1 -1
- package/dist/evaluator/LlamaContext/LlamaSampler.d.ts +1 -0
- package/dist/evaluator/LlamaContext/LlamaSampler.js +31 -0
- package/dist/evaluator/LlamaContext/LlamaSampler.js.map +1 -0
- package/dist/evaluator/LlamaContext/types.d.ts +77 -9
- package/dist/evaluator/LlamaContext/utils/batchItemsPrioritizationStrategies/maximumParallelismStrategy.js.map +1 -1
- package/dist/evaluator/LlamaContext/utils/resolveBatchItemsPrioritizationStrategy.js +1 -1
- package/dist/evaluator/LlamaContext/utils/resolveBatchItemsPrioritizationStrategy.js.map +1 -1
- package/dist/evaluator/LlamaEmbedding.d.ts +21 -0
- package/dist/evaluator/LlamaEmbedding.js +53 -0
- package/dist/evaluator/LlamaEmbedding.js.map +1 -0
- package/dist/evaluator/LlamaEmbeddingContext.d.ts +1 -5
- package/dist/evaluator/LlamaEmbeddingContext.js +6 -8
- package/dist/evaluator/LlamaEmbeddingContext.js.map +1 -1
- package/dist/evaluator/LlamaGrammar.d.ts +9 -10
- package/dist/evaluator/LlamaGrammar.js +10 -5
- package/dist/evaluator/LlamaGrammar.js.map +1 -1
- package/dist/evaluator/LlamaGrammarEvaluationState.d.ts +7 -3
- package/dist/evaluator/LlamaGrammarEvaluationState.js +8 -4
- package/dist/evaluator/LlamaGrammarEvaluationState.js.map +1 -1
- package/dist/evaluator/LlamaJsonSchemaGrammar.d.ts +3 -0
- package/dist/evaluator/LlamaJsonSchemaGrammar.js +3 -0
- package/dist/evaluator/LlamaJsonSchemaGrammar.js.map +1 -1
- package/dist/evaluator/LlamaModel/LlamaModel.d.ts +28 -15
- package/dist/evaluator/LlamaModel/LlamaModel.js +66 -51
- package/dist/evaluator/LlamaModel/LlamaModel.js.map +1 -1
- package/dist/evaluator/LlamaModel/utils/TokenAttributes.d.ts +10 -10
- package/dist/evaluator/LlamaModel/utils/TokenAttributes.js +10 -10
- package/dist/evaluator/LlamaModel/utils/TokenAttributes.js.map +1 -1
- package/dist/evaluator/TokenBias.d.ts +20 -8
- package/dist/evaluator/TokenBias.js +44 -12
- package/dist/evaluator/TokenBias.js.map +1 -1
- package/dist/evaluator/TokenMeter.d.ts +3 -12
- package/dist/evaluator/TokenMeter.js +4 -16
- package/dist/evaluator/TokenMeter.js.map +1 -1
- package/dist/gguf/fileReaders/GgufFileReader.d.ts +0 -1
- package/dist/gguf/fileReaders/GgufFileReader.js.map +1 -1
- package/dist/gguf/fileReaders/GgufFsFileReader.d.ts +0 -2
- package/dist/gguf/fileReaders/GgufNetworkFetchFileReader.d.ts +5 -3
- package/dist/gguf/fileReaders/GgufNetworkFetchFileReader.js +26 -13
- package/dist/gguf/fileReaders/GgufNetworkFetchFileReader.js.map +1 -1
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.d.ts +57 -1
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.js +86 -4
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.js.map +1 -1
- package/dist/gguf/insights/utils/scoreLevels.js.map +1 -1
- package/dist/gguf/readGgufFileInfo.d.ts +18 -6
- package/dist/gguf/readGgufFileInfo.js +8 -3
- package/dist/gguf/readGgufFileInfo.js.map +1 -1
- package/dist/gguf/types/GgufMetadataTypes.d.ts +18 -2
- package/dist/gguf/types/GgufMetadataTypes.js +16 -1
- package/dist/gguf/types/GgufMetadataTypes.js.map +1 -1
- package/dist/gguf/utils/convertMetadataKeyValueRecordToNestedObject.js +2 -0
- package/dist/gguf/utils/convertMetadataKeyValueRecordToNestedObject.js.map +1 -1
- package/dist/gguf/utils/getGgufFileTypeName.d.ts +1 -1
- package/dist/gguf/utils/resolveBinarySplitGgufPartUrls.js +1 -1
- package/dist/gguf/utils/resolveBinarySplitGgufPartUrls.js.map +1 -1
- package/dist/index.d.ts +8 -4
- package/dist/index.js +5 -3
- package/dist/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -0
- package/dist/types.d.ts +1 -0
- package/dist/types.js.map +1 -1
- package/dist/utils/LlamaText.d.ts +3 -0
- package/dist/utils/LlamaText.js +7 -4
- package/dist/utils/LlamaText.js.map +1 -1
- package/dist/utils/LruCache.d.ts +2 -2
- package/dist/utils/LruCache.js.map +1 -1
- package/dist/utils/OverridesObject.d.ts +7 -0
- package/dist/utils/OverridesObject.js +2 -0
- package/dist/utils/OverridesObject.js.map +1 -0
- package/dist/utils/StopGenerationDetector.js.map +1 -1
- package/dist/utils/ThreadsSplitter.d.ts +32 -0
- package/dist/utils/ThreadsSplitter.js +177 -0
- package/dist/utils/ThreadsSplitter.js.map +1 -0
- package/dist/utils/TokenStreamRegulator.js.map +1 -1
- package/dist/utils/appendUserMessageToChatHistory.d.ts +4 -0
- package/dist/utils/appendUserMessageToChatHistory.js +4 -0
- package/dist/utils/appendUserMessageToChatHistory.js.map +1 -1
- package/dist/utils/compareTokens.d.ts +1 -1
- package/dist/utils/compareTokens.js.map +1 -1
- package/dist/utils/createModelDownloader.d.ts +94 -6
- package/dist/utils/createModelDownloader.js +174 -46
- package/dist/utils/createModelDownloader.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfOr.js.map +1 -1
- package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js +1 -1
- package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js.map +1 -1
- package/dist/utils/getGrammarsFolder.js +1 -1
- package/dist/utils/getGrammarsFolder.js.map +1 -1
- package/dist/utils/gitReleaseBundles.js.map +1 -1
- package/dist/utils/modelFileAccesTokens.d.ts +4 -0
- package/dist/utils/modelFileAccesTokens.js +40 -0
- package/dist/utils/modelFileAccesTokens.js.map +1 -0
- package/dist/utils/parseModelFileName.js.map +1 -1
- package/dist/utils/parseTextTemplate.js.map +1 -1
- package/dist/utils/resolveGithubRelease.d.ts +1 -1
- package/dist/utils/resolveLastTokens.js.map +1 -1
- package/dist/utils/spawnCommand.d.ts +0 -1
- package/dist/utils/truncateTextAndRoundToWords.js +3 -1
- package/dist/utils/truncateTextAndRoundToWords.js.map +1 -1
- package/dist/utils/withOra.js +1 -1
- package/dist/utils/withOra.js.map +1 -1
- package/dist/utils/withProgressLog.d.ts +0 -1
- package/dist/utils/wrapAbortSignal.d.ts +0 -1
- package/llama/CMakeLists.txt +20 -12
- package/llama/addon/AddonContext.cpp +69 -202
- package/llama/addon/AddonContext.h +4 -5
- package/llama/addon/AddonGrammar.cpp +8 -11
- package/llama/addon/AddonGrammar.h +4 -3
- package/llama/addon/AddonGrammarEvaluationState.cpp +9 -10
- package/llama/addon/AddonGrammarEvaluationState.h +3 -1
- package/llama/addon/AddonModel.cpp +6 -5
- package/llama/addon/AddonSampler.cpp +513 -0
- package/llama/addon/AddonSampler.h +65 -0
- package/llama/addon/RingBuffer.h +109 -0
- package/llama/addon/addon.cpp +7 -0
- package/llama/addon/globals/addonLog.cpp +2 -1
- package/llama/binariesGithubRelease.json +1 -1
- package/llama/gitRelease.bundle +0 -0
- package/llama/grammars/README.md +1 -1
- package/llama/llama.cpp.info.json +1 -1
- package/package.json +71 -46
- package/templates/packed/electron-typescript-react.json +1 -1
- package/templates/packed/node-typescript.json +1 -1
- package/bins/linux-arm64/_nlcBuildMetadata.json +0 -1
- package/bins/linux-arm64/libggml.so +0 -0
- package/bins/linux-arm64/libllama.so +0 -0
- package/bins/linux-arm64/llama-addon.node +0 -0
- package/bins/linux-armv7l/_nlcBuildMetadata.json +0 -1
- package/bins/linux-armv7l/libggml.so +0 -0
- package/bins/linux-armv7l/libllama.so +0 -0
- package/bins/linux-armv7l/llama-addon.node +0 -0
- package/bins/linux-x64/_nlcBuildMetadata.json +0 -1
- package/bins/linux-x64/libggml.so +0 -0
- package/bins/linux-x64/libllama.so +0 -0
- package/bins/linux-x64/llama-addon.node +0 -0
- package/bins/linux-x64-vulkan/_nlcBuildMetadata.json +0 -1
- package/bins/linux-x64-vulkan/libggml.so +0 -0
- package/bins/linux-x64-vulkan/libllama.so +0 -0
- package/bins/linux-x64-vulkan/llama-addon.node +0 -0
- package/bins/linux-x64-vulkan/vulkan-shaders-gen +0 -0
- package/bins/mac-arm64-metal/_nlcBuildMetadata.json +0 -1
- package/bins/mac-arm64-metal/ggml-common.h +0 -1833
- package/bins/mac-arm64-metal/ggml-metal.metal +0 -6168
- package/bins/mac-arm64-metal/libggml.dylib +0 -0
- package/bins/mac-arm64-metal/libllama.dylib +0 -0
- package/bins/mac-arm64-metal/llama-addon.node +0 -0
- package/bins/mac-x64/_nlcBuildMetadata.json +0 -1
- package/bins/mac-x64/libggml.dylib +0 -0
- package/bins/mac-x64/libllama.dylib +0 -0
- package/bins/mac-x64/llama-addon.node +0 -0
- package/bins/win-arm64/_nlcBuildMetadata.json +0 -1
- package/bins/win-arm64/ggml.dll +0 -0
- package/bins/win-arm64/llama-addon.exp +0 -0
- package/bins/win-arm64/llama-addon.lib +0 -0
- package/bins/win-arm64/llama-addon.node +0 -0
- package/bins/win-arm64/llama.dll +0 -0
- package/bins/win-x64/_nlcBuildMetadata.json +0 -1
- package/bins/win-x64/ggml.dll +0 -0
- package/bins/win-x64/llama-addon.exp +0 -0
- package/bins/win-x64/llama-addon.lib +0 -0
- package/bins/win-x64/llama-addon.node +0 -0
- package/bins/win-x64/llama.dll +0 -0
- package/bins/win-x64-vulkan/_nlcBuildMetadata.json +0 -1
- package/bins/win-x64-vulkan/ggml.dll +0 -0
- package/bins/win-x64-vulkan/llama-addon.exp +0 -0
- package/bins/win-x64-vulkan/llama-addon.lib +0 -0
- package/bins/win-x64-vulkan/llama-addon.node +0 -0
- package/bins/win-x64-vulkan/llama.dll +0 -0
- package/bins/win-x64-vulkan/vulkan-shaders-gen.exe +0 -0
- package/dist/cli/commands/BuildCommand.js.map +0 -1
- package/dist/cli/commands/ClearCommand.js.map +0 -1
- package/dist/cli/commands/DownloadCommand.js.map +0 -1
- package/dist/utils/DeepPartialObject.d.ts +0 -3
- package/dist/utils/DeepPartialObject.js +0 -2
- package/dist/utils/DeepPartialObject.js.map +0 -1
- /package/dist/cli/commands/{ClearCommand.d.ts → source/commands/ClearCommand.d.ts} +0 -0
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ChatWrapper } from "../ChatWrapper.js";
|
|
2
2
|
import { SpecialToken, LlamaText, SpecialTokensText } from "../utils/LlamaText.js";
|
|
3
|
-
import { defaultChatSystemPrompt } from "../config.js";
|
|
4
3
|
import { ChatModelFunctionsDocumentationGenerator } from "./utils/ChatModelFunctionsDocumentationGenerator.js";
|
|
5
4
|
import { jsonDumps } from "./utils/jsonDumps.js";
|
|
6
5
|
// source: https://llama.meta.com/docs/model-cards-and-prompt-formats/llama3_1
|
|
@@ -8,6 +7,8 @@ export class Llama3_1ChatWrapper extends ChatWrapper {
|
|
|
8
7
|
wrapperName = "Llama 3.1";
|
|
9
8
|
cuttingKnowledgeDate;
|
|
10
9
|
todayDate;
|
|
10
|
+
noToolInstructions;
|
|
11
|
+
/** @internal */ _specialTokensTextForPreamble;
|
|
11
12
|
settings = {
|
|
12
13
|
supportsSystemMessages: true,
|
|
13
14
|
functions: {
|
|
@@ -26,14 +27,20 @@ export class Llama3_1ChatWrapper extends ChatWrapper {
|
|
|
26
27
|
/**
|
|
27
28
|
* @param options
|
|
28
29
|
*/
|
|
29
|
-
constructor({ cuttingKnowledgeDate = new Date("2023-12-01T00:00:00Z"), todayDate = new Date() } = {}) {
|
|
30
|
+
constructor({ cuttingKnowledgeDate = new Date("2023-12-01T00:00:00Z"), todayDate = () => new Date(), noToolInstructions = false, _specialTokensTextForPreamble = false } = {}) {
|
|
30
31
|
super();
|
|
31
32
|
this.cuttingKnowledgeDate = cuttingKnowledgeDate == null
|
|
32
33
|
? null
|
|
33
|
-
:
|
|
34
|
+
: cuttingKnowledgeDate instanceof Function
|
|
35
|
+
? cuttingKnowledgeDate
|
|
36
|
+
: new Date(cuttingKnowledgeDate);
|
|
34
37
|
this.todayDate = todayDate == null
|
|
35
38
|
? null
|
|
36
|
-
:
|
|
39
|
+
: todayDate instanceof Function
|
|
40
|
+
? todayDate
|
|
41
|
+
: new Date(todayDate);
|
|
42
|
+
this.noToolInstructions = noToolInstructions;
|
|
43
|
+
this._specialTokensTextForPreamble = _specialTokensTextForPreamble;
|
|
37
44
|
}
|
|
38
45
|
addAvailableFunctionsSystemMessageToHistory(history, availableFunctions, { documentParams = true } = {}) {
|
|
39
46
|
const availableFunctionNames = Object.keys(availableFunctions ?? {});
|
|
@@ -54,7 +61,8 @@ export class Llama3_1ChatWrapper extends ChatWrapper {
|
|
|
54
61
|
return res;
|
|
55
62
|
}
|
|
56
63
|
generateContextState({ chatHistory, availableFunctions, documentFunctionParams }) {
|
|
57
|
-
const
|
|
64
|
+
const chatHistoryWithPreamble = this.prependPreambleToChatHistory(chatHistory);
|
|
65
|
+
const historyWithFunctions = this.addAvailableFunctionsSystemMessageToHistory(chatHistoryWithPreamble, availableFunctions, {
|
|
58
66
|
documentParams: documentFunctionParams
|
|
59
67
|
});
|
|
60
68
|
const resultItems = [];
|
|
@@ -62,12 +70,14 @@ export class Llama3_1ChatWrapper extends ChatWrapper {
|
|
|
62
70
|
let userTexts = [];
|
|
63
71
|
let modelTexts = [];
|
|
64
72
|
let currentAggregateFocus = null;
|
|
65
|
-
|
|
73
|
+
const flush = () => {
|
|
66
74
|
if (systemTexts.length > 0 || userTexts.length > 0 || modelTexts.length > 0)
|
|
67
75
|
resultItems.push({
|
|
68
76
|
system: systemTexts.length === 0
|
|
69
77
|
? null
|
|
70
|
-
: LlamaText.joinValues(
|
|
78
|
+
: LlamaText.joinValues(resultItems.length === 0 && this._specialTokensTextForPreamble
|
|
79
|
+
? LlamaText(new SpecialTokensText("\n\n"))
|
|
80
|
+
: "\n\n", systemTexts),
|
|
71
81
|
user: userTexts.length === 0
|
|
72
82
|
? null
|
|
73
83
|
: LlamaText.joinValues("\n\n", userTexts),
|
|
@@ -78,7 +88,7 @@ export class Llama3_1ChatWrapper extends ChatWrapper {
|
|
|
78
88
|
systemTexts = [];
|
|
79
89
|
userTexts = [];
|
|
80
90
|
modelTexts = [];
|
|
81
|
-
}
|
|
91
|
+
};
|
|
82
92
|
for (const item of historyWithFunctions) {
|
|
83
93
|
if (item.type === "system") {
|
|
84
94
|
if (currentAggregateFocus !== "system")
|
|
@@ -99,7 +109,7 @@ export class Llama3_1ChatWrapper extends ChatWrapper {
|
|
|
99
109
|
modelTexts.push(this.generateModelResponseText(item.response));
|
|
100
110
|
}
|
|
101
111
|
else
|
|
102
|
-
void
|
|
112
|
+
void item;
|
|
103
113
|
}
|
|
104
114
|
flush();
|
|
105
115
|
const contextText = LlamaText(new SpecialToken("BOS"), resultItems.map((item, index) => {
|
|
@@ -176,39 +186,46 @@ export class Llama3_1ChatWrapper extends ChatWrapper {
|
|
|
176
186
|
"- Always add your sources when using search results to answer the user query"
|
|
177
187
|
]);
|
|
178
188
|
}
|
|
179
|
-
|
|
180
|
-
const res =
|
|
181
|
-
|
|
182
|
-
const
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
return `${day} ${month} ${year}`;
|
|
186
|
-
}
|
|
187
|
-
const formatMonthDate = (date) => {
|
|
188
|
-
const today = this.todayDate ?? new Date();
|
|
189
|
+
prependPreambleToChatHistory(chatHistory) {
|
|
190
|
+
const res = chatHistory.slice();
|
|
191
|
+
const formatMonthDate = (date, timezone) => {
|
|
192
|
+
const today = this.todayDate instanceof Function
|
|
193
|
+
? this.todayDate()
|
|
194
|
+
: (this.todayDate ?? new Date());
|
|
189
195
|
if (today.getUTCMonth() === date.getUTCMonth() && today.getUTCFullYear() === date.getUTCFullYear())
|
|
190
|
-
return formatDate(date);
|
|
191
|
-
const month = date.toLocaleDateString("en-US", { month: "long", timeZone:
|
|
192
|
-
const year = date.toLocaleDateString("en-US", { year: "numeric", timeZone:
|
|
196
|
+
return formatDate(date, timezone);
|
|
197
|
+
const month = date.toLocaleDateString("en-US", { month: "long", timeZone: timezone });
|
|
198
|
+
const year = date.toLocaleDateString("en-US", { year: "numeric", timeZone: timezone });
|
|
193
199
|
return `${month} ${year}`;
|
|
194
200
|
};
|
|
195
201
|
const lines = [];
|
|
196
|
-
if (this.cuttingKnowledgeDate != null)
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
202
|
+
if (this.cuttingKnowledgeDate != null) {
|
|
203
|
+
const date = this.cuttingKnowledgeDate instanceof Function
|
|
204
|
+
? this.cuttingKnowledgeDate()
|
|
205
|
+
: this.cuttingKnowledgeDate;
|
|
206
|
+
lines.push(`Cutting Knowledge Date: ${formatMonthDate(date, "UTC")}`);
|
|
207
|
+
}
|
|
208
|
+
if (this.todayDate != null) {
|
|
209
|
+
const date = this.todayDate instanceof Function
|
|
210
|
+
? this.todayDate()
|
|
211
|
+
: this.todayDate;
|
|
212
|
+
lines.push(`Today Date: ${formatDate(date, undefined)}`);
|
|
213
|
+
}
|
|
214
|
+
if (!this.noToolInstructions) {
|
|
215
|
+
if (lines.length > 0)
|
|
216
|
+
lines.push("");
|
|
217
|
+
lines.push("# Tool Instructions");
|
|
218
|
+
lines.push("- When looking for real time information use relevant functions if available");
|
|
219
|
+
lines.push("");
|
|
220
|
+
lines.push("");
|
|
221
|
+
}
|
|
222
|
+
if (lines.length > 0)
|
|
223
|
+
res.unshift({
|
|
224
|
+
type: "system",
|
|
225
|
+
text: this._specialTokensTextForPreamble
|
|
226
|
+
? LlamaText(new SpecialTokensText(lines.join("\n"))).toJSON()
|
|
227
|
+
: LlamaText.joinValues("\n", lines).toJSON()
|
|
228
|
+
});
|
|
212
229
|
return res;
|
|
213
230
|
}
|
|
214
231
|
/** @internal */
|
|
@@ -219,5 +236,42 @@ export class Llama3_1ChatWrapper extends ChatWrapper {
|
|
|
219
236
|
}
|
|
220
237
|
return true;
|
|
221
238
|
}
|
|
239
|
+
/** @internal */
|
|
240
|
+
static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
|
|
241
|
+
return [
|
|
242
|
+
{},
|
|
243
|
+
[{ todayDate: null }, {}],
|
|
244
|
+
[{ cuttingKnowledgeDate: null }, {}],
|
|
245
|
+
[{ noToolInstructions: true }, {}],
|
|
246
|
+
[{ todayDate: null, cuttingKnowledgeDate: null }, {}],
|
|
247
|
+
[{ todayDate: null, cuttingKnowledgeDate: null, noToolInstructions: true }, {}],
|
|
248
|
+
[{ todayDate: new Date("2024-07-26T00:00:00"), cuttingKnowledgeDate: null, noToolInstructions: true }, {}],
|
|
249
|
+
[
|
|
250
|
+
{
|
|
251
|
+
todayDate: new Date("2024-07-26T00:00:00"),
|
|
252
|
+
cuttingKnowledgeDate: new Date("2023-12-01T00:00:00Z"),
|
|
253
|
+
noToolInstructions: true
|
|
254
|
+
},
|
|
255
|
+
{ cuttingKnowledgeDate: new Date("2023-12-01T00:00:00Z") },
|
|
256
|
+
{ "date_string": formatDate(new Date("2024-07-26T00:00:00"), undefined) }
|
|
257
|
+
],
|
|
258
|
+
[
|
|
259
|
+
{
|
|
260
|
+
todayDate: new Date("2024-07-26T00:00:00"),
|
|
261
|
+
cuttingKnowledgeDate: new Date("2023-12-01T00:00:00Z"),
|
|
262
|
+
noToolInstructions: true,
|
|
263
|
+
_specialTokensTextForPreamble: true
|
|
264
|
+
},
|
|
265
|
+
{ cuttingKnowledgeDate: new Date("2023-12-01T00:00:00Z") },
|
|
266
|
+
{ "date_string": formatDate(new Date("2024-07-26T00:00:00"), undefined) }
|
|
267
|
+
]
|
|
268
|
+
];
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
function formatDate(date, timezone) {
|
|
272
|
+
const day = date.toLocaleDateString("en-US", { day: "numeric", timeZone: timezone });
|
|
273
|
+
const month = date.toLocaleDateString("en-US", { month: "short", timeZone: timezone });
|
|
274
|
+
const year = date.toLocaleDateString("en-US", { year: "numeric", timeZone: timezone });
|
|
275
|
+
return `${day} ${month} ${year}`;
|
|
222
276
|
}
|
|
223
277
|
//# sourceMappingURL=Llama3_1ChatWrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Llama3_1ChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/Llama3_1ChatWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"Llama3_1ChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/Llama3_1ChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { ChatWrapper } from "../ChatWrapper.js";
|
|
2
|
+
import { ChatHistoryItem, ChatWrapperGenerateContextStateOptions, ChatWrapperGeneratedContextState, ChatWrapperGenerateInitialHistoryOptions, ChatWrapperSettings } from "../types.js";
|
|
3
|
+
export declare class MistralChatWrapper extends ChatWrapper {
|
|
4
|
+
readonly wrapperName: string;
|
|
5
|
+
readonly settings: ChatWrapperSettings;
|
|
6
|
+
constructor({ addSpaceBeforeEos }?: {
|
|
7
|
+
/**
|
|
8
|
+
* Default to `true`
|
|
9
|
+
*/
|
|
10
|
+
addSpaceBeforeEos?: boolean;
|
|
11
|
+
});
|
|
12
|
+
addAvailableFunctionsSystemMessageToHistory(history: readonly ChatHistoryItem[]): readonly ChatHistoryItem[];
|
|
13
|
+
generateContextState({ chatHistory, availableFunctions, documentFunctionParams }: ChatWrapperGenerateContextStateOptions): ChatWrapperGeneratedContextState;
|
|
14
|
+
generateInitialChatHistory({ systemPrompt }?: ChatWrapperGenerateInitialHistoryOptions): ChatHistoryItem[];
|
|
15
|
+
}
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
import { ChatWrapper } from "../ChatWrapper.js";
|
|
2
|
+
import { SpecialToken, LlamaText, SpecialTokensText } from "../utils/LlamaText.js";
|
|
3
|
+
import { jsonDumps } from "./utils/jsonDumps.js";
|
|
4
|
+
import { chunkChatItems } from "./utils/chunkChatItems.js";
|
|
5
|
+
// source:
|
|
6
|
+
// https://github.com/mistralai/platform-docs-public/blob/02c3f50e427ce5cf96bba9710501598f621babea/docs/guides/tokenization.mdx#v3-tokenizer
|
|
7
|
+
//
|
|
8
|
+
// source: https://docs.mistral.ai/guides/tokenization/#v3-tokenizer
|
|
9
|
+
export class MistralChatWrapper extends ChatWrapper {
|
|
10
|
+
wrapperName = "Mistral";
|
|
11
|
+
settings = {
|
|
12
|
+
supportsSystemMessages: true,
|
|
13
|
+
functions: {
|
|
14
|
+
call: {
|
|
15
|
+
optionalPrefixSpace: true,
|
|
16
|
+
prefix: '{"name": "',
|
|
17
|
+
paramsPrefix: '", "arguments": ',
|
|
18
|
+
suffix: "}"
|
|
19
|
+
},
|
|
20
|
+
result: {
|
|
21
|
+
prefix: '{"name": "{{functionName}}", "content": ',
|
|
22
|
+
suffix: "}"
|
|
23
|
+
},
|
|
24
|
+
parallelism: {
|
|
25
|
+
call: {
|
|
26
|
+
sectionPrefix: LlamaText(new SpecialTokensText("[TOOL_CALLS]"), "["),
|
|
27
|
+
betweenCalls: ", ",
|
|
28
|
+
sectionSuffix: LlamaText("]", new SpecialToken("EOS"))
|
|
29
|
+
},
|
|
30
|
+
result: {
|
|
31
|
+
sectionPrefix: LlamaText(new SpecialTokensText("[TOOL_RESULTS]"), "["),
|
|
32
|
+
betweenResults: ", ",
|
|
33
|
+
sectionSuffix: LlamaText("]", new SpecialTokensText("[/TOOL_RESULTS]"))
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
/** @internal */ _addSpaceBeforeEos;
|
|
39
|
+
constructor({ addSpaceBeforeEos = false } = {}) {
|
|
40
|
+
super();
|
|
41
|
+
this._addSpaceBeforeEos = addSpaceBeforeEos;
|
|
42
|
+
}
|
|
43
|
+
addAvailableFunctionsSystemMessageToHistory(history) {
|
|
44
|
+
return history;
|
|
45
|
+
}
|
|
46
|
+
generateContextState({ chatHistory, availableFunctions, documentFunctionParams }) {
|
|
47
|
+
const toolsText = this._generateAvailableToolsText({ availableFunctions, documentFunctionParams });
|
|
48
|
+
const { systemMessage, chatHistory: chatHistoryWithoutSystemMessage } = this._splitSystemMessageFromChatHistory(chatHistory);
|
|
49
|
+
const { lastInteraction, chatHistory: cleanChatHistory } = this._splitLastInteractionFromChatHistory(chatHistoryWithoutSystemMessage);
|
|
50
|
+
const chunkedChatHistory = chunkChatItems(cleanChatHistory, {
|
|
51
|
+
generateModelResponseText: this.generateModelResponseText.bind(this)
|
|
52
|
+
});
|
|
53
|
+
const chunkedLastInteraction = chunkChatItems(lastInteraction, {
|
|
54
|
+
generateModelResponseText: this.generateModelResponseText.bind(this)
|
|
55
|
+
});
|
|
56
|
+
const contextText = LlamaText(new SpecialToken("BOS"), chunkedChatHistory.map(({ system, user, model }) => {
|
|
57
|
+
return LlamaText([
|
|
58
|
+
new SpecialTokensText("[INST]"),
|
|
59
|
+
LlamaText.joinValues("\n\n", [
|
|
60
|
+
system,
|
|
61
|
+
user
|
|
62
|
+
].filter((item) => item.values.length > 0)),
|
|
63
|
+
new SpecialTokensText("[/INST]"),
|
|
64
|
+
model,
|
|
65
|
+
this._addSpaceBeforeEos
|
|
66
|
+
? " "
|
|
67
|
+
: "",
|
|
68
|
+
new SpecialToken("EOS")
|
|
69
|
+
]);
|
|
70
|
+
}), toolsText === ""
|
|
71
|
+
? ""
|
|
72
|
+
: [
|
|
73
|
+
new SpecialTokensText("[AVAILABLE_TOOLS]"),
|
|
74
|
+
toolsText,
|
|
75
|
+
new SpecialTokensText("[/AVAILABLE_TOOLS]")
|
|
76
|
+
], chunkedLastInteraction.map(({ system, user, model }, index) => {
|
|
77
|
+
const isLastItem = index === chunkedLastInteraction.length - 1;
|
|
78
|
+
return LlamaText([
|
|
79
|
+
new SpecialTokensText("[INST]"),
|
|
80
|
+
(isLastItem && LlamaText(systemMessage).values.length > 0)
|
|
81
|
+
? [systemMessage, "\n\n"]
|
|
82
|
+
: "",
|
|
83
|
+
LlamaText.joinValues("\n\n", [
|
|
84
|
+
system,
|
|
85
|
+
user
|
|
86
|
+
].filter((item) => item.values.length > 0)),
|
|
87
|
+
new SpecialTokensText("[/INST]"),
|
|
88
|
+
model,
|
|
89
|
+
this._addSpaceBeforeEos
|
|
90
|
+
? " "
|
|
91
|
+
: "",
|
|
92
|
+
isLastItem
|
|
93
|
+
? LlamaText([])
|
|
94
|
+
: new SpecialToken("EOS")
|
|
95
|
+
]);
|
|
96
|
+
}));
|
|
97
|
+
return {
|
|
98
|
+
contextText,
|
|
99
|
+
stopGenerationTriggers: [
|
|
100
|
+
LlamaText(new SpecialToken("EOS")),
|
|
101
|
+
LlamaText("</s>")
|
|
102
|
+
]
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
generateInitialChatHistory({ systemPrompt } = {}) {
|
|
106
|
+
if (systemPrompt == null || systemPrompt.trim() === "")
|
|
107
|
+
return [];
|
|
108
|
+
return [{
|
|
109
|
+
type: "system",
|
|
110
|
+
text: LlamaText(systemPrompt).toJSON()
|
|
111
|
+
}];
|
|
112
|
+
}
|
|
113
|
+
/** @internal */
|
|
114
|
+
_generateAvailableToolsText({ availableFunctions, documentFunctionParams = true }) {
|
|
115
|
+
const availableFunctionNames = Object.keys(availableFunctions ?? {});
|
|
116
|
+
if (availableFunctions == null || availableFunctionNames.length === 0)
|
|
117
|
+
return "";
|
|
118
|
+
const availableTools = availableFunctionNames.map((functionName) => {
|
|
119
|
+
const functionDefinition = availableFunctions[functionName];
|
|
120
|
+
return {
|
|
121
|
+
type: "function",
|
|
122
|
+
function: {
|
|
123
|
+
name: functionName,
|
|
124
|
+
description: functionDefinition?.description != null && functionDefinition.description.trim() !== ""
|
|
125
|
+
? functionDefinition.description
|
|
126
|
+
: undefined,
|
|
127
|
+
parameters: documentFunctionParams && functionDefinition?.params != null
|
|
128
|
+
? functionDefinition.params
|
|
129
|
+
: undefined
|
|
130
|
+
}
|
|
131
|
+
};
|
|
132
|
+
});
|
|
133
|
+
return jsonDumps(availableTools);
|
|
134
|
+
}
|
|
135
|
+
/** @internal */
|
|
136
|
+
_splitSystemMessageFromChatHistory(history) {
|
|
137
|
+
const systemMessages = [];
|
|
138
|
+
const newHistory = history.slice();
|
|
139
|
+
while (newHistory.length > 0 && newHistory[0].type === "system")
|
|
140
|
+
systemMessages.push(LlamaText.fromJSON(newHistory.shift().text));
|
|
141
|
+
return {
|
|
142
|
+
systemMessage: LlamaText.joinValues("\n\n", systemMessages),
|
|
143
|
+
chatHistory: newHistory
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
/** @internal */
|
|
147
|
+
_splitLastInteractionFromChatHistory(history) {
|
|
148
|
+
const lastInteraction = [];
|
|
149
|
+
const newHistory = history.slice();
|
|
150
|
+
while (newHistory.length > 0) {
|
|
151
|
+
const item = newHistory.pop();
|
|
152
|
+
lastInteraction.unshift(item);
|
|
153
|
+
if (item.type === "user")
|
|
154
|
+
break;
|
|
155
|
+
}
|
|
156
|
+
return {
|
|
157
|
+
lastInteraction,
|
|
158
|
+
chatHistory: newHistory
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
/** @internal */
|
|
162
|
+
static _getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate() {
|
|
163
|
+
return [
|
|
164
|
+
{ addSpaceBeforeEos: false },
|
|
165
|
+
{ addSpaceBeforeEos: true }
|
|
166
|
+
];
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
//# sourceMappingURL=MistralChatWrapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MistralChatWrapper.js","sourceRoot":"","sources":["../../src/chatWrappers/MistralChatWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,6 +45,10 @@ export type JinjaTemplateChatWrapperOptions = {
|
|
|
45
45
|
* Defaults to `true`.
|
|
46
46
|
*/
|
|
47
47
|
trimLeadingWhitespaceInResponses?: boolean;
|
|
48
|
+
/**
|
|
49
|
+
* Additional parameters to use for rendering the Jinja template.
|
|
50
|
+
*/
|
|
51
|
+
additionalRenderParameters?: Record<string, any>;
|
|
48
52
|
};
|
|
49
53
|
export type JinjaTemplateChatWrapperOptionsConvertMessageFormat = {
|
|
50
54
|
use?: "always" | "ifNeeded";
|
|
@@ -58,6 +62,22 @@ export type JinjaTemplateChatWrapperOptionsConvertMessageFormat = {
|
|
|
58
62
|
* from the `ChatWrapper` class and implement a custom chat wrapper of your own in TypeScript.
|
|
59
63
|
*
|
|
60
64
|
* For a simpler way to create a chat wrapper, see the `TemplateChatWrapper` class.
|
|
65
|
+
* @example
|
|
66
|
+
* <span v-pre>
|
|
67
|
+
*
|
|
68
|
+
* ```ts
|
|
69
|
+
* import {JinjaTemplateChatWrapper} from "node-llama-cpp";
|
|
70
|
+
*
|
|
71
|
+
* const chatWrapper = new JinjaTemplateChatWrapper({
|
|
72
|
+
* template: "<Jinja template here>",
|
|
73
|
+
* // functionCallMessageTemplate: { // optional
|
|
74
|
+
* // call: "[[call: {{functionName}}({{functionParams}})]]",
|
|
75
|
+
* // result: " [[result: {{functionCallResult}}]]"
|
|
76
|
+
* // }
|
|
77
|
+
* });
|
|
78
|
+
* ```
|
|
79
|
+
*
|
|
80
|
+
* </span>
|
|
61
81
|
*/
|
|
62
82
|
export declare class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
63
83
|
readonly wrapperName = "JinjaTemplate";
|
|
@@ -69,7 +89,11 @@ export declare class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
69
89
|
readonly convertUnsupportedSystemMessagesToUserMessages?: JinjaTemplateChatWrapperOptionsConvertMessageFormat;
|
|
70
90
|
readonly joinAdjacentMessagesOfTheSameType: boolean;
|
|
71
91
|
readonly trimLeadingWhitespaceInResponses: boolean;
|
|
72
|
-
|
|
92
|
+
readonly additionalRenderParameters?: Record<string, any>;
|
|
93
|
+
/**
|
|
94
|
+
* @param options
|
|
95
|
+
*/
|
|
96
|
+
constructor({ template, modelRoleName, userRoleName, systemRoleName, convertUnsupportedSystemMessagesToUserMessages, functionCallMessageTemplate, joinAdjacentMessagesOfTheSameType, trimLeadingWhitespaceInResponses, additionalRenderParameters }: JinjaTemplateChatWrapperOptions);
|
|
73
97
|
generateContextState({ chatHistory, availableFunctions, documentFunctionParams }: ChatWrapperGenerateContextStateOptions): ChatWrapperGeneratedContextState & {
|
|
74
98
|
transformedSystemMessagesToUserMessages: boolean;
|
|
75
99
|
};
|
|
@@ -14,6 +14,22 @@ const defaultConvertUnsupportedSystemMessagesToUserMessagesFormat = {
|
|
|
14
14
|
* from the `ChatWrapper` class and implement a custom chat wrapper of your own in TypeScript.
|
|
15
15
|
*
|
|
16
16
|
* For a simpler way to create a chat wrapper, see the `TemplateChatWrapper` class.
|
|
17
|
+
* @example
|
|
18
|
+
* <span v-pre>
|
|
19
|
+
*
|
|
20
|
+
* ```ts
|
|
21
|
+
* import {JinjaTemplateChatWrapper} from "node-llama-cpp";
|
|
22
|
+
*
|
|
23
|
+
* const chatWrapper = new JinjaTemplateChatWrapper({
|
|
24
|
+
* template: "<Jinja template here>",
|
|
25
|
+
* // functionCallMessageTemplate: { // optional
|
|
26
|
+
* // call: "[[call: {{functionName}}({{functionParams}})]]",
|
|
27
|
+
* // result: " [[result: {{functionCallResult}}]]"
|
|
28
|
+
* // }
|
|
29
|
+
* });
|
|
30
|
+
* ```
|
|
31
|
+
*
|
|
32
|
+
* </span>
|
|
17
33
|
*/
|
|
18
34
|
export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
19
35
|
wrapperName = "JinjaTemplate";
|
|
@@ -25,8 +41,12 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
25
41
|
convertUnsupportedSystemMessagesToUserMessages;
|
|
26
42
|
joinAdjacentMessagesOfTheSameType;
|
|
27
43
|
trimLeadingWhitespaceInResponses;
|
|
44
|
+
additionalRenderParameters;
|
|
28
45
|
/** @internal */ _jinjaTemplate;
|
|
29
|
-
|
|
46
|
+
/**
|
|
47
|
+
* @param options
|
|
48
|
+
*/
|
|
49
|
+
constructor({ template, modelRoleName = "assistant", userRoleName = "user", systemRoleName = "system", convertUnsupportedSystemMessagesToUserMessages = defaultConvertUnsupportedSystemMessagesToUserMessagesFormat, functionCallMessageTemplate, joinAdjacentMessagesOfTheSameType = true, trimLeadingWhitespaceInResponses = true, additionalRenderParameters }) {
|
|
30
50
|
super();
|
|
31
51
|
if (template == null)
|
|
32
52
|
throw new Error("template cannot be null");
|
|
@@ -38,6 +58,7 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
38
58
|
resolveConvertUnsupportedSystemMessagesToUserMessagesOption(convertUnsupportedSystemMessagesToUserMessages);
|
|
39
59
|
this.joinAdjacentMessagesOfTheSameType = joinAdjacentMessagesOfTheSameType;
|
|
40
60
|
this.trimLeadingWhitespaceInResponses = trimLeadingWhitespaceInResponses;
|
|
61
|
+
this.additionalRenderParameters = additionalRenderParameters;
|
|
41
62
|
this.settings = {
|
|
42
63
|
...ChatWrapper.defaultSettings,
|
|
43
64
|
functions: parseFunctionCallMessageTemplate(functionCallMessageTemplate) ?? ChatWrapper.defaultSettings.functions
|
|
@@ -119,7 +140,7 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
119
140
|
currentTexts.push(this.generateModelResponseText(item.response));
|
|
120
141
|
}
|
|
121
142
|
else
|
|
122
|
-
void
|
|
143
|
+
void item;
|
|
123
144
|
}
|
|
124
145
|
const lastItemIsModelMessage = currentAggregateFocus === "model";
|
|
125
146
|
flush();
|
|
@@ -151,24 +172,41 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
151
172
|
idToContent.set(bosTokenId, new SpecialToken("BOS"));
|
|
152
173
|
idToContent.set(eosTokenId, new SpecialToken("EOS"));
|
|
153
174
|
idToContent.set(eotTokenId, new SpecialToken("EOT"));
|
|
175
|
+
function tryOptions(options) {
|
|
176
|
+
for (let i = 0; i < options.length; i++) {
|
|
177
|
+
if (i === options.length - 1)
|
|
178
|
+
return options[i]();
|
|
179
|
+
try {
|
|
180
|
+
return options[i]();
|
|
181
|
+
}
|
|
182
|
+
catch (err) {
|
|
183
|
+
// do nothing
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
throw new Error("All options failed");
|
|
187
|
+
}
|
|
154
188
|
const renderJinjaText = () => {
|
|
155
|
-
|
|
156
|
-
|
|
189
|
+
return tryOptions([
|
|
190
|
+
() => this._jinjaTemplate.render({
|
|
191
|
+
...(this.additionalRenderParameters == null
|
|
192
|
+
? {}
|
|
193
|
+
: structuredClone(this.additionalRenderParameters)),
|
|
157
194
|
messages: jinjaItems,
|
|
158
195
|
"bos_token": bosTokenId,
|
|
159
196
|
"eos_token": eosTokenId,
|
|
160
197
|
"eot_token": eotTokenId
|
|
161
|
-
})
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
198
|
+
}),
|
|
199
|
+
() => this._jinjaTemplate.render({
|
|
200
|
+
...(this.additionalRenderParameters == null
|
|
201
|
+
? {}
|
|
202
|
+
: structuredClone(this.additionalRenderParameters)),
|
|
165
203
|
messages: jinjaItems,
|
|
166
204
|
"bos_token": bosTokenId,
|
|
167
205
|
"eos_token": eosTokenId,
|
|
168
206
|
"eot_token": eotTokenId,
|
|
169
207
|
"add_generation_prompt": true
|
|
170
|
-
})
|
|
171
|
-
|
|
208
|
+
})
|
|
209
|
+
]);
|
|
172
210
|
};
|
|
173
211
|
const validateThatAllMessageIdsAreUsed = (parts) => {
|
|
174
212
|
const messageIdsLeft = new Set(messageIds);
|
|
@@ -186,7 +224,7 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
186
224
|
let lastModelResponseIndex = -1;
|
|
187
225
|
for (let i = splitJinjaParts.length - 1; i >= 0; i--) {
|
|
188
226
|
const part = splitJinjaParts[i];
|
|
189
|
-
if (typeof part === "string")
|
|
227
|
+
if (part == null || typeof part === "string")
|
|
190
228
|
continue;
|
|
191
229
|
if (modelMessageIds.has(part.separator)) {
|
|
192
230
|
lastModelResponseIndex = i;
|
|
@@ -270,7 +308,7 @@ export class JinjaTemplateChatWrapper extends ChatWrapper {
|
|
|
270
308
|
return { supportsSystemMessages };
|
|
271
309
|
}
|
|
272
310
|
catch (err) {
|
|
273
|
-
throw new Error("The provided Jinja template failed
|
|
311
|
+
throw new Error("The provided Jinja template failed the sanity test: " + String(err) + ". Inspect the Jinja template to find out what went wrong");
|
|
274
312
|
}
|
|
275
313
|
}
|
|
276
314
|
}
|