node-llama-cpp 3.0.0-beta.2 → 3.0.0-beta.21

package/dist/chatWrappers/utils/resolveChatWrapper.js

@@ -0,0 +1,214 @@
+import { parseModelFileName } from "../../utils/parseModelFileName.js";
+import { Llama3ChatWrapper } from "../Llama3ChatWrapper.js";
+import { Llama2ChatWrapper } from "../Llama2ChatWrapper.js";
+import { ChatMLChatWrapper } from "../ChatMLChatWrapper.js";
+import { GeneralChatWrapper } from "../GeneralChatWrapper.js";
+import { FalconChatWrapper } from "../FalconChatWrapper.js";
+import { FunctionaryChatWrapper } from "../FunctionaryChatWrapper.js";
+import { AlpacaChatWrapper } from "../AlpacaChatWrapper.js";
+import { GemmaChatWrapper } from "../GemmaChatWrapper.js";
+import { JinjaTemplateChatWrapper } from "../generic/JinjaTemplateChatWrapper.js";
+import { TemplateChatWrapper } from "../generic/TemplateChatWrapper.js";
+import { getConsoleLogPrefix } from "../../utils/getConsoleLogPrefix.js";
+import { isJinjaTemplateEquivalentToSpecializedChatWrapper } from "./isJinjaTemplateEquivalentToSpecializedChatWrapper.js";
+export const specializedChatWrapperTypeNames = Object.freeze([
+    "general", "llama3Chat", "llama2Chat", "alpacaChat", "functionary", "chatML", "falconChat", "gemma"
+]);
+export const templateChatWrapperTypeNames = Object.freeze([
+    "template", "jinjaTemplate"
+]);
+export const resolvableChatWrapperTypeNames = Object.freeze([
+    "auto",
+    ...specializedChatWrapperTypeNames,
+    ...templateChatWrapperTypeNames
+]);
+const chatWrappers = {
+    "general": GeneralChatWrapper,
+    "llama3Chat": Llama3ChatWrapper,
+    "llama2Chat": Llama2ChatWrapper,
+    "alpacaChat": AlpacaChatWrapper,
+    "functionary": FunctionaryChatWrapper,
+    "chatML": ChatMLChatWrapper,
+    "falconChat": FalconChatWrapper,
+    "gemma": GemmaChatWrapper,
+    "template": TemplateChatWrapper,
+    "jinjaTemplate": JinjaTemplateChatWrapper
+};
+const chatWrapperToConfigType = new Map(Object.entries(chatWrappers)
+    .map(([configType, Wrapper]) => ([Wrapper, configType])));
+/**
+ * Resolve to a chat wrapper instance based on the provided information.
+ * The more information provided, the better the resolution will be (except for `type`).
+ *
+ * It's recommended to not set `type` to a specific chat wrapper in order for the resolution to be more flexible, but it is useful for when
+ * you need to provide the ability to force a specific chat wrapper type.
+ * Note that when setting `type` to a generic chat wrapper type (such as `"template"` or `"jinjaTemplate"`), the `customWrapperSettings`
+ * must contain the necessary settings for that chat wrapper to be created.
+ *
+ * When loading a Jinja chat template from either `fileInfo` or `customWrapperSettings.jinjaTemplate.template`,
+ * if the chat template format is invalid, it fallbacks to resolve other chat wrappers,
+ * unless `fallbackToOtherWrappersOnJinjaError` is set to `false` (in which case, it will throw an error).
+ */
+export function resolveChatWrapper({ type = "auto", bosString, filename, fileInfo, tokenizer, customWrapperSettings, warningLogs = true, fallbackToOtherWrappersOnJinjaError = true, noJinja = false }) {
+    function createSpecializedChatWrapper(specializedChatWrapper, defaultSettings = {}) {
+        const chatWrapperConfigType = chatWrapperToConfigType.get(specializedChatWrapper);
+        const chatWrapperSettings = customWrapperSettings?.[chatWrapperConfigType];
+        return new specializedChatWrapper({
+            ...(defaultSettings ?? {}),
+            ...(chatWrapperSettings ?? {})
+        });
+    }
+    if (type !== "auto" && type != null) {
+        if (isTemplateChatWrapperType(type)) {
+            const Wrapper = chatWrappers[type];
+            if (isClassReference(Wrapper, TemplateChatWrapper)) {
+                const wrapperSettings = customWrapperSettings?.template;
+                if (wrapperSettings == null || wrapperSettings?.template == null || wrapperSettings?.historyTemplate == null ||
+                    wrapperSettings?.modelRoleName == null || wrapperSettings?.userRoleName == null) {
+                    if (warningLogs)
+                        console.warn(getConsoleLogPrefix() + "Template chat wrapper settings must have a template, historyTemplate, modelRoleName, and userRoleName. Falling back to resolve other chat wrapper types.");
+                }
+                else
+                    return new TemplateChatWrapper(wrapperSettings);
+            }
+            else if (isClassReference(Wrapper, JinjaTemplateChatWrapper)) {
+                const jinjaTemplate = customWrapperSettings?.jinjaTemplate?.template ?? fileInfo?.metadata?.tokenizer?.chat_template;
+                if (jinjaTemplate == null) {
+                    if (warningLogs)
+                        console.warn(getConsoleLogPrefix() + "Jinja template chat wrapper received no template. Falling back to resolve other chat wrapper types.");
+                }
+                else {
+                    try {
+                        return new JinjaTemplateChatWrapper({
+                            ...(customWrapperSettings?.jinjaTemplate ?? {}),
+                            template: jinjaTemplate
+                        });
+                    }
+                    catch (err) {
+                        if (!fallbackToOtherWrappersOnJinjaError)
+                            throw err;
+                        else if (warningLogs)
+                            console.error(getConsoleLogPrefix() + "Error creating Jinja template chat wrapper. Falling back to resolve other chat wrappers. Error:", err);
+                    }
+                }
+            }
+            else
+                void (Wrapper);
+        }
+        else if (Object.hasOwn(chatWrappers, type)) {
+            const Wrapper = chatWrappers[type];
+            const wrapperSettings = customWrapperSettings?.[type];
+            return new Wrapper(wrapperSettings);
+        }
+    }
+    const modelJinjaTemplate = customWrapperSettings?.jinjaTemplate?.template ?? fileInfo?.metadata?.tokenizer?.chat_template;
+    if (modelJinjaTemplate != null && modelJinjaTemplate.trim() !== "") {
+        const jinjaTemplateChatWrapperOptions = {
+            ...(customWrapperSettings?.jinjaTemplate ?? {}),
+            template: modelJinjaTemplate
+        };
+        for (const specializedChatWrapperTypeName of specializedChatWrapperTypeNames) {
+            const Wrapper = chatWrappers[specializedChatWrapperTypeName];
+            const wrapperSettings = customWrapperSettings?.[specializedChatWrapperTypeName];
+            const testOptionConfigurations = Wrapper._getOptionConfigurationsToTestIfCanSupersedeJinjaTemplate?.() ?? [];
+            if (testOptionConfigurations.length === 0)
+                testOptionConfigurations.push({});
+            for (const testConfiguration of testOptionConfigurations) {
+                const testChatWrapperSettings = {
+                    ...(wrapperSettings ?? {}),
+                    ...(testConfiguration ?? {})
+                };
+                const chatWrapper = new Wrapper(testChatWrapperSettings);
+                if (isJinjaTemplateEquivalentToSpecializedChatWrapper(jinjaTemplateChatWrapperOptions, chatWrapper, tokenizer))
+                    return new Wrapper(testChatWrapperSettings);
+            }
+        }
+        if (!noJinja) {
+            if (!fallbackToOtherWrappersOnJinjaError)
+                return new JinjaTemplateChatWrapper(jinjaTemplateChatWrapperOptions);
+            try {
+                return new JinjaTemplateChatWrapper(jinjaTemplateChatWrapperOptions);
+            }
+            catch (err) {
+                console.error(getConsoleLogPrefix() + "Error creating Jinja template chat wrapper. Falling back to resolve other chat wrappers. Error:", err);
+            }
+        }
+    }
+    // try to find a pattern in the Jinja template to resolve to a specialized chat wrapper,
+    // with a logic similar to `llama.cpp`'s `llama_chat_apply_template_internal` function
+    if (modelJinjaTemplate != null && modelJinjaTemplate.trim() !== "") {
+        if (modelJinjaTemplate.includes("<|im_start|>"))
+            return createSpecializedChatWrapper(ChatMLChatWrapper);
+        else if (modelJinjaTemplate.includes("[INST]"))
+            return createSpecializedChatWrapper(Llama2ChatWrapper, {
+                addSpaceBeforeEos: modelJinjaTemplate.includes("' ' + eos_token")
+            });
+        else if (modelJinjaTemplate.includes("<|start_header_id|>") && modelJinjaTemplate.includes("<|end_header_id|>"))
+            return createSpecializedChatWrapper(Llama3ChatWrapper);
+        else if (modelJinjaTemplate.includes("<start_of_turn>"))
+            return createSpecializedChatWrapper(GemmaChatWrapper);
+    }
+    if (filename != null) {
+        const { name, subType, fileType, otherInfo } = parseModelFileName(filename);
+        if (fileType?.toLowerCase() === "gguf") {
+            const lowercaseName = name?.toLowerCase();
+            const lowercaseSubType = subType?.toLowerCase();
+            const splitLowercaseSubType = (lowercaseSubType?.split("-") ?? []).concat(otherInfo.map(info => info.toLowerCase()));
+            const firstSplitLowercaseSubType = splitLowercaseSubType[0];
+            if (lowercaseName === "llama") {
+                if (splitLowercaseSubType.includes("chat"))
+                    return createSpecializedChatWrapper(Llama2ChatWrapper);
+                return createSpecializedChatWrapper(GeneralChatWrapper);
+            }
+            else if (lowercaseName === "codellama")
+                return createSpecializedChatWrapper(GeneralChatWrapper);
+            else if (lowercaseName === "yarn" && firstSplitLowercaseSubType === "llama")
+                return createSpecializedChatWrapper(Llama2ChatWrapper);
+            else if (lowercaseName === "orca")
+                return createSpecializedChatWrapper(ChatMLChatWrapper);
+            else if (lowercaseName === "phind" && lowercaseSubType === "codellama")
+                return createSpecializedChatWrapper(Llama2ChatWrapper);
+            else if (lowercaseName === "mistral")
+                return createSpecializedChatWrapper(GeneralChatWrapper);
+            else if (firstSplitLowercaseSubType === "llama")
+                return createSpecializedChatWrapper(Llama2ChatWrapper);
+            else if (lowercaseSubType === "alpaca")
+                return createSpecializedChatWrapper(AlpacaChatWrapper);
+            else if (lowercaseName === "functionary")
+                return createSpecializedChatWrapper(FunctionaryChatWrapper);
+            else if (lowercaseName === "dolphin" && splitLowercaseSubType.includes("mistral"))
+                return createSpecializedChatWrapper(ChatMLChatWrapper);
+            else if (lowercaseName === "gemma")
+                return createSpecializedChatWrapper(GemmaChatWrapper);
+            else if (splitLowercaseSubType.includes("chatml"))
+                return createSpecializedChatWrapper(ChatMLChatWrapper);
+        }
+    }
+    if (fileInfo != null) {
+        const arch = fileInfo.metadata.general?.architecture;
+        if (arch === "llama")
+            return createSpecializedChatWrapper(GeneralChatWrapper);
+        else if (arch === "falcon")
+            return createSpecializedChatWrapper(FalconChatWrapper);
+    }
+    if (bosString === "" || bosString == null)
+        return null;
+    if ("<s>[INST] <<SYS>>\n".startsWith(bosString)) {
+        return createSpecializedChatWrapper(Llama2ChatWrapper);
+    }
+    else if ("<|im_start|>system\n".startsWith(bosString)) {
+        return createSpecializedChatWrapper(ChatMLChatWrapper);
+    }
+    return null;
+}
+export function isSpecializedChatWrapperType(type) {
+    return specializedChatWrapperTypeNames.includes(type);
+}
+export function isTemplateChatWrapperType(type) {
+    return templateChatWrapperTypeNames.includes(type);
+}
+// this is needed because TypeScript guards don't work automatically with class references
+function isClassReference(value, classReference) {
+    return value === classReference;
+}
+//# sourceMappingURL=resolveChatWrapper.js.map

