@aj-archipelago/cortex 1.3.36 → 1.3.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "1.3.36",
+  "version": "1.3.37",
   "description": "Cortex is a GraphQL API for AI. It provides a simple, extensible interface for using AI services from OpenAI, Azure and others.",
   "private": false,
   "repository": {

package/pathways/system/entity/sys_entity_agent.js

@@ -36,6 +36,10 @@ export default {
     timeout: 600,
 
     toolCallback: async (args, message, resolver) => {
+        if (!args || !message || !resolver) {
+            return;
+        }
+
         const { tool_calls } = message;
         const pathwayResolver = resolver;
         const { entityTools, entityToolsOpenAiFormat } = args;
@@ -170,11 +174,10 @@ export default {
 
             args.chatHistory = finalMessages;
 
-            await pathwayResolver.promptAndParse({
+            return await pathwayResolver.promptAndParse({
                 ...args,
                 tools: entityToolsOpenAiFormat,
                 tool_choice: "auto",
-                stream: true
             });
         }
     },
@@ -183,7 +186,7 @@ export default {
         let pathwayResolver = resolver;
 
         // Load input parameters and information into args
-        const { entityId, voiceResponse, aiMemorySelfModify } = { ...pathwayResolver.pathway.inputParameters, ...args };
+        const { entityId, voiceResponse, aiMemorySelfModify, stream } = { ...pathwayResolver.pathway.inputParameters, ...args };
         
         const entityConfig = loadEntityConfig(entityId);
         const { entityTools, entityToolsOpenAiFormat } = getToolsForEntity(entityConfig);
@@ -267,14 +270,17 @@ export default {
             let currentMessages = JSON.parse(JSON.stringify(args.chatHistory));
 
             // Run the initial prompt with streaming
-            const response = await runAllPrompts({
+            let response = await runAllPrompts({
                 ...args,
                 chatHistory: currentMessages,
                 tools: entityToolsOpenAiFormat,
-                tool_choice: "auto",
-                stream: true
+                tool_choice: "auto"
             });
 
+            let toolCallback = pathwayResolver.pathway.toolCallback;
+            while (response?.tool_calls) {
+                response = await toolCallback(args, response, resolver);
+            }
 
             // Return the final response
             return response;

package/server/plugins/openAiVisionPlugin.js

@@ -266,7 +266,7 @@ class OpenAIVisionPlugin extends OpenAIChatPlugin {
                 switch (finishReason.toLowerCase()) {
                     case 'tool_calls':
                         // Process complete tool calls when we get the finish reason
-                        if (this.pathwayToolCallback && this.toolCallsBuffer.length > 0) {
+                        if (this.pathwayToolCallback && this.toolCallsBuffer.length > 0 && pathwayResolver) {
                             const toolMessage = {
                                 role: 'assistant',
                                 content: delta?.content || '',