@studious-lms/server 1.2.49 → 1.2.51

package/dist/server/pipelines/gradeWorksheet.d.ts

@@ -1,4 +1,5 @@
-export declare const gradeWorksheetPipeline: (worksheetResponseId: string) => Promise<{
+export declare const gradeWorksheetPipeline: (worksheetResponseId: string) => Promise<void>;
+export declare const cancelGradePipeline: (worksheetResponseId: string, worksheetQuestionProgressId: string) => Promise<{
     status: import(".prisma/client").$Enums.GenerationStatus | null;
     id: string;
     feedback: string | null;
@@ -11,5 +12,19 @@ export declare const gradeWorksheetPipeline: (worksheetResponseId: string) => Pr
     markschemeState: import("@prisma/client/runtime/library.js").JsonValue | null;
     points: number;
     studentWorksheetResponseId: string | null;
-} | undefined>;
+}>;
+export declare const regradeWorksheetPipeline: (worksheetResponseId: string, worksheetQuestionProgressId: string) => Promise<{
+    status: import(".prisma/client").$Enums.GenerationStatus | null;
+    id: string;
+    feedback: string | null;
+    studentId: string;
+    createdAt: Date;
+    updatedAt: Date | null;
+    questionId: string;
+    response: string;
+    isCorrect: boolean;
+    markschemeState: import("@prisma/client/runtime/library.js").JsonValue | null;
+    points: number;
+    studentWorksheetResponseId: string | null;
+}>;
 //# sourceMappingURL=gradeWorksheet.d.ts.map

package/dist/server/pipelines/gradeWorksheet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gradeWorksheet.d.ts","sourceRoot":"/","sources":["server/pipelines/gradeWorksheet.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,sBAAsB,GAAU,qBAAqB,MAAM;;;;;;;;;;;;;cAsIvE,CAAC"}
+{"version":3,"file":"gradeWorksheet.d.ts","sourceRoot":"/","sources":["server/pipelines/gradeWorksheet.ts"],"names":[],"mappings":"AA+IA,eAAO,MAAM,sBAAsB,GAAU,qBAAqB,MAAM,kBAsDvE,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAU,qBAAqB,MAAM,EAAE,6BAA6B,MAAM;;;;;;;;;;;;;EAyBzG,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAU,qBAAqB,MAAM,EAAE,6BAA6B,MAAM;;;;;;;;;;;;;EAgD9G,CAAC"}

package/dist/server/pipelines/gradeWorksheet.js

@@ -1,5 +1,5 @@
 
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="1b23ac7f-6ff8-51c0-8cc7-e0276b542625")}catch(e){}}();
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="dca8f58c-f587-5706-98e0-1eafd2fa5e2f")}catch(e){}}();
 import { GenerationStatus, WorksheetQuestionType } from "@prisma/client";
 import { prisma } from "../../lib/prisma.js";
 import { logger } from "../../utils/logger.js";
@@ -7,6 +7,114 @@ import z from "zod";
 import { inference } from "../../utils/inference.js";
 import { getAIUserId } from "../../utils/aiUser.js";
 import { pusher } from "../../lib/pusher.js";
