@gentbajko/slopify 2.3.1 → 2.5.0

package/dist/slices/rebuild/runtime-export-edit.js

@@ -0,0 +1,119 @@
+import { readFileSync } from "node:fs";
+import { extname } from "node:path";
+import { z } from "zod";
+import { usesYoutubeDescription } from "../admission/rules.js";
+import { resolveFont } from "../fonts/index.js";
+import { outputPath } from "../storage/layout.js";
+import { headingChapters } from "../video/chapters.js";
+import { sentenceCutPoints } from "../video/cuts.js";
+import { usesChapterCards, usesNarrationCuts, videoEditOf, } from "../video/edit-settings.js";
+import { probeDurationMs } from "../video/ffmpeg.js";
+import { wordsSchema } from "./runtime-subtitles.js";
+// The containers an uploaded clip may come in; anything else in the images is a still.
+const clipExtensions = new Set([".mp4", ".mov", ".m4v", ".webm", ".mkv"]);
+export function isClipPath(path) {
+    return clipExtensions.has(extname(path).toLowerCase());
+}
+export async function exportEdit(deps, context, view, images) {
+    const config = view.revision.config;
+    const order = view.revision.content.imageOrder;
+    const ready = (key) => view.outputs.find((row) => row.workKey === key && row.selected && row.available && row.state === "ready");
+    // Clips: an animated image's clip first, then an uploaded clip in the image's own place.
+    const clips = [];
+    for (const [index, key] of order.entries()) {
+        const animated = ready(`animate:${key}`);
+        const path = animated?.output.role === "animated_image"
+            ? outputPath(deps.paths, context.work.projectId, animated.output.path)
+            : images[index] !== undefined && isClipPath(images[index] ?? "")
+                ? images[index]
+                : undefined;
+        clips.push(path === undefined
+            ? undefined
+            : { kind: "video", path, seconds: await clipSeconds(deps, context, path, index + 1) });
+    }
+    const warnings = view.pieces.flatMap((row) => {
+        if (!row.key.startsWith("animate:") || !row.selected || row.piece.state !== "done")
+            return [];
+        const parsed = z
+            .object({ fallback: z.string() })
+            .safeParse(JSON.parse(row.piece.payload ?? "null"));
+        return parsed.success ? [parsed.data.fallback] : [];
+    });
+    if (config.videoEdit === undefined)
+        return {
+            edit: clips.some((clip) => clip !== undefined) ? { clips } : undefined,
+            warnings,
+            settings: undefined,
+        };
+    const settings = videoEditOf(config);
+    const cuts = usesNarrationCuts(config);
+    const cards = usesChapterCards(config);
+    const words = cuts || cards ? timingWords(deps, context, view) : [];
+    const chapters = cuts || cards ? chaptersOf(view, config, words) : [];
+    const font = cards
+        ? await resolveFont(deps.paths, config.subtitles?.fontId ?? "default")
+        : undefined;
+    return {
+        edit: {
+            clips,
+            ...(cuts
+                ? {
+                    narration: {
+                        cutPoints: sentenceCutPoints(words),
+                        chapterStarts: chapters.map((chapter) => chapter.start),
+                    },
+                }
+                : {}),
+            ...(settings.transition === "cut"
+                ? {}
+                : { transition: { kind: settings.transition, seconds: settings.transitionSeconds } }),
+            look: {
+                vignette: settings.vignette,
+                grain: settings.grain,
+                grade: settings.grade,
+                atmosphere: settings.atmosphere,
+            },
+            ...(font === undefined
+                ? {}
+                : { cards: { chapters, font: { path: font.path, name: font.assName } } }),
+        },
+        warnings,
+        settings,
+    };
+}
+function timingWords(deps, context, view) {
+    const timing = view.outputs.find((row) => row.selected &&
+        row.available &&
+        row.state === "ready" &&
+        row.workKey === "subtitles:timing" &&
+        row.output.role === "subtitle_words");
+    if (timing === undefined)
+        throw new Error("The narration's word timing, which the video's cuts and chapter cards follow, is missing. Use Re-run section on Video, then Retry stage.");
+    return wordsSchema.parse(JSON.parse(readFileSync(outputPath(deps.paths, context.work.projectId, timing.output.path), "utf8"))).words;
+}
+// The YouTube description's chapters when that step runs, the article's headings otherwise.
+function chaptersOf(view, config, words) {
+    if (usesYoutubeDescription(config)) {
+        const row = view.pieces.find((one) => one.key === "youtube:description" && one.selected && one.piece.state === "done");
+        const parsed = z
+            .object({ chapters: z.array(z.object({ start: z.number(), title: z.string() })) })
+            .safeParse(JSON.parse(row?.piece.payload ?? "null"));
+        if (parsed.success)
+            return parsed.data.chapters;
+    }
+    return headingChapters(view.articleMarkdown ?? "", words);
+}
+async function clipSeconds(deps, context, path, place) {
+    let ms;
+    try {
+        ms = await probeDurationMs(deps.ffmpeg, path, context.signal, deps.log);
+    }
+    catch (error) {
+        if (context.signal.aborted)
+            throw error;
+        ms = 0;
+    }
+    if (!(ms > 0))
+        throw new Error(`Image ${String(place)} is a video clip Slopify can't read, so the video can't show it. Replace it with another clip or an image in Edit project → Images, then Retry stage.`);
+    return ms / 1000;
+}

