@aj-archipelago/cortex 1.3.21 → 1.3.23

package/pathways/system/entity/memory/sys_search_memory.js

@@ -53,7 +53,7 @@ export default {
             result = `${result}\n\nThe last time you spoke to the user was ${new Date().toISOString()}.`;
 
         } else {
-            sectionMemory = await callPathway("sys_read_memory", {contextId: args.contextId, section: args.section}); 
+            sectionMemory = await callPathway("sys_read_memory", {contextId: args.contextId, section: args.section, stripMetadata: (args.section !== 'memoryTopics')}); 
             result = await runAllPrompts({...args, sectionMemory});
         }
 

package/pathways/system/entity/sys_entity_start.js

@@ -5,6 +5,7 @@ import logger from  '../../../lib/logger.js';
 import { chatArgsHasImageUrl } from  '../../../lib/util.js';
 import { QueueServiceClient } from '@azure/storage-queue';
 import { config } from '../../../config.js';
+import { addToolCalls, addToolResults } from './memory/shared/sys_memory_helpers.js';
 
 const connectionString = process.env.AZURE_STORAGE_CONNECTION_STRING;
 let queueClient;
@@ -86,9 +87,13 @@ export default {
             args.model = pathwayResolver.modelName;
         }
 
+        // Stuff the memory context into the chat history
+        const chatHistoryBeforeMemory = [...args.chatHistory];
+
         const memoryContext = await callPathway('sys_read_memory', { ...args, section: 'memoryContext', priority: 0, recentHours: 0, stream: false }, pathwayResolver);
         if (memoryContext) {
-            args.chatHistory.splice(-1, 0, { role: 'assistant', content: memoryContext });
+            const { toolCallId } = addToolCalls(args.chatHistory, "search memory for relevant information", "memory_lookup");
+            addToolResults(args.chatHistory, memoryContext, toolCallId);
         }
         
         let ackResponse = null;
