Test using instruct field && some cleanup

open-learning-exchange · Jul 31, 2024 · ef9a898 · ef9a898
1 parent 7b8b9a0
commit ef9a898
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/chatapi/src/services/chat.service.ts b/chatapi/src/services/chat.service.ts
@@ -21,7 +21,6 @@ export async function chat(data: any, stream?: boolean, callback?: (response: st
   const { content, ...dbData } = data;
   const messages: ChatMessage[] = [];
   const aiProvider = dbData.aiProvider as AIProvider || { 'name': 'openai' };
-  console.log(dbData);
 
   if (!content || typeof content !== 'string') {
     throw new Error('"data.content" is a required non-empty string field');

diff --git a/chatapi/src/utils/chat-assistant.utils.ts b/chatapi/src/utils/chat-assistant.utils.ts
@@ -8,15 +8,14 @@ dotenv.config();
  * @param model - Model to use for assistant
  * @returns Assistant object
  */
-export async function createAssistant(model: string, additionalContext?: any) {
-  console.log(additionalContext);
+export async function createAssistant(model: string) {
+// export async function createAssistant(model: string, additionalContext?: any) {
 
-  const instructions = process.env.ASSISTANT_INSTRUCTIONS + (additionalContext ? additionalContext?.data : '');
-  console.log(instructions);
+  // const instructions = process.env.ASSISTANT_INSTRUCTIONS + (additionalContext ? additionalContext?.data : '');
 
   return await openai.beta.assistants.create({
     'name': process.env.ASSISTANT_NAME,
-    instructions,
+    'instructions': process.env.ASSISTANT_INSTRUCTIONS,
     'tools': [{ 'type': 'code_interpreter' }],
     model,
   });
@@ -36,10 +35,13 @@ export async function addToThread(threadId: any, message: string) {
   );
 }
 
-export async function createRun(threadID: any, assistantID: any) {
+export async function createRun(threadID: any, assistantID: any, instructions?: string) {
   return await openai.beta.threads.runs.create(
     threadID,
-    { 'assistant_id': assistantID }
+    {
+      'assistant_id': assistantID,
+      instructions
+    }
   );
 }
 

diff --git a/chatapi/src/utils/chat-helpers.utils.ts b/chatapi/src/utils/chat-helpers.utils.ts
@@ -79,7 +79,7 @@ export async function aiChatStream(
 
   if (assistant) {
     try {
-      const asst = await createAssistant(model, context);
+      const asst = await createAssistant(model);
       const thread = await createThread();
       for (const message of messages) {
         await addToThread(thread.id, message.content);
@@ -138,12 +138,12 @@ export async function aiChatNonStream(
 
   if(assistant) {
     try {
-      const asst = await createAssistant(model, context);
+      const asst = await createAssistant(model);
       const thread = await createThread();
       for (const message of messages) {
         await addToThread(thread.id, message.content);
       }
-      const run = await createRun(thread.id, asst.id);
+      const run = await createRun(thread.id, asst.id, context.data);
       await waitForRunCompletion(thread.id, run.id);
 
       return await retrieveResponse(thread.id);