@remotion/install-whisper-cpp 4.0.270 → 4.0.272

package/dist/install-whisper-cpp.d.ts

@@ -1,4 +1,4 @@
-export declare const getWhisperExecutablePath: (whisperPath: string) => string;
+export declare const getWhisperExecutablePath: (whisperPath: string, whisperCppVersion: string) => string;
 export declare const installWhisperCpp: ({ version, to, printOutput, signal, }: {
     version: string;
     to: string;

package/dist/install-whisper-cpp.js

@@ -33,6 +33,7 @@ const fs_1 = __importStar(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const download_1 = require("./download");
+const utils_1 = require("./utils");
 const getIsSemVer = (str) => {
     return /^[\d]{1}\.[\d]{1,2}\.+/.test(str);
 };
@@ -108,17 +109,24 @@ const installWhisperForUnix = async ({ version, to, printOutput, signal, }) => {
         shell: null,
     });
 };
-const getWhisperExecutablePath = (whisperPath) => {
+const getWhisperExecutablePath = (whisperPath, whisperCppVersion) => {
+    // INFO: 'main.exe' is deprecated.
+    let cppBin = ['main'];
+    let cppFolder = [];
+    if ((0, utils_1.compareVersions)(whisperCppVersion, '1.7.4') >= 0) {
+        cppBin = ['whisper-cli'];
+        cppFolder = ['build', 'bin'];
+    }
     return os_1.default.platform() === 'win32'
-        ? path_1.default.join(path_1.default.resolve(process.cwd(), whisperPath), 'main.exe')
-        : path_1.default.join(path_1.default.resolve(process.cwd(), whisperPath), './main');
+        ? path_1.default.join(path_1.default.resolve(process.cwd(), whisperPath), ...cppFolder, `${cppBin}.exe`)
+        : path_1.default.join(path_1.default.resolve(process.cwd(), whisperPath), ...cppFolder, `./${cppBin}`);
 };
 exports.getWhisperExecutablePath = getWhisperExecutablePath;
 const installWhisperCpp = async ({ version, to, printOutput = true, signal, }) => {
     if ((0, fs_1.existsSync)(to)) {
-        if (!(0, fs_1.existsSync)((0, exports.getWhisperExecutablePath)(to))) {
+        if (!(0, fs_1.existsSync)((0, exports.getWhisperExecutablePath)(to, version))) {
             if (printOutput) {
-                throw new Error(`Whisper folder ${to} exists but the executable (${(0, exports.getWhisperExecutablePath)(to)}) is missing. Delete ${to} and try again.`);
+                throw new Error(`Whisper folder ${to} exists but the executable (${(0, exports.getWhisperExecutablePath)(to, version)}) is missing. Delete ${to} and try again.`);
             }
             return Promise.resolve({ alreadyExisted: false });
         }
@@ -137,7 +145,12 @@ const installWhisperCpp = async ({ version, to, printOutput = true, signal, }) =
         return Promise.resolve({ alreadyExisted: false });
     }
     if (process.platform === 'win32') {
-        await installForWindows({ version, to, printOutput, signal: signal !== null && signal !== void 0 ? signal : null });
+        await installForWindows({
+            version,
+            to,
+            printOutput,
+            signal: signal !== null && signal !== void 0 ? signal : null,
+        });
         return Promise.resolve({ alreadyExisted: false });
     }
     throw new Error(`Unsupported platform: ${process.platform}`);

package/dist/transcribe.d.ts

@@ -60,9 +60,10 @@ export type TranscriptionJson<WithTokenLevelTimestamp extends boolean> = {
 };
 export type TranscribeOnProgress = (progress: number) => void;
 export declare const modelToDtw: (model: WhisperModel) => string;
-export declare const transcribe: <HasTokenLevelTimestamps extends boolean>({ inputPath, whisperPath, model, modelFolder, translateToEnglish, tokenLevelTimestamps, printOutput, tokensPerItem, language, splitOnWord, signal, onProgress, }: {
+export declare const transcribe: <HasTokenLevelTimestamps extends boolean>({ inputPath, whisperPath, whisperCppVersion, model, modelFolder, translateToEnglish, tokenLevelTimestamps, printOutput, tokensPerItem, language, splitOnWord, signal, onProgress, }: {
     inputPath: string;
     whisperPath: string;
+    whisperCppVersion: string;
     model: WhisperModel;
     tokenLevelTimestamps: HasTokenLevelTimestamps;
     modelFolder?: string;

package/dist/transcribe.js

@@ -61,12 +61,12 @@ const modelToDtw = (model) => {
     return model;
 };
 exports.modelToDtw = modelToDtw;
-const transcribeToTemporaryFile = async ({ fileToTranscribe, whisperPath, model, tmpJSONPath, modelFolder, translate, tokenLevelTimestamps, printOutput, tokensPerItem, language, splitOnWord, signal, onProgress, }) => {
+const transcribeToTemporaryFile = async ({ fileToTranscribe, whisperPath, whisperCppVersion, model, tmpJSONPath, modelFolder, translate, tokenLevelTimestamps, printOutput, tokensPerItem, language, splitOnWord, signal, onProgress, }) => {
     const modelPath = (0, download_whisper_model_1.getModelPath)(modelFolder !== null && modelFolder !== void 0 ? modelFolder : whisperPath, model);
     if (!node_fs_1.default.existsSync(modelPath)) {
         throw new Error(`Error: Model ${model} does not exist at ${modelFolder ? modelFolder : modelPath}. Check out the downloadWhisperModel() API at https://www.remotion.dev/docs/install-whisper-cpp/download-whisper-model to see how to install whisper models`);
     }
-    const executable = (0, install_whisper_cpp_1.getWhisperExecutablePath)(whisperPath);
+    const executable = (0, install_whisper_cpp_1.getWhisperExecutablePath)(whisperPath, whisperCppVersion);
     const args = [
         '-f',
         fileToTranscribe,
@@ -141,7 +141,7 @@ const transcribeToTemporaryFile = async ({ fileToTranscribe, whisperPath, model,
     });
     return { outputPath };
 };
-const transcribe = async ({ inputPath, whisperPath, model, modelFolder, translateToEnglish = false, tokenLevelTimestamps, printOutput = true, tokensPerItem, language, splitOnWord, signal, onProgress, }) => {
+const transcribe = async ({ inputPath, whisperPath, whisperCppVersion, model, modelFolder, translateToEnglish = false, tokenLevelTimestamps, printOutput = true, tokensPerItem, language, splitOnWord, signal, onProgress, }) => {
     if (!(0, node_fs_1.existsSync)(whisperPath)) {
         throw new Error(`Whisper does not exist at ${whisperPath}. Double-check the passed whisperPath. If you havent installed whisper, check out the installWhisperCpp() API at https://www.remotion.dev/docs/install-whisper-cpp/install-whisper-cpp to see how to install whisper programatically.`);
     }
@@ -155,6 +155,7 @@ const transcribe = async ({ inputPath, whisperPath, model, modelFolder, translat
     const { outputPath: tmpJSONPath } = await transcribeToTemporaryFile({
         fileToTranscribe: inputPath,
         whisperPath,
+        whisperCppVersion,
         model,
         tmpJSONPath: tmpJSONDir,
         modelFolder: modelFolder !== null && modelFolder !== void 0 ? modelFolder : null,

package/dist/utils.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Compares two version strings.
+ *
+ * @param version1 - The first version string.
+ * @param version2 - The second version string.
+ * @returns 1 if version1 > version2, -1 if version1 < version2, 0 if they are equal.
+ * @throws {Error} If either version is not a valid string or has an invalid format.
+ */
+export declare function compareVersions(version1: string, version2: string): number;

package/dist/utils.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compareVersions = compareVersions;
+/**
+ * Compares two version strings.
+ *
+ * @param version1 - The first version string.
+ * @param version2 - The second version string.
+ * @returns 1 if version1 > version2, -1 if version1 < version2, 0 if they are equal.
+ * @throws {Error} If either version is not a valid string or has an invalid format.
+ */
+function compareVersions(version1, version2) {
+    const parseVersion = (version) => {
+        const parts = version.split('.').map((part) => Number(part));
+        if (parts.some(isNaN)) {
+            throw new Error('Invalid version format. Expected x.x.x');
+        }
+        return parts;
+    };
+    if (typeof version1 !== 'string' || typeof version2 !== 'string') {
+        throw new Error('Both inputs should be strings. Expected x.x.x');
+    }
+    const v1Parts = parseVersion(version1);
+    const v2Parts = parseVersion(version2);
+    // Ensure both versions have the same number of parts
+    const maxLength = Math.max(v1Parts.length, v2Parts.length);
+    while (v1Parts.length < maxLength)
+        v1Parts.push(0);
+    while (v2Parts.length < maxLength)
+        v2Parts.push(0);
+    for (let i = 0; i < maxLength; i++) {
+        if (v1Parts[i] > v2Parts[i])
+            return 1; // Version1 is greater
+        if (v1Parts[i] < v2Parts[i])
+            return -1; // Version2 is greater
+    }
+    return 0; // Versions are equal
+}

package/package.json

@@ -3,7 +3,7 @@
     "url": "https://github.com/remotion-dev/remotion/tree/main/packages/install-whisper-cpp"
   },
   "name": "@remotion/install-whisper-cpp",
-  "version": "4.0.270",
+  "version": "4.0.272",
   "description": "Helpers for installing and using Whisper.cpp",
   "main": "dist/index.js",
   "sideEffects": false,
@@ -16,12 +16,12 @@
   "author": "Jonny Burger <jonny@remotion.dev>",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "@remotion/captions": "4.0.270"
+    "@remotion/captions": "4.0.272"
   },
   "peerDependencies": {},
   "devDependencies": {
     "eslint": "9.19.0",
-    "@remotion/eslint-config-internal": "4.0.270"
+    "@remotion/eslint-config-internal": "4.0.272"
   },
   "keywords": [
     "remotion",