@learnpack/learnpack 5.0.361 → 5.0.362

package/lib/creatorDist/index.html

@@ -10,7 +10,7 @@
     />
 
     <title>Learnpack Creator: Craft tutorials in seconds!</title>
-    <script type="module" crossorigin src="/creator/assets/index-CqVEKiJR.js"></script>
+    <script type="module" crossorigin src="/creator/assets/index-CKg5uuoj.js"></script>
     <link rel="stylesheet" crossorigin href="/creator/assets/index-B7s5Nmq8.css">
   </head>
   <body>

package/lib/utils/lessonRecovery.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Whether a lesson README holds generated content. The file starts as a
+ * `loader` block, and the generated content replaces it.
+ * @param readme - The README text, or null when the file does not exist.
+ * @returns True when the lesson has its generated content.
+ */
+export declare const hasGeneratedContent: (readme: string | null) => boolean;
+/**
+ * Finds the lessons marked as ERROR that were generated anyway. Publishing and
+ * translating wait for every lesson, and the retry screen only shows while the
+ * README has its `loader`, so these lessons would otherwise stay stuck.
+ * @param lessons - The lessons of the syllabus.
+ * @param readReadme - Reads the README of a lesson, or null if it has none.
+ * @returns The lessons to mark as done.
+ */
+export declare const findFinishedLessons: <T extends {
+    status?: string;
+}>(lessons: T[], readReadme: (lesson: T) => Promise<string | null>) => Promise<T[]>;

package/lib/utils/lessonRecovery.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findFinishedLessons = exports.hasGeneratedContent = void 0;
+/**
+ * Whether a lesson README holds generated content. The file starts as a
+ * `loader` block, and the generated content replaces it.
+ * @param readme - The README text, or null when the file does not exist.
+ * @returns True when the lesson has its generated content.
+ */
+const hasGeneratedContent = (readme) => readme !== null && readme.trim() !== "" && !readme.includes("```loader");
+exports.hasGeneratedContent = hasGeneratedContent;
+/**
+ * Finds the lessons marked as ERROR that were generated anyway. Publishing and
+ * translating wait for every lesson, and the retry screen only shows while the
+ * README has its `loader`, so these lessons would otherwise stay stuck.
+ * @param lessons - The lessons of the syllabus.
+ * @param readReadme - Reads the README of a lesson, or null if it has none.
+ * @returns The lessons to mark as done.
+ */
+const findFinishedLessons = async (lessons, readReadme) => {
+    const finished = [];
+    for (const lesson of lessons) {
+        if (lesson.status !== "ERROR")
+            continue;
+        // eslint-disable-next-line no-await-in-loop
+        if ((0, exports.hasGeneratedContent)(await readReadme(lesson)))
+            finished.push(lesson);
+    }
+    return finished;
+};
+exports.findFinishedLessons = findFinishedLessons;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@learnpack/learnpack",
   "description": "Seamlessly build, sell and/or take interactive & auto-graded tutorials, start learning now or build a new tutorial to your audience.",
-  "version": "5.0.361",
+  "version": "5.0.362",
   "author": "Alejandro Sanchez @alesanchezr",
   "contributors": [
     {

package/src/commands/serve.ts

@@ -48,6 +48,7 @@ import {
   getReadmeExtension,
   insertStepInCorrectPosition,
 } from "../utils/creatorUtilities"
+import { findFinishedLessons } from "../utils/lessonRecovery"
 // import { handleAssetCreation } from "./publish"
 import axios from "axios"
 import * as FormData from "form-data"
@@ -680,6 +681,10 @@ async function startInitialContentGeneration(
   )
 
   console.log("INITIAL CONTENT GENERATOR RES", res)
+  if (!res) {
+    throw new Error(`Could not start generating lesson ${exSlug}`)
+  }
+
   return res.id
 }
 
@@ -1020,6 +1025,45 @@ async function updateLessonStatusToDone(
   }
 }
 
+const lessonSlug = (lesson: Lesson) => slugify(lesson.id + "-" + lesson.title)
+
+async function repairFinishedLessons(
+  courseSlug: string,
+  syllabus: Syllabus,
+  bucket: Bucket
+): Promise<void> {
+  const language = syllabus.courseInfo.language || "en"
+
+  try {
+    const finished = await findFinishedLessons(
+      syllabus.lessons ?? [],
+      async lesson => {
+        const readme = bucket.file(
+          `courses/${courseSlug}/exercises/${lessonSlug(
+            lesson
+          )}/README${getReadmeExtension(language)}`
+        )
+        const [exists] = await readme.exists()
+        if (!exists) return null
+
+        const [content] = await readme.download()
+        return content.toString()
+      }
+    )
+
+    for (const lesson of finished) {
+      // eslint-disable-next-line no-await-in-loop
+      await updateLessonStatusToDone(courseSlug, lessonSlug(lesson), bucket)
+      lesson.status = "DONE"
+      lesson.generated = true
+    }
+  } catch (error) {
+    // Loading the course matters more than repairing it now. The next load
+    // tries again.
+    console.error(`Error repairing lessons of ${courseSlug}:`, error)
+  }
+}
+
 async function continueWithNextLesson(
   courseSlug: string,
   currentExerciseIndex: number,
@@ -1043,15 +1087,26 @@ async function continueWithNextLesson(
       feedback = `\n\nThe user added the following feedback with relation to the previous generations: ${syllabus.feedback}`
     }
 
-    nextCompletionId = await startInitialContentGeneration(
-      rigoToken,
-      syllabus.lessons,
-      syllabus.courseInfo,
-      nextExercise,
-      courseSlug,
-      syllabus.courseInfo.purpose,
-      finalContent + "\n\n" + feedback
-    )
+    try {
+      nextCompletionId = await startInitialContentGeneration(
+        rigoToken,
+        syllabus.lessons,
+        syllabus.courseInfo,
+        nextExercise,
+        courseSlug,
+        syllabus.courseInfo.purpose,
+        finalContent + "\n\n" + feedback
+      )
+    } catch (error) {
+      // The current lesson is finished either way. The next one stays PENDING,
+      // and its screen offers to continue.
+      console.error("Error starting the next lesson:", error)
+      emitToCourse(courseSlug, "course-creation", {
+        lesson: slugify(nextExercise.id + "-" + nextExercise.title),
+        status: "error",
+        log: `❌ Could not start lesson ${nextExercise.title}`,
+      })
+    }
   } else {
     console.log(
       "Stopping generation process at",
@@ -5239,6 +5294,7 @@ class ServeCommand extends SessionCommand {
         const [content] = await syllabus.download()
         const syllabusJson: Syllabus = JSON.parse(content.toString())
         sanitizeSyllabusFromUnknown(syllabusJson)
+        await repairFinishedLessons(courseSlug, syllabusJson, bucket)
         res.json(syllabusJson)
       } catch (error) {
         console.error("Error getting syllabus:", error)