@goscribe/server 1.0.11 → 1.1.0

package/dist/routers/studyguide.d.ts

@@ -7,7 +7,17 @@ export declare const studyguide: import("@trpc/server").TRPCBuiltRouter<{
         cookies: Record<string, string | undefined>;
     };
     meta: object;
-    errorShape: import("@trpc/server").TRPCDefaultErrorShape;
+    errorShape: {
+        data: {
+            zodError: string | null;
+            code: import("@trpc/server").TRPC_ERROR_CODE_KEY;
+            httpStatus: number;
+            path?: string;
+            stack?: string;
+        };
+        message: string;
+        code: import("@trpc/server").TRPC_ERROR_CODE_NUMBER;
+    };
     transformer: true;
 }, import("@trpc/server").TRPCDecorateCreateRouterOptions<{
     get: import("@trpc/server").TRPCQueryProcedure<{

package/dist/routers/worksheets.d.ts

@@ -7,14 +7,60 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
         cookies: Record<string, string | undefined>;
     };
     meta: object;
-    errorShape: import("@trpc/server").TRPCDefaultErrorShape;
+    errorShape: {
+        data: {
+            zodError: string | null;
+            code: import("@trpc/server").TRPC_ERROR_CODE_KEY;
+            httpStatus: number;
+            path?: string;
+            stack?: string;
+        };
+        message: string;
+        code: import("@trpc/server").TRPC_ERROR_CODE_NUMBER;
+    };
     transformer: true;
 }, import("@trpc/server").TRPCDecorateCreateRouterOptions<{
     list: import("@trpc/server").TRPCQueryProcedure<{
         input: {
             workspaceId: string;
         };
-        output: any;
+        output: ({
+            versions: {
+                id: string;
+                createdAt: Date;
+                createdById: string | null;
+                artifactId: string;
+                content: string;
+                data: import("@prisma/client/runtime/library").JsonValue | null;
+                version: number;
+            }[];
+            questions: {
+                meta: import("@prisma/client/runtime/library").JsonValue | null;
+                id: string;
+                createdAt: Date;
+                type: import("@prisma/client").$Enums.QuestionType;
+                difficulty: import("@prisma/client").$Enums.Difficulty;
+                artifactId: string;
+                prompt: string;
+                answer: string | null;
+                order: number;
+            }[];
+        } & {
+            id: string;
+            createdAt: Date;
+            updatedAt: Date;
+            title: string;
+            description: string | null;
+            workspaceId: string;
+            type: import("@prisma/client").$Enums.ArtifactType;
+            isArchived: boolean;
+            generating: boolean;
+            generatingMetadata: import("@prisma/client/runtime/library").JsonValue | null;
+            difficulty: import("@prisma/client").$Enums.Difficulty | null;
+            estimatedTime: string | null;
+            imageObjectKey: string | null;
+            createdById: string | null;
+        })[];
         meta: object;
     }>;
     create: import("@trpc/server").TRPCMutationProcedure<{
@@ -27,7 +73,7 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
             problems?: {
                 question: string;
                 answer: string;
-                type?: "TEXT" | "MULTIPLE_CHOICE" | "NUMERIC" | "TRUE_FALSE" | "MATCHING" | "FILL_IN_THE_BLANK" | undefined;
+                type?: "MULTIPLE_CHOICE" | "TEXT" | "NUMERIC" | "TRUE_FALSE" | "MATCHING" | "FILL_IN_THE_BLANK" | undefined;
                 options?: string[] | undefined;
             }[] | undefined;
         };
@@ -39,9 +85,9 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
                 type: import("@prisma/client").$Enums.QuestionType;
                 difficulty: import("@prisma/client").$Enums.Difficulty;
                 artifactId: string;
-                order: number;
                 prompt: string;
                 answer: string | null;
+                order: number;
             }[];
         } & {
             id: string;
@@ -52,8 +98,11 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
             workspaceId: string;
             type: import("@prisma/client").$Enums.ArtifactType;
             isArchived: boolean;
+            generating: boolean;
+            generatingMetadata: import("@prisma/client/runtime/library").JsonValue | null;
             difficulty: import("@prisma/client").$Enums.Difficulty | null;
             estimatedTime: string | null;
+            imageObjectKey: string | null;
             createdById: string | null;
         };
         meta: object;
@@ -62,7 +111,34 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
         input: {
             worksheetId: string;
         };
