@peopl-health/nexus 3.3.18-fix-model → 3.3.19

package/lib/helpers/assistantHelper.js

@@ -23,9 +23,10 @@ const runAssistantAndWait = async ({ thread, assistant, message = null, runConfi
   const provider = createLLMProvider({ variant: process.env.VARIANT || 'assistants' });
   const { polling, tools: configTools, ...config } = runConfig;
   const tools = assistant.getToolSchemas?.() || configTools || [];
+  const messageForRun = Array.isArray(message) && message.length > 0 ? message[0] : message;
 
   return withThreadRecovery(
-    (currentThread = thread) => provider.executeRun({ thread: currentThread, message, assistant, tools, config, polling }),
+    (currentThread = thread) => provider.executeRun({ thread: currentThread, message: messageForRun, assistant, tools, config, polling }),
     thread
   );
 };

package/lib/helpers/messageHelper.js

@@ -99,6 +99,49 @@ function formatMessage(reply) {
   }
 }
 
+function getMessageTools(reply) {
+  const tools = reply?.tools_executed;
+  if (!tools?.length) return [];
+
+  const msgId = reply?.message_id ?? `msg_${Date.now()}`;
+  const items = [];
+
+  try {
+    // API requires function_call id to start with "fc" and function_call_output to reference it via call_id.
+    tools.forEach((t, i) => {
+      const safeId = `${msgId}_${i}`.replace(/[^a-zA-Z0-9_-]/g, '_').slice(0, 80);
+      const functionCallId = `fc_${safeId}`;
+      const argsStr = JSON.stringify(t.tool_arguments ?? {});
+      let outputStr;
+      if (t.tool_output != null) {
+        outputStr = typeof t.tool_output === 'string'
+          ? t.tool_output
+          : JSON.stringify(t.tool_output);
+      } else {
+        outputStr = JSON.stringify({ success: t.success !== false });
+      }
+
+      items.push({
+        type: 'function_call',
+        id: functionCallId,
+        call_id: functionCallId,
+        name: t.tool_name,
+        arguments: argsStr
+      });
+      items.push({
+        type: 'function_call_output',
+        id: `fco_${safeId}`,
+        call_id: functionCallId,
+        output: outputStr
+      });
+    });
+    return items;
+  } catch (error) {
+    logger.error('[getMessageTools] Error', { messageId: reply?.message_id, error: error.message });
+    return [];
+  }
+}
+
 async function isRecentMessage(chatId) {
   const fiveMinutesAgo = new Date(Date.now() - 5 * 60 * 1000);
   const recent = await Message.findOne({
@@ -113,5 +156,6 @@ module.exports = {
   getLastMessages,
   getLastNMessages,
   formatMessage,
+  getMessageTools,
   isRecentMessage
 };

package/lib/memory/DefaultMemoryManager.js

@@ -4,7 +4,7 @@ const { logger } = require('../utils/logger');
 
 const { MemoryManager } = require('../memory/MemoryManager');
 
-const { getLastNMessages, formatMessage } = require('../helpers/messageHelper');
+const { getLastNMessages, getMessageTools, formatMessage } = require('../helpers/messageHelper');
 
 const { handlePendingFunctionCalls: handlePendingFunctionCallsUtil } = require('../providers/OpenAIResponsesProviderTools');
 
@@ -20,7 +20,7 @@ class DefaultMemoryManager extends MemoryManager {
     this._logActivity('Building context', { threadCode: thread.code });
 
     try {
-      const beforeCheckpoint = message ? message.createdAt : null;
+      const beforeCheckpoint = config.beforeCheckpoint ?? message?.createdAt ?? null;
       const allMessages = await getLastNMessages(thread.code, this.maxHistoricalMessages, beforeCheckpoint, {
         query: { origin: { $ne: 'instruction' } }
       });
@@ -32,12 +32,16 @@ class DefaultMemoryManager extends MemoryManager {
 
       const roleMap = { system: 'system', patient: 'user' };
       const context = allMessages.reverse().flatMap(msg => {
-        const formattedContents = formatMessage(msg);
-        return formattedContents.map(content => ({
-          role: roleMap[msg.origin] || 'assistant',
-          content: content || msg.body || msg.content || ''
-        }));
-      }).filter(msg => msg.content);
+        const toolItems = getMessageTools(msg);
+        const contentItems = formatMessage(msg)
+          .map(content => ({
+            role: roleMap[msg.origin] || 'assistant',
+            content: content,
+            type: 'message'
+          }))
+          .filter(item => item.content);
+        return [...toolItems, ...contentItems];
+      });
 
       return [...context, ...additional];
     } catch (error) {

package/lib/observability/index.js

@@ -1,6 +1,6 @@
 const { trace, metrics } = require('@opentelemetry/api');
 
-const { initTelemetry, shutdownTelemetry, getMetricsRequestHandler } = require('../observability/telemetry');
+const { initTelemetry, shutdownTelemetry } = require('../observability/telemetry');
 
 const tracer = trace.getTracer('nexus-assistant');
 const meter = metrics.getMeter('nexus-assistant');
@@ -149,7 +149,6 @@ function recordFileOperation(operationType, attributes = {}) {
 module.exports = {
   init,
   shutdown: shutdownTelemetry,
-  getMetricsRequestHandler,
   traceOperation,
   createSpan,
   tracer,

package/lib/observability/telemetry.js

@@ -1,6 +1,5 @@
 const { NodeSDK } = require('@opentelemetry/sdk-node');
 const { getNodeAutoInstrumentations } = require('@opentelemetry/auto-instrumentations-node');
-const { PrometheusExporter } = require('@opentelemetry/exporter-prometheus');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http');
 const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-node');
@@ -11,13 +10,12 @@ const runtimeConfig = require('../config/runtimeConfig');
 
 const nodeEnv = runtimeConfig.get('NODE_ENV') || '';
 const isProd = nodeEnv === 'production' || nodeEnv === 'prod';
-const IGNORED_PATHS = ['/health', '/metrics', '/'];
+const IGNORED_PATHS = ['/health', '/'];
 
 class TelemetryManager {
   constructor() {
     this.sdk = null;
     this.isInitialized = false;
-    this.prometheusExporter = null;
   }
 
   async init(config = {}) {
@@ -32,8 +30,6 @@ class TelemetryManager {
       jaegerEndpoint = 'http://localhost:14268/api/traces',
       otlpEndpoint = null,
       otlpHeaders = {},
-      prometheusEndpoint = '/metrics',
-      prometheusPort = 9090
     } = config;
 
     try {
@@ -75,18 +71,12 @@ class TelemetryManager {
           exportTimeoutMillis: isProd ? 5000 : 2000,
           scheduledDelayMillis: isProd ? 2000 : 500,
         }),
-        metricReader: this.prometheusExporter = new PrometheusExporter({
-          endpoint: prometheusEndpoint,
-          port: prometheusPort,
-          preventServerStart: true,
-        }),
       });
 
       await this.sdk.start();
       this.isInitialized = true;
 
       console.log(`🚀 OpenTelemetry initialized for "${serviceName}"`);
-      console.log(`📊 Metrics: available at ${prometheusEndpoint} (mounted on Express app)`);
       console.log(`🔍 Traces: ${otlpEndpoint || jaegerEndpoint}`);
     } catch (error) {
       console.error('❌ Failed to initialize OpenTelemetry:', error.message);
@@ -115,8 +105,4 @@ module.exports = {
   telemetryManager,
   initTelemetry: (config) => telemetryManager.init(config),
   shutdownTelemetry: () => telemetryManager.shutdown(),
-  getMetricsRequestHandler: () => {
-    if (!telemetryManager.prometheusExporter) return null;
-    return (req, res) => telemetryManager.prometheusExporter.getMetricsRequestHandler(req, res);
-  }
 };

package/lib/providers/OpenAIResponsesProvider.js

@@ -115,11 +115,17 @@ class OpenAIResponsesProvider {
   }
 
   _convertItemsToApiFormat(items) {
-    return items.map(item => ({
-      role: item.role || 'user',
-      content: this._normalizeContent(item.content),
-      type: item.type || 'message',
-    }));
+    return items.map(item => {
+      const type = item.type || 'message';
+      if (type === 'function_call' || type === 'function_call_output') {
+        return { ...item, type };
+      }
+      return {
+        role: item.role || 'user',
+        type,
+        content: this._normalizeContent(item.content)
+      };
+    });
   }
 
   _normalizeContent(content) {
@@ -322,8 +328,8 @@ class OpenAIResponsesProvider {
       devContent += `\n\nYou only have access to these tools: ${toolNames}. Do not call or reference any tools not listed here.`;
     }
 
-    const messages = (context || this._convertItemsToApiFormat(additionalMessages))
-      .filter(item => item.type !== 'function_call' && item.type !== 'function_call_output');
+    const rawMessages = context || additionalMessages;
+    const messages = this._convertItemsToApiFormat(rawMessages);
     const input = [{ role: 'developer', content: devContent }, ...messages];
 
     const promptConfig = { id: assistantId };

package/lib/routes/index.js

@@ -176,12 +176,6 @@ const builtInControllers = {
 };
 
 const setupDefaultRoutes = (app) => {
-  const { getMetricsRequestHandler } = require('../observability');
-  const metricsHandler = getMetricsRequestHandler();
-  if (metricsHandler) {
-    app.get('/metrics', metricsHandler);
-  }
-
   app.use('/api/assistant', createRouter(assistantRouteDefinitions, builtInControllers));
   app.use('/api/conversation', createRouter(conversationRouteDefinitions, builtInControllers));
   app.use('/api/interaction', createRouter(interactionRouteDefinitions, builtInControllers));

package/lib/services/assistantService.js

@@ -159,8 +159,7 @@ const replyAssistantCore = async (code, message_ = null, thread_ = null, runOpti
     if (!thread) return null;
 
     const messagesStart = Date.now();
-    const beforeCheckpoint = message_?.createdAt ? 
-      (message_.createdAt.$date ? new Date(message_.createdAt.$date) : message_.createdAt) : null;
+    const beforeCheckpoint = message_?.createdAt ?? null;
     const lastMessage = await getLastNMessages(code, 1, beforeCheckpoint, {
       query: { from_me: false }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "3.3.18-fix-model",
+  "version": "3.3.19",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "keywords": [
     "whatsapp",
@@ -58,19 +58,18 @@
     "postversion": "git push && git push --tags"
   },
   "dependencies": {
-    "body-parser": "^1.20.2",
     "@opentelemetry/api": "1.9.0",
     "@opentelemetry/auto-instrumentations-node": "0.67.0",
     "@opentelemetry/exporter-jaeger": "1.28.0",
-    "@opentelemetry/exporter-prometheus": "0.56.0",
     "@opentelemetry/exporter-trace-otlp-http": "0.56.0",
     "@opentelemetry/resources": "1.28.0",
     "@opentelemetry/sdk-node": "0.56.0",
     "@opentelemetry/sdk-trace-node": "1.28.0",
     "@opentelemetry/semantic-conventions": "1.28.0",
     "airtable": "^0.12.2",
-    "aws-sdk": "2.1693.0",
+    "aws-sdk": "^2.1693.0",
     "axios": "^1.5.0",
+    "body-parser": "^1.20.2",
     "dotenv": "^16.6.1",
     "moment-timezone": "^0.5.43",
     "mongoose": "^7.5.0",
@@ -108,6 +107,9 @@
   "engines": {
     "node": ">=20.0.0"
   },
+  "overrides": {
+    "p-limit": "2.3.0"
+  },
   "publishConfig": {
     "access": "public"
   }