@aj-archipelago/cortex 1.3.28 → 1.3.30

package/package.json

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

@@ -59,12 +59,17 @@ export default {
             
             logger.debug(`Using generator pathway: ${generatorPathway}`);
             
-            const result = await callPathway(generatorPathway, newArgs, resolver);
+            let result = await callPathway(generatorPathway, newArgs, resolver);
 
             if (!result && !args.stream) {
                 result = await callPathway('sys_generator_error', { ...args, text: `Tried to use a tool (${generatorPathway}), but no result was returned`, stream: false }, resolver);
             }
 
+            if (resolver.errors.length > 0) {
+                result = await callPathway('sys_generator_error', { ...args, text: resolver.errors.join('\n'), stream: false }, resolver);
+                resolver.errors = [];
+            }
+
             return result;
 
         } catch (e) {

package/pathways/system/entity/sys_generator_error.js

@@ -4,8 +4,11 @@ export default {
     prompt:
         [
             new Prompt({ messages: [
-                {"role": "system", "content": `{{renderTemplate AI_DIRECTIVES}}\n\n{{renderTemplate AI_COMMON_INSTRUCTIONS}}\n\n{{renderTemplate AI_EXPERTISE}}\n\nThe user has requested information that you have already determined can be found in the indexes that you can search, and you were trying to search for it, but encountered the following error: {{{text}}}. Your response should be concise, fit the rest of the conversation, include detail appropriate for the technical level of the user if you can determine it, and be appropriate for the context. You cannot resolve this error.\n{{renderTemplate AI_DATETIME}}`},
-                "{{chatHistory}}",
+                {"role": "system", "content": `{{renderTemplate AI_MEMORY}}\n\n{{renderTemplate AI_DIRECTIVES}}\n\n{{renderTemplate AI_COMMON_INSTRUCTIONS}}\n\n{{renderTemplate AI_EXPERTISE}}\n\n{{renderTemplate AI_CONVERSATION_HISTORY}}\n\nYou were trying to fulfill the user's last request in the above conversation, but ran into an error. You cannot resolve this error.\n{{renderTemplate AI_DATETIME}}`},
+                {
+                    "role": "user",
+                    "content": `The model that you were trying to use to fulfill the user's request returned the following error(s): {{{text}}}. Please let them know what happened. Your response should be concise, fit the rest of the conversation, include detail appropriate for the technical level of the user if you can determine it, and be appropriate for the context. You cannot resolve this error.`
+                },
             ]}),
         ],
     inputParameters: {

package/pathways/translate_subtitle.js

@@ -2,7 +2,7 @@ import { parse, build } from "@aj-archipelago/subvibe";
 import logger from "../lib/logger.js";
 import { callPathway } from "../lib/pathwayTools.js";
 
-function splitIntoOverlappingChunks(captions, chunkSize = 20, overlap = 3) {
+export function splitIntoOverlappingChunks(captions, chunkSize = 20, overlap = 3) {
   const chunks = [];
   for (let i = 0; i < captions.length; i += (chunkSize - overlap)) {
     const end = Math.min(i + chunkSize, captions.length);
@@ -17,26 +17,51 @@ function splitIntoOverlappingChunks(captions, chunkSize = 20, overlap = 3) {
   return chunks;
 }
 
-function selectBestTranslation(translations, startIndex, endIndex) {
-  // If we only have one translation for this caption, use it
-  if (translations.length === 1) return translations[0];
+export function selectBestTranslation(translations, startIndex, endIndex) {
+  try {
+    if (!translations || !Array.isArray(translations)) {
+      logger.warn(`Invalid translations input: ${JSON.stringify(translations)}`);
+      return null;
+    }
+    
+    if (translations.length === 0) {
+      logger.warn(`No translations available for selection`);
+      return null;
+    }
+    
+    // If we only have one translation for this caption, use it
+    if (translations.length === 1) return translations[0];
 
-  // For multiple translations, prefer the one from the middle of its chunk
-  // This helps avoid edge effects in translation
-  return translations.reduce((best, current) => {
-    const currentDistance = Math.min(
-      Math.abs(current.chunkStart - startIndex),
-      Math.abs(current.chunkEnd - endIndex)
-    );
-    const bestDistance = Math.min(
-      Math.abs(best.chunkStart - startIndex),
-      Math.abs(best.chunkEnd - endIndex)
-    );
-    return currentDistance < bestDistance ? current : best;
-  });
+    // Use the first translation as a starting point
+    const first = translations[0];
+    
+    // For multiple translations, prefer the one whose identifier is closest to the middle
+    // of the requested range
+    const targetValue = (Number(startIndex) + Number(endIndex)) / 2;
+    
+    return translations.reduce((best, current) => {
+      try {
+        // Use identifier for comparison if available, otherwise use index
+        const currentValue = Number(current.identifier !== undefined ? current.identifier : current.index || 0);
+        const bestValue = Number(best.identifier !== undefined ? best.identifier : best.index || 0);
+        
+        const currentDistance = Math.abs(currentValue - targetValue);
+        const bestDistance = Math.abs(bestValue - targetValue);
+        
+        return currentDistance < bestDistance ? current : best;
+      } catch (err) {
+        logger.warn(`Error comparing translations: ${err.message}`);
+        return best; // Fallback to existing best on error
+      }
+    }, first);
+  } catch (err) {
+    logger.error(`Error in selectBestTranslation: ${err.message}`);
+    // Return the first translation if available, otherwise null
+    return translations && translations.length ? translations[0] : null;
+  }
 }
 
-async function translateChunk(chunk, args, maxRetries = 3) {
+export async function translateChunk(chunk, args, maxRetries = 3) {
   const chunkText = build(chunk.captions, { format: args.format, preserveIndexes: true });
   
   for (let attempt = 0; attempt < maxRetries; attempt++) {
@@ -82,7 +107,7 @@ export default {
   timeout: 3600,
   executePathway: async ({args}) => {
     try {
-      const { text, format = 'srt' } = args;
+      const { text, format = 'vtt' } = args;
       const parsed = parse(text, { format, preserveIndexes: true });
       const captions = parsed.cues;
   
@@ -101,16 +126,18 @@ export default {
       // Create a map of caption index to all its translations
       const translationMap = new Map();
       translatedChunks.flat().forEach(caption => {
-        if (!translationMap.has(caption.index)) {
-          translationMap.set(caption.index, []);
+        const identifier = caption.identifier || caption.index;
+        if (!translationMap.has(identifier)) {
+          translationMap.set(identifier, []);
         }
-        translationMap.get(caption.index).push(caption);
+        translationMap.get(identifier).push(caption);
       });
       
       // Select best translation for each caption
       const finalCaptions = captions.map(caption => {
-        const translations = translationMap.get(caption.index) || [caption];
-        const bestTranslation = selectBestTranslation(translations, caption.index, caption.index);
+        const identifier = caption.identifier || caption.index;
+        const translations = translationMap.get(identifier) || [caption];
+        const bestTranslation = selectBestTranslation(translations, identifier, identifier);
         const text = bestTranslation?.text || caption?.text;
         return { ...caption, text };
       });

package/server/plugins/gemini15ChatPlugin.js

@@ -140,7 +140,7 @@ class Gemini15ChatPlugin extends ModelPlugin {
             dataToMerge = data.contents;
         } else if (data && data.candidates && Array.isArray(data.candidates)) {
             const { content, finishReason, safetyRatings } = data.candidates[0];
-            if (finishReason === 'STOP') {
+            if (finishReason === 'STOP' || finishReason === 'MAX_TOKENS') {
                 return content?.parts?.[0]?.text ?? '';
             } else {
                 const returnString = `Response was not completed.  Finish reason: ${finishReason}, Safety ratings: ${JSON.stringify(safetyRatings, null, 2)}`;

package/server/plugins/gemini15VisionPlugin.js

@@ -143,8 +143,8 @@ class Gemini15VisionPlugin extends Gemini15ChatPlugin {
                 if (data.error.code === 400 && data.error.message === 'Precondition check failed.') {
                     throw new Error('One or more of the included files is too large to process. Please try again with a smaller file.');
                 }
-            throw e;
             }
+            throw e;
         }
         return result; 
     }

package/server/plugins/openAiWhisperPlugin.js

@@ -72,13 +72,7 @@ class OpenAIWhisperPlugin extends ModelPlugin {
             if(maxLineWidth) tsparams.max_line_width = maxLineWidth;
             if(maxLineCount) tsparams.max_line_count = maxLineCount;
             if(maxWordsPerLine) tsparams.max_words_per_line = maxWordsPerLine;
-            if(wordTimestamped!=null) {
-                if(!wordTimestamped) {
-                    tsparams.word_timestamps = "False";
-                }else{
-                    tsparams.word_timestamps = wordTimestamped;    
-                }
-            }
+            tsparams.word_timestamps = !wordTimestamped ? "False" : wordTimestamped;
 
             const cortexRequest = new CortexRequest({ pathwayResolver });
             cortexRequest.url = WHISPER_TS_API_URL;
@@ -157,7 +151,8 @@ async function processURI(uri) {
 
     const intervalId = setInterval(() => sendProgress(true), 3000);
 
-    const useTS = WHISPER_TS_API_URL && (wordTimestamped || highlightWords);
+    //const useTS = WHISPER_TS_API_URL && (wordTimestamped || highlightWords); // use TS API only for word timestamped
+    const useTS = !!WHISPER_TS_API_URL; // use TS API always if URL is set
 
     if (useTS) {
         _promise = processTS;