-        output: any;
+        output: {
+            questions: {
+                meta: import("@prisma/client/runtime/library").JsonValue | null;
+                id: string;
+                createdAt: Date;
+                type: import("@prisma/client").$Enums.QuestionType;
+                difficulty: import("@prisma/client").$Enums.Difficulty;
+                artifactId: string;
+                prompt: string;
+                answer: string | null;
+                order: number;
+            }[];
+        } & {
+            id: string;
+            createdAt: Date;
+            updatedAt: Date;
+            title: string;
+            description: string | null;
+            workspaceId: string;
+            type: import("@prisma/client").$Enums.ArtifactType;
+            isArchived: boolean;
+            generating: boolean;
+            generatingMetadata: import("@prisma/client/runtime/library").JsonValue | null;
+            difficulty: import("@prisma/client").$Enums.Difficulty | null;
+            estimatedTime: string | null;
+            imageObjectKey: string | null;
+            createdById: string | null;
+        };
         meta: object;
     }>;
     createWorksheetQuestion: import("@trpc/server").TRPCMutationProcedure<{
@@ -70,7 +146,7 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
             worksheetId: string;
             prompt: string;
             answer?: string | undefined;
-            type?: "TEXT" | "MULTIPLE_CHOICE" | "NUMERIC" | "TRUE_FALSE" | "MATCHING" | "FILL_IN_THE_BLANK" | undefined;
+            type?: "MULTIPLE_CHOICE" | "TEXT" | "NUMERIC" | "TRUE_FALSE" | "MATCHING" | "FILL_IN_THE_BLANK" | undefined;
             difficulty?: "EASY" | "MEDIUM" | "HARD" | undefined;
             order?: number | undefined;
             meta?: Record<string, unknown> | undefined;
@@ -82,9 +158,9 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
             type: import("@prisma/client").$Enums.QuestionType;
             difficulty: import("@prisma/client").$Enums.Difficulty;
             artifactId: string;
-            order: number;
             prompt: string;
             answer: string | null;
+            order: number;
         };
         meta: object;
     }>;
@@ -93,7 +169,7 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
             worksheetQuestionId: string;
             prompt?: string | undefined;
             answer?: string | undefined;
-            type?: "TEXT" | "MULTIPLE_CHOICE" | "NUMERIC" | "TRUE_FALSE" | "MATCHING" | "FILL_IN_THE_BLANK" | undefined;
+            type?: "MULTIPLE_CHOICE" | "TEXT" | "NUMERIC" | "TRUE_FALSE" | "MATCHING" | "FILL_IN_THE_BLANK" | undefined;
             difficulty?: "EASY" | "MEDIUM" | "HARD" | undefined;
             order?: number | undefined;
             meta?: Record<string, unknown> | undefined;
@@ -105,9 +181,9 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
             type: import("@prisma/client").$Enums.QuestionType;
             difficulty: import("@prisma/client").$Enums.Difficulty;
             artifactId: string;
-            order: number;
             prompt: string;
             answer: string | null;
+            order: number;
         };
         meta: object;
     }>;
@@ -123,6 +199,7 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
             problemId: string;
             completed: boolean;
             answer?: string | undefined;
+            correct?: boolean | undefined;
         };
         output: {
             meta: import("@prisma/client/runtime/library").JsonValue | null;
@@ -131,8 +208,9 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
             updatedAt: Date;
             userId: string;
             worksheetQuestionId: string;
-            completed: boolean;
+            modified: boolean;
             userAnswer: string | null;
+            correct: boolean | null;
             completedAt: Date | null;
             attempts: number;
             timeSpentSec: number | null;
@@ -150,8 +228,9 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
             updatedAt: Date;
             userId: string;
             worksheetQuestionId: string;
-            completed: boolean;
+            modified: boolean;
             userAnswer: string | null;
+            correct: boolean | null;
             completedAt: Date | null;
             attempts: number;
             timeSpentSec: number | null;
@@ -169,7 +248,7 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
                 question: string;
                 answer: string;
                 id?: string | undefined;
-                type?: "TEXT" | "MULTIPLE_CHOICE" | "NUMERIC" | "TRUE_FALSE" | "MATCHING" | "FILL_IN_THE_BLANK" | undefined;
+                type?: "MULTIPLE_CHOICE" | "TEXT" | "NUMERIC" | "TRUE_FALSE" | "MATCHING" | "FILL_IN_THE_BLANK" | undefined;
                 options?: string[] | undefined;
             }[] | undefined;
         };
