fix: simplify logic for backend by using the new prompt. Display error toast in /upload using the message sent by backend

abhitrueprogrammer · abhitrueprogrammer · commit 741a5ded2696 · 2025-03-07T22:42:17.000+05:30
diff --git a/src/app/api/ai-upload/map.ts b/src/app/api/ai-upload/map.ts
diff --git a/src/app/api/ai-upload/route.ts b/src/app/api/ai-upload/route.ts
@@ -16,10 +16,9 @@ import type {
   ExamDetail,
   IAdminPaper,
 } from "@/interface";
-import Paper, { PaperAdmin } from "@/db/papers";
+import { PaperAdmin } from "@/db/papers";
 import axios from "axios";
 import processAndAnalyze from "@/util/gemini";
-import { examMap } from "./map";
 import Fuse from "fuse.js";
 // import processAndAnalyze from "./mistral";
 // TODO: REMOVE THUMBNAIL FROM admin-buffer DB
@@ -68,17 +67,22 @@ export async function POST(req: Request) {
       const bytes = await files[0]?.arrayBuffer();
       if (bytes) {
         const buffer = Buffer.from(bytes);
-        imageURL = buffer.toString("base64"); // Plain Base64 string, no data URL prefix
+        imageURL = buffer.toString("base64"); 
       }
     }
     const tags = await processAndAnalyze({ imageURL });
 
     console.log(" tags:", tags);
 
     const finalTags = await setTagsFromCurrentLists(tags);
-    const subject = finalTags["course-name"];
+    console.log(" tags:", finalTags);
+    if(!tags)
+    {
+      return null;
+    }
+    const subject = finalTags.subject;
     const slot = finalTags.slot;
-    const exam = finalTags["exam-type"];
+    const exam = finalTags.exam
     const year = finalTags.year;
     const campus = formData.get("campus") as string;
     const semester = finalTags.semester;
@@ -267,37 +271,40 @@ async function setTagsFromCurrentLists(
   }
 
   const newTags: ExamDetail = {
-    "course-name": courses[0],
+    "subject": courses[0],
     slot: slots[0],
     "course-code": "notInUse",
-    "exam-type": exams[0],
+    "exam": exams[0],
     semester: semesters[0] as SemesterType,
     year: years[0],
   };
