@learnpack/learnpack 5.0.234 → 5.0.240

package/lib/commands/init.js

@@ -270,8 +270,12 @@ const handleAILogic = async (tutorialDir, packageInfo) => {
     const imagePromises = imagesArray.map(async (image) => {
         try {
             const filename = (0, creatorUtilities_1.getFilenameFromUrl)(image.url);
+            const webhookUrl = `${process.env.HOST}/webhooks/${(0, creatorUtilities_1.slugify)(packageInfo.title.us)}/images/${filename}`;
             const imagePath = path.join(tutorialDir, ".learn", "assets", filename);
-            const res = await (0, rigoActions_1.generateImage)(rigoToken, { prompt: image.alt });
+            const res = await (0, rigoActions_1.generateImage)(rigoToken, {
+                prompt: image.alt,
+                callbackUrl: webhookUrl,
+            });
             await (0, rigoActions_1.downloadImage)(res.image_url, imagePath);
             return true;
         }
@@ -289,8 +293,9 @@ const handleAILogic = async (tutorialDir, packageInfo) => {
         prompt: "Generate a preview image for the tutorial. This is all the tutorial information: " +
             packageContext +
             "\n Generate only a basic preview image, add the tutorial Title as a text add the top middle, avoid adding any other text elements. Try to generate an image that related with the tutorial content.",
+        callbackUrl: `${process.env.HOST}/webhooks/${(0, creatorUtilities_1.slugify)(packageInfo.title.us)}/images/preview.png`,
     });
-    await (0, rigoActions_1.downloadImage)(res.image_url, imagePath);
+    // await downloadImage(res.image_url, imagePath)
     return true;
 };
 const getChoices = async (empty) => {

package/lib/commands/publish.d.ts

@@ -2,7 +2,7 @@ import SessionCommand from "../utils/SessionCommand";
 export declare const handleAssetCreation: (sessionPayload: {
     token: string;
     rigobotToken: string;
-}, learnJson: any, selectedLang: string, learnpackDeployUrl: string) => Promise<void>;
+}, learnJson: any, selectedLang: string, learnpackDeployUrl: string, b64IndexReadme: string) => Promise<void>;
 declare class BuildCommand extends SessionCommand {
     static description: string;
     static flags: {

package/lib/commands/publish.js

@@ -19,10 +19,10 @@ const prompts = require("prompts");
 const rigoActions_1 = require("../utils/rigoActions");
 const misc_1 = require("../utils/misc");
 const uploadZipEndpont = api_1.RIGOBOT_HOST + "/v1/learnpack/upload";
-const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, learnpackDeployUrl) => {
+const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, learnpackDeployUrl, b64IndexReadme) => {
     const categories = {
-        us: 91,
-        es: 92,
+        us: 9,
+        es: 10,
     };
     let category = categories[selectedLang];
     if (!category) {
@@ -45,6 +45,7 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
                 owner: user.id,
                 author: user.id,
                 preview: learnJson.preview,
+                readme_raw: b64IndexReadme,
             });
             await api_1.default.updateRigoAssetID(sessionPayload.token, learnJson.slug, asset.id);
             console_1.default.info("Asset created with id", asset.id);
@@ -295,7 +296,7 @@ class BuildCommand extends SessionCommand_1.default {
                 console.log(res.data);
                 fs.unlinkSync(zipFilePath);
                 this.removeDirectory(buildDir);
-                await (0, exports.handleAssetCreation)(sessionPayload, learnJson, "us", res.data.url);
+                await (0, exports.handleAssetCreation)(sessionPayload, learnJson, "us", res.data.url, "");
             }
             catch (error) {
                 if (axios_1.default.isAxiosError(error)) {

package/lib/commands/serve.d.ts

@@ -1,6 +1,5 @@
 import SessionCommand from "../utils/SessionCommand";
-import { Bucket } from "@google-cloud/storage";
-import { FormState, Lesson } from "../models/creator";
+import { FormState } from "../models/creator";
 export declare const createLearnJson: (courseInfo: FormState) => {
     slug: string;
     title: {
@@ -20,8 +19,7 @@ export declare const createLearnJson: (courseInfo: FormState) => {
     };
     preview: string;
 };
-export declare const processImage: (bucket: Bucket, tutorialDir: string, url: string, description: string, rigoToken: string) => Promise<boolean>;
-export declare function processExercise(bucket: Bucket, rigoToken: string, steps: Lesson[], packageContext: FormState, exercise: Lesson, tutorialDir: string, courseSlug: string, purposeSlug: string, lastLesson?: string): Promise<string>;
+export declare const processImage: (url: string, description: string, rigoToken: string, courseSlug: string) => Promise<boolean>;
 export default class ServeCommand extends SessionCommand {
     static description: string;
     static flags: any;

package/lib/commands/serve.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processImage = exports.createLearnJson = void 0;
-exports.processExercise = processExercise;
 const tslib_1 = require("tslib");
 const command_1 = require("@oclif/command");
 // import { readDocument } from "../utils/readDocuments"
@@ -93,14 +92,46 @@ const PARAMS = {
     max_rewrite_attempts: 2,
     max_title_length: 50,
 };
-const processImage = async (bucket, tutorialDir, url, description, rigoToken) => {
+// app.post("/webhooks/:courseSlug/images/:imageId", async (req, res) => {
+//   const { courseSlug, imageId } = req.params
+//   const body = req.body
+//   console.log("RECEIVING IMAGE WEBHOOK", body)
+//   const imageUrl = body.image_url
+//   const imagePath = `courses/${courseSlug}/.learn/assets/${imageId}`
+//   const imageFile = bucket.file(imagePath)
+//   const [exists] = await imageFile.exists()
+//   if (!exists) {
+//     // Descargar la imagen
+//     const response = await fetch(imageUrl)
+//     if (!response.ok) {
+//       return res.status(400).json({
+//         status: "ERROR",
+//         message: "No se pudo descargar la imagen",
+//       })
+//     }
+//     const buffer = await response.arrayBuffer()
+//     // Guardar la imagen en el bucket
+//     await imageFile.save(new Uint8Array(buffer), {
+//       contentType: "image/png",
+//     })
+//   }
+//   emitToNotification(imageId, {
+//     status: "SUCCESS",
+//     message: "Image generated successfully",
+//   })
+//   res.json({ status: "SUCCESS" })
+// })
+const processImage = async (url, description, rigoToken, courseSlug) => {
     try {
+        // TODO: MAKE THIS ASYNC
         const filename = (0, creatorUtilities_1.getFilenameFromUrl)(url);
-        const imagePath = `${tutorialDir}/.learn/assets/${filename}`;
-        console.log("🖼️ Generating image", imagePath);
-        const res = await (0, rigoActions_1.generateImage)(rigoToken, { prompt: description });
-        await uploadImageToBucket(bucket, res.image_url, imagePath);
-        console.log("✅ Image", imagePath, "generated successfully!");
+        const webhookUrl = `${process.env.HOST}/webhooks/${courseSlug}/images/${filename}`;
+        await (0, rigoActions_1.generateImage)(rigoToken, {
+            prompt: description,
+            callbackUrl: webhookUrl,
+        });
+        // await uploadImageToBucket(bucket, res.image_url, imagePath)
+        // console.log("✅ Image", imagePath, "generated successfully!")
         return true;
     }
     catch (_a) {
@@ -148,83 +179,19 @@ async function startExerciseGeneration(bucket, rigoToken, steps, packageContext,
         kind: exercise.type.toLowerCase(),
         last_lesson: lastLesson,
     }, purposeSlug, webhookUrl);
-    // console.log("res processing in background", res)
 }
-async function processExercise(bucket, rigoToken, steps, packageContext, exercise, tutorialDir, courseSlug, purposeSlug, lastLesson = "") {
-    const exercisesDir = `${tutorialDir}/exercises`;
-    //   const tid = toast.loading("Generating lesson...")
-    const exSlug = (0, creatorUtilities_2.slugify)(exercise.id + "-" + exercise.title);
-    console.log("exSlug", exSlug);
-    const readmeFilename = `README.${packageContext.language && packageContext.language !== "en" ?
-        `${packageContext.language}.` :
-        ""}md`;
-    const targetDir = `${exercisesDir}/${exSlug}`;
-    console.log("✍🏻 Generating lesson", exercise.id, exercise.title);
-    const readme = 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)),
-        tutorial_description: JSON.stringify(cleanFormState(packageContext)),
-        lesson_description: exercise.description,
-        kind: exercise.type.toLowerCase(),
-        last_lesson: lastLesson,
-    }, purposeSlug);
-    const duration = exercise.duration;
-    // let attempts = 0
-    const readability = (0, creatorUtilities_2.checkReadability)(readme.parsed.content, PARAMS.max_words, duration || 3);
-    (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
-        lesson: exSlug,
-        status: "generating",
-        log: `🔄 The lesson ${exercise.id} - ${exercise.title} has a readability score of ${readability.fkglResult.fkgl}`,
-    });
-    // while (
-    //   readability.fkglResult.fkgl > PARAMS.max_fkgl &&
-    //   attempts < PARAMS.max_rewrite_attempts
-    // ) {
-    //   // eslint-disable-next-line
-    //   const reducedReadme = await makeReadmeReadable(
-    //     rigoToken,
-    //     {
-    //       lesson: readability.body,
-    //       number_of_words: readability.minutes.toString(),
-    //       expected_number_words: PARAMS.max_words.toString(),
-    //       fkgl_results: JSON.stringify(readability.fkglResult),
-    //       expected_grade_level: PARAMS.expected_grade_level,
-    //     },
-    //     purposeSlug
-    //   )
-    //   if (!reducedReadme) break
-    //   readability = checkReadability(
-    //     reducedReadme.parsed.content,
-    //     PARAMS.max_words,
-    //     duration || 3
-    //   )
-    //   attempts++
-    // }
-    await uploadFileToBucket(bucket, readability.newMarkdown, `${targetDir}/${readmeFilename}`);
-    if (exercise.type.toLowerCase() === "code" &&
-        readme.parsed.codefile_content) {
-        console.log("🔍 Creating code file for", exercise.title);
-        await uploadFileToBucket(bucket, readme.parsed.codefile_content, `${targetDir}/${readme.parsed.codefile_name.toLowerCase().trim()}`);
+async function createInitialReadme(tutorialInfo, tutorialSlug, rigoToken) {
+    const webhookUrl = `${process.env.HOST}/webhooks/${tutorialSlug}/initial-readme-processor`;
+    console.log("Creating initial readme", webhookUrl);
+    try {
+        const res = await (0, rigoActions_1.createStructuredPreviewReadme)(rigoToken, {
+            tutorial_info: tutorialInfo,
+        }, webhookUrl);
+        console.log("Initial readme created", res);
     }
-    const imagesArray = (0, creatorUtilities_1.extractImagesFromMarkdown)(readability.newMarkdown);
-    if (imagesArray.length > 0) {
-        (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
-            lesson: exSlug,
-            status: "done",
-            log: `🔄 Generating images for ${exercise.title}`,
-        });
-        for (const image of imagesArray) {
-            // eslint-disable-next-line no-await-in-loop
-            await (0, exports.processImage)(bucket, tutorialDir, image.url, image.alt, rigoToken);
-        }
+    catch (error) {
+        console.error("Error creating initial readme", error);
     }
-    (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
-        lesson: exSlug,
-        status: "done",
-        log: `✅ The lesson ${exercise.id} - ${exercise.title} has been generated successfully!`,
-    });
-    return readability.newMarkdown;
 }
 const fixPreviewUrl = (slug, previewUrl) => {
     if (!previewUrl) {
@@ -391,6 +358,20 @@ class ServeCommand extends SessionCommand_1.default {
             (0, creatorSocket_1.emitToNotification)(id, body);
             res.json({ id, status: "SUCCESS" });
         });
+        app.post("/webhooks/:courseSlug/initial-readme-processor", async (req, res) => {
+            const { courseSlug } = req.params;
+            const body = req.body;
+            console.log("RECEIVING INITIAL README WEBHOOK", body);
+            // Save the file as courses/courseSlug/README.md
+            const filePath = `courses/${courseSlug}/README.${body.parsed.language_code === "us" ||
+                body.parsed.language_code === "en" ?
+                "md" :
+                `${body.parsed.language_code}.md`}`;
+            console.log("Saving initial readme to", filePath);
+            await uploadFileToBucket(bucket, body.parsed.content, filePath);
+            console.log("Initial readme saved to", filePath);
+            res.json({ status: "SUCCESS" });
+        });
         app.post("/webhooks/:courseSlug/images/:imageId", async (req, res) => {
             const { courseSlug, imageId } = req.params;
             const body = req.body;
@@ -459,13 +440,17 @@ class ServeCommand extends SessionCommand_1.default {
                     log: `🔄 Creating code file for ${exercise.title}`,
                 });
                 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",
+                    log: `✅ Code file created for ${exercise.title}`,
+                });
             }
             if (nextExercise) {
                 startExerciseGeneration(bucket, rigoToken, syllabusJson.lessons, syllabusJson.courseInfo, nextExercise, `courses/${courseSlug}`, courseSlug, syllabusJson.courseInfo.purpose, readme.parsed.content);
             }
             const imagesArray = (0, creatorUtilities_1.extractImagesFromMarkdown)(readability.newMarkdown);
             if (imagesArray.length > 0) {
-                console.log("This course requires images and I don't have the token :)");
                 (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
                     lesson: exSlug,
                     status: "pending",
@@ -473,7 +458,7 @@ class ServeCommand extends SessionCommand_1.default {
                 });
                 for (const image of imagesArray) {
                     // eslint-disable-next-line no-await-in-loop
-                    await (0, exports.processImage)(bucket, `courses/${courseSlug}`, image.url, image.alt, rigoToken);
+                    await (0, exports.processImage)(image.url, image.alt, rigoToken, courseSlug);
                 }
             }
             (0, creatorSocket_1.emitToCourse)(courseSlug, "course-creation", {
@@ -826,41 +811,13 @@ class ServeCommand extends SessionCommand_1.default {
             await uploadFileToBucket(bucket, JSON.stringify(sidebar), `${tutorialDir}/.learn/sidebar.json`);
             const firstLesson = syllabus.lessons[0];
             const lastResult = "Nothing";
-            startExerciseGeneration(bucket, rigoToken, syllabus.lessons, syllabus.courseInfo, firstLesson, tutorialDir, courseSlug, syllabus.courseInfo.purpose, 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",
                 slug: (0, creatorUtilities_2.slugify)(syllabus.courseInfo.title),
             });
         });
-        // app.post(
-        //   "/check-latex/:courseSlug/:exerciseSlug/:lang",
-        //   async (req, res) => {
-        //     const { courseSlug, exerciseSlug, lang } = req.params
-        //     const rigoToken = req.header("x-rigo-token")
-        //     if (!rigoToken) {
-        //       return res.status(400).json({ error: "Missing tokens" })
-        //     }
-        //     const exercise = await bucket.file(
-        //       `courses/${courseSlug}/exercises/${exerciseSlug}/README.${lang}.md`
-        //     )
-        //     const [content] = await exercise.download()
-        //     const headers = {
-        //       Authorization: `Token ${rigoToken}`,
-        //     }
-        //     const response = await axios.get(
-        //       `${RIGOBOT_HOST}/v1/prompting/completion/60865/`,
-        //       {
-        //         headers,
-        //       }
-        //     )
-        //     console.log(response.data.parsed.content, "RESPONSE from Rigobot")
-        //     res.json({
-        //       message: "Exercise downloaded",
-        //       completion: response.data,
-        //       exercise: content.toString(),
-        //     })
-        //   }
-        // )
         app.get("/courses/:courseSlug/syllabus", async (req, res) => {
             try {
                 console.log("GET /courses/:courseSlug/syllabus");
@@ -974,7 +931,6 @@ class ServeCommand extends SessionCommand_1.default {
                     title = config.title[availableLangs[0]];
                     selectedLang = availableLangs[0];
                 }
-                console.log(config.description, "CONFIG DESCRIPTION");
                 // console.log(availableLangs, "AVAILABLE LANGs")
                 // console.log(selectedLang, "SELECTED LANG")
                 // console.log(title, "TITLE")
@@ -1021,10 +977,17 @@ class ServeCommand extends SessionCommand_1.default {
                     form.append("file", fs.createReadStream(zipPath));
                     form.append("config", JSON.stringify(config));
                     const rigoRes = await axios_1.default.post(`${api_1.RIGOBOT_HOST}/v1/learnpack/upload`, form, {
-                        headers: Object.assign(Object.assign({}, form.getHeaders()), { Authorization: `Token ${rigoToken}` }),
+                        headers: Object.assign(Object.assign({}, form.getHeaders()), { Authorization: `Token ${rigoToken.trim()}` }),
                     });
-                    await (0, publish_1.handleAssetCreation)({ token: bcToken, rigobotToken: rigoToken }, fullConfig.config, selectedLang, rigoRes.data.url);
+                    const indexReadme = await bucket.file(`courses/${slug}/README.${selectedLang === "us" || selectedLang === "en" ?
+                        "md" :
+                        `${selectedLang}.md`}`);
+                    const [indexReadmeContent] = await indexReadme.download();
+                    const indexReadmeString = indexReadmeContent.toString();
+                    const b64IndexReadme = Buffer.from(indexReadmeString).toString("base64");
+                    await (0, publish_1.handleAssetCreation)({ token: bcToken, rigobotToken: rigoToken }, fullConfig.config, selectedLang, rigoRes.data.url, b64IndexReadme);
                     rimraf.sync(tmpRoot);
+                    console.log("RigoRes", rigoRes.data);
                     return res.json({ url: rigoRes.data.url });
                 });
                 archive.on("error", err => {