@learnpack/learnpack 5.0.270 → 5.0.274

package/src/commands/serve.ts

@@ -45,7 +45,10 @@ import {
 import axios from "axios"
 import * as FormData from "form-data"
 import api, { RIGOBOT_HOST } from "../utils/api"
-import { createUploadMiddleware, minutesToISO8601Duration } from "../utils/misc"
+import {
+  createUploadMiddleware,
+  minutesToISO8601Duration,
+} from "../utils/misc"
 import { buildConfig, ConfigResponse } from "../utils/configBuilder"
 import { checkReadability, slugify } from "../utils/creatorUtilities"
 import { checkAndFixSidebarPure } from "../utils/sidebarGenerator"
@@ -157,11 +160,9 @@ const uploadInitialReadme = async (
   :rigo
   \`\`\`
       `
-  const readmeFilename = `README.${
-    packageContext.language && packageContext.language !== "en" ?
-      `${packageContext.language}.` :
-      ""
-  }md`
+  const readmeFilename = `README${getReadmeExtension(
+    packageContext.language || "en"
+  )}`
 
   await uploadFileToBucket(
     bucket,
@@ -229,12 +230,10 @@ const createMultiLangAsset = async (
 }
 
 async function startExerciseGeneration(
-  bucket: Bucket,
   rigoToken: string,
   steps: Lesson[],
   packageContext: FormState,
   exercise: Lesson,
-  tutorialDir: string,
   courseSlug: string,
   purposeSlug: string,
   lastLesson = ""
@@ -246,7 +245,7 @@ async function startExerciseGeneration(
 
   console.log("WEBHOOK URL", webhookUrl)
 
-  await readmeCreator(
+  const res = await readmeCreator(
     rigoToken,
     {
       title: `${exercise.id} - ${exercise.title}`,
@@ -262,6 +261,8 @@ async function startExerciseGeneration(
     purposeSlug,
     webhookUrl
   )
+
+  console.log("README CREATOR RES", res)
 }
 
 async function createInitialReadme(
@@ -558,8 +559,6 @@ export default class ServeCommand extends SessionCommand {
           return res.json({ status: "ERROR" })
         }
 
-        fs.writeFileSync(`image-${imageId}.json`, JSON.stringify(body, null, 2))
-
         const imageUrl = body.image_url
         const format = body.format
         const imagePath = `courses/${courseSlug}/.learn/assets/${imageId}`
@@ -651,18 +650,34 @@ export default class ServeCommand extends SessionCommand {
         }
 
         await startExerciseGeneration(
-          bucket,
           rigoToken,
           syllabusJson.lessons,
           syllabusJson.courseInfo,
           exercise,
-          `courses/${courseSlug}`,
           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"
+        if (
+          syllabusJson.feedback &&
+          typeof syllabusJson.feedback === "string"
+        ) {
+          syllabusJson.feedback += "\n\n" + feedback
+        } else {
+          syllabusJson.feedback = feedback
+        }
+
+        await uploadFileToBucket(
+          bucket,
+          JSON.stringify(syllabusJson),
+          `courses/${courseSlug}/.learn/initialSyllabus.json`
+        )
+
+        res.json({ status: "SUCCESS" })
       }
     )
 
@@ -762,16 +777,19 @@ export default class ServeCommand extends SessionCommand {
           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
+            readme.parsed.content + "\n\n" + feedback
           )
           nextStarted = true
         } else {
@@ -801,8 +819,8 @@ export default class ServeCommand extends SessionCommand {
 
         const newSyllabus = {
           ...syllabusJson,
-          lessons: syllabusJson.lessons.map(lesson => {
-            if (lesson.id === exercise.id) {
+          lessons: syllabusJson.lessons.map((lesson, index) => {
+            if (index === exerciseIndex) {
               return { ...lesson, generated: true, status: "DONE" }
             }
 
@@ -1424,12 +1442,10 @@ export default class ServeCommand extends SessionCommand {
       const lastResult = "---"
 
       await startExerciseGeneration(
-        bucket,
         rigoToken,
         syllabus.lessons,
         syllabus.courseInfo,
         firstLesson,
-        tutorialDir,
         courseSlug,
         syllabus.courseInfo.purpose,
         lastResult
@@ -1494,12 +1510,10 @@ export default class ServeCommand extends SessionCommand {
       const firstLessonToGenerate = notGeneratedLessons[0]
 
       await startExerciseGeneration(
-        bucket,
         rigoToken,
         syllabusJson.lessons,
         syllabusJson.courseInfo,
         firstLessonToGenerate,
-        `courses/${courseSlug}`,
         courseSlug,
         syllabusJson.courseInfo.purpose,
         JSON.stringify(lastGeneratedLesson) +
@@ -1734,7 +1748,9 @@ export default class ServeCommand extends SessionCommand {
           console.error("❌ Error fetching file:", error)
           return res
             .status(500)
-            .json({ error: (error as Error).message || "Unable to fetch file" })
+            .json({
+              error: (error as Error).message || "Unable to fetch file",
+            })
         }
       }
     )
@@ -1750,25 +1766,38 @@ export default class ServeCommand extends SessionCommand {
 
         if (ytMatch) {
           const videoId = ytMatch[1]
+          console.log("VIDEO ID", videoId)
           // fetch metadata
           const items = await YoutubeTranscript.fetchTranscript(videoId)
+          console.log("ITEMS FROM YOUTUBE TRANSCRIPT", items)
           const transcript = items.map(i => i.text).join(" ")
 
-          const { data: meta } = await axios.get(
-            "https://www.youtube.com/oembed",
-            {
-              params: { url: decoded, format: "json" },
-            }
-          )
+          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
+          }
+
+          throw new Error("test")
 
           return res.json({
             url: decoded,
-            title: meta.title,
-            author: meta.author_name,
-            thumbnail: meta.thumbnail_url,
+            title: meta?.title || null,
+            author: meta?.author_name || null,
+            thumbnail: meta?.thumbnail_url || null,
             transcript,
           })
         }
+ 
+          console.log("NOT A YOUTUBE LINK", decoded)
 
         const response = await axios.get(decoded, { responseType: "text" })
         const html = response.data as string
@@ -1783,7 +1812,9 @@ export default class ServeCommand extends SessionCommand {
         })
       } catch (error: any) {
         console.error("❌ /actions/fetch error:", error.message || error)
-        res.status(500).json({ error: error.message || "Failed to fetch link" })
+        res
+          .status(500)
+          .json({ error: error.message || "Failed to fetch link" })
       }
     })
     app.delete("/packages/:slug", async (req, res) => {