Merge branch 'kl/scrum-41-ai-timetable-generate' of https://github.com/UTSC-CSCC01-Software-Engineering-I/term-group-project-c01w25-project-course-matrix into kl/scrum-41-ai-timetable-generate

Author: kevin-lann

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

@@ -200,9 +200,8 @@ export const availableFunctions: AvailableFunctions = {
         });
       }
 
-      const groupedOfferingsList: GroupedOfferingList[] = await groupOfferings(
-        courseOfferingsList
-      );
+      const groupedOfferingsList: GroupedOfferingList[] =
+        await groupOfferings(courseOfferingsList);
 
       // console.log(JSON.stringify(groupedOfferingsList, null, 2));
 
@@ -215,7 +214,7 @@ export const availableFunctions: AvailableFunctions = {
       }
 
       const categorizedOfferings = await categorizeValidOfferings(
-        validCourseOfferingsList
+        validCourseOfferingsList,
       );
 
       // console.log(typeof categorizedOfferings);
@@ -228,7 +227,7 @@ export const availableFunctions: AvailableFunctions = {
         [],
         0,
         categorizedOfferings.length,
-        maxdays
+        maxdays,
       );
 
       // Return error if no valid schedules are found

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

@@ -56,7 +56,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");
@@ -65,7 +65,7 @@ export async function searchSelectedNamespaces(
   query: string,
   k: number,
   namespaces: string[],
-  filters?: Object
+  filters?: Object,
 ): Promise<Document[]> {
   let allResults: Document[] = [];
 
@@ -87,7 +87,7 @@ export async function searchSelectedNamespaces(
       const results = await namespaceStore.similaritySearch(
         query,
         Math.max(k, namespaceToMinResults.get(namespace)),
-        namespace === "courses_v3" ? filters : undefined
+        namespace === "courses_v3" ? filters : undefined,
       );
       console.log(`Found ${results.length} results in namespace: ${namespace}`);
       allResults = [...allResults, ...results];
@@ -108,7 +108,7 @@ export async function searchSelectedNamespaces(
 // Reformulate user query to make more concise query to database, taking into consideration context
 export async function reformulateQuery(
   latestQuery: string,
-  conversationHistory: any[]
+  conversationHistory: any[],
 ): Promise<string> {
   try {
     const openai2 = new OpenAI({
@@ -331,7 +331,7 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
             toolCall.args,
             `The tool accepts the following schema:`,
             parameterSchema(toolCall),
-            "Please fix the arguments."
+            "Please fix the arguments.",
           );
 
           const { object: repairedArgs } = await generateObject({
@@ -366,7 +366,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);
@@ -380,8 +380,8 @@ 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);
@@ -392,7 +392,7 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
           reformulatedQuery,
           3,
           relevantNamespaces,
-          Object.keys(filters).length === 0 ? undefined : filters
+          Object.keys(filters).length === 0 ? undefined : filters,
         );
         // console.log("Search Results: ", searchResults);
 
@@ -402,7 +402,7 @@ export const chat = asyncHandler(async (req: Request, res: Response) => {
         }
       } else {
         console.log(
-          "Query does not require knowledge retrieval, skipping search"
+          "Query does not require knowledge retrieval, skipping search",
         );
       }
 
@@ -468,15 +468,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);
 
@@ -486,11 +486,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/controllers/generatorController.ts

@@ -408,12 +408,10 @@ export default {
         return res.status(404).json({ error: "No valid schedules found." });
       }
       // Return the valid schedules
-      return res
-        .status(200)
-        .json({
-          amount: validSchedules.length,
-          schedules: trim(validSchedules),
-        });
+      return res.status(200).json({
+        amount: validSchedules.length,
+        schedules: trim(validSchedules),
+      });
     } catch (error) {
       // Catch any error and return the error message
       const errorMessage =

course-matrix/backend/src/models/timetable-form.ts

@@ -56,7 +56,7 @@ export const CourseSchema = z.object({
     .max(8, "Invalid course code")
     .min(1, "Course code is required")
     .describe(
-      "The course code. Formatted like: CSCA08H3. Course codes cannot be provided without the H3 at the end."
+      "The course code. Formatted like: CSCA08H3. Course codes cannot be provided without the H3 at the end.",
     ),
   name: z.string().describe("The name of the course"),
 });
@@ -80,7 +80,7 @@ export const RestrictionSchema = z.object({
     .max(4, "Cannot block all days of the week")
     .optional()
     .describe(
-      "If type is Days Off, then this field is used and describes min number of days off per week."
+      "If type is Days Off, then this field is used and describes min number of days off per week.",
     ),
   startTime: z
     .string()