node-llama-cpp 3.0.0-beta.15 → 3.0.0-beta.16

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.
Files changed (163) hide show
  1. package/dist/bindings/AddonTypes.d.ts +2 -0
  2. package/dist/bindings/Llama.d.ts +7 -0
  3. package/dist/bindings/Llama.js +12 -1
  4. package/dist/bindings/Llama.js.map +1 -1
  5. package/dist/bindings/getLlama.d.ts +2 -2
  6. package/dist/bindings/getLlama.js +1 -1
  7. package/dist/bindings/getLlama.js.map +1 -1
  8. package/dist/bindings/utils/cloneLlamaCppRepo.js +23 -23
  9. package/dist/bindings/utils/cloneLlamaCppRepo.js.map +1 -1
  10. package/dist/chatWrappers/utils/resolveChatWrapper.js +3 -1
  11. package/dist/chatWrappers/utils/resolveChatWrapper.js.map +1 -1
  12. package/dist/cli/commands/BuildCommand.js +1 -1
  13. package/dist/cli/commands/BuildCommand.js.map +1 -1
  14. package/dist/cli/commands/ChatCommand.d.ts +2 -1
  15. package/dist/cli/commands/ChatCommand.js +70 -75
  16. package/dist/cli/commands/ChatCommand.js.map +1 -1
  17. package/dist/cli/commands/CompleteCommand.d.ts +2 -1
  18. package/dist/cli/commands/CompleteCommand.js +61 -57
  19. package/dist/cli/commands/CompleteCommand.js.map +1 -1
  20. package/dist/cli/commands/DebugCommand.js +4 -4
  21. package/dist/cli/commands/DownloadCommand.js +3 -4
  22. package/dist/cli/commands/DownloadCommand.js.map +1 -1
  23. package/dist/cli/commands/InfillCommand.d.ts +2 -1
  24. package/dist/cli/commands/InfillCommand.js +63 -61
  25. package/dist/cli/commands/InfillCommand.js.map +1 -1
  26. package/dist/cli/commands/inspect/commands/InspectGgufCommand.d.ts +2 -1
  27. package/dist/cli/commands/inspect/commands/InspectGgufCommand.js +20 -7
  28. package/dist/cli/commands/inspect/commands/InspectGgufCommand.js.map +1 -1
  29. package/dist/cli/commands/inspect/commands/InspectGpuCommand.js +42 -4
  30. package/dist/cli/commands/inspect/commands/InspectGpuCommand.js.map +1 -1
  31. package/dist/cli/commands/inspect/commands/InspectMeasureCommand.d.ts +2 -1
  32. package/dist/cli/commands/inspect/commands/InspectMeasureCommand.js +29 -27
  33. package/dist/cli/commands/inspect/commands/InspectMeasureCommand.js.map +1 -1
  34. package/dist/cli/recommendedModels.d.ts +2 -0
  35. package/dist/cli/recommendedModels.js +281 -0
  36. package/dist/cli/recommendedModels.js.map +1 -0
  37. package/dist/cli/utils/ConsoleInteraction.d.ts +23 -0
  38. package/dist/cli/utils/ConsoleInteraction.js +122 -0
  39. package/dist/cli/utils/ConsoleInteraction.js.map +1 -0
  40. package/dist/cli/utils/ConsoleTable.js +5 -5
  41. package/dist/cli/utils/basicChooseFromListConsoleInteraction.d.ts +13 -0
  42. package/dist/cli/utils/basicChooseFromListConsoleInteraction.js +111 -0
  43. package/dist/cli/utils/basicChooseFromListConsoleInteraction.js.map +1 -0
  44. package/dist/cli/utils/consolePromptQuestion.d.ts +5 -0
  45. package/dist/cli/utils/consolePromptQuestion.js +80 -0
  46. package/dist/cli/utils/consolePromptQuestion.js.map +1 -0
  47. package/dist/cli/utils/getReadablePath.d.ts +1 -0
  48. package/dist/cli/utils/getReadablePath.js +14 -0
  49. package/dist/cli/utils/getReadablePath.js.map +1 -0
  50. package/dist/cli/utils/printCommonInfoLines.js +1 -1
  51. package/dist/cli/utils/printInfoLine.d.ts +4 -2
  52. package/dist/cli/utils/printInfoLine.js +15 -6
  53. package/dist/cli/utils/printInfoLine.js.map +1 -1
  54. package/dist/cli/utils/resolveCommandGgufPath.d.ts +2 -1
  55. package/dist/cli/utils/resolveCommandGgufPath.js +490 -2
  56. package/dist/cli/utils/resolveCommandGgufPath.js.map +1 -1
  57. package/dist/cli/utils/resolveHeaderFlag.d.ts +1 -0
  58. package/dist/cli/utils/resolveHeaderFlag.js +21 -0
  59. package/dist/cli/utils/resolveHeaderFlag.js.map +1 -0
  60. package/dist/cli/utils/resolveModelRecommendationFileOptions.d.ts +19 -0
  61. package/dist/cli/utils/resolveModelRecommendationFileOptions.js +7 -0
  62. package/dist/cli/utils/resolveModelRecommendationFileOptions.js.map +1 -0
  63. package/dist/cli/utils/splitAnsiToLines.d.ts +1 -0
  64. package/dist/cli/utils/splitAnsiToLines.js +17 -0
  65. package/dist/cli/utils/splitAnsiToLines.js.map +1 -0
  66. package/dist/config.d.ts +3 -0
  67. package/dist/config.js +5 -2
  68. package/dist/config.js.map +1 -1
  69. package/dist/consts.d.ts +2 -0
  70. package/dist/consts.js +8 -0
  71. package/dist/consts.js.map +1 -1
  72. package/dist/evaluator/LlamaChat/LlamaChat.d.ts +8 -1
  73. package/dist/evaluator/LlamaChat/LlamaChat.js +2 -1
  74. package/dist/evaluator/LlamaChat/LlamaChat.js.map +1 -1
  75. package/dist/evaluator/LlamaChatSession/LlamaChatSession.d.ts +9 -2
  76. package/dist/evaluator/LlamaChatSession/LlamaChatSession.js +5 -3
  77. package/dist/evaluator/LlamaChatSession/LlamaChatSession.js.map +1 -1
  78. package/dist/evaluator/LlamaCompletion.d.ts +9 -2
  79. package/dist/evaluator/LlamaCompletion.js +6 -3
  80. package/dist/evaluator/LlamaCompletion.js.map +1 -1
  81. package/dist/evaluator/LlamaContext/LlamaContext.d.ts +9 -19
  82. package/dist/evaluator/LlamaContext/LlamaContext.js +35 -55
  83. package/dist/evaluator/LlamaContext/LlamaContext.js.map +1 -1
  84. package/dist/evaluator/LlamaGrammar.d.ts +3 -2
  85. package/dist/evaluator/LlamaGrammar.js +3 -2
  86. package/dist/evaluator/LlamaGrammar.js.map +1 -1
  87. package/dist/evaluator/LlamaModel.d.ts +7 -15
  88. package/dist/evaluator/LlamaModel.js +4 -201
  89. package/dist/evaluator/LlamaModel.js.map +1 -1
  90. package/dist/evaluator/TokenBias.d.ts +22 -0
  91. package/dist/evaluator/TokenBias.js +33 -0
  92. package/dist/evaluator/TokenBias.js.map +1 -0
  93. package/dist/gguf/{GgufInsights.d.ts → insights/GgufInsights.d.ts} +5 -3
  94. package/dist/gguf/{GgufInsights.js → insights/GgufInsights.js} +46 -35
  95. package/dist/gguf/insights/GgufInsights.js.map +1 -0
  96. package/dist/gguf/insights/GgufInsightsConfigurationResolver.d.ts +87 -0
  97. package/dist/gguf/insights/GgufInsightsConfigurationResolver.js +136 -0
  98. package/dist/gguf/insights/GgufInsightsConfigurationResolver.js.map +1 -0
  99. package/dist/gguf/insights/utils/resolveContextContextSizeOption.d.ts +18 -0
  100. package/dist/gguf/insights/utils/resolveContextContextSizeOption.js +52 -0
  101. package/dist/gguf/insights/utils/resolveContextContextSizeOption.js.map +1 -0
  102. package/dist/gguf/insights/utils/resolveModelGpuLayersOption.d.ts +14 -0
  103. package/dist/gguf/insights/utils/resolveModelGpuLayersOption.js +177 -0
  104. package/dist/gguf/insights/utils/resolveModelGpuLayersOption.js.map +1 -0
  105. package/dist/gguf/insights/utils/scoreLevels.d.ts +5 -0
  106. package/dist/gguf/insights/utils/scoreLevels.js +16 -0
  107. package/dist/gguf/insights/utils/scoreLevels.js.map +1 -0
  108. package/dist/gguf/readGgufFileInfo.js +2 -1
  109. package/dist/gguf/readGgufFileInfo.js.map +1 -1
  110. package/dist/index.d.ts +2 -1
  111. package/dist/index.js +2 -1
  112. package/dist/index.js.map +1 -1
  113. package/dist/utils/getConsoleLogPrefix.js +1 -1
  114. package/dist/utils/getReadableContextSize.d.ts +1 -0
  115. package/dist/utils/getReadableContextSize.js +7 -0
  116. package/dist/utils/getReadableContextSize.js.map +1 -0
  117. package/dist/utils/isToken.d.ts +2 -0
  118. package/dist/utils/isToken.js +4 -0
  119. package/dist/utils/isToken.js.map +1 -0
  120. package/dist/utils/isUrl.d.ts +1 -0
  121. package/dist/utils/isUrl.js +15 -0
  122. package/dist/utils/isUrl.js.map +1 -0
  123. package/dist/utils/tokenizeInput.d.ts +1 -1
  124. package/dist/utils/tokenizeInput.js +3 -0
  125. package/dist/utils/tokenizeInput.js.map +1 -1
  126. package/dist/utils/withOra.d.ts +1 -0
  127. package/dist/utils/withOra.js +13 -7
  128. package/dist/utils/withOra.js.map +1 -1
  129. package/dist/utils/withProgressLog.d.ts +23 -0
  130. package/dist/utils/withProgressLog.js +211 -0
  131. package/dist/utils/withProgressLog.js.map +1 -0
  132. package/dist/utils/withStatusLogs.js +1 -1
  133. package/dist/utils/withStatusLogs.js.map +1 -1
  134. package/llama/addon.cpp +43 -5
  135. package/llama/binariesGithubRelease.json +1 -1
  136. package/llama/gitRelease.bundle +0 -0
  137. package/llama/grammars/README.md +10 -0
  138. package/llama/llama.cpp.info.json +1 -1
  139. package/llamaBins/linux-arm64/_nlcBuildMetadata.json +1 -1
  140. package/llamaBins/linux-arm64/llama-addon.node +0 -0
  141. package/llamaBins/linux-armv7l/_nlcBuildMetadata.json +1 -1
  142. package/llamaBins/linux-armv7l/llama-addon.node +0 -0
  143. package/llamaBins/linux-x64/_nlcBuildMetadata.json +1 -1
  144. package/llamaBins/linux-x64/llama-addon.node +0 -0
  145. package/llamaBins/linux-x64-cuda/_nlcBuildMetadata.json +1 -1
  146. package/llamaBins/linux-x64-cuda/llama-addon.node +0 -0
  147. package/llamaBins/linux-x64-vulkan/_nlcBuildMetadata.json +1 -1
  148. package/llamaBins/linux-x64-vulkan/llama-addon.node +0 -0
  149. package/llamaBins/mac-arm64-metal/_nlcBuildMetadata.json +1 -1
  150. package/llamaBins/mac-arm64-metal/default.metallib +0 -0
  151. package/llamaBins/mac-arm64-metal/llama-addon.node +0 -0
  152. package/llamaBins/mac-x64/_nlcBuildMetadata.json +1 -1
  153. package/llamaBins/mac-x64/llama-addon.node +0 -0
  154. package/llamaBins/win-arm64/_nlcBuildMetadata.json +1 -1
  155. package/llamaBins/win-arm64/llama-addon.node +0 -0
  156. package/llamaBins/win-x64/_nlcBuildMetadata.json +1 -1
  157. package/llamaBins/win-x64/llama-addon.node +0 -0
  158. package/llamaBins/win-x64-cuda/_nlcBuildMetadata.json +1 -1
  159. package/llamaBins/win-x64-cuda/llama-addon.node +0 -0
  160. package/llamaBins/win-x64-vulkan/_nlcBuildMetadata.json +1 -1
  161. package/llamaBins/win-x64-vulkan/llama-addon.node +0 -0
  162. package/package.json +8 -7
  163. package/dist/gguf/GgufInsights.js.map +0 -1