package/dist/slices/rebuild/runtime-export.js

@@ -7,6 +7,7 @@ import { withPaths } from "../video/edit-list.js";
 import { runFfmpeg } from "../video/ffmpeg.js";
 import { planRender } from "../video/plan.js";
 import { renderSlideshow } from "../video/slideshow.js";
+import { exportEdit } from "./runtime-export-edit.js";
 import { exportSnapshot, retainedOutput, revisionAudio, } from "./runtime-export-inputs.js";
 import { preparedResult, preparedText, publishResult } from "./runtime-publication.js";
 export async function executeExportRecipe(deps, context, piece) {
@@ -53,6 +54,7 @@ export async function executeExportRecipe(deps, context, piece) {
                 throw new Error("The video export can't find one of the slideshow images. Use Re-run section on Images (or regenerate that image in Edit project → Images), then Retry stage.");
             return outputPath(deps.paths, context.work.projectId, row.output.path);
         });
+        const edited = wav ? undefined : await exportEdit(deps, context, view, images);
         const plan = wav
             ? undefined
             : planRender({
@@ -67,6 +69,7 @@ export async function executeExportRecipe(deps, context, piece) {
                 outro: segment("outro"),
                 images,
                 output: pending.absolutePath,
+                edit: edited?.edit,
             });
         const totalSeconds = plan?.totalSeconds ?? audio.reduce((sum, row) => sum + row.seconds, 0);
         const projectDirectory = projectDir(deps.paths, context.work.projectId);
@@ -90,6 +93,10 @@ export async function executeExportRecipe(deps, context, piece) {
                 output: pending.path,
                 editList: withPaths(plan.editList, relativePath),
                 subtitles: config.subtitles,
+                ...(edited?.settings === undefined ? {} : { videoEdit: edited.settings }),
+                ...(edited === undefined || edited.warnings.length === 0
+                    ? {}
+                    : { warnings: edited.warnings }),
             };
         if (!context.maySubmit(piece.id))
             return "held";
@@ -122,7 +129,12 @@ export async function executeExportRecipe(deps, context, piece) {
             });
         context.signal.throwIfAborted();
         const asset = sealAsset(deps, pending);
-        prepared.push(preparedResult(deps, context, piece, wav ? "audio_export" : "video", asset, Math.round(totalSeconds * 1000), { subtitlesMode: mode }));
+        prepared.push(preparedResult(deps, context, piece, wav ? "audio_export" : "video", asset, Math.round(totalSeconds * 1000), {
+            subtitlesMode: mode,
+            ...(edited === undefined || edited.warnings.length === 0
+                ? {}
+                : { warnings: edited.warnings }),
+        }));
         prepared.push(preparedText(deps, context, piece, "render_params", "render.json", JSON.stringify(record)));
         prepared.push(...captions.map((row) => retainedOutput(deps, view, row)));
         await publishResult(deps, context, piece, prepared, { totalSeconds }, asset);

package/dist/slices/rebuild/runtime-image.js

