@gentbajko/slopify 3.0.8 → 3.0.10

package/dist/slices/rebuild/recipe-visual.js

@@ -1,6 +1,7 @@
 import { thumbnailCountOf, thumbnailKey } from "../admission/model.js";
 import { usesShortMode } from "../admission/short-mode.js";
 import { render } from "../admission/substitute.js";
+import { withoutScene, withScene } from "../images/scenes.js";
 import { usesAmbientBed } from "../video/ambient-bed.js";
 import { castFor } from "./recipe-cast.js";
 import { noMaster } from "./recipe-loudness.js";
@@ -15,7 +16,9 @@ reference,
 // The word timing's identity, which a short's captions are drawn from.
 timing = null, 
 // Level the volume: the levelled narration and the master (`recipe-loudness.ts`).
-master = noMaster) {
+master = noMaster, 
+// Each image's own scene, for the images whose prompt asks for one (`recipe-scenes.ts`).
+scenes) {
     const recipes = [];
     const imageKeys = config.sources.images === "off" ? [] : content.imageOrder;
     for (const key of imageKeys) {
@@ -25,7 +28,17 @@ master = noMaster) {
         const raw = image.templateKey === undefined || image.templateKey === null
             ? undefined
             : content.promptTemplates[image.templateKey];
-        const prompt = raw === undefined || raw === null ? image.prompt : render(raw, config.values);
+        const at = scenes?.keys.indexOf(key) ?? -1;
+        if (scenes !== undefined && at !== -1 && image.source === "generate") {
+            recipes.push(sceneImage(config, content, key, raw ?? image.prompt ?? "", scenes, at, reference));
+            continue;
+        }
+        // With Scenes from the article off, a prompt's `{{Scene}}` line is left out.
+        const prompt = raw === undefined || raw === null
+            ? image.prompt === null || image.prompt === undefined
+                ? image.prompt
+                : withoutScene(image.prompt)
+            : render(withoutScene(raw), config.values);
         recipes.push(recipe({ content }, `image:${key}`, "images", image.source === "provide"
             ? { kind: "provided", version: 1, assetId: image.assetId, semantic: null }
             : {
@@ -109,6 +122,37 @@ master = noMaster) {
     }
     return recipes;
 }
+// An image drawn from its own scene. Until the scenes are written it waits as a deferred
+// request that names the scenes step and the image's place among them, so writing them turns
+// it into its image request (materialization), and writing them again draws it again.
+function sceneImage(config, content, key, body, scenes, at, reference) {
+    const scene = scenes.scenes?.[at];
+    const prompt = scene === undefined ? undefined : withScene(render(body, config.values), scene);
+    return recipe({ content }, `image:${key}`, "images", prompt === undefined
+        ? {
+            kind: "deferred",
+            version: 1,
+            operation: "image-scene",
+            template: [
+                scenes.recipe.fingerprint,
+                at,
+                config.images?.provider ?? null,
+                config.images?.model ?? null,
+                config.format,
+                ...(config.images?.thinking === undefined ? [] : [config.images.thinking]),
+                ...(reference === undefined ? [] : [reference.input.fingerprint]),
+            ],
+        }
+        : {
+            kind: "image",
+            version: 1,
+            ...imageChoice(config),
+            aspect: config.format,
+            prompt,
+            ...(reference === undefined ? {} : { reference: reference.input }),
+            ...castField(castFor(config, prompt)),
+        }, [scenes.recipe.key, ...(reference === undefined ? [] : [reference.key])]);
+}
 // What the ambient bed adds to the render's fingerprint: its settings and, for the user's own
 // file, the project asset it plays. Undefined without a bed.
 export function ambientBedValues(config, content) {

package/dist/slices/rebuild/recipe-work.js

@@ -278,6 +278,24 @@ export function priceRecipe(work, value, config) {
     const onPlan = config === undefined ? undefined : cliRequest(work, value, config);
     if (onPlan !== undefined)
         return onPlan;
+    // Scenes from the article: an image waiting for its scene is one image, and the scenes are
+    // one call that reads the article (its length is known once the article is written).
+    if (input.kind === "deferred" &&
+        (input.operation === "image-scene" || input.operation === "image-scenes")) {
+        const choice = config === undefined ? undefined : recipeProviderChoice(value, config);
+        if (choice !== undefined && input.operation === "image-scene")
+            return { kind: "image", stage: work.key, provider: choice.provider, model: choice.model };
+        if (choice !== undefined)
+            return {
+                kind: "llm",
+                stage: work.key,
+                provider: choice.provider,
+                model: choice.model,
+                inputCharacters: 90000,
+                outputCharacters: 4000,
+                detail: "The article is read when the step runs; its length is estimated. Retries are excluded.",
+            };
+    }
     if (input.kind === "deferred" && input.operation === "narration-preparation")
         return {
             kind: "unknown",

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

@@ -24,7 +24,7 @@ export async function executeDocumentRecipe(deps, context, piece) {
             : readFileSync(outputPath(deps.paths, projectId, row.output.path), "utf8");
     };
     const config = view.revision.config;
-    const article = view.revision.content.articleEdited === true || config.sources.article === "provide"
+    const article = view.revision.content.articleEdited === true || config.sources.article !== "generate"
         ? view.articleMarkdown
         : text("article_md", "article:body");
     if (article === null)

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

@@ -45,6 +45,8 @@ export function pieceLabel(deps, context, piece) {
         return "Shorts";
     if (key === "animate:future")
         return "Animated images";
+    if (key === "images:scenes")
+        return "Image scenes";
     const short = /^shorts:(\d+):(prompts|image:(\d+)|render)$/.exec(key);
     if (short !== null)
         return short[2] === "prompts"

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

@@ -35,7 +35,7 @@ export function executionPlan(deps, view, catalogue) {
     const payloads = view.pieces.filter((piece) => piece.selected && piece.piece.state === "done" && piece.piece.payload !== null);
     const resolved = {
         articleMarkdown: view.revision.content.articleEdited === true ||
-            view.revision.config.sources.article === "provide"
+            view.revision.config.sources.article !== "generate"
             ? view.articleMarkdown
             : textOutput("article_md"),
         researchNotes: textOutput("notes"),

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

@@ -2,6 +2,7 @@ import { basename } from "node:path";
 import { referenceKey, thumbnailVariant } from "../admission/model.js";
 import { plainText } from "../article/plain.js";
 import { splitEndMatter } from "../article/split.js";
+import { checkScenes, sceneCountOf } from "../images/scenes.js";
 import { spokenPassage } from "../narration/describe.js";
 import { observeNarration } from "../narration/live.js";
 import { validatePreparation } from "../narration/preparation.js";
@@ -14,6 +15,7 @@ import { outputPath } from "../storage/layout.js";
 import { probeDurationMs } from "../video/ffmpeg.js";
 import { parseAttribution } from "../voices/attribution.js";
 import { parseScript } from "../voices/script.js";
+import { imageScenesKey } from "./recipe-scenes.js";
 import { executeArticleRequests } from "./runtime-article.js";
 import { imageCall } from "./runtime-image.js";
 import { frozenInstructions } from "./runtime-instructions.js";
@@ -193,6 +195,11 @@ function checkAnswer(piece, answer) {
         return spokenPassage(answer.text) === ""
             ? "The AI model's description had no words a narrator could say. Use Try again; if it keeps happening, choose another model in the Providers section of Edit project, or turn off Describe tables and figures there."
             : undefined;
+    // Scenes from the article: one scene per image, as many as the request lists.
+    if (piece.key === imageScenesKey && piece.input.kind === "llm") {
+        const checked = checkScenes(answer.text, sceneCountOf(piece.input.messages) ?? 0);
+        return checked.ok ? undefined : checked.reason;
+    }
     if (piece.key === "research:planner")
         return chaptersFrom(answer.text).length === 0
             ? "The AI model's research plan listed no chapters, so research could not go on. Use Try again; if it keeps happening, choose another model in the Providers section of Edit project."
@@ -210,6 +217,15 @@ function attributionSource(messages) {
     return messages.at(-1)?.content ?? "";
 }
 async function publishText(deps, context, piece, answer) {
+    if (piece.key === imageScenesKey && piece.input.kind === "llm") {
+        const checked = checkScenes(answer.text, sceneCountOf(piece.input.messages) ?? 0);
+        if (!checked.ok)
+            throw new Error(checked.reason);
+        await publishResult(deps, context, piece, preparedTexts(deps, context, piece, [
+            ["instructions", "instructions.md", frozenInstructions(deps, context, piece)],
+        ]), { scenes: checked.scenes, text: answer.text });
+        return;
+    }
     if (piece.input.kind === "llm" && piece.input.preparation !== undefined) {
         const checked = validatePreparation(answer.text, piece.input.preparation.source);
         if (!checked.ok)

package/dist/slices/revisions/mutation-prepare.js

@@ -121,7 +121,7 @@ export async function prepareEditAssets(deps, base, edit) {
             };
             prepared.push(item);
         }
-        const article = edit.config.sources.article === "provide" || content.articleEdited === true
+        const article = edit.config.sources.article !== "generate" || content.articleEdited === true
             ? (content.articleMarkdown ?? edit.config.provided.article)
             : undefined;
         if (article !== undefined &&

package/dist/slices/revisions/view.js

@@ -40,5 +40,7 @@ export function resolvedArticleMarkdown(deps, revision, outputs) {
         return readFileSync(outputPath(deps.paths, revision.projectId, article.output.path), "utf8");
     return revision.config.sources.article === "provide"
         ? (revision.config.provided.article ?? null)
-        : null;
+        : revision.config.sources.article === "off"
+            ? ""
+            : null;
 }

package/dist/tutorials/Play-Images.md

@@ -105,6 +105,22 @@ How the count is worked out:
 
 Turning it on also switches **Motion** (in the **Video and style** row) from **Zoom in and out** to **Mix of both**, so a long video pans and zooms by turns. A **Pan across** or **Still** you picked stays, and you can pick Zoom again.
 
+## Scenes from the article
+
+Without it, every image of a prompt is drawn from the same text, so three images of one prompt tend to show the same picture three times. **Scenes from the article** gives every image its own moment.
+
+| Option | What it does | Default |
+| --- | --- | --- |
+| **Scenes from the article** | Before the images are drawn, the project's AI model reads the article once and writes a short scene for each image. Scene 1 comes from the article's opening and the last from its ending, in the order the images are shown. Each image is drawn from its prompt with its scene added. One more AI call per run. | Off |
+
+Where the scene goes:
+
+- A prompt with `{{Scene}}` gets the scene there, for example a line `Scene: {{Scene}}` under the prompt's first sentence. `{{Scene}}` is never a field to fill in: Slopify writes it.
+- A prompt without it gets the scene as a line of its own after its first paragraph, so any prompt works unchanged.
+- With the switch off, a line holding `{{Scene}}` is left out and the prompt is drawn as it always was.
+
+The style, composition and everything else in the prompt stay as written; only the scene changes from image to image. The scenes are written once the article exists, and each image waits for them. Switching it on or off in **Edit project** remakes the images.
+
 ## How long each image stays on screen
 
 **Seconds per image** (1 to 600, default 15) is in the **Video and style** row, beside **Cuts**, **Zoom** and **Motion**. When cuts follow the narration, it is the target length and a cut waits for a sentence end. When images run out, they start again. See [Play Video and Style](Play-Video-and-Style).

package/dist/tutorials/Play-Title-and-Article.md

@@ -25,6 +25,7 @@ The Article row starts with a **Source** switch:
 | --- | --- | --- |
 | **Generate** (default) | The text model writes the article from the article prompt, in one call. | One text-model call |
 | **Provide** | Slopify narrates the text you paste, word for word. No text model writes one. | No text-model cost for the article |
+| **Off** | No article at all, for a project of images or a thumbnail made from prompts. Choosing it switches off what reads the article (research, narration, captions, the YouTube description, shorts, the PDF, Scenes from the article) and takes those sections out of Play; the thumbnail offers From prompt and Provide only. | Nothing |
 
 The article is what the narration reads and what the PDF lays out.
 

package/dist/updater/service.js

@@ -2,6 +2,7 @@ import { timingSafeEqual } from "node:crypto";
 import { setImmediate } from "node:timers";
 import { isStableVersion, isUpdateToken, newerVersion } from "./model.js";
 const waitCheckMs = 5_000;
+const idleLooksToInstall = 2;
 export function createUpdater(deps) {
     let latestVersion = null;
     let checkedAt = -Infinity;
@@ -66,13 +67,23 @@ export function createUpdater(deps) {
             deps.report(error);
         });
     }
-    // Looks again every few seconds and installs the moment no work is running.
+    // Looks again every few seconds and installs once no work is running. Idle has to hold for
+    // two looks in a row, so the moment between one step finishing and the next starting is
+    // never mistaken for the end of the work.
     function wait(version) {
         pending = version;
         status = "waiting";
         error = undefined;
+        let idleLooks = 0;
         stopWatching = every(() => {
-            if (status !== "waiting" || busyNow())
+            if (status !== "waiting")
+                return;
+            if (busyNow()) {
+                idleLooks = 0;
+                return;
+            }
+            idleLooks += 1;
+            if (idleLooks < idleLooksToInstall)
                 return;
             stopWatching?.();
             stopWatching = undefined;

package/dist/updater/work-in-progress.js

@@ -0,0 +1,59 @@
+import { derive } from "../kernel/runner/graph.js";
+import { projectPaused, stagesOf } from "../slices/admission/repo.js";
+// A scheduled run this close is treated as running: a restart then could land on its time,
+// and a schedule that skips missed runs would skip it.
+export const scheduledSoonMs = 10 * 60_000;
+// What an update must wait for, named for "installs when … finishes"; undefined when nothing
+// is. An update never installs while a job is going: a step running or about to run, a step
+// waiting to try again, a batch with videos still to make, a narration chunk about to be
+// recorded again, a schedule writing topics or due to start a run.
+export function workInProgress(db, inflight, now) {
+    const projects = db
+        .prepare("SELECT id, title FROM projects WHERE id NOT IN (SELECT project_id FROM project_trash)")
+        .all()
+        .flatMap((row) => typeof row.id === "string" && typeof row.title === "string"
+        ? [{ id: row.id, title: row.title }]
+        : []);
+    for (const project of projects) {
+        if (inflight(project.id))
+            return project.title;
+        if (projectPaused(db, project.id))
+            continue;
+        // Running, or waiting to try a step again (`derive`); or between two steps, with work
+        // admitted and free to start. Work held for a person (a review checkpoint) doesn't count.
+        const state = derive(stagesOf(db, project.id));
+        if (state === "running")
+            return project.title;
+        if (state === "pending" &&
+            db
+                .prepare("SELECT 1 FROM revision_work WHERE project_id=? AND state IN ('pending','running') AND dispatch_state='allowed' LIMIT 1")
+                .get(project.id) !== undefined)
+            return project.title;
+    }
+    const queued = db
+        .prepare(`SELECT p.title FROM project_queue q JOIN projects p ON p.id=q.project_id
+       WHERE q.state IN ('queued','active')
+         AND q.project_id NOT IN (SELECT project_id FROM project_trash)
+         AND q.project_id NOT IN (SELECT project_id FROM project_controls WHERE paused=1)
+       LIMIT 1`)
+        .get();
+    if (typeof queued?.title === "string")
+        return queued.title;
+    const retry = db
+        .prepare(`SELECT p.title FROM narration_retries r JOIN projects p ON p.id=r.project_id
+       WHERE r.state='pending' LIMIT 1`)
+        .get();
+    if (typeof retry?.title === "string")
+        return retry.title;
+    const schedule = db
+        .prepare(`SELECT name FROM schedules WHERE deleted_at IS NULL AND (
+         (status='active' AND next_run_at IS NOT NULL AND next_run_at <= ?)
+         OR (topics_generating_at IS NOT NULL
+             AND (topics_generated_at IS NULL OR topics_generated_at < topics_generating_at)
+             AND (topics_failed_at IS NULL OR topics_failed_at < topics_generating_at))
+       ) LIMIT 1`)
+        .get(new Date(now + scheduledSoonMs).toISOString());
+    if (typeof schedule?.name === "string")
+        return schedule.name;
+    return undefined;
+}