mulmocast 2.3.0 → 2.3.1

package/lib/actions/audio.js

@@ -5,7 +5,7 @@ import { fileWriteAgent } from "@graphai/vanilla_node_agents";
 import { ttsOpenaiAgent, ttsGoogleAgent, ttsGeminiAgent, ttsElevenlabsAgent, ttsKotodamaAgent, addBGMAgent, combineAudioFilesAgent, mediaMockAgent, } from "../agents/index.js";
 import { text2SpeechProviderSchema } from "../types/index.js";
 import { fileCacheAgentFilter } from "../utils/filters.js";
-import { getAudioArtifactFilePath, getAudioFilePath, getOutputStudioFilePath, resolveDirPath, defaultBGMPath, mkdir, writingMessage } from "../utils/file.js";
+import { getAudioArtifactFilePath, getAudioFilePath, getGroupedAudioFilePath, getOutputStudioFilePath, resolveDirPath, defaultBGMPath, mkdir, writingMessage, } from "../utils/file.js";
 import { localizedText, settings2GraphAIConfig } from "../utils/utils.js";
 import { text2hash } from "../utils/utils_node.js";
 import { provider2TTSAgent } from "../types/provider2agent.js";
@@ -43,7 +43,9 @@ export const getBeatAudioPathOrUrl = (text, context, beat, lang) => {
     ].join(":");
     GraphAILogger.log(`getBeatAudioPathOrUrl [${hash_string}]`);
     const audioFileName = `${context.studio.filename}_${text2hash(hash_string)}`;
-    const maybeAudioFile = getAudioFilePath(audioDirPath, context.studio.filename, audioFileName, lang);
+    const maybeAudioFile = context.fileDirs.grouped
+        ? getGroupedAudioFilePath(audioDirPath, audioFileName, lang)
+        : getAudioFilePath(audioDirPath, context.studio.filename, audioFileName, lang);
     return getAudioPathOrUrl(context, beat, maybeAudioFile);
 };
 // for lipSync
