Question Component Page updated

studyAi/graphql/schema.graphql

@@ -505,7 +505,7 @@ type AggregateVerificationToken {
 }
 
 type AnswerData {
-  correctAnswer: [String!]!
+  correctAnswer: [AnswerOption!]!
 }
 
 input AnswerDataCompositeFilter {
@@ -519,19 +519,15 @@ input AnswerDataCreateEnvelopeInput {
 }
 
 input AnswerDataCreateInput {
-  correctAnswer: AnswerDataCreatecorrectAnswerInput
-}
-
-input AnswerDataCreatecorrectAnswerInput {
-  set: [String!]!
+  correctAnswer: [AnswerOptionCreateInput!]
 }
 
 input AnswerDataObjectEqualityInput {
-  correctAnswer: [String!]
+  correctAnswer: [AnswerOptionObjectEqualityInput!]
 }
 
 input AnswerDataOrderByInput {
-  correctAnswer: SortOrder
+  correctAnswer: AnswerOptionOrderByCompositeAggregateInput
 }
 
 input AnswerDataUpdateEnvelopeInput {
@@ -540,19 +536,33 @@ input AnswerDataUpdateEnvelopeInput {
 }
 
 input AnswerDataUpdateInput {
-  correctAnswer: AnswerDataUpdatecorrectAnswerInput
-}
-
-input AnswerDataUpdatecorrectAnswerInput {
-  push: [String!]
-  set: [String!]
+  correctAnswer: [AnswerOptionCreateInput!]
 }
 
 input AnswerDataWhereInput {
   AND: [AnswerDataWhereInput!]
   NOT: [AnswerDataWhereInput!]
   OR: [AnswerDataWhereInput!]
-  correctAnswer: StringNullableListFilter
+  correctAnswer: [AnswerOptionObjectEqualityInput!]
+}
+
+type AnswerOption {
+  id: String!
+  value: String!
+}
+
+input AnswerOptionCreateInput {
+  id: String!
+  value: String!
+}
+
+input AnswerOptionObjectEqualityInput {
+  id: String!
+  value: String!
+}
+
+input AnswerOptionOrderByCompositeAggregateInput {
+  _count: SortOrder
 }
 
 input BoolFieldUpdateOperationsInput {
@@ -1282,7 +1292,7 @@ type QuestionGroupBy {
 
 type QuestionInfoData {
   description: String!
-  options: [String!]!
+  options: [AnswerOption!]!
   title: String!
 }
 
@@ -1298,23 +1308,19 @@ input QuestionInfoDataCreateEnvelopeInput {
 
 input QuestionInfoDataCreateInput {
   description: String!
-  options: QuestionInfoDataCreateoptionsInput
+  options: [AnswerOptionCreateInput!]
   title: String!
 }
 
-input QuestionInfoDataCreateoptionsInput {
-  set: [String!]!
-}
-
 input QuestionInfoDataObjectEqualityInput {
   description: String!
-  options: [String!]
+  options: [AnswerOptionObjectEqualityInput!]
   title: String!
 }
 
 input QuestionInfoDataOrderByInput {
   description: SortOrder
-  options: SortOrder
+  options: AnswerOptionOrderByCompositeAggregateInput
   title: SortOrder
 }
 
@@ -1325,21 +1331,16 @@ input QuestionInfoDataUpdateEnvelopeInput {
 
 input QuestionInfoDataUpdateInput {
   description: StringFieldUpdateOperationsInput
-  options: QuestionInfoDataUpdateoptionsInput
+  options: [AnswerOptionCreateInput!]
   title: StringFieldUpdateOperationsInput
 }
 
-input QuestionInfoDataUpdateoptionsInput {
-  push: [String!]
-  set: [String!]
-}
-
 input QuestionInfoDataWhereInput {
   AND: [QuestionInfoDataWhereInput!]
   NOT: [QuestionInfoDataWhereInput!]
   OR: [QuestionInfoDataWhereInput!]
   description: StringFilter
-  options: StringNullableListFilter
+  options: [AnswerOptionObjectEqualityInput!]
   title: StringFilter
 }
 

studyAi/package.json

@@ -47,6 +47,7 @@
     "nexus": "^1.3.0",
     "openai": "^3.3.0",
     "react": "18",
+    "react-device-detect": "^2.2.3",
     "react-dom": "18",
     "react-select": "^5.7.7",
     "react-sweet-state": "^2.7.1",

studyAi/prisma/schema.prisma

@@ -15,7 +15,10 @@ datasource db {
   provider = "mongodb"
   url      = env("DATABASE_URL")
 }
-
+type AnswerOption {
+  id String @db.ObjectId
+  value String 
+}
 type LocationData {
   locationType String
   //latitude and longitude
@@ -32,7 +35,7 @@ type QuestionInfoData {
   title       String
   description String
   //for mc and select multiple. short answer will contain empty arr
-  options     String[]
+  options     AnswerOption[]
 }
 
 type UserQuestionData {
@@ -41,7 +44,7 @@ type UserQuestionData {
 }
 
 type AnswerData {
-  correctAnswer String[]
+  correctAnswer AnswerOption[]
 }
 
 type LikeCounter {

studyAi/public/site.webmanifest

@@ -0,0 +1,19 @@
+{
+  "name": "Study AI",
+  "short_name": "Study AI",
+  "icons": [
+    {
+      "src": "/logo/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/logo/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
+}

studyAi/src/app/api/generateQuestion/generateQuestion.ts

@@ -1,28 +1,136 @@
 import generatePrompts from "../../util/openAI/openAI";
 import { NextResponse } from "next/server";
 import * as z from "zod";
-
 //schema for validating user inputs
 const questionSchema = z.object({
   type: z.string(),
   tags: z.array(z.string()),
+  title: z.array(z.string()),
   question: z.string(),
-  numberOfOptions: z.number()
+  answers: z.array(
+    z.object({
+      value: z.string(),
+      id: z.string(),
+    })
+  ),
+  numberOfOptions: z.number(),
 });
-
+type QuesitonSchema = z.infer<typeof questionSchema>;
+const determinePromptTemplateStr = (questionType: string) => {
+  let str: string;
+  switch (questionType) {
+    case "Multiple Choice":
+      str = `
+        {
+          description: 'QuestionDescription'
+          title: 'QuestionTitle'
+          options: 'QuestionOptions'
+          answer: 'CorrectAnswers'
+        }
+      `;
+      return str;
+    case "Short Answer":
+      str = `
+        {
+          description: 'QuestionDescription'
+          title: 'QuestionTitle'
+          answer: 'CorrectAnswers'
+        }
+      `;
+      return str;
+    case "Select Multiple":
+      str = `
+        {
+          description: 'QuestionDescription'
+          title: 'QuestionTitle'
+          options: 'QuestionOptions'
+          answer: 'CorrectAnswers'
+        }
+      `;
+      return str;
+    default:
+      str = `
+        {
+          description: 'QuestionDescription'
+          title: 'QuestionTitle'
+          answer: 'CorrectAnswers'
+        }
+      `;
+      return str;
+  }
+};
+const determineVariableTypeTemplateStr = (
+  questionType: string,
+  numberOfOptions: number
+) => {
+  let str: string;
+  switch (questionType) {
+    case "Multiple Choice":
+      str = `the new options as a list of strings with length ${numberOfOptions} called 'QuestionOptions', and the new correct answer inside a list of strings, with length 1, called 'CorrectAnswers'.`;
+      break;
+    case "Short Answer":
+      str = `the new correct answer inside a list of strings with length 1, called 'CorrectAnswers'`;
+      break;
+    case "Select Multiple":
+      str = `the new options as a list of strings with length ${numberOfOptions} called 'QuestionOptions', and the new correct answer/answers as a list of strings called 'CorrectAnswers'`;
+      break;
+    default:
+      str = `the new correct answer inside a list of strings with length 1, called 'CorrectAnswers'`;
+      break;
+  }
+  return str;
+};
 export async function generateQuestion(req: Request) {
   try {
     const bodyPromise = req.json();
     const body = await bodyPromise;
-    const { type, tags, question, numberOfOptions } = questionSchema.parse(body);
-    const questionType = (type === "mcq") ?  `multiple choice with ${numberOfOptions} different potential answers` : ("checkbox") ? `with ${numberOfOptions} different potential answers some correct and some incorrect` : "short answer";
+    let parsedBody: QuesitonSchema;
+    try {
+      parsedBody = questionSchema.parse(body);
+    } catch (err) {
+      return NextResponse.json({
+        status: 400,
+        message: "Invalid input",
+        error: err,
+      });
+    }
+    const { type, tags, title, question, numberOfOptions, answers } =
+      parsedBody;
+    const questionType =
+      type === "Multiple Choice"
+        ? `A Multiple choice question, with ${numberOfOptions} unique options, but only one correct answer`
+        : "Select Multiple"
+        ? `A Select Multiple/Select All question, with ${numberOfOptions} unique options, where each option can be a correct answer OR incorrect answer. However, there MUST be at least ONE correct answer`
+        : "Short Answer question";
+
+    const prompt = `Give me a completely NEW question where the question type is: ${questionType}. 
+    It should also be similar to the following question:
+    questionTitle: ${title}, description: ${question}, answer: ${answers
+      .map((a) => a.value)
+      .join(", ")}.
+
+    Also, try to ensure that the question is related to the following subjects: ${tags.join(
+      ", "
+    )}
 
-    const prompt = `Ask me a question, ${questionType}, similar to this question: ${question} and from the following subjects: ${tags}. Indicate which is the correct response, and Return your response in a JSON object, with the following format: {"question": "", "correct": ["",...], "incorrect": ["",...]}`;
-    const model = "gpt-3.5-turbo";
-    const questionGenerated = await generatePrompts(model, prompt) || "";
-    const newQuestion = JSON.parse(questionGenerated);
-    newQuestion.options = [...newQuestion.correct, ...newQuestion.incorrect];
+    Then, store the new question description as a string called 'QuestionDescription', the new question title as a string 'QuestionTitle', ${determineVariableTypeTemplateStr(type, numberOfOptions)}
 
+    Finally, return the new generated question data as a JSON object, in the following format:
+    ${determinePromptTemplateStr(type)}`;
+    // Indicate which is the correct response, and Return your response in a JSON object,
+    // with the following format: {"question": "", "correct": ["",...], "incorrect": ["",...]};
+    const model = "gpt-3.5-turbo";
+    const questionGenerated = (await generatePrompts(model, prompt)) || "";
+    let newQuestion = null;
+    try {
+      newQuestion = JSON.parse(questionGenerated);
+    } catch (err) {
+      return NextResponse.json({
+        status: 500,
+        message: `Failed to parse the following response ${questionGenerated}`,
+        error: err,
+      });
+    }
     return NextResponse.json({
       newQuestion,
       message: `Question Generated Successfully`,
@@ -34,4 +142,4 @@ export async function generateQuestion(req: Request) {
       message: "Something went wrong",
     });
   }
-}
+}