@aj-archipelago/cortex 1.1.24 → 1.1.26

package/lib/cortexRequest.js

@@ -1,18 +1,21 @@
 import { selectEndpoint } from './requestExecutor.js';
 
 class CortexRequest {
-    constructor( { url, urlSuffix, data, params, headers, cache, model, pathwayResolver, selectedEndpoint, stream } = {}) { 
+    constructor( { url, urlSuffix, data, params, headers, auth, cache, model, pathwayResolver, selectedEndpoint, stream, initCallback } = {}) { 
         this._url = url || '';
         this._urlSuffix = urlSuffix || '';
         this._data = data || {};
         this._params = params || {};
         this._headers = headers || {};
+        this._addHeaders = {};
+        this._auth = auth || {};
         this._cache = cache || {};
         this._model = model || '';
         this._pathwayResolver = pathwayResolver || {};
         this._selectedEndpoint = selectedEndpoint || {};
         this._stream = stream || false;
         this._method = 'POST';
+        this._initCallback = initCallback || null;
 
         if (this._pathwayResolver) {
             this._model = this._pathwayResolver.model;
@@ -23,14 +26,22 @@ class CortexRequest {
         }
     }
 
+    initRequest() {
+        if (typeof this._initCallback === 'function') {
+            this._initCallback(this);
+        }
+    }
+
     selectNewEndpoint() {
         const sep = selectEndpoint(this._model);
         if (sep) {
             this._selectedEndpoint = sep;
             this._url = sep.url;
-            this._data = { ...this._data, ...sep.params };
-            this._headers = { ...this._headers, ...sep.headers };
-            this._params = { ...this._params, ...sep.params };
+            this._data = { ...this._data, ...sep.data, ...sep.params };
+            if (sep.auth) {
+                this._auth = { ...sep.auth };
+            }
+            this.initRequest();
         }
     }
 
@@ -70,9 +81,22 @@ class CortexRequest {
         this._data = value;
     }
 
+    // initCallback getter and setter
+    get initCallback() {
+        return this._initCallback;
+    }
+
+    set initCallback(value) {
+        if (typeof value !== 'function') {
+            throw new Error('initCallback must be a function');
+        }
+        this._initCallback = value;
+        this.initRequest();
+    }
+
     // params getter and setter
     get params() {
-        return this._params;
+        return {...this._params, ...this._selectedEndpoint.params};
     }
 
     set params(value) {
@@ -81,13 +105,38 @@ class CortexRequest {
 
     // headers getter and setter
     get headers() {
-        return this._headers;
+        return { ...this._headers, ...this._selectedEndpoint.headers, ...this._auth, ...this._addHeaders };
     }
 
     set headers(value) {
         this._headers = value;
     }
 
+    // addheaders getter and setter
+    get addHeaders() {
+        return this._addHeaders;
+    }
+
+    set addHeaders(value) {
+        // Create a new object to store the processed headers
+        this._addHeaders = {};
+
+        // Iterate over the input headers and convert keys to title case
+        for (const [key, val] of Object.entries(value)) {
+            const titleCaseKey = key.replace(/(^|-)./g, m => m.toUpperCase());
+            this._addHeaders[titleCaseKey] = val;
+        }
+    }
+
+    // auth getter and setter
+    get auth() {
+        return this._auth;
+    }
+
+    set auth(value) {
+        this._auth = value;
+    }
+
     // cache getter and setter
     get cache() {
         return this._cache;

package/lib/requestExecutor.js

@@ -311,9 +311,9 @@ const makeRequest = async (cortexRequest) => {
                 throw new Error(`Received error response: ${response.status}`);
             }
         } catch (error) {
-            const { response, duration } = error;
-            if (response) {
-                const status = response.status;
+            const { response, duration, code } = error;
+            if (response || code === 'ECONNRESET') {
+                const status = response?.status || 502; // default to 502 if ECONNRESET
                 // if there is only one endpoint, only retry select error codes
                 if (cortexRequest.model.endpoints.length === 1) {
                     if (status !== 429 &&
@@ -323,6 +323,8 @@ const makeRequest = async (cortexRequest) => {
                         status !== 504) {
                         return { response, duration };
                     }
+                    // set up for a retry by reinitializing the request
+                    cortexRequest.initRequest();
                 } else {
                     // if there are multiple endpoints, retry everything by default
                     // as it could be a temporary issue with one endpoint
@@ -331,6 +333,7 @@ const makeRequest = async (cortexRequest) => {
                     if (status == 400) {
                         return { response, duration };
                     }
+                    // set up for a retry by selecting a new endpoint, which will also reinitialize the request
                     cortexRequest.selectNewEndpoint();
                 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "1.1.24",
+  "version": "1.1.26",
   "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/server/plugins/claude3VertexPlugin.js

@@ -263,7 +263,7 @@ class Claude3VertexPlugin extends OpenAIVisionPlugin {
 
     const gcpAuthTokenHelper = this.config.get("gcpAuthTokenHelper");
     const authToken = await gcpAuthTokenHelper.getAccessToken();
-    cortexRequest.headers.Authorization = `Bearer ${authToken}`;
+    cortexRequest.auth.Authorization = `Bearer ${authToken}`;
 
     return this.executeRequest(cortexRequest);
   }

package/server/plugins/gemini15ChatPlugin.js

@@ -164,7 +164,7 @@ class Gemini15ChatPlugin extends ModelPlugin {
 
         const gcpAuthTokenHelper = this.config.get('gcpAuthTokenHelper');
         const authToken = await gcpAuthTokenHelper.getAccessToken();
-        cortexRequest.headers.Authorization = `Bearer ${authToken}`;
+        cortexRequest.auth.Authorization = `Bearer ${authToken}`;
 
         return this.executeRequest(cortexRequest);
     }

package/server/plugins/geminiChatPlugin.js

@@ -159,7 +159,7 @@ class GeminiChatPlugin extends ModelPlugin {
 
         const gcpAuthTokenHelper = this.config.get('gcpAuthTokenHelper');
         const authToken = await gcpAuthTokenHelper.getAccessToken();
-        cortexRequest.headers.Authorization = `Bearer ${authToken}`;
+        cortexRequest.auth.Authorization = `Bearer ${authToken}`;
 
         return this.executeRequest(cortexRequest);
     }

package/server/plugins/neuralSpacePlugin.js

@@ -117,49 +117,52 @@ class NeuralSpacePlugin extends ModelPlugin {
         const cortexRequest = new CortexRequest({ pathwayResolver });
         cortexRequest.url = this.requestUrl();
 
-        const formData = new FormData();
-        formData.append("files", fs.createReadStream(chunk));
-        const configObj = {
-          file_transcription: {
-            mode: "advanced",
-          },
-        };
-
-        //phrase/segment level
-        if ((responseFormat && !wordTimestamped) || maxLineWidth) {
-          configObj.speaker_diarization = {
-            // mode: "speakers",
-            // num_speakers: numSpeakers,
-            // overrides: {
-            //   clustering: {
-            //     threshold: clusteringThreshold,
-            //   },
-            // },
+        const nsInitCallback = (requestInstance) => {
+          const formData = new FormData();
+          formData.append("files", fs.createReadStream(chunk));
+          const configObj = {
+            file_transcription: {
+              mode: "advanced",
+            },
           };
 
-          configObj.subtitles_guidelines = {
-            line_count: 1
-          };
-        }
-
-        if (maxLineWidth) {
-          configObj.subtitles_guidelines = {
-            character_count: maxLineWidth,
+          //phrase/segment level
+          if ((responseFormat && !wordTimestamped) || maxLineWidth) {
+            configObj.speaker_diarization = {
+              // mode: "speakers",
+              // num_speakers: numSpeakers,
+              // overrides: {
+              //   clustering: {
+              //     threshold: clusteringThreshold,
+              //   },
+              // },
+            };
+
+            configObj.subtitles_guidelines = {
+              line_count: 1,
+            };
+          }
+
+          if (maxLineWidth) {
+            configObj.subtitles_guidelines = {
+              character_count: maxLineWidth,
+            };
+          }
+
+          if (language) {
+            configObj.file_transcription.language_id = language;
+          }
+          formData.append("config", JSON.stringify(configObj));
+
+          requestInstance.data = formData;
+          requestInstance.params = {};
+          requestInstance.addHeaders = {
+            ...formData.getHeaders(),
           };
-        }
-
-        if (language) {
-          configObj.file_transcription.language_id = language;
-        }
-        formData.append("config", JSON.stringify(configObj));
-
-        cortexRequest.data = formData;
-        cortexRequest.params = {};
-        cortexRequest.headers = {
-          ...cortexRequest.headers,
-          ...formData.getHeaders(),
         };
 
+        cortexRequest.initCallback = nsInitCallback;
+
         const result = await this.executeRequest(cortexRequest);
 
         const jobId = result?.data?.jobId;

package/server/plugins/openAiWhisperPlugin.js

@@ -37,22 +37,26 @@ class OpenAIWhisperPlugin extends ModelPlugin {
                 chunks.push(chunk);
 
                 const { language, responseFormat } = parameters;
-                const params = {};
                 const { modelPromptText } = this.getCompiledPrompt(text, parameters, prompt);
                 const response_format = responseFormat || 'text';
 
-                const formData = new FormData();
-                formData.append('file', fs.createReadStream(chunk));
-                formData.append('model', cortexRequest.params.model);
-                formData.append('response_format', response_format);
-                language && formData.append('language', language);
-                modelPromptText && formData.append('prompt', modelPromptText);
+                const whisperInitCallback = (requestInstance) => {
 
-                cortexRequest.data = formData;
-                cortexRequest.params = params;
-                cortexRequest.headers = { ...cortexRequest.headers, ...formData.getHeaders() };
+                    const formData = new FormData();
+                    formData.append('file', fs.createReadStream(chunk));
+                    formData.append('model', requestInstance.params.model);
+                    formData.append('response_format', response_format);
+                    language && formData.append('language', language);
+                    modelPromptText && formData.append('prompt', modelPromptText);
 
+                    requestInstance.data = formData;
+                    requestInstance.addHeaders = { ...formData.getHeaders() };
+
+                };
+
+                cortexRequest.initCallback = whisperInitCallback;
                 return this.executeRequest(cortexRequest);
+
             } catch (err) {
                 logger.error(`Error getting word timestamped data from api: ${err}`);
                 throw err;

package/server/plugins/palmChatPlugin.js

@@ -147,7 +147,7 @@ class PalmChatPlugin extends ModelPlugin {
 
         const gcpAuthTokenHelper = this.config.get('gcpAuthTokenHelper');
         const authToken = await gcpAuthTokenHelper.getAccessToken();
-        cortexRequest.headers.Authorization = `Bearer ${authToken}`;
+        cortexRequest.auth.Authorization = `Bearer ${authToken}`;
 
         return this.executeRequest(cortexRequest);
     }

package/server/plugins/palmCompletionPlugin.js

@@ -61,7 +61,7 @@ class PalmCompletionPlugin extends ModelPlugin {
 
         const gcpAuthTokenHelper = this.config.get('gcpAuthTokenHelper');
         const authToken = await gcpAuthTokenHelper.getAccessToken();
-        cortexRequest.headers.Authorization = `Bearer ${authToken}`;
+        cortexRequest.auth.Authorization = `Bearer ${authToken}`;
 
         return this.executeRequest(cortexRequest);
     }