@learnpack/learnpack 5.0.272 → 5.0.275

package/lib/commands/serve.js

@@ -4,7 +4,6 @@ exports.processImage = exports.createLearnJson = void 0;
 const tslib_1 = require("tslib");
 const command_1 = require("@oclif/command");
 const buffer_1 = require("buffer");
-const youtube_transcript_1 = require("youtube-transcript");
 const express = require("express");
 const cors = require("cors");
 const path = require("path");
@@ -82,7 +81,6 @@ const processImage = async (url, description, rigoToken, courseSlug) => {
             prompt: description,
             callbackUrl: webhookUrl,
         });
-        // console.log("✅ Image", imagePath, "generated successfully!")
         return true;
     }
     catch (_a) {
@@ -105,9 +103,7 @@ const uploadInitialReadme = async (bucket, exSlug, targetDir, packageContext) =>
   :rigo
   \`\`\`
       `;
-    const readmeFilename = `README.${packageContext.language && packageContext.language !== "en" ?
-        `${packageContext.language}.` :
-        ""}md`;
+    const readmeFilename = `README${(0, creatorUtilities_1.getReadmeExtension)(packageContext.language || "en")}`;
     await uploadFileToBucket(bucket, isGeneratingText, `${targetDir}/${readmeFilename}`);
 };
 const cleanFormState = (formState) => {
@@ -134,12 +130,12 @@ const createMultiLangAsset = async (bucket, rigoToken, bcToken, courseSlug, cour
         all_translations.push(asset.slug);
     }
 };
