@learnpack/learnpack 5.0.274 → 5.0.275

package/src/commands/serve.ts

@@ -44,11 +44,8 @@ import {
 // import { handleAssetCreation } from "./publish"
 import axios from "axios"
 import * as FormData from "form-data"
-import api, { RIGOBOT_HOST } from "../utils/api"
-import {
-  createUploadMiddleware,
-  minutesToISO8601Duration,
-} from "../utils/misc"
+import api, { RIGOBOT_HOST, RIGOBOT_REALTIME_HOST } from "../utils/api"
+import { createUploadMiddleware, minutesToISO8601Duration } from "../utils/misc"
 import { buildConfig, ConfigResponse } from "../utils/configBuilder"
 import { checkReadability, slugify } from "../utils/creatorUtilities"
 import { checkAndFixSidebarPure } from "../utils/sidebarGenerator"
@@ -128,7 +125,6 @@ export const processImage = async (
       callbackUrl: webhookUrl,
     })
 
-    // console.log("✅ Image", imagePath, "generated successfully!")
     return true
   } catch {
     return false
@@ -237,7 +233,7 @@ async function startExerciseGeneration(
   courseSlug: string,
   purposeSlug: string,
   lastLesson = ""
-): Promise<void> {
+): Promise<number> {
   const exSlug = slugify(exercise.id + "-" + exercise.title)
   console.log("Starting generation of", exSlug)
 
@@ -263,6 +259,7 @@ async function startExerciseGeneration(
   )
 
   console.log("README CREATOR RES", res)
+  return res.id
 }
 
 async function createInitialReadme(
@@ -649,7 +646,7 @@ export default class ServeCommand extends SessionCommand {
           }
         }
 
-        await startExerciseGeneration(
+        const completionId = await startExerciseGeneration(
           rigoToken,
           syllabusJson.lessons,
           syllabusJson.courseInfo,
@@ -662,6 +659,14 @@ export default class ServeCommand extends SessionCommand {
         )
 
         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"
@@ -681,6 +686,27 @@ export default class ServeCommand extends SessionCommand {
       }
     )
 
+    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 processImage(image.url, image.alt, rigoToken, courseSlug)
+      res.json({ status: "QUEUED" })
+    })
+
     app.post(
       "/webhooks/:courseSlug/exercise-processor/:lessonID/:rigoToken",
       async (req, res) => {
@@ -772,7 +798,7 @@ export default class ServeCommand extends SessionCommand {
           })
         }
 
-        let nextStarted = false
+        let nextCompletionId: number | null = null
         if (
           nextExercise &&
           (exerciseIndex === 0 || !(exerciseIndex % 3 === 0))
@@ -782,7 +808,7 @@ export default class ServeCommand extends SessionCommand {
             feedback = `\n\nThe user added the following feedback with relation to the previous generations: ${syllabusJson.feedback}`
           }
 
-          startExerciseGeneration(
+          nextCompletionId = await startExerciseGeneration(
             rigoToken,
             syllabusJson.lessons,
             syllabusJson.courseInfo,
@@ -791,7 +817,6 @@ export default class ServeCommand extends SessionCommand {
             syllabusJson.courseInfo.purpose,
             readme.parsed.content + "\n\n" + feedback
           )
-          nextStarted = true
         } else {
           console.log(
             "Stopping generation process at",
@@ -805,32 +830,60 @@ export default class ServeCommand extends SessionCommand {
           readability.newMarkdown
         )
 
-        if (imagesArray.length > 0) {
-          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 processImage(image.url, image.alt, rigoToken, courseSlug)
-          }
-        }
-
         const newSyllabus = {
           ...syllabusJson,
           lessons: syllabusJson.lessons.map((lesson, index) => {
             if (index === exerciseIndex) {
-              return { ...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 {
+                ...lesson,
+                generated: true,
+                status: "DONE",
+                translations: {
+                  [syllabusJson.courseInfo.language || "en"]: {
+                    completionId: nextCompletionId,
+                    completedAt: Date.now(),
+                  },
+                },
+              }
             }
 
-            if (nextExercise && nextExercise.id === lesson.id && nextStarted) {
-              return { ...lesson, generated: false, status: "GENERATING" }
+            if (
+              nextExercise &&
+              nextExercise.id === lesson.id &&
+              nextCompletionId
+            ) {
+              return {
+                ...lesson,
+                generated: false,
+                status: "GENERATING",
+                translations: {
+                  [syllabusJson.courseInfo.language || "en"]: {
+                    completionId: nextCompletionId,
+                    startedAt: Date.now(),
+                  },
+                },
+              }
             }
 
             return { ...lesson }
           }),
         }
+        console.log("New syllabus", newSyllabus)
         await uploadFileToBucket(
           bucket,
           JSON.stringify(newSyllabus),
@@ -1441,7 +1494,7 @@ export default class ServeCommand extends SessionCommand {
 
       const lastResult = "---"
 
-      await startExerciseGeneration(
+      const completionId = await startExerciseGeneration(
         rigoToken,
         syllabus.lessons,
         syllabus.courseInfo,
@@ -1450,6 +1503,15 @@ export default class ServeCommand extends SessionCommand {
         syllabus.courseInfo.purpose,
         lastResult
       )
+      if (firstLesson) {
+        firstLesson.translations = {
+          [syllabus.courseInfo.language || "en"]: {
+            completionId,
+            startedAt: Date.now(),
+            completedAt: 0,
+          },
+        }
+      }
 
       await createInitialReadme(
         JSON.stringify(syllabus.courseInfo),
@@ -1479,52 +1541,52 @@ export default class ServeCommand extends SessionCommand {
       }
     })
 
-    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]
-
-      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/",
@@ -1746,11 +1808,9 @@ export default class ServeCommand extends SessionCommand {
           return res.send(content.toString("utf-8"))
         } catch (error) {
           console.error("❌ Error fetching file:", error)
-          return res
-            .status(500)
-            .json({
-              error: (error as Error).message || "Unable to fetch file",
-            })
+          return res.status(500).json({
+            error: (error as Error).message || "Unable to fetch file",
+          })
         }
       }
     )
@@ -1766,38 +1826,35 @@ 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(" ")
-
-          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")
+          const resFromRigo = await axios.get(
+            `${RIGOBOT_REALTIME_HOST}/actions/youtube-transcript/${videoId}`
+          )
+          console.log("RES FROM RIGO", resFromRigo.data)
+          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?.title || null,
-            author: meta?.author_name || null,
-            thumbnail: meta?.thumbnail_url || null,
+            title: resFromRigo.data.title || null,
+            author: resFromRigo.data.author || null,
             transcript,
           })
         }
- 
-          console.log("NOT A YOUTUBE LINK", decoded)
+
+        console.log("NOT A YOUTUBE LINK", decoded)
 
         const response = await axios.get(decoded, { responseType: "text" })
         const html = response.data as string
@@ -1812,9 +1869,7 @@ 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) => {