@@ -241,7 +243,7 @@ export const generateBeatAudio = async (index, context, args) => {
         const fileName = MulmoStudioContextMethods.getFileName(context);
         const audioDirPath = MulmoStudioContextMethods.getAudioDirPath(context);
         const outDirPath = MulmoStudioContextMethods.getOutDirPath(context);
-        const audioSegmentDirPath = resolveDirPath(audioDirPath, fileName);
+        const audioSegmentDirPath = context.fileDirs.grouped ? audioDirPath : resolveDirPath(audioDirPath, fileName);
         mkdir(outDirPath);
         mkdir(audioSegmentDirPath);
         const config = settings2GraphAIConfig(settings);
@@ -279,8 +281,10 @@ export const audio = async (context, args) => {
         const audioDirPath = MulmoStudioContextMethods.getAudioDirPath(context);
         const outDirPath = MulmoStudioContextMethods.getOutDirPath(context);
         const audioArtifactFilePath = getAudioArtifactFilePath(context);
-        const audioSegmentDirPath = resolveDirPath(audioDirPath, fileName);
-        const audioCombinedFilePath = getAudioFilePath(audioDirPath, fileName, fileName, context.lang);
+        const audioSegmentDirPath = context.fileDirs.grouped ? audioDirPath : resolveDirPath(audioDirPath, fileName);
+        const audioCombinedFilePath = context.fileDirs.grouped
+            ? getGroupedAudioFilePath(audioDirPath, fileName, context.lang)
+            : getAudioFilePath(audioDirPath, fileName, fileName, context.lang);
         const outputStudioFilePath = getOutputStudioFilePath(outDirPath, fileName);
         mkdir(outDirPath);
         mkdir(audioSegmentDirPath);

package/lib/actions/bundle.js

@@ -61,8 +61,8 @@ export const mulmoViewerBundle = async (context, options = {}) => {
     const baseDir = context.fileDirs.baseDirPath;
     const filename = context.studio.filename;
     mkdir(outDir);
-    // Bundle directory: output/<script_name>/
-    const bundleDir = path.resolve(outDir, filename);
+    // Bundle directory: when grouped, outDir is already output/<script_name>/
+    const bundleDir = context.fileDirs.grouped ? outDir : path.resolve(outDir, filename);
     mkdir(bundleDir);
     const zipper = skipZip ? undefined : new ZipBuilder(path.resolve(bundleDir, zipFileName));
     // text

package/lib/actions/image_agents.js

@@ -1,6 +1,6 @@
 import { GraphAILogger } from "graphai";
 import { MulmoPresentationStyleMethods, MulmoStudioContextMethods, MulmoBeatMethods, MulmoMediaSourceMethods } from "../methods/index.js";
-import { getBeatPngImagePath, getBeatMoviePaths, getAudioFilePath } from "../utils/file.js";
+import { getBeatPngImagePath, getBeatMoviePaths, getAudioFilePath, getGroupedAudioFilePath } from "../utils/file.js";
 import { imagePrompt, htmlImageSystemPrompt } from "../utils/prompt.js";
 import { renderHTMLToImage } from "../utils/html_render.js";
 import { beatId } from "../utils/utils.js";
@@ -54,8 +54,10 @@ export const imagePreprocessAgent = async (namedInputs) => {
             returnValue.bgmFile = MulmoMediaSourceMethods.resolve(context.studio.script.audioParams.bgm, context);
             const folderName = MulmoStudioContextMethods.getFileName(context);
             const audioDirPath = MulmoStudioContextMethods.getAudioDirPath(context);
-            const fileName = `${beatId(beat.id, index)}_trimmed.mp3`;
-            returnValue.audioFile = getAudioFilePath(audioDirPath, folderName, fileName);
+            const trimmedName = `${beatId(beat.id, index)}_trimmed`;
+            returnValue.audioFile = context.fileDirs.grouped
+                ? getGroupedAudioFilePath(audioDirPath, trimmedName)
+                : getAudioFilePath(audioDirPath, folderName, trimmedName);
         }
         else {
             // Audio file will be set from the beat's audio file when available

package/lib/cli/commands/audio/builder.d.ts

@@ -7,6 +7,8 @@ export declare const builder: (yargs: Argv) => Argv<{
     l: string | undefined;
 } & {
     f: boolean;
+} & {
+    g: boolean;
 } & {
     backup: boolean;
 } & {

package/lib/cli/commands/bundle/builder.d.ts

@@ -7,6 +7,8 @@ export declare const builder: (yargs: Argv) => Argv<{
     l: string | undefined;
 } & {
     f: boolean;
+} & {
+    g: boolean;
 } & {
     backup: boolean;
 } & {

package/lib/cli/commands/html/builder.d.ts

@@ -7,6 +7,8 @@ export declare const builder: (yargs: Argv) => Argv<{
     l: string | undefined;
 } & {
     f: boolean;
+} & {
+    g: boolean;
 } & {
     backup: boolean;
 } & {

package/lib/cli/commands/image/builder.d.ts

@@ -7,6 +7,8 @@ export declare const builder: (yargs: Argv) => Argv<{
     l: string | undefined;
 } & {
     f: boolean;
+} & {
+    g: boolean;
 } & {
     backup: boolean;
 } & {

package/lib/cli/commands/markdown/builder.d.ts

@@ -7,6 +7,8 @@ export declare const builder: (yargs: Argv) => Argv<{
     l: string | undefined;
 } & {
     f: boolean;
+} & {
+    g: boolean;
 } & {
     backup: boolean;
 } & {

package/lib/cli/commands/movie/builder.d.ts

@@ -7,6 +7,8 @@ export declare const builder: (yargs: Argv) => Argv<{
     l: string | undefined;
 } & {
     f: boolean;
+} & {
+    g: boolean;
 } & {
     backup: boolean;
 } & {

package/lib/cli/commands/pdf/builder.d.ts

@@ -7,6 +7,8 @@ export declare const builder: (yargs: Argv) => Argv<{
     l: string | undefined;
 } & {
     f: boolean;
+} & {
+    g: boolean;
 } & {
     backup: boolean;
 } & {

package/lib/cli/commands/translate/builder.d.ts

@@ -7,6 +7,8 @@ export declare const builder: (yargs: Argv) => Argv<import("yargs").Omit<{
     l: string | undefined;
 } & {
     f: boolean;
+} & {
+    g: boolean;
 } & {
     backup: boolean;
 } & {

package/lib/cli/common.d.ts

@@ -7,6 +7,8 @@ export declare const commonOptions: (yargs: Argv) => Argv<{
     l: string | undefined;
 } & {
     f: boolean;
+} & {
+    g: boolean;
 } & {
     backup: boolean;
 } & {

package/lib/cli/common.js

@@ -25,6 +25,12 @@ export const commonOptions = (yargs) => {
         describe: "Force regenerate",
         type: "boolean",
         default: false,
+    })
+        .option("g", {
+        alias: "grouped",
+        describe: "Output all files under output/<basename>/ directory",
+        type: "boolean",
+        default: false,
     })
         .option("backup", {
         describe: "create backup media file",

package/lib/cli/helpers.d.ts

@@ -10,5 +10,6 @@ export declare const getFileObject: (args: {
     presentationStyle?: string;
     file: string;
     nodeModuleRootPath?: string;
+    grouped?: boolean;
 }) => FileObject;
 export declare const initializeContext: (argv: CliArgs<InitOptions>, raiseError?: boolean) => Promise<MulmoStudioContext | null>;

package/lib/cli/helpers.js

@@ -30,9 +30,9 @@ export const setGraphAILogger = (verbose, logValues) => {
     }
 };
 export const getFileObject = (args) => {
-    const { basedir, outdir, imagedir, audiodir, file, presentationStyle, nodeModuleRootPath } = args;
+    const { basedir, outdir, imagedir, audiodir, file, presentationStyle, nodeModuleRootPath, grouped = false } = args;
     const baseDirPath = getBaseDirPath(basedir);
-    const outDirPath = getFullPath(baseDirPath, outdir ?? outDirName);
+    const baseOutDirPath = getFullPath(baseDirPath, outdir ?? outDirName);
     const { fileOrUrl, fileName } = (() => {
         if (file === "__clipboard") {
             // We generate a new unique script file from clipboard text in the output directory
@@ -40,8 +40,8 @@ export const getFileObject = (args) => {
             const clipboardText = clipboardy.readSync();
             const json = JSON.parse(clipboardText);
             const formattedText = JSON.stringify(json, null, 2);
-            const resolvedFilePath = resolveDirPath(outDirPath, `${generatedFileName}.json`);
-            mkdir(outDirPath);
+            const resolvedFilePath = resolveDirPath(baseOutDirPath, `${generatedFileName}.json`);
+            mkdir(baseOutDirPath);
             fs.writeFileSync(resolvedFilePath, formattedText, "utf8");
             return { fileOrUrl: resolvedFilePath, fileName: generatedFileName };
         }
@@ -49,6 +49,7 @@ export const getFileObject = (args) => {
         const parsedFileName = path.parse(resolvedFileOrUrl).name;
         return { fileOrUrl: resolvedFileOrUrl, fileName: parsedFileName };
     })();
+    const outDirPath = grouped ? getFullPath(baseOutDirPath, fileName) : baseOutDirPath;
     const isHttpPath = isHttp(fileOrUrl);
     const mulmoFilePath = isHttpPath ? "" : getFullPath(baseDirPath, fileOrUrl);
     const mulmoFileDirPath = path.dirname(isHttpPath ? baseDirPath : mulmoFilePath);
@@ -71,6 +72,7 @@ export const getFileObject = (args) => {
         presentationStylePath,
         fileName,
         nodeModuleRootPath,
+        grouped,
     };
 };
 export const initializeContext = async (argv, raiseError = false) => {
@@ -81,6 +83,7 @@ export const initializeContext = async (argv, raiseError = false) => {
         audiodir: argv.a,
         presentationStyle: argv.p,
         file: argv.file ?? "",
+        grouped: Boolean(argv.g),
     });
     setGraphAILogger(Boolean(argv.v), { files });
     return await initializeContextFromFiles(files, raiseError, Boolean(argv.f), Boolean(argv.backup), argv.c, argv.l);

package/lib/methods/mulmo_studio_context.js

@@ -44,6 +44,9 @@ export const MulmoStudioContextMethods = {
     },
     getImageProjectDirPath(context) {
         const imageDirPath = MulmoStudioContextMethods.getImageDirPath(context);
+        if (context.fileDirs.grouped) {
+            return imageDirPath;
+        }
         return `${imageDirPath}/${context.studio.filename}`;
     },
     getOutDirPath(context) {

package/lib/types/type.d.ts

@@ -128,6 +128,7 @@ export interface FileObject {
     outputMultilingualFilePath: string;
     presentationStylePath: string | undefined;
     fileName: string;
+    grouped: boolean;
 }
 export type InitOptions = {
     b?: string;
@@ -138,6 +139,7 @@ export type InitOptions = {
     l?: string;
     c?: string;
     p?: string;
+    g?: boolean;
 };
 export type PublicAPIArgs = {
     settings?: Record<string, string>;

package/lib/utils/file.d.ts

@@ -20,7 +20,9 @@ export declare const fetchMulmoScriptFile: (url: string) => Promise<{
 export declare const getOutputStudioFilePath: (outDirPath: string, fileName: string) => string;
 export declare const getOutputMultilingualFilePath: (outDirPath: string, fileName: string) => string;
 export declare const resolveDirPath: (dirPath: string, studioFileName: string) => string;
+export declare const formatAudioFileName: (name: string, lang?: string) => string;
 export declare const getAudioFilePath: (audioDirPath: string, dirName: string, fileName: string, lang?: string) => string;
+export declare const getGroupedAudioFilePath: (audioDirPath: string, fileName: string, lang?: string) => string;
 export declare const getAudioArtifactFilePath: (context: MulmoStudioContext) => string;
 export declare const getOutputVideoFilePath: (outDirPath: string, fileName: string, lang?: string, caption?: string) => string;
 export declare const imageSuffix = "p";

package/lib/utils/file.js

@@ -68,11 +68,15 @@ export const resolveDirPath = (dirPath, studioFileName) => {
     return path.resolve(dirPath, studioFileName);
 };
 // audio
+export const formatAudioFileName = (name, lang) => {
+    const suffix = lang ? `_${lang}` : "";
+    return `${name}${suffix}.mp3`;
+};
 export const getAudioFilePath = (audioDirPath, dirName, fileName, lang) => {
-    if (lang) {
-        return path.resolve(audioDirPath, dirName, `${fileName}_${lang}.mp3`);
-    }
-    return path.resolve(audioDirPath, dirName, fileName + ".mp3");
+    return path.resolve(audioDirPath, dirName, formatAudioFileName(fileName, lang));
+};
+export const getGroupedAudioFilePath = (audioDirPath, fileName, lang) => {
+    return path.resolve(audioDirPath, formatAudioFileName(fileName, lang));
 };
 export const getAudioArtifactFilePath = (context) => {
     const suffix = context.lang ? `_${context.lang}` : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mulmocast",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "",
   "type": "module",
   "main": "lib/index.node.js",