@learnpack/learnpack 5.0.361 → 5.0.363

package/lib/commands/serve.js

@@ -23,6 +23,7 @@ const rigoActions_1 = require("../utils/rigoActions");
 const dotenv = require("dotenv");
 // import { v4 as uuidv4 } from "uuid"
 const creatorUtilities_1 = require("../utils/creatorUtilities");
+const lessonRecovery_1 = require("../utils/lessonRecovery");
 // import { handleAssetCreation } from "./publish"
 const axios_1 = require("axios");
 const FormData = require("form-data");
@@ -407,6 +408,9 @@ async function startInitialContentGeneration(rigoToken, steps, packageContext, e
     };
     const res = await (0, rigoActions_1.initialContentGenerator)(rigoToken.trim(), inputs, webhookUrl, endpointSlug);
     console.log("INITIAL CONTENT GENERATOR RES", res);
+    if (!res) {
+        throw new Error(`Could not start generating lesson ${exSlug}`);
+    }
     return res.id;
 }
 async function startInteractivityGeneration(rigoToken, steps, packageContext, exercise, courseSlug, purposeSlug, bucket, lastLesson = "") {
@@ -620,6 +624,32 @@ async function updateLessonStatusToDone(courseSlug, exerciseSlug, bucket) {
         throw error;
     }
 }