package/dist/chatWrappers/utils/resolveChatWrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveChatWrapper.js","sourceRoot":"","sources":["../../../src/chatWrappers/utils/resolveChatWrapper.ts"],"names":[],"mappings":"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"}

package/dist/cli/cli.js

@@ -2,26 +2,40 @@
 import { fileURLToPath } from "url";
 import path from "path";
 import yargs from "yargs";
-// eslint-disable-next-line n/file-extension-in-import
 import { hideBin } from "yargs/helpers";
 import fs from "fs-extra";
-import { cliBinName } from "../config.js";
+import { cliBinName, documentationPageUrls } from "../config.js";
+import { setIsRunningFromCLI } from "../state.js";
+import { withCliCommandDescriptionDocsUrl } from "./utils/withCliCommandDescriptionDocsUrl.js";
+import { PullCommand } from "./commands/PullCommand.js";
+import { ChatCommand } from "./commands/ChatCommand.js";
+import { InitCommand } from "./commands/InitCommand.js";
 import { DownloadCommand } from "./commands/DownloadCommand.js";
+import { CompleteCommand } from "./commands/CompleteCommand.js";
+import { InfillCommand } from "./commands/InfillCommand.js";
+import { InspectCommand } from "./commands/inspect/InspectCommand.js";
 import { BuildCommand } from "./commands/BuildCommand.js";
