@peopl-health/nexus 2.0.13 → 2.0.15

package/lib/adapters/TwilioProvider.js

@@ -61,10 +61,9 @@ class TwilioProvider extends MessageProvider {
 
     // Handle template messages
     if (contentSid) {
-      // Render template and add to messageData for storage
       const renderedMessage = await this.renderTemplate(contentSid, variables);
       if (renderedMessage) {
-        messageData.body = renderedMessage; // Add rendered content for storage
+        messageData.body = renderedMessage;
       }
       
       messageParams.contentSid = contentSid;

package/lib/core/NexusMessaging.js

@@ -320,7 +320,8 @@ class NexusMessaging {
       await this.messageStorage.saveMessage({
         ...messageData,
         timestamp: new Date(),
-        fromMe: false
+        fromMe: false,
+        origin: 'patient'
       });
     }
 

package/lib/helpers/assistantHelper.js

@@ -16,7 +16,7 @@ const moment = require('moment-timezone');
 const mode = process.env.NODE_ENV || 'dev';
 
 
-async function checkRunStatus(assistant, thread_id, run_id, retryCount = 0, maxRetries = 100, actionHandled = false) {
+async function checkRunStatus(assistant, thread_id, run_id, retryCount = 0, maxRetries = 10, actionHandled = false) {
   try {
     const provider = createProvider({ variant: process.env.VARIANT || 'assistants' });
     const run = await provider.getRun({ threadId: thread_id, runId: run_id });
@@ -295,13 +295,12 @@ async function processIndividualMessage(code, reply, provider, thread) {
     // ONLY add user messages to the thread
     const threadId = process.env.VARIANT === 'responses' ? thread?.conversation_id : thread?.thread_id;
     if (isNotAssistant) {
-      console.log('Adding user message to thread', thread);
       await provider.addMessage({
         threadId,
         role: 'user',
         content: messagesChat
       });
-      console.log('[processIndividualMessage] User message added to thread');
+      console.log(`[processIndividualMessage] User message added to thread ${threadId}`);
     }
 
     await Message.updateOne(

package/lib/helpers/llmsHelper.js

@@ -45,7 +45,7 @@ async function analyzeImage(imagePath) {
     // Descrciption of the image
     const imageDescription = 'Describe the image in detail.';
     const messageDescription = await anthropicClient.messages.create({
-      model: 'claude-3-7-sonnet-20250219',
+      model: 'claude-sonnet-4-5',
       max_tokens: 1024,
       messages: [
         {

package/lib/models/messageModel.js

@@ -29,8 +29,8 @@ const messageSchema = new mongoose.Schema({
   from_me: { type: Boolean, default: false },
   origin: { 
     type: String, 
-    enum: ['whatsapp', 'assistant', 'patient'], 
-    default: 'whatsapp' },
+    enum: ['whatsapp_platform', 'assistant', 'patient'], 
+    default: 'whatsapp_platform' },
   media: {
     contentType: { type: String, default: null },
     bucketName: { type: String, default: null },
@@ -102,9 +102,10 @@ async function insertMessage(values) {
       media: values.media ? values.media : null,
       content_sid: values.content_sid || null,
       clinical_context: clinical_context,
+      origin: values.origin,
       raw: values.raw || null
     };
-    console.log('Inserting message', messageData);
+    console.log('[MongoStorage] Inserting message', messageData);
 
     await Message.findOneAndUpdate(
       { message_id: values.message_id, body: values.body },
@@ -112,9 +113,9 @@ async function insertMessage(values) {
       { upsert: true, new: true }
     );
 
-    console.log('Message inserted or updated successfully');
+    console.log('[MongoStorage] Message inserted or updated successfully');
   } catch (err) {
-    console.error('Error inserting message:', err);
+    console.error('[MongoStorage] Error inserting message:', err);
     throw err;
   }
 }
@@ -166,7 +167,7 @@ async function getContactDisplayName(contactNumber) {
       return contactNumber;
     }
   } catch (error) {
-    console.error(`Error fetching display name for ${contactNumber}:`, error);
+    console.error('[MongoStorage] Error fetching display name for ${contactNumber}:', error);
     return contactNumber;
   }
 }

package/lib/services/assistantService.js

@@ -265,10 +265,20 @@ const addMsgAssistant = async (code, inMessages, reply = false) => {
 
     if (!reply) return null;
 
+    let output, completed;
+    let retries = 0;
+    const maxRetries = 10;
     const assistant = getAssistantById(thread?.prompt_id || thread?.assistant_id, thread);
-    const { output } = await runAssistantAndWait({ thread, assistant });
-    console.log('THE ANS IS', output);
+    do {
+      ({ output, completed } = await runAssistantAndWait({ thread, assistant }));
+      console.log(`Attempt ${retries + 1}: completed=${completed}, output=${output || '(empty)'}`);
+      
+      if (completed && output) break;
+      if (retries < maxRetries) await new Promise(resolve => setTimeout(resolve, 2000));
+      retries++;
+    } while (retries <= maxRetries && (!completed || !output));
 
+    console.log('THE ANS IS', output);
     return output;
   } catch (error) {
     console.log(error);
@@ -282,17 +292,27 @@ const addInsAssistant = async (code, instruction) => {
     console.log(thread);
     if (thread === null) return null;
 
+    let output, completed;
+    let retries = 0;
+    const maxRetries = 10;
     const assistant = getAssistantById(thread?.prompt_id || thread?.assistant_id, thread);
-    const { output } = await runAssistantAndWait({
-      thread,
-      assistant,
-      runConfig: {
-        additionalInstructions: instruction,
-        additionalMessages: [
-          { role: 'user', content: instruction }
-        ]
-      }
-    });
+    do {
+      ({ output, completed } = await runAssistantAndWait({
+        thread,
+        assistant,
+        runConfig: {
+          additionalInstructions: instruction,
+          additionalMessages: [
+            { role: 'user', content: instruction }
+          ]
+        }
+      }));
+      console.log(`Attempt ${retries + 1}: completed=${completed}, output=${output || '(empty)'}`);
+      
+      if (completed && output) break;
+      if (retries < maxRetries) await new Promise(resolve => setTimeout(resolve, 2000));
+      retries++;
+    } while (retries <= maxRetries && (!completed || !output));
     console.log('RUN RESPONSE', output);
 
     return output;
@@ -399,11 +419,22 @@ const replyAssistant = async function (code, message_ = null, thread_ = null, ru
     const assistant = getAssistantById(process.env.VARIANT === 'responses' ? thread?.prompt_id : thread?.assistant_id, thread);
     assistant.setReplies(patientReply);
 
-    const { run, output, completed } = await runAssistantAndWait({
-      thread,
-      assistant,
-      runConfig: runOptions
-    });
+    let run, output, completed;
+    let retries = 0;
+    const maxRetries = 10;
+    do {
+      ({ run, output, completed } = await runAssistantAndWait({
+        thread,
+        assistant,
+        runConfig: runOptions
+      }));
+      console.log(`Attempt ${retries + 1}: completed=${completed}, output=${output || '(empty)'}`);
+      
+      if (completed && output) break;
+      if (retries < maxRetries) await new Promise(resolve => setTimeout(resolve, 2000));
+      retries++;
+    } while (retries <= maxRetries && (!completed || !output));
+
     console.log('RUN LAST ERROR:', run?.last_error);
     console.log('RUN STATUS', completed);
     console.log(output);

package/lib/storage/MongoStorage.js

@@ -18,32 +18,13 @@ class MongoStorage {
 
   createSchemas() {
     const { Message } = require('../models/messageModel');
-    const interactionSchema = new mongoose.Schema({
-      messageId: String,
-      numero: String,
-      interactive_type: String, // 'button', 'list', 'flow'
-      payload: mongoose.Schema.Types.Mixed,
-      timestamp: String,
-      createdAt: { type: Date, default: Date.now }
-    });
-
-    const threadSchema = new mongoose.Schema({
-      code: String,
-      assistantId: String,
-      threadId: String,
-      patientId: String,
-      runId: String,
-      nombre: String,
-      active: { type: Boolean, default: true },
-      stopped: { type: Boolean, default: false },
-      nextSid: [String],
-      createdAt: { type: Date, default: Date.now }
-    });
+    const { Interaction } = require('../models/interactionModel');
+    const { Thread } = require('../models/threadModel');
 
     return {
       Message,
-      Interaction: mongoose.models.Interaction || mongoose.model('Interaction', interactionSchema),
-      Thread: mongoose.models.Thread || mongoose.model('Thread', threadSchema)
+      Interaction,
+      Thread
     };
   }
 
@@ -61,18 +42,12 @@ class MongoStorage {
 
   async saveMessage(messageData) {
     try {
-      console.log('[MongoStorage] Saving message', messageData);
       const enrichedMessage = await this._enrichTwilioMedia(messageData);
       console.log('[MongoStorage] Enriched message', enrichedMessage);
       const values = this.buildMessageValues(enrichedMessage);
       const { insertMessage } = require('../models/messageModel');
       await insertMessage(values);
-      console.log('[MongoStorage] Message stored', {
-        messageId: values.message_id,
-        numero: values.numero,
-        isMedia: values.is_media,
-        hasMediaPayload: Boolean(values.media)
-      });
+      console.log('[MongoStorage] Message stored');
       return values;
     } catch (error) {
       console.error('Error saving message:', error);
@@ -172,6 +147,7 @@ class MongoStorage {
     const timestamp = now.toISOString();
     const nombre = messageData.nombre_whatsapp || messageData.author || messageData.fromName || runtimeConfig.get('USER_DB_MONGO') || process.env.USER_DB_MONGO || 'Nexus';
     const processed = messageData.processed || false;
+    const origin = messageData.origin || 'whatsapp_platform';
     
     // Use message body directly (template rendering is now handled by the provider)
     let textBody = messageData.body;
@@ -210,7 +186,8 @@ class MongoStorage {
       media,
       content_sid: messageData.contentSid || null,
       template_variables: messageData.variables ? JSON.stringify(messageData.variables) : null,
-      raw: messageData.raw || null
+      raw: messageData.raw || null,
+      origin
     };
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "keywords": [
     "whatsapp",