+const removeAllPreviousAIComments = async (worksheetQuestionProgressId) => {
+    await prisma.comment.deleteMany({
+        where: {
+            studentQuestionProgressId: worksheetQuestionProgressId,
+            authorId: getAIUserId(),
+        },
+    });
+};
+const gradeWorksheetQuestion = async (worksheetResponseId, worksheetQuestionProgressId) => {
+    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({
+        where: { id: worksheetResponseId },
+        include: {
+            worksheet: true,
+        },
+    });
+    if (!worksheetResponse) {
+        logger.error('Worksheet response not found');
+        throw new Error('Worksheet response not found');
+    }
+    const studentQuestionProgress = await prisma.studentQuestionProgress.findFirst({
+        where: {
+            id: worksheetQuestionProgressId,
+        },
+        include: {
+            question: true,
+            comments: true,
+        },
+    });
+    if (!studentQuestionProgress) {
+        logger.error('Student question progress not found');
+        throw new Error('Student question progress not found');
+    }
+    pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-pending`, {
+        id: studentQuestionProgress.id,
+    });
+    const question = studentQuestionProgress.question;
+    const comments = studentQuestionProgress.comments;
+    const responseText = studentQuestionProgress.response;
+    try {
+        const apiResponse = await inference(`Grade the following worksheet response:
+            
+            Question: ${question.question}
+            Response: ${responseText}
+
+            Comments: ${comments.map((comment) => comment.content).join('\n')}
+            Mark Scheme: ${JSON.stringify(question.markScheme)}
+            
+            Justify your reasoning by including comment(s) and mark the question please.         
+            Return ONLY JSON in the following format (fill in the values as per the question):
+           {
+            "isCorrect": <boolean>,
+            "points": <number>,
+            "markschemeState": [
+                { "id": <string>, "correct": <boolean> }
+            ],
+            "comments": [<string>, ...]
+            }
+            `, z.object({
+            isCorrect: z.boolean(),
+            points: z.number(),
+            markschemeState: z.array(z.object({
+                id: z.string(),
+                correct: z.boolean(),
+            })), // @note: this has to be converted to [id: string]: correct boolean
+            comments: z.array(z.string()),
+        })).catch((error) => {
+            logger.error('Failed to grade worksheet response', { error });
+            throw error;
+        });
+        const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({
+            where: { id: studentQuestionProgress.id, status: {
+                    not: {
+                        in: ['CANCELLED'],
+                    },
+                } },
+            data: {
+                status: GenerationStatus.COMPLETED,
+                isCorrect: apiResponse.isCorrect,
+                points: apiResponse.points,
+                markschemeState: apiResponse.markschemeState.reduce((acc, curr) => {
+                    acc["item-" + curr.id] = curr.correct;
+                    return acc;
+                }, {}),
+                comments: {
+                    create: apiResponse.comments.map((commentContent) => ({
+                        content: commentContent,
+                        authorId: getAIUserId(),
+                    })),
+                },
+            },
+        });
+        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-completed`, {
+            id: updatedStudentQuestionProgress.id,
+        });
+        return updatedStudentQuestionProgress;
+    }
+    catch (error) {
+        logger.error('Failed to grade worksheet response', { error, worksheetResponseId });
+        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-failed`, {
+            id: studentQuestionProgress.id,
+        });
+        await prisma.studentQuestionProgress.update({
+            where: { id: studentQuestionProgress.id },
+            data: { status: GenerationStatus.FAILED },
+        });
+        throw error;
+    }
+};
 /**
  * Grades and regrades worksheet (can fixed failed responses)
  * @param worksheetResponseId worksheet response id
@@ -48,9 +156,6 @@ export const gradeWorksheetPipeline = async (worksheetResponseId) => {
     // Use for...of instead of forEach to properly handle async operations
     for (const response of worksheetResponse.responses) {
         logger.info('Grading question', { questionId: response.questionId });
-        const question = response.question;
-        const comments = response.comments;
-        const responseText = response.response;
         const studentQuestionProgress = await prisma.studentQuestionProgress.update({
             where: { id: response.id, status: {
                     not: {
@@ -62,78 +167,75 @@ export const gradeWorksheetPipeline = async (worksheetResponseId) => {
         if (studentQuestionProgress.status !== GenerationStatus.PENDING) {
             return;
         }
-        try {
-            const apiResponse = await inference(`Grade the following worksheet response:
-                
-                Question: ${question.question}
-                Response: ${responseText}
-
-                Comments: ${comments.map((comment) => comment.content).join('\n')}
-                Mark Scheme: ${JSON.stringify(question.markScheme)}
-                
-                Justify your reasoning by including comment(s) and mark the question please.         
-                Return ONLY JSON in the following format (fill in the values as per the question):
-               {
-                "isCorrect": <boolean>,
-                "points": <number>,
-                "markschemeState": [
-                    { "id": <string>, "correct": <boolean> }
-                ],
-                "comments": [<string>, ...]
-                }
-                `, z.object({
-                isCorrect: z.boolean(),
-                points: z.number(),
-                markschemeState: z.array(z.object({
-                    id: z.string(),
-                    correct: z.boolean(),
-                })), // @note: this has to be converted to [id: string]: correct boolean
-                comments: z.array(z.string()),
-            })).catch((error) => {
-                logger.error('Failed to grade worksheet response', { error });
-                throw error;
-            });
-            console.log(apiResponse);
-            const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({
-                where: { id: studentQuestionProgress.id, status: {
-                        not: {
-                            in: ['CANCELLED'],
-                        },
-                    } },
-                data: {
-                    status: GenerationStatus.COMPLETED,
-                    isCorrect: apiResponse.isCorrect,
-                    points: apiResponse.points,
-                    markschemeState: apiResponse.markschemeState.reduce((acc, curr) => {
-                        acc["item-" + curr.id] = curr.correct;
-                        return acc;
-                    }, {}),
-                    comments: {
-                        create: apiResponse.comments.map((commentContent) => ({
-                            content: commentContent,
-                            authorId: getAIUserId(),
-                        })),
-                    },
-                },
-            });
-            pusher.trigger(`class-${worksheetResponse.worksheet.classId}`, `ai-worksheet-updated-${worksheetResponse.id}`, {
-                success: true,
-            });
-            return updatedStudentQuestionProgress;
+        gradeWorksheetQuestion(worksheetResponseId, response.id);
+    }
+    ;
+};
+export const cancelGradePipeline = async (worksheetResponseId, worksheetQuestionProgressId) => {
+    logger.info('Cancelling auto grading', { worksheetResponseId, worksheetQuestionProgressId });
+    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({
+        where: { id: worksheetResponseId },
+        include: {
+            worksheet: true,
+        },
+    });
+    if (!worksheetResponse) {
+        logger.error('Worksheet response not found');
+        throw new Error('Worksheet response not found');
+    }
+    const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({
+        where: { id: worksheetQuestionProgressId },
+        data: { status: GenerationStatus.CANCELLED },
+    });
+    await removeAllPreviousAIComments(worksheetQuestionProgressId);
+    pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-cancelled`, {
+        id: updatedStudentQuestionProgress.id,
+    });
+    return updatedStudentQuestionProgress;
+};
+export const regradeWorksheetPipeline = async (worksheetResponseId, worksheetQuestionProgressId) => {
+    logger.info('Regrading worksheet response', { worksheetResponseId, worksheetQuestionProgressId });
+    try {
+        const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({
+            where: { id: worksheetResponseId, },
+            include: {
+                worksheet: true,
+            },
+        });
+        await removeAllPreviousAIComments(worksheetQuestionProgressId);
+        if (!worksheetResponse) {
+            logger.error('Worksheet response not found');
+            throw new Error('Worksheet response not found');
         }
-        catch (error) {
-            logger.error('Failed to grade worksheet response', { error, worksheetResponseId });
-            pusher.trigger(`class-${worksheetResponse.worksheet.classId}`, `ai-worksheet-updated-${worksheetResponse.id}`, {
-                success: false,
-            });
-            await prisma.studentQuestionProgress.update({
-                where: { id: studentQuestionProgress.id },
-                data: { status: GenerationStatus.FAILED },
-            });
-            throw error;
+        const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({
+            where: { id: worksheetQuestionProgressId },
+            data: { status: GenerationStatus.PENDING },
+        });
+        console.log(updatedStudentQuestionProgress);
+        gradeWorksheetQuestion(worksheetResponseId, worksheetQuestionProgressId);
+        return updatedStudentQuestionProgress;
+    }
+    catch (error) {
+        await prisma.studentQuestionProgress.update({
+            where: { id: worksheetQuestionProgressId },
+            data: { status: GenerationStatus.FAILED },
+        });
+        const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({
+            where: { id: worksheetResponseId, },
+            include: {
+                worksheet: true,
+            },
+        });
+        if (!worksheetResponse) {
+            logger.error('Worksheet response not found');
+            throw new Error('Worksheet response not found');
         }
+        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-failed`, {
+            id: worksheetQuestionProgressId,
+        });
+        logger.error('Failed to regrade worksheet response', { error, worksheetResponseId, worksheetQuestionProgressId });
+        throw error;
     }
-    ;
 };
 //# sourceMappingURL=gradeWorksheet.js.map
-//# debugId=1b23ac7f-6ff8-51c0-8cc7-e0276b542625
+//# debugId=dca8f58c-f587-5706-98e0-1eafd2fa5e2f

package/dist/server/pipelines/gradeWorksheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"gradeWorksheet.js","sources":["server/pipelines/gradeWorksheet.ts"],"sourceRoot":"/","sourcesContent":["import { GenerationStatus, WorksheetQuestionType } from \"@prisma/client\";\nimport { prisma } from \"../../lib/prisma.js\";\nimport { logger } from \"../../utils/logger.js\";\nimport z from \"zod\";\nimport { inference } from \"../../utils/inference.js\";\nimport { getAIUserId } from \"../../utils/aiUser.js\";\nimport { pusher } from \"../../lib/pusher.js\";\n\n/**\n * Grades and regrades worksheet (can fixed failed responses)\n * @param worksheetResponseId worksheet response id\n * @returns updated worksheet response\n */\n\nconst DO_NOT_INFERENCE_STATUSES = [GenerationStatus.CANCELLED, GenerationStatus.PENDING, GenerationStatus.COMPLETED];\n\nexport const gradeWorksheetPipeline = async (worksheetResponseId: string) => {\n    logger.info('Grading worksheet response', { worksheetResponseId });\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId },\n        include: {\n            worksheet: true,\n            responses: {\n                where: {\n                    status: {\n                        not: {\n                            in: DO_NOT_INFERENCE_STATUSES,\n                        },\n                    },\n                    question: {\n                        type: {\n                            not: {\n                                in: [WorksheetQuestionType.MULTIPLE_CHOICE, WorksheetQuestionType.TRUE_FALSE],\n                            }\n                        },\n                    },\n                },\n                include: {\n                    question: true,\n                    comments: true,\n                },\n            },\n        },\n    });\n\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }\n\n    // Use for...of instead of forEach to properly handle async operations\n    for (const response of worksheetResponse.responses) {\n        logger.info('Grading question', { questionId: response.questionId });\n        const question = response.question;\n        const comments = response.comments;\n        const responseText = response.response;\n\n        const studentQuestionProgress = await prisma.studentQuestionProgress.update({\n            where: { id: response.id, status: {\n                not: {\n                    in: DO_NOT_INFERENCE_STATUSES,\n                }\n            } },\n            data: { status: GenerationStatus.PENDING },\n        });\n\n        if (studentQuestionProgress.status !== GenerationStatus.PENDING) {\n            return;\n        }\n\n        try {\n            const apiResponse = await inference(\n                `Grade the following worksheet response:\n                \n                Question: ${question.question}\n                Response: ${responseText}\n\n                Comments: ${comments.map((comment) => comment.content).join('\\n')}\n                Mark Scheme: ${JSON.stringify(question.markScheme)}\n                \n                Justify your reasoning by including comment(s) and mark the question please.         \n                Return ONLY JSON in the following format (fill in the values as per the question):\n               {\n                \"isCorrect\": <boolean>,\n                \"points\": <number>,\n                \"markschemeState\": [\n                    { \"id\": <string>, \"correct\": <boolean> }\n                ],\n                \"comments\": [<string>, ...]\n                }\n                `,\n                z.object({\n                    isCorrect: z.boolean(),\n                    points: z.number(),\n                    markschemeState: z.array(z.object({\n                        id: z.string(),\n                        correct: z.boolean(),\n                      })), // @note: this has to be converted to [id: string]: correct boolean\n                    comments: z.array(z.string()),\n                }),\n            ).catch((error) => {\n                logger.error('Failed to grade worksheet response', { error });\n                throw error;\n            });\n\n            console.log(apiResponse);\n\n            const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({\n                where: { id: studentQuestionProgress.id, status: {\n                    not: {\n                        in: ['CANCELLED'],\n                    },\n                } },\n                data: {\n                    status: GenerationStatus.COMPLETED,\n                    isCorrect: (apiResponse as { isCorrect: boolean }).isCorrect,\n                    points: (apiResponse as { points: number }).points,\n                    markschemeState: (apiResponse as {\n                        markschemeState: { id: string; correct: boolean }[];\n                    }).markschemeState.reduce((acc, curr) => {\n                        acc[\"item-\" + curr.id] = curr.correct;\n                        return acc;\n                    }, {} as Record<string, boolean>),\n                    comments: {\n                        create: (apiResponse as {\n                            comments: string[];\n                        }).comments.map((commentContent) => ({\n                            content: commentContent,\n                            authorId: getAIUserId(),\n                        })),\n                    },\n                },\n            });\n            pusher.trigger(`class-${worksheetResponse.worksheet.classId}`, `ai-worksheet-updated-${worksheetResponse.id}`, {\n                success: true,\n            });\n\n            return updatedStudentQuestionProgress;\n        } catch (error) {\n            logger.error('Failed to grade worksheet response', { error, worksheetResponseId });\n            pusher.trigger(`class-${worksheetResponse.worksheet.classId}`, `ai-worksheet-updated-${worksheetResponse.id}`, {\n                success: false,\n            });\n            await prisma.studentQuestionProgress.update({\n                where: { id: studentQuestionProgress.id },\n                data: { status: GenerationStatus.FAILED },\n            });\n            throw error;\n        }\n    };\n};"],"names":[],"mappings":"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","debug_id":"1b23ac7f-6ff8-51c0-8cc7-e0276b542625"}
+{"version":3,"file":"gradeWorksheet.js","sources":["server/pipelines/gradeWorksheet.ts"],"sourceRoot":"/","sourcesContent":["import { GenerationStatus, WorksheetQuestionType } from \"@prisma/client\";\nimport { prisma } from \"../../lib/prisma.js\";\nimport { logger } from \"../../utils/logger.js\";\nimport z from \"zod\";\nimport { inference } from \"../../utils/inference.js\";\nimport { getAIUserId } from \"../../utils/aiUser.js\";\nimport { pusher } from \"../../lib/pusher.js\";\n\n\nconst removeAllPreviousAIComments = async (worksheetQuestionProgressId: string) => {\n    await prisma.comment.deleteMany({\n        where: {\n            studentQuestionProgressId: worksheetQuestionProgressId,\n            authorId: getAIUserId(),\n        },\n    });\n};\n\nconst gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQuestionProgressId: string) => {\n\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId },\n        include: {\n            worksheet: true,\n        },\n    });\n\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }    \n\n    const studentQuestionProgress = await prisma.studentQuestionProgress.findFirst({\n        where: {\n            id: worksheetQuestionProgressId,\n        },\n        include: {\n            question: true,\n            comments: true,\n        },\n    });\n\n    if (!studentQuestionProgress) {\n        logger.error('Student question progress not found');\n        throw new Error('Student question progress not found');\n    }\n\n    pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-pending`, {\n        id: studentQuestionProgress.id,\n    });\n\n    const question = studentQuestionProgress.question;\n    const comments = studentQuestionProgress.comments;\n    const responseText = studentQuestionProgress.response;\n\n\n    try {\n        const apiResponse = await inference(\n            `Grade the following worksheet response:\n            \n            Question: ${question.question}\n            Response: ${responseText}\n\n            Comments: ${comments.map((comment) => comment.content).join('\\n')}\n            Mark Scheme: ${JSON.stringify(question.markScheme)}\n            \n            Justify your reasoning by including comment(s) and mark the question please.         \n            Return ONLY JSON in the following format (fill in the values as per the question):\n           {\n            \"isCorrect\": <boolean>,\n            \"points\": <number>,\n            \"markschemeState\": [\n                { \"id\": <string>, \"correct\": <boolean> }\n            ],\n            \"comments\": [<string>, ...]\n            }\n            `,\n            z.object({\n                isCorrect: z.boolean(),\n                points: z.number(),\n                markschemeState: z.array(z.object({\n                    id: z.string(),\n                    correct: z.boolean(),\n                  })), // @note: this has to be converted to [id: string]: correct boolean\n                comments: z.array(z.string()),\n            }),\n        ).catch((error) => {\n            logger.error('Failed to grade worksheet response', { error });\n            throw error;\n        });\n\n        const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({\n            where: { id: studentQuestionProgress.id, status: {\n                not: {\n                    in: ['CANCELLED'],\n                },\n            } },\n            data: {\n                status: GenerationStatus.COMPLETED,\n                isCorrect: (apiResponse as { isCorrect: boolean }).isCorrect,\n                points: (apiResponse as { points: number }).points,\n                markschemeState: (apiResponse as {\n                    markschemeState: { id: string; correct: boolean }[];\n                }).markschemeState.reduce((acc, curr) => {\n                    acc[\"item-\" + curr.id] = curr.correct;\n                    return acc;\n                }, {} as Record<string, boolean>),\n                comments: {\n                    create: (apiResponse as {\n                        comments: string[];\n                    }).comments.map((commentContent) => ({\n                        content: commentContent,\n                        authorId: getAIUserId(),\n                    })),\n                },\n            },\n        });\n        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-completed`, {\n            id: updatedStudentQuestionProgress.id,\n        });\n\n        return updatedStudentQuestionProgress;\n    } catch (error) {\n        logger.error('Failed to grade worksheet response', { error, worksheetResponseId });\n        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-failed`, {\n            id: studentQuestionProgress.id,\n        });\n        await prisma.studentQuestionProgress.update({\n            where: { id: studentQuestionProgress.id },\n            data: { status: GenerationStatus.FAILED },\n        });\n        throw error;\n    }\n}\n\n/**\n * Grades and regrades worksheet (can fixed failed responses)\n * @param worksheetResponseId worksheet response id\n * @returns updated worksheet response\n */\n\nconst DO_NOT_INFERENCE_STATUSES = [GenerationStatus.CANCELLED, GenerationStatus.PENDING, GenerationStatus.COMPLETED];\n\nexport const gradeWorksheetPipeline = async (worksheetResponseId: string) => {\n    logger.info('Grading worksheet response', { worksheetResponseId });\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId },\n        include: {\n            worksheet: true,\n            responses: {\n                where: {\n                    status: {\n                        not: {\n                            in: DO_NOT_INFERENCE_STATUSES,\n                        },\n                    },\n                    question: {\n                        type: {\n                            not: {\n                                in: [WorksheetQuestionType.MULTIPLE_CHOICE, WorksheetQuestionType.TRUE_FALSE],\n                            }\n                        },\n                    },\n                },\n                include: {\n                    question: true,\n                    comments: true,\n                },\n            },\n        },\n    });\n\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }\n\n    // Use for...of instead of forEach to properly handle async operations\n    for (const response of worksheetResponse.responses) {\n        logger.info('Grading question', { questionId: response.questionId });\n\n        const studentQuestionProgress = await prisma.studentQuestionProgress.update({\n            where: { id: response.id, status: {\n                not: {\n                    in: DO_NOT_INFERENCE_STATUSES,\n                }\n            } },\n            data: { status: GenerationStatus.PENDING },\n        });\n\n        if (studentQuestionProgress.status !== GenerationStatus.PENDING) {\n            return;\n        }\n\n        gradeWorksheetQuestion(worksheetResponseId, response.id);\n\n    };\n};\n\nexport const cancelGradePipeline = async (worksheetResponseId: string, worksheetQuestionProgressId: string) => {\n    logger.info('Cancelling auto grading', { worksheetResponseId, worksheetQuestionProgressId });\n\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId },\n        include: {\n            worksheet: true,\n        },\n    });\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }\n    const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({\n        where: { id: worksheetQuestionProgressId },\n        data: { status: GenerationStatus.CANCELLED },\n    });\n\n    await removeAllPreviousAIComments(worksheetQuestionProgressId);\n\n    pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-cancelled`, {\n        id: updatedStudentQuestionProgress.id,\n    });\n\n    return updatedStudentQuestionProgress;\n};\n\nexport const regradeWorksheetPipeline = async (worksheetResponseId: string, worksheetQuestionProgressId: string) => {\n    logger.info('Regrading worksheet response', { worksheetResponseId, worksheetQuestionProgressId });\n    try {\n    const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n        where: { id: worksheetResponseId, },\n        include: {\n            worksheet: true,\n        },\n    });\n    \n    await removeAllPreviousAIComments(worksheetQuestionProgressId);\n\n    if (!worksheetResponse) {\n        logger.error('Worksheet response not found');\n        throw new Error('Worksheet response not found');\n    }\n\n    const updatedStudentQuestionProgress = await prisma.studentQuestionProgress.update({\n        where: { id: worksheetQuestionProgressId },\n        data: { status: GenerationStatus.PENDING },\n    });\n\nconsole.log(updatedStudentQuestionProgress);\n\n    gradeWorksheetQuestion(worksheetResponseId, worksheetQuestionProgressId);\n\n    return updatedStudentQuestionProgress;\n    } catch (error) {\n        await prisma.studentQuestionProgress.update({\n            where: { id: worksheetQuestionProgressId },\n            data: { status: GenerationStatus.FAILED },\n        });\n        const worksheetResponse = await prisma.studentWorksheetResponse.findUnique({\n            where: { id: worksheetResponseId, },\n            include: {\n                worksheet: true,\n            },\n        });\n        if (!worksheetResponse) {\n            logger.error('Worksheet response not found');\n            throw new Error('Worksheet response not found');\n        }\n        pusher.trigger(`class-${worksheetResponse.worksheet.classId}-worksheetSubmission-${worksheetResponse.id}`, `set-failed`, {\n            id: worksheetQuestionProgressId,\n        });\n        logger.error('Failed to regrade worksheet response', { error, worksheetResponseId, worksheetQuestionProgressId });\n        throw error;\n    }\n};\n"],"names":[],"mappings":"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","debug_id":"dca8f58c-f587-5706-98e0-1eafd2fa5e2f"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@studious-lms/server",
-  "version": "1.2.49",
+  "version": "1.2.51",
   "description": "Backend server for Studious application",
   "main": "dist/exportType.js",
   "types": "dist/exportType.d.ts",
@@ -31,6 +31,7 @@
     "@prisma/client": "^6.7.0",
     "@sentry/cli": "^2.58.2",
     "@sentry/node": "^10.26.0",
+    "@studious-lms/server": "^1.2.49",
     "@trpc/server": "^11.4.3",
     "@unkey/ratelimit": "^2.1.3",
     "bcryptjs": "^3.0.2",

package/src/routers/conversation.ts

@@ -314,6 +314,53 @@ export const conversationRouter = createTRPCRouter({
         });
       }
 
+      return conversation;
+    }),
+    addMember: protectedProcedure
+    .input(z.object({ conversationId: z.string(), memberId: z.string() }))
+    .mutation(async ({ input, ctx }) => {
+      const userId = ctx.user!.id;
+      const { conversationId, memberId } = input;
+
+      const conversation = await prisma.conversation.findFirst({
+        where: { id: conversationId, members: { some: { userId } } },
+      });
+
+      if (!conversation) {
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+          message: 'Conversation not found or access denied',
+        });
+      }
+
+      await prisma.conversationMember.create({
+        data: { userId: memberId, conversationId, role: 'MEMBER' },
+      });
+
+      return conversation;
+    }),
+
+  removeMember: protectedProcedure
+    .input(z.object({ conversationId: z.string(), memberId: z.string() }))
+    .mutation(async ({ input, ctx }) => {
+      const userId = ctx.user!.id;
+      const { conversationId, memberId } = input;
+
+      const conversation = await prisma.conversation.findFirst({
+        where: { id: conversationId, members: { some: { userId } } },
+      });
+
+      if (!conversation) {
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+          message: 'Conversation not found or access denied',
+        });
+      }
+
+      await prisma.conversationMember.delete({
+        where: { userId_conversationId: { userId: memberId, conversationId } },
+      });
+
       return conversation;
     }),
 });

