@aj-archipelago/cortex 1.0.4 → 1.0.6

package/README.md

@@ -17,7 +17,7 @@ Just about anything! It's kind of an LLM swiss army knife.  Here are some ideas:
 ## Features
 
 * Simple architecture to build custom functional endpoints (called `pathways`), that implement common NL AI tasks. Default pathways include chat, summarization, translation, paraphrasing, completion, spelling and grammar correction, entity extraction, sentiment analysis, and bias analysis.
-* Allows for building multi-model, multi-tool, multi-vendor, and model-agnostic pathways (choose the right model or combination of models and tools for the job, implement redundancy) with built-in support for OpenAI GPT-3, GPT-3.5 (chatGPT), and GPT-4 models - both from OpenAI directly and through Azure OpenAI, OpenAI Whisper, Azure Translator, LangChain.js and more.
+* Allows for building multi-model, multi-tool, multi-vendor, and model-agnostic pathways (choose the right model or combination of models and tools for the job, implement redundancy) with built-in support for OpenAI GPT-3, GPT-3.5 (chatGPT), and GPT-4 models - both from OpenAI directly and through Azure OpenAI, PaLM Text and PaLM Chat from Google, OpenAI Whisper, Azure Translator, LangChain.js and more.
 * Easy, templatized prompt definition with flexible support for most prompt engineering techniques and strategies ranging from simple single prompts to complex custom prompt chains with context continuity.
 * Built in support for long-running, asynchronous operations with progress updates or streaming responses
 * Integrated context persistence: have your pathways "remember" whatever you want and use it on the next request to the model
@@ -198,8 +198,8 @@ The core pathway `summary.js` below is implemented using custom pathway logic an
 // This module exports a prompt that takes an input text and generates a summary using a custom resolver.
 
 // Import required modules
-import { semanticTruncate } from '../graphql/chunker.js';
-import { PathwayResolver } from '../graphql/pathwayResolver.js';
+import { semanticTruncate } from '../server/chunker.js';
+import { PathwayResolver } from '../server/pathwayResolver.js';
 
 export default {
     // The main prompt function that takes the input text and asks to generate a summary.

package/config/default.example.json

@@ -51,6 +51,24 @@
             "requestsPerSecond": 10,
             "maxTokenLength": 8192
         },
