@peopl-health/nexus 2.2.0 → 2.2.1

package/lib/assistants/BaseAssistant.js

@@ -1,6 +1,7 @@
 const llmConfig = require('../config/llmConfig');
 const { Thread } = require('../models/threadModel');
-const { getLastNMessages } = require('../helpers/assistantHelper');
+const { Message } = require('../models/messageModel');
+const { formatMessage } = require('../helpers/assistantHelper');
 const { createProvider } = require('../providers/createProvider');
 
 const DEFAULT_MAX_HISTORICAL_MESSAGES = parseInt(process.env.MAX_HISTORICAL_MESSAGES || '50', 10);
@@ -165,11 +166,6 @@ class BaseAssistant {
     this._ensureClient();
     this.status = 'active';
 
-    const whatsappId = context?.whatsapp_id || code;
-    if (whatsappId) {
-      this.lastMessages = await getLastNMessages(whatsappId, DEFAULT_MAX_HISTORICAL_MESSAGES);
-    }
-
     const provider = createProvider({ variant: process.env.VARIANT || 'assistants' });
     if (!provider || typeof provider.createConversation !== 'function') {
       throw new Error('Provider not configured. Cannot create conversation.');
@@ -189,12 +185,39 @@ class BaseAssistant {
     return this.thread;
   }
 
-  async buildInitialMessages({ code }) {
-    if (!this.lastMessages) return [];
-    return [{
-      role: 'assistant',
-      content: `Últimos mensajes para ${code}: \n${this.lastMessages}`
-    }];
+  async buildInitialMessages({ code, context = {} }) {
+    const whatsappId = context?.whatsapp_id || code;
+    if (!whatsappId) {
+      return [];
+    }
+
+    try {
+      const lastMessages = await Message.find({ numero: whatsappId })
+        .sort({ createdAt: -1 })
+        .limit(DEFAULT_MAX_HISTORICAL_MESSAGES);
+
+      if (!lastMessages || lastMessages.length === 0) {
+        return [];
+      }
+
+      const messagesInOrder = lastMessages.reverse();
+
+      // Messages with from_me: true are assistant messages, from_me: false are user messages
+      const formattedMessages = messagesInOrder
+        .filter(message => message && message.timestamp && message.body && message.body.trim() !== '')
+        .map(message => {
+          const formattedText = formatMessage(message);
+          return formattedText ? { role: message.from_me ? 'assistant' : 'user', content: formattedText } : null;
+        })
+        .filter(message => message !== null); // Remove any null entries
+
+      console.log(`[buildInitialMessages] Built ${formattedMessages.length} initial messages for ${code}`);
+      
+      return formattedMessages;
+    } catch (error) {
+      console.error('[buildInitialMessages] Error fetching messages:', error);
+      return [];
+    }
   }
 
   async close() {

package/lib/controllers/bugReportController.js

@@ -6,7 +6,7 @@ async function logBugReportToAirtable(reporter, whatsapp_id, description, severi
   try {
     let conversation = null;
     if (messageIds && messageIds.length > 0) {
-      const messageObjects = await Message.find({ _id: { $in: messageIds } }).sort({ timestamp: 1 });
+      const messageObjects = await Message.find({ _id: { $in: messageIds } }).sort({ createdAt: 1 });
       conversation = messageObjects.map(msg => {
         const timestamp = new Date(msg.timestamp).toISOString().slice(0, 16).replace('T', ' ');
         const role = msg.from_me ? 'Assistant' : 'Patient';

package/lib/controllers/conversationController.js

@@ -409,14 +409,14 @@ const getConversationsByNameController = async (req, res) => {
   try {
     const conversations = await Message.aggregate([
       { $match: { from_me: false, is_group: false } },
-      { $sort: { timestamp: -1 } },
+      { $sort: { createdAt: -1 } },
       { $group: {
         _id: '$numero',
         name: { $first: '$nombre_whatsapp' },
         latestMessage: { $first: '$$ROOT' },
         messageCount: { $sum: 1 }
       }},
-      { $sort: { 'latestMessage.timestamp': -1 } }
+      { $sort: { 'latestMessage.createdAt': -1 } }
     ]);
         
     res.status(200).json({

package/lib/helpers/assistantHelper.js

@@ -48,7 +48,7 @@ async function getLastMessages(code) {
       query.is_group = false;
     }
 
-    const lastMessages = await Message.find(query).sort({ timestamp: -1 });
+    const lastMessages = await Message.find(query).sort({ createdAt: -1 });
     console.log('[getLastMessages] lastMessages', lastMessages.map(msg => msg.body).join('\n\n'));
 
     if (lastMessages.length === 0) return [];
@@ -73,7 +73,7 @@ async function getLastMessages(code) {
 async function getLastNMessages(code, n) {
   try {
     const lastMessages = await Message.find({ numero: code })
-      .sort({ timestamp: -1 })
+      .sort({ createdAt: -1 })
       .limit(n);
 
     // Format each message and concatenate them with skip lines

package/lib/helpers/baileysHelper.js

@@ -110,15 +110,15 @@ async function isRecentMessage(chatId) {
 
   const recentMessage = await Message.find({
     $or: [{ group_id: chatId }, { numero: chatId }],
-    timestamp: { $gte: fiveMinutesAgo.toISOString() }
-  }).sort({ timestamp: -1 }).limit(1);
+    createdAt: { $gte: fiveMinutesAgo }
+  }).sort({ createdAt: -1 }).limit(1);
 
   return !!recentMessage;
 }
 
 async function getLastMessages(chatId, n) {
   const messages = await Message.find({ group_id: chatId })
-    .sort({ timestamp: -1 })
+    .sort({ createdAt: -1 })
     .limit(n)
     .select('timestamp numero nombre_whatsapp body');
 

package/lib/helpers/twilioHelper.js

@@ -70,8 +70,8 @@ async function isRecentMessage(chatId) {
 
   const recentMessage = await Message.find({
     $or: [{ group_id: chatId }, { numero: chatId }],
-    timestamp: { $gte: fiveMinutesAgo.toISOString() }
-  }).sort({ timestamp: -1 }).limit(1);
+    createdAt: { $gte: fiveMinutesAgo }
+  }).sort({ createdAt: -1 }).limit(1);
 
   return !!recentMessage;
 }
@@ -79,7 +79,7 @@ async function isRecentMessage(chatId) {
 
 async function getLastMessages(chatId, n) {
   const messages = await Message.find({ numero: chatId })
-    .sort({ timestamp: -1 })
+    .sort({ createdAt: -1 })
     .limit(n)
     .select('timestamp numero nombre_whatsapp body');
 

package/lib/models/messageModel.js

@@ -57,6 +57,7 @@ const messageSchema = new mongoose.Schema({
 }, { timestamps: true });
 
 messageSchema.index({ message_id: 1, timestamp: 1 }, { unique: true });
+messageSchema.index({ numero: 1, createdAt: -1 });
 
 messageSchema.pre('save', function (next) {
   if (this.timestamp) {
@@ -157,7 +158,10 @@ function getMessageValues(message, content, reply, is_media) {
 
 async function getContactDisplayName(contactNumber) {
   try {
-    const latestMessage = await Message.findOne({ numero: contactNumber })
+    const latestMessage = await Message.findOne({ 
+      numero: contactNumber,
+      from_me: false
+    })
       .sort({ createdAt: -1 })
       .select('nombre_whatsapp');
 

package/package.json

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