package/src/routers/worksheet.ts

@@ -4,6 +4,7 @@ import { z } from "zod";
 import { prisma } from "../lib/prisma.js";
 import { GenerationStatus, WorksheetQuestionType } from "@prisma/client";
 import { commentSelect } from "./comment.js";
+import { cancelGradePipeline, regradeWorksheetPipeline } from "../server/pipelines/gradeWorksheet.js";
 
 type MCQOptions = {
   id: string;
@@ -415,22 +416,24 @@ export const worksheetRouter = createTRPCRouter({
 
       return updatedWorksheetResponse;
     }),
-  cancelAutoGrading: protectedProcedure
+  cancelGrading: protectedProcedure
     .input(z.object({
       worksheetResponseId: z.string(),
-      questionId: z.string(),
+      progressId: z.string(),
     }))
     .mutation(async ({ ctx, input }) => {
-      const { worksheetResponseId, questionId } = input;
-
-      const updatedQuestion = await prisma.studentQuestionProgress.update({
-        where: { id: questionId, studentWorksheetResponseId: worksheetResponseId },
-        data: {
-          status: GenerationStatus.CANCELLED,
-        },
-      });
+      const { worksheetResponseId, progressId } = input;
 
-      return updatedQuestion;
+      return cancelGradePipeline(worksheetResponseId, progressId);
+    }),
+  regradeQuestion: protectedProcedure
+    .input(z.object({
+      worksheetResponseId: z.string(),
+      progressId: z.string(),
+    }))
+    .mutation(async ({ ctx, input }) => {
+      const { worksheetResponseId, progressId } = input;
+      return regradeWorksheetPipeline(worksheetResponseId, progressId);
     }),
   // Grade a student's answer
   gradeAnswer: protectedProcedure