+const lessonSlug = (lesson) => (0, creatorUtilities_2.slugify)(lesson.id + "-" + lesson.title);
+async function repairFinishedLessons(courseSlug, syllabus, bucket) {
+    var _a;
+    const language = syllabus.courseInfo.language || "en";
+    try {
+        const finished = await (0, lessonRecovery_1.findFinishedLessons)((_a = syllabus.lessons) !== null && _a !== void 0 ? _a : [], async (lesson) => {
+            const readme = bucket.file(`courses/${courseSlug}/exercises/${lessonSlug(lesson)}/README${(0, creatorUtilities_1.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, currentExerciseIndex, rigoToken, finalContent, bucket) {
     const syllabus = await getSyllabus(courseSlug, bucket);
     const nextExercise = syllabus.lessons[currentExerciseIndex + 1] || null;
@@ -633,7 +663,19 @@ async function continueWithNextLesson(courseSlug, currentExerciseIndex, rigoToke
         if (syllabus.feedback) {
             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);
+            (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
+                lesson: (0, creatorUtilities_2.slugify)(nextExercise.id + "-" + nextExercise.title),
+                status: "error",
+                log: `❌ Could not start lesson ${nextExercise.title}`,
+            });
+        }
     }
     else {
         console.log("Stopping generation process at", currentExerciseIndex, syllabus.lessons[currentExerciseIndex].title, "because it's a multiple of 3");
@@ -952,7 +994,6 @@ class ServeCommand extends SessionCommand_1.default {
         if (!crendsEnv) {
             process.exit(1);
         }
-        await api_1.default.updateTechnologiesPeriodically();
         const credentials = JSON.parse(crendsEnv);
         const bucketStorage = new storage_1.Storage({
             credentials,
@@ -3498,11 +3539,6 @@ class ServeCommand extends SessionCommand_1.default {
                 res.status(500).json({ error: error.message });
             }
         });
-        app.get("/technologies", async (req, res) => {
-            console.log("GET /technologies");
-            const technologies = await api_1.default.getCurrentTechnologies();
-            res.json(technologies);
-        });
         app.get("/assets/:file", (req, res) => {
             const file = path.join(localAppPath, req.params.file);
             res.sendFile(file);
@@ -3591,6 +3627,7 @@ class ServeCommand extends SessionCommand_1.default {
                 const [content] = await syllabus.download();
                 const syllabusJson = JSON.parse(content.toString());
                 sanitizeSyllabusFromUnknown(syllabusJson);
+                await repairFinishedLessons(courseSlug, syllabusJson, bucket);
                 res.json(syllabusJson);
             }
             catch (error) {

package/lib/creatorDist/assets/{index-B7s5Nmq8.css → index-Cco3XhDR.css}

@@ -57,9 +57,14 @@
       "Liberation Mono", "Courier New", monospace;
     --color-red-50: oklch(97.1% 0.013 17.38);
     --color-red-100: oklch(93.6% 0.032 17.717);
+    --color-red-300: oklch(80.8% 0.114 19.571);
     --color-red-500: oklch(63.7% 0.237 25.331);
     --color-red-600: oklch(57.7% 0.245 27.325);
     --color-red-700: oklch(50.5% 0.213 27.518);
+    --color-amber-50: oklch(98.7% 0.022 95.277);
+    --color-amber-100: oklch(96.2% 0.059 95.617);
+    --color-amber-300: oklch(87.9% 0.169 91.605);
+    --color-amber-800: oklch(47.3% 0.137 46.201);
     --color-yellow-600: oklch(68.1% 0.162 75.834);
     --color-yellow-700: oklch(55.4% 0.135 66.442);
     --color-blue-50: oklch(97% 0.014 254.604);
@@ -89,6 +94,7 @@
     --container-sm: 24rem;
     --container-md: 28rem;
     --container-xl: 36rem;
+    --container-3xl: 48rem;
     --text-xs: 0.75rem;
     --text-xs--line-height: calc(1 / 0.75);
     --text-sm: 0.875rem;
@@ -540,6 +546,9 @@
   .ml-auto {
     margin-left: auto;
   }
+  .block {
+    display: block;
+  }
   .flex {
     display: flex;
   }
@@ -564,6 +573,9 @@
   .h-2 {
     height: calc(var(--spacing) * 2);
   }
+  .h-3 {
+    height: calc(var(--spacing) * 3);
+  }
   .h-4 {
     height: calc(var(--spacing) * 4);
   }
@@ -609,9 +621,15 @@
   .max-h-\[78vh\] {
     max-height: 78vh;
   }
+  .max-h-\[90vh\] {
+    max-height: 90vh;
+  }
   .max-h-\[300px\] {
     max-height: 300px;
   }
+  .min-h-48 {
+    min-height: calc(var(--spacing) * 48);
+  }
   .min-h-\[69vh\] {
     min-height: 69vh;
   }
@@ -621,6 +639,9 @@
   .w-2 {
     width: calc(var(--spacing) * 2);
   }
+  .w-3 {
+    width: calc(var(--spacing) * 3);
+  }
   .w-4 {
     width: calc(var(--spacing) * 4);
   }
@@ -657,12 +678,18 @@
   .w-full {
     width: 100%;
   }
+  .max-w-3xl {
+    max-width: var(--container-3xl);
+  }
   .max-w-64 {
     max-width: calc(var(--spacing) * 64);
   }
   .max-w-\[700px\] {
     max-width: 700px;
   }
+  .max-w-full {
+    max-width: 100%;
+  }
   .max-w-md {
     max-width: var(--container-md);
   }
@@ -681,6 +708,9 @@
   .flex-1 {
     flex: 1;
   }
+  .shrink-0 {
+    flex-shrink: 0;
+  }
   .flex-grow {
     flex-grow: 1;
   }
@@ -852,6 +882,9 @@
     border-right-style: var(--tw-border-style);
     border-right-width: 1px;
   }
+  .border-amber-300 {
+    border-color: var(--color-amber-300);
+  }
   .border-blue-200 {
     border-color: var(--color-blue-200);
   }
@@ -867,12 +900,21 @@
   .border-gray-300 {
     border-color: var(--color-gray-300);
   }
+  .border-red-300 {
+    border-color: var(--color-red-300);
+  }
   .border-transparent {
     border-color: #0000;
   }
   .border-t-transparent {
     border-top-color: #0000;
   }
+  .bg-amber-50 {
+    background-color: var(--color-amber-50);
+  }
+  .bg-amber-100 {
+    background-color: var(--color-amber-100);
+  }
   .bg-black\/50 {
     background-color: #00000080;
   }
@@ -1027,6 +1069,9 @@
   .text-left {
     text-align: left;
   }
+  .font-mono {
+    font-family: var(--font-mono);
+  }
   .font-sans {
     font-family: var(--font-sans);
   }
@@ -1083,6 +1128,12 @@
   .whitespace-pre-line {
     white-space: pre-line;
   }
+  .whitespace-pre-wrap {
+    white-space: pre-wrap;
+  }
+  .text-amber-800 {
+    color: var(--color-amber-800);
+  }
   .text-black {
     color: var(--color-black);
   }
@@ -1125,6 +1176,9 @@
   .text-red-600 {
     color: var(--color-red-600);
   }
+  .text-red-700 {
+    color: var(--color-red-700);
+  }
   .text-white {
     color: var(--color-white);
   }
@@ -1262,6 +1316,9 @@
     .hover\:text-yellow-700:hover {
       color: var(--color-yellow-700);
     }
+    .hover\:underline:hover {
+      text-decoration-line: underline;
+    }
     .hover\:shadow-lg:hover {
       --tw-shadow: 0 10px 15px -3px var(--tw-shadow-color, #0000001a),
         0 4px 6px -4px var(--tw-shadow-color, #0000001a);
@@ -1322,6 +1379,9 @@
     .sm\:flex-row {
       flex-direction: row;
     }
+    .sm\:justify-center {
+      justify-content: center;
+    }
     :where(.sm\:space-y-0 > :not(:last-child)) {
       --tw-space-y-reverse: 0;
       margin-block-start: calc(
@@ -1514,6 +1574,42 @@ body {
   list-style-type: decimal;
   list-style-position: inside;
 }
+.markdown-renderer table {
+  border-collapse: collapse;
+  width: 100%;
+  margin: 0.5rem 0;
+}
+.markdown-renderer th,
+.markdown-renderer td {
+  text-align: left;
+  vertical-align: top;
+  border: 1px solid #d1d5db;
+  padding: 0.25rem 0.5rem;
+}
+.markdown-renderer th {
+  background-color: #f3f4f6;
+  font-weight: 600;
+}
+.file-read h1,
+.file-read h2,
+.file-read h3 {
+  margin-top: 0.75rem;
+  font-size: 1.05rem;
+  font-weight: 600;
+}
+.file-read h4 {
+  color: #6b7280;
+  border-bottom: 1px solid #e5e7eb;
+  margin: 1rem 0 0.5rem;
+  padding-bottom: 0.25rem;
+  font-size: 0.75rem;
+}
+.file-read h4:first-child {
+  margin-top: 0;
+}
+.file-read p {
+  margin-bottom: 0.5rem;
+}
 .appear {
   transform-origin: top;
   opacity: 0;