@aj-archipelago/cortex 1.1.25 → 1.1.27

package/lib/cortexRequest.js

@@ -1,12 +1,13 @@
 import { selectEndpoint } from './requestExecutor.js';
 
 class CortexRequest {
-    constructor( { url, urlSuffix, data, params, headers, auth, 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 || '';
@@ -14,6 +15,7 @@ class CortexRequest {
         this._selectedEndpoint = selectedEndpoint || {};
         this._stream = stream || false;
         this._method = 'POST';
+        this._initCallback = initCallback || null;
 
         if (this._pathwayResolver) {
             this._model = this._pathwayResolver.model;
@@ -24,17 +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._data = { ...this._data, ...sep.data, ...sep.params };
             if (sep.auth) {
                 this._auth = { ...sep.auth };
             }
-            this._params = { ...this._params, ...sep.params };
+            this.initRequest();
         }
     }
 
@@ -74,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) {
@@ -85,13 +105,29 @@ class CortexRequest {
 
     // headers getter and setter
     get headers() {
-        return { ...this._headers, ...this._auth };
+        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;

package/lib/logger.js

@@ -19,11 +19,25 @@ const prodFormat = winston.format.combine(
     winston.format.simple()
 );
 
-const transports = process.env.NODE_ENV === 'production' ?
-    new winston.transports.Console({ level: 'info', format: prodFormat }) :
-    new winston.transports.Console({ level: 'debug', format: debugFormat });
+const getTransport = () => {
+    switch (process.env.NODE_ENV) {
+      case 'production':
+        return new winston.transports.Console({ level: 'info', format: prodFormat });
+      case 'development':
+        return new winston.transports.Console({ level: 'verbose', format: debugFormat });
+      case 'debug':
+        return new winston.transports.Console({ level: 'debug', format: debugFormat });
+      default:
+        // Default to development settings if NODE_ENV is not set or unknown
+        console.warn(`Unknown NODE_ENV: ${process.env.NODE_ENV}. Defaulting to development settings.`);
+        return new winston.transports.Console({ level: 'verbose', format: debugFormat });
+    }
+};
 
-const logger = winston.createLogger({ transports });
+// Create the logger
+const logger = winston.createLogger({
+    transports: [getTransport()]
+});
 
 // Function to obscure sensitive URL parameters
 export const obscureUrlParams = url => {

package/lib/requestExecutor.js

@@ -277,7 +277,7 @@ const makeRequest = async (cortexRequest) => {
                                 ({ response, duration } = await selectedEndpoint.limiter.schedule({expiration: pathway.timeout * 1000 + 1000, id: `${requestId}_${uuidv4()}`}, () => requestWithMonitor(selectedEndpoint, url, data, axiosConfigObj)));
 
                                 if (!controller.signal?.aborted) {
-                                    logger.debug(`<<< [${requestId}] received response for request ${index}`);
+                                    logger.verbose(`<<< [${requestId}] received response for request ${index}`);
                                 }
                             }
 
@@ -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.25",
+  "version": "1.1.27",
   "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/rag_jarvis.js

@@ -190,7 +190,7 @@ export default {
                 indexCount++;
                 const rowCount = data.length;
                 if (rowCount === 0) {
-                    logger.debug(`Index ${indexCount} had no matching sources.`);
+                    logger.verbose(`Index ${indexCount} had no matching sources.`);
                     continue;
                 }
                 const proportion = rowCount / totalLength;
@@ -203,7 +203,7 @@ export default {
                 let items = data.splice(0, slots);
                 searchResults.push(...items);
             
-                logger.debug(`Index ${indexCount} had ${rowCount} matching sources. ${items.length} forwarded to the LLM.`);
+                logger.verbose(`Index ${indexCount} had ${rowCount} matching sources. ${items.length} forwarded to the LLM.`);
                 // Update remaining slots for next iteration
                 remainingSlots -= slots;
             }

package/server/plugins/azureBingPlugin.js

@@ -39,7 +39,7 @@ class AzureBingPlugin extends ModelPlugin {
     logRequestData(data, responseData, prompt) {
         this.logAIRequestFinished();
     
-        logger.debug(`${this.parseResponse(responseData)}`);
+        logger.verbose(`${this.parseResponse(responseData)}`);
     
         prompt && prompt.debugInfo && (prompt.debugInfo += `\n${JSON.stringify(data)}`);
     }

package/server/plugins/azureTranslatePlugin.js

@@ -47,8 +47,8 @@ class AzureTranslatePlugin extends ModelPlugin {
     logRequestData(data, responseData, prompt) {
         const modelInput = data[0].Text;
     
-        logger.debug(`${modelInput}`);
-        logger.debug(`${this.parseResponse(responseData)}`);
+        logger.verbose(`${modelInput}`);
+        logger.verbose(`${this.parseResponse(responseData)}`);
     
         prompt && prompt.debugInfo && (prompt.debugInfo += `\n${JSON.stringify(data)}`);
     }

package/server/plugins/claude3VertexPlugin.js

@@ -183,7 +183,7 @@ class Claude3VertexPlugin extends OpenAIVisionPlugin {
     if (system) {
       const { length, units } = this.getLength(system);
       logger.info(`[system messages sent containing ${length} ${units}]`);
-      logger.debug(`${system}`);
+      logger.verbose(`${system}`);
     }
 
     if (messages && messages.length > 1) {
@@ -209,7 +209,7 @@ class Claude3VertexPlugin extends OpenAIVisionPlugin {
               " ... " +
               words.slice(-20).join(" ");
 
-        logger.debug(
+        logger.verbose(
           `message ${index + 1}: role: ${
             message.role
           }, ${units}: ${length}, content: "${preview}"`
@@ -225,7 +225,7 @@ class Claude3VertexPlugin extends OpenAIVisionPlugin {
         : message.content;
       const { length, units } = this.getLength(content);
       logger.info(`[request sent containing ${length} ${units}]`);
-      logger.debug(`${content}`);
+      logger.verbose(`${content}`);
     }
 
     if (stream) {
@@ -234,7 +234,7 @@ class Claude3VertexPlugin extends OpenAIVisionPlugin {
       const responseText = this.parseResponse(responseData);
       const { length, units } = this.getLength(responseText);
       logger.info(`[response received containing ${length} ${units}]`);
-      logger.debug(`${responseText}`);
+      logger.verbose(`${responseText}`);
     }
 
     prompt &&

package/server/plugins/gemini15ChatPlugin.js

@@ -186,26 +186,26 @@ class Gemini15ChatPlugin extends ModelPlugin {
                 const { length, units } = this.getLength(messageContent);
                 const preview = words.length < 41 ? messageContent : words.slice(0, 20).join(" ") + " ... " + words.slice(-20).join(" ");
     
-                logger.debug(`message ${index + 1}: role: ${message.role}, ${units}: ${length}, content: "${preview}"`);
+                logger.verbose(`message ${index + 1}: role: ${message.role}, ${units}: ${length}, content: "${preview}"`);
             });
         } else if (messages && messages.length === 1) {
-            logger.debug(`${messages[0].parts[0].text}`);
+            logger.verbose(`${messages[0].parts[0].text}`);
         }
 
         // check if responseData is an array or string
         if (typeof responseData === 'string') {
             const { length, units } = this.getLength(responseData);
             logger.info(`[response received containing ${length} ${units}]`);
-            logger.debug(`${responseData}`);
+            logger.verbose(`${responseData}`);
         } else if (Array.isArray(responseData)) {
             const { mergedResult, safetyRatings } = mergeResults(responseData);
             if (safetyRatings?.length) {
                 logger.warn(`!!! response was blocked because the input or response potentially violates policies`);
-                logger.debug(`Safety Ratings: ${JSON.stringify(safetyRatings, null, 2)}`);
+                logger.verbose(`Safety Ratings: ${JSON.stringify(safetyRatings, null, 2)}`);
             }
             const { length, units } = this.getLength(mergedResult);
             logger.info(`[response received containing ${length} ${units}]`);
-            logger.debug(`${mergedResult}`);
+            logger.verbose(`${mergedResult}`);
         } else {
             logger.info(`[response received as an SSE stream]`);
         }

package/server/plugins/geminiChatPlugin.js

@@ -181,26 +181,26 @@ class GeminiChatPlugin extends ModelPlugin {
                 const { length, units } = this.getLength(messageContent);
                 const preview = words.length < 41 ? messageContent : words.slice(0, 20).join(" ") + " ... " + words.slice(-20).join(" ");
     
-                logger.debug(`message ${index + 1}: role: ${message.role}, ${units}: ${length}, content: "${preview}"`);
+                logger.verbose(`message ${index + 1}: role: ${message.role}, ${units}: ${length}, content: "${preview}"`);
             });
         } else if (messages && messages.length === 1) {
-            logger.debug(`${messages[0].parts[0].text}`);
+            logger.verbose(`${messages[0].parts[0].text}`);
         }
 
         // check if responseData is an array or string
         if (typeof responseData === 'string') {
             const { length, units } = this.getLength(responseData);
             logger.info(`[response received containing ${length} ${units}]`);
-            logger.debug(`${responseData}`);
+            logger.verbose(`${responseData}`);
         } else if (Array.isArray(responseData)) {
             const { mergedResult, safetyRatings } = mergeResults(responseData);
             if (safetyRatings?.length) {
                 logger.warn(`!!! response was blocked because the input or response potentially violates policies`);
-                logger.debug(`Safety Ratings: ${JSON.stringify(safetyRatings, null, 2)}`);
+                logger.verbose(`Safety Ratings: ${JSON.stringify(safetyRatings, null, 2)}`);
             }
             const { length, units } = this.getLength(mergedResult);
             logger.info(`[response received containing ${length} ${units}]`);
-            logger.debug(`${mergedResult}`);
+            logger.verbose(`${mergedResult}`);
         } else {
             logger.info(`[response received as an SSE stream]`);
         }

package/server/plugins/localModelPlugin.js

@@ -55,13 +55,13 @@ class LocalModelPlugin extends ModelPlugin {
         //args.push("--temperature", requestParameters.temperature);
 
         try {
-            logger.debug(`Running local model: ${executablePath}, ${args}`);
+            logger.verbose(`Running local model: ${executablePath}, ${args}`);
             const result = execFileSync(executablePath, args, { encoding: 'utf8' });
             // Remove only the first occurrence of requestParameters.prompt from the result
             // Could have used regex here but then would need to escape the prompt
             const parts = result.split(requestParameters.prompt, 2);
             const modifiedResult = parts[0] + parts[1];
-            logger.debug(`Result: ${modifiedResult}`);
+            logger.verbose(`Result: ${modifiedResult}`);
             return this.filterFirstResponse(modifiedResult);
         } catch (error) {
             logger.error(`Error running local model: ${error}`);

package/server/plugins/modelPlugin.js

@@ -250,13 +250,13 @@ class ModelPlugin {
         if (modelInput) {
             const { length, units } = this.getLength(modelInput);
             logger.info(`[request sent containing ${length} ${units}]`);
-            logger.debug(`${modelInput}`);
+            logger.verbose(`${modelInput}`);
         }
     
         const responseText = JSON.stringify(responseData);
         const { length, units } = this.getLength(responseText);
         logger.info(`[response received containing ${length} ${units}]`);
-        logger.debug(`${responseText}`);
+        logger.verbose(`${responseText}`);
     
         prompt && prompt.debugInfo && (prompt.debugInfo += `\n${JSON.stringify(data)}`);
     }

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/openAiChatPlugin.js

@@ -117,7 +117,7 @@ class OpenAIChatPlugin extends ModelPlugin {
                 const { length, units } = this.getLength(content);
                 const preview = words.length < 41 ? content : words.slice(0, 20).join(" ") + " ... " + words.slice(-20).join(" ");
     
-                logger.debug(`message ${index + 1}: role: ${message.role}, ${units}: ${length}, content: "${preview}"`);
+                logger.verbose(`message ${index + 1}: role: ${message.role}, ${units}: ${length}, content: "${preview}"`);
                 totalLength += length;
                 totalUnits = units;
             });
@@ -127,7 +127,7 @@ class OpenAIChatPlugin extends ModelPlugin {
             const content = Array.isArray(message.content) ? message.content.map(item => JSON.stringify(item)).join(', ') : message.content;
             const { length, units } = this.getLength(content);
             logger.info(`[request sent containing ${length} ${units}]`);
-            logger.debug(`${content}`);
+            logger.verbose(`${content}`);
         }
     
         if (stream) {
@@ -136,7 +136,7 @@ class OpenAIChatPlugin extends ModelPlugin {
             const responseText = this.parseResponse(responseData);
             const { length, units } = this.getLength(responseText);
             logger.info(`[response received containing ${length} ${units}]`);
-            logger.debug(`${responseText}`);
+            logger.verbose(`${responseText}`);
         }
 
         prompt && prompt.debugInfo && (prompt.debugInfo += `\n${JSON.stringify(data)}`);

package/server/plugins/openAiCompletionPlugin.js

@@ -110,7 +110,7 @@ class OpenAICompletionPlugin extends ModelPlugin {
         const { length, units } = this.getLength(modelInput);
 
         logger.info(`[request sent containing ${length} ${units}]`);
-        logger.debug(`${modelInput}`);
+        logger.verbose(`${modelInput}`);
 
         if (stream) {
             logger.info(`[response received as an SSE stream]`);
@@ -118,7 +118,7 @@ class OpenAICompletionPlugin extends ModelPlugin {
             const responseText = this.parseResponse(responseData);
             const { length, units } = this.getLength(responseText);
             logger.info(`[response received containing ${length} ${units}]`);
-            logger.debug(`${responseText}`);
+            logger.verbose(`${responseText}`);
         }
     
         prompt && prompt.debugInfo && (prompt.debugInfo += `\n${JSON.stringify(data)}`);

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

@@ -190,13 +190,13 @@ class PalmChatPlugin extends ModelPlugin {
         if (context) {
             const { length, units } = this.getLength(context);
             logger.info(`[chat request contains context information of length ${length} ${units}]`)
-            logger.debug(`context: ${context}`);
+            logger.verbose(`context: ${context}`);
         }
 
         if (examples && examples.length) {
             logger.info(`[chat request contains ${examples.length} examples]`);
             examples.forEach((example, index) => {
-                logger.debug(`example ${index + 1}: input: "${example.input.content}", output: "${example.output.content}"`);
+                logger.verbose(`example ${index + 1}: input: "${example.input.content}", output: "${example.output.content}"`);
             });
         }
         
@@ -207,10 +207,10 @@ class PalmChatPlugin extends ModelPlugin {
                 const { length, units } = this.getLength(message.content);
                 const preview = words.length < 41 ? message.content : words.slice(0, 20).join(" ") + " ... " + words.slice(-20).join(" ");
     
-                logger.debug(`message ${index + 1}: author: ${message.author}, ${units}: ${length}, content: "${preview}"`);
+                logger.verbose(`message ${index + 1}: author: ${message.author}, ${units}: ${length}, content: "${preview}"`);
             });
         } else if (messages && messages.length === 1) {
-            logger.debug(`${messages[0].content}`);
+            logger.verbose(`${messages[0].content}`);
         }
 
         const safetyAttributes = this.getSafetyAttributes(responseData);
@@ -218,7 +218,7 @@ class PalmChatPlugin extends ModelPlugin {
         const responseText = this.parseResponse(responseData);
         const { length, units } = this.getLength(responseText);
         logger.info(`[response received containing ${length} ${units}]`);
-        logger.debug(`${responseText}`);
+        logger.verbose(`${responseText}`);
 
         if (safetyAttributes) {
             logger.warn(`[response contains safety attributes: ${JSON.stringify(safetyAttributes, null, 2)}]`);

package/server/plugins/palmCompletionPlugin.js

@@ -114,13 +114,13 @@ class PalmCompletionPlugin extends ModelPlugin {
         if (modelInput) {
             const { length, units } = this.getLength(modelInput);
             logger.info(`[request sent containing ${length} ${units}]`);
-            logger.debug(`${modelInput}`);
+            logger.verbose(`${modelInput}`);
         }
 
         const responseText = this.parseResponse(responseData);
         const { length, units } = this.getLength(responseText);
         logger.info(`[response received containing ${length} ${units}]`);
-        logger.debug(`${responseText}`);
+        logger.verbose(`${responseText}`);
 
         if (safetyAttributes) {
             logger.warn(`[response contains safety attributes: ${JSON.stringify(safetyAttributes, null, 2)}]`);