1 files changed, 28 insertions, 14 deletions

diff --git a/src/client/apis/gpt/GPT.ts b/src/client/apis/gpt/GPT.ts
index e3e87e017..fc4347a64 100644
--- a/src/client/apis/gpt/GPT.ts
+++ b/src/client/apis/gpt/GPT.ts
@@ -1,9 +1,11 @@
 import { ClientOptions, OpenAI } from 'openai';
+import { ChatCompletionMessageParam } from 'openai/resources';
 
 enum GPTCallType {
     SUMMARY = 'summary',
     COMPLETION = 'completion',
     EDIT = 'edit',
+    DATA = 'data',
 }
 
 type GPTCallOpts = {
@@ -13,23 +15,29 @@ type GPTCallOpts = {
     prompt: string;
 };
 
+/**
+ * Replace completions (deprecated) with chat
+ */
+
 const callTypeMap: { [type: string]: GPTCallOpts } = {
-    summary: { model: 'gpt-3.5-turbo-instruct', maxTokens: 256, temp: 0.5, prompt: 'Summarize this text in simpler terms: ' },
-    edit: { model: 'gpt-3.5-turbo-instruct', maxTokens: 256, temp: 0.5, prompt: 'Reword this: ' },
-    completion: { model: 'gpt-3.5-turbo-instruct', maxTokens: 256, temp: 0.5, prompt: '' },
+    // newest model: gpt-4
+    summary: { model: 'gpt-3.5-turbo', maxTokens: 256, temp: 0.5, prompt: 'Summarize the text given in simpler terms.' },
+    edit: { model: 'gpt-3.5-turbo', maxTokens: 256, temp: 0.5, prompt: 'Reword the text.' },
+    completion: { model: 'gpt-3.5-turbo', maxTokens: 256, temp: 0.5, prompt: "You are a helpful assistant. Answer the user's prompt." },
+    data: { model: 'gpt-3.5-turbo', maxTokens: 256, temp: 0.5, prompt: "You are a helpful resarch assistant. Analyze the user's data to find meaningful patterns and/or correlation. Please keep your response short and to the point." },
 };
 
+let lastCall = '';
+let lastResp = '';
 /**
  * Calls the OpenAI API.
  *
  * @param inputText Text to process
  * @returns AI Output
  */
-let lastCall = '';
-let lastResp = '';
-const gptAPICall = async (inputTextIn: string, callType: GPTCallType) => {
-    const inputText = callType === GPTCallType.SUMMARY ? inputTextIn + '.' : inputTextIn;
-    const opts = callTypeMap[callType];
+const gptAPICall = async (inputText: string, callType: GPTCallType, prompt?: any) => {
+    if (callType === GPTCallType.SUMMARY) inputText += '.';
+    const opts: GPTCallOpts = callTypeMap[callType];
     if (lastCall === inputText) return lastResp;
     try {
         const configuration: ClientOptions = {
@@ -38,14 +46,21 @@ const gptAPICall = async (inputTextIn: string, callType: GPTCallType) => {
         };
         lastCall = inputText;
         const openai = new OpenAI(configuration);
-        const response = await openai.completions.create({
+
+        let usePrompt = prompt ? opts.prompt + prompt : opts.prompt;
+        let messages: ChatCompletionMessageParam[] = [
+            { role: 'system', content: usePrompt },
+            { role: 'user', content: inputText },
+        ];
+
+        const response = await openai.chat.completions.create({
             model: opts.model,
             max_tokens: opts.maxTokens,
             temperature: opts.temp,
-            prompt: `${opts.prompt}${inputText}`,
+            messages,
         });
-        lastResp = response.choices[0].text;
-        return response.choices[0].text;
+        lastResp = response.choices[0].message.content ?? '';
+        return lastResp;
     } catch (err) {
         console.log(err);
         return 'Error connecting with API.';
@@ -65,8 +80,7 @@ const gptImageCall = async (prompt: string, n?: number) => {
             n: n ?? 1,
             size: '1024x1024',
         });
-        return response.data.map((data: any) => data.url);
-        // return response.data.data[0].url;
+        return response.data.map(data => data.url);
     } catch (err) {
         console.error(err);
     }