@learnpack/learnpack 5.0.267 → 5.0.268

package/lib/commands/serve.js

@@ -403,6 +403,41 @@ class ServeCommand extends SessionCommand_1.default {
                 res.status(500).json({ error: error.message });
             }
         });
+        app.post("/actions/continue-generating/:courseSlug/:position", async (req, res) => {
+            const { courseSlug, position } = req.params;
+            const { feedback } = req.body;
+            const rigoToken = req.header("x-rigo-token");
+            if (!rigoToken) {
+                return res.status(400).json({
+                    error: "Rigo token is required. x-rigo-token header is missing",
+                });
+            }
+            const syllabus = await bucket.file(`courses/${courseSlug}/.learn/initialSyllabus.json`);
+            const [content] = await syllabus.download();
+            const syllabusJson = JSON.parse(content.toString());
+            const exercise = syllabusJson.lessons[parseInt(position)];
+            // previous exercise
+            let previousReadme = "---";
+            const previousExercise = syllabusJson.lessons[parseInt(position) - 1];
+            if (previousExercise) {
+                // Get the readme of the previous exercise
+                const exSlug = (0, creatorUtilities_2.slugify)(previousExercise.id + "-" + previousExercise.title);
+                // llist the files un
+                const [files] = await bucket.getFiles({
+                    prefix: `courses/${courseSlug}/exercises/${exSlug}/README`,
+                });
+                // select any README
+                const readmeFiles = files.map(f => f.name);
+                const readmeFile = readmeFiles.find(f => f.includes("README"));
+                if (readmeFile) {
+                    const [content] = await bucket.file(readmeFile).download();
+                    previousReadme = content.toString();
+                }
+            }
+            await startExerciseGeneration(bucket, rigoToken, syllabusJson.lessons, syllabusJson.courseInfo, exercise, `courses/${courseSlug}`, courseSlug, syllabusJson.courseInfo.purpose, previousReadme +
+                "\n\nThe user provided the following feedback related to the content of the course so far: \n\n" +
+                feedback);
+        });
         app.post("/webhooks/:courseSlug/exercise-processor/:lessonID/:rigoToken", async (req, res) => {
             // console.log("Receiving a webhook to exercise processor")
             const { courseSlug, lessonID, rigoToken } = req.params;
@@ -410,17 +445,26 @@ class ServeCommand extends SessionCommand_1.default {
             const syllabus = await bucket.file(`courses/${courseSlug}/.learn/initialSyllabus.json`);
             const [content] = await syllabus.download();
             const syllabusJson = JSON.parse(content.toString());
+            if (readme.status === "ERROR") {
+                (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
+                    lesson: lessonID,
+                    status: "error",
+                    log: `❌ Error generating the lesson ${lessonID}`,
+                });
+            }
             const exerciseIndex = syllabusJson.lessons.findIndex(lesson => lesson.id === lessonID);
             if (exerciseIndex === -1) {
                 console.log("Exercise not found receiving webhook, this should not happen", lessonID);
                 return res.json({ status: "ERROR", error: "Exercise not found" });
             }
             const exercise = syllabusJson.lessons[exerciseIndex];
-            const nextExercise = syllabusJson.lessons[exerciseIndex + 1] || null;
             if (!exercise) {
-                console.log("Exercise not found receiving webhook, this should not happen", lessonID);
-                return res.json({ status: "SUCCESS" });
+                return res.json({
+                    status: "ERROR",
+                    error: "Exercise not found or is invalid",
+                });
             }
+            const nextExercise = syllabusJson.lessons[exerciseIndex + 1] || null;
             const exSlug = (0, creatorUtilities_2.slugify)(exercise.id + "-" + exercise.title);
             const readability = (0, creatorUtilities_2.checkReadability)(readme.parsed.content, PARAMS.max_words, 3);
             (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
@@ -430,9 +474,7 @@ class ServeCommand extends SessionCommand_1.default {
             });
             const exercisesDir = `courses/${courseSlug}/exercises`;
             const targetDir = `${exercisesDir}/${exSlug}`;
-            const readmeFilename = `README.${readme.parsed.language_code && readme.parsed.language_code !== "en" ?
-                `${readme.parsed.language_code}.` :
-                ""}md`;
+            const readmeFilename = `README${(0, creatorUtilities_1.getReadmeExtension)(readme.parsed.language_code)}`;
             await uploadFileToBucket(bucket, readability.newMarkdown, `${targetDir}/${readmeFilename}`);
             if (exercise.type.toLowerCase() === "code" &&
                 readme.parsed.codefile_content) {
@@ -444,12 +486,18 @@ class ServeCommand extends SessionCommand_1.default {
                 await uploadFileToBucket(bucket, readme.parsed.codefile_content, `${targetDir}/${readme.parsed.codefile_name.toLowerCase().trim()}`);
                 (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
                     lesson: exSlug,
-                    status: "done",
+                    status: "generating",
                     log: `✅ Code file created for ${exercise.title}`,
                 });
             }
-            if (nextExercise) {
+            let nextStarted = false;
+            if (nextExercise &&
+                (exerciseIndex === 0 || !(exerciseIndex % 3 === 0))) {
                 startExerciseGeneration(bucket, rigoToken, syllabusJson.lessons, syllabusJson.courseInfo, nextExercise, `courses/${courseSlug}`, courseSlug, syllabusJson.courseInfo.purpose, readme.parsed.content);
+                nextStarted = true;
+            }
+            else {
+                console.log("Stopping generation process at", exerciseIndex, exercise.title, "because it's a multiple of 3");
             }
             const imagesArray = (0, creatorUtilities_1.extractImagesFromMarkdown)(readability.newMarkdown);
             if (imagesArray.length > 0) {
@@ -463,18 +511,21 @@ class ServeCommand extends SessionCommand_1.default {
                     await (0, exports.processImage)(image.url, image.alt, rigoToken, courseSlug);
                 }
             }
-            (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
-                lesson: exSlug,
-                status: "done",
-                log: `✅ The lesson ${exercise.id} - ${exercise.title} has been generated successfully!`,
-            });
             const newSyllabus = Object.assign(Object.assign({}, syllabusJson), { lessons: syllabusJson.lessons.map(lesson => {
                     if (lesson.id === exercise.id) {
-                        return Object.assign(Object.assign({}, lesson), { generated: true });
+                        return Object.assign(Object.assign({}, lesson), { generated: true, status: "DONE" });
                     }
-                    return lesson;
+                    if (nextExercise && nextExercise.id === lesson.id && !nextStarted) {
+                        return Object.assign(Object.assign({}, lesson), { generated: false, status: "GENERATING" });
+                    }
+                    return Object.assign({}, lesson);
                 }) });
             await uploadFileToBucket(bucket, JSON.stringify(newSyllabus), `courses/${courseSlug}/.learn/initialSyllabus.json`);
+            (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
+                lesson: exSlug,
+                status: "done",
+                log: `✅ The lesson ${exercise.id} - ${exercise.title} has been generated successfully!`,
+            });
             res.json({ status: "SUCCESS" });
         });
         // The following endpoint is used to store an incoming translation where it supposed to be
