node-llama-cpp 3.0.0-beta.44 → 3.0.0-beta.45
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 +9 -0
- package/dist/bindings/Llama.js +33 -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 +33 -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 +3 -0
- 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 +3 -0
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.js +3 -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 +256 -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 +71 -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 +26 -0
- package/dist/utils/ThreadsSplitter.js +164 -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
|
@@ -2,26 +2,29 @@ import process from "process";
|
|
|
2
2
|
import fs from "fs-extra";
|
|
3
3
|
import chalk from "chalk";
|
|
4
4
|
import { cliModelsDirectory, documentationPageUrls } from "../../config.js";
|
|
5
|
-
import { createModelDownloader } from "../../utils/createModelDownloader.js";
|
|
5
|
+
import { combineModelDownloaders, createModelDownloader } from "../../utils/createModelDownloader.js";
|
|
6
6
|
import { getReadablePath } from "../utils/getReadablePath.js";
|
|
7
7
|
import { ConsoleInteraction, ConsoleInteractionKey } from "../utils/ConsoleInteraction.js";
|
|
8
8
|
import { getIsInDocumentationMode } from "../../state.js";
|
|
9
9
|
import { resolveHeaderFlag } from "../utils/resolveHeaderFlag.js";
|
|
10
10
|
import { withCliCommandDescriptionDocsUrl } from "../utils/withCliCommandDescriptionDocsUrl.js";
|
|
11
11
|
export const PullCommand = {
|
|
12
|
-
command: "pull [
|
|
12
|
+
command: "pull [urls..]",
|
|
13
13
|
aliases: ["get"],
|
|
14
|
-
describe: withCliCommandDescriptionDocsUrl("Download
|
|
14
|
+
describe: withCliCommandDescriptionDocsUrl("Download models from URLs", documentationPageUrls.CLI.Pull),
|
|
15
15
|
builder(yargs) {
|
|
16
16
|
const isInDocumentationMode = getIsInDocumentationMode();
|
|
17
17
|
return yargs
|
|
18
|
-
.option("
|
|
18
|
+
.option("urls", {
|
|
19
19
|
type: "string",
|
|
20
|
+
alias: ["url"],
|
|
21
|
+
array: true,
|
|
20
22
|
description: [
|
|
21
23
|
"A `.gguf` model URL to pull.",
|
|
22
|
-
"Automatically handles split and binary-split models files.",
|
|
23
|
-
"If a file already exists and its size matches the expected size, it will not be downloaded again unless the `--override` flag is used."
|
|
24
|
-
|
|
24
|
+
!isInDocumentationMode && "Automatically handles split and binary-split models files, so only pass the URL to the first file of a model.",
|
|
25
|
+
!isInDocumentationMode && "If a file already exists and its size matches the expected size, it will not be downloaded again unless the `--override` flag is used.",
|
|
26
|
+
"Pass multiple URLs to download multiple models at once."
|
|
27
|
+
].filter(Boolean).join(isInDocumentationMode
|
|
25
28
|
? "\n"
|
|
26
29
|
: " "),
|
|
27
30
|
demandOption: true,
|
|
@@ -37,7 +40,7 @@ export const PullCommand = {
|
|
|
37
40
|
.option("override", {
|
|
38
41
|
alias: ["o"],
|
|
39
42
|
type: "boolean",
|
|
40
|
-
description: "Override
|
|
43
|
+
description: "Override existing model files",
|
|
41
44
|
default: false,
|
|
42
45
|
group: "Optional:"
|
|
43
46
|
})
|
|
@@ -67,51 +70,89 @@ export const PullCommand = {
|
|
|
67
70
|
.option("filename", {
|
|
68
71
|
alias: ["n", "name"],
|
|
69
72
|
type: "string",
|
|
70
|
-
description: "Filename to save the model as",
|
|
73
|
+
description: "Filename to save the model as. Can only be used if a single URL is passed",
|
|
74
|
+
group: "Optional:"
|
|
75
|
+
})
|
|
76
|
+
.option("parallel", {
|
|
77
|
+
alias: ["p"],
|
|
78
|
+
type: "number",
|
|
79
|
+
description: "Maximum parallel downloads",
|
|
80
|
+
default: 4,
|
|
71
81
|
group: "Optional:"
|
|
72
82
|
});
|
|
73
83
|
},
|
|
74
|
-
async handler({
|
|
84
|
+
async handler({ urls, header: headerArg, override, noProgress, noTempFile, directory, filename, parallel }) {
|
|
75
85
|
const headers = resolveHeaderFlag(headerArg);
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
86
|
+
if (urls.length === 0)
|
|
87
|
+
throw new Error("At least one URL must be provided");
|
|
88
|
+
else if (urls.length > 1 && filename != null)
|
|
89
|
+
throw new Error("The `--filename` flag can only be used when a single URL is passed");
|
|
90
|
+
if (urls.length === 1) {
|
|
91
|
+
const downloader = await createModelDownloader({
|
|
92
|
+
modelUrl: urls[0],
|
|
93
|
+
dirPath: directory,
|
|
94
|
+
headers,
|
|
95
|
+
showCliProgress: !noProgress,
|
|
96
|
+
deleteTempFileOnCancel: noTempFile,
|
|
97
|
+
skipExisting: !override,
|
|
98
|
+
fileName: filename || undefined,
|
|
99
|
+
parallelDownloads: parallel
|
|
100
|
+
});
|
|
101
|
+
if (!override && downloader.totalFiles === 1 && await fs.pathExists(downloader.entrypointFilePath)) {
|
|
102
|
+
const fileStats = await fs.stat(downloader.entrypointFilePath);
|
|
103
|
+
if (downloader.totalSize === fileStats.size) {
|
|
104
|
+
console.info(`${chalk.yellow("File:")} ${getReadablePath(downloader.entrypointFilePath)}`);
|
|
92
105
|
console.info("Skipping download of an existing file: " + chalk.yellow(getReadablePath(downloader.entrypointFilePath)));
|
|
106
|
+
process.exit(0);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
const consoleInteraction = new ConsoleInteraction();
|
|
110
|
+
consoleInteraction.onKey(ConsoleInteractionKey.ctrlC, async () => {
|
|
111
|
+
await downloader.cancel();
|
|
112
|
+
consoleInteraction.stop();
|
|
93
113
|
process.exit(0);
|
|
114
|
+
});
|
|
115
|
+
if (!noProgress) {
|
|
116
|
+
console.info(`Downloading to ${chalk.yellow(getReadablePath(directory))}${downloader.splitBinaryParts != null
|
|
117
|
+
? chalk.gray(` (combining ${downloader.splitBinaryParts} parts into a single file)`)
|
|
118
|
+
: ""}`);
|
|
119
|
+
consoleInteraction.start();
|
|
94
120
|
}
|
|
121
|
+
await downloader.download();
|
|
122
|
+
if (!noProgress)
|
|
123
|
+
consoleInteraction.stop();
|
|
124
|
+
console.info(`Downloaded to ${chalk.yellow(getReadablePath(downloader.entrypointFilePath))}`);
|
|
95
125
|
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
126
|
+
else {
|
|
127
|
+
const downloader = await combineModelDownloaders(urls.map((url) => createModelDownloader({
|
|
128
|
+
modelUrl: url,
|
|
129
|
+
dirPath: directory,
|
|
130
|
+
headers,
|
|
131
|
+
showCliProgress: false,
|
|
132
|
+
deleteTempFileOnCancel: noTempFile,
|
|
133
|
+
skipExisting: !override,
|
|
134
|
+
fileName: filename || undefined
|
|
135
|
+
})), {
|
|
136
|
+
showCliProgress: !noProgress,
|
|
137
|
+
parallelDownloads: parallel
|
|
138
|
+
});
|
|
139
|
+
const consoleInteraction = new ConsoleInteraction();
|
|
140
|
+
consoleInteraction.onKey(ConsoleInteractionKey.ctrlC, async () => {
|
|
141
|
+
await downloader.cancel();
|
|
142
|
+
consoleInteraction.stop();
|
|
143
|
+
process.exit(0);
|
|
144
|
+
});
|
|
145
|
+
if (!noProgress) {
|
|
146
|
+
console.info(`Downloading to ${chalk.yellow(getReadablePath(directory))}`);
|
|
147
|
+
consoleInteraction.start();
|
|
148
|
+
}
|
|
149
|
+
await downloader.download();
|
|
150
|
+
if (!noProgress)
|
|
151
|
+
consoleInteraction.stop();
|
|
152
|
+
console.info(`Downloaded ${downloader.modelDownloaders.length} models to ${chalk.yellow(getReadablePath(directory))}\n${chalk.gray("*")} ` +
|
|
153
|
+
downloader.modelDownloaders.map((downloader) => chalk.yellow(downloader.entrypointFilename))
|
|
154
|
+
.join(`\n${chalk.gray("*")} `));
|
|
107
155
|
}
|
|
108
|
-
await downloader.download();
|
|
109
|
-
if (!noProgress)
|
|
110
|
-
consoleInteraction.stop();
|
|
111
|
-
if (noProgress)
|
|
112
|
-
console.info(downloader.entrypointFilePath);
|
|
113
|
-
else
|
|
114
|
-
console.info(`Downloaded to ${chalk.yellow(getReadablePath(downloader.entrypointFilePath))}`);
|
|
115
156
|
}
|
|
116
157
|
};
|
|
117
158
|
//# sourceMappingURL=PullCommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PullCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/PullCommand.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,kBAAkB,EAAE,qBAAqB,EAAC,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAC,qBAAqB,EAAC,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"PullCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/PullCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,17 +3,19 @@ import { documentationPageUrls } from "../../../config.js";
|
|
|
3
3
|
import { InspectGgufCommand } from "./commands/InspectGgufCommand.js";
|
|
4
4
|
import { InspectGpuCommand } from "./commands/InspectGpuCommand.js";
|
|
5
5
|
import { InspectMeasureCommand } from "./commands/InspectMeasureCommand.js";
|
|
6
|
+
import { InspectEstimateCommand } from "./commands/InspectEstimateCommand.js";
|
|
6
7
|
export const InspectCommand = {
|
|
7
8
|
command: "inspect <command>",
|
|
8
|
-
describe: withCliCommandDescriptionDocsUrl("Inspect the inner workings of node-llama-cpp", documentationPageUrls.CLI.Inspect.index),
|
|
9
|
+
describe: withCliCommandDescriptionDocsUrl("Inspect the inner workings of `node-llama-cpp`", documentationPageUrls.CLI.Inspect.index),
|
|
9
10
|
builder(yargs) {
|
|
10
11
|
return yargs
|
|
11
12
|
.command(InspectGpuCommand)
|
|
12
13
|
.command(InspectGgufCommand)
|
|
13
|
-
.command(InspectMeasureCommand)
|
|
14
|
+
.command(InspectMeasureCommand)
|
|
15
|
+
.command(InspectEstimateCommand);
|
|
14
16
|
},
|
|
15
17
|
async handler() {
|
|
16
|
-
// this function must
|
|
18
|
+
// this function must exist, even though we do nothing here
|
|
17
19
|
}
|
|
18
20
|
};
|
|
19
21
|
//# sourceMappingURL=InspectCommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InspectCommand.js","sourceRoot":"","sources":["../../../../src/cli/commands/inspect/InspectCommand.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gCAAgC,EAAC,MAAM,iDAAiD,CAAC;AACjG,OAAO,EAAC,qBAAqB,EAAC,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAC,kBAAkB,EAAC,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAC,iBAAiB,EAAC,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAC,qBAAqB,EAAC,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"InspectCommand.js","sourceRoot":"","sources":["../../../../src/cli/commands/inspect/InspectCommand.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gCAAgC,EAAC,MAAM,iDAAiD,CAAC;AACjG,OAAO,EAAC,qBAAqB,EAAC,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAC,kBAAkB,EAAC,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAC,iBAAiB,EAAC,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAC,qBAAqB,EAAC,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AAM5E,MAAM,CAAC,MAAM,cAAc,GAA0C;IACjE,OAAO,EAAE,mBAAmB;IAC5B,QAAQ,EAAE,gCAAgC,CACtC,gDAAgD,EAChD,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAC1C;IACD,OAAO,CAAC,KAAK;QACT,OAAO,KAAK;aACP,OAAO,CAAC,iBAAiB,CAAC;aAC1B,OAAO,CAAC,kBAAkB,CAAC;aAC3B,OAAO,CAAC,qBAAqB,CAAC;aAC9B,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACzC,CAAC;IACD,KAAK,CAAC,OAAO;QACT,2DAA2D;IAC/D,CAAC;CACJ,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { CommandModule } from "yargs";
|
|
2
|
+
import { BuildGpu } from "../../../../bindings/types.js";
|
|
3
|
+
type InspectEstimateCommand = {
|
|
4
|
+
modelPath: string;
|
|
5
|
+
header?: string[];
|
|
6
|
+
gpu?: BuildGpu | "auto";
|
|
7
|
+
gpuLayers?: number | "max";
|
|
8
|
+
contextSize?: number | "train";
|
|
9
|
+
embedding?: boolean;
|
|
10
|
+
};
|
|
11
|
+
export declare const InspectEstimateCommand: CommandModule<object, InspectEstimateCommand>;
|
|
12
|
+
export {};
|
|
@@ -0,0 +1,225 @@
|
|
|
1
|
+
import path from "path";
|
|
2
|
+
import chalk from "chalk";
|
|
3
|
+
import bytes from "bytes";
|
|
4
|
+
import { readGgufFileInfo } from "../../../../gguf/readGgufFileInfo.js";
|
|
5
|
+
import { normalizeGgufDownloadUrl } from "../../../../gguf/utils/normalizeGgufDownloadUrl.js";
|
|
6
|
+
import { isUrl } from "../../../../utils/isUrl.js";
|
|
7
|
+
import { resolveHeaderFlag } from "../../../utils/resolveHeaderFlag.js";
|
|
8
|
+
import { getReadablePath } from "../../../utils/getReadablePath.js";
|
|
9
|
+
import { withCliCommandDescriptionDocsUrl } from "../../../utils/withCliCommandDescriptionDocsUrl.js";
|
|
10
|
+
import { documentationPageUrls } from "../../../../config.js";
|
|
11
|
+
import { printInfoLine } from "../../../utils/printInfoLine.js";
|
|
12
|
+
import { renderModelCompatibilityPercentageWithColors } from "../../../utils/renderModelCompatibilityPercentageWithColors.js";
|
|
13
|
+
import { getReadableContextSize } from "../../../../utils/getReadableContextSize.js";
|
|
14
|
+
import { GgufInsights } from "../../../../gguf/insights/GgufInsights.js";
|
|
15
|
+
import { getLlama } from "../../../../bindings/getLlama.js";
|
|
16
|
+
import { LlamaLogLevel, nodeLlamaCppGpuOptions, parseNodeLlamaCppGpuOption } from "../../../../bindings/types.js";
|
|
17
|
+
import { defaultTrainContextSizeForEstimationPurposes } from "../../../../gguf/insights/GgufInsightsConfigurationResolver.js";
|
|
18
|
+
import { getGgufFileTypeName } from "../../../../gguf/utils/getGgufFileTypeName.js";
|
|
19
|
+
import { getPrettyBuildGpuName } from "../../../../bindings/consts.js";
|
|
20
|
+
import withOra from "../../../../utils/withOra.js";
|
|
21
|
+
export const InspectEstimateCommand = {
|
|
22
|
+
command: "estimate [modelPath]",
|
|
23
|
+
describe: withCliCommandDescriptionDocsUrl("Estimate the compatibility of a model with the current hardware", documentationPageUrls.CLI.Inspect.Estimate),
|
|
24
|
+
builder(yargs) {
|
|
25
|
+
return yargs
|
|
26
|
+
.option("modelPath", {
|
|
27
|
+
alias: ["m", "model", "path", "url"],
|
|
28
|
+
type: "string",
|
|
29
|
+
demandOption: true,
|
|
30
|
+
description: "The path or URL of the GGUF file to use. If a URL is provided, the metadata will be read from the remote file without downloading the entire file.",
|
|
31
|
+
group: "Required:"
|
|
32
|
+
})
|
|
33
|
+
.option("header", {
|
|
34
|
+
alias: ["H"],
|
|
35
|
+
type: "string",
|
|
36
|
+
array: true,
|
|
37
|
+
description: "Headers to use when reading a model file from a URL, in the format `key: value`. You can pass this option multiple times to add multiple headers.",
|
|
38
|
+
group: "Optional:"
|
|
39
|
+
})
|
|
40
|
+
.option("gpu", {
|
|
41
|
+
type: "string",
|
|
42
|
+
// yargs types don't support passing `false` as a choice, although it is supported by yargs
|
|
43
|
+
choices: nodeLlamaCppGpuOptions,
|
|
44
|
+
coerce: (value) => {
|
|
45
|
+
if (value == null || value == "")
|
|
46
|
+
return undefined;
|
|
47
|
+
return parseNodeLlamaCppGpuOption(value);
|
|
48
|
+
},
|
|
49
|
+
defaultDescription: "Uses the latest local build, and fallbacks to \"auto\"",
|
|
50
|
+
description: "Compute layer implementation type to use for llama.cpp. If omitted, uses the latest local build, and fallbacks to \"auto\"",
|
|
51
|
+
group: "Optional:"
|
|
52
|
+
})
|
|
53
|
+
.option("gpuLayers", {
|
|
54
|
+
alias: "gl",
|
|
55
|
+
type: "number",
|
|
56
|
+
description: "number of layers to store in VRAM. Set to `max` to use all the layers the model has",
|
|
57
|
+
string: true,
|
|
58
|
+
coerce: (value) => {
|
|
59
|
+
if (value === "max")
|
|
60
|
+
return -2;
|
|
61
|
+
return parseInt(value);
|
|
62
|
+
},
|
|
63
|
+
default: -1,
|
|
64
|
+
defaultDescription: "Automatically determined based on the available VRAM",
|
|
65
|
+
group: "Optional:"
|
|
66
|
+
})
|
|
67
|
+
.option("contextSize", {
|
|
68
|
+
alias: "c",
|
|
69
|
+
type: "number",
|
|
70
|
+
description: "Context size to use for the model context. Set to `max` or `train` to use the training context size. " +
|
|
71
|
+
"Note that the train context size is not necessarily what you should use for inference, " +
|
|
72
|
+
"and a big context size will use a lot of memory",
|
|
73
|
+
string: true,
|
|
74
|
+
coerce: (value) => {
|
|
75
|
+
if (value === "max" || value === "train")
|
|
76
|
+
return -2;
|
|
77
|
+
return parseInt(value);
|
|
78
|
+
},
|
|
79
|
+
default: -1,
|
|
80
|
+
defaultDescription: "Automatically determined based on the available VRAM",
|
|
81
|
+
group: "Optional:"
|
|
82
|
+
})
|
|
83
|
+
.option("embedding", {
|
|
84
|
+
alias: "e",
|
|
85
|
+
type: "boolean",
|
|
86
|
+
description: "Whether to estimate for creating an embedding context",
|
|
87
|
+
default: false,
|
|
88
|
+
group: "Optional:"
|
|
89
|
+
});
|
|
90
|
+
},
|
|
91
|
+
async handler({ modelPath: ggufPath, header: headerArg, gpu, gpuLayers, contextSize: contextSizeArg, embedding }) {
|
|
92
|
+
if (gpuLayers === -1)
|
|
93
|
+
gpuLayers = undefined;
|
|
94
|
+
if (gpuLayers === -2)
|
|
95
|
+
gpuLayers = "max";
|
|
96
|
+
if (contextSizeArg === -1)
|
|
97
|
+
contextSizeArg = undefined;
|
|
98
|
+
if (contextSizeArg === -2)
|
|
99
|
+
contextSizeArg = "train";
|
|
100
|
+
const isPathUrl = isUrl(ggufPath);
|
|
101
|
+
const resolvedGgufPath = isPathUrl
|
|
102
|
+
? normalizeGgufDownloadUrl(ggufPath)
|
|
103
|
+
: path.resolve(ggufPath);
|
|
104
|
+
const headers = resolveHeaderFlag(headerArg);
|
|
105
|
+
const llama = gpu == null
|
|
106
|
+
? await getLlama("lastBuild", {
|
|
107
|
+
logLevel: LlamaLogLevel.error
|
|
108
|
+
})
|
|
109
|
+
: await getLlama({
|
|
110
|
+
gpu,
|
|
111
|
+
logLevel: LlamaLogLevel.error
|
|
112
|
+
});
|
|
113
|
+
if (isPathUrl)
|
|
114
|
+
console.info(`${chalk.yellow("URL:")} ${resolvedGgufPath}`);
|
|
115
|
+
else
|
|
116
|
+
console.info(`${chalk.yellow("File:")} ${getReadablePath(resolvedGgufPath)}`);
|
|
117
|
+
if (embedding)
|
|
118
|
+
console.info(`${chalk.yellow("Estimating for an embedding context")}`);
|
|
119
|
+
const ggufFileInfo = await withOra({
|
|
120
|
+
loading: chalk.blue("Reading model metadata"),
|
|
121
|
+
success: chalk.blue("Read model metadata"),
|
|
122
|
+
fail: chalk.blue("Failed to read model metadata"),
|
|
123
|
+
noSuccessLiveStatus: true
|
|
124
|
+
}, async () => {
|
|
125
|
+
return await readGgufFileInfo(ggufPath, {
|
|
126
|
+
fetchHeaders: isPathUrl ? headers : undefined
|
|
127
|
+
});
|
|
128
|
+
});
|
|
129
|
+
const ggufInsights = await GgufInsights.from(ggufFileInfo, llama);
|
|
130
|
+
const contextSize = contextSizeArg === "train"
|
|
131
|
+
? ggufInsights.trainContextSize ?? defaultTrainContextSizeForEstimationPurposes
|
|
132
|
+
: contextSizeArg;
|
|
133
|
+
async function resolveCompatibilityScore(flashAttention) {
|
|
134
|
+
return await ggufInsights.configurationResolver.resolveAndScoreConfig({
|
|
135
|
+
flashAttention,
|
|
136
|
+
targetContextSize: contextSize,
|
|
137
|
+
targetGpuLayers: gpuLayers,
|
|
138
|
+
embeddingContext: embedding
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
const [compatibilityScore, compatibilityScoreWithFlashAttention] = await Promise.all([
|
|
142
|
+
resolveCompatibilityScore(false),
|
|
143
|
+
resolveCompatibilityScore(true)
|
|
144
|
+
]);
|
|
145
|
+
const longestTitle = Math.max("GPU info".length, "Model info".length, "Resolved config".length, "With flash attention".length) + 1;
|
|
146
|
+
if (llama.gpu !== false) {
|
|
147
|
+
const [vramState, deviceNames] = await Promise.all([
|
|
148
|
+
llama.getVramState(),
|
|
149
|
+
llama.getGpuDeviceNames()
|
|
150
|
+
]);
|
|
151
|
+
printInfoLine({
|
|
152
|
+
title: "GPU info",
|
|
153
|
+
padTitle: longestTitle,
|
|
154
|
+
info: [{
|
|
155
|
+
title: "Type",
|
|
156
|
+
value: getPrettyBuildGpuName(llama.gpu)
|
|
157
|
+
}, {
|
|
158
|
+
title: "VRAM",
|
|
159
|
+
value: bytes(vramState.total)
|
|
160
|
+
}, {
|
|
161
|
+
title: "Name",
|
|
162
|
+
value: toOneLine(deviceNames.join(", "))
|
|
163
|
+
}]
|
|
164
|
+
});
|
|
165
|
+
}
|
|
166
|
+
printInfoLine({
|
|
167
|
+
title: "Model info",
|
|
168
|
+
padTitle: longestTitle,
|
|
169
|
+
info: [{
|
|
170
|
+
title: "Type",
|
|
171
|
+
value: toOneLine([
|
|
172
|
+
ggufFileInfo.metadata?.general?.architecture,
|
|
173
|
+
ggufFileInfo.metadata?.general?.size_label,
|
|
174
|
+
getGgufFileTypeName(ggufFileInfo.metadata.general?.file_type)
|
|
175
|
+
].filter(Boolean).join(" "))
|
|
176
|
+
}, {
|
|
177
|
+
title: "Size",
|
|
178
|
+
value: bytes(ggufInsights.modelSize)
|
|
179
|
+
}, {
|
|
180
|
+
show: ggufInsights.trainContextSize != null,
|
|
181
|
+
title: "Train context size",
|
|
182
|
+
value: getReadableContextSize(ggufInsights.trainContextSize ?? 0)
|
|
183
|
+
}]
|
|
184
|
+
});
|
|
185
|
+
console.info();
|
|
186
|
+
logCompatibilityScore("Resolved config", longestTitle, compatibilityScore, ggufInsights, llama, false);
|
|
187
|
+
logCompatibilityScore("With flash attention", longestTitle, compatibilityScoreWithFlashAttention, ggufInsights, llama, true);
|
|
188
|
+
}
|
|
189
|
+
};
|
|
190
|
+
function logCompatibilityScore(title, padTitle, compatibilityScore, ggufInsights, llama, flashAttention) {
|
|
191
|
+
printInfoLine({
|
|
192
|
+
title,
|
|
193
|
+
padTitle,
|
|
194
|
+
separateLines: false,
|
|
195
|
+
info: [{
|
|
196
|
+
title: "",
|
|
197
|
+
value: renderModelCompatibilityPercentageWithColors(compatibilityScore.compatibilityScore * 100) + " compatibility"
|
|
198
|
+
}, {
|
|
199
|
+
show: ggufInsights.trainContextSize != null,
|
|
200
|
+
title: "Context size",
|
|
201
|
+
value: getReadableContextSize(compatibilityScore.resolvedValues.contextSize)
|
|
202
|
+
}, {
|
|
203
|
+
show: llama.gpu !== false,
|
|
204
|
+
title: "GPU layers",
|
|
205
|
+
value: () => (compatibilityScore.resolvedValues.gpuLayers + "/" + ggufInsights.totalLayers + " " +
|
|
206
|
+
chalk.dim(`(${Math.floor((compatibilityScore.resolvedValues.gpuLayers / ggufInsights.totalLayers) * 100)}%)`))
|
|
207
|
+
}, {
|
|
208
|
+
show: llama.gpu !== false,
|
|
209
|
+
title: "VRAM usage",
|
|
210
|
+
value: () => bytes(compatibilityScore.resolvedValues.totalVramUsage)
|
|
211
|
+
}, {
|
|
212
|
+
show: compatibilityScore.resolvedValues.totalRamUsage > 0,
|
|
213
|
+
title: "RAM usage",
|
|
214
|
+
value: () => bytes(compatibilityScore.resolvedValues.totalRamUsage)
|
|
215
|
+
}, {
|
|
216
|
+
show: flashAttention,
|
|
217
|
+
title: "Flash attention",
|
|
218
|
+
value: "enabled"
|
|
219
|
+
}]
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
function toOneLine(text) {
|
|
223
|
+
return text.replaceAll("\n", chalk.gray("\\n"));
|
|
224
|
+
}
|
|
225
|
+
//# sourceMappingURL=InspectEstimateCommand.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"InspectEstimateCommand.js","sourceRoot":"","sources":["../../../../../src/cli/commands/inspect/commands/InspectEstimateCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ import { resolveHeaderFlag } from "../../../utils/resolveHeaderFlag.js";
|
|
|
12
12
|
import { getReadablePath } from "../../../utils/getReadablePath.js";
|
|
13
13
|
import { withCliCommandDescriptionDocsUrl } from "../../../utils/withCliCommandDescriptionDocsUrl.js";
|
|
14
14
|
import { documentationPageUrls } from "../../../../config.js";
|
|
15
|
+
import withOra from "../../../../utils/withOra.js";
|
|
15
16
|
export const InspectGgufCommand = {
|
|
16
17
|
command: "gguf [modelPath]",
|
|
17
18
|
describe: withCliCommandDescriptionDocsUrl("Inspect a GGUF file", documentationPageUrls.CLI.Inspect.GGUF),
|
|
@@ -76,10 +77,22 @@ export const InspectGgufCommand = {
|
|
|
76
77
|
else
|
|
77
78
|
console.info(`${chalk.yellow("File:")} ${getReadablePath(resolvedGgufPath)}`);
|
|
78
79
|
}
|
|
79
|
-
const parsedMetadata =
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
80
|
+
const parsedMetadata = plainJson
|
|
81
|
+
? await readGgufFileInfo(ggufPath, {
|
|
82
|
+
fetchHeaders: isPathUrl ? headers : undefined,
|
|
83
|
+
spliceSplitFiles: !noSplice
|
|
84
|
+
})
|
|
85
|
+
: await withOra({
|
|
86
|
+
loading: chalk.blue("Reading model metadata"),
|
|
87
|
+
success: chalk.blue("Read model metadata"),
|
|
88
|
+
fail: chalk.blue("Failed to read model metadata"),
|
|
89
|
+
noSuccessLiveStatus: true
|
|
90
|
+
}, async () => {
|
|
91
|
+
return await readGgufFileInfo(ggufPath, {
|
|
92
|
+
fetchHeaders: isPathUrl ? headers : undefined,
|
|
93
|
+
spliceSplitFiles: !noSplice
|
|
94
|
+
});
|
|
95
|
+
});
|
|
83
96
|
const fileTypeName = getGgufFileTypeName(parsedMetadata.metadata.general?.file_type);
|
|
84
97
|
if (plainJson || outputToJsonFile != null) {
|
|
85
98
|
const outputJson = JSON.stringify({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InspectGgufCommand.js","sourceRoot":"","sources":["../../../../../src/cli/commands/inspect/commands/InspectGgufCommand.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAC,gBAAgB,EAAC,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAC,iBAAiB,EAA2B,MAAM,wCAAwC,CAAC;AACnG,OAAO,EAAC,mBAAmB,EAAC,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAC,wBAAwB,EAAC,MAAM,oDAAoD,CAAC;AAC5F,OAAO,EAAC,KAAK,EAAC,MAAM,4BAA4B,CAAC;AACjD,OAAO,EAAC,iBAAiB,EAAC,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAC,eAAe,EAAC,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAC,gCAAgC,EAAC,MAAM,oDAAoD,CAAC;AACpG,OAAO,EAAC,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"InspectGgufCommand.js","sourceRoot":"","sources":["../../../../../src/cli/commands/inspect/commands/InspectGgufCommand.ts"],"names":[],"mappings":"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"}
|