@aj-archipelago/cortex 1.1.15 → 1.1.17

package/package.json

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

@@ -30,5 +30,7 @@ export default {
     executePathway: undefined,
     // Set the temperature to 0 to favor more deterministic output when generating entity extraction.
     temperature: 0.9,
+    // Require a valid JSON response from the model
+    json: false,
 };
 

package/server/parser.js

@@ -49,6 +49,28 @@ const isNumberedList = (data) => {
     return numberedListPattern.test(data.trim());
 }
 
+function parseJson(str) {
+    try {
+      const start = Math.min(
+        str.indexOf('{') !== -1 ? str.indexOf('{') : Infinity,
+        str.indexOf('[') !== -1 ? str.indexOf('[') : Infinity
+      );
+
+      const end = Math.max(
+        str.lastIndexOf('}') !== -1 ? str.lastIndexOf('}') + 1 : 0,
+        str.lastIndexOf(']') !== -1 ? str.lastIndexOf(']') + 1 : 0
+      );
+  
+      const jsonStr = str.slice(start, end);
+      // eslint-disable-next-line no-unused-vars
+      const json = JSON.parse(jsonStr);
+      return jsonStr;
+    } catch (error) {
+      logger.warn(`Pathway requires JSON format result. Failed to parse JSON: ${error.message}`);
+      return null;
+    }
+}
+
 export {
     regexParser,
     parseNumberedList,
@@ -56,4 +78,5 @@ export {
     parseCommaSeparatedList,
     isCommaSeparatedList,
     isNumberedList,
+    parseJson
 };

package/server/pathwayResolver.js

@@ -211,8 +211,22 @@ class PathwayResolver {
         // Save the context before processing the request
         const savedContextStr = JSON.stringify(this.savedContext);
 
-        // Process the request
-        const data = await this.processRequest(args);
+        const MAX_RETRIES = 3;
+        let data = null;
+        
+        for (let retries = 0; retries < MAX_RETRIES; retries++) {
+            data = await this.processRequest(args);
+            if (!data) {
+                break;
+            }
+
+            data = this.responseParser.parse(data);
+            if (data !== null) {
+                break;
+            }
+
+            logger.warn(`Bad pathway result - retrying pathway. Attempt ${retries + 1} of ${MAX_RETRIES}`);
+        }
 
         // Update saved context if it has changed, generating a new contextId if necessary
         if (savedContextStr !== JSON.stringify(this.savedContext)) {
@@ -220,8 +234,7 @@ class PathwayResolver {
             setv && setv(this.savedContextId, this.savedContext);
         }
 
-        // Return the result
-        return this.responseParser.parse(data);
+        return data;
     }
 
     // Add a warning and log it

package/server/pathwayResponseParser.js

@@ -1,4 +1,4 @@
-import { parseNumberedList, parseNumberedObjectList, parseCommaSeparatedList, isCommaSeparatedList, isNumberedList } from './parser.js';
+import { parseNumberedList, parseNumberedObjectList, parseCommaSeparatedList, isCommaSeparatedList, isNumberedList, parseJson } from './parser.js';
 
 class PathwayResponseParser {
     constructor(pathway) {
@@ -22,6 +22,10 @@ class PathwayResponseParser {
             return [data];
         }
 
+        if (this.pathway.json) {
+            return parseJson(data);
+        }
+
         return data;
     }
 }