@aj-archipelago/cortex 1.3.36 → 1.3.38

package/lib/pathwayTools.js

@@ -97,11 +97,23 @@ const callTool = async (toolName, args, toolDefinitions, pathwayResolver) => {
                 // Extract and add each search result
                 parsedResult.value.forEach(result => {
                     if (result.searchResultId) {
+                        // Build content by concatenating headers and chunk if available
+                        let content = '';
+                        if (result.header_1) content += result.header_1 + '\n\n';
+                        if (result.header_2) content += result.header_2 + '\n\n';
+                        if (result.header_3) content += result.header_3 + '\n\n';
+                        if (result.chunk) content += result.chunk;
+                        
+                        // If no headers/chunk were found, fall back to existing content fields
+                        if (!content) {
+                            content = result.content || result.text || result.chunk || '';
+                        }
+
                         pathwayResolver.searchResults.push({
                             searchResultId: result.searchResultId,
-                            title: result.title || '',
+                            title: result.title || result.key || '',
                             url: result.url || '',
-                            content: result.content || '',
+                            content: content,
                             path: result.path || '',
                             wireid: result.wireid || '',
                             source: result.source || '',
@@ -120,6 +132,30 @@ const callTool = async (toolName, args, toolDefinitions, pathwayResolver) => {
     }
 }
 
+const addCitationsToResolver = (pathwayResolver, contentBuffer) => {
+    const regex = /:cd_source\[(.*?)\]/g;
+    let match;
+    const foundIds = [];
+    while ((match = regex.exec(contentBuffer)) !== null) {
+        // Ensure the capture group exists and is not empty
+        if (match[1] && match[1].trim()) { 
+            foundIds.push(match[1].trim());
+        }
+    }
+
+    if (foundIds.length > 0) {
+        const {searchResults, tool} = pathwayResolver;
+        logger.info(`Found referenced searchResultIds: ${foundIds.join(', ')}`);
+
+        if (searchResults) {
+            const toolObj = typeof tool === 'string' ? JSON.parse(tool) : (tool || {});
+            toolObj.citations = searchResults
+                .filter(result => foundIds.includes(result.searchResultId));
+            pathwayResolver.tool = JSON.stringify(toolObj);
+        }
+    }
+}
+
 const gpt3Encode = (text) => {
     return encode(text);
 }
@@ -166,4 +202,4 @@ const say = async (requestId, message, maxMessageLength = Infinity, voiceRespons
     }
 };
 
-export { callPathway, gpt3Encode, gpt3Decode, say, callTool };
+export { callPathway, gpt3Encode, gpt3Decode, say, callTool, addCitationsToResolver };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "1.3.36",
+  "version": "1.3.38",
   "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/chat_title.js

@@ -19,7 +19,7 @@ export default {
         title: '',
         text: '',
     },
-    model: 'oai-gpt4o',
+    model: 'oai-gpt41-nano',
     useInputChunking: false,
     temperature: 0,
     enableDuplicateRequests: false

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);
@@ -249,6 +252,8 @@ export default {
         // truncate the chat history in case there is really long content
         const truncatedChatHistory = resolver.modelExecutor.plugin.truncateMessagesToTargetLength(args.chatHistory, null, 1000);
 
+        const fetchTitleResponsePromise = callPathway('chat_title', {...args, chatHistory: truncatedChatHistory, stream: false});
+
         // Add the memory context to the chat history if applicable
         if (truncatedChatHistory.length > 1 && entityUseMemory) {
             const memoryContext = await callPathway('sys_read_memory', { ...args, chatHistory: truncatedChatHistory, section: 'memoryContext', priority: 0, recentHours: 0, stream: false }, resolver);
@@ -266,23 +271,26 @@ export default {
         try {
             let currentMessages = JSON.parse(JSON.stringify(args.chatHistory));
 
-            // Run the initial prompt with streaming
-            const response = await runAllPrompts({
+            const title = await fetchTitleResponsePromise;
+            pathwayResolver.tool = JSON.stringify({ title });
+
+            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, pathwayResolver);
+            }
 
-            // Return the final response
             return response;
 
         } catch (e) {
-            resolver.logError(e);
-            const chatResponse = await callPathway('sys_generator_quick', {...args, model: styleModel, stream: false}, resolver);
-            resolver.tool = JSON.stringify({ search: false, title: args.title });
+            pathwayResolver.logError(e);
+            const chatResponse = await callPathway('sys_generator_quick', {...args, model: styleModel, stream: false}, pathwayResolver);
             return chatResponse;
         }
     }

package/pathways/system/entity/tools/sys_tool_cognitive_search.js

@@ -199,6 +199,24 @@ export default {
 
             const combinedResults = [];
 
+            // Add OData context and count information if present
+            if (parsedResponse["@odata.context"]) {
+                combinedResults.push({
+                    searchResultId: getSearchResultId(),
+                    key: "@odata.context",
+                    content: parsedResponse["@odata.context"],
+                    source_type: 'metadata'
+                });
+            }
+            if (parsedResponse["@odata.count"]) {
+                combinedResults.push({
+                    searchResultId: getSearchResultId(),
+                    key: "@odata.count",
+                    content: parsedResponse["@odata.count"].toString(),
+                    source_type: 'metadata'
+                });
+            }
+
             if (parsedResponse.value && Array.isArray(parsedResponse.value)) {
                 // Filter out vector fields from each result before adding to combinedResults
                 combinedResults.push(...parsedResponse.value.map(result => ({

package/server/pathwayResolver.js

@@ -7,7 +7,7 @@ import { PathwayResponseParser } from './pathwayResponseParser.js';
 import { Prompt } from './prompt.js';
 import { getv, setv } from '../lib/keyValueStorageClient.js';
 import { requestState } from './requestState.js';
-import { callPathway } from '../lib/pathwayTools.js';
+import { callPathway, addCitationsToResolver } from '../lib/pathwayTools.js';
 import { publishRequestProgress } from '../lib/redisSubscription.js';
 import logger from '../lib/logger.js';
 // eslint-disable-next-line import/no-extraneous-dependencies
@@ -322,6 +322,8 @@ class PathwayResolver {
             await saveChangedMemory();
         }
 
+        addCitationsToResolver(this, data);
+
         return data;
     }
 

package/server/plugins/openAiVisionPlugin.js

@@ -1,7 +1,7 @@
 import OpenAIChatPlugin from './openAiChatPlugin.js';
 import logger from '../../lib/logger.js';
 import { requestState } from '../requestState.js';
-
+import { addCitationsToResolver } from '../../lib/pathwayTools.js';
 function safeJsonParse(content) {
     try {
         const parsedContent = JSON.parse(content);
@@ -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 || '', 
@@ -289,29 +289,7 @@ class OpenAIVisionPlugin extends OpenAIChatPlugin {
                         break;
                     default: // Includes 'stop' and other normal finish reasons
                         // Look to see if we need to add citations to the response
-                        if (pathwayResolver && this.contentBuffer) {
-                            const regex = /:cd_source\[(.*?)\]/g;
-                            let match;
-                            const foundIds = [];
-                            while ((match = regex.exec(this.contentBuffer)) !== null) {
-                                // Ensure the capture group exists and is not empty
-                                if (match[1] && match[1].trim()) { 
-                                    foundIds.push(match[1].trim());
-                                }
-                            }
-
-                            if (foundIds.length > 0) {
-                                const {searchResults, tool} = pathwayResolver;
-                                logger.info(`Found referenced searchResultIds: ${foundIds.join(', ')}`);
-
-                                if (searchResults) {
-                                    const toolObj = typeof tool === 'string' ? JSON.parse(tool) : (tool || {});
-                                    toolObj.citations = searchResults
-                                        .filter(result => foundIds.includes(result.searchResultId));
-                                    pathwayResolver.tool = JSON.stringify(toolObj);
-                                }
-                            }
-                        }
+                        addCitationsToResolver(pathwayResolver, this.contentBuffer);
                         requestProgress.progress = 1;
                         // Clear buffers on finish
                         this.toolCallsBuffer = [];