mario-education 2.4.600-feedback → 2.4.601-feedback

package/dist/containers/MarioAi/cofigs/type.d.ts

@@ -119,3 +119,16 @@ export interface IAnswer {
     startTime: string;
     teacherName: string;
 }
+export interface AiRequest {
+    historyId?: number;
+    promptId: number;
+    labelTime: string;
+    startDate?: number;
+    endDate?: number;
+    studentName: string;
+    chatHistory: IChat[];
+}
+export interface FilterRequest {
+    startDate?: number;
+    endDate?: number;
+}

package/dist/index.js

@@ -80095,7 +80095,7 @@ var useGeminiAI = function useGeminiAI() {
       var _temp4 = _catch(function () {
         var _systemPrompt;
 
-        var genAI = new generativeAi.GoogleGenerativeAI("AIzaSyCqCHPOBhR-uhO5iHVja2g1behLY4FsctM");
+        var genAI = new generativeAi.GoogleGenerativeAI("AIzaSyAb1MebW5BcT__I8WZtbvKkDHYzZDHKZro");
         var model = genAI.getGenerativeModel({
           model: "gemini-1.5-flash",
           generationConfig: {
@@ -80269,7 +80269,6 @@ var CALENDAR_OPTIONS$2 = [{
   startDate: moment().startOf("year").valueOf(),
   endDate: moment().endOf("year").valueOf()
 }];
-var timeKeywords = ["this month", "this week", "this year", "last month", "last week", "last year", "today"];
 var IDataType;
 
 (function (IDataType) {
@@ -80559,6 +80558,7 @@ var ListPrompts = function ListPrompts(_ref) {
 };
 
 var PROMPT_URL = marioCore.BASE_URL + "/api/Prompt";
+var GEMINI_AI_URL = marioCore.BASE_URL + "/api/GeminiAi";
 var getPrompt = function getPrompt() {
   return marioCore.api.get("" + PROMPT_URL);
 };
@@ -80568,11 +80568,6 @@ var getById$p = function getById(id) {
 var getHistoryPrompt = function getHistoryPrompt() {
   return marioCore.api.get(PROMPT_URL + "/history");
 };
-var getSessionAnswer = function getSessionAnswer(params) {
-  return marioCore.api.get(PROMPT_URL + "/session-data", {
-    params: params
-  });
-};
 var createHistory = function createHistory(data) {
   return marioCore.api.post(PROMPT_URL + "/create-history", data);
 };
@@ -80582,10 +80577,8 @@ var removeHistory = function removeHistory(id) {
 var getHistoryById = function getHistoryById(id) {
   return marioCore.api.get(PROMPT_URL + "/history/" + id);
 };
-var getTotalSession = function getTotalSession(params) {
-  return marioCore.api.get(PROMPT_URL + "/session-total-data", {
-    params: params
-  });
+var chatWithAi = function chatWithAi(data) {
+  return marioCore.api.post(GEMINI_AI_URL + "/generate", data);
 };
 
 var useAIMario = function useAIMario() {
@@ -80952,24 +80945,13 @@ var useAIChat = function useAIChat() {
       historyId = _useState4[0],
       setHistoryId = _useState4[1];
 
-  var _useState5 = React.useState([]),
-      answers = _useState5[0],
-      setAnswers = _useState5[1];
+  var _useState5 = React.useState(""),
+      inputString = _useState5[0],
+      setInputString = _useState5[1];
 
-  var _useState6 = React.useState(""),
-      inputString = _useState6[0],
-      setInputString = _useState6[1];
-
-  var _useState7 = React.useState({
-    checkInCompleteCount: 0,
-    checkInCount: 0,
-    oneToOneCompleteCount: 0,
-    oneToOneCount: 0,
-    studentNotDoneCheckIns: [],
-    studentNotDoneConversations: []
-  }),
-      totalCheckIns = _useState7[0],
-      setTotalCheckIns = _useState7[1];
+  var _useState6 = React.useState(),
+      filters = _useState6[0],
+      setFilters = _useState6[1];
 
   var goBack = function goBack() {
     history.goBack();
@@ -81050,8 +81032,8 @@ var useAIChat = function useAIChat() {
         isSystem: false
       }]);
       setChats(responses);
-      var startDate;
-      var endDate;
+      var startDate = filters === null || filters === void 0 ? void 0 : filters.startDate;
+      var endDate = filters === null || filters === void 0 ? void 0 : filters.endDate;
 
       switch (option.toLowerCase()) {
         case "this month":
@@ -81083,20 +81065,14 @@ var useAIChat = function useAIChat() {
           break;
       }
 
-      if (startDate && endDate) {
-        !!prompt && getSessionAnswerData(startDate, endDate, prompt, option, responses);
-      } else {
-        if ((prompt === null || prompt === void 0 ? void 0 : prompt.dataType) == IDataType.Total) {
-          var dataInputPrompt = "Here is the data summary:  \n                    - Total check-ins: " + totalCheckIns.checkInCount + "  \n                    - Completed check-ins: " + totalCheckIns.checkInCompleteCount + "  \n                    - Total one-on-one sessions: " + totalCheckIns.oneToOneCount + "  \n                    - Completed one-on-one sessions: " + totalCheckIns.oneToOneCompleteCount + "  \n\n                    The following students and teachers have not completed their tasks:  \n                    - Pending check-ins: " + totalCheckIns.studentNotDoneCheckIns.join(", ") + "  \n                    - Pending one-on-one conversations: " + totalCheckIns.studentNotDoneConversations.join(", ");
-          !!prompt && askGeminiAI(dataInputPrompt, prompt, "", responses);
-        } else {
-          var _dataInputPrompt = "This is the data:\n" + (!(answers !== null && answers !== void 0 && answers.length) ? "No data available for analysis." : answers.map(function (r) {
-            return "Student name: " + r.fullName + ", \n                        Answer: " + r.answer + ", \n                        Student grade: " + r.grade + ", \n                        Start time: " + r.startTime + ", \n                        Question: " + r.question + ", \n                        Teacher name: " + r.teacherName + ";";
-          }).join("\n"));
-
-          !!prompt && askGeminiAI(_dataInputPrompt, prompt, "", responses);
-        }
+      if (endDate && startDate) {
+        setFilters({
+          startDate: startDate,
+          endDate: endDate
+        });
       }
+
+      !!prompt && askGeminiAI(prompt, option, responses, startDate, endDate);
     } catch (err) {
       var _err$response;
 
@@ -81107,33 +81083,11 @@ var useAIChat = function useAIChat() {
     }
   };
 
-  var getSessionAnswerData = React.useCallback(function (startDate, endDate, prompt, labelTime, responses) {
+  var saveHistoryPrompt = React.useCallback(function (data) {
     try {
       var _temp6 = _catch(function () {
-        var filters = {
-          startDate: startDate,
-          endDate: endDate,
-          question: prompt.question,
-          instruction: prompt.instruction,
-          studentName: inputString
-        };
-        return Promise.resolve(prompt.dataType != IDataType.Total ? getSessionAnswer(filters) : getTotalSession(filters)).then(function (res) {
-          if (prompt.dataType == IDataType.Total) {
-            setTotalCheckIns(res.data);
-            var totals = res.data;
-            var dataInputPrompt = "Here is the data summary:  \n                        - Total check-ins: " + totals.checkInCount + "  \n                        - Completed check-ins: " + totals.checkInCompleteCount + "  \n                        - Total one-on-one sessions: " + totals.oneToOneCount + "  \n                        - Completed one-on-one sessions: " + totals.oneToOneCompleteCount + "  \n\n                        The following students and teachers have not completed their tasks:  \n                        - Pending check-ins: " + totals.studentNotDoneCheckIns.join(", ") + "  \n                        - Pending one-on-one conversations: " + totals.studentNotDoneConversations.join(", ");
-            askGeminiAI(dataInputPrompt, prompt, labelTime, responses);
-          } else {
-            var _answers = res.data || [];
-
-            setAnswers(_answers);
-
-            var _dataInputPrompt2 = "This is the data:\n" + (!(_answers !== null && _answers !== void 0 && _answers.length) ? "No data available for analysis." : _answers.map(function (r) {
-              return "Student name: " + r.fullName + ", \n                            Answer: " + r.answer + ", \n                            Student grade: " + r.grade + ", \n                            Start time: " + r.startTime + ", \n                            Question: " + r.question + ", \n                            Teacher name: " + r.teacherName + ";";
-            }).join("\n"));
-
-            askGeminiAI(_dataInputPrompt2, prompt, labelTime, responses);
-          }
+        return Promise.resolve(createHistory(data)).then(function (res) {
+          setHistoryId(res.data);
         });
       }, function (err) {
         var _err$response2;
@@ -81148,103 +81102,23 @@ var useAIChat = function useAIChat() {
     } catch (e) {
       return Promise.reject(e);
     }
-  }, [prompt, historyId, inputString]);
-  var saveHistoryPrompt = React.useCallback(function (data) {
-    try {
-      var _temp8 = _catch(function () {
-        return Promise.resolve(createHistory(data)).then(function (res) {
-          setHistoryId(res.data);
-        });
-      }, function (err) {
-        var _err$response3;
-
-        dispatch(marioCore.setAlert({
-          type: "danger",
-          message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : _err$response3.data) || err.message
-        }));
-      });
-
-      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
-    } catch (e) {
-      return Promise.reject(e);
-    }
   }, [historyId]);
 
-  var askGeminiAI = function askGeminiAI(dataInputPrompt, prompt, labelTime, responses) {
+  var askGeminiAI = function askGeminiAI(prompt, labelTime, responses, startDate, endDate) {
     try {
-      var _temp10 = _catch(function () {
-        var genAI = new generativeAi.GoogleGenerativeAI("AIzaSyCqCHPOBhR-uhO5iHVja2g1behLY4FsctM");
-        var model = genAI.getGenerativeModel({
-          model: prompt.aiModel
-        });
-        var userMessages = prompt.messages.filter(function (r) {
-          var _r$role2;
-
-          return ((_r$role2 = r.role) === null || _r$role2 === void 0 ? void 0 : _r$role2.toString()) != "System";
-        }).map(function (i) {
-          var _i$role2, _i$message;
-
-          return {
-            role: (_i$role2 = i.role) === null || _i$role2 === void 0 ? void 0 : _i$role2.toString().toLowerCase(),
-            parts: [{
-              text: (_i$message = i.message) === null || _i$message === void 0 ? void 0 : _i$message.replace(/{time}/g, labelTime)
-            }]
-          };
-        });
-        var updatedChatHistory = responses.filter(function (r) {
-          return r.message;
-        }).reduce(function (acc, i) {
-          acc.push({
-            role: i.isUser ? "user" : "model",
-            parts: [{
-              text: i.message
-            }]
-          });
-
-          if (timeKeywords.includes(i.message.toLowerCase())) {
-            acc.push({
-              role: "user",
-              parts: [{
-                text: dataInputPrompt
-              }]
-            });
-          }
-
-          return acc;
-        }, []);
-        var systemMessages = prompt.messages.filter(function (r) {
-          var _r$role3;
-
-          return ((_r$role3 = r.role) === null || _r$role3 === void 0 ? void 0 : _r$role3.toString()) == "System";
-        }).map(function (i) {
-          var _i$message2;
-
-          return {
-            text: (_i$message2 = i.message) === null || _i$message2 === void 0 ? void 0 : _i$message2.replace(/{time}/g, labelTime)
-          };
-        });
-        var contents = [].concat(userMessages, updatedChatHistory);
-        return Promise.resolve(model.generateContent({
-          contents: contents,
-          systemInstruction: {
-            role: "system",
-            parts: [].concat(systemMessages, [{
-              text: dataInputPrompt
-            }])
-          },
-          generationConfig: {
-            temperature: prompt.temperature,
-            topP: prompt.topP,
-            topK: prompt.topK,
-            maxOutputTokens: prompt.maxOutputTokens,
-            frequencyPenalty: prompt.frequencyPenalty,
-            presencePenalty: prompt.presencePenalty,
-            responseMimeType: "text/plain"
-          }
-        })).then(function (result) {
-          var _result$response;
+      var _temp8 = _catch(function () {
+        return Promise.resolve(chatWithAi({
+          chatHistory: responses,
+          startDate: startDate,
+          endDate: endDate,
+          studentName: inputString,
+          promptId: prompt.id,
+          labelTime: labelTime,
+          historyId: historyId || undefined
+        })).then(function (res) {
+          var _res$data;
 
-          var partialText = result === null || result === void 0 ? void 0 : (_result$response = result.response) === null || _result$response === void 0 ? void 0 : _result$response.text();
+          var partialText = (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.text) || "";
 
           if (!!partialText) {
             var aiChats = [];
@@ -81273,6 +81147,17 @@ var useAIChat = function useAIChat() {
               aiChats = updatedChats;
               return updatedChats;
             });
+            var systemMessages = prompt.messages.filter(function (r) {
+              var _r$role2;
+
+              return ((_r$role2 = r.role) === null || _r$role2 === void 0 ? void 0 : _r$role2.toString()) == "System";
+            }).map(function (i) {
+              var _i$message;
+
+              return {
+                text: (_i$message = i.message) === null || _i$message === void 0 ? void 0 : _i$message.replace(/{time}/g, labelTime)
+              };
+            });
             var formattedSystemMessages = systemMessages.map(function (msg) {
               return {
                 message: msg.text,
@@ -81293,15 +81178,15 @@ var useAIChat = function useAIChat() {
           }
         });
       }, function (err) {
-        var _err$response4, _err$response4$data;
+        var _err$response3, _err$response3$data;
 
         dispatch(marioCore.setAlert({
           type: "danger",
-          message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message
+          message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.title) || err.message
         }));
       });
 
-      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(function () {}) : void 0);
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }