fixes typecheck issue after rebasing

.editorconfig

@@ -1,4 +0,0 @@
-root = true
-
-[*]
-end_of_line = crlf

.env.example

@@ -1,105 +1,59 @@
-# To customize your server, make a copy of this file to `.env` and edit any
+# Copy this file to .env and fill in the values you wish to change. Most already
-# values you want to change. Be sure to remove the `#` at the beginning of each
+# have sensible defaults.  See config.ts for more details.
-# line you want to modify.
 
-# All values have reasonable defaults, so you only need to change the ones you
+# PORT=7860
-# want to override.
-
-# ------------------------------------------------------------------------------
-# General settings:
-
-# The title displayed on the info page.
 # SERVER_TITLE=Coom Tunnel
-
-# Model requests allowed per minute per user.
 # MODEL_RATE_LIMIT=4
-
-# Max number of output tokens a user can request at once.
 # MAX_OUTPUT_TOKENS_OPENAI=300
-# MAX_OUTPUT_TOKENS_ANTHROPIC=400
+# MAX_OUTPUT_TOKENS_ANTHROPIC=900
-
+# LOG_LEVEL=info
-# Whether to show the estimated cost of consumed tokens on the info page.
+# REJECT_DISALLOWED=false
-# SHOW_TOKEN_COSTS=false
+# REJECT_MESSAGE="This content violates /aicg/'s acceptable use policy."
-
-# Whether to automatically check API keys for validity.
-# Note: CHECK_KEYS is disabled by default in local development mode, but enabled
-# by default in production mode.
 # CHECK_KEYS=true
-
+# QUOTA_DISPLAY_MODE=full
-# Which model types users are allowed to access.
+# QUEUE_MODE=fair
-# ALLOWED_MODEL_FAMILIES=claude,turbo,gpt4,gpt4-32k
-
-# URLs from which requests will be blocked.
 # BLOCKED_ORIGINS=reddit.com,9gag.com
-# Message to show when requests are blocked.
 # BLOCK_MESSAGE="You must be over the age of majority in your country to use this service."
-# Destination to redirect blocked requests to.
 # BLOCK_REDIRECT="https://roblox.com/"
 
-# Whether to reject requests containing disallowed content.
+# Note: CHECK_KEYS is disabled by default in local development mode, but enabled
-# REJECT_DISALLOWED=false
+# by default in production mode.
-# Message to show when requests are rejected.
-# REJECT_MESSAGE="This content violates /aicg/'s acceptable use policy."
 
-# Whether prompts should be logged to Google Sheets.
+# Optional settings for user management. See docs/user-management.md.
-# Requires additional setup. See `docs/google-sheets.md` for more information.
+# GATEKEEPER=none
+# GATEKEEPER_STORE=memory
+# MAX_IPS_PER_USER=20
+
+# Optional settings for prompt logging. See docs/logging-sheets.md.
 # PROMPT_LOGGING=false
 
-# The port to listen on.
-# PORT=7860
-
-# Detail level of logging. (trace | debug | info | warn | error)
-# LOG_LEVEL=info
-
 # ------------------------------------------------------------------------------
-# Optional settings for user management, access control, and quota enforcement:
+# The values below are secret -- make sure they are set securely.
-# See `docs/user-management.md` for more information and setup instructions.
-# See `docs/user-quotas.md` to learn how to set up quotas.
-
-# Which access control method to use. (none | proxy_key | user_token)
-# GATEKEEPER=none
-# Which persistence method to use. (memory | firebase_rtdb)
-# GATEKEEPER_STORE=memory
-
-# Maximum number of unique IPs a user can connect from. (0 for unlimited)
-# MAX_IPS_PER_USER=0
-
-# With user_token gatekeeper, whether to allow users to change their nickname.
-# ALLOW_NICKNAME_CHANGES=true
-
-# Default token quotas for each model family. (0 for unlimited)
-# TOKEN_QUOTA_TURBO=0
-# TOKEN_QUOTA_GPT4=0
-# TOKEN_QUOTA_GPT4_32K=0
-# TOKEN_QUOTA_CLAUDE=0
-
-# How often to refresh token quotas. (hourly | daily)
-# Leave unset to never automatically refresh quotas.
-# QUOTA_REFRESH_PERIOD=daily
-
-# ------------------------------------------------------------------------------
-# Secrets and keys:
-# Do not put any passwords or API keys directly in this file.
 # For Huggingface, set them via the Secrets section in your Space's config UI.
 # For Render, create a "secret file" called .env using the Environment tab.
 
-# You can add multiple API keys by separating them with a comma.
+# You can add multiple keys by separating them with a comma.
-# For AWS credentials, separate the access key ID, secret key, and region with a colon.
 OPENAI_KEY=sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ANTHROPIC_KEY=sk-ant-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-# See `docs/aws-configuration.md` for more information, there may be additional steps required to set up AWS.
-AWS_CREDENTIALS=myaccesskeyid:mysecretkey:us-east-1,anotheraccesskeyid:anothersecretkey:us-west-2
 
-# With proxy_key gatekeeper, the password users must provide to access the API.
+# TEMPORARY: This will eventually be replaced by a more robust system.
+# You can adjust the models used when sending OpenAI prompts to /anthropic.
+# Refer to Anthropic's docs for more info (note that they don't list older
+# versions of the models, but they still work).
+# CLAUDE_SMALL_MODEL=claude-v1.2
+# CLAUDE_BIG_MODEL=claude-v1-100k
+
+# You can require a Bearer token for requests when using proxy_token gatekeeper.
 # PROXY_KEY=your-secret-key
 
-# With user_token gatekeeper, the admin password used to manage users.
+# You can set an admin key for user management when using user_token gatekeeper.
 # ADMIN_KEY=your-very-secret-key
 
-# With firebase_rtdb gatekeeper storage, the Firebase project credentials.
+# These are used for various persistence features. Refer to the docs for more
+# info.
 # FIREBASE_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 # FIREBASE_RTDB_URL=https://xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.firebaseio.com
 
-# With prompt logging, the Google Sheets credentials.
+# This is only relevant if you want to use the prompt logging feature.
 # GOOGLE_SHEETS_SPREADSHEET_ID=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 # GOOGLE_SHEETS_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

.gitignore

@@ -1,7 +1,7 @@
 .env
 .venv
 .vscode
-.idea
+.venv
 build
 greeting.md
 node_modules

.husky/pre-push

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npm run type-check

.prettierrc

@@ -1,14 +0,0 @@
-{
-  "overrides": [
-    {
-      "files": [
-        "*.ejs"
-      ],
-      "options": {
-        "printWidth": 160,
-        "bracketSameLine": true
-      }
-    }
-  ],
-  "trailingComma": "es5"
-}

README.md

@@ -40,3 +40,5 @@ To run the proxy locally for development or testing, install Node.js >= 18.0.0 a
 4. Start the server in development mode with `npm run start:dev`.
 
 You can also use `npm run start:dev:tsc` to enable project-wide type checking at the cost of slower startup times. `npm run type-check` can be used to run type checking without starting the server.
+
+See the [Optional Dependencies](./docs/optional-dependencies.md) page for information on how to install the optional Claude tokenizer locally.

docker/ci/Dockerfile

@@ -0,0 +1,45 @@
+# Switched to alpine both for smaller image size and because zeromq.js provides
+# a working prebuilt binary for alpine. On Debian, the prebuild was not working
+# and a bug in libzmq's makefile was causing the build from source to fail.
+# https://github.com/zeromq/zeromq.js/issues/529#issuecomment-1370721089
+FROM node:18-alpine as builder
+
+# Install general build dependencies
+RUN apk add --no-cache autoconf automake g++ libtool zeromq-dev python3 \
+    py3-pip git curl cmake gcc musl-dev pkgconfig openssl-dev
+  
+# Install Rust (required to build huggingface/tokenizers)
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+RUN git clone -b tokenize https://gitgud.io/khanon/oai-reverse-proxy.git /app
+WORKDIR /app
+
+RUN npm ci
+
+RUN npm run build && \
+    npm prune --production
+
+FROM node:18-alpine as runner
+
+RUN apk add --no-cache \
+  zeromq-dev \
+  python3
+
+COPY --from=builder /app/build /app/build
+COPY --from=builder /app/node_modules /app/node_modules
+COPY --from=builder /app/.venv /app/.venv
+COPY --from=builder /app/package.json /app/package.json
+
+WORKDIR /app
+RUN . .venv/bin/activate
+
+EXPOSE 7860
+
+ENV NODE_ENV=production
+
+# TODO: stamp with tag and git commit
+ENV RENDER=true
+ENV RENDER_GIT_COMMIT=ci-test
+
+CMD [ "npm", "start" ]

docker/huggingface/Dockerfile

@@ -1,9 +1,10 @@
-FROM node:18-bullseye-slim
+FROM node:18-bullseye
 RUN apt-get update && \
-    apt-get install -y git
+    apt-get install -y git python3 python3-pip libzmq3-dev curl cmake g++ libsodium-dev pkg-config
 RUN git clone https://gitgud.io/khanon/oai-reverse-proxy.git /app
 WORKDIR /app
-RUN npm install
+RUN pip3 install --no-cache-dir -r requirements.txt
+RUN npm ci --loglevel=verbose
 COPY Dockerfile greeting.md* .env* ./
 RUN npm run build
 EXPOSE 7860

docs/aws-configuration.md

@@ -1,57 +0,0 @@
-# Configuring the proxy for AWS Bedrock
-
-The proxy supports AWS Bedrock models via the `/proxy/aws/claude` endpoint. There are a few extra steps necessary to use AWS Bedrock compared to the other supported APIs.
-
-- [Setting keys](#setting-keys)
-- [Attaching policies](#attaching-policies)
-- [Provisioning models](#provisioning-models)
-- [Note regarding logging](#note-regarding-logging)
-
-## Setting keys
-
-Use the `AWS_CREDENTIALS` environment variable to set the AWS API keys.
-
-Like other APIs, you can provide multiple keys separated by commas. Each AWS key, however, is a set of credentials including the access key, secret key, and region. These are separated by a colon (`:`).
-
-For example:
-
-```
-AWS_CREDENTIALS=AKIA000000000000000:somesecretkey:us-east-1,AKIA111111111111111:anothersecretkey:us-west-2
-```
-
-## Attaching policies
-
-Unless your credentials belong to the root account, the principal will need to be granted the following permissions:
-
-- `bedrock:InvokeModel`
-- `bedrock:InvokeModelWithResponseStream`
-- `bedrock:GetModelInvocationLoggingConfiguration`
-  - The proxy needs this to determine whether prompt/response logging is enabled. By default, the proxy won't use credentials unless it can conclusively determine that logging is disabled, for privacy reasons.
-
-Use the IAM console or the AWS CLI to attach these policies to the principal associated with the credentials.
-
-## Provisioning models
-
-AWS does not automatically provide accounts with access to every model. You will need to provision the models you want to use, in the regions you want to use them in. You can do this from the AWS console.
-
-⚠️ **Models are region-specific.** Currently AWS only offers Claude in a small number of regions. Switch to the AWS region you want to use, then go to the models page and request access to **Anthropic / Claude**.
-
-![](./assets/aws-request-model-access.png)
-
-Access is generally granted more or less instantly. Once your account has access, you can enable the model by checking the box next to it.
-
-You can also request Claude Instant, but support for this isn't fully implemented yet.
-
-### Supported model IDs
-Users can send these model IDs to the proxy to invoke the corresponding models.
-- **Claude**
-  - `anthropic.claude-v1` (~18k context)
-  - `anthropic.claude-v2` (~100k context)
-- **Claude Instant**
-  - `anthropic.claude-instant-v1`
-
-## Note regarding logging
-
-By default, the proxy will refuse to use keys if it finds that logging is enabled, or if it doesn't have permission to check logging status.
-
-If you can't attach the `bedrock:GetModelInvocationLoggingConfiguration` policy to the principal, you can set the `ALLOW_AWS_LOGGING` environment variable to `true` to force the proxy to use the keys anyway. A warning will appear on the info page when this is enabled.

docs/deploy-huggingface.md

@@ -12,12 +12,12 @@ This repository can be deployed to a [Huggingface Space](https://huggingface.co/
 - Provide a name for your Space and select "Docker" as the SDK.  Select "Blank" for the template.
 - Click "Create Space" and wait for the Space to be created.
 
-![Create Space](assets/huggingface-createspace.png)
+![Create Space](huggingface-createspace.png)
 
 ### 3. Create an empty Dockerfile
 - Once your Space is created, you'll see an option to "Create the Dockerfile in your browser".  Click that link.
 
-![Create Dockerfile](assets/huggingface-dockerfile.png)
+![Create Dockerfile](huggingface-dockerfile.png)
 - Paste the following into the text editor and click "Save".
 ```dockerfile
 FROM node:18-bullseye-slim
@@ -34,7 +34,7 @@ CMD [ "npm", "start" ]
 ```
 - Click "Commit new file to `main`" to save the Dockerfile.
 
-![Commit](assets/huggingface-savedockerfile.png)
+![Commit](huggingface-savedockerfile.png)
 
 ### 4. Set your API key as a secret
 - Click the Settings button in the top right corner of your repository.
@@ -82,18 +82,14 @@ MAX_OUTPUT_TOKENS_ANTHROPIC=512
 # Block prompts containing disallowed characters
 REJECT_DISALLOWED=false
 REJECT_MESSAGE="This content violates /aicg/'s acceptable use policy."
+# Show exact quota usage on the Server Info page
+QUOTA_DISPLAY_MODE=full
 ```
 
 See `.env.example` for a full list of available settings, or check `config.ts` for details on what each setting does.
 
 ## Restricting access to the server
 
-If you want to restrict access to the server, you can set a `PROXY_KEY` secret.  This key will need to be passed in the Authentication header of every request to the server, just like an OpenAI API key.  Set the `GATEKEEPER` mode to `proxy_key`, and then set the `PROXY_KEY` variable to whatever password you want.
+If you want to restrict access to the server, you can set a `PROXY_KEY` secret.  This key will need to be passed in the Authentication header of every request to the server, just like an OpenAI API key.
 
 Add this using the same method as the OPENAI_KEY secret above. Don't add this to your `.env` file because that file is public and anyone can see it.
-
-Example:
-```
-GATEKEEPER=proxy_key
-PROXY_KEY=your_secret_password
-```

docs/deploy-render.md

@@ -1,5 +1,5 @@
 # Deploy to Render.com
-Render.com offers a free tier that includes 750 hours of compute time per month.  This is enough to run a single proxy instance 24/7.  Instances shut down after 15 minutes without traffic but start up again automatically when a request is received.  You can use something like https://app.checklyhq.com/ to ping your proxy every 15 minutes to keep it alive.
+Render.com offers a free tier that includes 750 hours of compute time per month.  This is enough to run a single proxy instance 24/7.  Instances shut down after 15 minutes without traffic but start up again automatically when a request is received.
 
 ### 1. Create account
 - [Sign up for Render.com](https://render.com/) to create an account and access the dashboard.

docs/openapi-admin-users.yaml

@@ -1,4 +1,4 @@
-
+# Shat out by GPT-4, I did not check for correctness beyond a cursory glance
 openapi: 3.0.0
 info:
   version: 1.0.0
@@ -26,26 +26,6 @@ paths:
     post:
       summary: Create a new user
       operationId: createUser
-      requestBody:
-        content:
-          application/json:
-            schema:
-              oneOf:
-                - type: object
-                  properties:
-                    type:
-                      type: string
-                      enum: ["normal", "special"]
-                - type: object
-                  properties:
-                    type:
-                      type: string
-                      enum: ["temporary"]
-                    expiresAt:
-                      type: integer
-                      format: int64
-                    tokenLimits:
-                      $ref: "#/components/schemas/TokenCount"       
       responses:
         "200":
           description: The created user's token
@@ -193,21 +173,6 @@ paths:
                     type: string
 components:
   schemas:
-    TokenCount:
-      type: object
-      properties:
-        turbo:
-          type: integer
-          format: int32
-        gpt4:
-          type: integer
-          format: int32
-        "gpt4-32k":
-          type: integer
-          format: int32
-        claude:
-          type: integer
-          format: int32
     User:
       type: object
       properties:
@@ -217,18 +182,15 @@ components:
           type: array
           items:
             type: string
-        nickname:
-          type: string
         type:
           type: string
           enum: ["normal", "special"]
         promptCount:
           type: integer
           format: int32
-        tokenLimits:
+        tokenCount:
-          $ref: "#/components/schemas/TokenCount"
+          type: integer
-        tokenCounts:
+          format: int32
-          $ref: "#/components/schemas/TokenCount"
         createdAt:
           type: integer
           format: int64
@@ -240,6 +202,3 @@ components:
           format: int64
         disabledReason:
           type: string
-        expiresAt:
-          type: integer
-          format: int64

docs/optional-dependencies.md

@@ -0,0 +1,35 @@
+# Optional Dependencies
+## Claude tokenizer
+As Anthropic does not ship a NodeJS tokenizer, the server includes a small Python script that runs alongside the proxy to tokenize Claude requests. It is automatically started when the server is launched, but requires additional dependencies to be installed. If these dependencies are not installed, the server will not be able to accurately count the number of tokens in Claude requests but will still function normally otherwise.
+
+Note: On Windows, a Windows Firewall prompt may appear when the Claude tokenizer is started. This is normal and is caused by the Python process attempting to open a socket to communicate with the NodeJS server. You can safely allow the connection.
+
+### Automatic installation (local development)
+This will create a venv and install the required dependencies. You still need to activate the venv when running the server, and you must have Python >= 3.8.0 installed.
+1. Install Python >= 3.8.0
+2. Run `npm install`, which should automatically create a venv and install the required dependencies.
+3. Activate the virtual environment with `source .venv/bin/activate` (Linux/Mac) or `.\.venv\Scripts\activate` (PowerShell/Windows)
+    - **This step is required every time you start the server from a new terminal.**
+
+### Manual installation (local development)
+1. Install Python >= 3.8.0
+2. Create a virtual environment using `python -m .venv venv`
+3. Activate the virtual environment with `source .venv/bin/activate` (Linux/Mac) or `.\.venv\Scripts\activate` (PowerShell/Windows)
+    - **This step is required every time you start the server from a new terminal.**
+4. Install dependencies with `pip install -r requirements.txt`
+5. Provided you have the virtual environment activated, the server will automatically start the tokenizer when it is launched.
+
+### Docker (production deployment)
+Refer to the reference Dockerfiles for examples on how to install the tokenizer. The Huggingface and Render Dockerfiles both include the tokenizer.
+
+Generally, you will need libzmq3-dev, cmake, g++, and Python >= 3.8.0 installed. The postinstall script will automatically install the required Python dependencies.
+
+### Troubleshooting
+Ensure that:
+- Python >= 3.8 is installed and in your PATH
+- Python dependencies are installed (re-run `npm install`)
+- Python venv is activated (see above)
+- zeromq optional dependency installed successfully
+  - This should generally be installed automatically.
+  - On Windows, you may need to install MS C++ Build Tools or set msvs_version (eg `npm config set msvs_version 2019`), then re-run npm install.
+  - On Linux, ensure you have the appropriate build tools and headers installed for your distribution; refer to the reference Dockerfiles for examples.

docs/user-management.md

@@ -1,11 +1,10 @@
 # User Management
 
-The proxy supports several different user management strategies. You can choose the one that best fits your needs by setting the `GATEKEEPER` environment variable.
+The proxy supports several different user management strategies.  You can choose the one that best fits your needs by setting the `GATEKEEPER` environment variable.
 
-Several of these features require you to set secrets in your environment. If using Huggingface Spaces to deploy, do not set these in your `.env` file because that file is public and anyone can see it.
+Several of these features require you to set secrets in your environment.  If using Huggingface Spaces to deploy, do not set these in your `.env` file because that file is public and anyone can see it.
 
 ## Table of Contents
-
 - [No user management](#no-user-management-gatekeepernone)
 - [Single-password authentication](#single-password-authentication-gatekeeperproxy_key)
 - [Per-user authentication](#per-user-authentication-gatekeeperuser_token)
@@ -19,30 +18,29 @@ This is the default mode. The proxy will not require any authentication to acces
 
 ## Single-password authentication (`GATEKEEPER=proxy_key`)
 
-This mode allows you to set a password that must be passed in the `Authentication` header of every request to the server as a bearer token. This is useful if you want to restrict access to the server, but don't want to create a separate account for every user.
+This mode allows you to set a password that must be passed in the `Authentication` header of every request to the server as a bearer token.  This is useful if you want to restrict access to the server, but don't want to create a separate account for every user.
 
 To set the password, create a `PROXY_KEY` secret in your environment.
 
 ## Per-user authentication (`GATEKEEPER=user_token`)
 
-This mode allows you to provision separate Bearer tokens for each user. You can manage users via the /admin/users via REST or through the admin interface at `/admin`.
+This mode allows you to provision separate Bearer tokens for each user. You can manage users via the /admin/users REST API, which itself requires an admin Bearer token.
 
-To begin, set `ADMIN_KEY` to a secret value. This will be used to authenticate requests to the REST API or to log in to the UI.
+To begin, set `ADMIN_KEY` to a secret value.  This will be used to authenticate requests to the /admin/users REST API.
 
 [You can find an OpenAPI specification for the /admin/users REST API here.](openapi-admin-users.yaml)
  
-By default, the proxy will store user data in memory. Naturally, this means that user data will be lost when the proxy is restarted, though you can use the user import/export feature to save and restore user data manually or via a script. However, the proxy also supports persisting user data to an external data store with some additional configuration.
+By default, the proxy will store user data in memory. Naturally, this means that user data will be lost when the proxy is restarted, though you can use the bulk user import/export feature to save and restore user data manually or via a script. However, the proxy also supports persisting user data to an external data store with some additional configuration.
 
 Below are the supported data stores and their configuration options.
 
 ### Memory
 
-This is the default data store (`GATEKEEPER_STORE=memory`) User data will be stored in memory and will be lost when the server is restarted. You are responsible for exporting and re-importing user data after a restart.
+This is the default data store (`GATEKEEPER_STORE=memory`)  User data will be stored in memory and will be lost when the proxy is restarted. You are responsible for downloading and re-uploading user data via the REST API if you want to persist it.
 
 ### Firebase Realtime Database
 
 To use Firebase Realtime Database to persist user data, set the following environment variables:
-
 - `GATEKEEPER_STORE`: Set this to `firebase_rtdb`
 - **Secret** `FIREBASE_RTDB_URL`: The URL of your Firebase Realtime Database, e.g. `https://my-project-default-rtdb.firebaseio.com`
 - **Secret** `FIREBASE_KEY`: A base-64 encoded service account key for your Firebase project. Refer to the instructions below for how to create this key.
@@ -51,13 +49,17 @@ To use Firebase Realtime Database to persist user data, set the following enviro
 
 1. Go to the [Firebase console](https://console.firebase.google.com/) and click "Add project", then follow the prompts to create a new project.
 2. From the **Project Overview** page, click **All products** in the left sidebar, then click **Realtime Database**.
-3. Click **Create database** and choose **Start in test mode**. Click **Enable**.
+3. Click **Create database** and choose **Start in test mode**.  Click **Enable**.
-   - Test mode is fine for this use case as it still requires authentication to access the database. You may wish to set up more restrictive rules if you plan to use the database for other purposes.
+    - Test mode is fine for this use case as it still requires authentication to access the database. You may wish to set up more restrictive rules if you plan to use the database for other purposes.
-   - The reference URL for the database will be displayed on the page. You will need this later.
+    - The reference URL for the database will be displayed on the page. You will need this later.
 4. Click the gear icon next to **Project Overview** in the left sidebar, then click **Project settings**.
 5. Click the **Service accounts** tab, then click **Generate new private key**.
 6. The downloaded file contains your key. Encode it as base64 and set it as the `FIREBASE_KEY` secret in your environment.
 7. Set `FIREBASE_RTDB_URL` to the reference URL of your Firebase Realtime Database, e.g. `https://my-project-default-rtdb.firebaseio.com`.
 8. Set `GATEKEEPER_STORE` to `firebase_rtdb` in your environment if you haven't already.
 
-The proxy server will attempt to connect to your Firebase Realtime Database at startup and will throw an error if it cannot connect. If you see this error, check that your `FIREBASE_RTDB_URL` and `FIREBASE_KEY` secrets are set correctly.
+The proxy will attempt to connect to your Firebase Realtime Database at startup and will throw an error if it cannot connect.  If you see this error, check that your `FIREBASE_RTDB_URL` and `FIREBASE_KEY` secrets are set correctly.
+
+---
+
+Users are loaded from the database and changes are flushed periodically.  You can use the PUT /admin/users API to bulk import users and force a flush to the database.

docs/user-quotas.md

@@ -1,36 +0,0 @@
-# User Quotas
-
-When using `user_token` authentication, you can set (model) token quotas for user.  These quotas are enforced by the proxy server and are separate from the quotas enforced by OpenAI.
-
-You can set the default quota via environment variables. Quotas are enforced on a per-model basis, and count both prompt tokens and completion tokens. By default, all quotas are disabled.
-
-Set the following environment variables to set the default quotas:
-- `TOKEN_QUOTA_TURBO`
-- `TOKEN_QUOTA_GPT4`
-- `TOKEN_QUOTA_CLAUDE`
-
-Quotas only apply to `normal`-type users; `special`-type users are exempt from quotas. You can change users' types via the REST API.
-
-**Note that changes to these environment variables will only apply to newly created users.**  To modify existing users' quotas, use the REST API or the admin UI.
-
-## Automatically refreshing quotas
-
-You can use the `QUOTA_REFRESH_PERIOD` environment variable to automatically refresh users' quotas periodically.  This is useful if you want to give users a certain number of tokens per day, for example. The entire quota will be refreshed at the start of the specified period, and any tokens a user has not used will not be carried over.
-
-Quotas for all models and users will be refreshed. If you haven't set `TOKEN_QUOTA_*` for a particular model, quotas for that model will not be refreshed (so any manually set quotas will not be overwritten).
-
-Set the `QUOTA_REFRESH_PERIOD` environment variable to one of the following values:
-- `daily` (at midnight)
-- `hourly`
-- leave unset to disable automatic refreshing
-
-You can also use a cron expression, for example:
-- Every 45 seconds: `"*/45 * * * * *"`
-- Every 30 minutes: `"*/30 * * * *"`
-- Every 6 hours: `"0 */6 * * *"`
-- Every 3 days: `"0 0 */3 * *"`
-- Daily, but at mid-day: `"0 12 * * *"`
-
-Make sure to enclose the cron expression in quotation marks.
-
-All times are in the server's local time zone. Refer to [crontab.guru](https://crontab.guru/) for more examples.

esbuild.js

@@ -0,0 +1,47 @@
+const esbuild = require("esbuild");
+const fs = require("fs");
+const { copy } = require("esbuild-plugin-copy");
+
+const buildDir = "build";
+
+const config = {
+  entryPoints: ["src/server.ts"],
+  bundle: true,
+  outfile: `${buildDir}/server.js`,
+  platform: "node",
+  target: "es2020",
+  format: "cjs",
+  sourcemap: true,
+  external: ["fs", "path", "zeromq", "tiktoken"],
+  plugins: [
+    copy({
+      resolveFrom: "cwd",
+      assets: {
+        from: ["src/tokenization/*.py"],
+        to: [`${buildDir}/tokenization`],
+      },
+    }),
+  ],
+};
+
+function createBundler() {
+  return {
+    build: async () => esbuild.build(config),
+    watch: async () => {
+      const watchConfig = { ...config, logLevel: "info" };
+      const ctx = await esbuild.context(watchConfig);
+      ctx.watch();
+    },
+  };
+}
+
+(async () => {
+  fs.rmSync(buildDir, { recursive: true, force: true });
+  const isDev = process.argv.includes("--dev");
+  const bundler = createBundler();
+  if (isDev) {
+    await bundler.watch();
+  } else {
+    await bundler.build();
+  }
+})();

package.json

@@ -3,12 +3,14 @@
   "version": "1.0.0",
   "description": "Reverse proxy for the OpenAI API",
   "scripts": {
-    "build": "tsc && copyfiles -u 1 src/**/*.ejs build",
+    "build:dev": "node esbuild.js --dev",
-    "prepare": "husky install",
+    "build": "node esbuild.js",
-    "start": "node build/server.js",
+    "postinstall": "node scripts/install-python-deps.js",
-    "start:dev": "nodemon --watch src --exec ts-node --transpile-only src/server.ts",
+    "start:dev:tsc": "nodemon --watch src --exec ts-node src/server.ts",
+    "start:dev": "concurrently \"npm run build:dev\" \"npm run start:watch\"",
     "start:replit": "tsc && node build/server.js",
     "start:watch": "nodemon --require source-map-support/register build/server.js",
+    "start": "node build/server.js",
     "type-check": "tsc --noEmit"
   },
   "engines": {
@@ -17,60 +19,43 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@anthropic-ai/tokenizer": "^0.0.4",
-    "@aws-crypto/sha256-js": "^5.1.0",
-    "@smithy/protocol-http": "^3.0.6",
-    "@smithy/signature-v4": "^2.0.10",
-    "@smithy/types": "^2.3.4",
     "axios": "^1.3.5",
-    "cookie-parser": "^1.4.6",
-    "copyfiles": "^2.4.1",
     "cors": "^2.8.5",
-    "csrf-csrf": "^2.3.0",
     "dotenv": "^16.0.3",
-    "ejs": "^3.1.9",
     "express": "^4.18.2",
-    "express-session": "^1.17.3",
+    "firebase-admin": "^11.9.0",
-    "firebase-admin": "^11.10.1",
+    "googleapis": "^117.0.0",
-    "googleapis": "^122.0.0",
     "http-proxy-middleware": "^3.0.0-beta.1",
-    "lifion-aws-event-stream": "^1.0.7",
+    "openai": "^3.2.1",
-    "memorystore": "^1.6.7",
-    "multer": "^1.4.5-lts.1",
-    "node-schedule": "^2.1.1",
     "pino": "^8.11.0",
     "pino-http": "^8.3.3",
-    "sanitize-html": "^2.11.0",
     "showdown": "^2.1.0",
-    "tiktoken": "^1.0.10",
+    "tiktoken": "^1.0.7",
     "uuid": "^9.0.0",
     "zlib": "^1.0.5",
-    "zod": "^3.22.3",
+    "zod": "^3.21.4"
-    "zod-error": "^1.5.0"
   },
   "devDependencies": {
-    "@types/cookie-parser": "^1.4.3",
     "@types/cors": "^2.8.13",
     "@types/express": "^4.17.17",
-    "@types/express-session": "^1.17.7",
-    "@types/multer": "^1.4.7",
-    "@types/node-schedule": "^2.1.0",
-    "@types/sanitize-html": "^2.9.0",
     "@types/showdown": "^2.0.0",
     "@types/uuid": "^9.0.1",
+    "@types/zeromq": "^5.2.2",
     "concurrently": "^8.0.1",
     "esbuild": "^0.17.16",
+    "esbuild-node-externals": "^1.7.0",
+    "esbuild-plugin-copy": "^2.1.1",
     "esbuild-register": "^3.4.2",
-    "husky": "^8.0.3",
+    "nodemon": "^2.0.22",
-    "nodemon": "^3.0.1",
-    "pino-pretty": "^10.2.3",
-    "prettier": "^3.0.3",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.9.1",
-    "typescript": "^5.1.3"
+    "typescript": "^5.0.4"
   },
   "overrides": {
-    "google-gax": "^3.6.1",
+    "optionator": "^0.9.3",
-    "postcss": "^8.4.31"
+    "semver": "^7.5.3"
+  },
+  "optionalDependencies": {
+    "zeromq": "^6.0.0-beta.16"
   }
 }

requirements.txt

@@ -0,0 +1,2 @@
+pyzmq==25.1.0
+anthropic==0.2.9

scripts/install-python-deps.js

@@ -0,0 +1,68 @@
+const fs = require("fs");
+const spawn = require("child_process").spawn;
+
+const IS_WINDOWS = process.platform === "win32";
+const IS_DEV = process.env.NODE_ENV !== "production";
+
+const installDeps = async () => {
+  try {
+    console.log("Installing additional optional dependencies...");
+    console.log("Creating venv...");
+    await maybeCreateVenv();
+    console.log("Installing python dependencies...");
+    await installPythonDependencies();
+  } catch (error) {
+    console.error("Error installing additional optional dependencies", error);
+    process.exit(0); // don't fail the build
+  }
+};
+
+installDeps();
+
+async function maybeCreateVenv() {
+  if (!IS_DEV) {
+    console.log("Skipping venv creation in production");
+    return true;
+  }
+  if (fs.existsSync(".venv")) {
+    console.log("Skipping venv creation, already exists");
+    return true;
+  }
+  const python = IS_WINDOWS ? "python" : "python3";
+  await runCommand(`${python} -m venv .venv`);
+  return true;
+}
+
+async function installPythonDependencies() {
+  const commands = [];
+  if (IS_DEV) {
+    commands.push(
+      IS_WINDOWS ? ".venv\\Scripts\\activate.bat" : "source .venv/bin/activate"
+    );
+  }
+  const pip = IS_WINDOWS ? "pip" : "pip3";
+  commands.push(`${pip} install -r requirements.txt`);
+
+  const command = commands.join(" && ");
+  await runCommand(command);
+  return true;
+}
+
+async function runCommand(command) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(command, [], { shell: true });
+    child.stdout.on("data", (data) => {
+      console.log(data.toString());
+    });
+    child.stderr.on("data", (data) => {
+      console.error(data.toString());
+    });
+    child.on("close", (code) => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject();
+      }
+    });
+  });
+}

src/admin/auth.ts

@@ -1,54 +0,0 @@
-import { Request, Response, RequestHandler } from "express";
-import { config } from "../config";
-
-const ADMIN_KEY = config.adminKey;
-const failedAttempts = new Map<string, number>();
-
-type AuthorizeParams = { via: "cookie" | "header" };
-
-export const authorize: ({ via }: AuthorizeParams) => RequestHandler =
-  ({ via }) =>
-  (req, res, next) => {
-    const bearerToken = req.headers.authorization?.slice("Bearer ".length);
-    const cookieToken = req.session.adminToken;
-    const token = via === "cookie" ? cookieToken : bearerToken;
-    const attempts = failedAttempts.get(req.ip) ?? 0;
-
-    if (!ADMIN_KEY) {
-      req.log.warn(
-        { ip: req.ip },
-        `Blocked admin request because no admin key is configured`
-      );
-      return res.status(401).json({ error: "Unauthorized" });
-    }
-
-    if (attempts > 5) {
-      req.log.warn(
-        { ip: req.ip, token: bearerToken },
-        `Blocked admin request due to too many failed attempts`
-      );
-      return res.status(401).json({ error: "Too many attempts" });
-    }
-
-    if (token && token === ADMIN_KEY) {
-      return next();
-    }
-
-    req.log.warn(
-      { ip: req.ip, attempts, invalidToken: String(token) },
-      `Attempted admin request with invalid token`
-    );
-    return handleFailedLogin(req, res);
-  };
-
-function handleFailedLogin(req: Request, res: Response) {
-  const attempts = failedAttempts.get(req.ip) ?? 0;
-  const newAttempts = attempts + 1;
-  failedAttempts.set(req.ip, newAttempts);
-  if (req.accepts("json", "html") === "json") {
-    return res.status(401).json({ error: "Unauthorized" });
-  }
-  delete req.session.adminToken;
-  req.session.flash = { type: "error", message: `Invalid admin key.` };
-  return res.redirect("/admin/login");
-}

src/admin/login.ts

@@ -1,26 +0,0 @@
-import { Router } from "express";
-
-const loginRouter = Router();
-
-loginRouter.get("/login", (_req, res) => {
-  res.render("admin_login");
-});
-
-loginRouter.post("/login", (req, res) => {
-  req.session.adminToken = req.body.token;
-  res.redirect("/admin");
-});
-
-loginRouter.get("/logout", (req, res) => {
-  delete req.session.adminToken;
-  res.redirect("/admin/login");
-});
-
-loginRouter.get("/", (req, res) => {
-  if (req.session.adminToken) {
-    return res.redirect("/admin/manage");
-  }
-  res.redirect("/admin/login");
-});
-
-export { loginRouter };

src/admin/routes.ts

@@ -1,54 +1,36 @@
-import express, { Router } from "express";
+import { RequestHandler, Router } from "express";
-import { authorize } from "./auth";
+import { config } from "../config";
-import { HttpError } from "../shared/errors";
+import { usersRouter } from "./users";
-import { injectLocals } from "../shared/inject-locals";
+
-import { withSession } from "../shared/with-session";
+const ADMIN_KEY = config.adminKey;
-import { injectCsrfToken, checkCsrfToken } from "../shared/inject-csrf";
+const failedAttempts = new Map<string, number>();
-import { loginRouter } from "./login";
-import { usersApiRouter as apiRouter } from "./api/users";
-import { usersWebRouter as webRouter } from "./web/manage";
 
 const adminRouter = Router();
 
-adminRouter.use(
+const auth: RequestHandler = (req, res, next) => {
-  express.json({ limit: "20mb" }),
+  const token = req.headers.authorization?.slice("Bearer ".length);
-  express.urlencoded({ extended: true, limit: "20mb" })
+  const attempts = failedAttempts.get(req.ip) ?? 0;
-);
+  if (attempts > 5) {
-adminRouter.use(withSession);
+    req.log.warn(
-adminRouter.use(injectCsrfToken);
+      { ip: req.ip, token },
-
+      `Blocked request to admin API due to too many failed attempts`
-adminRouter.use("/users", authorize({ via: "header" }), apiRouter);
+    );
-
+    return res.status(401).json({ error: "Too many attempts" });
-adminRouter.use(checkCsrfToken);
-adminRouter.use(injectLocals);
-adminRouter.use("/", loginRouter);
-adminRouter.use("/manage", authorize({ via: "cookie" }), webRouter);
-
-adminRouter.use(
-  (
-    err: Error,
-    req: express.Request,
-    res: express.Response,
-    _next: express.NextFunction
-  ) => {
-    const data: any = { message: err.message, stack: err.stack };
-    if (err instanceof HttpError) {
-      data.status = err.status;
-      res.status(err.status);
-      if (req.accepts(["html", "json"]) === "json") {
-        return res.json({ error: data });
-      }
-      return res.render("admin_error", data);
-    } else if (err.name === "ForbiddenError") {
-      data.status = 403;
-      if (err.message === "invalid csrf token") {
-        data.message =
-          "Invalid CSRF token; try refreshing the previous page before submitting again.";
-      }
-      return res.status(403).render("admin_error", { ...data, flash: null });
-    }
-    res.status(500).json({ error: data });
   }
-);
 
+  if (token !== ADMIN_KEY) {
+    const newAttempts = attempts + 1;
+    failedAttempts.set(req.ip, newAttempts);
+    req.log.warn(
+      { ip: req.ip, attempts: newAttempts, token },
+      `Attempted admin API request with invalid token`
+    );
+    return res.status(401).json({ error: "Unauthorized" });
+  }
+
+  next();
+};
+
+adminRouter.use(auth);
+adminRouter.use("/users", usersRouter);
 export { adminRouter };

src/admin/users.ts

@@ -1,18 +1,37 @@
 import { Router } from "express";
 import { z } from "zod";
-import * as userStore from "../../shared/users/user-store";
+import * as userStore from "../proxy/auth/user-store";
-import { parseSort, sortBy } from "../../shared/utils";
-import { UserPartialSchema, UserSchema } from "../../shared/users/schema";
 
-const router = Router();
+const usersRouter = Router();
+
+const UserSchema = z
+  .object({
+    ip: z.array(z.string()).optional(),
+    type: z.enum(["normal", "special"]).optional(),
+    promptCount: z.number().optional(),
+    tokenCount: z.number().optional(),
+    createdAt: z.number().optional(),
+    lastUsedAt: z.number().optional(),
+    disabledAt: z.number().optional(),
+    disabledReason: z.string().optional(),
+  })
+  .strict();
+
+const UserSchemaWithToken = UserSchema.extend({
+  token: z.string(),
+}).strict();
 
 /**
  * Returns a list of all users, sorted by prompt count and then last used time.
  * GET /admin/users
  */
-router.get("/", (req, res) => {
+usersRouter.get("/", (_req, res) => {
-  const sort = parseSort(req.query.sort) || ["promptCount", "lastUsedAt"];
+  const users = userStore.getUsers().sort((a, b) => {
-  const users = userStore.getUsers().sort(sortBy(sort, false));
+    if (a.promptCount !== b.promptCount) {
+      return b.promptCount - a.promptCount;
+    }
+    return (b.lastUsedAt ?? 0) - (a.lastUsedAt ?? 0);
+  });
   res.json({ users, count: users.length });
 });
 
@@ -20,7 +39,7 @@ router.get("/", (req, res) => {
  * Returns the user with the given token.
  * GET /admin/users/:token
  */
-router.get("/:token", (req, res) => {
+usersRouter.get("/:token", (req, res) => {
   const user = userStore.getUser(req.params.token);
   if (!user) {
     return res.status(404).json({ error: "Not found" });
@@ -30,33 +49,11 @@ router.get("/:token", (req, res) => {
 
 /**
  * Creates a new user.
- * Optionally accepts a JSON body containing `type`, and for temporary-type
- * users, `tokenLimits` and `expiresAt` fields.
  * Returns the created user's token.
  * POST /admin/users
  */
-router.post("/", (req, res) => {
+usersRouter.post("/", (_req, res) => {
-  const body = req.body;
+  res.json({ token: userStore.createUser() });
-
-  const base = z.object({
-    type: UserSchema.shape.type.exclude(["temporary"]).default("normal"),
-  });
-  const tempUser = base
-    .extend({
-      type: z.literal("temporary"),
-      expiresAt: UserSchema.shape.expiresAt,
-      tokenLimits: UserSchema.shape.tokenLimits,
-    })
-    .required();
-
-  const schema = z.union([base, tempUser]);
-  const result = schema.safeParse(body);
-  if (!result.success) {
-    return res.status(400).json({ error: result.error });
-  }
-
-  const token = userStore.createUser({ ...result.data });
-  res.json({ token });
 });
 
 /**
@@ -65,15 +62,12 @@ router.post("/", (req, res) => {
  * Returns the upserted user.
  * PUT /admin/users/:token
  */
-router.put("/:token", (req, res) => {
+usersRouter.put("/:token", (req, res) => {
-  const result = UserPartialSchema.safeParse({
+  const result = UserSchema.safeParse(req.body);
-    ...req.body,
-    token: req.params.token,
-  });
   if (!result.success) {
     return res.status(400).json({ error: result.error });
   }
-  userStore.upsertUser(result.data);
+  userStore.upsertUser({ ...result.data, token: req.params.token });
   res.json(userStore.getUser(req.params.token));
 });
 
@@ -83,13 +77,16 @@ router.put("/:token", (req, res) => {
  * Returns an object containing the upserted users and the number of upserts.
  * PUT /admin/users
  */
-router.put("/", (req, res) => {
+usersRouter.put("/", (req, res) => {
-  const result = z.array(UserPartialSchema).safeParse(req.body.users);
+  const result = z.array(UserSchemaWithToken).safeParse(req.body.users);
   if (!result.success) {
     return res.status(400).json({ error: result.error });
   }
   const upserts = result.data.map((user) => userStore.upsertUser(user));
-  res.json({ upserted_users: upserts, count: upserts.length });
+  res.json({
+    upserted_users: upserts,
+    count: upserts.length,
+  });
 });
 
 /**
@@ -98,7 +95,7 @@ router.put("/", (req, res) => {
  * Returns the disabled user.
  * DELETE /admin/users/:token
  */
-router.delete("/:token", (req, res) => {
+usersRouter.delete("/:token", (req, res) => {
   const user = userStore.getUser(req.params.token);
   const disabledReason = z
     .string()
@@ -114,4 +111,4 @@ router.delete("/:token", (req, res) => {
   res.json(userStore.getUser(req.params.token));
 });
 
-export { router as usersApiRouter };
+export { usersRouter };

src/admin/web/manage.ts

@@ -1,358 +0,0 @@
-import { Router } from "express";
-import multer from "multer";
-import { z } from "zod";
-import { config } from "../../config";
-import { HttpError } from "../../shared/errors";
-import * as userStore from "../../shared/users/user-store";
-import { parseSort, sortBy, paginate } from "../../shared/utils";
-import { keyPool } from "../../shared/key-management";
-import { MODEL_FAMILIES } from "../../shared/models";
-import { getTokenCostUsd, prettyTokens } from "../../shared/stats";
-import {
-  User,
-  UserPartialSchema,
-  UserSchema,
-  UserTokenCounts,
-} from "../../shared/users/schema";
-
-const router = Router();
-
-const upload = multer({
-  storage: multer.memoryStorage(),
-  fileFilter: (_req, file, cb) => {
-    if (file.mimetype !== "application/json") {
-      cb(new Error("Invalid file type"));
-    } else {
-      cb(null, true);
-    }
-  },
-});
-
-router.get("/create-user", (req, res) => {
-  const recentUsers = userStore
-    .getUsers()
-    .sort(sortBy(["createdAt"], false))
-    .slice(0, 5);
-  res.render("admin_create-user", {
-    recentUsers,
-    newToken: !!req.query.created,
-  });
-});
-
-router.post("/create-user", (req, res) => {
-  const body = req.body;
-
-  const base = z.object({ type: UserSchema.shape.type.default("normal") });
-  const tempUser = base
-    .extend({
-      temporaryUserDuration: z.coerce
-        .number()
-        .int()
-        .min(1)
-        .max(10080 * 4),
-    })
-    .merge(
-      MODEL_FAMILIES.reduce((schema, model) => {
-        return schema.extend({
-          [`temporaryUserQuota_${model}`]: z.coerce.number().int().min(0),
-        });
-      }, z.object({}))
-    )
-    .transform((data: any) => {
-      const expiresAt = Date.now() + data.temporaryUserDuration * 60 * 1000;
-      const tokenLimits = MODEL_FAMILIES.reduce((limits, model) => {
-        limits[model] = data[`temporaryUserQuota_${model}`];
-        return limits;
-      }, {} as UserTokenCounts);
-      return { ...data, expiresAt, tokenLimits };
-    });
-
-  const createSchema = body.type === "temporary" ? tempUser : base;
-  const result = createSchema.safeParse(body);
-  if (!result.success) {
-    throw new HttpError(
-      400,
-      result.error.issues.flatMap((issue) => issue.message).join(", ")
-    );
-  }
-
-  userStore.createUser({ ...result.data });
-  return res.redirect(`/admin/manage/create-user?created=true`);
-});
-
-router.get("/view-user/:token", (req, res) => {
-  const user = userStore.getUser(req.params.token);
-  if (!user) throw new HttpError(404, "User not found");
-  res.render("admin_view-user", { user });
-});
-
-router.get("/list-users", (req, res) => {
-  const sort = parseSort(req.query.sort) || ["sumTokens", "createdAt"];
-  const requestedPageSize =
-    Number(req.query.perPage) || Number(req.cookies.perPage) || 20;
-  const perPage = Math.max(1, Math.min(1000, requestedPageSize));
-  const users = userStore
-    .getUsers()
-    .map((user) => {
-      const sums = getSumsForUser(user);
-      return { ...user, ...sums };
-    })
-    .sort(sortBy(sort, false));
-
-  const page = Number(req.query.page) || 1;
-  const { items, ...pagination } = paginate(users, page, perPage);
-
-  return res.render("admin_list-users", {
-    sort: sort.join(","),
-    users: items,
-    ...pagination,
-  });
-});
-
-router.get("/import-users", (_req, res) => {
-  res.render("admin_import-users");
-});
-
-router.post("/import-users", upload.single("users"), (req, res) => {
-  if (!req.file) throw new HttpError(400, "No file uploaded");
-
-  const data = JSON.parse(req.file.buffer.toString());
-  const result = z.array(UserPartialSchema).safeParse(data.users);
-  if (!result.success) throw new HttpError(400, result.error.toString());
-
-  const upserts = result.data.map((user) => userStore.upsertUser(user));
-  req.session.flash = {
-    type: "success",
-    message: `${upserts.length} users imported`,
-  };
-  res.redirect("/admin/manage/import-users");
-});
-
-router.get("/export-users", (_req, res) => {
-  res.render("admin_export-users");
-});
-
-router.get("/export-users.json", (_req, res) => {
-  const users = userStore.getUsers();
-  res.setHeader("Content-Disposition", "attachment; filename=users.json");
-  res.setHeader("Content-Type", "application/json");
-  res.send(JSON.stringify({ users }, null, 2));
-});
-
-router.get("/", (_req, res) => {
-  res.render("admin_index");
-});
-
-router.post("/edit-user/:token", (req, res) => {
-  const result = UserPartialSchema.safeParse({
-    ...req.body,
-    token: req.params.token,
-  });
-  if (!result.success) {
-    throw new HttpError(
-      400,
-      result.error.issues.flatMap((issue) => issue.message).join(", ")
-    );
-  }
-
-  userStore.upsertUser(result.data);
-  return res.status(200).json({ success: true });
-});
-
-router.post("/reactivate-user/:token", (req, res) => {
-  const user = userStore.getUser(req.params.token);
-  if (!user) throw new HttpError(404, "User not found");
-
-  userStore.upsertUser({
-    token: user.token,
-    disabledAt: null,
-    disabledReason: null,
-  });
-  return res.sendStatus(204);
-});
-
-router.post("/disable-user/:token", (req, res) => {
-  const user = userStore.getUser(req.params.token);
-  if (!user) throw new HttpError(404, "User not found");
-
-  userStore.disableUser(req.params.token, req.body.reason);
-  return res.sendStatus(204);
-});
-
-router.post("/refresh-user-quota", (req, res) => {
-  const user = userStore.getUser(req.body.token);
-  if (!user) throw new HttpError(404, "User not found");
-
-  userStore.refreshQuota(user.token);
-  req.session.flash = {
-    type: "success",
-    message: "User's quota was refreshed",
-  };
-  return res.redirect(`/admin/manage/view-user/${user.token}`);
-});
-
-router.post("/maintenance", (req, res) => {
-  const action = req.body.action;
-  let flash = { type: "", message: "" };
-  switch (action) {
-    case "recheck": {
-      keyPool.recheck("openai");
-      keyPool.recheck("anthropic");
-      const size = keyPool
-        .list()
-        .filter((k) => k.service !== "google-palm").length;
-      flash.type = "success";
-      flash.message = `Scheduled recheck of ${size} keys for OpenAI and Anthropic.`;
-      break;
-    }
-    case "resetQuotas": {
-      const users = userStore.getUsers();
-      users.forEach((user) => userStore.refreshQuota(user.token));
-      const { claude, gpt4, turbo } = config.tokenQuota;
-      flash.type = "success";
-      flash.message = `All users' token quotas reset to ${turbo} (Turbo), ${gpt4} (GPT-4), ${claude} (Claude).`;
-      break;
-    }
-    case "resetCounts": {
-      const users = userStore.getUsers();
-      users.forEach((user) => userStore.resetUsage(user.token));
-      flash.type = "success";
-      flash.message = `All users' token usage records reset.`;
-      break;
-    }
-    default: {
-      throw new HttpError(400, "Invalid action");
-    }
-  }
-
-  req.session.flash = flash;
-
-  return res.redirect(`/admin/manage`);
-});
-
-router.get("/download-stats", (_req, res) => {
-  return res.render("admin_download-stats");
-});
-
-router.post("/generate-stats", (req, res) => {
-  const body = req.body;
-
-  const valid = z
-    .object({
-      anon: z.coerce.boolean().optional().default(false),
-      sort: z.string().optional().default("prompts"),
-      maxUsers: z.coerce
-        .number()
-        .int()
-        .min(5)
-        .max(1000)
-        .optional()
-        .default(1000),
-      tableType: z.enum(["code", "markdown"]).optional().default("markdown"),
-      format: z
-        .string()
-        .optional()
-        .default("# Stats\n{{header}}\n{{stats}}\n{{time}}"),
-    })
-    .strict()
-    .safeParse(body);
-
-  if (!valid.success) {
-    throw new HttpError(
-      400,
-      valid.error.issues.flatMap((issue) => issue.message).join(", ")
-    );
-  }
-
-  const { anon, sort, format, maxUsers, tableType } = valid.data;
-  const users = userStore.getUsers();
-
-  let totalTokens = 0;
-  let totalCost = 0;
-  let totalPrompts = 0;
-  let totalIps = 0;
-
-  const lines = users
-    .map((u) => {
-      const sums = getSumsForUser(u);
-      totalTokens += sums.sumTokens;
-      totalCost += sums.sumCost;
-      totalPrompts += u.promptCount;
-      totalIps += u.ip.length;
-
-      const getName = (u: User) => {
-        const id = `...${u.token.slice(-5)}`;
-        const banned = !!u.disabledAt;
-        let nick = anon || !u.nickname ? "Anonymous" : u.nickname;
-
-        if (tableType === "markdown") {
-          nick = banned ? `~~${nick}~~` : nick;
-          return `${nick.slice(0, 18)} | ${id}`;
-        } else {
-          // Strikethrough doesn't work within code blocks
-          const dead = !!u.disabledAt ? "[dead] " : "";
-          nick = `${dead}${nick}`;
-          return `${nick.slice(0, 18).padEnd(18)} ${id}`.padEnd(27);
-        }
-      };
-
-      const user = getName(u);
-      const prompts = `${u.promptCount} proompts`.padEnd(14);
-      const ips = `${u.ip.length} IPs`.padEnd(8);
-      const tokens = `${sums.prettyUsage} tokens`.padEnd(30);
-      const sortField = sort === "prompts" ? u.promptCount : sums.sumTokens;
-      return { user, prompts, ips, tokens, sortField };
-    })
-    .sort((a, b) => b.sortField - a.sortField)
-    .map(({ user, prompts, ips, tokens }, i) => {
-      const pos = tableType === "markdown" ? (i + 1 + ".").padEnd(4) : "";
-      return `${pos}${user} | ${prompts} | ${ips} | ${tokens}`;
-    })
-    .slice(0, maxUsers);
-
-  const strTotalPrompts = `${totalPrompts} proompts`;
-  const strTotalIps = `${totalIps} IPs`;
-  const strTotalTokens = `${prettyTokens(totalTokens)} tokens`;
-  const strTotalCost = `US$${totalCost.toFixed(2)} cost`;
-  const header = `!!!Note ${users.length} users | ${strTotalPrompts} | ${strTotalIps} | ${strTotalTokens} | ${strTotalCost}`;
-  const time = `\n-> *(as of ${new Date().toISOString()})* <-`;
-
-  let table = [];
-  table.push(lines.join("\n"));
-
-  if (valid.data.tableType === "markdown") {
-    table = ["User||Prompts|IPs|Usage", "---|---|---|---|---", ...table];
-  } else {
-    table = ["```text", ...table, "```"];
-  }
-
-  const result = format
-    .replace("{{header}}", header)
-    .replace("{{stats}}", table.join("\n"))
-    .replace("{{time}}", time);
-
-  res.setHeader(
-    "Content-Disposition",
-    `attachment; filename=proxy-stats-${new Date().toISOString()}.md`
-  );
-  res.setHeader("Content-Type", "text/markdown");
-  res.send(result);
-});
-
-function getSumsForUser(user: User) {
-  const sums = MODEL_FAMILIES.reduce(
-    (s, model) => {
-      const tokens = user.tokenCounts[model] ?? 0;
-      s.sumTokens += tokens;
-      s.sumCost += getTokenCostUsd(model, tokens);
-      return s;
-    },
-    { sumTokens: 0, sumCost: 0, prettyUsage: "" }
-  );
-  sums.prettyUsage = `${prettyTokens(sums.sumTokens)} ($${sums.sumCost.toFixed(
-    2
-  )})`;
-  return sums;
-}
-
-export { router as usersWebRouter };

src/admin/web/views/admin_create-user.ejs

@@ -1,133 +0,0 @@
-<%- include("partials/shared_header", { title: "Create User - OAI Reverse Proxy Admin" }) %>
-
-<style>
-  #temporaryUserOptions {
-    margin-top: 1em;
-    max-width: 30em;
-  }
-  
-  #temporaryUserOptions h3 {
-    margin-bottom: -0.4em;
-  }
-
-  input[type="number"] {
-    max-width: 10em;
-  }
-
-  .temporary-user-fieldset {
-    display: grid;
-    grid-template-columns: repeat(4, 1fr); /* Four equal-width columns */
-    column-gap: 1em;
-    row-gap: 0.2em;
-  }
-
-  .full-width {
-    grid-column: 1 / -1;
-  }
-
-  .quota-label {
-    text-align: right;
-  }
-</style>
-
-<h1>Create User Token</h1>
-<p>User token types:</p>
-<ul>
-  <li><strong>Normal</strong> - Standard users.
-  <li><strong>Special</strong> - Exempt from token quotas and <code>MAX_IPS_PER_USER</code> enforcement.</li>
-  <li><strong>Temporary</strong> - Disabled after a specified duration. Quotas never refresh.</li>
-</ul>
-  
-<form action="/admin/manage/create-user" method="post">
-  <input type="hidden" name="_csrf" value="<%= csrfToken %>" />
-  <label for="type">Type</label>
-  <select name="type">
-    <option value="normal">Normal</option>
-    <option value="special">Special</option>
-    <option value="temporary">Temporary</option>
-  </select>
-  <input type="submit" value="Create" />
-  <fieldset id="temporaryUserOptions" style="display: none">
-    <legend>Temporary User Options</legend>
-    <div class="temporary-user-fieldset">
-      <p class="full-width">
-        Temporary users will be disabled after the specified duration, and their records will be deleted 72 hours after that.
-        These options apply only to new
-        temporary users; existing ones use whatever options were in effect when they were created.
-      </p>
-      <label for="temporaryUserDuration" class="full-width">Access duration (in minutes)</label>
-      <input type="number" name="temporaryUserDuration" id="temporaryUserDuration" value="60" class="full-width" />
-      <!-- convenience calculations -->
-      <span>6 hours:</span><code>360</code>
-      <span>12 hours:</span><code>720</code>
-      <span>1 day:</span><code>1440</code>
-      <span>1 week:</span><code>10080</code>
-      <h3 class="full-width">Token Quotas</h3>
-      <p class="full-width">Temporary users' quotas are never refreshed.</p>
-      <% Object.entries(quota).forEach(function([model, tokens]) { %>
-      <label class="quota-label" for="temporaryUserQuota_<%= model %>"><%= model %></label>
-      <input
-        type="number"
-        name="temporaryUserQuota_<%= model %>"
-        id="temporaryUserQuota_<%= model %>"
-        value="0"
-        data-fieldtype="tokenquota"
-        data-default="<%= tokens %>" />
-      <% }) %>
-    </div>
-  </fieldset>
-</form>
-<% if (newToken) { %>
-<p>Just created <code><%= recentUsers[0].token %></code>.</p>
-<% } %>
-<h2>Recent Tokens</h2>
-<ul>
-  <% recentUsers.forEach(function(user) { %>
-  <li><a href="/admin/manage/view-user/<%= user.token %>"><%= user.token %></a></li>
-  <% }) %>
-</ul>
-
-<script>
-  const typeInput = document.querySelector("select[name=type]");
-  const temporaryUserOptions = document.querySelector("#temporaryUserOptions");
-  typeInput.addEventListener("change", function () {
-    localStorage.setItem("admin__create-user__type", typeInput.value);
-    if (typeInput.value === "temporary") {
-      temporaryUserOptions.style.display = "block";
-    } else {
-      temporaryUserOptions.style.display = "none";
-    }
-  });
-
-  function loadDefaults() {
-    const defaultType = localStorage.getItem("admin__create-user__type");
-    if (defaultType) {
-      typeInput.value = defaultType;
-      typeInput.dispatchEvent(new Event("change"));
-    }
-
-    const durationInput = document.querySelector("input[name=temporaryUserDuration]");
-    const defaultDuration = localStorage.getItem("admin__create-user__duration");
-    durationInput.addEventListener("change", function () {
-      localStorage.setItem("admin__create-user__duration", durationInput.value);
-    });
-    if (defaultDuration) {
-      durationInput.value = defaultDuration;
-    }
-
-    const tokenQuotaInputs = document.querySelectorAll("input[data-fieldtype=tokenquota]");
-    tokenQuotaInputs.forEach(function (input) {
-      const defaultQuota = localStorage.getItem("admin__create-user__quota__" + input.id);
-      input.addEventListener("change", function () {
-        localStorage.setItem("admin__create-user__quota__" + input.id, input.value);
-      });
-      if (defaultQuota) {
-        input.value = defaultQuota;
-      }
-    });
-  }
-
-  loadDefaults();
-</script>
-
-<%- include("partials/admin-footer") %>

src/admin/web/views/admin_download-stats.ejs

@@ -1,147 +0,0 @@
-<%- include("partials/shared_header", { title: "Download Stats - OAI Reverse Proxy Admin" }) %>
-<style>
-  #statsForm {
-    display: flex;
-    flex-direction: column;
-  }
-
-  #statsForm div {
-    display: flex;
-    flex-direction: row;
-    margin-bottom: 0.5em;
-  }
-
-  #statsForm div label {
-    width: 6em;
-    text-align: right;
-    margin-right: 1em;
-  }
-
-  #statsForm ul {
-    margin: 0;
-    padding-left: 2em;
-    font-size: 0.8em;
-  }
-
-  #statsForm li {
-    list-style: none;
-  }
-
-  #statsForm textarea {
-    font-family: monospace;
-    flex-grow: 1;
-  }
-</style>
-<h1>Download Stats</h1>
-<p>
-  Download usage statistics to a Markdown document. You can paste this into a service like Rentry.org to share it.
-</p>
-<div>
-  <h3>Options</h3>
-  <form id="statsForm" action="/admin/manage/generate-stats" method="post"
-    style="display: flex; flex-direction: column;">
-    <input id="_csrf" type="hidden" name="_csrf" value="<%= csrfToken %>" />
-    <div>
-      <label for="anon">Anonymize</label>
-      <input id="anon" type="checkbox" name="anon" value="true" />
-    </div>
-    <div>
-      <label for="sort">Sort</label>
-      <select id="sort" name="sort">
-        <option value="tokens" selected>By Token Count</option>
-        <option value="prompts">By Prompt Count</option>
-      </select>
-    </div>
-    <div>
-      <label for="maxUsers">Max Users</label>
-      <input id="maxUsers" type="number" name="maxUsers" value="1000" />
-    </div>
-    <div>
-      <label for="tableType">Table Type</label>
-      <select id="tableType" name="tableType">
-        <option value="markdown" selected>Markdown Table</option>
-        <option value="code">Code Block</option>
-      </select>
-    </div>
-    <div>
-      <label for="format">Custom Format <ul>
-          <li><code>{{header}}</code></li>
-          <li><code>{{stats}}</code></li>
-          <li><code>{{time}}</code></li>
-        </ul></label>
-      <textarea id="format" name="format" rows="10" cols="50" placeholder="{{stats}}">
-# Stats
-{{header}}
-{{stats}}
-{{time}}
-    </textarea>
-    </div>
-    <div>
-      <button type="submit">Download</button>
-      <button id="copyButton" type="button">Copy to Clipboard</button>
-    </div>
-  </form>
-</div>
-
-<script>
-  function loadDefaults() {
-    const getState = (key) => localStorage.getItem("admin__download-stats__" + key);
-    const setState = (key, value) => localStorage.setItem("admin__download-stats__" + key, value);
-
-    const checkboxes = ["anon"];
-    const values = ["sort", "format", "tableType", "maxUsers"];
-
-    checkboxes.forEach((key) => {
-      const value = getState(key);
-      if (value) {
-        document.getElementById(key).checked = value == "true";
-      }
-      document.getElementById(key).addEventListener("change", (e) => {
-        setState(key, e.target.checked);
-      });
-    });
-
-    values.forEach((key) => {
-      const value = getState(key);
-      if (value) {
-        document.getElementById(key).value = value;
-      }
-      document.getElementById(key).addEventListener("change", (e) => {
-        setState(key, e.target.value?.trim());
-      });
-    });
-  }
-
-  loadDefaults();
-
-  async function fetchAndCopy() {
-    const form = document.getElementById('statsForm');
-    const formData = new FormData(form);
-
-    const response = await fetch(form.action, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      credentials: 'same-origin',
-      body: new URLSearchParams(formData),
-    });
-
-
-    if (response.ok) {
-      const content = await response.text();
-      copyToClipboard(content);
-    } else {
-      throw new Error('Failed to fetch generated stats. Try reloading the page.');
-    }
-  }
-
-  function copyToClipboard(text) {
-    navigator.clipboard.writeText(text).then(() => {
-      alert('Copied to clipboard');
-    }).catch(err => {
-      alert('Failed to copy to clipboard. Try downloading the file instead.');
-    });
-  }
-
-  document.getElementById('copyButton').addEventListener('click', fetchAndCopy);
-</script>
-<%- include("partials/admin-footer") %>

src/admin/web/views/admin_error.ejs

@@ -1,8 +0,0 @@
-<%- include("partials/shared_header", { title: "Error" }) %>
-    <div id="error-content" style="color: red; background-color: #eedddd; padding: 1em">
-      <p><strong>⚠️ Error <%= status %>:</strong> <%= message %></p>
-      <pre><%= stack %></pre>
-      <a href="#" onclick="window.history.back()">Go Back</a> | <a href="/admin">Go Home</a>
-    </div>
-  </body>
-</html>

src/admin/web/views/admin_export-users.ejs

@@ -1,28 +0,0 @@
-<%- include("partials/shared_header", { title: "Export Users - OAI Reverse Proxy Admin" }) %>
-<h1>Export Users</h1>
-<p>
-  Export users to JSON. The JSON will be an array of objects under the key
-  <code>users</code>. You can use this JSON to import users later.
-</p>
-<script>
-  function exportUsers() {
-    var xhr = new XMLHttpRequest();
-    xhr.open("GET", "/admin/manage/export-users.json", true);
-    xhr.responseType = "blob";
-    xhr.onload = function() {
-      if (this.status === 200) {
-        var blob = new Blob([this.response], { type: "application/json" });
-        var url = URL.createObjectURL(blob);
-        var a = document.createElement("a");
-        a.href = url;
-        a.download = "users.json";
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
-      }
-    };
-    xhr.send();
-  }
-</script>
-<button onclick="exportUsers()">Export</button>
-<%- include("partials/admin-footer") %>

src/admin/web/views/admin_import-users.ejs

@@ -1,48 +0,0 @@
-<%- include("partials/shared_header", { title: "Import Users - OAI Reverse Proxy Admin" }) %>
-<h1>Import Users</h1>
-<p>
-  Import users from JSON. The JSON should be an array of objects under the key
-  <code>users</code>. Each object should have the following fields:
-</p>
-<ul>
-  <li><code>token</code> (required): a unique identifier for the user</li>
-  <li><code>nickname</code> (optional): a nickname for the user, max 80 chars</li>
-  <li><code>ip</code> (optional): IP addresses the user has connected from</li>
-  <li>
-    <code>type</code> (optional): either <code>normal</code> or
-    <code>special</code>
-  </li>
-  <li>
-    <code>promptCount</code> (optional): the number of times the user has sent a
-    prompt
-  </li>
-  <li>
-    <code>tokenCounts</code> (optional): the number of tokens the user has
-    consumed. This should be an object with keys <code>turbo</code>,
-    <code>gpt4</code>, and <code>claude</code>.
-  </li>
-  <li>
-    <code>tokenLimits</code> (optional): the number of tokens the user can
-    consume. This should be an object with keys <code>turbo</code>,
-    <code>gpt4</code>, and <code>claude</code>.
-  </li>
-  <li>
-    <code>createdAt</code> (optional): the timestamp when the user was created
-  </li>
-  <li>
-    <code>disabledAt</code> (optional): the timestamp when the user was disabled
-  </li>
-  <li>
-    <code>disabledReason</code> (optional): the reason the user was disabled
-  </li>
-</ul>
-<p>
-  If a user with the same token already exists, the existing user will be
-  updated with the new values.
-</p>
-<form action="/admin/manage/import-users?_csrf=<%= csrfToken %>" method="post" enctype="multipart/form-data">
-  <input type="file" name="users" />
-  <input type="submit" value="Import" />
-</form>
-</form>
-<%- include("partials/admin-footer") %>

src/admin/web/views/admin_index.ejs

@@ -1,64 +0,0 @@
-<%- include("partials/shared_header", { title: "OAI Reverse Proxy Admin" }) %>
-<h1>OAI Reverse Proxy Admin</h1>
-<% if (!persistenceEnabled) { %>
-<p style="color: red; background-color: #eedddd; padding: 1em">
-  <strong>⚠️ Users will be lost when the server restarts because persistence is not configured.</strong><br />
-  <br />Be sure to export your users and import them again after restarting the server if you want to keep them.<br />
-  <br />
-  See the
-  <a target="_blank" href="https://gitgud.io/khanon/oai-reverse-proxy/-/blob/main/docs/user-management.md#firebase-realtime-database">
-    user management documentation</a
-  >
-  to learn how to set up persistence.
-</p>
-<% } %>
-<h3>Users</h3>
-<ul>
-  <li><a href="/admin/manage/list-users">List Users</a></li>
-  <li><a href="/admin/manage/create-user">Create User</a></li>
-  <li><a href="/admin/manage/import-users">Import Users</a></li>
-  <li><a href="/admin/manage/export-users">Export Users</a></li>
-  <li><a href="/admin/manage/download-stats">Download Rentry Stats</a>
-</ul>
-<h3>Maintenance</h3>
-<form id="maintenanceForm" action="/admin/manage/maintenance" method="post">
-  <input id="_csrf" type="hidden" name="_csrf" value="<%= csrfToken %>" />
-  <input id="hiddenAction" type="hidden" name="action" value="" />
-  <div display="flex" flex-direction="column">
-    <fieldset>
-      <legend>Key Recheck</legend>
-      <button id="recheck-keys" type="button" onclick="submitForm('recheck')">Force Key Recheck</button>
-      <label for="recheck-keys">Triggers a recheck of all keys without restarting the server.</label>
-    </fieldset>
-    <% if (quotasEnabled) { %>
-    <fieldset>
-      <legend>Bulk Quota Management</legend>
-      <p>
-        <button id="refresh-quotas" type="button" onclick="submitForm('resetQuotas')">Refresh All Quotas</button>
-        Resets all users' quotas to the values set in the <code>TOKEN_QUOTA_*</code> environment variables.
-      </p>
-      <p>
-        <button id="clear-token-counts" type="button" onclick="submitForm('resetCounts')">Clear All Token Counts</button>
-        Resets all users' token records to zero.
-      </p>
-    </fieldset>
-    <% } %>
-  </div>
-</form>
-
-<script>
-  let confirmed = false;
-  function submitForm(action) {
-    if (action === "resetCounts" && !confirmed) {
-      document.getElementById("clear-token-counts").innerText = "💣 Confirm Clear All Token Counts";
-      alert("⚠️ This will permanently clear token records for all users. If you only want to refresh quotas, use the other button.");
-      confirmed = true;
-      return;
-    }
-
-    document.getElementById("hiddenAction").value = action;
-    document.getElementById("maintenanceForm").submit();
-  }
-</script>
-
-<%- include("partials/admin-footer") %>

src/admin/web/views/admin_list-users.ejs

@@ -1,87 +0,0 @@
-<%- include("partials/shared_header", { title: "Users - OAI Reverse Proxy Admin" }) %>
-    <h1>User Token List</h1>
-    
-    <% if (users.length === 0) { %>
-    <p>No users found.</p>
-    <% } else { %>
-    <input type="checkbox" id="toggle-nicknames" onchange="toggleNicknames()" />
-    <label for="toggle-nicknames">Show Nicknames</label>
-    <table>
-      <thead>
-        <tr>
-          <th>User</th>
-          <th <% if (sort.includes("ip")) { %>class="active"<% } %> ><a href="/admin/manage/list-users?sort=ip">IPs</a></th>
-          <th <% if (sort.includes("promptCount")) { %>class="active"<% } %> ><a href="/admin/manage/list-users?sort=promptCount">Prompts</a></th>
-          <th <% if (sort.includes("sumCost")) { %>class="active"<% } %> ><a href="/admin/manage/list-users?sort=sumCost">Usage</a></th>
-          <th>Type</th>
-          <th <% if (sort.includes("createdAt")) { %>class="active"<% } %> ><a href="/admin/manage/list-users?sort=createdAt">Created (UTC)</a></th>
-          <th <% if (sort.includes("lastUsedAt")) { %>class="active"<% } %> ><a href="/admin/manage/list-users?sort=lastUsedAt">Last Used (UTC)</a></th>
-          <th colspan="2">Banned?</th>
-        </tr>
-      </thead>
-      <tbody>
-        <% users.forEach(function(user){ %>
-        <tr>
-          <td>
-            <a href="/admin/manage/view-user/<%= user.token %>">
-            <code class="usertoken"><%= user.token %></code>
-            <% if (user.nickname) { %>
-            <span class="nickname" style="display: none"><%= user.nickname %></span>
-            <% } else { %>
-            <code class="nickname" style="display: none"><%= "..." + user.token.slice(-5) %></code>
-            <% } %>
-          </a>
-          </td>
-          <td><%= user.ip.length %></td>
-          <td><%= user.promptCount %></td>
-          <td><%= user.prettyUsage %></td>
-          <td><%= user.type %></td>
-          <td><%= user.createdAt %></td>
-          <td><%= user.lastUsedAt ?? "never" %></td>
-          <td class="actions">
-            <% if (user.disabledAt) { %>
-            <a title="Unban" href="#" class="unban" data-token="<%= user.token %>">🔄️</a>
-            <% } else { %>
-            <a title="Ban" href="#" class="ban" data-token="<%= user.token %>">🚫</a>
-            <% } %>
-          <td><%= user.disabledAt ? "Yes" : "No" %> <%= user.disabledReason ? `(${user.disabledReason})` : "" %></td>
-          </td>
-        </tr>
-        <% }); %>
-    </table>
-    <ul class="pagination">
-      <% if (page > 1) { %>
-      <li><a href="/admin/manage/list-users?sort=<%= sort %>&page=<%= page - 1 %>">&laquo;</a></li>
-      <% } %> <% for (var i = 1; i <= pageCount; i++) { %>
-      <li <% if (i === page) { %>class="active"<% } %>><a href="/admin/manage/list-users?sort=<%= sort %>&page=<%= i %>"><%= i %></a></li>
-      <% } %> <% if (page < pageCount) { %>
-      <li><a href="/admin/manage/list-users?sort=<%= sort %>&page=<%= page + 1 %>">&raquo;</a></li>
-      <% } %>
-    </ul>
-    
-    <p>Showing <%= page * pageSize - pageSize + 1 %> to <%= users.length + page * pageSize - pageSize %> of <%= totalCount %> users.</p>
-    <%- include("partials/shared_pagination") %>
-    <% } %>
-    
-<script>
-  function toggleNicknames() {
-    const checked = document.getElementById("toggle-nicknames").checked;
-    const visibleSelector = checked ? ".nickname" : ".usertoken";
-    const hiddenSelector = checked ? ".usertoken" : ".nickname";
-    document.querySelectorAll(visibleSelector).forEach(function (el) {
-      el.style.display = "inline";
-    });
-    document.querySelectorAll(hiddenSelector).forEach(function (el) {
-      el.style.display = "none";
-    });
-    localStorage.setItem("showNicknames", checked);
-  }
-  
-  const state = localStorage.getItem("showNicknames") === "true";
-  document.getElementById("toggle-nicknames").checked = state;
-  toggleNicknames();
-</script>
-
-<%- include("partials/admin-ban-xhr-script") %>
-
-<%- include("partials/admin-footer") %>

src/admin/web/views/admin_login.ejs

@@ -1,10 +0,0 @@
-<%- include("partials/shared_header", { title: "Login" }) %>
-    <h1>Login</h1>
-    <form action="/admin/login" method="post">
-      <input type="hidden" name="_csrf" value="<%= csrfToken %>" />
-      <label for="token">Admin Key</label>
-      <input type="password" name="token" />
-      <input type="submit" value="Login" />
-    </form>
-  </body>
-</html>

src/admin/web/views/admin_view-user.ejs

@@ -1,147 +0,0 @@
-<%- include("partials/shared_header", { title: "View User - OAI Reverse Proxy Admin" }) %>
-<h1>View User</h1>
-
-<table class="striped">
-  <thead>
-    <tr>
-      <th scope="col">Key</th>
-      <th scope="col" colspan="2">Value</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <th scope="row">Token</th>
-      <td colspan="2"><%- user.token %></td>
-    </tr>
-    <tr>
-      <th scope="row">Nickname</th>
-      <td><%- user.nickname ?? "none" %></td>
-      <td class="actions">
-        <a title="Edit" id="edit-nickname" href="#" data-field="nickname" data-token="<%= user.token %>">✏️</a>
-      </td>
-    </tr>
-    <tr>
-      <th scope="row">Type</th>
-      <td><%- user.type %></td>
-      <td class="actions">
-        <a title="Edit" id="edit-type" href="#" data-field="type" data-token="<%= user.token %>">✏️</a>
-      </td>
-    </tr>
-    <tr>
-      <th scope="row">Prompts</th>
-      <td colspan="2"><%- user.promptCount %></td>
-    </tr>
-    <tr>
-      <th scope="row">Created At</th>
-      <td colspan="2"><%- user.createdAt %></td>
-    </tr>
-    <tr>
-      <th scope="row">Last Used At</th>
-      <td colspan="2"><%- user.lastUsedAt || "never" %></td>
-    </tr>
-    <tr>
-      <th scope="row">Disabled At</th>
-      <td><%- user.disabledAt %></td>
-      <td class="actions">
-        <% if (user.disabledAt) { %>
-        <a title="Unban" href="#" class="unban" data-token="<%= user.token %>">🔄️</a>
-        <% } else { %>
-        <a title="Ban" href="#" class="ban" data-token="<%= user.token %>">🚫</a>
-        <% } %>
-      </td>
-    </tr>
-    <tr>
-      <th scope="row">Disabled Reason</th>
-      <td><%- user.disabledReason %></td>
-      <% if (user.disabledAt) { %>
-      <td class="actions">
-        <a title="Edit" id="edit-disabledReason" href="#" data-field="disabledReason"
-          data-token="<%= user.token %>">✏️</a>
-      </td>
-      <% } %>
-    </tr>
-    <tr>
-      <th scope="row">IP Address Limit</th>
-      <td><%- (user.maxIps ?? maxIps) || "Unlimited" %></td>
-      <td class="actions">
-        <a title="Edit" id="edit-maxIps" href="#" data-field="maxIps" data-token="<%= user.token %>">✏️</a>
-      </td>
-    </tr>
-    <tr>
-      <th scope="row">IPs</th>
-      <td colspan="2"><%- include("partials/shared_user_ip_list", { user, shouldRedact: false }) %></td>
-    </tr>
-    <tr>
-      <th scope="row">Admin Note <span title="Unlike nickname, this is not visible to or editable by the user">🔒</span>
-      </th>
-      <td><%- user.adminNote ?? "none" %></td>
-      <td class="actions">
-        <a title="Edit" id="edit-adminNote" href="#" data-field="adminNote" data-token="<%= user.token %>">✏️</a>
-      </td>
-    </tr>
-    <% if (user.type === "temporary") { %>
-    <tr>
-      <th scope="row">Expires At</th>
-      <td colspan="2"><%- user.expiresAt %></td>
-    </tr>
-    <% } %>
-  </tbody>
-</table>
-
-<form style="display:none" id="current-values">
-  <input type="hidden" name="token" value="<%- user.token %>" />
-  <% ["nickname", "type", "disabledAt", "disabledReason", "maxIps", "adminNote"].forEach(function (key) { %>
-  <input type="hidden" name="<%- key %>" value="<%- user[key] %>" />
-  <% }); %>
-</form>
-
-<h3>Quota Information</h3>
-<% if (quotasEnabled) { %>
-<form action="/admin/manage/refresh-user-quota" method="POST">
-  <input type="hidden" name="token" value="<%- user.token %>" />
-  <input type="hidden" name="_csrf" value="<%- csrfToken %>" />
-  <button type="submit" class="btn btn-primary">Refresh Quotas for User</button>
-</form>
-<% } %> <%- include("partials/shared_quota-info", { quota, user }) %>
-
-<p><a href="/admin/manage/list-users">Back to User List</a></p>
-
-<script>
-  document.querySelectorAll("td.actions a[data-field]").forEach(function (a) {
-    a.addEventListener("click", function (e) {
-      e.preventDefault();
-      const token = a.dataset.token;
-      const field = a.dataset.field;
-      const existingValue = document.querySelector(`#current-values input[name=${field}]`).value;
-      let value = prompt(`Enter new value for '${field}'':`, existingValue);
-      if (value !== null) {
-        if (value === "") {
-          value = null;
-        }
-        fetch(`/admin/manage/edit-user/${token}`, {
-          method: "POST",
-          credentials: "same-origin",
-          body: JSON.stringify({
-            [field]: value,
-            _csrf: document.querySelector("meta[name=csrf-token]").getAttribute("content"),
-          }),
-          headers: { "Content-Type": "application/json", Accept: "application/json" },
-        })
-          .then((res) => Promise.all([res.ok, res.json()]))
-          .then(([ok, json]) => {
-            const url = new URL(window.location.href);
-            const params = new URLSearchParams();
-            if (!ok) {
-              params.set("flash", `error: ${json.error.message}`);
-            } else {
-              params.set("flash", `success: User's ${field} updated.`);
-            }
-            url.search = params.toString();
-            window.location.assign(url);
-          });
-      }
-    });
-  });
-</script>
-
-<%- include("partials/admin-ban-xhr-script") %> <%- include("partials/admin-footer") %>

src/admin/web/views/partials/admin-ban-xhr-script.ejs

@@ -1,32 +0,0 @@
-<script>
-  document.querySelectorAll("td.actions a.ban").forEach(function (a) {
-    a.addEventListener("click", function (e) {
-      e.preventDefault();
-      var token = a.getAttribute("data-token");
-      if (confirm("Are you sure you want to ban this user?")) {
-        let reason = prompt("Reason for ban:");
-        fetch("/admin/manage/disable-user/" + token, {
-          method: "POST",
-          credentials: "same-origin",
-          body: JSON.stringify({ reason, _csrf: document.querySelector("meta[name=csrf-token]").getAttribute("content") }),
-          headers: { "Content-Type": "application/json" },
-        }).then(() => window.location.reload());
-      }
-    });
-  });
-
-  document.querySelectorAll("td.actions a.unban").forEach(function (a) {
-    a.addEventListener("click", function (e) {
-      e.preventDefault();
-      var token = a.getAttribute("data-token");
-      if (confirm("Are you sure you want to unban this user?")) {
-        fetch("/admin/manage/reactivate-user/" + token, {
-          method: "POST",
-          credentials: "same-origin",
-          body: JSON.stringify({ _csrf: document.querySelector("meta[name=csrf-token]").getAttribute("content") }),
-          headers: { "Content-Type": "application/json" },
-        }).then(() => window.location.reload());
-      }
-    });
-  });
-</script>

src/admin/web/views/partials/admin-footer.ejs

@@ -1,15 +0,0 @@
-  <hr />
-  <footer>
-    <a href="/admin">Index</a> | <a href="/admin/logout">Logout</a>
-  </footer>
-  <script>
-    document.querySelectorAll("td,time").forEach(function(td) {
-      if (td.innerText.match(/^\d{13}$/)) {
-        if (td.innerText == 0) return 'never';
-        var date = new Date(parseInt(td.innerText));
-        td.innerText = date.toISOString().replace("T", " ").replace(/\.\d+Z$/, "Z");
-      }
-    });
-  </script>
-  </body>
-</html>

src/config.ts

@@ -1,13 +1,16 @@
 import dotenv from "dotenv";
 import type firebase from "firebase-admin";
-import { hostname } from "os";
 import pino from "pino";
-import type { ModelFamily } from "./shared/models";
 dotenv.config();
 
+// Can't import the usual logger here because it itself needs the config.
 const startupLogger = pino({ level: "debug" }).child({ module: "startup" });
+
 const isDev = process.env.NODE_ENV !== "production";
 
+type PromptLoggingBackend = "google_sheets";
+export type DequeueMode = "fair" | "random" | "none";
+
 type Config = {
   /** The port the proxy server will listen on. */
   port: number;
@@ -15,91 +18,51 @@ type Config = {
   openaiKey?: string;
   /** Comma-delimited list of Anthropic API keys. */
   anthropicKey?: string;
-  /** Comma-delimited list of Google PaLM API keys. */
-  googlePalmKey?: string;
-  /**
-   * Comma-delimited list of AWS credentials. Each credential item should be a
-   * colon-delimited list of access key, secret key, and AWS region.
-   *
-   * The credentials must have access to the actions `bedrock:InvokeModel` and
-   * `bedrock:InvokeModelWithResponseStream`. You must also have already
-   * provisioned the necessary models in your AWS account, on the specific
-   * regions specified for each credential. Models are region-specific.
-   *
-   * @example `AWS_CREDENTIALS=access_key_1:secret_key_1:us-east-1,access_key_2:secret_key_2:us-west-2`
-   */
-  awsCredentials?: string;
   /**
    * The proxy key to require for requests. Only applicable if the user
    * management mode is set to 'proxy_key', and required if so.
-   */
+   **/
   proxyKey?: string;
   /**
-   * The admin key used to access the /admin API or UI. Required if the user
+   * The admin key used to access the /admin API. Required if the user
    * management mode is set to 'user_token'.
-   */
+   **/
   adminKey?: string;
   /**
    * Which user management mode to use.
-   * - `none`: No user management. Proxy is open to all requests with basic
+   *
-   *   abuse protection.
+   * `none`: No user management. Proxy is open to all requests with basic
-   * - `proxy_key`: A specific proxy key must be provided in the Authorization
+   *  abuse protection.
-   *   header to use the proxy.
+   *
-   * - `user_token`: Users must be created via by admins and provide their
+   * `proxy_key`: A specific proxy key must be provided in the Authorization
-   *   personal access token in the Authorization header to use the proxy.
+   *  header to use the proxy.
-   *   Configure this function and add users via the admin API or UI.
+   *
+   * `user_token`: Users must be created via the /admin REST API and provide
+   *  their personal access token in the Authorization header to use the proxy.
+   *  Configure this function and add users via the /admin API.
    */
   gatekeeper: "none" | "proxy_key" | "user_token";
   /**
-   * Persistence layer to use for user and key management.
+   * Persistence layer to use for user management.
-   * - `memory`: Data is stored in memory and lost on restart (default)
+   *
-   * - `firebase_rtdb`: Data is stored in Firebase Realtime Database; requires
+   * `memory`: Users are stored in memory and are lost on restart (default)
-   *   `firebaseKey` and `firebaseRtdbUrl` to be set.
+   *
-   */
+   * `firebase_rtdb`: Users are stored in a Firebase Realtime Database; requires
-  persistenceProvider: "memory" | "firebase_rtdb";
+   *  `firebaseKey` and `firebaseRtdbUrl` to be set.
+   **/
+  gatekeeperStore: "memory" | "firebase_rtdb";
   /** URL of the Firebase Realtime Database if using the Firebase RTDB store. */
   firebaseRtdbUrl?: string;
-  /**
+  /** Base64-encoded Firebase service account key if using the Firebase RTDB store. */
-   * Base64-encoded Firebase service account key if using the Firebase RTDB
-   * store. Note that you should encode the *entire* JSON key file, not just the
-   * `private_key` field inside it.
-   */
   firebaseKey?: string;
-  /**
-   * The root key under which data will be stored in the Firebase RTDB. This
-   * allows multiple instances of the proxy to share the same database while
-   * keeping their data separate.
-   *
-   * If you want multiple proxies to share the same data, set all of their
-   * `firebaseRtdbRoot` to the same value. Beware that there will likely
-   * be conflicts because concurrent writes are not yet supported and proxies
-   * currently assume they have exclusive access to the database.
-   *
-   * Defaults to the system hostname so that data is kept separate.
-   */
-  firebaseRtdbRoot: string;
   /**
    * Maximum number of IPs per user, after which their token is disabled.
    * Users with the manually-assigned `special` role are exempt from this limit.
-   * - Defaults to 0, which means that users are not IP-limited.
+   * By default, this is 0, meaning that users are not IP-limited.
    */
   maxIpsPerUser: number;
   /** Per-IP limit for requests per minute to OpenAI's completions endpoint. */
   modelRateLimit: number;
-  /**
-   * For OpenAI, the maximum number of context tokens (prompt + max output) a
-   * user can request before their request is rejected.
-   * Context limits can help prevent excessive spend.
-   * - Defaults to 0, which means no limit beyond OpenAI's stated maximums.
-   */
-  maxContextTokensOpenAI: number;
-  /**
-   * For Anthropic, the maximum number of context tokens a user can request.
-   * Claude context limits can prevent requests from tying up concurrency slots
-   * for too long, which can lengthen queue times for other users.
-   * - Defaults to 0, which means no limit beyond Anthropic's stated maximums.
-   */
-  maxContextTokensAnthropic: number;
   /** For OpenAI, the maximum number of sampled tokens a user can request. */
   maxOutputTokensOpenAI: number;
   /** For Anthropic, the maximum number of sampled tokens a user can request. */
@@ -108,64 +71,59 @@ type Config = {
   rejectDisallowed?: boolean;
   /** Message to return when rejecting requests. */
   rejectMessage?: string;
-  /** Verbosity level of diagnostic logging. */
+  /** Pino log level. */
-  logLevel: "trace" | "debug" | "info" | "warn" | "error";
+  logLevel?: "debug" | "info" | "warn" | "error";
-  /**
-   * Whether to allow the usage of AWS credentials which could be logging users'
-   * model invocations. By default, such keys are treated as if they were
-   * disabled because users may not be aware that their usage is being logged.
-   *
-   * Some credentials do not have the policy attached that allows the proxy to
-   * confirm logging status, in which case the proxy assumes that logging could
-   * be enabled and will refuse to use the key. If you still want to use such a
-   * key and can't attach the policy, you can set this to true.
-   */
-  allowAwsLogging?: boolean;
   /** Whether prompts and responses should be logged to persistent storage. */
   promptLogging?: boolean;
   /** Which prompt logging backend to use. */
-  promptLoggingBackend?: "google_sheets";
+  promptLoggingBackend?: PromptLoggingBackend;
   /** Base64-encoded Google Sheets API key. */
   googleSheetsKey?: string;
   /** Google Sheets spreadsheet ID. */
   googleSheetsSpreadsheetId?: string;
   /** Whether to periodically check keys for usage and validity. */
-  checkKeys: boolean;
+  checkKeys?: boolean;
-  /** Whether to publicly show total token costs on the info page. */
+  /**
-  showTokenCosts: boolean;
+   * How to display quota information on the info page.
+   *
+   * `none`: Hide quota information
+   *
+   * `partial`: Display quota information only as a percentage
+   *
+   * `full`: Display quota information as usage against total capacity
+   */
+  quotaDisplayMode: "none" | "partial" | "full";
+  /**
+   * Which request queueing strategy to use when keys are over their rate limit.
+   *
+   * `fair`: Requests are serviced in the order they were received (default)
+   *
+   * `random`: Requests are serviced randomly
+   *
+   * `none`: Requests are not queued and users have to retry manually
+   */
+  queueMode: DequeueMode;
   /**
    * Comma-separated list of origins to block. Requests matching any of these
    * origins or referers will be rejected.
-   * - Partial matches are allowed, so `reddit` will match `www.reddit.com`.
+   * Partial matches are allowed, so `reddit` will match `www.reddit.com`.
-   * - Include only the hostname, not the protocol or path, e.g:
+   * Include only the hostname, not the protocol or path, e.g:
    *  `reddit.com,9gag.com,gaiaonline.com`
    */
   blockedOrigins?: string;
-  /** Message to return when rejecting requests from blocked origins. */
+  /**
+   * Message to return when rejecting requests from blocked origins.
+   */
   blockMessage?: string;
-  /** Destination URL to redirect blocked requests to, for non-JSON requests. */
+  /**
+   * Desination URL to redirect blocked requests to, for non-JSON requests.
+   */
   blockRedirect?: string;
-  /** Which model families to allow requests for. Applies only to OpenAI. */
-  allowedModelFamilies: ModelFamily[];
   /**
-   * The number of (LLM) tokens a user can consume before requests are rejected.
+   * Whether the proxy should disallow requests for GPT-4 models in order to
-   * Limits include both prompt and response tokens. `special` users are exempt.
+   * prevent excessive spend.  Applies only to OpenAI.
-   * - Defaults to 0, which means no limit.
-   * - Changes are not automatically applied to existing users. Use the
-   * admin API or UI to update existing users, or use the QUOTA_REFRESH_PERIOD
-   * setting to periodically set all users' quotas to these values.
    */
-  tokenQuota: { [key in ModelFamily]: number };
+  turboOnly?: boolean;
-  /**
-   * The period over which to enforce token quotas. Quotas will be fully reset
-   * at the start of each period, server time. Unused quota does not roll over.
-   * You can also provide a cron expression for a custom schedule. If not set,
-   * quotas will never automatically refresh.
-   * - Defaults to unset, which means quotas will never automatically refresh.
-   */
-  quotaRefreshPeriod?: "hourly" | "daily" | string;
-  /** Whether to allow users to change their own nicknames via the UI. */
-  allowNicknameChanges: boolean;
 };
 
 // To change configs, create a file called .env in the root directory.
@@ -174,38 +132,19 @@ export const config: Config = {
   port: getEnvWithDefault("PORT", 7860),
   openaiKey: getEnvWithDefault("OPENAI_KEY", ""),
   anthropicKey: getEnvWithDefault("ANTHROPIC_KEY", ""),
-  googlePalmKey: getEnvWithDefault("GOOGLE_PALM_KEY", ""),
-  awsCredentials: getEnvWithDefault("AWS_CREDENTIALS", ""),
   proxyKey: getEnvWithDefault("PROXY_KEY", ""),
   adminKey: getEnvWithDefault("ADMIN_KEY", ""),
   gatekeeper: getEnvWithDefault("GATEKEEPER", "none"),
-  persistenceProvider: getEnvWithDefault("PERSISTENCE_PROVIDER", "memory"),
+  gatekeeperStore: getEnvWithDefault("GATEKEEPER_STORE", "memory"),
   maxIpsPerUser: getEnvWithDefault("MAX_IPS_PER_USER", 0),
   firebaseRtdbUrl: getEnvWithDefault("FIREBASE_RTDB_URL", undefined),
   firebaseKey: getEnvWithDefault("FIREBASE_KEY", undefined),
-  firebaseRtdbRoot: getEnvWithDefault("FIREBASE_RTDB_ROOT", hostname()),
   modelRateLimit: getEnvWithDefault("MODEL_RATE_LIMIT", 4),
-  maxContextTokensOpenAI: getEnvWithDefault("MAX_CONTEXT_TOKENS_OPENAI", 0),
+  maxOutputTokensOpenAI: getEnvWithDefault("MAX_OUTPUT_TOKENS_OPENAI", 300),
-  maxContextTokensAnthropic: getEnvWithDefault(
-    "MAX_CONTEXT_TOKENS_ANTHROPIC",
-    0
-  ),
-  maxOutputTokensOpenAI: getEnvWithDefault(
-    ["MAX_OUTPUT_TOKENS_OPENAI", "MAX_OUTPUT_TOKENS"],
-    300
-  ),
   maxOutputTokensAnthropic: getEnvWithDefault(
-    ["MAX_OUTPUT_TOKENS_ANTHROPIC", "MAX_OUTPUT_TOKENS"],
+    "MAX_OUTPUT_TOKENS_ANTHROPIC",
-    400
+    600
   ),
-  allowedModelFamilies: getEnvWithDefault("ALLOWED_MODEL_FAMILIES", [
-    "turbo",
-    "gpt4",
-    "gpt4-32k",
-    "claude",
-    "bison",
-    "aws-claude",
-  ]),
   rejectDisallowed: getEnvWithDefault("REJECT_DISALLOWED", false),
   rejectMessage: getEnvWithDefault(
     "REJECT_MESSAGE",
@@ -213,8 +152,7 @@ export const config: Config = {
   ),
   logLevel: getEnvWithDefault("LOG_LEVEL", "info"),
   checkKeys: getEnvWithDefault("CHECK_KEYS", !isDev),
-  showTokenCosts: getEnvWithDefault("SHOW_TOKEN_COSTS", false),
+  quotaDisplayMode: getEnvWithDefault("QUOTA_DISPLAY_MODE", "partial"),
-  allowAwsLogging: getEnvWithDefault("ALLOW_AWS_LOGGING", false),
   promptLogging: getEnvWithDefault("PROMPT_LOGGING", false),
   promptLoggingBackend: getEnvWithDefault("PROMPT_LOGGING_BACKEND", undefined),
   googleSheetsKey: getEnvWithDefault("GOOGLE_SHEETS_KEY", undefined),
@@ -222,83 +160,80 @@ export const config: Config = {
     "GOOGLE_SHEETS_SPREADSHEET_ID",
     undefined
   ),
+  queueMode: getEnvWithDefault("QUEUE_MODE", "fair"),
   blockedOrigins: getEnvWithDefault("BLOCKED_ORIGINS", undefined),
   blockMessage: getEnvWithDefault(
     "BLOCK_MESSAGE",
     "You must be over the age of majority in your country to use this service."
   ),
   blockRedirect: getEnvWithDefault("BLOCK_REDIRECT", "https://www.9gag.com"),
-  tokenQuota: {
+  turboOnly: getEnvWithDefault("TURBO_ONLY", false),
-    turbo: getEnvWithDefault("TOKEN_QUOTA_TURBO", 0),
-    gpt4: getEnvWithDefault("TOKEN_QUOTA_GPT4", 0),
-    "gpt4-32k": getEnvWithDefault("TOKEN_QUOTA_GPT4_32K", 0),
-    claude: getEnvWithDefault("TOKEN_QUOTA_CLAUDE", 0),
-    bison: getEnvWithDefault("TOKEN_QUOTA_BISON", 0),
-    "aws-claude": getEnvWithDefault("TOKEN_QUOTA_AWS_CLAUDE", 0),
-  },
-  quotaRefreshPeriod: getEnvWithDefault("QUOTA_REFRESH_PERIOD", undefined),
-  allowNicknameChanges: getEnvWithDefault("ALLOW_NICKNAME_CHANGES", true),
 } as const;
 
-function generateCookieSecret() {
+function migrateConfigs() {
-  if (process.env.COOKIE_SECRET !== undefined) {
+  let migrated = false;
-    return process.env.COOKIE_SECRET;
+  const deprecatedMax = process.env.MAX_OUTPUT_TOKENS;
+
+  if (!process.env.MAX_OUTPUT_TOKENS_OPENAI && deprecatedMax) {
+    migrated = true;
+    config.maxOutputTokensOpenAI = parseInt(deprecatedMax);
+  }
+  if (!process.env.MAX_OUTPUT_TOKENS_ANTHROPIC && deprecatedMax) {
+    migrated = true;
+    config.maxOutputTokensAnthropic = parseInt(deprecatedMax);
   }
 
-  const seed = "" + config.adminKey + config.openaiKey + config.anthropicKey;
+  if (migrated) {
-  const crypto = require("crypto");
+    startupLogger.warn(
-  return crypto.createHash("sha256").update(seed).digest("hex");
+      {
+        MAX_OUTPUT_TOKENS: deprecatedMax,
+        MAX_OUTPUT_TOKENS_OPENAI: config.maxOutputTokensOpenAI,
+        MAX_OUTPUT_TOKENS_ANTHROPIC: config.maxOutputTokensAnthropic,
+      },
+      "`MAX_OUTPUT_TOKENS` has been replaced with separate `MAX_OUTPUT_TOKENS_OPENAI` and `MAX_OUTPUT_TOKENS_ANTHROPIC` configs. You should update your .env file to remove `MAX_OUTPUT_TOKENS` and set the new configs."
+    );
+  }
 }
 
-export const COOKIE_SECRET = generateCookieSecret();
+/** Prevents the server from starting if config state is invalid. */
-
 export async function assertConfigIsValid() {
-  if (process.env.TURBO_ONLY === "true") {
+  migrateConfigs();
-    startupLogger.warn(
-      "TURBO_ONLY is deprecated. Use ALLOWED_MODEL_FAMILIES=turbo instead."
-    );
-    config.allowedModelFamilies = config.allowedModelFamilies.filter(
-      (f) => !f.includes("gpt4")
-    );
-  }
-
-  if (!!process.env.GATEKEEPER_STORE) {
-    startupLogger.warn(
-      "GATEKEEPER_STORE is deprecated. Use PERSISTENCE_PROVIDER instead. Configuration will be migrated."
-    );
-    config.persistenceProvider = process.env.GATEKEEPER_STORE as any;
-  }
 
+  // Ensure gatekeeper mode is valid.
   if (!["none", "proxy_key", "user_token"].includes(config.gatekeeper)) {
     throw new Error(
       `Invalid gatekeeper mode: ${config.gatekeeper}. Must be one of: none, proxy_key, user_token.`
     );
   }
 
+  // Don't allow `user_token` mode without `ADMIN_KEY`.
   if (config.gatekeeper === "user_token" && !config.adminKey) {
     throw new Error(
       "`user_token` gatekeeper mode requires an `ADMIN_KEY` to be set."
     );
   }
 
+  // Don't allow `proxy_key` mode without `PROXY_KEY`.
   if (config.gatekeeper === "proxy_key" && !config.proxyKey) {
     throw new Error(
       "`proxy_key` gatekeeper mode requires a `PROXY_KEY` to be set."
     );
   }
 
+  // Don't allow `PROXY_KEY` to be set for other modes.
   if (config.gatekeeper !== "proxy_key" && config.proxyKey) {
     throw new Error(
       "`PROXY_KEY` is set, but gatekeeper mode is not `proxy_key`. Make sure to set `GATEKEEPER=proxy_key`."
     );
   }
 
+  // Require appropriate firebase config if using firebase store.
   if (
-    config.persistenceProvider === "firebase_rtdb" &&
+    config.gatekeeperStore === "firebase_rtdb" &&
     (!config.firebaseKey || !config.firebaseRtdbUrl)
   ) {
     throw new Error(
-      "Firebase RTDB persistence requires `FIREBASE_KEY` and `FIREBASE_RTDB_URL` to be set."
+      "Firebase RTDB store requires `FIREBASE_KEY` and `FIREBASE_RTDB_URL` to be set."
     );
   }
 
@@ -333,29 +268,26 @@ export const OMITTED_KEYS: (keyof Config)[] = [
   "logLevel",
   "openaiKey",
   "anthropicKey",
-  "googlePalmKey",
-  "awsCredentials",
   "proxyKey",
   "adminKey",
   "checkKeys",
-  "showTokenCosts",
+  "quotaDisplayMode",
   "googleSheetsKey",
-  "persistenceProvider",
   "firebaseKey",
   "firebaseRtdbUrl",
+  "gatekeeperStore",
   "maxIpsPerUser",
   "blockedOrigins",
   "blockMessage",
   "blockRedirect",
-  "allowNicknameChanges",
 ];
 
 const getKeys = Object.keys as <T extends object>(obj: T) => Array<keyof T>;
 
-export function listConfig(obj: Config = config): Record<string, any> {
+export function listConfig(): Record<string, string> {
-  const result: Record<string, any> = {};
+  const result: Record<string, string> = {};
-  for (const key of getKeys(obj)) {
+  for (const key of getKeys(config)) {
-    const value = obj[key]?.toString() || "";
+    const value = config[key]?.toString() || "";
 
     const shouldOmit =
       OMITTED_KEYS.includes(key) || value === "" || value === "undefined";
@@ -370,42 +302,19 @@ export function listConfig(obj: Config = config): Record<string, any> {
     } else {
       result[key] = value;
     }
-
-    if (typeof obj[key] === "object" && !Array.isArray(obj[key])) {
-      result[key] = listConfig(obj[key] as unknown as Config);
-    }
   }
   return result;
 }
 
-/**
+function getEnvWithDefault<T>(name: string, defaultValue: T): T {
- * Tries to get a config value from one or more environment variables (in
+  const value = process.env[name];
- * order), falling back to a default value if none are set.
- */
-function getEnvWithDefault<T>(env: string | string[], defaultValue: T): T {
-  const value = Array.isArray(env)
-    ? env.map((e) => process.env[e]).find((v) => v !== undefined)
-    : process.env[env];
   if (value === undefined) {
     return defaultValue;
   }
   try {
-    if (
+    if (name === "OPENAI_KEY" || name === "ANTHROPIC_KEY") {
-      [
-        "OPENAI_KEY",
-        "ANTHROPIC_KEY",
-        "GOOGLE_PALM_KEY",
-        "AWS_CREDENTIALS",
-      ].includes(String(env))
-    ) {
       return value as unknown as T;
     }
-
-    // Intended to be used for comma-delimited lists
-    if (Array.isArray(defaultValue)) {
-      return value.split(",").map((v) => v.trim()) as T;
-    }
-
     return JSON.parse(value) as T;
   } catch (err) {
     return value as unknown as T;
@@ -415,7 +324,7 @@ function getEnvWithDefault<T>(env: string | string[], defaultValue: T): T {
 let firebaseApp: firebase.app.App | undefined;
 
 async function maybeInitializeFirebase() {
-  if (!config.persistenceProvider.startsWith("firebase")) {
+  if (!config.gatekeeperStore.startsWith("firebase")) {
     return;
   }
 

src/info-page.ts

@@ -2,63 +2,18 @@ import fs from "fs";
 import { Request, Response } from "express";
 import showdown from "showdown";
 import { config, listConfig } from "./config";
-import {
+import { keyPool } from "./key-management";
-  AnthropicKey,
-  AwsBedrockKey,
-  GooglePalmKey,
-  OpenAIKey,
-  keyPool,
-} from "./shared/key-management";
-import { ModelFamily, OpenAIModelFamily } from "./shared/models";
 import { getUniqueIps } from "./proxy/rate-limit";
-import { getEstimatedWaitTime, getQueueLength } from "./proxy/queue";
+import {
-import { getTokenCostUsd, prettyTokens } from "./shared/stats";
+  QueuePartition,
-import { assertNever } from "./shared/utils";
+  getEstimatedWaitTime,
+  getQueueLength,
+} from "./proxy/queue";
 
-const INFO_PAGE_TTL = 2000;
+const INFO_PAGE_TTL = 5000;
 let infoPageHtml: string | undefined;
 let infoPageLastUpdated = 0;
 
-type KeyPoolKey = ReturnType<typeof keyPool.list>[0];
-const keyIsOpenAIKey = (k: KeyPoolKey): k is OpenAIKey =>
-  k.service === "openai";
-const keyIsAnthropicKey = (k: KeyPoolKey): k is AnthropicKey =>
-  k.service === "anthropic";
-const keyIsGooglePalmKey = (k: KeyPoolKey): k is GooglePalmKey =>
-  k.service === "google-palm";
-const keyIsAwsKey = (k: KeyPoolKey): k is AwsBedrockKey => k.service === "aws";
-
-type ModelAggregates = {
-  active: number;
-  trial?: number;
-  revoked?: number;
-  overQuota?: number;
-  pozzed?: number;
-  awsLogged?: number;
-  queued: number;
-  queueTime: string;
-  tokens: number;
-};
-type ModelAggregateKey = `${ModelFamily}__${keyof ModelAggregates}`;
-type ServiceAggregates = {
-  status?: string;
-  openaiKeys?: number;
-  openaiOrgs?: number;
-  anthropicKeys?: number;
-  palmKeys?: number;
-  awsKeys?: number;
-  proompts: number;
-  tokens: number;
-  tokenCost: number;
-  openAiUncheckedKeys?: number;
-  anthropicUncheckedKeys?: number;
-} & {
-  [modelFamily in ModelFamily]?: ModelAggregates;
-};
-
-const modelStats = new Map<ModelAggregateKey, number>();
-const serviceStats = new Map<keyof ServiceAggregates, number>();
-
 export const handleInfoPage = (req: Request, res: Response) => {
   if (infoPageLastUpdated + INFO_PAGE_TTL > Date.now()) {
     res.send(infoPageHtml);
@@ -74,54 +29,40 @@ export const handleInfoPage = (req: Request, res: Response) => {
   res.send(cacheInfoPageHtml(baseUrl));
 };
 
-function getCostString(cost: number) {
-  if (!config.showTokenCosts) return "";
-  return ` ($${cost.toFixed(2)})`;
-}
-
 function cacheInfoPageHtml(baseUrl: string) {
   const keys = keyPool.list();
 
-  modelStats.clear();
+  const openaiKeys = keys.filter((k) => k.service === "openai").length;
-  serviceStats.clear();
+  const anthropicKeys = keys.filter((k) => k.service === "anthropic").length;
-  keys.forEach(addKeyToAggregates);
-
-  const openaiKeys = serviceStats.get("openaiKeys") || 0;
-  const anthropicKeys = serviceStats.get("anthropicKeys") || 0;
-  const palmKeys = serviceStats.get("palmKeys") || 0;
-  const awsKeys = serviceStats.get("awsKeys") || 0;
-  const proompts = serviceStats.get("proompts") || 0;
-  const tokens = serviceStats.get("tokens") || 0;
-  const tokenCost = serviceStats.get("tokenCost") || 0;
 
   const info = {
-    uptime: Math.floor(process.uptime()),
+    uptime: process.uptime(),
     endpoints: {
       ...(openaiKeys ? { openai: baseUrl + "/proxy/openai" } : {}),
-      ...(openaiKeys
-        ? { ["openai2"]: baseUrl + "/proxy/openai/turbo-instruct" }
-        : {}),
       ...(anthropicKeys ? { anthropic: baseUrl + "/proxy/anthropic" } : {}),
-      ...(palmKeys ? { "google-palm": baseUrl + "/proxy/google-palm" } : {}),
-      ...(awsKeys ? { aws: baseUrl + "/proxy/aws/claude" } : {}),
     },
-    proompts,
+    proompts: keys.reduce((acc, k) => acc + k.promptCount, 0),
-    tookens: `${prettyTokens(tokens)}${getCostString(tokenCost)}`,
     ...(config.modelRateLimit ? { proomptersNow: getUniqueIps() } : {}),
     openaiKeys,
     anthropicKeys,
-    palmKeys,
-    awsKeys,
     ...(openaiKeys ? getOpenAIInfo() : {}),
     ...(anthropicKeys ? getAnthropicInfo() : {}),
-    ...(palmKeys ? { "palm-bison": getPalmInfo() } : {}),
-    ...(awsKeys ? { "aws-claude": getAwsInfo() } : {}),
     config: listConfig(),
     build: process.env.BUILD_INFO || "dev",
   };
 
   const title = getServerTitle();
-  const headerHtml = buildInfoPageHeader(new showdown.Converter(), title);
+  let headerHtml = buildInfoPageHeader(new showdown.Converter(), title);
+
+  if (process.env.MISSING_PYTHON_WARNING) {
+    headerHtml +=
+      `<p style="color: red;">Python is not installed; the Claude tokenizer ` +
+      `cannot start. Your Dockerfile may be out of date; see <a ` +
+      `href="https://gitgud.io/khanon/oai-reverse-proxy">the docs</a> for an ` +
+      `updated Huggingface Dockerfile.</p><p>You can disable this warning by ` +
+      `setting <code>DISABLE_MISSING_PYTHON_WARNING=true</code> in your ` +
+      `environment.</p>`;
+  }
 
   const pageBody = `<!DOCTYPE html>
 <html lang="en">
@@ -135,7 +76,6 @@ function cacheInfoPageHtml(baseUrl: string) {
     <hr />
     <h2>Service Info</h2>
     <pre>${JSON.stringify(info, null, 2)}</pre>
-    ${getSelfServiceLinks()}
   </body>
 </html>`;
 
@@ -145,259 +85,112 @@ function cacheInfoPageHtml(baseUrl: string) {
   return pageBody;
 }
 
-function getUniqueOpenAIOrgs(keys: KeyPoolKey[]) {
+type ServiceInfo = {
-  const orgIds = new Set(
+  activeKeys: number;
-    keys.filter((k) => k.service === "openai").map((k: any) => k.organizationId)
+  trialKeys?: number;
-  );
+  quota: string;
-  return orgIds.size;
+  proomptersInQueue: number;
-}
+  estimatedQueueTime: string;
+};
 
-function increment<T extends keyof ServiceAggregates | ModelAggregateKey>(
+// this has long since outgrown this awful "dump everything in a <pre> tag" approach
-  map: Map<T, number>,
+// but I really don't want to spend time on a proper UI for this right now
-  key: T,
-  delta = 1
-) {
-  map.set(key, (map.get(key) || 0) + delta);
-}
-
-function addKeyToAggregates(k: KeyPoolKey) {
-  increment(serviceStats, "proompts", k.promptCount);
-  increment(serviceStats, "openaiKeys", k.service === "openai" ? 1 : 0);
-  increment(serviceStats, "anthropicKeys", k.service === "anthropic" ? 1 : 0);
-  increment(serviceStats, "palmKeys", k.service === "google-palm" ? 1 : 0);
-  increment(serviceStats, "awsKeys", k.service === "aws" ? 1 : 0);
-
-  let sumTokens = 0;
-  let sumCost = 0;
-  let family: ModelFamily;
-  const families = k.modelFamilies.filter((f) =>
-    config.allowedModelFamilies.includes(f)
-  );
-
-  switch (k.service) {
-    case "openai":
-      if (!keyIsOpenAIKey(k)) throw new Error("Invalid key type");
-      increment(
-        serviceStats,
-        "openAiUncheckedKeys",
-        Boolean(k.lastChecked) ? 0 : 1
-      );
-
-      // Technically this would not account for keys that have tokens recorded
-      // on models they aren't provisioned for, but that would be strange
-      k.modelFamilies.forEach((f) => {
-        const tokens = k[`${f}Tokens`];
-        sumTokens += tokens;
-        sumCost += getTokenCostUsd(f, tokens);
-        increment(modelStats, `${f}__tokens`, tokens);
-      });
-
-      if (families.includes("gpt4-32k")) {
-        family = "gpt4-32k";
-      } else if (families.includes("gpt4")) {
-        family = "gpt4";
-      } else {
-        family = "turbo";
-      }
-
-      increment(modelStats, `${family}__trial`, k.isTrial ? 1 : 0);
-      break;
-    case "anthropic":
-      if (!keyIsAnthropicKey(k)) throw new Error("Invalid key type");
-      family = "claude";
-      sumTokens += k.claudeTokens;
-      sumCost += getTokenCostUsd(family, k.claudeTokens);
-      increment(modelStats, `${family}__tokens`, k.claudeTokens);
-      increment(modelStats, `${family}__pozzed`, k.isPozzed ? 1 : 0);
-      increment(
-        serviceStats,
-        "anthropicUncheckedKeys",
-        Boolean(k.lastChecked) ? 0 : 1
-      );
-      break;
-    case "google-palm":
-      if (!keyIsGooglePalmKey(k)) throw new Error("Invalid key type");
-      family = "bison";
-      sumTokens += k.bisonTokens;
-      sumCost += getTokenCostUsd(family, k.bisonTokens);
-      increment(modelStats, `${family}__tokens`, k.bisonTokens);
-      break;
-    case "aws":
-      if (!keyIsAwsKey(k)) throw new Error("Invalid key type");
-      family = "aws-claude";
-      sumTokens += k["aws-claudeTokens"];
-      sumCost += getTokenCostUsd(family, k["aws-claudeTokens"]);
-      increment(modelStats, `${family}__tokens`, k["aws-claudeTokens"]);
-
-      // Ignore revoked keys for aws logging stats, but include keys where the
-      // logging status is unknown.
-      const countAsLogged =
-        k.lastChecked && !k.isDisabled && k.awsLoggingStatus !== "disabled";
-      increment(modelStats, `${family}__awsLogged`, countAsLogged ? 1 : 0);
-
-      break;
-    default:
-      assertNever(k.service);
-  }
-
-  increment(serviceStats, "tokens", sumTokens);
-  increment(serviceStats, "tokenCost", sumCost);
-  increment(modelStats, `${family}__active`, k.isDisabled ? 0 : 1);
-  if ("isRevoked" in k) {
-    increment(modelStats, `${family}__revoked`, k.isRevoked ? 1 : 0);
-  }
-  if ("isOverQuota" in k) {
-    increment(modelStats, `${family}__overQuota`, k.isOverQuota ? 1 : 0);
-  }
-}
 
 function getOpenAIInfo() {
-  const info: { status?: string; openaiKeys?: number; openaiOrgs?: number } & {
+  const info: { [model: string]: Partial<ServiceInfo> } = {};
-    [modelFamily in OpenAIModelFamily]?: {
+  const keys = keyPool.list().filter((k) => k.service === "openai");
-      usage?: string;
+  const hasGpt4 = keys.some((k) => k.isGpt4) && !config.turboOnly;
-      activeKeys: number;
-      trialKeys?: number;
-      revokedKeys?: number;
-      overQuotaKeys?: number;
-      proomptersInQueue?: number;
-      estimatedQueueTime?: string;
-    };
-  } = {};
 
-  const allowedFamilies = new Set(config.allowedModelFamilies);
+  if (keyPool.anyUnchecked()) {
-  let families = new Set<OpenAIModelFamily>();
+    const uncheckedKeys = keys.filter((k) => !k.lastChecked);
-  const keys = keyPool.list().filter((k) => {
+    info.status = `Still checking ${uncheckedKeys.length} keys...` as any;
-    const isOpenAI = keyIsOpenAIKey(k);
+  } else {
-    if (isOpenAI) k.modelFamilies.forEach((f) => families.add(f));
+    delete info.status;
-    return isOpenAI;
+  }
-  }) as Omit<OpenAIKey, "key">[];
-  families = new Set([...families].filter((f) => allowedFamilies.has(f)));
 
   if (config.checkKeys) {
-    const unchecked = serviceStats.get("openAiUncheckedKeys") || 0;
+    const turboKeys = keys.filter((k) => !k.isGpt4 && !k.isDisabled);
-    if (unchecked > 0) {
+    const gpt4Keys = keys.filter((k) => k.isGpt4 && !k.isDisabled);
-      info.status = `Checking ${unchecked} keys...`;
+
+    const quota: Record<string, string> = { turbo: "", gpt4: "" };
+    const turboQuota = keyPool.remainingQuota("openai") * 100;
+    const gpt4Quota = keyPool.remainingQuota("openai", { gpt4: true }) * 100;
+
+    if (config.quotaDisplayMode === "full") {
+      const turboUsage = keyPool.usageInUsd("openai");
+      const gpt4Usage = keyPool.usageInUsd("openai", { gpt4: true });
+      quota.turbo = `${turboUsage} (${Math.round(turboQuota)}% remaining)`;
+      quota.gpt4 = `${gpt4Usage} (${Math.round(gpt4Quota)}% remaining)`;
+    } else {
+      quota.turbo = `${Math.round(turboQuota)}%`;
+      quota.gpt4 = `${Math.round(gpt4Quota * 100)}%`;
     }
-    info.openaiKeys = keys.length;
-    info.openaiOrgs = getUniqueOpenAIOrgs(keys);
 
-    families.forEach((f) => {
+    info.turbo = {
-      const tokens = modelStats.get(`${f}__tokens`) || 0;
+      activeKeys: turboKeys.filter((k) => !k.isDisabled).length,
-      const cost = getTokenCostUsd(f, tokens);
+      trialKeys: turboKeys.filter((k) => k.isTrial).length,
+      quota: quota.turbo,
+    };
 
-      info[f] = {
+    if (hasGpt4) {
-        usage: `${prettyTokens(tokens)} tokens${getCostString(cost)}`,
+      info.gpt4 = {
-        activeKeys: modelStats.get(`${f}__active`) || 0,
+        activeKeys: gpt4Keys.filter((k) => !k.isDisabled).length,
-        trialKeys: modelStats.get(`${f}__trial`) || 0,
+        trialKeys: gpt4Keys.filter((k) => k.isTrial).length,
-        revokedKeys: modelStats.get(`${f}__revoked`) || 0,
+        quota: quota.gpt4,
-        overQuotaKeys: modelStats.get(`${f}__overQuota`) || 0,
       };
-    });
+    }
+
+    if (config.quotaDisplayMode === "none") {
+      delete info.turbo?.quota;
+      delete info.gpt4?.quota;
+    }
   } else {
-    info.status = "Key checking is disabled.";
+    info.status = "Key checking is disabled." as any;
     info.turbo = { activeKeys: keys.filter((k) => !k.isDisabled).length };
     info.gpt4 = {
-      activeKeys: keys.filter(
+      activeKeys: keys.filter((k) => !k.isDisabled && k.isGpt4).length,
-        (k) => !k.isDisabled && k.modelFamilies.includes("gpt4")
-      ).length,
     };
   }
 
-  families.forEach((f) => {
+  if (config.queueMode !== "none") {
-    if (info[f]) {
+    const turboQueue = getQueueInformation("turbo");
-      const { estimatedQueueTime, proomptersInQueue } = getQueueInformation(f);
+
-      info[f]!.proomptersInQueue = proomptersInQueue;
+    info.turbo.proomptersInQueue = turboQueue.proomptersInQueue;
-      info[f]!.estimatedQueueTime = estimatedQueueTime;
+    info.turbo.estimatedQueueTime = turboQueue.estimatedQueueTime;
+
+    if (hasGpt4) {
+      const gpt4Queue = getQueueInformation("gpt-4");
+      info.gpt4.proomptersInQueue = gpt4Queue.proomptersInQueue;
+      info.gpt4.estimatedQueueTime = gpt4Queue.estimatedQueueTime;
     }
-  });
+  }
 
   return info;
 }
 
 function getAnthropicInfo() {
-  const claudeInfo: Partial<ModelAggregates> = {
+  const claudeInfo: Partial<ServiceInfo> = {};
-    active: modelStats.get("claude__active") || 0,
+  const keys = keyPool.list().filter((k) => k.service === "anthropic");
-    pozzed: modelStats.get("claude__pozzed") || 0,
+  claudeInfo.activeKeys = keys.filter((k) => !k.isDisabled).length;
-  };
+  if (config.queueMode !== "none") {
-
+    const queue = getQueueInformation("claude");
-  const queue = getQueueInformation("claude");
+    claudeInfo.proomptersInQueue = queue.proomptersInQueue;
-  claudeInfo.queued = queue.proomptersInQueue;
+    claudeInfo.estimatedQueueTime = queue.estimatedQueueTime;
-  claudeInfo.queueTime = queue.estimatedQueueTime;
+  }
-
+  return { claude: claudeInfo };
-  const tokens = modelStats.get("claude__tokens") || 0;
-  const cost = getTokenCostUsd("claude", tokens);
-
-  const unchecked =
-    (config.checkKeys && serviceStats.get("anthropicUncheckedKeys")) || 0;
-
-  return {
-    claude: {
-      usage: `${prettyTokens(tokens)} tokens${getCostString(cost)}`,
-      ...(unchecked > 0 ? { status: `Checking ${unchecked} keys...` } : {}),
-      activeKeys: claudeInfo.active,
-      ...(config.checkKeys ? { pozzedKeys: claudeInfo.pozzed } : {}),
-      proomptersInQueue: claudeInfo.queued,
-      estimatedQueueTime: claudeInfo.queueTime,
-    },
-  };
 }
 
-function getPalmInfo() {
-  const bisonInfo: Partial<ModelAggregates> = {
-    active: modelStats.get("bison__active") || 0,
-  };
-
-  const queue = getQueueInformation("bison");
-  bisonInfo.queued = queue.proomptersInQueue;
-  bisonInfo.queueTime = queue.estimatedQueueTime;
-
-  const tokens = modelStats.get("bison__tokens") || 0;
-  const cost = getTokenCostUsd("bison", tokens);
-
-  return {
-    usage: `${prettyTokens(tokens)} tokens${getCostString(cost)}`,
-    activeKeys: bisonInfo.active,
-    proomptersInQueue: bisonInfo.queued,
-    estimatedQueueTime: bisonInfo.queueTime,
-  };
-}
-
-function getAwsInfo() {
-  const awsInfo: Partial<ModelAggregates> = {
-    active: modelStats.get("aws-claude__active") || 0,
-  };
-
-  const queue = getQueueInformation("aws-claude");
-  awsInfo.queued = queue.proomptersInQueue;
-  awsInfo.queueTime = queue.estimatedQueueTime;
-
-  const tokens = modelStats.get("aws-claude__tokens") || 0;
-  const cost = getTokenCostUsd("aws-claude", tokens);
-
-  const logged = modelStats.get("aws-claude__awsLogged") || 0;
-  const logMsg = config.allowAwsLogging
-    ? `${logged} active keys are potentially logged.`
-    : `${logged} active keys are potentially logged and can't be used.`;
-
-  return {
-    usage: `${prettyTokens(tokens)} tokens${getCostString(cost)}`,
-    activeKeys: awsInfo.active,
-    proomptersInQueue: awsInfo.queued,
-    estimatedQueueTime: awsInfo.queueTime,
-    ...(logged > 0 ? { privacy: logMsg } : {}),
-  };
-}
-
-const customGreeting = fs.existsSync("greeting.md")
-  ? fs.readFileSync("greeting.md", "utf8")
-  : null;
-
 /**
  * If the server operator provides a `greeting.md` file, it will be included in
  * the rendered info page.
  **/
 function buildInfoPageHeader(converter: showdown.Converter, title: string) {
+  const customGreeting = fs.existsSync("greeting.md")
+    ? fs.readFileSync("greeting.md", "utf8")
+    : null;
+
   // TODO: use some templating engine instead of this mess
+
   let infoBody = `<!-- Header for Showdown's parser, don't remove this line -->
 # ${title}`;
   if (config.promptLogging) {
@@ -409,56 +202,38 @@ Logs are anonymous and do not contain IP addresses or timestamps. [You can see t
 **If you are uncomfortable with this, don't send prompts to this proxy!**`;
   }
 
-  const waits: string[] = [];
+  if (config.queueMode !== "none") {
-  infoBody += `\n## Estimated Wait Times\nIf the AI is busy, your prompt will processed when a slot frees up.`;
+    const waits: string[] = [];
+    infoBody += `\n## Estimated Wait Times\nIf the AI is busy, your prompt will processed when a slot frees up.`;
 
-  if (config.openaiKey) {
+    if (config.openaiKey) {
-    // TODO: un-fuck this
+      const turboWait = getQueueInformation("turbo").estimatedQueueTime;
-    const keys = keyPool.list().filter((k) => k.service === "openai");
+      const gpt4Wait = getQueueInformation("gpt-4").estimatedQueueTime;
-
+      waits.push(`**Turbo:** ${turboWait}`);
-    const turboWait = getQueueInformation("turbo").estimatedQueueTime;
+      if (keyPool.list().some((k) => k.isGpt4) && !config.turboOnly) {
-    waits.push(`**Turbo:** ${turboWait}`);
+        waits.push(`**GPT-4:** ${gpt4Wait}`);
-
+      }
-    const gpt4Wait = getQueueInformation("gpt4").estimatedQueueTime;
-    const hasGpt4 = keys.some((k) => k.modelFamilies.includes("gpt4"));
-    const allowedGpt4 = config.allowedModelFamilies.includes("gpt4");
-    if (hasGpt4 && allowedGpt4) {
-      waits.push(`**GPT-4:** ${gpt4Wait}`);
     }
 
-    const gpt432kWait = getQueueInformation("gpt4-32k").estimatedQueueTime;
+    if (config.anthropicKey) {
-    const hasGpt432k = keys.some((k) => k.modelFamilies.includes("gpt4-32k"));
+      const claudeWait = getQueueInformation("claude").estimatedQueueTime;
-    const allowedGpt432k = config.allowedModelFamilies.includes("gpt4-32k");
+      waits.push(`**Claude:** ${claudeWait}`);
-    if (hasGpt432k && allowedGpt432k) {
-      waits.push(`**GPT-4-32k:** ${gpt432kWait}`);
     }
+    infoBody += "\n\n" + waits.join(" / ");
   }
 
-  if (config.anthropicKey) {
-    const claudeWait = getQueueInformation("claude").estimatedQueueTime;
-    waits.push(`**Claude:** ${claudeWait}`);
-  }
-
-  if (config.awsCredentials) {
-    const awsClaudeWait = getQueueInformation("aws-claude").estimatedQueueTime;
-    waits.push(`**Claude (AWS):** ${awsClaudeWait}`);
-  }
-
-  infoBody += "\n\n" + waits.join(" / ");
-
   if (customGreeting) {
-    infoBody += `\n## Server Greeting\n${customGreeting}`;
+    infoBody += `\n## Server Greeting\n
+${customGreeting}`;
   }
   return converter.makeHtml(infoBody);
 }
 
-function getSelfServiceLinks() {
-  if (config.gatekeeper !== "user_token") return "";
-  return `<footer style="font-size: 0.8em;"><hr /><a target="_blank" href="/user/lookup">Check your user token info</a></footer>`;
-}
-
 /** Returns queue time in seconds, or minutes + seconds if over 60 seconds. */
-function getQueueInformation(partition: ModelFamily) {
+function getQueueInformation(partition: QueuePartition) {
+  if (config.queueMode === "none") {
+    return {};
+  }
   const waitMs = getEstimatedWaitTime(partition);
   const waitTime =
     waitMs < 60000

src/key-management/anthropic/provider.ts

@@ -1,12 +1,7 @@
-import { config } from "../../../config";
+import crypto from "crypto";
-import { logger } from "../../../logger";
+import { Key, KeyProvider } from "..";
-import type { AnthropicModelFamily } from "../../models";
+import { config } from "../../config";
-import { KeyProviderBase } from "../key-provider-base";
+import { logger } from "../../logger";
-import { Key } from "../types";
-import { AnthropicKeyChecker } from "./checker";
-
-const RATE_LIMIT_LOCKOUT = 2000;
-const KEY_REUSE_DELAY = 500;
 
 // https://docs.anthropic.com/claude/reference/selecting-a-model
 export const ANTHROPIC_SUPPORTED_MODELS = [
@@ -18,13 +13,18 @@ export const ANTHROPIC_SUPPORTED_MODELS = [
 ] as const;
 export type AnthropicModel = (typeof ANTHROPIC_SUPPORTED_MODELS)[number];
 
-type AnthropicKeyUsage = {
+export type AnthropicKeyUpdate = Omit<
-  [K in AnthropicModelFamily as `${K}Tokens`]: number;
+  Partial<AnthropicKey>,
-};
+  | "key"
+  | "hash"
+  | "lastUsed"
+  | "promptCount"
+  | "rateLimitedAt"
+  | "rateLimitedUntil"
+>;
 
-export interface AnthropicKey extends Key, AnthropicKeyUsage {
+export interface AnthropicKey extends Key {
   readonly service: "anthropic";
-  readonly modelFamilies: AnthropicModelFamily[];
   /** The time at which this key was last rate limited. */
   rateLimitedAt: number;
   /** The time until which this key is rate limited. */
@@ -37,38 +37,67 @@ export interface AnthropicKey extends Key, AnthropicKeyUsage {
    * When a key returns this particular error, we set this flag to true.
    */
   requiresPreamble: boolean;
-  /**
-   * Whether this key has been detected as being affected by Anthropic's silent
-   * 'please answer ethically' prompt poisoning.
-   */
-  isPozzed: boolean;
 }
 
-export class AnthropicKeyProvider extends KeyProviderBase<AnthropicKey> {
+/**
-  readonly service = "anthropic" as const;
+ * Upon being rate limited, a key will be locked out for this many milliseconds
+ * while we wait for other concurrent requests to finish.
+ */
+const RATE_LIMIT_LOCKOUT = 2000;
+/**
+ * Upon assigning a key, we will wait this many milliseconds before allowing it
+ * to be used again. This is to prevent the queue from flooding a key with too
+ * many requests while we wait to learn whether previous ones succeeded.
+ */
+const KEY_REUSE_DELAY = 500;
 
-  protected readonly keys: AnthropicKey[] = [];
+export class AnthropicKeyProvider implements KeyProvider<AnthropicKey> {
-  private checker?: AnthropicKeyChecker;
+  readonly service = "anthropic";
-  protected log = logger.child({ module: "key-provider", service: this.service });
 
-  public async init() {
+  private keys: AnthropicKey[] = [];
-    const storeName = this.store.constructor.name;
+  private log = logger.child({ module: "key-provider", service: this.service });
-    const loadedKeys = await this.store.load();
 
-    if (loadedKeys.length === 0) {
+  constructor() {
-      return this.log.warn({ via: storeName }, "No Anthropic keys found.");
+    const keyConfig = config.anthropicKey?.trim();
+    if (!keyConfig) {
+      this.log.warn(
+        "ANTHROPIC_KEY is not set. Anthropic API will not be available."
+      );
+      return;
     }
-
+    let bareKeys: string[];
-    this.keys.push(...loadedKeys);
+    bareKeys = [...new Set(keyConfig.split(",").map((k) => k.trim()))];
-    this.log.info(
+    for (const key of bareKeys) {
-      { count: this.keys.length, via: storeName },
+      const newKey: AnthropicKey = {
-      "Loaded Anthropic keys."
+        key,
-    );
+        service: this.service,
-
+        isGpt4: false,
-    if (config.checkKeys) {
+        isTrial: false,
-      this.checker = new AnthropicKeyChecker(this.keys, this.update.bind(this));
+        isDisabled: false,
-      this.checker.start();
+        promptCount: 0,
+        lastUsed: 0,
+        rateLimitedAt: 0,
+        rateLimitedUntil: 0,
+        requiresPreamble: false,
+        hash: `ant-${crypto
+          .createHash("sha256")
+          .update(key)
+          .digest("hex")
+          .slice(0, 8)}`,
+        lastChecked: 0,
+      };
+      this.keys.push(newKey);
     }
+    this.log.info({ keyCount: this.keys.length }, "Loaded Anthropic keys.");
+  }
+
+  public init() {
+    // Nothing to do as Anthropic's API doesn't provide any usage information so
+    // there is no key checker implementation and no need to start it.
+  }
+
+  public list() {
+    return this.keys.map((k) => Object.freeze({ ...k, key: undefined }));
   }
 
   public get(_model: AnthropicModel) {
@@ -84,8 +113,7 @@ export class AnthropicKeyProvider extends KeyProviderBase<AnthropicKey> {
     // 1. Keys which are not rate limited
     //    a. If all keys were rate limited recently, select the least-recently
     //       rate limited key.
-    // 2. Keys which are not pozzed
+    // 2. Keys which have not been used in the longest time
-    // 3. Keys which have not been used in the longest time
 
     const now = Date.now();
 
@@ -98,10 +126,6 @@ export class AnthropicKeyProvider extends KeyProviderBase<AnthropicKey> {
       if (aRateLimited && bRateLimited) {
         return a.rateLimitedAt - b.rateLimitedAt;
       }
-
-      if (a.isPozzed && !b.isPozzed) return 1;
-      if (!a.isPozzed && b.isPozzed) return -1;
-
       return a.lastUsed - b.lastUsed;
     });
 
@@ -115,11 +139,31 @@ export class AnthropicKeyProvider extends KeyProviderBase<AnthropicKey> {
     return { ...selectedKey };
   }
 
-  public incrementUsage(hash: string, _model: string, tokens: number) {
+  public disable(key: AnthropicKey) {
+    const keyFromPool = this.keys.find((k) => k.key === key.key);
+    if (!keyFromPool || keyFromPool.isDisabled) return;
+    keyFromPool.isDisabled = true;
+    this.log.warn({ key: key.hash }, "Key disabled");
+  }
+
+  public update(hash: string, update: Partial<AnthropicKey>) {
+    const keyFromPool = this.keys.find((k) => k.hash === hash)!;
+    Object.assign(keyFromPool, update);
+  }
+
+  public available() {
+    return this.keys.filter((k) => !k.isDisabled).length;
+  }
+
+  // No key checker for Anthropic
+  public anyUnchecked() {
+    return false;
+  }
+
+  public incrementPrompt(hash?: string) {
     const key = this.keys.find((k) => k.hash === hash);
     if (!key) return;
     key.promptCount++;
-    key.claudeTokens += tokens;
   }
 
   public getLockoutPeriod(_model: AnthropicModel) {
@@ -136,7 +180,10 @@ export class AnthropicKeyProvider extends KeyProviderBase<AnthropicKey> {
 
     // If all keys are rate-limited, return the time until the first key is
     // ready.
-    return Math.min(...activeKeys.map((k) => k.rateLimitedUntil - now));
+    const timeUntilFirstReady = Math.min(
+      ...activeKeys.map((k) => k.rateLimitedUntil - now)
+    );
+    return timeUntilFirstReady;
   }
 
   /**
@@ -147,21 +194,21 @@ export class AnthropicKeyProvider extends KeyProviderBase<AnthropicKey> {
    * retrying in order to give the other requests a chance to finish.
    */
   public markRateLimited(keyHash: string) {
-    this.log.debug({ key: keyHash }, "Key rate limited");
+    this.log.warn({ key: keyHash }, "Key rate limited");
     const key = this.keys.find((k) => k.hash === keyHash)!;
     const now = Date.now();
     key.rateLimitedAt = now;
     key.rateLimitedUntil = now + RATE_LIMIT_LOCKOUT;
   }
 
-  public recheck() {
+  public remainingQuota() {
-    this.keys.forEach((key) => {
+    const activeKeys = this.keys.filter((k) => !k.isDisabled).length;
-      this.update(key.hash, {
+    const allKeys = this.keys.length;
-        isPozzed: false,
+    if (activeKeys === 0) return 0;
-        isDisabled: false,
+    return Math.round((activeKeys / allKeys) * 100) / 100;
-        lastChecked: 0,
+  }
-      });
+
-    });
+  public usageInUsd() {
-    this.checker?.scheduleNextCheck();
+    return "$0.00 / ∞";
   }
 }

src/key-management/index.ts

@@ -0,0 +1,68 @@
+import { OPENAI_SUPPORTED_MODELS, OpenAIModel } from "./openai/provider";
+import {
+  ANTHROPIC_SUPPORTED_MODELS,
+  AnthropicModel,
+} from "./anthropic/provider";
+import { KeyPool } from "./key-pool";
+
+export type AIService = "openai" | "anthropic";
+export type Model = OpenAIModel | AnthropicModel;
+
+export interface Key {
+  /** The API key itself. Never log this, use `hash` instead. */
+  readonly key: string;
+  /** The service that this key is for. */
+  service: AIService;
+  /** Whether this is a free trial key. These are prioritized over paid keys if they can fulfill the request. */
+  isTrial: boolean;
+  /** Whether this key has been provisioned for GPT-4. */
+  isGpt4: boolean;
+  /** Whether this key is currently disabled, meaning its quota has been exceeded or it has been revoked. */
+  isDisabled: boolean;
+  /** The number of prompts that have been sent with this key. */
+  promptCount: number;
+  /** The time at which this key was last used. */
+  lastUsed: number;
+  /** The time at which this key was last checked. */
+  lastChecked: number;
+  /** Hash of the key, for logging and to find the key in the pool. */
+  hash: string;
+}
+
+/*
+KeyPool and KeyProvider's similarities are a relic of the old design where
+there was only a single KeyPool for OpenAI keys. Now that there are multiple
+supported services, the service-specific functionality has been moved to
+KeyProvider and KeyPool is just a wrapper around multiple KeyProviders,
+delegating to the appropriate one based on the model requested.
+
+Existing code will continue to call methods on KeyPool, which routes them to
+the appropriate KeyProvider or returns data aggregated across all KeyProviders
+for service-agnostic functionality.
+*/
+
+export interface KeyProvider<T extends Key = Key> {
+  readonly service: AIService;
+  init(): void;
+  get(model: Model): T;
+  list(): Omit<T, "key">[];
+  disable(key: T): void;
+  update(hash: string, update: Partial<T>): void;
+  available(): number;
+  anyUnchecked(): boolean;
+  incrementPrompt(hash: string): void;
+  getLockoutPeriod(model: Model): number;
+  remainingQuota(options?: Record<string, unknown>): number;
+  usageInUsd(options?: Record<string, unknown>): string;
+  markRateLimited(hash: string): void;
+}
+
+export const keyPool = new KeyPool();
+export const SUPPORTED_MODELS = [
+  ...OPENAI_SUPPORTED_MODELS,
+  ...ANTHROPIC_SUPPORTED_MODELS,
+] as const;
+export type SupportedModel = (typeof SUPPORTED_MODELS)[number];
+export { OPENAI_SUPPORTED_MODELS, ANTHROPIC_SUPPORTED_MODELS };
+export { AnthropicKey } from "./anthropic/provider";
+export { OpenAIKey } from "./openai/provider";

src/key-management/key-pool.ts

@@ -0,0 +1,106 @@
+import type * as http from "http";
+import { AnthropicKeyProvider, AnthropicKeyUpdate } from "./anthropic/provider";
+import { Key, Model, KeyProvider, AIService } from "./index";
+import { OpenAIKeyProvider, OpenAIKeyUpdate } from "./openai/provider";
+
+type AllowedPartial = OpenAIKeyUpdate | AnthropicKeyUpdate;
+
+export class KeyPool {
+  private keyProviders: KeyProvider[] = [];
+
+  constructor() {
+    this.keyProviders.push(new OpenAIKeyProvider());
+    this.keyProviders.push(new AnthropicKeyProvider());
+  }
+
+  public init() {
+    this.keyProviders.forEach((provider) => provider.init());
+    const availableKeys = this.available("all");
+    if (availableKeys === 0) {
+      throw new Error(
+        "No keys loaded. Ensure either OPENAI_KEY or ANTHROPIC_KEY is set."
+      );
+    }
+  }
+
+  public get(model: Model): Key {
+    const service = this.getService(model);
+    return this.getKeyProvider(service).get(model);
+  }
+
+  public list(): Omit<Key, "key">[] {
+    return this.keyProviders.flatMap((provider) => provider.list());
+  }
+
+  public disable(key: Key): void {
+    const service = this.getKeyProvider(key.service);
+    service.disable(key);
+  }
+
+  public update(key: Key, props: AllowedPartial): void {
+    const service = this.getKeyProvider(key.service);
+    service.update(key.hash, props);
+  }
+
+  public available(service: AIService | "all" = "all"): number {
+    return this.keyProviders.reduce((sum, provider) => {
+      const includeProvider = service === "all" || service === provider.service;
+      return sum + (includeProvider ? provider.available() : 0);
+    }, 0);
+  }
+
+  public anyUnchecked(): boolean {
+    return this.keyProviders.some((provider) => provider.anyUnchecked());
+  }
+
+  public incrementPrompt(key: Key): void {
+    const provider = this.getKeyProvider(key.service);
+    provider.incrementPrompt(key.hash);
+  }
+
+  public getLockoutPeriod(model: Model): number {
+    const service = this.getService(model);
+    return this.getKeyProvider(service).getLockoutPeriod(model);
+  }
+
+  public markRateLimited(key: Key): void {
+    const provider = this.getKeyProvider(key.service);
+    provider.markRateLimited(key.hash);
+  }
+
+  public updateRateLimits(key: Key, headers: http.IncomingHttpHeaders): void {
+    const provider = this.getKeyProvider(key.service);
+    if (provider instanceof OpenAIKeyProvider) {
+      provider.updateRateLimits(key.hash, headers);
+    }
+  }
+
+  public remainingQuota(
+    service: AIService,
+    options?: Record<string, unknown>
+  ): number {
+    return this.getKeyProvider(service).remainingQuota(options);
+  }
+
+  public usageInUsd(
+    service: AIService,
+    options?: Record<string, unknown>
+  ): string {
+    return this.getKeyProvider(service).usageInUsd(options);
+  }
+
+  private getService(model: Model): AIService {
+    if (model.startsWith("gpt")) {
+      // https://platform.openai.com/docs/models/model-endpoint-compatibility
+      return "openai";
+    } else if (model.startsWith("claude-")) {
+      // https://console.anthropic.com/docs/api/reference#parameters
+      return "anthropic";
+    }
+    throw new Error(`Unknown service for model '${model}'`);
+  }
+
+  private getKeyProvider(service: AIService): KeyProvider {
+    return this.keyProviders.find((provider) => provider.service === service)!;
+  }
+}

src/key-management/openai/checker.ts

@@ -0,0 +1,285 @@
+import axios, { AxiosError } from "axios";
+import { Configuration, OpenAIApi } from "openai";
+import { logger } from "../../logger";
+import type { OpenAIKey, OpenAIKeyProvider } from "./provider";
+
+const MIN_CHECK_INTERVAL = 3 * 1000; // 3 seconds
+const KEY_CHECK_PERIOD = 5 * 60 * 1000; // 5 minutes
+
+const GET_SUBSCRIPTION_URL =
+  "https://api.openai.com/dashboard/billing/subscription";
+const GET_USAGE_URL = "https://api.openai.com/dashboard/billing/usage";
+
+type GetSubscriptionResponse = {
+  plan: { title: string };
+  has_payment_method: boolean;
+  soft_limit_usd: number;
+  hard_limit_usd: number;
+  system_hard_limit_usd: number;
+};
+
+type GetUsageResponse = {
+  total_usage: number;
+};
+
+type OpenAIError = {
+  error: { type: string; code: string; param: unknown; message: string };
+};
+
+type UpdateFn = typeof OpenAIKeyProvider.prototype.update;
+
+export class OpenAIKeyChecker {
+  private readonly keys: OpenAIKey[];
+  private log = logger.child({ module: "key-checker", service: "openai" });
+  private timeout?: NodeJS.Timeout;
+  private updateKey: UpdateFn;
+  private lastCheck = 0;
+
+  constructor(keys: OpenAIKey[], updateKey: UpdateFn) {
+    this.keys = keys;
+    this.updateKey = updateKey;
+  }
+
+  public start() {
+    this.log.info("Starting key checker...");
+    this.scheduleNextCheck();
+  }
+
+  public stop() {
+    if (this.timeout) {
+      clearTimeout(this.timeout);
+    }
+  }
+
+  /**
+   * Schedules the next check. If there are still keys yet to be checked, it
+   * will schedule a check immediately for the next unchecked key. Otherwise,
+   * it will schedule a check in several minutes for the oldest key.
+   **/
+  private scheduleNextCheck() {
+    const enabledKeys = this.keys.filter((key) => !key.isDisabled);
+
+    if (enabledKeys.length === 0) {
+      this.log.warn("All keys are disabled. Key checker stopping.");
+      return;
+    }
+
+    // Perform startup checks for any keys that haven't been checked yet.
+    const uncheckedKeys = enabledKeys.filter((key) => !key.lastChecked);
+    if (uncheckedKeys.length > 0) {
+      // Check up to 12 keys at once to speed up startup.
+      const keysToCheck = uncheckedKeys.slice(0, 12);
+
+      this.log.info(
+        {
+          key: keysToCheck.map((key) => key.hash),
+          remaining: uncheckedKeys.length - keysToCheck.length,
+        },
+        "Scheduling initial checks for key batch."
+      );
+      this.timeout = setTimeout(async () => {
+        const promises = keysToCheck.map((key) => this.checkKey(key));
+        try {
+          await Promise.all(promises);
+        } catch (error) {
+          this.log.error({ error }, "Error checking one or more keys.");
+        }
+        this.scheduleNextCheck();
+      }, 250);
+      return;
+    }
+
+    // Schedule the next check for the oldest key.
+    const oldestKey = enabledKeys.reduce((oldest, key) =>
+      key.lastChecked < oldest.lastChecked ? key : oldest
+    );
+
+    // Don't check any individual key more than once every 5 minutes.
+    // Also, don't check anything more often than once every 3 seconds.
+    const nextCheck = Math.max(
+      oldestKey.lastChecked + KEY_CHECK_PERIOD,
+      this.lastCheck + MIN_CHECK_INTERVAL
+    );
+
+    this.log.debug(
+      { key: oldestKey.hash, nextCheck: new Date(nextCheck) },
+      "Scheduling next check."
+    );
+
+    const delay = nextCheck - Date.now();
+    this.timeout = setTimeout(() => this.checkKey(oldestKey), delay);
+  }
+
+  private async checkKey(key: OpenAIKey) {
+    // It's possible this key might have been disabled while we were waiting
+    // for the next check.
+    if (key.isDisabled) {
+      this.log.warn({ key: key.hash }, "Skipping check for disabled key.");
+      this.scheduleNextCheck();
+      return;
+    }
+
+    this.log.debug({ key: key.hash }, "Checking key...");
+    let isInitialCheck = !key.lastChecked;
+    try {
+      // During the initial check we need to get the subscription first because
+      // trials have different behavior.
+      if (isInitialCheck) {
+        const subscription = await this.getSubscription(key);
+        this.updateKey(key.hash, { isTrial: !subscription.has_payment_method });
+        if (key.isTrial) {
+          this.log.debug(
+            { key: key.hash },
+            "Attempting generation on trial key."
+          );
+          await this.assertCanGenerate(key);
+        }
+        const [provisionedModels, usage] = await Promise.all([
+          this.getProvisionedModels(key),
+          this.getUsage(key),
+        ]);
+        const updates = {
+          isGpt4: provisionedModels.gpt4,
+          softLimit: subscription.soft_limit_usd,
+          hardLimit: subscription.hard_limit_usd,
+          systemHardLimit: subscription.system_hard_limit_usd,
+          usage,
+        };
+        this.updateKey(key.hash, updates);
+      } else {
+        // Don't check provisioned models after the initial check because it's
+        // not likely to change.
+        const [subscription, usage] = await Promise.all([
+          this.getSubscription(key),
+          this.getUsage(key),
+        ]);
+        const updates = {
+          softLimit: subscription.soft_limit_usd,
+          hardLimit: subscription.hard_limit_usd,
+          systemHardLimit: subscription.system_hard_limit_usd,
+          usage,
+        };
+        this.updateKey(key.hash, updates);
+      }
+      this.log.info(
+        { key: key.hash, usage: key.usage, hardLimit: key.hardLimit },
+        "Key check complete."
+      );
+    } catch (error) {
+      // touch the key so we don't check it again for a while
+      this.updateKey(key.hash, {});
+      this.handleAxiosError(key, error as AxiosError);
+    }
+
+    this.lastCheck = Date.now();
+    // Only enqueue the next check if this wasn't a startup check, since those
+    // are batched together elsewhere.
+    if (!isInitialCheck) {
+      this.scheduleNextCheck();
+    }
+  }
+
+  private async getProvisionedModels(
+    key: OpenAIKey
+  ): Promise<{ turbo: boolean; gpt4: boolean }> {
+    const openai = new OpenAIApi(new Configuration({ apiKey: key.key }));
+    const models = (await openai.listModels()!).data.data;
+    const turbo = models.some(({ id }) => id.startsWith("gpt-3.5"));
+    const gpt4 = models.some(({ id }) => id.startsWith("gpt-4"));
+    return { turbo, gpt4 };
+  }
+
+  private async getSubscription(key: OpenAIKey) {
+    const { data } = await axios.get<GetSubscriptionResponse>(
+      GET_SUBSCRIPTION_URL,
+      { headers: { Authorization: `Bearer ${key.key}` } }
+    );
+    return data;
+  }
+
+  private async getUsage(key: OpenAIKey) {
+    const querystring = OpenAIKeyChecker.getUsageQuerystring(key.isTrial);
+    const url = `${GET_USAGE_URL}?${querystring}`;
+    const { data } = await axios.get<GetUsageResponse>(url, {
+      headers: { Authorization: `Bearer ${key.key}` },
+    });
+    return parseFloat((data.total_usage / 100).toFixed(2));
+  }
+
+  private handleAxiosError(key: OpenAIKey, error: AxiosError) {
+    if (error.response && OpenAIKeyChecker.errorIsOpenAiError(error)) {
+      const { status, data } = error.response;
+      if (status === 401) {
+        this.log.warn(
+          { key: key.hash, error: data },
+          "Key is invalid or revoked. Disabling key."
+        );
+        this.updateKey(key.hash, { isDisabled: true });
+      } else if (status === 429 && data.error.type === "insufficient_quota") {
+        this.log.warn(
+          { key: key.hash, isTrial: key.isTrial, error: data },
+          "Key is out of quota. Disabling key."
+        );
+        this.updateKey(key.hash, { isDisabled: true });
+      }
+      else if (status === 429 && data.error.type === "access_terminated") {
+        this.log.warn(
+          { key: key.hash, isTrial: key.isTrial, error: data },
+          "Key has been terminated due to policy violations. Disabling key."
+        );
+        this.updateKey(key.hash, { isDisabled: true });
+      } else {
+        this.log.error(
+          { key: key.hash, status, error: data },
+          "Encountered API error while checking key."
+        );
+      }
+      return;
+    }
+    this.log.error(
+      { key: key.hash, error },
+      "Network error while checking key; trying again later."
+    );
+  }
+
+  /**
+   * Trial key usage reporting is inaccurate, so we need to run an actual
+   * completion to test them for liveness.
+   */
+  private async assertCanGenerate(key: OpenAIKey): Promise<void> {
+    const openai = new OpenAIApi(new Configuration({ apiKey: key.key }));
+    // This will throw an AxiosError if the key is invalid or out of quota.
+    await openai.createChatCompletion({
+      model: "gpt-3.5-turbo",
+      messages: [{ role: "user", content: "Hello" }],
+      max_tokens: 1,
+    });
+  }
+
+  static getUsageQuerystring(isTrial: boolean) {
+    // For paid keys, the limit resets every month, so we can use the first day
+    // of the current month.
+    // For trial keys, the limit does not reset and we don't know when the key
+    // was created, so we use 99 days ago because that's as far back as the API
+    // will let us go.
+
+    // End date needs to be set to the beginning of the next day so that we get
+    // usage for the current day.
+
+    const today = new Date();
+    const startDate = isTrial
+      ? new Date(today.getTime() - 99 * 24 * 60 * 60 * 1000)
+      : new Date(today.getFullYear(), today.getMonth(), 1);
+    const endDate = new Date(today.getTime() + 24 * 60 * 60 * 1000);
+    return `start_date=${startDate.toISOString().split("T")[0]}&end_date=${
+      endDate.toISOString().split("T")[0]
+    }`;
+  }
+
+  static errorIsOpenAiError(
+    error: AxiosError
+  ): error is AxiosError<OpenAIError> {
+    const data = error.response?.data as any;
+    return data?.error?.type;
+  }
+}

src/key-management/openai/provider.ts

@@ -1,40 +1,31 @@
+/* Manages OpenAI API keys. Tracks usage, disables expired keys, and provides
+round-robin access to keys. Keys are stored in the OPENAI_KEY environment
+variable as a comma-separated list of keys. */
 import crypto from "crypto";
-import { IncomingHttpHeaders } from "http";
+import fs from "fs";
-import { config } from "../../../config";
+import http from "http";
-import { logger } from "../../../logger";
+import path from "path";
-import { getOpenAIModelFamily, OpenAIModelFamily } from "../../models";
+import { KeyProvider, Key, Model } from "../index";
-import { Key, Model } from "../types";
+import { config } from "../../config";
+import { logger } from "../../logger";
 import { OpenAIKeyChecker } from "./checker";
-import { KeyProviderBase } from "../key-provider-base";
 
-const KEY_REUSE_DELAY = 1000;
+export type OpenAIModel = "gpt-3.5-turbo" | "gpt-4";
-
+export const OPENAI_SUPPORTED_MODELS: readonly OpenAIModel[] = [
-export const OPENAI_SUPPORTED_MODELS = [
   "gpt-3.5-turbo",
-  "gpt-3.5-turbo-instruct",
   "gpt-4",
-  "gpt-4-32k",
-  "text-embedding-ada-002",
 ] as const;
-export type OpenAIModel = (typeof OPENAI_SUPPORTED_MODELS)[number];
 
-type OpenAIKeyUsage = {
+export interface OpenAIKey extends Key {
-  [K in OpenAIModelFamily as `${K}Tokens`]: number;
-};
-
-export interface OpenAIKey extends Key, OpenAIKeyUsage {
   readonly service: "openai";
-  modelFamilies: OpenAIModelFamily[];
+  /** The current usage of this key. */
-  /**
+  usage: number;
-   * Some keys are assigned to multiple organizations, each with their own quota
+  /** Threshold at which a warning email will be sent by OpenAI. */
-   * limits. We clone the key for each organization and track usage/disabled
+  softLimit: number;
-   * status separately.
+  /** Threshold at which the key will be disabled because it has reached the user-defined limit. */
-   */
+  hardLimit: number;
-  organizationId?: string;
+  /** The maximum quota allocated to this key by OpenAI. */
-  /** Whether this is a free trial key. These are prioritized over paid keys if they can fulfill the request. */
+  systemHardLimit: number;
-  isTrial: boolean;
-  /** Set when key check returns a non-transient 429. */
-  isOverQuota: boolean;
   /** The time at which this key was last rate limited. */
   rateLimitedAt: number;
   /**
@@ -61,78 +52,105 @@ export interface OpenAIKey extends Key, OpenAIKeyUsage {
   rateLimitTokensReset: number;
 }
 
-export class OpenAIKeyProvider extends KeyProviderBase<OpenAIKey> {
+export type OpenAIKeyUpdate = Omit<
+  Partial<OpenAIKey>,
+  "key" | "hash" | "lastUsed" | "lastChecked" | "promptCount"
+>;
+
+export class OpenAIKeyProvider implements KeyProvider<OpenAIKey> {
   readonly service = "openai" as const;
 
-  protected readonly keys: OpenAIKey[] = [];
+  private keys: OpenAIKey[] = [];
   private checker?: OpenAIKeyChecker;
-  protected log = logger.child({ module: "key-provider", service: this.service });
+  private log = logger.child({ module: "key-provider", service: this.service });
 
-  public async init() {
+  constructor() {
-    const storeName = this.store.constructor.name;
+    const keyString = config.openaiKey?.trim();
-    const loadedKeys = await this.store.load();
+    if (!keyString) {
-
+      this.log.warn("OPENAI_KEY is not set. OpenAI API will not be available.");
-    // TODO: after key management UI, keychecker should always be enabled
+      return;
-    // because keys may be added after initialization.
-
-    if (loadedKeys.length === 0) {
-      return this.log.warn({ via: storeName }, "No OpenAI keys found.");
     }
+    let bareKeys: string[];
+    bareKeys = keyString.split(",").map((k) => k.trim());
+    bareKeys = [...new Set(bareKeys)];
+    for (const k of bareKeys) {
+      const newKey = {
+        key: k,
+        service: "openai" as const,
+        isGpt4: true,
+        isTrial: false,
+        isDisabled: false,
+        softLimit: 0,
+        hardLimit: 0,
+        systemHardLimit: 0,
+        usage: 0,
+        lastUsed: 0,
+        lastChecked: 0,
+        promptCount: 0,
+        hash: `oai-${crypto
+          .createHash("sha256")
+          .update(k)
+          .digest("hex")
+          .slice(0, 8)}`,
+        rateLimitedAt: 0,
+        rateLimitRequestsReset: 0,
+        rateLimitTokensReset: 0,
+      };
+      this.keys.push(newKey);
+    }
+    this.log.info({ keyCount: this.keys.length }, "Loaded OpenAI keys.");
+  }
 
-    this.keys.push(...loadedKeys);
+  public init() {
-    this.log.info(
-      { count: this.keys.length, via: storeName },
-      "Loaded OpenAI keys."
-    );
-
     if (config.checkKeys) {
-      const cloneFn = this.clone.bind(this);
+      this.checker = new OpenAIKeyChecker(this.keys, this.update.bind(this));
-      const updateFn = this.update.bind(this);
-      this.checker = new OpenAIKeyChecker(this.keys, cloneFn, updateFn);
       this.checker.start();
     }
   }
 
+  /**
+   * Returns a list of all keys, with the key field removed.
+   * Don't mutate returned keys, use a KeyPool method instead.
+   **/
+  public list() {
+    return this.keys.map((key) => {
+      return Object.freeze({
+        ...key,
+        key: undefined,
+      });
+    });
+  }
+
   public get(model: Model) {
-    const neededFamily = getOpenAIModelFamily(model);
+    const needGpt4 = model.startsWith("gpt-4");
-    const excludeTrials = model === "text-embedding-ada-002";
-
     const availableKeys = this.keys.filter(
-      // Allow keys which...
+      (key) => !key.isDisabled && (!needGpt4 || key.isGpt4)
-      (key) =>
-        !key.isDisabled && // ...are not disabled
-        key.modelFamilies.includes(neededFamily) && // ...have access to the model
-        (!excludeTrials || !key.isTrial) // ...and are not trials (if applicable)
     );
-
     if (availableKeys.length === 0) {
-      throw new Error(`No active keys available for ${neededFamily} models.`);
+      let message = needGpt4
+        ? "No GPT-4 keys available.  Try selecting a Turbo model."
+        : "No active OpenAI keys available.";
+      throw new Error(message);
     }
 
-    if (!config.allowedModelFamilies.includes(neededFamily)) {
+    if (needGpt4 && config.turboOnly) {
       throw new Error(
-        `Proxy operator has disabled access to ${neededFamily} models.`
+        "Proxy operator has disabled GPT-4 to reduce quota usage.  Try selecting a Turbo model."
       );
     }
 
     // Select a key, from highest priority to lowest priority:
     // 1. Keys which are not rate limited
-    //    a. We ignore rate limits from >30 seconds ago
+    //    a. We ignore rate limits from over a minute ago
     //    b. If all keys were rate limited in the last minute, select the
     //       least recently rate limited key
     // 2. Keys which are trials
-    // 3. Keys which do *not* have access to GPT-4-32k
+    // 3. Keys which have not been used in the longest time
-    // 4. Keys which have not been used in the longest time
 
     const now = Date.now();
-    const rateLimitThreshold = 30 * 1000;
+    const rateLimitThreshold = 60 * 1000;
 
     const keysByPriority = availableKeys.sort((a, b) => {
-      // TODO: this isn't quite right; keys are briefly artificially rate-
-      // limited when they are selected, so this will deprioritize keys that
-      // may not actually be limited, simply because they were used recently.
-      // This should be adjusted to use a new `rateLimitedUntil` field instead
-      // of `rateLimitedAt`.
       const aRateLimited = now - a.rateLimitedAt < rateLimitThreshold;
       const bRateLimited = now - b.rateLimitedAt < rateLimitThreshold;
 
@@ -141,32 +159,13 @@ export class OpenAIKeyProvider extends KeyProviderBase<OpenAIKey> {
       if (aRateLimited && bRateLimited) {
         return a.rateLimitedAt - b.rateLimitedAt;
       }
-      // Neither key is rate limited, continue
 
       if (a.isTrial && !b.isTrial) return -1;
       if (!a.isTrial && b.isTrial) return 1;
-      // Neither or both keys are trials, continue
-
-      const aHas32k = a.modelFamilies.includes("gpt4-32k");
-      const bHas32k = b.modelFamilies.includes("gpt4-32k");
-      if (aHas32k && !bHas32k) return 1;
-      if (!aHas32k && bHas32k) return -1;
-      // Neither or both keys have 32k, continue
 
       return a.lastUsed - b.lastUsed;
     });
 
-    // logger.debug(
-    //   {
-    //     byPriority: keysByPriority.map((k) => ({
-    //       hash: k.hash,
-    //       isRateLimited: now - k.rateLimitedAt < rateLimitThreshold,
-    //       modelFamilies: k.modelFamilies,
-    //     })),
-    //   },
-    //   "Keys sorted by priority"
-    // );
-
     const selectedKey = keysByPriority[0];
     selectedKey.lastUsed = now;
 
@@ -177,32 +176,34 @@ export class OpenAIKeyProvider extends KeyProviderBase<OpenAIKey> {
     // Instead, we will let a request through every second until the key
     // becomes fully saturated and locked out again.
     selectedKey.rateLimitedAt = now;
-    selectedKey.rateLimitRequestsReset = KEY_REUSE_DELAY;
+    selectedKey.rateLimitRequestsReset = 1000;
     return { ...selectedKey };
   }
 
-  /** Called by the key checker to create clones of keys for the given orgs. */
+  /** Called by the key checker to update key information. */
-  public clone(keyHash: string, newOrgIds: string[]) {
+  public update(keyHash: string, update: OpenAIKeyUpdate) {
     const keyFromPool = this.keys.find((k) => k.hash === keyHash)!;
-    const clones = newOrgIds.map((orgId) => {
+    Object.assign(keyFromPool, { ...update, lastChecked: Date.now() });
-      const clone: OpenAIKey = {
+    // this.writeKeyStatus();
-        ...keyFromPool,
+  }
-        organizationId: orgId,
+
-        isDisabled: false,
+  /** Disables a key, or does nothing if the key isn't in this pool. */
-        hash: `oai-${crypto
+  public disable(key: Key) {
-          .createHash("sha256")
+    const keyFromPool = this.keys.find((k) => k.key === key.key);
-          .update(keyFromPool.key + orgId)
+    if (!keyFromPool || keyFromPool.isDisabled) return;
-          .digest("hex")
+    keyFromPool.isDisabled = true;
-          .slice(0, 8)}`,
+    // If it's disabled just set the usage to the hard limit so it doesn't
-        lastChecked: 0, // Force re-check in case the org has different models
+    // mess with the aggregate usage.
-      };
+    keyFromPool.usage = keyFromPool.hardLimit;
-      this.log.info(
+    this.log.warn({ key: key.hash }, "Key disabled");
-        { cloneHash: clone.hash, parentHash: keyFromPool.hash, orgId },
+  }
-        "Cloned organization key"
+
-      );
+  public available() {
-      return clone;
+    return this.keys.filter((k) => !k.isDisabled).length;
-    });
+  }
-    clones.forEach((clone) => this.addKey(clone));
+
+  public anyUnchecked() {
+    return !!config.checkKeys && this.keys.some((key) => !key.lastChecked);
   }
 
   /**
@@ -210,9 +211,9 @@ export class OpenAIKeyProvider extends KeyProviderBase<OpenAIKey> {
    * the request, or returns 0 if a key is ready immediately.
    */
   public getLockoutPeriod(model: Model = "gpt-4"): number {
-    const neededFamily = getOpenAIModelFamily(model);
+    const needGpt4 = model.startsWith("gpt-4");
     const activeKeys = this.keys.filter(
-      (key) => !key.isDisabled && key.modelFamilies.includes(neededFamily)
+      (key) => !key.isDisabled && (!needGpt4 || key.isGpt4)
     );
 
     if (activeKeys.length === 0) {
@@ -243,7 +244,7 @@ export class OpenAIKeyProvider extends KeyProviderBase<OpenAIKey> {
 
     // If all keys are rate-limited, return the time until the first key is
     // ready.
-    return Math.min(
+    const timeUntilFirstReady = Math.min(
       ...activeKeys.map((key) => {
         const resetTime = Math.max(
           key.rateLimitRequestsReset,
@@ -252,22 +253,22 @@ export class OpenAIKeyProvider extends KeyProviderBase<OpenAIKey> {
         return key.rateLimitedAt + resetTime - now;
       })
     );
+    return timeUntilFirstReady;
   }
 
   public markRateLimited(keyHash: string) {
-    this.log.debug({ key: keyHash }, "Key rate limited");
+    this.log.warn({ key: keyHash }, "Key rate limited");
     const key = this.keys.find((k) => k.hash === keyHash)!;
     key.rateLimitedAt = Date.now();
   }
 
-  public incrementUsage(keyHash: string, model: string, tokens: number) {
+  public incrementPrompt(keyHash?: string) {
     const key = this.keys.find((k) => k.hash === keyHash);
     if (!key) return;
     key.promptCount++;
-    key[`${getOpenAIModelFamily(model)}Tokens`] += tokens;
   }
 
-  public updateRateLimits(keyHash: string, headers: IncomingHttpHeaders) {
+  public updateRateLimits(keyHash: string, headers: http.IncomingHttpHeaders) {
     const key = this.keys.find((k) => k.hash === keyHash)!;
     const requestsReset = headers["x-ratelimit-reset-requests"];
     const tokensReset = headers["x-ratelimit-reset-tokens"];
@@ -276,7 +277,7 @@ export class OpenAIKeyProvider extends KeyProviderBase<OpenAIKey> {
     // unclear why.
 
     if (requestsReset && typeof requestsReset === "string") {
-      this.log.debug(
+      this.log.info(
         { key: key.hash, requestsReset },
         `Updating rate limit requests reset time`
       );
@@ -284,7 +285,7 @@ export class OpenAIKeyProvider extends KeyProviderBase<OpenAIKey> {
     }
 
     if (tokensReset && typeof tokensReset === "string") {
-      this.log.debug(
+      this.log.info(
         { key: key.hash, tokensReset },
         `Updating rate limit tokens reset time`
       );
@@ -300,17 +301,51 @@ export class OpenAIKeyProvider extends KeyProviderBase<OpenAIKey> {
     }
   }
 
-  public recheck() {
+  /** Returns the remaining aggregate quota for all keys as a percentage. */
-    this.keys.forEach((key) => {
+  public remainingQuota({ gpt4 }: { gpt4: boolean } = { gpt4: false }): number {
-      this.update(key.hash, {
+    const keys = this.keys.filter((k) => k.isGpt4 === gpt4);
-        isRevoked: false,
+    if (keys.length === 0) return 0;
-        isOverQuota: false,
+
-        isDisabled: false,
+    const totalUsage = keys.reduce((acc, key) => {
-        lastChecked: 0,
+      // Keys can slightly exceed their quota
-      });
+      return acc + Math.min(key.usage, key.hardLimit);
-    });
+    }, 0);
-    this.checker?.scheduleNextCheck();
+    const totalLimit = keys.reduce((acc, { hardLimit }) => acc + hardLimit, 0);
+
+    return 1 - totalUsage / totalLimit;
   }
+
+  /** Returns used and available usage in USD. */
+  public usageInUsd({ gpt4 }: { gpt4: boolean } = { gpt4: false }): string {
+    const keys = this.keys.filter((k) => k.isGpt4 === gpt4);
+    if (keys.length === 0) return "???";
+
+    const totalHardLimit = keys.reduce(
+      (acc, { hardLimit }) => acc + hardLimit,
+      0
+    );
+    const totalUsage = keys.reduce((acc, key) => {
+      // Keys can slightly exceed their quota
+      return acc + Math.min(key.usage, key.hardLimit);
+    }, 0);
+
+    return `$${totalUsage.toFixed(2)} / $${totalHardLimit.toFixed(2)}`;
+  }
+
+  /** Writes key status to disk. */
+  // public writeKeyStatus() {
+  //   const keys = this.keys.map((key) => ({
+  //     key: key.key,
+  //     isGpt4: key.isGpt4,
+  //     usage: key.usage,
+  //     hardLimit: key.hardLimit,
+  //     isDisabled: key.isDisabled,
+  //   }));
+  //   fs.writeFileSync(
+  //     path.join(__dirname, "..", "keys.json"),
+  //     JSON.stringify(keys, null, 2)
+  //   );
+  // }
 }
 
 /**

src/logger.ts

@@ -1,20 +1,6 @@
 import pino from "pino";
 import { config } from "./config";
 
-const transport =
-  process.env.NODE_ENV === "production"
-    ? undefined
-    : {
-        target: "pino-pretty",
-        options: {
-          singleLine: true,
-          messageFormat: "{if module}\x1b[90m[{module}] \x1b[39m{end}{msg}",
-          ignore: "module",
-        },
-      };
-
 export const logger = pino({
   level: config.logLevel,
-  base: { pid: process.pid, module: "server" },
-  transport,
 });

src/prompt-logging/backends/sheets.ts

@@ -8,8 +8,8 @@ support because it relies on local state to match up with the remote state. */
 import { google, sheets_v4 } from "googleapis";
 import type { CredentialBody } from "google-auth-library";
 import type { GaxiosResponse } from "googleapis-common";
-import { config } from "../../../config";
+import { config } from "../../config";
-import { logger } from "../../../logger";
+import { logger } from "../../logger";
 import { PromptLogEntry } from "..";
 
 // There is always a sheet called __index__ which contains a list of all the

src/prompt-logging/log-queue.ts

@@ -1,7 +1,7 @@
 /* Queues incoming prompts/responses and periodically flushes them to configured
  * logging backend. */
 
-import { logger } from "../../logger";
+import { logger } from "../logger";
 import { PromptLogEntry } from ".";
 import { sheets } from "./backends";
 

src/proxy/anthropic.ts

@@ -1,4 +1,5 @@
 import { Request, RequestHandler, Router } from "express";
+import * as http from "http";
 import { createProxyMiddleware } from "http-proxy-middleware";
 import { config } from "../config";
 import { logger } from "../logger";
@@ -7,13 +8,13 @@ import { ipLimiter } from "./rate-limit";
 import { handleProxyError } from "./middleware/common";
 import {
   addKey,
-  applyQuotaLimits,
   addAnthropicPreamble,
   blockZoomerOrigins,
   createPreprocessorMiddleware,
   finalizeBody,
   languageFilter,
-  stripHeaders, createOnProxyReqHandler
+  limitOutputTokens,
+  removeOriginHeaders,
 } from "./middleware/request";
 import {
   ProxyResHandlerWithBody,
@@ -66,6 +67,31 @@ const handleModelRequest: RequestHandler = (_req, res) => {
   res.status(200).json(getModelsResponse());
 };
 
+const rewriteAnthropicRequest = (
+  proxyReq: http.ClientRequest,
+  req: Request,
+  res: http.ServerResponse
+) => {
+  const rewriterPipeline = [
+    addKey,
+    addAnthropicPreamble,
+    languageFilter,
+    limitOutputTokens,
+    blockZoomerOrigins,
+    removeOriginHeaders,
+    finalizeBody,
+  ];
+
+  try {
+    for (const rewriter of rewriterPipeline) {
+      rewriter(proxyReq, req, res, {});
+    }
+  } catch (error) {
+    req.log.error(error, "Error while executing proxy rewriter");
+    proxyReq.destroy(error as Error);
+  }
+};
+
 /** Only used for non-streaming requests. */
 const anthropicResponseHandler: ProxyResHandlerWithBody = async (
   _proxyRes,
@@ -84,7 +110,7 @@ const anthropicResponseHandler: ProxyResHandlerWithBody = async (
 
   if (req.inboundApi === "openai") {
     req.log.info("Transforming Anthropic response to OpenAI format");
-    body = transformAnthropicResponse(body, req);
+    body = transformAnthropicResponse(body);
   }
 
   // TODO: Remove once tokenization is stable
@@ -102,19 +128,17 @@ const anthropicResponseHandler: ProxyResHandlerWithBody = async (
  * on-the-fly.
  */
 function transformAnthropicResponse(
-  anthropicBody: Record<string, any>,
+  anthropicBody: Record<string, any>
-  req: Request
 ): Record<string, any> {
-  const totalTokens = (req.promptTokens ?? 0) + (req.outputTokens ?? 0);
   return {
     id: "ant-" + anthropicBody.log_id,
     object: "chat.completion",
     created: Date.now(),
     model: anthropicBody.model,
     usage: {
-      prompt_tokens: req.promptTokens,
+      prompt_tokens: 0,
-      completion_tokens: req.outputTokens,
+      completion_tokens: 0,
-      total_tokens: totalTokens,
+      total_tokens: 0,
     },
     choices: [
       {
@@ -133,23 +157,13 @@ const anthropicProxy = createQueueMiddleware(
   createProxyMiddleware({
     target: "https://api.anthropic.com",
     changeOrigin: true,
-    selfHandleResponse: true,
-    logger,
     on: {
-      proxyReq: createOnProxyReqHandler({
+      proxyReq: rewriteAnthropicRequest,
-        pipeline: [
-          applyQuotaLimits,
-          addKey,
-          addAnthropicPreamble,
-          languageFilter,
-          blockZoomerOrigins,
-          stripHeaders,
-          finalizeBody,
-        ],
-      }),
       proxyRes: createOnProxyResHandler([anthropicResponseHandler]),
       error: handleProxyError,
     },
+    selfHandleResponse: true,
+    logger,
     pathRewrite: {
       // Send OpenAI-compat requests to the real Anthropic endpoint.
       "^/v1/chat/completions": "/v1/complete",
@@ -158,42 +172,35 @@ const anthropicProxy = createQueueMiddleware(
 );
 
 const anthropicRouter = Router();
+// Fix paths because clients don't consistently use the /v1 prefix.
+anthropicRouter.use((req, _res, next) => {
+  if (!req.path.startsWith("/v1/")) {
+    req.url = `/v1${req.url}`;
+  }
+  next();
+});
 anthropicRouter.get("/v1/models", handleModelRequest);
-// Native Anthropic chat completion endpoint.
 anthropicRouter.post(
   "/v1/complete",
   ipLimiter,
-  createPreprocessorMiddleware({
+  createPreprocessorMiddleware({ inApi: "anthropic", outApi: "anthropic" }),
-    inApi: "anthropic",
-    outApi: "anthropic",
-    service: "anthropic",
-  }),
   anthropicProxy
 );
 // OpenAI-to-Anthropic compatibility endpoint.
 anthropicRouter.post(
   "/v1/chat/completions",
   ipLimiter,
-  createPreprocessorMiddleware(
+  createPreprocessorMiddleware({ inApi: "openai", outApi: "anthropic" }),
-    { inApi: "openai", outApi: "anthropic", service: "anthropic" },
-    { afterTransform: [maybeReassignModel] }
-  ),
   anthropicProxy
 );
-
+// Redirect browser requests to the homepage.
-function maybeReassignModel(req: Request) {
+anthropicRouter.get("*", (req, res, next) => {
-  const model = req.body.model;
+  const isBrowser = req.headers["user-agent"]?.includes("Mozilla");
-  if (!model.startsWith("gpt-")) return;
+  if (isBrowser) {
-
+    res.redirect("/");
-  const bigModel = process.env.CLAUDE_BIG_MODEL || "claude-v1-100k";
+  } else {
-  const contextSize = req.promptTokens! + req.outputTokens!;
+    next();
-  if (contextSize > 8500) {
-    req.log.debug(
-      { model: bigModel, contextSize },
-      "Using Claude 100k model for OpenAI-to-Anthropic request"
-    );
-    req.body.model = bigModel;
   }
-}
+});
 
 export const anthropic = anthropicRouter;

src/proxy/auth/gatekeeper.ts

@@ -1,6 +1,6 @@
 import type { Request, RequestHandler } from "express";
-import { config } from "../config";
+import { config } from "../../config";
-import { authenticate, getUser } from "../shared/users/user-store";
+import { authenticate, getUser } from "./user-store";
 
 const GATEKEEPER = config.gatekeeper;
 const PROXY_KEY = config.proxyKey;

src/proxy/auth/user-store.ts

@@ -0,0 +1,211 @@
+/**
+ * Basic user management. Handles creation and tracking of proxy users, personal
+ * access tokens, and quota management. Supports in-memory and Firebase Realtime
+ * Database persistence stores.
+ *
+ * Users are identified solely by their personal access token. The token is
+ * used to authenticate the user for all proxied requests.
+ */
+
+import admin from "firebase-admin";
+import { v4 as uuid } from "uuid";
+import { config, getFirebaseApp } from "../../config";
+import { logger } from "../../logger";
+
+export interface User {
+  /** The user's personal access token. */
+  token: string;
+  /** The IP addresses the user has connected from. */
+  ip: string[];
+  /** The user's privilege level. */
+  type: UserType;
+  /** The number of prompts the user has made. */
+  promptCount: number;
+  /** The number of tokens the user has consumed. Not yet implemented. */
+  tokenCount: number;
+  /** The time at which the user was created. */
+  createdAt: number;
+  /** The time at which the user last connected. */
+  lastUsedAt?: number;
+  /** The time at which the user was disabled, if applicable. */
+  disabledAt?: number;
+  /** The reason for which the user was disabled, if applicable. */
+  disabledReason?: string;
+}
+
+/**
+ * Possible privilege levels for a user.
+ * - `normal`: Default role. Subject to usual rate limits and quotas.
+ * - `special`: Special role. Higher quotas and exempt from auto-ban/lockout.
+ * TODO: implement auto-ban/lockout for normal users when they do naughty shit
+ */
+export type UserType = "normal" | "special";
+
+type UserUpdate = Partial<User> & Pick<User, "token">;
+
+const MAX_IPS_PER_USER = config.maxIpsPerUser;
+
+const users: Map<string, User> = new Map();
+const usersToFlush = new Set<string>();
+
+export async function init() {
+  logger.info({ store: config.gatekeeperStore }, "Initializing user store...");
+  if (config.gatekeeperStore === "firebase_rtdb") {
+    await initFirebase();
+  }
+  logger.info("User store initialized.");
+}
+
+/** Creates a new user and returns their token. */
+export function createUser() {
+  const token = uuid();
+  users.set(token, {
+    token,
+    ip: [],
+    type: "normal",
+    promptCount: 0,
+    tokenCount: 0,
+    createdAt: Date.now(),
+  });
+  usersToFlush.add(token);
+  return token;
+}
+
+/** Returns the user with the given token if they exist. */
+export function getUser(token: string) {
+  return users.get(token);
+}
+
+/** Returns a list of all users. */
+export function getUsers() {
+  return Array.from(users.values()).map((user) => ({ ...user }));
+}
+
+/**
+ * Upserts the given user. Intended for use with the /admin API for updating
+ * user information via JSON. Use other functions for more specific operations.
+ */
+export function upsertUser(user: UserUpdate) {
+  const existing: User = users.get(user.token) ?? {
+    token: user.token,
+    ip: [],
+    type: "normal",
+    promptCount: 0,
+    tokenCount: 0,
+    createdAt: Date.now(),
+  };
+
+  users.set(user.token, {
+    ...existing,
+    ...user,
+  });
+  usersToFlush.add(user.token);
+
+  // Immediately schedule a flush to the database if we're using Firebase.
+  if (config.gatekeeperStore === "firebase_rtdb") {
+    setImmediate(flushUsers);
+  }
+
+  return users.get(user.token);
+}
+
+/** Increments the prompt count for the given user. */
+export function incrementPromptCount(token: string) {
+  const user = users.get(token);
+  if (!user) return;
+  user.promptCount++;
+  usersToFlush.add(token);
+}
+
+/** Increments the token count for the given user by the given amount. */
+export function incrementTokenCount(token: string, amount = 1) {
+  const user = users.get(token);
+  if (!user) return;
+  user.tokenCount += amount;
+  usersToFlush.add(token);
+}
+
+/**
+ * Given a user's token and IP address, authenticates the user and adds the IP
+ * to the user's list of IPs. Returns the user if they exist and are not
+ * disabled, otherwise returns undefined.
+ */
+export function authenticate(token: string, ip: string) {
+  const user = users.get(token);
+  if (!user || user.disabledAt) return;
+  if (!user.ip.includes(ip)) user.ip.push(ip);
+
+  // If too many IPs are associated with the user, disable the account.
+  const ipLimit =
+    user.type === "special" || !MAX_IPS_PER_USER ? Infinity : MAX_IPS_PER_USER;
+  if (user.ip.length > ipLimit) {
+    disableUser(token, "Too many IP addresses associated with this token.");
+    return;
+  }
+
+  user.lastUsedAt = Date.now();
+  usersToFlush.add(token);
+  return user;
+}
+
+/** Disables the given user, optionally providing a reason. */
+export function disableUser(token: string, reason?: string) {
+  const user = users.get(token);
+  if (!user) return;
+  user.disabledAt = Date.now();
+  user.disabledReason = reason;
+  usersToFlush.add(token);
+}
+
+// TODO: Firebase persistence is pretend right now and just polls the in-memory
+// store to sync it with Firebase when it changes. Will refactor to abstract
+// persistence layer later so we can support multiple stores.
+let firebaseTimeout: NodeJS.Timeout | undefined;
+
+async function initFirebase() {
+  logger.info("Connecting to Firebase...");
+  const app = getFirebaseApp();
+  const db = admin.database(app);
+  const usersRef = db.ref("users");
+  const snapshot = await usersRef.once("value");
+  const users: Record<string, User> | null = snapshot.val();
+  firebaseTimeout = setInterval(flushUsers, 20 * 1000);
+  if (!users) {
+    logger.info("No users found in Firebase.");
+    return;
+  }
+  for (const token in users) {
+    upsertUser(users[token]);
+  }
+  usersToFlush.clear();
+  const numUsers = Object.keys(users).length;
+  logger.info({ users: numUsers }, "Loaded users from Firebase");
+}
+
+async function flushUsers() {
+  const app = getFirebaseApp();
+  const db = admin.database(app);
+  const usersRef = db.ref("users");
+  const updates: Record<string, User> = {};
+
+  for (const token of usersToFlush) {
+    const user = users.get(token);
+    if (!user) {
+      continue;
+    }
+    updates[token] = user;
+  }
+
+  usersToFlush.clear();
+
+  const numUpdates = Object.keys(updates).length;
+  if (numUpdates === 0) {
+    return;
+  }
+
+  await usersRef.update(updates);
+  logger.info(
+    { users: Object.keys(updates).length },
+    "Flushed users to Firebase"
+  );
+}

src/proxy/aws.ts

@@ -1,196 +0,0 @@
-import { Request, RequestHandler, Router } from "express";
-import { createProxyMiddleware } from "http-proxy-middleware";
-import { v4 } from "uuid";
-import { config } from "../config";
-import { logger } from "../logger";
-import { createQueueMiddleware } from "./queue";
-import { ipLimiter } from "./rate-limit";
-import { handleProxyError } from "./middleware/common";
-import {
-  applyQuotaLimits,
-  createPreprocessorMiddleware,
-  stripHeaders,
-  signAwsRequest,
-  finalizeAwsRequest,
-  createOnProxyReqHandler,
-  languageFilter,
-  blockZoomerOrigins,
-} from "./middleware/request";
-import {
-  ProxyResHandlerWithBody,
-  createOnProxyResHandler,
-} from "./middleware/response";
-
-let modelsCache: any = null;
-let modelsCacheTime = 0;
-
-const getModelsResponse = () => {
-  if (new Date().getTime() - modelsCacheTime < 1000 * 60) {
-    return modelsCache;
-  }
-
-  if (!config.awsCredentials) return { object: "list", data: [] };
-
-  const variants = ["anthropic.claude-v1", "anthropic.claude-v2"];
-
-  const models = variants.map((id) => ({
-    id,
-    object: "model",
-    created: new Date().getTime(),
-    owned_by: "anthropic",
-    permission: [],
-    root: "claude",
-    parent: null,
-  }));
-
-  modelsCache = { object: "list", data: models };
-  modelsCacheTime = new Date().getTime();
-
-  return modelsCache;
-};
-
-const handleModelRequest: RequestHandler = (_req, res) => {
-  res.status(200).json(getModelsResponse());
-};
-
-/** Only used for non-streaming requests. */
-const awsResponseHandler: ProxyResHandlerWithBody = async (
-  _proxyRes,
-  req,
-  res,
-  body
-) => {
-  if (typeof body !== "object") {
-    throw new Error("Expected body to be an object");
-  }
-
-  if (config.promptLogging) {
-    const host = req.get("host");
-    body.proxy_note = `Prompts are logged on this proxy instance. See ${host} for more information.`;
-  }
-
-  if (req.inboundApi === "openai") {
-    req.log.info("Transforming AWS Claude response to OpenAI format");
-    body = transformAwsResponse(body, req);
-  }
-
-  // TODO: Remove once tokenization is stable
-  if (req.debug) {
-    body.proxy_tokenizer_debug_info = req.debug;
-  }
-
-  // AWS does not confirm the model in the response, so we have to add it
-  body.model = req.body.model;
-
-  res.status(200).json(body);
-};
-
-/**
- * Transforms a model response from the Anthropic API to match those from the
- * OpenAI API, for users using Claude via the OpenAI-compatible endpoint. This
- * is only used for non-streaming requests as streaming requests are handled
- * on-the-fly.
- */
-function transformAwsResponse(
-  awsBody: Record<string, any>,
-  req: Request
-): Record<string, any> {
-  const totalTokens = (req.promptTokens ?? 0) + (req.outputTokens ?? 0);
-  return {
-    id: "aws-" + v4(),
-    object: "chat.completion",
-    created: Date.now(),
-    model: req.body.model,
-    usage: {
-      prompt_tokens: req.promptTokens,
-      completion_tokens: req.outputTokens,
-      total_tokens: totalTokens,
-    },
-    choices: [
-      {
-        message: {
-          role: "assistant",
-          content: awsBody.completion?.trim(),
-        },
-        finish_reason: awsBody.stop_reason,
-        index: 0,
-      },
-    ],
-  };
-}
-
-const awsProxy = createQueueMiddleware(
-  createProxyMiddleware({
-    target: "bad-target-will-be-rewritten",
-    router: ({ signedRequest }) => {
-      if (!signedRequest) {
-        throw new Error("AWS requests must go through signAwsRequest first");
-      }
-      return `${signedRequest.protocol}//${signedRequest.hostname}`;
-    },
-    changeOrigin: true,
-    selfHandleResponse: true,
-    logger,
-    on: {
-      proxyReq: createOnProxyReqHandler({
-        pipeline: [
-          applyQuotaLimits,
-          // Credentials are added by signAwsRequest preprocessor
-          languageFilter,
-          blockZoomerOrigins,
-          stripHeaders,
-          finalizeAwsRequest,
-        ],
-      }),
-      proxyRes: createOnProxyResHandler([awsResponseHandler]),
-      error: handleProxyError,
-    },
-  })
-);
-
-const awsRouter = Router();
-awsRouter.get("/v1/models", handleModelRequest);
-// Native(ish) Anthropic chat completion endpoint.
-awsRouter.post(
-  "/v1/complete",
-  ipLimiter,
-  createPreprocessorMiddleware(
-    { inApi: "anthropic", outApi: "anthropic", service: "aws" },
-    { afterTransform: [maybeReassignModel, signAwsRequest] }
-  ),
-  awsProxy
-);
-// OpenAI-to-AWS Anthropic compatibility endpoint.
-awsRouter.post(
-  "/v1/chat/completions",
-  ipLimiter,
-  createPreprocessorMiddleware(
-    { inApi: "openai", outApi: "anthropic", service: "aws" },
-    { afterTransform: [maybeReassignModel, signAwsRequest] }
-  ),
-  awsProxy
-);
-
-/**
- * Tries to deal with:
- * - frontends sending AWS model names even when they want to use the OpenAI-
- *   compatible endpoint
- * - frontends sending Anthropic model names that AWS doesn't recognize
- * - frontends sending OpenAI model names because they expect the proxy to
- *   translate them
- */
-function maybeReassignModel(req: Request) {
-  const model = req.body.model;
-  // User's client sent an AWS model already
-  if (model.includes("anthropic.claude")) return;
-  // User's client is sending Anthropic-style model names, check for v1
-  if (model.match(/^claude-v?1/)) {
-    req.body.model = "anthropic.claude-v1";
-  } else {
-    // User's client requested v2 or possibly some OpenAI model, default to v2
-    req.body.model = "anthropic.claude-v2";
-  }
-  // TODO: Handle claude-instant
-}
-
-export const aws = awsRouter;

src/proxy/check-risu-token.ts

@@ -1,106 +0,0 @@
-/**
- * Authenticates RisuAI.xyz users using a special x-risu-tk header provided by
- * RisuAI.xyz. This lets us rate limit and limit queue concurrency properly,
- * since otherwise RisuAI.xyz users share the same IP address and can't be
- * distinguished.
- * Contributors: @kwaroran
- */
-import crypto from "crypto";
-import { Request, Response, NextFunction } from "express";
-import { logger } from "../logger";
-
-const log = logger.child({ module: "check-risu-token" });
-
-const RISUAI_PUBLIC_KEY = `
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArEXBmHQfy/YdNIu9lfNC
-xHbVwb2aYx07pBEmqQJtvVEOISj80fASxg+cMJH+/0a/Z4gQgzUJl0HszRpMXAfu
-wmRoetedyC/6CLraHke0Qad/AEHAKwG9A+NwsHRv/cDfP8euAr20cnOyVa79bZsl
-1wlHYQQGo+ve+P/FXtjLGJ/KZYr479F5jkIRKZxPE8mRmkhAVS/u+18QM94BzfoI
-0LlbwvvCHe18QSX6viDK+HsqhhyYDh+0FgGNJw6xKYLdExbQt77FSukH7NaJmVAs
-kYuIJbnAGw5Oq0L6dXFW2DFwlcLz51kPVOmDc159FsQjyuPnta7NiZAANS8KM1CJ
-pwIDAQAB`;
-let IMPORTED_RISU_KEY: CryptoKey | null = null;
-
-type RisuToken = { id: string; expiresIn: number };
-type SignedToken = { data: RisuToken; sig: string };
-
-(async () => {
-  try {
-    log.debug("Importing Risu public key");
-    IMPORTED_RISU_KEY = await crypto.subtle.importKey(
-      "spki",
-      Buffer.from(RISUAI_PUBLIC_KEY.replace(/\s/g, ""), "base64"),
-      { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" },
-      true,
-      ["verify"]
-    );
-    log.debug("Imported Risu public key");
-  } catch (err) {
-    log.warn({ error: err.message }, "Error importing Risu public key");
-    IMPORTED_RISU_KEY = null;
-  }
-})();
-
-export async function checkRisuToken(
-  req: Request,
-  _res: Response,
-  next: NextFunction
-) {
-  let header = req.header("x-risu-tk") || null;
-  if (!header || !IMPORTED_RISU_KEY) {
-    return next();
-  }
-
-  try {
-    const { valid, data } = await validCheck(header);
-
-    if (!valid || !data) {
-      req.log.warn(
-        { token: header, data },
-        "Invalid RisuAI token; using IP instead"
-      );
-    } else {
-      req.log.info("RisuAI token validated");
-      req.risuToken = String(data.id);
-    }
-  } catch (err) {
-    req.log.warn(
-      { error: err.message },
-      "Error validating RisuAI token; using IP instead"
-    );
-  }
-
-  next();
-}
-
-async function validCheck(header: string) {
-  let tk: SignedToken;
-  try {
-    tk = JSON.parse(
-      Buffer.from(decodeURIComponent(header), "base64").toString("utf-8")
-    );
-  } catch (err) {
-    log.warn({ error: err.message }, "Provided unparseable RisuAI token");
-    return { valid: false };
-  }
-  const data: RisuToken = tk.data;
-  const sig = Buffer.from(tk.sig, "base64");
-
-  if (data.expiresIn < Math.floor(Date.now() / 1000)) {
-    log.warn({ token: header }, "Provided expired RisuAI token");
-    return { valid: false };
-  }
-
-  const valid = await crypto.subtle.verify(
-    { name: "RSASSA-PKCS1-v1_5" },
-    IMPORTED_RISU_KEY!,
-    sig,
-    Buffer.from(JSON.stringify(data))
-  );
-
-  if (!valid) {
-    log.warn({ token: header }, "RisuAI token failed signature check");
-  }
-
-  return { valid, data };
-}

src/proxy/kobold.ts

@@ -0,0 +1,114 @@
+/* Pretends to be a KoboldAI API endpoint and translates incoming Kobold
+requests to OpenAI API equivalents. */
+
+import { Request, Response, Router } from "express";
+import http from "http";
+import { createProxyMiddleware } from "http-proxy-middleware";
+import { config } from "../config";
+import { logger } from "../logger";
+import { ipLimiter } from "./rate-limit";
+import { handleProxyError } from "./middleware/common";
+import {
+  addKey,
+  createPreprocessorMiddleware,
+  finalizeBody,
+  languageFilter,
+  limitOutputTokens,
+  transformKoboldPayload,
+} from "./middleware/request";
+import {
+  createOnProxyResHandler,
+  ProxyResHandlerWithBody,
+} from "./middleware/response";
+
+export const handleModelRequest = (_req: Request, res: Response) => {
+  res.status(200).json({ result: "Connected to OpenAI reverse proxy" });
+};
+
+export const handleSoftPromptsRequest = (_req: Request, res: Response) => {
+  res.status(200).json({ soft_prompts_list: [] });
+};
+
+const rewriteRequest = (
+  proxyReq: http.ClientRequest,
+  req: Request,
+  res: Response
+) => {
+  if (config.queueMode !== "none") {
+    const msg = `Queueing is enabled on this proxy instance and is incompatible with the KoboldAI endpoint. Use the OpenAI endpoint instead.`;
+    proxyReq.destroy(new Error(msg));
+    return;
+  }
+
+  req.body.stream = false;
+  const rewriterPipeline = [
+    addKey,
+    transformKoboldPayload,
+    languageFilter,
+    limitOutputTokens,
+    finalizeBody,
+  ];
+
+  try {
+    for (const rewriter of rewriterPipeline) {
+      rewriter(proxyReq, req, res, {});
+    }
+  } catch (error) {
+    logger.error(error, "Error while executing proxy rewriter");
+    proxyReq.destroy(error as Error);
+  }
+};
+
+const koboldResponseHandler: ProxyResHandlerWithBody = async (
+  _proxyRes,
+  req,
+  res,
+  body
+) => {
+  if (typeof body !== "object") {
+    throw new Error("Expected body to be an object");
+  }
+
+  const koboldResponse = {
+    results: [{ text: body.choices[0].message.content }],
+    model: body.model,
+    ...(config.promptLogging && {
+      proxy_note: `Prompt logging is enabled on this proxy instance. See ${req.get(
+        "host"
+      )} for more information.`,
+    }),
+  };
+
+  res.send(JSON.stringify(koboldResponse));
+};
+
+const koboldOaiProxy = createProxyMiddleware({
+  target: "https://api.openai.com",
+  changeOrigin: true,
+  pathRewrite: {
+    "^/api/v1/generate": "/v1/chat/completions",
+  },
+  on: {
+    proxyReq: rewriteRequest,
+    proxyRes: createOnProxyResHandler([koboldResponseHandler]),
+    error: handleProxyError,
+  },
+  selfHandleResponse: true,
+  logger,
+});
+
+const koboldRouter = Router();
+koboldRouter.get("/api/v1/model", handleModelRequest);
+koboldRouter.get("/api/v1/config/soft_prompts_list", handleSoftPromptsRequest);
+koboldRouter.post(
+  "/api/v1/generate",
+  ipLimiter,
+  createPreprocessorMiddleware({ inApi: "kobold", outApi: "openai" }),
+  koboldOaiProxy
+);
+koboldRouter.use((req, res) => {
+  logger.warn(`Unhandled kobold request: ${req.method} ${req.path}`);
+  res.status(404).json({ error: "Not found" });
+});
+
+export const kobold = koboldRouter;

src/proxy/middleware/common.ts

@@ -1,32 +1,17 @@
 import { Request, Response } from "express";
 import httpProxy from "http-proxy";
 import { ZodError } from "zod";
-import { generateErrorMessage } from "zod-error";
-import { buildFakeSse } from "../../shared/streaming";
-import { assertNever } from "../../shared/utils";
-import { QuotaExceededError } from "./request/apply-quota-limits";
 
 const OPENAI_CHAT_COMPLETION_ENDPOINT = "/v1/chat/completions";
-const OPENAI_TEXT_COMPLETION_ENDPOINT = "/v1/completions";
-const OPENAI_EMBEDDINGS_ENDPOINT = "/v1/embeddings";
 const ANTHROPIC_COMPLETION_ENDPOINT = "/v1/complete";
 
 /** Returns true if we're making a request to a completion endpoint. */
 export function isCompletionRequest(req: Request) {
-  // 99% sure this function is not needed anymore
   return (
     req.method === "POST" &&
-    [
+    [OPENAI_CHAT_COMPLETION_ENDPOINT, ANTHROPIC_COMPLETION_ENDPOINT].some(
-      OPENAI_CHAT_COMPLETION_ENDPOINT,
+      (endpoint) => req.path.startsWith(endpoint)
-      OPENAI_TEXT_COMPLETION_ENDPOINT,
+    )
-      ANTHROPIC_COMPLETION_ENDPOINT,
-    ].some((endpoint) => req.path.startsWith(endpoint))
-  );
-}
-
-export function isEmbeddingsRequest(req: Request) {
-  return (
-    req.method === "POST" && req.path.startsWith(OPENAI_EMBEDDINGS_ENDPOINT)
   );
 }
 
@@ -36,7 +21,7 @@ export function writeErrorResponse(
   statusCode: number,
   errorPayload: Record<string, any>
 ) {
-  const errorSource = errorPayload.error?.type?.startsWith("proxy")
+  const errorSource = errorPayload.error?.type.startsWith("proxy")
     ? "proxy"
     : "upstream";
 
@@ -44,16 +29,23 @@ export function writeErrorResponse(
   // the stream. Otherwise just send a normal error response.
   if (
     res.headersSent ||
-    String(res.getHeader("content-type")).startsWith("text/event-stream")
+    res.getHeader("content-type") === "text/event-stream"
   ) {
-    const errorTitle = `${errorSource} error (${statusCode})`;
+    const errorContent =
-    const errorContent = JSON.stringify(errorPayload, null, 2);
+      statusCode === 403
-    const msg = buildFakeSse(errorTitle, errorContent, req);
+        ? JSON.stringify(errorPayload)
+        : JSON.stringify(errorPayload, null, 2);
+
+    const msg = buildFakeSseMessage(
+      `${errorSource} error (${statusCode})`,
+      errorContent,
+      req
+    );
     res.write(msg);
     res.write(`data: [DONE]\n\n`);
     res.end();
   } else {
-    if (req.debug && errorPayload.error) {
+    if (req.debug) {
       errorPayload.error.proxy_tokenizer_debug_info = req.debug;
     }
     res.status(statusCode).json(errorPayload);
@@ -61,136 +53,92 @@ export function writeErrorResponse(
 }
 
 export const handleProxyError: httpProxy.ErrorCallback = (err, req, res) => {
-  req.log.error(err, `Error during http-proxy-middleware request`);
+  req.log.error({ err }, `Error during proxy request middleware`);
-  classifyErrorAndSend(err, req as Request, res as Response);
+  handleInternalError(err, req as Request, res as Response);
 };
 
-export const classifyErrorAndSend = (
+export const handleInternalError = (
   err: Error,
   req: Request,
-  res: Response
+  res: Response,
+  errorType: string = "proxy_internal_error"
 ) => {
   try {
-    const { status, userMessage, ...errorDetails } = classifyError(err);
+    const isZod = err instanceof ZodError;
-    writeErrorResponse(req, res, status, {
+    const isForbidden = err.name === "ForbiddenError";
-      error: { message: userMessage, ...errorDetails },
+    if (isZod) {
-    });
+      writeErrorResponse(req, res, 400, {
-  } catch (error) {
+        error: {
-    req.log.error(error, `Error writing error response headers, giving up.`);
+          type: "proxy_validation_error",
+          proxy_note: `Reverse proxy couldn't validate your request when trying to transform it. Your client may be sending invalid data.`,
+          issues: err.issues,
+          stack: err.stack,
+          message: err.message,
+        },
+      });
+    } else if (isForbidden) {
+      // Spoofs a vaguely threatening OpenAI error message. Only invoked by the
+      // block-zoomers rewriter to scare off tiktokers.
+      writeErrorResponse(req, res, 403, {
+        error: {
+          type: "organization_account_disabled",
+          code: "policy_violation",
+          param: null,
+          message: err.message,
+        },
+      });
+    } else {
+      writeErrorResponse(req, res, 500, {
+        error: {
+          type: errorType,
+          proxy_note: `Reverse proxy encountered an error before it could reach the upstream API.`,
+          message: err.message,
+          stack: err.stack,
+        },
+      });
+    }
+  } catch (e) {
+    req.log.error(
+      { error: e },
+      `Error writing error response headers, giving up.`
+    );
   }
 };
 
-function classifyError(err: Error): {
+export function buildFakeSseMessage(
-  /** HTTP status code returned to the client. */
+  type: string,
-  status: number;
+  string: string,
-  /** Message displayed to the user. */
+  req: Request
-  userMessage: string;
+) {
-  /** Short error type, e.g. "proxy_validation_error". */
+  let fakeEvent;
-  type: string;
+  const useBackticks = !type.includes("403");
-} & Record<string, any> {
+  const msgContent = useBackticks
-  const defaultError = {
+    ? `\`\`\`\n[${type}: ${string}]\n\`\`\`\n`
-    status: 500,
+    : `[${type}: ${string}]`;
-    userMessage: `Reverse proxy encountered an unexpected error. (${err.message})`,
-    type: "proxy_internal_error",
-    stack: err.stack,
-  };
 
-  switch (err.constructor.name) {
+  if (req.inboundApi === "anthropic") {
-    case "ZodError":
+    fakeEvent = {
-      const userMessage = generateErrorMessage((err as ZodError).issues, {
+      completion: msgContent,
-        prefix: "Request validation failed. ",
+      stop_reason: type,
-        path: { enabled: true, label: null, type: "breadcrumbs" },
+      truncated: false, // I've never seen this be true
-        code: { enabled: false },
+      stop: null,
-        maxErrors: 3,
+      model: req.body?.model,
-        transform: ({ issue, ...rest }) => {
+      log_id: "proxy-req-" + req.id,
-          return `At '${rest.pathComponent}', ${issue.message}`;
+    };
+  } else {
+    fakeEvent = {
+      id: "chatcmpl-" + req.id,
+      object: "chat.completion.chunk",
+      created: Date.now(),
+      model: req.body?.model,
+      choices: [
+        {
+          delta: { content: msgContent },
+          index: 0,
+          finish_reason: type,
         },
-      });
+      ],
-      return { status: 400, userMessage, type: "proxy_validation_error" };
+    };
-    case "ForbiddenError":
-      // Mimics a ban notice from OpenAI, thrown when blockZoomerOrigins blocks
-      // a request.
-      return {
-        status: 403,
-        userMessage: `Your account has been disabled for violating our terms of service.`,
-        type: "organization_account_disabled",
-        code: "policy_violation",
-      };
-    case "QuotaExceededError":
-      return {
-        status: 429,
-        userMessage: `You've exceeded your token quota for this model type.`,
-        type: "proxy_quota_exceeded",
-        info: (err as QuotaExceededError).quotaInfo,
-      };
-    case "Error":
-      if ("code" in err) {
-        switch (err.code) {
-          case "ENOTFOUND":
-            return {
-              status: 502,
-              userMessage: `Reverse proxy encountered a DNS error while trying to connect to the upstream service.`,
-              type: "proxy_network_error",
-              code: err.code,
-            };
-          case "ECONNREFUSED":
-            return {
-              status: 502,
-              userMessage: `Reverse proxy couldn't connect to the upstream service.`,
-              type: "proxy_network_error",
-              code: err.code,
-            };
-          case "ECONNRESET":
-            return {
-              status: 504,
-              userMessage: `Reverse proxy timed out while waiting for the upstream service to respond.`,
-              type: "proxy_network_error",
-              code: err.code,
-            };
-        }
-      }
-      return defaultError;
-    default:
-      return defaultError;
-  }
-}
-
-export function getCompletionFromBody(req: Request, body: Record<string, any>) {
-  const format = req.outboundApi;
-  switch (format) {
-    case "openai":
-      return body.choices[0].message.content;
-    case "openai-text":
-      return body.choices[0].text;
-    case "anthropic":
-      if (!body.completion) {
-        req.log.error(
-          { body: JSON.stringify(body) },
-          "Received empty Anthropic completion"
-        );
-        return "";
-      }
-      return body.completion.trim();
-    case "google-palm":
-      return body.candidates[0].output;
-    default:
-      assertNever(format);
-  }
-}
-
-export function getModelFromBody(req: Request, body: Record<string, any>) {
-  const format = req.outboundApi;
-  switch (format) {
-    case "openai":
-    case "openai-text":
-      return body.model;
-    case "anthropic":
-      // Anthropic confirms the model in the response, but AWS Claude doesn't.
-      return body.model || req.body.model;
-    case "google-palm":
-      // Google doesn't confirm the model in the response.
-      return req.body.model;
-    default:
-      assertNever(format);
   }
+  return `data: ${JSON.stringify(fakeEvent)}\n\n`;
 }

src/proxy/middleware/request/add-anthropic-preamble.ts

@@ -1,4 +1,4 @@
-import { AnthropicKey, Key } from "../../../shared/key-management";
+import { AnthropicKey, Key } from "../../../key-management";
 import { isCompletionRequest } from "../common";
 import { ProxyRequestMiddleware } from ".";
 

src/proxy/middleware/request/add-key.ts

@@ -1,7 +1,6 @@
-import { Key, OpenAIKey, keyPool } from "../../../shared/key-management";
+import { Key, keyPool } from "../../../key-management";
-import { isCompletionRequest, isEmbeddingsRequest } from "../common";
+import { isCompletionRequest } from "../common";
 import { ProxyRequestMiddleware } from ".";
-import { assertNever } from "../../../shared/utils";
 
 /** Add a key that can service this request to the request object. */
 export const addKey: ProxyRequestMiddleware = (proxyReq, req) => {
@@ -11,11 +10,8 @@ export const addKey: ProxyRequestMiddleware = (proxyReq, req) => {
     // Horrible, horrible hack to stop the proxy from complaining about clients
     // not sending a model when they are requesting the list of models (which
     // requires a key, but obviously not a model).
-
+    // TODO: shouldn't even proxy /models to the upstream API, just fake it
-    // I don't think this is needed anymore since models requests are no longer
+    // using the models our key pool has available.
-    // proxied to the upstream API. Everything going through this is either a
-    // completion request or a special case like OpenAI embeddings.
-    req.log.warn({ path: req.path }, "addKey called on non-completion request");
     req.body.model = "gpt-3.5-turbo";
   }
 
@@ -34,33 +30,20 @@ export const addKey: ProxyRequestMiddleware = (proxyReq, req) => {
     throw new Error("You must specify a model with your request.");
   }
 
-  // TODO: use separate middleware to deal with stream flags
+  // This should happen somewhere else but addKey is guaranteed to run first.
   req.isStreaming = req.body.stream === true || req.body.stream === "true";
   req.body.stream = req.isStreaming;
 
-  if (req.inboundApi === req.outboundApi) {
+  // Anthropic support has a special endpoint that accepts OpenAI-formatted
-    assignedKey = keyPool.get(req.body.model);
+  // requests and translates them into Anthropic requests.  On this endpoint,
+  // the requested model is an OpenAI one even though we're actually sending
+  // an Anthropic request.
+  // For such cases, ignore the requested model entirely.
+  if (req.inboundApi === "openai" && req.outboundApi === "anthropic") {
+    req.log.debug("Using an Anthropic key for an OpenAI-compatible request");
+    assignedKey = keyPool.get("claude-v1");
   } else {
-    switch (req.outboundApi) {
+    assignedKey = keyPool.get(req.body.model);
-      // If we are translating between API formats we may need to select a model
-      // for the user, because the provided model is for the inbound API.
-      case "anthropic":
-        assignedKey = keyPool.get("claude-v1");
-        break;
-      case "google-palm":
-        assignedKey = keyPool.get("text-bison-001");
-        delete req.body.stream;
-        break;
-      case "openai-text":
-        assignedKey = keyPool.get("gpt-3.5-turbo-instruct");
-        break;
-      case "openai":
-        throw new Error(
-          "OpenAI Chat as an API translation target is not supported"
-        );
-      default:
-        assertNever(req.outboundApi);
-    }
   }
 
   req.key = assignedKey;
@@ -74,64 +57,9 @@ export const addKey: ProxyRequestMiddleware = (proxyReq, req) => {
     "Assigned key to request"
   );
 
-  // TODO: KeyProvider should assemble all necessary headers
+  if (assignedKey.service === "anthropic") {
-  switch (assignedKey.service) {
+    proxyReq.setHeader("X-API-Key", assignedKey.key);
-    case "anthropic":
+  } else {
-      proxyReq.setHeader("X-API-Key", assignedKey.key);
+    proxyReq.setHeader("Authorization", `Bearer ${assignedKey.key}`);
-      break;
-    case "openai":
-      const key: OpenAIKey = assignedKey as OpenAIKey;
-      if (key.organizationId) {
-        proxyReq.setHeader("OpenAI-Organization", key.organizationId);
-      }
-      proxyReq.setHeader("Authorization", `Bearer ${assignedKey.key}`);
-      break;
-    case "google-palm":
-      const originalPath = proxyReq.path;
-      proxyReq.path = originalPath.replace(
-        /(\?.*)?$/,
-        `?key=${assignedKey.key}`
-      );
-      break;
-    case "aws":
-      throw new Error(
-        "add-key should not be used for AWS security credentials. Use sign-aws-request instead."
-      );
-    default:
-      assertNever(assignedKey.service);
-  }
-};
-
-/**
- * Special case for embeddings requests which don't go through the normal
- * request pipeline.
- */
-export const addKeyForEmbeddingsRequest: ProxyRequestMiddleware = (
-  proxyReq,
-  req
-) => {
-  if (!isEmbeddingsRequest(req)) {
-    throw new Error(
-      "addKeyForEmbeddingsRequest called on non-embeddings request"
-    );
-  }
-
-  if (req.inboundApi !== "openai") {
-    throw new Error("Embeddings requests must be from OpenAI");
-  }
-
-  req.body = { input: req.body.input, model: "text-embedding-ada-002" }
-
-  const key = keyPool.get("text-embedding-ada-002") as OpenAIKey;
-
-  req.key = key;
-  req.log.info(
-    { key: key.hash, toApi: req.outboundApi },
-    "Assigned Turbo key to embeddings request"
-  );
-
-  proxyReq.setHeader("Authorization", `Bearer ${key.key}`);
-  if (key.organizationId) {
-    proxyReq.setHeader("OpenAI-Organization", key.organizationId);
   }
 };

src/proxy/middleware/request/apply-quota-limits.ts

@@ -1,30 +0,0 @@
-import { hasAvailableQuota } from "../../../shared/users/user-store";
-import { isCompletionRequest } from "../common";
-import { ProxyRequestMiddleware } from ".";
-
-export class QuotaExceededError extends Error {
-  public quotaInfo: any;
-  constructor(message: string, quotaInfo: any) {
-    super(message);
-    this.name = "QuotaExceededError";
-    this.quotaInfo = quotaInfo;
-  }
-}
-
-export const applyQuotaLimits: ProxyRequestMiddleware = (_proxyReq, req) => {
-  if (!isCompletionRequest(req) || !req.user) {
-    return;
-  }
-
-  const requestedTokens = (req.promptTokens ?? 0) + (req.outputTokens ?? 0);
-  if (!hasAvailableQuota(req.user.token, req.body.model, requestedTokens)) {
-    throw new QuotaExceededError(
-      "You have exceeded your proxy token quota for this model.",
-      {
-        quota: req.user.tokenLimits,
-        used: req.user.tokenCounts,
-        requested: requestedTokens,
-      }
-    );
-  }
-};

src/proxy/middleware/request/check-prompt-size.ts

@@ -0,0 +1,36 @@
+import { countTokens } from "../../../tokenization";
+import { RequestPreprocessor } from ".";
+import { openAIMessagesToClaudePrompt } from "./transform-outbound-payload";
+
+export const checkPromptSize: RequestPreprocessor = async (req) => {
+  const prompt =
+    req.inboundApi === "openai" ? req.body.messages : req.body.prompt;
+
+  let result;
+  if (req.outboundApi === "openai") {
+    result = await countTokens({ req, prompt, service: "openai" });
+  } else {
+    // If we're doing OpenAI-to-Anthropic, we need to convert the messages to a
+    // prompt first before counting tokens, as that process affects the token
+    // count.
+    let promptStr =
+      req.inboundApi === "anthropic"
+        ? prompt
+        : openAIMessagesToClaudePrompt(prompt);
+    result = await countTokens({
+      req,
+      prompt: promptStr,
+      service: "anthropic",
+    });
+  }
+
+  req.promptTokens = result.token_count;
+
+  // TODO: Remove once token counting is stable
+  req.log.debug({ result }, "Counted prompt tokens");
+  req.debug = req.debug ?? {};
+  req.debug = {
+    ...req.debug,
+    ...result,
+  };
+};

src/proxy/middleware/request/count-prompt-tokens.ts

@@ -1,48 +0,0 @@
-import { RequestPreprocessor } from "./index";
-import { countTokens, OpenAIPromptMessage } from "../../../shared/tokenization";
-import { assertNever } from "../../../shared/utils";
-
-/**
- * Given a request with an already-transformed body, counts the number of
- * tokens and assigns the count to the request.
- */
-export const countPromptTokens: RequestPreprocessor = async (req) => {
-  const service = req.outboundApi;
-  let result;
-
-  switch (service) {
-    case "openai": {
-      req.outputTokens = req.body.max_tokens;
-      const prompt: OpenAIPromptMessage[] = req.body.messages;
-      result = await countTokens({ req, prompt, service });
-      break;
-    }
-    case "openai-text": {
-      req.outputTokens = req.body.max_tokens;
-      const prompt: string = req.body.prompt;
-      result = await countTokens({ req, prompt, service });
-      break;
-    }
-    case "anthropic": {
-      req.outputTokens = req.body.max_tokens_to_sample;
-      const prompt: string = req.body.prompt;
-      result = await countTokens({ req, prompt, service });
-      break;
-    }
-    case "google-palm": {
-      req.outputTokens = req.body.maxOutputTokens;
-      const prompt: string = req.body.prompt.text;
-      result = await countTokens({ req, prompt, service });
-      break;
-    }
-    default:
-      assertNever(service);
-  }
-
-  req.promptTokens = result.token_count;
-
-  // TODO: Remove once token counting is stable
-  req.log.debug({ result: result }, "Counted prompt tokens.");
-  req.debug = req.debug ?? {};
-  req.debug = { ...req.debug, ...result };
-};

src/proxy/middleware/request/finalize-aws-request.ts

@@ -1,26 +0,0 @@
-import type { ProxyRequestMiddleware } from ".";
-
-/**
- * For AWS requests, the body is signed earlier in the request pipeline, before
- * the proxy middleware. This function just assigns the path and headers to the
- * proxy request.
- */
-export const finalizeAwsRequest: ProxyRequestMiddleware = (proxyReq, req) => {
-  if (!req.signedRequest) {
-    throw new Error("Expected req.signedRequest to be set");
-  }
-
-  // The path depends on the selected model and the assigned key's region.
-  proxyReq.path = req.signedRequest.path;
-
-  // Amazon doesn't want extra headers, so we need to remove all of them and
-  // reassign only the ones specified in the signed request.
-  proxyReq.getRawHeaderNames().forEach(proxyReq.removeHeader.bind(proxyReq));
-  Object.entries(req.signedRequest.headers).forEach(([key, value]) => {
-    proxyReq.setHeader(key, value);
-  });
-
-  // Don't use fixRequestBody here because it adds a content-length header.
-  // Amazon doesn't want that and it breaks the signature.
-  proxyReq.write(req.signedRequest.body);
-};

src/proxy/middleware/request/index.ts

@@ -2,29 +2,22 @@ import type { Request } from "express";
 import type { ClientRequest } from "http";
 import type { ProxyReqCallback } from "http-proxy";
 
-export { createOnProxyReqHandler } from "./rewrite";
-export {
-  createPreprocessorMiddleware,
-  createEmbeddingsPreprocessorMiddleware,
-} from "./preprocess";
-
 // Express middleware (runs before http-proxy-middleware, can be async)
-export { applyQuotaLimits } from "./apply-quota-limits";
+export { createPreprocessorMiddleware } from "./preprocess";
-export { validateContextSize } from "./validate-context-size";
+export { checkPromptSize } from "./check-prompt-size";
-export { countPromptTokens } from "./count-prompt-tokens";
 export { setApiFormat } from "./set-api-format";
-export { signAwsRequest } from "./sign-aws-request";
 export { transformOutboundPayload } from "./transform-outbound-payload";
 
 // HPM middleware (runs on onProxyReq, cannot be async)
-export { addKey, addKeyForEmbeddingsRequest } from "./add-key";
+export { addKey } from "./add-key";
 export { addAnthropicPreamble } from "./add-anthropic-preamble";
 export { blockZoomerOrigins } from "./block-zoomer-origins";
 export { finalizeBody } from "./finalize-body";
-export { finalizeAwsRequest } from "./finalize-aws-request";
 export { languageFilter } from "./language-filter";
 export { limitCompletions } from "./limit-completions";
-export { stripHeaders } from "./strip-headers";
+export { limitOutputTokens } from "./limit-output-tokens";
+export { removeOriginHeaders } from "./remove-origin-headers";
+export { transformKoboldPayload } from "./transform-kobold-payload";
 
 /**
  * Middleware that runs prior to the request being handled by http-proxy-
@@ -54,6 +47,3 @@ export type RequestPreprocessor = (req: Request) => void | Promise<void>;
  * request queue middleware.
  */
 export type ProxyRequestMiddleware = ProxyReqCallback<ClientRequest, Request>;
-
-export const forceModel = (model: string) => (req: Request) =>
-  void (req.body.model = model);

src/proxy/middleware/request/language-filter.ts

@@ -1,7 +1,6 @@
 import { Request } from "express";
 import { config } from "../../../config";
 import { logger } from "../../../logger";
-import { assertNever } from "../../../shared/utils";
 import { isCompletionRequest } from "../common";
 import { ProxyRequestMiddleware } from ".";
 
@@ -46,11 +45,7 @@ function getPromptFromRequest(req: Request) {
       return body.messages
         .map((m: { content: string }) => m.content)
         .join("\n");
-    case "openai-text":
-      return body.prompt;
-    case "google-palm":
-      return body.prompt.text;
     default:
-      assertNever(service);
+      throw new Error(`Unknown service: ${service}`);
   }
 }

src/proxy/middleware/request/limit-output-tokens.ts

@@ -0,0 +1,46 @@
+import { Request } from "express";
+import { config } from "../../../config";
+import { isCompletionRequest } from "../common";
+import { ProxyRequestMiddleware } from ".";
+
+/** Enforce a maximum number of tokens requested from the model. */
+export const limitOutputTokens: ProxyRequestMiddleware = (_proxyReq, req) => {
+  // TODO: do all of this shit in the zod validator
+  if (isCompletionRequest(req)) {
+    const requestedMax = Number.parseInt(getMaxTokensFromRequest(req));
+    const apiMax =
+      req.outboundApi === "openai"
+        ? config.maxOutputTokensOpenAI
+        : config.maxOutputTokensAnthropic;
+    let maxTokens = requestedMax;
+
+    if (typeof requestedMax !== "number") {
+      maxTokens = apiMax;
+    }
+
+    maxTokens = Math.min(maxTokens, apiMax);
+    if (req.outboundApi === "openai") {
+      req.body.max_tokens = maxTokens;
+    } else if (req.outboundApi === "anthropic") {
+      req.body.max_tokens_to_sample = maxTokens;
+    }
+
+    if (requestedMax !== maxTokens) {
+      req.log.info(
+        { requestedMax, configMax: apiMax, final: maxTokens },
+        "Limiting user's requested max output tokens"
+      );
+    }
+  }
+};
+
+function getMaxTokensFromRequest(req: Request) {
+  switch (req.outboundApi) {
+    case "anthropic":
+      return req.body?.max_tokens_to_sample;
+    case "openai":
+      return req.body?.max_tokens;
+    default:
+      throw new Error(`Unknown service: ${req.outboundApi}`);
+  }
+}

src/proxy/middleware/request/preprocess.ts

@@ -1,79 +1,36 @@
 import { RequestHandler } from "express";
-import { initializeSseStream } from "../../../shared/streaming";
+import { handleInternalError } from "../common";
-import { classifyErrorAndSend } from "../common";
 import {
   RequestPreprocessor,
-  validateContextSize,
+  checkPromptSize,
-  countPromptTokens,
   setApiFormat,
   transformOutboundPayload,
 } from ".";
 
-type RequestPreprocessorOptions = {
-  /**
-   * Functions to run before the request body is transformed between API
-   * formats. Use this to change the behavior of the transformation, such as for
-   * endpoints which can accept multiple API formats.
-   */
-  beforeTransform?: RequestPreprocessor[];
-  /**
-   * Functions to run after the request body is transformed and token counts are
-   * assigned. Use this to perform validation or other actions that depend on
-   * the request body being in the final API format.
-   */
-  afterTransform?: RequestPreprocessor[];
-};
-
 /**
  * Returns a middleware function that processes the request body into the given
  * API format, and then sequentially runs the given additional preprocessors.
  */
 export const createPreprocessorMiddleware = (
   apiFormat: Parameters<typeof setApiFormat>[0],
-  { beforeTransform, afterTransform }: RequestPreprocessorOptions = {}
+  additionalPreprocessors?: RequestPreprocessor[]
 ): RequestHandler => {
   const preprocessors: RequestPreprocessor[] = [
     setApiFormat(apiFormat),
-    ...(beforeTransform ?? []),
+    checkPromptSize,
     transformOutboundPayload,
-    countPromptTokens,
+    ...(additionalPreprocessors ?? []),
-    ...(afterTransform ?? []),
-    validateContextSize,
   ];
-  return async (...args) => executePreprocessors(preprocessors, args);
-};
 
-/**
+  return async function executePreprocessors(req, res, next) {
- * Returns a middleware function that specifically prepares requests for
+    try {
- * OpenAI's embeddings API. Tokens are not counted because embeddings requests
+      for (const preprocessor of preprocessors) {
- * are basically free.
+        await preprocessor(req);
- */
+      }
-export const createEmbeddingsPreprocessorMiddleware = (): RequestHandler => {
+      next();
-  const preprocessors: RequestPreprocessor[] = [
+    } catch (error) {
-    setApiFormat({ inApi: "openai", outApi: "openai", service: "openai" }),
+      req.log.error(error, "Error while executing request preprocessor");
-    (req) => void (req.promptTokens = req.outputTokens = 0),
+      handleInternalError(error as Error, req, res, "proxy_preprocessor_error");
-  ];
-  return async (...args) => executePreprocessors(preprocessors, args);
-};
-
-async function executePreprocessors(
-  preprocessors: RequestPreprocessor[],
-  [req, res, next]: Parameters<RequestHandler>
-) {
-  try {
-    for (const preprocessor of preprocessors) {
-      await preprocessor(req);
     }
-    next();
+  };
-  } catch (error) {
+};
-    req.log.error(error, "Error while executing request preprocessor");
-
-    // If the requested has opted into streaming, the client probably won't
-    // handle a non-eventstream response, but we haven't initialized the SSE
-    // stream yet as that is typically done later by the request queue. We'll
-    // do that here and then call classifyErrorAndSend to use the streaming
-    // error handler.
-    initializeSseStream(res)
-    classifyErrorAndSend(error as Error, req, res);
-  }
-}

src/proxy/middleware/request/remove-origin-headers.ts

@@ -0,0 +1,10 @@
+import { ProxyRequestMiddleware } from ".";
+
+/**
+ * Removes origin and referer headers before sending the request to the API for
+ * privacy reasons.
+ **/
+export const removeOriginHeaders: ProxyRequestMiddleware = (proxyReq) => {
+  proxyReq.setHeader("origin", "");
+  proxyReq.setHeader("referer", "");
+};

src/proxy/middleware/request/rewrite.ts

@@ -1,35 +0,0 @@
-import { Request } from "express";
-import { ClientRequest } from "http";
-import httpProxy from "http-proxy";
-import { ProxyRequestMiddleware } from "./index";
-
-type ProxyReqCallback = httpProxy.ProxyReqCallback<ClientRequest, Request>;
-type RewriterOptions = {
-  beforeRewrite?: ProxyReqCallback[];
-  pipeline: ProxyRequestMiddleware[];
-};
-
-export const createOnProxyReqHandler = ({
-  beforeRewrite = [],
-  pipeline,
-}: RewriterOptions): ProxyReqCallback => {
-  return (proxyReq, req, res, options) => {
-    try {
-      for (const validator of beforeRewrite) {
-        validator(proxyReq, req, res, options);
-      }
-    } catch (error) {
-      req.log.error(error, "Error while executing proxy request validator");
-      proxyReq.destroy(error);
-    }
-
-    try {
-      for (const rewriter of pipeline) {
-        rewriter(proxyReq, req, res, options);
-      }
-    } catch (error) {
-      req.log.error(error, "Error while executing proxy request rewriter");
-      proxyReq.destroy(error);
-    }
-  };
-};

src/proxy/middleware/request/set-api-format.ts

@@ -1,15 +1,13 @@
 import { Request } from "express";
-import { APIFormat, LLMService } from "../../../shared/key-management";
+import { AIService } from "../../../key-management";
 import { RequestPreprocessor } from ".";
 
 export const setApiFormat = (api: {
   inApi: Request["inboundApi"];
-  outApi: APIFormat;
+  outApi: AIService;
-  service: LLMService;
 }): RequestPreprocessor => {
-  return function configureRequestApiFormat(req) {
+  return (req) => {
     req.inboundApi = api.inApi;
     req.outboundApi = api.outApi;
-    req.service = api.service;
   };
 };

src/proxy/middleware/request/sign-aws-request.ts

@@ -1,96 +0,0 @@
-import express from "express";
-import { Sha256 } from "@aws-crypto/sha256-js";
-import { SignatureV4 } from "@smithy/signature-v4";
-import { HttpRequest } from "@smithy/protocol-http";
-import { keyPool } from "../../../shared/key-management";
-import { RequestPreprocessor } from ".";
-import { AnthropicV1CompleteSchema } from "./transform-outbound-payload";
-
-const AMZ_HOST =
-  process.env.AMZ_HOST || "invoke-bedrock.%REGION%.amazonaws.com";
-
-/**
- * Signs an outgoing AWS request with the appropriate headers modifies the
- * request object in place to fix the path.
- */
-export const signAwsRequest: RequestPreprocessor = async (req) => {
-  req.key = keyPool.get("anthropic.claude-v2");
-
-  const { model, stream } = req.body;
-  req.isStreaming = stream === true || stream === "true";
-
-  let preamble = req.body.prompt.startsWith("\n\nHuman:") ? "" : "\n\nHuman:";
-  req.body.prompt = preamble + req.body.prompt;
-
-  // AWS supports only a subset of Anthropic's parameters and is more strict
-  // about unknown parameters.
-  // TODO: This should happen in transform-outbound-payload.ts
-  const strippedParams = AnthropicV1CompleteSchema.pick({
-    prompt: true,
-    max_tokens_to_sample: true,
-    stop_sequences: true,
-    temperature: true,
-    top_k: true,
-    top_p: true,
-  }).parse(req.body);
-
-  const credential = getCredentialParts(req);
-  const host = AMZ_HOST.replace("%REGION%", credential.region);
-  // AWS only uses 2023-06-01 and does not actually check this header, but we
-  // set it so that the stream adapter always selects the correct transformer.
-  req.headers["anthropic-version"] = "2023-06-01";
-
-  // Uses the AWS SDK to sign a request, then modifies our HPM proxy request
-  // with the headers generated by the SDK.
-  const newRequest = new HttpRequest({
-    method: "POST",
-    protocol: "https:",
-    hostname: host,
-    path: `/model/${model}/invoke${stream ? "-with-response-stream" : ""}`,
-    headers: {
-      ["Host"]: host,
-      ["content-type"]: "application/json",
-    },
-    body: JSON.stringify(strippedParams),
-  });
-
-  if (stream) {
-    newRequest.headers["x-amzn-bedrock-accept"] = "application/json";
-  } else {
-    newRequest.headers["accept"] = "*/*";
-  }
-
-  req.signedRequest = await sign(newRequest, getCredentialParts(req));
-};
-
-type Credential = {
-  accessKeyId: string;
-  secretAccessKey: string;
-  region: string;
-};
-function getCredentialParts(req: express.Request): Credential {
-  const [accessKeyId, secretAccessKey, region] = req.key!.key.split(":");
-
-  if (!accessKeyId || !secretAccessKey || !region) {
-    req.log.error(
-      { key: req.key!.hash },
-      "AWS_CREDENTIALS isn't correctly formatted; refer to the docs"
-    );
-    throw new Error("The key assigned to this request is invalid.");
-  }
-
-  return { accessKeyId, secretAccessKey, region };
-}
-
-async function sign(request: HttpRequest, credential: Credential) {
-  const { accessKeyId, secretAccessKey, region } = credential;
-
-  const signer = new SignatureV4({
-    sha256: Sha256,
-    credentials: { accessKeyId, secretAccessKey },
-    region,
-    service: "bedrock",
-  });
-
-  return signer.sign(request);
-}

src/proxy/middleware/request/strip-headers.ts

@@ -1,16 +0,0 @@
-import { ProxyRequestMiddleware } from ".";
-
-/**
- * Removes origin and referer headers before sending the request to the API for
- * privacy reasons.
- **/
-export const stripHeaders: ProxyRequestMiddleware = (proxyReq) => {
-  proxyReq.setHeader("origin", "");
-  proxyReq.setHeader("referer", "");
-
-  proxyReq.removeHeader("cf-connecting-ip");
-  proxyReq.removeHeader("forwarded");
-  proxyReq.removeHeader("true-client-ip");
-  proxyReq.removeHeader("x-forwarded-for");
-  proxyReq.removeHeader("x-real-ip");
-};

src/proxy/middleware/request/transform-kobold-payload.ts

@@ -0,0 +1,112 @@
+/**
+ * Transforms a KoboldAI payload into an OpenAI payload.
+ * @deprecated Kobold input format isn't supported anymore as all popular
+ * frontends support reverse proxies or changing their base URL. It adds too
+ * many edge cases to be worth maintaining and doesn't work with newer features.
+ */
+import { logger } from "../../../logger";
+import type { ProxyRequestMiddleware } from ".";
+
+// Kobold requests look like this:
+// body:
+// {
+//   prompt: "Aqua is character from Konosuba anime. Aqua is a goddess, before life in the Fantasy World, she was a goddess of water who guided humans to the afterlife.  Aqua looks like young woman with beauty no human could match. Aqua has light blue hair, blue eyes, slim figure, long legs, wide hips, blue waist-long hair that is partially tied into a loop with a spherical clip. Aqua's measurements are 83-56-83 cm. Aqua's height 157cm. Aqua wears sleeveless dark-blue dress with white trimmings, extremely short dark blue miniskirt, green bow around her chest with a blue gem in the middle, detached white sleeves with blue and golden trimmings, thigh-high blue heeled boots over white stockings with blue trimmings. Aqua is very strong in water magic, but a little stupid, so she does not always use it to the place. Aqua is high-spirited, cheerful, carefree. Aqua rarely thinks about the consequences of her actions and always acts or speaks on her whims. Because very easy to taunt Aqua with jeers or lure her with praises.\n" +
+//     "Aqua's personality: high-spirited, likes to party, carefree, cheerful.\n" +
+//     'Circumstances and context of the dialogue: Aqua is standing in the city square and is looking for new followers\n' +
+//     'This is how Aqua should talk\n' +
+//     'You: Hi Aqua, I heard you like to spend time in the pub.\n' +
+//     "Aqua: *excitedly* Oh my goodness, yes! I just love spending time at the pub! It's so much fun to talk to all the adventurers and hear about their exciting adventures! And you are?\n" +
+//     "You: I'm a new here and I wanted to ask for your advice.\n" +
+//     'Aqua: *giggles* Oh, advice! I love giving advice! And in gratitude for that, treat me to a drink! *gives signals to the bartender*\n' +
+//     'This is how Aqua should talk\n' +
+//     'You: Hello\n' +
+//     "Aqua: *excitedly* Hello there, dear! Are you new to Axel? Don't worry, I, Aqua the goddess of water, am here to help you! Do you need any assistance? And may I say, I look simply radiant today! *strikes a pose and looks at you with puppy eyes*\n" +
+//     '\n' +
+//     'Then the roleplay chat between You and Aqua begins.\n' +
+//     "Aqua: *She is in the town square of a city named Axel. It's morning on a Saturday and she suddenly notices a person who looks like they don't know what they're doing. She approaches him and speaks* \n" +
+//     '\n' +
+//     `"Are you new here? Do you need help? Don't worry! I, Aqua the Goddess of Water, shall help you! Do I look beautiful?" \n` +
+//     '\n' +
+//     '*She strikes a pose and looks at him with puppy eyes.*\n' +
+//     'You: test\n' +
+//     'You: test\n' +
+//     'You: t\n' +
+//     'You: test\n',
+//   use_story: false,
+//   use_memory: false,
+//   use_authors_note: false,
+//   use_world_info: false,
+//   max_context_length: 2048,
+//   max_length: 180,
+//   rep_pen: 1.1,
+//   rep_pen_range: 1024,
+//   rep_pen_slope: 0.9,
+//   temperature: 0.65,
+//   tfs: 0.9,
+//   top_a: 0,
+//   top_k: 0,
+//   top_p: 0.9,
+//   typical: 1,
+//   sampler_order: [
+//     6, 0, 1, 2,
+//     3, 4, 5
+//   ],
+//   singleline: false
+// }
+
+// OpenAI expects this body:
+// { model: 'gpt-3.5-turbo', temperature: 0.65, top_p: 0.9, max_tokens: 180, messages }
+// there's also a frequency_penalty but it's not clear how that maps to kobold's
+// rep_pen.
+
+// messages is an array of { role: "system" | "assistant" | "user", content: ""}
+// kobold only sends us the entire prompt. we can try to split the last two
+// lines into user and assistant messages, but that's not always correct. For
+// now it will have to do.
+
+/**
+ * Transforms a KoboldAI payload into an OpenAI payload.
+ * @deprecated Probably doesn't work anymore, idk.
+ **/
+export const transformKoboldPayload: ProxyRequestMiddleware = (
+  _proxyReq,
+  req
+) => {
+  if (req.inboundApi !== "kobold") {
+    throw new Error("transformKoboldPayload called for non-kobold request.");
+  }
+
+  const { body } = req;
+  const { prompt, max_length, rep_pen, top_p, temperature } = body;
+
+  if (!max_length) {
+    logger.error("KoboldAI request missing max_length.");
+    throw new Error("You must specify a max_length parameter.");
+  }
+
+  const promptLines = prompt.split("\n");
+  // The very last line is the contentless "Assistant: " hint to the AI.
+  // Tavern just leaves an empty line, Agnai includes the AI's name.
+  const assistantHint = promptLines.pop();
+  // The second-to-last line is the user's prompt, generally.
+  const userPrompt = promptLines.pop();
+  const messages = [
+    { role: "system", content: promptLines.join("\n") },
+    { role: "user", content: userPrompt },
+    { role: "assistant", content: assistantHint },
+  ];
+
+  // Kobold doesn't select a model. If the addKey rewriter assigned us a GPT-4
+  // key, use that. Otherwise, use GPT-3.5-turbo.
+
+  const model = req.key!.isGpt4 ? "gpt-4" : "gpt-3.5-turbo";
+  const newBody = {
+    model,
+    temperature,
+    top_p,
+    frequency_penalty: rep_pen, // remove this if model turns schizo
+    max_tokens: max_length,
+    messages,
+  };
+  req.body = newBody;
+};

src/proxy/middleware/request/transform-outbound-payload.ts

@@ -1,36 +1,34 @@
 import { Request } from "express";
 import { z } from "zod";
-import { config } from "../../../config";
-import { OpenAIPromptMessage } from "../../../shared/tokenization";
 import { isCompletionRequest } from "../common";
 import { RequestPreprocessor } from ".";
-import { APIFormat } from "../../../shared/key-management";
+import { OpenAIPromptMessage } from "../../../tokenization/openai";
 
-const CLAUDE_OUTPUT_MAX = config.maxOutputTokensAnthropic;
+/**
-const OPENAI_OUTPUT_MAX = config.maxOutputTokensOpenAI;
+ * The maximum number of tokens an Anthropic prompt can have before we switch to
+ * the larger claude-100k context model.
+ */
+const CLAUDE_100K_TOKEN_THRESHOLD = 8200;
 
 // https://console.anthropic.com/docs/api/reference#-v1-complete
-export const AnthropicV1CompleteSchema = z.object({
+const AnthropicV1CompleteSchema = z.object({
-  model: z.string(),
+  model: z.string().regex(/^claude-/, "Model must start with 'claude-'"),
   prompt: z.string({
     required_error:
       "No prompt found. Are you sending an OpenAI-formatted request to the Claude endpoint?",
   }),
-  max_tokens_to_sample: z.coerce
+  max_tokens_to_sample: z.coerce.number(),
-    .number()
-    .int()
-    .transform((v) => Math.min(v, CLAUDE_OUTPUT_MAX)),
   stop_sequences: z.array(z.string()).optional(),
   stream: z.boolean().optional().default(false),
   temperature: z.coerce.number().optional().default(1),
-  top_k: z.coerce.number().optional(),
+  top_k: z.coerce.number().optional().default(-1),
-  top_p: z.coerce.number().optional(),
+  top_p: z.coerce.number().optional().default(-1),
   metadata: z.any().optional(),
 });
 
 // https://platform.openai.com/docs/api-reference/chat/create
 const OpenAIV1ChatCompletionSchema = z.object({
-  model: z.string(),
+  model: z.string().regex(/^gpt/, "Model must start with 'gpt-'"),
   messages: z.array(
     z.object({
       role: z.enum(["system", "user", "assistant"]),
@@ -39,9 +37,7 @@ const OpenAIV1ChatCompletionSchema = z.object({
     }),
     {
       required_error:
-        "No `messages` found. Ensure you've set the correct completion endpoint.",
+        "No prompt found. Are you sending an Anthropic-formatted request to the OpenAI endpoint?",
-      invalid_type_error:
-        "Messages were not formatted correctly. Refer to the OpenAI Chat API documentation for more information.",
     }
   ),
   temperature: z.number().optional().default(1),
@@ -55,75 +51,30 @@ const OpenAIV1ChatCompletionSchema = z.object({
     .optional(),
   stream: z.boolean().optional().default(false),
   stop: z.union([z.string(), z.array(z.string())]).optional(),
-  max_tokens: z.coerce
+  max_tokens: z.coerce.number().optional(),
-    .number()
-    .int()
-    .nullish()
-    .default(16)
-    .transform((v) => Math.min(v ?? OPENAI_OUTPUT_MAX, OPENAI_OUTPUT_MAX)),
   frequency_penalty: z.number().optional().default(0),
   presence_penalty: z.number().optional().default(0),
   logit_bias: z.any().optional(),
   user: z.string().optional(),
 });
 
-const OpenAIV1TextCompletionSchema = z
-  .object({
-    model: z
-      .string()
-      .regex(
-        /^gpt-3.5-turbo-instruct/,
-        "Model must start with 'gpt-3.5-turbo-instruct'"
-      ),
-    prompt: z.string({
-      required_error:
-        "No `prompt` found. Ensure you've set the correct completion endpoint.",
-    }),
-    logprobs: z.number().int().nullish().default(null),
-    echo: z.boolean().optional().default(false),
-    best_of: z.literal(1).optional(),
-    stop: z.union([z.string(), z.array(z.string()).max(4)]).optional(),
-    suffix: z.string().optional(),
-  })
-  .merge(OpenAIV1ChatCompletionSchema.omit({ messages: true }));
-
-// https://developers.generativeai.google/api/rest/generativelanguage/models/generateText
-const PalmV1GenerateTextSchema = z.object({
-  model: z.string(),
-  prompt: z.object({ text: z.string() }),
-  temperature: z.number().optional(),
-  maxOutputTokens: z.coerce
-    .number()
-    .int()
-    .optional()
-    .default(16)
-    .transform((v) => Math.min(v, 1024)), // TODO: Add config
-  candidateCount: z.literal(1).optional(),
-  topP: z.number().optional(),
-  topK: z.number().optional(),
-  safetySettings: z.array(z.object({})).max(0).optional(),
-  stopSequences: z.array(z.string()).max(5).optional(),
-});
-
-const VALIDATORS: Record<APIFormat, z.ZodSchema<any>> = {
-  anthropic: AnthropicV1CompleteSchema,
-  openai: OpenAIV1ChatCompletionSchema,
-  "openai-text": OpenAIV1TextCompletionSchema,
-  "google-palm": PalmV1GenerateTextSchema,
-};
-
 /** Transforms an incoming request body to one that matches the target API. */
 export const transformOutboundPayload: RequestPreprocessor = async (req) => {
   const sameService = req.inboundApi === req.outboundApi;
-  const alreadyTransformed = req.retryCount > 0;
   const notTransformable = !isCompletionRequest(req);
 
-  if (alreadyTransformed || notTransformable) {
+  if (notTransformable) {
     return;
   }
 
   if (sameService) {
-    const result = VALIDATORS[req.inboundApi].safeParse(req.body);
+    // Just validate, don't transform.
+    const validator =
+      req.outboundApi === "openai"
+        ? OpenAIV1ChatCompletionSchema
+        : AnthropicV1CompleteSchema;
+    const result = validator.safeParse(req.body);
+
     if (!result.success) {
       req.log.error(
         { issues: result.error.issues, body: req.body },
@@ -131,22 +82,14 @@ export const transformOutboundPayload: RequestPreprocessor = async (req) => {
       );
       throw result.error;
     }
-    req.body = result.data;
+
+    validatePromptSize(req);
     return;
   }
 
   if (req.inboundApi === "openai" && req.outboundApi === "anthropic") {
-    req.body = openaiToAnthropic(req);
+    req.body = openaiToAnthropic(req.body, req);
-    return;
+    validatePromptSize(req);
-  }
-
-  if (req.inboundApi === "openai" && req.outboundApi === "google-palm") {
-    req.body = openaiToPalm(req);
-    return;
-  }
-
-  if (req.inboundApi === "openai" && req.outboundApi === "openai-text") {
-    req.body = openaiToOpenaiText(req);
     return;
   }
 
@@ -155,22 +98,46 @@ export const transformOutboundPayload: RequestPreprocessor = async (req) => {
   );
 };
 
-function openaiToAnthropic(req: Request) {
+function openaiToAnthropic(body: any, req: Request) {
-  const { body } = req;
   const result = OpenAIV1ChatCompletionSchema.safeParse(body);
   if (!result.success) {
-    req.log.warn(
+    req.log.error(
-      { issues: result.error.issues, body },
+      { issues: result.error.issues, body: req.body },
       "Invalid OpenAI-to-Anthropic request"
     );
     throw result.error;
   }
 
-  req.headers["anthropic-version"] = "2023-06-01";
+  // Anthropic has started versioning their API, indicated by an HTTP header
+  // `anthropic-version`. The new June 2023 version is not backwards compatible
+  // with our OpenAI-to-Anthropic transformations so we need to explicitly
+  // request the older version for now. 2023-01-01 will be removed in September.
+  // https://docs.anthropic.com/claude/reference/versioning
+  req.headers["anthropic-version"] = "2023-01-01";
 
   const { messages, ...rest } = result.data;
   const prompt = openAIMessagesToClaudePrompt(messages);
 
+  // No longer defaulting to `claude-v1.2` because it seems to be in the process
+  // of being deprecated. `claude-v1` is the new default.
+  // If you have keys that can still use `claude-v1.2`, you can set the
+  // CLAUDE_BIG_MODEL and CLAUDE_SMALL_MODEL environment variables in your .env
+  // file.
+
+  const CLAUDE_BIG = process.env.CLAUDE_BIG_MODEL || "claude-v1-100k";
+  const CLAUDE_SMALL = process.env.CLAUDE_SMALL_MODEL || "claude-v1";
+
+  const contextTokens = Number(req.promptTokens ?? 0) + Number(rest.max_tokens);
+  const model =
+    (contextTokens ?? 0) > CLAUDE_100K_TOKEN_THRESHOLD
+      ? CLAUDE_BIG
+      : CLAUDE_SMALL;
+
+  req.log.debug(
+    { contextTokens, model, CLAUDE_100K_TOKEN_THRESHOLD },
+    "Selected Claude model"
+  );
+
   let stops = rest.stop
     ? Array.isArray(rest.stop)
       ? rest.stop
@@ -185,90 +152,11 @@ function openaiToAnthropic(req: Request) {
   stops = [...new Set(stops)];
 
   return {
-    // Model may be overridden in `calculate-context-size.ts` to avoid having
+    ...rest,
-    // a circular dependency (`calculate-context-size.ts` needs an already-
+    model,
-    // transformed request body to count tokens, but this function would like
-    // to know the count to select a model).
-    model: process.env.CLAUDE_SMALL_MODEL || "claude-v1",
     prompt: prompt,
     max_tokens_to_sample: rest.max_tokens,
     stop_sequences: stops,
-    stream: rest.stream,
-    temperature: rest.temperature,
-    top_p: rest.top_p,
-  };
-}
-
-function openaiToOpenaiText(req: Request) {
-  const { body } = req;
-  const result = OpenAIV1ChatCompletionSchema.safeParse(body);
-  if (!result.success) {
-    req.log.warn(
-      { issues: result.error.issues, body },
-      "Invalid OpenAI-to-OpenAI-text request"
-    );
-    throw result.error;
-  }
-
-  const { messages, ...rest } = result.data;
-  const prompt = flattenOpenAiChatMessages(messages);
-
-  let stops = rest.stop
-    ? Array.isArray(rest.stop)
-      ? rest.stop
-      : [rest.stop]
-    : [];
-  stops.push("\n\nUser:");
-  stops = [...new Set(stops)];
-
-  const transformed = { ...rest, prompt: prompt, stop: stops };
-  return OpenAIV1TextCompletionSchema.parse(transformed);
-}
-
-function openaiToPalm(req: Request): z.infer<typeof PalmV1GenerateTextSchema> {
-  const { body } = req;
-  const result = OpenAIV1ChatCompletionSchema.safeParse({
-    ...body,
-    model: "gpt-3.5-turbo",
-  });
-  if (!result.success) {
-    req.log.warn(
-      { issues: result.error.issues, body },
-      "Invalid OpenAI-to-Palm request"
-    );
-    throw result.error;
-  }
-
-  const { messages, ...rest } = result.data;
-  const prompt = flattenOpenAiChatMessages(messages);
-
-  let stops = rest.stop
-    ? Array.isArray(rest.stop)
-      ? rest.stop
-      : [rest.stop]
-    : [];
-
-  stops.push("\n\nUser:");
-  stops = [...new Set(stops)];
-
-  z.array(z.string()).max(5).parse(stops);
-
-  return {
-    prompt: { text: prompt },
-    maxOutputTokens: rest.max_tokens,
-    stopSequences: stops,
-    model: "text-bison-001",
-    topP: rest.top_p,
-    temperature: rest.temperature,
-    safetySettings: [
-      { category: "HARM_CATEGORY_UNSPECIFIED", threshold: "BLOCK_NONE" },
-      { category: "HARM_CATEGORY_DEROGATORY", threshold: "BLOCK_NONE" },
-      { category: "HARM_CATEGORY_TOXICITY", threshold: "BLOCK_NONE" },
-      { category: "HARM_CATEGORY_VIOLENCE", threshold: "BLOCK_NONE" },
-      { category: "HARM_CATEGORY_SEXUAL", threshold: "BLOCK_NONE" },
-      { category: "HARM_CATEGORY_MEDICAL", threshold: "BLOCK_NONE" },
-      { category: "HARM_CATEGORY_DANGEROUS", threshold: "BLOCK_NONE" },
-    ],
   };
 }
 
@@ -294,39 +182,40 @@ export function openAIMessagesToClaudePrompt(messages: OpenAIPromptMessage[]) {
   );
 }
 
-function flattenOpenAiChatMessages(messages: OpenAIPromptMessage[]) {
+function validatePromptSize(req: Request) {
-  // Temporary to allow experimenting with prompt strategies
+  const promptTokens = req.promptTokens || 0;
-  const PROMPT_VERSION: number = 1;
+  const model = req.body.model;
-  switch (PROMPT_VERSION) {
+  let maxTokensForModel = 0;
-    case 1:
+
-      return (
+  if (model.match(/gpt-3.5/)) {
-        messages
+    maxTokensForModel = 4096;
-          .map((m) => {
+  } else if (model.match(/gpt-4/)) {
-            // Claude-style human/assistant turns
+    maxTokensForModel = 8192;
-            let role: string = m.role;
+  } else if (model.match(/gpt-4-32k/)) {
-            if (role === "assistant") {
+    maxTokensForModel = 32768;
-              role = "Assistant";
+  } else if (model.match(/claude-(?:instant-)?v1(?:\.\d)?(?:-100k)/)) {
-            } else if (role === "system") {
+    // Claude models don't throw an error if you exceed the token limit and
-              role = "System";
+    // instead just become extremely slow and give schizo results, so we will be
-            } else if (role === "user") {
+    // more conservative with the token limit for them.
-              role = "User";
+    maxTokensForModel = 100000 * 0.98;
-            }
+  } else if (model.match(/claude-(?:instant-)?v1(?:\.\d)?$/)) {
-            return `\n\n${role}: ${m.content}`;
+    maxTokensForModel = 9000 * 0.98;
-          })
+  } else {
-          .join("") + "\n\nAssistant:"
+    // I don't trust my regular expressions enough to throw an error here so
-      );
+    // we just log a warning and allow 100k tokens.
-    case 2:
+    req.log.warn({ model }, "Unknown model, using 100k token limit.");
-      return messages
+    maxTokensForModel = 100000;
-        .map((m) => {
-          // Claude without prefixes (except system) and no Assistant priming
-          let role: string = "";
-          if (role === "system") {
-            role = "System: ";
-          }
-          return `\n\n${role}${m.content}`;
-        })
-        .join("");
-    default:
-      throw new Error(`Unknown prompt version: ${PROMPT_VERSION}`);
   }
+
+  if (req.debug) {
+    req.debug.calculated_max_tokens = maxTokensForModel;
+  }
+
+  z.number()
+    .max(
+      maxTokensForModel,
+      `Prompt is too long for model ${model} (${promptTokens} tokens, max ${maxTokensForModel})`
+    )
+    .parse(promptTokens);
+  req.log.debug({ promptTokens, maxTokensForModel }, "Prompt size validated");
 }

src/proxy/middleware/request/validate-context-size.ts

@@ -1,99 +0,0 @@
-import { Request } from "express";
-import { z } from "zod";
-import { config } from "../../../config";
-import { assertNever } from "../../../shared/utils";
-import { RequestPreprocessor } from ".";
-
-const CLAUDE_MAX_CONTEXT = config.maxContextTokensAnthropic;
-const OPENAI_MAX_CONTEXT = config.maxContextTokensOpenAI;
-const BISON_MAX_CONTEXT = 8100;
-
-/**
- * Assigns `req.promptTokens` and `req.outputTokens` based on the request body
- * and outbound API format, which combined determine the size of the context.
- * If the context is too large, an error is thrown.
- * This preprocessor should run after any preprocessor that transforms the
- * request body.
- */
-export const validateContextSize: RequestPreprocessor = async (req) => {
-  assertRequestHasTokenCounts(req);
-  const promptTokens = req.promptTokens;
-  const outputTokens = req.outputTokens;
-  const contextTokens = promptTokens + outputTokens;
-  const model = req.body.model;
-
-  let proxyMax: number;
-  switch (req.outboundApi) {
-    case "openai":
-    case "openai-text":
-      proxyMax = OPENAI_MAX_CONTEXT;
-      break;
-    case "anthropic":
-      proxyMax = CLAUDE_MAX_CONTEXT;
-      break;
-    case "google-palm":
-      proxyMax = BISON_MAX_CONTEXT;
-      break;
-    default:
-      assertNever(req.outboundApi);
-  }
-  proxyMax ||= Number.MAX_SAFE_INTEGER;
-
-  let modelMax: number;
-  if (model.match(/gpt-3.5-turbo-16k/)) {
-    modelMax = 16384;
-  } else if (model.match(/gpt-3.5-turbo/)) {
-    modelMax = 4096;
-  } else if (model.match(/gpt-4-32k/)) {
-    modelMax = 32768;
-  } else if (model.match(/gpt-4/)) {
-    modelMax = 8192;
-  } else if (model.match(/^claude-(?:instant-)?v1(?:\.\d)?-100k/)) {
-    modelMax = 100000;
-  } else if (model.match(/^claude-(?:instant-)?v1(?:\.\d)?$/)) {
-    modelMax = 9000;
-  } else if (model.match(/^claude-2/)) {
-    modelMax = 100000;
-  } else if (model.match(/^text-bison-\d{3}$/)) {
-    modelMax = BISON_MAX_CONTEXT;
-  } else if (model.match(/^anthropic\.claude/)) {
-    // Not sure if AWS Claude has the same context limit as Anthropic Claude.
-    modelMax = 100000;
-  } else {
-    // Don't really want to throw here because I don't want to have to update
-    // this ASAP every time a new model is released.
-    req.log.warn({ model }, "Unknown model, using 100k token limit.");
-    modelMax = 100000;
-  }
-
-  const finalMax = Math.min(proxyMax, modelMax);
-  z.object({
-    tokens: z
-      .number()
-      .int()
-      .max(finalMax, {
-        message: `Your request exceeds the context size limit. (max: ${finalMax} tokens, requested: ${promptTokens} prompt + ${outputTokens} output = ${contextTokens} context tokens)`,
-      }),
-  }).parse({ tokens: contextTokens });
-
-  req.log.debug(
-    { promptTokens, outputTokens, contextTokens, modelMax, proxyMax },
-    "Prompt size validated"
-  );
-
-  req.debug.prompt_tokens = promptTokens;
-  req.debug.completion_tokens = outputTokens;
-  req.debug.max_model_tokens = modelMax;
-  req.debug.max_proxy_tokens = proxyMax;
-};
-
-function assertRequestHasTokenCounts(
-  req: Request
-): asserts req is Request & { promptTokens: number; outputTokens: number } {
-  z.object({
-    promptTokens: z.number().int().min(1),
-    outputTokens: z.number().int().min(1),
-  })
-    .nonstrict()
-    .parse({ promptTokens: req.promptTokens, outputTokens: req.outputTokens });
-}

src/proxy/middleware/response/handle-streamed-response.ts

@@ -1,16 +1,29 @@
-import { pipeline } from "stream";
+import { Request, Response } from "express";
-import { promisify } from "util";
+import * as http from "http";
-import {
+import { buildFakeSseMessage } from "../common";
-  buildFakeSse,
+import { RawResponseBodyHandler, decodeResponseBody } from ".";
-  copySseResponseHeaders,
-  initializeSseStream
-} from "../../../shared/streaming";
-import { decodeResponseBody, RawResponseBodyHandler } from ".";
-import { SSEStreamAdapter } from "./streaming/sse-stream-adapter";
-import { SSEMessageTransformer } from "./streaming/sse-message-transformer";
-import { EventAggregator } from "./streaming/event-aggregator";
 
-const pipelineAsync = promisify(pipeline);
+type OpenAiChatCompletionResponse = {
+  id: string;
+  object: string;
+  created: number;
+  model: string;
+  choices: {
+    message: { role: string; content: string };
+    finish_reason: string | null;
+    index: number;
+  }[];
+};
+
+type AnthropicCompletionResponse = {
+  completion: string;
+  stop_reason: string;
+  truncated: boolean;
+  stop: any;
+  model: string;
+  log_id: string;
+  exception: null;
+};
 
 /**
  * Consume the SSE stream and forward events to the client. Once the stream is
@@ -21,67 +34,260 @@ const pipelineAsync = promisify(pipeline);
  * in the event a streamed request results in a non-200 response, we need to
  * fall back to the non-streaming response handler so that the error handler
  * can inspect the error response.
+ *
+ * Currently most frontends don't support Anthropic streaming, so users can opt
+ * to send requests for Claude models via an endpoint that accepts OpenAI-
+ * compatible requests and translates the received Anthropic SSE events into
+ * OpenAI ones, essentially pretending to be an OpenAI streaming API.
  */
 export const handleStreamedResponse: RawResponseBodyHandler = async (
   proxyRes,
   req,
   res
 ) => {
-  const { hash } = req.key!;
+  // If these differ, the user is using the OpenAI-compatibile endpoint, so
+  // we need to translate the SSE events into OpenAI completion events for their
+  // frontend.
   if (!req.isStreaming) {
-    throw new Error("handleStreamedResponse called for non-streaming request.");
+    const err = new Error(
+      "handleStreamedResponse called for non-streaming request."
+    );
+    req.log.error({ stack: err.stack, api: req.inboundApi }, err.message);
+    throw err;
   }
 
-  if (proxyRes.statusCode! > 201) {
+  const key = req.key!;
-    req.isStreaming = false; // Forces non-streaming response handler to execute
+  if (proxyRes.statusCode !== 200) {
+    // Ensure we use the non-streaming middleware stack since we won't be
+    // getting any events.
+    req.isStreaming = false;
     req.log.warn(
-      { statusCode: proxyRes.statusCode, key: hash },
+      { statusCode: proxyRes.statusCode, key: key.hash },
       `Streaming request returned error status code. Falling back to non-streaming response handler.`
     );
     return decodeResponseBody(proxyRes, req, res);
   }
 
-  req.log.debug(
+  return new Promise((resolve, reject) => {
-    { headers: proxyRes.headers, key: hash },
+    req.log.info({ key: key.hash }, `Starting to proxy SSE stream.`);
-    `Starting to proxy SSE stream.`
-  );
 
-  // Users waiting in the queue already have a SSE connection open for the
+    // Queued streaming requests will already have a connection open and headers
-  // heartbeat, so we can't always send the stream headers.
+    // sent due to the heartbeat handler.  In that case we can just start
-  if (!res.headersSent) {
+    // streaming the response without sending headers.
-    copySseResponseHeaders(proxyRes, res);
+    if (!res.headersSent) {
-    initializeSseStream(res);
+      res.setHeader("Content-Type", "text/event-stream");
-  }
+      res.setHeader("Cache-Control", "no-cache");
+      res.setHeader("Connection", "keep-alive");
+      res.setHeader("X-Accel-Buffering", "no");
+      copyHeaders(proxyRes, res);
+      res.flushHeaders();
+    }
 
-  const prefersNativeEvents = req.inboundApi === req.outboundApi;
+    const originalEvents: string[] = [];
-  const contentType = proxyRes.headers["content-type"];
+    let partialMessage = "";
+    let lastPosition = 0;
 
-  const adapter = new SSEStreamAdapter({ contentType });
+    type ProxyResHandler<T extends unknown> = (...args: T[]) => void;
-  const aggregator = new EventAggregator({ format: req.outboundApi });
+    function withErrorHandling<T extends unknown>(fn: ProxyResHandler<T>) {
-  const transformer = new SSEMessageTransformer({
+      return (...args: T[]) => {
-    inputFormat: req.outboundApi, // outbound from the request's perspective
+        try {
-    inputApiVersion: String(req.headers["anthropic-version"]),
+          fn(...args);
-    logger: req.log,
+        } catch (error) {
-    requestId: String(req.id),
+          proxyRes.emit("error", error);
-    requestedModel: req.body.model,
+        }
-  })
+      };
-    .on("originalMessage", (msg: string) => {
+    }
-      if (prefersNativeEvents) res.write(msg);
+
-    })
+    proxyRes.on(
-    .on("data", (msg) => {
+      "data",
-      if (!prefersNativeEvents) res.write(`data: ${JSON.stringify(msg)}\n\n`);
+      withErrorHandling((chunk: Buffer) => {
-      aggregator.addEvent(msg);
+        // We may receive multiple (or partial) SSE messages in a single chunk,
+        // so we need to buffer and emit seperate stream events for full
+        // messages so we can parse/transform them properly.
+        const str = chunk.toString();
+
+        // Anthropic uses CRLF line endings (out-of-spec btw)
+        const fullMessages = (partialMessage + str).split(/\r?\n\r?\n/);
+        partialMessage = fullMessages.pop() || "";
+
+        for (const message of fullMessages) {
+          proxyRes.emit("full-sse-event", message);
+        }
+      })
+    );
+
+    proxyRes.on(
+      "full-sse-event",
+      withErrorHandling((data) => {
+        originalEvents.push(data);
+        const { event, position } = transformEvent({
+          data,
+          requestApi: req.inboundApi,
+          responseApi: req.outboundApi,
+          lastPosition,
+        });
+        lastPosition = position;
+        res.write(event + "\n\n");
+      })
+    );
+
+    proxyRes.on(
+      "end",
+      withErrorHandling(() => {
+        let finalBody = convertEventsToFinalResponse(originalEvents, req);
+        req.log.info({ key: key.hash }, `Finished proxying SSE stream.`);
+        res.end();
+        resolve(finalBody);
+      })
+    );
+
+    proxyRes.on("error", (err) => {
+      req.log.error({ error: err, key: key.hash }, `Mid-stream error.`);
+      const fakeErrorEvent = buildFakeSseMessage(
+        "mid-stream-error",
+        err.message,
+        req
+      );
+      res.write(`data: ${JSON.stringify(fakeErrorEvent)}\n\n`);
+      res.write("data: [DONE]\n\n");
+      res.end();
+      reject(err);
     });
-
+  });
-  try {
-    await pipelineAsync(proxyRes, adapter, transformer);
-    req.log.debug({ key: hash }, `Finished proxying SSE stream.`);
-    res.end();
-    return aggregator.getFinalResponse();
-  } catch (err) {
-    const errorEvent = buildFakeSse("stream-error", err.message, req);
-    res.write(`${errorEvent}data: [DONE]\n\n`);
-    res.end();
-    throw err;
-  }
 };
+
+/**
+ * Transforms SSE events from the given response API into events compatible with
+ * the API requested by the client.
+ */
+function transformEvent({
+  data,
+  requestApi,
+  responseApi,
+  lastPosition,
+}: {
+  data: string;
+  requestApi: string;
+  responseApi: string;
+  lastPosition: number;
+}) {
+  if (requestApi === responseApi) {
+    return { position: -1, event: data };
+  }
+
+  if (requestApi === "anthropic" && responseApi === "openai") {
+    throw new Error(`Anthropic -> OpenAI streaming not implemented.`);
+  }
+
+  // Anthropic sends the full completion so far with each event whereas OpenAI
+  // only sends the delta. To make the SSE events compatible, we remove
+  // everything before `lastPosition` from the completion.
+  if (!data.startsWith("data:")) {
+    return { position: lastPosition, event: data };
+  }
+
+  if (data.startsWith("data: [DONE]")) {
+    return { position: lastPosition, event: data };
+  }
+
+  const event = JSON.parse(data.slice("data: ".length));
+  const newEvent = {
+    id: "ant-" + event.log_id,
+    object: "chat.completion.chunk",
+    created: Date.now(),
+    model: event.model,
+    choices: [
+      {
+        index: 0,
+        delta: { content: event.completion?.slice(lastPosition) },
+        finish_reason: event.stop_reason,
+      },
+    ],
+  };
+  return {
+    position: event.completion.length,
+    event: `data: ${JSON.stringify(newEvent)}`,
+  };
+}
+
+/** Copy headers, excluding ones we're already setting for the SSE response. */
+function copyHeaders(proxyRes: http.IncomingMessage, res: Response) {
+  const toOmit = [
+    "content-length",
+    "content-encoding",
+    "transfer-encoding",
+    "content-type",
+    "connection",
+    "cache-control",
+  ];
+  for (const [key, value] of Object.entries(proxyRes.headers)) {
+    if (!toOmit.includes(key) && value) {
+      res.setHeader(key, value);
+    }
+  }
+}
+
+/**
+ * Converts the list of incremental SSE events into an object that resembles a
+ * full, non-streamed response from the API so that subsequent middleware can
+ * operate on it as if it were a normal response.
+ * Events are expected to be in the format they were received from the API.
+ */
+function convertEventsToFinalResponse(events: string[], req: Request) {
+  if (req.outboundApi === "openai") {
+    let response: OpenAiChatCompletionResponse = {
+      id: "",
+      object: "",
+      created: 0,
+      model: "",
+      choices: [],
+    };
+    response = events.reduce((acc, event, i) => {
+      if (!event.startsWith("data: ")) {
+        return acc;
+      }
+
+      if (event === "data: [DONE]") {
+        return acc;
+      }
+
+      const data = JSON.parse(event.slice("data: ".length));
+      if (i === 0) {
+        return {
+          id: data.id,
+          object: data.object,
+          created: data.created,
+          model: data.model,
+          choices: [
+            {
+              message: { role: data.choices[0].delta.role, content: "" },
+              index: 0,
+              finish_reason: null,
+            },
+          ],
+        };
+      }
+
+      if (data.choices[0].delta.content) {
+        acc.choices[0].message.content += data.choices[0].delta.content;
+      }
+      acc.choices[0].finish_reason = data.choices[0].finish_reason;
+      return acc;
+    }, response);
+    return response;
+  }
+  if (req.outboundApi === "anthropic") {
+    /*
+     * Full complete responses from Anthropic are conveniently just the same as
+     * the final SSE event before the "DONE" event, so we can reuse that
+     */
+    const lastEvent = events[events.length - 2].toString();
+    const data = JSON.parse(lastEvent.slice("data: ".length));
+    const response: AnthropicCompletionResponse = {
+      ...data,
+      log_id: req.id,
+    };
+    return response;
+  }
+  throw new Error("If you get this, something is fucked");
+}

src/proxy/middleware/response/index.ts

@@ -3,22 +3,12 @@ import { Request, Response } from "express";
 import * as http from "http";
 import util from "util";
 import zlib from "zlib";
+import { config } from "../../../config";
 import { logger } from "../../../logger";
+import { keyPool } from "../../../key-management";
 import { enqueue, trackWaitTime } from "../../queue";
-import { HttpError } from "../../../shared/errors";
+import { incrementPromptCount } from "../../auth/user-store";
-import { AnthropicKey, keyPool } from "../../../shared/key-management";
+import { isCompletionRequest, writeErrorResponse } from "../common";
-import { getOpenAIModelFamily } from "../../../shared/models";
-import { countTokens } from "../../../shared/tokenization";
-import {
-  incrementPromptCount,
-  incrementTokenCount,
-} from "../../../shared/users/user-store";
-import { assertNever } from "../../../shared/utils";
-import {
-  getCompletionFromBody,
-  isCompletionRequest,
-  writeErrorResponse,
-} from "../common";
 import { handleStreamedResponse } from "./handle-streamed-response";
 import { logPrompt } from "./log-prompt";
 
@@ -84,7 +74,7 @@ export const createOnProxyResHandler = (apiMiddleware: ProxyResMiddleware) => {
       ? handleStreamedResponse
       : decodeResponseBody;
 
-    let lastMiddleware = initialHandler.name;
+    let lastMiddlewareName = initialHandler.name;
 
     try {
       const body = await initialHandler(proxyRes, req, res);
@@ -94,18 +84,12 @@ export const createOnProxyResHandler = (apiMiddleware: ProxyResMiddleware) => {
       if (req.isStreaming) {
         // `handleStreamedResponse` writes to the response and ends it, so
         // we can only execute middleware that doesn't write to the response.
-        middlewareStack.push(
+        middlewareStack.push(trackRateLimit, incrementKeyUsage, logPrompt);
-          trackRateLimit,
-          countResponseTokens,
-          incrementUsage,
-          logPrompt
-        );
       } else {
         middlewareStack.push(
           trackRateLimit,
           handleUpstreamErrors,
-          countResponseTokens,
+          incrementKeyUsage,
-          incrementUsage,
           copyHttpHeaders,
           logPrompt,
           ...apiMiddleware
@@ -113,38 +97,37 @@ export const createOnProxyResHandler = (apiMiddleware: ProxyResMiddleware) => {
       }
 
       for (const middleware of middlewareStack) {
-        lastMiddleware = middleware.name;
+        lastMiddlewareName = middleware.name;
         await middleware(proxyRes, req, res, body);
       }
 
       trackWaitTime(req);
-    } catch (error) {
+    } catch (error: any) {
       // Hack: if the error is a retryable rate-limit error, the request has
       // been re-enqueued and we can just return without doing anything else.
       if (error instanceof RetryableError) {
         return;
       }
 
-      // Already logged and responded to the client by handleUpstreamErrors
+      const errorData = {
-      if (error instanceof HttpError) {
+        error: error.stack,
-        if (!res.writableEnded) res.end();
+        thrownBy: lastMiddlewareName,
-        return;
+        key: req.key?.hash,
-      }
+      };
-
+      const message = `Error while executing proxy response middleware: ${lastMiddlewareName} (${error.message})`;
-      const { stack, message } = error;
-      const info = { stack, lastMiddleware, key: req.key?.hash };
-      const description = `Error while executing proxy response middleware: ${lastMiddleware} (${message})`;
-
       if (res.headersSent) {
-        req.log.error(info, description);
+        req.log.error(errorData, message);
-        if (!res.writableEnded) res.end();
+        // This should have already been handled by the error handler, but
+        // just in case...
+        if (!res.writableEnded) {
+          res.end();
+        }
         return;
-      } else {
-        req.log.error(info, description);
-        res
-          .status(500)
-          .json({ error: "Internal server error", proxy_note: description });
       }
+      logger.error(errorData, message);
+      res
+        .status(500)
+        .json({ error: "Internal server error", proxy_note: message });
     }
   };
 };
@@ -175,7 +158,7 @@ export const decodeResponseBody: RawResponseBodyHandler = async (
     throw err;
   }
 
-  return new Promise<string>((resolve, reject) => {
+  const promise = new Promise<string>((resolve, reject) => {
     let chunks: Buffer[] = [];
     proxyRes.on("data", (chunk) => chunks.push(chunk));
     proxyRes.on("end", async () => {
@@ -205,27 +188,23 @@ export const decodeResponseBody: RawResponseBodyHandler = async (
         return resolve(body.toString());
       } catch (error: any) {
         const errorMessage = `Proxy received response with invalid JSON: ${error.message}`;
-        logger.warn({ error: error.stack, key: req.key?.hash }, errorMessage);
+        logger.warn({ error, key: req.key?.hash }, errorMessage);
         writeErrorResponse(req, res, 500, { error: errorMessage });
         return reject(errorMessage);
       }
     });
   });
+  return promise;
 };
 
-type ProxiedErrorPayload = {
+// TODO: This is too specific to OpenAI's error responses.
-  error?: Record<string, any>;
-  message?: string;
-  proxy_note?: string;
-};
-
 /**
  * Handles non-2xx responses from the upstream service.  If the proxied response
  * is an error, this will respond to the client with an error payload and throw
  * an error to stop the middleware stack.
  * On 429 errors, if request queueing is enabled, the request will be silently
  * re-enqueued.  Otherwise, the request will be rejected with an error payload.
- * @throws {HttpError} On HTTP error status code from upstream service
+ * @throws {Error} On HTTP error status code from upstream service
  */
 const handleUpstreamErrors: ProxyResHandlerWithBody = async (
   proxyRes,
@@ -239,19 +218,27 @@ const handleUpstreamErrors: ProxyResHandlerWithBody = async (
     return;
   }
 
-  let errorPayload: ProxiedErrorPayload;
+  let errorPayload: Record<string, any>;
-  const tryAgainMessage = keyPool.available(req.body?.model)
+  // Subtract 1 from available keys because if this message is being shown,
-    ? `There may be more keys available for this model; try again in a few seconds.`
+  // it's because the key is about to be disabled.
-    : "There are no more keys available for this model.";
+  const availableKeys = keyPool.available(req.outboundApi) - 1;
+  const tryAgainMessage = Boolean(availableKeys)
+    ? `There are ${availableKeys} more keys available; try your request again.`
+    : "There are no more keys available.";
 
   try {
-    assertJsonResponse(body);
+    if (typeof body === "object") {
-    errorPayload = body;
+      errorPayload = body;
-  } catch (parseError) {
+    } else {
-    // Likely Bad Gateway or Gateway Timeout from upstream's reverse proxy
+      throw new Error("Received unparsable error response from upstream.");
-    const hash = req.key?.hash;
+    }
+  } catch (parseError: any) {
     const statusMessage = proxyRes.statusMessage || "Unknown error";
-    logger.warn({ statusCode, statusMessage, key: hash }, parseError.message);
+    // Likely Bad Gateway or Gateway Timeout from reverse proxy/load balancer
+    logger.warn(
+      { statusCode, statusMessage, key: req.key?.hash },
+      parseError.message
+    );
 
     const errorObject = {
       statusCode,
@@ -260,105 +247,51 @@ const handleUpstreamErrors: ProxyResHandlerWithBody = async (
       proxy_note: `This is likely a temporary error with the upstream service.`,
     };
     writeErrorResponse(req, res, statusCode, errorObject);
-    throw new HttpError(statusCode, parseError.message);
+    throw new Error(parseError.message);
   }
 
-  const errorType =
-    errorPayload.error?.code ||
-    errorPayload.error?.type ||
-    getAwsErrorType(proxyRes.headers["x-amzn-errortype"]);
-
   logger.warn(
-    { statusCode, type: errorType, errorPayload, key: req.key?.hash },
+    {
+      statusCode,
+      type: errorPayload.error?.code,
+      errorPayload,
+      key: req.key?.hash,
+    },
     `Received error response from upstream. (${proxyRes.statusMessage})`
   );
 
-  const service = req.key!.service;
-  if (service === "aws") {
-    // Try to standardize the error format for AWS
-    errorPayload.error = { message: errorPayload.message, type: errorType };
-    delete errorPayload.message;
-  }
-
   if (statusCode === 400) {
-    // Bad request. For OpenAI, this is usually due to prompt length.
+    // Bad request (likely prompt is too long)
-    // For Anthropic, this is usually due to missing preamble.
+    if (req.outboundApi === "openai") {
-    switch (service) {
+      errorPayload.proxy_note = `Upstream service rejected the request as invalid. Your prompt may be too long for ${req.body?.model}.`;
-      case "openai":
+    } else if (req.outboundApi === "anthropic") {
-      case "google-palm":
+      maybeHandleMissingPreambleError(req, errorPayload);
-        errorPayload.proxy_note = `Upstream service rejected the request as invalid. Your prompt may be too long for ${req.body?.model}.`;
-        break;
-      case "anthropic":
-      case "aws":
-        maybeHandleMissingPreambleError(req, errorPayload);
-        break;
-      default:
-        assertNever(service);
     }
   } else if (statusCode === 401) {
     // Key is invalid or was revoked
-    keyPool.disable(req.key!, "revoked");
+    keyPool.disable(req.key!);
     errorPayload.proxy_note = `API key is invalid or revoked. ${tryAgainMessage}`;
-  } else if (statusCode === 403) {
-    // Amazon is the only service that returns 403.
-    switch (errorType) {
-      case "UnrecognizedClientException":
-        // Key is invalid.
-        keyPool.disable(req.key!, "revoked");
-        errorPayload.proxy_note = `API key is invalid or revoked. ${tryAgainMessage}`;
-        break;
-      case "AccessDeniedException":
-        req.log.error(
-          { key: req.key?.hash, model: req.body?.model },
-          "Disabling key due to AccessDeniedException when invoking model. If credentials are valid, check IAM permissions."
-        );
-        keyPool.disable(req.key!, "revoked");
-        errorPayload.proxy_note = `API key doesn't have access to the requested resource.`;
-        break;
-      default:
-        errorPayload.proxy_note = `Received 403 error. Key may be invalid.`;
-    }
   } else if (statusCode === 429) {
-    switch (service) {
+    // OpenAI uses this for a bunch of different rate-limiting scenarios.
-      case "openai":
+    if (req.outboundApi === "openai") {
-        handleOpenAIRateLimitError(req, tryAgainMessage, errorPayload);
+      handleOpenAIRateLimitError(req, tryAgainMessage, errorPayload);
-        break;
+    } else if (req.outboundApi === "anthropic") {
-      case "anthropic":
+      handleAnthropicRateLimitError(req, errorPayload);
-        handleAnthropicRateLimitError(req, errorPayload);
-        break;
-      case "aws":
-        handleAwsRateLimitError(req, errorPayload);
-        break;
-      case "google-palm":
-        throw new Error("Rate limit handling not implemented for PaLM");
-      default:
-        assertNever(service);
     }
   } else if (statusCode === 404) {
     // Most likely model not found
-    switch (service) {
+    if (req.outboundApi === "openai") {
-      case "openai":
+      // TODO: this probably doesn't handle GPT-4-32k variants properly if the
-        if (errorPayload.error?.code === "model_not_found") {
+      // proxy has keys for both the 8k and 32k context models at the same time.
-          const requestedModel = req.body.model;
+      if (errorPayload.error?.code === "model_not_found") {
-          const modelFamily = getOpenAIModelFamily(requestedModel);
+        if (req.key!.isGpt4) {
-          errorPayload.proxy_note = `The key assigned to your prompt does not support the requested model (${requestedModel}, family: ${modelFamily}).`;
+          errorPayload.proxy_note = `Assigned key isn't provisioned for the GPT-4 snapshot you requested. Try again to get a different key, or use Turbo.`;
-          req.log.error(
+        } else {
-            { key: req.key?.hash, model: requestedModel, modelFamily },
+          errorPayload.proxy_note = `No model was found for this key.`;
-            "Prompt was routed to a key that does not support the requested model."
-          );
         }
-        break;
+      }
-      case "anthropic":
+    } else if (req.outboundApi === "anthropic") {
-        errorPayload.proxy_note = `The requested Claude model might not exist, or the key might not be provisioned for it.`;
+      errorPayload.proxy_note = `The requested Claude model might not exist, or the key might not be provisioned for it.`;
-        break;
-      case "google-palm":
-        errorPayload.proxy_note = `The requested Google PaLM model might not exist, or the key might not be provisioned for it.`;
-        break;
-      case "aws":
-        errorPayload.proxy_note = `The requested AWS resource might not exist, or the key might not have access to it.`;
-        break;
-      default:
-        assertNever(service);
     }
   } else {
     errorPayload.proxy_note = `Unrecognized error from upstream service.`;
@@ -373,7 +306,7 @@ const handleUpstreamErrors: ProxyResHandlerWithBody = async (
   }
 
   writeErrorResponse(req, res, statusCode, errorPayload);
-  throw new HttpError(statusCode, errorPayload.error?.message);
+  throw new Error(errorPayload.error?.message);
 };
 
 /**
@@ -397,7 +330,7 @@ const handleUpstreamErrors: ProxyResHandlerWithBody = async (
  */
 function maybeHandleMissingPreambleError(
   req: Request,
-  errorPayload: ProxiedErrorPayload
+  errorPayload: Record<string, any>
 ) {
   if (
     errorPayload.error?.type === "invalid_request_error" &&
@@ -407,9 +340,12 @@ function maybeHandleMissingPreambleError(
       { key: req.key?.hash },
       "Request failed due to missing preamble. Key will be marked as such for subsequent requests."
     );
-    keyPool.update(req.key as AnthropicKey, { requiresPreamble: true });
+    keyPool.update(req.key!, { requiresPreamble: true });
-    reenqueueRequest(req);
+    if (config.queueMode !== "none") {
-    throw new RetryableError("Claude request re-enqueued to add preamble.");
+      reenqueueRequest(req);
+      throw new RetryableError("Claude request re-enqueued to add preamble.");
+    }
+    errorPayload.proxy_note = `This Claude key requires special prompt formatting. Try again; the proxy will reformat your prompt next time.`;
   } else {
     errorPayload.proxy_note = `Proxy received unrecognized error from Anthropic. Check the specific error for more information.`;
   }
@@ -417,117 +353,64 @@ function maybeHandleMissingPreambleError(
 
 function handleAnthropicRateLimitError(
   req: Request,
-  errorPayload: ProxiedErrorPayload
+  errorPayload: Record<string, any>
 ) {
   if (errorPayload.error?.type === "rate_limit_error") {
     keyPool.markRateLimited(req.key!);
-    reenqueueRequest(req);
+    if (config.queueMode !== "none") {
-    throw new RetryableError("Claude rate-limited request re-enqueued.");
+      reenqueueRequest(req);
+      throw new RetryableError("Claude rate-limited request re-enqueued.");
+    }
+    errorPayload.proxy_note = `There are too many in-flight requests for this key. Try again later.`;
   } else {
     errorPayload.proxy_note = `Unrecognized rate limit error from Anthropic. Key may be over quota.`;
   }
 }
 
-function handleAwsRateLimitError(
-  req: Request,
-  errorPayload: ProxiedErrorPayload
-) {
-  const errorType = errorPayload.error?.type;
-  switch (errorType) {
-    case "ThrottlingException":
-      keyPool.markRateLimited(req.key!);
-      reenqueueRequest(req);
-      throw new RetryableError("AWS rate-limited request re-enqueued.");
-    case "ModelNotReadyException":
-      errorPayload.proxy_note = `The requested model is overloaded. Try again in a few seconds.`;
-      break;
-    default:
-      errorPayload.proxy_note = `Unrecognized rate limit error from AWS. (${errorType})`;
-  }
-}
-
 function handleOpenAIRateLimitError(
   req: Request,
   tryAgainMessage: string,
-  errorPayload: ProxiedErrorPayload
+  errorPayload: Record<string, any>
 ): Record<string, any> {
   const type = errorPayload.error?.type;
-  switch (type) {
+  if (type === "insufficient_quota") {
-    case "insufficient_quota":
+    // Billing quota exceeded (key is dead, disable it)
-      // Billing quota exceeded (key is dead, disable it)
+    keyPool.disable(req.key!);
-      keyPool.disable(req.key!, "quota");
+    errorPayload.proxy_note = `Assigned key's quota has been exceeded. ${tryAgainMessage}`;
-      errorPayload.proxy_note = `Assigned key's quota has been exceeded. ${tryAgainMessage}`;
+  } else if (type === "access_terminated") {
-      break;
+    // Account banned (key is dead, disable it)
-    case "access_terminated":
+    keyPool.disable(req.key!);
-      // Account banned (key is dead, disable it)
+    errorPayload.proxy_note = `Assigned key has been banned by OpenAI for policy violations. ${tryAgainMessage}`;
-      keyPool.disable(req.key!, "revoked");
+  } else if (type === "billing_not_active") {
-      errorPayload.proxy_note = `Assigned key has been banned by OpenAI for policy violations. ${tryAgainMessage}`;
+    // Billing is not active (key is dead, disable it)
-      break;
+    keyPool.disable(req.key!);
-    case "billing_not_active":
+    errorPayload.proxy_note = `Assigned key was deactivated by OpenAI. ${tryAgainMessage}`;
-      // Key valid but account billing is delinquent
+  } else if (type === "requests" || type === "tokens") {
-      keyPool.disable(req.key!, "quota");
+    // Per-minute request or token rate limit is exceeded, which we can retry
-      errorPayload.proxy_note = `Assigned key has been disabled due to delinquent billing. ${tryAgainMessage}`;
+    keyPool.markRateLimited(req.key!);
-      break;
+    if (config.queueMode !== "none") {
-    case "requests":
-    case "tokens":
-      // Per-minute request or token rate limit is exceeded, which we can retry
-      keyPool.markRateLimited(req.key!);
       reenqueueRequest(req);
+      // This is confusing, but it will bubble up to the top-level response
+      // handler and cause the request to go back into the request queue.
       throw new RetryableError("Rate-limited request re-enqueued.");
-    default:
+    }
-      errorPayload.proxy_note = `This is likely a temporary error with OpenAI. Try again in a few seconds.`;
+    errorPayload.proxy_note = `Assigned key's '${type}' rate limit has been exceeded. Try again later.`;
-      break;
+  } else {
+    // OpenAI probably overloaded
+    errorPayload.proxy_note = `This is likely a temporary error with OpenAI. Try again in a few seconds.`;
   }
   return errorPayload;
 }
 
-const incrementUsage: ProxyResHandlerWithBody = async (_proxyRes, req) => {
+const incrementKeyUsage: ProxyResHandlerWithBody = async (_proxyRes, req) => {
   if (isCompletionRequest(req)) {
-    const model = req.body.model;
+    keyPool.incrementPrompt(req.key!);
-    const tokensUsed = req.promptTokens! + req.outputTokens!;
-    keyPool.incrementUsage(req.key!, model, tokensUsed);
     if (req.user) {
       incrementPromptCount(req.user.token);
-      incrementTokenCount(req.user.token, model, tokensUsed);
     }
   }
 };
 
-const countResponseTokens: ProxyResHandlerWithBody = async (
-  _proxyRes,
-  req,
-  _res,
-  body
-) => {
-  // This function is prone to breaking if the upstream API makes even minor
-  // changes to the response format, especially for SSE responses. If you're
-  // seeing errors in this function, check the reassembled response body from
-  // handleStreamedResponse to see if the upstream API has changed.
-  try {
-    assertJsonResponse(body);
-    const service = req.outboundApi;
-    const completion = getCompletionFromBody(req, body);
-    const tokens = await countTokens({ req, completion, service });
-
-    req.log.debug(
-      { service, tokens, prevOutputTokens: req.outputTokens },
-      `Counted tokens for completion`
-    );
-    if (req.debug) {
-      req.debug.completion_tokens = tokens;
-    }
-
-    req.outputTokens = tokens.token_count;
-  } catch (error) {
-    req.log.warn(
-      error,
-      "Error while counting completion tokens; assuming `max_output_tokens`"
-    );
-    // req.outputTokens will already be set to `max_output_tokens` from the
-    // prompt counting middleware, so we don't need to do anything here.
-  }
-};
-
 const trackRateLimit: ProxyResHandlerWithBody = async (proxyRes, req) => {
   keyPool.updateRateLimits(req.key!, proxyRes.headers);
 };
@@ -551,14 +434,3 @@ const copyHttpHeaders: ProxyResHandlerWithBody = async (
     res.setHeader(key, proxyRes.headers[key] as string);
   });
 };
-
-function getAwsErrorType(header: string | string[] | undefined) {
-  const val = String(header).match(/^(\w+):?/)?.[1];
-  return val || String(header);
-}
-
-function assertJsonResponse(body: any): asserts body is Record<string, any> {
-  if (typeof body !== "object") {
-    throw new Error("Expected response to be an object");
-  }
-}

src/proxy/middleware/response/log-prompt.ts

@@ -1,13 +1,10 @@
 import { Request } from "express";
 import { config } from "../../../config";
-import { logQueue } from "../../../shared/prompt-logging";
+import { AIService } from "../../../key-management";
-import {
+import { logQueue } from "../../../prompt-logging";
-  getCompletionFromBody,
+import { isCompletionRequest } from "../common";
-  getModelFromBody,
-  isCompletionRequest,
-} from "../common";
 import { ProxyResHandlerWithBody } from ".";
-import { assertNever } from "../../../shared/utils";
+import { logger } from "../../../logger";
 
 /** If prompt logging is enabled, enqueues the prompt for logging. */
 export const logPrompt: ProxyResHandlerWithBody = async (
@@ -29,15 +26,17 @@ export const logPrompt: ProxyResHandlerWithBody = async (
 
   const promptPayload = getPromptForRequest(req);
   const promptFlattened = flattenMessages(promptPayload);
-  const response = getCompletionFromBody(req, responseBody);
+  const response = getResponseForService({
-  const model = getModelFromBody(req, responseBody);
+    service: req.outboundApi,
+    body: responseBody,
+  });
 
   logQueue.enqueue({
     endpoint: req.inboundApi,
     promptRaw: JSON.stringify(promptPayload),
     promptFlattened,
-    model,
+    model: response.model, // may differ from the requested model
-    response,
+    response: response.completion,
   });
 };
 
@@ -50,17 +49,10 @@ const getPromptForRequest = (req: Request): string | OaiMessage[] => {
   // Since the prompt logger only runs after the request has been proxied, we
   // can assume the body has already been transformed to the target API's
   // format.
-  switch (req.outboundApi) {
+  if (req.outboundApi === "anthropic") {
-    case "openai":
+    return req.body.prompt;
-      return req.body.messages;
+  } else {
-    case "openai-text":
+    return req.body.messages;
-      return req.body.prompt;
-    case "anthropic":
-      return req.body.prompt;
-    case "google-palm":
-      return req.body.prompt.text;
-    default:
-      assertNever(req.outboundApi);
   }
 };
 
@@ -70,3 +62,17 @@ const flattenMessages = (messages: string | OaiMessage[]): string => {
   }
   return messages.map((m) => `${m.role}: ${m.content}`).join("\n");
 };
+
+const getResponseForService = ({
+  service,
+  body,
+}: {
+  service: AIService;
+  body: Record<string, any>;
+}): { completion: string; model: string } => {
+  if (service === "anthropic") {
+    return { completion: body.completion.trim(), model: body.model };
+  } else {
+    return { completion: body.choices[0].message.content, model: body.model };
+  }
+};

src/proxy/middleware/response/streaming/aggregators/anthropic.ts

@@ -1,48 +0,0 @@
-import { OpenAIChatCompletionStreamEvent } from "../index";
-
-export type AnthropicCompletionResponse = {
-  completion: string;
-  stop_reason: string;
-  truncated: boolean;
-  stop: any;
-  model: string;
-  log_id: string;
-  exception: null;
-};
-
-/**
- * Given a list of OpenAI chat completion events, compiles them into a single
- * finalized Anthropic completion response so that non-streaming middleware
- * can operate on it as if it were a blocking response.
- */
-export function mergeEventsForAnthropic(
-  events: OpenAIChatCompletionStreamEvent[]
-): AnthropicCompletionResponse {
-  let merged: AnthropicCompletionResponse = {
-    log_id: "",
-    exception: null,
-    model: "",
-    completion: "",
-    stop_reason: "",
-    truncated: false,
-    stop: null,
-  };
-  merged = events.reduce((acc, event, i) => {
-    // The first event will only contain role assignment and response metadata
-    if (i === 0) {
-      acc.log_id = event.id;
-      acc.model = event.model;
-      acc.completion = "";
-      acc.stop_reason = "";
-      return acc;
-    }
-
-    acc.stop_reason = event.choices[0].finish_reason ?? "";
-    if (event.choices[0].delta.content) {
-      acc.completion += event.choices[0].delta.content;
-    }
-
-    return acc;
-  }, merged);
-  return merged;
-}

src/proxy/middleware/response/streaming/aggregators/openai-chat.ts

@@ -1,58 +0,0 @@
-import { OpenAIChatCompletionStreamEvent } from "../index";
-
-export type OpenAiChatCompletionResponse = {
-  id: string;
-  object: string;
-  created: number;
-  model: string;
-  choices: {
-    message: { role: string; content: string };
-    finish_reason: string | null;
-    index: number;
-  }[];
-};
-
-/**
- * Given a list of OpenAI chat completion events, compiles them into a single
- * finalized OpenAI chat completion response so that non-streaming middleware
- * can operate on it as if it were a blocking response.
- */
-export function mergeEventsForOpenAIChat(
-  events: OpenAIChatCompletionStreamEvent[]
-): OpenAiChatCompletionResponse {
-  let merged: OpenAiChatCompletionResponse = {
-    id: "",
-    object: "",
-    created: 0,
-    model: "",
-    choices: [],
-  };
-  merged = events.reduce((acc, event, i) => {
-    // The first event will only contain role assignment and response metadata
-    if (i === 0) {
-      acc.id = event.id;
-      acc.object = event.object;
-      acc.created = event.created;
-      acc.model = event.model;
-      acc.choices = [
-        {
-          index: 0,
-          message: {
-            role: event.choices[0].delta.role ?? "assistant",
-            content: "",
-          },
-          finish_reason: null,
-        },
-      ];
-      return acc;
-    }
-
-    acc.choices[0].finish_reason = event.choices[0].finish_reason;
-    if (event.choices[0].delta.content) {
-      acc.choices[0].message.content += event.choices[0].delta.content;
-    }
-
-    return acc;
-  }, merged);
-  return merged;
-}

src/proxy/middleware/response/streaming/aggregators/openai-text.ts

@@ -1,57 +0,0 @@
-import { OpenAIChatCompletionStreamEvent } from "../index";
-
-export type OpenAiTextCompletionResponse = {
-  id: string;
-  object: string;
-  created: number;
-  model: string;
-  choices: {
-    text: string;
-    finish_reason: string | null;
-    index: number;
-    logprobs: null;
-  }[];
-};
-
-/**
- * Given a list of OpenAI chat completion events, compiles them into a single
- * finalized OpenAI text completion response so that non-streaming middleware
- * can operate on it as if it were a blocking response.
- */
-export function mergeEventsForOpenAIText(
-  events: OpenAIChatCompletionStreamEvent[]
-): OpenAiTextCompletionResponse {
-  let merged: OpenAiTextCompletionResponse = {
-    id: "",
-    object: "",
-    created: 0,
-    model: "",
-    choices: [],
-  };
-  merged = events.reduce((acc, event, i) => {
-    // The first event will only contain role assignment and response metadata
-    if (i === 0) {
-      acc.id = event.id;
-      acc.object = event.object;
-      acc.created = event.created;
-      acc.model = event.model;
-      acc.choices = [
-        {
-          text: "",
-          index: 0,
-          finish_reason: null,
-          logprobs: null,
-        },
-      ];
-      return acc;
-    }
-
-    acc.choices[0].finish_reason = event.choices[0].finish_reason;
-    if (event.choices[0].delta.content) {
-      acc.choices[0].text += event.choices[0].delta.content;
-    }
-
-    return acc;
-  }, merged);
-  return merged;
-}

src/proxy/middleware/response/streaming/event-aggregator.ts

@@ -1,41 +0,0 @@
-import { APIFormat } from "../../../../shared/key-management";
-import { assertNever } from "../../../../shared/utils";
-import {
-  mergeEventsForAnthropic,
-  mergeEventsForOpenAIChat,
-  mergeEventsForOpenAIText,
-  OpenAIChatCompletionStreamEvent,
-} from "./index";
-
-/**
- * Collects SSE events containing incremental chat completion responses and
- * compiles them into a single finalized response for downstream middleware.
- */
-export class EventAggregator {
-  private readonly format: APIFormat;
-  private readonly events: OpenAIChatCompletionStreamEvent[];
-
-  constructor({ format }: { format: APIFormat }) {
-    this.events = [];
-    this.format = format;
-  }
-
-  addEvent(event: OpenAIChatCompletionStreamEvent) {
-    this.events.push(event);
-  }
-
-  getFinalResponse() {
-    switch (this.format) {
-      case "openai":
-        return mergeEventsForOpenAIChat(this.events);
-      case "openai-text":
-        return mergeEventsForOpenAIText(this.events);
-      case "anthropic":
-        return mergeEventsForAnthropic(this.events);
-      case "google-palm":
-        throw new Error("Google PaLM API does not support streaming responses");
-      default:
-        assertNever(this.format);
-    }
-  }
-}

src/proxy/middleware/response/streaming/index.ts

@@ -1,30 +0,0 @@
-export type SSEResponseTransformArgs = {
-  data: string;
-  lastPosition: number;
-  index: number;
-  fallbackId: string;
-  fallbackModel: string;
-};
-
-export type OpenAIChatCompletionStreamEvent = {
-  id: string;
-  object: "chat.completion.chunk";
-  created: number;
-  model: string;
-  choices: {
-    index: number;
-    delta: { role?: string; content?: string };
-    finish_reason: string | null;
-  }[];
-}
-
-export type StreamingCompletionTransformer = (
-  params: SSEResponseTransformArgs
-) => { position: number; event?: OpenAIChatCompletionStreamEvent };
-
-export { openAITextToOpenAIChat } from "./transformers/openai-text-to-openai";
-export { anthropicV1ToOpenAI } from "./transformers/anthropic-v1-to-openai";
-export { anthropicV2ToOpenAI } from "./transformers/anthropic-v2-to-openai";
-export { mergeEventsForOpenAIChat } from "./aggregators/openai-chat";
-export { mergeEventsForOpenAIText } from "./aggregators/openai-text";
-export { mergeEventsForAnthropic } from "./aggregators/anthropic";

src/proxy/middleware/response/streaming/parse-sse.ts

@@ -1,29 +0,0 @@
-export type ServerSentEvent = { id?: string; type?: string; data: string };
-
-/** Given a string of SSE data, parse it into a `ServerSentEvent` object. */
-export function parseEvent(event: string) {
-  const buffer: ServerSentEvent = { data: "" };
-  return event.split(/\r?\n/).reduce(parseLine, buffer)
-}
-
-function parseLine(event: ServerSentEvent, line: string) {
-  const separator = line.indexOf(":");
-  const field = separator === -1 ? line : line.slice(0,separator);
-  const value = separator === -1 ? "" : line.slice(separator + 1);
-
-  switch (field) {
-    case 'id':
-      event.id = value.trim()
-      break
-    case 'event':
-      event.type = value.trim()
-      break
-    case 'data':
-      event.data += value.trimStart()
-      break
-    default:
-      break
-  }
-
-  return event
-}

src/proxy/middleware/response/streaming/sse-message-transformer.ts

@@ -1,123 +0,0 @@
-import { Transform, TransformOptions } from "stream";
-import { logger } from "../../../../logger";
-import { APIFormat } from "../../../../shared/key-management";
-import { assertNever } from "../../../../shared/utils";
-import {
-  anthropicV1ToOpenAI,
-  anthropicV2ToOpenAI,
-  OpenAIChatCompletionStreamEvent,
-  openAITextToOpenAIChat,
-  StreamingCompletionTransformer,
-} from "./index";
-import { passthroughToOpenAI } from "./transformers/passthrough-to-openai";
-
-const genlog = logger.child({ module: "sse-transformer" });
-
-type SSEMessageTransformerOptions = TransformOptions & {
-  requestedModel: string;
-  requestId: string;
-  inputFormat: APIFormat;
-  inputApiVersion?: string;
-  logger?: typeof logger;
-};
-
-/**
- * Transforms SSE messages from one API format to OpenAI chat.completion.chunks.
- * Emits the original string SSE message as an "originalMessage" event.
- */
-export class SSEMessageTransformer extends Transform {
-  private lastPosition: number;
-  private msgCount: number;
-  private readonly transformFn: StreamingCompletionTransformer;
-  private readonly log;
-  private readonly fallbackId: string;
-  private readonly fallbackModel: string;
-
-  constructor(options: SSEMessageTransformerOptions) {
-    super({ ...options, readableObjectMode: true });
-    this.log = options.logger?.child({ module: "sse-transformer" }) ?? genlog;
-    this.lastPosition = 0;
-    this.msgCount = 0;
-    this.transformFn = getTransformer(
-      options.inputFormat,
-      options.inputApiVersion
-    );
-    this.fallbackId = options.requestId;
-    this.fallbackModel = options.requestedModel;
-    this.log.debug(
-      {
-        fn: this.transformFn.name,
-        format: options.inputFormat,
-        version: options.inputApiVersion,
-      },
-      "Selected SSE transformer"
-    );
-  }
-
-  _transform(chunk: Buffer, _encoding: BufferEncoding, callback: Function) {
-    try {
-      const originalMessage = chunk.toString();
-      const { event: transformedMessage, position: newPosition } =
-        this.transformFn({
-          data: originalMessage,
-          lastPosition: this.lastPosition,
-          index: this.msgCount++,
-          fallbackId: this.fallbackId,
-          fallbackModel: this.fallbackModel,
-        });
-      this.lastPosition = newPosition;
-
-      this.emit("originalMessage", originalMessage);
-
-      // Some events may not be transformed, e.g. ping events
-      if (!transformedMessage) return callback();
-
-      if (this.msgCount === 1) {
-        this.push(createInitialMessage(transformedMessage));
-      }
-      this.push(transformedMessage);
-      callback();
-    } catch (err) {
-      this.log.error(err, "Error transforming SSE message");
-      callback(err);
-    }
-  }
-}
-
-function getTransformer(
-  responseApi: APIFormat,
-  version?: string
-): StreamingCompletionTransformer {
-  switch (responseApi) {
-    case "openai":
-      return passthroughToOpenAI;
-    case "openai-text":
-      return openAITextToOpenAIChat;
-    case "anthropic":
-      return version === "2023-01-01"
-        ? anthropicV1ToOpenAI
-        : anthropicV2ToOpenAI;
-    case "google-palm":
-      throw new Error("Google PaLM does not support streaming responses");
-    default:
-      assertNever(responseApi);
-  }
-}
-
-/**
- * OpenAI streaming chat completions start with an event that contains only the
- * metadata and role (always 'assistant') for the response.  To simulate this
- * for APIs where the first event contains actual content, we create a fake
- * initial event with no content but correct metadata.
- */
-function createInitialMessage(
-  event: OpenAIChatCompletionStreamEvent
-): OpenAIChatCompletionStreamEvent {
-  return {
-    ...event,
-    choices: event.choices.map((choice) => ({
-      ...choice,
-      delta: { role: "assistant", content: "" },
-    })),
-  };
-}

src/proxy/middleware/response/streaming/sse-stream-adapter.ts

@@ -1,97 +0,0 @@
-import { Transform, TransformOptions } from "stream";
-// @ts-ignore
-import { Parser } from "lifion-aws-event-stream";
-import { logger } from "../../../../logger";
-
-const log = logger.child({ module: "sse-stream-adapter" });
-
-type SSEStreamAdapterOptions = TransformOptions & { contentType?: string };
-type AwsEventStreamMessage = {
-  headers: { ":message-type": "event" | "exception" };
-  payload: { message?: string /** base64 encoded */; bytes?: string };
-};
-
-/**
- * Receives either text chunks or AWS binary event stream chunks and emits
- * full SSE events.
- */
-export class SSEStreamAdapter extends Transform {
-  private readonly isAwsStream;
-  private parser = new Parser();
-  private partialMessage = "";
-
-  constructor(options?: SSEStreamAdapterOptions) {
-    super(options);
-    this.isAwsStream =
-      options?.contentType === "application/vnd.amazon.eventstream";
-
-    this.parser.on("data", (data: AwsEventStreamMessage) => {
-      const message = this.processAwsEvent(data);
-      if (message) {
-        this.push(Buffer.from(message + "\n\n"), "utf8");
-      }
-    });
-  }
-
-  protected processAwsEvent(event: AwsEventStreamMessage): string | null {
-    const { payload, headers } = event;
-    if (headers[":message-type"] === "exception" || !payload.bytes) {
-      log.error(
-        { event: JSON.stringify(event) },
-        "Received bad streaming event from AWS"
-      );
-      const message = JSON.stringify(event);
-      return getFakeErrorCompletion("proxy AWS error", message);
-    } else {
-      const { bytes } = payload;
-      // technically this is a transformation but we don't really distinguish
-      // between aws claude and anthropic claude at the APIFormat level, so
-      // these will short circuit the message transformer
-      return [
-        "event: completion",
-        `data: ${Buffer.from(bytes, "base64").toString("utf8")}`,
-      ].join("\n");
-    }
-  }
-
-  _transform(chunk: Buffer, _encoding: BufferEncoding, callback: Function) {
-    try {
-      if (this.isAwsStream) {
-        this.parser.write(chunk);
-      } else {
-        // We may receive multiple (or partial) SSE messages in a single chunk,
-        // so we need to buffer and emit separate stream events for full
-        // messages so we can parse/transform them properly.
-        const str = chunk.toString("utf8");
-
-        const fullMessages = (this.partialMessage + str).split(/\r?\n\r?\n/);
-        this.partialMessage = fullMessages.pop() || "";
-
-        for (const message of fullMessages) {
-          // Mixing line endings will break some clients and our request queue
-          // will have already sent \n for heartbeats, so we need to normalize
-          // to \n.
-          this.push(message.replace(/\r\n/g, "\n") + "\n\n");
-        }
-      }
-      callback();
-    } catch (error) {
-      this.emit("error", error);
-      callback(error);
-    }
-  }
-}
-
-function getFakeErrorCompletion(type: string, message: string) {
-  const content = `\`\`\`\n[${type}: ${message}]\n\`\`\`\n`;
-  const fakeEvent = JSON.stringify({
-    log_id: "aws-proxy-sse-message",
-    stop_reason: type,
-    completion:
-      "\nProxy encountered an error during streaming response.\n" + content,
-    truncated: false,
-    stop: null,
-    model: "",
-  });
-  return ["event: completion", `data: ${fakeEvent}\n\n`].join("\n");
-}

src/proxy/middleware/response/streaming/transformers/anthropic-v1-to-openai.ts

@@ -1,67 +0,0 @@
-import { StreamingCompletionTransformer } from "../index";
-import { parseEvent, ServerSentEvent } from "../parse-sse";
-import { logger } from "../../../../../logger";
-
-const log = logger.child({
-  module: "sse-transformer",
-  transformer: "anthropic-v1-to-openai",
-});
-
-type AnthropicV1StreamEvent = {
-  log_id?: string;
-  model?: string;
-  completion: string;
-  stop_reason: string;
-};
-
-/**
- * Transforms an incoming Anthropic SSE (2023-01-01 API) to an equivalent
- * OpenAI chat.completion.chunk SSE.
- */
-export const anthropicV1ToOpenAI: StreamingCompletionTransformer = (params) => {
-  const { data, lastPosition } = params;
-
-  const rawEvent = parseEvent(data);
-  if (!rawEvent.data || rawEvent.data === "[DONE]") {
-    return { position: lastPosition };
-  }
-
-  const completionEvent = asCompletion(rawEvent);
-  if (!completionEvent) {
-    return { position: lastPosition };
-  }
-
-  // Anthropic sends the full completion so far with each event whereas OpenAI
-  // only sends the delta. To make the SSE events compatible, we remove
-  // everything before `lastPosition` from the completion.
-  const newEvent = {
-    id: "ant-" + (completionEvent.log_id ?? params.fallbackId),
-    object: "chat.completion.chunk" as const,
-    created: Date.now(),
-    model: completionEvent.model ?? params.fallbackModel,
-    choices: [
-      {
-        index: 0,
-        delta: { content: completionEvent.completion?.slice(lastPosition) },
-        finish_reason: completionEvent.stop_reason,
-      },
-    ],
-  };
-
-  return { position: completionEvent.completion.length, event: newEvent };
-};
-
-function asCompletion(event: ServerSentEvent): AnthropicV1StreamEvent | null {
-  try {
-    const parsed = JSON.parse(event.data);
-    if (parsed.completion !== undefined && parsed.stop_reason !== undefined) {
-      return parsed;
-    } else {
-      // noinspection ExceptionCaughtLocallyJS
-      throw new Error("Missing required fields");
-    }
-  } catch (error) {
-    log.warn({ error: error.stack, event }, "Received invalid event");
-  }
-  return null;
-}

src/proxy/middleware/response/streaming/transformers/anthropic-v2-to-openai.ts

@@ -1,66 +0,0 @@
-import { StreamingCompletionTransformer } from "../index";
-import { parseEvent, ServerSentEvent } from "../parse-sse";
-import { logger } from "../../../../../logger";
-
-const log = logger.child({
-  module: "sse-transformer",
-  transformer: "anthropic-v2-to-openai",
-});
-
-type AnthropicV2StreamEvent = {
-  log_id?: string;
-  model?: string;
-  completion: string;
-  stop_reason: string;
-};
-
-/**
- * Transforms an incoming Anthropic SSE (2023-06-01 API) to an equivalent
- * OpenAI chat.completion.chunk SSE.
- */
-export const anthropicV2ToOpenAI: StreamingCompletionTransformer = (params) => {
-  const { data } = params;
-
-  const rawEvent = parseEvent(data);
-  if (!rawEvent.data || rawEvent.data === "[DONE]") {
-    return { position: -1 };
-  }
-
-  const completionEvent = asCompletion(rawEvent);
-  if (!completionEvent) {
-    return { position: -1 };
-  }
-
-  const newEvent = {
-    id: "ant-" + (completionEvent.log_id ?? params.fallbackId),
-    object: "chat.completion.chunk" as const,
-    created: Date.now(),
-    model: completionEvent.model ?? params.fallbackModel,
-    choices: [
-      {
-        index: 0,
-        delta: { content: completionEvent.completion },
-        finish_reason: completionEvent.stop_reason,
-      },
-    ],
-  };
-
-  return { position: completionEvent.completion.length, event: newEvent };
-};
-
-function asCompletion(event: ServerSentEvent): AnthropicV2StreamEvent | null {
-  if (event.type === "ping") return null;
-
-  try {
-    const parsed = JSON.parse(event.data);
-    if (parsed.completion !== undefined && parsed.stop_reason !== undefined) {
-      return parsed;
-    } else {
-      // noinspection ExceptionCaughtLocallyJS
-      throw new Error("Missing required fields");
-    }
-  } catch (error) {
-    log.warn({ error: error.stack, event }, "Received invalid event");
-  }
-  return null;
-}

src/proxy/middleware/response/streaming/transformers/openai-text-to-openai.ts

@@ -1,68 +0,0 @@
-import { SSEResponseTransformArgs } from "../index";
-import { parseEvent, ServerSentEvent } from "../parse-sse";
-import { logger } from "../../../../../logger";
-
-const log = logger.child({
-  module: "sse-transformer",
-  transformer: "openai-text-to-openai",
-});
-
-type OpenAITextCompletionStreamEvent = {
-  id: string;
-  object: "text_completion";
-  created: number;
-  choices: {
-    text: string;
-    index: number;
-    logprobs: null;
-    finish_reason: string | null;
-  }[];
-  model: string;
-};
-
-export const openAITextToOpenAIChat = (params: SSEResponseTransformArgs) => {
-  const { data } = params;
-
-  const rawEvent = parseEvent(data);
-  if (!rawEvent.data || rawEvent.data === "[DONE]") {
-    return { position: -1 };
-  }
-
-  const completionEvent = asCompletion(rawEvent);
-  if (!completionEvent) {
-    return { position: -1 };
-  }
-
-  const newEvent = {
-    id: completionEvent.id,
-    object: "chat.completion.chunk" as const,
-    created: completionEvent.created,
-    model: completionEvent.model,
-    choices: [
-      {
-        index: completionEvent.choices[0].index,
-        delta: { content: completionEvent.choices[0].text },
-        finish_reason: completionEvent.choices[0].finish_reason,
-      },
-    ],
-  };
-
-  return { position: -1, event: newEvent };
-};
-
-function asCompletion(
-  event: ServerSentEvent
-): OpenAITextCompletionStreamEvent | null {
-  try {
-    const parsed = JSON.parse(event.data);
-    if (Array.isArray(parsed.choices) && parsed.choices[0].text !== undefined) {
-      return parsed;
-    } else {
-      // noinspection ExceptionCaughtLocallyJS
-      throw new Error("Missing required fields");
-    }
-  } catch (error) {
-    log.warn({ error: error.stack, event }, "Received invalid data event");
-  }
-  return null;
-}

src/proxy/middleware/response/streaming/transformers/passthrough-to-openai.ts

@@ -1,38 +0,0 @@
-import {
-  OpenAIChatCompletionStreamEvent,
-  SSEResponseTransformArgs,
-} from "../index";
-import { parseEvent, ServerSentEvent } from "../parse-sse";
-import { logger } from "../../../../../logger";
-
-const log = logger.child({
-  module: "sse-transformer",
-  transformer: "openai-to-openai",
-});
-
-export const passthroughToOpenAI = (params: SSEResponseTransformArgs) => {
-  const { data } = params;
-
-  const rawEvent = parseEvent(data);
-  if (!rawEvent.data || rawEvent.data === "[DONE]") {
-    return { position: -1 };
-  }
-
-  const completionEvent = asCompletion(rawEvent);
-  if (!completionEvent) {
-    return { position: -1 };
-  }
-
-  return { position: -1, event: completionEvent };
-};
-
-function asCompletion(
-  event: ServerSentEvent
-): OpenAIChatCompletionStreamEvent | null {
-  try {
-    return JSON.parse(event.data);
-  } catch (error) {
-    log.warn({ error: error.stack, event }, "Received invalid event");
-  }
-  return null;
-}

src/proxy/openai.ts

@@ -1,30 +1,21 @@
-import { RequestHandler, Router } from "express";
+import { RequestHandler, Request, Router } from "express";
+import * as http from "http";
 import { createProxyMiddleware } from "http-proxy-middleware";
 import { config } from "../config";
-import { keyPool } from "../shared/key-management";
+import { keyPool } from "../key-management";
-import {
-  ModelFamily,
-  OpenAIModelFamily,
-  getOpenAIModelFamily,
-} from "../shared/models";
 import { logger } from "../logger";
 import { createQueueMiddleware } from "./queue";
 import { ipLimiter } from "./rate-limit";
 import { handleProxyError } from "./middleware/common";
 import {
-  RequestPreprocessor,
   addKey,
-  addKeyForEmbeddingsRequest,
-  applyQuotaLimits,
   blockZoomerOrigins,
-  createEmbeddingsPreprocessorMiddleware,
   createPreprocessorMiddleware,
   finalizeBody,
-  forceModel,
   languageFilter,
   limitCompletions,
-  stripHeaders,
+  limitOutputTokens,
-  createOnProxyReqHandler,
+  removeOriginHeaders,
 } from "./middleware/request";
 import {
   createOnProxyResHandler,
@@ -40,34 +31,25 @@ function getModelsResponse() {
   }
 
   // https://platform.openai.com/docs/models/overview
-  const knownModels = [
+  const gptVariants = [
     "gpt-4",
     "gpt-4-0613",
-    "gpt-4-0314", // EOL 2024-06-13
+    "gpt-4-0314", // EOL 2023-09-13
     "gpt-4-32k",
     "gpt-4-32k-0613",
-    "gpt-4-32k-0314", // EOL 2024-06-13
+    "gpt-4-32k-0314", // EOL 2023-09-13
     "gpt-3.5-turbo",
-    "gpt-3.5-turbo-0301", // EOL 2024-06-13
+    "gpt-3.5-turbo-0301", // EOL 2023-09-13
     "gpt-3.5-turbo-0613",
     "gpt-3.5-turbo-16k",
     "gpt-3.5-turbo-16k-0613",
-    "gpt-3.5-turbo-instruct",
-    "gpt-3.5-turbo-instruct-0914",
-    "text-embedding-ada-002",
   ];
 
-  let available = new Set<OpenAIModelFamily>();
+  const gpt4Available = keyPool.list().filter((key) => {
-  for (const key of keyPool.list()) {
+    return key.service === "openai" && !key.isDisabled && key.isGpt4;
-    if (key.isDisabled || key.service !== "openai") continue;
+  }).length;
-    key.modelFamilies.forEach((family) =>
-      available.add(family as OpenAIModelFamily)
-    );
-  }
-  const allowed = new Set<ModelFamily>(config.allowedModelFamilies);
-  available = new Set([...available].filter((x) => allowed.has(x)));
 
-  const models = knownModels
+  const models = gptVariants
     .map((id) => ({
       id,
       object: "model",
@@ -86,7 +68,12 @@ function getModelsResponse() {
       root: id,
       parent: null,
     }))
-    .filter((model) => available.has(getOpenAIModelFamily(model.id)));
+    .filter((model) => {
+      if (model.id.startsWith("gpt-4")) {
+        return gpt4Available > 0;
+      }
+      return true;
+    });
 
   modelsCache = { object: "list", data: models };
   modelsCacheTime = new Date().getTime();
@@ -98,23 +85,29 @@ const handleModelRequest: RequestHandler = (_req, res) => {
   res.status(200).json(getModelsResponse());
 };
 
-/** Handles some turbo-instruct special cases. */
+const rewriteRequest = (
-const rewriteForTurboInstruct: RequestPreprocessor = (req) => {
+  proxyReq: http.ClientRequest,
-  // /v1/turbo-instruct/v1/chat/completions accepts either prompt or messages.
+  req: Request,
-  // Depending on whichever is provided, we need to set the inbound format so
+  res: http.ServerResponse
-  // it is transformed correctly later.
+) => {
-  if (req.body.prompt && !req.body.messages) {
+  const rewriterPipeline = [
-    req.inboundApi = "openai-text";
+    addKey,
-  } else if (req.body.messages && !req.body.prompt) {
+    languageFilter,
-    req.inboundApi = "openai";
+    limitOutputTokens,
-    // Set model for user since they're using a client which is not aware of
+    limitCompletions,
-    // turbo-instruct.
+    blockZoomerOrigins,
-    req.body.model = "gpt-3.5-turbo-instruct";
+    removeOriginHeaders,
-  } else {
+    finalizeBody,
-    throw new Error("`prompt` OR `messages` must be provided");
+  ];
-  }
 
-  req.url = "/v1/completions";
+  try {
+    for (const rewriter of rewriterPipeline) {
+      rewriter(proxyReq, req, res, {});
+    }
+  } catch (error) {
+    req.log.error(error, "Error while executing proxy rewriter");
+    proxyReq.destroy(error as Error);
+  }
 };
 
 const openaiResponseHandler: ProxyResHandlerWithBody = async (
@@ -132,11 +125,6 @@ const openaiResponseHandler: ProxyResHandlerWithBody = async (
     body.proxy_note = `Prompts are logged on this proxy instance. See ${host} for more information.`;
   }
 
-  if (req.outboundApi === "openai-text" && req.inboundApi === "openai") {
-    req.log.info("Transforming Turbo-Instruct response to Chat format");
-    body = transformTurboInstructResponse(body);
-  }
-
   // TODO: Remove once tokenization is stable
   if (req.debug) {
     body.proxy_tokenizer_debug_info = req.debug;
@@ -145,104 +133,47 @@ const openaiResponseHandler: ProxyResHandlerWithBody = async (
   res.status(200).json(body);
 };
 
-/** Only used for non-streaming responses. */
-function transformTurboInstructResponse(
-  turboInstructBody: Record<string, any>
-): Record<string, any> {
-  const transformed = { ...turboInstructBody };
-  transformed.choices = [
-    {
-      ...turboInstructBody.choices[0],
-      message: {
-        role: "assistant",
-        content: turboInstructBody.choices[0].text.trim(),
-      },
-    },
-  ];
-  delete transformed.choices[0].text;
-  return transformed;
-}
-
 const openaiProxy = createQueueMiddleware(
   createProxyMiddleware({
     target: "https://api.openai.com",
     changeOrigin: true,
-    selfHandleResponse: true,
-    logger,
     on: {
-      proxyReq: createOnProxyReqHandler({
+      proxyReq: rewriteRequest,
-        pipeline: [
-          applyQuotaLimits,
-          addKey,
-          languageFilter,
-          limitCompletions,
-          blockZoomerOrigins,
-          stripHeaders,
-          finalizeBody,
-        ],
-      }),
       proxyRes: createOnProxyResHandler([openaiResponseHandler]),
       error: handleProxyError,
     },
+    selfHandleResponse: true,
+    logger,
   })
 );
 
-const openaiEmbeddingsProxy = createProxyMiddleware({
-  target: "https://api.openai.com",
-  changeOrigin: true,
-  selfHandleResponse: false,
-  logger,
-  on: {
-    proxyReq: createOnProxyReqHandler({
-      pipeline: [addKeyForEmbeddingsRequest, stripHeaders, finalizeBody],
-    }),
-    error: handleProxyError,
-  },
-});
-
 const openaiRouter = Router();
+// Fix paths because clients don't consistently use the /v1 prefix.
+openaiRouter.use((req, _res, next) => {
+  if (!req.path.startsWith("/v1/")) {
+    req.url = `/v1${req.url}`;
+  }
+  next();
+});
 openaiRouter.get("/v1/models", handleModelRequest);
-// Native text completion endpoint, only for turbo-instruct.
-openaiRouter.post(
-  "/v1/completions",
-  ipLimiter,
-  createPreprocessorMiddleware({
-    inApi: "openai-text",
-    outApi: "openai-text",
-    service: "openai",
-  }),
-  openaiProxy
-);
-// turbo-instruct compatibility endpoint, accepts either prompt or messages
-openaiRouter.post(
-  /\/v1\/turbo-instruct\/(v1\/)?chat\/completions/,
-  ipLimiter,
-  createPreprocessorMiddleware(
-    { inApi: "openai", outApi: "openai-text", service: "openai" },
-    {
-      beforeTransform: [rewriteForTurboInstruct],
-      afterTransform: [forceModel("gpt-3.5-turbo-instruct")],
-    }
-  ),
-  openaiProxy
-);
-// General chat completion endpoint. Turbo-instruct is not supported here.
 openaiRouter.post(
   "/v1/chat/completions",
   ipLimiter,
-  createPreprocessorMiddleware({
+  createPreprocessorMiddleware({ inApi: "openai", outApi: "openai" }),
-    inApi: "openai",
-    outApi: "openai",
-    service: "openai",
-  }),
   openaiProxy
 );
-// Embeddings endpoint.
+// Redirect browser requests to the homepage.
-openaiRouter.post(
+openaiRouter.get("*", (req, res, next) => {
-  "/v1/embeddings",
+  const isBrowser = req.headers["user-agent"]?.includes("Mozilla");
-  ipLimiter,
+  if (isBrowser) {
-  createEmbeddingsPreprocessorMiddleware(),
+    res.redirect("/");
-  openaiEmbeddingsProxy
+  } else {
-);
+    next();
+  }
+});
+openaiRouter.use((req, res) => {
+  req.log.warn(`Blocked openai proxy request: ${req.method} ${req.path}`);
+  res.status(404).json({ error: "Not found" });
+});
 
 export const openai = openaiRouter;

src/proxy/palm.ts

@@ -1,183 +0,0 @@
-import { Request, RequestHandler, Router } from "express";
-import * as http from "http";
-import { createProxyMiddleware } from "http-proxy-middleware";
-import { v4 } from "uuid";
-import { config } from "../config";
-import { logger } from "../logger";
-import { createQueueMiddleware } from "./queue";
-import { ipLimiter } from "./rate-limit";
-import { handleProxyError } from "./middleware/common";
-import {
-  addKey,
-  applyQuotaLimits,
-  blockZoomerOrigins,
-  createOnProxyReqHandler,
-  createPreprocessorMiddleware,
-  finalizeBody,
-  forceModel,
-  languageFilter,
-  stripHeaders,
-} from "./middleware/request";
-import {
-  createOnProxyResHandler,
-  ProxyResHandlerWithBody,
-} from "./middleware/response";
-
-let modelsCache: any = null;
-let modelsCacheTime = 0;
-
-const getModelsResponse = () => {
-  if (new Date().getTime() - modelsCacheTime < 1000 * 60) {
-    return modelsCache;
-  }
-
-  if (!config.googlePalmKey) return { object: "list", data: [] };
-
-  const bisonVariants = ["text-bison-001"];
-
-  const models = bisonVariants.map((id) => ({
-    id,
-    object: "model",
-    created: new Date().getTime(),
-    owned_by: "google",
-    permission: [],
-    root: "palm",
-    parent: null,
-  }));
-
-  modelsCache = { object: "list", data: models };
-  modelsCacheTime = new Date().getTime();
-
-  return modelsCache;
-};
-
-const handleModelRequest: RequestHandler = (_req, res) => {
-  res.status(200).json(getModelsResponse());
-};
-
-/** Only used for non-streaming requests. */
-const palmResponseHandler: ProxyResHandlerWithBody = async (
-  _proxyRes,
-  req,
-  res,
-  body
-) => {
-  if (typeof body !== "object") {
-    throw new Error("Expected body to be an object");
-  }
-
-  if (config.promptLogging) {
-    const host = req.get("host");
-    body.proxy_note = `Prompts are logged on this proxy instance. See ${host} for more information.`;
-  }
-
-  if (req.inboundApi === "openai") {
-    req.log.info("Transforming Google PaLM response to OpenAI format");
-    body = transformPalmResponse(body, req);
-  }
-
-  // TODO: Remove once tokenization is stable
-  if (req.debug) {
-    body.proxy_tokenizer_debug_info = req.debug;
-  }
-
-  // TODO: PaLM has no streaming capability which will pose a problem here if
-  // requests wait in the queue for too long.  Probably need to fake streaming
-  // and return the entire completion in one stream event using the other
-  // response handler.
-  res.status(200).json(body);
-};
-
-/**
- * Transforms a model response from the Anthropic API to match those from the
- * OpenAI API, for users using Claude via the OpenAI-compatible endpoint. This
- * is only used for non-streaming requests as streaming requests are handled
- * on-the-fly.
- */
-function transformPalmResponse(
-  palmRespBody: Record<string, any>,
-  req: Request
-): Record<string, any> {
-  const totalTokens = (req.promptTokens ?? 0) + (req.outputTokens ?? 0);
-  return {
-    id: "plm-" + v4(),
-    object: "chat.completion",
-    created: Date.now(),
-    model: req.body.model,
-    usage: {
-      prompt_tokens: req.promptTokens,
-      completion_tokens: req.outputTokens,
-      total_tokens: totalTokens,
-    },
-    choices: [
-      {
-        message: {
-          role: "assistant",
-          content: palmRespBody.candidates[0].output,
-        },
-        finish_reason: null, // palm doesn't return this
-        index: 0,
-      },
-    ],
-  };
-}
-
-function reassignPathForPalmModel(proxyReq: http.ClientRequest, req: Request) {
-  if (req.body.stream) {
-    throw new Error("Google PaLM API doesn't support streaming requests");
-  }
-
-  // PaLM API specifies the model in the URL path, not the request body. This
-  // doesn't work well with our rewriter architecture, so we need to manually
-  // fix it here.
-
-  // POST https://generativelanguage.googleapis.com/v1beta2/{model=models/*}:generateText
-  // POST https://generativelanguage.googleapis.com/v1beta2/{model=models/*}:generateMessage
-
-  // The chat api (generateMessage) is not very useful at this time as it has
-  // few params and no adjustable safety settings.
-
-  proxyReq.path = proxyReq.path.replace(
-    /^\/v1\/chat\/completions/,
-    `/v1beta2/models/${req.body.model}:generateText`
-  );
-}
-
-const googlePalmProxy = createQueueMiddleware(
-  createProxyMiddleware({
-    target: "https://generativelanguage.googleapis.com",
-    changeOrigin: true,
-    selfHandleResponse: true,
-    logger,
-    on: {
-      proxyReq: createOnProxyReqHandler({
-        beforeRewrite: [reassignPathForPalmModel],
-        pipeline: [
-          applyQuotaLimits,
-          addKey,
-          languageFilter,
-          blockZoomerOrigins,
-          stripHeaders,
-          finalizeBody,
-        ],
-      }),
-      proxyRes: createOnProxyResHandler([palmResponseHandler]),
-      error: handleProxyError,
-    },
-  })
-);
-
-const palmRouter = Router();
-palmRouter.get("/v1/models", handleModelRequest);
-// OpenAI-to-Google PaLM compatibility endpoint.
-palmRouter.post(
-  "/v1/chat/completions",
-  ipLimiter,
-  createPreprocessorMiddleware(
-    { inApi: "openai", outApi: "google-palm", service: "google-palm" },
-    { afterTransform: [forceModel("text-bison-001")] }
-  ),
-  googlePalmProxy
-);
-
-export const googlePalm = palmRouter;

src/proxy/queue.ts

@@ -16,63 +16,52 @@
  */
 
 import type { Handler, Request } from "express";
-import { keyPool } from "../shared/key-management";
+import { config, DequeueMode } from "../config";
-import {
+import { keyPool, SupportedModel } from "../key-management";
-  getClaudeModelFamily,
-  getGooglePalmModelFamily,
-  getOpenAIModelFamily,
-  ModelFamily,
-} from "../shared/models";
-import { buildFakeSse, initializeSseStream } from "../shared/streaming";
-import { assertNever } from "../shared/utils";
 import { logger } from "../logger";
 import { AGNAI_DOT_CHAT_IP } from "./rate-limit";
+import { buildFakeSseMessage } from "./middleware/common";
+
+export type QueuePartition = "claude" | "turbo" | "gpt-4";
 
 const queue: Request[] = [];
 const log = logger.child({ module: "request-queue" });
 
+let dequeueMode: DequeueMode = "fair";
+
 /** Maximum number of queue slots for Agnai.chat requests. */
-const AGNAI_CONCURRENCY_LIMIT = 5;
+const AGNAI_CONCURRENCY_LIMIT = 15;
 /** Maximum number of queue slots for individual users. */
 const USER_CONCURRENCY_LIMIT = 1;
 
-/**
+const sameIpPredicate = (incoming: Request) => (queued: Request) =>
- * Returns a unique identifier for a request. This is used to determine if a
+  queued.ip === incoming.ip;
- * request is already in the queue.
- * This can be (in order of preference):
- * - user token assigned by the proxy operator
- * - x-risu-tk header, if the request is from RisuAI.xyz
- * - IP address
- */
-function getIdentifier(req: Request) {
-  if (req.user) {
-    return req.user.token;
-  }
-  if (req.risuToken) {
-    return req.risuToken;
-  }
-  return req.ip;
-}
-
 const sameUserPredicate = (incoming: Request) => (queued: Request) => {
-  const queuedId = getIdentifier(queued);
+  const incomingUser = incoming.user ?? { token: incoming.ip };
-  const incomingId = getIdentifier(incoming);
+  const queuedUser = queued.user ?? { token: queued.ip };
-  return queuedId === incomingId;
+  return queuedUser.token === incomingUser.token;
 };
 
 export function enqueue(req: Request) {
-  const enqueuedRequestCount = queue.filter(sameUserPredicate(req)).length;
+  let enqueuedRequestCount = 0;
   let isGuest = req.user?.token === undefined;
 
+  if (isGuest) {
+    enqueuedRequestCount = queue.filter(sameIpPredicate(req)).length;
+  } else {
+    enqueuedRequestCount = queue.filter(sameUserPredicate(req)).length;
+  }
+
   // All Agnai.chat requests come from the same IP, so we allow them to have
   // more spots in the queue. Can't make it unlimited because people will
   // intentionally abuse it.
   // Authenticated users always get a single spot in the queue.
-  const isAgnai = AGNAI_DOT_CHAT_IP.includes(req.ip);
   const maxConcurrentQueuedRequests =
-    isGuest && isAgnai ? AGNAI_CONCURRENCY_LIMIT : USER_CONCURRENCY_LIMIT;
+    isGuest && req.ip === AGNAI_DOT_CHAT_IP
+      ? AGNAI_CONCURRENCY_LIMIT
+      : USER_CONCURRENCY_LIMIT;
   if (enqueuedRequestCount >= maxConcurrentQueuedRequests) {
-    if (isAgnai) {
+    if (req.ip === AGNAI_DOT_CHAT_IP) {
       // Re-enqueued requests are not counted towards the limit since they
       // already made it through the queue once.
       if (req.retryCount === 0) {
@@ -92,22 +81,21 @@ export function enqueue(req: Request) {
   // If the request opted into streaming, we need to register a heartbeat
   // handler to keep the connection alive while it waits in the queue. We
   // deregister the handler when the request is dequeued.
-  const { stream } = req.body;
+  if (req.body.stream === "true" || req.body.stream === true) {
-  if (stream === "true" || stream === true || req.isStreaming) {
     const res = req.res!;
     if (!res.headersSent) {
       initStreaming(req);
     }
     req.heartbeatInterval = setInterval(() => {
       if (process.env.NODE_ENV === "production") {
-        if (!req.query.badSseParser) req.res!.write(": queue heartbeat\n\n");
+        req.res!.write(": queue heartbeat\n\n");
       } else {
         req.log.info(`Sending heartbeat to request in queue.`);
         const partition = getPartitionForRequest(req);
         const avgWait = Math.round(getEstimatedWaitTime(partition) / 1000);
         const currentDuration = Math.round((Date.now() - req.startTime) / 1000);
         const debugMsg = `queue length: ${queue.length}; elapsed time: ${currentDuration}s; avg wait: ${avgWait}s`;
-        req.res!.write(buildFakeSse("heartbeat", debugMsg, req));
+        req.res!.write(buildFakeSseMessage("heartbeat", debugMsg, req));
       }
     }, 10000);
   }
@@ -134,45 +122,46 @@ export function enqueue(req: Request) {
   }
 }
 
-function getPartitionForRequest(req: Request): ModelFamily {
+function getPartitionForRequest(req: Request): QueuePartition {
-  // There is a single request queue, but it is partitioned by model family.
+  // There is a single request queue, but it is partitioned by model and API
-  // Model families are typically separated on cost/rate limit boundaries so
+  // provider.
-  // they should be treated as separate queues.
+  // - claude: requests for the Anthropic API, regardless of model
-  const model = req.body.model ?? "gpt-3.5-turbo";
+  // - gpt-4: requests for the OpenAI API, specifically for GPT-4 models
-
+  // - turbo: effectively, all other requests
-  // Weird special case for AWS because they serve multiple models from
+  const provider = req.outboundApi;
-  // different vendors, even if currently only one is supported.
+  const model = (req.body.model as SupportedModel) ?? "gpt-3.5-turbo";
-  if (req.service === "aws") {
+  if (provider === "anthropic") {
-    return "aws-claude";
+    return "claude";
   }
-
+  if (provider === "openai" && model.startsWith("gpt-4")) {
-  switch (req.outboundApi) {
+    return "gpt-4";
-    case "anthropic":
-      return getClaudeModelFamily(model);
-    case "openai":
-    case "openai-text":
-      return getOpenAIModelFamily(model);
-    case "google-palm":
-      return getGooglePalmModelFamily(model);
-    default:
-      assertNever(req.outboundApi);
   }
+  return "turbo";
 }
 
-function getQueueForPartition(partition: ModelFamily): Request[] {
+function getQueueForPartition(partition: QueuePartition): Request[] {
   return queue.filter((req) => getPartitionForRequest(req) === partition);
 }
 
-export function dequeue(partition: ModelFamily): Request | undefined {
+export function dequeue(partition: QueuePartition): Request | undefined {
   const modelQueue = getQueueForPartition(partition);
 
   if (modelQueue.length === 0) {
     return undefined;
   }
 
-  const req = modelQueue.reduce((prev, curr) =>
+  let req: Request;
-    prev.startTime < curr.startTime ? prev : curr
+
-  );
+  if (dequeueMode === "fair") {
+    // Dequeue the request that has been waiting the longest
+    req = modelQueue.reduce((prev, curr) =>
+      prev.startTime < curr.startTime ? prev : curr
+    );
+  } else {
+    // Dequeue a random request
+    const index = Math.floor(Math.random() * modelQueue.length);
+    req = modelQueue[index];
+  }
   queue.splice(queue.indexOf(req), 1);
 
   if (req.onAborted) {
@@ -202,22 +191,13 @@ function processQueue() {
   // This isn't completely correct, because a key can service multiple models.
   // Currently if a key is locked out on one model it will also stop servicing
   // the others, because we only track one rate limit per key.
-
-  // TODO: `getLockoutPeriod` uses model names instead of model families
-  // TODO: genericize this it's really ugly
-  const gpt432kLockout = keyPool.getLockoutPeriod("gpt-4-32k");
   const gpt4Lockout = keyPool.getLockoutPeriod("gpt-4");
   const turboLockout = keyPool.getLockoutPeriod("gpt-3.5-turbo");
   const claudeLockout = keyPool.getLockoutPeriod("claude-v1");
-  const palmLockout = keyPool.getLockoutPeriod("text-bison-001");
-  const awsClaudeLockout = keyPool.getLockoutPeriod("anthropic.claude-v2");
 
   const reqs: (Request | undefined)[] = [];
-  if (gpt432kLockout === 0) {
-    reqs.push(dequeue("gpt4-32k"));
-  }
   if (gpt4Lockout === 0) {
-    reqs.push(dequeue("gpt4"));
+    reqs.push(dequeue("gpt-4"));
   }
   if (turboLockout === 0) {
     reqs.push(dequeue("turbo"));
@@ -225,12 +205,6 @@ function processQueue() {
   if (claudeLockout === 0) {
     reqs.push(dequeue("claude"));
   }
-  if (palmLockout === 0) {
-    reqs.push(dequeue("bison"));
-  }
-  if (awsClaudeLockout === 0) {
-    reqs.push(dequeue("aws-claude"));
-  }
 
   reqs.filter(Boolean).forEach((req) => {
     if (req?.proceed) {
@@ -272,7 +246,7 @@ export function start() {
   log.info(`Started request queue.`);
 }
 
-let waitTimes: { partition: ModelFamily; start: number; end: number }[] = [];
+let waitTimes: { partition: QueuePartition; start: number; end: number }[] = [];
 
 /** Adds a successful request to the list of wait times. */
 export function trackWaitTime(req: Request) {
@@ -284,7 +258,7 @@ export function trackWaitTime(req: Request) {
 }
 
 /** Returns average wait time in milliseconds. */
-export function getEstimatedWaitTime(partition: ModelFamily) {
+export function getEstimatedWaitTime(partition: QueuePartition) {
   const now = Date.now();
   const recentWaits = waitTimes.filter(
     (wt) => wt.partition === partition && now - wt.end < 300 * 1000
@@ -299,7 +273,7 @@ export function getEstimatedWaitTime(partition: ModelFamily) {
   );
 }
 
-export function getQueueLength(partition: ModelFamily | "all" = "all") {
+export function getQueueLength(partition: QueuePartition | "all" = "all") {
   if (partition === "all") {
     return queue.length;
   }
@@ -309,6 +283,10 @@ export function getQueueLength(partition: ModelFamily | "all" = "all") {
 
 export function createQueueMiddleware(proxyMiddleware: Handler): Handler {
   return (req, res, next) => {
+    if (config.queueMode === "none") {
+      return proxyMiddleware(req, res, next);
+    }
+
     req.proceed = () => {
       proxyMiddleware(req, res, next);
     };
@@ -335,7 +313,11 @@ function killQueuedRequest(req: Request) {
   try {
     const message = `Your request has been terminated by the proxy because it has been in the queue for more than 5 minutes. The queue is currently ${queue.length} requests long.`;
     if (res.headersSent) {
-      const fakeErrorEvent = buildFakeSse("proxy queue error", message, req);
+      const fakeErrorEvent = buildFakeSseMessage(
+        "proxy queue error",
+        message,
+        req
+      );
       res.write(fakeErrorEvent);
       res.end();
     } else {
@@ -347,17 +329,16 @@ function killQueuedRequest(req: Request) {
 }
 
 function initStreaming(req: Request) {
+  req.log.info(`Initiating streaming for new queued request.`);
   const res = req.res!;
-  initializeSseStream(res);
+  res.statusCode = 200;
-
+  res.setHeader("Content-Type", "text/event-stream");
-  if (req.query.badSseParser) {
+  res.setHeader("Cache-Control", "no-cache");
-    // Some clients have a broken SSE parser that doesn't handle comments
+  res.setHeader("Connection", "keep-alive");
-    // correctly. These clients can pass ?badSseParser=true to
+  res.setHeader("X-Accel-Buffering", "no"); // nginx-specific fix
-    // disable comments in the SSE stream.
+  res.flushHeaders();
-    return;
+  res.write("\n");
-  }
+  res.write(": joining queue\n\n");
-
-  res.write(`: joining queue at position ${queue.length}\n\n`);
 }
 
 /**

src/proxy/rate-limit.ts

@@ -1,13 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import { config } from "../config";
 
-export const AGNAI_DOT_CHAT_IP = [
+export const AGNAI_DOT_CHAT_IP = "157.230.249.32";
-  "157.230.249.32", // old
-  "157.245.148.56",
-  "174.138.29.50",
-  "209.97.162.44",
-];
-
 const RATE_LIMIT_ENABLED = Boolean(config.modelRateLimit);
 const RATE_LIMIT = Math.max(1, config.modelRateLimit);
 const ONE_MINUTE_MS = 60 * 1000;
@@ -58,26 +52,23 @@ export const getUniqueIps = () => {
   return lastAttempts.size;
 };
 
-export const ipLimiter = async (
+export const ipLimiter = (req: Request, res: Response, next: NextFunction) => {
-  req: Request,
+  if (!RATE_LIMIT_ENABLED) {
-  res: Response,
+    next();
-  next: NextFunction
+    return;
-) => {
+  }
-  if (!RATE_LIMIT_ENABLED) return next();
-  if (req.user?.type === "special") return next();
 
   // Exempt Agnai.chat from rate limiting since it's shared between a lot of
   // users. Dunno how to prevent this from being abused without some sort of
   // identifier sent from Agnaistic to identify specific users.
-  if (AGNAI_DOT_CHAT_IP.includes(req.ip)) {
+  if (req.ip === AGNAI_DOT_CHAT_IP) {
-    req.log.info("Exempting Agnai request from rate limiting.");
     next();
     return;
   }
 
   // If user is authenticated, key rate limiting by their token. Otherwise, key
   // rate limiting by their IP address. Mitigates key sharing.
-  const rateLimitKey = req.user?.token || req.risuToken || req.ip;
+  const rateLimitKey = req.user?.token || req.ip;
 
   const { remaining, reset } = getStatus(rateLimitKey);
   res.set("X-RateLimit-Limit", config.modelRateLimit.toString());
@@ -92,7 +83,7 @@ export const ipLimiter = async (
         type: "proxy_rate_limited",
         message: `This proxy is rate limited to ${
           config.modelRateLimit
-        } prompts per minute. Please try again in ${Math.ceil(
+        } model requests per minute. Please try again in ${Math.ceil(
           tryAgainInMs / 1000
         )} seconds.`,
       },

src/proxy/routes.ts

@@ -1,50 +1,19 @@
-import express, { Request, Response, NextFunction } from "express";
+/* Accepts incoming requests at either the /kobold or /openai routes and then
-import { gatekeeper } from "./gatekeeper";
+routes them to the appropriate handler to be forwarded to the OpenAI API.
-import { checkRisuToken } from "./check-risu-token";
+Incoming OpenAI requests are more or less 1:1 with the OpenAI API, but only a
+subset of the API is supported. Kobold requests must be transformed into
+equivalent OpenAI requests. */
+
+import * as express from "express";
+import { gatekeeper } from "./auth/gatekeeper";
+import { kobold } from "./kobold";
 import { openai } from "./openai";
 import { anthropic } from "./anthropic";
-import { googlePalm } from "./palm";
-import { aws } from "./aws";
 
-const proxyRouter = express.Router();
+const router = express.Router();
-proxyRouter.use((req, _res, next) => {
-  if (req.headers.expect) {
-    // node-http-proxy does not like it when clients send `expect: 100-continue`
-    // and will stall. none of the upstream APIs use this header anyway.
-    delete req.headers.expect;
-  }
-  next();
-});
-proxyRouter.use(
-  express.json({ limit: "1536kb" }),
-  express.urlencoded({ extended: true, limit: "1536kb" })
-);
-proxyRouter.use(gatekeeper);
-proxyRouter.use(checkRisuToken);
-proxyRouter.use((req, _res, next) => {
-  req.startTime = Date.now();
-  req.retryCount = 0;
-  next();
-});
-proxyRouter.use("/openai", addV1, openai);
-proxyRouter.use("/anthropic", addV1, anthropic);
-proxyRouter.use("/google-palm", addV1, googlePalm);
-proxyRouter.use("/aws/claude", addV1, aws);
-// Redirect browser requests to the homepage.
-proxyRouter.get("*", (req, res, next) => {
-  const isBrowser = req.headers["user-agent"]?.includes("Mozilla");
-  if (isBrowser) {
-    res.redirect("/");
-  } else {
-    next();
-  }
-});
-export { proxyRouter as proxyRouter };
 
-function addV1(req: Request, res: Response, next: NextFunction) {
+router.use(gatekeeper);
-  // Clients don't consistently use the /v1 prefix so we'll add it for them.
+router.use("/kobold", kobold);
-  if (!req.path.startsWith("/v1/")) {
+router.use("/openai", openai);
-    req.url = `/v1${req.url}`;
+router.use("/anthropic", anthropic);
-  }
+export { router as proxyRouter };
-  next();
-}

src/server.ts

@@ -2,20 +2,18 @@ import { assertConfigIsValid, config } from "./config";
 import "source-map-support/register";
 import express from "express";
 import cors from "cors";
-import path from "path";
 import pinoHttp from "pino-http";
 import childProcess from "child_process";
-import { handleInfoPage } from "./info-page";
 import { logger } from "./logger";
+import { keyPool } from "./key-management";
 import { adminRouter } from "./admin/routes";
-import { checkOrigin } from "./proxy/check-origin";
-import { start as startRequestQueue } from "./proxy/queue";
 import { proxyRouter } from "./proxy/routes";
-import { init as initKeyPool } from "./shared/key-management/key-pool";
+import { handleInfoPage } from "./info-page";
-import { logQueue } from "./shared/prompt-logging";
+import { logQueue } from "./prompt-logging";
-import { init as initTokenizers } from "./shared/tokenization";
+import { start as startRequestQueue } from "./proxy/queue";
-import { init as initUserStore } from "./shared/users/user-store";
+import { init as initUserStore } from "./proxy/auth/user-store";
-import { userRouter } from "./user/routes";
+import { init as initTokenizers } from "./tokenization";
+import { checkOrigin } from "./proxy/check-origin";
 
 const PORT = config.port;
 
@@ -26,7 +24,10 @@ app.use(
     quietReqLogger: true,
     logger,
     autoLogging: {
-      ignore: ({ url }) => ["/health"].includes(url as string),
+      ignore: (req) => {
+        const ignored = ["/proxy/kobold/api/v1/model", "/health"];
+        return ignored.includes(req.url as string);
+      },
     },
     redact: {
       paths: [
@@ -34,6 +35,10 @@ app.use(
         'res.headers["set-cookie"]',
         "req.headers.authorization",
         'req.headers["x-api-key"]',
+        'req.headers["x-forwarded-for"]',
+        'req.headers["x-real-ip"]',
+        'req.headers["true-client-ip"]',
+        'req.headers["cf-connecting-ip"]',
         // Don't log the prompt text on transform errors
         "body.messages",
         "body.prompt",
@@ -43,27 +48,28 @@ app.use(
   })
 );
 
+app.get("/health", (_req, res) => res.sendStatus(200));
+app.use((req, _res, next) => {
+  req.startTime = Date.now();
+  req.retryCount = 0;
+  next();
+});
+app.use(cors());
+app.use(
+  express.json({ limit: "10mb" }),
+  express.urlencoded({ extended: true, limit: "10mb" })
+);
+
 // TODO: Detect (or support manual configuration of) whether the app is behind
 // a load balancer/reverse proxy, which is necessary to determine request IP
 // addresses correctly.
 app.set("trust proxy", true);
 
-app.set("view engine", "ejs");
-app.set("views", [
-  path.join(__dirname, "admin/web/views"),
-  path.join(__dirname, "user/web/views"),
-  path.join(__dirname, "shared/views"),
-]);
-
-app.get("/health", (_req, res) => res.sendStatus(200));
-app.use(cors());
-app.use(checkOrigin);
-
 // routes
+app.use(checkOrigin);
 app.get("/", handleInfoPage);
 app.use("/admin", adminRouter);
 app.use("/proxy", proxyRouter);
-app.use("/user", userRouter);
 
 // 500 and 404
 app.use((err: any, _req: unknown, res: express.Response, _next: unknown) => {
@@ -92,8 +98,7 @@ async function start() {
   logger.info("Checking configs and external dependencies...");
   await assertConfigIsValid();
 
-  logger.info("Starting key pool...");
+  keyPool.init();
-  await initKeyPool();
 
   await initTokenizers();
 
@@ -106,8 +111,10 @@ async function start() {
     logQueue.start();
   }
 
-  logger.info("Starting request queue...");
+  if (config.queueMode !== "none") {
-  startRequestQueue();
+    logger.info("Starting request queue...");
+    startRequestQueue();
+  }
 
   app.listen(PORT, async () => {
     logger.info({ port: PORT }, "Now listening for connections.");

src/shared/errors.ts

@@ -1,23 +0,0 @@
-export class HttpError extends Error {
-  constructor(public status: number, message: string) {
-    super(message);
-  }
-}
-
-export class UserInputError extends HttpError {
-  constructor(message: string) {
-    super(400, message);
-  }
-}
-
-export class ForbiddenError extends HttpError {
-  constructor(message: string) {
-    super(403, message);
-  }
-}
-
-export class NotFoundError extends HttpError {
-  constructor(message: string) {
-    super(404, message);
-  }
-}