node-llama-cpp 3.0.0-beta.15 → 3.0.0-beta.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ChatWrapper.d.ts +1 -15
- package/dist/ChatWrapper.js +19 -29
- package/dist/ChatWrapper.js.map +1 -1
- package/dist/bindings/AddonTypes.d.ts +5 -1
- package/dist/bindings/Llama.d.ts +7 -0
- package/dist/bindings/Llama.js +12 -1
- package/dist/bindings/Llama.js.map +1 -1
- package/dist/bindings/getLlama.d.ts +2 -2
- package/dist/bindings/getLlama.js +1 -1
- package/dist/bindings/getLlama.js.map +1 -1
- package/dist/bindings/utils/cloneLlamaCppRepo.js +23 -23
- package/dist/bindings/utils/cloneLlamaCppRepo.js.map +1 -1
- package/dist/chatWrappers/FunctionaryChatWrapper.js +39 -40
- package/dist/chatWrappers/FunctionaryChatWrapper.js.map +1 -1
- package/dist/chatWrappers/{LlamaChatWrapper.d.ts → Llama2ChatWrapper.d.ts} +1 -1
- package/dist/chatWrappers/{LlamaChatWrapper.js → Llama2ChatWrapper.js} +3 -3
- package/dist/chatWrappers/Llama2ChatWrapper.js.map +1 -0
- package/dist/chatWrappers/Llama3ChatWrapper.d.ts +31 -0
- package/dist/chatWrappers/Llama3ChatWrapper.js +129 -0
- package/dist/chatWrappers/Llama3ChatWrapper.js.map +1 -0
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.d.ts +2 -2
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js +6 -2
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/TemplateChatWrapper.d.ts +2 -2
- package/dist/chatWrappers/generic/TemplateChatWrapper.js.map +1 -1
- package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.d.ts +42 -0
- package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.js +82 -0
- package/dist/chatWrappers/utils/ChatModelFunctionsDocumentationGenerator.js.map +1 -0
- package/dist/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.js +1 -1
- package/dist/chatWrappers/utils/isJinjaTemplateEquivalentToSpecializedChatWrapper.js.map +1 -1
- package/dist/chatWrappers/utils/resolveChatWrapper.d.ts +6 -4
- package/dist/chatWrappers/utils/resolveChatWrapper.js +26 -18
- package/dist/chatWrappers/utils/resolveChatWrapper.js.map +1 -1
- package/dist/cli/commands/BuildCommand.js +1 -1
- package/dist/cli/commands/BuildCommand.js.map +1 -1
- package/dist/cli/commands/ChatCommand.d.ts +4 -1
- package/dist/cli/commands/ChatCommand.js +93 -81
- package/dist/cli/commands/ChatCommand.js.map +1 -1
- package/dist/cli/commands/CompleteCommand.d.ts +4 -1
- package/dist/cli/commands/CompleteCommand.js +82 -61
- package/dist/cli/commands/CompleteCommand.js.map +1 -1
- package/dist/cli/commands/DebugCommand.js +4 -4
- package/dist/cli/commands/DownloadCommand.js +3 -4
- package/dist/cli/commands/DownloadCommand.js.map +1 -1
- package/dist/cli/commands/InfillCommand.d.ts +4 -1
- package/dist/cli/commands/InfillCommand.js +84 -65
- package/dist/cli/commands/InfillCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectGgufCommand.d.ts +2 -1
- package/dist/cli/commands/inspect/commands/InspectGgufCommand.js +20 -7
- package/dist/cli/commands/inspect/commands/InspectGgufCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectGpuCommand.js +42 -4
- package/dist/cli/commands/inspect/commands/InspectGpuCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectMeasureCommand.d.ts +4 -1
- package/dist/cli/commands/inspect/commands/InspectMeasureCommand.js +69 -36
- package/dist/cli/commands/inspect/commands/InspectMeasureCommand.js.map +1 -1
- package/dist/cli/recommendedModels.d.ts +2 -0
- package/dist/cli/recommendedModels.js +350 -0
- package/dist/cli/recommendedModels.js.map +1 -0
- package/dist/cli/utils/ConsoleInteraction.d.ts +23 -0
- package/dist/cli/utils/ConsoleInteraction.js +122 -0
- package/dist/cli/utils/ConsoleInteraction.js.map +1 -0
- package/dist/cli/utils/ConsoleTable.js +5 -5
- package/dist/cli/utils/basicChooseFromListConsoleInteraction.d.ts +13 -0
- package/dist/cli/utils/basicChooseFromListConsoleInteraction.js +111 -0
- package/dist/cli/utils/basicChooseFromListConsoleInteraction.js.map +1 -0
- package/dist/cli/utils/consolePromptQuestion.d.ts +5 -0
- package/dist/cli/utils/consolePromptQuestion.js +80 -0
- package/dist/cli/utils/consolePromptQuestion.js.map +1 -0
- package/dist/cli/utils/getReadablePath.d.ts +1 -0
- package/dist/cli/utils/getReadablePath.js +14 -0
- package/dist/cli/utils/getReadablePath.js.map +1 -0
- package/dist/cli/utils/printCommonInfoLines.js +5 -4
- package/dist/cli/utils/printCommonInfoLines.js.map +1 -1
- package/dist/cli/utils/printInfoLine.d.ts +4 -2
- package/dist/cli/utils/printInfoLine.js +15 -6
- package/dist/cli/utils/printInfoLine.js.map +1 -1
- package/dist/cli/utils/resolveCommandGgufPath.d.ts +2 -1
- package/dist/cli/utils/resolveCommandGgufPath.js +551 -2
- package/dist/cli/utils/resolveCommandGgufPath.js.map +1 -1
- package/dist/cli/utils/resolveHeaderFlag.d.ts +1 -0
- package/dist/cli/utils/resolveHeaderFlag.js +21 -0
- package/dist/cli/utils/resolveHeaderFlag.js.map +1 -0
- package/dist/cli/utils/resolveModelRecommendationFileOptions.d.ts +19 -0
- package/dist/cli/utils/resolveModelRecommendationFileOptions.js +10 -0
- package/dist/cli/utils/resolveModelRecommendationFileOptions.js.map +1 -0
- package/dist/cli/utils/splitAnsiToLines.d.ts +1 -0
- package/dist/cli/utils/splitAnsiToLines.js +17 -0
- package/dist/cli/utils/splitAnsiToLines.js.map +1 -0
- package/dist/config.d.ts +3 -0
- package/dist/config.js +5 -2
- package/dist/config.js.map +1 -1
- package/dist/consts.d.ts +2 -0
- package/dist/consts.js +8 -0
- package/dist/consts.js.map +1 -1
- package/dist/evaluator/LlamaChat/LlamaChat.d.ts +9 -2
- package/dist/evaluator/LlamaChat/LlamaChat.js +58 -22
- package/dist/evaluator/LlamaChat/LlamaChat.js.map +1 -1
- package/dist/evaluator/LlamaChat/utils/FunctionCallGrammar.js +3 -1
- package/dist/evaluator/LlamaChat/utils/FunctionCallGrammar.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.d.ts +10 -3
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js +5 -3
- package/dist/evaluator/LlamaChatSession/LlamaChatSession.js.map +1 -1
- package/dist/evaluator/LlamaCompletion.d.ts +11 -4
- package/dist/evaluator/LlamaCompletion.js +16 -15
- package/dist/evaluator/LlamaCompletion.js.map +1 -1
- package/dist/evaluator/LlamaContext/LlamaContext.d.ts +13 -23
- package/dist/evaluator/LlamaContext/LlamaContext.js +47 -60
- package/dist/evaluator/LlamaContext/LlamaContext.js.map +1 -1
- package/dist/evaluator/LlamaEmbeddingContext.js +1 -1
- package/dist/evaluator/LlamaEmbeddingContext.js.map +1 -1
- package/dist/evaluator/LlamaGrammar.d.ts +3 -2
- package/dist/evaluator/LlamaGrammar.js +3 -2
- package/dist/evaluator/LlamaGrammar.js.map +1 -1
- package/dist/evaluator/LlamaModel.d.ts +21 -18
- package/dist/evaluator/LlamaModel.js +34 -205
- package/dist/evaluator/LlamaModel.js.map +1 -1
- package/dist/evaluator/TokenBias.d.ts +22 -0
- package/dist/evaluator/TokenBias.js +33 -0
- package/dist/evaluator/TokenBias.js.map +1 -0
- package/dist/gguf/{GgufInsights.d.ts → insights/GgufInsights.d.ts} +5 -3
- package/dist/gguf/{GgufInsights.js → insights/GgufInsights.js} +46 -35
- package/dist/gguf/insights/GgufInsights.js.map +1 -0
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.d.ts +87 -0
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.js +136 -0
- package/dist/gguf/insights/GgufInsightsConfigurationResolver.js.map +1 -0
- package/dist/gguf/insights/utils/resolveContextContextSizeOption.d.ts +18 -0
- package/dist/gguf/insights/utils/resolveContextContextSizeOption.js +52 -0
- package/dist/gguf/insights/utils/resolveContextContextSizeOption.js.map +1 -0
- package/dist/gguf/insights/utils/resolveModelGpuLayersOption.d.ts +14 -0
- package/dist/gguf/insights/utils/resolveModelGpuLayersOption.js +177 -0
- package/dist/gguf/insights/utils/resolveModelGpuLayersOption.js.map +1 -0
- package/dist/gguf/insights/utils/scoreLevels.d.ts +5 -0
- package/dist/gguf/insights/utils/scoreLevels.js +16 -0
- package/dist/gguf/insights/utils/scoreLevels.js.map +1 -0
- package/dist/gguf/readGgufFileInfo.js +2 -1
- package/dist/gguf/readGgufFileInfo.js.map +1 -1
- package/dist/gguf/types/GgufMetadataTypes.d.ts +4 -0
- package/dist/gguf/types/GgufMetadataTypes.js.map +1 -1
- package/dist/index.d.ts +7 -4
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/dist/types.d.ts +21 -1
- package/dist/types.js.map +1 -1
- package/dist/utils/LlamaText.d.ts +2 -1
- package/dist/utils/LlamaText.js +20 -0
- package/dist/utils/LlamaText.js.map +1 -1
- package/dist/utils/StopGenerationDetector.js +19 -18
- package/dist/utils/StopGenerationDetector.js.map +1 -1
- package/dist/utils/TokenStreamRegulator.d.ts +4 -2
- package/dist/utils/TokenStreamRegulator.js +22 -4
- package/dist/utils/TokenStreamRegulator.js.map +1 -1
- package/dist/utils/getConsoleLogPrefix.js +1 -1
- package/dist/utils/getReadableContextSize.d.ts +1 -0
- package/dist/utils/getReadableContextSize.js +7 -0
- package/dist/utils/getReadableContextSize.js.map +1 -0
- package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js +15 -11
- package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js.map +1 -1
- package/dist/utils/isToken.d.ts +2 -0
- package/dist/utils/isToken.js +4 -0
- package/dist/utils/isToken.js.map +1 -0
- package/dist/utils/isUrl.d.ts +1 -0
- package/dist/utils/isUrl.js +15 -0
- package/dist/utils/isUrl.js.map +1 -0
- package/dist/utils/tokenizeInput.d.ts +1 -1
- package/dist/utils/tokenizeInput.js +3 -0
- package/dist/utils/tokenizeInput.js.map +1 -1
- package/dist/utils/utilTypes.d.ts +3 -0
- package/dist/utils/utilTypes.js +2 -0
- package/dist/utils/utilTypes.js.map +1 -0
- package/dist/utils/withOra.d.ts +1 -0
- package/dist/utils/withOra.js +13 -7
- package/dist/utils/withOra.js.map +1 -1
- package/dist/utils/withProgressLog.d.ts +23 -0
- package/dist/utils/withProgressLog.js +211 -0
- package/dist/utils/withProgressLog.js.map +1 -0
- package/dist/utils/withStatusLogs.js +1 -1
- package/dist/utils/withStatusLogs.js.map +1 -1
- package/llama/addon.cpp +90 -10
- package/llama/binariesGithubRelease.json +1 -1
- package/llama/gitRelease.bundle +0 -0
- package/llama/grammars/README.md +10 -0
- package/llama/llama.cpp.info.json +1 -1
- package/llamaBins/linux-arm64/_nlcBuildMetadata.json +1 -1
- package/llamaBins/linux-arm64/llama-addon.node +0 -0
- package/llamaBins/linux-armv7l/_nlcBuildMetadata.json +1 -1
- package/llamaBins/linux-armv7l/llama-addon.node +0 -0
- package/llamaBins/linux-x64/_nlcBuildMetadata.json +1 -1
- package/llamaBins/linux-x64/llama-addon.node +0 -0
- package/llamaBins/linux-x64-cuda/_nlcBuildMetadata.json +1 -1
- package/llamaBins/linux-x64-cuda/llama-addon.node +0 -0
- package/llamaBins/linux-x64-vulkan/_nlcBuildMetadata.json +1 -1
- package/llamaBins/linux-x64-vulkan/llama-addon.node +0 -0
- package/llamaBins/mac-arm64-metal/_nlcBuildMetadata.json +1 -1
- package/llamaBins/mac-arm64-metal/default.metallib +0 -0
- package/llamaBins/mac-arm64-metal/llama-addon.node +0 -0
- package/llamaBins/mac-x64/_nlcBuildMetadata.json +1 -1
- package/llamaBins/mac-x64/llama-addon.node +0 -0
- package/llamaBins/win-arm64/_nlcBuildMetadata.json +1 -1
- package/llamaBins/win-arm64/llama-addon.node +0 -0
- package/llamaBins/win-x64/_nlcBuildMetadata.json +1 -1
- package/llamaBins/win-x64/llama-addon.node +0 -0
- package/llamaBins/win-x64-cuda/_nlcBuildMetadata.json +1 -1
- package/llamaBins/win-x64-cuda/llama-addon.node +0 -0
- package/llamaBins/win-x64-vulkan/_nlcBuildMetadata.json +1 -1
- package/llamaBins/win-x64-vulkan/llama-addon.node +0 -0
- package/package.json +9 -7
- package/dist/chatWrappers/LlamaChatWrapper.js.map +0 -1
- package/dist/gguf/GgufInsights.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"recommendedModels.js","sourceRoot":"","sources":["../../src/cli/recommendedModels.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
export declare const enum ConsoleInteractionKey {
|
|
3
|
+
ctrlC = "\u0003",
|
|
4
|
+
upArrow = "\u001B[A",
|
|
5
|
+
downArrow = "\u001B[B",
|
|
6
|
+
enter = "\r"
|
|
7
|
+
}
|
|
8
|
+
export declare class ConsoleInteraction {
|
|
9
|
+
constructor({ stdin }?: {
|
|
10
|
+
stdin?: NodeJS.ReadStream;
|
|
11
|
+
});
|
|
12
|
+
get isActive(): boolean;
|
|
13
|
+
start(): void;
|
|
14
|
+
stop(): void;
|
|
15
|
+
onKey(key: string | ConsoleInteractionKey | (string | ConsoleInteractionKey)[], callback: () => void): ConsoleInteractionOnKeyHandle;
|
|
16
|
+
static yesNoQuestion(question: string): Promise<boolean>;
|
|
17
|
+
}
|
|
18
|
+
export declare class ConsoleInteractionOnKeyHandle {
|
|
19
|
+
private constructor();
|
|
20
|
+
dispose(): void;
|
|
21
|
+
[Symbol.dispose](): void;
|
|
22
|
+
get disposed(): boolean;
|
|
23
|
+
}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
import process from "process";
|
|
2
|
+
import chalk from "chalk";
|
|
3
|
+
export var ConsoleInteractionKey;
|
|
4
|
+
(function (ConsoleInteractionKey) {
|
|
5
|
+
ConsoleInteractionKey["ctrlC"] = "\u0003";
|
|
6
|
+
ConsoleInteractionKey["upArrow"] = "\u001B[A";
|
|
7
|
+
ConsoleInteractionKey["downArrow"] = "\u001B[B";
|
|
8
|
+
ConsoleInteractionKey["enter"] = "\r";
|
|
9
|
+
})(ConsoleInteractionKey || (ConsoleInteractionKey = {}));
|
|
10
|
+
export class ConsoleInteraction {
|
|
11
|
+
/** @internal */ _keyCallbacks = new Map();
|
|
12
|
+
/** @internal */ _stdin;
|
|
13
|
+
/** @internal */ _isActive = false;
|
|
14
|
+
constructor({ stdin = process.stdin } = {}) {
|
|
15
|
+
this._stdin = stdin;
|
|
16
|
+
this._onData = this._onData.bind(this);
|
|
17
|
+
}
|
|
18
|
+
get isActive() {
|
|
19
|
+
return this._isActive;
|
|
20
|
+
}
|
|
21
|
+
start() {
|
|
22
|
+
if (this._isActive)
|
|
23
|
+
return;
|
|
24
|
+
this._isActive = true;
|
|
25
|
+
if (this._stdin.isTTY)
|
|
26
|
+
this._stdin.setRawMode(true);
|
|
27
|
+
this._stdin.on("data", this._onData);
|
|
28
|
+
this._stdin.resume();
|
|
29
|
+
}
|
|
30
|
+
stop() {
|
|
31
|
+
if (!this._isActive)
|
|
32
|
+
return;
|
|
33
|
+
this._isActive = false;
|
|
34
|
+
if (this._stdin.isTTY)
|
|
35
|
+
this._stdin.setRawMode(false);
|
|
36
|
+
this._stdin.off("data", this._onData);
|
|
37
|
+
this._stdin.pause();
|
|
38
|
+
}
|
|
39
|
+
onKey(key, callback) {
|
|
40
|
+
if (typeof key === "string")
|
|
41
|
+
key = [key];
|
|
42
|
+
for (const k of key) {
|
|
43
|
+
if (!this._keyCallbacks.has(k))
|
|
44
|
+
this._keyCallbacks.set(k, []);
|
|
45
|
+
this._keyCallbacks.get(k).push(callback);
|
|
46
|
+
}
|
|
47
|
+
return ConsoleInteractionOnKeyHandle._create(() => {
|
|
48
|
+
for (const k of key) {
|
|
49
|
+
const callbacks = this._keyCallbacks.get(k);
|
|
50
|
+
if (callbacks == null)
|
|
51
|
+
continue;
|
|
52
|
+
const index = callbacks.indexOf(callback);
|
|
53
|
+
if (index >= 0)
|
|
54
|
+
callbacks.splice(index, 1);
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
/** @internal */
|
|
59
|
+
_onData(data) {
|
|
60
|
+
if (!this._isActive)
|
|
61
|
+
return;
|
|
62
|
+
const key = data.toString();
|
|
63
|
+
const callbacks = this._keyCallbacks.get(key) ?? [];
|
|
64
|
+
if (callbacks.length === 0 && key === ConsoleInteractionKey.ctrlC) {
|
|
65
|
+
process.stdout.write("\n");
|
|
66
|
+
this.stop();
|
|
67
|
+
process.exit(0);
|
|
68
|
+
}
|
|
69
|
+
for (const callback of callbacks) {
|
|
70
|
+
try {
|
|
71
|
+
callback();
|
|
72
|
+
}
|
|
73
|
+
catch (err) {
|
|
74
|
+
console.error(err);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
static yesNoQuestion(question) {
|
|
79
|
+
return new Promise((resolve) => {
|
|
80
|
+
const interaction = new ConsoleInteraction();
|
|
81
|
+
interaction.onKey(["Y", "y"], () => {
|
|
82
|
+
resolve(true);
|
|
83
|
+
interaction.stop();
|
|
84
|
+
process.stdout.write("\n");
|
|
85
|
+
});
|
|
86
|
+
interaction.onKey(["N", "n"], () => {
|
|
87
|
+
resolve(false);
|
|
88
|
+
interaction.stop();
|
|
89
|
+
process.stdout.write("\n");
|
|
90
|
+
});
|
|
91
|
+
console.log();
|
|
92
|
+
process.stdout.write(question + " " + chalk.gray("(Y/n) "));
|
|
93
|
+
interaction.start();
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
export class ConsoleInteractionOnKeyHandle {
|
|
98
|
+
/** @internal */
|
|
99
|
+
_dispose;
|
|
100
|
+
constructor(dispose) {
|
|
101
|
+
this._dispose = dispose;
|
|
102
|
+
this.dispose = this.dispose.bind(this);
|
|
103
|
+
this[Symbol.dispose] = this[Symbol.dispose].bind(this);
|
|
104
|
+
}
|
|
105
|
+
dispose() {
|
|
106
|
+
if (this._dispose != null) {
|
|
107
|
+
this._dispose();
|
|
108
|
+
this._dispose = null;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
[Symbol.dispose]() {
|
|
112
|
+
this.dispose();
|
|
113
|
+
}
|
|
114
|
+
get disposed() {
|
|
115
|
+
return this._dispose == null;
|
|
116
|
+
}
|
|
117
|
+
/** @internal */
|
|
118
|
+
static _create(dispose) {
|
|
119
|
+
return new ConsoleInteractionOnKeyHandle(dispose);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=ConsoleInteraction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ConsoleInteraction.js","sourceRoot":"","sources":["../../../src/cli/utils/ConsoleInteraction.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export class ConsoleTable {
|
|
|
5
5
|
_columns;
|
|
6
6
|
_columnSeparator;
|
|
7
7
|
_drawHeaderRowSeparator;
|
|
8
|
-
constructor(columns, { columnSeparator = chalk.
|
|
8
|
+
constructor(columns, { columnSeparator = chalk.gray(" | "), drawHeaderRowSeparator = true } = {}) {
|
|
9
9
|
this._columns = columns;
|
|
10
10
|
this._columnSeparator = columnSeparator;
|
|
11
11
|
this._drawHeaderRowSeparator = drawHeaderRowSeparator;
|
|
@@ -30,7 +30,7 @@ export class ConsoleTable {
|
|
|
30
30
|
}
|
|
31
31
|
const moreText = "...";
|
|
32
32
|
if (stripAnsi(title).length > columnSize)
|
|
33
|
-
title = sliceAnsi(title, 0, columnSize - moreText.length) + chalk.
|
|
33
|
+
title = sliceAnsi(title, 0, columnSize - moreText.length) + chalk.gray(moreText);
|
|
34
34
|
title = title + " ".repeat(Math.max(0, columnSize - stripAnsi(title).length));
|
|
35
35
|
title = sliceAnsi(title, 0, columnSize);
|
|
36
36
|
if (i < this._columns.length - 1)
|
|
@@ -39,7 +39,7 @@ export class ConsoleTable {
|
|
|
39
39
|
}
|
|
40
40
|
console.info(logLine);
|
|
41
41
|
if (drawRowSeparator)
|
|
42
|
-
console.info(chalk.
|
|
42
|
+
console.info(chalk.gray("-".repeat(stripAnsi(logLine).length)));
|
|
43
43
|
}
|
|
44
44
|
logLine(data) {
|
|
45
45
|
let logLine = "";
|
|
@@ -66,7 +66,7 @@ export class ConsoleTable {
|
|
|
66
66
|
}
|
|
67
67
|
const moreText = "...";
|
|
68
68
|
if (valueWithoutAnsi.length > columnSize)
|
|
69
|
-
value = sliceAnsi(value, 0, columnSize - moreText.length) + chalk.
|
|
69
|
+
value = sliceAnsi(value, 0, columnSize - moreText.length) + chalk.gray(moreText);
|
|
70
70
|
value = value + " ".repeat(Math.max(0, columnSize - valueWithoutAnsi.length));
|
|
71
71
|
value = sliceAnsi(value, 0, columnSize);
|
|
72
72
|
if (i < this._columns.length - 1)
|
|
@@ -81,6 +81,6 @@ function getColumnWidth(column) {
|
|
|
81
81
|
return column.width ?? stripAnsi(toOneLine(column.title ?? " ")).length;
|
|
82
82
|
}
|
|
83
83
|
function toOneLine(text) {
|
|
84
|
-
return text.replaceAll("\n", chalk.
|
|
84
|
+
return text.replaceAll("\n", chalk.gray("\\n"));
|
|
85
85
|
}
|
|
86
86
|
//# sourceMappingURL=ConsoleTable.js.map
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export declare function basicChooseFromListConsoleInteraction<T>({ title, footer, items, renderItem, canFocusItem, canSelectItem, initialFocusIndex, aboveItemsPadding, belowItemsPadding, renderSummaryOnExit, exitOnCtrlC }: {
|
|
2
|
+
title: string | ((focusedItem: T, rerender: () => void) => string);
|
|
3
|
+
footer?: string | ((focusedItem: T, rerender: () => void) => string | undefined);
|
|
4
|
+
items: T[];
|
|
5
|
+
renderItem(item: T, focused: boolean, rerender: () => void): string;
|
|
6
|
+
canFocusItem?(item: T): boolean;
|
|
7
|
+
canSelectItem?(item: T): boolean;
|
|
8
|
+
initialFocusIndex?: number;
|
|
9
|
+
aboveItemsPadding?: number;
|
|
10
|
+
belowItemsPadding?: number;
|
|
11
|
+
renderSummaryOnExit?(item: T | null): string;
|
|
12
|
+
exitOnCtrlC?: boolean;
|
|
13
|
+
}): Promise<T | null>;
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import process from "process";
|
|
2
|
+
import UpdateManager from "stdout-update";
|
|
3
|
+
import stripAnsi from "strip-ansi";
|
|
4
|
+
import sliceAnsi from "slice-ansi";
|
|
5
|
+
import chalk from "chalk";
|
|
6
|
+
import { ConsoleInteraction, ConsoleInteractionKey } from "./ConsoleInteraction.js";
|
|
7
|
+
import { splitAnsiToLines } from "./splitAnsiToLines.js";
|
|
8
|
+
export async function basicChooseFromListConsoleInteraction({ title, footer, items, renderItem, canFocusItem, canSelectItem, initialFocusIndex = 0, aboveItemsPadding = 1, belowItemsPadding = 1, renderSummaryOnExit = (item) => (item == null ? "" : renderItem(item, false, () => void 0)), exitOnCtrlC = true }) {
|
|
9
|
+
const updateManager = UpdateManager.getInstance();
|
|
10
|
+
let focusIndex = initialFocusIndex;
|
|
11
|
+
let scrollOffset = 0;
|
|
12
|
+
let rerenderTimeout = undefined;
|
|
13
|
+
let isDone = false;
|
|
14
|
+
function adjustScrollOffset(screenLines) {
|
|
15
|
+
if (focusIndex < scrollOffset + aboveItemsPadding)
|
|
16
|
+
scrollOffset = Math.max(0, focusIndex - aboveItemsPadding);
|
|
17
|
+
else if (focusIndex > scrollOffset + screenLines - belowItemsPadding)
|
|
18
|
+
scrollOffset = Math.min(Math.max(0, focusIndex - screenLines + belowItemsPadding), items.length - 1 - screenLines);
|
|
19
|
+
}
|
|
20
|
+
function scheduleRerender() {
|
|
21
|
+
if (isDone)
|
|
22
|
+
return;
|
|
23
|
+
if (rerenderTimeout == null)
|
|
24
|
+
rerenderTimeout = setTimeout(renderScreen, 0);
|
|
25
|
+
}
|
|
26
|
+
function renderScreen() {
|
|
27
|
+
clearTimeout(rerenderTimeout);
|
|
28
|
+
rerenderTimeout = undefined;
|
|
29
|
+
if (isDone)
|
|
30
|
+
return;
|
|
31
|
+
while (canFocusItem != null && focusIndex > 0 && !canFocusItem(items[focusIndex]))
|
|
32
|
+
focusIndex--;
|
|
33
|
+
while (canFocusItem != null && focusIndex < items.length - 1 && !canFocusItem(items[focusIndex]))
|
|
34
|
+
focusIndex++;
|
|
35
|
+
const maxWidth = (process.stdout.columns ?? 80) - 2;
|
|
36
|
+
const maxHeight = (process.stdout.rows ?? 24) - 2;
|
|
37
|
+
const focusedItem = items[focusIndex];
|
|
38
|
+
const titleLines = splitAnsiToLines(title instanceof Function ? title(focusedItem, scheduleRerender) : title, maxWidth);
|
|
39
|
+
const footerLines = splitAnsiToLines(footer instanceof Function ? footer(focusedItem, scheduleRerender) : footer, maxWidth);
|
|
40
|
+
const reservedLinesCount = titleLines.length + footerLines.length;
|
|
41
|
+
const maxItemLinesCount = Math.max(1, maxHeight - reservedLinesCount);
|
|
42
|
+
adjustScrollOffset(maxItemLinesCount);
|
|
43
|
+
updateManager.update([
|
|
44
|
+
...titleLines,
|
|
45
|
+
...items
|
|
46
|
+
.slice(scrollOffset, scrollOffset + maxItemLinesCount + 1)
|
|
47
|
+
.map((item, index) => (renderSingleLine(renderItem(item, scrollOffset + index === focusIndex, scheduleRerender), maxWidth))),
|
|
48
|
+
...footerLines
|
|
49
|
+
]);
|
|
50
|
+
}
|
|
51
|
+
updateManager.hook();
|
|
52
|
+
const consoleInteraction = new ConsoleInteraction();
|
|
53
|
+
try {
|
|
54
|
+
consoleInteraction.onKey(ConsoleInteractionKey.upArrow, () => {
|
|
55
|
+
let newFocusIndex = Math.max(0, focusIndex - 1);
|
|
56
|
+
while (newFocusIndex > 0 && canFocusItem != null && !canFocusItem(items[newFocusIndex]))
|
|
57
|
+
newFocusIndex--;
|
|
58
|
+
if (canFocusItem == null || canFocusItem(items[newFocusIndex])) {
|
|
59
|
+
focusIndex = newFocusIndex;
|
|
60
|
+
renderScreen();
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
consoleInteraction.onKey(ConsoleInteractionKey.downArrow, () => {
|
|
64
|
+
let newFocusIndex = Math.min(items.length - 1, focusIndex + 1);
|
|
65
|
+
while (newFocusIndex < items.length - 1 && canFocusItem != null && !canFocusItem(items[newFocusIndex]))
|
|
66
|
+
newFocusIndex++;
|
|
67
|
+
if (canFocusItem == null || canFocusItem(items[newFocusIndex])) {
|
|
68
|
+
focusIndex = newFocusIndex;
|
|
69
|
+
renderScreen();
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
process.on("SIGWINCH", renderScreen);
|
|
73
|
+
renderScreen();
|
|
74
|
+
const res = await new Promise((resolve) => {
|
|
75
|
+
consoleInteraction.onKey(ConsoleInteractionKey.enter, () => {
|
|
76
|
+
if (canSelectItem == null || canSelectItem(items[focusIndex]))
|
|
77
|
+
resolve(items[focusIndex]);
|
|
78
|
+
});
|
|
79
|
+
consoleInteraction.onKey(ConsoleInteractionKey.ctrlC, () => {
|
|
80
|
+
if (exitOnCtrlC) {
|
|
81
|
+
updateManager.update([""]);
|
|
82
|
+
consoleInteraction.stop();
|
|
83
|
+
updateManager.unhook(true);
|
|
84
|
+
process.exit(0);
|
|
85
|
+
}
|
|
86
|
+
resolve(null);
|
|
87
|
+
});
|
|
88
|
+
consoleInteraction.start();
|
|
89
|
+
});
|
|
90
|
+
isDone = true;
|
|
91
|
+
clearTimeout(rerenderTimeout);
|
|
92
|
+
rerenderTimeout = undefined;
|
|
93
|
+
process.off("SIGWINCH", renderScreen);
|
|
94
|
+
updateManager.update([
|
|
95
|
+
renderSummaryOnExit(res)
|
|
96
|
+
]);
|
|
97
|
+
return res;
|
|
98
|
+
}
|
|
99
|
+
finally {
|
|
100
|
+
consoleInteraction.stop();
|
|
101
|
+
updateManager.unhook(true);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
function renderSingleLine(text, maxWidth) {
|
|
105
|
+
const textWithoutAnsi = stripAnsi(text);
|
|
106
|
+
const moreText = "...";
|
|
107
|
+
if (textWithoutAnsi.length > maxWidth)
|
|
108
|
+
return sliceAnsi(text, 0, maxWidth - moreText.length) + chalk.gray(moreText);
|
|
109
|
+
return text;
|
|
110
|
+
}
|
|
111
|
+
//# sourceMappingURL=basicChooseFromListConsoleInteraction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"basicChooseFromListConsoleInteraction.js","sourceRoot":"","sources":["../../../src/cli/utils/basicChooseFromListConsoleInteraction.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare function consolePromptQuestion(question: string, { validate, renderSummaryOnExit, exitOnCtrlC }?: {
|
|
2
|
+
validate?: (input: string) => string | null | Promise<string | null>;
|
|
3
|
+
renderSummaryOnExit?: (item: string | null) => string;
|
|
4
|
+
exitOnCtrlC?: boolean;
|
|
5
|
+
}): Promise<string | null>;
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
import readline from "readline";
|
|
2
|
+
import process from "process";
|
|
3
|
+
import chalk from "chalk";
|
|
4
|
+
import { splitAnsiToLines } from "./splitAnsiToLines.js";
|
|
5
|
+
export async function consolePromptQuestion(question, { validate, renderSummaryOnExit, exitOnCtrlC = true } = {}) {
|
|
6
|
+
let lastErrorText = "";
|
|
7
|
+
let lastResponse = "";
|
|
8
|
+
process.stdout.moveCursor(0, -1);
|
|
9
|
+
// eslint-disable-next-line no-constant-condition
|
|
10
|
+
while (true) {
|
|
11
|
+
const rl = readline.createInterface({
|
|
12
|
+
input: process.stdin,
|
|
13
|
+
output: process.stdout
|
|
14
|
+
});
|
|
15
|
+
const res = await new Promise((accept) => {
|
|
16
|
+
const initialCursorPosition = rl.getCursorPos();
|
|
17
|
+
function onSigInt() {
|
|
18
|
+
rl.off("SIGINT", onSigInt);
|
|
19
|
+
rl.close();
|
|
20
|
+
const linesUsed = splitAnsiToLines(lastErrorText, process.stdout.columns).length +
|
|
21
|
+
rl.getCursorPos().rows - initialCursorPosition.rows + 1;
|
|
22
|
+
clearLastLines(linesUsed);
|
|
23
|
+
if (exitOnCtrlC) {
|
|
24
|
+
rl.close();
|
|
25
|
+
process.exit(0);
|
|
26
|
+
}
|
|
27
|
+
else
|
|
28
|
+
accept(null);
|
|
29
|
+
}
|
|
30
|
+
rl.on("SIGINT", onSigInt);
|
|
31
|
+
rl.question(question, (res) => {
|
|
32
|
+
rl.off("SIGINT", onSigInt);
|
|
33
|
+
rl.close();
|
|
34
|
+
accept(res);
|
|
35
|
+
});
|
|
36
|
+
rl.write(lastResponse);
|
|
37
|
+
});
|
|
38
|
+
const linesUsed = splitAnsiToLines(lastErrorText + question + res, process.stdout.columns).length + (res != null ? 1 : 0);
|
|
39
|
+
if (res == null) {
|
|
40
|
+
clearLastLines(linesUsed);
|
|
41
|
+
if (renderSummaryOnExit != null) {
|
|
42
|
+
const summary = renderSummaryOnExit(null);
|
|
43
|
+
if (summary !== "")
|
|
44
|
+
process.stdout.write(summary + "\n");
|
|
45
|
+
}
|
|
46
|
+
return null;
|
|
47
|
+
}
|
|
48
|
+
lastResponse = res;
|
|
49
|
+
const validationError = await validate?.(res);
|
|
50
|
+
if (validationError != null) {
|
|
51
|
+
clearLastLines(linesUsed);
|
|
52
|
+
lastErrorText = chalk.red(validationError) + "\n";
|
|
53
|
+
process.stdout.write(lastErrorText);
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
56
|
+
else if (renderSummaryOnExit != null) {
|
|
57
|
+
clearLastLines(linesUsed);
|
|
58
|
+
const summary = renderSummaryOnExit(res);
|
|
59
|
+
if (summary !== "")
|
|
60
|
+
process.stdout.write(summary + "\n");
|
|
61
|
+
}
|
|
62
|
+
else if (lastErrorText !== "") {
|
|
63
|
+
clearLastLines(linesUsed);
|
|
64
|
+
process.stdout.write(question + res + "\n");
|
|
65
|
+
}
|
|
66
|
+
return res;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
function clearLastLines(linesCount) {
|
|
70
|
+
if (linesCount === 0)
|
|
71
|
+
return;
|
|
72
|
+
process.stdout.write("\n");
|
|
73
|
+
for (let i = 0; i < linesCount; i++) {
|
|
74
|
+
process.stdout.moveCursor(0, -1);
|
|
75
|
+
process.stdout.clearLine(0);
|
|
76
|
+
}
|
|
77
|
+
process.stdout.write("\n");
|
|
78
|
+
process.stdout.moveCursor(0, -1);
|
|
79
|
+
}
|
|
80
|
+
//# sourceMappingURL=consolePromptQuestion.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"consolePromptQuestion.js","sourceRoot":"","sources":["../../../src/cli/utils/consolePromptQuestion.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function getReadablePath(fsPath: string): string;
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import os from "os";
|
|
2
|
+
import path from "path";
|
|
3
|
+
export function getReadablePath(fsPath) {
|
|
4
|
+
const resolvedPath = path.resolve(fsPath);
|
|
5
|
+
if (process.platform === "win32" || process.platform === "cygwin")
|
|
6
|
+
return resolvedPath;
|
|
7
|
+
let homedir = os.homedir();
|
|
8
|
+
if (!homedir.endsWith("/"))
|
|
9
|
+
homedir += "/";
|
|
10
|
+
if (resolvedPath.startsWith(homedir))
|
|
11
|
+
return "~" + resolvedPath.slice(homedir.length - "/".length);
|
|
12
|
+
return resolvedPath;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=getReadablePath.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getReadablePath.js","sourceRoot":"","sources":["../../../src/cli/utils/getReadablePath.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,UAAU,eAAe,CAAC,MAAc;IAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE1C,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ;QAC7D,OAAO,YAAY,CAAC;IAExB,IAAI,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC3B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QACtB,OAAO,IAAI,GAAG,CAAC;IAEnB,IAAI,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC;QAChC,OAAO,GAAG,GAAG,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;IAEjE,OAAO,YAAY,CAAC;AACxB,CAAC"}
|
|
@@ -19,9 +19,6 @@ export function printCommonInfoLines({ context, minTitleLength = 0, logBatchSize
|
|
|
19
19
|
}, {
|
|
20
20
|
title: "Name",
|
|
21
21
|
value: toOneLine(llama.getGpuDeviceNames().join(", "))
|
|
22
|
-
}, {
|
|
23
|
-
title: "GPU layers",
|
|
24
|
-
value: `${model.gpuLayers}/${model.fileInsights.totalLayers} offloaded ${chalk.dim(`(${Math.floor((model.gpuLayers / model.fileInsights.totalLayers) * 100)}%)`)}`
|
|
25
22
|
}]
|
|
26
23
|
});
|
|
27
24
|
}
|
|
@@ -34,6 +31,10 @@ export function printCommonInfoLines({ context, minTitleLength = 0, logBatchSize
|
|
|
34
31
|
}, {
|
|
35
32
|
title: "Size",
|
|
36
33
|
value: bytes(model.size)
|
|
34
|
+
}, {
|
|
35
|
+
show: llama.gpu !== false,
|
|
36
|
+
title: "GPU layers",
|
|
37
|
+
value: `${model.gpuLayers}/${model.fileInsights.totalLayers} offloaded ${chalk.dim(`(${Math.floor((model.gpuLayers / model.fileInsights.totalLayers) * 100)}%)`)}`
|
|
37
38
|
}, {
|
|
38
39
|
show: printBos,
|
|
39
40
|
title: "BOS",
|
|
@@ -65,6 +66,6 @@ export function printCommonInfoLines({ context, minTitleLength = 0, logBatchSize
|
|
|
65
66
|
});
|
|
66
67
|
}
|
|
67
68
|
function toOneLine(text) {
|
|
68
|
-
return text.replaceAll("\n", chalk.
|
|
69
|
+
return text.replaceAll("\n", chalk.gray("\\n"));
|
|
69
70
|
}
|
|
70
71
|
//# sourceMappingURL=printCommonInfoLines.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"printCommonInfoLines.js","sourceRoot":"","sources":["../../../src/cli/utils/printCommonInfoLines.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,qBAAqB,EAAC,MAAM,0BAA0B,CAAC;AAE/D,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAEjD,MAAM,UAAU,oBAAoB,CAAC,EACjC,OAAO,EACP,cAAc,GAAG,CAAC,EAClB,YAAY,GAAG,KAAK,EACpB,iBAAiB,GAAG,KAAK,EACzB,QAAQ,GAAG,KAAK,EAChB,QAAQ,GAAG,KAAK,EAQnB;IACG,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;IAC7B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEhE,IAAI,KAAK,CAAC,GAAG,KAAK,KAAK,EAAE;QACrB,aAAa,CAAC;YACV,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,QAAQ;YAClB,IAAI,EAAE,CAAC;oBACH,KAAK,EAAE,MAAM;oBACb,KAAK,EAAE,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC;iBAC1C,EAAE;oBACC,KAAK,EAAE,MAAM;oBACb,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC;iBAC3C,EAAE;oBACC,KAAK,EAAE,MAAM;oBACb,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACzD,
|
|
1
|
+
{"version":3,"file":"printCommonInfoLines.js","sourceRoot":"","sources":["../../../src/cli/utils/printCommonInfoLines.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
export declare function printInfoLine(
|
|
1
|
+
export declare function printInfoLine(options: Parameters<typeof renderInfoLine>[0]): void;
|
|
2
|
+
export declare function renderInfoLine({ title, padTitle, separateLines, info, maxWidth }: {
|
|
2
3
|
title?: string;
|
|
3
4
|
padTitle?: number;
|
|
4
5
|
separateLines?: boolean;
|
|
@@ -7,4 +8,5 @@ export declare function printInfoLine({ title, padTitle, separateLines, info }:
|
|
|
7
8
|
value: string | (() => string);
|
|
8
9
|
show?: boolean;
|
|
9
10
|
}>;
|
|
10
|
-
|
|
11
|
+
maxWidth?: number;
|
|
12
|
+
}): string;
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import chalk from "chalk";
|
|
2
2
|
import stripAnsi from "strip-ansi";
|
|
3
|
-
export function printInfoLine(
|
|
3
|
+
export function printInfoLine(options) {
|
|
4
|
+
console.info(renderInfoLine(options));
|
|
5
|
+
}
|
|
6
|
+
export function renderInfoLine({ title, padTitle = 0, separateLines = false, info, maxWidth = process.stdout.columns - 1 }) {
|
|
4
7
|
const res = [];
|
|
5
8
|
const items = [];
|
|
6
9
|
if (separateLines) {
|
|
@@ -9,11 +12,14 @@ export function printInfoLine({ title, padTitle = 0, separateLines = false, info
|
|
|
9
12
|
for (const { title, value, show } of info) {
|
|
10
13
|
if (show === false)
|
|
11
14
|
continue;
|
|
12
|
-
|
|
15
|
+
if (title == null || title === "")
|
|
16
|
+
items.push(value instanceof Function ? value() : value);
|
|
17
|
+
else
|
|
18
|
+
items.push(`${chalk.yellow(title + ":")} ${value instanceof Function ? value() : value}`);
|
|
13
19
|
}
|
|
14
20
|
const itemPrefix = `${chalk.dim("|")} `;
|
|
15
21
|
res.push(itemPrefix + items.join("\n" + itemPrefix));
|
|
16
|
-
|
|
22
|
+
return res.join("\n") + "\n";
|
|
17
23
|
}
|
|
18
24
|
else {
|
|
19
25
|
if (title != null && title.length > 0)
|
|
@@ -21,11 +27,14 @@ export function printInfoLine({ title, padTitle = 0, separateLines = false, info
|
|
|
21
27
|
for (const { title, value, show } of info) {
|
|
22
28
|
if (show === false)
|
|
23
29
|
continue;
|
|
24
|
-
|
|
30
|
+
if (title == null || title === "")
|
|
31
|
+
items.push(chalk.bgGray(` ${value instanceof Function ? value() : value} `));
|
|
32
|
+
else
|
|
33
|
+
items.push(chalk.bgGray(` ${chalk.yellow(title + ":")} ${value instanceof Function ? value() : value} `));
|
|
25
34
|
}
|
|
26
35
|
const startPad = stripAnsi(res.join(" ")).length + (res.length > 0 ? " ".length : 0);
|
|
27
|
-
res.push(splitItemsIntoLines(items,
|
|
28
|
-
|
|
36
|
+
res.push(splitItemsIntoLines(items, maxWidth - startPad).join("\n" + " ".repeat(startPad)));
|
|
37
|
+
return res.join(" ");
|
|
29
38
|
}
|
|
30
39
|
}
|
|
31
40
|
function splitItemsIntoLines(items, maxLineLength) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"printInfoLine.js","sourceRoot":"","sources":["../../../src/cli/utils/printInfoLine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,MAAM,UAAU,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"printInfoLine.js","sourceRoot":"","sources":["../../../src/cli/utils/printInfoLine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
import { Llama } from "../../bindings/Llama.js";
|
|
2
|
+
export declare function resolveCommandGgufPath(ggufPath: string | undefined, llama: Llama, fetchHeaders?: Record<string, string>): Promise<string>;
|