node-llama-cpp 2.7.5 → 3.0.0-beta.1

package/dist/utils/getBuildDefaults.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getBuildDefaults.js","sourceRoot":"","sources":["../../src/utils/getBuildDefaults.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,0BAA0B,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,sBAAsB,EAC7G,MAAM,cAAc,CAAC;AAEtB,MAAM,CAAC,KAAK,UAAU,gBAAgB;IAClC,OAAO;QACH,IAAI,EAAE,yBAAyB;QAC/B,OAAO,EAAE,sBAAsB;QAC/B,YAAY,EAAE,2BAA2B;QACzC,WAAW,EAAE,0BAA0B;KAC1C,CAAC;AACN,CAAC"}

package/dist/utils/getReleaseInfo.d.ts

@@ -0,0 +1,7 @@
+export declare function getReleaseInfo(): Promise<{
+    moduleVersion: string;
+    llamaCpp: {
+        binarySource: string;
+        release: string;
+    };
+}>;

package/dist/utils/getReleaseInfo.js

@@ -0,0 +1,30 @@
+import path from "path";
+import { fileURLToPath } from "url";
+import fs from "fs-extra";
+import { getUsedBinFlag } from "./usedBinFlag.js";
+import { getClonedLlamaCppRepoReleaseTag } from "./cloneLlamaCppRepo.js";
+import { getBinariesGithubRelease } from "./binariesGithubRelease.js";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+export async function getReleaseInfo() {
+    const [usedBinFlag, moduleVersion] = await Promise.all([
+        getUsedBinFlag(),
+        getModuleVersion()
+    ]);
+    const release = usedBinFlag === "prebuiltBinaries"
+        ? await getBinariesGithubRelease()
+        : (await getClonedLlamaCppRepoReleaseTag() ?? await getBinariesGithubRelease());
+    return {
+        llamaCpp: {
+            binarySource: usedBinFlag === "prebuiltBinaries"
+                ? "included"
+                : "builtLocally",
+            release
+        },
+        moduleVersion
+    };
+}
+async function getModuleVersion() {
+    const packageJson = await fs.readJson(path.join(__dirname, "..", "..", "package.json"));
+    return packageJson.version;
+}
+//# sourceMappingURL=getReleaseInfo.js.map

package/dist/utils/getReleaseInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getReleaseInfo.js","sourceRoot":"","sources":["../../src/utils/getReleaseInfo.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,aAAa,EAAC,MAAM,KAAK,CAAC;AAClC,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,+BAA+B,EAAC,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAC,wBAAwB,EAAC,MAAM,4BAA4B,CAAC;AAEpE,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE/D,MAAM,CAAC,KAAK,UAAU,cAAc;IAOhC,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,cAAc,EAAE;QAChB,gBAAgB,EAAE;KACrB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,WAAW,KAAK,kBAAkB;QAC9C,CAAC,CAAC,MAAM,wBAAwB,EAAE;QAClC,CAAC,CAAC,CAAC,MAAM,+BAA+B,EAAE,IAAI,MAAM,wBAAwB,EAAE,CAAC,CAAC;IAEpF,OAAO;QACH,QAAQ,EAAE;YACN,YAAY,EAAE,WAAW,KAAK,kBAAkB;gBAC5C,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,cAAc;YACpB,OAAO;SACV;QACD,aAAa;KAChB,CAAC;AACN,CAAC;AAED,KAAK,UAAU,gBAAgB;IAC3B,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;IAExF,OAAO,WAAW,CAAC,OAAO,CAAC;AAC/B,CAAC"}

package/dist/utils/parseModelFileName.d.ts

@@ -0,0 +1,9 @@
+export declare function parseModelFileName(filename: string): {
+    name: string | undefined;
+    subType: string;
+    quantization: string | undefined;
+    fileType: string | undefined;
+    version: string | undefined;
+    contextSize: string | undefined;
+    parameters: `${number}B` | undefined;
+};

package/dist/utils/parseModelFileName.js

