npm - @learnpack/learnpack - Versions diffs - 5.0.261 → 5.0.265 - Mend

@learnpack/learnpack 5.0.261 → 5.0.265

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/lib/commands/serve.js +82 -50
package/lib/commands/translate.js +1 -2
package/lib/creatorDist/assets/{index-BvHkfJm4.js → index-6e9E-1qG.js} +1996 -1947
package/lib/creatorDist/index.html +1 -1
package/lib/managers/server/routes.js +1 -2
package/lib/models/creator.d.ts +2 -0
package/lib/utils/rigoActions.d.ts +6 -3
package/lib/utils/rigoActions.js +15 -4
package/package.json +1 -1
package/src/commands/serve.ts +123 -72
package/src/commands/translate.ts +8 -5
package/src/creator/src/App.tsx +29 -6
package/src/creator/src/components/PurposeSelector.tsx +6 -6
package/src/creator/src/components/TurnstileModal.tsx +34 -19
package/src/creator/src/locales/en.json +4 -0
package/src/creator/src/locales/es.json +4 -0
package/src/creator/src/utils/store.ts +5 -0
package/src/creatorDist/assets/{index-BvHkfJm4.js → index-6e9E-1qG.js} +1996 -1947
package/src/creatorDist/index.html +1 -1
package/src/managers/server/routes.ts +9 -7
package/src/models/creator.ts +4 -0
package/src/ui/_app/app.css +1 -1
package/src/ui/_app/app.js +356 -348
package/src/ui/_app/index.html +19 -2
package/src/ui/app.tar.gz +0 -0
package/src/utils/rigoActions.ts +27 -5

package/lib/creatorDist/index.html CHANGED Viewed

@@ -10,7 +10,7 @@
     />
     <title>Learnpack Creator: Craft tutorials in seconds!</title>
-    <script type="module" crossorigin src="/creator/assets/index-BvHkfJm4.js"></script>
+    <script type="module" crossorigin src="/creator/assets/index-6e9E-1qG.js"></script>
     <link rel="stylesheet" crossorigin href="/creator/assets/index-DmpsXknz.css">
   </head>
   <body>

package/lib/managers/server/routes.js CHANGED Viewed

@@ -305,8 +305,7 @@ async function default_1(app, configObject, configManager) {
                         const response = await (0, rigoActions_1.translateExercise)(rigoToken, {
                             text_to_translate: readme.body,
                             output_language: language,
-                            exercise_slug: slug,
-                        });
+                        }, `${process.env.HOST}/webhooks/translate-exercise`);
                         await (0, creatorUtilities_1.saveTranslatedReadme)(slug, response.parsed.output_language_code, response.parsed.translation);
                         (0, sidebarGenerator_1.addExerciseToSidebar)(slug, response.parsed.output_language_code, response.parsed.translated_slug, configDirPath || "");
                         console_1.default.success(`Translated ${slug} to ${language} successfully`);

package/lib/models/creator.d.ts CHANGED Viewed

@@ -11,10 +11,12 @@ export interface ParsedLink {
     name: string;
     text: string;
 }