-import { OnPostInstallCommand } from "./commands/OnPostInstallCommand.js";
 import { ClearCommand } from "./commands/ClearCommand.js";
-import { ChatCommand } from "./commands/ChatCommand.js";
+import { OnPostInstallCommand } from "./commands/OnPostInstallCommand.js";
+import { DebugCommand } from "./commands/DebugCommand.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const packageJson = fs.readJSONSync(path.join(__dirname, "..", "..", "package.json"));
+setIsRunningFromCLI(true);
 const yarg = yargs(hideBin(process.argv));
 yarg
     .scriptName(cliBinName)
-    .usage("Usage: $0 <command> [options]")
+    .usage(withCliCommandDescriptionDocsUrl("Usage: $0 <command> [options]", documentationPageUrls.CLI.index))
+    .command(PullCommand)
+    .command(ChatCommand)
+    .command(InitCommand)
     .command(DownloadCommand)
+    .command(CompleteCommand)
+    .command(InfillCommand)
+    .command(InspectCommand)
     .command(BuildCommand)
     .command(ClearCommand)
-    .command(ChatCommand)
     .command(OnPostInstallCommand)
+    .command(DebugCommand)
     .recommendCommands()
     .demandCommand(1)
     .strict()
@@ -30,6 +44,6 @@ yarg
     .help("h")
     .alias("h", "help")
     .version(packageJson.version)
