json-object-editor 0.10.625 → 0.10.633

package/server/plugins/chatgpt-assistants.js

@@ -205,18 +205,13 @@ function ChatGPTAssistants() {
         resave = true;
       }
 
+      // Ensure we have a thread_id; create one if missing
       if (!convo.thread_id) {
         const thread = await openai.beta.threads.create();
         convo.thread_id = thread.id;
         resave = true;
-        // await new Promise((resolve, reject) => {
-        //   JOE.Storage.save(convo, 'ai_conversation', function(err, saved) {
-        //     if (err) return reject(err);
-        //     resolve(saved);
-        //   });
-        // });
       }
-  
+
       if(resave){
         await new Promise((resolve, reject) => {
           JOE.Storage.save(convo, 'ai_conversation', function(err, saved) {
@@ -224,49 +219,89 @@ function ChatGPTAssistants() {
             resolve(saved);
           });
         });
+      }
 
+      /**
+       * Helper to start a run on the current thread for the correct assistant.
+       */
+      async function startRunForConversation(convo, data){
+        let runObj = null;
+        // Prefer assistants array if present
+        if (convo.assistants && convo.assistants.length > 0) {
+          const assistant_id = data.assistant_id || convo.assistants?.[0]?.openai_id || convo.assistants?.[0];
+          const assistant = JOE.Data.ai_assistant.find(a => a._id === assistant_id) || $J.get(assistant_id);
+          if (assistant && assistant.assistant_id) {
+            runObj = await openai.beta.threads.runs.create(convo.thread_id, {
+              assistant_id: assistant.assistant_id
+            });
+            coloredLog(`Assistant run started: ${runObj.id}`);
+          }
+        } else if (convo.assistant) {
+          const assistant = $J.get(convo.assistant);
+          if (assistant && assistant.assistant_id) {
+            runObj = await openai.beta.threads.runs.create(convo.thread_id, {
+              assistant_id: assistant.assistant_id
+            });
+            coloredLog(`Assistant run started: ${runObj.id}`);
+          }
+        }
+        return runObj;
       }
 
-      await openai.beta.threads.messages.create(convo.thread_id, {
-        role: "user",
-        content: content
-      });
-      var runObj = null;
-      // NOW ➔ trigger assistant reply if assistant is selected
-      if (convo.assistants && convo.assistants.length > 0) {
-        // const assistant_id = convo.assistants[0]; // Assuming you store OpenAI assistant ID here
-        //get assistant object by id
-        const assistant_id = data.assistant_id || convo.assistants?.[0]?.openai_id;
-        const assistant = JOE.Data.ai_assistant.find(a => a._id === assistant_id);
-        if (assistant.assistant_id) {
-          runObj = await openai.beta.threads.runs.create(convo.thread_id, {
-            assistant_id: assistant.assistant_id
+      let runObj = null;
+      try {
+        // Normal path: append user message to existing thread
+        await openai.beta.threads.messages.create(convo.thread_id, {
+          role: "user",
+          content: content
+        });
+        runObj = await startRunForConversation(convo, data);
+      } catch (err) {
+        // If a previous run is still active on this thread, OpenAI returns 400:
+        // "Can't add messages to <thread> while a run <run_x> is active."
+        const msg = err && err.message ? String(err.message) : '';
+        if (err && err.status === 400 && msg.indexOf("Can't add messages to") !== -1 && msg.indexOf("while a run") !== -1) {
+          coloredLog("⚠️ Active run detected for conversation " + convo._id + " on thread " + convo.thread_id);
+          return({
+            error: "active_run",
+            message: "This conversation has an active assistant run on its thread. Please wait for it to complete or start a new conversation.",
+            thread_id: convo.thread_id
           });
-  
-          console.log(`Assistant run started: ${runObj.id}`);
-          // You could optionally poll for completion here
         }
-      }else if(convo.assistant){
-        const assistant = $J.get(convo.assistant);
-        runObj = await openai.beta.threads.runs.create(convo.thread_id, {
-          assistant_id: assistant.assistant_id // Assuming you store OpenAI assistant ID here
-        });
-
-        coloredLog(`Assistant run started: ${runObj.id}`);
+        // Unknown error – rethrow to outer catch
+        throw err;
       }
-      return({ success: true,runObj });
+
+      return({
+        success: true,
+        runObj,
+        run_id: runObj && runObj.id,
+        thread_id: convo.thread_id
+      });
     } catch (err) {
       console.error('❌ addMessage error:', err);
-      return({ error: "Failed to send message.", message: err.message });
+      const msg = err && err.message ? String(err.message) : 'Unknown error';
+      return({ error: "Failed to send message.", message: msg });
     }
   };
   this.getRunStatus = async function(data, req, res) {
     try {
+      // Debug: log raw data coming into getRunStatus to diagnose bad IDs
+      try {
+        coloredLog("🔍 getRunStatus called with data:", JSON.stringify(data));
+      } catch(_e) {
+        console.log("[chatgpt-assistants] getRunStatus data (fallback log):", data);
+      }
+
       const run_id = data.run_id;
       const thread_id = data.thread_id;
       var errors = [];
-      if (!run_id) errors.push("Missing run ID.");
-      if(!thread_id) errors.push("Missing thread ID.");
+      if (!run_id || run_id === 'undefined' || run_id === 'null') {
+        errors.push("Missing run ID.");
+      }
+      if (!thread_id || thread_id === 'undefined' || thread_id === 'null') {
+        errors.push("Missing thread ID.");
+      }
 
       if (errors.length) {
         return { error: errors.join(" ") };