@learnpack/learnpack 5.0.240 → 5.0.246

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, b64IndexReadme: string) => Promise<void>;
+}, learnJson: any, selectedLang: string, learnpackDeployUrl: string, b64IndexReadme: string, all_translations?: string[]) => Promise<any>;
 declare class BuildCommand extends SessionCommand {
     static description: string;
     static flags: {

package/lib/commands/publish.js

@@ -18,8 +18,9 @@ const api_1 = require("../utils/api");
 const prompts = require("prompts");
 const rigoActions_1 = require("../utils/rigoActions");
 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) => {
+const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, learnpackDeployUrl, b64IndexReadme, all_translations = []) => {
     const categories = {
         us: 9,
         es: 10,
@@ -30,11 +31,12 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
     }
     try {
         const user = await api_1.default.validateToken(sessionPayload.token);
-        const { exists } = await api_1.default.doesAssetExists(sessionPayload.token, learnJson.slug);
+        const slug = (0, creatorUtilities_1.slugify)(learnJson.title[selectedLang]).slice(0, 50);
+        const { exists } = await api_1.default.doesAssetExists(sessionPayload.token, slug);
         if (!exists) {
             console_1.default.info("Asset does not exist in this academy, creating it");
             const asset = await api_1.default.createAsset(sessionPayload.token, {
-                slug: learnJson.slug,
+                slug: slug,
                 title: learnJson.title[selectedLang],
                 lang: selectedLang,
                 description: learnJson.description[selectedLang],
@@ -46,23 +48,26 @@ const handleAssetCreation = async (sessionPayload, learnJson, selectedLang, lear
                 author: user.id,
                 preview: learnJson.preview,
                 readme_raw: b64IndexReadme,
+                all_translations,
             });
             await api_1.default.updateRigoAssetID(sessionPayload.token, learnJson.slug, asset.id);
             console_1.default.info("Asset created with id", asset.id);
+            return asset;
         }
-        else {
-            console_1.default.info("Asset exists, updating it");
-            const asset = await api_1.default.updateAsset(sessionPayload.token, learnJson.slug, {
-                learnpack_deploy_url: learnpackDeployUrl,
-                title: learnJson.title[selectedLang],
-                description: learnJson.description[selectedLang],
-            });
-            await api_1.default.updateRigoAssetID(sessionPayload.rigobotToken, learnJson.slug, asset.id);
-            console_1.default.info("Asset updated with id", asset.id);
-        }
+        console_1.default.info("Asset exists, updating it");
+        const asset = await api_1.default.updateAsset(sessionPayload.token, slug, {
+            learnpack_deploy_url: learnpackDeployUrl,
+            title: learnJson.title[selectedLang],
+            description: learnJson.description[selectedLang],
+            all_translations,
+        });
+        await api_1.default.updateRigoAssetID(sessionPayload.rigobotToken.trim(), learnJson.slug, asset.id);
+        console_1.default.info("Asset updated with id", asset.id);
+        return asset;
     }
     catch (error) {
         console_1.default.error("Error updating or creating asset:", error);
+        return null;
     }
 };
 exports.handleAssetCreation = handleAssetCreation;
@@ -296,7 +301,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.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processImage = exports.createLearnJson = void 0;
 const tslib_1 = require("tslib");
 const command_1 = require("@oclif/command");
-// import { readDocument } from "../utils/readDocuments"
 const youtube_transcript_1 = require("youtube-transcript");
 const express = require("express");
 const cors = require("cors");
@@ -42,11 +41,11 @@ function findLast(array, predicate) {
 }
 const createLearnJson = (courseInfo) => {
     // console.log("courseInfo to create learn json", courseInfo)
-    const expectedPreviewUrl = `https://${(0, creatorUtilities_2.slugify)(courseInfo.title)}.learn-pack.com/preview.png`;
+    const expectedPreviewUrl = `https://${courseInfo.slug}.learn-pack.com/preview.png`;
     console.log("Preview url in generated learn.json", expectedPreviewUrl);
     const language = courseInfo.language || "en";
     const learnJson = {
-        slug: (0, creatorUtilities_2.slugify)(courseInfo.title),
+        slug: courseInfo.slug,
         title: language === "en" || language === "us" ?
             {
                 us: courseInfo.title,
@@ -72,19 +71,6 @@ const uploadFileToBucket = async (bucket, file, path) => {
     const fileRef = bucket.file(path);
     await fileRef.save(Buffer.from(file, "utf8"));
 };
-const uploadImageToBucket = async (bucket, url, path) => {
-    const response = await fetch(url);
-    if (!response.ok) {
-        throw new Error(`Failed to download image: ${response.statusText}`);
-    }
-    const contentType = response.headers.get("content-type") || "application/octet-stream";
-    const buffer = await response.arrayBuffer();
-    const fileRef = bucket.file(path);
-    await fileRef.save(Buffer.from(buffer), {
-        resumable: false,
-        contentType,
-    });
-};
 const PARAMS = {
     expected_grade_level: "8",
     max_fkgl: 10,
@@ -92,35 +78,6 @@ const PARAMS = {
     max_rewrite_attempts: 2,
     max_title_length: 50,
 };
-// 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
@@ -130,7 +87,6 @@ const processImage = async (url, description, rigoToken, courseSlug) => {
             prompt: description,
             callbackUrl: webhookUrl,
         });
-        // await uploadImageToBucket(bucket, res.image_url, imagePath)
         // console.log("✅ Image", imagePath, "generated successfully!")
         return true;
     }
@@ -161,10 +117,25 @@ const uploadInitialReadme = async (bucket, exSlug, targetDir, packageContext) =>
     await uploadFileToBucket(bucket, isGeneratingText, `${targetDir}/${readmeFilename}`);
 };
 const cleanFormState = (formState) => {
-    // keysToDelete: description, technologies, purpose
     const { description, technologies, purpose, hasContentIndex, duration, isCompleted, variables, currentStep, language } = formState, rest = tslib_1.__rest(formState, ["description", "technologies", "purpose", "hasContentIndex", "duration", "isCompleted", "variables", "currentStep", "language"]);
     return rest;
 };
+const createMultiLangAsset = async (bucket, rigoToken, bcToken, courseSlug, courseJson, deployUrl) => {
+    const availableLangs = Object.keys(courseJson.title);
+    console.log("AVAILABLE LANGUAGES to upload asset", availableLangs);
+    const all_translations = [];
+    for (const lang of availableLangs) {
+        // eslint-disable-next-line no-await-in-loop
+        const indexReadme = await bucket.file(`courses/${courseSlug}/README.${lang === "us" || lang === "en" ? "md" : `${lang}.md`}`);
+        // eslint-disable-next-line no-await-in-loop
+        const [indexReadmeContent] = await indexReadme.download();
+        const indexReadmeString = indexReadmeContent.toString();
+        const b64IndexReadme = Buffer.from(indexReadmeString).toString("base64");
+        // eslint-disable-next-line no-await-in-loop
+        const asset = await (0, publish_1.handleAssetCreation)({ token: bcToken, rigobotToken: rigoToken.trim() }, courseJson, lang, deployUrl, b64IndexReadme, all_translations);
+        all_translations.push(asset.slug);
+    }
+};
 async function startExerciseGeneration(bucket, rigoToken, steps, packageContext, exercise, tutorialDir, courseSlug, purposeSlug, lastLesson = "") {
     const exSlug = (0, creatorUtilities_2.slugify)(exercise.id + "-" + exercise.title);
     console.log("Starting generation of", exSlug);
@@ -361,7 +332,6 @@ class ServeCommand extends SessionCommand_1.default {
         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" ?
@@ -629,19 +599,23 @@ class ServeCommand extends SessionCommand_1.default {
         });
         app.post("/actions/translate", express.json(), async (req, res) => {
             console.log("POST /actions/translate");
-            const { exerciseSlugs, languages, rigoToken } = req.body;
+            const { exerciseSlugs, languages, rigoToken, currentLanguage } = req.body;
             const query = req.query;
             const courseSlug = query.slug;
-            console.log("EXERCISE SLUGS", exerciseSlugs);
-            console.log("LANGUAGES", languages);
-            console.log("RIGO TOKEN", rigoToken);
             if (!rigoToken) {
                 return res.status(400).json({ error: "RigoToken not found" });
             }
             const languagesToTranslate = languages.split(",");
+            const course = await bucket
+                .file(`courses/${courseSlug}/learn.json`)
+                .download();
+            const courseJson = JSON.parse(course.toString());
+            const languageCodes = new Set();
             try {
                 await Promise.all(exerciseSlugs.map(async (slug) => {
-                    const readmePath = `courses/${courseSlug}/exercises/${slug}/README.md`;
+                    const readmePath = `courses/${courseSlug}/exercises/${slug}/README${currentLanguage === "us" || currentLanguage === "en" ?
+                        "" :
+                        `.${currentLanguage}`}.md`;
                     const readme = await bucket.file(readmePath).download();
                     await Promise.all(languagesToTranslate.map(async (language) => {
                         const response = await (0, rigoActions_1.translateExercise)(rigoToken, {
@@ -649,10 +623,62 @@ class ServeCommand extends SessionCommand_1.default {
                             output_language: language,
                             exercise_slug: slug,
                         });
-                        const translatedReadme = await bucket.file(`courses/${courseSlug}/exercises/${slug}/README.${response.parsed.output_language_code}.md`);
+                        const translatedReadme = await bucket.file(`courses/${courseSlug}/exercises/${slug}/README${response.parsed.output_language_code === "us" ||
+                            response.parsed.output_language_code === "en" ?
+                            "" :
+                            `.${response.parsed.output_language_code}`}.md`);
                         await translatedReadme.save(response.parsed.translation);
+                        languageCodes.add(response.parsed.output_language_code);
                     }));
                 }));
+                if (languageCodes.has("en")) {
+                    languageCodes.delete("en");
+                    languageCodes.add("us");
+                }
+                const currentLanguages = Object.keys(courseJson.title);
+                for (const languageCode of currentLanguages) {
+                    if (languageCodes.has(languageCode)) {
+                        languageCodes.delete(languageCode);
+                    }
+                }
+                if ([...languageCodes].length > 0) {
+                    console.log("TRANSLATING COURSE METADATA", languageCodes);
+                    const translatedCourseMetadata = await Promise.all([...languageCodes].map(async (languageCode) => {
+                        const result = await (0, rigoActions_1.translateCourseMetadata)(rigoToken, {
+                            title: courseJson.title[currentLanguage],
+                            description: courseJson.description[currentLanguage],
+                            destination_lang_code: languageCode,
+                        });
+                        return {
+                            languageCode,
+                            title: result.parsed.title,
+                            description: result.parsed.description,
+                        };
+                    }));
+                    for (const metadata of translatedCourseMetadata) {
+                        courseJson.title[metadata.languageCode] = metadata.title;
+                        courseJson.description[metadata.languageCode] =
+                            metadata.description;
+                    }
+                    await uploadFileToBucket(bucket, JSON.stringify(courseJson), `courses/${courseSlug}/learn.json`);
+                    const previewReadme = await bucket.file(`courses/${courseSlug}/README${currentLanguage === "us" || currentLanguage === "en" ?
+                        "" :
+                        `.${currentLanguage}`}.md`);
+                    const [previewReadmeContent] = await previewReadme.download();
+                    const previewReadmeContentString = previewReadmeContent.toString();
+                    await Promise.all([...languageCodes].map(async (languageCode) => {
+                        const translatedPreviewReadme = await (0, rigoActions_1.translateExercise)(rigoToken, {
+                            text_to_translate: previewReadmeContentString,
+                            output_language: languageCode,
+                            exercise_slug: "preview-readme",
+                        });
+                        await bucket
+                            .file(`courses/${courseSlug}/README${languageCode === "us" || languageCode === "en" ?
+                            "" :
+                            `.${languageCode}`}.md`)
+                            .save(translatedPreviewReadme.parsed.translation);
+                    }));
+                }
                 return res.status(200).json({ message: "Translated exercises" });
             }
             catch (error) {
@@ -661,6 +687,7 @@ class ServeCommand extends SessionCommand_1.default {
             }
         });
         app.delete("/exercise/:slug/delete", async (req, res) => {
+            console.log("DELETE /exercise/:slug/delete");
             const { slug } = req.params;
             const query = req.query;
             const courseSlug = query.slug;
@@ -696,53 +723,23 @@ class ServeCommand extends SessionCommand_1.default {
             }
             catch (error) {
                 if (error.code === 404) {
-                    console.log("SIDEBAR FILE NOT FOUND", courseSlug);
                     const { exercises } = await (0, configBuilder_1.buildConfig)(bucket, courseSlug);
                     const exerciseSlugsArray = exercises.map(exercise => exercise.slug);
                     const sidebar = await createInitialSidebar(exerciseSlugsArray);
+                    await uploadFileToBucket(bucket, JSON.stringify(sidebar), `courses/${courseSlug}/.learn/sidebar.json`);
                     if (rigoToken) {
                         const { fixedSidebar } = await (0, sidebarGenerator_1.checkAndFixSidebarPure)(sidebar, exercises, rigoToken);
                         if (fixedSidebar) {
                             await uploadFileToBucket(bucket, JSON.stringify(fixedSidebar), `courses/${courseSlug}/.learn/sidebar.json`);
                         }
-                        await uploadFileToBucket(bucket, JSON.stringify(sidebar), `courses/${courseSlug}/.learn/sidebar.json`);
                         return res.status(200).json(fixedSidebar);
                     }
-                    await uploadFileToBucket(bucket, JSON.stringify(sidebar), `courses/${courseSlug}/.learn/sidebar.json`);
                     return res.status(200).json(sidebar);
                 }
                 console.error("Unexpected error:", error);
                 res.status(500).json({ error: error.message });
             }
         });
-        // app.get("/test/:slug", (req, res) => {
-        //   emitToCourse(req.params.slug, "course-creation", {
-        //     lesson: "000-welcome-to-bird-domestication",
-        //     status: "generating",
-        //     log: "Hello",
-        //   })
-        //   emitToCourse(req.params.slug, "course-creation", {
-        //     lesson: "000-welcome-to-bird-domestication",
-        //     status: "generating",
-        //     log: "Hello",
-        //   })
-        //   emitToCourse(req.params.slug, "course-creation", {
-        //     lesson: "000-welcome-to-bird-domestication",
-        //     status: "generating",
-        //     log: "Hello broder",
-        //   })
-        //   emitToCourse(req.params.slug, "course-creation", {
-        //     lesson: "000-welcome-to-bird-domestication",
-        //     status: "done",
-        //     log: "Hello broder",
-        //   })
-        //   emitToCourse(req.params.slug, "course-creation", {
-        //     lesson: "other",
-        //     status: "generating",
-        //     log: "Hello",
-        //   })
-        //   res.send({ message: "Course creation started" })
-        // })
         app.get("/technologies", async (req, res) => {
             console.log("GET /technologies");
             const technologies = await api_1.default.getCurrentTechnologies();
@@ -775,7 +772,7 @@ class ServeCommand extends SessionCommand_1.default {
             if (!rigoToken || !bcToken) {
                 return res.status(400).json({ error: "Missing tokens" });
             }
-            const courseSlug = (0, creatorUtilities_2.slugify)(syllabus.courseInfo.title);
+            const courseSlug = syllabus.courseInfo.slug;
             const tutorialDir = `courses/${courseSlug}`;
             const learnJson = (0, exports.createLearnJson)(syllabus.courseInfo);
             try {
@@ -815,7 +812,7 @@ class ServeCommand extends SessionCommand_1.default {
             await createInitialReadme(JSON.stringify(syllabus.courseInfo), courseSlug, rigoToken);
             return res.json({
                 message: "Course created",
-                slug: (0, creatorUtilities_2.slugify)(syllabus.courseInfo.title),
+                slug: syllabus.courseInfo.slug,
             });
         });
         app.get("/courses/:courseSlug/syllabus", async (req, res) => {
@@ -889,6 +886,7 @@ class ServeCommand extends SessionCommand_1.default {
         app.post("/actions/publish/:slug", async (req, res) => {
             try {
                 const { slug } = req.params;
+                const { currentLanguage } = req.body;
                 const rigoToken = req.header("x-rigo-token");
                 const bcToken = req.header("x-breathecode-token");
                 // const { academyId, categoryId } = req.body
@@ -898,7 +896,6 @@ class ServeCommand extends SessionCommand_1.default {
                         .json({ error: "Authentication failed, missing tokens" });
                 }
                 const { config, exercises } = await (0, configBuilder_1.buildConfig)(bucket, slug);
-                // const fixedSlug = fixSlugLength(slug)
                 const prefix = `courses/${slug}/`;
                 const tmpRoot = path.join(os.tmpdir(), `learnpack-${slug}`);
                 const buildRoot = path.join(tmpRoot, "build");
@@ -931,10 +928,6 @@ class ServeCommand extends SessionCommand_1.default {
                     title = config.title[availableLangs[0]];
                     selectedLang = availableLangs[0];
                 }
-                // console.log(availableLangs, "AVAILABLE LANGs")
-                // console.log(selectedLang, "SELECTED LANG")
-                // console.log(title, "TITLE")
-                // 5) Inyectar placeholders en index.html
                 const idxTpl = fs.readFileSync(path.join(uiSrc, "index.html"), "utf-8");
                 const idxHtml = idxTpl
                     .replace(/{{title}}/g, title)
@@ -977,15 +970,9 @@ 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.trim()}` }),
+                        headers: Object.assign(Object.assign({}, form.getHeaders()), { Authorization: "Token " + rigoToken.trim() }),
                     });
-                    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);
+                    await createMultiLangAsset(bucket, rigoToken, bcToken, slug, fullConfig.config, rigoRes.data.url);
                     rimraf.sync(tmpRoot);
                     console.log("RigoRes", rigoRes.data);
                     return res.json({ url: rigoRes.data.url });