-    .wrap(Math.min(100, yarg.terminalWidth()))
+    .wrap(Math.min(130, yarg.terminalWidth()))
     .parse();
 //# sourceMappingURL=cli.js.map

package/dist/cli/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,sDAAsD;AACtD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAC,oBAAoB,EAAC,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAC;AAEtD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/D,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;AAEtF,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AAE1C,IAAI;KACC,UAAU,CAAC,UAAU,CAAC;KACtB,KAAK,CAAC,+BAA+B,CAAC;KACtC,OAAO,CAAC,eAAe,CAAC;KACxB,OAAO,CAAC,YAAY,CAAC;KACrB,OAAO,CAAC,YAAY,CAAC;KACrB,OAAO,CAAC,WAAW,CAAC;KACpB,OAAO,CAAC,oBAAoB,CAAC;KAC7B,iBAAiB,EAAE;KACnB,aAAa,CAAC,CAAC,CAAC;KAChB,MAAM,EAAE;KACR,cAAc,EAAE;KAChB,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC;KACrB,IAAI,CAAC,GAAG,CAAC;KACT,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;KAClB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;KAC5B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;KACzC,KAAK,EAAE,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAE,qBAAqB,EAAC,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAC,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAChD,OAAO,EAAC,gCAAgC,EAAC,MAAM,6CAA6C,CAAC;AAC7F,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAC,eAAe,EAAC,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAC,cAAc,EAAC,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAC,oBAAoB,EAAC,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAExD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/D,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;AAEtF,mBAAmB,CAAC,IAAI,CAAC,CAAC;AAE1B,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;AAE1C,IAAI;KACC,UAAU,CAAC,UAAU,CAAC;KACtB,KAAK,CAAC,gCAAgC,CAAC,+BAA+B,EAAE,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACzG,OAAO,CAAC,WAAW,CAAC;KACpB,OAAO,CAAC,WAAW,CAAC;KACpB,OAAO,CAAC,WAAW,CAAC;KACpB,OAAO,CAAC,eAAe,CAAC;KACxB,OAAO,CAAC,eAAe,CAAC;KACxB,OAAO,CAAC,aAAa,CAAC;KACtB,OAAO,CAAC,cAAc,CAAC;KACvB,OAAO,CAAC,YAAY,CAAC;KACrB,OAAO,CAAC,YAAY,CAAC;KACrB,OAAO,CAAC,oBAAoB,CAAC;KAC7B,OAAO,CAAC,YAAY,CAAC;KACrB,iBAAiB,EAAE;KACnB,aAAa,CAAC,CAAC,CAAC;KAChB,MAAM,EAAE;KACR,cAAc,EAAE;KAChB,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC;KACrB,IAAI,CAAC,GAAG,CAAC;KACT,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;KAClB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;KAC5B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;KACzC,KAAK,EAAE,CAAC"}