+  
   const coursesFuzy = new Fuse(courses);
   if (!tags) {
     console.log("Anaylsis failed setting random courses as fields");
     return newTags;
   } else {
     const subjectSearch = coursesFuzy.search(
-      tags["course-name"] + "|" + tags["course-code"],
+      tags.subject ,
     )[0];
     if (subjectSearch) {
-      newTags["course-name"] = subjectSearch.item;
+      newTags.subject = subjectSearch.item;
     }
     const slotSearchResult = findMatch(slots, tags.slot);
     if (slotSearchResult) {
       newTags.slot = slotSearchResult;
     }
-    if ("exam-type" in tags && tags["exam-type"] in examMap) {
-      const examType = tags["exam-type"] as keyof typeof examMap;
-      newTags["exam-type"] = examMap[examType];
+    const examSearchResult = findMatch(exams, tags.exam);
+    if (examSearchResult) {
+      newTags.exam = examSearchResult;
     }
     const semesterSearchResult = findMatch(semesters, tags.semester);
     if (semesterSearchResult) {
       newTags.semester = semesterSearchResult as SemesterType;
+
     }
     const yearSearchResult = findMatch(years, tags.year);
+
     if (yearSearchResult) {
       newTags.year = yearSearchResult;
     }
diff --git a/src/app/upload/page.tsx b/src/app/upload/page.tsx
@@ -1,17 +1,18 @@
 "use client";
 import React, { useState } from "react";
-import axios from "axios";
+import axios, { AxiosError } from "axios";
 import toast from "react-hot-toast";
 import { handleAPIError } from "../../util/error";
 import { Button } from "@/components/ui/button";
 import Navbar from "@/components/Navbar";
 import Footer from "@/components/Footer";
-import { type PostPDFToCloudinary } from "@/interface";
+import { type APIResponse } from "@/interface";
 import Dropzone from "react-dropzone";
 
 import { createCanvas } from "canvas";
 import { getDocument, GlobalWorkerOptions } from "pdfjs-dist";
 import { PDFDocument } from "pdf-lib";
+import { ApiError } from "next/dist/server/api-utils";
 async function pdfToImage(file: File) {
   GlobalWorkerOptions.workerSrc =
     "https://unpkg.com/pdfjs-dist@3.4.120/build/pdf.worker.min.js";
@@ -120,7 +121,7 @@ const Page = () => {
     if (isPdf && files[0]) {
       formData.append("image", await pdfToImage(files[0]));
     }
-    
+
     // formData.append("exam", exam);
     formData.append("campus", campus);
 
@@ -130,11 +131,27 @@ const Page = () => {
 
     try {
       await toast.promise(
-        axios.post<PostPDFToCloudinary>("/api/ai-upload", formData),
+        async () => {
+          try {
+            await axios.post<APIResponse>(
+              "/api/ai-upload",
+              formData,
+            );
+          } catch (error) {
+            if (error instanceof AxiosError && error.response?.data ) {
+              const errorData = error.response.data as APIResponse;
+              const errorMessage = errorData.message || "Failed to upload papers";
+              throw new Error(errorMessage);
+            }
+            throw new Error("Failed to upload papers");
+          }
+        },
         {
           loading: "Uploading papers...",
           success: "Papers uploaded successfully!",
-          error: "Failed to upload papers. Please try again.",
+          error: (error: Error) => {
+            return error.message;
+          },
         },
       );
 
@@ -207,4 +224,4 @@ const Page = () => {
   );
 };
 
-export default Page;
+export default Page;
diff --git a/src/app/upload/page_not_AI.tsx b/src/app/upload/page_not_AI.tsx
@@ -7,7 +7,7 @@ import { handleAPIError } from "../../util/error";
 import { Button } from "@/components/ui/button";
 import Navbar from "@/components/Navbar";
 import Footer from "@/components/Footer";
-import { type PostPDFToCloudinary } from "@/interface";
+import { type APIResponse } from "@/interface";
 import { slots, years, campuses, semesters, exams } from "@/components/select_options";
 import SearchBar from "@/components/searchbarSubjectList";
 import Dropzone from "react-dropzone";
@@ -170,7 +170,7 @@ const Page = () => {
 
     try {
       await toast.promise(
-        axios.post<PostPDFToCloudinary>("/api/upload", formData),
+        axios.post<APIResponse>("/api/upload", formData),
         {
           loading: "Uploading papers...",
           success: "Papers uploaded successfully!",
diff --git a/src/interface.ts b/src/interface.ts
@@ -96,8 +96,9 @@ export interface IAdminUpload {
   exam: "CAT-1" | "CAT-2" | "FAT";
   isPdf: boolean;
 }
-export interface PostPDFToCloudinary {
-  status: boolean;
+export interface APIResponse {
+  message: string;
+  status: number;
 }
 export interface ConverttoPDFResponse {
   url: string;
@@ -147,10 +148,10 @@ export interface IPaper {
   answerKeyIncluded?: boolean;
 }
 export type ExamDetail = {
-  "course-name": string;
+  subject: string;
   slot: string;
   "course-code": string;
-  "exam-type": string;
+  "exam": string;
   semester: "Fall Semester" | "Winter Semester" | "Summer Semester" | "Weekend Semester";
   year: string;
 };
diff --git a/src/util/gemini.ts b/src/util/gemini.ts
@@ -73,14 +73,14 @@ function parseExamDetail(analysis: string): ExamDetail {
       if (examDetail.semester) {
         const validSemesters = ["Fall Semester", "Winter Semester", "Summer Semester", "Weekend Semester"];
         if (!validSemesters.includes(examDetail.semester)) {
-          examDetail.semester = "Fall Semester"; // Default to Fall Semester if invalid
+          examDetail.semester = "Fall Semester"; 
         }
       }
       
       if (examDetail.year) {
         const yearPattern = /^\d{4}$/;
         if (!yearPattern.test(examDetail.year)) {
-          examDetail.year = new Date().getFullYear().toString(); // Default to current year if invalid
+          examDetail.year = new Date().getFullYear().toString(); 
         }
       }
       return examDetail
@@ -90,10 +90,10 @@ function parseExamDetail(analysis: string): ExamDetail {
   } catch (error) {
     console.error("Error parsing exam details:", error);
     return {
-      "course-name": "Unknown",
+      "subject": "Unknown",
       slot: "Unknown",
       "course-code": "Unknown",
-      "exam-type": "Unknown",
+      "exam": "Unknown",
       semester: "Fall Semester",
       year: new Date().getFullYear().toString() 
     };
@@ -114,8 +114,18 @@ async function analyzeImage(dataUrl: string): Promise<AnalysisResult[]> {
 
     // const dataUrl = `data:image/png;base64,${imageBase64}`;
 
-    const prompt = `This is an image of a question paper. I want you to extract the Exam name, there can be three: final assessment test, continuous assessment test 1, continuous assessment test 2.Now Final assessment should be labelled as FAT, Continuous assessment 1 should be labelled as CAT1 and Continuous assessment 2 should be labelled as CAT2. Also I want you to find me the semester it is from, there can be four: Fall Semester, Winter Semester, Summer Semester, Weekend Semester. Fall semester lasts form july to end of the year and winter from january to april, rest is summer semester.Do not put weekend semester if you dont see it in the image. Also find me the year of the exam and the slot of the exam, they look something like this : A1, A1+TA1, B2+BT2, C1+TC1+TCC1 etc.Instead of the entire slot though i just require the initial, alphaber and number part before the plus sign. And I also require the course title and the course code from the paper. Course code looks something like : BCSE202P, BCSE307L etc. if you unable to find return NOT FOUND also format your output into a .json format. most importantly if you are unsure of anything at all just return NOT FOUND`;
+    const prompt = `This is an image of a question paper. I want you to extract the Exam name, there can be three: final assessment test, continuous assessment test 1, continuous assessment test 2.Now Final assessment should be labelled as FAT, Continuous assessment 1 should be labelled as CAT-1 and Continuous assessment 2 should be labelled as CAT-2. Also I want you to find me the semester it is from, there can be four: Fall Semester, Winter Semester, Summer Semester, Weekend Semester. Fall semester lasts form july to end of the year and winter from january to May inclusive , summer semester is from june to july. Do not put weekend semester if you dont see it in the image. Also find me the year of the exam and the slot of the exam, they look something like this : A1, A1+TA1, B2+BT2, C1+TC1+TCC1 etc.Instead of the entire slot though i just require the initial, alphaber and number part before the plus sign. And I also require the course title and the course code from the paper. Course code looks something like : BCSE202P, BCSE307L etc. if you unable to find return NOT FOUND also format your output into a .json format. most importantly if you are unsure of anything at all just return NOT FOUND
 
+    make sure to return the output in the following format:
+    {
+    subject: "course title [course code]"
+    exam: "exam type" 
+    year: year
+    slot: "A1/A2/B1 etc "
+    semester: "semester"
+    }
+        
+    `;
     const image = {
       inlineData: {
         data: dataUrl,
@@ -128,8 +138,8 @@ async function analyzeImage(dataUrl: string): Promise<AnalysisResult[]> {
     const chatResponse = result.response.text();
     const rawAnalysis =  chatResponse;
 
+    console.log(rawAnalysis)
     const examDetail: ExamDetail = parseExamDetail(rawAnalysis);
-
     results.push({
       examDetail,
       rawAnalysis,
@@ -144,10 +154,10 @@ async function analyzeImage(dataUrl: string): Promise<AnalysisResult[]> {
     return [
       {
         examDetail: {
-          "course-name": "Error",
+          "subject": "Error",
           slot: "Error",
           "course-code": "Error",
-          "exam-type": "Error",
+          "exam": "Error",
           semester: "Fall Semester", 
           year: new Date().getFullYear().toString()
         },
diff --git a/src/util/mistral.ts b/src/util/mistral.ts
