@studious-lms/server 1.2.46 → 1.2.48

package/src/routers/newtonChat.ts

@@ -3,13 +3,9 @@ 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,
-  openAIClient,
-  sendAIMessage,
-} from '../utils/inference.js';
 import { logger } from '../utils/logger.js';
 import { isAIUser } from '../utils/aiUser.js';
+import { generateAndSendNewtonIntroduction, generateAndSendNewtonResponse } from '../server/pipelines/aiNewtonChat.js';
 
 export const newtonChatRouter = createTRPCRouter({
   getTutorConversation: protectedProcedure
@@ -124,19 +120,17 @@ export const newtonChatRouter = createTRPCRouter({
             title: 'Session with Newton Tutor',
           },
         });
+        generateAndSendNewtonIntroduction(
+          newtonChat.id,
+          newtonChat.conversationId,
+          submission.id
+        ).catch(error => {
+          logger.error('Failed to generate AI introduction:', { error, newtonChatId: result.id });
+        });
 
         return newtonChat;
       });
 
-      // Generate AI introduction message in parallel (don't await - fire and forget)
-      generateAndSendNewtonIntroduction(
-        result.id,
-        result.conversationId,
-        submission.id
-      ).catch(error => {
-        logger.error('Failed to generate AI introduction:', { error, newtonChatId: result.id });
-      });
-
       return {
         conversationId: result.conversationId,
         newtonChatId: result.id,
@@ -300,221 +294,4 @@ export const newtonChatRouter = createTRPCRouter({
     }),
 });
 
-/**
- * Generate and send AI introduction for Newton chat
- */
-async function generateAndSendNewtonIntroduction(
-  newtonChatId: string,
-  conversationId: string,
-  submissionId: string
-): Promise<void> {
-  try {
-    // Get submission details for context
-    const submission = await prisma.submission.findUnique({
-      where: { id: submissionId },
-      include: {
-        assignment: {
-          select: {
-            title: true,
-            instructions: true,
-            class: {
-              select: {
-                subject: true,
-                name: true,
-              },
-            },
-          },
-        },
-        attachments: {
-          select: {
-            id: true,
-            name: true,
-            type: true,
-          },
-        },
-      },
-    });
-
-    if (!submission) {
-      throw new Error('Submission not found');
-    }
-
-    const systemPrompt = `You are Newton, an AI tutor helping a student with their assignment submission. 
-
-Assignment: ${submission.assignment.title}
-Subject: ${submission.assignment.class.subject}
-Instructions: ${submission.assignment.instructions || 'No specific instructions provided'}
-
-Your role:
-- Help the student understand concepts related to their assignment
-- Provide guidance and explanations without giving away direct answers
-- Encourage learning and critical thinking
-- Be supportive and encouraging
-- Use clear, educational language appropriate for the subject
-
-Do not use markdown formatting in your responses - use plain text only.`;
-
-    const completion = await inferenceClient.chat.completions.create({
-      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,
-      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: submission.assignment.class.subject || 'Assignment',
-    });
-
-    logger.info('AI Introduction sent', { newtonChatId, conversationId });
-
-  } catch (error) {
-    logger.error('Failed to generate AI introduction:', { error, newtonChatId });
-    
-    // Send fallback introduction
-    try {
-      const fallbackIntro = `Hello! I'm Newton, your AI tutor. I'm here to help you with your assignment. I can answer questions, explain concepts, and guide you through your work. What would you like help with today?`;
-      
-      await sendAIMessage(fallbackIntro, conversationId, {
-        subject: 'Assignment',
-      });
-
-      logger.info('Fallback AI introduction sent', { newtonChatId });
-
-    } catch (fallbackError) {
-      logger.error('Failed to send fallback AI introduction:', { error: fallbackError, newtonChatId });
-    }
-  }
-}
-
-/**
- * Generate and send AI response to student message
- */
-async function generateAndSendNewtonResponse(
-  newtonChatId: string,
-  studentMessage: string,
-  conversationId: string,
-  submission: {
-    id: string;
-    assignment: {
-      id: string;
-      title: string;
-      instructions: string | null;
-      class: {
-        subject: string | null;
-      };
-    };
-  }
-): Promise<void> {
-  try {
-    // 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
-    });
-
-    const systemPrompt = `You are Newton, an AI tutor helping a student with their assignment submission. 
-
-Assignment: ${submission.assignment.title}
-Subject: ${submission.assignment.class.subject || 'General'}
-Instructions: ${submission.assignment.instructions || 'No specific instructions provided'}
-
-Your role:
-- Help the student understand concepts related to their assignment
-- Provide guidance and explanations without giving away direct answers
-- Encourage learning and critical thinking
-- Be supportive and encouraging
-- Use clear, educational language appropriate for the subject
-- If the student asks for direct answers, guide them to think through the problem instead
-- Break down complex concepts into simpler parts
-- Use examples and analogies when helpful
-
-IMPORTANT:
-- Do not use markdown formatting in your responses - use plain text only
-- Keep responses conversational and educational
-- Focus on helping the student learn, not just completing the assignment`;
-
-    const messages: Array<{ role: 'user' | 'assistant' | 'system'; content: string }> = [
-      { role: 'system', content: systemPrompt },
-    ];
-
-    // Add recent conversation history
-    recentMessages.reverse().forEach(msg => {
-      const role = isAIUser(msg.senderId) ? 'assistant' : 'user';
-      const senderName = msg.sender?.profile?.displayName || msg.sender?.username || 'Student';
-      const content = isAIUser(msg.senderId) ? msg.content : `${senderName}: ${msg.content}`;
-      
-      messages.push({
-        role: role as 'user' | 'assistant',
-        content,
-      });
-    });
-
-    // Add the new student message
-    messages.push({
-      role: 'user',
-      content: `Student: ${studentMessage}`,
-    });
-
-    const completion = await openAIClient.chat.completions.create({
-      model: 'gpt-5-nano',
-      messages,
-      temperature: 0.7,
-    });
-
-    const response = completion.choices[0]?.message?.content;
-    
-    if (!response) {
-      throw new Error('No response generated from inference API');
-    }
-
-    // Send the text response to the conversation
-    await sendAIMessage(response, conversationId, {
-      subject: submission.assignment.class.subject || 'Assignment',
-    });
-
-    logger.info('AI response sent', { newtonChatId, conversationId });
-
-  } catch (error) {
-    logger.error('Failed to generate AI response:', { 
-      error: error instanceof Error ? {
-        message: error.message,
-        stack: error.stack,
-        name: error.name
-      } : error,
-      newtonChatId 
-    });
-  }
-}
-
 

