Removed redundant code from gptAnalysis, modified prompts so that parsing result to GPTData type is more correct

Author: Samantha Mathan

README.md

@@ -45,7 +45,7 @@ each time.
 Simply run the below command in the `server` directory
 
 ```sh
-npm run start:dev
+npm run start-dev
 ```
 
 This will start a development server with the `ts-node` and `nodemon` packages. This allows for easy development via cold-reloading. `ts-node` allows for running the typescript code without the need for compliation while `nodemon` monitors for changes to any `.ts` or `.js` files.

server/src/gpt-controller.ts

@@ -45,6 +45,7 @@ export class GPTController {
       //console.log(`Thread Message: ${threadMessage}`)
       // Create the three threads for each paper
       let threadResults: GPTData[] = [];
+      //const loopPromises = Array.from({ length: 1 }, async (_) => {   // FOR TESTING
       const loopPromises = Array.from({ length: 3 }, async (_) => {
         const assistant = await this.createAssistant(assistantParams);
         const thread = await this.createThread(threadMessage);
@@ -55,43 +56,30 @@ export class GPTController {
             assistant_id: assistant.id,
           },
         );
-        var result = "";
         if (run.status == "completed") {
           const messages =
             await GPTController.client.beta.threads.messages.list(
               run.thread_id,
             );
           var n = 1;
           for (const message of messages.data.reverse()) {
-            // Need to check if the message content is text before parsing it
-            if (message.content[0].type == "text") {
-              result = message.content[0].text.value;
-              var resvalues: GPTData = {    // Initialize GPT data object
-                paper_name: "",
-                year: 0,
-                author: [],
-                part_no: "",
-                type: "",
-                manufacturer: "",
-                testing_location: "Terrestrial",
-                testing_type: "TID",
-                data_type: 0
-              }
-              // Every second message has the data values
-              if(n % 2 == 0) {
-                // console.log(`${message.role} > ${result}`);
+            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;
+              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)
-                resvalues = {
+                console.log(preres)
+                var resvalues: GPTData =  {
                   paper_name: preres[0],
                   year: parseInt(preres[1]),
-                  author: preres[2].split(","),
+                  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: this gives a list ("TID, TID, DD") sometimes so the cast may fail
-                  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") sometimes so the cast may fail
+                                                        // Produces weird output: "SEE【4:0†source】"
+                  data_type: 0                          // TODO: add a prompt to get data_type
                 };
                 console.log(resvalues)
                 threadResults.push(resvalues);
@@ -112,25 +100,8 @@ export class GPTController {
         pass_2: threadResults[1],
         pass_3: threadResults[2],
       };
-
       //console.log(threadFinal)
       results.push(threadFinal);
-
-      // TODO: Need to add the stream and and return it, not working yet.
-      // Will be uncommented to implement
-
-      /*
-      const stream = await GPTController.client.beta.threads.runs.create(
-        thread.id, 
-        {assistant_id: assistant.id, stream: true}
-
-      )
-
-      let response = '';
-      for await (const chunk of stream) {
-        response += chunk.choices[0]?.delta?.content || "";
-      }
-      */
     });
 
     await Promise.all(fileThreads);

server/src/prompts.data.ts

@@ -1,12 +1,12 @@
 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 list like this ['J. Doe', 'R. Austin']",
-  "What is the Part No. or name if that is not available",
-  'What is the type of part (eg, switching regulator), if there are multiple part numbers listed, list them all and seperate them with a "¶"',
+  "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 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 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"
 ];
 
 export const prompt = `Please answer the following questions, as concisely as possible, and with a heavy emphasis on numbers instead of words.\n