@aj-archipelago/cortex 1.1.4-0 → 1.1.4

package/README.md

@@ -422,7 +422,7 @@ Configuration of Cortex is done via a [convict](https://github.com/mozilla/node-
 - `enableCache`: A boolean flag indicating whether to enable Axios-level request caching. Default is true. The value can be set using the `CORTEX_ENABLE_CACHE` environment variable.
 - `enableGraphqlCache`: A boolean flag indicating whether to enable GraphQL query caching. Default is false. The value can be set using the `CORTEX_ENABLE_GRAPHQL_CACHE` environment variable.
 - `enableRestEndpoints`: A boolean flag indicating whether create REST endpoints for pathways as well as GraphQL queries. Default is false. The value can be set using the `CORTEX_ENABLE_REST` environment variable.
-- `cortexApiKey`: A string containing an API key that the client must pass to Cortex for authorization. Default is null in which case Cortex is unprotected. The value can be set using the `CORTEX_API_KEY` environment variable
+- `cortexApiKeys`: A string containing one or more comma separated API keys that the client must pass to Cortex for authorization. Default is null in which case Cortex is unprotected. The value can be set using the `CORTEX_API_KEY` environment variable
 - `models`: An object containing the different models used by the project. The value can be set using the `CORTEX_MODELS` environment variable. Cortex is model and vendor agnostic - you can use this config to set up models of any type from any vendor.
 - `openaiApiKey`: The API key used for accessing the OpenAI API. This is sensitive information and has no default value. The value can be set using the `OPENAI_API_KEY` environment variable.
 - `openaiApiUrl`: The URL used for accessing the OpenAI API. Default is https://api.openai.com/v1/completions. The value can be set using the `OPENAI_API_URL` environment variable.

package/config.js

@@ -8,6 +8,18 @@ import logger from './lib/logger.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
+convict.addFormat({
+    name: 'string-array',
+    validate: function(val) {
+      if (!Array.isArray(val)) {
+        throw new Error('must be of type Array');
+      }
+    },
+    coerce: function(val) {
+      return val.split(',');
+    },
+});
+
 // Schema for config
 var config = convict({
     env: {
@@ -30,8 +42,8 @@ var config = convict({
         default: path.join(__dirname, 'pathways'),
         env: 'CORTEX_CORE_PATHWAYS_PATH'
     },
-    cortexApiKey: {
-        format: String,
+    cortexApiKeys: {
+        format: 'string-array',
         default: null,
         env: 'CORTEX_API_KEY',
         sensitive: true
@@ -264,7 +276,7 @@ const buildPathways = async (config) => {
 
 // Build and load models to config
 const buildModels = (config) => {
-    let { models } = config.getProperties();
+    const { models } = config.getProperties();
 
     // iterate over each model
     for (let [key, model] of Object.entries(models)) {

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

@@ -113,7 +113,9 @@ async function splitMediaFile(inputPath, chunkDurationInSeconds = 600) {
 
         return { chunkPromises, uniqueOutputPath };
     } catch (err) {
-        console.error('Error occurred during the splitting process:', err);
+        const msg = `Error processing media file, check if the file is a valid media file or is accessible`;
+        console.error(msg, err);
+        throw new Error(msg);
     }
 }
 

package/package.json

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

@@ -97,7 +97,7 @@ const getResolvers = (config, pathways) => {
             // add shared state to contextValue
             contextValue.pathway = pathway;
             contextValue.config = config;
-                        return pathway.rootResolver(parent, args, contextValue, info);
+            return pathway.rootResolver(parent, args, contextValue, info);
         }
     }
 
@@ -176,8 +176,8 @@ const build = async (config) => {
     });
 
     // If CORTEX_API_KEY is set, we roll our own auth middleware - usually not used if you're being fronted by a proxy
-    const cortexApiKey = config.get('cortexApiKey');
-    if (cortexApiKey) {
+    const cortexApiKeys = config.get('cortexApiKeys');
+    if (cortexApiKeys  && Array.isArray(cortexApiKeys)) {
         app.use((req, res, next) => {
             let providedApiKey = req.headers['cortex-api-key'] || req.query['cortex-api-key'];
             if (!providedApiKey) {
@@ -185,7 +185,7 @@ const build = async (config) => {
                 providedApiKey = providedApiKey?.startsWith('Bearer ') ? providedApiKey.slice(7) : providedApiKey;
             }
 
-            if (cortexApiKey && cortexApiKey !== providedApiKey) {
+            if (!cortexApiKeys.includes(providedApiKey)) {
                 if (req.baseUrl === '/graphql' || req.headers['content-type'] === 'application/graphql') {
                     res.status(401)
                     .set('WWW-Authenticate', 'Cortex-Api-Key')

package/server/plugins/openAiWhisperPlugin.js

@@ -289,7 +289,7 @@ class OpenAIWhisperPlugin extends ModelPlugin {
             }
 
         } catch (error) {
-            const errMsg = `Transcribe error: ${error?.message || error}`;
+            const errMsg = `Transcribe error: ${error?.response?.data || error?.message || error}`;
             logger.error(errMsg);
             return errMsg;
         }