@aj-archipelago/cortex 0.0.9 → 0.0.11

package/graphql/plugins/openAiCompletionPlugin.js

@@ -1,6 +1,7 @@
 // OpenAICompletionPlugin.js
-const ModelPlugin = require('./modelPlugin');
-const { encode } = require("gpt-3-encoder");
+import ModelPlugin from './modelPlugin.js';
+
+import { encode } from 'gpt-3-encoder';
 
 class OpenAICompletionPlugin extends ModelPlugin {
     constructor(config, pathway) {
@@ -16,7 +17,7 @@ class OpenAICompletionPlugin extends ModelPlugin {
         let requestParameters = {};
     
         if (modelPromptMessages) {
-            const requestMessages = this.removeMessagesUntilTarget(modelPromptMessages, modelMaxTokenLength - 1);
+            const requestMessages = this.truncateMessagesToTargetLength(modelPromptMessages, modelMaxTokenLength - 1);
             modelPromptMessagesML = this.messagesToChatML(requestMessages);
             tokenLength = encode(modelPromptMessagesML).length;
         
@@ -66,5 +67,5 @@ class OpenAICompletionPlugin extends ModelPlugin {
     }
 }
 
-module.exports = OpenAICompletionPlugin;
+export default OpenAICompletionPlugin;
 

package/graphql/plugins/openAiWhisperPlugin.js

@@ -1,9 +1,10 @@
 // OpenAICompletionPlugin.js
-const ModelPlugin = require('./modelPlugin');
-const FormData = require('form-data');
-const fs = require('fs');
-const { splitMediaFile, isValidYoutubeUrl, processYoutubeUrl, deleteTempPath } = require('../../lib/fileChunker');
-const pubsub = require('../pubsub');
+import ModelPlugin from './modelPlugin.js';
+
+import FormData from 'form-data';
+import fs from 'fs';
+import { splitMediaFile, isValidYoutubeUrl, processYoutubeUrl, deleteTempPath } from '../../lib/fileChunker.js';
+import pubsub from '../pubsub.js';
 
 class OpenAIWhisperPlugin extends ModelPlugin {
     constructor(config, pathway) {
@@ -87,5 +88,5 @@ class OpenAIWhisperPlugin extends ModelPlugin {
     }
 }
 
-module.exports = OpenAIWhisperPlugin;
+export default OpenAIWhisperPlugin;
 

package/graphql/prompt.js

@@ -43,4 +43,4 @@ function promptContains(variable, prompt) {
     return variables.includes(variable);
 }
 
-module.exports = { Prompt, promptContains };
+export { Prompt, promptContains };

package/graphql/pubsub.js

@@ -1,4 +1,4 @@
-const { PubSub } = require('graphql-subscriptions');
+import { PubSub } from 'graphql-subscriptions';
 const pubsub = new PubSub();
 
-module.exports = pubsub;
+export default pubsub;

package/graphql/requestState.js

@@ -1,5 +1,5 @@
 const requestState = {}; // Stores the state of each request
 
-module.exports = {
+export {
     requestState
 };

package/graphql/resolver.js

@@ -1,5 +1,5 @@
-const { fulfillWithTimeout } = require("../lib/promiser");
-const { PathwayResolver } = require("./pathwayResolver");
+import { fulfillWithTimeout } from '../lib/promiser.js';
+import { PathwayResolver } from './pathwayResolver.js';
 
 // This resolver uses standard parameters required by Apollo server:
 // (parent, args, contextValue, info)
@@ -38,6 +38,6 @@ const cancelRequestResolver = (parent, args, contextValue, info) => {
     return true
 }
 
-module.exports = {
+export {
     resolver, rootResolver, cancelRequestResolver
-}
+};

package/graphql/subscriptions.js

@@ -2,9 +2,10 @@
 //       multi-server instance
 // See https://www.apollographql.com/docs/apollo-server/v3/data/subscriptions/#resolving-a-subscription
 
-const pubsub = require("./pubsub");
-const { withFilter } = require("graphql-subscriptions");
-const { requestState } = require("./requestState");
+import pubsub from './pubsub.js';
+
+import { withFilter } from 'graphql-subscriptions';
+import { requestState } from './requestState.js';
 
 const subscriptions = {
     requestProgress: {
@@ -31,4 +32,4 @@ const subscriptions = {
     },
 };
 
-module.exports = subscriptions;
+export default subscriptions;

package/graphql/typeDef.js

@@ -3,59 +3,59 @@ const GRAPHQL_TYPE_MAP = {
     string: 'String',
     number: 'Int',
   };
-  
-  const typeDef = (pathway) => {
-    const { name, objName, defaultInputParameters, inputParameters, format } = pathway;
-  
-    const fields = format ? format.match(/\b(\w+)\b/g) : null;
-    const fieldsStr = !fields ? `` : fields.map((f) => `${f}: String`).join('\n    ');
-  
-    const typeName = fields ? `${objName}Result` : `String`;
-    const messageType = `input Message { role: String, content: String }`;
-  
-    const type = fields ? `type ${typeName} {
-      ${fieldsStr}
-      }` : ``;
-  
-    const resultStr = pathway.list ? `[${typeName}]` : typeName;
-  
-    const responseType = `type ${objName} {
-          debug: String
-          result: ${resultStr}
-          previousResult: String
-          warnings: [String]
-          contextId: String
-  }`;
-  
-    const params = { ...defaultInputParameters, ...inputParameters };
-  
-    const paramsStr = Object.entries(params)
-      .map(([key, value]) => {
-        if (typeof value === 'object' && Array.isArray(value)) {
-          return `${key}: [Message] = []`;
-        } else {
-          return `${key}: ${GRAPHQL_TYPE_MAP[typeof value]} = ${
-            typeof value === 'string' ? `"${value}"` : value
-          }`;
-        }
-      })
-      .join('\n');
-  
-    const restDefinition = Object.entries(params).map(([key, value]) => {
-      return {
-        name: key,
-        type: `${GRAPHQL_TYPE_MAP[typeof value]}${typeof value === 'object' && Array.isArray(value) ? '[]' : ''}`,
-      };
-    });
-  
-    const gqlDefinition = `${messageType}\n\n${type}\n\n${responseType}\n\nextend type Query {${name}(${paramsStr}): ${objName}}`;
-  
+
+const typeDef = (pathway) => {
+  const { name, objName, defaultInputParameters, inputParameters, format } = pathway;
+
+  const fields = format ? format.match(/\b(\w+)\b/g) : null;
+  const fieldsStr = !fields ? `` : fields.map((f) => `${f}: String`).join('\n    ');
+
+  const typeName = fields ? `${objName}Result` : `String`;
+  const messageType = `input Message { role: String, content: String }`;
+
+  const type = fields ? `type ${typeName} {
+    ${fieldsStr}
+    }` : ``;
+
+  const resultStr = pathway.list ? `[${typeName}]` : typeName;
+
+  const responseType = `type ${objName} {
+        debug: String
+        result: ${resultStr}
+        previousResult: String
+        warnings: [String]
+        contextId: String
+}`;
+
+  const params = { ...defaultInputParameters, ...inputParameters };
+
+  const paramsStr = Object.entries(params)
+    .map(([key, value]) => {
+      if (typeof value === 'object' && Array.isArray(value)) {
+        return `${key}: [Message] = []`;
+      } else {
+        return `${key}: ${GRAPHQL_TYPE_MAP[typeof value]} = ${
+          typeof value === 'string' ? `"${value}"` : value
+        }`;
+      }
+    })
+    .join('\n');
+
+  const restDefinition = Object.entries(params).map(([key, value]) => {
     return {
-      gqlDefinition,
-      restDefinition,
+      name: key,
+      type: `${GRAPHQL_TYPE_MAP[typeof value]}${typeof value === 'object' && Array.isArray(value) ? '[]' : ''}`,
     };
+  });
+
+  const gqlDefinition = `${messageType}\n\n${type}\n\n${responseType}\n\nextend type Query {${name}(${paramsStr}): ${objName}}`;
+
+  return {
+    gqlDefinition,
+    restDefinition,
   };
-  
-  module.exports = {
-    typeDef,
-  };
+};
+
+export {
+  typeDef,
+};

package/index.js

@@ -1,7 +1,7 @@
-const { config } = require('./config');
-const { build } = require('./graphql/graphql');
+import { config } from './config.js';
+import { build } from './graphql/graphql.js';
 
-module.exports = (configParams) => {
+export default async (configParams) => {
     configParams && config.load(configParams);
-    return build(config);
-}
+    return await build(config);
+};

package/lib/fileChunker.js

@@ -1,14 +1,18 @@
-const fs = require('fs');
-const ffmpegPath = require('@ffmpeg-installer/ffmpeg').path;
-const ffmpeg = require('fluent-ffmpeg');
+import fs from 'fs';
+import { path as ffmpegPath } from '@ffmpeg-installer/ffmpeg';
+import ffmpeg from 'fluent-ffmpeg';
 ffmpeg.setFfmpegPath(ffmpegPath);
-const path = require('path');
-const { v4: uuidv4 } = require('uuid');
-const os = require('os');
-const util = require('util');
+import path from 'path';
+import { v4 as uuidv4 } from 'uuid';
+import os from 'os';
+import util from 'util';
+import { pipeline } from 'stream';
+
 const ffmpegProbe = util.promisify(ffmpeg.ffprobe);
-const pipeline = util.promisify(require('stream').pipeline);
-const ytdl = require('ytdl-core');
+
+const cPipeline = util.promisify(pipeline);
+
+import ytdl from 'ytdl-core';
 
 
 async function processChunk(inputPath, outputFileName, start, duration) {
@@ -117,7 +121,7 @@ function convertYoutubeToMp3Stream(video) {
 
 async function pipeStreamToFile(stream, filePath) {
     try {
-        await pipeline(stream, fs.createWriteStream(filePath));
+        await cPipeline(stream, fs.createWriteStream(filePath));
         console.log('Stream piped to file successfully.');
     } catch (error) {
         console.error(`Error piping stream to file: ${error.message}`);
@@ -151,6 +155,6 @@ function deleteFile(filePath) {
     }
 }
 
-module.exports = {
+export {
     splitMediaFile, deleteTempPath, processYoutubeUrl, isValidYoutubeUrl
 };

package/lib/keyValueStorageClient.js

@@ -1,5 +1,5 @@
-const Keyv = require('keyv');
-const { config } = require('../config');
+import Keyv from 'keyv';
+import { config } from '../config.js';
 
 const storageConnectionString = config.get('storageConnectionString');
 
@@ -18,15 +18,15 @@ const keyValueStorageClient = new Keyv(storageConnectionString, {
 
 // Set values to keyv
 async function setv(key, value) {
-    return (keyValueStorageClient && await keyValueStorageClient.set(key, value));
+    return keyValueStorageClient && (await keyValueStorageClient.set(key, value));
 }
 
 // Get values from keyv
 async function getv(key) {
-    return (keyValueStorageClient && await keyValueStorageClient.get(key));
+    return keyValueStorageClient && (await keyValueStorageClient.get(key));
 }
 
-module.exports = {
+export {
     keyValueStorageClient,
     setv,
     getv

package/lib/promiser.js

@@ -19,6 +19,6 @@ const fulfillWithTimeout = (promise, timeout) => {
 };
 
 
-module.exports = {
+export {
     fulfillWithTimeout
-}
+};

package/lib/request.js

@@ -1,12 +1,14 @@
-const Bottleneck = require("bottleneck/es5");
-const RequestMonitor = require('./requestMonitor');
-const { config } = require('../config');
-let axios = require('axios');
+import Bottleneck from 'bottleneck/es5.js';
+import RequestMonitor from './requestMonitor.js';
+import { config } from '../config.js';
+import axios from 'axios';
+import { setupCache } from 'axios-cache-interceptor';
+
+let cortexAxios = axios;
 
 if (config.get('enableCache')) {
     // Setup cache
-    const { setupCache } = require('axios-cache-interceptor');
-    axios = setupCache(axios, {
+    cortexAxios = setupCache(axios, {
         // enable cache for all requests by default
         methods: ['get', 'post', 'put', 'delete', 'patch'],
         interpretHeader: false,
@@ -57,7 +59,7 @@ setInterval(() => {
 const postWithMonitor = async (model, url, data, axiosConfigObj) => {
     const monitor = monitors[model];
     monitor.incrementCallCount();
-    return axios.post(url, data, axiosConfigObj);
+    return cortexAxios.post(url, data, axiosConfigObj);
 }
 
 const MAX_RETRY = 10;
@@ -103,6 +105,6 @@ const request = async (params, model) => {
     return data;
 }
 
-module.exports = {
+export {
     request, postRequest, buildLimiters
-}
+};

package/lib/requestMonitor.js

@@ -38,6 +38,6 @@ class RequestMonitor {
       this.startTime = new Date();
     }
   }
-  
-  module.exports = RequestMonitor;
+
+export default RequestMonitor;
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Cortex is a GraphQL API for AI. It provides a simple, extensible interface for using AI services from OpenAI, Azure and others.",
   "repository": {
     "type": "git",
@@ -21,10 +21,11 @@
   "main": "index.js",
   "scripts": {
     "start": "node start.js",
-    "test": "jest --setupFiles dotenv/config"
+    "test": "ava"
   },
   "author": "",
   "license": "MIT",
+  "type": "module",
   "homepage": "https://github.com/aj-archipelago/cortex#readme",
   "dependencies": {
     "@apollo/utils.keyvadapter": "^1.1.2",
@@ -49,14 +50,23 @@
     "graphql-ws": "^5.11.2",
     "handlebars": "^4.7.7",
     "keyv": "^4.5.2",
+    "langchain": "^0.0.47",
     "ws": "^8.12.0",
     "ytdl-core": "^4.11.2"
   },
   "devDependencies": {
-    "dotenv": "^16.0.3",
-    "jest": "^29.3.1"
+    "ava": "^5.2.0",
+    "dotenv": "^16.0.3"
   },
   "publishConfig": {
-    "access": "private"
+    "access": "restricted"
+  },
+  "ava": {
+    "files": [
+      "tests/**/*.test.js"
+    ],
+    "require": [
+      "dotenv/config"
+    ]
   }
 }

package/pathways/basePathway.js

@@ -1,8 +1,8 @@
-const { rootResolver, resolver } = require("../graphql/resolver");
-const { typeDef } = require('../graphql/typeDef')
+import { rootResolver, resolver } from '../graphql/resolver.js';
+import { typeDef } from '../graphql/typeDef.js';
 
 // all default definitions of a single pathway
-module.exports = {
+export default {
     prompt: `{{text}}`,
     defaultInputParameters: {
         text: ``,
@@ -19,4 +19,5 @@ module.exports = {
     useInputSummarization: false,    
     truncateFromFront: false,
     timeout: 120, // in seconds
-}
+};
+

package/pathways/bias.js

@@ -2,9 +2,9 @@
 // Objectivity analysis of text
 // This module exports a prompt that analyzes the given text and determines if it's written objectively. It also provides a detailed explanation of the decision.
 
-module.exports = {
+export default {
     // Uncomment the following line to enable caching for this prompt, if desired.
     // enableCache: true,
     
     prompt: `{{text}}\n\nIs the above text written objectively?  Why or why not, explain with details:\n`
-}
+};

package/pathways/chat.js

@@ -2,7 +2,7 @@
 // Simple context-aware chat bot
 // This is a two prompt implementation of a context aware chat bot. The first prompt generates content that will be stored in the previousResult variable and will be returned to the client. In the optimum implementation, the client will then update their chatContext variable for the next call. The second prompt actually responds to the user. The second prompt *could* use previousResult instead of chatContext, but in this situation previousResult will also include the current turn of the conversation to which it is responding. That can get a little confusing as it tends to overemphasize the current turn in the response.
 
-module.exports = {
+export default {
     prompt:
         [
             `{{{chatContext}}}\n\n{{{text}}}\n\nGiven the information above, create a short summary of the conversation to date making sure to include all of the personal details about the user that you encounter:\n\n`,            
@@ -12,4 +12,5 @@ module.exports = {
         chatContext: `User: Starting conversation.`,
     },
     useInputChunking: false,
-}
+};
+

package/pathways/complete.js

@@ -2,6 +2,8 @@
 // Text completion module
 // This module exports a prompt that takes an input text and completes it by generating a continuation of the given text.
 
-module.exports = {
+export default {
     prompt: `Continue and complete the following:\n\n{{text}}`
-}
+};
+
+

package/pathways/edit.js

@@ -2,9 +2,10 @@
 // Grammar and spelling correction module
 // This module exports a prompt that takes an input text and corrects all spelling and grammar errors found within the text.
 
-module.exports = {
+export default {
     // Set the temperature to 0 to favor more deterministic output when generating corrections.
     temperature: 0,
 
     prompt: `Correct all spelling and grammar errors in the input text.\n\nInput:\n{{text}}\n\nOutput:\n`
-}
+};
+

package/pathways/entities.js

@@ -2,7 +2,7 @@
 // Entity extraction module
 // This module exports a prompt that takes an input text and extracts the top entities and their definitions as specified by the count parameter.
 
-module.exports = {
+export default {
     // Set the temperature to 0 to favor more deterministic output when generating entity extraction.
     temperature: 0,
 
@@ -18,4 +18,5 @@ module.exports = {
 
     // Set the list option to true as the prompt is expected to return a list of entities.
     list: true,
-}
+};
+

package/pathways/index.js

@@ -1,12 +1,25 @@
-module.exports = {
-    "edit": require('./edit'),
-    "chat": require('./chat'),
-    "bias": require('./bias'),
-    "complete": require('./complete'),
-    "entities": require('./entities'),
-    "paraphrase": require('./paraphrase'),
-    "sentiment": require('./sentiment'),
-    "summary": require('./summary'),
-    "transcribe": require('./transcribe'),
-    "translate": require('./translate'),
-}
+import edit from './edit.js';
+import chat from './chat.js';
+import bias from './bias.js';
+import complete from './complete.js';
+import entities from './entities.js';
+import lc_test from './lc_test.mjs';
+import paraphrase from './paraphrase.js';
+import sentiment from './sentiment.js';
+import summary from './summary.js';
+import transcribe from './transcribe.js';
+import translate from './translate.js';
+
+export {
+    edit,
+    chat,
+    bias,
+    complete,
+    entities,
+    lc_test,
+    paraphrase,
+    sentiment,
+    summary,
+    transcribe,
+    translate
+};

package/pathways/lc_test.mjs

@@ -0,0 +1,99 @@
+// lc_test.js
+// LangChain Cortex integration test
+
+// Import required modules
+import { OpenAI } from "langchain/llms";
+import { PromptTemplate } from "langchain/prompts";
+import { LLMChain, ConversationChain } from "langchain/chains";
+import { initializeAgentExecutor } from "langchain/agents";
+import { SerpAPI, Calculator } from "langchain/tools";
+import { BufferMemory } from "langchain/memory";
+
+export default {
+
+    // Agent test case
+    resolver: async (parent, args, contextValue, info) => {
+
+        const { config } = contextValue;
+        const openAIApiKey = config.get('openaiApiKey');
+        const serpApiKey = config.get('serpApiKey');
+
+        const model = new OpenAI({ openAIApiKey: openAIApiKey, temperature: 0 });
+        const tools = [new SerpAPI( serpApiKey ), new Calculator()];
+
+        const executor = await initializeAgentExecutor(
+            tools,
+            model,
+            "zero-shot-react-description"
+            );
+
+        console.log(`====================`);
+        console.log("Loaded langchain agent.");
+        const input = args.text;
+        console.log(`Executing with input "${input}"...`);
+        const result = await executor.call({ input });
+        console.log(`Got output ${result.output}`);
+        console.log(`====================`);
+
+        return result?.output;
+    },
+
+    /*
+    // Agent test case
+    resolver: async (parent, args, contextValue, info) => {
+
+        const { config } = contextValue;
+        const openAIApiKey = config.get('openaiApiKey');
+        const serpApiKey = config.get('serpApiKey');
+
+        const model = new OpenAI({ openAIApiKey: openAIApiKey, temperature: 0 });
+        const tools = [new SerpAPI( serpApiKey ), new Calculator()];
+
+        const executor = await initializeAgentExecutor(
+            tools,
+            model,
+            "zero-shot-react-description"
+            );
+
+        console.log(`====================`);
+        console.log("Loaded langchain agent.");
+        const input = args.text;
+        console.log(`Executing with input "${input}"...`);
+        const result = await executor.call({ input });
+        console.log(`Got output ${result.output}`);
+        console.log(`====================`);
+
+        return result?.output;
+    },
+    */
+    // Simplest test case
+    /*
+    resolver: async (parent, args, contextValue, info) => {
+     
+        const { config } = contextValue;
+        const openAIApiKey = config.get('openaiApiKey');
+
+        const model = new OpenAI({ openAIApiKey: openAIApiKey, temperature: 0.9 });
+
+        const template = "What is a good name for a company that makes {product}?";
+
+        const prompt = new PromptTemplate({
+            template: template,
+            inputVariables: ["product"],
+        });
+
+        const chain = new LLMChain({ llm: model, prompt: prompt });  
+
+        console.log(`====================`);
+        console.log(`Calling langchain with prompt: ${prompt?.template}`);
+        console.log(`Input text: ${args.text}`);
+        const res = await chain.call({ product: args.text });
+        console.log(`Result: ${res?.text}`);
+        console.log(`====================`);     
+
+        return res?.text?.trim();
+    },
+    */
+};
+
+