+        "palm-text": {
+            "type": "PALM-COMPLETION",
+            "url": "https://us-central1-aiplatform.googleapis.com/v1/projects/project-id/locations/us-central1/publishers/google/models/text-bison@001:predict",
+            "headers": {
+                "Content-Type": "application/json"
+            },
+            "requestsPerSecond": 10,
+            "maxTokenLength": 2048
+        },
+        "palm-chat": {
+            "type": "PALM-CHAT",
+            "url": "https://us-central1-aiplatform.googleapis.com/v1/projects/project-id/locations/us-central1/publishers/google/models/chat-bison@001:predict",
+            "headers": {
+                "Content-Type": "application/json"
+            },
+            "requestsPerSecond": 10,
+            "maxTokenLength": 2048
+        },
         "local-llama13B": {
             "type": "LOCAL-CPP-MODEL",
             "executablePath": "../llm/llama.cpp/main",

package/config.js

@@ -3,6 +3,7 @@ import convict from 'convict';
 import HandleBars from './lib/handleBars.js';
 import fs from 'fs';
 import { fileURLToPath, pathToFileURL } from 'url';
+import GcpAuthTokenHelper from './lib/gcpAuthTokenHelper.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -57,7 +58,8 @@ var config = convict({
     cortexApiKey: {
         format: String,
         default: null,
-        env: 'CORTEX_API_KEY'
+        env: 'CORTEX_API_KEY',
+        sensitive: true
     },
     defaultModelName: {
         format: String,
@@ -67,19 +69,21 @@ var config = convict({
     models: {
         format: Object,
         default: {
-            "oai-td3": {
-                "type": "OPENAI-COMPLETION",
-                "url": "{{openaiApiUrl}}",
+            "oai-gpturbo": {
+                "type": "OPENAI-CHAT",
+                "url": "https://api.openai.com/v1/chat/completions",
                 "headers": {
-                    "Authorization": "Bearer {{openaiApiKey}}",
+                    "Authorization": "Bearer {{OPENAI_API_KEY}}",
                     "Content-Type": "application/json"
                 },
                 "params": {
-                    "model": "{{openaiDefaultModel}}"
+                    "model": "gpt-3.5-turbo"
                 },
+                "requestsPerSecond": 10,
+                "maxTokenLength": 8192
             },
             "oai-whisper": {
-                "type": "OPENAI_WHISPER",
+                "type": "OPENAI-WHISPER",
                 "url": "https://api.openai.com/v1/audio/transcriptions",
                 "headers": {
                     "Authorization": "Bearer {{OPENAI_API_KEY}}"
@@ -93,7 +97,7 @@ var config = convict({
     },
     openaiDefaultModel: {
         format: String,
-        default: 'text-davinci-003',
+        default: 'gpt-3.5-turbo',
         env: 'OPENAI_DEFAULT_MODEL'
     },
     openaiApiKey: {
@@ -117,6 +121,17 @@ var config = convict({
         default: 'null',
         env: 'WHISPER_MEDIA_API_URL'
     },
+    whisperTSApiUrl: {
+        format: String,
+        default: 'null',
+        env: 'WHISPER_TS_API_URL'
+    },
+    gcpServiceAccountKey: {
+        format: String,
+        default: null,
+        env: 'GCP_SERVICE_ACCOUNT_KEY',
+        sensitive: true
+    },
 });
 
 // Read in environment variables and set up service configuration
@@ -135,6 +150,11 @@ if (configFile && fs.existsSync(configFile)) {
     }
 }
 
+if (config.get('gcpServiceAccountKey')) {
+    const gcpAuthTokenHelper = new GcpAuthTokenHelper(config.getProperties());
+    config.set('gcpAuthTokenHelper', gcpAuthTokenHelper);
+}
+
 // Build and load pathways to config
 const buildPathways = async (config) => {
     const { pathwaysPath, corePathwaysPath, basePathwayPath } = config.getProperties();

package/helper_apps/MediaFileChunker/Dockerfile

@@ -0,0 +1,20 @@
+FROM node:18-alpine
+
+WORKDIR /usr/src/app
+
+COPY package*.json ./
+
+RUN npm install
+
+## following 3 lines are for installing ffmepg
+RUN apk update
+RUN apk add
+RUN apk add ffmpeg
+
+COPY . .
+
+EXPOSE 7071
+
+# RUN npm run build
+
+CMD [ "node", "start.js" ]

package/helper_apps/MediaFileChunker/package-lock.json

@@ -18,7 +18,7 @@
         "ioredis": "^5.3.1",
         "public-ip": "^6.0.1",
         "uuid": "^9.0.0",
-        "ytdl-core": "git+ssh://git@github.com:khlevon/node-ytdl-core.git#v4.11.3-patch.1"
+        "ytdl-core": "github:khlevon/node-ytdl-core#v4.11.4-patch.2"
       }
     },
     "node_modules/@azure/abort-controller": {
@@ -45,9 +45,9 @@
       }
     },
     "node_modules/@azure/core-http": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.0.tgz",
-      "integrity": "sha512-BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.1.tgz",
+      "integrity": "sha512-A3x+um3cAPgQe42Lu7Iv/x8/fNjhL/nIoEfqFxfn30EyxK6zC13n+OUxzZBRC0IzQqssqIbt4INf5YG7lYYFtw==",
       "dependencies": {
         "@azure/abort-controller": "^1.0.0",
         "@azure/core-auth": "^1.3.0",
@@ -62,7 +62,7 @@
         "tslib": "^2.2.0",
         "tunnel": "^0.0.6",
         "uuid": "^8.3.0",
-        "xml2js": "^0.4.19"
+        "xml2js": "^0.5.0"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -1720,9 +1720,9 @@
       }
     },
     "node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
       "dependencies": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"
@@ -1741,7 +1741,7 @@
     },
     "node_modules/ytdl-core": {
       "version": "0.0.0-development",
-      "resolved": "git+ssh://git@github.com/khlevon/node-ytdl-core.git#586971bd9aeda1cbb4600851cfef82a809833ac2",
+      "resolved": "git+ssh://git@github.com/khlevon/node-ytdl-core.git#87450450caabb91f81afa6e66758bf2f629664a1",
       "license": "MIT",
       "dependencies": {
         "m3u8stream": "^0.8.6",
@@ -1772,9 +1772,9 @@
       }
     },
     "@azure/core-http": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.0.tgz",
-      "integrity": "sha512-BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.1.tgz",
+      "integrity": "sha512-A3x+um3cAPgQe42Lu7Iv/x8/fNjhL/nIoEfqFxfn30EyxK6zC13n+OUxzZBRC0IzQqssqIbt4INf5YG7lYYFtw==",
       "requires": {
         "@azure/abort-controller": "^1.0.0",
         "@azure/core-auth": "^1.3.0",
@@ -1789,7 +1789,7 @@
         "tslib": "^2.2.0",
         "tunnel": "^0.0.6",
         "uuid": "^8.3.0",
-        "xml2js": "^0.4.19"
+        "xml2js": "^0.5.0"
       },
       "dependencies": {
         "uuid": {
@@ -2948,9 +2948,9 @@
       }
     },
     "xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
       "requires": {
         "sax": ">=0.6.0",
         "xmlbuilder": "~11.0.0"
@@ -2962,8 +2962,8 @@
       "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
     },
     "ytdl-core": {
-      "version": "git+ssh://git@github.com/khlevon/node-ytdl-core.git#586971bd9aeda1cbb4600851cfef82a809833ac2",
-      "from": "ytdl-core@git+ssh://git@github.com:khlevon/node-ytdl-core.git#v4.11.3-patch.1",
+      "version": "git+ssh://git@github.com/khlevon/node-ytdl-core.git#87450450caabb91f81afa6e66758bf2f629664a1",
+      "from": "ytdl-core@github:khlevon/node-ytdl-core#v4.11.4-patch.2",
       "requires": {
         "m3u8stream": "^0.8.6",
         "miniget": "^4.2.2",

package/helper_apps/MediaFileChunker/package.json

@@ -18,6 +18,6 @@
     "ioredis": "^5.3.1",
     "public-ip": "^6.0.1",
     "uuid": "^9.0.0",
-    "ytdl-core": "git+ssh://git@github.com:khlevon/node-ytdl-core.git#v4.11.3-patch.1"
+    "ytdl-core": "github:khlevon/node-ytdl-core#v4.11.4-patch.2"
   }
 }

package/helper_apps/WhisperX/.dockerignore

@@ -0,0 +1,27 @@
+**/__pycache__
+**/.venv
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/bin
+**/charts
+**/docker-compose*
+**/compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

package/helper_apps/WhisperX/Dockerfile

@@ -0,0 +1,31 @@
+# For more information, please refer to https://aka.ms/vscode-docker-python
+FROM python:3.10-slim
+
+EXPOSE 8000
+
+## following 3 lines are for installing ffmepg
+RUN apt-get -y update
+RUN apt-get -y upgrade
+RUN apt-get install -y ffmpeg
+
+# Keeps Python from generating .pyc files in the container
+ENV PYTHONDONTWRITEBYTECODE=1
+
+# Turns off buffering for easier container logging
+ENV PYTHONUNBUFFERED=1
+
+# Install pip requirements
+COPY requirements.txt .
+RUN python -m pip install -r requirements.txt
+
+WORKDIR /app
+COPY ./models /app/models
+COPY . /app
+
+# Creates a non-root user with an explicit UID and adds permission to access the /app folder
+# For more info, please refer to https://aka.ms/vscode-docker-python-configure-containers
+RUN adduser -u 5678 --disabled-password --gecos "" appuser && chown -R appuser /app
+USER appuser
+
+# During debugging, this entry point will be overridden. For more information, please refer to https://aka.ms/vscode-docker-python-debug
+CMD ["gunicorn", "--bind", "0.0.0.0:8000", "--timeout", "0", "-k", "uvicorn.workers.UvicornWorker", "app:app"]

package/helper_apps/WhisperX/app-ts.py

@@ -0,0 +1,76 @@
+import uvicorn
+from fastapi import FastAPI
+import stable_whisper
+from uuid import uuid4
+import requests
+import os
+
+model_download_root = './models'
+model = stable_whisper.load_model('large', download_root=model_download_root) #large, tiny
+
+app = FastAPI()
+
+save_directory = "./tmp"  # folder for downloaded files
+os.makedirs(save_directory, exist_ok=True)
+
+
+def download_remote_file(url, save_directory):
+    # Generate a unique file name with a UUID
+    unique_name = str(uuid4()) + os.path.splitext(url)[-1]
+    save_path = os.path.join(save_directory, unique_name)
+
+    # Download the remote file
+    response = requests.get(url, stream=True)
+    response.raise_for_status()
+
+    # Save the downloaded file with the unique name
+    with open(save_path, 'wb') as file:
+        for chunk in response.iter_content(chunk_size=8192):
+            file.write(chunk)
+
+    return [unique_name, save_path]
+
+
+def delete_tmp_file(file_path):
+    try:
+        os.remove(file_path)
+        print(f"Temporary file '{file_path}' has been deleted.")
+    except OSError as e:
+        print(f"Error: {e.strerror}")
+
+
+async def transcribe(fileurl):
+    print(f"Downloading file from: {fileurl}")
+    [unique_file_name, save_path] = download_remote_file(
+        fileurl, save_directory)
+    print(f"Downloaded file saved as: {unique_file_name}")
+
+    print(f"Transcribing file")
+    result = model.transcribe(save_path)
+
+    srtpath = os.path.join(save_directory, str(uuid4()) + ".srt")
+
+    print(f"Saving transcription as : {srtpath}")
+    result.to_srt_vtt(srtpath, segment_level=False)
+
+    with open(srtpath, "r") as f:
+        srtstr = f.read()
+
+    # clean up tmp files
+    delete_tmp_file(save_path)
+    delete_tmp_file(srtpath)
+
+    print(f"Transcription done.")
+    return srtstr
+
+
+@app.get("/")
+async def root(fileurl: str):
+    if not fileurl:
+        return "No fileurl given!"
+    result = await transcribe(fileurl)
+    return result
+
+if __name__ == "__main__":
+    print("Starting server", flush=True)
+    uvicorn.run(app, host="0.0.0.0", port=8000)

package/helper_apps/WhisperX/app.py

@@ -0,0 +1,115 @@
+import uvicorn
+from fastapi import FastAPI, HTTPException, Request
+from uuid import uuid4
+import os
+import requests
+import asyncio
+import whisper
+from whisper.utils import get_writer
+from fastapi.encoders import jsonable_encoder
+
+model_download_root = './models'
+model = whisper.load_model("large", download_root=model_download_root) #large, tiny
+
+# Create a semaphore with a limit of 1
+semaphore = asyncio.Semaphore(1)
+
+app = FastAPI()
+
+save_directory = "./tmp"  # folder for downloaded files
+os.makedirs(save_directory, exist_ok=True)
+
+
+def download_remote_file(url, save_directory):
+    # Generate a unique file name with a UUID
+    unique_name = str(uuid4()) + os.path.splitext(url)[-1]
+    save_path = os.path.join(save_directory, unique_name)
+
+    # Download the remote file
+    response = requests.get(url, stream=True)
+    response.raise_for_status()
+
+    # Save the downloaded file with the unique name
+    with open(save_path, 'wb') as file:
+        for chunk in response.iter_content(chunk_size=8192):
+            file.write(chunk)
+
+    return [unique_name, save_path]
+
+def delete_tmp_file(file_path):
+    try:
+        os.remove(file_path)
+        print(f"Temporary file '{file_path}' has been deleted.")
+    except OSError as e:
+        print(f"Error: {e.strerror}")
+
+def modify_segments(result):
+    modified_segments = []
+    
+    id = 0
+    for segment in result["segments"]:
+        for word_info in segment['words']:
+            word = word_info['word']
+            start = word_info['start']
+            end = word_info['end']
+            
+            modified_segment = {} #segment.copy()
+            modified_segment['id'] = id
+            modified_segment['text'] = word
+            modified_segment['start'] = start
+            modified_segment['end'] = end
+            modified_segments.append(modified_segment)
+            id+=1
+    
+    result["segments"] = modified_segments
+    
+def transcribe(fileurl):
+    print(f"Downloading file from: {fileurl}")
+    [unique_file_name, save_path] = download_remote_file(
+        fileurl, save_directory)
+    print(f"Downloaded file saved as: {unique_file_name}")
+
+    print(f"Transcribing file")
+    result = model.transcribe(save_path, word_timestamps=True)
+
+    modify_segments(result)
+
+    srtpath = os.path.join(save_directory, str(uuid4()) + ".srt")
+
+    print(f"Saving transcription as : {srtpath}")
+    writer = get_writer("srt", save_directory)
+    with open(srtpath, 'w', encoding='utf-8') as file_obj :
+        writer.write_result(result, file_obj)
+
+    with open(srtpath, "r") as f:
+        srtstr = f.read()
+
+    # clean up tmp files
+    delete_tmp_file(save_path)
+    delete_tmp_file(srtpath)
+
+    print(f"Transcription done.")
+    return srtstr
+
+
+@app.get("/")
+@app.post("/")
+async def root(request: Request):
+    if request.method == "POST":
+        body = jsonable_encoder(await request.json())
+        fileurl = body.get("fileurl")
+    else:
+        fileurl = request.query_params.get("fileurl")
+    if not fileurl:
+        return "No fileurl given!"
+
+    if semaphore.locked():
+        raise HTTPException(status_code=429, detail="Too Many Requests")
+    
+    async with semaphore:
+        result = await asyncio.to_thread(transcribe, fileurl)
+        return result
+
+if __name__ == "__main__":
+    print("Starting APPWhisper server", flush=True)
+    uvicorn.run(app, host="0.0.0.0", port=8000)

package/helper_apps/WhisperX/docker-compose.debug.yml

@@ -0,0 +1,12 @@
+version: '3.4'
+
+services:
+  cortex:
+    image: cortex
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    command: ["sh", "-c", "pip install debugpy -t /tmp && python /tmp/debugpy --wait-for-client --listen 0.0.0.0:5678 -m uvicorn helper_apps.WhisperX/app:app --host 0.0.0.0 --port 8000"]
+    ports:
+      - 8000:8000
+      - 5678:5678

package/helper_apps/WhisperX/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '3.4'
+
+services:
+  cortex:
+    image: cortex
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    ports:
+      - 8000:8000

package/helper_apps/WhisperX/requirements.txt

@@ -0,0 +1,6 @@
+# To ensure app dependencies are ported from your virtual environment/host machine into your container, run 'pip freeze > requirements.txt' in the terminal to overwrite this file
+fastapi[all]==0.89.0
+uvicorn[standard]==0.20.0
+gunicorn==20.1.0
+whisper
+stable-ts

package/index.js

@@ -1,5 +1,5 @@
 import { config } from './config.js';
-import { build } from './graphql/graphql.js';
+import { build } from './server/graphql.js';
 
 export default async (configParams) => {
     configParams && config.load(configParams);

package/lib/gcpAuthTokenHelper.js

@@ -0,0 +1,37 @@
+import { GoogleAuth } from 'google-auth-library';
+
+class GcpAuthTokenHelper {
+  constructor(config) {
+    const creds = config.gcpServiceAccountKey ? JSON.parse(config.gcpServiceAccountKey) : null;
+    if (!creds) {
+      throw new Error('GCP_SERVICE_ACCOUNT_KEY is missing or undefined');
+    }
+    this.authClient = new GoogleAuth({
+      credentials: creds,
+      scopes: ['https://www.googleapis.com/auth/cloud-platform'],
+    });
+    this.token = null;
+    this.expiry = null;
+  }
+
+  async getAccessToken() {
+    if (!this.token || !this.isTokenValid()) {
+      await this.refreshToken();
+    }
+    return this.token;
+  }
+
+  isTokenValid() {
+    // Check if token is still valid with a 5-minute buffer
+    return this.expiry && Date.now() < this.expiry.getTime() - 5 * 60 * 1000;
+  }
+
+  async refreshToken() {
+    const authClient = await this.authClient.getClient();
+    const accessTokenResponse = await authClient.getAccessToken();
+    this.token = accessTokenResponse.token;
+    this.expiry = new Date(accessTokenResponse.expirationTime);
+  }
+}
+
+export default GcpAuthTokenHelper;

package/lib/redisSubscription.js

@@ -1,6 +1,6 @@
 import Redis from 'ioredis';
 import { config } from '../config.js';
-import pubsub from '../graphql/pubsub.js';
+import pubsub from '../server/pubsub.js';
 
 const connectionString = config.get('storageConnectionString');
 const client = new Redis(connectionString);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-archipelago/cortex",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "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",
@@ -28,13 +28,11 @@
   "type": "module",
   "homepage": "https://github.com/aj-archipelago/cortex#readme",
   "dependencies": {
-    "@apollo/utils.keyvadapter": "^1.1.2",
+    "@apollo/server": "^4.7.3",
+    "@apollo/server-plugin-response-cache": "^4.1.2",
+    "@apollo/utils.keyvadapter": "^3.0.0",
     "@graphql-tools/schema": "^9.0.12",
     "@keyv/redis": "^2.5.4",
-    "apollo-server": "^3.12.0",
-    "apollo-server-core": "^3.11.1",
-    "apollo-server-express": "^3.11.1",
-    "apollo-server-plugin-response-cache": "^3.8.1",
     "axios": "^1.3.4",
     "axios-cache-interceptor": "^1.0.1",
     "bottleneck": "^2.19.5",
@@ -43,6 +41,7 @@
     "convict": "^6.2.3",
     "express": "^4.18.2",
     "form-data": "^4.0.0",
+    "google-auth-library": "^8.8.0",
     "gpt-3-encoder": "^1.1.4",
     "graphql": "^16.6.0",
     "graphql-subscriptions": "^2.0.0",
@@ -51,6 +50,7 @@
     "ioredis": "^5.3.1",
     "keyv": "^4.5.2",
     "langchain": "^0.0.47",
+    "subsrt": "^1.1.1",
     "uuid": "^9.0.0",
     "ws": "^8.12.0"
   },
@@ -59,6 +59,7 @@
     "dotenv": "^16.0.3",
     "eslint": "^8.38.0",
     "eslint-plugin-import": "^2.27.5",
+    "got": "^13.0.0",
     "sinon": "^15.0.3"
   },
   "publishConfig": {
@@ -70,6 +71,7 @@
     ],
     "require": [
       "dotenv/config"
-    ]
+    ],
+    "concurrency": 1
   }
 }

package/pathways/basePathway.js

@@ -1,5 +1,5 @@
-import { rootResolver, resolver } from '../graphql/resolver.js';
-import { typeDef } from '../graphql/typeDef.js';
+import { rootResolver, resolver } from '../server/resolver.js';
+import { typeDef } from '../server/typeDef.js';
 
 // all default definitions of a single pathway
 export default {