@aj-archipelago/cortex 1.3.29 → 1.3.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "1.3.29",
+  "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/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; 
     }