question generation type fix

Author: MmagdyHafezZ

apps/api/src/api/attempt/attempt.controller.ts

@@ -32,9 +32,9 @@ import { Roles } from "src/auth/role/roles.global.guard";
 import { Logger } from "winston";
 import {
   GRADE_SUBMISSION_EXCEPTION,
+  IN_COOLDOWN_PERIOD,
   MAX_ATTEMPTS_SUBMISSION_EXCEPTION_MESSAGE,
   SUBMISSION_DEADLINE_EXCEPTION_MESSAGE,
-  IN_COOLDOWN_PERIOD,
 } from "../assignment/attempt/api-exceptions/exceptions";
 import { BaseAssignmentAttemptResponseDto } from "../assignment/attempt/dto/assignment-attempt/base.assignment.attempt.response.dto";
 import { LearnerUpdateAssignmentAttemptRequestDto } from "../assignment/attempt/dto/assignment-attempt/create.update.assignment.attempt.request.dto";
@@ -139,6 +139,7 @@ export class AttemptControllerV2 {
   @ApiResponse({ status: 403 })
   getAssignmentAttempt(
     @Param("attemptId") assignmentAttemptId: number,
+    @Req() request: UserSessionRequest,
     @Query("lang") lang?: string,
   ): Promise<GetAssignmentAttemptResponseDto> {
     return this.attemptService.getAssignmentAttempt(

apps/api/src/api/llm/features/question-generation/services/question-generation.service.ts

@@ -421,13 +421,17 @@ export class QuestionGenerationService implements IQuestionGenerationService {
               .int()
               .positive()
               .optional()
-              .describe("Maximum word limit for text responses"),
+              .describe(
+                "Maximum word limit for text responses (only include for TEXT question types, omit otherwise)",
+              ),
             maxCharacters: z
               .number()
               .int()
               .positive()
               .optional()
-              .describe("Maximum character limit for text responses"),
+              .describe(
+                "Maximum character limit for text responses (only include for TEXT question types, omit otherwise)",
+              ),
             randomizedChoices: z
               .boolean()
               .optional()
@@ -653,10 +657,14 @@ FORMAT INSTRUCTIONS:
       responseType: question.responseType || this.getDefaultResponseType(),
       difficultyLevel: question.difficultyLevel,
       maxWords:
-        question.maxWords ||
+        (question.maxWords && question.maxWords > 0
+          ? question.maxWords
+          : null) ||
         this.getDefaultMaxWords(question.type, question.difficultyLevel),
       maxCharacters:
-        question.maxCharacters ||
+        (question.maxCharacters && question.maxCharacters > 0
+          ? question.maxCharacters
+          : null) ||
         this.getDefaultMaxCharacters(question.type, question.difficultyLevel),
       randomizedChoices:
         question.randomizedChoices ??
@@ -685,7 +693,11 @@ FORMAT INSTRUCTIONS:
       }
 
       const originalChoice = question.choices[0];
-      const choiceText = originalChoice.choice?.toLowerCase().trim();
+      const choiceValue =
+        typeof originalChoice.choice === "string"
+          ? originalChoice.choice
+          : String(originalChoice.choice ?? "");
+      const choiceText = choiceValue.toLowerCase().trim();
       const isStatementTrue = choiceText === "true";
 
       return [
@@ -707,22 +719,28 @@ FORMAT INSTRUCTIONS:
       return this.getDefaultChoices(question.type, question.difficultyLevel);
     }
 
-    return question.choices.map((choice: Choice, index: number) => ({
-      choice: choice.choice?.replaceAll("```", "").trim() || "",
-      id: choice.id || index + 1,
-      isCorrect: choice.isCorrect === true,
-      points:
-        choice.points === undefined
-          ? choice.isCorrect
-            ? 1
-            : 0
-          : Math.round(choice.points),
-      feedback:
-        choice.feedback?.replaceAll("```", "").trim() ||
-        (choice.isCorrect
-          ? "This is the correct answer."
-          : "This is not the correct answer."),
-    }));
+    return question.choices.map((choice: Choice, index: number) => {
+      const choiceValue =
+        typeof choice.choice === "string"
+          ? choice.choice
+          : String(choice.choice ?? "");
+      return {
+        choice: choiceValue.replaceAll("```", "").trim() || "",
+        id: choice.id || index + 1,
+        isCorrect: choice.isCorrect === true,
+        points:
+          choice.points === undefined
+            ? choice.isCorrect
+              ? 1
+              : 0
+            : Math.round(choice.points),
+        feedback:
+          choice.feedback?.replaceAll("```", "").trim() ||
+          (choice.isCorrect
+            ? "This is the correct answer."
+            : "This is not the correct answer."),
+      };
+    });
   }
 
   private async refineQuestions(
@@ -952,7 +970,11 @@ FORMAT INSTRUCTIONS:
       }
 
       const choice = question.choices[0];
-      const choiceValue = choice.choice?.toString().toLowerCase().trim();
+      const choiceString =
+        typeof choice.choice === "string"
+          ? choice.choice
+          : String(choice.choice ?? "");
+      const choiceValue = choiceString.toLowerCase().trim();
       if (choiceValue !== "true" && choiceValue !== "false") {
         return true;
       }

apps/api/src/api/llm/features/question-generation/services/question-validator.service.ts

@@ -471,7 +471,11 @@ export class QuestionValidatorService implements IQuestionValidatorService {
 
     const choice = question.choices[0];
 
-    const choiceText = choice.choice?.toString().toLowerCase().trim();
+    const choiceString =
+      typeof choice.choice === "string"
+        ? choice.choice
+        : String(choice.choice ?? "");
+    const choiceText = choiceString.toLowerCase().trim();
 
     if (choiceText !== "true" && choiceText !== "false") {
       issues.push(

apps/web/app/Helpers/checkQuestionsReady.ts

@@ -72,7 +72,9 @@ export const useQuestionsAreReadyToBePublished = (
     }
     for (let i = 0; i < choices.length; i++) {
       const { choice: choiceText, points } = choices[i];
-      if (!choiceText?.trim()) {
+      const choiceString =
+        typeof choiceText === "string" ? choiceText : String(choiceText ?? "");
+      if (!choiceString.trim()) {
         return {
           message: `Question ${index + 1} has an empty choice text.`,
           step: 0,

apps/web/app/author/(components)/AuthorQuestionsPage/index.tsx

@@ -86,7 +86,6 @@ type ClientSnapshot = {
   };
   timezone: string | null;
 };
-
 function parseBrowser(ua: string) {
   const pairs = [
     [/Edg\/([\d.]+)/i, "Edge"],

apps/web/stores/author.ts

@@ -1306,14 +1306,24 @@ export const useAuthorStore = createWithEqualityFn<
             return (
               Array.isArray(variant.choices) &&
               variant.choices.every((choice) => {
-                return choice.choice.toLowerCase() === "true";
+                const choiceValue = choice.choice;
+                if (typeof choiceValue === "boolean")
+                  return choiceValue === true;
+                if (typeof choiceValue === "string")
+                  return choiceValue.toLowerCase() === "true";
+                return false;
               })
             );
           } else {
             return (
               Array.isArray(question.choices) &&
               question.choices.every((choice) => {
-                return choice.choice.toLowerCase() === "true";
+                const choiceValue = choice.choice;
+                if (typeof choiceValue === "boolean")
+                  return choiceValue === true;
+                if (typeof choiceValue === "string")
+                  return choiceValue.toLowerCase() === "true";
+                return false;
               })
             );
           }