@learnpack/learnpack 5.0.274 → 5.0.276

package/lib/commands/publish.js

@@ -21,15 +21,7 @@ const misc_1 = require("../utils/misc");
 const creatorUtilities_1 = require("../utils/creatorUtilities");
 const uploadZipEndpont = api_1.RIGOBOT_HOST + "/v1/learnpack/upload";
 const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, learnpackDeployUrl, b64IndexReadme, all_translations = []) => {
-    const categories = {
-        en: 9,
-        us: 9,
-        es: 10,
-    };
-    let category = categories[selectedLang];
-    if (!category) {
-        category = 91;
-    }
+    const category = "uncategorized";
     try {
         const user = await api_1.default.validateToken(sessionPayload.token);
         const slug = (0, creatorUtilities_1.slugify)(learnJson.title[selectedLang]).slice(0, 50);
@@ -59,6 +51,7 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
         const asset = await api_1.default.updateAsset(sessionPayload.token, slug, {
             learnpack_deploy_url: learnpackDeployUrl,
             title: learnJson.title[selectedLang],
+            category: category,
             description: learnJson.description[selectedLang],
             all_translations,
         });
@@ -216,7 +209,9 @@ class BuildCommand extends SessionCommand_1.default {
             this.copyDirectory(assetsDir, path.join(buildDir, ".learn", "assets"));
         }
         else {
-            fs.mkdirSync(path.join(buildDir, ".learn", "assets"), { recursive: true });
+            fs.mkdirSync(path.join(buildDir, ".learn", "assets"), {
+                recursive: true,
+            });
         }
         // Copy .learn/_app directory files to the same level as config.json
         const appDir = path.join(process.cwd(), ".learn", "_app");

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) {
@@ -147,6 +145,7 @@ async function startExerciseGeneration(rigoToken, steps, packageContext, exercis
         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`;
@@ -432,10 +431,18 @@ class ServeCommand extends SessionCommand_1.default {
                     previousReadme = content.toString();
                 }
             }
-            await startExerciseGeneration(rigoToken, syllabusJson.lessons, syllabusJson.courseInfo, exercise, 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;
@@ -446,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;
@@ -498,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(rigoToken, syllabusJson.lessons, syllabusJson.courseInfo, nextExercise, 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,
@@ -936,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(rigoToken, syllabus.lessons, syllabus.courseInfo, firstLesson, 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",
@@ -957,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(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.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/");
@@ -1134,9 +1197,7 @@ class ServeCommand extends SessionCommand_1.default {
             }
             catch (error) {
                 console.error("❌ Error fetching file:", error);
-                return res
-                    .status(500)
-                    .json({
+                return res.status(500).json({
                     error: error.message || "Unable to fetch file",
                 });
             }
@@ -1150,28 +1211,25 @@ class ServeCommand extends SessionCommand_1.default {
                 const ytMatch = decoded.match(YT_REGEX);
                 if (ytMatch) {
                     const videoId = ytMatch[1];
-                    console.log("VIDEO ID", videoId);
-                    // fetch metadata
-                    const items = await youtube_transcript_1.YoutubeTranscript.fetchTranscript(videoId);
-                    console.log("ITEMS FROM YOUTUBE TRANSCRIPT", items);
-                    const transcript = items.map(i => i.text).join(" ");
-                    let meta = null;
-                    try {
-                        const { data: meta } = await axios_1.default.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;
-                    }
-                    throw new Error("test");
+                    const resFromRigo = await axios_1.default.get(`${api_1.RIGOBOT_REALTIME_HOST}/actions/youtube-transcript/${videoId}`);
+                    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 === null || meta === void 0 ? void 0 : meta.title) || null,
-                        author: (meta === null || meta === void 0 ? void 0 : meta.author_name) || null,
-                        thumbnail: (meta === null || meta === void 0 ? void 0 : meta.thumbnail_url) || null,
+                        title: resFromRigo.data.title || null,
+                        author: resFromRigo.data.author || null,
                         transcript,
                     });
                 }

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>;
@@ -18,7 +19,7 @@ type TAssetMissing = {
     description: string;
     learnpack_deploy_url: string;
     technologies: string[];
-    category: number;
+    category: number | string;
     owner: number;
     author: number;
     preview: string;

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"
@@ -419,13 +420,14 @@ const getCategories = async (token) => {
     }
 };
 const updateRigoAssetID = async (token, slug, asset_id) => {
+    const cleanToken = token.replace(/[\n\r]/g, "");
     const url = `${exports.RIGOBOT_HOST}/v1/learnpack/package/${slug}/`;
-    const headers = {
-        Authorization: "Token " + token.trim(),
-    };
-    console.log("HEADERS", headers);
     try {
-        const response = await axios_1.default.put(url, { asset_id }, { headers });
+        const response = await axios_1.default.put(url, { asset_id }, {
+            headers: {
+                Authorization: "Token " + cleanToken,
+            },
+        });
         return response.data;
     }
     catch (error) {
@@ -435,11 +437,13 @@ const updateRigoAssetID = async (token, slug, asset_id) => {
 };
 const createRigoPackage = async (token, slug, config) => {
     const url = `${exports.RIGOBOT_HOST}/v1/learnpack/package`;
-    const headers = {
-        Authorization: "Token " + token.trim(),
-    };
+    const cleanToken = token.replace(/[\n\r]/g, "");
     try {
-        const response = await axios_1.default.post(url, { slug, config }, { headers });
+        const response = await axios_1.default.post(url, { slug, config }, {
+            headers: {
+                Authorization: "Token " + cleanToken,
+            },
+        });
         return response.data;
     }
     catch (error) {

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