@@ -181,9 +260,9 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
                 type: import("@prisma/client").$Enums.QuestionType;
                 difficulty: import("@prisma/client").$Enums.Difficulty;
                 artifactId: string;
-                order: number;
                 prompt: string;
                 answer: string | null;
+                order: number;
             }[];
         } & {
             id: string;
@@ -194,8 +273,11 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
             workspaceId: string;
             type: import("@prisma/client").$Enums.ArtifactType;
             isArchived: boolean;
+            generating: boolean;
+            generatingMetadata: import("@prisma/client/runtime/library").JsonValue | null;
             difficulty: import("@prisma/client").$Enums.Difficulty | null;
             estimatedTime: string | null;
+            imageObjectKey: string | null;
             createdById: string | null;
         };
         meta: object;
@@ -226,11 +308,40 @@ export declare const worksheets: import("@trpc/server").TRPCBuiltRouter<{
                 workspaceId: string;
                 type: import("@prisma/client").$Enums.ArtifactType;
                 isArchived: boolean;
+                generating: boolean;
+                generatingMetadata: import("@prisma/client/runtime/library").JsonValue | null;
                 difficulty: import("@prisma/client").$Enums.Difficulty | null;
                 estimatedTime: string | null;
+                imageObjectKey: string | null;
                 createdById: string | null;
             };
         };
         meta: object;
     }>;
+    checkAnswer: import("@trpc/server").TRPCMutationProcedure<{
+        input: {
+            worksheetId: string;
+            questionId: string;
+            answer: string;
+        };
+        output: {
+            isCorrect: boolean;
+            userMarkScheme: import("../types/index.js").UserMarkScheme | null;
+            progress: {
+                meta: import("@prisma/client/runtime/library").JsonValue | null;
+                id: string;
+                createdAt: Date;
+                updatedAt: Date;
+                userId: string;
+                worksheetQuestionId: string;
+                modified: boolean;
+                userAnswer: string | null;
+                correct: boolean | null;
+                completedAt: Date | null;
+                attempts: number;
+                timeSpentSec: number | null;
+            };
+        };
+        meta: object;
+    }>;
 }>>;

package/dist/routers/worksheets.js

@@ -3,6 +3,7 @@ import { TRPCError } from '@trpc/server';
 import { router, authedProcedure } from '../trpc.js';
 import { aiSessionService } from '../lib/ai-session.js';
 import PusherService from '../lib/pusher.js';