@@ -103,15 +108,13 @@ export default {
         const fetchChatResponse = async (args, pathwayResolver) => {
             const [chatResponse, chatTitleResponse] = await Promise.all([
                 callPathway('sys_generator_quick', {...args, model: styleModel}, pathwayResolver),
-                callPathway('chat_title', { ...args, stream: false}),
+                callPathway('chat_title', { ...args, chatHistory: chatHistoryBeforeMemory, stream: false}),
             ]);
 
             title = chatTitleResponse;
 
             return chatResponse;
         };
-            
-        const { chatHistory } = args;
 
         // start fetching the default response - we may need it later
         let fetchChatResponsePromise;
@@ -125,13 +128,13 @@ export default {
             // Get tool routing response
             const toolRequiredResponse = await callPathway('sys_router_tool', { 
                 ...args,
-                chatHistory: chatHistory.slice(-4),
+                chatHistory: chatHistoryBeforeMemory.slice(-4),
                 stream: false
             });
 
             // Asynchronously manage memory for this context
             if (args.aiMemorySelfModify) {
-                callPathway('sys_memory_manager', {  ...args, stream: false })    
+                callPathway('sys_memory_manager', {  ...args, chatHistory: chatHistoryBeforeMemory, stream: false })    
                 .catch(error => logger.error(error?.message || "Error in sys_memory_manager pathway"));
             }
 

package/pathways/system/entity/sys_generator_image.js

@@ -3,7 +3,7 @@
 import { callPathway } from '../../../lib/pathwayTools.js';
 import { Prompt } from '../../../server/prompt.js';
 import logger from '../../../lib/logger.js';
-import { getUniqueId } from '../../../lib/util.js';
+import { addToolCalls, addToolResults } from './memory/shared/sys_memory_helpers.js';
 
 export default {
     prompt: [],
@@ -26,15 +26,11 @@ export default {
     timeout: 300,
 
     executePathway: async ({args, runAllPrompts, resolver}) => {
-
         const { chatHistory } = args;
-
         let pathwayResolver = resolver;
-
         const useMemory = args.useMemory || pathwayResolver.pathway.inputParameters.useMemory;
 
-        pathwayResolver.pathwayPrompt = 
-        [
+        pathwayResolver.pathwayPrompt = [
             new Prompt({ messages: [
                 {
                     "role": "system",
@@ -48,38 +44,7 @@ Instructions: As part of a conversation with the user, you have been asked to cr
             ]}),
         ];
 
-        // function to add tool_calls to the chatHistory
-        const addToolCalls= (chatHistory, imagePrompt, toolCallId) => {
-            const toolCall = {
-                "role": "assistant",
-                "tool_calls": [
-                        {
-                            "id": toolCallId,
-                            "type": "function",
-                            "function": {
-                                "arguments": JSON.stringify(imagePrompt),
-                                "name": "generate_image"
-                            }
-                        }
-                    ]
-            };
-            chatHistory.push(toolCall);
-            return chatHistory;
-        }
-
-        // function to add tool_results to the chatHistory
-        const addToolResults = (chatHistory, imageResults, toolCallId) => {
-            const toolResult = {
-                "role": "tool",
-                "content": imageResults,
-                "tool_call_id": toolCallId
-            };
-            chatHistory.push(toolResult);
-            return chatHistory;
-        }
-
         try {
-          
             // figure out what the user wants us to do
             const contextInfo = chatHistory.filter(message => message.role === "user").slice(0, -1).map(message => message.content).join("\n");
             
@@ -100,7 +65,7 @@ Instructions: As part of a conversation with the user, you have been asked to cr
                     model = "replicate-flux-1-schnell";
                 }
                 if (renderText) {
-                    return await callPathway('image_recraft', {...args, text: prompt, stream: false });
+                    return await callPathway('image_recraft', {...args, text: prompt, model, stream: false });
                 } else {
                     return await callPathway('image_flux', {...args, text: prompt, negativePrompt, numberResults, model, stream: false });
                 }
@@ -108,9 +73,8 @@ Instructions: As part of a conversation with the user, you have been asked to cr
 
             // add the tool_calls and tool_results to the chatHistory
             imageResults.forEach((imageResult, index) => {
-                const toolCallId = getUniqueId();
-                addToolCalls(chatHistory, imagePrompts[index], toolCallId);
-                addToolResults(chatHistory, imageResult, toolCallId);
+                const { toolCallId } = addToolCalls(chatHistory, imagePrompts[index], "generate_image");
+                addToolResults(chatHistory, imageResult, toolCallId, "generate_image");
             });
             
             const result = await runAllPrompts({ ...args });

package/pathways/system/entity/sys_generator_memory.js

@@ -1,4 +1,5 @@
 import { callPathway } from '../../../lib/pathwayTools.js';
+import { addToolCalls, addToolResults } from './memory/shared/sys_memory_helpers.js';
 
 export default {
     prompt:
@@ -19,7 +20,8 @@ export default {
 
         const memoryContext = await callPathway('sys_search_memory', { ...args, section: 'memoryAll', updateContext: true });
         if (memoryContext) {
-            args.chatHistory.splice(-1, 0, { role: 'assistant', content: memoryContext });
+            const {toolCallId} = addToolCalls(args.chatHistory, "search memory for relevant information", "memory_lookup");
+            addToolResults(args.chatHistory, memoryContext, toolCallId);
         }
 
         let result;

package/pathways/system/entity/sys_generator_reasoning.js

@@ -5,7 +5,7 @@ export default {
     prompt:
         [
             new Prompt({ messages: [
-                {"role": "system", "content": `{{renderTemplate AI_COMMON_INSTRUCTIONS}}\n{{renderTemplate AI_EXPERTISE}}\n{{renderTemplate AI_MEMORY}}\nYou are the AI subsystem responsible for advanced, step-by-step reasoning. Use all of the information in your memory and the chat history to reason about the user's request and provide a correct and accurate response. The information in your chat history may be more current than your knowledge cutoff and has been verified by other subsystems so prioritize it over your internal knowledge.\n{{renderTemplate AI_MEMORY_INSTRUCTIONS}}\n{{renderTemplate AI_DATETIME}}`},
+                {"role": "system", "content": `Formatting re-enabled\n{{renderTemplate AI_COMMON_INSTRUCTIONS}}\n{{renderTemplate AI_EXPERTISE}}\n{{renderTemplate AI_MEMORY}}\nYou are the AI subsystem responsible for advanced, step-by-step reasoning. Use all of the information in your memory and the chat history to reason about the user's request and provide a correct and accurate response. The information in your chat history may be more current than your knowledge cutoff and has been verified by other subsystems so prioritize it over your internal knowledge.\n{{renderTemplate AI_MEMORY_INSTRUCTIONS}}\n{{renderTemplate AI_DATETIME}}`},
                 "{{chatHistory}}",
             ]}),
         ],

package/pathways/system/entity/sys_router_tool.js

@@ -21,7 +21,7 @@ Available tools and their specific use cases:
 
 2. Document: Access user's personal document index. Use for user-specific uploaded information. If user refers vaguely to "this document/file/article" without context, use this tool to search the personal index.
 
-3. Memory: Access to your memory index. Use to recall any information that you may have stored in your memory that you don't currently see elsewhere in your context.
+3. Memory: Read access to your memory index. Use to recall any information that you may have stored in your memory that you don't currently see elsewhere in your context. If you can answer from your context, don't use this tool. Don't use to make changes to your memory - that will happen naturally.
 
 4. Write: Engage for any task related to composing, editing, or refining written content. This includes articles, essays, scripts, or any form of textual creation or modification. If you need to search for information or look at a document first, use the Search or Document tools. This tool is just to create or modify content.
 
@@ -52,13 +52,12 @@ Tool Selection Guidelines:
 
 Decision Output:
 If you decide to use a tool, return a JSON object in this format:
-{"toolRequired": true, "toolFunction": "toolName", "toolMessage": "message to the user to wait a moment while you work", "toolReason": "detailed explanation of why this tool was chosen"}
+{"toolRequired": true, "toolFunction": "toolName", "toolMessage": "message to the user that you are taking an action", "toolReason": "detailed explanation of why this tool was chosen"}
 
 toolMessage Guidelines:
-- The message is a filler message to the user to let them know you're working on their request.
 - The message should be consistent in style and tone with the rest of your responses in the conversation history.
 - The message should be brief and conversational and flow naturally with the conversation history.
-- The message should not refer to the tool directly, but rather what you're trying to accomplish. E.g. for the memory tool, the message would be something like "Let me think about that for a moment..." or "I'm trying to remember...", etc.
+- The message should not refer to the tool use directly, but rather what you're trying to do.
 
 If no tool is required, return:
 {"toolRequired": false, "toolReason": "explanation of why no tool was necessary"}

package/pathways/system/rest_streaming/sys_claude_35_sonnet.js

@@ -11,7 +11,7 @@ export default {
         ]}),
     ],
     inputParameters: {
-        messages: [],
+        messages: [{role: '', content: []}],
     },
     model: 'claude-35-sonnet-vertex',
     useInputChunking: false,

package/pathways/system/rest_streaming/sys_claude_3_haiku.js

@@ -11,7 +11,7 @@ export default {
         ]}),
     ],
     inputParameters: {
-        messages: [],
+        messages: [{role: '', content: []}],
     },
     model: 'claude-3-haiku-vertex',
     useInputChunking: false,

package/pathways/system/rest_streaming/sys_google_gemini_chat.js

@@ -11,7 +11,7 @@ export default {
         ]}),
     ],
     inputParameters: {
-        messages: [],
+        messages: [{role: '', content: []}],
     },
     model: 'gemini-pro-chat',
     useInputChunking: false,

package/pathways/system/rest_streaming/sys_ollama_chat.js

@@ -0,0 +1,21 @@
+// sys_ollama_chat.js
+// override handler for ollama chat model
+
+import { Prompt } from '../../../server/prompt.js';
+
+export default {
+    prompt:
+    [
+        new Prompt({ messages: [
+            "{{messages}}",
+        ]}),
+    ],
+    inputParameters: {
+        messages: [{ role: '', content: '' }],
+        ollamaModel: '',
+    },
+    model: 'ollama-chat',
+    useInputChunking: false,
+    emulateOpenAIChatModel: 'ollama-chat',
+    timeout: 300,
+}

package/pathways/system/rest_streaming/sys_ollama_completion.js

@@ -0,0 +1,14 @@
+// sys_ollama_completion.js
+// default handler for ollama completion endpoints when REST endpoints are enabled
+
+export default {
+    prompt: `{{text}}`,
+    inputParameters: {
+        text: '',
+        ollamaModel: '',
+    },
+    model: 'ollama-completion',
+    useInputChunking: false,
+    emulateOpenAICompletionModel: 'ollama-completion',
+    timeout: 300,
+}

package/pathways/system/rest_streaming/sys_openai_chat_o1.js

@@ -10,7 +10,7 @@ export default {
         ]}),
     ],
     inputParameters: {
-        messages: [],
+        messages: [{role: '', content: []}],
     },
     model: 'oai-o1',
     useInputChunking: false,

package/pathways/system/rest_streaming/sys_openai_chat_o3_mini.js

@@ -10,7 +10,7 @@ export default {
         ]}),
     ],
     inputParameters: {
-        messages: [],
+        messages: [{role: '', content: []}],
     },
     model: 'oai-o3-mini',
     useInputChunking: false,