@@ -0,0 +1 @@
1
+ {"version":3,"file":"GgufInsightsConfigurationResolver.js","sourceRoot":"","sources":["../../../src/gguf/insights/GgufInsightsConfigurationResolver.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,18 @@
1
+ import { LlamaContextOptions } from "../../../evaluator/LlamaContext/types.js";
2
+ import { GgufInsights } from "../GgufInsights.js";
3
+ import { BuildGpu } from "../../../bindings/types.js";
4
+ export declare function resolveContextContextSizeOption({ contextSize, batchSize, sequences, modelFileInsights, modelGpuLayers, modelTrainContextSize, getVramState, llamaGpu, ignoreMemorySafetyChecks, isEmbeddingContext }: {
5
+ contextSize?: LlamaContextOptions["contextSize"];
6
+ batchSize?: LlamaContextOptions["batchSize"];
7
+ sequences: number;
8
+ modelFileInsights: GgufInsights;
9
+ modelGpuLayers: number;
10
+ modelTrainContextSize: number;
11
+ getVramState(): {
12
+ total: number;
13
+ free: number;
14
+ };
15
+ llamaGpu: BuildGpu;
16
+ ignoreMemorySafetyChecks?: boolean;
17
+ isEmbeddingContext?: boolean;
18
+ }): number;
@@ -0,0 +1,52 @@
1
+ import { minAllowedContextSizeInCalculations } from "../../../config.js";
2
+ import { getDefaultContextBatchSize, getDefaultModelContextSize } from "../../../evaluator/LlamaContext/LlamaContext.js";
3
+ export function resolveContextContextSizeOption({ contextSize, batchSize, sequences, modelFileInsights, modelGpuLayers, modelTrainContextSize, getVramState, llamaGpu, ignoreMemorySafetyChecks = false, isEmbeddingContext = false }) {
4
+ if (contextSize == null)
5
+ contextSize = "auto";
6
+ if (typeof contextSize === "number") {
7
+ const resolvedContextSize = Math.max(1, Math.floor(contextSize));
8
+ if (ignoreMemorySafetyChecks)
9
+ return resolvedContextSize;
10
+ const vramState = getVramState();
11
+ const contextVram = modelFileInsights.estimateContextResourceRequirements({
12
+ contextSize: resolvedContextSize,
13
+ batchSize: batchSize ?? getDefaultContextBatchSize({ contextSize: resolvedContextSize, sequences }),
14
+ modelGpuLayers: modelGpuLayers,
15
+ sequences,
16
+ isEmbeddingContext
17
+ }).gpuVram;
18
+ if (contextVram > vramState.free)
19
+ throw new Error(`The context size of ${resolvedContextSize}${sequences > 1 ? ` with ${sequences} sequences` : ""} is too large for the available VRAM`);
20
+ return resolvedContextSize;
21
+ }
22
+ else if (contextSize === "auto" || typeof contextSize === "object") {
23
+ if (llamaGpu === false)
24
+ return modelTrainContextSize;
25
+ const vramState = getVramState();
26
+ if (vramState.total === 0)
27
+ return modelTrainContextSize;
28
+ const freeVram = vramState.free;
29
+ const maxContextSize = contextSize === "auto"
30
+ ? getDefaultModelContextSize({ trainContextSize: modelTrainContextSize })
31
+ : Math.min(contextSize.max ?? getDefaultModelContextSize({ trainContextSize: modelTrainContextSize }), getDefaultModelContextSize({ trainContextSize: modelTrainContextSize }));
32
+ const minContextSize = contextSize === "auto"
33
+ ? minAllowedContextSizeInCalculations
34
+ : Math.max(contextSize.min ?? minAllowedContextSizeInCalculations, minAllowedContextSizeInCalculations);
35
+ for (let testContextSize = maxContextSize; testContextSize >= minContextSize; testContextSize--) {
36
+ const contextVram = modelFileInsights.estimateContextResourceRequirements({
37
+ contextSize: testContextSize,
38
+ batchSize: batchSize ?? getDefaultContextBatchSize({ contextSize: testContextSize, sequences }),
39
+ modelGpuLayers: modelGpuLayers,
40
+ sequences,
41
+ isEmbeddingContext
42
+ }).gpuVram;
43
+ if (contextVram <= freeVram)
44
+ return testContextSize;
45
+ }
46
+ if (ignoreMemorySafetyChecks)
47
+ return minContextSize;
48
+ throw new Error(`The available VRAM is too small to fit the context size of ${maxContextSize}${sequences > 1 ? ` with ${sequences} sequences` : ""}`);
49
+ }
50
+ throw new Error(`Invalid context size: "${contextSize}"`);
51
+ }
52
+ //# sourceMappingURL=resolveContextContextSizeOption.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolveContextContextSizeOption.js","sourceRoot":"","sources":["../../../../src/gguf/insights/utils/resolveContextContextSizeOption.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,14 @@
1
+ import { LlamaModelOptions } from "../../../evaluator/LlamaModel.js";
2
+ import { BuildGpu } from "../../../bindings/types.js";
3
+ import type { GgufInsights } from "../GgufInsights.js";
4
+ export declare function resolveModelGpuLayersOption(gpuLayers: LlamaModelOptions["gpuLayers"], { ggufInsights, ignoreMemorySafetyChecks, getVramState, llamaVramPaddingSize, llamaGpu, llamaSupportsGpuOffloading }: {
5
+ ggufInsights: GgufInsights;
6
+ ignoreMemorySafetyChecks?: boolean;
7
+ getVramState(): {
8
+ total: number;
9
+ free: number;
10
+ };
11
+ llamaVramPaddingSize: number;
12
+ llamaGpu: BuildGpu;
13
+ llamaSupportsGpuOffloading: boolean;
14
+ }): number;
@@ -0,0 +1,177 @@
1
+ import { InsufficientMemoryError } from "../../../utils/InsufficientMemoryError.js";
2
+ import { findBestOption } from "../../../utils/findBestOption.js";
3
+ import { getDefaultContextBatchSize, getDefaultModelContextSize } from "../../../evaluator/LlamaContext/LlamaContext.js";
4
+ import { minAllowedContextSizeInCalculations } from "../../../config.js";
5
+ import { scoreLevels } from "./scoreLevels.js";
6
+ const fitContextExtraMemoryPaddingPercentage = 0.5;
7
+ export function resolveModelGpuLayersOption(gpuLayers, { ggufInsights, ignoreMemorySafetyChecks = false, getVramState, llamaVramPaddingSize, llamaGpu, llamaSupportsGpuOffloading }) {
8
+ if (gpuLayers == null)
9
+ gpuLayers = "auto";
10
+ if (!llamaSupportsGpuOffloading)
11
+ return 0;
12
+ if (gpuLayers === "max" || typeof gpuLayers === "number") {
13
+ const resolvedGpuLayers = typeof gpuLayers === "number"
14
+ ? Math.max(0, Math.min(ggufInsights.totalLayers, gpuLayers))
15
+ : ggufInsights.totalLayers;
16
+ if (ignoreMemorySafetyChecks)
17
+ return resolvedGpuLayers;
18
+ const vramState = getVramState();
19
+ const maxLayersRequirements = getVramRequiredForGpuLayers({
20
+ gpuLayers: resolvedGpuLayers,
21
+ ggufInsights,
22
+ currentVram: vramState.free
23
+ });
24
+ if (maxLayersRequirements == null)
25
+ throw new InsufficientMemoryError("Not enough VRAM to fit the model with the specified settings");
26
+ return resolvedGpuLayers;
27
+ }
28
+ else if (gpuLayers === "auto" || typeof gpuLayers === "object") {
29
+ if (llamaGpu === false)
30
+ return 0;
31
+ const vramState = getVramState();
32
+ if (vramState.total === 0)
33
+ return 0;
34
+ let freeVram = vramState.free;
35
+ if (typeof gpuLayers === "object" && gpuLayers.fitContext?.contextSize != null) {
36
+ freeVram -= llamaVramPaddingSize * fitContextExtraMemoryPaddingPercentage;
37
+ if (freeVram < 0)
38
+ freeVram = 0;
39
+ }
40
+ const bestGpuLayersOption = getBestGpuLayersForFreeVram({
41
+ ggufInsights,
42
+ freeVram,
43
+ fitContext: typeof gpuLayers === "object"
44
+ ? gpuLayers.fitContext
45
+ : undefined,
46
+ minGpuLayers: typeof gpuLayers === "object"
47
+ ? gpuLayers.min
48
+ : undefined,
49
+ maxGpuLayers: typeof gpuLayers === "object"
50
+ ? gpuLayers.max
51
+ : undefined
52
+ });
53
+ const hasGpuLayersRequirements = typeof gpuLayers === "object" &&
54
+ (gpuLayers.min != null || gpuLayers.max != null || gpuLayers.fitContext?.contextSize != null);
55
+ if (!ignoreMemorySafetyChecks && bestGpuLayersOption == null && hasGpuLayersRequirements)
56
+ throw new InsufficientMemoryError("Not enough VRAM to fit the model with the specified settings");
57
+ return bestGpuLayersOption ?? 0;
58
+ }
59
+ throw new Error(`Invalid gpuLayers value: ${gpuLayers}`);
60
+ }
61
+ function getBestGpuLayersForFreeVram({ ggufInsights, freeVram, fitContext, minGpuLayers, maxGpuLayers }) {
62
+ return findBestOption({
63
+ *generator() {
64
+ const minLayers = Math.floor(Math.max(0, minGpuLayers ?? 0));
65
+ const maxLayers = Math.floor(Math.min(ggufInsights.totalLayers, maxGpuLayers ?? ggufInsights.totalLayers));
66
+ for (let layers = maxLayers; layers >= minLayers; layers--) {
67
+ yield {
68
+ gpuLayers: layers
69
+ };
70
+ }
71
+ },
72
+ score(option) {
73
+ const layersRequirements = getVramRequiredForGpuLayers({
74
+ gpuLayers: option.gpuLayers,
75
+ ggufInsights,
76
+ currentVram: freeVram,
77
+ fitContext
78
+ });
79
+ if (layersRequirements == null)
80
+ return null;
81
+ return scoreGpuLayersAndContextCombination({ gpuLayers: option.gpuLayers, contextSize: layersRequirements.contextSize }, {
82
+ totalGpuLayers: ggufInsights.totalLayers,
83
+ trainContextSize: getDefaultModelContextSize({ trainContextSize: ggufInsights.trainContextSize })
84
+ });
85
+ }
86
+ })?.gpuLayers ?? null;
87
+ }
88
+ function scoreGpuLayersAndContextCombination({ gpuLayers, contextSize }, { totalGpuLayers, trainContextSize }) {
89
+ function scoreGpuLayers() {
90
+ return scoreLevels(gpuLayers, [{
91
+ start: 0,
92
+ points: 4
93
+ }, {
94
+ start: 1,
95
+ points: 26
96
+ }, {
97
+ start: totalGpuLayers,
98
+ points: 14,
99
+ end: totalGpuLayers
100
+ }]);
101
+ }
102
+ function scoreContextSize() {
103
+ const gpuLayersPercentage = gpuLayers / totalGpuLayers;
104
+ return scoreLevels(contextSize, [{
105
+ start: 0,
106
+ points: 2
107
+ }, {
108
+ start: 1024,
109
+ points: 4
110
+ }, {
111
+ start: 2048,
112
+ points: gpuLayersPercentage < 0.1 ? 1 : 8
113
+ }, {
114
+ start: 4096,
115
+ points: gpuLayersPercentage < 0.3 ? 4 : 16
116
+ }, {
117
+ start: 8192,
118
+ points: gpuLayersPercentage < 0.6 ? 1 : 8,
119
+ end: Math.max(trainContextSize, 16384)
120
+ }]);
121
+ }
122
+ return scoreGpuLayers() + scoreContextSize();
123
+ }
124
+ function getVramRequiredForGpuLayers({ gpuLayers, ggufInsights, currentVram, fitContext }) {
125
+ const modelVram = ggufInsights.estimateModelResourceRequirements({ gpuLayers }).gpuVram;
126
+ if (modelVram > currentVram)
127
+ return null;
128
+ if (fitContext != null && fitContext.contextSize != null) {
129
+ const contextVram = ggufInsights.estimateContextResourceRequirements({
130
+ contextSize: fitContext.contextSize,
131
+ batchSize: getDefaultContextBatchSize({ contextSize: fitContext.contextSize, sequences: 1 }),
132
+ modelGpuLayers: gpuLayers,
133
+ sequences: 1,
134
+ isEmbeddingContext: fitContext.embeddingContext ?? false
135
+ }).gpuVram;
136
+ const totalVram = modelVram + contextVram;
137
+ if (totalVram > currentVram)
138
+ return null;
139
+ return {
140
+ contextSize: fitContext.contextSize,
141
+ contextVram,
142
+ totalVram
143
+ };
144
+ }
145
+ const maxContext = findMaxPossibleContextSizeForVram({
146
+ gpuLayers,
147
+ ggufInsights,
148
+ vram: currentVram - modelVram,
149
+ isEmbeddingContext: fitContext?.embeddingContext ?? false
150
+ });
151
+ if (maxContext == null || modelVram + maxContext.vram > currentVram)
152
+ return null;
153
+ return {
154
+ contextSize: maxContext.contextSize,
155
+ contextVram: maxContext.vram,
156
+ totalVram: modelVram + maxContext.vram
157
+ };
158
+ }
159
+ function findMaxPossibleContextSizeForVram({ gpuLayers, ggufInsights, vram, isEmbeddingContext }) {
160
+ const maxContextSize = getDefaultModelContextSize({ trainContextSize: ggufInsights.trainContextSize });
161
+ for (let contextSize = maxContextSize; contextSize >= minAllowedContextSizeInCalculations; contextSize--) {
162
+ const contextVram = ggufInsights.estimateContextResourceRequirements({
163
+ contextSize,
164
+ batchSize: getDefaultContextBatchSize({ contextSize, sequences: 1 }),
165
+ modelGpuLayers: gpuLayers,
166
+ sequences: 1,
167
+ isEmbeddingContext
168
+ }).gpuVram;
169
+ if (contextVram <= vram)
170
+ return {
171
+ contextSize,
172
+ vram: contextVram
173
+ };
174
+ }
175
+ return null;
176
+ }
177
+ //# sourceMappingURL=resolveModelGpuLayersOption.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"resolveModelGpuLayersOption.js","sourceRoot":"","sources":["../../../../src/gguf/insights/utils/resolveModelGpuLayersOption.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,5 @@
1
+ export declare function scoreLevels(num: number, levels: {
2
+ start: number;
3
+ end?: number;
4
+ points: number;
5
+ }[]): number;
@@ -0,0 +1,16 @@
1
+ export function scoreLevels(num, levels) {
2
+ let res = 0;
3
+ for (let i = 0; i < levels.length; i++) {
4
+ const level = levels[i];
5
+ const start = level.start;
6
+ const end = level.end ?? levels[i + 1]?.start ?? Math.max(start, num);
7
+ if (num < start)
8
+ break;
9
+ else if (num >= end)
10
+ res += level.points;
11
+ else
12
+ res += level.points * ((num - start) / (end - start));
13
+ }
14
+ return res;
15
+ }
16
+ //# sourceMappingURL=scoreLevels.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"scoreLevels.js","sourceRoot":"","sources":["../../../../src/gguf/insights/utils/scoreLevels.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,GAAW,EAAE,MAAyD;IAC9F,IAAI,GAAG,GAAG,CAAC,CAAC;IAEZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAC1B,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAEtE,IAAI,GAAG,GAAG,KAAK;YACX,MAAM;aACL,IAAI,GAAG,IAAI,GAAG;YACf,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC;;YAEpB,GAAG,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC;KAC7D;IAED,OAAO,GAAG,CAAC;AACf,CAAC"}
@@ -1,3 +1,4 @@
1
+ import { isUrl } from "../utils/isUrl.js";
1
2
  import { parseGguf } from "./parser/parseGguf.js";
2
3
  import { GgufNetworkFetchFileReader } from "./fileReaders/GgufNetworkFetchFileReader.js";
3
4
  import { GgufFsFileReader } from "./fileReaders/GgufFsFileReader.js";
@@ -9,7 +10,7 @@ import { normalizeGgufDownloadUrl } from "./utils/normalizeGgufDownloadUrl.js";
9
10
  */
10
11
  export async function readGgufFileInfo(pathOrUrl, { readTensorInfo = true, sourceType, ignoreKeys = [], logWarnings = true, fetchRetryOptions = ggufDefaultFetchRetryOptions, fetchHeaders = {}, signal } = {}) {
11
12
  function createFileReader() {
12
- if (sourceType === "network" || (sourceType == null && (pathOrUrl.startsWith("http://") || pathOrUrl.startsWith("https://")))) {
13
+ if (sourceType === "network" || (sourceType == null && isUrl(pathOrUrl))) {
13
14
  return new GgufNetworkFetchFileReader({
14
15
  url: normalizeGgufDownloadUrl(pathOrUrl),
15
16
  retryOptions: fetchRetryOptions,
@@ -1 +1 @@
1
- {"version":3,"file":"readGgufFileInfo.js","sourceRoot":"","sources":["../../src/gguf/readGgufFileInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAC,0BAA0B,EAAC,MAAM,6CAA6C,CAAC;AACvF,OAAO,EAAC,gBAAgB,EAAC,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAC,4BAA4B,EAAC,MAAM,aAAa,CAAC;AACzD,OAAO,EAAC,wBAAwB,EAAC,MAAM,qCAAqC,CAAC;AAG7E;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,SAAiB,EAAE,EACtD,cAAc,GAAG,IAAI,EACrB,UAAU,EACV,UAAU,GAAG,EAAE,EACf,WAAW,GAAG,IAAI,EAClB,iBAAiB,GAAG,4BAA4B,EAChD,YAAY,GAAG,EAAE,EACjB,MAAM,KA8BN,EAAE;IACF,SAAS,gBAAgB;QACrB,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;YAC3H,OAAO,IAAI,0BAA0B,CAAC;gBAClC,GAAG,EAAE,wBAAwB,CAAC,SAAS,CAAC;gBACxC,YAAY,EAAE,iBAAiB;gBAC/B,OAAO,EAAE,YAAY;gBACrB,MAAM;aACT,CAAC,CAAC;SACN;aAAM,IAAI,UAAU,KAAK,YAAY,IAAI,UAAU,IAAI,IAAI,EAAE;YAC1D,OAAO,IAAI,gBAAgB,CAAC;gBACxB,QAAQ,EAAE,SAAS;gBACnB,MAAM;aACT,CAAC,CAAC;SACN;QAED,KAAK,CAAC,UAA0B,CAAC,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;IACtC,OAAO,MAAM,SAAS,CAAC;QACnB,UAAU;QACV,UAAU;QACV,cAAc;QACd,WAAW;KACd,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"readGgufFileInfo.js","sourceRoot":"","sources":["../../src/gguf/readGgufFileInfo.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAC,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAC,0BAA0B,EAAC,MAAM,6CAA6C,CAAC;AACvF,OAAO,EAAC,gBAAgB,EAAC,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAC,4BAA4B,EAAC,MAAM,aAAa,CAAC;AACzD,OAAO,EAAC,wBAAwB,EAAC,MAAM,qCAAqC,CAAC;AAG7E;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,SAAiB,EAAE,EACtD,cAAc,GAAG,IAAI,EACrB,UAAU,EACV,UAAU,GAAG,EAAE,EACf,WAAW,GAAG,IAAI,EAClB,iBAAiB,GAAG,4BAA4B,EAChD,YAAY,GAAG,EAAE,EACjB,MAAM,KA8BN,EAAE;IACF,SAAS,gBAAgB;QACrB,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,IAAI,IAAI,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE;YACtE,OAAO,IAAI,0BAA0B,CAAC;gBAClC,GAAG,EAAE,wBAAwB,CAAC,SAAS,CAAC;gBACxC,YAAY,EAAE,iBAAiB;gBAC/B,OAAO,EAAE,YAAY;gBACrB,MAAM;aACT,CAAC,CAAC;SACN;aAAM,IAAI,UAAU,KAAK,YAAY,IAAI,UAAU,IAAI,IAAI,EAAE;YAC1D,OAAO,IAAI,gBAAgB,CAAC;gBACxB,QAAQ,EAAE,SAAS;gBACnB,MAAM;aACT,CAAC,CAAC;SACN;QAED,KAAK,CAAC,UAA0B,CAAC,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;IACtC,OAAO,MAAM,SAAS,CAAC;QACnB,UAAU;QACV,UAAU;QACV,cAAc;QACd,WAAW;KACd,CAAC,CAAC;AACP,CAAC"}
package/dist/index.d.ts CHANGED
@@ -11,6 +11,7 @@ import { LlamaGrammarEvaluationState, LlamaGrammarEvaluationStateOptions } from
11
11
  import { LlamaContext, LlamaContextSequence } from "./evaluator/LlamaContext/LlamaContext.js";
12
12
  import { LlamaEmbeddingContext, type LlamaEmbeddingContextOptions, LlamaEmbedding, type LlamaEmbeddingJSON } from "./evaluator/LlamaEmbeddingContext.js";
13
13
  import { type LlamaContextOptions, type BatchingOptions, type LlamaContextSequenceRepeatPenalty, type CustomBatchingDispatchSchedule, type CustomBatchingPrioritizationStrategy, type BatchItem, type PrioritizedBatchItem, type ContextShiftOptions, type ContextTokensDeleteRange, type EvaluationPriority } from "./evaluator/LlamaContext/types.js";
14
+ import { TokenBias } from "./evaluator/TokenBias.js";
14
15
  import { LlamaChatSession, type LlamaChatSessionOptions, type LlamaChatSessionContextShiftOptions, type LLamaChatPromptOptions, type LlamaChatSessionRepeatPenalty } from "./evaluator/LlamaChatSession/LlamaChatSession.js";
15
16
  import { defineChatSessionFunction } from "./evaluator/LlamaChatSession/utils/defineChatSessionFunction.js";
16
17
  import { LlamaChat, type LlamaChatOptions, type LLamaChatGenerateResponseOptions, type LLamaChatContextShiftOptions, type LlamaChatResponse, type LlamaChatResponseFunctionCall } from "./evaluator/LlamaChat/LlamaChat.js";
@@ -39,4 +40,4 @@ import { type GbnfJsonArraySchema, type GbnfJsonBasicSchema, type GbnfJsonConstS
39
40
  import { type GgufFileInfo } from "./gguf/types/GgufFileInfoTypes.js";
40
41
  import { type GgufMetadata, type GgufMetadataLlmToType, GgufArchitectureType, GgufFileType, GgufMetadataTokenizerTokenType, GgufMetadataArchitecturePoolingType, type GgufMetadataGeneral, type GgufMetadataTokenizer, type GgufMetadataDefaultArchitectureType, type GgufMetadataLlmLLaMA, type GgufMetadataMPT, type GgufMetadataGPTNeoX, type GgufMetadataGPTJ, type GgufMetadataGPT2, type GgufMetadataBloom, type GgufMetadataFalcon, type GgufMetadataMamba, type GgufMetadataRWKV, isGgufMetadataOfArchitectureType } from "./gguf/types/GgufMetadataTypes.js";
41
42
  import { GgmlType, type GgufTensorInfo } from "./gguf/types/GgufTensorInfoTypes.js";
42
- export { Llama, getLlama, type LlamaOptions, LlamaLogLevel, NoBinaryFoundError, LlamaModel, LlamaModelTokens, LlamaModelInfillTokens, type LlamaModelOptions, LlamaGrammar, type LlamaGrammarOptions, LlamaJsonSchemaGrammar, LlamaJsonSchemaValidationError, LlamaGrammarEvaluationState, type LlamaGrammarEvaluationStateOptions, LlamaContext, LlamaContextSequence, type LlamaContextOptions, type BatchingOptions, type CustomBatchingDispatchSchedule, type CustomBatchingPrioritizationStrategy, type BatchItem, type PrioritizedBatchItem, type ContextShiftOptions, type ContextTokensDeleteRange, type EvaluationPriority, type LlamaContextSequenceRepeatPenalty, LlamaEmbeddingContext, type LlamaEmbeddingContextOptions, LlamaEmbedding, type LlamaEmbeddingJSON, LlamaChatSession, defineChatSessionFunction, type LlamaChatSessionOptions, type LlamaChatSessionContextShiftOptions, type LLamaChatPromptOptions, type LlamaChatSessionRepeatPenalty, LlamaChat, type LlamaChatOptions, type LLamaChatGenerateResponseOptions, type LLamaChatContextShiftOptions, type LLamaContextualRepeatPenalty, type LlamaChatResponse, type LlamaChatResponseFunctionCall, LlamaCompletion, type LlamaCompletionOptions, type LlamaCompletionGenerationOptions, type LlamaInfillGenerationOptions, TokenMeter, type TokenMeterState, UnsupportedError, InsufficientMemoryError, DisposedError, ChatWrapper, type ChatWrapperSettings, EmptyChatWrapper, LlamaChatWrapper, GeneralChatWrapper, ChatMLChatWrapper, FalconChatWrapper, AlpacaChatWrapper, FunctionaryChatWrapper, GemmaChatWrapper, TemplateChatWrapper, type TemplateChatWrapperOptions, JinjaTemplateChatWrapper, type JinjaTemplateChatWrapperOptions, resolveChatWrapper, type ResolveChatWrapperOptions, resolvableChatWrapperTypeNames, type ResolvableChatWrapperTypeName, specializedChatWrapperTypeNames, type SpecializedChatWrapperTypeName, templateChatWrapperTypeNames, type TemplateChatWrapperTypeName, LlamaText, SpecialTokensText, SpecialToken, isLlamaText, tokenizeText, type LlamaTextJSON, type LlamaTextJSONValue, type LlamaTextSpecialTokensTextJSON, type LlamaTextSpecialTokenJSON, appendUserMessageToChatHistory, getModuleVersion, type ChatHistoryItem, type ChatModelFunctionCall, type ChatModelFunctions, type ChatModelResponse, type ChatSessionModelFunction, type ChatSessionModelFunctions, type ChatSystemMessage, type ChatUserMessage, type Token, isChatModelResponseFunctionCall, type GbnfJsonSchema, type GbnfJsonSchemaToType, type GbnfJsonSchemaImmutableType, type GbnfJsonBasicSchema, type GbnfJsonConstSchema, type GbnfJsonEnumSchema, type GbnfJsonOneOfSchema, type GbnfJsonObjectSchema, type GbnfJsonArraySchema, LlamaVocabularyType, LlamaLogLevelGreaterThan, LlamaLogLevelGreaterThanOrEqual, readGgufFileInfo, type GgufFileInfo, type GgufMetadata, type GgufTensorInfo, type GgufMetadataLlmToType, GgufArchitectureType, GgufFileType, GgufMetadataTokenizerTokenType, GgufMetadataArchitecturePoolingType, type GgufMetadataGeneral, type GgufMetadataTokenizer, type GgufMetadataDefaultArchitectureType, type GgufMetadataLlmLLaMA, type GgufMetadataMPT, type GgufMetadataGPTNeoX, type GgufMetadataGPTJ, type GgufMetadataGPT2, type GgufMetadataBloom, type GgufMetadataFalcon, type GgufMetadataMamba, type GgufMetadataRWKV, GgmlType, isGgufMetadataOfArchitectureType };
43
+ export { Llama, getLlama, type LlamaOptions, LlamaLogLevel, NoBinaryFoundError, LlamaModel, LlamaModelTokens, LlamaModelInfillTokens, type LlamaModelOptions, LlamaGrammar, type LlamaGrammarOptions, LlamaJsonSchemaGrammar, LlamaJsonSchemaValidationError, LlamaGrammarEvaluationState, type LlamaGrammarEvaluationStateOptions, LlamaContext, LlamaContextSequence, type LlamaContextOptions, type BatchingOptions, type CustomBatchingDispatchSchedule, type CustomBatchingPrioritizationStrategy, type BatchItem, type PrioritizedBatchItem, type ContextShiftOptions, type ContextTokensDeleteRange, type EvaluationPriority, type LlamaContextSequenceRepeatPenalty, TokenBias, LlamaEmbeddingContext, type LlamaEmbeddingContextOptions, LlamaEmbedding, type LlamaEmbeddingJSON, LlamaChatSession, defineChatSessionFunction, type LlamaChatSessionOptions, type LlamaChatSessionContextShiftOptions, type LLamaChatPromptOptions, type LlamaChatSessionRepeatPenalty, LlamaChat, type LlamaChatOptions, type LLamaChatGenerateResponseOptions, type LLamaChatContextShiftOptions, type LLamaContextualRepeatPenalty, type LlamaChatResponse, type LlamaChatResponseFunctionCall, LlamaCompletion, type LlamaCompletionOptions, type LlamaCompletionGenerationOptions, type LlamaInfillGenerationOptions, TokenMeter, type TokenMeterState, UnsupportedError, InsufficientMemoryError, DisposedError, ChatWrapper, type ChatWrapperSettings, EmptyChatWrapper, LlamaChatWrapper, GeneralChatWrapper, ChatMLChatWrapper, FalconChatWrapper, AlpacaChatWrapper, FunctionaryChatWrapper, GemmaChatWrapper, TemplateChatWrapper, type TemplateChatWrapperOptions, JinjaTemplateChatWrapper, type JinjaTemplateChatWrapperOptions, resolveChatWrapper, type ResolveChatWrapperOptions, resolvableChatWrapperTypeNames, type ResolvableChatWrapperTypeName, specializedChatWrapperTypeNames, type SpecializedChatWrapperTypeName, templateChatWrapperTypeNames, type TemplateChatWrapperTypeName, LlamaText, SpecialTokensText, SpecialToken, isLlamaText, tokenizeText, type LlamaTextJSON, type LlamaTextJSONValue, type LlamaTextSpecialTokensTextJSON, type LlamaTextSpecialTokenJSON, appendUserMessageToChatHistory, getModuleVersion, type ChatHistoryItem, type ChatModelFunctionCall, type ChatModelFunctions, type ChatModelResponse, type ChatSessionModelFunction, type ChatSessionModelFunctions, type ChatSystemMessage, type ChatUserMessage, type Token, isChatModelResponseFunctionCall, type GbnfJsonSchema, type GbnfJsonSchemaToType, type GbnfJsonSchemaImmutableType, type GbnfJsonBasicSchema, type GbnfJsonConstSchema, type GbnfJsonEnumSchema, type GbnfJsonOneOfSchema, type GbnfJsonObjectSchema, type GbnfJsonArraySchema, LlamaVocabularyType, LlamaLogLevelGreaterThan, LlamaLogLevelGreaterThanOrEqual, readGgufFileInfo, type GgufFileInfo, type GgufMetadata, type GgufTensorInfo, type GgufMetadataLlmToType, GgufArchitectureType, GgufFileType, GgufMetadataTokenizerTokenType, GgufMetadataArchitecturePoolingType, type GgufMetadataGeneral, type GgufMetadataTokenizer, type GgufMetadataDefaultArchitectureType, type GgufMetadataLlmLLaMA, type GgufMetadataMPT, type GgufMetadataGPTNeoX, type GgufMetadataGPTJ, type GgufMetadataGPT2, type GgufMetadataBloom, type GgufMetadataFalcon, type GgufMetadataMamba, type GgufMetadataRWKV, GgmlType, isGgufMetadataOfArchitectureType };
package/dist/index.js CHANGED
@@ -10,6 +10,7 @@ import { LlamaJsonSchemaValidationError } from "./utils/gbnfJson/utils/validateO
10
10
  import { LlamaGrammarEvaluationState } from "./evaluator/LlamaGrammarEvaluationState.js";
11
11
  import { LlamaContext, LlamaContextSequence } from "./evaluator/LlamaContext/LlamaContext.js";
12
12
  import { LlamaEmbeddingContext, LlamaEmbedding } from "./evaluator/LlamaEmbeddingContext.js";
13
+ import { TokenBias } from "./evaluator/TokenBias.js";
13
14
  import { LlamaChatSession } from "./evaluator/LlamaChatSession/LlamaChatSession.js";
14
15
  import { defineChatSessionFunction } from "./evaluator/LlamaChatSession/utils/defineChatSessionFunction.js";
15
16
  import { LlamaChat } from "./evaluator/LlamaChat/LlamaChat.js";
@@ -36,5 +37,5 @@ import { readGgufFileInfo } from "./gguf/readGgufFileInfo.js";
36
37
  import { isChatModelResponseFunctionCall } from "./types.js";
37
38
  import { GgufArchitectureType, GgufFileType, GgufMetadataTokenizerTokenType, GgufMetadataArchitecturePoolingType, isGgufMetadataOfArchitectureType } from "./gguf/types/GgufMetadataTypes.js";
38
39
  import { GgmlType } from "./gguf/types/GgufTensorInfoTypes.js";
39
- export { Llama, getLlama, LlamaLogLevel, NoBinaryFoundError, LlamaModel, LlamaModelTokens, LlamaModelInfillTokens, LlamaGrammar, LlamaJsonSchemaGrammar, LlamaJsonSchemaValidationError, LlamaGrammarEvaluationState, LlamaContext, LlamaContextSequence, LlamaEmbeddingContext, LlamaEmbedding, LlamaChatSession, defineChatSessionFunction, LlamaChat, LlamaCompletion, TokenMeter, UnsupportedError, InsufficientMemoryError, DisposedError, ChatWrapper, EmptyChatWrapper, LlamaChatWrapper, GeneralChatWrapper, ChatMLChatWrapper, FalconChatWrapper, AlpacaChatWrapper, FunctionaryChatWrapper, GemmaChatWrapper, TemplateChatWrapper, JinjaTemplateChatWrapper, resolveChatWrapper, resolvableChatWrapperTypeNames, specializedChatWrapperTypeNames, templateChatWrapperTypeNames, LlamaText, SpecialTokensText, SpecialToken, isLlamaText, tokenizeText, appendUserMessageToChatHistory, getModuleVersion, isChatModelResponseFunctionCall, LlamaVocabularyType, LlamaLogLevelGreaterThan, LlamaLogLevelGreaterThanOrEqual, readGgufFileInfo, GgufArchitectureType, GgufFileType, GgufMetadataTokenizerTokenType, GgufMetadataArchitecturePoolingType, GgmlType, isGgufMetadataOfArchitectureType };
40
+ export { Llama, getLlama, LlamaLogLevel, NoBinaryFoundError, LlamaModel, LlamaModelTokens, LlamaModelInfillTokens, LlamaGrammar, LlamaJsonSchemaGrammar, LlamaJsonSchemaValidationError, LlamaGrammarEvaluationState, LlamaContext, LlamaContextSequence, TokenBias, LlamaEmbeddingContext, LlamaEmbedding, LlamaChatSession, defineChatSessionFunction, LlamaChat, LlamaCompletion, TokenMeter, UnsupportedError, InsufficientMemoryError, DisposedError, ChatWrapper, EmptyChatWrapper, LlamaChatWrapper, GeneralChatWrapper, ChatMLChatWrapper, FalconChatWrapper, AlpacaChatWrapper, FunctionaryChatWrapper, GemmaChatWrapper, TemplateChatWrapper, JinjaTemplateChatWrapper, resolveChatWrapper, resolvableChatWrapperTypeNames, specializedChatWrapperTypeNames, templateChatWrapperTypeNames, LlamaText, SpecialTokensText, SpecialToken, isLlamaText, tokenizeText, appendUserMessageToChatHistory, getModuleVersion, isChatModelResponseFunctionCall, LlamaVocabularyType, LlamaLogLevelGreaterThan, LlamaLogLevelGreaterThanOrEqual, readGgufFileInfo, GgufArchitectureType, GgufFileType, GgufMetadataTokenizerTokenType, GgufMetadataArchitecturePoolingType, GgmlType, isGgufMetadataOfArchitectureType };
40
41
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,7 @@ export function getConsoleLogPrefix(forcePrefix = false, padEnd = true) {
4
4
  const isInCLI = getIsRunningFromCLI();
5
5
  const forceShowLogPrefix = getForceShowConsoleLogPrefix();
6
6
  if (!isInCLI || forceShowLogPrefix || forcePrefix)
7
- return chalk.grey("[node-llama-cpp]") + (padEnd ? " " : "");
7
+ return chalk.gray("[node-llama-cpp]") + (padEnd ? " " : "");
8
8
  return "";
9
9
  }
10
10
  //# sourceMappingURL=getConsoleLogPrefix.js.map
@@ -0,0 +1 @@
1
+ export declare function getReadableContextSize(contextSize: number): string;
@@ -0,0 +1,7 @@
1
+ export function getReadableContextSize(contextSize) {
2
+ return contextSize.toLocaleString("en-US", {
3
+ notation: "compact",
4
+ compactDisplay: "short"
5
+ });
6
+ }
7
+ //# sourceMappingURL=getReadableContextSize.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getReadableContextSize.js","sourceRoot":"","sources":["../../src/utils/getReadableContextSize.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,sBAAsB,CAAC,WAAmB;IACtD,OAAO,WAAW,CAAC,cAAc,CAAC,OAAO,EAAE;QACvC,QAAQ,EAAE,SAAS;QACnB,cAAc,EAAE,OAAO;KAC1B,CAAC,CAAC;AACP,CAAC"}
@@ -0,0 +1,2 @@
1
+ import { Token } from "../types.js";
2
+ export declare function isToken(token: any): token is Token;
@@ -0,0 +1,4 @@
1
+ export function isToken(token) {
2
+ return typeof token === "number";
3
+ }
4
+ //# sourceMappingURL=isToken.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"isToken.js","sourceRoot":"","sources":["../../src/utils/isToken.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,OAAO,CAAC,KAAU;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;AACrC,CAAC"}
@@ -0,0 +1 @@
1
+ export declare function isUrl(text: string, throwOnInvalidUrl?: boolean): boolean;
@@ -0,0 +1,15 @@
1
+ export function isUrl(text, throwOnInvalidUrl = true) {
2
+ if (text.startsWith("http://") || text.startsWith("https://")) {
3
+ try {
4
+ new URL(text);
5
+ return true;
6
+ }
7
+ catch {
8
+ if (throwOnInvalidUrl)
9
+ throw new Error(`Invalid URL: ${text}`);
10
+ return false;
11
+ }
12
+ }
13
+ return false;
14
+ }
15
+ //# sourceMappingURL=isUrl.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"isUrl.js","sourceRoot":"","sources":["../../src/utils/isUrl.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,KAAK,CAAC,IAAY,EAAE,oBAA6B,IAAI;IACjE,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC3D,IAAI;YACA,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;YACd,OAAO,IAAI,CAAC;SACf;QAAC,MAAM;YACJ,IAAI,iBAAiB;gBACjB,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;YAE5C,OAAO,KAAK,CAAC;SAChB;KACJ;IAED,OAAO,KAAK,CAAC;AACjB,CAAC"}
@@ -1,3 +1,3 @@
1
1
  import { Token, Tokenizer } from "../types.js";
2
2
  import { LlamaText } from "./LlamaText.js";
3
- export declare function tokenizeInput(input: Token[] | string | LlamaText, tokenizer: Tokenizer, options?: "trimLeadingSpace"): Token[];
3
+ export declare function tokenizeInput(input: Token | Token[] | string | LlamaText, tokenizer: Tokenizer, options?: "trimLeadingSpace"): Token[];
@@ -1,9 +1,12 @@
1
1
  import { isLlamaText } from "./LlamaText.js";
2
+ import { isToken } from "./isToken.js";
2
3
  export function tokenizeInput(input, tokenizer, options) {
3
4
  if (typeof input === "string")
4
5
  return tokenizer(input, false, options);
5
6
  else if (isLlamaText(input))
6
7
  return input.tokenize(tokenizer, options);
8
+ else if (isToken(input))
9
+ return [input];
7
10
  return input;
8
11
  }
9
12
  //# sourceMappingURL=tokenizeInput.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tokenizeInput.js","sourceRoot":"","sources":["../../src/utils/tokenizeInput.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAY,MAAM,gBAAgB,CAAC;AAEtD,MAAM,UAAU,aAAa,CAAC,KAAmC,EAAE,SAAoB,EAAE,OAA4B;IACjH,IAAI,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAO,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SACvC,IAAI,WAAW,CAAC,KAAK,CAAC;QACvB,OAAO,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAE9C,OAAO,KAAK,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"tokenizeInput.js","sourceRoot":"","sources":["../../src/utils/tokenizeInput.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,WAAW,EAAY,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAErC,MAAM,UAAU,aAAa,CAAC,KAA2C,EAAE,SAAoB,EAAE,OAA4B;IACzH,IAAI,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAO,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SACvC,IAAI,WAAW,CAAC,KAAK,CAAC;QACvB,OAAO,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;SACzC,IAAI,OAAO,CAAC,KAAK,CAAC;QACnB,OAAO,CAAC,KAAK,CAAC,CAAC;IAEnB,OAAO,KAAK,CAAC;AACjB,CAAC"}
@@ -3,4 +3,5 @@ export default function withOra<T>(message: string | {
3
3
  success?: string;
4
4
  fail?: string;
5
5
  useStatusLogs?: boolean;
6
+ noSuccessLiveStatus?: boolean;
6
7
  }, callback: () => Promise<T>): Promise<T>;
@@ -1,9 +1,9 @@
1
1
  import ora from "ora";
2
- import { isRunningInsideGoogleColab } from "../config.js";
2
+ import { useCiLogs } from "../config.js";
3
3
  import { getConsoleLogPrefix } from "./getConsoleLogPrefix.js";
4
4
  import withStatusLogs from "./withStatusLogs.js";
5
5
  export default async function withOra(message, callback) {
6
- if (isRunningInsideGoogleColab || (typeof message !== "string" && message.useStatusLogs))
6
+ if (useCiLogs || (typeof message !== "string" && message.useStatusLogs))
7
7
  return withStatusLogs(message, callback);
8
8
  const spinner = ora({
9
9
  prefixText: getConsoleLogPrefix(),
@@ -11,20 +11,26 @@ export default async function withOra(message, callback) {
11
11
  ? { text: message }
12
12
  : { loading: message.loading, success: message.success, fail: message.fail })
13
13
  });
14
- spinner.start();
14
+ spinner.start(typeof message === "string"
15
+ ? message
16
+ : message.loading);
15
17
  try {
16
18
  const res = await callback();
17
- if (typeof message !== "string")
18
- spinner.succeed(message.success);
19
+ if (typeof message !== "string") {
20
+ if (message.noSuccessLiveStatus)
21
+ spinner.clear();
22
+ else
23
+ spinner.succeed(message.success);
24
+ }
19
25
  else
20
- spinner.succeed();
26
+ spinner.succeed(message);
21
27
  return res;
22
28
  }
23
29
  catch (er) {
24
30
  if (typeof message !== "string")
25
31
  spinner.fail(message.fail);
26
32
  else
27
- spinner.fail();
33
+ spinner.fail(message);
28
34
  throw er;
29
35
  }
30
36
  }
@@ -1 +1 @@
1
- {"version":3,"file":"withOra.js","sourceRoot":"","sources":["../../src/utils/withOra.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAC,0BAA0B,EAAC,MAAM,cAAc,CAAC;AACxD,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAC7D,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,OAAO,CACjC,OAKC,EACD,QAA0B;IAE1B,IAAI,0BAA0B,IAAI,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC;QACpF,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,GAAG,CAAC;QAChB,UAAU,EAAE,mBAAmB,EAAE;QACjC,GAAG,CACC,OAAO,OAAO,KAAK,QAAQ;YACvB,CAAC,CAAC,EAAC,IAAI,EAAE,OAAO,EAAqC;YACrD,CAAC,CAAC,EAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAC,CACjF;KACJ,CAAC,CAAC;IAEH,OAAO,CAAC,KAAK,EAAE,CAAC;IAEhB,IAAI;QACA,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAE7B,IAAI,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;;YAEjC,OAAO,CAAC,OAAO,EAAE,CAAC;QAEtB,OAAO,GAAG,CAAC;KACd;IAAC,OAAO,EAAE,EAAE;QACT,IAAI,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;;YAE3B,OAAO,CAAC,IAAI,EAAE,CAAC;QAEnB,MAAM,EAAE,CAAC;KACZ;AACL,CAAC"}
1
+ {"version":3,"file":"withOra.js","sourceRoot":"","sources":["../../src/utils/withOra.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAC7D,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,OAAO,CACjC,OAMC,EACD,QAA0B;IAE1B,IAAI,SAAS,IAAI,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC;QACnE,OAAO,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,GAAG,CAAC;QAChB,UAAU,EAAE,mBAAmB,EAAE;QACjC,GAAG,CACC,OAAO,OAAO,KAAK,QAAQ;YACvB,CAAC,CAAC,EAAC,IAAI,EAAE,OAAO,EAAqC;YACrD,CAAC,CAAC,EAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAC,CACjF;KACJ,CAAC,CAAC;IAEH,OAAO,CAAC,KAAK,CACT,OAAO,OAAO,KAAK,QAAQ;QACvB,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,OAAO,CAAC,OAAO,CACxB,CAAC;IAEF,IAAI;QACA,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAE7B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAC7B,IAAI,OAAO,CAAC,mBAAmB;gBAC3B,OAAO,CAAC,KAAK,EAAE,CAAC;;gBAEhB,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SACxC;;YACG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7B,OAAO,GAAG,CAAC;KACd;IAAC,OAAO,EAAE,EAAE;QACT,IAAI,OAAO,OAAO,KAAK,QAAQ;YAC3B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;;YAE3B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE1B,MAAM,EAAE,CAAC;KACZ;AACL,CAAC"}
@@ -0,0 +1,23 @@
1
+ /// <reference types="node" />
2
+ export declare function withProgressLog<T>({ loadingText, successText, failText, liveUpdates, statusIcons, initialPercentage, initialProgressBarText, progressBarLength, minPercentageChangeForNonLiveUpdates, eta, etaUpdateInterval, noProgress, progressFractionDigits, noSuccessLiveStatus, liveCtrlCSendsAbortSignal }: {
3
+ loadingText: string;
4
+ successText: string;
5
+ failText: string;
6
+ liveUpdates?: boolean;
7
+ statusIcons?: boolean;
8
+ initialPercentage?: number;
9
+ initialProgressBarText?: string;
10
+ progressBarLength?: number;
11
+ minPercentageChangeForNonLiveUpdates?: number;
12
+ eta?: boolean;
13
+ etaUpdateInterval?: number;
14
+ noProgress?: boolean;
15
+ progressFractionDigits?: boolean;
16
+ noSuccessLiveStatus?: boolean;
17
+ liveCtrlCSendsAbortSignal?: boolean;
18
+ }, callback: (progressUpdater: ProgressUpdater) => Promise<T>): Promise<T>;
19
+ type ProgressUpdater = {
20
+ setProgress(percentage: number, progressText?: string): ProgressUpdater;
21
+ abortSignal?: AbortSignal;
22
+ };
23
+ export {};