Merge branch 'main' of https://github.com/UTSC-CSCC01-Software-Engineering-I/term-group-project-c01w25-project-course-matrix into scrum-57-child-133-Update-timetable-endpoints-for-favorites

Author: minhhaitran08

course-matrix/backend/jest.config.ts

@@ -2,8 +2,12 @@ import type { Config } from "jest";
 
 const config: Config = {
   preset: "ts-jest",
-  moduleNameMapper: { "\\.(css|scss)$": "identity-obj-proxy" },
+  moduleNameMapper: {
+    "\\.(css|scss)$": "identity-obj-proxy",
+    "^.+\\.svg": "<rootDir>/tests/mocks/svgMock.tsx",
+  },
   // to obtain access to the matchers.
+  setupFilesAfterEnv: ["<rootDir>/tests/setupTests.ts"],
   moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
   modulePaths: ["<rootDir>"],
   testEnvironment: "jsdom",

course-matrix/backend/src/constants/constants.ts

@@ -39,7 +39,7 @@ export const yearToCode = (year: number) => {
 
 // Set minimum results wanted for a similarity search on the associated namespace.
 export const namespaceToMinResults = new Map();
-namespaceToMinResults.set("courses_v3", 10);
+namespaceToMinResults.set("courses_v2", 10);
 namespaceToMinResults.set("offerings", 16); // Typically, more offering info is wanted.
 namespaceToMinResults.set("prerequisites", 5);
 namespaceToMinResults.set("corequisites", 5);

course-matrix/backend/src/constants/promptKeywords.ts

@@ -1,6 +1,6 @@
 // Keywords related to each namespace
 export const NAMESPACE_KEYWORDS = {
-  courses_v3: [
+  courses_v2: [
     "course",
     "class",
     "description",
@@ -61,41 +61,6 @@ export const NAMESPACE_KEYWORDS = {
   programs: ["program", "major", "minor", "specialist", "degree", "stream"],
 };
 
-export const BREADTH_REQUIREMENT_KEYWORDS = {
-  ART_LIT_LANG: [
-    "ART_LIT_LANG",
-    "art literature",
-    "arts literature",
-    "art language",
-    "arts language",
-    "literature language",
-    "art literature language",
-    "arts literature language",
-  ],
-  HIS_PHIL_CUL: [
-    "HIS_PHIL_CUL",
-    "history philosophy culture",
-    "history, philosophy, culture",
-    "history, philosophy, and culture",
-    "history, philosophy",
-    "history philosophy",
-    "philosophy culture",
-    "philosophy, culture",
-    "history culture",
-    "History, Philosophy and Cultural Studies",
-  ],
-  SOCIAL_SCI: ["SOCIAL_SCI", "social science", "social sciences"],
-  NAT_SCI: ["NAT_SCI", "natural science", "natural sciences"],
-  QUANT: ["QUANT", "quantitative reasoning"],
-};
-
-export const YEAR_LEVEL_KEYWORDS = {
-  first_year: ["first year", "first-year", "A-level", "A level", "1st year"],
-  second_year: ["second year", "second-year", "B-level", "B level", "2nd year"],
-  third_year: ["third year", "third-year", "C-level", "C level", "3rd year"],
-  fourth_year: ["fourth year", "fourth-year", "D-level", "D level", "4th year"],
-};
-
 // General academic terms that might indicate a search is needed
 export const GENERAL_ACADEMIC_TERMS = ["credit", "enroll", "drop"];
 

course-matrix/backend/src/controllers/aiController.ts

@@ -12,14 +12,10 @@ import {
   DEPARTMENT_CODES,
   ASSISTANT_TERMS,
   USEFUL_INFO,
-  BREADTH_REQUIREMENT_KEYWORDS,
-  YEAR_LEVEL_KEYWORDS,
 } from "../constants/promptKeywords";
 import { CHATBOT_MEMORY_THRESHOLD, codeToYear } from "../constants/constants";
 import { namespaceToMinResults } from "../constants/constants";
 import OpenAI from "openai";
-import { convertBreadthRequirement } from "../utils/convert-breadth-requirement";
-import { convertYearLevel } from "../utils/convert-year-level";
 
 const openai = createOpenAI({
   baseURL: process.env.OPENAI_BASE_URL,
@@ -35,7 +31,7 @@ const pinecone = new Pinecone({
 });
 
 const index: Index<RecordMetadata> = pinecone.Index(
-  process.env.PINECONE_INDEX_NAME!,
+  process.env.PINECONE_INDEX_NAME!
 );
 
 console.log("Connected to OpenAI API");
@@ -62,8 +58,8 @@ function analyzeQuery(query: string): {
 
   // If a course code is detected, add tehse namespaces
   if (containsCourseCode) {
-    if (!relevantNamespaces.includes("courses_v3"))
-      relevantNamespaces.push("courses_v3");
+    if (!relevantNamespaces.includes("courses_v2"))
+      relevantNamespaces.push("courses_v2");
     if (!relevantNamespaces.includes("offerings"))
       relevantNamespaces.push("offerings");
     if (!relevantNamespaces.includes("prerequisites"))
@@ -74,8 +70,8 @@ function analyzeQuery(query: string): {
   if (DEPARTMENT_CODES.some((code) => lowerQuery.includes(code))) {
     if (!relevantNamespaces.includes("departments"))
       relevantNamespaces.push("departments");
-    if (!relevantNamespaces.includes("courses_v3"))
-      relevantNamespaces.push("courses_v3");
+    if (!relevantNamespaces.includes("courses_v2"))
+      relevantNamespaces.push("courses_v2");
   }
 
   // If search is required at all
@@ -87,12 +83,12 @@ function analyzeQuery(query: string): {
   // If no specific namespaces identified & search required, then search all
   if (requiresSearch && relevantNamespaces.length === 0) {
     relevantNamespaces.push(
-      "courses_v3",
+      "courses_v2",
       "offerings",
       "prerequisites",
       "corequisites",
       "departments",
-      "programs",
+      "programs"
     );
   }
 
@@ -109,8 +105,7 @@ function analyzeQuery(query: string): {
 async function searchSelectedNamespaces(
   query: string,
   k: number,
-  namespaces: string[],
-  filters?: Object,
+  namespaces: string[]
 ): Promise<Document[]> {
   let allResults: Document[] = [];
 
@@ -131,8 +126,7 @@ async function searchSelectedNamespaces(
       // Search results count given by the min result count for a given namespace (or k if k is greater)
       const results = await namespaceStore.similaritySearch(
         query,
-        Math.max(k, namespaceToMinResults.get(namespace)),
-        namespace === "courses_v3" ? filters : undefined,
+        Math.max(k, namespaceToMinResults.get(namespace))
       );
       console.log(`Found ${results.length} results in namespace: ${namespace}`);
       allResults = [...allResults, ...results];
@@ -153,7 +147,7 @@ async function searchSelectedNamespaces(
 // Reformulate user query to make more concise query to database, taking into consideration context
 async function reformulateQuery(
   latestQuery: string,
-  conversationHistory: any[],
+  conversationHistory: any[]
 ): Promise<string> {
   try {
     const openai = new OpenAI({
@@ -233,69 +227,6 @@ async function reformulateQuery(
   }
 }
 
-// Determines whether to apply metadata filtering based on user query.
-function includeFilters(query: string) {
-  const lowerQuery = query.toLocaleLowerCase();
-  const relaventBreadthRequirements: string[] = [];
-  const relaventYearLevels: string[] = [];
-
-  Object.entries(BREADTH_REQUIREMENT_KEYWORDS).forEach(
-    ([namespace, keywords]) => {
-      if (keywords.some((keyword) => lowerQuery.includes(keyword))) {
-        relaventBreadthRequirements.push(convertBreadthRequirement(namespace));
-      }
-    },
-  );
-
-  Object.entries(YEAR_LEVEL_KEYWORDS).forEach(([namespace, keywords]) => {
-    if (keywords.some((keyword) => lowerQuery.includes(keyword))) {
-      relaventYearLevels.push(convertYearLevel(namespace));
-    }
-  });
-
-  let filter = {};
-  if (relaventBreadthRequirements.length > 0 && relaventYearLevels.length > 0) {
-    filter = {
-      $and: [
-        {
-          $or: relaventBreadthRequirements.map((req) => ({
-            breadth_requirement: { $eq: req },
-          })),
-        },
-        {
-          $or: relaventYearLevels.map((yl) => ({ year_level: { $eq: yl } })),
-        },
-      ],
-    };
-  } else if (relaventBreadthRequirements.length > 0) {
-    filter = {
-      $or: relaventBreadthRequirements.map((req) => ({
-        breadth_requirement: { $eq: req },
-      })),
-    };
-  } else if (relaventYearLevels.length > 0) {
-    filter = {
-      $or: relaventYearLevels.map((yl) => ({ year_level: { $eq: yl } })),
-    };
-  }
-  return filter;
-}
-
-/**
- * @description Handles user queries and generates responses using GPT-4o, with optional knowledge retrieval.
- *
- * @param {Request} req - The Express request object, containing:
- *   @param {Object[]} req.body.messages - Array of message objects representing the conversation history.
- *   @param {string} req.body.messages[].role - The role of the message sender (e.g., "user", "assistant").
- *   @param {Object[]} req.body.messages[].content - An array containing message content objects.
- *   @param {string} req.body.messages[].content[].text - The actual text of the message.
- *
- * @param {Response} res - The Express response object used to stream the generated response.
- *
- * @returns {void} Responds with a streamed text response of the AI output
- *
- * @throws {Error} If query reformulation or knowledge retrieval fails.
- */
 export const chat = asyncHandler(async (req: Request, res: Response) => {
   const { messages } = req.body;
   const latestMessage = messages[messages.length - 1].content[0].text;
@@ -309,7 +240,7 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
   // Use GPT-4o to reformulate the query based on conversation history
   const reformulatedQuery = await reformulateQuery(
     latestMessage,
-    conversationHistory.slice(-CHATBOT_MEMORY_THRESHOLD), // last K messages
+    conversationHistory.slice(-CHATBOT_MEMORY_THRESHOLD) // last K messages
   );
   console.log(">>>> Original query:", latestMessage);
   console.log(">>>> Reformulated query:", reformulatedQuery);
@@ -323,19 +254,15 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
   if (requiresSearch) {
     console.log(
       `Query requires knowledge retrieval, searching namespaces: ${relevantNamespaces.join(
-        ", ",
-      )}`,
+        ", "
+      )}`
     );
 
-    const filters = includeFilters(reformulatedQuery);
-    // console.log("Filters: ", JSON.stringify(filters))
-
     // Search only relevant namespaces
     const searchResults = await searchSelectedNamespaces(
       reformulatedQuery,
       3,
-      relevantNamespaces,
-      Object.keys(filters).length === 0 ? undefined : filters,
+      relevantNamespaces
     );
     // console.log("Search Results: ", searchResults);
 
@@ -403,15 +330,15 @@ export const testSimilaritySearch = asyncHandler(
     if (requiresSearch) {
       console.log(
         `Query requires knowledge retrieval, searching namespaces: ${relevantNamespaces.join(
-          ", ",
-        )}`,
+          ", "
+        )}`
       );
 
       // Search only the relevant namespaces
       const searchResults = await searchSelectedNamespaces(
         message,
         3,
-        relevantNamespaces,
+        relevantNamespaces
       );
       console.log("Search Results: ", searchResults);
 
@@ -421,11 +348,11 @@ export const testSimilaritySearch = asyncHandler(
       }
     } else {
       console.log(
-        "Query does not require knowledge retrieval, skipping search",
+        "Query does not require knowledge retrieval, skipping search"
       );
     }
 
     console.log("CONTEXT: ", context);
     res.status(200).send(context);
-  },
+  }
 );

course-matrix/backend/src/routes/aiRouter.ts

@@ -4,13 +4,5 @@ import { authRouter } from "./authRouter";
 
 export const aiRouter = express.Router();
 
-/**
- * @route POST /api/ai/chat
- * @description Handles user queries and generates responses using GPT-4o, with optional knowledge retrieval.
- */
 aiRouter.post("/chat", authRouter, chat);
-/**
- * @route POST /api/ai/test-similarity-search
- * @description Test vector database similarity search feature
- */
 aiRouter.post("/test-similarity-search", testSimilaritySearch);

course-matrix/backend/src/utils/embeddings.ts

@@ -5,7 +5,6 @@ import { PineconeStore } from "@langchain/pinecone";
 import { Pinecone } from "@pinecone-database/pinecone";
 import config from "../config/config";
 import path from "path";
-import { convertBreadthRequirement } from "./convert-breadth-requirement";
 
 console.log("Running embeddings process...");
 
@@ -38,35 +37,6 @@ async function processCSV(filePath: string, namespace: string) {
   });
 }
 
-// Generate embeddings for courses.csv
-async function processCoursesCSV(filePath: string, namespace: string) {
-  const fileName = path.basename(filePath);
-  const loader = new CSVLoader(filePath);
-  let docs = await loader.load();
-
-  docs = docs.map((doc, index) => ({
-    ...doc,
-    metadata: {
-      ...doc.metadata,
-      source: fileName,
-      row: index + 1,
-      breadth_requirement: convertBreadthRequirement(
-        doc.pageContent.split("\n")[1].split(": ")[1],
-      ),
-      year_level: doc.pageContent.split("\n")[10].split(": ")[1],
-    },
-  }));
-  console.log("Sample doc: ", docs[0]);
-
-  const index = pinecone.Index(process.env.PINECONE_INDEX_NAME!);
-
-  // Store each row as an individual embedding
-  await PineconeStore.fromDocuments(docs, embeddings, {
-    pineconeIndex: index as any,
-    namespace: namespace,
-  });
-}
-
 // Generate embeddings for pdfs
 async function processPDF(filePath: string, namespace: string) {
   const fileName = path.basename(filePath);
@@ -101,7 +71,7 @@ async function processPDF(filePath: string, namespace: string) {
   // console.log("Sample split docs: ", splitDocs.slice(0, 6))
 
   console.log(
-    `Split into ${splitDocs.length} sections by "Calendar Section:" delimiter`,
+    `Split into ${splitDocs.length} sections by "Calendar Section:" delimiter`
   );
 
   // Store the split documents as embeddings
@@ -128,7 +98,6 @@ async function processPDF(filePath: string, namespace: string) {
 // processCSV("../data/tables/offerings_winter_2026.csv", "offerings")
 // processCSV("../data/tables/departments.csv", "departments")
 // processCSV("../data/tables/courses_with_year.csv", "courses_v2")
-// processCoursesCSV("../data/tables/courses_with_year.csv", "courses_v3");
 
 console.log("embeddings done.");
 

course-matrix/backend/tests/mocks/svgMock.tsx

@@ -0,0 +1,2 @@
+export default "SvgrURL";
+export const ReactComponent = "div";

course-matrix/backend/tests/setupTests.ts

@@ -1 +1 @@
-import "@testing-library/jest-dom";
+import "@testing-library/jest-dom";