@studious-lms/server 1.4.2 → 1.4.3

package/src/models/worksheet.ts

@@ -4,6 +4,21 @@
 import { prisma } from "../lib/prisma.js";
 import type { WorksheetQuestionType, GenerationStatus } from "@prisma/client";
 
+const worksheetClassMemberWhere = (userId: string) => ({
+  class: {
+    OR: [
+      { teachers: { some: { id: userId } } },
+      { students: { some: { id: userId } } },
+    ],
+  },
+});
+
+const worksheetTeacherWhere = (userId: string) => ({
+  class: {
+    teachers: { some: { id: userId } },
+  },
+});
+
 /** @returns Worksheet with questions and class. */
 export function findWorksheetById(id: string) {
   return prisma.worksheet.findUnique({
@@ -22,6 +37,34 @@ export function findWorksheetByIdMinimal(id: string) {
   });
 }
 
+/** @returns Worksheet by ID for an authorized class member. */
+export function findWorksheetByIdForClassMember(id: string, userId: string) {
+  return prisma.worksheet.findFirst({
+    where: {
+      id,
+      ...worksheetClassMemberWhere(userId),
+    },
+    include: {
+      questions: { orderBy: { createdAt: "asc" as const } },
+      class: true,
+    },
+  });
+}
+
+/** @returns Worksheet by ID for an authorized teacher. */
+export function findWorksheetByIdForTeacher(id: string, userId: string) {
+  return prisma.worksheet.findFirst({
+    where: {
+      id,
+      ...worksheetTeacherWhere(userId),
+    },
+    include: {
+      questions: { orderBy: { createdAt: "asc" as const } },
+      class: true,
+    },
+  });
+}
+
 /** @returns Worksheets for a class. */
 export function findWorksheetsByClassId(classId: string) {
   return prisma.worksheet.findMany({
@@ -33,6 +76,26 @@ export function findWorksheetsByClassId(classId: string) {
   });
 }
 
+/** @returns Worksheet question by ID for an authorized teacher. */
+export function findWorksheetQuestionByIdForTeacher(id: string, userId: string) {
+  return prisma.worksheetQuestion.findFirst({
+    where: {
+      id,
+      worksheet: worksheetTeacherWhere(userId),
+    },
+  });
+}
+
+/** @returns Worksheet question scoped to a worksheet. */
+export function findWorksheetQuestionByIdInWorksheet(
+  id: string,
+  worksheetId: string
+) {
+  return prisma.worksheetQuestion.findFirst({
+    where: { id, worksheetId },
+  });
+}
+
 /** Create a worksheet. */
 export function createWorksheet(data: { classId: string; name: string }) {
   return prisma.worksheet.create({
@@ -118,6 +181,45 @@ export function findSubmissionById(id: string) {
   });
 }
 
+/** @returns Submission if requester is the owning student or a class teacher for the worksheet. */
+export function findSubmissionByIdForWorksheetAccess(
+  id: string,
+  worksheetId: string,
+  worksheetClassId: string,
+  userId: string
+) {
+  return prisma.submission.findFirst({
+    where: {
+      id,
+      assignment: {
+        classId: worksheetClassId,
+        worksheets: { some: { id: worksheetId } },
+      },
+      OR: [
+        {
+          studentId: userId,
+          assignment: {
+            class: {
+              students: { some: { id: userId } },
+            },
+          },
+        },
+        {
+          assignment: {
+            class: {
+              teachers: { some: { id: userId } },
+            },
+          },
+        },
+      ],
+    },
+    select: {
+      id: true,
+      studentId: true,
+    },
+  });
+}
+
 const worksheetResponseInclude = {
   responses: {
     include: {
@@ -182,6 +284,29 @@ export function findWorksheetResponseById(id: string) {
   });
 }
 
+/** @returns Worksheet response if requester is the owning student. */
+export function findWorksheetResponseByIdForStudent(id: string, userId: string) {
+  return prisma.studentWorksheetResponse.findFirst({
+    where: {
+      id,
+      studentId: userId,
+      worksheet: worksheetClassMemberWhere(userId),
+    },
+    include: { responses: true, worksheet: true },
+  });
+}
+
+/** @returns Worksheet response if requester is a class teacher. */
+export function findWorksheetResponseByIdForTeacher(id: string, userId: string) {
+  return prisma.studentWorksheetResponse.findFirst({
+    where: {
+      id,
+      worksheet: worksheetTeacherWhere(userId),
+    },
+    include: { responses: true, worksheet: true },
+  });
+}
+
 /** @returns Worksheet response with question responses. */
 export function findWorksheetResponseWithResponses(
   id: string,
@@ -197,6 +322,43 @@ export function findWorksheetResponseWithResponses(
   });
 }
 
+/** @returns Worksheet response with scoped responses if requester is the owning student. */
+export function findWorksheetResponseWithResponsesForStudent(
+  id: string,
+  userId: string,
+  questionId?: string
+) {
+  return prisma.studentWorksheetResponse.findFirst({
+    where: {
+      id,
+      studentId: userId,
+      worksheet: worksheetClassMemberWhere(userId),
+    },
+    include: {
+      worksheet: true,
+      responses: questionId ? { where: { questionId } } : true,
+    },
+  });
+}
+
+/** @returns Worksheet response with scoped responses if requester is a class teacher. */
+export function findWorksheetResponseWithResponsesForTeacher(
+  id: string,
+  userId: string,
+  questionId?: string
+) {
+  return prisma.studentWorksheetResponse.findFirst({
+    where: {
+      id,
+      worksheet: worksheetTeacherWhere(userId),
+    },
+    include: {
+      worksheet: true,
+      responses: questionId ? { where: { questionId } } : true,
+    },
+  });
+}
+
 /** @returns Worksheet question by ID. */
 export function findWorksheetQuestionById(id: string) {
   return prisma.worksheetQuestion.findUnique({
@@ -204,6 +366,46 @@ export function findWorksheetQuestionById(id: string) {
   });
 }
 
+/** @returns Student question progress if requester is a class teacher. */
+export function findStudentQuestionProgressByIdForTeacher(
+  id: string,
+  userId: string
+) {
+  return prisma.studentQuestionProgress.findFirst({
+    where: {
+      id,
+      question: {
+        worksheet: worksheetTeacherWhere(userId),
+      },
+    },
+    include: {
+      question: true,
+      studentWorksheetResponse: true,
+    },
+  });
+}
+
+/** @returns Student question progress by id and worksheet response if requester is a class teacher. */
+export function findStudentQuestionProgressByIdForTeacherAndResponse(
+  id: string,
+  studentWorksheetResponseId: string,
+  userId: string
+) {
+  return prisma.studentQuestionProgress.findFirst({
+    where: {
+      id,
+      studentWorksheetResponseId,
+      question: {
+        worksheet: worksheetTeacherWhere(userId),
+      },
+    },
+    include: {
+      question: true,
+      studentWorksheetResponse: true,
+    },
+  });
+}
+
 /** Update student's question progress. */
 export function updateStudentQuestionProgress(
   id: string,

package/src/pipelines/aiLabChat.ts

@@ -479,7 +479,15 @@ export const generateAndSendLabIntroduction = async (
     //   });
 
     const response = await withTimeout(
-      inference<LabChatResponse>(messages, labChatResponseSchema),
+      inference<LabChatResponse>(messages, labChatResponseSchema, {
+        reason: 'lab_chat_response',
+        metadata: {
+          labChatId,
+          conversationId,
+          classId: fullLabChat.classId,
+          ...(emitOptions?.messageId ? { messageId: emitOptions.messageId } : {}),
+        },
+      }),
       LAB_CHAT_RESPONSE_TIMEOUT_MS,
       "Lab chat response generation",
     );

package/src/pipelines/aiNewtonChat.ts

@@ -3,7 +3,7 @@
  * Uses assignment context and AI policy levels for tutoring.
  */
 import { prisma } from "../lib/prisma.js";
-import { inference, inferenceClient, openAIClient } from "../utils/inference.js";
+import { inference } from "../utils/inference.js";
 import { logger } from "../utils/logger.js";
 import { sendAIMessage } from "../utils/inference.js";
 import { isAIUser } from "../utils/aiUser.js";
@@ -132,20 +132,23 @@ export const generateAndSendNewtonIntroduction = async (
   
   Do not use markdown formatting in your responses - use plain text only.`;
   
-      const completion = await inferenceClient.chat.completions.create({
+      const response = await inference<string>([
+        { role: 'system', content: systemPrompt },
+        {
+          role: 'user',
+          content: 'Please introduce yourself to the student. Explain that you are Newton, their AI tutor, and you are here to help them with their assignment. Ask them what they would like help with.'
+        },
+      ], undefined, {
+        reason: 'newton_chat_introduction',
+        metadata: {
+          newtonChatId,
+          conversationId,
+          submissionId: submission.id,
+        },
         model: 'command-a-03-2025',
-        messages: [
-          { role: 'system', content: systemPrompt },
-          { 
-            role: 'user', 
-            content: 'Please introduce yourself to the student. Explain that you are Newton, their AI tutor, and you are here to help them with their assignment. Ask them what they would like help with.' 
-          },
-        ],
-        max_tokens: 300,
+        maxTokens: 300,
         temperature: 0.8,
       });
-  
-      const response = completion.choices[0]?.message?.content;
       
       if (!response) {
         throw new Error('No response generated from inference API');
@@ -320,7 +323,14 @@ export const generateAndSendNewtonIntroduction = async (
         content: `SYSTEM: ${formatAssignmentString(assignmentData)}`,
       });
   
-      const response = await inference<string>(messages);
+      const response = await inference<string>(messages, undefined, {
+        reason: 'newton_chat_response',
+        metadata: {
+          newtonChatId,
+          conversationId,
+          submissionId: submission.id,
+        },
+      });
       
       if (!response) {
         throw new Error('No response generated from inference API');
@@ -344,4 +354,4 @@ export const generateAndSendNewtonIntroduction = async (
       });
     }
   }
-  
+  

package/src/pipelines/gradeWorksheet.ts

@@ -97,6 +97,14 @@ const gradeWorksheetQuestion = async (worksheetResponseId: string, worksheetQues
                   })), // @note: this has to be converted to [id: string]: correct boolean
                 comments: z.array(z.string()),
             }),
+            {
+                reason: 'worksheet_autograde',
+                metadata: {
+                    worksheetResponseId: worksheetResponse.id,
+                    questionId: worksheetQuestionProgressId,
+                    studentId: worksheetResponse.studentId,
+                },
+            },
         ).catch((error) => {
             logger.error('Failed to grade worksheet response', { error });
             throw error;

package/src/routers/class.ts

@@ -46,7 +46,7 @@ export const classRouter = createTRPCRouter({
     getAllClasses(ctx.user?.id ?? "")
   ),
 
-  get: protectedProcedure
+  get: protectedClassMemberProcedure
     .input(z.object({ classId: z.string() }))
     .query(({ ctx, input }) =>
       getClass(ctx.user?.id ?? "", input.classId)
@@ -329,4 +329,4 @@ export const classRouter = createTRPCRouter({
     .mutation(({ ctx, input }) =>
       importClass(input.classId, ctx.user?.id ?? "", input.year, input.classData)
     ),
-});
+});

package/src/routers/labChat.ts

@@ -38,8 +38,9 @@ export const labChatRouter = createTRPCRouter({
     .input(
       z.object({
         labChatId: z.string(),
-        content: z.string().min(1).max(4000),
+        content: z.string().max(4000),
         mentionedUserIds: z.array(z.string()).optional(),
+        fileIds: z.array(z.string()).max(10).optional(),
       })
     )
     .mutation(({ ctx, input }) =>
@@ -47,6 +48,7 @@ export const labChatRouter = createTRPCRouter({
         labChatId: input.labChatId,
         content: input.content,
         mentionedUserIds: input.mentionedUserIds,
+        fileIds: input.fileIds,
       })
     ),
 

package/src/routers/message.ts

@@ -5,6 +5,8 @@ import {
   sendMessage,
   updateMessage,
   deleteMessage,
+  getMessageUploadUrls,
+  confirmMessageUpload,
   markAsRead,
   markMentionsAsRead,
   markSuggestionCreated,
@@ -32,8 +34,9 @@ export const messageRouter = createTRPCRouter({
     .input(
       z.object({
         conversationId: z.string(),
-        content: z.string().min(1).max(4000),
+        content: z.string().max(4000),
         mentionedUserIds: z.array(z.string()).optional(),
+        fileIds: z.array(z.string()).max(10).optional(),
       })
     )
     .mutation(({ ctx, input }) =>
@@ -41,9 +44,43 @@ export const messageRouter = createTRPCRouter({
         conversationId: input.conversationId,
         content: input.content,
         mentionedUserIds: input.mentionedUserIds,
+        fileIds: input.fileIds,
       })
     ),
 
+  getUploadUrls: protectedProcedure
+    .input(
+      z.object({
+        conversationId: z.string(),
+        files: z
+          .array(
+            z.object({
+              name: z.string().min(1),
+              type: z.string().min(1),
+              size: z.number().int().nonnegative(),
+            })
+          )
+          .min(1)
+          .max(10),
+      })
+    )
+    .mutation(({ ctx, input }) =>
+      getMessageUploadUrls(ctx.user!.id, input)
+    ),
+
+  confirmUpload: protectedProcedure
+    .input(
+      z.object({
+        conversationId: z.string(),
+        fileId: z.string(),
+        uploadSuccess: z.boolean(),
+        errorMessage: z.string().optional(),
+      })
+    )
+    .mutation(({ ctx, input }) =>
+      confirmMessageUpload(ctx.user!.id, input)
+    ),
+
   update: protectedProcedure
     .input(
       z.object({

package/src/routers/newtonChat.ts

@@ -21,8 +21,9 @@ export const newtonChatRouter = createTRPCRouter({
     .input(
       z.object({
         newtonChatId: z.string(),
-        content: z.string().min(1).max(4000),
+        content: z.string().max(4000),
         mentionedUserIds: z.array(z.string()).optional(),
+        fileIds: z.array(z.string()).max(10).optional(),
       })
     )
     .mutation(({ ctx, input }) =>
@@ -30,7 +31,8 @@ export const newtonChatRouter = createTRPCRouter({
         ctx.user!.id,
         input.newtonChatId,
         input.content,
-        input.mentionedUserIds ?? []
+        input.mentionedUserIds ?? [],
+        input.fileIds ?? []
       )
     ),
 });

package/src/routers/notifications.ts

@@ -15,7 +15,7 @@ export const notificationRouter = createTRPCRouter({
 
   get: protectedProcedure
     .input(z.object({ id: z.string() }))
-    .query(({ input }) => getNotification(input.id)),
+    .query(({ ctx, input }) => getNotification(ctx.user!.id, input.id)),
 
   sendTo: protectedProcedure
     .input(
@@ -39,5 +39,5 @@ export const notificationRouter = createTRPCRouter({
 
   markAsRead: protectedProcedure
     .input(z.object({ id: z.string() }))
-    .mutation(({ input }) => markAsRead(input.id)),
+    .mutation(({ ctx, input }) => markAsRead(ctx.user!.id, input.id)),
 });

package/src/routers/worksheet.ts

@@ -3,6 +3,7 @@ import {
   createTRPCRouter,
   protectedClassMemberProcedure,
   protectedProcedure,
+  protectedTeacherProcedure,
 } from "../trpc.js";
 import { z } from "zod";
 import {
@@ -27,7 +28,7 @@ import {
 export const worksheetRouter = createTRPCRouter({
   getWorksheet: protectedProcedure
     .input(z.object({ worksheetId: z.string() }))
-    .query(({ input }) => getWorksheet(input.worksheetId)),
+    .query(({ ctx, input }) => getWorksheet(input.worksheetId, ctx.user!.id)),
 
   exists: protectedClassMemberProcedure
     .input(z.object({ id: z.string() }))
@@ -41,21 +42,25 @@ export const worksheetRouter = createTRPCRouter({
       return worksheetExists(input.id);
     }),
 
-  listWorksheets: protectedProcedure
+  listWorksheets: protectedClassMemberProcedure
     .input(z.object({ classId: z.string() }))
     .query(({ input }) => listWorksheets(input.classId)),
 
   updateWorksheet: protectedProcedure
     .input(z.object({ worksheetId: z.string(), name: z.string().optional() }))
-    .mutation(({ input }) =>
-      updateWorksheetRecord(input.worksheetId, { name: input.name })
+    .mutation(({ ctx, input }) =>
+      updateWorksheetRecord(input.worksheetId, ctx.user!.id, {
+        name: input.name,
+      })
     ),
 
   deleteWorksheet: protectedProcedure
     .input(z.object({ worksheetId: z.string() }))
-    .mutation(({ input }) => deleteWorksheetRecord(input.worksheetId)),
+    .mutation(({ ctx, input }) =>
+      deleteWorksheetRecord(input.worksheetId, ctx.user!.id)
+    ),
 
-  create: protectedProcedure
+  create: protectedTeacherProcedure
     .input(z.object({ classId: z.string(), name: z.string() }))
     .mutation(({ input }) =>
       createWorksheetRecord(input.classId, input.name)
@@ -80,8 +85,8 @@ export const worksheetRouter = createTRPCRouter({
         ]),
       })
     )
-    .mutation(({ input }) =>
-      addQuestionToWorksheet(input.worksheetId, {
+    .mutation(({ ctx, input }) =>
+      addQuestionToWorksheet(input.worksheetId, ctx.user!.id, {
         question: input.question,
         answer: input.answer,
         points: input.points,
@@ -100,9 +105,10 @@ export const worksheetRouter = createTRPCRouter({
         targetId: z.string(),
       })
     )
-    .mutation(({ input }) =>
+    .mutation(({ ctx, input }) =>
       reorderWorksheetQuestions(
         input.worksheetId,
+        ctx.user!.id,
         input.movedId,
         input.position,
         input.targetId
@@ -131,10 +137,11 @@ export const worksheetRouter = createTRPCRouter({
           .optional(),
       })
     )
-    .mutation(({ input }) =>
+    .mutation(({ ctx, input }) =>
       updateWorksheetQuestionRecord(
         input.worksheetId,
         input.questionId,
+        ctx.user!.id,
         {
           question: input.question,
           answer: input.answer,
@@ -153,8 +160,12 @@ export const worksheetRouter = createTRPCRouter({
         questionId: z.string(),
       })
     )
-    .mutation(({ input }) =>
-      deleteWorksheetQuestionRecord(input.worksheetId, input.questionId)
+    .mutation(({ ctx, input }) =>
+      deleteWorksheetQuestionRecord(
+        input.worksheetId,
+        input.questionId,
+        ctx.user!.id
+      )
     ),
 
   getWorksheetSubmission: protectedProcedure
@@ -164,8 +175,8 @@ export const worksheetRouter = createTRPCRouter({
         submissionId: z.string(),
       })
     )
-    .query(({ input }) =>
-      getWorksheetSubmission(input.worksheetId, input.submissionId)
+    .query(({ ctx, input }) =>
+      getWorksheetSubmission(input.worksheetId, input.submissionId, ctx.user!.id)
     ),
 
   answerQuestion: protectedProcedure
@@ -192,8 +203,8 @@ export const worksheetRouter = createTRPCRouter({
         progressId: z.string(),
       })
     )
-    .mutation(({ input }) =>
-      cancelGrading(input.worksheetResponseId, input.progressId)
+    .mutation(({ ctx, input }) =>
+      cancelGrading(input.worksheetResponseId, input.progressId, ctx.user!.id)
     ),
 
   regradeQuestion: protectedProcedure
@@ -203,8 +214,8 @@ export const worksheetRouter = createTRPCRouter({
         progressId: z.string(),
       })
     )
-    .mutation(({ input }) =>
-      regradeQuestion(input.worksheetResponseId, input.progressId)
+    .mutation(({ ctx, input }) =>
+      regradeQuestion(input.worksheetResponseId, input.progressId, ctx.user!.id)
     ),
 
   gradeAnswer: protectedProcedure
@@ -220,10 +231,11 @@ export const worksheetRouter = createTRPCRouter({
         points: z.number().optional(),
       })
     )
-    .mutation(({ input }) =>
+    .mutation(({ ctx, input }) =>
       gradeAnswer(
         input.questionId,
         input.studentWorksheetResponseId,
+        ctx.user!.id,
         {
           responseId: input.responseId,
           response: input.response,