@studious-lms/server 1.1.13 → 1.1.15

package/src/routers/labChat.ts

@@ -10,7 +10,10 @@ import {
 } from '../utils/inference.js';
 import { logger } from '../utils/logger.js';
 import { isAIUser } from '../utils/aiUser.js';
+import { uploadFile } from 'src/lib/googleCloudStorage.js';
+import { createPdf } from "src/lib/jsonConversion.js"
 import OpenAI from 'openai';
+import { v4 as uuidv4 } from "uuid";
 
 export const labChatRouter = createTRPCRouter({
   create: protectedProcedure
@@ -772,7 +775,30 @@ IMPORTANT INSTRUCTIONS:
 - 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`;
+- 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).
+- 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 },
@@ -797,11 +823,67 @@ IMPORTANT INSTRUCTIONS:
       content: `${senderName}: ${teacherMessage}`,
     });
 
+
     const completion = await inferenceClient.chat.completions.create({
       model: 'command-a-03-2025',
       messages,
-      max_tokens: 500,
       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;
@@ -810,15 +892,92 @@ IMPORTANT INSTRUCTIONS:
       throw new Error('No response generated from inference API');
     }
 
-    // Send AI response
-    await sendAIMessage(response, conversationId, {
-      subject: fullLabChat.class?.subject || 'Lab',
-    });
+    // 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)) {
+        
+        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`;
+              
+
+              logger.info(`PDF ${i + 1} generated successfully`, { labChatId, title: doc.title });
+              const gcpResult = await uploadFile(Buffer.from(pdfBytes).toString('base64'), `class/generated/${fullLabChat.classId}/${filename}`, 'application/pdf');
+              logger.info(`PDF ${i + 1} uploaded successfully`, { labChatId, filename });
+
+              const file = await prisma.file.create({
+                data: {
+                  name: filename,
+                  path: `class/generated/${fullLabChat.classId}/${filename}`,
+                  type: 'application/pdf',
+                  userId: fullLabChat.createdById,
+                },
+              });
+              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) {
-    logger.error('Failed to generate AI response:', { error, labChatId });
+    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

@@ -3,6 +3,7 @@ import { createTRPCRouter, protectedProcedure } from '../trpc.js';
 import { prisma } from '../lib/prisma.js';
 import { pusher } from '../lib/pusher.js';
 import { TRPCError } from '@trpc/server';
+import { logger } from '../utils/logger.js';
 
 export const messageRouter = createTRPCRouter({
   list: protectedProcedure
@@ -42,6 +43,13 @@ export const messageRouter = createTRPCRouter({
           }),
         },
         include: {
+          attachments: {
+            select: {
+              id: true,
+              name: true,
+              type: true,
+            },
+          },
           sender: {
             select: {
               id: true,
@@ -90,6 +98,11 @@ export const messageRouter = createTRPCRouter({
           conversationId: message.conversationId,
           createdAt: message.createdAt,
           sender: message.sender,
+          attachments: message.attachments.map((attachment) => ({
+            id: attachment.id,
+            name: attachment.name,
+            type: attachment.type,
+          })),
           mentions: message.mentions.map((mention) => ({
             user: mention.user,
           })),
@@ -198,7 +211,7 @@ export const messageRouter = createTRPCRouter({
           mentionedUserIds,
         });
       } catch (error) {
-        console.error('Failed to broadcast message:', error);
+        logger.error('Failed to broadcast message:', {error});
         // Don't fail the request if Pusher fails
       }
 
@@ -341,7 +354,7 @@ export const messageRouter = createTRPCRouter({
           mentionedUserIds,
         });
       } catch (error) {
-        console.error('Failed to broadcast message update:', error);
+        logger.error('Failed to broadcast message update:', {error});
         // Don't fail the request if Pusher fails
       }
 
@@ -429,7 +442,7 @@ export const messageRouter = createTRPCRouter({
           senderId: existingMessage.senderId,
         });
       } catch (error) {
-        console.error('Failed to broadcast message deletion:', error);
+        logger.error('Failed to broadcast message deletion:', {error});
         // Don't fail the request if Pusher fails
       }
 
@@ -480,7 +493,7 @@ export const messageRouter = createTRPCRouter({
           viewedAt: new Date(),
         });
       } catch (error) {
-        console.error('Failed to broadcast conversation view:', error);
+        logger.error('Failed to broadcast conversation view:', {error});
         // Don't fail the request if Pusher fails
       }
 
@@ -529,7 +542,7 @@ export const messageRouter = createTRPCRouter({
           viewedAt: new Date(),
         });
       } catch (error) {
-        console.error('Failed to broadcast mentions view:', error);
+        logger.error('Failed to broadcast mentions view:', {error});
         // Don't fail the request if Pusher fails
       }
 

package/src/utils/inference.ts

@@ -43,6 +43,9 @@ export async function sendAIMessage(
   conversationId: string,
   options: {
     subject?: string;
+    attachments?: {
+      connect: { id: string }[];
+    };
     customSender?: {
       displayName: string;
       profilePicture?: string | null;
@@ -64,6 +67,14 @@ export async function sendAIMessage(
       content,
       senderId: getAIUserId(),
       conversationId,
+      ...(options.attachments && {
+        attachments: {
+          connect: options.attachments.connect,
+        },
+      }),
+    },
+    include: {
+      attachments: true,
     },
   });
 
@@ -93,6 +104,14 @@ export async function sendAIMessage(
       createdAt: aiMessage.createdAt,
       sender: senderInfo,
       mentionedUserIds: [],
+      attachments: aiMessage.attachments.map(attachment => ({
+        id: attachment.id,
+        attachmentId: attachment.id,
+        name: attachment.name,
+        type: attachment.type,
+        size: attachment.size,
+        path: attachment.path,
+      })),
     });
   } catch (error) {
     logger.error('Failed to broadcast AI message:', { error, messageId: aiMessage.id });