@aj-archipelago/cortex 1.1.26 → 1.1.28

package/helper-apps/cortex-file-handler/blobHandler.js

@@ -1,6 +1,6 @@
 import fs from "fs";
 import path from "path";
-import { BlobServiceClient } from "@azure/storage-blob";
+import { generateBlobSASQueryParameters, StorageSharedKeyCredential, BlobServiceClient } from "@azure/storage-blob";
 import { v4 as uuidv4 } from "uuid";
 import Busboy from "busboy";
 import { PassThrough } from "stream";
@@ -53,6 +53,7 @@ function isBase64(str) {
   }
 }
 
+const { SAS_TOKEN_LIFE_DAYS = 30 } = process.env;
 const GCP_SERVICE_ACCOUNT_KEY =
   process.env.GCP_SERVICE_ACCOUNT_KEY_BASE64 ||
   process.env.GCP_SERVICE_ACCOUNT_KEY ||
@@ -138,6 +139,7 @@ async function saveFileToBlob(chunkPath, requestId) {
   const { containerClient } = await getBlobClient();
   // Use the filename with a UUID as the blob name
   const blobName = `${requestId}/${uuidv4()}_${encodeURIComponent(path.basename(chunkPath))}`;
+  const sasToken = generateSASToken(containerClient, blobName);
 
   // Create a read stream for the chunk file
   const fileStream = fs.createReadStream(chunkPath);
@@ -147,10 +149,28 @@ async function saveFileToBlob(chunkPath, requestId) {
   await blockBlobClient.uploadStream(fileStream);
 
   // Return the full URI of the uploaded blob
-  const blobUrl = blockBlobClient.url;
+  const blobUrl = `${blockBlobClient.url}?${sasToken}`;
   return blobUrl;
 }
 
+const generateSASToken = (containerClient, blobName, expiryTimeSeconds = 
+    parseInt(SAS_TOKEN_LIFE_DAYS) * 24 * 60 * 60
+) => {
+  const { accountName, accountKey } = containerClient.credential;
+  const sharedKeyCredential = new StorageSharedKeyCredential(accountName, accountKey);
+
+  const sasOptions = {
+    containerName: containerClient.containerName,
+    blobName: blobName,
+    permissions: "r", // Read permission
+    startsOn: new Date(),
+    expiresOn: new Date(new Date().valueOf() + expiryTimeSeconds * 1000)
+  };
+
+  const sasToken = generateBlobSASQueryParameters(sasOptions, sharedKeyCredential).toString();
+  return sasToken;
+};
+
 //deletes blob that has the requestId
 async function deleteBlob(requestId) {
   if (!requestId) throw new Error("Missing requestId parameter");
@@ -271,8 +291,9 @@ async function uploadFile(context, requestId, body, saveToLocal, useGoogle, file
     await blockBlobClient.uploadStream(passThroughStream, undefined, undefined, options);
 
     const message = `File '${encodedFilename}' uploaded successfully.`;
-    const url = blockBlobClient.url;
     context.log(message);
+    const sasToken = generateSASToken(containerClient, encodedFilename);
+    const url = `${blockBlobClient.url}?${sasToken}`;
     body = { message, url };
   }
 

package/helper-apps/cortex-file-handler/fileChunker.js

@@ -118,7 +118,8 @@ const ytdlDownload = async (url, filename, video = false) => {
             ? { filter: 'audioandvideo' }  // audio and video
             : { quality: 'highestaudio' }; // audio only
 
-        const videoStream = ytdl(url, videoOptions);
+        const encodedUrl = encodeURI(url);
+        const videoStream = ytdl(encodedUrl, videoOptions);
         let lastLoggedTime = Date.now();
 
         videoStream.on('error', (error) => {

package/helper-apps/cortex-file-handler/package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "dependencies": {
         "@azure/storage-blob": "^12.13.0",
-        "@distube/ytdl-core": "^4.13.5",
+        "@distube/ytdl-core": "^4.14.3",
         "@google-cloud/storage": "^7.10.0",
         "axios": "^1.3.6",
         "busboy": "^1.6.0",
@@ -158,19 +158,19 @@
       }
     },
     "node_modules/@distube/ytdl-core": {
-      "version": "4.13.5",
-      "resolved": "https://registry.npmjs.org/@distube/ytdl-core/-/ytdl-core-4.13.5.tgz",
-      "integrity": "sha512-g+4UJIR/auAJbia7iB0aWvaJDbs22P53NySWa47b1NT4xMTDJYguxHFArPrvRkcJrb/AgKjv/XoSZGghpL0CJA==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@distube/ytdl-core/-/ytdl-core-4.14.3.tgz",
+      "integrity": "sha512-z6i5EVGEuKhuvuRNyIqafBSs5aRA28HssnWehCRhEtYrxeFgXImfmpKTjUusHYU5vQt1swSVPVb2JCd22P0CPA==",
       "dependencies": {
         "http-cookie-agent": "^6.0.5",
         "m3u8stream": "^0.8.6",
         "miniget": "^4.2.3",
         "sax": "^1.4.1",
         "tough-cookie": "^4.1.4",
-        "undici": "^6.19.2"
+        "undici": "five"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=14.0"
       },
       "funding": {
         "url": "https://github.com/distubejs/ytdl-core?sponsor"
@@ -3073,16 +3073,16 @@
       }
     },
     "@distube/ytdl-core": {
-      "version": "4.13.5",
-      "resolved": "https://registry.npmjs.org/@distube/ytdl-core/-/ytdl-core-4.13.5.tgz",
-      "integrity": "sha512-g+4UJIR/auAJbia7iB0aWvaJDbs22P53NySWa47b1NT4xMTDJYguxHFArPrvRkcJrb/AgKjv/XoSZGghpL0CJA==",
+      "version": "4.14.3",
+      "resolved": "https://registry.npmjs.org/@distube/ytdl-core/-/ytdl-core-4.14.3.tgz",
+      "integrity": "sha512-z6i5EVGEuKhuvuRNyIqafBSs5aRA28HssnWehCRhEtYrxeFgXImfmpKTjUusHYU5vQt1swSVPVb2JCd22P0CPA==",
       "requires": {
         "http-cookie-agent": "^6.0.5",
         "m3u8stream": "^0.8.6",
         "miniget": "^4.2.3",
         "sax": "^1.4.1",
         "tough-cookie": "^4.1.4",
-        "undici": "^6.19.2"
+        "undici": "five"
       }
     },
     "@google-cloud/paginator": {

package/helper-apps/cortex-file-handler/package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@azure/storage-blob": "^12.13.0",
-    "@distube/ytdl-core": "^4.13.5",
+    "@distube/ytdl-core": "^4.14.3",
     "@google-cloud/storage": "^7.10.0",
     "axios": "^1.3.6",
     "busboy": "^1.6.0",

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}`);
                                 }
                             }
 

package/package.json

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