package/src/routers/section.ts

@@ -1,10 +1,11 @@
 import { z } from "zod";
-import { createTRPCRouter, protectedProcedure, protectedTeacherProcedure } from "../trpc.js";
+import { createTRPCRouter, protectedClassMemberProcedure, protectedProcedure, protectedTeacherProcedure } from "../trpc.js";
 import { TRPCError } from "@trpc/server";
 import { prisma } from "../lib/prisma.js";
 
 const createSectionSchema = z.object({
   classId: z.string(),
+  id: z.string().optional(),
   name: z.string(),
   color: z.string().optional(),
 });
@@ -22,6 +23,24 @@ const deleteSectionSchema = z.object({
 });
 
 export const sectionRouter = createTRPCRouter({
+  exists: protectedClassMemberProcedure
+    .input(z.object({
+      id: z.string(),
+    }))
+    .query(async ({ ctx, input }) => {
+      if (!ctx.user) {
+        throw new TRPCError({
+          code: "UNAUTHORIZED",
+          message: "User must be authenticated",
+        });
+      }
+
+      const section = await prisma.section.findUnique({
+        where: { id: input.id },
+      });
+
+      return section ? true : false;
+    }),
   create: protectedTeacherProcedure
     .input(createSectionSchema)
     .mutation(async ({ ctx, input }) => {
@@ -53,6 +72,7 @@ export const sectionRouter = createTRPCRouter({
 
       const section = await prisma.section.create({
         data: {
+          ...(input.id && { id: input.id }),
           name: input.name,
           order: 0,
           class: {

package/src/routers/worksheet.ts

@@ -1,5 +1,5 @@
 import { TRPCError } from "@trpc/server";
-import { createTRPCRouter, protectedProcedure } from "../trpc.js";
+import { createTRPCRouter, protectedClassMemberProcedure, protectedProcedure } from "../trpc.js";
 import { z } from "zod";
 import { prisma } from "../lib/prisma.js";
 import { GenerationStatus, WorksheetQuestionType } from "@prisma/client";
@@ -38,6 +38,22 @@ export const worksheetRouter = createTRPCRouter({
       return worksheet;
     }),
 
+  exists: protectedClassMemberProcedure
+    .input(z.object({
+      id: z.string(),
+    }))
+    .query(async ({ ctx, input }) => {
+      if (!ctx.user) {
+        throw new TRPCError({ code: 'UNAUTHORIZED', message: 'User must be authenticated' });
+      }
+
+      const worksheet = await prisma.worksheet.findUnique({
+        where: { id: input.id },
+      });
+
+      return worksheet ? true : false;
+    }),
+
   // List all worksheets for a class
   listWorksheets: protectedProcedure
     .input(z.object({

package/src/seedDatabase.ts

@@ -8,6 +8,21 @@ export async function clearDatabase() {
     logger.info('Clearing database');
     await prisma.notification.deleteMany();
     
+    // Delete worksheet-related records
+    await prisma.studentQuestionProgress.deleteMany();
+    await prisma.studentWorksheetResponse.deleteMany();
+    await prisma.worksheetQuestion.deleteMany();
+    await prisma.worksheet.deleteMany();
+    
+    // Delete reactions (they reference announcements and comments)
+    await prisma.reaction.deleteMany();
+    
+    // Delete comments (they reference announcements and users)
+    await prisma.comment.deleteMany();
+    
+    // Delete NewtonChat (they reference submissions and conversations)
+    await prisma.newtonChat.deleteMany();
+    
     // Delete chat-related records
     await prisma.mention.deleteMany();
     await prisma.message.deleteMany();
@@ -39,10 +54,19 @@ export async function clearDatabase() {
     // Delete schools (which reference files for logos) - this will cascade delete the file references
     await prisma.school.deleteMany();
     
+    // Delete marketing-related records
+    await prisma.schoolDevelopementProgram.deleteMany();
+    await prisma.earlyAccessRequest.deleteMany();
+    
     // Finally delete all files
     await prisma.file.deleteMany();
 }
 
+// Helper function to generate DiceBear avatar URL
+function getDiceBearAvatar(seed: string): string {
+    return `https://api.dicebear.com/7.x/avataaars/svg?seed=${encodeURIComponent(seed)}`;
+}
+
 export async function createUser(email: string, password: string, username: string) {
     logger.debug("Creating user", { email, username, password });
 
@@ -109,7 +133,7 @@ export const seedDatabase = async () => {
         createUser('charlotte.walker@student.riverside.edu', 'student123', 'charlotte.walker'),
     ]);
 
-    // 4. Create User Profiles
+    // 4. Create User Profiles with DiceBear avatars
     await Promise.all([
         prisma.userProfile.create({
             data: {
@@ -118,6 +142,7 @@ export const seedDatabase = async () => {
                 bio: 'Biology teacher with 15 years of experience. Passionate about making science accessible to all students.',
                 location: 'Riverside, CA',
                 website: 'https://sarahjohnson-bio.com',
+                profilePicture: getDiceBearAvatar(teachers[0].username),
             }
         }),
         prisma.userProfile.create({
@@ -126,6 +151,7 @@ export const seedDatabase = async () => {
                 displayName: 'Mr. Michael Chen',
                 bio: 'Mathematics teacher and department head. Specializes in AP Calculus and Statistics.',
                 location: 'Riverside, CA',
+                profilePicture: getDiceBearAvatar(teachers[1].username),
             }
         }),
         prisma.userProfile.create({
@@ -134,18 +160,24 @@ export const seedDatabase = async () => {
                 displayName: 'Ms. Emma Davis',
                 bio: 'English Literature teacher. Loves fostering creative writing and critical thinking.',
                 location: 'Riverside, CA',
+                profilePicture: getDiceBearAvatar(teachers[2].username),
             }
         }),
     ]);
 
-    // Add profiles for some students
-    await Promise.all(students.slice(0, 6).map((student, index) => {
-        const names = ['Alex Martinez', 'Sophia Williams', 'James Brown', 'Olivia Taylor', 'Ethan Anderson', 'Ava Thomas'];
+    // Add profiles for all students with DiceBear avatars
+    await Promise.all(students.map((student, index) => {
+        const names = [
+            'Alex Martinez', 'Sophia Williams', 'James Brown', 'Olivia Taylor', 
+            'Ethan Anderson', 'Ava Thomas', 'Noah Jackson', 'Isabella White',
+            'Liam Harris', 'Mia Clark', 'Lucas Lewis', 'Charlotte Walker'
+        ];
         return prisma.userProfile.create({
             data: {
                 userId: student.id,
-                displayName: names[index],
-                bio: `Grade 11 student at Riverside High School.`,
+                displayName: names[index] || student.username,
+                bio: index < 6 ? `Grade 11 student at Riverside High School.` : undefined,
+                profilePicture: getDiceBearAvatar(student.username),
             }
         });
     }));