@aj-archipelago/cortex 1.1.14 → 1.1.16

package/lib/cortexRequest.js

@@ -1,8 +1,9 @@
 import { selectEndpoint } from './requestExecutor.js';
 
 class CortexRequest {
-    constructor( { url, data, params, headers, cache, model, pathwayResolver, selectedEndpoint, stream } = {}) { 
+    constructor( { url, urlSuffix, data, params, headers, cache, model, pathwayResolver, selectedEndpoint, stream } = {}) { 
         this._url = url || '';
+        this._urlSuffix = urlSuffix || '';
         this._data = data || {};
         this._params = params || {};
         this._headers = headers || {};
@@ -35,13 +36,22 @@ class CortexRequest {
 
     // url getter and setter
     get url() {
-        return this._url;
+        return this._url + this._urlSuffix;
     }
 
     set url(value) {
         this._url = value;
     }
 
+    // urlSuffix getter and setter
+    get urlSuffix() {
+        return this._urlSuffix;
+    }
+    
+    set urlSuffix(value) {
+        this._urlSuffix = value;
+    }
+
     // method getter and setter
     get method() {
         return this._method;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "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,19 @@ 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);
+            data = this.responseParser.parse(data);
+
+            if (data !== null && data !== undefined) {
+                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 +231,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;
     }
 }

package/server/plugins/claude3VertexPlugin.js

@@ -79,7 +79,7 @@ class Claude3VertexPlugin extends OpenAIVisionPlugin {
         cortexRequest.data = { ...(cortexRequest.data || {}), ...requestParameters };
         cortexRequest.params = {}; // query params
         cortexRequest.stream = stream;
-        cortexRequest.url = cortexRequest.stream ? `${cortexRequest.url}:streamRawPredict` : `${cortexRequest.url}:rawPredict`;
+        cortexRequest.urlSuffix = cortexRequest.stream ? ':streamRawPredict' : ':rawPredict';
 
         const gcpAuthTokenHelper = this.config.get('gcpAuthTokenHelper');
         const authToken = await gcpAuthTokenHelper.getAccessToken();

package/server/plugins/openAiWhisperPlugin.js

@@ -335,7 +335,7 @@ try {
 
     totalCount = mediaChunks.length + 1; // total number of chunks that will be processed
 
-    const batchSize = 2;
+    const batchSize = 4;
     sendProgress();
 
     for (let i = 0; i < uris.length; i += batchSize) {