@@ -0,0 +1,50 @@
+import { readFileSync } from "node:fs";
+import { z } from "zod";
+import { outputPath } from "../storage/layout.js";
+// The provider call an image step makes: its request, the effort when one is chosen and, while
+// the project's Establishing image is on, that image's bytes as the visual reference.
+export function imageCall(deps, projectId, input, previewLabel) {
+    const reference = referenceImage(deps, projectId, input);
+    return {
+        provider: input.provider,
+        model: input.model,
+        prompt: input.prompt,
+        aspect: input.aspect,
+        ...(input.thinking === undefined ? {} : { thinking: input.thinking }),
+        ...(reference === undefined ? {} : { reference }),
+        ...(previewLabel === undefined ? {} : { previewLabel }),
+    };
+}
+function referenceImage(deps, projectId, input) {
+    if (input.reference === undefined)
+        return undefined;
+    // The step waits for the establishing image, so a missing one went away since.
+    const missing = "The establishing image this image is drawn from is missing. Use Regenerate on the establishing image in the Images section (or upload it again in Edit project → Images), then use Retry stage.";
+    if (input.reference.assetId === null)
+        throw new Error(missing);
+    const row = z
+        .object({ path: z.string() })
+        .optional()
+        .parse(deps.db
+        .prepare("SELECT path FROM project_assets WHERE id=? AND project_id=?")
+        .get(input.reference.assetId, projectId));
+    if (row === undefined)
+        throw new Error(missing);
+    let bytes;
+    try {
+        bytes = new Uint8Array(readFileSync(outputPath(deps.paths, projectId, row.path)));
+    }
+    catch {
+        throw new Error(missing);
+    }
+    const mime = imageMime(bytes);
+    if (mime === undefined)
+        throw new Error("The establishing image is not a PNG or JPEG file, so it can't be sent as a reference. Upload a PNG or JPEG in Edit project → Images → Establishing image, then use Retry stage.");
+    return { bytes, mime };
+}
+function imageMime(bytes) {
+    const png = [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a];
+    if (png.every((value, index) => bytes[index] === value))
+        return "image/png";
+    return bytes[0] === 0xff && bytes[1] === 0xd8 && bytes[2] === 0xff ? "image/jpeg" : undefined;
+}

package/dist/slices/rebuild/runtime-local.js

@@ -1,6 +1,7 @@
 import { statSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { z } from "zod";
+import { referenceKey } from "../admission/model.js";
 import { plainText } from "../article/plain.js";
 import { splitEndMatter } from "../article/split.js";
 import { joinNarration } from "../narration/concat.js";
@@ -36,9 +37,11 @@ export async function executeLocalRecipe(deps, context, piece) {
             ? "audio_body"
             : piece.key === "thumbnail:image"
                 ? "thumbnail"
-                : piece.key.startsWith("image:")
-                    ? "image"
-                    : undefined;
+                : piece.key === referenceKey
+                    ? "reference"
+                    : piece.key.startsWith("image:")
+                        ? "image"
+                        : undefined;
         await publishResult(deps, context, piece, role === undefined ? [] : [preparedResult(deps, context, piece, role, asset)], {}, asset);
         return "done";
     }

package/dist/slices/rebuild/runtime-materialize.js

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { transact } from "../../kernel/db/tx.js";
 import { currentRevisionId } from "../revisions/repo.js";
 import { getRevisionView } from "../revisions/view.js";
+import { recipeInputSchema } from "./recipe-input-schema.js";
 import { insertInvocation } from "./runtime-admission.js";
 import { bindNarrationReuse, narrationOrdinal } from "./runtime-narration-reuse.js";
 import { executionPlan, executionView, savedCatalogue } from "./runtime-plan.js";
@@ -56,6 +57,14 @@ export function materializeAdmittedWork(deps, projectId) {
                     continue;
                 if (plan.work.find((row) => row.key === recipe.key)?.disposition === "review")
                     continue;
+                // A step waiting on its inputs changes fingerprint each time one lands: every
+                // narration chunk moves the joined audio, the timing, the export and the YouTube
+                // description after it. The waiting row is the same request with newer inputs, so it
+                // takes them in place; minting a row per landing left one never-run row per chunk.
+                if (own !== undefined &&
+                    plan.work.find((row) => row.key === recipe.key)?.disposition !== "reuse" &&
+                    refreshWaiting(deps, head, own, recipe))
+                    continue;
                 if (own !== undefined) {
                     deps.db
                         .prepare("UPDATE revision_work SET state='done' WHERE id=? AND state='pending'")
@@ -89,6 +98,34 @@ export function materializeAdmittedWork(deps, projectId) {
         }
     });
 }
