@learnpack/learnpack 5.0.234 → 5.0.238

package/lib/commands/serve.d.ts

@@ -1,6 +1,6 @@
 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: {
@@ -21,7 +21,6 @@ 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 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"
@@ -95,7 +94,9 @@ const PARAMS = {
 };
 const processImage = async (bucket, tutorialDir, url, description, rigoToken) => {
     try {
+        // TODO: MAKE THIS ASYNC
         const filename = (0, creatorUtilities_1.getFilenameFromUrl)(url);
+        console.log("🖼️ IMAGE FILENAME", filename);
         const imagePath = `${tutorialDir}/.learn/assets/${filename}`;
         console.log("🖼️ Generating image", imagePath);
         const res = await (0, rigoActions_1.generateImage)(rigoToken, { prompt: description });
@@ -148,83 +149,6 @@ 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()}`);
-    }
-    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);
-        }
-    }
-    (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) {
@@ -459,13 +383,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",
@@ -826,41 +754,12 @@ 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);
             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");