@@ -865,18 +916,18 @@ class ServeCommand extends SessionCommand_1.default {
             const sidebar = await createInitialSidebar(syllabus.lessons.map(lesson => (0, creatorUtilities_2.slugify)(lesson.id + "-" + lesson.title)), syllabus.courseInfo.language);
             const initialSyllabus = Object.assign(Object.assign({}, syllabus), { lessons: syllabus.lessons.map((lesson, index) => {
                     if (index < 1) {
-                        return Object.assign(Object.assign({}, lesson), { generated: true });
+                        return Object.assign(Object.assign({}, lesson), { generated: false, status: "GENERATING" });
                     }
-                    return Object.assign(Object.assign({}, lesson), { generated: false });
+                    return Object.assign(Object.assign({}, lesson), { generated: false, status: "PENDING" });
                 }) });
             await uploadFileToBucket(bucket, JSON.stringify(initialSyllabus), `${tutorialDir}/.learn/initialSyllabus.json`);
             await uploadFileToBucket(bucket, JSON.stringify(sidebar), `${tutorialDir}/.learn/sidebar.json`);
             const firstLesson = syllabus.lessons[0];
-            const lastResult = "Nothing";
+            const lastResult = "---";
             await startExerciseGeneration(bucket, rigoToken, syllabus.lessons, syllabus.courseInfo, firstLesson, tutorialDir, courseSlug, syllabus.courseInfo.purpose, lastResult);
             await createInitialReadme(JSON.stringify(syllabus.courseInfo), courseSlug, rigoToken);
             return res.json({
-                message: "Course created",
+                message: "Course generation started",
                 slug: syllabus.courseInfo.slug,
             });
         });

package/lib/creatorDist/assets/{index-DmpsXknz.css → index-B4khtb0r.css}

@@ -1043,6 +1043,9 @@
   .text-blue-900 {
     color: var(--color-blue-900);
   }
+  .text-gray-200 {
+    color: var(--color-gray-200);
+  }
   .text-gray-400 {
     color: var(--color-gray-400);
   }