@gentbajko/slopify 3.10.3 → 3.11.1

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

@@ -152,6 +152,11 @@ export function textRecipes(context) {
         recipes.push(recipe(context, "article:continuation", "article", llmInput(context, continuationMessages(messages, resolved.articleContinuation), false, documents), [article.key]));
     const endMatter = articleMarkdown === null ? null : splitEndMatter(articleMarkdown);
     const articleText = endMatter === null ? null : plainText(endMatter.body);
+    // The pictures, and an intro or outro written from the article, go on reading the article
+    // they were made from while the version keeps it (`picturesArticle`).
+    const pictureText = content.picturesArticle === undefined
+        ? articleText
+        : plainText(splitEndMatter(content.picturesArticle).body);
     let script;
     if (voices !== undefined && scriptCheck !== undefined) {
         if (writesScript)
@@ -209,7 +214,7 @@ export function textRecipes(context) {
         const key = `entry:${category}:text`;
         const input = choice.mode === "text"
             ? { kind: "local", version: 1, operation: "entry-text", values: prompt }
-            : articleText === null
+            : pictureText === null
                 ? {
                     kind: "deferred",
                     version: 1,
@@ -219,7 +224,7 @@ export function textRecipes(context) {
                         article.fingerprint,
                     ],
                 }
-                : llmInput(context, withLanguage(segmentMessages(prompt, config, articleText), config.language));
+                : llmInput(context, withLanguage(segmentMessages(prompt, config, pictureText), config.language));
         const value = recipe(context, key, "article", input, choice.mode === "llm" ? [article.key] : []);
         recipes.push(value);
         entries[category] = {
@@ -234,9 +239,9 @@ export function textRecipes(context) {
             title: subjectOf(config),
             values: config.values,
             format: config.format,
-            article: articleText ?? "",
+            article: pictureText ?? "",
         });
-        recipes.push(recipe(context, "thumbnail:prompt", "thumbnail", articleText === null
+        recipes.push(recipe(context, "thumbnail:prompt", "thumbnail", pictureText === null
             ? {
                 kind: "deferred",
                 version: 1,
@@ -248,6 +253,7 @@ export function textRecipes(context) {
     return {
         recipes,
         articleText,
+        pictureText,
         narrationText,
         descriptions,
         cards,

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

@@ -17,6 +17,15 @@ export async function runRevisionInvocation(deps, context, providers) {
             continue;
         if (piece.input.kind === "deferred")
             return "held";
+        // A step Slopify does itself (no provider call) records how long it ran, for the working
+        // time; a provider call records its own attempts.
+        const local = /^(subtitles|export|document|voices):/.test(piece.key) ||
+            /^shorts:\d+:render$/.test(piece.key) ||
+            (!/^(review|youtube|shorts|animate):/.test(piece.key) &&
+                piece.input.kind !== "llm" &&
+                piece.input.kind !== "tts" &&
+                piece.input.kind !== "image");
+        const timed = local ? startLocalTime(deps, context) : undefined;
         try {
             const outcome = piece.key.startsWith("subtitles:")
                 ? await executeSubtitleRecipe(deps, context, piece)
@@ -57,9 +66,25 @@ export async function runRevisionInvocation(deps, context, providers) {
             }
             throw label === undefined ? error : new Error(`${label}: ${error.message}`, { cause: error });
         }
+        finally {
+            if (timed !== undefined)
+                endLocalTime(deps, timed);
+        }
     }
     deps.db
         .prepare("UPDATE revision_work_pieces SET state='done' WHERE work_id=? AND result_json IS NOT NULL")
         .run(context.work.workId);
     return "done";
 }
+function startLocalTime(deps, context) {
+    const id = deps.ids.next();
+    deps.db
+        .prepare("INSERT INTO local_work_times(id,project_id,stage_id,revision_id,work_id,started_at) VALUES (?,?,?,?,?,?)")
+        .run(id, context.work.projectId, context.work.stageId, context.work.revisionId, context.work.workId, deps.clock.now().toISOString());
+    return id;
+}
+function endLocalTime(deps, id) {
+    deps.db
+        .prepare("UPDATE local_work_times SET ended_at=? WHERE id=?")
+        .run(deps.clock.now().toISOString(), id);
+}

package/dist/slices/revisions/schema.js

@@ -34,6 +34,9 @@ export const revisionContentSchema = z
     .object({
     articleMarkdown: z.string().max(500000).optional(),
     articleEdited: z.boolean().default(false),
+    // The article the pictures were drawn from, kept once the article is edited by hand so
+    // they are not drawn again (`rebuild/recipe-save.ts`).
+    picturesArticle: z.string().max(500000).optional(),
     provided: z
         .object({
         research: id.optional(),

package/dist/slices/run-cost/timing.js

@@ -31,8 +31,13 @@ export function projectTiming(db, projectId, now) {
          a.started_at AS started_at, a.ended_at AS ended_at, w.state AS work_state
        FROM attempts a JOIN stages s ON s.id = a.stage_id
        LEFT JOIN revision_work w ON w.id = a.work_id
-       WHERE s.project_id = ?`)
-        .all(projectId)
+       WHERE s.project_id = ?
+       UNION ALL
+       SELECT s.kind, t.revision_id, t.work_id, t.started_at, t.ended_at, w.state
+       FROM local_work_times t JOIN stages s ON s.id = t.stage_id
+       LEFT JOIN revision_work w ON w.id = t.work_id
+       WHERE t.project_id = ?`)
+        .all(projectId, projectId)
         .map((row) => attemptRow.parse(row));
     const head = currentRevisionId(db, projectId);
     // Work an edit carried over to the current revision is still its run's work: a video

package/dist/slices/storage/backup-format.js

@@ -35,6 +35,8 @@ export const projectTables = [
     "project_controls",
     "stages",
     "attempts",
+    // Since 3.11.1: how long each local step (a render, the levelling) ran.
+    "local_work_times",
     "stage_pieces",
     "outputs",
     "project_revisions",