+// Only a row nothing has touched: still pending, one unsent piece, no attempt. Anything
+// further along keeps the old path, which retires it and admits a fresh row.
+function refreshWaiting(deps, head, own, recipe) {
+    const pieces = workPieces(deps.db, own.work_id);
+    const piece = pieces[0];
+    if (pieces.length !== 1 ||
+        piece === undefined ||
+        piece.key !== recipe.key ||
+        piece.state !== "pending" ||
+        piece.submittedAt !== null ||
+        piece.continuation !== null)
+        return false;
+    const waiting = deps.db
+        .prepare("SELECT 1 FROM revision_work w WHERE w.id=? AND w.state='pending' AND NOT EXISTS(SELECT 1 FROM attempts a WHERE a.work_id=w.id)")
+        .get(own.work_id);
+    if (waiting === undefined)
+        return false;
+    deps.db
+        .prepare("UPDATE revision_work SET fingerprint=? WHERE id=?")
+        .run(recipe.fingerprint, own.work_id);
+    deps.db
+        .prepare("UPDATE revision_work_pieces SET fingerprint=?,request_fingerprint=?,logical_fingerprint=?,input_json=? WHERE id=?")
+        .run(recipe.fingerprint, recipe.requestFingerprint, recipe.logicalFingerprint, JSON.stringify(recipeInputSchema.parse(recipe.input)), piece.id);
+    deps.db
+        .prepare("UPDATE revision_work_reservations SET fingerprint=? WHERE revision_id=? AND work_id=? AND work_key=?")
+        .run(recipe.fingerprint, head, own.work_id, recipe.key);
+    return true;
+}
 function desiredAnchor(deps, projectId, head, row) {
     const view = getRevisionView(deps, projectId, head);
     return (view?.revision.fingerprints[row.logical_key ?? row.work_key] ===
@@ -103,5 +140,16 @@ function futureKey(recipe) {
         return "research:planner";
     if (recipe.key === "article:continuation")
         return "article:body";
+    // A short's images and render unfold from its image prompts, admitted with them: under the
+    // pick on a first run, or on their own when one short is made again and the pick is kept.
+    // The prompts unfold from the pick's answer.
+    const clip = /^(shorts:\d+):(?:image:\d+|render)$/.exec(recipe.key);
+    if (clip?.[1] !== undefined)
+        return `${clip[1]}:prompts`;
+    if (recipe.key.startsWith("shorts:"))
+        return "shorts:pick";
+    // The chapter openers' clips unfold from the deferred request that stood in for them.
+    if (recipe.key.startsWith("animate:"))
+        return "animate:future";
     return recipe.key;
 }

package/dist/slices/rebuild/runtime-piece-label.js

@@ -6,12 +6,25 @@ export function pieceLabel(deps, context, piece) {
     const { key } = piece;
     if (key === "thumbnail:image" || key.startsWith("thumbnail:"))
         return "Thumbnail";
+    if (key === "reference:image")
+        return "Establishing image";
     if (key === "article:body")
         return "Article";
     if (key === "document:pdf")
         return "Document";
     if (key === "youtube:description")
         return "YouTube description";
+    if (key === "shorts:pick" || key === "shorts:future")
+        return "Shorts";
+    if (key === "animate:future")
+        return "Animated images";
+    const short = /^shorts:(\d+):(prompts|image:(\d+)|render)$/.exec(key);
+    if (short !== null)
+        return short[2] === "prompts"
+            ? `Short ${short[1]} image prompts`
+            : short[2] === "render"
+                ? `Short ${short[1]}`
+                : `Short ${short[1]} image ${short[3]}`;
     if (key === "entry:intro:text")
         return "Intro text";
     if (key === "entry:outro:text")
@@ -28,6 +41,10 @@ export function pieceLabel(deps, context, piece) {
         const at = view()?.revision.content.imageOrder.indexOf(key.slice("image:".length)) ?? -1;
         return at === -1 ? "An image" : `Image ${String(at + 1)}`;
     }
+    if (key.startsWith("animate:")) {
+        const at = view()?.revision.content.imageOrder.indexOf(key.slice("animate:".length)) ?? -1;
+        return at === -1 ? "An animated image" : `Animated image ${String(at + 1)}`;
+    }
     const narration = /^(?:narration:prepare:(?:intro|body|outro):)?audio:(intro|body|outro)(?::(.+))?$/.exec(key);
     if (narration === null)
         return undefined;

package/dist/slices/rebuild/runtime-provider.js

@@ -1,3 +1,4 @@
+import { referenceKey } from "../admission/model.js";
 import { plainText } from "../article/plain.js";
 import { splitEndMatter } from "../article/split.js";
 import { observeNarration } from "../narration/live.js";
@@ -9,6 +10,7 @@ import { discardPreparedAssets, writeAsset } from "../storage/assets.js";
 import { outputPath } from "../storage/layout.js";
 import { probeDurationMs } from "../video/ffmpeg.js";
 import { executeArticleRequests } from "./runtime-article.js";
+import { imageCall } from "./runtime-image.js";
 import { frozenInstructions } from "./runtime-instructions.js";
 import { executionPlan, executionView, savedCatalogue } from "./runtime-plan.js";
 import { preparedResult, preparedTexts, publishResult } from "./runtime-publication.js";
@@ -89,20 +91,25 @@ export async function executeProviderRecipe(deps, context, providers, piece) {
         return "done";
     }
     if (input.kind === "image") {
-        const image = await wrapped.image({
-            provider: input.provider,
-            model: input.model,
-            prompt: input.prompt,
-            aspect: input.aspect,
-        });
-        if (!image.ok)
-            return "held";
-        const asset = writeAsset(deps, context.work.projectId, image.value.mime === "image/jpeg" ? "image.jpg" : "image.png", image.value.bytes);
         const view = executionView(deps, context.work.projectId, context.work.revisionId);
         const index = piece.key.startsWith("image:")
             ? (view?.revision.content.imageOrder.indexOf(piece.key.slice(6)) ?? 0) + 1
             : undefined;
-        const output = preparedResult(deps, context, piece, piece.key === "thumbnail:image" ? "thumbnail" : "image", asset, null, {
+        const image = await wrapped.image(imageCall(deps, context.work.projectId, input, piece.key === "thumbnail:image"
+            ? "Thumbnail"
+            : piece.key === referenceKey
+                ? "Establishing image"
+                : index === undefined
+                    ? "Image"
+                    : `Image ${String(index)}`));
+        if (!image.ok)
+            return "held";
+        const asset = writeAsset(deps, context.work.projectId, image.value.mime === "image/jpeg" ? "image.jpg" : "image.png", image.value.bytes);
+        const output = preparedResult(deps, context, piece, piece.key === "thumbnail:image"
+            ? "thumbnail"
+            : piece.key === referenceKey
+                ? "reference"
+                : "image", asset, null, {
             prompt: input.prompt,
             provider: input.provider,
             model: input.model,

package/dist/slices/rebuild/runtime-publication.js

@@ -8,7 +8,13 @@ import { rebindPublishedNarration } from "./runtime-narration-publication.js";
 import { executionPlan, executionView, savedCatalogue } from "./runtime-plan.js";
 export function preparedResult(deps, context, piece, role, asset, durationMs = null, meta = {}) {
     return {
-        slot: role === "image" ? piece.key : `${context.work.kind}:${role}`,
+        // A project holds many images, and one video and several images per short.
+        slot: role === "image" ||
+            role === "short_image" ||
+            role === "short_video" ||
+            role === "animated_image"
+            ? piece.key
+            : `${context.work.kind}:${role}`,
         workKey: piece.key,
         fingerprint: piece.logicalFingerprint ?? piece.fingerprint,
         asset,
@@ -46,7 +52,7 @@ export function preparedTexts(deps, context, piece, texts) {
         throw error;
     }
 }
-export async function publishResult(deps, context, piece, outputs, payload, asset = null) {
+export async function publishResult(deps, context, piece, outputs, payload, asset = null, retired) {
     try {
         const record = {
             key: piece.key,
@@ -67,7 +73,7 @@ export async function publishResult(deps, context, piece, outputs, payload, asse
             },
         };
         const result = transact(deps.db, () => {
-            const committed = commitRevisionOutputs(deps, { work: context.work, pieceId: piece.id, publicationId: piece.id }, outputs, [record]);
+            const committed = commitRevisionOutputs(deps, { work: context.work, pieceId: piece.id, publicationId: piece.id }, outputs, [record], retired);
             rebindPublishedNarration(deps, context.work, piece);
             deps.db
                 .prepare("UPDATE revision_work_pieces SET state='done' WHERE id=? AND work_id=?")
@@ -93,7 +99,7 @@ function pieceKind(piece) {
         return "chunk";
     if (piece.input.kind === "provided" && /^audio:(intro|outro):\d+$/.test(piece.key))
         return "segment";
-    if (piece.key.startsWith("image:"))
+    if (piece.key.startsWith("image:") || piece.key.startsWith("animate:"))
         return "image";
     if (piece.key.startsWith("research:chapter:"))
         return "chapter";
@@ -117,6 +123,21 @@ function pieceIndex(deps, context, piece) {
         return 1;
     if (piece.key === "entry:outro:text")
         return 2;
+    // The shorts' steps take places of their own, past every other step of the Video stage:
+    // the pick, then per short its prompts, its images and its render.
+    const short = /^shorts:(?:(\d+):(prompts|image:(\d+)|render)|pick)$/.exec(piece.key);
+    if (short !== null)
+        return short[1] === undefined
+            ? 10000
+            : 10000 +
+                Number(short[1]) * 1000 +
+                (short[2] === "prompts" ? 0 : short[2] === "render" ? 999 : Number(short[3]));
+    // Animated images take places past the shorts', one per image of the slideshow.
+    if (piece.key.startsWith("animate:")) {
+        const order = executionView(deps, context.work.projectId, context.work.revisionId)?.revision
+            .content.imageOrder;
+        return 900000 + (order?.indexOf(piece.key.slice("animate:".length)) ?? -1) + 1;
+    }
     const localOrder = [
         "audio:body:concat",
         "audio:intro",

package/dist/slices/rebuild/runtime-run.js

@@ -1,8 +1,10 @@
+import { executeAnimateRecipe } from "./runtime-animate.js";
 import { executeDocumentRecipe } from "./runtime-document.js";
 import { executeExportRecipe } from "./runtime-export.js";
 import { executeLocalRecipe } from "./runtime-local.js";
 import { pieceLabel } from "./runtime-piece-label.js";
 import { executeProviderRecipe } from "./runtime-provider.js";
+import { executeShortsRecipe } from "./runtime-shorts.js";
 import { executeSubtitleRecipe } from "./runtime-subtitles.js";
 import { executeYoutubeRecipe } from "./runtime-youtube.js";
 import { workPieces } from "./work-records.js";
@@ -22,11 +24,15 @@ export async function runRevisionInvocation(deps, context, providers) {
                         ? await executeDocumentRecipe(deps, context, piece)
                         : piece.key.startsWith("youtube:")
                             ? await executeYoutubeRecipe(deps, context, providers, piece)
-                            : piece.input.kind === "llm" ||
-                                piece.input.kind === "tts" ||
-                                piece.input.kind === "image"
-                                ? await executeProviderRecipe(deps, context, providers, piece)
-                                : await executeLocalRecipe(deps, context, piece);
+                            : piece.key.startsWith("shorts:")
+                                ? await executeShortsRecipe(deps, context, providers, piece)
+                                : piece.key.startsWith("animate:")
+                                    ? await executeAnimateRecipe(deps, context, providers, piece)
+                                    : piece.input.kind === "llm" ||
+                                        piece.input.kind === "tts" ||
+                                        piece.input.kind === "image"
+                                        ? await executeProviderRecipe(deps, context, providers, piece)
+                                        : await executeLocalRecipe(deps, context, piece);
             if (outcome === "held")
                 return outcome;
         }