@@ -0,0 +1,68 @@
+export function parseModelFileName(filename) {
+    const parts = filename.split("-");
+    let quantization;
+    let fileType;
+    let version;
+    let contextSize;
+    if (parts.length > 0) {
+        const lastPart = parts[parts.length - 1];
+        const lastParts = lastPart.split(".");
+        fileType = lastParts.pop();
+        quantization = lastParts.pop();
+        if (lastParts.length > 0)
+            parts[parts.length - 1] = lastParts.join(".");
+        else
+            parts.pop();
+    }
+    const { previousParts, parameters, nextParts } = splitByModelParameters(parts);
+    const name = previousParts.shift();
+    for (let i = 0; i < nextParts.length; i++) {
+        const part = nextParts[i];
+        if (isContextSizeText(part)) {
+            contextSize = part.toUpperCase();
+            nextParts.splice(i, 1);
+            i--;
+        }
+        else if (isVersionText(part)) {
+            version = part.toLowerCase();
+            nextParts.splice(i, 1);
+            i--;
+        }
+    }
+    return {
+        name,
+        subType: previousParts.join("-"),
+        quantization,
+        fileType,
+        version,
+        contextSize,
+        parameters
+    };
+}
+function isParametersText(text) {
+    return /^[0-9]+[Bb]$/.test(text);
+}
+function isVersionText(text) {
+    return /^[vV]?[0-9]/.test(text);
+}
+function isContextSizeText(text) {
+    return /^[0-9]+[kKmM]$/.test(text);
+}
+function splitByModelParameters(parts) {
+    for (let i = 0; i < parts.length; i++) {
+        const part = parts[i];
+        if (isParametersText(part)) {
+            return {
+                parameters: part.toUpperCase(),
+                previousParts: parts.slice(0, i),
+                nextParts: parts.slice(i + 1)
+            };
+        }
+    }
+    return {
+        parameters: undefined,
+        previousParts: parts,
+        nextParts: []
+    };
+}
+//# sourceMappingURL=parseModelFileName.js.map

package/dist/utils/parseModelFileName.js.map

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

package/dist/utils/parseModelTypeDescription.d.ts

@@ -0,0 +1,6 @@
+import type { AddonModelArchName, AddonModelFileTypeName, AddonModelTypeName, ModelTypeDescription } from "./getBin.js";
+export declare function parseModelTypeDescription(modelTypeDescription: ModelTypeDescription): {
+    arch: AddonModelArchName;
+    type: AddonModelTypeName;
+    fileType: AddonModelFileTypeName;
+};

package/dist/utils/parseModelTypeDescription.js

@@ -0,0 +1,9 @@
+export function parseModelTypeDescription(modelTypeDescription) {
+    const [arch, type, ...fileTypeParts] = modelTypeDescription.split(" ");
+    return {
+        arch: arch,
+        type: type,
+        fileType: fileTypeParts.join(" ")
+    };
+}
+//# sourceMappingURL=parseModelTypeDescription.js.map

package/dist/utils/parseModelTypeDescription.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parseModelTypeDescription.js","sourceRoot":"","sources":["../../src/utils/parseModelTypeDescription.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,yBAAyB,CAAC,oBAA0C;IAChF,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEvE,OAAO;QACH,IAAI,EAAE,IAA0B;QAChC,IAAI,EAAE,IAA0B;QAChC,QAAQ,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,CAA2B;KAC9D,CAAC;AACN,CAAC"}

package/llama/.clang-format

@@ -1,20 +1,20 @@
 BasedOnStyle: Google
-IndentWidth: 2
+IndentWidth: 4
 UseTab: Never
-TabWidth: 2
-ColumnLimit: 500
+TabWidth: 4
+ColumnLimit: 140
 AllowShortCaseLabelsOnASingleLine: true
-AllowShortFunctionsOnASingleLine: true
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
 AlignTrailingComments: false
 SpaceAfterTemplateKeyword: false
-AllowShortBlocksOnASingleLine: true
+AllowShortBlocksOnASingleLine: false
 MaxEmptyLinesToKeep: 3
 NamespaceIndentation: None
 CommentPragmas: '^[^ ]'
 FixNamespaceComments: false
-AccessModifierOffset: -4
+IndentAccessModifiers: true
 SpaceAfterCStyleCast: false
 PointerAlignment: Left
 IndentCaseLabels: false
@@ -31,6 +31,7 @@ UseCRLF: false
 AllowAllArgumentsOnNextLine: true
 AlignAfterOpenBracket: DontAlign
 PackConstructorInitializers: CurrentLine
+AlignAfterOpenBracket: BlockIndent
 BraceWrapping:
   AfterStruct: false
   AfterClass: false
@@ -43,4 +44,4 @@ BraceWrapping:
   BeforeElse: false
   SplitEmptyFunction: false
   SplitEmptyRecord: false
-  SplitEmptyNamespace: false
+  SplitEmptyNamespace: false