+export type TDifficulty = "easy" | "beginner" | "intermediate" | "hard";
 export type FormState = {
     description: string;
     duration: number;
     hasContentIndex: boolean;
+    difficulty: TDifficulty;
     contentIndex: string;
     language?: string;
     technologies?: string[];

package/lib/utils/rigoActions.d.ts CHANGED Viewed

@@ -19,9 +19,8 @@ export declare function downloadImage(imageUrl: string, savePath: string): Promi
 type TTranslateInputs = {
     text_to_translate: string;
     output_language: string;
-    exercise_slug: string;
 };
-export declare const translateExercise: (token: string, inputs: TTranslateInputs) => Promise<any>;
+export declare const translateExercise: (token: string, inputs: TTranslateInputs, webhookUrl: string) => Promise<any>;
 type TGenerateCourseIntroductionInputs = {
     course_title: string;
     lessons_context: string;
@@ -63,7 +62,7 @@ export declare const createStructuredPreviewReadme: (token: string, inputs: TCre
 export declare const translateCourseMetadata: (token: string, inputs: {
     title: string;
     description: string;
-    destination_lang_code: string;
+    new_languages: string;
 }) => Promise<any>;
 export declare function createPreviewReadme(tutorialDir: string, packageInfo: PackageInfo, rigoToken: string, readmeContents: string[]): Promise<void>;
 type TReduceReadmeInputs = {
@@ -88,4 +87,8 @@ export declare const isPackageAuthor: (token: string, packageSlug: string) => Pr
     isAuthor: boolean;
     status: number;
 }>;
+type TGetLanguageCodesInputs = {
+    raw_languages: string;
+};
+export declare const getLanguageCodes: (token: string, inputs: TGetLanguageCodesInputs) => Promise<any>;
 export {};

package/lib/utils/rigoActions.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPackageAuthor = exports.fillSidebarJSON = exports.generateCourseShortName = exports.isValidRigoToken = exports.translateCourseMetadata = exports.createStructuredPreviewReadme = exports.readmeCreator = exports.createCodingReadme = exports.createCodeFile = exports.interactiveCreation = exports.generateCourseIntroduction = exports.translateExercise = exports.generateImage = exports.hasCreatorPermission = exports.createReadme = void 0;
+exports.getLanguageCodes = exports.isPackageAuthor = exports.fillSidebarJSON = exports.generateCourseShortName = exports.isValidRigoToken = exports.translateCourseMetadata = exports.createStructuredPreviewReadme = exports.readmeCreator = exports.createCodingReadme = exports.createCodeFile = exports.interactiveCreation = exports.generateCourseIntroduction = exports.translateExercise = exports.generateImage = exports.hasCreatorPermission = exports.createReadme = void 0;
 exports.downloadImage = downloadImage;
 exports.createPreviewReadme = createPreviewReadme;
 exports.makeReadmeReadable = makeReadmeReadable;
@@ -79,11 +79,12 @@ async function downloadImage(imageUrl, savePath) {
     const buffer = Buffer.from(response.data, "binary");
     await (0, promises_1.writeFile)(savePath, buffer);
 }
-const translateExercise = async (token, inputs) => {
-    const response = await axios_1.default.post(`${api_1.RIGOBOT_HOST}/v1/prompting/completion/159/`, {
+const translateExercise = async (token, inputs, webhookUrl) => {
+    const response = await axios_1.default.post(`${api_1.RIGOBOT_HOST}/v1/prompting/completion/translate-asset-markdown/`, {
         inputs: inputs,
         include_purpose_objective: false,
-        execute_async: false,
+        execute_async: true,
+        webhook_url: webhookUrl,
     }, {
         headers: {
             "Content-Type": "application/json",
@@ -272,3 +273,13 @@ const isPackageAuthor = async (token, packageSlug) => {
     }
 };
 exports.isPackageAuthor = isPackageAuthor;
+const getLanguageCodes = async (token, inputs) => {
+    const response = await axios_1.default.post(`${api_1.RIGOBOT_HOST}/v1/prompting/completion/get-language-codes/`, { inputs, include_purpose_objective: false, execute_async: false }, {
+        headers: {
+            "Content-Type": "application/json",
+            Authorization: "Token " + token,
+        },
+    });
+    return response.data;
+};
+exports.getLanguageCodes = getLanguageCodes;

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@learnpack/learnpack",
   "description": "Seamlessly build, sell and/or take interactive & auto-graded tutorials, start learning now or build a new tutorial to your audience.",
-  "version": "5.0.261",
+  "version": "5.0.265",
   "author": "Alejandro Sanchez @alesanchezr",
   "contributors": [
     {

package/src/commands/serve.ts CHANGED Viewed

@@ -31,6 +31,7 @@ import {
   isPackageAuthor,
   createStructuredPreviewReadme,
   translateCourseMetadata,
+  getLanguageCodes,
 } from "../utils/rigoActions"
 import * as dotenv from "dotenv"
 import {
@@ -519,11 +520,25 @@ export default class ServeCommand extends SessionCommand {
         const { courseSlug } = req.params
         const body = req.body
-        // Save the file as courses/courseSlug/README.md
+        console.log("RECEIVING INITIAL README WEBHOOK", body)
+        const langCode =
+          body.parsed.language_code || body.parsed.output_language_code || ""
+        const content = body.parsed.content || body.parsed.translation || ""
+        if (!content || !langCode) {
+          console.log("No content or language code to save", body)
+          return res.status(400).json({
+            status: "ERROR",
+            message: "No content to save",
+          })
+        }
         const filePath = `courses/${courseSlug}/README${getReadmeExtension(
-          body.parsed.language_code
+          langCode
         )}`
-        await uploadFileToBucket(bucket, body.parsed.content, filePath)
+        await uploadFileToBucket(bucket, content, filePath)
         res.json({ status: "SUCCESS" })
       }
@@ -707,6 +722,25 @@ export default class ServeCommand extends SessionCommand {
       }
     )
+    // The following endpoint is used to store an incoming translation where it supposed to be
+    app.post(
+      "/webhooks/:courseSlug/:exSlug/save-translation",
+      async (req, res) => {
+        const { courseSlug, exSlug } = req.params
+        const body = req.body
+        console.log("RECEIVING TRANSLATION WEBHOOK", body)
+        const readmePath = `courses/${courseSlug}/exercises/${exSlug}/README${getReadmeExtension(
+          body.parsed.output_language_code
+        )}`
+        await uploadFileToBucket(bucket, body.parsed.translation, readmePath)
+        res.json({ status: "SUCCESS" })
+      }
+    )
     app.get("/check-preview-image/:slug", async (req, res) => {
       const { slug } = req.params
       const file = bucket.file(`courses/${slug}/preview.png`)
@@ -948,13 +982,10 @@ export default class ServeCommand extends SessionCommand {
       }
       const languagesToTranslate: string[] = languages.split(",")
-      const course = await bucket
-        .file(`courses/${courseSlug}/learn.json`)
-        .download()
-      const courseJson = JSON.parse(course.toString())
-      const languageCodes = new Set()
+      const languageCodesRes = await getLanguageCodes(rigoToken, {
+        raw_languages: languagesToTranslate.join(","),
+      })
+      const languageCodes = languageCodesRes.parsed.language_codes
       try {
         await Promise.all(
@@ -962,59 +993,68 @@ export default class ServeCommand extends SessionCommand {
             const readmePath = `courses/${courseSlug}/exercises/${slug}/README${getReadmeExtension(
               currentLanguage
             )}`
             const readme = await bucket.file(readmePath).download()
             await Promise.all(
-              languagesToTranslate.map(async (language: string) => {
-                const response = await translateExercise(rigoToken, {
-                  text_to_translate: readme.toString(),
-                  output_language: language,
-                  exercise_slug: slug,
-                })
-                const translatedReadme = await bucket.file(
-                  `courses/${courseSlug}/exercises/${slug}/README${getReadmeExtension(
-                    response.parsed.output_language_code
-                  )}`
+              languageCodes.map(async (language: string) => {
+                // verify if the translation already exists
+                const translationPath = `courses/${courseSlug}/exercises/${slug}/README${getReadmeExtension(
+                  language
+                )}`
+                const [exists] = await bucket.file(translationPath).exists()
+                if (exists) {
+                  console.log(
+                    `Translation in ${language} already exists for exercise ${slug}`
+                  )
+                  return
+                }
+                await translateExercise(
+                  rigoToken,
+                  {
+                    text_to_translate: readme.toString(),
+                    output_language: language,
+                  },
+                  `${process.env.HOST}/webhooks/${courseSlug}/${slug}/save-translation`
                 )
-                await translatedReadme.save(response.parsed.translation)
-                languageCodes.add(response.parsed.output_language_code)
               })
             )
           })
         )
-        const currentLanguages = Object.keys(courseJson.title)
-        for (const languageCode of currentLanguages) {
-          if (languageCodes.has(languageCode)) {
-            languageCodes.delete(languageCode)
+        const course = await bucket
+          .file(`courses/${courseSlug}/learn.json`)
+          .download()
+        const courseJson = JSON.parse(course.toString())
+        const neededLanguages = new Set<string>()
+        let currentLanguages = Object.keys(courseJson.title)
+        for (const languageCode of languageCodes) {
+          if (!currentLanguages.includes(languageCode)) {
+            neededLanguages.add(languageCode)
           }
         }
-        if ([...languageCodes].length > 0) {
-          const translatedCourseMetadata = await Promise.all(
-            [...languageCodes].map(async languageCode => {
-              const result = await translateCourseMetadata(rigoToken, {
-                title: courseJson.title[currentLanguage],
-                description: courseJson.description[currentLanguage],
-                destination_lang_code: languageCode as string,
-              })
+        const neededLanguagesList: string[] = [...neededLanguages]
+          .map((lang: string) => lang.toLowerCase())
+          .sort()
-              return {
-                languageCode,
-                title: result.parsed.title,
-                description: result.parsed.description,
-              }
-            })
-          )
+        if (neededLanguagesList.length > 0) {
+          const result = await translateCourseMetadata(rigoToken, {
+            title: JSON.stringify(courseJson.title),
+            description: JSON.stringify(courseJson.description),
+            new_languages: neededLanguagesList.join(","),
+          })
-          for (const metadata of translatedCourseMetadata) {
-            courseJson.title[metadata.languageCode as string] = metadata.title
-            courseJson.description[metadata.languageCode as string] =
-              metadata.description
-          }
+          const translateTitle = JSON.parse(result.parsed.title)
+          const translateDescription = JSON.parse(result.parsed.description)
+          courseJson.title = translateTitle
+          courseJson.description = translateDescription
           await uploadFileToBucket(
             bucket,
@@ -1022,34 +1062,45 @@ export default class ServeCommand extends SessionCommand {
             `courses/${courseSlug}/learn.json`
           )
+          currentLanguages = Object.keys(courseJson.title)
+        }
+        // Check that all the READMEs exists
+        const missingReadmeTranslations = []
+        let firstAvailable = ""
+        for (const languageCode of currentLanguages) {
+          // eslint-disable-next-line no-await-in-loop
           const previewReadme = await bucket.file(
-            `courses/${courseSlug}/README${getReadmeExtension(currentLanguage)}`
+            `courses/${courseSlug}/README${getReadmeExtension(languageCode)}`
           )
-          const [previewReadmeContent] = await previewReadme.download()
-          const previewReadmeContentString = previewReadmeContent.toString()
-          await Promise.all(
-            [...languageCodes].map(async languageCode => {
-              const translatedPreviewReadme = await translateExercise(
-                rigoToken,
-                {
-                  text_to_translate: previewReadmeContentString,
-                  output_language: languageCode as string,
-                  exercise_slug: "preview-readme",
-                }
-              )
-              await bucket
-                .file(
-                  `courses/${courseSlug}/README${getReadmeExtension(
-                    languageCode as string
-                  )}`
-                )
-                .save(translatedPreviewReadme.parsed.translation)
-            })
-          )
+          // eslint-disable-next-line no-await-in-loop
+          const [exists] = await previewReadme.exists()
+          if (!exists) {
+            missingReadmeTranslations.push(languageCode)
+          } else {
+            // eslint-disable-next-line no-await-in-loop
+            const [previewReadmeContent] = await previewReadme.download()
+            const previewReadmeContentString = previewReadmeContent.toString()
+            firstAvailable = previewReadmeContentString
+          }
         }
+        await Promise.all(
+          missingReadmeTranslations.map(async languageCode => {
+            await translateExercise(
+              rigoToken,
+              {
+                text_to_translate: firstAvailable,
+                output_language: languageCode as string,
+              },
+              `${process.env.HOST}/webhooks/${courseSlug}/initial-readme-processor`
+            )
+          })
+        )
         return res.status(200).json({ message: "Translated exercises" })
       } catch (error) {
         console.log(error, "ERROR")

package/src/commands/translate.ts CHANGED Viewed

@@ -96,11 +96,14 @@ export default class BuildCommand extends SessionCommand {
             .split(",")
             .map(async (language: string) => {
               const readme = await getReadmeForExercise(exercise)
-              const response = await translateExercise(rigoToken, {
-                text_to_translate: readme,
-                output_language: language,
-                exercise_slug: exercise,
-              })
+              const response = await translateExercise(
+                rigoToken,
+                {
+                  text_to_translate: readme,
+                  output_language: language,
+                },
+                `${process.env.HOST}/webhooks/translate-exercise`
+              )
               await saveTranslatedReadme(
                 exercise,

package/src/creator/src/App.tsx CHANGED Viewed

@@ -4,7 +4,7 @@ import SelectableCard from "./components/SelectableCard"
 import Loader from "./components/Loader"
 import { useNavigate } from "react-router"
 import { useShallow } from "zustand/react/shallow"
-import useStore from "./utils/store"
+import useStore, { TDifficulty } from "./utils/store"
 import { publicInteractiveCreation, isHuman } from "./utils/rigo"
 import {
@@ -106,6 +106,7 @@ function App() {
       purpose,
       language,
       new: newParam,
+      difficulty,
     } = checkParams([
       "description",
       "duration",
@@ -113,6 +114,7 @@ function App() {
       "purpose",
       "language",
       "new",
+      "difficulty",
     ])
     if (newParam && newParam.toLowerCase().trim() === "true") {
@@ -155,6 +157,15 @@ function App() {
       })
     }
+    if (
+      difficulty &&
+      ["easy", "beginner", "intermediate", "hard"].includes(difficulty)
+    ) {
+      setFormState({
+        difficulty: difficulty as TDifficulty,
+      })
+    }
     if (description && duration && purpose) {
       setFormState({
         currentStep: "hasContentIndex",
@@ -363,11 +374,14 @@ function App() {
                 })
               }
             }}
-            // onError={() => {
-            //   setFormState({
-            //     currentStep: "purpose",
-            //   })
-            // }}
+            onError={() => {
+              toast.error(t("turnstileModal.error"), {
+                duration: 10000,
+              })
+              setFormState({
+                currentStep: "purpose",
+              })
+            }}
           />
         ),
       },
@@ -444,6 +458,15 @@ function App() {
             setShowTurnstileModal(false)
             handleCreateTutorial()
           }}
+          onError={() => {
+            toast.error(t("turnstileModal.error"), {
+              duration: 10000,
+            })
+            setShowTurnstileModal(false)
+            setFormState({
+              currentStep: "purpose",
+            })
+          }}
         />
       )}
       {formState.isCompleted && history.length === 0 ? (

package/src/creator/src/components/PurposeSelector.tsx CHANGED Viewed

@@ -36,17 +36,17 @@ export const PurposeSelector: React.FC<PurposeSelectorProps> = ({
       //   description: t("purposeSelector.learnpack-lesson-writer.description"),
       // },
       {
-        slug: "homework-and-exam-preparation-aid",
-        label: t("purposeSelector.homework-and-exam-preparation-aid.label"),
+        slug: "skill-building-facilitator",
+        label: t("purposeSelector.skill-building-facilitator.label"),
         description: t(
-          "purposeSelector.homework-and-exam-preparation-aid.description"
+          "purposeSelector.skill-building-facilitator.description"
         ),
       },
       {
-        slug: "skill-building-facilitator",
-        label: t("purposeSelector.skill-building-facilitator.label"),
+        slug: "homework-and-exam-preparation-aid",
+        label: t("purposeSelector.homework-and-exam-preparation-aid.label"),
         description: t(
-          "purposeSelector.skill-building-facilitator.description"
+          "purposeSelector.homework-and-exam-preparation-aid.description"
         ),
       },
       {

package/src/creator/src/components/TurnstileModal.tsx CHANGED Viewed

@@ -5,32 +5,47 @@ import { toast } from "react-hot-toast"
 import useStore from "../utils/store"
 import { useTranslation } from "react-i18next"
-export default function TurnstileModal({ onClose }: { onClose: () => void }) {
+export default function TurnstileModal({
+  onClose,
+  onError,
+}: {
+  onClose: () => void
+  onError: () => void
+}) {
   const auth = useStore((state) => state.auth)
   const setAuth = useStore((state) => state.setAuth)
   const { t } = useTranslation()
   return (
     <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-1000">
-      <TurnstileChallenge
-        siteKey={
-          DEV_MODE ? "0x4AAAAAABeKMBYYinMU4Ib0" : "0x4AAAAAABeZ9tjEevGBsJFU"
-        }
-        onSuccess={async (token) => {
-          const { human, message, token: jwtToken } = await isHuman(token)
-          if (human) {
-            toast.success(t("stepWizard.humanSuccess"))
-            setAuth({
-              ...auth,
-              publicToken: jwtToken,
-            })
-            onClose()
-          } else {
-            toast.error(message)
-            onClose()
+      <div className="bg-white p-4 rounded-lg max-w-md w-full flex flex-col items-center justify-center gap-4">
+        <h2 className="text-xl font-semibold text-center">
+          {t("turnstileModal.title")}
+        </h2>
+        <TurnstileChallenge
+          siteKey={
+            DEV_MODE ? "0x4AAAAAABeKMBYYinMU4Ib0" : "0x4AAAAAABeZ9tjEevGBsJFU"
           }
-        }}
-      />
+          onSuccess={async (token) => {
+            const { human, message, token: jwtToken } = await isHuman(token)
+            if (human) {
+              toast.success(t("stepWizard.humanSuccess"))
+              setAuth({
+                ...auth,
+                publicToken: jwtToken,
+              })
+              onClose()
+            } else {
+              console.error(message, "turnstileModal error")
+              onError()
+            }
+          }}
+          onError={() => {
+            console.error("turnstileModal error")
+            onError()
+          }}
+        />
+      </div>
     </div>
   )
 }

package/src/creator/src/locales/en.json CHANGED Viewed

@@ -115,5 +115,9 @@
         "loginWithEmail": "Login with Email",
         "youDontHaveAnAccount": "You don't have an account?",
         "registerHere": "Register here."
+    },
+    "turnstileModal": {
+        "title": "We need to verify you are a human, wait a moment...",
+        "error": "Error verifying you are a human, please try again, if the problem persists, use a different browser."
     }
 }

package/src/creator/src/locales/es.json CHANGED Viewed

@@ -115,5 +115,9 @@
         "loginWithEmail": "Iniciar sesión con Email",
         "youDontHaveAnAccount": "¿No tienes una cuenta?",
         "registerHere": "Regístrate aquí."
+    },
+    "turnstileModal": {
+        "title": "Necesitamos verificar que eres un humano, espera un momento...",
+        "error": "Error al verificar que eres un humano, por favor intenta de nuevo, si el problema persiste, usa un navegador diferente."
     }
 }

package/src/creator/src/utils/store.ts CHANGED Viewed

@@ -4,6 +4,7 @@ import { Lesson } from "../components/LessonItem"
 import { ParsedFile } from "../components/FileUploader"
 import { TMessage } from "../components/Message"
 // import { ParsedLink } from "../components/LinkUploader"
+export type TDifficulty = "easy" | "beginner" | "intermediate" | "hard"
 export type FormState = {
   description: string
@@ -11,6 +12,7 @@ export type FormState = {
   hasContentIndex: boolean
   contentIndex: string
   purpose: string
+  difficulty: TDifficulty
   slug: string
   language?: string
   isCompleted: boolean
@@ -92,6 +94,7 @@ const useStore = create<Store>()(
         purpose: "",
         language: "en",
         technologies: [],
+        difficulty: "beginner",
         // sources: [],
         isCompleted: false,
         currentStep: "description",
@@ -126,6 +129,7 @@ const useStore = create<Store>()(
             description: "",
             duration: 0,
             language: "en",
+            difficulty: "beginner",
             technologies: [],
             hasContentIndex: false,
             contentIndex: "",
@@ -173,6 +177,7 @@ const useStore = create<Store>()(
             description: "",
             duration: 0,
             slug: "",
+            difficulty: "beginner",
             language: "en",
             technologies: [],
             hasContentIndex: false,