@studious-lms/server 1.2.45 → 1.2.47

package/src/routers/conversation.ts

@@ -148,51 +148,69 @@ export const conversationRouter = createTRPCRouter({
 
       // For DMs, check if conversation already exists
       if (type === 'DM') {
-        const existingDM = await prisma.conversation.findFirst({
+        // Get the target user's ID from their username
+        const targetUser = await prisma.user.findFirst({
+          where: { username: memberIds[0] },
+          select: { id: true, username: true },
+        });
+
+        if (!targetUser) {
+          throw new TRPCError({
+            code: 'BAD_REQUEST',
+            message: `User "${memberIds[0]}" not found`,
+          });
+        }
+
+        // Find all DM conversations where current user is a member
+        const existingDMs = await prisma.conversation.findMany({
           where: {
             type: 'DM',
             members: {
-              every: {
-                userId: {
-                  in: [userId, memberIds[0]],
-                },
-              },
-            },
-            AND: {
-              members: {
-                some: {
-                  userId,
-                },
+              some: {
+                userId,
               },
             },
           },
           include: {
             members: {
-              include: {
-                user: {
-                  select: {
-                    id: true,
-                    username: true,
-                    profile: {
-                      select: {
-                        displayName: true,
-                        profilePicture: true,
-                      },
-                    },
-                  },
-                },
+              select: {
+                userId: true,
               },
             },
           },
         });
 
+        // Check if any of these conversations has exactly 2 members (current user + target user)
+        const existingDM = existingDMs.find(conv => {
+          const memberUserIds = conv.members.map(m => m.userId);
+          return memberUserIds.length === 2 &&
+                 memberUserIds.includes(userId) &&
+                 memberUserIds.includes(targetUser.id);
+        });
+
         if (existingDM) {
-          return existingDM;
+          // Conversation already exists, throw error with friendly message
+          throw new TRPCError({
+            code: 'BAD_REQUEST',
+            message: `A conversation with ${targetUser.username} already exists`,
+          });
         }
       }
 
       // Verify all members exist
-      const members = await prisma.user.findMany({
+      const membersWithIds = await prisma.user.findMany({
+        where: {
+          id: {
+            in: memberIds,
+          },
+        },
+        select: {
+          id: true,
+          username: true,
+        },
+      });
+
+      const membersWithUsernames = await prisma.user.findMany({
         where: {
           username: {
             in: memberIds,
@@ -204,6 +222,8 @@ export const conversationRouter = createTRPCRouter({
         },
       });
 
+      const members = [...membersWithIds, ...membersWithUsernames];
+
       if (members.length !== memberIds.length) {
         throw new TRPCError({
           code: 'BAD_REQUEST',
@@ -222,8 +242,8 @@ export const conversationRouter = createTRPCRouter({
                 userId,
                 role: type === 'GROUP' ? 'ADMIN' : 'MEMBER',
               },
-              ...memberIds.map((memberId) => ({
-                userId: members.find((member) => member.username === memberId)!.id,
+              ...members.map((member) => ({
+                userId: member.id,
                 role: 'MEMBER' as const,
               })),
             ],

package/src/routers/file.ts

@@ -73,6 +73,16 @@ export const fileRouter = createTRPCRouter({
                 }
               }
             }
+          },
+          announcement: {
+            include: {
+              class: {
+                include: {
+                  students: true,
+                  teachers: true
+                }
+              }
+            }
           }
         }
       });
@@ -92,18 +102,30 @@ export const fileRouter = createTRPCRouter({
       // Check if user is a teacher of the class
       if (file.assignment?.class) {
         classId = file.assignment.class.id;
-        hasAccess = file.assignment.class.teachers.some(teacher => teacher.id === userId) || false;
+        const isTeacher = file.assignment.class.teachers.some(teacher => teacher.id === userId);
+        const isStudent = file.assignment.class.students.some(student => student.id === userId);
+        logger.info(`Assignment file access check - userId: ${userId}, isTeacher: ${isTeacher}, isStudent: ${isStudent}`);
+        hasAccess = isTeacher || isStudent;
+      }
+
+      // Check if user has access to announcement files (teachers or students in the class)
+      if ((file as any).announcement?.class) {
+        classId = (file as any).announcement.class.id;
+        const isTeacher = (file as any).announcement.class.teachers.some((teacher: any) => teacher.id === userId);
+        const isStudent = (file as any).announcement.class.students.some((student: any) => student.id === userId);
+        logger.info(`Announcement file access check - userId: ${userId}, isTeacher: ${isTeacher}, isStudent: ${isStudent}`);
+        hasAccess = hasAccess || isTeacher || isStudent;
       }
 
       if (file.submission?.assignment?.classId) {
         classId = file.submission.assignment.classId;
-        hasAccess = file.submission?.studentId === userId || false;
+        hasAccess = hasAccess || file.submission?.studentId === userId || false;
         if (!hasAccess) hasAccess = file.submission.assignment.class.teachers.some(teacher => teacher.id === userId) || false;
       }
 
       if (file.annotations?.assignment?.classId) {
         classId = file.annotations?.assignment.classId;
-        hasAccess = file.annotations?.studentId === userId || false;
+        hasAccess = hasAccess || file.annotations?.studentId === userId || false;
         if (!hasAccess) hasAccess = file.annotations.assignment.class.teachers.some(teacher => teacher.id === userId) || false;
       }
 
@@ -114,8 +136,10 @@ export const fileRouter = createTRPCRouter({
 
       // Check if file is in a folder and user has access to the class
       if (file.folder?.class) {
-        hasAccess = hasAccess || file.folder.class.teachers.some(teacher => teacher.id === userId);
-        hasAccess = hasAccess || file.folder.class.students.some(student => student.id === userId);
+        const isTeacher = file.folder.class.teachers.some(teacher => teacher.id === userId);
+        const isStudent = file.folder.class.students.some(student => student.id === userId);
+        hasAccess = hasAccess || isTeacher;
+        hasAccess = hasAccess || isStudent;
       }
 
       if (!hasAccess) {

package/src/routers/labChat.ts

@@ -3,17 +3,8 @@ import { createTRPCRouter, protectedProcedure } from '../trpc.js';
 import { prisma } from '../lib/prisma.js';
 import { pusher } from '../lib/pusher.js';
 import { TRPCError } from '@trpc/server';
-import { 
-  inferenceClient,
-  sendAIMessage,
-  type LabChatContext 
-} from '../utils/inference.js';
-import { logger } from '../utils/logger.js';
 import { isAIUser } from '../utils/aiUser.js';
-import { bucket } from '../lib/googleCloudStorage.js';
-import { createPdf } from "../lib/jsonConversion.js"
-import OpenAI from 'openai';
-import { v4 as uuidv4 } from "uuid";
+import { generateAndSendLabIntroduction, generateAndSendLabResponse } from '../server/pipelines/aiLabChat.js';
 
 export const labChatRouter = createTRPCRouter({
   create: protectedProcedure
@@ -164,10 +155,7 @@ export const labChatRouter = createTRPCRouter({
       });
 
       // Generate AI introduction message in parallel (don't await - fire and forget)
-      generateAndSendLabIntroduction(result.id, result.conversationId, context, classWithTeachers.subject || 'Lab').catch(error => {
-        logger.error('Failed to generate AI introduction:', { error, labChatId: result.id });
-      });
-
+      generateAndSendLabIntroduction(result.id, result.conversationId, context, classWithTeachers.subject || 'Lab');
       // Broadcast lab chat creation to class members
       try {
         await pusher.trigger(`class-${classId}`, 'lab-chat-created', {
@@ -557,9 +545,7 @@ export const labChatRouter = createTRPCRouter({
         // Generate AI response in parallel (don't await - fire and forget)
         if (!isAIUser(userId)) {
           // Run AI response generation in background
-          generateAndSendLabResponse(labChatId, content, labChat.conversationId).catch(error => {
-            logger.error('Failed to generate AI response:', { error });
-          });
+          generateAndSendLabResponse(labChatId, content, labChat.conversationId)
         }
 
       return {
@@ -645,353 +631,3 @@ export const labChatRouter = createTRPCRouter({
     }),
 });
 
-/**
- * Generate and send AI introduction for lab chat
- * Uses the stored context directly from database
- */
-async function generateAndSendLabIntroduction(
-  labChatId: string,
-  conversationId: string,
-  contextString: string,
-  subject: string
-): Promise<void> {
-  try {
-    // Enhance the stored context with clarifying question instructions
-    const enhancedSystemPrompt = `${contextString}
-
-IMPORTANT INSTRUCTIONS:
-- You are helping teachers create course materials
-- Use the context information provided above (subject, topic, difficulty, objectives, etc.) as your foundation
-- Only ask clarifying questions about details NOT already specified in the context
-- Focus your questions on format preferences, specific requirements, or missing details needed to create the content
-- Only output final course materials when you have sufficient details beyond what's in the context
-- Do not use markdown formatting in your responses - use plain text only
-- When creating content, make it clear and well-structured without markdown`;
-
-    const completion = await inferenceClient.chat.completions.create({
-      model: 'command-a-03-2025',
-      messages: [
-        { role: 'system', content: enhancedSystemPrompt },
-        { 
-          role: 'user', 
-          content: 'Please introduce yourself to the teaching team. Explain that you will help create course materials by first asking clarifying questions based on the context provided, and only output final content when you have enough information.' 
-        },
-      ],
-      max_tokens: 300,
-      temperature: 0.8,
-    });
-
-    const response = completion.choices[0]?.message?.content;
-    
-    if (!response) {
-      throw new Error('No response generated from inference API');
-    }
-
-    // Send AI introduction using centralized sender
-    await sendAIMessage(response, conversationId, {
-      subject,
-    });
-
-    logger.info('AI Introduction sent', { labChatId, conversationId });
-
-  } catch (error) {
-    logger.error('Failed to generate AI introduction:', { error, labChatId });
-    
-    // Send fallback introduction
-    try {
-      const fallbackIntro = `Hello teaching team! I'm your AI assistant for course material development. I will help you create educational content by first asking clarifying questions based on the provided context, then outputting final materials when I have sufficient information. I won't use markdown formatting in my responses. What would you like to work on?`;
-      
-      await sendAIMessage(fallbackIntro, conversationId, {
-        subject,
-      });
-
-      logger.info('Fallback AI introduction sent', { labChatId });
-
-    } catch (fallbackError) {
-      logger.error('Failed to send fallback AI introduction:', { error: fallbackError, labChatId });
-    }
-  }
-}
-
-/**
- * Generate and send AI response to teacher message
- * Uses the stored context directly from database
- */
-async function generateAndSendLabResponse(
-  labChatId: string,
-  teacherMessage: string,
-  conversationId: string
-): Promise<void> {
-  try {
-    // Get lab context from database
-    const fullLabChat = await prisma.labChat.findUnique({
-      where: { id: labChatId },
-      include: {
-        class: {
-          select: {
-            name: true,
-            subject: true,
-          },
-        },
-      },
-    });
-
-    if (!fullLabChat) {
-      throw new Error('Lab chat not found');
-    }
-
-    // Get recent conversation history
-    const recentMessages = await prisma.message.findMany({
-      where: {
-        conversationId,
-      },
-      include: {
-        sender: {
-          select: {
-            id: true,
-            username: true,
-            profile: {
-              select: {
-                displayName: true,
-              },
-            },
-          },
-        },
-      },
-      orderBy: {
-        createdAt: 'desc',
-      },
-      take: 10, // Last 10 messages for context
-    });
-
-    // Build conversation history as proper message objects
-    // Enhance the stored context with clarifying question instructions
-    const enhancedSystemPrompt = `${fullLabChat.context}
-
-IMPORTANT INSTRUCTIONS:
-- Use the context information provided above (subject, topic, difficulty, objectives, etc.) as your foundation
-- Based on the teacher's input and existing context, only ask clarifying questions about details NOT already specified
-- Focus questions on format preferences, specific requirements, quantity, or missing implementation details
-- Only output final course materials when you have sufficient details beyond what's in the context
-- Do not use markdown formatting in your responses - use plain text only
-- When you do create content, make it clear and well-structured without markdown
-- If the request is vague, ask 1-2 specific clarifying questions about missing details only
-- You are primarily a chatbot - only provide files when it is necessary
-
-RESPONSE FORMAT:
-- Always respond with JSON in this format: { "text": string, "docs": null | array }
-- "text": Your conversational response (questions, explanations, etc.) - use plain text, no markdown
-- "docs": null for regular conversation, or array of PDF document objects when creating course materials
-
-WHEN CREATING COURSE MATERIALS (docs field):
-- docs: [ { "title": string, "blocks": [ { "format": <int 0-12>, "content": string | string[], "metadata"?: { fontSize?: number, lineHeight?: number, paragraphSpacing?: number, indentWidth?: number, paddingX?: number, paddingY?: number, font?: 0|1|2|3|4|5, color?: "#RGB"|"#RRGGBB", background?: "#RGB"|"#RRGGBB", align?: "left"|"center"|"right" } } ] } ]
-- Each document in the array should have a "title" (used for filename) and "blocks" (content)
-- You can create multiple documents when it makes sense (e.g., separate worksheets, answer keys, different topics)
-- Use descriptive titles like "Biology_Cell_Structure_Worksheet" or "Chemistry_Lab_Instructions"
-- Format enum (integers): 0=HEADER_1, 1=HEADER_2, 2=HEADER_3, 3=HEADER_4, 4=HEADER_5, 5=HEADER_6, 6=PARAGRAPH, 7=BULLET, 8=NUMBERED, 9=TABLE, 10=IMAGE, 11=CODE_BLOCK, 12=QUOTE
-- Fonts enum: 0=TIMES_ROMAN, 1=COURIER, 2=HELVETICA, 3=HELVETICA_BOLD, 4=HELVETICA_ITALIC, 5=HELVETICA_BOLD_ITALIC
-- Colors must be hex strings: "#RGB" or "#RRGGBB".
-- Headings (0-5): content is a single string; you may set metadata.align.
-- Paragraphs (6) and Quotes (12): content is a single string.
-- Bullets (7) and Numbered (8): content is an array of strings (one item per list entry). DO NOT include bullet symbols (*) or numbers (1. 2. 3.) in the content - the format will automatically add these.
-- Code blocks (11): prefer content as an array of lines; preserve indentation via leading tabs/spaces. If using a single string, include \n between lines.
-- Table (9) and Image (10) are not supported by the renderer now; do not emit them.
-- Use metadata sparingly; omit fields you don't need. For code blocks you may set metadata.paddingX, paddingY, background, and font (1 for Courier).
-- Wrap text naturally; do not insert manual line breaks except where semantically required (lists, code).
-- The JSON must be valid and ready for PDF rendering by the server.`;
-
-    const messages: OpenAI.Chat.Completions.ChatCompletionMessageParam[] = [
-      { role: 'system', content: enhancedSystemPrompt },
-    ];
-
-    // Add recent conversation history
-    recentMessages.reverse().forEach(msg => {
-      const role = isAIUser(msg.senderId) ? 'assistant' : 'user';
-      const senderName = msg.sender?.profile?.displayName || msg.sender?.username || 'Teacher';
-      const content = isAIUser(msg.senderId) ? msg.content : `${senderName}: ${msg.content}`;
-      
-      messages.push({
-        role: role as 'user' | 'assistant',
-        content,
-      });
-    });
-
-    // Add the new teacher message
-    const senderName = 'Teacher'; // We could get this from the actual sender if needed
-    messages.push({
-      role: 'user',
-      content: `${senderName}: ${teacherMessage}`,
-    });
-
-
-    const completion = await inferenceClient.chat.completions.create({
-      model: 'command-a-03-2025',
-      messages,
-      temperature: 0.7,
-      response_format: {
-        type: "json_object",
-        // @ts-expect-error
-        schema: {
-          type: "object",
-          properties: {
-            text: { type: "string" },
-            docs: {
-              type: "array",
-              items: {
-                type: "object",
-                properties: {
-                  title: { type: "string" },
-                  blocks: {
-                    type: "array",
-                    items: {
-                      type: "object",
-                      properties: {
-                        format: { type: "integer", minimum: 0, maximum: 12 },
-                        content: {
-                          oneOf: [
-                            { type: "string" },
-                            { type: "array", items: { type: "string" } }
-                          ]
-                        },
-                        metadata: {
-                          type: "object",
-                          properties: {
-                            fontSize: { type: "number", minimum: 6 },
-                            lineHeight: { type: "number", minimum: 0.6 },
-                            paragraphSpacing: { type: "number", minimum: 0 },
-                            indentWidth: { type: "number", minimum: 0 },
-                            paddingX: { type: "number", minimum: 0 },
-                            paddingY: { type: "number", minimum: 0 },
-                            font: { type: "integer", minimum: 0, maximum: 5 },
-                            color: { type: "string", pattern: "^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$" },
-                            background: { type: "string", pattern: "^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$" },
-                            align: { type: "string", enum: ["left", "center", "right"] }
-                          },
-                          additionalProperties: false
-                        }
-                      },
-                      required: ["format", "content"],
-                      additionalProperties: false
-                    }
-                  }
-                },
-                required: ["title", "blocks"],
-                additionalProperties: false
-              }
-            }
-          },
-          required: ["text"],
-          additionalProperties: false
-        }
-      },
-    });
-
-    const response = completion.choices[0]?.message?.content;
-    
-    if (!response) {
-      throw new Error('No response generated from inference API');
-    }
-
-    // Parse the JSON response and generate PDF if docs are provided
-    try {
-      const jsonData = JSON.parse(response);
-
-
-      const attachmentIds: string[] = [];
-      // Generate PDFs if docs are provided
-      if (jsonData.docs && Array.isArray(jsonData.docs)) {
-        
-
-        console.log('Generating PDFs', { labChatId, docs: JSON.stringify(jsonData.docs, null, 2) });
-        for (let i = 0; i < jsonData.docs.length; i++) {
-          const doc = jsonData.docs[i];
-          if (!doc.title || !doc.blocks || !Array.isArray(doc.blocks)) {
-            logger.error(`Document ${i + 1} is missing title or blocks`);
-            continue;
-          } 
-
-
-          try {
-            let pdfBytes = await createPdf(doc.blocks);            
-            if (pdfBytes) {
-              // Sanitize filename - remove special characters and limit length
-              const sanitizedTitle = doc.title
-                .replace(/[^a-zA-Z0-9\s\-_]/g, '')
-                .replace(/\s+/g, '_')
-                .substring(0, 50);
-              
-              const filename = `${sanitizedTitle}_${uuidv4().substring(0, 8)}.pdf`;
-              const filePath = `class/generated/${fullLabChat.classId}/${filename}`;
-
-              logger.info(`PDF ${i + 1} generated successfully`, { labChatId, title: doc.title });
-              
-              // Upload directly to Google Cloud Storage
-              const gcsFile = bucket.file(filePath);
-              await gcsFile.save(Buffer.from(pdfBytes), {
-                metadata: {
-                  contentType: 'application/pdf',
-                }
-              });
-    
-              logger.info(`PDF ${i + 1} uploaded successfully`, { labChatId, filename });
-
-              const file = await prisma.file.create({
-                data: {
-                  name: filename,
-                  path: filePath,
-                  type: 'application/pdf',
-                  size: pdfBytes.length,
-                  userId: fullLabChat.createdById,
-                  uploadStatus: 'COMPLETED',
-                  uploadedAt: new Date(),
-                },
-              });
-              attachmentIds.push(file.id);
-            } else {
-              logger.error(`PDF ${i + 1} creation returned undefined/null`, { labChatId, title: doc.title });
-            }
-          } catch (pdfError) {
-            logger.error(`PDF creation threw an error for document ${i + 1}:`, { 
-              error: pdfError instanceof Error ? {
-                message: pdfError.message,
-                stack: pdfError.stack,
-                name: pdfError.name
-              } : pdfError, 
-              labChatId,
-              title: doc.title
-            });
-          }
-        }
-      }
-
-      // Send the text response to the conversation
-      await sendAIMessage(jsonData.text || response, conversationId, {
-        attachments: {
-          connect: attachmentIds.map(id => ({ id })),
-        },
-        subject: fullLabChat.class?.subject || 'Lab',
-      });
-    } catch (parseError) {
-      logger.error('Failed to parse AI response or generate PDF:', { error: parseError, labChatId });
-      // Fallback: send the raw response if parsing fails
-      await sendAIMessage(response, conversationId, {
-        subject: fullLabChat.class?.subject || 'Lab',
-      });
-    }
-
-    logger.info('AI response sent', { labChatId, conversationId });
-
-  } catch (error) {
-    console.error('Full error object:', error);
-    logger.error('Failed to generate AI response:', { 
-      error: error instanceof Error ? {
-        message: error.message,
-        stack: error.stack,
-        name: error.name
-      } : error,
-      labChatId 
-    });
-    throw error; // Re-throw to see the full error in the calling function
-  }
-}
-

package/src/routers/message.ts

@@ -103,6 +103,7 @@ export const messageRouter = createTRPCRouter({
             name: attachment.name,
             type: attachment.type,
           })),
+          meta: message.meta as Record<string, any>,
           mentions: message.mentions.map((mention) => ({
             user: mention.user,
           })),
@@ -111,7 +112,6 @@ export const messageRouter = createTRPCRouter({
         nextCursor,
       };
     }),
-
   send: protectedProcedure
     .input(
       z.object({