Merge branch 'main' into base-components

ConnerWithAnE · web-flow · commit 378f7270bf57 · 2025-01-10T23:34:41.000Z
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -0,0 +1,65 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: CI/CD for Server and Web
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  server:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18.x'
+      - name: Install dependencies for server
+        run: |
+          cd server
+          npm install
+      - name: Run server tests
+        env:
+          OPEN_API_KEY: ${{ secrets.OPEN_API_KEY }}
+        run: |
+          cd server
+          npm test
+  web:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18.x'
+      - name: Install dependencies for web
+        run: |
+          cd web
+          npm install
+      - name: Build web app
+        run: |
+          cd web
+          npm run build
+  # build:
+
+  #   runs-on: ubuntu-latest
+
+  #   strategy:
+  #     matrix:
+  #       node-version: [18.x, 20.x, 22.x]
+  #       # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - name: Use Node.js ${{ matrix.node-version }}
+  #     uses: actions/setup-node@v4
+  #     with:
+  #       node-version: ${{ matrix.node-version }}
+  #       cache: 'npm'
+  #   - run: npm ci
+  #   - run: npm run build --if-present
+  #   - run: npm test
diff --git a/server/src/gpt-controller.ts b/server/src/gpt-controller.ts
@@ -49,7 +49,8 @@ export class GPTController {
       const loopPromises = Array.from({ length: 3 }, async (_) => {
         const assistant = await this.createAssistant(assistantParams);
         const thread = await this.createThread(threadMessage);
-        // Run the assistant on the thread and get the prompt results. Think non-stream results are better?
+        
+        // Run the assistant on the thread and get the prompt results
         let run = await GPTController.client.beta.threads.runs.createAndPoll(
           thread.id,
           {
@@ -61,25 +62,29 @@ export class GPTController {
             await GPTController.client.beta.threads.messages.list(
               run.thread_id,
             );
+          // console.log("Tokens used: ", run.usage)
           var n = 1;
           for (const message of messages.data.reverse()) {
             if (message.content[0].type == "text") {          // Need to check if the message content is text before parsing it
               var result = message.content[0].text.value;
+              //console.log("Result: ", result)                                 // FOR DEBUGGING
               if(n % 2 == 0) {                                // Every second message has the data values
-                // console.log(`${message.role} > ${result}`); // FOR TESTING
-                let preres = result.split("ø").map((s) => s.replace("\n", ""));
-                console.log(preres)
+                // console.log(`${message.role} > ${result}`);                  // FOR DEBUGGING
+                let preres = result.split("ø").map((s) => s.replace("\n", "") && s.replace(/^\s+/g, ""));   // Trimming each string
+                console.log("After split: ", preres)
                 var resvalues: GPTData =  {
                   paper_name: preres[0],
                   year: parseInt(preres[1]),
-                  author: preres[2].split(",").map((s) => s.replace(/^\s+/g, "")),
+                  author: preres[2].split("¶").map((s) => s.replace(/^\s+/g, "")),
                   part_no: preres[3],
                   type: preres[4],
                   manufacturer: preres[5],
                   testing_location: <TestLocation>preres[6],
-                  testing_type: <Testing>preres[7],     // TODO: preres[7] is a list ("TID, TID, DD") sometimes so the cast may fail
-                                                        // Produces weird output: "SEE【4:0†source】"
-                  data_type: 0                          // TODO: add a prompt to get data_type
+
+                  testing_type: <Testing>preres[7],
+                  // TODO: preres[7] is a list ("TID, TID, DD") if the paper has more than one testing type, so the cast may fail
+                  //       Produces weird output: "SEE【4:0†source】"
+                  data_type: 0                          // TODO: Need to be removed hear, from the defined data types and in db controller
                 };
                 console.log(resvalues)
                 threadResults.push(resvalues);
@@ -105,6 +110,7 @@ export class GPTController {
     });
 
     await Promise.all(fileThreads);
+    console.log("All threads completed!");
     return results;
   }
 
diff --git a/server/src/index.ts b/server/src/index.ts
@@ -42,14 +42,22 @@ async function initializeSystem(): Promise<{dbController: DatabaseController, gp
     filename: "./database.db",
     driver: sqlite3.Database,
   });
-  return {dbController: new DatabaseController(db), gptController: new GPTController(GPTModel.GPT3_5Turbo)};
+  return {dbController: new DatabaseController(db), gptController: new GPTController(GPTModel.GPT4Turbo)};
 }
 
 initializeSystem().then(({dbController, gptController}) => {
   app.use("/", exampleRouter);
   //app.use("/getTable", tableRouter)
   app.use("/api/dataRequest", cascadeRouter(dbController));
   app.use("/api/adminRequest", adminRouter(dbController, gptController));
+    //FOR QUICKLY TESTING A PAPER: Uncomment paper to test it. Run "localhost:3000/parse" in a browser to parse the paper and see results in console
+    // app.use("/parse", () => {        
+    //     gptController.runGPTAnalysis(["./test/testfiles/SEE_in-flight_data_for_two_static_32KB_memories_on_high_earth_orbit.pdf"]);
+    //     // gptController.runGPTAnalysis(["./test/testfiles/A_radiation_tolerant_video_camera_for_high_total_dose_environments.pdf"]);
+    //     // gptController.runGPTAnalysis(["./test/testfiles/Radiation_effects_predicted_observed_and_compared_for_spacecraft_systems.pdf"]);
+    //     // gptController.runGPTAnalysis(["./test/testfiles/Solar_flare_proton_environment_for_estimating_downtime_of_spacecraft_CCDs.pdf"]);
+    //     // gptController.runGPTAnalysis(["./test/testfiles/slvk121.pdf"]);
+    // });
 
   app.listen(PORT, () => {
     console.log(`Server is running on ${PORT}`);
diff --git a/server/src/prompts.data.ts b/server/src/prompts.data.ts
@@ -1,19 +1,27 @@
 export const questions = [
   "What is the title of the paper",
   "Which year was the paper published",
-  "What are all of the author's names, in the format (J. Doe) in a comma separated list",
-  "What is the part number (or name if that is not available) of the part or parts studied by the paper",
-  "What is the type of part or parts (eg, switching regulator) mentioned in the paper",
-  "Who is the manufacturer",
+  "What are all of the author's names, in the format (J. Doe) in a \"¶\" separated list",
+  "What is the part no. of the part studied by the paper. If there is more than one, list them",     // There can be more than one part no. in a paper
+  "What is the type of part or parts (eg. switching regulator) mentioned in the paper. If there is more than one, list them",
+  "Who is the manufacturer. If there is more than one, list them",         // There can be more than one manufacturer in a paper if multiple parts are mentioned
   "What is the type of testing location: Respond to this question with \"Terrestrial\" for a terrestial testing location, or \"Flight\" for a flight testing location",
-  "What type of testing was done: Respond to this question with \"TID\" for Total Ionizing Dose testing, \"SEE\" for heavy ion, proton, laser, or neutron testing, or \"OTHER\" if you are not completely 100% sure"
+  "What type of testing was done: Respond to this question with \"TID\" for Total Ionizing Dose testing, \"SEE\" for heavy ion, proton, laser, or neutron testing, \"DD\" for displacement damage testing, or \"OTHER\" if you are not completely 100% sure",
+  // In-progress prompts, bad results
+  // "If Total Ionizing Dose testing was performed, then list which of the following tests were done: Co60, ELDRS, Protons, Electrons. Otherwise, reply N/A",
+  // "If single event effects testing using heavy ion, proton, laser, or neutron was done, then list which of the following tests were done: Reply SEU for single event upset, SET for single event transient, SEFI for single event functional interrupt, SEL for single event latchup, SEB for single event burnout, SEGR for gate rupture, Dose rate for dose rate. Otherwise, reply N/A",
+  // "If displacement damage testing was performed, then list which of the following tests were conducted: Reply \"Protons\" for proton damage, \"Neutrons\" for neutron damage. Otherwise, reply N/A",
+  
+  "Summarize the paper's test results in 3 lines",
+  // "Reference the page number for each answer for the above questions in a \"¶\" separated list. If you are unable to give a page number or the answer is N/A, provide the answer N/A"
 ];
 
 export const prompt = `Please answer the following questions, as concisely as possible, and with a heavy emphasis on numbers instead of words.\n
-    Use standard text and do not provide citations for each of your answers. 
-    Answer each question, and separate the answers with a "ø" character as a delimiter.
-    If you are unable to answer the question accurately, provide the answer N/A.\n`;
+    Use standard text and do not provide citations for any answer.
+    If you are unable to answer the question accurately, provide the answer N/A.
+    Answer each question, and separate the answers with a "ø" character as a delimiter.\n`;
 
+// TODO: Need to incorporate the 3 sets of questions below, into prompts
 export const Other_targeted_questions = [
   "What type was the radiation source",
   "Were there any failures, if so, when?",
diff --git a/server/test/gpt-controller.test.ts b/server/test/gpt-controller.test.ts
@@ -1,10 +1,10 @@
-import { GetQuery, InsertData, RadData } from '../src/types';
+import { GetQuery, InsertData, RadData } from "../src/types";
 
-import { GPTController } from '../src/gpt-controller';
-import { GPTModel } from '../src/enums';
-import fs from 'fs';
-import dotenv from 'dotenv';
-import path, { resolve } from 'path';
+import { GPTController } from "../src/gpt-controller";
+import { GPTModel } from "../src/enums";
+import fs from "fs";
+import dotenv from "dotenv";
+import path, { resolve } from "path";
 
 async function initializeGPT(): Promise<GPTController> {
   return new GPTController(GPTModel.GPT3_5Turbo);
@@ -23,10 +23,47 @@ beforeAll(async () => {
  * Finish unit testing (using jest)
  ***********/
 
-test('Insertion of a paper with one author', async () => {
-  const paper: string = path.resolve(__dirname, 
-    './testfiles/SEE_in-flight_data_for_two_static_32KB_memories_on_high_earth_orbit.pdf');
+test("Insertion of a paper with one author", async () => {
+  const paper: string = path.resolve(
+    __dirname,
+    "./testfiles/Radiation_Test_Dummy_File.pdf"
+  );
   fs.readFileSync(paper);
 
   await expect(testGPT.runGPTAnalysis([paper])).resolves.not.toThrow();
 }, 60000);
+
+// test('Insertion of a paper with five authors', async () => {
+//   const paper: string = path.resolve(__dirname, 
+//     './testfiles/SEE_in-flight_data_for_two_static_32KB_memories_on_high_earth_orbit.pdf');
+//   fs.readFileSync(paper);
+
+//   await expect(testGPT.runGPTAnalysis([paper])).resolves.not.toThrow();
+// }, 60000);
+// }, 90000);    // More prompts = more time. Still not enough time... TODO: fix the test
+
+// Below gpt tests commented out to reduce token usage during testing
+
+// test('Insertion of a paper with two authors', async () => {
+//   const paper: string = path.resolve(__dirname, 
+//     './testfiles/Solar_flare_proton_environment_for_estimating_downtime_of_spacecraft_CCDs.pdf');
+//   fs.readFileSync(paper);
+
+//   await expect(testGPT.runGPTAnalysis([paper])).resolves.not.toThrow();
+// }, 60000);
+
+// test('Insertion of a paper with three authors. 1 of 2', async () => {
+//   const paper: string = path.resolve(__dirname, 
+//     './testfiles/A_radiation_tolerant_video_camera_for_high_total_dose_environments.pdf');
+//   fs.readFileSync(paper);
+
+//   await expect(testGPT.runGPTAnalysis([paper])).resolves.not.toThrow();
+// }, 60000);
+
+// test('Insertion of a paper with three authors. 2 of 2', async () => {
+//   const paper: string = path.resolve(__dirname, 
+//     './testfiles/Radiation_effects_predicted_observed_and_compared_for_spacecraft_systems.pdf');
+//   fs.readFileSync(paper);
+
+//   await expect(testGPT.runGPTAnalysis([paper])).resolves.not.toThrow();
+// }, 60000);
diff --git a/server/test/testfiles/Radiation_Test_Dummy_File.pdf b/server/test/testfiles/Radiation_Test_Dummy_File.pdf
diff --git a/web/src/App.tsx b/web/src/App.tsx
@@ -1,3 +1,4 @@
+import { useState as _useState } from "react";
 import { Route, Routes, BrowserRouter } from "react-router-dom";
 import "./App.css";
 import CASCallback from "./auth/CASCallback";
@@ -8,8 +9,7 @@ import Nav from "./components/nav-bar/nav-bar";
 import EditEntry from "./pages/edit-entry";
 
 function App() {
-    //const [count, setCount] = useState(0);
-
+  //const [count, setCount] = useState(0);
     return (
         <BrowserRouter>
             <Nav />
@@ -50,6 +50,7 @@ function App() {
             </Routes>
         </BrowserRouter>
     );
+
 }
 
 export default App;
