@storyteller-platform/ghost-story 0.1.5 → 0.1.6

package/dist/cli/bin.cjs

@@ -24,6 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var import_zli = require("@robingenz/zli");
 var import_cli_progress = require("cli-progress");
+var import_fs_extra = require("fs-extra");
 var import_zod = require("zod");
 var import_config = require("./config.cjs");
 var import_install = require("./install.cjs");
@@ -194,7 +195,16 @@ const transcribeCommand = (0, import_zli.defineCommand)({
       import_cli_progress.Presets.shades_classic
     );
     try {
-      const [inputPath] = args;
+      let [inputPath] = args;
+      const path = await import("node:path");
+      inputPath = path.resolve(process.cwd(), inputPath);
+      let outputPath = options.output ? path.resolve(process.cwd(), options.output) : void 0;
+      if (outputPath && !path.extname(outputPath)) {
+        outputPath = `${outputPath}.json`;
+      }
+      if (outputPath) {
+        (0, import_fs_extra.ensureDirSync)(path.dirname(outputPath));
+      }
       const result = await recognize(inputPath, {
         engine: options.engine,
         language: options.language,
@@ -219,14 +229,14 @@ const transcribeCommand = (0, import_zli.defineCommand)({
           }
         }
       });
-      if (!options.output) {
+      if (!outputPath) {
         console.log(JSON.stringify(result, null, 2));
         return;
       }
       const { writeFile } = await import("node:fs/promises");
-      await writeFile(options.output, JSON.stringify(result, null, 2));
+      await writeFile(outputPath, JSON.stringify(result, null, 2));
       console.log(`
-Transcription written to ${options.output}`);
+Transcription written to ${outputPath}`);
     } finally {
       if (!options.noProgress) {
         progressBar.stop();

package/dist/cli/bin.js

@@ -6,6 +6,7 @@ import {
   processConfig
 } from "@robingenz/zli";
 import { Presets, SingleBar } from "cli-progress";
+import { ensureDirSync } from "fs-extra";
 import { z } from "zod";
 import {
   BUILD_VARIANTS,
@@ -193,7 +194,16 @@ const transcribeCommand = defineCommand({
       Presets.shades_classic
     );
     try {
-      const [inputPath] = args;
+      let [inputPath] = args;
+      const path = await import("node:path");
+      inputPath = path.resolve(process.cwd(), inputPath);
+      let outputPath = options.output ? path.resolve(process.cwd(), options.output) : void 0;
+      if (outputPath && !path.extname(outputPath)) {
+        outputPath = `${outputPath}.json`;
+      }
+      if (outputPath) {
+        ensureDirSync(path.dirname(outputPath));
+      }
       const result = await recognize(inputPath, {
         engine: options.engine,
         language: options.language,
@@ -218,14 +228,14 @@ const transcribeCommand = defineCommand({
           }
         }
       });
-      if (!options.output) {
+      if (!outputPath) {
         console.log(JSON.stringify(result, null, 2));
         return;
       }
       const { writeFile } = await import("node:fs/promises");
-      await writeFile(options.output, JSON.stringify(result, null, 2));
+      await writeFile(outputPath, JSON.stringify(result, null, 2));
       console.log(`
-Transcription written to ${options.output}`);
+Transcription written to ${outputPath}`);
     } finally {
       if (!options.noProgress) {
         progressBar.stop();

package/dist/cli/install.cjs

@@ -43,6 +43,8 @@ var import_node_os = __toESM(require("node:os"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_promises2 = require("node:stream/promises");
 var import_node_zlib = require("node:zlib");
+var import_chalk = __toESM(require("chalk"), 1);
+var import_cli_progress = require("cli-progress");
 var import_tar = require("tar");
 var import_config = require("./config.cjs");
 async function downloadFile(options) {
@@ -68,9 +70,27 @@ async function downloadFile(options) {
   }
   await (0, import_promises.mkdir)(import_node_path.default.dirname(destPath), { recursive: true });
   const fileStream = (0, import_node_fs.createWriteStream)(destPath);
+  const progressBar = new import_cli_progress.SingleBar(
+    {
+      etaBuffer: 2,
+      hideCursor: null,
+      noTTYOutput: !process.stderr.isTTY,
+      autopadding: true,
+      format: `${import_chalk.default.yellow("{bar}")} | {percentage}% | {current}/{sum} MB | ({speed} MB/s)`
+    },
+    import_cli_progress.Presets.shades_classic
+  );
   const reader = response.body.getReader();
   let downloaded = 0;
-  let lastPrinted = 0;
+  let lastTime = Date.now();
+  let lastDownloaded = 0;
+  if (printOutput) {
+    progressBar.start(totalSize, 0, {
+      current: "0 MB",
+      sum: `${(totalSize / 1024 / 1024).toFixed(2)} MB`,
+      speed: 0
+    });
+  }
   try {
     while (true) {
       const { done, value } = await reader.read();
@@ -81,18 +101,25 @@ async function downloadFile(options) {
       fileStream.write(value);
       onProgress == null ? void 0 : onProgress(downloaded, totalSize);
       if (printOutput && totalSize > 0) {
-        const shouldPrint = downloaded - lastPrinted > 10 * 1024 * 1024 || downloaded === totalSize;
+        const deltaTime = Date.now() - lastTime;
+        const shouldPrint = deltaTime > 1e3 || downloaded === totalSize;
         if (shouldPrint) {
-          const percent = (downloaded / totalSize * 100).toFixed(1);
-          console.log(
-            `  ${(downloaded / 1024 / 1024).toFixed(1)} MB / ${(totalSize / 1024 / 1024).toFixed(1)} MB (${percent}%)`
-          );
-          lastPrinted = downloaded;
+          const speed = (downloaded - lastDownloaded) / 1024 / 1024 / (deltaTime / 1e3);
+          lastTime = Date.now();
+          lastDownloaded = downloaded;
+          progressBar.update(downloaded, {
+            current: (downloaded / 1024 / 1024).toFixed(2),
+            sum: (totalSize / 1024 / 1024).toFixed(2),
+            speed: speed.toFixed(2)
+          });
         }
       }
     }
   } finally {
     fileStream.end();
+    if (printOutput) {
+      progressBar.stop();
+    }
   }
   await new Promise((resolve, reject) => {
     fileStream.on("finish", resolve);

package/dist/cli/install.js

@@ -9,6 +9,8 @@ import os from "node:os";
 import path from "node:path";
 import { pipeline } from "node:stream/promises";
 import { createGunzip } from "node:zlib";
+import chalk from "chalk";
+import { Presets, SingleBar } from "cli-progress";
 import { extract } from "tar";
 import {
   MODEL_SIZES,
@@ -52,9 +54,27 @@ async function downloadFile(options) {
   }
   await mkdir(path.dirname(destPath), { recursive: true });
   const fileStream = createWriteStream(destPath);
+  const progressBar = new SingleBar(
+    {
+      etaBuffer: 2,
+      hideCursor: null,
+      noTTYOutput: !process.stderr.isTTY,
+      autopadding: true,
+      format: `${chalk.yellow("{bar}")} | {percentage}% | {current}/{sum} MB | ({speed} MB/s)`
+    },
+    Presets.shades_classic
+  );
   const reader = response.body.getReader();
   let downloaded = 0;
-  let lastPrinted = 0;
+  let lastTime = Date.now();
+  let lastDownloaded = 0;
+  if (printOutput) {
+    progressBar.start(totalSize, 0, {
+      current: "0 MB",
+      sum: `${(totalSize / 1024 / 1024).toFixed(2)} MB`,
+      speed: 0
+    });
+  }
   try {
     while (true) {
       const { done, value } = await reader.read();
@@ -65,18 +85,25 @@ async function downloadFile(options) {
       fileStream.write(value);
       onProgress == null ? void 0 : onProgress(downloaded, totalSize);
       if (printOutput && totalSize > 0) {
-        const shouldPrint = downloaded - lastPrinted > 10 * 1024 * 1024 || downloaded === totalSize;
+        const deltaTime = Date.now() - lastTime;
+        const shouldPrint = deltaTime > 1e3 || downloaded === totalSize;
         if (shouldPrint) {
-          const percent = (downloaded / totalSize * 100).toFixed(1);
-          console.log(
-            `  ${(downloaded / 1024 / 1024).toFixed(1)} MB / ${(totalSize / 1024 / 1024).toFixed(1)} MB (${percent}%)`
-          );
-          lastPrinted = downloaded;
+          const speed = (downloaded - lastDownloaded) / 1024 / 1024 / (deltaTime / 1e3);
+          lastTime = Date.now();
+          lastDownloaded = downloaded;
+          progressBar.update(downloaded, {
+            current: (downloaded / 1024 / 1024).toFixed(2),
+            sum: (totalSize / 1024 / 1024).toFixed(2),
+            speed: speed.toFixed(2)
+          });
         }
       }
     }
   } finally {
     fileStream.end();
+    if (printOutput) {
+      progressBar.stop();
+    }
   }
   await new Promise((resolve, reject) => {
     fileStream.on("finish", resolve);

package/dist/recognition/WhisperCppSTT.cjs

@@ -319,7 +319,7 @@ function buildTranscribeArgs(options) {
     "--print-progress",
     options.language ? ["--language", options.language.toLowerCase()] : null,
     options.flashAttention ? ["--flash-attn"] : null,
-    options.suppressNonSpeechTokens ? ["--suppress-nst", "--no-prints"] : null,
+    options.suppressNonSpeechTokens ? ["--suppress-nst"] : null,
     ["--processors", String(options.processors)],
     ["--threads", String(options.threads)]
   ];

package/dist/recognition/WhisperCppSTT.js

@@ -298,7 +298,7 @@ function buildTranscribeArgs(options) {
     "--print-progress",
     options.language ? ["--language", options.language.toLowerCase()] : null,
     options.flashAttention ? ["--flash-attn"] : null,
-    options.suppressNonSpeechTokens ? ["--suppress-nst", "--no-prints"] : null,
+    options.suppressNonSpeechTokens ? ["--suppress-nst"] : null,
     ["--processors", String(options.processors)],
     ["--threads", String(options.threads)]
   ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storyteller-platform/ghost-story",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "An easy-to-use speech toolset. Fork of the original echogarden project.",
   "author": "Thomas F. K. Jorna",
   "license": "GPL-3.0",