@aj-archipelago/cortex 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "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",

package/server/plugins/azureTranslatePlugin.js

@@ -24,8 +24,9 @@ class AzureTranslatePlugin extends ModelPlugin {
     }
 
     // Execute the request to the Azure Translate API
-    async execute(text, parameters, prompt) {
+    async execute(text, parameters, prompt, pathwayResolver) {
         const requestParameters = this.getRequestParameters(text, parameters, prompt);
+        const requestId = pathwayResolver?.requestId;
 
         const url = this.requestUrl(text);
 
@@ -33,7 +34,7 @@ class AzureTranslatePlugin extends ModelPlugin {
         const params = requestParameters.params;
         const headers = this.model.headers || {};
 
-        return this.executeRequest(url, data, params, headers, prompt);
+        return this.executeRequest(url, data, params, headers, prompt, requestId);
     }
     
     // Parse the response from the Azure Translate API
@@ -47,8 +48,7 @@ class AzureTranslatePlugin extends ModelPlugin {
     
     // Override the logging function to display the request and response
     logRequestData(data, responseData, prompt) {
-        const separator = `\n=== ${this.pathwayName}.${this.requestCount++} ===\n`;
-        console.log(separator);
+        this.logAIRequestFinished();
     
         const modelInput = data[0].Text;
     

package/server/plugins/modelPlugin.js

@@ -30,7 +30,8 @@ class ModelPlugin {
             }
         }
 
-        this.requestCount = 1;
+        this.requestCount = 0;
+        this.lastRequestStartTime = new Date();
         this.shouldCache = config.get('enableCache') && (pathway.enableCache || pathway.temperature == 0);
     }
 
@@ -199,10 +200,24 @@ class ModelPlugin {
     parseResponse(data) { return data; };
 
     // Default simple logging
+    logRequestStart(url, data) {
+        this.requestCount++;
+        const logMessage = `>>> [${this.requestId}: ${this.pathwayName}.${this.requestCount}] request`;
+        const header = '>'.repeat(logMessage.length);
+        console.log(`\n${header}\n${logMessage}`);
+        console.log(`>>> Making API request to ${url}`);
+    };
+
+    logAIRequestFinished() {
+        const currentTime = new Date();
+        const timeElapsed = (currentTime - this.lastRequestStartTime) / 1000;
+        const logMessage = `<<< [${this.requestId}: ${this.pathwayName}.${this.requestCount}] response - complete in ${timeElapsed}s - data:`;
+        const header = '<'.repeat(logMessage.length);
+        console.log(`\n${header}\n${logMessage}\n`);
+    };
+
     logRequestData(data, responseData, prompt) {
-        const separator = `\n=== ${this.pathwayName}.${this.requestCount++} ===\n`;
-        console.log(separator);
-    
+        this.logAIRequestFinished(); 
         const modelInput = data.prompt || (data.messages && data.messages[0].content) || (data.length > 0 && data[0].Text) || null;
     
         if (modelInput) {
@@ -214,7 +229,10 @@ class ModelPlugin {
         prompt && prompt.debugInfo && (prompt.debugInfo += `${separator}${JSON.stringify(data)}`);
     }
     
-    async executeRequest(url, data, params, headers, prompt) {
+    async executeRequest(url, data, params, headers, prompt, requestId) {
+        this.aiRequestStartTime = new Date();
+        this.requestId = requestId;
+        this.logRequestStart(url, data);
         const responseData = await request({ url, data, params, headers, cache: this.shouldCache }, this.modelName);
         
         if (responseData.error) {

package/server/plugins/openAiChatPlugin.js

@@ -76,14 +76,15 @@ class OpenAIChatPlugin extends ModelPlugin {
     }
 
     // Execute the request to the OpenAI Chat API
-    async execute(text, parameters, prompt) {
+    async execute(text, parameters, prompt, pathwayResolver) {
         const url = this.requestUrl(text);
         const requestParameters = this.getRequestParameters(text, parameters, prompt);
+        const requestId = pathwayResolver?.requestId;
 
         const data = { ...(this.model.params || {}), ...requestParameters };
         const params = {};
         const headers = this.model.headers || {};
-        return this.executeRequest(url, data, params, headers, prompt);
+        return this.executeRequest(url, data, params, headers, prompt, requestId);
     }
 
     // Parse the response from the OpenAI Chat API
@@ -105,8 +106,7 @@ class OpenAIChatPlugin extends ModelPlugin {
 
     // Override the logging function to display the messages and responses
     logRequestData(data, responseData, prompt) {
-        const separator = `\n=== ${this.pathwayName}.${this.requestCount++} ===\n`;
-        console.log(separator);
+        this.logAIRequestFinished();
     
         const { stream, messages } = data;
         if (messages && messages.length > 1) {

package/server/plugins/openAiCompletionPlugin.js

@@ -1,5 +1,6 @@
 // OpenAICompletionPlugin.js
 
+import { request } from 'https';
 import ModelPlugin from './modelPlugin.js';
 import { encode } from 'gpt-3-encoder';
 
@@ -78,12 +79,13 @@ class OpenAICompletionPlugin extends ModelPlugin {
     async execute(text, parameters, prompt, pathwayResolver) {
         const url = this.requestUrl(text);
         const requestParameters = this.getRequestParameters(text, parameters, prompt, pathwayResolver);
-    
+        const requestId = pathwayResolver?.requestId;
+
         const data = { ...(this.model.params || {}), ...requestParameters };
         const params = {};
         const headers = this.model.headers || {};
         
-        return this.executeRequest(url, data, params, headers, prompt);
+        return this.executeRequest(url, data, params, headers, prompt, requestId);
     }
 
     // Parse the response from the OpenAI Completion API
@@ -105,8 +107,7 @@ class OpenAICompletionPlugin extends ModelPlugin {
 
     // Override the logging function to log the prompt and response
     logRequestData(data, responseData, prompt) {
-        const separator = `\n=== ${this.pathwayName}.${this.requestCount++} ===\n`;
-        console.log(separator);
+        this.logAIRequestFinished();
     
         const stream = data.stream;
         const modelInput = data.prompt;

package/server/plugins/palmChatPlugin.js

@@ -137,9 +137,10 @@ class PalmChatPlugin extends ModelPlugin {
     }
 
     // Execute the request to the PaLM Chat API
-    async execute(text, parameters, prompt) {
+    async execute(text, parameters, prompt, pathwayResolver) {
         const url = this.requestUrl(text);
         const requestParameters = this.getRequestParameters(text, parameters, prompt);
+        const requestId = pathwayResolver?.requestId;
 
         const data = { ...(this.model.params || {}), ...requestParameters };
         const params = {};
@@ -147,7 +148,7 @@ class PalmChatPlugin extends ModelPlugin {
         const gcpAuthTokenHelper = this.config.get('gcpAuthTokenHelper');
         const authToken = await gcpAuthTokenHelper.getAccessToken();
         headers.Authorization = `Bearer ${authToken}`;
-        return this.executeRequest(url, data, params, headers, prompt);
+        return this.executeRequest(url, data, params, headers, prompt, requestId);
     }
 
     // Parse the response from the PaLM Chat API
@@ -181,8 +182,7 @@ class PalmChatPlugin extends ModelPlugin {
 
     // Override the logging function to display the messages and responses
     logRequestData(data, responseData, prompt) {
-        const separator = `\n=== ${this.pathwayName}.${this.requestCount++} ===\n`;
-        console.log(separator);
+        this.logAIRequestFinished();
     
         const instances = data && data.instances;
         const messages = instances && instances[0] && instances[0].messages;

package/server/plugins/palmCompletionPlugin.js

@@ -55,6 +55,7 @@ class PalmCompletionPlugin extends ModelPlugin {
     async execute(text, parameters, prompt, pathwayResolver) {
         const url = this.requestUrl(text);
         const requestParameters = this.getRequestParameters(text, parameters, prompt, pathwayResolver);
+        const requestId = pathwayResolver?.requestId;
 
         const data = { ...requestParameters };
         const params = {};
@@ -62,7 +63,7 @@ class PalmCompletionPlugin extends ModelPlugin {
         const gcpAuthTokenHelper = this.config.get('gcpAuthTokenHelper');
         const authToken = await gcpAuthTokenHelper.getAccessToken();
         headers.Authorization = `Bearer ${authToken}`;
-        return this.executeRequest(url, data, params, headers, prompt);
+        return this.executeRequest(url, data, params, headers, prompt, requestId);
     }
 
     // Parse the response from the PaLM API Text Completion API
@@ -105,8 +106,7 @@ class PalmCompletionPlugin extends ModelPlugin {
 
     // Override the logging function to log the prompt and response
     logRequestData(data, responseData, prompt) {
-        const separator = `\n=== ${this.pathwayName}.${this.requestCount++} ===\n`;
-        console.log(separator);
+        this.logAIRequestFinished();
 
         const safetyAttributes = this.getSafetyAttributes(responseData);
 

package/server/rest.js

@@ -83,6 +83,7 @@ const processIncomingStream = (requestId, res, jsonResponse) => {
     
         //console.log(`REST SEND: data: [DONE]\n\n`);
         res.write(`data: [DONE]\n\n`);
+        res.end();
     }
 
     const sendStreamData = (data) => {

package/tests/modelPlugin.test.js

@@ -8,11 +8,10 @@ const DEFAULT_MAX_TOKENS = 4096;
 const DEFAULT_PROMPT_TOKEN_RATIO = 0.5;
 
 // Mock configuration and pathway objects
-const config = mockConfig;
-const pathway = mockPathwayString;
+const { config, pathway, modelName, model } = mockPathwayResolverString;
 
 test('ModelPlugin constructor', (t) => {
-    const modelPlugin = new ModelPlugin(mockPathwayResolverString);
+    const modelPlugin = new ModelPlugin(config, pathway, modelName, model);
 
     t.is(modelPlugin.modelName, pathway.model, 'modelName should be set from pathway');
     t.deepEqual(modelPlugin.model, config.get('models')[pathway.model], 'model should be set from config');
@@ -21,7 +20,7 @@ test('ModelPlugin constructor', (t) => {
 });
 
 test.beforeEach((t) => {
-  t.context.modelPlugin = new ModelPlugin(mockPathwayResolverString);
+  t.context.modelPlugin = new ModelPlugin(config, pathway, modelName, model);
 });
 
 test('getCompiledPrompt - text and parameters', (t) => {

package/tests/openAiChatPlugin.test.js

@@ -2,16 +2,18 @@ import test from 'ava';
 import OpenAIChatPlugin from '../server/plugins/openAiChatPlugin.js';
 import { mockPathwayResolverMessages } from './mocks.js';
 
+const { config, pathway, modelName, model } = mockPathwayResolverMessages;
+
 // Test the constructor
 test('constructor', (t) => {
-    const plugin = new OpenAIChatPlugin(mockPathwayResolverMessages);
+    const plugin = new OpenAIChatPlugin(config, pathway, modelName, model);
     t.is(plugin.config, mockPathwayResolverMessages.config);
     t.is(plugin.pathwayPrompt, mockPathwayResolverMessages.pathway.prompt);
 });
 
 // Test the convertPalmToOpenAIMessages function
 test('convertPalmToOpenAIMessages', (t) => {
-    const plugin = new OpenAIChatPlugin(mockPathwayResolverMessages);
+    const plugin = new OpenAIChatPlugin(config, pathway, modelName, model);
     const context = 'This is a test context.';
     const examples = [
         {
@@ -35,7 +37,7 @@ test('convertPalmToOpenAIMessages', (t) => {
 
 // Test the getRequestParameters function
 test('getRequestParameters', async (t) => {
-    const plugin = new OpenAIChatPlugin(mockPathwayResolverMessages);
+    const plugin = new OpenAIChatPlugin(config, pathway, modelName, model);
     const text = 'Help me';
     const parameters = { name: 'John', age: 30 };
     const prompt = mockPathwayResolverMessages.pathway.prompt;
@@ -57,7 +59,7 @@ test('getRequestParameters', async (t) => {
 
 // Test the execute function
 test('execute', async (t) => {
-    const plugin = new OpenAIChatPlugin(mockPathwayResolverMessages);
+    const plugin = new OpenAIChatPlugin(config, pathway, modelName, model);
     const text = 'Help me';
     const parameters = { name: 'John', age: 30 };
     const prompt = mockPathwayResolverMessages.pathway.prompt;
@@ -89,7 +91,7 @@ test('execute', async (t) => {
 
 // Test the parseResponse function
 test('parseResponse', (t) => {
-    const plugin = new OpenAIChatPlugin(mockPathwayResolverMessages);
+    const plugin = new OpenAIChatPlugin(config, pathway, modelName, model);
     const data = {
         choices: [
             {
@@ -105,7 +107,7 @@ test('parseResponse', (t) => {
 
 // Test the logRequestData function
 test('logRequestData', (t) => {
-    const plugin = new OpenAIChatPlugin(mockPathwayResolverMessages);
+    const plugin = new OpenAIChatPlugin(config, pathway, modelName, model);
     const data = {
         messages: [
             { role: 'user', content: 'User: Help me\nAssistant: Please help John who is 30 years old.' },

package/tests/palmChatPlugin.test.js

@@ -3,8 +3,10 @@ import test from 'ava';
 import PalmChatPlugin from '../server/plugins/palmChatPlugin.js';
 import { mockPathwayResolverMessages } from './mocks.js';
 
+const { config, pathway, modelName, model } = mockPathwayResolverMessages;
+
 test.beforeEach((t) => {
-  const palmChatPlugin = new PalmChatPlugin(mockPathwayResolverMessages);
+  const palmChatPlugin = new PalmChatPlugin(config, pathway, modelName, model);
   t.context = { palmChatPlugin };
 });
 

package/tests/palmCompletionPlugin.test.js

@@ -4,8 +4,10 @@ import test from 'ava';
 import PalmCompletionPlugin from '../server/plugins/palmCompletionPlugin.js';
 import { mockPathwayResolverString } from './mocks.js';
 
+const { config, pathway, modelName, model } = mockPathwayResolverString;
+
 test.beforeEach((t) => {
-  const palmCompletionPlugin = new PalmCompletionPlugin(mockPathwayResolverString);
+  const palmCompletionPlugin = new PalmCompletionPlugin(config, pathway, modelName, model);
   t.context = { palmCompletionPlugin };
 });
 

package/tests/truncateMessages.test.js

@@ -4,9 +4,9 @@ import ModelPlugin from '../server/plugins/modelPlugin.js';
 import { encode } from 'gpt-3-encoder';
 import { mockPathwayResolverString } from './mocks.js';
 
-const { config, pathway } = mockPathwayResolverString;
+const { config, pathway, modelName, model } = mockPathwayResolverString;
 
-const modelPlugin = new ModelPlugin(mockPathwayResolverString);
+const modelPlugin = new ModelPlugin(config, pathway, modelName, model);
 
 const generateMessage = (role, content) => ({ role, content });