package/dist/cli/commands/BuildCommand.d.ts

@@ -1,10 +1,12 @@
+import process from "process";
 import { CommandModule } from "yargs";
+import { BuildGpu } from "../../bindings/types.js";
 type BuildCommand = {
-    arch?: string;
+    arch?: typeof process.arch;
     nodeTarget?: string;
-    metal?: boolean;
-    cuda?: boolean;
+    gpu?: BuildGpu | "auto";
+    noUsageExample?: boolean;
 };
 export declare const BuildCommand: CommandModule<object, BuildCommand>;
-export declare function BuildLlamaCppCommand({ arch, nodeTarget, metal, cuda }: BuildCommand): Promise<void>;
+export declare function BuildLlamaCppCommand({ arch, nodeTarget, gpu, noUsageExample, noCustomCmakeBuildOptionsInBinaryFolderName }: BuildCommand): Promise<void>;
 export {};

package/dist/cli/commands/BuildCommand.js

@@ -1,73 +1,135 @@
 import process from "process";
 import chalk from "chalk";
-import fs from "fs-extra";
-import { compileLlamaCpp } from "../../utils/compileLLamaCpp.js";
+import { compileLlamaCpp } from "../../bindings/utils/compileLLamaCpp.js";
 import withOra from "../../utils/withOra.js";
 import { clearTempFolder } from "../../utils/clearTempFolder.js";
-import { defaultLlamaCppCudaSupport, defaultLlamaCppMetalSupport, llamaCppDirectory } from "../../config.js";
+import { builtinLlamaCppGitHubRepo, builtinLlamaCppRelease, isCI, defaultLlamaCppGpuSupport, documentationPageUrls } from "../../config.js";
 import { downloadCmakeIfNeeded } from "../../utils/cmake.js";
 import withStatusLogs from "../../utils/withStatusLogs.js";
