@nualang/nualang-ui-components 0.1.1157 → 0.1.1159

package/dist/Dialogs/GeneratePhrases/GeneratePhrases.js

@@ -9,6 +9,7 @@ var _ResponsiveDialog = _interopRequireDefault(require("../ResponsiveDialog/Resp
 var _iconsMaterial = require("@mui/icons-material");
 var _material = require("@mui/material");
 var _reactRouterDom = require("react-router-dom");
+var _Info = _interopRequireDefault(require("@mui/icons-material/Info"));
 var _nualas = _interopRequireDefault(require("../../img/nualas.svg"));
 var _InputHelper = _interopRequireDefault(require("../../Forms/InputHelper/InputHelper"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -111,7 +112,9 @@ function GeneratePhrases({
     try {
       setIsGenerating(true);
       setErrorMessage(null);
-      const prompt = phraseType === "sentences" ? isPhrases ? `The context is a language learning application. Here is a list of phrases in ${learnLang} and their translations in ${forLang}:\n\n${JSON.stringify(phrases)}\n\nNow, generate ${values.phraseAmount} more phrases in ${learnLang} and their translations in ${forLang} on the topic of '${values.phrasesTopic}' in the same JSON format as the others. The 'idx' field should contain an index integer which follows on incrementally from the existing phrases. The 'image' field should contain an empty string. Do not include a 'voices' field. The phrases should be unique and not already in the list. The phrases should be ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty}.` : `The context is a language learning application. Generate ${values.phraseAmount} phrases in ${learnLang} and their translations in ${forLang} on the topic of '${values.phrasesTopic}'. Return the phrases inside an array of ${values.phraseAmount} objects, each with the following fields: 'phrase', 'translations', 'idx', and 'image'. Each field is required and cannot be omitted. The 'idx' field represents the index of the phrases, starting from 0 and going up by 1 up until the last phrase. The 'image' field should contain an empty string. The phrases should be ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty}. The 'translations' field should be an array of translations in ${forLang}. The phrases should be unique.` : isPhrases ? `The context is a language learning application. Here is a list of words or short lexical phrases in ${learnLang} and their translations in ${forLang}:\n\n${JSON.stringify(phrases)}\n\nNow, generate ${values.phraseAmount} more words or lexical phrases and their translations in ${learnLang} on the topic of '${values.phrasesTopic}' in the same JSON format as the ones that I have passed to you. The 'idx' field should contain an index integer which follows on incrementally from the existing phrases. The 'image' field should contain an empty string. Do not include a 'voices' field. The words or lexical phrases should be unique and not already in the list. The words or lexical phrases should be ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty}.` : `The context is a language learning application. Generate ${values.phraseAmount} words or short lexical phrases in ${learnLang} and their translations in ${forLang} on the topic of '${values.phrasesTopic}'. Return the words or short lexical phrases inside an array of ${values.phraseAmount} objects, each with the following fields: 'phrase', 'translations', 'idx', and 'image'. Each field is required and cannot be omitted. The 'idx' field represents the index of the phrases, starting from 0 and going up by 1 up until the last phrase. The 'image' field should contain an empty string. The words or short lexical phrases should be ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty}. The 'translations' field should be an array of at least one translation of the phrase in ${forLang}, but it can contain more translations as long as they are grammatically correct. The words or short lexical phrases should be unique.`;
+      const goalPrompt = `The generated phrases must specifically target the following linguistic goal: '${values.topicGoal}'. Avoid generating phrases that do not align with this goal. `;
+      const prompt = phraseType === "sentences" ? isPhrases ? `The context is a language learning application. Here is a list of phrases or sentences in ${learnLang} and their translations in ${forLang}:\n\n${JSON.stringify(phrases)}\n\nNow, generate ${values.phraseAmount} more uniques sentences in ${learnLang} and their translations in ${forLang} on the topic of '${values.phrasesTopic}' in the same JSON format as the ones that I have passed to you. The 'idx' field should contain an index integer which follows on incrementally from the existing phrases. The 'image' field should contain an empty string. Do not include a 'voices' field. ${values.topicGoal.trim() ? goalPrompt : ""}The sentences should be unique and not already in the list. The sentences should be appropriate for ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty} level. Ensure the formatting of the JSON response is correct and follows this structure.` : `The context is a language learning application. Generate ${values.phraseAmount} unique phrases or sentences in ${learnLang} and their translations in ${forLang} on the topic of '${values.phrasesTopic}'. Return the sentences inside a JSON array of ${values.phraseAmount} objects, each with the following fields: 'phrase', 'translations', 'idx', and 'image'. Each field is required and cannot be omitted. The 'idx' field represents the index of the phrases, starting from 0 and going up by 1 up until the last phrase. The 'image' field should contain an empty string. The 'translations' field should be an array of at least one translation of the sentence in ${forLang}, but it can contain more translations as long as they are grammatically correct. ${values.topicGoal.trim() ? goalPrompt : ""}The sentences should be appropriate for the ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty} level. The sentences should be unique. Ensure the formatting of the JSON response is correct and follows this structure.` : isPhrases ? `The context is a language learning application. Here is a list of words or short lexical phrases in ${learnLang} and their translations in ${forLang}:\n\n${JSON.stringify(phrases)}\n\nNow, generate ${values.phraseAmount} more words or lexical phrases and their translations in ${learnLang} on the topic of '${values.phrasesTopic}' in the same JSON format as the ones that I have passed to you. The 'idx' field should contain an index integer which follows on incrementally from the existing phrases. The 'image' field should contain an empty string. Do not include a 'voices' field. ${values.topicGoal.trim() ? goalPrompt : ""}The words or lexical phrases should be unique and not already in the list. The words or lexical phrases should be ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty}. Ensure the formatting of the JSON response is correct and follows this structure.` : `The context is a language learning application. Generate ${values.phraseAmount} unique words or short lexical phrases in ${learnLang} and their translations in ${forLang} on the topic of '${values.phrasesTopic}'. Return the words or short lexical phrases inside a JSON array of ${values.phraseAmount} objects, each with the following fields: 'phrase', 'translations', 'idx', and 'image'. Each field is required and cannot be omitted. The 'idx' field represents the index of the phrases, starting from 0 and going up by 1 up until the last phrase. The 'image' field should contain an empty string. The 'translations' field should be an array of at least one translation of the phrase in ${forLang}, but it can contain more translations as long as they are grammatically correct. ${values.topicGoal.trim() ? goalPrompt : ""}The words or short lexical phrases should be appropriate for the ${["en-US"].includes(siteLanguage) ? "ACTFL" : "CEFR"} ${difficulty} level. The words or short lexical phrases should be unique. Ensure the formatting of the JSON response is correct and follows this structure.`;
+      console.log("prompt: ", prompt);
       const chatGptResponse = await makeChatGptApiRequest({
         model: "gpt-3.5-turbo",
         prompt
@@ -172,16 +175,14 @@ function GeneratePhrases({
     }
   }, t("required_field")), /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true,
-    xs: 12,
-    mb: 2
+    xs: 12
   }, /*#__PURE__*/_react.default.createElement(_material.Alert, {
     severity: "info"
   }, t("experimental_feature_desc_phrases"), " -", " ", /*#__PURE__*/_react.default.createElement(_reactRouterDom.Link, {
     to: "/contact"
   }, t("contact_form"), "."))), /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true,
-    xs: 12,
-    mb: 2
+    xs: 12
   }, /*#__PURE__*/_react.default.createElement(_InputHelper.default, {
     t: t,
     id: "phrasesTopic",
@@ -201,6 +202,34 @@ function GeneratePhrases({
     item: true,
     xs: 12,
     mb: 2
+  }, /*#__PURE__*/_react.default.createElement(_material.TextField, {
+    id: "topicGoal",
+    name: "topicGoal",
+    "data-cy": "topicGoal",
+    label: t("enter_a_topic_goal"),
+    value: values.topicGoal,
+    type: "text",
+    margin: "normal",
+    variant: "outlined",
+    fullWidth: true,
+    onChange: handleChange,
+    InputProps: {
+      endAdornment: /*#__PURE__*/_react.default.createElement(_material.InputAdornment, {
+        position: "end"
+      }, /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
+        title: t("topic_goal_info_text"),
+        placement: "top"
+      }, /*#__PURE__*/_react.default.createElement(_Info.default, {
+        fontSize: "small",
+        style: {
+          color: "lightgrey"
+        }
+      })))
+    }
+  })), /*#__PURE__*/_react.default.createElement(_material.Grid, {
+    item: true,
+    xs: 12,
+    mb: 2
   }, /*#__PURE__*/_react.default.createElement(_material.TextField, {
     select: true,
     label: t("phrase_type"),

package/dist/Dialogs/GenerateRoleplay/GenerateRoleplay.js

@@ -43,17 +43,24 @@ function GenerateRoleplayDialog({
   makeCandooAIQuery,
   pdfVectorStoreCreationStatus,
   phrases,
-  topicId
+  topicId,
+  initialTopicGoal
 }) {
   const [isPreviewDialogOpen, setIsPreviewDialogOpen] = (0, _react.useState)(false);
   const [usePdfContext, setUsePdfContext] = (0, _react.useState)(false);
   const [usePhrasesContext, setUsePhrasesContext] = (0, _react.useState)(phrases && phrases.length > 0);
+  const [topicGoal, setTopicGoal] = (0, _react.useState)("");
   const [isRoleplayGenerating, setIsRoleplayGenerating] = (0, _react.useState)(false);
   const [generatedRoleplay, setGeneratedRoleplay] = (0, _react.useState)([]);
   const [previewMessages, setPreviewMessages] = (0, _react.useState)([]);
   const [values, setValues] = (0, _react.useState)(initialValues);
   const [errorMessage, setErrorMessage] = (0, _react.useState)(null);
   const [generateQuestions, setGenerateQuestions] = (0, _react.useState)(false);
+  (0, _react.useEffect)(() => {
+    if (initialTopicGoal && initialTopicGoal.trim() !== "") {
+      setTopicGoal(initialTopicGoal);
+    }
+  }, [initialTopicGoal]);
   const roleplayLengthOptionsArray = ["short", "medium", "long"];
   const roleplayLengthOptions = roleplayLengthOptionsArray.map((d, idx) => /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
     key: idx,
@@ -157,13 +164,14 @@ function GenerateRoleplayDialog({
       const roleplayDifficulty = values.roleplayDifficulty;
       console.log("Roleplay Difficulty:", roleplayDifficulty);
       const basePrompt = usePdfContext ? `Create an informative conversation between 2 people ${values?.actor1?.name && values?.actor2?.name ? `'${values.actor1.name}' and '${values.actor2.name}' ` : ""} about the topic '${values.roleplayTopic}' in the language ${learnLang}. The conversation should be ${i18nLanguage === "en-US" ? "ACTFL" : "CEFR"} level '${t(roleplayDifficulty)}.'` : `Create a conversation between 2 people ${values?.actor1?.name && values?.actor2?.name ? `'${values.actor1.name}' and '${values.actor2?.name}' ` : ""} about the topic '${values.roleplayTopic}' in the language ${learnLang}. The conversation should be ${i18nLanguage === "en-US" ? "ACTFL" : "CEFR"} level '${t(roleplayDifficulty)}.'`;
-      const promptWithPhrases = usePhrasesContext ? `${basePrompt} Use the following phrases as context to assist in the conversation, only add the phrases that are a good fit for the topic '${values.roleplayTopic}' to avoid adding unrelated phrases into the conversation: ${phrases.map(phrase => phrase.phrase).join(", ")}.` : basePrompt;
+      const topicGoalPrompt = topicGoal ? ` The conversation should be guided by the following goal: '${topicGoal}'.` : "";
+      const promptWithPhrases = usePhrasesContext ? ` Additionally, use the following phrases as part of the conversation, where appropriate to the topic '${values.roleplayTopic}': ${phrases.map(phrase => phrase.phrase).join(", ")}. Only use these phrases if they fit naturally into the conversation.` : "";
+      const finalPrompt = `${basePrompt}${topicGoalPrompt}${promptWithPhrases}`;
 
       // Add explicit JSON formatting instructions with roleplay length
-      const promptWithoutQuestions = usePdfContext ? `${promptWithPhrases} The conversation should be returned as a JSON array. The conversation must contain exactly ${values.roleplayLengthNumber} exchanges (lines). Each piece of dialogue should be represented as an object with the keys 'actor' and 'text'. The 'actor' key should be set to 1 if the dialogue is spoken by the first actor, and 2 if it is spoken by the second actor. The 'text' key should be set to the dialogue text spoken by that actor. Please ensure the entire output follows this structure and is returned in a single JSON array.` : `${promptWithPhrases} The conversation should be returned as a JSON array. The conversation must contain exactly ${values.roleplayLengthNumber} exchanges (lines). Each piece of dialogue should be represented as an object with the keys 'actor' and 'text'. The 'actor' key should be set to 1 if the dialogue is spoken by the first actor, and 2 if it is spoken by the second actor. The 'text' key should be set to the dialogue text spoken by that actor. Please ensure the entire output follows this structure and is returned in a single JSON array.`;
-      const promptWithQuestions = usePdfContext ? `${promptWithPhrases} The conversation should be returned as a JSON array, including ${values?.questionsAmount} comprehension questions related to the conversation. The conversation must contain exactly ${values.roleplayLengthNumber} exchanges (lines). Each piece of dialogue should be represented as an object with the keys 'actor' and 'text'. The 'actor' key should be set to 1 if the dialogue is spoken by the first actor, and 2 if it is spoken by the second actor. The 'text' key should be set to the dialogue text spoken by that actor. Each comprehension question should also be represented as an object in the same array, with the keys 'question' and 'answers'. The 'answers' key should be an array of 3 objects, each containing 'text', 'correct' (true or false), and 'type' ('correct' or 'incorrect'). Please ensure the entire output follows this structure and is returned in a single JSON array.` : `${promptWithPhrases} The conversation should be returned as a JSON array, including ${values?.questionsAmount} comprehension questions related to the conversation. The conversation must contain exactly ${values.roleplayLengthNumber} exchanges (lines). Each piece of dialogue should be represented as an object with the keys 'actor' and 'text'. The 'actor' key should be set to 1 if the dialogue is spoken by the first actor, and 2 if it is spoken by the second actor. The 'text' key should be set to the dialogue text spoken by that actor. Each comprehension question should also be represented as an object in the same array, with the keys 'question' and 'answers'. The 'answers' key should be an array of 3 objects, each containing 'text', 'correct' (true or false), and 'type' ('correct' or 'incorrect'). Please ensure the entire output follows this structure and is returned in a single JSON array.`;
-      const activePrompt = generateQuestions ? promptWithQuestions : promptWithoutQuestions; // Use this prompt if no questions
-
+      const promptWithoutQuestions = usePdfContext ? `${finalPrompt} The conversation should be returned as a JSON array. The conversation must contain exactly ${values.roleplayLengthNumber} exchanges (lines). Each piece of dialogue should be represented as an object with the keys 'actor' and 'text'. The 'actor' key should be set to 1 if the dialogue is spoken by the first actor, and 2 if it is spoken by the second actor. The 'text' key should be set to the dialogue text spoken by that actor. Please ensure the entire output follows this structure and is returned in a single JSON array.` : `${finalPrompt} The conversation should be returned as a JSON array. The conversation must contain exactly ${values.roleplayLengthNumber} exchanges (lines). Each piece of dialogue should be represented as an object with the keys 'actor' and 'text'. The 'actor' key should be set to 1 if the dialogue is spoken by the first actor, and 2 if it is spoken by the second actor. The 'text' key should be set to the dialogue text spoken by that actor. Please ensure the entire output follows this structure and is returned in a single JSON array.`;
+      const promptWithQuestions = usePdfContext ? `${finalPrompt} The conversation should be returned as a JSON array, including ${values?.questionsAmount} comprehension questions related to the conversation. The conversation must contain exactly ${values.roleplayLengthNumber} exchanges (lines). Each piece of dialogue should be represented as an object with the keys 'actor' and 'text'. The 'actor' key should be set to 1 if the dialogue is spoken by the first actor, and 2 if it is spoken by the second actor. The 'text' key should be set to the dialogue text spoken by that actor. Each comprehension question should also be represented as an object in the same array, with the keys 'question' and 'answers'. The 'answers' key should be an array of 3 objects, each containing 'text', 'correct' (true or false), and 'type' ('correct' or 'incorrect'). Please ensure the entire output follows this structure and is returned in a single JSON array.` : `${finalPrompt} The conversation should be returned as a JSON array, including ${values?.questionsAmount} comprehension questions related to the conversation. The conversation must contain exactly ${values.roleplayLengthNumber} exchanges (lines). Each piece of dialogue should be represented as an object with the keys 'actor' and 'text'. The 'actor' key should be set to 1 if the dialogue is spoken by the first actor, and 2 if it is spoken by the second actor. The 'text' key should be set to the dialogue text spoken by that actor. Each comprehension question should also be represented as an object in the same array, with the keys 'question' and 'answers'. The 'answers' key should be an array of 3 objects, each containing 'text', 'correct' (true or false), and 'type' ('correct' or 'incorrect'). Please ensure the entire output follows this structure and is returned in a single JSON array.`;
+      const activePrompt = generateQuestions ? promptWithQuestions : promptWithoutQuestions;
       console.log("Final Prompt Sent to API:", activePrompt);
 
       // Call the API and handle the response as before
@@ -344,6 +352,36 @@ function GenerateRoleplayDialog({
     onChange: handleChange,
     multiline: true,
     rows: 3
+  })), /*#__PURE__*/_react.default.createElement(_material.Grid, {
+    item: true,
+    xs: 12
+  }, /*#__PURE__*/_react.default.createElement(_material.TextField, {
+    id: "topicGoal",
+    name: "topicGoal",
+    label: t("enter_a_topic_goal"),
+    value: topicGoal,
+    type: "text",
+    margin: "normal",
+    variant: "outlined",
+    multiline: true,
+    fullWidth: true,
+    sx: {
+      marginBottom: 5
+    },
+    onChange: e => setTopicGoal(e.target.value),
+    InputProps: {
+      endAdornment: /*#__PURE__*/_react.default.createElement(_material.InputAdornment, {
+        position: "end"
+      }, /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
+        title: t("topic_goal_info_text"),
+        placement: "top"
+      }, /*#__PURE__*/_react.default.createElement(_Info.default, {
+        fontSize: "small",
+        style: {
+          color: "lightgrey"
+        }
+      })))
+    }
   }))), !hideRoleplayLengthOptions && !isRoleplayGenerating && /*#__PURE__*/_react.default.createElement(_material.Grid, {
     item: true,
     xs: 12

package/dist/Editors/Phrases/Phrases.js

@@ -227,7 +227,8 @@ function PhrasesEditor(props) {
     siteLanguage,
     makeChatGptApiRequest,
     difficulty,
-    subscription
+    subscription,
+    topicGoal
   } = props;
   const [mode, setMode] = _react.default.useState(Modes.NORMAL);
   const [errors, setErrors] = (0, _react.useState)([]);
@@ -569,7 +570,8 @@ function PhrasesEditor(props) {
     makeChatGptApiRequest: makeChatGptApiRequest,
     initialValues: {
       phrasesTopic: topicName,
-      phraseAmount: 8
+      phraseAmount: 8,
+      topicGoal: topicGoal
     },
     siteLanguage: siteLanguage,
     difficulty: difficulty

package/dist/Editors/Roleplay/Roleplay.js

@@ -269,7 +269,8 @@ function Roleplay({
   makeCandooAIQuery,
   siteLanguage,
   phrases,
-  topicId
+  topicId,
+  initialTopicGoal
 }) {
   console.log("Edit Roleplay -> phrases", phrases);
   const [isGenerateRoleplayDialogOpen, setIsGenerateRoleplayDialogOpen] = (0, _react.useState)(false);
@@ -848,6 +849,7 @@ function Roleplay({
     },
     phrases: phrases,
     topicId: topicId,
+    initialTopicGoal: initialTopicGoal,
     autoSelect: true
   }), /*#__PURE__*/_react.default.createElement(_reactJoyride.default, {
     callback: handleJoyrideCallback,

package/dist/Screens/Classrooms/ViewClassroom/ViewClassroom.js

@@ -51,6 +51,7 @@ var _AvatarDialog = _interopRequireDefault(require("../../../Dialogs/AvatarDialo
 var _Styles = require("../../../utils/Styles");
 var _teacherCreate = _interopRequireDefault(require("../../../img/teacher-create-2.svg"));
 var _Unarchive = _interopRequireDefault(require("@mui/icons-material/Unarchive"));
+var _Archive = _interopRequireDefault(require("@mui/icons-material/Archive"));
 var _Share = _interopRequireDefault(require("@mui/icons-material/Share"));
 var _RateReview = _interopRequireDefault(require("@mui/icons-material/RateReview"));
 var _Edit = _interopRequireDefault(require("@mui/icons-material/Edit"));
@@ -240,7 +241,9 @@ function OverflowMenu({
   })), /*#__PURE__*/_react.default.createElement(_material.Typography, null, t("delete_classroom"))), isCreator && !isArchived && /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
     "data-cy": "archive-classroom",
     onClick: archiveClassroom
-  }, t("archive_classroom")), isMediumScreen && isCreator && subscription.isPaidUser && !isArchived && /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
+  }, /*#__PURE__*/_react.default.createElement(_CardElements.CardMenuIcon, null, /*#__PURE__*/_react.default.createElement(_Archive.default, {
+    fontSize: "small"
+  })), /*#__PURE__*/_react.default.createElement(_material.Typography, null, t("archive_classroom"))), isMediumScreen && isCreator && subscription.isPaidUser && !isArchived && /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
     onClick: handleOpenInviteDialog
   }, t("invite")), isMediumScreen && isCreator && !subscription.isPaidUser && !isArchived && /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
     onClick: handleOpenUpgradeSubscriptionModal

package/dist/Screens/Courses/ViewCourse/ViewTopic/ViewTopic.js

@@ -528,6 +528,7 @@ function Topic({
   verificationStatus,
   makeChatGptApiRequest,
   parentClassroom,
+  topicGoal,
   ...otherProps
 }) {
   const {
@@ -1112,7 +1113,8 @@ function Topic({
     siteLanguage: siteLanguage,
     makeChatGptApiRequest: makeChatGptApiRequest,
     difficulty: difficulty,
-    subscription: subscription
+    subscription: subscription,
+    topicGoal: topicGoal
   })))), /*#__PURE__*/_react.default.createElement(_material.Box, {
     py: 1
   }, /*#__PURE__*/_react.default.createElement(_Notes.default, {
@@ -1260,6 +1262,7 @@ function ViewTopic({
   trackRecommendedEvent,
   makeChatGptApiRequest,
   parentClassroom,
+  topicGoal,
   ...otherProps
 }) {
   const {
@@ -1288,7 +1291,8 @@ function ViewTopic({
     verificationStatus: verificationStatus,
     trackRecommendedEvent: trackRecommendedEvent,
     makeChatGptApiRequest: makeChatGptApiRequest,
-    parentClassroom: parentClassroom
+    parentClassroom: parentClassroom,
+    topicGoal: topicGoal
   }, otherProps))), !isLoading && !topic && /*#__PURE__*/_react.default.createElement(_Topic.default, {
     t: t,
     isLoading: isLoading,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nualang/nualang-ui-components",
-  "version": "0.1.1157",
+  "version": "0.1.1159",
   "main": "dist/index.js",
   "files": [
     "dist",