-async function startExerciseGeneration(bucket, rigoToken, steps, packageContext, exercise, tutorialDir, courseSlug, purposeSlug, lastLesson = "") {
+async function startExerciseGeneration(rigoToken, steps, packageContext, exercise, courseSlug, purposeSlug, lastLesson = "") {
     const exSlug = (0, creatorUtilities_2.slugify)(exercise.id + "-" + exercise.title);
     console.log("Starting generation of", exSlug);
     const webhookUrl = `${process.env.HOST}/webhooks/${courseSlug}/exercise-processor/${exercise.id}/${rigoToken}`;
     console.log("WEBHOOK URL", webhookUrl);
-    await (0, rigoActions_1.readmeCreator)(rigoToken, {
+    const res = await (0, rigoActions_1.readmeCreator)(rigoToken, {
         title: `${exercise.id} - ${exercise.title}`,
         output_lang: packageContext.language || "en",
         list_of_exercises: JSON.stringify(steps.map(step => step.id + "-" + step.title)),
@@ -148,6 +144,8 @@ async function startExerciseGeneration(bucket, rigoToken, steps, packageContext,
         kind: exercise.type.toLowerCase(),
         last_lesson: lastLesson,
     }, purposeSlug, webhookUrl);
+    console.log("README CREATOR RES", res);
+    return res.id;
 }
 async function createInitialReadme(tutorialInfo, tutorialSlug, rigoToken) {
     const webhookUrl = `${process.env.HOST}/webhooks/${tutorialSlug}/initial-readme-processor`;
@@ -433,10 +431,18 @@ class ServeCommand extends SessionCommand_1.default {
                     previousReadme = content.toString();
                 }
             }
-            await startExerciseGeneration(bucket, rigoToken, syllabusJson.lessons, syllabusJson.courseInfo, exercise, `courses/${courseSlug}`, courseSlug, syllabusJson.courseInfo.purpose, previousReadme +
+            const completionId = await startExerciseGeneration(rigoToken, syllabusJson.lessons, syllabusJson.courseInfo, exercise, courseSlug, syllabusJson.courseInfo.purpose, previousReadme +
                 "\n\nThe user provided the following feedback related to the content of the course so far: \n\n" +
                 feedback);
             syllabusJson.lessons[parseInt(position)].status = "GENERATING";
+            syllabusJson.lessons[parseInt(position)].translations = {
+                [syllabusJson.courseInfo.language || "en"]: {
+                    completionId,
+                    startedAt: Date.now(),
+                    completedAt: 0,
+                },
+            };
+            console.log("Lesson", syllabusJson.lessons[parseInt(position)]);
             if (syllabusJson.feedback &&
                 typeof syllabusJson.feedback === "string") {
                 syllabusJson.feedback += "\n\n" + feedback;
@@ -447,6 +453,23 @@ class ServeCommand extends SessionCommand_1.default {
             await uploadFileToBucket(bucket, JSON.stringify(syllabusJson), `courses/${courseSlug}/.learn/initialSyllabus.json`);
             res.json({ status: "SUCCESS" });
         });
+        app.post("/actions/generate-image/:courseSlug", async (req, res) => {
+            const rigoToken = req.header("x-rigo-token");
+            const { courseSlug } = req.params;
+            const { image } = req.body;
+            if (!image) {
+                return res.status(400).json({
+                    error: "Image is required",
+                });
+            }
+            if (!rigoToken) {
+                return res.status(400).json({
+                    error: "Rigo token is required. x-rigo-token header is missing",
+                });
+            }
+            await (0, exports.processImage)(image.url, image.alt, rigoToken, courseSlug);
+            res.json({ status: "QUEUED" });
+        });
         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;
@@ -499,40 +522,55 @@ class ServeCommand extends SessionCommand_1.default {
                     log: `✅ Code file created for ${exercise.title}`,
                 });
             }
-            let nextStarted = false;
+            let nextCompletionId = null;
             if (nextExercise &&
                 (exerciseIndex === 0 || !(exerciseIndex % 3 === 0))) {
                 let feedback = "";
                 if (syllabusJson.feedback) {
                     feedback = `\n\nThe user added the following feedback with relation to the previous generations: ${syllabusJson.feedback}`;
                 }
-                startExerciseGeneration(bucket, rigoToken, syllabusJson.lessons, syllabusJson.courseInfo, nextExercise, `courses/${courseSlug}`, courseSlug, syllabusJson.courseInfo.purpose, readme.parsed.content + "\n\n" + feedback);
-                nextStarted = true;
+                nextCompletionId = await startExerciseGeneration(rigoToken, syllabusJson.lessons, syllabusJson.courseInfo, nextExercise, courseSlug, syllabusJson.courseInfo.purpose, readme.parsed.content + "\n\n" + feedback);
             }
             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) {
-                (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
-                    lesson: exSlug,
-                    status: "pending",
-                    log: `🔄 Generating images for ${exercise.title}`,
-                });
-                for (const image of imagesArray) {
-                    // eslint-disable-next-line no-await-in-loop
-                    await (0, exports.processImage)(image.url, image.alt, rigoToken, courseSlug);
-                }
-            }
             const newSyllabus = Object.assign(Object.assign({}, syllabusJson), { lessons: syllabusJson.lessons.map((lesson, index) => {
                     if (index === exerciseIndex) {
-                        return Object.assign(Object.assign({}, lesson), { generated: true, status: "DONE" });
+                        const currentTranslations = lesson.translations || {};
+                        let currentTranslation = currentTranslations[syllabusJson.courseInfo.language || "en"];
+                        if (currentTranslation) {
+                            currentTranslation.completedAt = Date.now();
+                        }
+                        else {
+                            currentTranslation = {
+                                completionId: readme.id,
+                                startedAt: Date.now(),
+                                completedAt: Date.now(),
+                            };
+                        }
+                        currentTranslations[syllabusJson.courseInfo.language || "en"] =
+                            currentTranslation;
+                        return Object.assign(Object.assign({}, lesson), { generated: true, status: "DONE", translations: {
+                                [syllabusJson.courseInfo.language || "en"]: {
+                                    completionId: nextCompletionId,
+                                    completedAt: Date.now(),
+                                },
+                            } });
                     }
-                    if (nextExercise && nextExercise.id === lesson.id && nextStarted) {
-                        return Object.assign(Object.assign({}, lesson), { generated: false, status: "GENERATING" });
+                    if (nextExercise &&
+                        nextExercise.id === lesson.id &&
+                        nextCompletionId) {
+                        return Object.assign(Object.assign({}, lesson), { generated: false, status: "GENERATING", translations: {
+                                [syllabusJson.courseInfo.language || "en"]: {
+                                    completionId: nextCompletionId,
+                                    startedAt: Date.now(),
+                                },
+                            } });
                     }
                     return Object.assign({}, lesson);
                 }) });
+            console.log("New syllabus", newSyllabus);
             await uploadFileToBucket(bucket, JSON.stringify(newSyllabus), `courses/${courseSlug}/.learn/initialSyllabus.json`);
             (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
                 lesson: exSlug,
@@ -937,7 +975,16 @@ class ServeCommand extends SessionCommand_1.default {
             await uploadFileToBucket(bucket, JSON.stringify(sidebar), `${tutorialDir}/.learn/sidebar.json`);
             const firstLesson = syllabus.lessons[0];
             const lastResult = "---";
-            await startExerciseGeneration(bucket, rigoToken, syllabus.lessons, syllabus.courseInfo, firstLesson, tutorialDir, courseSlug, syllabus.courseInfo.purpose, lastResult);
+            const completionId = await startExerciseGeneration(rigoToken, syllabus.lessons, syllabus.courseInfo, firstLesson, courseSlug, syllabus.courseInfo.purpose, lastResult);
+            if (firstLesson) {
+                firstLesson.translations = {
+                    [syllabus.courseInfo.language || "en"]: {
+                        completionId,
+                        startedAt: Date.now(),
+                        completedAt: 0,
+                    },
+                };
+            }
             await createInitialReadme(JSON.stringify(syllabus.courseInfo), courseSlug, rigoToken);
             return res.json({
                 message: "Course generation started",
@@ -958,29 +1005,44 @@ class ServeCommand extends SessionCommand_1.default {
                 return res.status(500).json({ error: "Error getting syllabus" });
             }
         });
-        app.post("/actions/continue-course/:courseSlug", async (req, res) => {
-            console.log("POST /actions/continue-course/:courseSlug");
-            const { courseSlug } = req.params;
-            const { feedback } = req.body;
-            const rigoToken = req.header("x-rigo-token");
-            const bcToken = req.header("x-breathecode-token");
-            if (!rigoToken || !bcToken) {
-                return res.status(400).json({ error: "Missing tokens" });
-            }
-            const syllabus = await bucket.file(`courses/${courseSlug}/.learn/initialSyllabus.json`);
-            const [content] = await syllabus.download();
-            const syllabusJson = JSON.parse(content.toString());
-            const notGeneratedLessons = syllabusJson.lessons.filter(lesson => !lesson.generated);
-            const lastGeneratedLesson = findLast(syllabusJson.lessons, lesson => { var _a; return (_a = lesson.generated) !== null && _a !== void 0 ? _a : false; });
-            console.log("ABout to generate", notGeneratedLessons.length, "lessons");
-            const firstLessonToGenerate = notGeneratedLessons[0];
-            await startExerciseGeneration(bucket, rigoToken, syllabusJson.lessons, syllabusJson.courseInfo, firstLessonToGenerate, `courses/${courseSlug}`, courseSlug, syllabusJson.courseInfo.purpose, JSON.stringify(lastGeneratedLesson) +
-                `\n\nThe user provided this feedback in relation to the course: ${feedback}`);
-            return res.json({
-                message: "Course continued",
-                slug: courseSlug,
-            });
-        });
+        // app.post("/actions/continue-course/:courseSlug", async (req, res) => {
+        //   console.log("POST /actions/continue-course/:courseSlug")
+        //   const { courseSlug } = req.params
+        //   const { feedback }: { feedback: string } = req.body
+        //   const rigoToken = req.header("x-rigo-token")
+        //   const bcToken = req.header("x-breathecode-token")
+        //   if (!rigoToken || !bcToken) {
+        //     return res.status(400).json({ error: "Missing tokens" })
+        //   }
+        //   const syllabus = await bucket.file(
+        //     `courses/${courseSlug}/.learn/initialSyllabus.json`
+        //   )
+        //   const [content] = await syllabus.download()
+        //   const syllabusJson: Syllabus = JSON.parse(content.toString())
+        //   const notGeneratedLessons = syllabusJson.lessons.filter(
+        //     lesson => !lesson.generated
+        //   )
+        //   const lastGeneratedLesson = findLast(
+        //     syllabusJson.lessons,
+        //     lesson => lesson.generated ?? false
+        //   )
+        //   console.log("ABout to generate", notGeneratedLessons.length, "lessons")
+        //   const firstLessonToGenerate = notGeneratedLessons[0]
+        //   const completionId = await startExerciseGeneration(
+        //     rigoToken,
+        //     syllabusJson.lessons,
+        //     syllabusJson.courseInfo,
+        //     firstLessonToGenerate,
+        //     courseSlug,
+        //     syllabusJson.courseInfo.purpose,
+        //     JSON.stringify(lastGeneratedLesson) +
+        //       `\n\nThe user provided this feedback in relation to the course: ${feedback}`
+        //   )
+        //   return res.json({
+        //     message: "Course continued",
+        //     slug: courseSlug,
+        //   })
+        // })
         app.get("/courses/:courseSlug/exercises/:exerciseSlug/", async (req, res) => {
             var _a;
             console.log("GET /courses/:courseSlug/exercises/:exerciseSlug/");
@@ -1135,9 +1197,9 @@ class ServeCommand extends SessionCommand_1.default {
             }
             catch (error) {
                 console.error("❌ Error fetching file:", error);
-                return res
-                    .status(500)
-                    .json({ error: error.message || "Unable to fetch file" });
+                return res.status(500).json({
+                    error: error.message || "Unable to fetch file",
+                });
             }
         });
         const YT_REGEX = /(?:youtube\.com\/watch\?v=|youtu\.be\/)([\w-]{11})/;
@@ -1149,20 +1211,30 @@ class ServeCommand extends SessionCommand_1.default {
                 const ytMatch = decoded.match(YT_REGEX);
                 if (ytMatch) {
                     const videoId = ytMatch[1];
-                    // fetch metadata
-                    const items = await youtube_transcript_1.YoutubeTranscript.fetchTranscript(videoId);
-                    const transcript = items.map(i => i.text).join(" ");
-                    const { data: meta } = await axios_1.default.get("https://www.youtube.com/oembed", {
-                        params: { url: decoded, format: "json" },
-                    });
+                    const resFromRigo = await axios_1.default.get(`${api_1.RIGOBOT_REALTIME_HOST}/actions/youtube-transcript/${videoId}`);
+                    console.log("RES FROM RIGO", resFromRigo.data);
+                    const transcript = resFromRigo.data.transcript;
+                    // let meta: any = null
+                    // try {
+                    //   const { data: meta } = await axios.get(
+                    //     "https://www.youtube.com/oembed",
+                    //     {
+                    //       params: { url: decoded, format: "json" },
+                    //     }
+                    //   )
+                    //   console.log("META", meta)
+                    // } catch (error) {
+                    //   console.error("ERROR FETCHING META", error)
+                    //   meta = null
+                    // }
                     return res.json({
                         url: decoded,
-                        title: meta.title,
-                        author: meta.author_name,
-                        thumbnail: meta.thumbnail_url,
+                        title: resFromRigo.data.title || null,
+                        author: resFromRigo.data.author || null,
                         transcript,
                     });
                 }
+                console.log("NOT A YOUTUBE LINK", decoded);
                 const response = await axios_1.default.get(decoded, { responseType: "text" });
                 const html = response.data;
                 const title = getTitleFromHTML(html);

package/lib/creatorDist/assets/{index-C1pv1wUb.js → index-BfLyIQVh.js}

@@ -18650,7 +18650,7 @@ const Cv = async (e) => {
       const l = Qu(15),
         u = `${
           Bb
-            ? "https://9cw5zmww-3000.use2.devtunnels.ms"
+            ? "https://1gm40gnb-3000.use2.devtunnels.ms"
             : window.location.origin
         }/notifications/${l}`
       return (
@@ -30522,7 +30522,8 @@ const qD = ({ messages: e, syllabus: t }) => {
                   p.lessons.length === 0 &&
                     t.length < 3 &&
                     E.jsx("div", {
-                      className: "text-center text-gray-200 font-bold text-lg",
+                      className:
+                        "text-center text-gray-500 font-bold text-lg h-[50vh] flex items-center justify-center",
                       children: N1("contentIndex.noLessons"),
                     }),
                   p.lessons.map((T, S) =>
@@ -38943,6 +38944,8 @@ const RL = {
     creatingCourseAs: "Creating the course as {{name}}",
     loginAsSomeoneElse: "Login as someone else",
     continueScrolling: "Continue scrolling",
+    noLessons:
+      "The content could not be generated, please talk with Rigobot to give it more context.",
     okMessage: "If you're satisfied, type 'OK' in the chat.",
     instructionsMessage: `If not, what would you like me to change? You can say things like:
   - Add more exercises
@@ -39090,6 +39093,8 @@ const RL = {
     creatingCourseAs: "Creando el curso como {{name}}",
     loginAsSomeoneElse: "Iniciar sesión como alguien más",
     continueScrolling: "Continuar desplazando",
+    noLessons:
+      "El contenido no pudo ser generado, por favor habla con Rigobot para darle más contexto.",
     okMessage: "Si estás satisfecho, escribe 'OK' en el chat.",
     instructionsMessage: `Si no, ¿qué te gustaría que cambiara? Puedes decir cosas como:
   - Añadir más ejercicios

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

@@ -566,6 +566,9 @@
   .h-60 {
     height: calc(var(--spacing) * 60);
   }
+  .h-\[50vh\] {
+    height: 50vh;
+  }
   .h-\[85\%\] {
     height: 85%;
   }
@@ -1043,9 +1046,6 @@
   .text-blue-900 {
     color: var(--color-blue-900);
   }
-  .text-gray-200 {
-    color: var(--color-gray-200);
-  }
   .text-gray-400 {
     color: var(--color-gray-400);
   }

package/lib/creatorDist/index.html

@@ -10,8 +10,8 @@
     />
 
     <title>Learnpack Creator: Craft tutorials in seconds!</title>
-    <script type="module" crossorigin src="/creator/assets/index-C1pv1wUb.js"></script>
-    <link rel="stylesheet" crossorigin href="/creator/assets/index-B4khtb0r.css">
+    <script type="module" crossorigin src="/creator/assets/index-BfLyIQVh.js"></script>
+    <link rel="stylesheet" crossorigin href="/creator/assets/index-C39zeF3W.css">
   </head>
   <body>
     <div id="root"></div>

package/lib/models/creator.d.ts

@@ -7,6 +7,13 @@ export interface Lesson {
     duration?: number;
     generated?: boolean;
     status?: "PENDING" | "GENERATING" | "DONE" | "ERROR";
+    translations?: {
+        [key: string]: {
+            completionId: number;
+            startedAt: number;
+            completedAt?: number;
+        };
+    };
 }
 export interface ParsedLink {
     name: string;

package/lib/utils/api.d.ts

@@ -1,4 +1,5 @@
 export declare const RIGOBOT_HOST = "https://rigobot.herokuapp.com";
+export declare const RIGOBOT_REALTIME_HOST = "https://chat.4geeks.com";
 type TConsumableSlug = "ai-conversation-message" | "ai-compilation" | "ai-tutorial-generation" | "ai-generation" | "learnpack-publish";
 export declare const countConsumables: (consumables: any, consumableSlug?: TConsumableSlug) => any;
 export declare const getConsumable: (token: string, consumableSlug?: TConsumableSlug) => Promise<any>;

package/lib/utils/api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentTechnologies = exports.fetchTechnologies = exports.doesAssetExists = exports.createAsset = exports.validateToken = exports.listUserAcademies = exports.getConsumable = exports.countConsumables = exports.RIGOBOT_HOST = void 0;
+exports.getCurrentTechnologies = exports.fetchTechnologies = exports.doesAssetExists = exports.createAsset = exports.validateToken = exports.listUserAcademies = exports.getConsumable = exports.countConsumables = exports.RIGOBOT_REALTIME_HOST = exports.RIGOBOT_HOST = void 0;
 const console_1 = require("../utils/console");
 const storage = require("node-persist");
 const cli_ux_1 = require("cli-ux");
@@ -9,6 +9,7 @@ const dotenv = require("dotenv");
 dotenv.config();
 const HOST = "https://breathecode.herokuapp.com";
 exports.RIGOBOT_HOST = "https://rigobot.herokuapp.com";
+exports.RIGOBOT_REALTIME_HOST = "https://chat.4geeks.com";
 // export const RIGOBOT_HOST = "https://rigobot-test-cca7d841c9d8.herokuapp.com"
 // export const RIGOBOT_HOST =
 // "https://8000-charlytoc-rigobot-bmwdeam7cev.ws-us118.gitpod.io"
@@ -354,6 +355,7 @@ const createAsset = async (token, asset) => {
         learnpack_deploy_url: asset.learnpack_deploy_url,
         technologies: asset.technologies,
         readme_raw: asset.readme_raw,
+        all_translations: asset.all_translations,
     };
     const url = `https://breathecode.herokuapp.com/v1/registry/asset/me`;
     const headers = {

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.272",
+  "version": "5.0.275",
   "author": "Alejandro Sanchez @alesanchezr",
   "contributors": [
     {