+import { logger } from '../lib/logger.js';
 // Avoid importing Prisma enums directly; mirror values as string literals
 const ArtifactType = {
     WORKSHEET: 'WORKSHEET',
@@ -53,13 +54,15 @@ export const worksheets = router({
                 if (!p)
                     return q;
                 const existingMeta = q.meta ? (typeof q.meta === 'object' ? q.meta : JSON.parse(q.meta)) : {};
+                const progressMeta = p.meta ? (typeof p.meta === 'object' ? p.meta : JSON.parse(p.meta)) : {};
                 return {
                     ...q,
                     meta: {
                         ...existingMeta,
-                        completed: p.completed,
+                        completed: p.modified,
                         userAnswer: p.userAnswer,
                         completedAt: p.completedAt,
+                        userMarkScheme: progressMeta.userMarkScheme,
                     },
                 };
             }),
@@ -141,13 +144,15 @@ export const worksheets = router({
                 if (!p)
                     return q;
                 const existingMeta = q.meta ? (typeof q.meta === 'object' ? q.meta : JSON.parse(q.meta)) : {};
+                const progressMeta = p.meta ? (typeof p.meta === 'object' ? p.meta : JSON.parse(p.meta)) : {};
                 return {
                     ...q,
                     meta: {
                         ...existingMeta,
-                        completed: p.completed,
+                        completed: p.modified,
                         userAnswer: p.userAnswer,
                         completedAt: p.completedAt,
+                        userMarkScheme: progressMeta.userMarkScheme,
                     },
                 };
             }),
@@ -230,6 +235,7 @@ export const worksheets = router({
         problemId: z.string(),
         completed: z.boolean(),
         answer: z.string().optional(),
+        correct: z.boolean().optional(),
     }))
         .mutation(async ({ ctx, input }) => {
         // Verify question ownership through worksheet
@@ -255,13 +261,14 @@ export const worksheets = router({
             create: {
                 worksheetQuestionId: input.problemId,
                 userId: ctx.session.user.id,
-                completed: input.completed,
+                modified: input.completed,
                 userAnswer: input.answer,
+                correct: input.correct,
                 completedAt: input.completed ? new Date() : null,
                 attempts: 1,
             },
             update: {
-                completed: input.completed,
+                modified: input.completed,
                 userAnswer: input.answer,
                 completedAt: input.completed ? new Date() : null,
                 attempts: { increment: 1 },
@@ -381,12 +388,6 @@ export const worksheets = router({
         const workspace = await ctx.db.workspace.findFirst({ where: { id: input.workspaceId, ownerId: ctx.session.user.id } });
         if (!workspace)
             throw new TRPCError({ code: 'NOT_FOUND' });
-        await PusherService.emitTaskComplete(input.workspaceId, 'worksheet_load_start', { source: 'prompt' });
-        const session = await aiSessionService.initSession(input.workspaceId);
-        await aiSessionService.setInstruction(session.id, `Create a worksheet with ${input.numQuestions} questions at ${input.difficulty} difficulty from this prompt. Return JSON.\n\nPrompt:\n${input.prompt}`);
-        await aiSessionService.startLLMSession(session.id);
-        const content = await aiSessionService.generateWorksheetQuestions(session.id, input.numQuestions, input.difficulty);
-        await PusherService.emitTaskComplete(input.workspaceId, 'worksheet_info', { contentLength: content.length });
         const artifact = await ctx.db.artifact.create({
             data: {
                 workspaceId: input.workspaceId,
@@ -395,60 +396,132 @@ export const worksheets = router({
                 createdById: ctx.session.user.id,
                 difficulty: (input.difficulty.toUpperCase()),
                 estimatedTime: input.estimatedTime,
+                generating: true,
+                generatingMetadata: { quantity: input.numQuestions, difficulty: input.difficulty.toLowerCase() },
             },
         });
+        await PusherService.emitTaskComplete(input.workspaceId, 'worksheet_info', { contentLength: input.numQuestions });
         try {
-            const worksheetData = JSON.parse(content);
-            let actualWorksheetData = worksheetData;
-            if (worksheetData.last_response) {
-                try {
-                    actualWorksheetData = JSON.parse(worksheetData.last_response);
+            const content = await aiSessionService.generateWorksheetQuestions(input.workspaceId, ctx.session.user.id, input.numQuestions, input.difficulty);
+            try {
+                const worksheetData = JSON.parse(content);
+                let actualWorksheetData = worksheetData;
+                if (worksheetData.last_response) {
+                    try {
+                        actualWorksheetData = JSON.parse(worksheetData.last_response);
+                    }
+                    catch { }
                 }
-                catch { }
-            }
-            const problems = actualWorksheetData.problems || actualWorksheetData.questions || actualWorksheetData || [];
-            for (let i = 0; i < Math.min(problems.length, input.numQuestions); i++) {
-                const problem = problems[i];
-                const prompt = problem.question || problem.prompt || `Question ${i + 1}`;
-                const answer = problem.answer || problem.solution || `Answer ${i + 1}`;
-                const type = problem.type || 'TEXT';
-                const options = problem.options || [];
-                await ctx.db.worksheetQuestion.create({
-                    data: {
-                        artifactId: artifact.id,
-                        prompt,
-                        answer,
-                        difficulty: (input.difficulty.toUpperCase()),
-                        order: i,
-                        meta: {
-                            type,
-                            options: options.length > 0 ? options : undefined,
-                        },
-                    },
-                });
-            }
-        }
-        catch {
-            const lines = content.split('\n').filter(line => line.trim());
-            for (let i = 0; i < Math.min(lines.length, input.numQuestions); i++) {
-                const line = lines[i];
-                if (line.includes(' - ')) {
-                    const [q, a] = line.split(' - ');
+                const problems = actualWorksheetData.problems || actualWorksheetData.questions || actualWorksheetData || [];
+                for (let i = 0; i < Math.min(problems.length, input.numQuestions); i++) {
+                    const problem = problems[i];
+                    const prompt = problem.question || problem.prompt || `Question ${i + 1}`;
+                    const answer = problem.answer || problem.solution || `Answer ${i + 1}`;
+                    const type = problem.type || 'TEXT';
+                    const options = problem.options || [];
                     await ctx.db.worksheetQuestion.create({
                         data: {
                             artifactId: artifact.id,
-                            prompt: q.trim(),
-                            answer: a.trim(),
+                            prompt,
+                            answer,
                             difficulty: (input.difficulty.toUpperCase()),
                             order: i,
-                            meta: { type: 'TEXT' },
+                            meta: {
+                                type,
+                                options: options.length > 0 ? options : undefined,
+                                mark_scheme: problem.mark_scheme || undefined,
+                            },
                         },
                     });
                 }
             }
+            catch {
+                logger.error('Failed to parse worksheet JSON,');
+                await ctx.db.artifact.delete({
+                    where: { id: artifact.id },
+                });
+                throw new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message: 'Failed to parse worksheet JSON' });
+            }
+            await ctx.db.artifact.update({
+                where: { id: artifact.id },
+                data: { generating: false },
+            });
+            await PusherService.emitWorksheetComplete(input.workspaceId, artifact);
+        }
+        catch (error) {
+            await ctx.db.artifact.delete({
+                where: { id: artifact.id },
+            });
+            await PusherService.emitError(input.workspaceId, `Failed to generate worksheet: ${error instanceof Error ? error.message : 'Unknown error'}`, 'worksheet_generation');
+            throw error;
         }
-        await PusherService.emitWorksheetComplete(input.workspaceId, artifact);
-        aiSessionService.deleteSession(session.id);
         return { artifact };
     }),
+    checkAnswer: authedProcedure
+        .input(z.object({
+        worksheetId: z.string(),
+        questionId: z.string(),
+        answer: z.string().min(1),
+    }))
+        .mutation(async ({ ctx, input }) => {
+        const worksheet = await ctx.db.artifact.findFirst({ where: { id: input.worksheetId, type: ArtifactType.WORKSHEET, workspace: { ownerId: ctx.session.user.id } }, include: { workspace: true } });
+        if (!worksheet)
+            throw new TRPCError({ code: 'NOT_FOUND' });
+        const question = await ctx.db.worksheetQuestion.findFirst({ where: { id: input.questionId, artifactId: input.worksheetId } });
+        if (!question)
+            throw new TRPCError({ code: 'NOT_FOUND' });
+        // Parse question meta to get mark_scheme
+        const questionMeta = question.meta ? (typeof question.meta === 'object' ? question.meta : JSON.parse(question.meta)) : {};
+        const markScheme = questionMeta.mark_scheme;
+        let isCorrect = false;
+        let userMarkScheme = null;
+        // If mark scheme exists, use AI marking
+        if (markScheme && markScheme.points && markScheme.points.length > 0) {
+            try {
+                userMarkScheme = await aiSessionService.checkWorksheetQuestions(worksheet.workspace.id, ctx.session.user.id, question.prompt, input.answer, markScheme);
+                // Determine if correct by comparing achieved points vs total points
+                const achievedTotal = userMarkScheme.points.reduce((sum, p) => sum + (p.achievedPoints || 0), 0);
+                isCorrect = achievedTotal === markScheme.totalPoints;
+            }
+            catch (error) {
+                logger.error('Failed to check answer with AI', error instanceof Error ? error.message : 'Unknown error');
+                // Fallback to simple string comparison
+                isCorrect = question.answer === input.answer;
+            }
+        }
+        else {
+            // Simple string comparison if no mark scheme
+            isCorrect = question.answer === input.answer;
+        }
+        // @todo: figure out this wierd fix
+        const progress = await ctx.db.worksheetQuestionProgress.upsert({
+            where: {
+                worksheetQuestionId_userId: {
+                    worksheetQuestionId: input.questionId,
+                    userId: ctx.session.user.id,
+                },
+            },
+            create: {
+                worksheetQuestionId: input.questionId,
+                userId: ctx.session.user.id,
+                modified: true,
+                userAnswer: input.answer,
+                correct: isCorrect,
+                completedAt: new Date(),
+                attempts: 1,
+                meta: userMarkScheme ? { userMarkScheme: JSON.parse(JSON.stringify(userMarkScheme)) } : { userMarkScheme: null },
+            },
+            update: {
+                modified: true,
+                userAnswer: input.answer,
+                correct: isCorrect,
+                completedAt: new Date(),
+                attempts: { increment: 1 },
+                meta: userMarkScheme
+                    ? { userMarkScheme: JSON.parse(JSON.stringify(userMarkScheme)) }
+                    : { userMarkScheme: null },
+            },
+        });
+        return { isCorrect, userMarkScheme, progress };
+    }),
 });