-import { getIsInDocumentationMode } from "../../state.js";
+import { logBinaryUsageExampleToConsole } from "../../bindings/utils/logBinaryUsageExampleToConsole.js";
+import { getPlatform } from "../../bindings/utils/getPlatform.js";
+import { resolveCustomCmakeOptions } from "../../bindings/utils/resolveCustomCmakeOptions.js";
+import { getClonedLlamaCppRepoReleaseInfo, isLlamaCppRepoCloned } from "../../bindings/utils/cloneLlamaCppRepo.js";
+import { nodeLlamaCppGpuOptions, parseNodeLlamaCppGpuOption } from "../../bindings/types.js";
+import { logUsedGpuTypeOption } from "../utils/logUsedGpuTypeOption.js";
+import { getGpuTypesToUseForOption } from "../../bindings/utils/getGpuTypesToUseForOption.js";
+import { getConsoleLogPrefix } from "../../utils/getConsoleLogPrefix.js";
+import { getPrettyBuildGpuName } from "../../bindings/consts.js";
+import { getPlatformInfo } from "../../bindings/utils/getPlatformInfo.js";
+import { withCliCommandDescriptionDocsUrl } from "../utils/withCliCommandDescriptionDocsUrl.js";
 export const BuildCommand = {
     command: "build",
-    describe: "Compile the currently downloaded llama.cpp",
+    aliases: ["compile"],
+    describe: withCliCommandDescriptionDocsUrl("Compile the currently downloaded `llama.cpp` source code", documentationPageUrls.CLI.Build),
     builder(yargs) {
-        const isInDocumentationMode = getIsInDocumentationMode();
         return yargs
             .option("arch", {
             alias: "a",
             type: "string",
+            coerce: (value) => value,
             description: "The architecture to compile llama.cpp for"
         })
             .option("nodeTarget", {
             alias: "t",
             type: "string",
-            description: "The Node.js version to compile llama.cpp for. Example: v18.0.0"
+            description: "The Node.js version to compile llama.cpp for. Example: `v18.0.0`"
         })
-            .option("metal", {
+            .option("gpu", {
+            type: "string",
+            default: defaultLlamaCppGpuSupport,
+            // yargs types don't support passing `false` as a choice, although it is supported by yargs
+            choices: nodeLlamaCppGpuOptions,
+            coerce: parseNodeLlamaCppGpuOption,
+            description: "Compute layer implementation type to use for llama.cpp"
+        })
+            .option("noUsageExample", {
+            alias: "nu",
             type: "boolean",
-            default: defaultLlamaCppMetalSupport || isInDocumentationMode,
-            description: "Compile llama.cpp with Metal support. Enabled by default on macOS. Can be disabled with \"--no-metal\". Can also be set via the NODE_LLAMA_CPP_METAL environment variable"
+            default: false,
+            description: "Don't print code usage example after building"
         })
-            .option("cuda", {
+            .option("noCustomCmakeBuildOptionsInBinaryFolderName", {
             type: "boolean",
-            default: defaultLlamaCppCudaSupport,
-            description: "Compile llama.cpp with CUDA support. Can also be set via the NODE_LLAMA_CPP_CUDA environment variable"
+            hidden: true,
+            default: false,
+            description: "Don't include custom CMake build options in build folder name"
         });
     },
     handler: BuildLlamaCppCommand
 };
-export async function BuildLlamaCppCommand({ arch = undefined, nodeTarget = undefined, metal = defaultLlamaCppMetalSupport, cuda = defaultLlamaCppCudaSupport }) {
-    if (!(await fs.pathExists(llamaCppDirectory))) {
+export async function BuildLlamaCppCommand({ arch = undefined, nodeTarget = undefined, gpu = defaultLlamaCppGpuSupport, noUsageExample = false, noCustomCmakeBuildOptionsInBinaryFolderName = false }) {
+    if (!(await isLlamaCppRepoCloned())) {
         console.log(chalk.red('llama.cpp is not downloaded. Please run "node-llama-cpp download" first'));
         process.exit(1);
     }
-    if (metal && process.platform === "darwin") {
-        console.log(`${chalk.yellow("Metal:")} enabled`);
-    }
-    if (cuda) {
-        console.log(`${chalk.yellow("CUDA:")} enabled`);
-    }
-    await downloadCmakeIfNeeded(true);
-    await withStatusLogs({
-        loading: chalk.blue("Compiling llama.cpp"),
-        success: chalk.blue("Compiled llama.cpp"),
-        fail: chalk.blue("Failed to compile llama.cpp")
-    }, async () => {
-        await compileLlamaCpp({
-            arch: arch ? arch : undefined,
-            nodeTarget: nodeTarget ? nodeTarget : undefined,
-            setUsedBinFlag: true,
-            metal,
-            cuda
+    const includeBuildOptionsInBinaryFolderName = !noCustomCmakeBuildOptionsInBinaryFolderName || !isCI;
+    const clonedLlamaCppRepoReleaseInfo = await getClonedLlamaCppRepoReleaseInfo();
+    const platform = getPlatform();
+    const platformInfo = await getPlatformInfo();
+    const customCmakeOptions = resolveCustomCmakeOptions();
+    const buildGpusToTry = await getGpuTypesToUseForOption(gpu, { platform, arch });
+    let downloadedCmake = false;
+    for (let i = 0; i < buildGpusToTry.length; i++) {
+        const gpuToTry = buildGpusToTry[i];
+        const isLastItem = i === buildGpusToTry.length - 1;
+        logUsedGpuTypeOption(gpuToTry);
+        if (!downloadedCmake) {
+            await downloadCmakeIfNeeded(true);
+            downloadedCmake = true;
+        }
+        const buildOptions = {
+            customCmakeOptions,
+            progressLogs: true,
+            platform,
+            platformInfo,
+            arch: arch
+                ? arch
+                : process.arch,
+            gpu: gpuToTry,
+            llamaCpp: {
+                repo: clonedLlamaCppRepoReleaseInfo?.llamaCppGithubRepo ?? builtinLlamaCppGitHubRepo,
+                release: clonedLlamaCppRepoReleaseInfo?.tag ?? builtinLlamaCppRelease
+            }
+        };
+        try {
+            await withStatusLogs({
+                loading: chalk.blue("Compiling llama.cpp"),
+                success: chalk.blue("Compiled llama.cpp"),
+                fail: chalk.blue("Failed to compile llama.cpp")
+            }, async () => {
+                await compileLlamaCpp(buildOptions, {
+                    nodeTarget: nodeTarget ? nodeTarget : undefined,
+                    updateLastBuildInfo: true,
+                    downloadCmakeIfNeeded: false,
+                    ensureLlamaCppRepoIsCloned: false,
+                    includeBuildOptionsInBinaryFolderName
+                });
+            });
+        }
+        catch (err) {
+            console.error(getConsoleLogPrefix() +
+                `Failed to build llama.cpp with ${getPrettyBuildGpuName(gpuToTry)} support. ` +
+                (!isLastItem
+                    ? `falling back to building llama.cpp with ${getPrettyBuildGpuName(buildGpusToTry[i + 1])} support. `
+                    : "") +
+                "Error:", err);
+            if (isLastItem)
+                throw err;
+            continue;
+        }
+        await withOra({
+            loading: chalk.blue("Removing temporary files"),
+            success: chalk.blue("Removed temporary files"),
+            fail: chalk.blue("Failed to remove temporary files")
+        }, async () => {
+            await clearTempFolder();
         });
-    });
-    await withOra({
-        loading: chalk.blue("Removing temporary files"),
-        success: chalk.blue("Removed temporary files"),
-        fail: chalk.blue("Failed to remove temporary files")
-    }, async () => {
-        await clearTempFolder();
-    });
+        if (!noUsageExample) {
+            console.log();
+            logBinaryUsageExampleToConsole(buildOptions, gpu !== "auto", true);
+            console.log();
+        }
+        break;
+    }
 }
 //# sourceMappingURL=BuildCommand.js.map

package/dist/cli/commands/BuildCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"BuildCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/BuildCommand.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BuildCommand.js","sourceRoot":"","sources":["../../../src/cli/commands/BuildCommand.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/ChatCommand.d.ts

@@ -1,17 +1,26 @@
 import { CommandModule } from "yargs";
-import type { LlamaGrammar } from "../../llamaEvaluator/LlamaGrammar.js";
-declare const modelWrappers: readonly ["auto", "general", "llamaChat", "alpacaChat", "functionary", "chatML", "falconChat"];
+import { LlamaGrammar } from "../../evaluator/LlamaGrammar.js";
+import { BuildGpu } from "../../bindings/types.js";
+import { SpecializedChatWrapperTypeName } from "../../chatWrappers/utils/resolveChatWrapper.js";
 type ChatCommand = {
-    model: string;
+    modelPath?: string;
+    header?: string[];
+    gpu?: BuildGpu | "auto";
     systemInfo: boolean;
     systemPrompt: string;
+    systemPromptFile?: string;
     prompt?: string;
-    wrapper: (typeof modelWrappers)[number];
-    contextSize: number;
-    grammar: "text" | Parameters<typeof LlamaGrammar.getFor>[0];
+    promptFile?: string;
+    wrapper: SpecializedChatWrapperTypeName | "auto";
+    noJinja?: boolean;
+    contextSize?: number;
+    batchSize?: number;
+    noTrimWhitespace: boolean;
+    grammar: "text" | Parameters<typeof LlamaGrammar.getFor>[1];
     jsonSchemaGrammarFile?: string;
     threads: number;
     temperature: number;
+    minP: number;
     topK: number;
     topP: number;
     gpuLayers?: number;
@@ -23,6 +32,9 @@ type ChatCommand = {
     maxTokens: number;
     noHistory: boolean;
     environmentFunctions: boolean;
+    debug: boolean;
+    meter: boolean;
+    printTimings: boolean;
 };
 export declare const ChatCommand: CommandModule<object, ChatCommand>;
 export {};