@peopl-health/nexus 2.5.3 → 2.5.5

package/lib/controllers/assistantController.js

@@ -28,9 +28,9 @@ const addInsAssistantController = async (req, res) => {
     const variant = process.env.VARIANT || 'assistants';
     const role = variant === 'responses' ? 'developer' : 'user';
     
-    const ans = await addInsAssistant(code, instruction, role);
-    if (ans) await sendMessage({code, body: ans, fileType: 'text', origin: 'assistant'});
-    return res.status(200).send({ message: 'Add instruction to the assistant' });
+    const assistantReply = await addInsAssistant(code, instruction, role);
+    if (assistantReply) await sendMessage({code, body: assistantReply, fileType: 'text', origin: 'assistant'});
+    return res.status(200).send({ message: 'Instruction added to assistant', success: true });
   } catch (error) {
     logger.error('[addInsAssistantController] Error', { error: error.message, code });
     res.status(500).send({ message: 'Failed to add instruction to assistant', error });
@@ -41,9 +41,9 @@ const addMsgAssistantController = async (req, res) => {
   const { code, messages, role = 'user', reply = false } = req.body;
 
   try {
-    const ans = await addMsgAssistant(code, messages, role, reply);
-    if (ans) await sendMessage({code, body: ans, fileType: 'text', origin: 'assistant'});
-    return res.status(200).send({ message: 'Add message to the assistant' });
+    const assistantReply = await addMsgAssistant(code, messages, role, reply);
+    if (assistantReply) await sendMessage({code, body: assistantReply, fileType: 'text', origin: 'assistant'});
+    return res.status(200).send({ message: 'Message added to assistant', success: true });
   } catch (error) {
     logger.error('[addMsgAssistantController] Error', { error: error.message, code, role });
     res.status(500).send({ message: 'Failed to add message assistant', error });

package/lib/controllers/messageController.js

@@ -349,10 +349,42 @@ const getLastInteractionController = async (req, res) => {
   }
 };
 
+const checkScheduledMessageStatusController = async (req, res) => {
+  const { contentSid, code } = req.query;
+  if (!contentSid || !code) return res.status(400).send({ message: 'contentSid and code are required' });
+  if (!ensureDependency(res, dependencies.ScheduledMessage, 'ScheduledMessage model not configured.')) return;
+
+  try {
+    const msg = await dependencies.ScheduledMessage.findOne({ contentSid, code: normalizeCode(code) });
+    if (!msg) return res.status(404).send({ message: 'ScheduledMessage not found' });
+    return res.status(200).send({ message: 'ScheduledMessage status retrieved successfully.', sent: msg?.status === 'sent', status: msg?.status || null });
+  } catch (error) {
+    logger.error('Error checking scheduled message status:', error);
+    return res.status(500).send({ message: 'Failed to check scheduled message status', error });
+  }
+};
+
+const checkMessageStatusController = async (req, res) => {
+  const { contentSid, code } = req.query;
+  if (!contentSid || !code) return res.status(400).send({ message: 'contentSid and code are required' });
+
+  try {
+    const msg = await Message.findOne({ content_sid: contentSid, numero: normalizeCode(code) });
+    if (!msg) return res.status(404).send({ message: 'Message not found' });
+    const sent = msg?.statusInfo?.status === 'sent' || msg?.statusInfo?.status === 'delivered' || msg?.statusInfo?.status === 'read';
+    return res.status(200).send({ message: 'Message status retrieved successfully.', sent, status: msg?.statusInfo?.status || null });
+  } catch (error) {
+    logger.error('Error checking message status:', error);
+    return res.status(500).send({ message: 'Failed to check message status', error });
+  }
+};
+
 module.exports = {
   sendMessageController,
   sendBulkMessageController,
   sendBulkMessageAirtableController,
   getLastInteractionController,
+  checkScheduledMessageStatusController,
+  checkMessageStatusController,
   configureMessageController
 };

package/lib/index.js

@@ -14,7 +14,7 @@ const {
   registerAssistant,
   overrideGetAssistantById,
   configureAssistants: setAssistantsConfig
-} = require('./services/assistantService');
+} = require('./services/assistantResolver');
 const { TwilioProvider } = require('./adapters/TwilioProvider');
 const { BaileysProvider } = require('./adapters/BaileysProvider');
 const { BaseAssistant } = require('./assistants/BaseAssistant');

package/lib/routes/index.js

@@ -36,6 +36,8 @@ const messageRouteDefinitions = {
   'POST /send-bulk': 'sendBulkMessageController',
   'POST /send-bulk-airtable': 'sendBulkMessageAirtableController',
   'GET /last': 'getLastInteractionController',
+  'GET /scheduled-status': 'checkScheduledMessageStatusController',
+  'GET /status': 'checkMessageStatusController',
   'POST /quality': 'addQualityVoteController',
   'GET /quality/:message_id': 'getQualityVotesByMessageController',
   'GET /quality/:message_id/voter/:voter_username': 'getQualityVoteByMessageAndVoterController',
@@ -130,6 +132,8 @@ const builtInControllers = {
   sendBulkMessageController: messageController.sendBulkMessageController,
   sendBulkMessageAirtableController: messageController.sendBulkMessageAirtableController,
   getLastInteractionController: messageController.getLastInteractionController,
+  checkScheduledMessageStatusController: messageController.checkScheduledMessageStatusController,
+  checkMessageStatusController: messageController.checkMessageStatusController,
   addQualityVoteController: qualityMessageController.addQualityVoteController,
   getQualityVotesByMessageController: qualityMessageController.getQualityVotesByMessageController,
   getQualityVoteByMessageAndVoterController: qualityMessageController.getQualityVoteByMessageAndVoterController,

package/lib/services/assistantResolver.js

@@ -0,0 +1,105 @@
+const llmConfig = require('../config/llmConfig');
+const { BaseAssistant } = require('../assistants/BaseAssistant');
+
+let assistantConfig = null;
+let assistantRegistry = {};
+let customGetAssistantById = null;
+
+const configureAssistants = (config) => {
+  if (!config) {
+    throw new Error('Assistant configuration is required');
+  }
+  assistantConfig = config;
+};
+
+const registerAssistant = (assistantId, definition) => {
+  if (!assistantId || typeof assistantId !== 'string') {
+    throw new Error('registerAssistant requires a string assistantId');
+  }
+
+  if (typeof definition === 'function') {
+    assistantRegistry[assistantId] = definition;
+    return definition;
+  }
+
+  if (definition && typeof definition === 'object') {
+    const {
+      extends: ParentClass = BaseAssistant,
+      create,
+      tools = [],
+      setup
+    } = definition;
+
+    class ConfiguredAssistant extends ParentClass {
+      constructor(options = {}) {
+        const provider = options.provider || llmConfig.getOpenAIProvider({ instantiate: false });
+        const sharedClient = options.client
+          || provider?.getClient?.()
+          || llmConfig.openaiClient
+          || null;
+
+        super({
+          ...options,
+          assistantId,
+          client: sharedClient,
+          provider,
+          tools: [...tools, ...(options.tools || [])]
+        });
+
+        if (typeof setup === 'function') {
+          setup.call(this, {
+            assistantId,
+            thread: this.thread,
+            options
+          });
+        }
+      }
+    }
+
+    if (typeof create === 'function') {
+      ConfiguredAssistant.prototype.create = async function(code, context) {
+        return await create.call(this, code, context);
+      };
+    }
+
+    assistantRegistry[assistantId] = ConfiguredAssistant;
+    return ConfiguredAssistant;
+  }
+
+  throw new Error('registerAssistant expects a class/function or configuration object');
+};
+
+const overrideGetAssistantById = (resolverFn) => {
+  if (typeof resolverFn === 'function') {
+    customGetAssistantById = resolverFn;
+  }
+};
+
+const getAssistantById = (assistant_id, thread) => {
+  if (customGetAssistantById) {
+    return customGetAssistantById(assistant_id, thread);
+  }
+
+  if (assistantRegistry[assistant_id]) {
+    const AssistantClass = assistantRegistry[assistant_id];
+    return new AssistantClass({ thread });
+  }
+
+  if (assistantConfig && assistantConfig[assistant_id]) {
+    const config = assistantConfig[assistant_id];
+    return new BaseAssistant({
+      ...config,
+      assistantId: assistant_id,
+      thread
+    });
+  }
+
+  throw new Error(`Assistant with ID "${assistant_id}" not found`);
+};
+
+module.exports = {
+  getAssistantById,
+  configureAssistants,
+  registerAssistant,
+  overrideGetAssistantById
+};

package/lib/services/assistantService.js

@@ -1,6 +1,5 @@
 const { withTracing } = require('../utils/tracingDecorator.js');
-const llmConfig = require('../config/llmConfig');
-const { BaseAssistant } = require('../assistants/BaseAssistant');
+const { runAssistantAndWait } = require('../helpers/assistantHelper');
 const {
   createAssistantCore,
   addMsgAssistantCore,
@@ -8,105 +7,15 @@ const {
   replyAssistantCore,
   switchAssistantCore
 } = require('./assistantServiceCore');
-
-let assistantConfig = null;
-let assistantRegistry = {};
-let customGetAssistantById = null;
-
-const configureAssistants = (config) => {
-  if (!config) {
-    throw new Error('Assistant configuration is required');
-  }
-  assistantConfig = config;
-};
-
-const registerAssistant = (assistantId, definition) => {
-  if (!assistantId || typeof assistantId !== 'string') {
-    throw new Error('registerAssistant requires a string assistantId');
-  }
-
-  if (typeof definition === 'function') {
-    assistantRegistry[assistantId] = definition;
-    return definition;
-  }
-
-  if (definition && typeof definition === 'object') {
-    const {
-      extends: ParentClass = BaseAssistant,
-      create,
-      tools = [],
-      setup
-    } = definition;
-
-    class ConfiguredAssistant extends ParentClass {
-      constructor(options = {}) {
-        const provider = options.provider || llmConfig.getOpenAIProvider({ instantiate: false });
-        const sharedClient = options.client
-          || provider?.getClient?.()
-          || llmConfig.openaiClient
-          || null;
-
-        super({
-          ...options,
-          assistantId,
-          client: sharedClient,
-          provider,
-          tools: [...tools, ...(options.tools || [])]
-        });
-
-        if (typeof setup === 'function') {
-          setup.call(this, {
-            assistantId,
-            thread: this.thread,
-            options
-          });
-        }
-      }
-    }
-
-    if (typeof create === 'function') {
-      ConfiguredAssistant.prototype.create = async function(code, context) {
-        return await create.call(this, code, context);
-      };
-    }
-
-    assistantRegistry[assistantId] = ConfiguredAssistant;
-    return ConfiguredAssistant;
-  }
-
-  throw new Error('registerAssistant expects a class/function or configuration object');
-};
-
-const overrideGetAssistantById = (resolverFn) => {
-  if (typeof resolverFn === 'function') {
-    customGetAssistantById = resolverFn;
-  }
-};
-
-const getAssistantById = (assistant_id, thread) => {
-  if (customGetAssistantById) {
-    return customGetAssistantById(assistant_id, thread);
-  }
-
-  if (assistantRegistry[assistant_id]) {
-    const AssistantClass = assistantRegistry[assistant_id];
-    return new AssistantClass({ thread });
-  }
-
-  if (assistantConfig && assistantConfig[assistant_id]) {
-    const config = assistantConfig[assistant_id];
-    return new BaseAssistant({
-      ...config,
-      assistantId: assistant_id,
-      thread
-    });
-  }
-
-  throw new Error(`Assistant with ID "${assistant_id}" not found`);
-};
+const {
+  getAssistantById,
+  configureAssistants,
+  registerAssistant,
+  overrideGetAssistantById
+} = require('./assistantResolver');
 
 const createAssistant = withTracing(
-  (code, assistant_id) => createAssistantCore(code, assistant_id, getAssistantById),
+  createAssistantCore,
   'create_assistant',
   (code, assistant_id) => ({
     'assistant.thread_code': code,
@@ -138,7 +47,7 @@ const addInsAssistant = withTracing(
 );
 
 const replyAssistant = withTracing(
-  (code, message_, thread_, runOptions) => replyAssistantCore(code, message_, thread_, runOptions, getAssistantById),
+  replyAssistantCore,
   'assistant_reply',
   (code, message_, thread_, runOptions) => ({
     'assistant.thread_code': code,
@@ -159,13 +68,14 @@ const switchAssistant = withTracing(
 );
 
 module.exports = {
-  getAssistantById,
   createAssistant,
   replyAssistant,
   addMsgAssistant,
   addInsAssistant,
   switchAssistant,
+  getAssistantById,
   configureAssistants,
   registerAssistant,
-  overrideGetAssistantById
+  overrideGetAssistantById,
+  runAssistantAndWait
 };

package/lib/services/assistantServiceCore.js

@@ -13,9 +13,10 @@ const { processThreadMessage } = require('../helpers/processHelper.js');
 const { getLastMessages, updateMessageRecord } = require('../helpers/messageHelper.js');
 const { withThreadRecovery } = require('../helpers/threadRecoveryHelper.js');
 const { combineImagesToPDF, cleanupFiles } = require('../helpers/filesHelper.js');
+const { getAssistantById } = require('./assistantResolver');
 const { logger } = require('../utils/logger');
 
-const createAssistantCore = async (code, assistant_id, getAssistantById) => {
+const createAssistantCore = async (code, assistant_id) => {
   const thread = await getThread(code);
   if (!thread) return null;
 
@@ -32,7 +33,7 @@ const createAssistantCore = async (code, assistant_id, getAssistantById) => {
   }
 };
 
-const addMsgAssistantCore = async (code, message, role = 'user') => {
+const addMsgAssistantCore = async (code, message, role = 'user', reply = false) => {
   const thread = await getThread(code);
   if (!thread) return null;
 
@@ -42,10 +43,17 @@ const addMsgAssistantCore = async (code, message, role = 'user') => {
   try {
     await provider.addMessage({ threadId, messages: [{ role, content: message }] });
     await insertMessage({ code, message, role });
-    return { success: true };
+    
+    if (reply) {
+      const assistant = getAssistantById(thread.getAssistantId(), thread);
+      const runResult = await runAssistantWithRetries(thread, assistant, {});
+      return runResult?.output || null;
+    }
+    
+    return null;
   } catch (error) {
     logger.error('[addMsgAssistantCore] Error adding message', { error: error.message, code, role });
-    return { success: false, error: error.message };
+    return null;
   }
 };
 
@@ -58,14 +66,16 @@ const addInstructionCore = async (code, instruction, role = 'user') => {
 
   try {
     await provider.addMessage({ threadId, messages: [{ role, content: instruction }] });
-    return { success: true };
+    const assistant = getAssistantById(thread.getAssistantId(), thread);
+    const runResult = await runAssistantWithRetries(thread, assistant, {});
+    return runResult?.output || null;
   } catch (error) {
     logger.error('[addInstructionCore] Error adding instruction', { error: error.message, code, role });
-    return { success: false, error: error.message };
+    return null;
   }
 };
 
-const replyAssistantCore = async (code, message_ = null, thread_ = null, runOptions = {}, getAssistantById) => {
+const replyAssistantCore = async (code, message_ = null, thread_ = null, runOptions = {}) => {
   const timings = {};
   const startTotal = Date.now();
   

package/package.json

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