wip, broke something with serializer

.editorconfig

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

.env.example

@@ -5,29 +5,17 @@
 # All values have reasonable defaults, so you only need to change the ones you
 # want to override.
 
-# Use production mode unless you are developing locally.
-NODE_ENV=production
-
 # ------------------------------------------------------------------------------
 # General settings:
 
 # The title displayed on the info page.
 # SERVER_TITLE=Coom Tunnel
 
-# The route name used to proxy requests to APIs, relative to the Web site root.
-# PROXY_ENDPOINT_ROUTE=/proxy
-
-# Text model requests allowed per minute per user.
-# TEXT_MODEL_RATE_LIMIT=4
-# Image model requests allowed per minute per user.
-# IMAGE_MODEL_RATE_LIMIT=2
-
-# Max number of context tokens a user can request at once.
-# Increase this if your proxy allow GPT 32k or 128k context
-# MAX_CONTEXT_TOKENS_OPENAI=16384
+# 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=400
+# MAX_OUTPUT_TOKENS_OPENAI=300
 # MAX_OUTPUT_TOKENS_ANTHROPIC=400
 
 # Whether to show the estimated cost of consumed tokens on the info page.
@@ -39,29 +27,8 @@ NODE_ENV=production
 # CHECK_KEYS=true
 
 # Which model types users are allowed to access.
-# The following model families are recognized:
+# ALLOWED_MODEL_FAMILIES=claude,turbo,gpt4,gpt4-32k
 
-# turbo | gpt4 | gpt4-32k | gpt4-turbo | gpt4o | dall-e | claude | claude-opus
-# | gemini-flash | gemini-pro | gemini-ultra | mistral-tiny | mistral-small
-# | mistral-medium | mistral-large | aws-claude | aws-claude-opus | gcp-claude
-# | gcp-claude-opus | azure-turbo | azure-gpt4 | azure-gpt4-32k
-# | azure-gpt4-turbo | azure-gpt4o | azure-dall-e
-
-# By default, all models are allowed except for 'dall-e' / 'azure-dall-e'.
-# To allow DALL-E image generation, uncomment the line below and add 'dall-e' or
-# 'azure-dall-e' to the list of allowed model families.
-# ALLOWED_MODEL_FAMILIES=turbo,gpt4,gpt4-32k,gpt4-turbo,gpt4o,claude,claude-opus,gemini-flash,gemini-pro,gemini-ultra,mistral-tiny,mistral-small,mistral-medium,mistral-large,aws-claude,aws-claude-opus,gcp-claude,gcp-claude-opus,azure-turbo,azure-gpt4,azure-gpt4-32k,azure-gpt4-turbo,azure-gpt4o
-
-# Which services can be used to process prompts containing images via multimodal
-# models. The following services are recognized:
-# openai | anthropic | aws | gcp | azure | google-ai | mistral-ai
-# Do not enable this feature unless all users are trusted, as you will be liable
-# for any user-submitted images containing illegal content.
-# By default, no image services are allowed and image prompts are rejected.
-# ALLOWED_VISION_SERVICES=
-
-# IP addresses or CIDR blocks from which requests will be blocked.
-# IP_BLACKLIST=10.0.0.1/24
 # URLs from which requests will be blocked.
 # BLOCKED_ORIGINS=reddit.com,9gag.com
 # Message to show when requests are blocked.
@@ -69,34 +36,21 @@ NODE_ENV=production
 # Destination to redirect blocked requests to.
 # BLOCK_REDIRECT="https://roblox.com/"
 
-# Comma-separated list of phrases that will be rejected. Only whole words are matched.
-# Surround phrases with quotes if they contain commas.
-# Avoid short or common phrases as this tests the entire prompt.
-# REJECT_PHRASES="phrase one,phrase two,"phrase three, which has a comma",phrase four"
+# Whether to reject requests containing disallowed content.
+# REJECT_DISALLOWED=false
 # Message to show when requests are rejected.
-# REJECT_MESSAGE="You can't say that here."
+# REJECT_MESSAGE="This content violates /aicg/'s acceptable use policy."
 
 # Whether prompts should be logged to Google Sheets.
 # Requires additional setup. See `docs/google-sheets.md` for more information.
 # PROMPT_LOGGING=false
 
-# The port and network interface to listen on.
+# The port to listen on.
 # PORT=7860
-# BIND_ADDRESS=0.0.0.0
-
-# Whether cookies should be set without the Secure flag, for hosts that don't support SSL.
-# USE_INSECURE_COOKIES=false
 
 # Detail level of logging. (trace | debug | info | warn | error)
 # LOG_LEVEL=info
 
-# Captcha verification settings. Refer to docs/pow-captcha.md for guidance.
-# CAPTCHA_MODE=none
-# POW_TOKEN_HOURS=24
-# POW_TOKEN_MAX_IPS=2
-# POW_DIFFICULTY_LEVEL=low
-# POW_CHALLENGE_TIMEOUT=30
-
 # ------------------------------------------------------------------------------
 # Optional settings for user management, access control, and quota enforcement:
 # See `docs/user-management.md` for more information and setup instructions.
@@ -109,65 +63,38 @@ NODE_ENV=production
 
 # Maximum number of unique IPs a user can connect from. (0 for unlimited)
 # MAX_IPS_PER_USER=0
-# Whether user_tokens should be automatically disabled when reaching the IP limit.
-# MAX_IPS_AUTO_BAN=true
 
 # 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)
-# Specify as TOKEN_QUOTA_MODEL_FAMILY=value, replacing dashes with underscores.
 # TOKEN_QUOTA_TURBO=0
 # TOKEN_QUOTA_GPT4=0
 # TOKEN_QUOTA_GPT4_32K=0
-# TOKEN_QUOTA_GPT4_TURBO=0
 # TOKEN_QUOTA_CLAUDE=0
-# TOKEN_QUOTA_GEMINI_PRO=0
-# TOKEN_QUOTA_AWS_CLAUDE=0
-# TOKEN_QUOTA_GCP_CLAUDE=0
-# "Tokens" for image-generation models are counted at a rate of 100000 tokens
-# per US$1.00 generated, which is similar to the cost of GPT-4 Turbo.
-# DALL-E 3 costs around US$0.10 per image (10000 tokens).
-# See `docs/dall-e-configuration.md` for more information.
-# TOKEN_QUOTA_DALL_E=0
 
 # How often to refresh token quotas. (hourly | daily)
 # Leave unset to never automatically refresh quotas.
 # QUOTA_REFRESH_PERIOD=daily
 
-# Specifies the number of proxies or load balancers in front of the server.
-# For Cloudflare or Hugging Face deployments, the default of 1 is correct.
-# For any other deployments, please see config.ts as the correct configuration
-# depends on your setup. Misconfiguring this value can result in problems
-# accurately tracking IP addresses and enforcing rate limits.
-# TRUSTED_PROXIES=1
-
 # ------------------------------------------------------------------------------
 # Secrets and keys:
-# For Huggingface, set them via the Secrets section in your Space's config UI. Dp not set them in .env.
+# 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.
 # For AWS credentials, separate the access key ID, secret key, and region with a colon.
-# For GCP credentials, separate the project ID, client email, region, and private key with a colon.
 OPENAI_KEY=sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ANTHROPIC_KEY=sk-ant-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-GOOGLE_AI_KEY=AIzaxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 # 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
-# See `docs/azure-configuration.md` for more information, there may be additional steps required to set up Azure.
-AZURE_CREDENTIALS=azure-resource-name:deployment-id:api-key,another-azure-resource-name:another-deployment-id:another-api-key
-GCP_CREDENTIALS=project-id:client-email:region:private-key
 
 # With proxy_key gatekeeper, the password users must provide to access the API.
 # PROXY_KEY=your-secret-key
 
 # With user_token gatekeeper, the admin password used to manage users.
 # ADMIN_KEY=your-very-secret-key
-# To restrict access to the admin interface to specific IP addresses, set the
-# ADMIN_WHITELIST environment variable to a comma-separated list of CIDR blocks.
-# ADMIN_WHITELIST=0.0.0.0/0
-
 
 # With firebase_rtdb gatekeeper storage, the Firebase project credentials.
 # FIREBASE_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

.gitignore

@@ -1,11 +1,7 @@
-.aider*
-.env*
-!.env.vault
+.env
 .venv
 .vscode
 .idea
 build
 greeting.md
 node_modules
-
-http-client.private.env.json

.prettierrc

@@ -1,10 +1,11 @@
 {
-  "plugins": ["prettier-plugin-ejs"],
   "overrides": [
     {
-      "files": "*.ejs",
+      "files": [
+        "*.ejs"
+      ],
       "options": {
-        "printWidth": 120,
+        "printWidth": 160,
         "bracketSameLine": true
       }
     }

README.md

@@ -1,50 +1,34 @@
 # OAI Reverse Proxy
 
-Reverse proxy server for various LLM APIs.
+Reverse proxy server for the OpenAI and Anthropic APIs. Forwards text generation requests while rejecting administrative/billing requests. Includes optional rate limiting and prompt filtering to prevent abuse.
 
 ### Table of Contents
 - [What is this?](#what-is-this)
-- [Features](#features)
-- [Usage Instructions](#usage-instructions)
-  - [Self-hosting](#self-hosting)
-  - [Huggingface (outdated, not advised)](#huggingface-outdated-not-advised)
-  - [Render (outdated, not advised)](#render-outdated-not-advised)
+- [Why?](#why)
+- [Usage Instructions](#setup-instructions)
+  - [Deploy to Huggingface (Recommended)](#deploy-to-huggingface-recommended)
+  - [Deploy to Repl.it (WIP)](#deploy-to-replit-wip)
 - [Local Development](#local-development)
 
 ## What is this?
-This project allows you to run a reverse proxy server for various LLM APIs.
+If you would like to provide a friend access to an API via keys you own, you can use this to keep your keys safe while still allowing them to generate text with the API. You can also use this if you'd like to build a client-side application which uses the OpenAI or Anthropic APIs, but don't want to build your own backend. You should never embed your real API keys in a client-side application. Instead, you can have your frontend connect to this reverse proxy and forward requests to the downstream service.
 
-## Features
-- [x] Support for multiple APIs
-  - [x] [OpenAI](https://openai.com/)
-  - [x] [Anthropic](https://www.anthropic.com/)
-  - [x] [AWS Bedrock](https://aws.amazon.com/bedrock/)
-  - [x] [Vertex AI (GCP)](https://cloud.google.com/vertex-ai/)
-  - [x] [Google MakerSuite/Gemini API](https://ai.google.dev/)
-  - [x] [Azure OpenAI](https://azure.microsoft.com/en-us/products/ai-services/openai-service)
-- [x] Translation from OpenAI-formatted prompts to any other API, including streaming responses
-- [x] Multiple API keys with rotation and rate limit handling
-- [x] Basic user management
-  - [x] Simple role-based permissions
-  - [x] Per-model token quotas
-  - [x] Temporary user accounts
-- [x] Prompt and completion logging
-- [x] Abuse detection and prevention
+This keeps your keys safe and allows you to use the rate limiting and prompt filtering features of the proxy to prevent abuse.
+
+## Why?
+OpenAI keys have full account permissions. They can revoke themselves, generate new keys, modify spend quotas, etc. **You absolutely should not share them, post them publicly, nor embed them in client-side applications as they can be easily stolen.**
+
+This proxy only forwards text generation requests to the downstream service and rejects requests which would otherwise modify your account. 
 
 ---
 
 ## Usage Instructions
-If you'd like to run your own instance of this server, you'll need to deploy it somewhere and configure it with your API keys. A few easy options are provided below, though you can also deploy it to any other service you'd like if you know what you're doing and the service supports Node.js.
+If you'd like to run your own instance of this proxy, you'll need to deploy it somewhere and configure it with your API keys. A few easy options are provided below, though you can also deploy it to any other service you'd like.
 
-### Self-hosting
-[See here for instructions on how to self-host the application on your own VPS or local machine.](./docs/self-hosting.md)
-
-**Ensure you set the `TRUSTED_PROXIES` environment variable according to your deployment.** Refer to [.env.example](./.env.example) and [config.ts](./src/config.ts) for more information.
-
-### Huggingface (outdated, not advised)
+### Deploy to Huggingface (Recommended)
 [See here for instructions on how to deploy to a Huggingface Space.](./docs/deploy-huggingface.md)
 
-### Render (outdated, not advised)
+### Deploy to Render
 [See here for instructions on how to deploy to Render.com.](./docs/deploy-render.md)
 
 ## Local Development
@@ -56,12 +40,3 @@ 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.
-
-## Building
-To build the project, run `npm run build`. This will compile the TypeScript code to JavaScript and output it to the `build` directory.
-
-Note that if you are trying to build the server on a very memory-constrained (<= 1GB) VPS, you may need to run the build with `NODE_OPTIONS=--max_old_space_size=2048 npm run build` to avoid running out of memory during the build process, assuming you have swap enabled.  The application itself should run fine on a 512MB VPS for most reasonable traffic levels.
-
-## Forking
-
-If you are forking the repository on GitGud, you may wish to disable GitLab CI/CD or you will be spammed with emails about failed builds due not having any CI runners. You can do this by going to *Settings > General > Visibility, project features, permissions* and then disabling the "CI/CD" feature.

data/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitkeep

docker/ci/.gitlab-ci.yml

@@ -1,21 +0,0 @@
-stages:
-  - build
-
-build_image:
-  stage: build
-  image:
-    name: gcr.io/kaniko-project/executor:debug
-    entrypoint: [""]
-  script:
-    - |
-      if [ "$CI_COMMIT_REF_NAME" = "main" ]; then
-        TAG="latest"
-      else
-        TAG=$CI_COMMIT_REF_NAME
-      fi
-    - echo "Building image with tag $TAG"
-    - BASE64_AUTH=$(echo -n "$DOCKER_HUB_USERNAME:$DOCKER_HUB_ACCESS_TOKEN" | base64)
-    - echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"$BASE64_AUTH\"}}}" > /kaniko/.docker/config.json
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/docker/ci/Dockerfile --destination docker.io/khanonci/oai-reverse-proxy:$TAG --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_PROJECT_PATH=$CI_PROJECT_PATH
-  only:
-    - main

docker/ci/Dockerfile

@@ -1,22 +0,0 @@
-FROM node:18-bullseye-slim
-
-WORKDIR /app
-COPY . .
-
-RUN npm ci
-RUN npm run build
-RUN npm prune --production
-
-EXPOSE 7860
-ENV PORT=7860
-ENV NODE_ENV=production
-
-ARG CI_COMMIT_REF_NAME
-ARG CI_COMMIT_SHA
-ARG CI_PROJECT_PATH
-
-ENV GITGUD_BRANCH=$CI_COMMIT_REF_NAME
-ENV GITGUD_COMMIT=$CI_COMMIT_SHA
-ENV GITGUD_PROJECT=$CI_PROJECT_PATH
-
-CMD [ "npm", "start" ]

docker/docker-compose-selfhost.yml

@@ -1,17 +0,0 @@
-# Before running this, create a .env and greeting.md file.
-# Refer to .env.example for the required environment variables.
-# User-generated content is stored in the data directory.
-# When self-hosting, it's recommended to run this behind a reverse proxy like
-# nginx or Caddy to handle SSL/TLS and rate limiting. Refer to
-# docs/self-hosting.md for more information and an example nginx config.
-version: '3.8'
-services:
-  oai-reverse-proxy:
-    image: khanonci/oai-reverse-proxy:latest
-    ports:
-      - "127.0.0.1:7860:7860"
-    env_file:
-      - ./.env
-    volumes:
-      - ./greeting.md:/app/greeting.md
-      - ./data:/app/data

docker/huggingface/Dockerfile

@@ -3,13 +3,9 @@ RUN apt-get update && \
     apt-get install -y git
 RUN git clone https://gitgud.io/khanon/oai-reverse-proxy.git /app
 WORKDIR /app
-RUN chown -R 1000:1000 /app
-USER 1000
 RUN npm install
 COPY Dockerfile greeting.md* .env* ./
 RUN npm run build
 EXPOSE 7860
 ENV NODE_ENV=production
-# Huggigface free VMs have 16GB of RAM so we can be greedy
-ENV NODE_OPTIONS="--max-old-space-size=12882"
 CMD [ "npm", "start" ]

docs/aws-configuration.md

@@ -45,11 +45,10 @@ You can also request Claude Instant, but support for this isn't fully implemente
 ### Supported model IDs
 Users can send these model IDs to the proxy to invoke the corresponding models.
 - **Claude**
-  - `anthropic.claude-v1` (~18k context, claude 1.3 -- EOL 2024-02-28)
-  - `anthropic.claude-v2` (~100k context, claude 2.0)
-  - `anthropic.claude-v2:1` (~200k context, claude 2.1)
+  - `anthropic.claude-v1` (~18k context)
+  - `anthropic.claude-v2` (~100k context)
 - **Claude Instant**
-  - `anthropic.claude-instant-v1` (~100k context, claude instant 1.2)
+  - `anthropic.claude-instant-v1`
 
 ## Note regarding logging
 

docs/azure-configuration.md

@@ -1,30 +0,0 @@
-# Configuring the proxy for Azure
-
-The proxy supports Azure OpenAI Service via the `/proxy/azure/openai` endpoint. The process of setting it up is slightly different from regular OpenAI.
-
-- [Setting keys](#setting-keys)
-- [Model assignment](#model-assignment)
-
-## Setting keys
-
-Use the `AZURE_CREDENTIALS` environment variable to set the Azure API keys.
-
-Like other APIs, you can provide multiple keys separated by commas. Each Azure key, however, is a set of values including the Resource Name, Deployment ID, and API key. These are separated by a colon (`:`).
-
-For example:
-```
-AZURE_CREDENTIALS=contoso-ml:gpt4-8k:0123456789abcdef0123456789abcdef,northwind-corp:testdeployment:0123456789abcdef0123456789abcdef
-```
-
-## Model assignment
-Note that each Azure deployment is assigned a model when you create it in the Azure OpenAI Service portal. If you want to use a different model, you'll need to create a new deployment, and therefore a new key to be added to the AZURE_CREDENTIALS environment variable. Each credential only grants access to one model.
-
-### Supported model IDs
-Users can send normal OpenAI model IDs to the proxy to invoke the corresponding models. For the most part they work the same with Azure. GPT-3.5 Turbo has an ID of "gpt-35-turbo" because Azure doesn't allow periods in model names, but the proxy should automatically convert this to the correct ID.
-
-As noted above, you can only use model IDs for which a deployment has been created and added to the proxy.
-
-## On content filtering
-Be aware that all Azure OpenAI Service deployments have content filtering enabled by default at a Medium level. Prompts or responses which are deemed to be inappropriate will be rejected by the API. This is a feature of the Azure OpenAI Service and not the proxy.
-
-You can disable this from deployment's settings within Azure, but you would need to request an exemption from Microsoft for your organization first. See [this page](https://learn.microsoft.com/en-us/azure/ai-services/openai/how-to/content-filters) for more information.

docs/dall-e-configuration.md

@@ -1,71 +0,0 @@
-# Configuring the proxy for DALL-E
-
-The proxy supports DALL-E 2 and DALL-E 3 image generation via the `/proxy/openai-images` endpoint. By default it is disabled as it is somewhat expensive and potentially more open to abuse than text generation.
-
-- [Updating your Dockerfile](#updating-your-dockerfile)
-- [Enabling DALL-E](#enabling-dall-e)
-- [Setting quotas](#setting-quotas)
-- [Rate limiting](#rate-limiting)
-
-## Updating your Dockerfile
-If you are using a previous version of the Dockerfile supplied with the proxy, it doesn't have the necessary permissions to let the proxy save temporary files.
-
-You can replace the entire thing with the new Dockerfile at [./docker/huggingface/Dockerfile](../docker/huggingface/Dockerfile) (or the equivalent for Render deployments).
-
-You can also modify your existing Dockerfile; just add the following lines after the `WORKDIR` line:
-
-```Dockerfile
-# Existing
-RUN git clone https://gitgud.io/khanon/oai-reverse-proxy.git /app
-WORKDIR /app
-
-# Take ownership of the app directory and switch to the non-root user
-RUN chown -R 1000:1000 /app
-USER 1000
-
-# Existing
-RUN npm install
-```
-
-## Enabling DALL-E
-Add `dall-e` to the `ALLOWED_MODEL_FAMILIES` environment variable to enable DALL-E. For example:
-
-```
-# GPT3.5 Turbo, GPT-4, GPT-4 Turbo, and DALL-E
-ALLOWED_MODEL_FAMILIES=turbo,gpt-4,gpt-4turbo,dall-e
-
-# All models as of this writing
-ALLOWED_MODEL_FAMILIES=turbo,gpt4,gpt4-32k,gpt4-turbo,claude,gemini-pro,aws-claude,dall-e
-```
-
-Refer to [.env.example](../.env.example) for a full list of supported model families. You can add `dall-e` to that list to enable all models.
-
-## Setting quotas
-DALL-E doesn't bill by token like text generation models. Instead there is a fixed cost per image generated, depending on the model, image size, and selected quality.
-
-The proxy still uses tokens to set quotas for users. The cost for each generated image will be converted to "tokens" at a rate of 100000 tokens per US$1.00. This works out to a similar cost-per-token as GPT-4 Turbo, so you can use similar token quotas for both.
-
-Use `TOKEN_QUOTA_DALL_E` to set the default quota for image generation. Otherwise it works the same as token quotas for other models.
-
-```
-# ~50 standard DALL-E images per refresh period, or US$2.00
-TOKEN_QUOTA_DALL_E=200000
-```
-
-Refer to [https://openai.com/pricing](https://openai.com/pricing) for the latest pricing information. As of this writing, the cheapest DALL-E 3 image costs $0.04 per generation, which works out to 4000 tokens. Higher resolution and quality settings can cost up to $0.12 per image, or 12000 tokens. 
-
-## Rate limiting
-The old `MODEL_RATE_LIMIT` setting has been split into `TEXT_MODEL_RATE_LIMIT` and `IMAGE_MODEL_RATE_LIMIT`. Whatever value you previously set for `MODEL_RATE_LIMIT` will be used for text models.
-
-If you don't specify a `IMAGE_MODEL_RATE_LIMIT`, it defaults to half of the `TEXT_MODEL_RATE_LIMIT`, to a minimum of 1 image per minute.
-
-```
-# 4 text generations per minute, 2 images per minute
-TEXT_MODEL_RATE_LIMIT=4
-IMAGE_MODEL_RATE_LIMIT=2
-```
-
-If a prompt is filtered by OpenAI's content filter, it won't count towards the rate limit.
-
-## Hiding recent images
-By default, the proxy shows the last 12 recently generated images by users. You can hide this section by setting `SHOW_RECENT_IMAGES` to `false`.

docs/deploy-huggingface.md

@@ -1,7 +1,5 @@
 # Deploy to Huggingface Space
 
-**⚠️ This method is no longer recommended.  Please use the [self-hosting instructions](./self-hosting.md) instead.**
-
 This repository can be deployed to a [Huggingface Space](https://huggingface.co/spaces).  This is a free service that allows you to run a simple server in the cloud.  You can use it to safely share your OpenAI API key with a friend.
 
 ### 1. Get an API key
@@ -27,14 +25,11 @@ RUN apt-get update && \
     apt-get install -y git
 RUN git clone https://gitgud.io/khanon/oai-reverse-proxy.git /app
 WORKDIR /app
-RUN chown -R 1000:1000 /app
-USER 1000
 RUN npm install
 COPY Dockerfile greeting.md* .env* ./
 RUN npm run build
 EXPOSE 7860
 ENV NODE_ENV=production
-ENV NODE_OPTIONS="--max-old-space-size=12882"
 CMD [ "npm", "start" ]
 ```
 - Click "Commit new file to `main`" to save the Dockerfile.

docs/deploy-render.md

@@ -1,7 +1,4 @@
 # Deploy to Render.com
-
-**⚠️ This method is no longer recommended.  Please use the [self-hosting instructions](./self-hosting.md) instead.**
-
 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.
 
 ### 1. Create account
@@ -31,8 +28,6 @@ The service will be created according to the instructions in the `render.yaml` f
   - For example, `OPENAI_KEY=sk-abc123`.
 - Click **Save Changes**.
 
-**IMPORTANT:** Set `TRUSTED_PROXIES=3`, otherwise users' IP addresses will not be recorded correctly (the server will see the IP address of Render's load balancer instead of the user's real IP address).
-
 The service will automatically rebuild and deploy with the new environment variables.  This will take a few minutes.  The link to your deployed proxy will appear at the top of the page.
 
 If you want to change the URL, go to the **Settings** tab of your Web Service and click the **Edit** button next to **Name**.  You can also set a custom domain, though I haven't tried this yet.

docs/gcp-configuration.md

@@ -1,35 +0,0 @@
-# Configuring the proxy for Vertex AI (GCP)
-
-The proxy supports GCP models via the `/proxy/gcp/claude` endpoint. There are a few extra steps necessary to use GCP compared to the other supported APIs.
-
-- [Setting keys](#setting-keys)
-- [Setup Vertex AI](#setup-vertex-ai)
-- [Supported model IDs](#supported-model-ids)
-
-## Setting keys
-
-Use the `GCP_CREDENTIALS` environment variable to set the GCP API keys.
-
-Like other APIs, you can provide multiple keys separated by commas. Each GCP key, however, is a set of credentials including the project id, client email, region and private key. These are separated by a colon (`:`).
-
-For example:
-
-```
-GCP_CREDENTIALS=my-first-project:xxx@yyy.com:us-east5:-----BEGIN PRIVATE KEY-----xxx-----END PRIVATE KEY-----,my-first-project2:xxx2@yyy.com:us-east5:-----BEGIN PRIVATE KEY-----xxx-----END PRIVATE KEY-----
-```
-
-## Setup Vertex AI
-1. Go to [https://cloud.google.com/vertex-ai](https://cloud.google.com/vertex-ai) and sign up for a GCP account. ($150 free credits without credit card or $300 free credits with credit card, credits expire in 90 days)
-2. Go to [https://console.cloud.google.com/marketplace/product/google/aiplatform.googleapis.com](https://console.cloud.google.com/marketplace/product/google/aiplatform.googleapis.com) to enable Vertex AI API.
-3. Go to [https://console.cloud.google.com/vertex-ai](https://console.cloud.google.com/vertex-ai) and navigate to Model Garden to apply for access to the Claude models.
-4. Create a [Service Account](https://console.cloud.google.com/projectselector/iam-admin/serviceaccounts/create?walkthrough_id=iam--create-service-account#step_index=1) , and make sure to grant the role of "Vertex AI User" or "Vertex AI Administrator".
-5. On the service account page you just created, create a new key and select "JSON". The JSON file will be downloaded automatically.
-6. The required credential is in the JSON file you just downloaded.
-
-## Supported model IDs
-Users can send these model IDs to the proxy to invoke the corresponding models.
-- **Claude**
-  - `claude-3-haiku@20240307`
-  - `claude-3-sonnet@20240229`
-  - `claude-3-opus@20240229`
-  - `claude-3-5-sonnet@20240620`

docs/pow-captcha.md

@@ -1,135 +0,0 @@
-# Proof-of-work Verification
-
-You can require users to complete a proof-of-work before they can access the
-proxy. This can increase the cost of denial of service attacks and slow down
-automated abuse.
-
-When configured, users access the challenge UI and request a token. The server
-sends a challenge to the client, which asks the user's browser to find a 
-solution to the challenge that meets a certain constraint (the difficulty
-level). Once the user has found a solution, they can submit it to the server
-and get a user token valid for a period you specify.
-
-The proof-of-work challenge uses the argon2id hash function.
-
-## Configuration
-
-To enable proof-of-work verification, set the following environment variables:
-
-```
-GATEKEEPER=user_token
-CAPTCHA_MODE=proof_of_work
-# Validity of the token in hours
-POW_TOKEN_HOURS=24
-# Max number of IPs that can use a user_token issued via proof-of-work
-POW_TOKEN_MAX_IPS=2
-# The difficulty level of the proof-of-work challenge. You can use one of the
-# predefined levels specified below, or you can specify a custom number of
-# expected hash iterations.
-POW_DIFFICULTY_LEVEL=low
-# The time limit for solving the challenge, in minutes
-POW_CHALLENGE_TIMEOUT=30
-```
-
-## Difficulty Levels
-
-The difficulty level controls how long, on average, it will take for a user to
-solve the proof-of-work challenge. Due to randomness, the actual time can very
-significantly; lucky users may solve the challenge in a fraction of the average
-time, while unlucky users may take much longer.
-
-The difficulty level doesn't affect the speed of the hash function itself, only
-the number of hashes that will need to be computed. Therefore, the time required
-to complete the challenge scales linearly with the difficulty level's iteration
-count.
-
-You can adjust the difficulty level while the proxy is running from the admin
-interface.
-
-Be aware that there is a time limit for solving the challenge, by default set to
-30 minutes. Above 'high' difficulty, you will probably need to increase the time
-limit or it will be very hard for users with slow devices to find a solution
-within the time limit.
-
-### Low
-
-- Average of 200 iterations required
-- Default setting.
-
-### Medium
-
-- Average of 900 iterations required
-
-### High
-
-- Average of 1900 iterations required
-
-### Extreme
-
-- Average of 4000 iterations required
-- Not recommended unless you are expecting very high levels of abuse
-- May require increasing `POW_CHALLENGE_TIMEOUT`
-
-### Custom
-
-Setting `POW_DIFFICULTY_LEVEL` to an integer will use that number of iterations
-as the difficulty level.
-
-## Other challenge settings
-
-- `POW_CHALLENGE_TIMEOUT`: The time limit for solving the challenge, in minutes.
-  Default is 30.
-- `POW_TOKEN_HOURS`: The period of time for which a user token issued via proof-
-  of-work can be used. Default is 24 hours. Starts when the challenge is solved.
-- `POW_TOKEN_MAX_IPS`: The maximum number of unique IPs that can use a single
-  user token issued via proof-of-work. Default is 2.
-- `POW_TOKEN_PURGE_HOURS`: The period of time after which an expired user token
-  issued via proof-of-work will be removed from the database. Until it is
-  purged, users can refresh expired tokens by completing a half-difficulty
-  challenge. Default is 48 hours.
-- `POW_MAX_TOKENS_PER_IP`: The maximum number of active user tokens that can
-  be associated with a single IP address. After this limit is reached, the
-  oldest token will be forcibly expired when a new token is issued. Set to 0
-  to disable this feature. Default is 0.
-
-## Custom argon2id parameters
-
-You can set custom argon2id parameters for the proof-of-work challenge.
-Generally, you should not need to change these unless you have a specific
-reason to do so.
-
-The listed values are the defaults.
-
-```
-ARGON2_TIME_COST=8
-ARGON2_MEMORY_KB=65536
-ARGON2_PARALLELISM=1
-ARGON2_HASH_LENGTH=32
-```
-
-Increasing parallelism will not do much except increase memory consumption for
-both the client and server, because browser proof-of-work implementations are
-single-threaded. It's better to increase the time cost if you want to increase
-the difficulty.
-
-Increasing memory too much may cause memory exhaustion on some mobile devices,
-particularly on iOS due to the way Safari handles WebAssembly memory allocation.
-
-## Tested hash rates
-
-These were measured with the default argon2id parameters listed above. These
-tests were not at all scientific so take them with a grain of salt.
-
-Safari does not like large WASM memory usage, so concurrency is limited to 4 to
-avoid overallocating memory on mobile WebKit browsers. Thermal throttling can
-also significantly reduce hash rates on mobile devices.
-
-- Intel Core i9-13900K (Chrome): 33-35 H/s
-- Intel Core i9-13900K (Firefox): 29-32 H/s
-- Intel Core i9-13900K (Chrome, in VM limited to 4 cores): 12.2 - 13.0 H/s
-- iPad Pro (M2) (Safari, 6 workers): 8.0 - 10 H/s
-  - Thermal throttles early. 8 cores is normal concurrency, but unstable.
-- iPhone 15 Pro Max (Safari): 4.0 - 4.6 H/s
-- Samsung Galaxy S10e (Chrome): 3.6 - 3.8 H/s
-  - This is a 2019 phone almost matching an iPhone five years newer because of
-    bad Safari performance.

docs/self-hosting.md

@@ -1,150 +0,0 @@
-# Quick self-hosting guide
-
-Temporary guide for self-hosting. This will be improved in the future to provide more robust instructions and options. Provided commands are for Ubuntu.
-
-This uses prebuilt Docker images for convenience. If you want to make adjustments to the code you can instead clone the repo and follow the Local Development guide in the [README](../README.md).
-
-## Table of Contents
-- [Requirements](#requirements)
-- [Running the application](#running-the-application)
-- [Setting up a reverse proxy](#setting-up-a-reverse-proxy)
-  - [trycloudflare](#trycloudflare)
-  - [nginx](#nginx)
-    - [Example basic nginx configuration (no SSL)](#example-basic-nginx-configuration-no-ssl)
-    - [Example with Cloudflare SSL](#example-with-cloudflare-ssl)
-- [Updating/Restarting the application](#updatingrestarting-the-application)
-
-## Requirements
-
-- Docker
-- Docker Compose
-- A VPS with at least 512MB of RAM (1GB recommended)
-- A domain name
-
-If you don't have a VPS and domain name you can use TryCloudflare to set up a temporary URL that you can share with others. See [trycloudflare](#trycloudflare) for more information.
-
-## Running the application
-
-- Install Docker and Docker Compose
-- Create a new directory for the application
-  - This will contain your .env file, greeting file, and any user-generated files
-- Execute the following commands:
-  - ```
-    touch .env
-    touch greeting.md
-    echo "OPENAI_KEY=your-openai-key" >> .env
-    curl https://gitgud.io/khanon/oai-reverse-proxy/-/raw/main/docker/docker-compose-selfhost.yml -o docker-compose.yml
-    ```
-  - You can set further environment variables and keys in the `.env` file. See [.env.example](../.env.example) for a list of available options.
-  - You can set a custom greeting in `greeting.md`. This will be displayed on the homepage.
-- Run `docker compose up -d`
-
-You can check logs with `docker compose logs -n 100 -f`.
-
-The provided docker-compose file listens on port 7860 but binds to localhost only. You should use a reverse proxy to expose the application to the internet as described in the next section.
-
-## Setting up a reverse proxy
-
-Rather than exposing the application directly to the internet, it is recommended to set up a reverse proxy. This will allow you to use HTTPS and add additional security measures.
-
-### trycloudflare
-
-This will give you a temporary (72 hours) URL that you can use to let others connect to your instance securely, without having to set up a reverse proxy. If you are running the server on your home network, this is probably the best option.
-- Install `cloudflared` following the instructions at [try.cloudflare.com](https://try.cloudflare.com/).
-- Run `cloudflared tunnel --url http://localhost:7860`
-- You will be given a temporary URL that you can share with others.
-
-If you have a VPS, you should use a proper reverse proxy like nginx instead for a more permanent solution which will allow you to use your own domain name, handle SSL, and add additional security/anti-abuse measures.
-
-### nginx
-
-First, install nginx.
-- `sudo apt update && sudo apt install nginx`
-
-#### Example basic nginx configuration (no SSL)
-
-- `sudo nano /etc/nginx/sites-available/oai.conf`
-  - ```
-    server {
-        listen 80;
-        server_name example.com;
-    
-        location / {
-            proxy_pass http://localhost:7860;
-        }
-    }
-    ```
-  - Replace `example.com` with your domain name.
-  - Ctrl+X to exit, Y to save, Enter to confirm.
-- `sudo ln -s /etc/nginx/sites-available/oai.conf /etc/nginx/sites-enabled`
-- `sudo nginx -t`
-  - This will check the configuration file for errors.
-- `sudo systemctl restart nginx`
-  - This will restart nginx and apply the new configuration.
-
-#### Example with Cloudflare SSL
-
-This allows you to use a self-signed certificate on the server, and have Cloudflare handle client SSL. You need to have a Cloudflare account and have your domain set up with Cloudflare already, pointing to your server's IP address.
-
-- Set Cloudflare to use Full SSL mode. Since we are using a self-signed certificate, don't use Full (strict) mode.
-- Create a self-signed certificate:
-  - `openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/nginx-selfsigned.key -out /etc/ssl/certs/nginx-selfsigned.crt`
-- `sudo nano /etc/nginx/sites-available/oai.conf`
-  - ```
-    server {
-        listen 443 ssl;
-        server_name yourdomain.com www.yourdomain.com;
-    
-        ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt;
-        ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key;
-    
-        # Only allow inbound traffic from Cloudflare
-        allow 173.245.48.0/20;
-        allow 103.21.244.0/22;
-        allow 103.22.200.0/22;
-        allow 103.31.4.0/22;
-        allow 141.101.64.0/18;
-        allow 108.162.192.0/18;
-        allow 190.93.240.0/20;
-        allow 188.114.96.0/20;
-        allow 197.234.240.0/22;
-        allow 198.41.128.0/17;
-        allow 162.158.0.0/15;
-        allow 104.16.0.0/13;
-        allow 104.24.0.0/14;
-        allow 172.64.0.0/13;
-        allow 131.0.72.0/22;
-        deny all;
-    
-        location / {
-            proxy_pass http://localhost:7860;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection 'upgrade';
-            proxy_set_header Host $host;
-            proxy_cache_bypass $http_upgrade;
-        }
-    
-        ssl_protocols TLSv1.2 TLSv1.3;
-        ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256';
-        ssl_prefer_server_ciphers on;
-        ssl_session_cache shared:SSL:10m;
-    }
-    ```
-  - Replace `yourdomain.com` with your domain name.
-  - Ctrl+X to exit, Y to save, Enter to confirm.
-- `sudo ln -s /etc/nginx/sites-available/oai.conf /etc/nginx/sites-enabled`
-
-## Updating/Restarting the application
-
-After making an .env change, you need to restart the application for it to take effect.
-
-- `docker compose down`
-- `docker compose up -d`
-
-To update the application to the latest version:
-
-- `docker compose pull`
-- `docker compose down`
-- `docker compose up -d`
-- `docker image prune -f`

docs/user-management.md

@@ -12,7 +12,6 @@ Several of these features require you to set secrets in your environment. If usi
   - [Memory](#memory)
   - [Firebase Realtime Database](#firebase-realtime-database)
     - [Firebase setup instructions](#firebase-setup-instructions)
-- [Whitelisting admin IP addresses](#whitelisting-admin-ip-addresses)
 
 ## No user management (`GATEKEEPER=none`)
 
@@ -62,12 +61,3 @@ To use Firebase Realtime Database to persist user data, set the following enviro
 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.
-
-## Whitelisting admin IP addresses
-You can add your own IP ranges to the `ADMIN_WHITELIST` environment variable for additional security.
-
-You can provide a comma-separated list containing individual IPv4 or IPv6 addresses, or CIDR ranges.
-
-To whitelist an entire IP range, use CIDR notation. For example, `192.168.0.1/24` would whitelist all addresses from `192.168.0.0` to `192.168.0.255`.
-
-To disable the whitelist, set `ADMIN_WHITELIST=0.0.0.0/0,::0`, which will allow access from any IPv4 or IPv6 address. This is the default behavior.

http-client.env.json

@@ -1,9 +0,0 @@
-{
-  "dev": {
-    "proxy-host": "http://localhost:7860",
-    "oai-key-1": "override in http-client.private.env.json",
-    "proxy-key": "override in http-client.private.env.json",
-    "azu-resource-name": "override in http-client.private.env.json",
-    "azu-deployment-id": "override in http-client.private.env.json"
-  }
-}

package.json

@@ -4,7 +4,6 @@
   "description": "Reverse proxy for the OpenAI API",
   "scripts": {
     "build": "tsc && copyfiles -u 1 src/**/*.ejs build",
-    "database:migrate": "ts-node scripts/migrate.ts",
     "prepare": "husky install",
     "start": "node build/server.js",
     "start:dev": "nodemon --watch src --exec ts-node --transpile-only src/server.ts",
@@ -19,41 +18,30 @@
   "license": "MIT",
   "dependencies": {
     "@anthropic-ai/tokenizer": "^0.0.4",
-    "@aws-crypto/sha256-js": "^5.2.0",
-    "@huggingface/jinja": "^0.3.0",
-    "@node-rs/argon2": "^1.8.3",
-    "@smithy/eventstream-codec": "^2.1.3",
-    "@smithy/eventstream-serde-node": "^2.1.3",
-    "@smithy/protocol-http": "^3.2.1",
-    "@smithy/signature-v4": "^2.1.3",
-    "@smithy/types": "^2.10.1",
-    "@smithy/util-utf8": "^2.1.1",
-    "axios": "^1.7.4",
-    "better-sqlite3": "^10.0.0",
-    "check-disk-space": "^3.4.0",
+    "@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.3.1",
-    "ejs": "^3.1.10",
+    "dotenv": "^16.0.3",
+    "ejs": "^3.1.9",
     "express": "^4.18.2",
     "express-session": "^1.17.3",
-    "firebase-admin": "^12.3.1",
-    "glob": "^10.3.12",
+    "firebase-admin": "^11.10.1",
     "googleapis": "^122.0.0",
     "http-proxy-middleware": "^3.0.0-beta.1",
-    "ipaddr.js": "^2.1.0",
+    "lifion-aws-event-stream": "^1.0.7",
     "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.13.0",
-    "sharp": "^0.32.6",
+    "sanitize-html": "^2.11.0",
     "showdown": "^2.1.0",
-    "source-map-support": "^0.5.21",
-    "stream-json": "^1.8.0",
     "tiktoken": "^1.0.10",
     "uuid": "^9.0.0",
     "zlib": "^1.0.5",
@@ -61,7 +49,6 @@
     "zod-error": "^1.5.0"
   },
   "devDependencies": {
-    "@types/better-sqlite3": "^7.6.10",
     "@types/cookie-parser": "^1.4.3",
     "@types/cors": "^2.8.13",
     "@types/express": "^4.17.17",
@@ -70,7 +57,6 @@
     "@types/node-schedule": "^2.1.0",
     "@types/sanitize-html": "^2.9.0",
     "@types/showdown": "^2.0.0",
-    "@types/stream-json": "^1.7.7",
     "@types/uuid": "^9.0.1",
     "concurrently": "^8.0.1",
     "esbuild": "^0.17.16",
@@ -79,13 +65,12 @@
     "nodemon": "^3.0.1",
     "pino-pretty": "^10.2.3",
     "prettier": "^3.0.3",
-    "prettier-plugin-ejs": "^1.0.3",
+    "source-map-support": "^0.5.21",
     "ts-node": "^10.9.1",
-    "typescript": "^5.4.2"
+    "typescript": "^5.1.3"
   },
   "overrides": {
-    "braces": "^3.0.3",
-    "fast-xml-parser": "^4.4.1",
-    "follow-redirects": "^1.15.4"
+    "google-gax": "^3.6.1",
+    "postcss": "^8.4.31"
   }
 }

public/css/reset.css

@@ -1,349 +0,0 @@
-/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
-
-/* Document
-   ========================================================================== */
-
-/**
- * 1. Correct the line height in all browsers.
- * 2. Prevent adjustments of font size after orientation changes in iOS.
- */
-
-html {
-    line-height: 1.15; /* 1 */
-    -webkit-text-size-adjust: 100%; /* 2 */
-}
-
-/* Sections
-   ========================================================================== */
-
-/**
- * Remove the margin in all browsers.
- */
-
-body {
-    margin: 0;
-}
-
-/**
- * Render the `main` element consistently in IE.
- */
-
-main {
-    display: block;
-}
-
-/**
- * Correct the font size and margin on `h1` elements within `section` and
- * `article` contexts in Chrome, Firefox, and Safari.
- */
-
-h1 {
-    font-size: 2em;
-    margin: 0.67em 0;
-}
-
-/* Grouping content
-   ========================================================================== */
-
-/**
- * 1. Add the correct box sizing in Firefox.
- * 2. Show the overflow in Edge and IE.
- */
-
-hr {
-    box-sizing: content-box; /* 1 */
-    height: 0; /* 1 */
-    overflow: visible; /* 2 */
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-pre {
-    font-family: monospace, monospace; /* 1 */
-    font-size: 1em; /* 2 */
-}
-
-/* Text-level semantics
-   ========================================================================== */
-
-/**
- * Remove the gray background on active links in IE 10.
- */
-
-a {
-    background-color: transparent;
-}
-
-/**
- * 1. Remove the bottom border in Chrome 57-
- * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
- */
-
-abbr[title] {
-    border-bottom: none; /* 1 */
-    text-decoration: underline; /* 2 */
-    text-decoration: underline dotted; /* 2 */
-}
-
-/**
- * Add the correct font weight in Chrome, Edge, and Safari.
- */
-
-b,
-strong {
-    font-weight: bolder;
-}
-
-/**
- * 1. Correct the inheritance and scaling of font size in all browsers.
- * 2. Correct the odd `em` font sizing in all browsers.
- */
-
-code,
-kbd,
-samp {
-    font-family: monospace, monospace; /* 1 */
-    font-size: 1em; /* 2 */
-}
-
-/**
- * Add the correct font size in all browsers.
- */
-
-small {
-    font-size: 80%;
-}
-
-/**
- * Prevent `sub` and `sup` elements from affecting the line height in
- * all browsers.
- */
-
-sub,
-sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-}
-
-sub {
-    bottom: -0.25em;
-}
-
-sup {
-    top: -0.5em;
-}
-
-/* Embedded content
-   ========================================================================== */
-
-/**
- * Remove the border on images inside links in IE 10.
- */
-
-img {
-    border-style: none;
-}
-
-/* Forms
-   ========================================================================== */
-
-/**
- * 1. Change the font styles in all browsers.
- * 2. Remove the margin in Firefox and Safari.
- */
-
-button,
-input,
-optgroup,
-select,
-textarea {
-    font-family: inherit; /* 1 */
-    font-size: 100%; /* 1 */
-    line-height: 1.15; /* 1 */
-    margin: 0; /* 2 */
-}
-
-/**
- * Show the overflow in IE.
- * 1. Show the overflow in Edge.
- */
-
-button,
-input { /* 1 */
-    overflow: visible;
-}
-
-/**
- * Remove the inheritance of text transform in Edge, Firefox, and IE.
- * 1. Remove the inheritance of text transform in Firefox.
- */
-
-button,
-select { /* 1 */
-    text-transform: none;
-}
-
-/**
- * Correct the inability to style clickable types in iOS and Safari.
- */
-
-button,
-[type="button"],
-[type="reset"],
-[type="submit"] {
-    -webkit-appearance: button;
-}
-
-/**
- * Remove the inner border and padding in Firefox.
- */
-
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-    border-style: none;
-    padding: 0;
-}
-
-/**
- * Restore the focus styles unset by the previous rule.
- */
-
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-    outline: 1px dotted ButtonText;
-}
-
-/**
- * Correct the padding in Firefox.
- */
-
-fieldset {
-    padding: 0.35em 0.75em 0.625em;
-}
-
-/**
- * 1. Correct the text wrapping in Edge and IE.
- * 2. Correct the color inheritance from `fieldset` elements in IE.
- * 3. Remove the padding so developers are not caught out when they zero out
- *    `fieldset` elements in all browsers.
- */
-
-legend {
-    box-sizing: border-box; /* 1 */
-    color: inherit; /* 2 */
-    display: table; /* 1 */
-    max-width: 100%; /* 1 */
-    padding: 0; /* 3 */
-    white-space: normal; /* 1 */
-}
-
-/**
- * Add the correct vertical alignment in Chrome, Firefox, and Opera.
- */
-
-progress {
-    vertical-align: baseline;
-}
-
-/**
- * Remove the default vertical scrollbar in IE 10+.
- */
-
-textarea {
-    overflow: auto;
-}
-
-/**
- * 1. Add the correct box sizing in IE 10.
- * 2. Remove the padding in IE 10.
- */
-
-[type="checkbox"],
-[type="radio"] {
-    box-sizing: border-box; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * Correct the cursor style of increment and decrement buttons in Chrome.
- */
-
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
-    height: auto;
-}
-
-/**
- * 1. Correct the odd appearance in Chrome and Safari.
- * 2. Correct the outline style in Safari.
- */
-
-[type="search"] {
-    -webkit-appearance: textfield; /* 1 */
-    outline-offset: -2px; /* 2 */
-}
-
-/**
- * Remove the inner padding in Chrome and Safari on macOS.
- */
-
-[type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none;
-}
-
-/**
- * 1. Correct the inability to style clickable types in iOS and Safari.
- * 2. Change font properties to `inherit` in Safari.
- */
-
-::-webkit-file-upload-button {
-    -webkit-appearance: button; /* 1 */
-    font: inherit; /* 2 */
-}
-
-/* Interactive
-   ========================================================================== */
-
-/*
- * Add the correct display in Edge, IE 10+, and Firefox.
- */
-
-details {
-    display: block;
-}
-
-/*
- * Add the correct display in all browsers.
- */
-
-summary {
-    display: list-item;
-}
-
-/* Misc
-   ========================================================================== */
-
-/**
- * Add the correct display in IE 10+.
- */
-
-template {
-    display: none;
-}
-
-/**
- * Add the correct display in IE 10.
- */
-
-[hidden] {
-    display: none;
-}

public/css/sakura-dark.css

@@ -1,231 +0,0 @@
-/* modified https://github.com/oxalorg/sakura */
-html {
-  font-size: 62.5%;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-    "Helvetica Neue", Arial, "Noto Sans", sans-serif;
-}
-body {
-  font-size: 1.8rem;
-  line-height: 1.618;
-  max-width: 38em;
-  margin: auto;
-  color: #c9c9c9;
-  background-color: #222222;
-  padding: 13px;
-}
-@media (max-width: 684px) {
-  body {
-    font-size: 1.53rem;
-  }
-}
-@media (max-width: 382px) {
-  body {
-    font-size: 1.35rem;
-  }
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  line-height: 1.1;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-    "Helvetica Neue", Arial, "Noto Sans", sans-serif;
-  font-weight: 700;
-  margin-top: 3rem;
-  margin-bottom: 1.5rem;
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-  -ms-word-break: break-all;
-  word-break: break-word;
-}
-h1 {
-  font-size: 2.35em;
-}
-h2 {
-  font-size: 2em;
-}
-h3 {
-  font-size: 1.75em;
-}
-h4 {
-  font-size: 1.5em;
-}
-h5 {
-  font-size: 1.25em;
-}
-h6 {
-  font-size: 1em;
-}
-p {
-  margin-top: 0px;
-  margin-bottom: 2.5rem;
-}
-small,
-sub,
-sup {
-  font-size: 75%;
-}
-hr {
-  border-color: #ffffff;
-}
-a {
-  text-decoration: none;
-  color: #ffffff;
-}
-a:visited {
-  color: #e6e6e6;
-}
-a:hover {
-  color: #c9c9c9;
-  text-decoration: underline;
-}
-ul {
-  padding-left: 1.4em;
-  margin-top: 0px;
-  margin-bottom: 2.5rem;
-}
-li {
-  margin-bottom: 0.4em;
-}
-blockquote {
-  margin-left: 0px;
-  margin-right: 0px;
-  padding-left: 1em;
-  padding-top: 0.8em;
-  padding-bottom: 0.8em;
-  padding-right: 0.8em;
-  border-left: 5px solid #ffffff;
-  margin-bottom: 2.5rem;
-  background-color: #4a4a4a;
-}
-blockquote p {
-  margin-bottom: 0;
-}
-img,
-video {
-  height: auto;
-  max-width: 100%;
-  margin-top: 0px;
-  margin-bottom: 2.5rem;
-}
-pre {
-  background-color: #4a4a4a;
-  display: block;
-  padding: 1em;
-  overflow-x: auto;
-  margin-top: 0px;
-  margin-bottom: 2.5rem;
-  font-size: 0.9em;
-}
-code,
-kbd,
-samp {
-  font-size: 0.9em;
-  padding: 0 0.5em;
-  background-color: #4a4a4a;
-  white-space: pre-wrap;
-}
-pre > code {
-  padding: 0;
-  background-color: transparent;
-  white-space: pre;
-  font-size: 1em;
-}
-table {
-  text-align: justify;
-  width: 100%;
-  border-collapse: collapse;
-  margin-bottom: 2rem;
-}
-td,
-th {
-  padding: 0.5em;
-  border-bottom: 1px solid #4a4a4a;
-}
-input,
-textarea {
-  border: 1px solid #c9c9c9;
-}
-input:focus,
-textarea:focus {
-  border: 1px solid #ffffff;
-}
-textarea {
-  width: 100%;
-}
-.button,
-button,
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="file"]::file-selector-button {
-  display: inline-block;
-  padding: 5px 10px;
-  text-align: center;
-  text-decoration: none;
-  white-space: nowrap;
-  background-color: #ffffff;
-  color: #222222;
-  border-radius: 1px;
-  border: 1px solid #ffffff;
-  cursor: pointer;
-  box-sizing: border-box;
-}
-.button[disabled],
-button[disabled],
-input[type="submit"][disabled],
-input[type="reset"][disabled],
-input[type="button"][disabled],
-input[type="file"][disabled] {
-  cursor: default;
-  opacity: 0.5;
-}
-.button:hover,
-button:hover,
-input[type="submit"]:hover,
-input[type="reset"]:hover,
-input[type="button"]:hover,
-input[type="file"]::file-selector-button:hover {
-  background-color: #c9c9c9;
-  color: #222222;
-  outline: 0;
-}
-.button:focus-visible,
-button:focus-visible,
-input[type="submit"]:focus-visible,
-input[type="reset"]:focus-visible,
-input[type="button"]:focus-visible,
-input[type="file"]::file-selector-button:focus-visible {
-  outline-style: solid;
-  outline-width: 2px;
-}
-textarea,
-select,
-input {
-  color: #c9c9c9;
-  padding: 6px 10px;
-  margin-bottom: 10px;
-  background-color: #4a4a4a;
-  border: 1px solid #4a4a4a;
-  border-radius: 4px;
-  box-shadow: none;
-  box-sizing: border-box;
-}
-textarea:focus,
-select:focus,
-input:focus {
-  border: 1px solid #ffffff;
-  outline: 0;
-}
-input[type="checkbox"]:focus {
-  outline: 1px dotted #ffffff;
-}
-label,
-legend,
-fieldset {
-  display: block;
-  margin-bottom: 0.5rem;
-  font-weight: 600;
-}

public/css/sakura.css

@@ -1,237 +0,0 @@
-/* modified https://github.com/oxalorg/sakura */
-:root {
-  --accent-color: #4a4a4a;
-  --accent-color-hover: #5a5a5a;
-  --link-color: #58739c;
-  --link-visted-color: #6f5e6f;
-}
-html {
-  font-size: 62.5%;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-    "Helvetica Neue", Arial, "Noto Sans", sans-serif;
-}
-body {
-  font-size: 1.8rem;
-  line-height: 1.618;
-  max-width: 38em;
-  margin: auto;
-  color: #4a4a4a;
-  background-color: #f9f9f9;
-  padding: 13px;
-}
-@media (max-width: 684px) {
-  body {
-    font-size: 1.53rem;
-  }
-}
-@media (max-width: 382px) {
-  body {
-    font-size: 1.35rem;
-  }
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  line-height: 1.1;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
-    "Helvetica Neue", Arial, "Noto Sans", sans-serif;
-  font-weight: 700;
-  margin-top: 3rem;
-  margin-bottom: 1.5rem;
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-  -ms-word-break: break-all;
-  word-break: break-word;
-}
-h1 {
-  font-size: 2.35em;
-}
-h2 {
-  font-size: 2em;
-}
-h3 {
-  font-size: 1.75em;
-}
-h4 {
-  font-size: 1.5em;
-}
-h5 {
-  font-size: 1.25em;
-}
-h6 {
-  font-size: 1em;
-}
-p {
-  margin-top: 0;
-  margin-bottom: 2.5rem;
-}
-small,
-sub,
-sup {
-  font-size: 75%;
-}
-hr {
-  border-color: var(--accent-color);
-}
-a {
-  text-decoration: none;
-  color: var(--link-color);
-}
-a:visited {
-  color: var(--link-visted-color);
-}
-a:hover {
-  color: var(--accent-color-hover);
-  text-decoration: underline;
-}
-ul {
-  padding-left: 1.4em;
-  margin-top: 0;
-  margin-bottom: 2.5rem;
-}
-li {
-  margin-bottom: 0.4em;
-}
-blockquote {
-  margin-left: 0;
-  margin-right: 0;
-  padding-left: 1em;
-  padding-top: 0.8em;
-  padding-bottom: 0.8em;
-  padding-right: 0.8em;
-  border-left: 5px solid var(--accent-color);
-  margin-bottom: 2.5rem;
-  background-color: #f1f1f1;
-}
-blockquote p {
-  margin-bottom: 0;
-}
-img,
-video {
-  height: auto;
-  max-width: 100%;
-  margin-top: 0;
-  margin-bottom: 2.5rem;
-}
-pre {
-  background-color: #f1f1f1;
-  display: block;
-  padding: 1em;
-  overflow-x: auto;
-  margin-top: 0;
-  margin-bottom: 2.5rem;
-  font-size: 0.9em;
-}
-code,
-kbd,
-samp {
-  font-size: 0.9em;
-  padding: 0 0.5em;
-  background-color: #f1f1f1;
-  white-space: pre-wrap;
-}
-pre > code {
-  padding: 0;
-  background-color: transparent;
-  white-space: pre;
-  font-size: 1em;
-}
-table {
-  text-align: justify;
-  width: 100%;
-  border-collapse: collapse;
-  margin-bottom: 2rem;
-}
-td,
-th {
-  padding: 0.5em;
-  border-bottom: 1px solid #f1f1f1;
-}
-input,
-textarea {
-  border: 1px solid #4a4a4a;
-}
-input:focus,
-textarea:focus {
-  border: 1px solid var(--accent-color);
-}
-textarea {
-  width: 100%;
-}
-.button,
-button,
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="file"]::file-selector-button {
-  display: inline-block;
-  padding: 5px 10px;
-  text-align: center;
-  text-decoration: none;
-  white-space: nowrap;
-  background-color: var(--accent-color);
-  color: #f9f9f9;
-  border-radius: 2px;
-  border: 1px solid var(--accent-color);
-  cursor: pointer;
-  box-sizing: border-box;
-}
-.button[disabled],
-button[disabled],
-input[type="submit"][disabled],
-input[type="reset"][disabled],
-input[type="button"][disabled],
-input[type="file"][disabled] {
-  cursor: default;
-  opacity: 0.5;
-}
-.button:hover,
-button:hover,
-input[type="submit"]:hover,
-input[type="reset"]:hover,
-input[type="button"]:hover,
-input[type="file"]::file-selector-button:hover {
-  background-color: var(--accent-color-hover);
-  color: #f9f9f9;
-  outline: 0;
-}
-.button:focus-visible,
-button:focus-visible,
-input[type="submit"]:focus-visible,
-input[type="reset"]:focus-visible,
-input[type="button"]:focus-visible,
-input[type="file"]::file-selector-button:focus-visible {
-  outline-style: solid;
-  outline-width: 2px;
-}
-textarea,
-select,
-input {
-  color: #4a4a4a;
-  padding: 6px 10px;
-  margin-bottom: 10px;
-  background-color: #f1f1f1;
-  border: 1px solid #f1f1f1;
-  border-radius: 4px;
-  box-shadow: none;
-  box-sizing: border-box;
-}
-textarea:focus,
-select:focus,
-input:focus {
-  border: 1px solid var(--accent-color);
-  outline: 0;
-}
-input[type="checkbox"]:focus {
-  outline: 1px dotted var(--accent-color);
-}
-label,
-legend,
-fieldset {
-  display: block;
-  margin-bottom: 0.5rem;
-  font-weight: 600;
-}

public/js/hash-worker.js

@@ -1,121 +0,0 @@
-importScripts(
-  "https://cdn.jsdelivr.net/npm/hash-wasm@4.11.0/dist/argon2.umd.min.js"
-);
-
-let active = false;
-let nonce = 0;
-let signature = "";
-let lastNotify = 0;
-let hashesSinceLastNotify = 0;
-let params = {
-  salt: null,
-  hashLength: 0,
-  iterations: 0,
-  memorySize: 0,
-  parallelism: 0,
-  targetValue: BigInt(0),
-  safariFix: false,
-};
-
-self.onmessage = async (event) => {
-  const { data } = event;
-  switch (data.type) {
-    case "stop":
-      active = false;
-      self.postMessage({ type: "paused", hashes: hashesSinceLastNotify });
-      return;
-    case "start":
-      active = true;
-      signature = data.signature;
-      nonce = data.nonce;
-
-      const c = data.challenge;
-      // decode salt to Uint8Array
-      const salt = new Uint8Array(c.s.length / 2);
-      for (let i = 0; i < c.s.length; i += 2) {
-        salt[i / 2] = parseInt(c.s.slice(i, i + 2), 16);
-      }
-
-      params = {
-        salt: salt,
-        hashLength: c.hl,
-        iterations: c.t,
-        memorySize: c.m,
-        parallelism: c.p,
-        targetValue: BigInt(c.d.slice(0, -1)),
-        safariFix: data.isMobileWebkit,
-      };
-
-      console.log("Started", params);
-      self.postMessage({ type: "started" });
-      setTimeout(solve, 0);
-      break;
-  }
-};
-
-const doHash = async (password) => {
-  const { salt, hashLength, iterations, memorySize, parallelism } = params;
-  return await self.hashwasm.argon2id({
-    password,
-    salt,
-    hashLength,
-    iterations,
-    memorySize,
-    parallelism,
-  });
-};
-
-const checkHash = (hash) => {
-  const { targetValue } = params;
-  const hashValue = BigInt(`0x${hash}`);
-  return hashValue <= targetValue;
-};
-
-const solve = async () => {
-  if (!active) {
-    console.log("Stopped solver", nonce);
-    return;
-  }
-
-  // Safari WASM doesn't like multiple calls in one worker
-  const batchSize = 1;
-  const batch = [];
-  for (let i = 0; i < batchSize; i++) {
-    batch.push(nonce++);
-  }
-
-  try {
-    const results = await Promise.all(
-      batch.map(async (nonce) => {
-        const hash = await doHash(String(nonce));
-        return { hash, nonce };
-      })
-    );
-    hashesSinceLastNotify += batchSize;
-
-    const solution = results.find(({ hash }) => checkHash(hash));
-    if (solution) {
-      console.log("Solution found", solution, params.salt);
-      self.postMessage({ type: "solved", nonce: solution.nonce });
-      active = false;
-    } else {
-      if (Date.now() - lastNotify > 1000) {
-        console.log("Last nonce", nonce, "Hashes", hashesSinceLastNotify);
-        self.postMessage({ type: "progress", hashes: hashesSinceLastNotify });
-        lastNotify = Date.now();
-        hashesSinceLastNotify = 0;
-      }
-      setTimeout(solve, 10);
-    }
-  } catch (error) {
-    console.error("Error", error);
-    const stack = error.stack;
-    const debug = {
-      stack,
-      lastNonce: nonce,
-      targetValue: params.targetValue,
-    };
-    self.postMessage({ type: "error", error: error.message, debug });
-    active = false;
-  }
-};

scripts/migrate.ts

@@ -1,39 +0,0 @@
-import Database from "better-sqlite3";
-import { DATABASE_VERSION, migrateDatabase } from "../src/shared/database";
-import { logger } from "../src/logger";
-import { config } from "../src/config";
-
-const log = logger.child({ module: "scripts/migrate" });
-
-async function runMigration() {
-  let targetVersion = Number(process.argv[2]) || undefined;
-
-  if (!targetVersion) {
-    log.info("Enter target version or leave empty to use the latest version.");
-    process.stdin.resume();
-    process.stdin.setEncoding("utf8");
-    const input = await new Promise<string>((resolve) => {
-      process.stdin.on("data", (text) => {
-        resolve((String(text) || "").trim());
-      });
-    });
-    process.stdin.pause();
-    targetVersion = Number(input);
-    if (!targetVersion) {
-      targetVersion = DATABASE_VERSION;
-    }
-  }
-
-  const db = new Database(config.sqliteDataPath, {
-    verbose: (msg, ...args) => log.debug({ args }, String(msg)),
-  });
-
-  const currentVersion = db.pragma("user_version", { simple: true });
-  log.info({ currentVersion, targetVersion }, "Running migrations.");
-  migrateDatabase(targetVersion, db);
-}
-
-runMigration().catch((error) => {
-  log.error(error, "Migration failed.");
-  process.exit(1);
-});

scripts/oai-reverse-proxy.http

@@ -1,309 +0,0 @@
-# OAI Reverse Proxy
-
-###
-# @name OpenAI -- Chat Completions
-POST https://api.openai.com/v1/chat/completions
-Authorization: Bearer {{oai-key-1}}
-Content-Type: application/json
-
-{
-  "model": "gpt-3.5-turbo",
-  "max_tokens": 30,
-  "stream": false,
-  "messages": [
-    {
-      "role": "user",
-      "content": "This is a test prompt."
-    }
-  ]
-}
-
-###
-# @name OpenAI -- Text Completions
-POST https://api.openai.com/v1/completions
-Authorization: Bearer {{oai-key-1}}
-Content-Type: application/json
-
-{
-  "model": "gpt-3.5-turbo-instruct",
-  "max_tokens": 30,
-  "stream": false,
-  "prompt": "This is a test prompt where"
-}
-
-###
-# @name OpenAI -- Create Embedding
-POST https://api.openai.com/v1/embeddings
-Authorization: Bearer {{oai-key-1}}
-Content-Type: application/json
-
-{
-  "model": "text-embedding-ada-002",
-  "input": "This is a test embedding input."
-}
-
-###
-# @name OpenAI -- Get Organizations
-GET https://api.openai.com/v1/organizations
-Authorization: Bearer {{oai-key-1}}
-
-###
-# @name OpenAI -- Get Models
-GET https://api.openai.com/v1/models
-Authorization: Bearer {{oai-key-1}}
-
-###
-# @name Azure OpenAI -- Chat Completions
-POST https://{{azu-resource-name}}.openai.azure.com/openai/deployments/{{azu-deployment-id}}/chat/completions?api-version=2023-09-01-preview
-api-key: {{azu-key-1}}
-Content-Type: application/json
-
-{
-  "max_tokens": 1,
-  "stream": false,
-  "messages": [
-    {
-      "role": "user",
-      "content": "This is a test prompt."
-    }
-  ]
-}
-
-###
-# @name Proxy / OpenAI -- Get Models
-GET {{proxy-host}}/proxy/openai/v1/models
-Authorization: Bearer {{proxy-key}}
-
-###
-# @name Proxy / OpenAI -- Native Chat Completions
-POST {{proxy-host}}/proxy/openai/chat/completions
-Authorization: Bearer {{proxy-key}}
-Content-Type: application/json
-
-{
-  "model": "gpt-4-1106-preview",
-  "max_tokens": 20,
-  "stream": true,
-  "temperature": 1,
-  "seed": 123,
-  "messages": [
-    {
-      "role": "user",
-      "content": "phrase one"
-    }
-  ]
-}
-
-###
-# @name Proxy / OpenAI -- Native Text Completions
-POST {{proxy-host}}/proxy/openai/v1/turbo-instruct/chat/completions
-Authorization: Bearer {{proxy-key}}
-Content-Type: application/json
-
-{
-  "model": "gpt-3.5-turbo-instruct",
-  "max_tokens": 20,
-  "temperature": 0,
-  "prompt": "Genshin Impact is a game about",
-  "stream": false
-}
-
-###
-# @name Proxy / OpenAI -- Chat-to-Text API Translation
-# Accepts a chat completion request and reformats it to work with the text completion API. `model` is ignored.
-POST {{proxy-host}}/proxy/openai/turbo-instruct/chat/completions
-Authorization: Bearer {{proxy-key}}
-Content-Type: application/json
-
-{
-  "model": "gpt-4",
-  "max_tokens": 20,
-  "stream": true,
-  "messages": [
-    {
-      "role": "user",
-      "content": "What is the name of the fourth president of the united states?"
-    },
-    {
-      "role": "assistant",
-      "content": "That would be George Washington."
-    },
-    {
-      "role": "user",
-      "content": "I don't think that's right..."
-    }
-  ]
-}
-
-###
-# @name Proxy / OpenAI -- Create Embedding
-POST {{proxy-host}}/proxy/openai/embeddings
-Authorization: Bearer {{proxy-key}}
-Content-Type: application/json
-
-{
-  "model": "text-embedding-ada-002",
-  "input": "This is a test embedding input."
-}
-
-
-###
-# @name Proxy / Anthropic -- Native Completion (old API)
-POST {{proxy-host}}/proxy/anthropic/v1/complete
-Authorization: Bearer {{proxy-key}}
-anthropic-version: 2023-01-01
-Content-Type: application/json
-
-{
-  "model": "claude-v1.3",
-  "max_tokens_to_sample": 20,
-  "temperature": 0.2,
-  "stream": true,
-  "prompt": "What is genshin impact\n\n:Assistant:"
-}
-
-###
-# @name Proxy / Anthropic -- Native Completion (2023-06-01 API)
-POST {{proxy-host}}/proxy/anthropic/v1/complete
-Authorization: Bearer {{proxy-key}}
-anthropic-version: 2023-06-01
-Content-Type: application/json
-
-{
-  "model": "claude-v1.3",
-  "max_tokens_to_sample": 20,
-  "temperature": 0.2,
-  "stream": true,
-  "prompt": "What is genshin impact\n\n:Assistant:"
-}
-
-###
-# @name Proxy / Anthropic -- OpenAI-to-Anthropic API Translation
-POST {{proxy-host}}/proxy/anthropic/v1/chat/completions
-Authorization: Bearer {{proxy-key}}
-#anthropic-version: 2023-06-01
-Content-Type: application/json
-
-{
-  "model": "gpt-3.5-turbo",
-  "max_tokens": 20,
-  "stream": false,
-  "temperature": 0,
-  "messages": [
-    {
-      "role": "user",
-      "content": "What is genshin impact"
-    }
-  ]
-}
-
-###
-# @name Proxy / AWS Claude -- Native Completion
-POST {{proxy-host}}/proxy/aws/claude/v1/complete
-Authorization: Bearer {{proxy-key}}
-anthropic-version: 2023-01-01
-Content-Type: application/json
-
-{
-  "model": "claude-v2",
-  "max_tokens_to_sample": 10,
-  "temperature": 0,
-  "stream": true,
-  "prompt": "What is genshin impact\n\n:Assistant:"
-}
-
-###
-# @name Proxy / AWS Claude -- OpenAI-to-Anthropic API Translation
-POST {{proxy-host}}/proxy/aws/claude/chat/completions
-Authorization: Bearer {{proxy-key}}
-Content-Type: application/json
-
-{
-  "model": "gpt-3.5-turbo",
-  "max_tokens": 50,
-  "stream": true,
-  "messages": [
-    {
-      "role": "user",
-      "content": "What is genshin impact?"
-    }
-  ]
-}
-
-###
-# @name Proxy / GCP Claude -- Native Completion
-POST {{proxy-host}}/proxy/gcp/claude/v1/complete
-Authorization: Bearer {{proxy-key}}
-anthropic-version: 2023-01-01
-Content-Type: application/json
-
-{
-  "model": "claude-v2",
-  "max_tokens_to_sample": 10,
-  "temperature": 0,
-  "stream": true,
-  "prompt": "What is genshin impact\n\n:Assistant:"
-}
-
-###
-# @name Proxy / GCP Claude -- OpenAI-to-Anthropic API Translation
-POST {{proxy-host}}/proxy/gcp/claude/chat/completions
-Authorization: Bearer {{proxy-key}}
-Content-Type: application/json
-
-{
-  "model": "gpt-3.5-turbo",
-  "max_tokens": 50,
-  "stream": true,
-  "messages": [
-    {
-      "role": "user",
-      "content": "What is genshin impact?"
-    }
-  ]
-}
-
-###
-# @name Proxy / Azure OpenAI -- Native Chat Completions
-POST {{proxy-host}}/proxy/azure/openai/chat/completions
-Authorization: Bearer {{proxy-key}}
-Content-Type: application/json
-
-{
-  "model": "gpt-4",
-  "max_tokens": 20,
-  "stream": true,
-  "temperature": 1,
-  "seed": 2,
-  "messages": [
-    {
-      "role": "user",
-      "content": "Hi what is the name of the fourth president of the united states?"
-    },
-    {
-      "role": "assistant",
-      "content": "That would be George Washington."
-    },
-    {
-      "role": "user",
-      "content": "That's not right."
-    }
-  ]
-}
-
-###
-# @name Proxy / Google AI -- OpenAI-to-Google AI API Translation
-POST {{proxy-host}}/proxy/google-ai/v1/chat/completions
-Authorization: Bearer {{proxy-key}}
-Content-Type: application/json
-
-{
-  "model": "gpt-4",
-  "max_tokens": 42,
-  "messages": [
-    {
-      "role": "user",
-      "content": "Hi what is the name of the fourth president of the united states?"
-    }
-  ]
-}

scripts/seed-events.ts

@@ -1,102 +0,0 @@
-import Database from "better-sqlite3";
-import { v4 as uuidv4 } from "uuid";
-import { config } from "../src/config";
-
-function generateRandomIP() {
-  return (
-    Math.floor(Math.random() * 255) +
-    "." +
-    Math.floor(Math.random() * 255) +
-    "." +
-    Math.floor(Math.random() * 255) +
-    "." +
-    Math.floor(Math.random() * 255)
-  );
-}
-
-function generateRandomDate() {
-  const end = new Date();
-  const start = new Date(end);
-  start.setDate(end.getDate() - 90);
-  const randomDate = new Date(
-    start.getTime() + Math.random() * (end.getTime() - start.getTime())
-  );
-  return randomDate.toISOString();
-}
-
-function generateMockSHA256() {
-  const characters = 'abcdef0123456789';
-  let hash = '';
-
-  for (let i = 0; i < 64; i++) {
-    const randomIndex = Math.floor(Math.random() * characters.length);
-    hash += characters[randomIndex];
-  }
-
-  return hash;
-}
-
-function getRandomModelFamily() {
-  const modelFamilies = [
-    "turbo",
-    "gpt4",
-    "gpt4-32k",
-    "gpt4-turbo",
-    "claude",
-    "claude-opus",
-    "gemini-pro",
-    "mistral-tiny",
-    "mistral-small",
-    "mistral-medium",
-    "mistral-large",
-    "aws-claude",
-    "aws-claude-opus",
-    "gcp-claude",
-    "gcp-claude-opus",
-    "azure-turbo",
-    "azure-gpt4",
-    "azure-gpt4-32k",
-    "azure-gpt4-turbo",
-    "dall-e",
-    "azure-dall-e",
-  ];
-  return modelFamilies[Math.floor(Math.random() * modelFamilies.length)];
-}
-
-(async () => {
-  const db = new Database(config.sqliteDataPath);
-  const numRows = 100;
-  const insertStatement = db.prepare(`
-  INSERT INTO events (type, ip, date, model, family, hashes, userToken, inputTokens, outputTokens)
-  VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-`);
-
-  const users = Array.from({ length: 10 }, () => uuidv4());
-  function getRandomUser() {
-    return users[Math.floor(Math.random() * users.length)];
-  }
-
-  const transaction = db.transaction(() => {
-    for (let i = 0; i < numRows; i++) {
-      insertStatement.run(
-        "chat_completion",
-        generateRandomIP(),
-        generateRandomDate(),
-        getRandomModelFamily() + "-" + Math.floor(Math.random() * 100),
-        getRandomModelFamily(),
-        Array.from(
-          { length: Math.floor(Math.random() * 10) },
-          generateMockSHA256
-        ).join(","),
-        getRandomUser(),
-        Math.floor(Math.random() * 500),
-        Math.floor(Math.random() * 6000)
-      );
-    }
-  });
-
-  transaction();
-
-  console.log(`Inserted ${numRows} rows into the events table.`);
-  db.close();
-})();

scripts/test-aws-signing.ts

@@ -1,118 +0,0 @@
-// uses the aws sdk to sign a request, then uses axios to send it to the bedrock REST API manually
-import axios from "axios";
-import { Sha256 } from "@aws-crypto/sha256-js";
-import { SignatureV4 } from "@smithy/signature-v4";
-import { HttpRequest } from "@smithy/protocol-http";
-
-const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID!;
-const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY!;
-
-// Copied from amazon bedrock docs
-
-// List models
-// ListFoundationModels
-// Service: Amazon Bedrock
-// List of Bedrock foundation models that you can use. For more information, see Foundation models in the
-// Bedrock User Guide.
-//   Request Syntax
-// GET /foundation-models?
-//   byCustomizationType=byCustomizationType&byInferenceType=byInferenceType&byOutputModality=byOutputModality&byProvider=byProvider
-//   HTTP/1.1
-// URI Request Parameters
-// The request uses the following URI parameters.
-// byCustomizationType (p. 38)
-// List by customization type.
-//   Valid Values: FINE_TUNING
-// byInferenceType (p. 38)
-// List by inference type.
-//   Valid Values: ON_DEMAND | PROVISIONED
-// byOutputModality (p. 38)
-// List by output modality type.
-//   Valid Values: TEXT | IMAGE | EMBEDDING
-// byProvider (p. 38)
-// A Bedrock model provider.
-//   Pattern: ^[a-z0-9-]{1,63}$
-// Request Body
-// The request does not have a request body
-
-// Run inference on a text model
-// Send an invoke request to run inference on a Titan Text G1 - Express model. We set the accept
-// parameter to accept any content type in the response.
-//   POST https://bedrock.us-east-1.amazonaws.com/model/amazon.titan-text-express-v1/invoke
-//   -H accept: */*
-// -H content-type: application/json
-// Payload
-// {"inputText": "Hello world"}
-// Example response
-// Response for the above request.
-// -H content-type: application/json
-// Payload
-// <the model response>
-
-const AMZ_REGION = "us-east-1";
-const AMZ_HOST = "invoke-bedrock.us-east-1.amazonaws.com";
-
-async function listModels() {
-  const httpRequest = new HttpRequest({
-    method: "GET",
-    protocol: "https:",
-    hostname: AMZ_HOST,
-    path: "/foundation-models",
-    headers: { ["Host"]: AMZ_HOST },
-  });
-
-  const signedRequest = await signRequest(httpRequest);
-  const response = await axios.get(
-    `https://${signedRequest.hostname}${signedRequest.path}`,
-    { headers: signedRequest.headers }
-  );
-  console.log(response.data);
-}
-
-async function invokeModel() {
-  const model = "anthropic.claude-v1";
-  const httpRequest = new HttpRequest({
-    method: "POST",
-    protocol: "https:",
-    hostname: AMZ_HOST,
-    path: `/model/${model}/invoke`,
-    headers: {
-      ["Host"]: AMZ_HOST,
-      ["accept"]: "*/*",
-      ["content-type"]: "application/json",
-    },
-    body: JSON.stringify({
-      temperature: 0.5,
-      prompt: "\n\nHuman:Hello world\n\nAssistant:",
-      max_tokens_to_sample: 10,
-    }),
-  });
-  console.log("httpRequest", httpRequest);
-
-  const signedRequest = await signRequest(httpRequest);
-  const response = await axios.post(
-    `https://${signedRequest.hostname}${signedRequest.path}`,
-    signedRequest.body,
-    { headers: signedRequest.headers }
-  );
-  console.log(response.status);
-  console.log(response.headers);
-  console.log(response.data);
-  console.log("full url", response.request.res.responseUrl);
-}
-
-async function signRequest(request: HttpRequest) {
-  const signer = new SignatureV4({
-    sha256: Sha256,
-    credentials: {
-      accessKeyId: AWS_ACCESS_KEY_ID,
-      secretAccessKey: AWS_SECRET_ACCESS_KEY,
-    },
-    region: AMZ_REGION,
-    service: "bedrock",
-  });
-  return await signer.sign(request, { signingDate: new Date() });
-}
-
-// listModels();
-// invokeModel();

scripts/test-concurrency.js

@@ -1,45 +0,0 @@
-const axios = require("axios");
-
-const concurrentRequests = 75;
-const headers = {
-  Authorization: "Bearer test",
-  "Content-Type": "application/json",
-};
-
-const payload = {
-  model: "gpt-4",
-  max_tokens: 1,
-  stream: false,
-  messages: [{ role: "user", content: "Hi" }],
-};
-
-const makeRequest = async (i) => {
-  try {
-    const response = await axios.post(
-      "http://localhost:7860/proxy/google-ai/v1/chat/completions",
-      payload,
-      { headers }
-    );
-    console.log(
-      `Req ${i} finished with status code ${response.status} and response:`,
-      response.data
-    );
-  } catch (error) {
-    const msg = error.response
-    console.error(`Error in req ${i}:`, error.message, msg || "");
-  }
-};
-
-const executeRequestsConcurrently = () => {
-  const promises = [];
-  for (let i = 1; i <= concurrentRequests; i++) {
-    console.log(`Starting request ${i}`);
-    promises.push(makeRequest(i));
-  }
-
-  Promise.all(promises).then(() => {
-    console.log("All requests finished");
-  });
-};
-
-executeRequestsConcurrently();

src/admin/api/events.ts

@@ -1,49 +0,0 @@
-import { Router } from "express";
-import { z } from "zod";
-import { encodeCursor, decodeCursor } from "../../shared/utils";
-import { eventsRepo } from "../../shared/database/repos/event";
-
-const router = Router();
-
-/**
- * Returns events for the given user token.
- * GET /admin/events/:token
- * @query first - The number of events to return.
- * @query after - The cursor to start returning events from (exclusive).
- */
-router.get("/:token", (req, res) => {
-  const schema = z.object({
-    token: z.string(),
-    first: z.coerce.number().int().positive().max(200).default(25),
-    after: z
-      .string()
-      .optional()
-      .transform((v) => {
-        try {
-          return decodeCursor(v);
-        } catch {
-          return null;
-        }
-      })
-      .nullable(),
-    sort: z.string().optional(),
-  });
-  const args = schema.safeParse({ ...req.params, ...req.query });
-  if (!args.success) {
-    return res.status(400).json({ error: args.error });
-  }
-
-  const data = eventsRepo
-    .getUserEvents(args.data.token, {
-      limit: args.data.first,
-      cursor: args.data.after,
-    })
-    .map((e) => ({ node: e, cursor: encodeCursor(e.date) }));
-
-  res.json({
-    data,
-    endCursor: data[data.length - 1]?.cursor,
-  });
-});
-
-export { router as eventsApiRouter };

src/admin/routes.ts

@@ -1,31 +1,15 @@
 import express, { Router } from "express";
-import { createWhitelistMiddleware } from "../shared/cidr";
+import { authorize } from "./auth";
 import { HttpError } from "../shared/errors";
-import { injectCsrfToken, checkCsrfToken } from "../shared/inject-csrf";
 import { injectLocals } from "../shared/inject-locals";
 import { withSession } from "../shared/with-session";
-import { config } from "../config";
-import { renderPage } from "../info-page";
-import { buildInfo } from "../service-info";
-import { authorize } from "./auth";
+import { injectCsrfToken, checkCsrfToken } from "../shared/inject-csrf";
 import { loginRouter } from "./login";
-import { eventsApiRouter } from "./api/events";
-import { usersApiRouter } from "./api/users";
+import { usersApiRouter as apiRouter } from "./api/users";
 import { usersWebRouter as webRouter } from "./web/manage";
-import { logger } from "../logger";
 
 const adminRouter = Router();
 
-const whitelist = createWhitelistMiddleware(
-  "ADMIN_WHITELIST",
-  config.adminWhitelist
-);
-
-if (!whitelist.ranges.length && config.adminKey?.length) {
-  logger.error("ADMIN_WHITELIST is empty. No admin requests will be allowed. Set 0.0.0.0/0 to allow all.");
-}
-
-adminRouter.use(whitelist);
 adminRouter.use(
   express.json({ limit: "20mb" }),
   express.urlencoded({ extended: true, limit: "20mb" })
@@ -33,18 +17,12 @@ adminRouter.use(
 adminRouter.use(withSession);
 adminRouter.use(injectCsrfToken);
 
-adminRouter.use("/users", authorize({ via: "header" }), usersApiRouter);
-adminRouter.use("/events", authorize({ via: "header" }), eventsApiRouter);
+adminRouter.use("/users", authorize({ via: "header" }), apiRouter);
 
 adminRouter.use(checkCsrfToken);
 adminRouter.use(injectLocals);
 adminRouter.use("/", loginRouter);
 adminRouter.use("/manage", authorize({ via: "cookie" }), webRouter);
-adminRouter.use("/service-info", authorize({ via: "cookie" }), (req, res) => {
-  return res.send(
-    renderPage(buildInfo(req.protocol + "://" + req.get("host"), true))
-  );
-});
 
 adminRouter.use(
   (

src/admin/web/manage.ts

@@ -1,5 +1,4 @@
 import { Router } from "express";
-import ipaddr from "ipaddr.js";
 import multer from "multer";
 import { z } from "zod";
 import { config } from "../../config";
@@ -7,7 +6,7 @@ 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 { LLMService, MODEL_FAMILIES } from "../../shared/models";
+import { MODEL_FAMILIES } from "../../shared/models";
 import { getTokenCostUsd, prettyTokens } from "../../shared/stats";
 import {
   User,
@@ -15,9 +14,6 @@ import {
   UserSchema,
   UserTokenCounts,
 } from "../../shared/users/schema";
-import { getLastNImages } from "../../shared/file-storage/image-history";
-import { blacklists, parseCidrs, whitelists } from "../../shared/cidr";
-import { invalidatePowHmacKey } from "../../user/web/pow-captcha";
 
 const router = Router();
 
@@ -43,74 +39,6 @@ router.get("/create-user", (req, res) => {
   });
 });
 
-router.get("/anti-abuse", (_req, res) => {
-  const wl = [...whitelists.entries()];
-  const bl = [...blacklists.entries()];
-
-  res.render("admin_anti-abuse", {
-    captchaMode: config.captchaMode,
-    difficulty: config.powDifficultyLevel,
-    whitelists: wl.map((w) => ({
-      name: w[0],
-      mode: "whitelist",
-      ranges: w[1].ranges,
-    })),
-    blacklists: bl.map((b) => ({
-      name: b[0],
-      mode: "blacklist",
-      ranges: b[1].ranges,
-    })),
-  });
-});
-
-router.post("/cidr", (req, res) => {
-  const body = req.body;
-  const valid = z
-    .object({
-      action: z.enum(["add", "remove"]),
-      mode: z.enum(["whitelist", "blacklist"]),
-      name: z.string().min(1),
-      mask: z.string().min(1),
-    })
-    .safeParse(body);
-
-  if (!valid.success) {
-    throw new HttpError(
-      400,
-      valid.error.issues.flatMap((issue) => issue.message).join(", ")
-    );
-  }
-
-  const { mode, name, mask } = valid.data;
-  const list = (mode === "whitelist" ? whitelists : blacklists).get(name);
-  if (!list) {
-    throw new HttpError(404, "List not found");
-  }
-  if (valid.data.action === "remove") {
-    const newRanges = new Set(list.ranges);
-    newRanges.delete(mask);
-    list.updateRanges([...newRanges]);
-    req.session.flash = {
-      type: "success",
-      message: `${mode} ${name} updated`,
-    };
-    return res.redirect("/admin/manage/anti-abuse");
-  } else if (valid.data.action === "add") {
-    const result = parseCidrs(mask);
-    if (result.length === 0) {
-      throw new HttpError(400, "Invalid CIDR mask");
-    }
-
-    const newRanges = new Set([...list.ranges, mask]);
-    list.updateRanges([...newRanges]);
-    req.session.flash = {
-      type: "success",
-      message: `${mode} ${name} updated`,
-    };
-    return res.redirect("/admin/manage/anti-abuse");
-  }
-});
-
 router.post("/create-user", (req, res) => {
   const body = req.body;
 
@@ -268,20 +196,13 @@ router.post("/maintenance", (req, res) => {
   let flash = { type: "", message: "" };
   switch (action) {
     case "recheck": {
-      const checkable: LLMService[] = [
-        "openai",
-        "anthropic",
-        "aws",
-        "gcp",
-        "azure",
-      ];
-      checkable.forEach((s) => keyPool.recheck(s));
-      const keyCount = keyPool
+      keyPool.recheck("openai");
+      keyPool.recheck("anthropic");
+      const size = keyPool
         .list()
-        .filter((k) => checkable.includes(k.service)).length;
-
+        .filter((k) => k.service !== "google-palm").length;
       flash.type = "success";
-      flash.message = `Scheduled recheck of ${keyCount} keys.`;
+      flash.message = `Scheduled recheck of ${size} keys for OpenAI and Anthropic.`;
       break;
     }
     case "resetQuotas": {
@@ -299,137 +220,14 @@ router.post("/maintenance", (req, res) => {
       flash.message = `All users' token usage records reset.`;
       break;
     }
-    case "downloadImageMetadata": {
-      const data = JSON.stringify(
-        {
-          exportedAt: new Date().toISOString(),
-          generations: getLastNImages(),
-        },
-        null,
-        2
-      );
-      res.setHeader(
-        "Content-Disposition",
-        `attachment; filename=image-metadata-${new Date().toISOString()}.json`
-      );
-      res.setHeader("Content-Type", "application/json");
-      return res.send(data);
-    }
-    case "expireTempTokens": {
-      const users = userStore.getUsers();
-      const temps = users.filter((u) => u.type === "temporary");
-      temps.forEach((user) => {
-        user.expiresAt = Date.now();
-        user.disabledReason = "Admin forced expiration.";
-        userStore.upsertUser(user);
-      });
-      invalidatePowHmacKey();
-      flash.type = "success";
-      flash.message = `${temps.length} temporary users marked for expiration.`;
-      break;
-    }
-    case "cleanTempTokens": {
-      const users = userStore.getUsers();
-      const disabledTempUsers = users.filter(
-        (u) => u.type === "temporary" && u.expiresAt && u.expiresAt < Date.now()
-      );
-      disabledTempUsers.forEach((user) => {
-        user.disabledAt = 1; //will be cleaned up by the next cron job
-        userStore.upsertUser(user);
-      });
-      flash.type = "success";
-      flash.message = `${disabledTempUsers.length} disabled temporary users marked for cleanup.`;
-      break;
-    }
-    case "setDifficulty": {
-      const selected = req.body["pow-difficulty"];
-      const valid = ["low", "medium", "high", "extreme"];
-      if (!selected || !valid.includes(selected)) {
-        throw new HttpError(400, "Invalid difficulty" + selected);
-      }
-      config.powDifficultyLevel = selected;
-      break;
-    }
-    case "generateTempIpReport": {
-      const tempUsers = userStore
-        .getUsers()
-        .filter((u) => u.type === "temporary");
-      const ipv4RangeMap = new Map<string, Set<string>>();
-      const ipv6RangeMap = new Map<string, Set<string>>();
-
-      tempUsers.forEach((u) => {
-        u.ip.forEach((ip) => {
-          try {
-            const parsed = ipaddr.parse(ip);
-            if (parsed.kind() === "ipv4") {
-              const subnet =
-                parsed.toNormalizedString().split(".").slice(0, 3).join(".") +
-                ".0/24";
-              const userSet = ipv4RangeMap.get(subnet) || new Set();
-              userSet.add(u.token);
-              ipv4RangeMap.set(subnet, userSet);
-            } else if (parsed.kind() === "ipv6") {
-              const subnet =
-                parsed.toNormalizedString().split(":").slice(0, 4).join(":") +
-                "::/48";
-              const userSet = ipv6RangeMap.get(subnet) || new Set();
-              userSet.add(u.token);
-              ipv6RangeMap.set(subnet, userSet);
-            }
-          } catch (e) {
-            req.log.warn(
-              { ip, error: e.message },
-              "Invalid IP address; skipping"
-            );
-          }
-        });
-      });
-
-      const ipv4Ranges = Array.from(ipv4RangeMap.entries())
-        .map(([subnet, userSet]) => ({
-          subnet,
-          distinctTokens: userSet.size,
-        }))
-        .sort((a, b) => b.distinctTokens - a.distinctTokens);
-
-      const ipv6Ranges = Array.from(ipv6RangeMap.entries())
-        .map(([subnet, userSet]) => ({
-          subnet,
-          distinctTokens: userSet.size,
-        }))
-        .sort((a, b) => {
-          if (a.distinctTokens === b.distinctTokens) {
-            return a.subnet.localeCompare(b.subnet);
-          }
-          return b.distinctTokens - a.distinctTokens;
-        });
-
-      const data = JSON.stringify(
-        {
-          exportedAt: new Date().toISOString(),
-          ipv4Ranges,
-          ipv6Ranges,
-        },
-        null,
-        2
-      );
-
-      res.setHeader(
-        "Content-Disposition",
-        `attachment; filename=temp-ip-report-${new Date().toISOString()}.json`
-      );
-      res.setHeader("Content-Type", "application/json");
-      return res.send(data);
-    }
     default: {
       throw new HttpError(400, "Invalid action");
     }
   }
 
   req.session.flash = flash;
-  const referer = req.get("referer");
 
-  return res.redirect(referer || "/admin/manage");
+  return res.redirect(`/admin/manage`);
 });
 
 router.get("/download-stats", (_req, res) => {

src/admin/web/views/admin_anti-abuse.ejs

@@ -1,140 +0,0 @@
-<%- include("partials/shared_header", { title: "Proof of Work Verification Settings - OAI Reverse Proxy Admin" }) %>
-<style>
-  details {
-    margin-top: 1em;
-  }
-  details summary {
-    font-weight: bold;
-    cursor: pointer;
-  }
-  details p {
-    margin-left: 1em;
-  }
-
-  #token-manage {
-    display: flex;
-    width: 100%;
-  }
-  #token-manage button {
-    flex-grow: 1;
-    margin: 0 0.5em;
-  }
-</style>
-
-<h1>Abuse Mitigation Settings</h1>
-<div>
-  <h2>Proof-of-Work Verification</h2>
-  <p>
-    The Proof-of-Work difficulty level is used to determine how much work a client must perform to earn a temporary user
-    token. Higher difficulty levels require more work, which can help mitigate abuse by making it more expensive for
-    attackers to generate tokens. However, higher difficulty levels can also make it more difficult for legitimate users
-    to generate tokens. Refer to documentation for guidance.
-  </p>
-  <%if (captchaMode === "none") { %>
-  <p>
-    <strong>PoW verification is not enabled. Set <code>CAPTCHA_MODE=proof_of_work</code> to enable.</strong>
-  </p>
-  <% } else { %>
-  <h3>Difficulty Level</h3>
-  <div>
-    <label for="difficulty">Difficulty Level:</label>
-    <span id="currentDifficulty">Current: <%= difficulty %></span>
-    <select name="difficulty" id="difficulty">
-      <option value="low">Low</option>
-      <option value="medium">Medium</option>
-      <option value="high">High</option>
-      <option value="extreme">Extreme</option>
-    </select>
-    <button onclick='doAction("setDifficulty")'>Update Difficulty</button>
-  </div>
-  <% } %>
-  <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="" />
-    <input id="hiddenDifficulty" type="hidden" name="pow-difficulty" value="" />
-  </form>
-  <h3>Manage Temporary User Tokens</h3>
-  <div id="token-manage">
-    <p><button onclick='doAction("expireTempTokens")'>🕒 Expire All Temp Tokens</button></p>
-    <p><button onclick='doAction("cleanTempTokens")'>🧹 Delete Expired Temp Tokens</button></p>
-    <p><button onclick='doAction("generateTempIpReport")'>📊 Generate Temp Token IP Report</button></p>
-  </div>
-</div>
-<div>
-  <h2>IP Whitelists and Blacklists</h2>
-  <p>
-    You can specify IP ranges to whitelist or blacklist from accessing the proxy. Note that changes here are not
-    persisted across server restarts. If you want to make changes permanent, you can copy the values to your deployment
-    configuration.
-  </p>
-  <p>
-    Entries can be specified as single addresses or
-    <a href="https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing#CIDR_notation">CIDR notation</a>. IPv6 is
-    supported but not recommended for use with the current version of the proxy.
-  </p>
-  <% for (let i = 0; i < whitelists.length; i++) { %>
-  <%- include("partials/admin-cidr-widget", { list: whitelists[i] }) %>
-  <% } %>
-  <% for (let i = 0; i < blacklists.length; i++) { %>
-  <%- include("partials/admin-cidr-widget", { list: blacklists[i] }) %>
-  <% } %>
-  <form action="/admin/manage/cidr" method="post" id="cidrForm">
-    <input id="_csrf" type="hidden" name="_csrf" value="<%= csrfToken %>" />
-    <input type="hidden" name="action" value="add" />
-    <input type="hidden" name="name" value="" />
-    <input type="hidden" name="mode" value="" />
-    <input type="hidden" name="mask" value="" />
-  </form>
-  <details>
-    <summary>Copy environment variables</summary>
-    <p>
-      If you have made changes with the UI, you can copy the values below to your deployment configuration to persist
-      them across server restarts.
-    </p>
-    <pre>
-    <% for (let i = 0; i < whitelists.length; i++) { %><%= whitelists[i].name %>=<%= whitelists[i].ranges.join(",") %><% } %>
-    <% for (let i = 0; i < blacklists.length; i++) { %><%= blacklists[i].name %>=<%= blacklists[i].ranges.join(",") %><% } %>
-    </pre>
-  </details>
-</div>
-
-<script>
-  function doAction(action) {
-    document.getElementById("hiddenAction").value = action;
-    if (action === "setDifficulty") {
-      document.getElementById("hiddenDifficulty").value = document.getElementById("difficulty").value;
-    }
-    document.getElementById("maintenanceForm").submit();
-  }
-
-  function onAddCidr(event) {
-    const list = event.target.dataset;
-    const newMask = prompt("Enter the IP or CIDR range to add to the list:");
-    if (!newMask) {
-      return;
-    }
-
-    const form = document.getElementById("cidrForm");
-    form["action"].value = "add";
-    form["name"].value = list.name;
-    form["mode"].value = list.mode;
-    form["mask"].value = newMask;
-    form.submit();
-  }
-
-  function onRemoveCidr(event) {
-    const list = event.target.dataset;
-    const removeMask = event.target.dataset.mask;
-    if (!removeMask) {
-      return;
-    }
-
-    const form = document.getElementById("cidrForm");
-    form["action"].value = "remove";
-    form["name"].value = list.name;
-    form["mode"].value = list.mode;
-    form["mask"].value = removeMask;
-    form.submit();
-  }
-</script>
-<%- include("partials/admin-footer") %>

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

@@ -51,8 +51,9 @@
     <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 permanently deleted after some time.
-        These options apply only to new temporary users; existing ones use whatever options were in effect when they were created.
+        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" />

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

@@ -5,6 +5,18 @@
     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;
@@ -21,17 +33,17 @@
   }
 </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>
+<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">
+  <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"><input id="anon" type="checkbox" name="anon" value="true" /> <span>Anonymize</span></label>
+      <label for="anon">Anonymize</label>
+      <input id="anon" type="checkbox" name="anon" value="true" />
     </div>
     <div>
       <label for="sort">Sort</label>
@@ -52,12 +64,11 @@
       </select>
     </div>
     <div>
-      <label for="format">Custom Format</label>
-      <ul>
-        <li><code>{{header}}</code></li>
-        <li><code>{{stats}}</code></li>
-        <li><code>{{time}}</code></li>
-      </ul>
+      <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}}
@@ -104,35 +115,33 @@
   loadDefaults();
 
   async function fetchAndCopy() {
-    const form = document.getElementById("statsForm");
+    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",
+      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.");
+      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.");
-      });
+    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);
+  document.getElementById('copyButton').addEventListener('click', fetchAndCopy);
 </script>
 <%- include("partials/admin-footer") %>

src/admin/web/views/admin_index.ejs

@@ -1,11 +1,5 @@
 <%- include("partials/shared_header", { title: "OAI Reverse Proxy Admin" }) %>
 <h1>OAI Reverse Proxy Admin</h1>
-<% if (!usersEnabled) { %>
-<p style="color: red; background-color: #eedddd; padding: 1em">
-  <strong>🚨 <code>user_token</code> gatekeeper is not enabled.</strong><br />
-  <br />None of the user management features will do anything.
-</p>
-<% } %>
 <% 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 />
@@ -25,14 +19,12 @@
   <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>
-  <li><a href="/admin/manage/anti-abuse">Abuse Mitigation Settings</a></li>
-  <li><a href="/admin/service-info">Service Info</a></li>
 </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>
+  <div display="flex" flex-direction="column">
     <fieldset>
       <legend>Key Recheck</legend>
       <button id="recheck-keys" type="button" onclick="submitForm('recheck')">Force Key Recheck</button>
@@ -43,7 +35,7 @@
       <legend>Bulk Quota Management</legend>
       <p>
         <button id="refresh-quotas" type="button" onclick="submitForm('resetQuotas')">Refresh All Quotas</button>
-        Immediately refreshes all users' quotas by the configured amounts.
+        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>
@@ -51,13 +43,6 @@
       </p>
     </fieldset>
     <% } %>
-    <% if (imageGenerationEnabled) { %>
-    <fieldset>
-      <legend>Image Generation</legend>
-      <button id="download-image-metadata" type="button" onclick="submitForm('downloadImageMetadata')">Download Image Metadata</button>
-      <label for="download-image-metadata">Downloads a metadata file containing URL, prompt, and truncated user token for all cached images.</label>
-    </fieldset>
-    <% } %>
   </div>
 </form>
 

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

@@ -4,8 +4,9 @@
     <% if (users.length === 0) { %>
     <p>No users found.</p>
     <% } else { %>
-    <label for="toggle-nicknames"><input type="checkbox" id="toggle-nicknames" onchange="toggleNicknames()" /> Show Nicknames</label>
-    <table class="striped full-width">
+    <input type="checkbox" id="toggle-nicknames" onchange="toggleNicknames()" />
+    <label for="toggle-nicknames">Show Nicknames</label>
+    <table>
       <thead>
         <tr>
           <th>User</th>

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

@@ -55,9 +55,8 @@
       <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
-        >
+        <a title="Edit" id="edit-disabledReason" href="#" data-field="disabledReason"
+          data-token="<%= user.token %>">✏️</a>
       </td>
       <% } %>
     </tr>
@@ -73,8 +72,7 @@
       <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 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">
@@ -87,24 +85,14 @@
       <td colspan="2"><%- user.expiresAt %></td>
     </tr>
     <% } %>
-    <% if (user.meta) { %>
-    <tr>
-      <th scope="row">Meta</th>
-      <td colspan="2"><%- JSON.stringify(user.meta) %></td>
-    </tr>
-    <% } %>
   </tbody>
 </table>
 
-<form style="display: none" id="current-values">
+<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] %>" />
   <% }); %>
-  <!-- tokenRefresh_ keys are dynamically generated -->
-  <% Object.entries(quota).forEach(([family]) => { %>
-  <input type="hidden" name="tokenRefresh_<%- family %>" value="<%- user.tokenRefresh[family] || quota[family] %>" />
-  <% }); %>
 </form>
 
 <h3>Quota Information</h3>
@@ -114,8 +102,7 @@
   <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, showRefreshEdit: true }) %>
+<% } %> <%- include("partials/shared_quota-info", { quota, user }) %>
 
 <p><a href="/admin/manage/list-users">Back to User List</a></p>
 
@@ -126,25 +113,18 @@
       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);
+      let value = prompt(`Enter new value for '${field}'':`, existingValue);
       if (value !== null) {
         if (value === "") {
           value = null;
         }
-
-        const payload = { _csrf: document.querySelector("meta[name=csrf-token]").getAttribute("content") };
-        if (field.startsWith("tokenRefresh_")) {
-          const family = field.slice("tokenRefresh_".length);
-          payload.tokenRefresh = { [family]: Number(value) };
-        } else {
-          payload[field] = value;
-        }
-
         fetch(`/admin/manage/edit-user/${token}`, {
           method: "POST",
           credentials: "same-origin",
-          body: JSON.stringify(payload),
+          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()]))
@@ -152,7 +132,9 @@
             const url = new URL(window.location.href);
             const params = new URLSearchParams();
             if (!ok) {
-              alert(`Failed to edit user: ${json.message}`);
+              params.set("flash", `error: ${json.error.message}`);
+            } else {
+              params.set("flash", `success: User's ${field} updated.`);
             }
             url.search = params.toString();
             window.location.assign(url);
@@ -162,5 +144,4 @@
   });
 </script>
 
-<%- include("partials/admin-ban-xhr-script") %>
-<%- include("partials/admin-footer") %>
+<%- include("partials/admin-ban-xhr-script") %> <%- include("partials/admin-footer") %>

src/admin/web/views/partials/admin-cidr-widget.ejs

@@ -1,13 +0,0 @@
-<h3>
-  <%= list.name %>
-  (<%= list.mode %>)
-</h3>
-<ul>
-  <% list.ranges.forEach(function(mask) { %>
-  <li>
-    <%= mask %>
-    <button class="remove" data-mode="<%= list.mode %>" data-name="<%= list.name %>" data-mask="<%= mask %>" onclick="onRemoveCidr(event)">Remove</button>
-  </li>
-  <% }); %>
-</ul>
-<button class="add" data-mode="<%= list.mode %>" data-name="<%= list.name %>" onclick="onAddCidr(event)">Add</button>

src/config.ts

@@ -1,38 +1,22 @@
-import crypto from "crypto";
 import dotenv from "dotenv";
 import type firebase from "firebase-admin";
-import path from "path";
+import { hostname } from "os";
 import pino from "pino";
-import type { LLMService, ModelFamily } from "./shared/models";
-import { MODEL_FAMILIES } from "./shared/models";
-
+import type { ModelFamily } from "./shared/models";
 dotenv.config();
 
 const startupLogger = pino({ level: "debug" }).child({ module: "startup" });
 const isDev = process.env.NODE_ENV !== "production";
 
-export const DATA_DIR = path.join(__dirname, "..", "data");
-export const USER_ASSETS_DIR = path.join(DATA_DIR, "user-files");
-
 type Config = {
   /** The port the proxy server will listen on. */
   port: number;
-  /** The network interface the proxy server will listen on. */
-  bindAddress: string;
   /** Comma-delimited list of OpenAI API keys. */
   openaiKey?: string;
   /** Comma-delimited list of Anthropic API keys. */
   anthropicKey?: string;
-  /**
-   * Comma-delimited list of Google AI API keys. Note that these are not the
-   * same as the GCP keys/credentials used for Vertex AI; the models are the
-   * same but the APIs are different. Vertex is the GCP product for enterprise.
-   **/
-  googleAIKey?: string;
-  /**
-   * Comma-delimited list of Mistral AI API keys.
-   */
-  mistralAIKey?: 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.
@@ -45,24 +29,6 @@ type Config = {
    * @example `AWS_CREDENTIALS=access_key_1:secret_key_1:us-east-1,access_key_2:secret_key_2:us-west-2`
    */
   awsCredentials?: string;
-  /**
-   * Comma-delimited list of GCP credentials. Each credential item should be a
-   * colon-delimited list of access key, secret key, and GCP region.
-   *
-   * @example `GCP_CREDENTIALS=project1:1@1.com:us-east5:-----BEGIN PRIVATE KEY-----xxx-----END PRIVATE KEY-----,project2:2@2.com:us-east5:-----BEGIN PRIVATE KEY-----xxx-----END PRIVATE KEY-----`
-   */
-  gcpCredentials?: string;
-  /**
-   * Comma-delimited list of Azure OpenAI credentials. Each credential item
-   * should be a colon-delimited list of Azure resource name, deployment ID, and
-   * API key.
-   *
-   * The resource name is the subdomain in your Azure OpenAI deployment's URL,
-   * e.g. `https://resource-name.openai.azure.com
-   *
-   * @example `AZURE_CREDENTIALS=resource_name_1:deployment_id_1:api_key_1,resource_name_2:deployment_id_2:api_key_2`
-   */
-  azureCredentials?: string;
   /**
    * The proxy key to require for requests. Only applicable if the user
    * management mode is set to 'proxy_key', and required if so.
@@ -73,11 +39,6 @@ type Config = {
    * management mode is set to 'user_token'.
    */
   adminKey?: string;
-  /**
-   * The password required to view the service info/status page. If not set, the
-   * info page will be publicly accessible.
-   */
-  serviceInfoPassword?: string;
   /**
    * Which user management mode to use.
    * - `none`: No user management. Proxy is open to all requests with basic
@@ -90,12 +51,12 @@ type Config = {
    */
   gatekeeper: "none" | "proxy_key" | "user_token";
   /**
-   * Persistence layer to use for user management.
-   * - `memory`: Users are stored in memory and are lost on restart (default)
-   * - `firebase_rtdb`: Users are stored in a Firebase Realtime Database;
-   *   requires `firebaseKey` and `firebaseRtdbUrl` to be set.
+   * Persistence layer to use for user and key management.
+   * - `memory`: Data is stored in memory and lost on restart (default)
+   * - `firebase_rtdb`: Data is stored in Firebase Realtime Database; requires
+   *   `firebaseKey` and `firebaseRtdbUrl` to be set.
    */
-  gatekeeperStore: "memory" | "firebase_rtdb";
+  persistenceProvider: "memory" | "firebase_rtdb";
   /** URL of the Firebase Realtime Database if using the Firebase RTDB store. */
   firebaseRtdbUrl?: string;
   /**
@@ -105,81 +66,26 @@ type Config = {
    */
   firebaseKey?: string;
   /**
-   * Maximum number of IPs allowed per user token.
+   * 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.
    */
   maxIpsPerUser: number;
-  /**
-   * Whether a user token should be automatically disabled if it exceeds the
-   * `maxIpsPerUser` limit, or if only connections from new IPs are be rejected.
-   */
-  maxIpsAutoBan: boolean;
-  /**
-   * Which captcha verification mode to use. Requires `user_token` gatekeeper.
-   * Allows users to automatically obtain a token by solving a captcha.
-   * - `none`: No captcha verification; tokens are issued manually.
-   * - `proof_of_work`: Users must solve an Argon2 proof of work to obtain a
-   *    temporary usertoken valid for a limited period.
-   */
-  captchaMode: "none" | "proof_of_work";
-  /**
-   * Duration (in hours) for which a PoW-issued temporary user token is valid.
-   */
-  powTokenHours: number;
-  /**
-   * The maximum number of IPs from which a single temporary user token can be
-   * used. Upon reaching the limit, the `maxIpsAutoBan` behavior is triggered.
-   */
-  powTokenMaxIps: number;
-  /**
-   * Difficulty level for the proof-of-work challenge.
-   * - `low`: 200 iterations
-   * - `medium`: 900 iterations
-   * - `high`: 1900 iterations
-   * - `extreme`: 4000 iterations
-   * - `number`: A custom number of iterations to use.
-   *
-   * Difficulty level only affects the number of iterations used in the PoW,
-   * not the complexity of the hash itself. Therefore, the average time-to-solve
-   * will scale linearly with the number of iterations.
-   *
-   * Refer to docs/proof-of-work.md for guidance and hashrate benchmarks.
-   */
-  powDifficultyLevel: "low" | "medium" | "high" | "extreme" | number;
-  /**
-   * Duration (in minutes) before a PoW challenge expires. Users' browsers must
-   * solve the challenge within this time frame or it will be rejected. Should
-   * be kept somewhat low to prevent abusive clients from working on many
-   * challenges in parallel, but you may need to increase this value for higher
-   * difficulty levels or older devices will not be able to solve the challenge
-   * in time.
-   *
-   * Defaults to 30 minutes.
-   */
-  powChallengeTimeout: number;
-  /**
-   * Duration (in hours) before expired temporary user tokens are purged from
-   * the user database. Users can refresh expired tokens by solving a faster PoW
-   * challenge as long as the original token has not been purged. Once purged,
-   * the user must solve a full PoW challenge to obtain a new token.
-   *
-   * Defaults to 48 hours. At 0, tokens are purged immediately upon expiry.
-   */
-  powTokenPurgeHours: number;
-  /**
-   * Maximum number of active temporary user tokens that can be associated with
-   * a single IP address. Note that this may impact users sending requests from
-   * hosted AI chat clients such as Agnaistic or RisuAI, as they may share IPs.
-   *
-   * When the limit is reached, the oldest token with the same IP will be
-   * expired. At 0, no limit is enforced. Defaults to 0.
-   */
-  // powMaxTokensPerIp: number;
-  /** Per-user limit for requests per minute to text and chat models. */
-  textModelRateLimit: number;
-  /** Per-user limit for requests per minute to image generation models. */
-  imageModelRateLimit: 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.
@@ -198,10 +104,10 @@ type Config = {
   maxOutputTokensOpenAI: number;
   /** For Anthropic, the maximum number of sampled tokens a user can request. */
   maxOutputTokensAnthropic: number;
-  /** Whether requests containing the following phrases should be rejected. */
-  rejectPhrases: string[];
+  /** Whether requests containing disallowed characters should be rejected. */
+  rejectDisallowed?: boolean;
   /** Message to return when rejecting requests. */
-  rejectMessage: string;
+  rejectMessage?: string;
   /** Verbosity level of diagnostic logging. */
   logLevel: "trace" | "debug" | "info" | "warn" | "error";
   /**
@@ -215,38 +121,10 @@ type Config = {
    * key and can't attach the policy, you can set this to true.
    */
   allowAwsLogging?: boolean;
-  /**
-   * Path to the SQLite database file for storing data such as event logs. By
-   * default, the database will be stored at `data/database.sqlite`.
-   *
-   * Ensure target is writable by the server process, and be careful not to
-   * select a path that is served publicly. The default path is safe.
-   */
-  sqliteDataPath?: string;
-  /**
-   * Whether to log events, such as generated completions, to the database.
-   * Events are associated with IP+user token pairs. If user_token mode is
-   * disabled, no events will be logged.
-   *
-   * Currently there is no pruning mechanism for the events table, so it will
-   * grow indefinitely. You may want to periodically prune the table manually.
-   */
-  eventLogging?: boolean;
-  /**
-   * When hashing prompt histories, how many messages to trim from the end.
-   * If zero, only the full prompt hash will be stored.
-   * If greater than zero, for each number N, a hash of the prompt with the
-   * last N messages removed will be stored.
-   *
-   * Experimental function, config may change in future versions.
-   */
-  eventLoggingTrim?: number;
   /** Whether prompts and responses should be logged to persistent storage. */
   promptLogging?: boolean;
   /** Which prompt logging backend to use. */
-  promptLoggingBackend?: "google_sheets" | "file";
-  /** Prefix for prompt logging files when using the file backend. */
-  promptLoggingFilePrefix?: string;
+  promptLoggingBackend?: "google_sheets";
   /** Base64-encoded Google Sheets API key. */
   googleSheetsKey?: string;
   /** Google Sheets spreadsheet ID. */
@@ -288,151 +166,47 @@ type Config = {
   quotaRefreshPeriod?: "hourly" | "daily" | string;
   /** Whether to allow users to change their own nicknames via the UI. */
   allowNicknameChanges: boolean;
-  /** Whether to show recent DALL-E image generations on the homepage. */
-  showRecentImages: boolean;
-  /**
-   * If true, cookies will be set without the `Secure` attribute, allowing
-   * the admin UI to used over HTTP.
-   */
-  useInsecureCookies: boolean;
-  /**
-   * Whether to use a more minimal public Service Info page with static content.
-   * Disables all stats pertaining to traffic, prompt/token usage, and queues.
-   * The full info page will appear if you have signed in as an admin using the
-   * configured ADMIN_KEY and go to /admin/service-info.
-   **/
-  staticServiceInfo?: boolean;
-  /**
-   * Trusted proxy hops. If you are deploying the server behind a reverse proxy
-   * (Nginx, Cloudflare Tunnel, AWS WAF, etc.) the IP address of incoming
-   * requests will be the IP address of the proxy, not the actual user.
-   *
-   * Depending on your hosting configuration, there may be multiple proxies/load
-   * balancers between your server and the user. Each one will append the
-   * incoming IP address to the `X-Forwarded-For` header. The user's real IP
-   * address will be the first one in the list, assuming the header has not been
-   * tampered with. Setting this value correctly ensures that the server doesn't
-   * trust values in `X-Forwarded-For` not added by trusted proxies.
-   *
-   * In order for the server to determine the user's real IP address, you need
-   * to tell it how many proxies are between the user and the server so it can
-   * select the correct IP address from the `X-Forwarded-For` header.
-   *
-   * *WARNING:* If you set it incorrectly, the proxy will either record the
-   * wrong IP address, or it will be possible for users to spoof their IP
-   * addresses and bypass rate limiting. Check the request logs to see what
-   * incoming X-Forwarded-For values look like.
-   *
-   * Examples:
-   *  - X-Forwarded-For: "34.1.1.1, 172.1.1.1, 10.1.1.1" => trustedProxies: 3
-   *  - X-Forwarded-For: "34.1.1.1" => trustedProxies: 1
-   *  - no X-Forwarded-For header => trustedProxies: 0 (the actual IP of the incoming request will be used)
-   *
-   * As of 2024/01/08:
-   * For HuggingFace or Cloudflare Tunnel, use 1.
-   * For Render, use 3.
-   * For deployments not behind a load balancer, use 0.
-   *
-   * You should double check against your actual request logs to be sure.
-   *
-   * Defaults to 1, as most deployments are on HuggingFace or Cloudflare Tunnel.
-   */
-  trustedProxies?: number;
-  /**
-   * Whether to allow OpenAI tool usage.  The proxy doesn't impelment any
-   * support for tools/function calling but can pass requests and responses as
-   * is. Note that the proxy also cannot accurately track quota usage for
-   * requests involving tools, so you must opt in to this feature at your own
-   * risk.
-   */
-  allowOpenAIToolUsage?: boolean;
-  /**
-   * Which services will accept prompts containing images, for use with
-   * multimodal models. Users with `special` role are exempt from this
-   * restriction.
-   *
-   * Do not enable this feature for untrusted users, as malicious users could
-   * send images which violate your provider's terms of service or local laws.
-   *
-   * Defaults to no services, meaning image prompts are disabled. Use a comma-
-   * separated list. Available services are:
-   * openai,anthropic,google-ai,mistral-ai,aws,gcp,azure
-   */
-  allowedVisionServices: LLMService[];
-  /**
-   * Allows overriding the default proxy endpoint route. Defaults to /proxy.
-   * A leading slash is required.
-   */
-  proxyEndpointRoute: string;
-  /**
-   * If set, only requests from these IP addresses will be permitted to use the
-   * admin API and UI. Provide a comma-separated list of IP addresses or CIDR
-   * ranges. If not set, the admin API and UI will be open to all requests.
-   */
-  adminWhitelist: string[];
-  /**
-   * If set, requests from these IP addresses will be blocked from using the
-   * application. Provide a comma-separated list of IP addresses or CIDR ranges.
-   * If not set, no IP addresses will be blocked.
-   *
-   * Takes precedence over the adminWhitelist.
-   */
-  ipBlacklist: string[];
 };
 
 // To change configs, create a file called .env in the root directory.
 // See .env.example for an example.
 export const config: Config = {
   port: getEnvWithDefault("PORT", 7860),
-  bindAddress: getEnvWithDefault("BIND_ADDRESS", "0.0.0.0"),
   openaiKey: getEnvWithDefault("OPENAI_KEY", ""),
   anthropicKey: getEnvWithDefault("ANTHROPIC_KEY", ""),
-  googleAIKey: getEnvWithDefault("GOOGLE_AI_KEY", ""),
-  mistralAIKey: getEnvWithDefault("MISTRAL_AI_KEY", ""),
+  googlePalmKey: getEnvWithDefault("GOOGLE_PALM_KEY", ""),
   awsCredentials: getEnvWithDefault("AWS_CREDENTIALS", ""),
-  gcpCredentials: getEnvWithDefault("GCP_CREDENTIALS", ""),
-  azureCredentials: getEnvWithDefault("AZURE_CREDENTIALS", ""),
   proxyKey: getEnvWithDefault("PROXY_KEY", ""),
   adminKey: getEnvWithDefault("ADMIN_KEY", ""),
-  serviceInfoPassword: getEnvWithDefault("SERVICE_INFO_PASSWORD", ""),
-  sqliteDataPath: getEnvWithDefault(
-    "SQLITE_DATA_PATH",
-    path.join(DATA_DIR, "database.sqlite")
-  ),
-  eventLogging: getEnvWithDefault("EVENT_LOGGING", false),
-  eventLoggingTrim: getEnvWithDefault("EVENT_LOGGING_TRIM", 5),
   gatekeeper: getEnvWithDefault("GATEKEEPER", "none"),
-  gatekeeperStore: getEnvWithDefault("GATEKEEPER_STORE", "memory"),
+  persistenceProvider: getEnvWithDefault("PERSISTENCE_PROVIDER", "memory"),
   maxIpsPerUser: getEnvWithDefault("MAX_IPS_PER_USER", 0),
-  maxIpsAutoBan: getEnvWithDefault("MAX_IPS_AUTO_BAN", false),
-  captchaMode: getEnvWithDefault("CAPTCHA_MODE", "none"),
-  powTokenHours: getEnvWithDefault("POW_TOKEN_HOURS", 24),
-  powTokenMaxIps: getEnvWithDefault("POW_TOKEN_MAX_IPS", 2),
-  powDifficultyLevel: getEnvWithDefault("POW_DIFFICULTY_LEVEL", "low"),
-  powChallengeTimeout: getEnvWithDefault("POW_CHALLENGE_TIMEOUT", 30),
-  powTokenPurgeHours: getEnvWithDefault("POW_TOKEN_PURGE_HOURS", 48),
   firebaseRtdbUrl: getEnvWithDefault("FIREBASE_RTDB_URL", undefined),
   firebaseKey: getEnvWithDefault("FIREBASE_KEY", undefined),
-  textModelRateLimit: getEnvWithDefault("TEXT_MODEL_RATE_LIMIT", 4),
-  imageModelRateLimit: getEnvWithDefault("IMAGE_MODEL_RATE_LIMIT", 4),
-  maxContextTokensOpenAI: getEnvWithDefault("MAX_CONTEXT_TOKENS_OPENAI", 32768),
+  firebaseRtdbRoot: getEnvWithDefault("FIREBASE_RTDB_ROOT", hostname()),
+  modelRateLimit: getEnvWithDefault("MODEL_RATE_LIMIT", 4),
+  maxContextTokensOpenAI: getEnvWithDefault("MAX_CONTEXT_TOKENS_OPENAI", 0),
   maxContextTokensAnthropic: getEnvWithDefault(
     "MAX_CONTEXT_TOKENS_ANTHROPIC",
-    32768
+    0
   ),
   maxOutputTokensOpenAI: getEnvWithDefault(
     ["MAX_OUTPUT_TOKENS_OPENAI", "MAX_OUTPUT_TOKENS"],
-    1024
+    300
   ),
   maxOutputTokensAnthropic: getEnvWithDefault(
     ["MAX_OUTPUT_TOKENS_ANTHROPIC", "MAX_OUTPUT_TOKENS"],
-    1024
+    400
   ),
-  allowedModelFamilies: getEnvWithDefault(
-    "ALLOWED_MODEL_FAMILIES",
-    getDefaultModelFamilies()
-  ),
-  rejectPhrases: parseCsv(getEnvWithDefault("REJECT_PHRASES", "")),
+  allowedModelFamilies: getEnvWithDefault("ALLOWED_MODEL_FAMILIES", [
+    "turbo",
+    "gpt4",
+    "gpt4-32k",
+    "claude",
+    "bison",
+    "aws-claude",
+  ]),
+  rejectDisallowed: getEnvWithDefault("REJECT_DISALLOWED", false),
   rejectMessage: getEnvWithDefault(
     "REJECT_MESSAGE",
     "This content violates /aicg/'s acceptable use policy."
@@ -443,10 +217,6 @@ export const config: Config = {
   allowAwsLogging: getEnvWithDefault("ALLOW_AWS_LOGGING", false),
   promptLogging: getEnvWithDefault("PROMPT_LOGGING", false),
   promptLoggingBackend: getEnvWithDefault("PROMPT_LOGGING_BACKEND", undefined),
-  promptLoggingFilePrefix: getEnvWithDefault(
-    "PROMPT_LOGGING_FILE_PREFIX",
-    "prompt-logs"
-  ),
   googleSheetsKey: getEnvWithDefault("GOOGLE_SHEETS_KEY", undefined),
   googleSheetsSpreadsheetId: getEnvWithDefault(
     "GOOGLE_SHEETS_SPREADSHEET_ID",
@@ -458,98 +228,45 @@ export const config: Config = {
     "You must be over the age of majority in your country to use this service."
   ),
   blockRedirect: getEnvWithDefault("BLOCK_REDIRECT", "https://www.9gag.com"),
-  tokenQuota: MODEL_FAMILIES.reduce(
-    (acc, family: ModelFamily) => {
-      acc[family] = getEnvWithDefault(
-        `TOKEN_QUOTA_${family.toUpperCase().replace(/-/g, "_")}`,
-        0
-      ) as number;
-      return acc;
-    },
-    {} as { [key in ModelFamily]: number }
-  ),
+  tokenQuota: {
+    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),
-  showRecentImages: getEnvWithDefault("SHOW_RECENT_IMAGES", true),
-  useInsecureCookies: getEnvWithDefault("USE_INSECURE_COOKIES", isDev),
-  staticServiceInfo: getEnvWithDefault("STATIC_SERVICE_INFO", false),
-  trustedProxies: getEnvWithDefault("TRUSTED_PROXIES", 1),
-  allowOpenAIToolUsage: getEnvWithDefault("ALLOW_OPENAI_TOOL_USAGE", false),
-  allowedVisionServices: parseCsv(
-    getEnvWithDefault("ALLOWED_VISION_SERVICES", "")
-  ) as LLMService[],
-  proxyEndpointRoute: getEnvWithDefault("PROXY_ENDPOINT_ROUTE", "/proxy"),
-  adminWhitelist: parseCsv(
-    getEnvWithDefault("ADMIN_WHITELIST", "0.0.0.0/0,::/0")
-  ),
-  ipBlacklist: parseCsv(getEnvWithDefault("IP_BLACKLIST", "")),
 } as const;
 
-function generateSigningKey() {
+function generateCookieSecret() {
   if (process.env.COOKIE_SECRET !== undefined) {
-    // legacy, replaced by SIGNING_KEY
     return process.env.COOKIE_SECRET;
-  } else if (process.env.SIGNING_KEY !== undefined) {
-    return process.env.SIGNING_KEY;
   }
 
-  const secrets = [
-    config.adminKey,
-    config.openaiKey,
-    config.anthropicKey,
-    config.googleAIKey,
-    config.mistralAIKey,
-    config.awsCredentials,
-    config.gcpCredentials,
-    config.azureCredentials,
-  ];
-  if (secrets.filter((s) => s).length === 0) {
-    startupLogger.warn(
-      "No SIGNING_KEY or secrets are set. All sessions, cookies, and proofs of work will be invalidated on restart."
-    );
-    return crypto.randomBytes(32).toString("hex");
-  }
-
-  startupLogger.info("No SIGNING_KEY set; one will be generated from secrets.");
-  startupLogger.info(
-    "It's recommended to set SIGNING_KEY explicitly to ensure users' sessions and cookies always persist across restarts."
-  );
-  const seed = secrets.map((s) => s || "n/a").join("");
+  const seed = "" + config.adminKey + config.openaiKey + config.anthropicKey;
+  const crypto = require("crypto");
   return crypto.createHash("sha256").update(seed).digest("hex");
 }
 
-const signingKey = generateSigningKey();
-export const COOKIE_SECRET = signingKey;
+export const COOKIE_SECRET = generateCookieSecret();
 
 export async function assertConfigIsValid() {
-  if (process.env.MODEL_RATE_LIMIT !== undefined) {
-    const limit =
-      parseInt(process.env.MODEL_RATE_LIMIT, 10) || config.textModelRateLimit;
-
-    config.textModelRateLimit = limit;
-    config.imageModelRateLimit = Math.max(Math.floor(limit / 2), 1);
-
+  if (process.env.TURBO_ONLY === "true") {
     startupLogger.warn(
-      { textLimit: limit, imageLimit: config.imageModelRateLimit },
-      "MODEL_RATE_LIMIT is deprecated. Use TEXT_MODEL_RATE_LIMIT and IMAGE_MODEL_RATE_LIMIT instead."
+      "TURBO_ONLY is deprecated. Use ALLOWED_MODEL_FAMILIES=turbo instead."
+    );
+    config.allowedModelFamilies = config.allowedModelFamilies.filter(
+      (f) => !f.includes("gpt4")
     );
   }
 
-  if (process.env.ALLOW_IMAGE_PROMPTS === "true") {
-    const hasAllowedServices = config.allowedVisionServices.length > 0;
-    if (!hasAllowedServices) {
-      config.allowedVisionServices = ["openai", "anthropic"];
-      startupLogger.warn(
-        { allowedVisionServices: config.allowedVisionServices },
-        "ALLOW_IMAGE_PROMPTS is deprecated. Use ALLOWED_VISION_SERVICES instead."
-      );
-    }
-  }
-
-  if (config.promptLogging && !config.promptLoggingBackend) {
-    throw new Error(
-      "Prompt logging is enabled but no backend is configured. Set PROMPT_LOGGING_BACKEND to 'google_sheets' or 'file'."
+  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;
   }
 
   if (!["none", "proxy_key", "user_token"].includes(config.gatekeeper)) {
@@ -564,41 +281,24 @@ export async function assertConfigIsValid() {
     );
   }
 
-  if (
-    config.captchaMode === "proof_of_work" &&
-    config.gatekeeper !== "user_token"
-  ) {
-    throw new Error(
-      "Captcha mode 'proof_of_work' requires gatekeeper mode 'user_token'."
-    );
-  }
-
-  if (config.captchaMode === "proof_of_work") {
-    const val = config.powDifficultyLevel;
-    const isDifficulty =
-      typeof val === "string" &&
-      ["low", "medium", "high", "extreme"].includes(val);
-    const isIterations =
-      typeof val === "number" && Number.isInteger(val) && val > 0;
-    if (!isDifficulty && !isIterations) {
-      throw new Error(
-        "Invalid POW_DIFFICULTY_LEVEL. Must be one of: low, medium, high, extreme, or a positive integer."
-      );
-    }
-  }
-
   if (config.gatekeeper === "proxy_key" && !config.proxyKey) {
     throw new Error(
       "`proxy_key` gatekeeper mode requires a `PROXY_KEY` to be set."
     );
   }
 
+  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`."
+    );
+  }
+
   if (
-    config.gatekeeperStore === "firebase_rtdb" &&
+    config.persistenceProvider === "firebase_rtdb" &&
     (!config.firebaseKey || !config.firebaseRtdbUrl)
   ) {
     throw new Error(
-      "Firebase RTDB store requires `FIREBASE_KEY` and `FIREBASE_RTDB_URL` to be set."
+      "Firebase RTDB persistence requires `FIREBASE_KEY` and `FIREBASE_RTDB_URL` to be set."
     );
   }
 
@@ -606,8 +306,7 @@ export async function assertConfigIsValid() {
   // them to users.
   for (const key of getKeys(config)) {
     const maybeSensitive = ["key", "credentials", "secret", "password"].some(
-      (sensitive) =>
-        key.toLowerCase().includes(sensitive) && !["checkKeys"].includes(key)
+      (sensitive) => key.toLowerCase().includes(sensitive)
     );
     const secured = new Set([...SENSITIVE_KEYS, ...OMITTED_KEYS]);
     if (maybeSensitive && !secured.has(key))
@@ -629,86 +328,54 @@ export const SENSITIVE_KEYS: (keyof Config)[] = ["googleSheetsSpreadsheetId"];
  * Config keys that are not displayed on the info page at all, generally because
  * they are not relevant to the user or can be inferred from other config.
  */
-export const OMITTED_KEYS = [
+export const OMITTED_KEYS: (keyof Config)[] = [
   "port",
-  "bindAddress",
   "logLevel",
   "openaiKey",
   "anthropicKey",
-  "googleAIKey",
-  "mistralAIKey",
+  "googlePalmKey",
   "awsCredentials",
-  "gcpCredentials",
-  "azureCredentials",
   "proxyKey",
   "adminKey",
-  "serviceInfoPassword",
-  "rejectPhrases",
-  "rejectMessage",
+  "checkKeys",
   "showTokenCosts",
-  "promptLoggingFilePrefix",
   "googleSheetsKey",
+  "persistenceProvider",
   "firebaseKey",
   "firebaseRtdbUrl",
-  "sqliteDataPath",
-  "eventLogging",
-  "eventLoggingTrim",
-  "gatekeeperStore",
   "maxIpsPerUser",
   "blockedOrigins",
   "blockMessage",
   "blockRedirect",
   "allowNicknameChanges",
-  "showRecentImages",
-  "useInsecureCookies",
-  "staticServiceInfo",
-  "checkKeys",
-  "allowedModelFamilies",
-  "trustedProxies",
-  "proxyEndpointRoute",
-  "adminWhitelist",
-  "ipBlacklist",
-  "powTokenPurgeHours",
-] satisfies (keyof Config)[];
-type OmitKeys = (typeof OMITTED_KEYS)[number];
-
-type Printable<T> = {
-  [P in keyof T as Exclude<P, OmitKeys>]: T[P] extends object
-    ? Printable<T[P]>
-    : string;
-};
-type PublicConfig = Printable<Config>;
+];
 
 const getKeys = Object.keys as <T extends object>(obj: T) => Array<keyof T>;
 
-export function listConfig(obj: Config = config) {
-  const result: Record<string, unknown> = {};
+export function listConfig(obj: Config = config): Record<string, any> {
+  const result: Record<string, any> = {};
   for (const key of getKeys(obj)) {
     const value = obj[key]?.toString() || "";
 
-    const shouldMask = SENSITIVE_KEYS.includes(key);
     const shouldOmit =
-      OMITTED_KEYS.includes(key as OmitKeys) ||
-      value === "" ||
-      value === "undefined";
+      OMITTED_KEYS.includes(key) || value === "" || value === "undefined";
+    const shouldMask = SENSITIVE_KEYS.includes(key);
 
     if (shouldOmit) {
       continue;
     }
 
-    const validKey = key as keyof Printable<Config>;
-
     if (value && shouldMask) {
-      result[validKey] = "********";
+      result[key] = "********";
     } else {
-      result[validKey] = value;
+      result[key] = value;
     }
 
     if (typeof obj[key] === "object" && !Array.isArray(obj[key])) {
       result[key] = listConfig(obj[key] as unknown as Config);
     }
   }
-  return result as PublicConfig;
+  return result;
 }
 
 /**
@@ -727,10 +394,8 @@ function getEnvWithDefault<T>(env: string | string[], defaultValue: T): T {
       [
         "OPENAI_KEY",
         "ANTHROPIC_KEY",
-        "GOOGLE_AI_KEY",
+        "GOOGLE_PALM_KEY",
         "AWS_CREDENTIALS",
-        "GCP_CREDENTIALS",
-        "AZURE_CREDENTIALS",
       ].includes(String(env))
     ) {
       return value as unknown as T;
@@ -750,7 +415,7 @@ function getEnvWithDefault<T>(env: string | string[], defaultValue: T): T {
 let firebaseApp: firebase.app.App | undefined;
 
 async function maybeInitializeFirebase() {
-  if (!config.gatekeeperStore.startsWith("firebase")) {
+  if (!config.persistenceProvider.startsWith("firebase")) {
     return;
   }
 
@@ -772,15 +437,3 @@ export function getFirebaseApp(): firebase.app.App {
   }
   return firebaseApp;
 }
-
-function parseCsv(val: string): string[] {
-  if (!val) return [];
-
-  const regex = /(".*?"|[^",]+)(?=\s*,|\s*$)/g;
-  const matches = val.match(regex) || [];
-  return matches.map((item) => item.replace(/^"|"$/g, "").trim());
-}
-
-function getDefaultModelFamilies(): ModelFamily[] {
-  return MODEL_FAMILIES.filter((f) => !f.includes("dall-e")) as ModelFamily[];
-}

src/info-page.ts

@@ -1,174 +1,475 @@
-/** This whole module kinda sucks */
 import fs from "fs";
-import express, { Router, Request, Response } from "express";
+import { Request, Response } from "express";
 import showdown from "showdown";
-import { config } from "./config";
-import { buildInfo, ServiceInfo } from "./service-info";
-import { getLastNImages } from "./shared/file-storage/image-history";
-import { keyPool } from "./shared/key-management";
-import { MODEL_FAMILY_SERVICE, ModelFamily } from "./shared/models";
-import { withSession } from "./shared/with-session";
-import { checkCsrfToken, injectCsrfToken } from "./shared/inject-csrf";
+import { config, listConfig } from "./config";
+import {
+  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 { getTokenCostUsd, prettyTokens } from "./shared/stats";
+import { assertNever } from "./shared/utils";
 
 const INFO_PAGE_TTL = 2000;
-const MODEL_FAMILY_FRIENDLY_NAME: { [f in ModelFamily]: string } = {
-  turbo: "GPT-4o Mini / 3.5 Turbo",
-  gpt4: "GPT-4",
-  "gpt4-32k": "GPT-4 32k",
-  "gpt4-turbo": "GPT-4 Turbo",
-  gpt4o: "GPT-4o",
-  "dall-e": "DALL-E",
-  claude: "Claude (Sonnet)",
-  "claude-opus": "Claude (Opus)",
-  "gemini-flash": "Gemini Flash",
-  "gemini-pro": "Gemini Pro",
-  "gemini-ultra": "Gemini Ultra",
-  "mistral-tiny": "Mistral 7B",
-  "mistral-small": "Mistral Nemo",
-  "mistral-medium": "Mistral Medium",
-  "mistral-large": "Mistral Large",
-  "aws-claude": "AWS Claude (Sonnet)",
-  "aws-claude-opus": "AWS Claude (Opus)",
-  "aws-mistral-tiny": "AWS Mistral 7B",
-  "aws-mistral-small": "AWS Mistral Nemo",
-  "aws-mistral-medium": "AWS Mistral Medium",
-  "aws-mistral-large": "AWS Mistral Large",
-  "gcp-claude": "GCP Claude (Sonnet)",
-  "gcp-claude-opus": "GCP Claude (Opus)",
-  "azure-turbo": "Azure GPT-3.5 Turbo",
-  "azure-gpt4": "Azure GPT-4",
-  "azure-gpt4-32k": "Azure GPT-4 32k",
-  "azure-gpt4-turbo": "Azure GPT-4 Turbo",
-  "azure-gpt4o": "Azure GPT-4o",
-  "azure-dall-e": "Azure DALL-E",
-};
-
-const converter = new showdown.Converter();
-const customGreeting = fs.existsSync("greeting.md")
-  ? `<div id="servergreeting">${fs.readFileSync("greeting.md", "utf8")}</div>`
-  : "";
 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()) {
-    return res.send(infoPageHtml);
+    res.send(infoPageHtml);
+    return;
   }
 
+  // Sometimes huggingface doesn't send the host header and makes us guess.
   const baseUrl =
     process.env.SPACE_ID && !req.get("host")?.includes("hf.space")
       ? getExternalUrlForHuggingfaceSpaceId(process.env.SPACE_ID)
       : req.protocol + "://" + req.get("host");
 
-  const info = buildInfo(baseUrl + config.proxyEndpointRoute);
-  infoPageHtml = renderPage(info);
-  infoPageLastUpdated = Date.now();
-
-  res.send(infoPageHtml);
+  res.send(cacheInfoPageHtml(baseUrl));
 };
 
-export function renderPage(info: ServiceInfo) {
-  const title = getServerTitle();
-  const headerHtml = buildInfoPageHeader(info);
+function getCostString(cost: number) {
+  if (!config.showTokenCosts) return "";
+  return ` ($${cost.toFixed(2)})`;
+}
 
-  return `<!doctype html>
+function cacheInfoPageHtml(baseUrl: string) {
+  const keys = keyPool.list();
+
+  modelStats.clear();
+  serviceStats.clear();
+  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()),
+    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,
+    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);
+
+  const pageBody = `<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
     <meta name="robots" content="noindex" />
     <title>${title}</title>
-    <link rel="stylesheet" href="/res/css/reset.css" media="screen" />
-    <link rel="stylesheet" href="/res/css/sakura.css" media="screen" />
-    <link rel="stylesheet" href="/res/css/sakura-dark.css" media="screen and (prefers-color-scheme: dark)" />
-    <style>
-      body {
-        font-family: sans-serif;
-        padding: 1em;
-        max-width: 900px;
-        margin: 0;
-      }
-      
-      .self-service-links {
-        display: flex;
-        justify-content: center;
-        margin-bottom: 1em;
-        padding: 0.5em;
-        font-size: 0.8em;
-      }
-      
-      .self-service-links a {
-        margin: 0 0.5em;
-      }
-    </style>
   </head>
-  <body>
+  <body style="font-family: sans-serif; background-color: #f0f0f0; padding: 1em;">
     ${headerHtml}
     <hr />
-    ${getSelfServiceLinks()}
     <h2>Service Info</h2>
     <pre>${JSON.stringify(info, null, 2)}</pre>
+    ${getSelfServiceLinks()}
   </body>
 </html>`;
+
+  infoPageHtml = pageBody;
+  infoPageLastUpdated = Date.now();
+
+  return pageBody;
 }
 
+function getUniqueOpenAIOrgs(keys: KeyPoolKey[]) {
+  const orgIds = new Set(
+    keys.filter((k) => k.service === "openai").map((k: any) => k.organizationId)
+  );
+  return orgIds.size;
+}
+
+function increment<T extends keyof ServiceAggregates | ModelAggregateKey>(
+  map: Map<T, number>,
+  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 } & {
+    [modelFamily in OpenAIModelFamily]?: {
+      usage?: string;
+      activeKeys: number;
+      trialKeys?: number;
+      revokedKeys?: number;
+      overQuotaKeys?: number;
+      proomptersInQueue?: number;
+      estimatedQueueTime?: string;
+    };
+  } = {};
+
+  const allowedFamilies = new Set(config.allowedModelFamilies);
+  let families = new Set<OpenAIModelFamily>();
+  const keys = keyPool.list().filter((k) => {
+    const isOpenAI = keyIsOpenAIKey(k);
+    if (isOpenAI) k.modelFamilies.forEach((f) => families.add(f));
+    return isOpenAI;
+  }) as Omit<OpenAIKey, "key">[];
+  families = new Set([...families].filter((f) => allowedFamilies.has(f)));
+
+  if (config.checkKeys) {
+    const unchecked = serviceStats.get("openAiUncheckedKeys") || 0;
+    if (unchecked > 0) {
+      info.status = `Checking ${unchecked} keys...`;
+    }
+    info.openaiKeys = keys.length;
+    info.openaiOrgs = getUniqueOpenAIOrgs(keys);
+
+    families.forEach((f) => {
+      const tokens = modelStats.get(`${f}__tokens`) || 0;
+      const cost = getTokenCostUsd(f, tokens);
+
+      info[f] = {
+        usage: `${prettyTokens(tokens)} tokens${getCostString(cost)}`,
+        activeKeys: modelStats.get(`${f}__active`) || 0,
+        trialKeys: modelStats.get(`${f}__trial`) || 0,
+        revokedKeys: modelStats.get(`${f}__revoked`) || 0,
+        overQuotaKeys: modelStats.get(`${f}__overQuota`) || 0,
+      };
+    });
+  } else {
+    info.status = "Key checking is disabled.";
+    info.turbo = { activeKeys: keys.filter((k) => !k.isDisabled).length };
+    info.gpt4 = {
+      activeKeys: keys.filter(
+        (k) => !k.isDisabled && k.modelFamilies.includes("gpt4")
+      ).length,
+    };
+  }
+
+  families.forEach((f) => {
+    if (info[f]) {
+      const { estimatedQueueTime, proomptersInQueue } = getQueueInformation(f);
+      info[f]!.proomptersInQueue = proomptersInQueue;
+      info[f]!.estimatedQueueTime = estimatedQueueTime;
+    }
+  });
+
+  return info;
+}
+
+function getAnthropicInfo() {
+  const claudeInfo: Partial<ModelAggregates> = {
+    active: modelStats.get("claude__active") || 0,
+    pozzed: modelStats.get("claude__pozzed") || 0,
+  };
+
+  const queue = getQueueInformation("claude");
+  claudeInfo.queued = queue.proomptersInQueue;
+  claudeInfo.queueTime = queue.estimatedQueueTime;
+
+  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(info: ServiceInfo) {
-  const title = getServerTitle();
+function buildInfoPageHeader(converter: showdown.Converter, title: string) {
   // TODO: use some templating engine instead of this mess
-  let infoBody = `# ${title}`;
+  let infoBody = `<!-- Header for Showdown's parser, don't remove this line -->
+# ${title}`;
   if (config.promptLogging) {
-    infoBody += `\n## Prompt Logging Enabled
-This proxy keeps full logs of all prompts and AI responses. Prompt logs are anonymous and do not contain IP addresses or timestamps.
+    infoBody += `\n## Prompt logging is enabled!
+The server operator has enabled prompt logging. The prompts you send to this proxy and the AI responses you receive may be saved.
 
-[You can see the type of data logged here, along with the rest of the code.](https://gitgud.io/khanon/oai-reverse-proxy/-/blob/main/src/shared/prompt-logging/index.ts).
+Logs are anonymous and do not contain IP addresses or timestamps. [You can see the type of data logged here, along with the rest of the code.](https://gitgud.io/khanon/oai-reverse-proxy/-/blob/main/src/prompt-logging/index.ts).
 
 **If you are uncomfortable with this, don't send prompts to this proxy!**`;
   }
 
-  if (config.staticServiceInfo) {
-    return converter.makeHtml(infoBody + customGreeting);
+  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) {
+    // TODO: un-fuck this
+    const keys = keyPool.list().filter((k) => k.service === "openai");
+
+    const turboWait = getQueueInformation("turbo").estimatedQueueTime;
+    waits.push(`**Turbo:** ${turboWait}`);
+
+    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;
+    const hasGpt432k = keys.some((k) => k.modelFamilies.includes("gpt4-32k"));
+    const allowedGpt432k = config.allowedModelFamilies.includes("gpt4-32k");
+    if (hasGpt432k && allowedGpt432k) {
+      waits.push(`**GPT-4-32k:** ${gpt432kWait}`);
+    }
   }
 
-  const waits: string[] = [];
+  if (config.anthropicKey) {
+    const claudeWait = getQueueInformation("claude").estimatedQueueTime;
+    waits.push(`**Claude:** ${claudeWait}`);
+  }
 
-  for (const modelFamily of config.allowedModelFamilies) {
-    const service = MODEL_FAMILY_SERVICE[modelFamily];
-
-    const hasKeys = keyPool.list().some((k) => {
-      return k.service === service && k.modelFamilies.includes(modelFamily);
-    });
-
-    const wait = info[modelFamily]?.estimatedQueueTime;
-    if (hasKeys && wait) {
-      waits.push(
-        `**${MODEL_FAMILY_FRIENDLY_NAME[modelFamily] || modelFamily}**: ${wait}`
-      );
-    }
+  if (config.awsCredentials) {
+    const awsClaudeWait = getQueueInformation("aws-claude").estimatedQueueTime;
+    waits.push(`**Claude (AWS):** ${awsClaudeWait}`);
   }
 
   infoBody += "\n\n" + waits.join(" / ");
 
-  infoBody += customGreeting;
-
-  infoBody += buildRecentImageSection();
-
+  if (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>`;
+}
 
-  const links = [["Check your user token", "/user/lookup"]];
-  if (config.captchaMode !== "none") {
-    links.unshift(["Request a user token", "/user/captcha"]);
-  }
-
-  return `<div class="self-service-links">${links
-    .map(([text, link]) => `<a target="_blank" href="${link}">${text}</a>`)
-    .join(" | ")}</div>`;
+/** Returns queue time in seconds, or minutes + seconds if over 60 seconds. */
+function getQueueInformation(partition: ModelFamily) {
+  const waitMs = getEstimatedWaitTime(partition);
+  const waitTime =
+    waitMs < 60000
+      ? `${Math.round(waitMs / 1000)}sec`
+      : `${Math.round(waitMs / 60000)}min, ${Math.round(
+          (waitMs % 60000) / 1000
+        )}sec`;
+  return {
+    proomptersInQueue: getQueueLength(partition),
+    estimatedQueueTime: waitMs > 2000 ? waitTime : "no wait",
+  };
 }
 
 function getServerTitle() {
@@ -190,48 +491,9 @@ function getServerTitle() {
   return "OAI Reverse Proxy";
 }
 
-function buildRecentImageSection() {
-  const dalleModels: ModelFamily[] = ["azure-dall-e", "dall-e"];
-  if (
-    !config.showRecentImages ||
-    dalleModels.every((f) => !config.allowedModelFamilies.includes(f))
-  ) {
-    return "";
-  }
-
-  let html = `<h2>Recent DALL-E Generations</h2>`;
-  const recentImages = getLastNImages(12).reverse();
-  if (recentImages.length === 0) {
-    html += `<p>No images yet.</p>`;
-    return html;
-  }
-
-  html += `<div style="display: flex; flex-wrap: wrap;" id="recent-images">`;
-  for (const { url, prompt } of recentImages) {
-    const thumbUrl = url.replace(/\.png$/, "_t.jpg");
-    const escapedPrompt = escapeHtml(prompt);
-    html += `<div style="margin: 0.5em;" class="recent-image">
-<a href="${url}" target="_blank"><img src="${thumbUrl}" title="${escapedPrompt}" alt="${escapedPrompt}" style="max-width: 150px; max-height: 150px;" /></a>
-</div>`;
-  }
-  html += `</div>`;
-  html += `<p style="clear: both; text-align: center;"><a href="/user/image-history">View all recent images</a></p>`;
-
-  return html;
-}
-
-function escapeHtml(unsafe: string) {
-  return unsafe
-    .replace(/&/g, "&amp;")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;")
-    .replace(/'/g, "&#39;")
-    .replace(/\[/g, "&#91;")
-    .replace(/]/g, "&#93;");
-}
-
 function getExternalUrlForHuggingfaceSpaceId(spaceId: string) {
+  // Huggingface broke their amazon elb config and no longer sends the
+  // x-forwarded-host header. This is a workaround.
   try {
     const [username, spacename] = spaceId.split("/");
     return `https://${username}-${spacename.replace(/_/g, "-")}.hf.space`;
@@ -239,49 +501,3 @@ function getExternalUrlForHuggingfaceSpaceId(spaceId: string) {
     return "";
   }
 }
-
-function checkIfUnlocked(
-  req: Request,
-  res: Response,
-  next: express.NextFunction
-) {
-  if (config.serviceInfoPassword?.length && !req.session?.unlocked) {
-    return res.redirect("/unlock-info");
-  }
-  next();
-}
-
-const infoPageRouter = Router();
-if (config.serviceInfoPassword?.length) {
-  infoPageRouter.use(
-    express.json({ limit: "1mb" }),
-    express.urlencoded({ extended: true, limit: "1mb" })
-  );
-  infoPageRouter.use(withSession);
-  infoPageRouter.use(injectCsrfToken, checkCsrfToken);
-  infoPageRouter.post("/unlock-info", (req, res) => {
-    if (req.body.password !== config.serviceInfoPassword) {
-      return res.status(403).send("Incorrect password");
-    }
-    req.session!.unlocked = true;
-    res.redirect("/");
-  });
-  infoPageRouter.get("/unlock-info", (_req, res) => {
-    if (_req.session?.unlocked) return res.redirect("/");
-
-    res.send(`
-      <form method="post" action="/unlock-info">
-        <h1>Unlock Service Info</h1>
-        <input type="hidden" name="_csrf" value="${res.locals.csrfToken}" />
-        <input type="password" name="password" placeholder="Password" />
-        <button type="submit">Unlock</button>
-      </form>
-    `);
-  });
-  infoPageRouter.use(checkIfUnlocked);
-}
-infoPageRouter.get("/", handleInfoPage);
-infoPageRouter.get("/status", (req, res) => {
-  res.json(buildInfo(req.protocol + "://" + req.get("host"), false));
-});
-export { infoPageRouter };

src/proxy/add-v1.ts

@@ -1,9 +0,0 @@
-import { NextFunction, Request, Response } from "express";
-
-export function addV1(req: Request, res: Response, next: NextFunction) {
-  // Clients don't consistently use the /v1 prefix so we'll add it for them.
-  if (!req.path.startsWith("/v1/") && !req.path.startsWith("/v1beta/")) {
-    req.url = `/v1${req.url}`;
-  }
-  next();
-}

src/proxy/anthropic.ts

@@ -1,4 +1,4 @@
-import { Request, Response, RequestHandler, Router } from "express";
+import { Request, RequestHandler, Router } from "express";
 import { createProxyMiddleware } from "http-proxy-middleware";
 import { config } from "../config";
 import { logger } from "../logger";
@@ -7,16 +7,18 @@ import { ipLimiter } from "./rate-limit";
 import { handleProxyError } from "./middleware/common";
 import {
   addKey,
+  applyQuotaLimits,
   addAnthropicPreamble,
+  blockZoomerOrigins,
   createPreprocessorMiddleware,
   finalizeBody,
-  createOnProxyReqHandler,
+  languageFilter,
+  stripHeaders, createOnProxyReqHandler
 } from "./middleware/request";
 import {
   ProxyResHandlerWithBody,
   createOnProxyResHandler,
 } from "./middleware/response";
-import { sendErrorToClient } from "./middleware/response/error-generator";
 
 let modelsCache: any = null;
 let modelsCacheTime = 0;
@@ -40,13 +42,8 @@ const getModelsResponse = () => {
     "claude-instant-v1.1",
     "claude-instant-v1.1-100k",
     "claude-instant-v1.0",
-    "claude-2",
+    "claude-2", // claude-2 is 100k by default it seems
     "claude-2.0",
-    "claude-2.1",
-    "claude-3-haiku-20240307",
-    "claude-3-opus-20240229",
-    "claude-3-sonnet-20240229",
-    "claude-3-5-sonnet-20240620",
   ];
 
   const models = claudeVariants.map((id) => ({
@@ -70,7 +67,7 @@ const handleModelRequest: RequestHandler = (_req, res) => {
 };
 
 /** Only used for non-streaming requests. */
-const anthropicBlockingResponseHandler: ProxyResHandlerWithBody = async (
+const anthropicResponseHandler: ProxyResHandlerWithBody = async (
   _proxyRes,
   req,
   res,
@@ -80,56 +77,31 @@ const anthropicBlockingResponseHandler: ProxyResHandlerWithBody = async (
     throw new Error("Expected body to be an object");
   }
 
-  let newBody = body;
-  switch (`${req.inboundApi}<-${req.outboundApi}`) {
-    case "openai<-anthropic-text":
-      req.log.info("Transforming Anthropic Text back to OpenAI format");
-      newBody = transformAnthropicTextResponseToOpenAI(body, req);
-      break;
-    case "openai<-anthropic-chat":
-      req.log.info("Transforming Anthropic Chat back to OpenAI format");
-      newBody = transformAnthropicChatResponseToOpenAI(body);
-      break;
-    case "anthropic-text<-anthropic-chat":
-      req.log.info("Transforming Anthropic Chat back to Anthropic chat format");
-      newBody = transformAnthropicChatResponseToAnthropicText(body);
-      break;
+  if (config.promptLogging) {
+    const host = req.get("host");
+    body.proxy_note = `Prompts are logged on this proxy instance. See ${host} for more information.`;
   }
 
-  res.status(200).json({ ...newBody, proxy: body.proxy });
+  if (req.inboundApi === "openai") {
+    req.log.info("Transforming Anthropic response to OpenAI format");
+    body = transformAnthropicResponse(body, req);
+  }
+
+  // TODO: Remove once tokenization is stable
+  if (req.debug) {
+    body.proxy_tokenizer_debug_info = req.debug;
+  }
+
+  res.status(200).json(body);
 };
 
-function flattenChatResponse(
-  content: { type: string; text: string }[]
-): string {
-  return content
-    .map((part: { type: string; text: string }) =>
-      part.type === "text" ? part.text : ""
-    )
-    .join("\n");
-}
-
-export function transformAnthropicChatResponseToAnthropicText(
-  anthropicBody: Record<string, any>
-): Record<string, any> {
-  return {
-    type: "completion",
-    id: "ant-" + anthropicBody.id,
-    completion: flattenChatResponse(anthropicBody.content),
-    stop_reason: anthropicBody.stop_reason,
-    stop: anthropicBody.stop_sequence,
-    model: anthropicBody.model,
-    usage: anthropicBody.usage,
-  };
-}
-
 /**
  * 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.
  */
-export function transformAnthropicTextResponseToOpenAI(
+function transformAnthropicResponse(
   anthropicBody: Record<string, any>,
   req: Request
 ): Record<string, any> {
@@ -157,163 +129,71 @@ export function transformAnthropicTextResponseToOpenAI(
   };
 }
 
-export function transformAnthropicChatResponseToOpenAI(
-  anthropicBody: Record<string, any>
-): Record<string, any> {
-  return {
-    id: "ant-" + anthropicBody.id,
-    object: "chat.completion",
-    created: Date.now(),
-    model: anthropicBody.model,
-    usage: anthropicBody.usage,
-    choices: [
-      {
-        message: {
-          role: "assistant",
-          content: flattenChatResponse(anthropicBody.content),
-        },
-        finish_reason: anthropicBody.stop_reason,
-        index: 0,
-      },
-    ],
-  };
-}
-
-/**
- * If a client using the OpenAI compatibility endpoint requests an actual OpenAI
- * model, reassigns it to Claude 3 Sonnet.
- */
-function maybeReassignModel(req: Request) {
-  const model = req.body.model;
-  if (!model.startsWith("gpt-")) return;
-  req.body.model = "claude-3-sonnet-20240229";
-}
-
-/**
- * If client requests more than 4096 output tokens the request must have a
- * particular version header.
- * https://docs.anthropic.com/en/release-notes/api#july-15th-2024
- */
-function setAnthropicBetaHeader(req: Request) {
-  const { max_tokens_to_sample } = req.body;
-  if (max_tokens_to_sample > 4096) {
-    req.headers["anthropic-beta"] = "max-tokens-3-5-sonnet-2024-07-15";
-  }
-}
-
-const anthropicProxy = createQueueMiddleware({
-  proxyMiddleware: createProxyMiddleware({
+const anthropicProxy = createQueueMiddleware(
+  createProxyMiddleware({
     target: "https://api.anthropic.com",
     changeOrigin: true,
     selfHandleResponse: true,
     logger,
     on: {
       proxyReq: createOnProxyReqHandler({
-        pipeline: [addKey, addAnthropicPreamble, finalizeBody],
+        pipeline: [
+          applyQuotaLimits,
+          addKey,
+          addAnthropicPreamble,
+          languageFilter,
+          blockZoomerOrigins,
+          stripHeaders,
+          finalizeBody,
+        ],
       }),
-      proxyRes: createOnProxyResHandler([anthropicBlockingResponseHandler]),
+      proxyRes: createOnProxyResHandler([anthropicResponseHandler]),
       error: handleProxyError,
     },
-    // Abusing pathFilter to rewrite the paths dynamically.
-    pathFilter: (pathname, req) => {
-      const isText = req.outboundApi === "anthropic-text";
-      const isChat = req.outboundApi === "anthropic-chat";
-      if (isChat && pathname === "/v1/complete") {
-        req.url = "/v1/messages";
-      }
-      if (isText && pathname === "/v1/chat/completions") {
-        req.url = "/v1/complete";
-      }
-      if (isChat && pathname === "/v1/chat/completions") {
-        req.url = "/v1/messages";
-      }
-      if (isChat && ["sonnet", "opus"].includes(req.params.type)) {
-        req.url = "/v1/messages";
-      }
-      return true;
+    pathRewrite: {
+      // Send OpenAI-compat requests to the real Anthropic endpoint.
+      "^/v1/chat/completions": "/v1/complete",
     },
-  }),
-});
-
-const nativeAnthropicChatPreprocessor = createPreprocessorMiddleware(
-  { inApi: "anthropic-chat", outApi: "anthropic-chat", service: "anthropic" },
-  { afterTransform: [setAnthropicBetaHeader] }
+  })
 );
 
-const nativeTextPreprocessor = createPreprocessorMiddleware({
-  inApi: "anthropic-text",
-  outApi: "anthropic-text",
-  service: "anthropic",
-});
-
-const textToChatPreprocessor = createPreprocessorMiddleware({
-  inApi: "anthropic-text",
-  outApi: "anthropic-chat",
-  service: "anthropic",
-});
-
-/**
- * Routes text completion prompts to anthropic-chat if they need translation
- * (claude-3 based models do not support the old text completion endpoint).
- */
-const preprocessAnthropicTextRequest: RequestHandler = (req, res, next) => {
-  if (req.body.model?.startsWith("claude-3")) {
-    textToChatPreprocessor(req, res, next);
-  } else {
-    nativeTextPreprocessor(req, res, next);
-  }
-};
-
-const oaiToTextPreprocessor = createPreprocessorMiddleware({
-  inApi: "openai",
-  outApi: "anthropic-text",
-  service: "anthropic",
-});
-
-const oaiToChatPreprocessor = createPreprocessorMiddleware({
-  inApi: "openai",
-  outApi: "anthropic-chat",
-  service: "anthropic",
-});
-
-/**
- * Routes an OpenAI prompt to either the legacy Claude text completion endpoint
- * or the new Claude chat completion endpoint, based on the requested model.
- */
-const preprocessOpenAICompatRequest: RequestHandler = (req, res, next) => {
-  maybeReassignModel(req);
-  if (req.body.model?.includes("claude-3")) {
-    oaiToChatPreprocessor(req, res, next);
-  } else {
-    oaiToTextPreprocessor(req, res, next);
-  }
-};
-
 const anthropicRouter = Router();
 anthropicRouter.get("/v1/models", handleModelRequest);
 // Native Anthropic chat completion endpoint.
-anthropicRouter.post(
-  "/v1/messages",
-  ipLimiter,
-  nativeAnthropicChatPreprocessor,
-  anthropicProxy
-);
-// Anthropic text completion endpoint. Translates to Anthropic chat completion
-// if the requested model is a Claude 3 model.
 anthropicRouter.post(
   "/v1/complete",
   ipLimiter,
-  preprocessAnthropicTextRequest,
+  createPreprocessorMiddleware({
+    inApi: "anthropic",
+    outApi: "anthropic",
+    service: "anthropic",
+  }),
   anthropicProxy
 );
-// OpenAI-to-Anthropic compatibility endpoint. Accepts an OpenAI chat completion
-// request and transforms/routes it to the appropriate Anthropic format and
-// endpoint based on the requested model.
+// OpenAI-to-Anthropic compatibility endpoint.
 anthropicRouter.post(
   "/v1/chat/completions",
   ipLimiter,
-  preprocessOpenAICompatRequest,
+  createPreprocessorMiddleware(
+    { inApi: "openai", outApi: "anthropic", service: "anthropic" },
+    { afterTransform: [maybeReassignModel] }
+  ),
   anthropicProxy
 );
 
+function maybeReassignModel(req: Request) {
+  const model = req.body.model;
+  if (!model.startsWith("gpt-")) return;
+
+  const bigModel = process.env.CLAUDE_BIG_MODEL || "claude-v1-100k";
+  const contextSize = req.promptTokens! + req.outputTokens!;
+  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/aws-claude.ts

@@ -1,253 +0,0 @@
-import { Request, RequestHandler, Router } from "express";
-import { createProxyMiddleware } from "http-proxy-middleware";
-import { v4 } from "uuid";
-import { logger } from "../logger";
-import { createQueueMiddleware } from "./queue";
-import { ipLimiter } from "./rate-limit";
-import { handleProxyError } from "./middleware/common";
-import {
-  createPreprocessorMiddleware,
-  signAwsRequest,
-  finalizeSignedRequest,
-  createOnProxyReqHandler,
-} from "./middleware/request";
-import {
-  ProxyResHandlerWithBody,
-  createOnProxyResHandler,
-} from "./middleware/response";
-import {
-  transformAnthropicChatResponseToAnthropicText,
-  transformAnthropicChatResponseToOpenAI,
-} from "./anthropic";
-
-/** 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");
-  }
-
-  let newBody = body;
-  switch (`${req.inboundApi}<-${req.outboundApi}`) {
-    case "openai<-anthropic-text":
-      req.log.info("Transforming Anthropic Text back to OpenAI format");
-      newBody = transformAwsTextResponseToOpenAI(body, req);
-      break;
-    case "openai<-anthropic-chat":
-      req.log.info("Transforming AWS Anthropic Chat back to OpenAI format");
-      newBody = transformAnthropicChatResponseToOpenAI(body);
-      break;
-    case "anthropic-text<-anthropic-chat":
-      req.log.info("Transforming AWS Anthropic Chat back to Text format");
-      newBody = transformAnthropicChatResponseToAnthropicText(body);
-      break;
-  }
-
-  // AWS does not always confirm the model in the response, so we have to add it
-  if (!newBody.model && req.body.model) {
-    newBody.model = req.body.model;
-  }
-
-  res.status(200).json({ ...newBody, proxy: body.proxy });
-};
-
-/**
- * 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 transformAwsTextResponseToOpenAI(
-  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 awsClaudeProxy = createQueueMiddleware({
-  beforeProxy: signAwsRequest,
-  proxyMiddleware: createProxyMiddleware({
-    target: "bad-target-will-be-rewritten",
-    router: ({ signedRequest }) => {
-      if (!signedRequest) throw new Error("Must sign request before proxying");
-      return `${signedRequest.protocol}//${signedRequest.hostname}`;
-    },
-    changeOrigin: true,
-    selfHandleResponse: true,
-    logger,
-    on: {
-      proxyReq: createOnProxyReqHandler({ pipeline: [finalizeSignedRequest] }),
-      proxyRes: createOnProxyResHandler([awsResponseHandler]),
-      error: handleProxyError,
-    },
-  }),
-});
-
-const nativeTextPreprocessor = createPreprocessorMiddleware(
-  { inApi: "anthropic-text", outApi: "anthropic-text", service: "aws" },
-  { afterTransform: [maybeReassignModel] }
-);
-
-const textToChatPreprocessor = createPreprocessorMiddleware(
-  { inApi: "anthropic-text", outApi: "anthropic-chat", service: "aws" },
-  { afterTransform: [maybeReassignModel] }
-);
-
-/**
- * Routes text completion prompts to aws anthropic-chat if they need translation
- * (claude-3 based models do not support the old text completion endpoint).
- */
-const preprocessAwsTextRequest: RequestHandler = (req, res, next) => {
-  if (req.body.model?.includes("claude-3")) {
-    textToChatPreprocessor(req, res, next);
-  } else {
-    nativeTextPreprocessor(req, res, next);
-  }
-};
-
-const oaiToAwsTextPreprocessor = createPreprocessorMiddleware(
-  { inApi: "openai", outApi: "anthropic-text", service: "aws" },
-  { afterTransform: [maybeReassignModel] }
-);
-
-const oaiToAwsChatPreprocessor = createPreprocessorMiddleware(
-  { inApi: "openai", outApi: "anthropic-chat", service: "aws" },
-  { afterTransform: [maybeReassignModel] }
-);
-
-/**
- * Routes an OpenAI prompt to either the legacy Claude text completion endpoint
- * or the new Claude chat completion endpoint, based on the requested model.
- */
-const preprocessOpenAICompatRequest: RequestHandler = (req, res, next) => {
-  if (req.body.model?.includes("claude-3")) {
-    oaiToAwsChatPreprocessor(req, res, next);
-  } else {
-    oaiToAwsTextPreprocessor(req, res, next);
-  }
-};
-
-const awsClaudeRouter = Router();
-// Native(ish) Anthropic text completion endpoint.
-awsClaudeRouter.post(
-  "/v1/complete",
-  ipLimiter,
-  preprocessAwsTextRequest,
-  awsClaudeProxy
-);
-// Native Anthropic chat completion endpoint.
-awsClaudeRouter.post(
-  "/v1/messages",
-  ipLimiter,
-  createPreprocessorMiddleware(
-    { inApi: "anthropic-chat", outApi: "anthropic-chat", service: "aws" },
-    { afterTransform: [maybeReassignModel] }
-  ),
-  awsClaudeProxy
-);
-
-// OpenAI-to-AWS Anthropic compatibility endpoint.
-awsClaudeRouter.post(
-  "/v1/chat/completions",
-  ipLimiter,
-  preprocessOpenAICompatRequest,
-  awsClaudeProxy
-);
-
-/**
- * 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
- *
- * If client sends AWS model ID it will be used verbatim. Otherwise, various
- * strategies are used to try to map a non-AWS model name to AWS model ID.
- */
-function maybeReassignModel(req: Request) {
-  const model = req.body.model;
-
-  // If it looks like an AWS model, use it as-is
-  if (model.includes("anthropic.claude")) {
-    return;
-  }
-
-  // Anthropic model names can look like:
-  // - claude-v1
-  // - claude-2.1
-  // - claude-3-5-sonnet-20240620-v1:0
-  const pattern =
-    /^(claude-)?(instant-)?(v)?(\d+)([.-](\d))?(-\d+k)?(-sonnet-|-opus-|-haiku-)?(\d*)/i;
-  const match = model.match(pattern);
-
-  // If there's no match, fallback to Claude v2 as it is most likely to be
-  // available on AWS.
-  if (!match) {
-    req.body.model = `anthropic.claude-v2:1`;
-    return;
-  }
-
-  const [_, _cl, instant, _v, major, _sep, minor, _ctx, name, _rev] = match;
-
-  if (instant) {
-    req.body.model = "anthropic.claude-instant-v1";
-    return;
-  }
-
-  const ver = minor ? `${major}.${minor}` : major;
-  switch (ver) {
-    case "1":
-    case "1.0":
-      req.body.model = "anthropic.claude-v1";
-      return;
-    case "2":
-    case "2.0":
-      req.body.model = "anthropic.claude-v2";
-      return;
-    case "3":
-    case "3.0":
-      if (name.includes("opus")) {
-        req.body.model = "anthropic.claude-3-opus-20240229-v1:0";
-      } else if (name.includes("haiku")) {
-        req.body.model = "anthropic.claude-3-haiku-20240307-v1:0";
-      } else {
-        req.body.model = "anthropic.claude-3-sonnet-20240229-v1:0";
-      }
-      return;
-    case "3.5":
-      req.body.model = "anthropic.claude-3-5-sonnet-20240620-v1:0";
-      return;
-  }
-
-  // Fallback to Claude 2.1
-  req.body.model = `anthropic.claude-v2:1`;
-  return;
-}
-
-export const awsClaude = awsClaudeRouter;

src/proxy/aws-mistral.ts

@@ -1,110 +0,0 @@
-import { Request } from "express";
-import {
-  createOnProxyResHandler,
-  ProxyResHandlerWithBody,
-} from "./middleware/response";
-import { createQueueMiddleware } from "./queue";
-import {
-  createOnProxyReqHandler,
-  createPreprocessorMiddleware,
-  finalizeSignedRequest,
-  signAwsRequest,
-} from "./middleware/request";
-import { createProxyMiddleware } from "http-proxy-middleware";
-import { logger } from "../logger";
-import { handleProxyError } from "./middleware/common";
-import { Router } from "express";
-import { ipLimiter } from "./rate-limit";
-import { detectMistralInputApi, transformMistralTextToMistralChat } from "./mistral-ai";
-
-const awsMistralBlockingResponseHandler: ProxyResHandlerWithBody = async (
-  _proxyRes,
-  req,
-  res,
-  body
-) => {
-  if (typeof body !== "object") {
-    throw new Error("Expected body to be an object");
-  }
-
-  let newBody = body;
-  if (req.inboundApi === "mistral-ai" && req.outboundApi === "mistral-text") {
-    newBody = transformMistralTextToMistralChat(body);
-  }
-  // AWS does not always confirm the model in the response, so we have to add it
-  if (!newBody.model && req.body.model) {
-    newBody.model = req.body.model;
-  }
-
-  res.status(200).json({ ...newBody, proxy: body.proxy });
-};
-
-const awsMistralProxy = createQueueMiddleware({
-  beforeProxy: signAwsRequest,
-  proxyMiddleware: createProxyMiddleware({
-    target: "bad-target-will-be-rewritten",
-    router: ({ signedRequest }) => {
-      if (!signedRequest) throw new Error("Must sign request before proxying");
-      return `${signedRequest.protocol}//${signedRequest.hostname}`;
-    },
-    changeOrigin: true,
-    selfHandleResponse: true,
-    logger,
-    on: {
-      proxyReq: createOnProxyReqHandler({ pipeline: [finalizeSignedRequest] }),
-      proxyRes: createOnProxyResHandler([awsMistralBlockingResponseHandler]),
-      error: handleProxyError,
-    },
-  }),
-});
-
-function maybeReassignModel(req: Request) {
-  const model = req.body.model;
-
-  // If it looks like an AWS model, use it as-is
-  if (model.startsWith("mistral.")) {
-    return;
-  }
-  // Mistral 7B Instruct
-  else if (model.includes("7b")) {
-    req.body.model = "mistral.mistral-7b-instruct-v0:2";
-  }
-  // Mistral 8x7B Instruct
-  else if (model.includes("8x7b")) {
-    req.body.model = "mistral.mixtral-8x7b-instruct-v0:1";
-  }
-  // Mistral Large (Feb 2024)
-  else if (model.includes("large-2402")) {
-    req.body.model = "mistral.mistral-large-2402-v1:0";
-  }
-  // Mistral Large 2 (July 2024)
-  else if (model.includes("large")) {
-    req.body.model = "mistral.mistral-large-2407-v1:0";
-  }
-  // Mistral Small (Feb 2024)
-  else if (model.includes("small")) {
-    req.body.model = "mistral.mistral-small-2402-v1:0";
-  } else {
-    throw new Error(
-      `Can't map '${model}' to a supported AWS model ID; make sure you are requesting a Mistral model supported by Amazon Bedrock`
-    );
-  }
-}
-
-const nativeMistralChatPreprocessor = createPreprocessorMiddleware(
-  { inApi: "mistral-ai", outApi: "mistral-ai", service: "aws" },
-  {
-    beforeTransform: [detectMistralInputApi],
-    afterTransform: [maybeReassignModel],
-  }
-);
-
-const awsMistralRouter = Router();
-awsMistralRouter.post(
-  "/v1/chat/completions",
-  ipLimiter,
-  nativeMistralChatPreprocessor,
-  awsMistralProxy
-);
-
-export const awsMistral = awsMistralRouter;

src/proxy/aws.ts

@@ -1,75 +1,196 @@
-/* Shared code between AWS Claude and AWS Mistral endpoints. */
-
-import { Request, Response, Router } from "express";
+import { Request, RequestHandler, Router } from "express";
+import { createProxyMiddleware } from "http-proxy-middleware";
+import { v4 } from "uuid";
 import { config } from "../config";
-import { addV1 } from "./add-v1";
-import { awsClaude } from "./aws-claude";
-import { awsMistral } from "./aws-mistral";
-import { AwsBedrockKey, keyPool } from "../shared/key-management";
+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";
 
-const awsRouter = Router();
-awsRouter.get(["/:vendor?/v1/models", "/:vendor?/models"], handleModelsRequest);
-awsRouter.use("/claude", addV1, awsClaude);
-awsRouter.use("/mistral", addV1, awsMistral);
+let modelsCache: any = null;
+let modelsCacheTime = 0;
+
+const getModelsResponse = () => {
+  if (new Date().getTime() - modelsCacheTime < 1000 * 60) {
+    return modelsCache;
+  }
 
-const MODELS_CACHE_TTL = 10000;
-let modelsCache: Record<string, any> = {};
-let modelsCacheTime: Record<string, number> = {};
-function handleModelsRequest(req: Request, res: Response) {
   if (!config.awsCredentials) return { object: "list", data: [] };
 
-  const vendor = req.params.vendor?.length
-    ? req.params.vendor === "claude"
-      ? "anthropic"
-      : req.params.vendor
-    : "all";
+  const variants = ["anthropic.claude-v1", "anthropic.claude-v2"];
 
-  const cacheTime = modelsCacheTime[vendor] || 0;
-  if (new Date().getTime() - cacheTime < MODELS_CACHE_TTL) {
-    return res.json(modelsCache[vendor]);
+  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");
   }
 
-  const availableModelIds = new Set<string>();
-  for (const key of keyPool.list()) {
-    if (key.isDisabled || key.service !== "aws") continue;
-    (key as AwsBedrockKey).modelIds.forEach((id) => availableModelIds.add(id));
+  if (config.promptLogging) {
+    const host = req.get("host");
+    body.proxy_note = `Prompts are logged on this proxy instance. See ${host} for more information.`;
   }
 
-  // https://docs.aws.amazon.com/bedrock/latest/userguide/model-ids.html
-  const models = [
-    "anthropic.claude-v2",
-    "anthropic.claude-v2:1",
-    "anthropic.claude-3-haiku-20240307-v1:0",
-    "anthropic.claude-3-sonnet-20240229-v1:0",
-    "anthropic.claude-3-5-sonnet-20240620-v1:0",
-    "anthropic.claude-3-opus-20240229-v1:0",
-    "mistral.mistral-7b-instruct-v0:2",
-    "mistral.mixtral-8x7b-instruct-v0:1",
-    "mistral.mistral-large-2402-v1:0",
-    "mistral.mistral-large-2407-v1:0",
-    "mistral.mistral-small-2402-v1:0",
-  ]
-    .filter((id) => availableModelIds.has(id))
-    .map((id) => {
-      const vendor = id.match(/^(.*)\./)?.[1];
-      return {
-        id,
-        object: "model",
-        created: new Date().getTime(),
-        owned_by: vendor,
-        permission: [],
-        root: vendor,
-        parent: null,
-      };
-    });
+  if (req.inboundApi === "openai") {
+    req.log.info("Transforming AWS Claude response to OpenAI format");
+    body = transformAwsResponse(body, req);
+  }
 
-  modelsCache[vendor] = {
-    object: "list",
-    data: models.filter((m) => vendor === "all" || m.root === vendor),
+  // 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,
+      },
+    ],
   };
-  modelsCacheTime[vendor] = new Date().getTime();
+}
 
-  return res.json(modelsCache[vendor]);
+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/azure.ts

@@ -1,129 +0,0 @@
-import { RequestHandler, Router } from "express";
-import { createProxyMiddleware } from "http-proxy-middleware";
-import { config } from "../config";
-import { keyPool } from "../shared/key-management";
-import {
-  AzureOpenAIModelFamily,
-  getAzureOpenAIModelFamily,
-  ModelFamily,
-} from "../shared/models";
-import { logger } from "../logger";
-import { KNOWN_OPENAI_MODELS } from "./openai";
-import { createQueueMiddleware } from "./queue";
-import { ipLimiter } from "./rate-limit";
-import { handleProxyError } from "./middleware/common";
-import {
-  addAzureKey,
-  createOnProxyReqHandler,
-  createPreprocessorMiddleware,
-  finalizeSignedRequest,
-} from "./middleware/request";
-import {
-  createOnProxyResHandler,
-  ProxyResHandlerWithBody,
-} from "./middleware/response";
-
-let modelsCache: any = null;
-let modelsCacheTime = 0;
-
-function getModelsResponse() {
-  if (new Date().getTime() - modelsCacheTime < 1000 * 60) {
-    return modelsCache;
-  }
-
-  let available = new Set<AzureOpenAIModelFamily>();
-  for (const key of keyPool.list()) {
-    if (key.isDisabled || key.service !== "azure") continue;
-    key.modelFamilies.forEach((family) =>
-      available.add(family as AzureOpenAIModelFamily)
-    );
-  }
-  const allowed = new Set<ModelFamily>(config.allowedModelFamilies);
-  available = new Set([...available].filter((x) => allowed.has(x)));
-
-  const models = KNOWN_OPENAI_MODELS.map((id) => ({
-    id,
-    object: "model",
-    created: new Date().getTime(),
-    owned_by: "azure",
-    permission: [
-      {
-        id: "modelperm-" + id,
-        object: "model_permission",
-        created: new Date().getTime(),
-        organization: "*",
-        group: null,
-        is_blocking: false,
-      },
-    ],
-    root: id,
-    parent: null,
-  })).filter((model) => available.has(getAzureOpenAIModelFamily(model.id)));
-
-  modelsCache = { object: "list", data: models };
-  modelsCacheTime = new Date().getTime();
-
-  return modelsCache;
-}
-
-const handleModelRequest: RequestHandler = (_req, res) => {
-  res.status(200).json(getModelsResponse());
-};
-
-const azureOpenaiResponseHandler: ProxyResHandlerWithBody = async (
-  _proxyRes,
-  req,
-  res,
-  body
-) => {
-  if (typeof body !== "object") {
-    throw new Error("Expected body to be an object");
-  }
-
-  res.status(200).json({ ...body, proxy: body.proxy });
-};
-
-const azureOpenAIProxy = createQueueMiddleware({
-  beforeProxy: addAzureKey,
-  proxyMiddleware: createProxyMiddleware({
-    target: "will be set by router",
-    router: (req) => {
-      if (!req.signedRequest) throw new Error("signedRequest not set");
-      const { hostname, path } = req.signedRequest;
-      return `https://${hostname}${path}`;
-    },
-    changeOrigin: true,
-    selfHandleResponse: true,
-    logger,
-    on: {
-      proxyReq: createOnProxyReqHandler({ pipeline: [finalizeSignedRequest] }),
-      proxyRes: createOnProxyResHandler([azureOpenaiResponseHandler]),
-      error: handleProxyError,
-    },
-  }),
-});
-
-const azureOpenAIRouter = Router();
-azureOpenAIRouter.get("/v1/models", handleModelRequest);
-azureOpenAIRouter.post(
-  "/v1/chat/completions",
-  ipLimiter,
-  createPreprocessorMiddleware({
-    inApi: "openai",
-    outApi: "openai",
-    service: "azure",
-  }),
-  azureOpenAIProxy
-);
-azureOpenAIRouter.post(
-  "/v1/images/generations",
-  ipLimiter,
-  createPreprocessorMiddleware({
-    inApi: "openai-image",
-    outApi: "openai-image",
-    service: "azure",
-  }),
-  azureOpenAIProxy
-);
-
-export const azure = azureOpenAIRouter;

src/proxy/gatekeeper.ts

@@ -1,7 +1,6 @@
-import type { Request, Response, RequestHandler } from "express";
+import type { Request, RequestHandler } from "express";
 import { config } from "../config";
 import { authenticate, getUser } from "../shared/users/user-store";
-import { sendErrorToClient } from "./middleware/response/error-generator";
 
 const GATEKEEPER = config.gatekeeper;
 const PROXY_KEY = config.proxyKey;
@@ -12,7 +11,6 @@ function getProxyAuthorizationFromRequest(req: Request): string | undefined {
   // pass the _proxy_ key in this header too, instead of providing it as a
   // Bearer token in the Authorization header.  So we need to check both.
   // Prefer the Authorization header if both are present.
-  // Google AI uses a key querystring parameter.
 
   if (req.headers.authorization) {
     const token = req.headers.authorization?.slice("Bearer ".length);
@@ -25,12 +23,6 @@ function getProxyAuthorizationFromRequest(req: Request): string | undefined {
     delete req.headers["x-api-key"];
     return token;
   }
-  
-  if (req.query.key) {
-    const token = req.query.key?.toString();
-    delete req.query.key;
-    return token;
-  }
 
   return undefined;
 }
@@ -54,65 +46,21 @@ export const gatekeeper: RequestHandler = (req, res, next) => {
   }
 
   if (GATEKEEPER === "user_token" && token) {
-    // RisuAI users all come from a handful of aws lambda IPs so we cannot use
-    // IP alone to distinguish between them and prevent usertoken sharing.
-    // Risu sends a signed token in the request headers with an anonymous user
-    // ID that we can instead use to associate requests with an individual.
-    const ip = req.risuToken?.length
-      ? `risu${req.risuToken}-${req.ip}`
-      : req.ip;
-
-    const { user, result } = authenticate(token, ip);
-
-    switch (result) {
-      case "success":
-        req.user = user;
-        return next();
-      case "limited":
-        return sendError(
-          req,
-          res,
-          403,
-          `Forbidden: no more IP addresses allowed for this user token`,
-          { currentIp: ip, maxIps: user?.maxIps }
-        );
-      case "disabled":
-        const bannedUser = getUser(token);
-        if (bannedUser?.disabledAt) {
-          const reason = bannedUser.disabledReason || "User token disabled";
-          return sendError(req, res, 403, `Forbidden: ${reason}`);
-        }
+    const user = authenticate(token, req.ip);
+    if (user) {
+      req.user = user;
+      return next();
+    } else {
+      const maybeBannedUser = getUser(token);
+      if (maybeBannedUser?.disabledAt) {
+        return res.status(403).json({
+          error: `Forbidden: ${
+            maybeBannedUser.disabledReason || "Token disabled"
+          }`,
+        });
+      }
     }
   }
 
-  sendError(req, res, 401, "Unauthorized");
+  res.status(401).json({ error: "Unauthorized" });
 };
-
-function sendError(
-  req: Request,
-  res: Response,
-  status: number,
-  message: string,
-  data: any = {}
-) {
-  const isPost = req.method === "POST";
-  const hasBody = isPost && req.body;
-  const hasModel = hasBody && req.body.model;
-
-  if (!hasModel) {
-    return res.status(status).json({ error: message });
-  }
-
-  sendErrorToClient({
-    req,
-    res,
-    options: {
-      title: `Proxy gatekeeper error (HTTP ${status})`,
-      message,
-      format: "unknown",
-      statusCode: status,
-      reqId: req.id,
-      obj: data,
-    },
-  });
-}

src/proxy/gcp.ts

@@ -1,196 +0,0 @@
-import { Request, RequestHandler, Response, 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 {
-  createPreprocessorMiddleware,
-  signGcpRequest,
-  finalizeSignedRequest,
-  createOnProxyReqHandler,
-} from "./middleware/request";
-import {
-  ProxyResHandlerWithBody,
-  createOnProxyResHandler,
-} from "./middleware/response";
-import { transformAnthropicChatResponseToOpenAI } from "./anthropic";
-import { sendErrorToClient } from "./middleware/response/error-generator";
-
-const LATEST_GCP_SONNET_MINOR_VERSION = "20240229";
-
-let modelsCache: any = null;
-let modelsCacheTime = 0;
-
-const getModelsResponse = () => {
-  if (new Date().getTime() - modelsCacheTime < 1000 * 60) {
-    return modelsCache;
-  }
-
-  if (!config.gcpCredentials) return { object: "list", data: [] };
-
-  // https://docs.anthropic.com/en/docs/about-claude/models
-  const variants = [
-    "claude-3-haiku@20240307",
-    "claude-3-sonnet@20240229",
-    "claude-3-opus@20240229",
-    "claude-3-5-sonnet@20240620",
-  ];
-
-  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 gcpResponseHandler: ProxyResHandlerWithBody = async (
-  _proxyRes,
-  req,
-  res,
-  body
-) => {
-  if (typeof body !== "object") {
-    throw new Error("Expected body to be an object");
-  }
-
-  let newBody = body;
-  switch (`${req.inboundApi}<-${req.outboundApi}`) {
-    case "openai<-anthropic-chat":
-      req.log.info("Transforming Anthropic Chat back to OpenAI format");
-      newBody = transformAnthropicChatResponseToOpenAI(body);
-      break;
-  }
-
-  res.status(200).json({ ...newBody, proxy: body.proxy });
-};
-
-const gcpProxy = createQueueMiddleware({
-  beforeProxy: signGcpRequest,
-  proxyMiddleware: createProxyMiddleware({
-    target: "bad-target-will-be-rewritten",
-    router: ({ signedRequest }) => {
-      if (!signedRequest) throw new Error("Must sign request before proxying");
-      return `${signedRequest.protocol}//${signedRequest.hostname}`;
-    },
-    changeOrigin: true,
-    selfHandleResponse: true,
-    logger,
-    on: {
-      proxyReq: createOnProxyReqHandler({ pipeline: [finalizeSignedRequest] }),
-      proxyRes: createOnProxyResHandler([gcpResponseHandler]),
-      error: handleProxyError,
-    },
-  }),
-});
-
-const oaiToChatPreprocessor = createPreprocessorMiddleware(
-  { inApi: "openai", outApi: "anthropic-chat", service: "gcp" },
-  { afterTransform: [maybeReassignModel] }
-);
-
-/**
- * Routes an OpenAI prompt to either the legacy Claude text completion endpoint
- * or the new Claude chat completion endpoint, based on the requested model.
- */
-const preprocessOpenAICompatRequest: RequestHandler = (req, res, next) => {
-  oaiToChatPreprocessor(req, res, next);
-};
-
-const gcpRouter = Router();
-gcpRouter.get("/v1/models", handleModelRequest);
-// Native Anthropic chat completion endpoint.
-gcpRouter.post(
-  "/v1/messages",
-  ipLimiter,
-  createPreprocessorMiddleware(
-    { inApi: "anthropic-chat", outApi: "anthropic-chat", service: "gcp" },
-    { afterTransform: [maybeReassignModel] }
-  ),
-  gcpProxy
-);
-
-// OpenAI-to-GCP Anthropic compatibility endpoint.
-gcpRouter.post(
-  "/v1/chat/completions",
-  ipLimiter,
-  preprocessOpenAICompatRequest,
-  gcpProxy
-);
-
-/**
- * Tries to deal with:
- * - frontends sending GCP model names even when they want to use the OpenAI-
- *   compatible endpoint
- * - frontends sending Anthropic model names that GCP doesn't recognize
- * - frontends sending OpenAI model names because they expect the proxy to
- *   translate them
- * 
- * If client sends GCP model ID it will be used verbatim. Otherwise, various
- * strategies are used to try to map a non-GCP model name to GCP model ID.
- */
-function maybeReassignModel(req: Request) {
-  const model = req.body.model;
-
-  // If it looks like an GCP model, use it as-is
-  // if (model.includes("anthropic.claude")) {
-  if (model.startsWith("claude-") && model.includes("@")) {
-    return;
-  }
-
-  // Anthropic model names can look like:
-  // - claude-v1
-  // - claude-2.1
-  // - claude-3-5-sonnet-20240620-v1:0
-  const pattern =
-    /^(claude-)?(instant-)?(v)?(\d+)([.-](\d{1}))?(-\d+k)?(-sonnet-|-opus-|-haiku-)?(\d*)/i;
-  const match = model.match(pattern);
-
-  // If there's no match, fallback to Claude3 Sonnet as it is most likely to be
-  // available on GCP.
-  if (!match) {
-    req.body.model = `claude-3-sonnet@${LATEST_GCP_SONNET_MINOR_VERSION}`;
-    return;
-  }
-
-  const [_, _cl, instant, _v, major, _sep, minor, _ctx, name, _rev] = match;
-  
-  const ver = minor ? `${major}.${minor}` : major;
-  switch (ver) {
-    case "3":
-    case "3.0":
-      if (name.includes("opus")) {
-        req.body.model = "claude-3-opus@20240229";
-      } else if (name.includes("haiku")) {
-        req.body.model = "claude-3-haiku@20240307";
-      } else {
-        req.body.model = "claude-3-sonnet@20240229";
-      }
-      return;
-    case "3.5":
-      req.body.model = "claude-3-5-sonnet@20240620";
-      return;
-  }
-
-  // Fallback to Claude3 Sonnet
-  req.body.model = `claude-3-sonnet@${LATEST_GCP_SONNET_MINOR_VERSION}`;
-  return;
-}
-
-export const gcp = gcpRouter;

src/proxy/google-ai.ts

@@ -1,207 +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 {
-  createOnProxyReqHandler,
-  createPreprocessorMiddleware,
-  finalizeSignedRequest,
-} from "./middleware/request";
-import {
-  createOnProxyResHandler,
-  ProxyResHandlerWithBody,
-} from "./middleware/response";
-import { addGoogleAIKey } from "./middleware/request/preprocessors/add-google-ai-key";
-import { GoogleAIKey, keyPool } from "../shared/key-management";
-
-let modelsCache: any = null;
-let modelsCacheTime = 0;
-
-// https://ai.google.dev/models/gemini
-// TODO: list models https://ai.google.dev/tutorials/rest_quickstart#list_models
-
-const getModelsResponse = () => {
-  if (new Date().getTime() - modelsCacheTime < 1000 * 60) {
-    return modelsCache;
-  }
-
-  if (!config.googleAIKey) return { object: "list", data: [] };
-
-  const keys = keyPool
-    .list()
-    .filter((k) => k.service === "google-ai") as GoogleAIKey[];
-  if (keys.length === 0) {
-    modelsCache = { object: "list", data: [] };
-    modelsCacheTime = new Date().getTime();
-    return modelsCache;
-  }
-
-  const modelIds = Array.from(
-    new Set(keys.map((k) => k.modelIds).flat())
-  ).filter((id) => id.startsWith("models/gemini"));
-  const models = modelIds.map((id) => ({
-    id,
-    object: "model",
-    created: new Date().getTime(),
-    owned_by: "google",
-    permission: [],
-    root: "google",
-    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 googleAIResponseHandler: ProxyResHandlerWithBody = async (
-  _proxyRes,
-  req,
-  res,
-  body
-) => {
-  if (typeof body !== "object") {
-    throw new Error("Expected body to be an object");
-  }
-
-  let newBody = body;
-  if (req.inboundApi === "openai") {
-    req.log.info("Transforming Google AI response to OpenAI format");
-    newBody = transformGoogleAIResponse(body, req);
-  }
-
-  res.status(200).json({ ...newBody, proxy: body.proxy });
-};
-
-function transformGoogleAIResponse(
-  resBody: Record<string, any>,
-  req: Request
-): Record<string, any> {
-  const totalTokens = (req.promptTokens ?? 0) + (req.outputTokens ?? 0);
-  const parts = resBody.candidates[0].content?.parts ?? [{ text: "" }];
-  const content = parts[0].text.replace(/^(.{0,50}?): /, () => "");
-  return {
-    id: "goo-" + 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 },
-        finish_reason: resBody.candidates[0].finishReason,
-        index: 0,
-      },
-    ],
-  };
-}
-
-const googleAIProxy = createQueueMiddleware({
-  beforeProxy: addGoogleAIKey,
-  proxyMiddleware: createProxyMiddleware({
-    target: "bad-target-will-be-rewritten",
-    router: ({ signedRequest }) => {
-      const { protocol, hostname, path } = signedRequest;
-      return `${protocol}//${hostname}${path}`;
-    },
-    changeOrigin: true,
-    selfHandleResponse: true,
-    // Prevent logging of the API key by HPM
-    logger: logger.child(
-      {},
-      {
-        redact: {
-          paths: ["*"],
-          censor: (v) =>
-            typeof v === "string" ? v.replace(/key=\S+/g, "key=xxxxxxx") : v,
-        },
-      }
-    ),
-    on: {
-      proxyReq: createOnProxyReqHandler({ pipeline: [finalizeSignedRequest] }),
-      proxyRes: createOnProxyResHandler([googleAIResponseHandler]),
-      error: handleProxyError,
-    },
-  }),
-});
-
-const googleAIRouter = Router();
-googleAIRouter.get("/v1/models", handleModelRequest);
-
-// Native Google AI chat completion endpoint
-googleAIRouter.post(
-  "/v1beta/models/:modelId:(generateContent|streamGenerateContent)",
-  ipLimiter,
-  createPreprocessorMiddleware(
-    {
-      inApi: "google-ai",
-      outApi: "google-ai",
-      service: "google-ai",
-    },
-    { afterTransform: [maybeReassignModel, setStreamFlag] }
-  ),
-  googleAIProxy
-);
-
-// OpenAI-to-Google AI compatibility endpoint.
-googleAIRouter.post(
-  "/v1/chat/completions",
-  ipLimiter,
-  createPreprocessorMiddleware(
-    { inApi: "openai", outApi: "google-ai", service: "google-ai" },
-    { afterTransform: [maybeReassignModel] }
-  ),
-  googleAIProxy
-);
-
-function setStreamFlag(req: Request) {
-  const isStreaming = req.url.includes("streamGenerateContent");
-  if (isStreaming) {
-    req.body.stream = true;
-    req.isStreaming = true;
-  } else {
-    req.body.stream = false;
-    req.isStreaming = false;
-  }
-}
-
-/**
- * Replaces requests for non-Google AI models with gemini-pro-1.5-latest.
- * Also strips models/ from the beginning of the model IDs.
- **/
-function maybeReassignModel(req: Request) {
-  // Ensure model is on body as a lot of middleware will expect it.
-  const model = req.body.model || req.url.split("/").pop()?.split(":").shift();
-  if (!model) {
-    throw new Error("You must specify a model with your request.");
-  }
-  req.body.model = model;
-
-  const requested = model;
-  if (requested.startsWith("models/")) {
-    req.body.model = requested.slice("models/".length);
-  }
-
-  if (requested.includes("gemini")) {
-    return;
-  }
-
-  req.log.info({ requested }, "Reassigning model to gemini-pro-1.5-latest");
-  req.body.model = "gemini-pro-1.5-latest";
-}
-
-export const googleAI = googleAIRouter;

src/proxy/middleware/common.ts

@@ -1,73 +1,63 @@
 import { Request, Response } from "express";
-import http from "http";
 import httpProxy from "http-proxy";
 import { ZodError } from "zod";
 import { generateErrorMessage } from "zod-error";
-import { HttpError } from "../../shared/errors";
+import { buildFakeSse } from "../../shared/streaming";
 import { assertNever } from "../../shared/utils";
-import { QuotaExceededError } from "./request/preprocessors/apply-quota-limits";
-import { sendErrorToClient } from "./response/error-generator";
+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 OPENAI_IMAGE_COMPLETION_ENDPOINT = "/v1/images/generations";
 const ANTHROPIC_COMPLETION_ENDPOINT = "/v1/complete";
-const ANTHROPIC_MESSAGES_ENDPOINT = "/v1/messages";
-const ANTHROPIC_SONNET_COMPAT_ENDPOINT = "/v1/sonnet";
-const ANTHROPIC_OPUS_COMPAT_ENDPOINT = "/v1/opus";
 
-export function isTextGenerationRequest(req: Request) {
+/** 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,
       OPENAI_TEXT_COMPLETION_ENDPOINT,
       ANTHROPIC_COMPLETION_ENDPOINT,
-      ANTHROPIC_MESSAGES_ENDPOINT,
-      ANTHROPIC_SONNET_COMPAT_ENDPOINT,
-      ANTHROPIC_OPUS_COMPAT_ENDPOINT,
     ].some((endpoint) => req.path.startsWith(endpoint))
   );
 }
 
-export function isImageGenerationRequest(req: Request) {
-  return (
-    req.method === "POST" &&
-    req.path.startsWith(OPENAI_IMAGE_COMPLETION_ENDPOINT)
-  );
-}
-
 export function isEmbeddingsRequest(req: Request) {
   return (
     req.method === "POST" && req.path.startsWith(OPENAI_EMBEDDINGS_ENDPOINT)
   );
 }
 
-export function sendProxyError(
+export function writeErrorResponse(
   req: Request,
   res: Response,
   statusCode: number,
-  statusMessage: string,
   errorPayload: Record<string, any>
 ) {
-  const msg =
-    statusCode === 500
-      ? `The proxy encountered an error while trying to process your prompt.`
-      : `The proxy encountered an error while trying to send your prompt to the API.`;
+  const errorSource = errorPayload.error?.type?.startsWith("proxy")
+    ? "proxy"
+    : "upstream";
 
-  sendErrorToClient({
-    options: {
-      format: req.inboundApi,
-      title: `Proxy error (HTTP ${statusCode} ${statusMessage})`,
-      message: `${msg} Further details are provided below.`,
-      obj: errorPayload,
-      reqId: req.id,
-      model: req.body?.model,
-    },
-    req,
-    res,
-  });
+  // If we're mid-SSE stream, send a data event with the error payload and end
+  // the stream. Otherwise just send a normal error response.
+  if (
+    res.headersSent ||
+    String(res.getHeader("content-type")).startsWith("text/event-stream")
+  ) {
+    const errorTitle = `${errorSource} error (${statusCode})`;
+    const errorContent = JSON.stringify(errorPayload, null, 2);
+    const msg = buildFakeSse(errorTitle, errorContent, req);
+    res.write(msg);
+    res.write(`data: [DONE]\n\n`);
+    res.end();
+  } else {
+    if (req.debug && errorPayload.error) {
+      errorPayload.error.proxy_tokenizer_debug_info = req.debug;
+    }
+    res.status(statusCode).json(errorPayload);
+  }
 }
 
 export const handleProxyError: httpProxy.ErrorCallback = (err, req, res) => {
@@ -81,65 +71,31 @@ export const classifyErrorAndSend = (
   res: Response
 ) => {
   try {
-    const { statusCode, statusMessage, userMessage, ...errorDetails } =
-      classifyError(err);
-    sendProxyError(req, res, statusCode, statusMessage, {
+    const { status, userMessage, ...errorDetails } = classifyError(err);
+    writeErrorResponse(req, res, status, {
       error: { message: userMessage, ...errorDetails },
     });
   } catch (error) {
     req.log.error(error, `Error writing error response headers, giving up.`);
-    res.end();
   }
 };
 
 function classifyError(err: Error): {
   /** HTTP status code returned to the client. */
-  statusCode: number;
-  /** HTTP status message returned to the client. */
-  statusMessage: string;
+  status: number;
   /** Message displayed to the user. */
   userMessage: string;
   /** Short error type, e.g. "proxy_validation_error". */
   type: string;
 } & Record<string, any> {
   const defaultError = {
-    statusCode: 500,
-    statusMessage: "Internal Server Error",
-    userMessage: `Reverse proxy error: ${err.message}`,
+    status: 500,
+    userMessage: `Reverse proxy encountered an unexpected error. (${err.message})`,
     type: "proxy_internal_error",
     stack: err.stack,
   };
 
   switch (err.constructor.name) {
-    case "HttpError":
-      const statusCode = (err as HttpError).status;
-      return {
-        statusCode,
-        statusMessage: `HTTP ${statusCode} ${http.STATUS_CODES[statusCode]}`,
-        userMessage: `Reverse proxy error: ${err.message}`,
-        type: "proxy_http_error",
-      };
-    case "BadRequestError":
-      return {
-        statusCode: 400,
-        statusMessage: "Bad Request",
-        userMessage: `Request is not valid. (${err.message})`,
-        type: "proxy_bad_request",
-      };
-    case "NotFoundError":
-      return {
-        statusCode: 404,
-        statusMessage: "Not Found",
-        userMessage: `Requested resource not found. (${err.message})`,
-        type: "proxy_not_found",
-      };
-    case "PaymentRequiredError":
-      return {
-        statusCode: 402,
-        statusMessage: "No Keys Available",
-        userMessage: err.message,
-        type: "proxy_no_keys_available",
-      };
     case "ZodError":
       const userMessage = generateErrorMessage((err as ZodError).issues, {
         prefix: "Request validation failed. ",
@@ -147,36 +103,22 @@ function classifyError(err: Error): {
         code: { enabled: false },
         maxErrors: 3,
         transform: ({ issue, ...rest }) => {
-          return `At '${rest.pathComponent}': ${issue.message}`;
+          return `At '${rest.pathComponent}', ${issue.message}`;
         },
       });
-      return {
-        statusCode: 400,
-        statusMessage: "Bad Request",
-        userMessage,
-        type: "proxy_validation_error",
-      };
-    case "ZoomerForbiddenError":
+      return { status: 400, userMessage, type: "proxy_validation_error" };
+    case "ForbiddenError":
       // Mimics a ban notice from OpenAI, thrown when blockZoomerOrigins blocks
       // a request.
       return {
-        statusCode: 403,
-        statusMessage: "Forbidden",
+        status: 403,
         userMessage: `Your account has been disabled for violating our terms of service.`,
         type: "organization_account_disabled",
         code: "policy_violation",
       };
-    case "ForbiddenError":
-      return {
-        statusCode: 403,
-        statusMessage: "Forbidden",
-        userMessage: `Request is not allowed. (${err.message})`,
-        type: "proxy_forbidden",
-      };
     case "QuotaExceededError":
       return {
-        statusCode: 429,
-        statusMessage: "Too Many Requests",
+        status: 429,
         userMessage: `You've exceeded your token quota for this model type.`,
         type: "proxy_quota_exceeded",
         info: (err as QuotaExceededError).quotaInfo,
@@ -186,24 +128,21 @@ function classifyError(err: Error): {
         switch (err.code) {
           case "ENOTFOUND":
             return {
-              statusCode: 502,
-              statusMessage: "Bad Gateway",
+              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 {
-              statusCode: 502,
-              statusMessage: "Bad Gateway",
+              status: 502,
               userMessage: `Reverse proxy couldn't connect to the upstream service.`,
               type: "proxy_network_error",
               code: err.code,
             };
           case "ECONNRESET":
             return {
-              statusCode: 504,
-              statusMessage: "Gateway Timeout",
+              status: 504,
               userMessage: `Reverse proxy timed out while waiting for the upstream service to respond.`,
               type: "proxy_network_error",
               code: err.code,
@@ -220,65 +159,37 @@ export function getCompletionFromBody(req: Request, body: Record<string, any>) {
   const format = req.outboundApi;
   switch (format) {
     case "openai":
-    case "mistral-ai":
-      // Few possible values:
-      // - choices[0].message.content
-      // - choices[0].message with no content if model is invoking a tool
-      return body.choices?.[0]?.message?.content || "";
-    case "mistral-text":
-      return body.outputs?.[0]?.text || "";
+      return body.choices[0].message.content;
     case "openai-text":
       return body.choices[0].text;
-    case "anthropic-chat":
-      if (!body.content) {
-        req.log.error(
-          { body: JSON.stringify(body) },
-          "Received empty Anthropic chat completion"
-        );
-        return "";
-      }
-      return body.content
-        .map(({ text, type }: { type: string; text: string }) =>
-          type === "text" ? text : `[Unsupported content type: ${type}]`
-        )
-        .join("\n");
-    case "anthropic-text":
+    case "anthropic":
       if (!body.completion) {
         req.log.error(
           { body: JSON.stringify(body) },
-          "Received empty Anthropic text completion"
+          "Received empty Anthropic completion"
         );
         return "";
       }
       return body.completion.trim();
-    case "google-ai":
-      if ("choices" in body) {
-        return body.choices[0].message.content;
-      }
-      return body.candidates[0].content.parts[0].text;
-    case "openai-image":
-      return body.data?.map((item: any) => item.url).join("\n");
+    case "google-palm":
+      return body.candidates[0].output;
     default:
       assertNever(format);
   }
 }
 
-export function getModelFromBody(req: Request, resBody: Record<string, any>) {
+export function getModelFromBody(req: Request, body: Record<string, any>) {
   const format = req.outboundApi;
   switch (format) {
     case "openai":
     case "openai-text":
-      return resBody.model;
-    case "mistral-ai":
-    case "mistral-text":
-    case "openai-image":
-    case "google-ai":
-      // These formats don't have a model in the response body.
-      return req.body.model;
-    case "anthropic-chat":
-    case "anthropic-text":
+      return body.model;
+    case "anthropic":
       // Anthropic confirms the model in the response, but AWS Claude doesn't.
-      return resBody.model || req.body.model;
+      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);
   }

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

@@ -1,25 +1,24 @@
-import { AnthropicKey, Key } from "../../../../shared/key-management";
-import { isTextGenerationRequest } from "../../common";
-import { HPMRequestCallback } from "../index";
+import { AnthropicKey, Key } from "../../../shared/key-management";
+import { isCompletionRequest } from "../common";
+import { ProxyRequestMiddleware } from ".";
 
 /**
  * Some keys require the prompt to start with `\n\nHuman:`. There is no way to
  * know this without trying to send the request and seeing if it fails. If a
  * key is marked as requiring a preamble, it will be added here.
  */
-export const addAnthropicPreamble: HPMRequestCallback = (_proxyReq, req) => {
-  if (
-    !isTextGenerationRequest(req) ||
-    req.key?.service !== "anthropic" ||
-    req.outboundApi !== "anthropic-text"
-  ) {
+export const addAnthropicPreamble: ProxyRequestMiddleware = (
+  _proxyReq,
+  req
+) => {
+  if (!isCompletionRequest(req) || req.key?.service !== "anthropic") {
     return;
   }
 
   let preamble = "";
   let prompt = req.body.prompt;
   assertAnthropicKey(req.key);
-  if (req.key.requiresPreamble && prompt) {
+  if (req.key.requiresPreamble) {
     preamble = prompt.startsWith("\n\nHuman:") ? "" : "\n\nHuman:";
     req.log.debug({ key: req.key.hash, preamble }, "Adding preamble to prompt");
   }

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

@@ -0,0 +1,137 @@
+import { Key, OpenAIKey, keyPool } from "../../../shared/key-management";
+import { isCompletionRequest, isEmbeddingsRequest } 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) => {
+  let assignedKey: Key;
+
+  if (!isCompletionRequest(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).
+
+    // I don't think this is needed anymore since models requests are no longer
+    // 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";
+  }
+
+  if (!req.inboundApi || !req.outboundApi) {
+    const err = new Error(
+      "Request API format missing. Did you forget to add the request preprocessor to your router?"
+    );
+    req.log.error(
+      { in: req.inboundApi, out: req.outboundApi, path: req.path },
+      err.message
+    );
+    throw err;
+  }
+
+  if (!req.body?.model) {
+    throw new Error("You must specify a model with your request.");
+  }
+
+  // TODO: use separate middleware to deal with stream flags
+  req.isStreaming = req.body.stream === true || req.body.stream === "true";
+  req.body.stream = req.isStreaming;
+
+  if (req.inboundApi === req.outboundApi) {
+    assignedKey = keyPool.get(req.body.model);
+  } else {
+    switch (req.outboundApi) {
+      // 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;
+  req.log.info(
+    {
+      key: assignedKey.hash,
+      model: req.body?.model,
+      fromApi: req.inboundApi,
+      toApi: req.outboundApi,
+    },
+    "Assigned key to request"
+  );
+
+  // TODO: KeyProvider should assemble all necessary headers
+  switch (assignedKey.service) {
+    case "anthropic":
+      proxyReq.setHeader("X-API-Key", 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

@@ -0,0 +1,30 @@
+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/block-zoomer-origins.ts

@@ -1,11 +1,12 @@
-import { HPMRequestCallback } from "../index";
+import { isCompletionRequest } from "../common";
+import { ProxyRequestMiddleware } from ".";
 
 const DISALLOWED_ORIGIN_SUBSTRINGS = "janitorai.com,janitor.ai".split(",");
 
-class ZoomerForbiddenError extends Error {
+class ForbiddenError extends Error {
   constructor(message: string) {
     super(message);
-    this.name = "ZoomerForbiddenError";
+    this.name = "ForbiddenError";
   }
 }
 
@@ -13,7 +14,11 @@ class ZoomerForbiddenError extends Error {
  * Blocks requests from Janitor AI users with a fake, scary error message so I
  * stop getting emails asking for tech support.
  */
-export const blockZoomerOrigins: HPMRequestCallback = (_proxyReq, req) => {
+export const blockZoomerOrigins: ProxyRequestMiddleware = (_proxyReq, req) => {
+  if (!isCompletionRequest(req)) {
+    return;
+  }
+
   const origin = req.headers.origin || req.headers.referer;
   if (origin && DISALLOWED_ORIGIN_SUBSTRINGS.some((s) => origin.includes(s))) {
     // Venus-derivatives send a test prompt to check if the proxy is working.
@@ -22,7 +27,7 @@ export const blockZoomerOrigins: HPMRequestCallback = (_proxyReq, req) => {
       return;
     }
 
-    throw new ZoomerForbiddenError(
+    throw new ForbiddenError(
       `Your access was terminated due to violation of our policies, please check your email for more information. If you believe this is in error and would like to appeal, please contact us through our help center at help.openai.com.`
     );
   }

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

@@ -0,0 +1,48 @@
+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,11 +1,11 @@
-import type { HPMRequestCallback } from "../index";
+import type { ProxyRequestMiddleware } from ".";
 
 /**
- * For AWS/GCP/Azure/Google 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.
+ * 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 finalizeSignedRequest: HPMRequestCallback = (proxyReq, req) => {
+export const finalizeAwsRequest: ProxyRequestMiddleware = (proxyReq, req) => {
   if (!req.signedRequest) {
     throw new Error("Expected req.signedRequest to be set");
   }

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

@@ -1,18 +1,9 @@
 import { fixRequestBody } from "http-proxy-middleware";
-import type { HPMRequestCallback } from "../index";
+import type { ProxyRequestMiddleware } from ".";
 
 /** Finalize the rewritten request body. Must be the last rewriter. */
-export const finalizeBody: HPMRequestCallback = (proxyReq, req) => {
+export const finalizeBody: ProxyRequestMiddleware = (proxyReq, req) => {
   if (["POST", "PUT", "PATCH"].includes(req.method ?? "") && req.body) {
-    // For image generation requests, remove stream flag.
-    if (req.outboundApi === "openai-image") {
-      delete req.body.stream;
-    }
-    // For anthropic text to chat requests, remove undefined prompt.
-    if (req.outboundApi === "anthropic-chat") {
-      delete req.body.prompt;
-    }
-
     const updatedBody = JSON.stringify(req.body);
     proxyReq.setHeader("Content-Length", Buffer.byteLength(updatedBody));
     (req as any).rawBody = Buffer.from(updatedBody);

src/proxy/middleware/request/index.ts

@@ -2,32 +2,29 @@ import type { Request } from "express";
 import type { ClientRequest } from "http";
 import type { ProxyReqCallback } from "http-proxy";
 
-export { createOnProxyReqHandler } from "./onproxyreq-factory";
+export { createOnProxyReqHandler } from "./rewrite";
 export {
   createPreprocessorMiddleware,
   createEmbeddingsPreprocessorMiddleware,
-} from "./preprocessor-factory";
+} from "./preprocess";
 
 // Express middleware (runs before http-proxy-middleware, can be async)
-export { addAzureKey } from "./preprocessors/add-azure-key";
-export { applyQuotaLimits } from "./preprocessors/apply-quota-limits";
-export { countPromptTokens } from "./preprocessors/count-prompt-tokens";
-export { languageFilter } from "./preprocessors/language-filter";
-export { setApiFormat } from "./preprocessors/set-api-format";
-export { signAwsRequest } from "./preprocessors/sign-aws-request";
-export { signGcpRequest } from "./preprocessors/sign-vertex-ai-request";
-export { transformOutboundPayload } from "./preprocessors/transform-outbound-payload";
-export { validateContextSize } from "./preprocessors/validate-context-size";
-export { validateVision } from "./preprocessors/validate-vision";
+export { applyQuotaLimits } from "./apply-quota-limits";
+export { validateContextSize } from "./validate-context-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";
 
-// http-proxy-middleware callbacks (runs on onProxyReq, cannot be async)
-export { addAnthropicPreamble } from "./onproxyreq/add-anthropic-preamble";
-export { addKey, addKeyForEmbeddingsRequest } from "./onproxyreq/add-key";
-export { blockZoomerOrigins } from "./onproxyreq/block-zoomer-origins";
-export { checkModelFamily } from "./onproxyreq/check-model-family";
-export { finalizeBody } from "./onproxyreq/finalize-body";
-export { finalizeSignedRequest } from "./onproxyreq/finalize-signed-request";
-export { stripHeaders } from "./onproxyreq/strip-headers";
+// HPM middleware (runs on onProxyReq, cannot be async)
+export { addKey, addKeyForEmbeddingsRequest } 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";
 
 /**
  * Middleware that runs prior to the request being handled by http-proxy-
@@ -46,7 +43,7 @@ export { stripHeaders } from "./onproxyreq/strip-headers";
 export type RequestPreprocessor = (req: Request) => void | Promise<void>;
 
 /**
- * Callbacks that run immediately before the request is sent to the API in
+ * Middleware that runs immediately before the request is sent to the API in
  * response to http-proxy-middleware's `proxyReq` event.
  *
  * Async functions cannot be used here as HPM's event emitter is not async and
@@ -56,7 +53,7 @@ export type RequestPreprocessor = (req: Request) => void | Promise<void>;
  * first attempt is rate limited and the request is automatically retried by the
  * request queue middleware.
  */
-export type HPMRequestCallback = ProxyReqCallback<ClientRequest, Request>;
+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

@@ -0,0 +1,56 @@
+import { Request } from "express";
+import { config } from "../../../config";
+import { logger } from "../../../logger";
+import { assertNever } from "../../../shared/utils";
+import { isCompletionRequest } from "../common";
+import { ProxyRequestMiddleware } from ".";
+
+const DISALLOWED_REGEX =
+  /[\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u3005\u3007\u3021-\u3029\u3038-\u303B\u3400-\u4DB5\u4E00-\u9FD5\uF900-\uFA6D\uFA70-\uFAD9]/;
+
+// Our shitty free-tier VMs will fall over if we test every single character in
+// each 15k character request ten times a second. So we'll just sample 20% of
+// the characters and hope that's enough.
+const containsDisallowedCharacters = (text: string) => {
+  const sampleSize = Math.ceil(text.length * 0.2);
+  const sample = text
+    .split("")
+    .sort(() => 0.5 - Math.random())
+    .slice(0, sampleSize)
+    .join("");
+  return DISALLOWED_REGEX.test(sample);
+};
+
+/** Block requests containing too many disallowed characters. */
+export const languageFilter: ProxyRequestMiddleware = (_proxyReq, req) => {
+  if (!config.rejectDisallowed) {
+    return;
+  }
+
+  if (isCompletionRequest(req)) {
+    const combinedText = getPromptFromRequest(req);
+    if (containsDisallowedCharacters(combinedText)) {
+      logger.warn(`Blocked request containing bad characters`);
+      _proxyReq.destroy(new Error(config.rejectMessage));
+    }
+  }
+};
+
+function getPromptFromRequest(req: Request) {
+  const service = req.outboundApi;
+  const body = req.body;
+  switch (service) {
+    case "anthropic":
+      return body.prompt;
+    case "openai":
+      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);
+  }
+}

src/proxy/middleware/request/limit-completions.ts

@@ -0,0 +1,16 @@
+import { isCompletionRequest } from "../common";
+import { ProxyRequestMiddleware } from ".";
+
+/**
+ * Don't allow multiple completions to be requested to prevent abuse.
+ * OpenAI-only, Anthropic provides no such parameter.
+ **/
+export const limitCompletions: ProxyRequestMiddleware = (_proxyReq, req) => {
+  if (isCompletionRequest(req) && req.outboundApi === "openai") {
+    const originalN = req.body?.n || 1;
+    req.body.n = 1;
+    if (originalN !== req.body.n) {
+      req.log.warn(`Limiting completion choices from ${originalN} to 1`);
+    }
+  }
+};

src/proxy/middleware/request/onproxyreq-factory.ts

@@ -1,45 +0,0 @@
-import {
-  applyQuotaLimits,
-  blockZoomerOrigins,
-  checkModelFamily,
-  HPMRequestCallback,
-  stripHeaders,
-} from "./index";
-
-type ProxyReqHandlerFactoryOptions = { pipeline: HPMRequestCallback[] };
-
-/**
- * Returns an http-proxy-middleware request handler that runs the given set of
- * onProxyReq callback functions in sequence.
- *
- * These will run each time a request is proxied, including on automatic retries
- * by the queue after encountering a rate limit.
- */
-export const createOnProxyReqHandler = ({
-  pipeline,
-}: ProxyReqHandlerFactoryOptions): HPMRequestCallback => {
-  const callbackPipeline = [
-    checkModelFamily,
-    applyQuotaLimits,
-    blockZoomerOrigins,
-    stripHeaders,
-    ...pipeline,
-  ];
-  return (proxyReq, req, res, options) => {
-    // The streaming flag must be set before any other onProxyReq handler runs,
-    // as it may influence the behavior of subsequent handlers.
-    // Image generation requests can't be streamed.
-    // TODO: this flag is set in too many places
-    req.isStreaming =
-      req.isStreaming || req.body.stream === true || req.body.stream === "true";
-    req.body.stream = req.isStreaming;
-
-    try {
-      for (const fn of callbackPipeline) {
-        fn(proxyReq, req, res, options);
-      }
-    } catch (error) {
-      proxyReq.destroy(error);
-    }
-  };
-};

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

@@ -1,127 +0,0 @@
-import { AnthropicChatMessage } from "../../../../shared/api-schemas";
-import { containsImageContent } from "../../../../shared/api-schemas/anthropic";
-import { Key, OpenAIKey, keyPool } from "../../../../shared/key-management";
-import { isEmbeddingsRequest } from "../../common";
-import { HPMRequestCallback } from "../index";
-import { assertNever } from "../../../../shared/utils";
-
-export const addKey: HPMRequestCallback = (proxyReq, req) => {
-  let assignedKey: Key;
-  const { service, inboundApi, outboundApi, body } = req;
-
-  if (!inboundApi || !outboundApi) {
-    const err = new Error(
-      "Request API format missing. Did you forget to add the request preprocessor to your router?"
-    );
-    req.log.error({ inboundApi, outboundApi, path: req.path }, err.message);
-    throw err;
-  }
-
-  if (!body?.model) {
-    throw new Error("You must specify a model with your request.");
-  }
-
-  let needsMultimodal = false;
-  if (outboundApi === "anthropic-chat") {
-    needsMultimodal = containsImageContent(
-      body.messages as AnthropicChatMessage[]
-    );
-  }
-
-  if (inboundApi === outboundApi) {
-    assignedKey = keyPool.get(body.model, service, needsMultimodal);
-  } else {
-    switch (outboundApi) {
-      // 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.
-      // TODO: This whole else condition is probably no longer needed since API
-      // translation now reassigns the model earlier in the request pipeline.
-      case "anthropic-text":
-      case "anthropic-chat":
-      case "mistral-ai":
-      case "mistral-text":
-      case "google-ai":
-        assignedKey = keyPool.get(body.model, service);
-        break;
-      case "openai-text":
-        assignedKey = keyPool.get("gpt-3.5-turbo-instruct", service);
-        break;
-      case "openai-image":
-        assignedKey = keyPool.get("dall-e-3", service);
-        break;
-      case "openai":
-        throw new Error(
-          `Outbound API ${outboundApi} is not supported for ${inboundApi}`
-        );
-      default:
-        assertNever(outboundApi);
-    }
-  }
-
-  req.key = assignedKey;
-  req.log.info(
-    { key: assignedKey.hash, model: body.model, inboundApi, outboundApi },
-    "Assigned key to request"
-  );
-
-  // TODO: KeyProvider should assemble all necessary headers
-  switch (assignedKey.service) {
-    case "anthropic":
-      proxyReq.setHeader("X-API-Key", 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 "mistral-ai":
-      proxyReq.setHeader("Authorization", `Bearer ${assignedKey.key}`);
-      break;
-    case "azure":
-      const azureKey = assignedKey.key;
-      proxyReq.setHeader("api-key", azureKey);
-      break;
-    case "aws":
-    case "gcp":
-    case "google-ai":
-      throw new Error("add-key should not be used for this service.");
-    default:
-      assertNever(assignedKey.service);
-  }
-};
-
-/**
- * Special case for embeddings requests which don't go through the normal
- * request pipeline.
- */
-export const addKeyForEmbeddingsRequest: HPMRequestCallback = (
-  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", "openai") 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/onproxyreq/check-model-family.ts

@@ -1,16 +0,0 @@
-import { config } from "../../../../config";
-import { ForbiddenError } from "../../../../shared/errors";
-import { getModelFamilyForRequest } from "../../../../shared/models";
-import { HPMRequestCallback } from "../index";
-
-/**
- * Ensures the selected model family is enabled by the proxy configuration.
- */
-export const checkModelFamily: HPMRequestCallback = (_proxyReq, req) => {
-  const family = getModelFamilyForRequest(req);
-  if (!config.allowedModelFamilies.includes(family)) {
-    throw new ForbiddenError(
-      `Model family '${family}' is not enabled on this proxy`
-    );
-  }
-};

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

@@ -1,21 +0,0 @@
-import { HPMRequestCallback } from "../index";
-
-/**
- * Removes origin and referer headers before sending the request to the API for
- * privacy reasons.
- **/
-export const stripHeaders: HPMRequestCallback = (proxyReq) => {
-  proxyReq.setHeader("origin", "");
-  proxyReq.setHeader("referer", "");
-  proxyReq.removeHeader("tailscale-user-login");
-  proxyReq.removeHeader("tailscale-user-name");
-  proxyReq.removeHeader("tailscale-headers-info");
-  proxyReq.removeHeader("tailscale-user-profile-pic")
-  proxyReq.removeHeader("cf-connecting-ip");
-  proxyReq.removeHeader("forwarded");
-  proxyReq.removeHeader("true-client-ip");
-  proxyReq.removeHeader("x-forwarded-for");
-  proxyReq.removeHeader("x-forwarded-host");
-  proxyReq.removeHeader("x-forwarded-proto");
-  proxyReq.removeHeader("x-real-ip");
-};

src/proxy/middleware/request/preprocess.ts

@@ -1,15 +1,12 @@
 import { RequestHandler } from "express";
-import { ZodIssue } from "zod";
 import { initializeSseStream } from "../../../shared/streaming";
 import { classifyErrorAndSend } from "../common";
 import {
   RequestPreprocessor,
+  validateContextSize,
   countPromptTokens,
-  languageFilter,
   setApiFormat,
   transformOutboundPayload,
-  validateContextSize,
-  validateVision,
 } from ".";
 
 type RequestPreprocessorOptions = {
@@ -30,14 +27,6 @@ type RequestPreprocessorOptions = {
 /**
  * Returns a middleware function that processes the request body into the given
  * API format, and then sequentially runs the given additional preprocessors.
- *
- * These run first in the request lifecycle, a single time per request before it
- * is added to the request queue. They aren't run again if the request is
- * re-attempted after a rate limit.
- *
- * To run a preprocessor on every re-attempt, pass it to createQueueMiddleware.
- * It will run after these preprocessors, but before the request is sent to
- * http-proxy-middleware.
  */
 export const createPreprocessorMiddleware = (
   apiFormat: Parameters<typeof setApiFormat>[0],
@@ -48,10 +37,8 @@ export const createPreprocessorMiddleware = (
     ...(beforeTransform ?? []),
     transformOutboundPayload,
     countPromptTokens,
-    languageFilter,
     ...(afterTransform ?? []),
     validateContextSize,
-    validateVision,
   ];
   return async (...args) => executePreprocessors(preprocessors, args);
 };
@@ -73,93 +60,20 @@ async function executePreprocessors(
   preprocessors: RequestPreprocessor[],
   [req, res, next]: Parameters<RequestHandler>
 ) {
-  handleTestMessage(req, res, next);
-  if (res.headersSent) return;
-
   try {
     for (const preprocessor of preprocessors) {
       await preprocessor(req);
     }
     next();
   } catch (error) {
-    if (error.constructor.name === "ZodError") {
-      const msg = error?.issues
-        ?.map((issue: ZodIssue) => issue.message)
-        .join("; ");
-      req.log.warn({ issues: msg }, "Prompt validation failed.");
-    } else {
-      req.log.error(error, "Error while executing request preprocessor");
-    }
+    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.
-    const { stream } = req.body;
-    const isStreaming = stream === "true" || stream === true;
-    if (isStreaming && !res.headersSent) {
-      initializeSseStream(res);
-    }
+    initializeSseStream(res)
     classifyErrorAndSend(error as Error, req, res);
   }
 }
-
-/**
- * Bypasses the API call and returns a test message response if the request body
- * is a known test message from SillyTavern. Otherwise these messages just waste
- * API request quota and confuse users when the proxy is busy, because ST always
- * makes them with `stream: false` (which is not allowed when the proxy is busy)
- */
-const handleTestMessage: RequestHandler = (req, res) => {
-  const { method, body } = req;
-  if (method !== "POST") {
-    return;
-  }
-
-  if (isTestMessage(body)) {
-    req.log.info({ body }, "Received test message. Skipping API call.");
-    res.json({
-      id: "test-message",
-      object: "chat.completion",
-      created: Date.now(),
-      model: body.model,
-      // openai chat
-      choices: [
-        {
-          message: { role: "assistant", content: "Hello!" },
-          finish_reason: "stop",
-          index: 0,
-        },
-      ],
-      // anthropic text
-      completion: "Hello!",
-      // anthropic chat
-      content: [{ type: "text", text: "Hello!" }],
-      proxy_note:
-        "This response was generated by the proxy's test message handler and did not go to the API.",
-    });
-  }
-};
-
-function isTestMessage(body: any) {
-  const { messages, prompt, contents } = body;
-
-  if (messages) {
-    return (
-      messages.length === 1 &&
-      messages[0].role === "user" &&
-      messages[0].content === "Hi"
-    );
-  } else if (contents) {
-    return (
-      contents.length === 1 &&
-      contents[0].parts[0]?.text === "Hi"
-    );
-  } else {
-    return (
-      prompt?.trim() === "Human: Hi\n\nAssistant:" ||
-      prompt?.startsWith("Hi\n\n")
-    );
-  }
-}

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

@@ -1,78 +0,0 @@
-import {
-  APIFormat,
-  AzureOpenAIKey,
-  keyPool,
-} from "../../../../shared/key-management";
-import { RequestPreprocessor } from "../index";
-
-export const addAzureKey: RequestPreprocessor = (req) => {
-  const validAPIs: APIFormat[] = ["openai", "openai-image"];
-  const apisValid = [req.outboundApi, req.inboundApi].every((api) =>
-    validAPIs.includes(api)
-  );
-  const serviceValid = req.service === "azure";
-  if (!apisValid || !serviceValid) {
-    throw new Error("addAzureKey called on invalid request");
-  }
-
-  if (!req.body?.model) {
-    throw new Error("You must specify a model with your request.");
-  }
-
-  const model = req.body.model.startsWith("azure-")
-    ? req.body.model
-    : `azure-${req.body.model}`;
-
-  req.key = keyPool.get(model, "azure");
-  req.body.model = model;
-
-  // Handles the sole Azure API deviation from the OpenAI spec (that I know of)
-  const notNullOrUndefined = (x: any) => x !== null && x !== undefined;
-  if ([req.body.logprobs, req.body.top_logprobs].some(notNullOrUndefined)) {
-    // OpenAI wants logprobs: true/false and top_logprobs: number
-    // Azure seems to just want to combine them into logprobs: number
-    // if (typeof req.body.logprobs === "boolean") {
-    //   req.body.logprobs = req.body.top_logprobs || undefined;
-    //   delete req.body.top_logprobs
-    // }
-
-    // Temporarily just disabling logprobs for Azure because their model support
-    // is random: `This model does not support the 'logprobs' parameter.`
-    delete req.body.logprobs;
-    delete req.body.top_logprobs;
-  }
-
-  req.log.info(
-    { key: req.key.hash, model },
-    "Assigned Azure OpenAI key to request"
-  );
-
-  const cred = req.key as AzureOpenAIKey;
-  const { resourceName, deploymentId, apiKey } = getCredentialsFromKey(cred);
-
-  const operation =
-    req.outboundApi === "openai" ? "/chat/completions" : "/images/generations";
-  const apiVersion =
-    req.outboundApi === "openai" ? "2023-09-01-preview" : "2024-02-15-preview";
-
-  req.signedRequest = {
-    method: "POST",
-    protocol: "https:",
-    hostname: `${resourceName}.openai.azure.com`,
-    path: `/openai/deployments/${deploymentId}${operation}?api-version=${apiVersion}`,
-    headers: {
-      ["host"]: `${resourceName}.openai.azure.com`,
-      ["content-type"]: "application/json",
-      ["api-key"]: apiKey,
-    },
-    body: JSON.stringify(req.body),
-  };
-};
-
-function getCredentialsFromKey(key: AzureOpenAIKey) {
-  const [resourceName, deploymentId, apiKey] = key.key.split(":");
-  if (!resourceName || !deploymentId || !apiKey) {
-    throw new Error("Assigned Azure OpenAI key is not in the correct format.");
-  }
-  return { resourceName, deploymentId, apiKey };
-}

src/proxy/middleware/request/preprocessors/add-google-ai-key.ts

@@ -1,39 +0,0 @@
-import { keyPool } from "../../../../shared/key-management";
-import { RequestPreprocessor } from "../index";
-
-export const addGoogleAIKey: RequestPreprocessor = (req) => {
-  const inboundValid =
-    req.inboundApi === "openai" || req.inboundApi === "google-ai";
-  const outboundValid = req.outboundApi === "google-ai";
-  
-  const serviceValid = req.service === "google-ai";
-  if (!inboundValid || !outboundValid || !serviceValid) {
-    throw new Error("addGoogleAIKey called on invalid request");
-  }
-  
-  const model = req.body.model;
-  req.isStreaming = req.isStreaming || req.body.stream;
-  req.key = keyPool.get(model, "google-ai");
-  req.log.info(
-    { key: req.key.hash, model, stream: req.isStreaming },
-    "Assigned Google AI API key to request"
-  );
-  
-  // https://generativelanguage.googleapis.com/v1beta/models/$MODEL_ID:generateContent?key=$API_KEY
-  // https://generativelanguage.googleapis.com/v1beta/models/$MODEL_ID:streamGenerateContent?key=${API_KEY}
-  const payload = { ...req.body, stream: undefined, model: undefined };
-
-  req.signedRequest = {
-    method: "POST",
-    protocol: "https:",
-    hostname: "generativelanguage.googleapis.com",
-    path: `/v1beta/models/${model}:${
-      req.isStreaming ? "streamGenerateContent" : "generateContent"
-    }?key=${req.key.key}`,
-    headers: {
-      ["host"]: `generativelanguage.googleapis.com`,
-      ["content-type"]: "application/json",
-    },
-    body: JSON.stringify(payload),
-  };
-};

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

@@ -1,37 +0,0 @@
-import { hasAvailableQuota } from "../../../../shared/users/user-store";
-import { isImageGenerationRequest, isTextGenerationRequest } from "../../common";
-import { HPMRequestCallback } from "../index";
-
-export class QuotaExceededError extends Error {
-  public quotaInfo: any;
-  constructor(message: string, quotaInfo: any) {
-    super(message);
-    this.name = "QuotaExceededError";
-    this.quotaInfo = quotaInfo;
-  }
-}
-
-export const applyQuotaLimits: HPMRequestCallback = (_proxyReq, req) => {
-  const subjectToQuota =
-    isTextGenerationRequest(req) || isImageGenerationRequest(req);
-  if (!subjectToQuota || !req.user) return;
-
-  const requestedTokens = (req.promptTokens ?? 0) + (req.outputTokens ?? 0);
-  if (
-    !hasAvailableQuota({
-      userToken: req.user.token,
-      model: req.body.model,
-      api: req.outboundApi,
-      requested: 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/preprocessors/count-prompt-tokens.ts

@@ -1,74 +0,0 @@
-import { RequestPreprocessor } from "../index";
-import { countTokens } from "../../../../shared/tokenization";
-import { assertNever } from "../../../../shared/utils";
-import {
-  GoogleAIChatMessage,
-  MistralAIChatMessage,
-  OpenAIChatMessage,
-} from "../../../../shared/api-schemas";
-
-/**
- * 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: OpenAIChatMessage[] = 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-chat": {
-      req.outputTokens = req.body.max_tokens;
-      const prompt = {
-        system: req.body.system ?? "",
-        messages: req.body.messages,
-      };
-      result = await countTokens({ req, prompt, service });
-      break;
-    }
-    case "anthropic-text": {
-      req.outputTokens = req.body.max_tokens_to_sample;
-      const prompt: string = req.body.prompt;
-      result = await countTokens({ req, prompt, service });
-      break;
-    }
-    case "google-ai": {
-      req.outputTokens = req.body.generationConfig.maxOutputTokens;
-      const prompt: GoogleAIChatMessage[] = req.body.contents;
-      result = await countTokens({ req, prompt, service });
-      break;
-    }
-    case "mistral-ai":
-    case "mistral-text": {
-      req.outputTokens = req.body.max_tokens;
-      const prompt: string | MistralAIChatMessage[] =
-        req.body.messages ?? req.body.prompt;
-      result = await countTokens({ req, prompt, service });
-      break;
-    }
-    case "openai-image": {
-      req.outputTokens = 1;
-      result = await countTokens({ req, service });
-      break;
-    }
-    default:
-      assertNever(service);
-  }
-
-  req.promptTokens = result.token_count;
-
-  req.log.debug({ result: result }, "Counted prompt tokens.");
-  req.tokenizerInfo = req.tokenizerInfo ?? {};
-  req.tokenizerInfo = { ...req.tokenizerInfo, ...result };
-};

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

@@ -1,83 +0,0 @@
-import { Request } from "express";
-import { config } from "../../../../config";
-import { assertNever } from "../../../../shared/utils";
-import { RequestPreprocessor } from "../index";
-import { BadRequestError } from "../../../../shared/errors";
-import {
-  MistralAIChatMessage,
-  OpenAIChatMessage,
-  flattenAnthropicMessages,
-} from "../../../../shared/api-schemas";
-
-const rejectedClients = new Map<string, number>();
-
-setInterval(() => {
-  rejectedClients.forEach((count, ip) => {
-    if (count > 0) {
-      rejectedClients.set(ip, Math.floor(count / 2));
-    } else {
-      rejectedClients.delete(ip);
-    }
-  });
-}, 30000);
-
-/**
- * Block requests containing blacklisted phrases. Repeated rejections from the
- * same IP address will be throttled.
- */
-export const languageFilter: RequestPreprocessor = async (req) => {
-  if (!config.rejectPhrases.length) return;
-
-  const prompt = getPromptFromRequest(req);
-  const match = config.rejectPhrases.find((phrase) =>
-    prompt.match(new RegExp(phrase, "i"))
-  );
-
-  if (match) {
-    const ip = req.ip;
-    const rejections = (rejectedClients.get(req.ip) || 0) + 1;
-    const delay = Math.min(60000, Math.pow(2, rejections - 1) * 1000);
-    rejectedClients.set(ip, rejections);
-    req.log.warn(
-      { match, ip, rejections, delay },
-      "Prompt contains rejected phrase"
-    );
-    await new Promise((resolve) => {
-      req.res!.once("close", resolve);
-      setTimeout(resolve, delay);
-    });
-    throw new BadRequestError(config.rejectMessage);
-  }
-};
-
-function getPromptFromRequest(req: Request) {
-  const service = req.outboundApi;
-  const body = req.body;
-  switch (service) {
-    case "anthropic-chat":
-      return flattenAnthropicMessages(body.messages);
-    case "openai":
-    case "mistral-ai":
-      return body.messages
-        .map((msg: OpenAIChatMessage | MistralAIChatMessage) => {
-          const text = Array.isArray(msg.content)
-            ? msg.content
-                .map((c) => {
-                  if ("text" in c) return c.text;
-                })
-                .join()
-            : msg.content;
-          return `${msg.role}: ${text}`;
-        })
-        .join("\n\n");
-    case "anthropic-text":
-    case "openai-text":
-    case "openai-image":
-    case "mistral-text":
-      return body.prompt;
-    case "google-ai":
-      return body.prompt.text;
-    default:
-      assertNever(service);
-  }
-}

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

@@ -1,148 +0,0 @@
-import express, { Request } from "express";
-import { Sha256 } from "@aws-crypto/sha256-js";
-import { SignatureV4 } from "@smithy/signature-v4";
-import { HttpRequest } from "@smithy/protocol-http";
-import {
-  AnthropicV1TextSchema,
-  AnthropicV1MessagesSchema,
-} from "../../../../shared/api-schemas";
-import { keyPool } from "../../../../shared/key-management";
-import { RequestPreprocessor } from "../index";
-import {
-  AWSMistralV1ChatCompletionsSchema,
-  AWSMistralV1TextCompletionsSchema,
-} from "../../../../shared/api-schemas/mistral-ai";
-
-const AMZ_HOST =
-  process.env.AMZ_HOST || "bedrock-runtime.%REGION%.amazonaws.com";
-
-/**
- * Signs an outgoing AWS request with the appropriate headers modifies the
- * request object in place to fix the path.
- * This happens AFTER request transformation.
- */
-export const signAwsRequest: RequestPreprocessor = async (req) => {
-  const { model, stream } = req.body;
-  req.key = keyPool.get(model, "aws");
-
-  req.isStreaming = stream === true || stream === "true";
-
-  // same as addAnthropicPreamble for non-AWS requests, but has to happen here
-  if (req.outboundApi === "anthropic-text") {
-    let preamble = req.body.prompt.startsWith("\n\nHuman:") ? "" : "\n\nHuman:";
-    req.body.prompt = preamble + req.body.prompt;
-  }
-
-  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(applyAwsStrictValidation(req)),
-  });
-
-  if (stream) {
-    newRequest.headers["x-amzn-bedrock-accept"] = "application/json";
-  } else {
-    newRequest.headers["accept"] = "*/*";
-  }
-
-  const { key, body, inboundApi, outboundApi } = req;
-  req.log.info(
-    { key: key.hash, model: body.model, inboundApi, outboundApi },
-    "Assigned AWS credentials to request"
-  );
-
-  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);
-}
-
-function applyAwsStrictValidation(req: Request): unknown {
-  // AWS uses vendor API formats but imposes additional (more strict) validation
-  // rules, namely that extraneous parameters are not allowed. We will validate
-  // using the vendor's zod schema but apply `.strip` to ensure that any
-  // extraneous parameters are removed.
-  let strippedParams: Record<string, unknown> = {};
-  switch (req.outboundApi) {
-    case "anthropic-text":
-      strippedParams = AnthropicV1TextSchema.pick({
-        prompt: true,
-        max_tokens_to_sample: true,
-        stop_sequences: true,
-        temperature: true,
-        top_k: true,
-        top_p: true,
-      })
-        .strip()
-        .parse(req.body);
-      break;
-    case "anthropic-chat":
-      strippedParams = AnthropicV1MessagesSchema.pick({
-        messages: true,
-        system: true,
-        max_tokens: true,
-        stop_sequences: true,
-        temperature: true,
-        top_k: true,
-        top_p: true,
-      })
-        .strip()
-        .parse(req.body);
-      strippedParams.anthropic_version = "bedrock-2023-05-31";
-      break;
-    case "mistral-ai":
-      strippedParams = AWSMistralV1ChatCompletionsSchema.parse(req.body);
-      break;
-    case "mistral-text":
-      strippedParams = AWSMistralV1TextCompletionsSchema.parse(req.body);
-      break;
-    default:
-      throw new Error("Unexpected outbound API for AWS.");
-  }
-  return strippedParams;
-}

src/proxy/middleware/request/preprocessors/sign-vertex-ai-request.ts

@@ -1,201 +0,0 @@
-import express from "express";
-import crypto from "crypto";
-import { keyPool } from "../../../../shared/key-management";
-import { RequestPreprocessor } from "../index";
-import { AnthropicV1MessagesSchema } from "../../../../shared/api-schemas";
-
-const GCP_HOST = process.env.GCP_HOST || "%REGION%-aiplatform.googleapis.com";
-
-export const signGcpRequest: RequestPreprocessor = async (req) => {
-  const serviceValid = req.service === "gcp";
-  if (!serviceValid) {
-    throw new Error("addVertexAIKey called on invalid request");
-  }
-
-  if (!req.body?.model) {
-    throw new Error("You must specify a model with your request.");
-  }
-
-  const { model, stream } = req.body;
-  req.key = keyPool.get(model, "gcp");
-
-  req.log.info({ key: req.key.hash, model }, "Assigned GCP key to request");
-
-  req.isStreaming = String(stream) === "true";
-
-  // TODO: This should happen in transform-outbound-payload.ts
-  // TODO: Support tools
-  let strippedParams: Record<string, unknown>;
-  strippedParams = AnthropicV1MessagesSchema.pick({
-    messages: true,
-    system: true,
-    max_tokens: true,
-    stop_sequences: true,
-    temperature: true,
-    top_k: true,
-    top_p: true,
-    stream: true,
-  })
-    .strip()
-    .parse(req.body);
-  strippedParams.anthropic_version = "vertex-2023-10-16";
-  
-  const [accessToken, credential] = await getAccessToken(req);
-
-  const host = GCP_HOST.replace("%REGION%", credential.region);
-  // GCP doesn't use the anthropic-version header, but we set it to ensure the
-  // stream adapter selects the correct transformer.
-  req.headers["anthropic-version"] = "2023-06-01";
-
-  req.signedRequest = {
-    method: "POST",
-    protocol: "https:",
-    hostname: host,
-    path: `/v1/projects/${credential.projectId}/locations/${credential.region}/publishers/anthropic/models/${model}:streamRawPredict`,
-    headers: {
-      ["host"]: host,
-      ["content-type"]: "application/json",
-      ["authorization"]: `Bearer ${accessToken}`,
-    },
-    body: JSON.stringify(strippedParams),
-  };
-};
-
-async function getAccessToken(
-  req: express.Request
-): Promise<[string, Credential]> {
-  // TODO: access token caching to reduce latency
-  const credential = getCredentialParts(req);
-  const signedJWT = await createSignedJWT(
-    credential.clientEmail,
-    credential.privateKey
-  );
-  const [accessToken, jwtError] = await exchangeJwtForAccessToken(signedJWT);
-  if (accessToken === null) {
-    req.log.warn(
-      { key: req.key!.hash, jwtError },
-      "Unable to get the access token"
-    );
-    throw new Error("The access token is invalid.");
-  }
-  return [accessToken, credential];
-}
-
-async function createSignedJWT(email: string, pkey: string): Promise<string> {
-  let cryptoKey = await crypto.subtle.importKey(
-    "pkcs8",
-    str2ab(atob(pkey)),
-    {
-      name: "RSASSA-PKCS1-v1_5",
-      hash: { name: "SHA-256" },
-    },
-    false,
-    ["sign"]
-  );
-
-  const authUrl = "https://www.googleapis.com/oauth2/v4/token";
-  const issued = Math.floor(Date.now() / 1000);
-  const expires = issued + 600;
-
-  const header = {
-    alg: "RS256",
-    typ: "JWT",
-  };
-
-  const payload = {
-    iss: email,
-    aud: authUrl,
-    iat: issued,
-    exp: expires,
-    scope: "https://www.googleapis.com/auth/cloud-platform",
-  };
-
-  const encodedHeader = urlSafeBase64Encode(JSON.stringify(header));
-  const encodedPayload = urlSafeBase64Encode(JSON.stringify(payload));
-
-  const unsignedToken = `${encodedHeader}.${encodedPayload}`;
-
-  const signature = await crypto.subtle.sign(
-    "RSASSA-PKCS1-v1_5",
-    cryptoKey,
-    str2ab(unsignedToken)
-  );
-
-  const encodedSignature = urlSafeBase64Encode(signature);
-  return `${unsignedToken}.${encodedSignature}`;
-}
-
-async function exchangeJwtForAccessToken(
-  signedJwt: string
-): Promise<[string | null, string]> {
-  const authUrl = "https://www.googleapis.com/oauth2/v4/token";
-  const params = {
-    grant_type: "urn:ietf:params:oauth:grant-type:jwt-bearer",
-    assertion: signedJwt,
-  };
-
-  const r = await fetch(authUrl, {
-    method: "POST",
-    headers: { "Content-Type": "application/x-www-form-urlencoded" },
-    body: Object.entries(params)
-      .map(([k, v]) => `${k}=${v}`)
-      .join("&"),
-  }).then((res) => res.json());
-
-  if (r.access_token) {
-    return [r.access_token, ""];
-  }
-
-  return [null, JSON.stringify(r)];
-}
-
-function str2ab(str: string): ArrayBuffer {
-  const buffer = new ArrayBuffer(str.length);
-  const bufferView = new Uint8Array(buffer);
-  for (let i = 0; i < str.length; i++) {
-    bufferView[i] = str.charCodeAt(i);
-  }
-  return buffer;
-}
-
-function urlSafeBase64Encode(data: string | ArrayBuffer): string {
-  let base64: string;
-  if (typeof data === "string") {
-    base64 = btoa(
-      encodeURIComponent(data).replace(/%([0-9A-F]{2})/g, (match, p1) =>
-        String.fromCharCode(parseInt("0x" + p1, 16))
-      )
-    );
-  } else {
-    base64 = btoa(String.fromCharCode(...new Uint8Array(data)));
-  }
-  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-
-type Credential = {
-  projectId: string;
-  clientEmail: string;
-  region: string;
-  privateKey: string;
-};
-
-function getCredentialParts(req: express.Request): Credential {
-  const [projectId, clientEmail, region, rawPrivateKey] =
-    req.key!.key.split(":");
-  if (!projectId || !clientEmail || !region || !rawPrivateKey) {
-    req.log.error(
-      { key: req.key!.hash },
-      "GCP_CREDENTIALS isn't correctly formatted; refer to the docs"
-    );
-    throw new Error("The key assigned to this request is invalid.");
-  }
-
-  const privateKey = rawPrivateKey
-    .replace(
-      /-----BEGIN PRIVATE KEY-----|-----END PRIVATE KEY-----|\r|\n|\\n/g,
-      ""
-    )
-    .trim();
-
-  return { projectId, clientEmail, region, privateKey };
-}

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

@@ -1,86 +0,0 @@
-import { Request } from "express";
-import {
-  API_REQUEST_VALIDATORS,
-  API_REQUEST_TRANSFORMERS,
-} from "../../../../shared/api-schemas";
-import { BadRequestError } from "../../../../shared/errors";
-import { fixMistralPrompt } from "../../../../shared/api-schemas/mistral-ai";
-import {
-  isImageGenerationRequest,
-  isTextGenerationRequest,
-} from "../../common";
-import { RequestPreprocessor } from "../index";
-
-/** Transforms an incoming request body to one that matches the target API. */
-export const transformOutboundPayload: RequestPreprocessor = async (req) => {
-  const alreadyTransformed = req.retryCount > 0;
-  const notTransformable =
-    !isTextGenerationRequest(req) && !isImageGenerationRequest(req);
-
-  if (alreadyTransformed || notTransformable) return;
-
-  applyMistralPromptFixes(req);
-
-  // Native prompts are those which were already provided by the client in the
-  // target API format. We don't need to transform them.
-  const isNativePrompt = req.inboundApi === req.outboundApi;
-  if (isNativePrompt) {
-    const result = API_REQUEST_VALIDATORS[req.inboundApi].safeParse(req.body);
-    if (!result.success) {
-      req.log.warn(
-        { issues: result.error.issues, body: req.body },
-        "Native prompt request validation failed."
-      );
-      throw result.error;
-    }
-    req.body = result.data;
-    return;
-  }
-
-  // Prompt requires translation from one API format to another.
-  const transformation = `${req.inboundApi}->${req.outboundApi}` as const;
-  const transFn = API_REQUEST_TRANSFORMERS[transformation];
-
-  if (transFn) {
-    req.log.info({ transformation }, "Transforming request...");
-    req.body = await transFn(req);
-    return;
-  }
-
-  throw new BadRequestError(
-    `${transformation} proxying is not supported. Make sure your client is configured to send requests in the correct format and to the correct endpoint.`
-  );
-};
-
-// handles weird cases that don't fit into our abstractions
-function applyMistralPromptFixes(req: Request): void {
-  if (req.inboundApi === "mistral-ai") {
-    // Mistral Chat is very similar to OpenAI but not identical and many clients
-    // don't properly handle the differences. We will try to validate the
-    // mistral prompt and try to fix it if it fails. It will be re-validated
-    // after this function returns.
-    const result = API_REQUEST_VALIDATORS["mistral-ai"].parse(req.body);
-    req.body.messages = fixMistralPrompt(result.messages);
-    req.log.info(
-      { n: req.body.messages.length, prev: result.messages.length },
-      "Applied Mistral chat prompt fixes."
-    );
-
-    // If the prompt relies on `prefix: true` for the last message, we need to
-    // convert it to a text completions request because AWS Mistral support for
-    // this feature is broken.
-    // On Mistral La Plateforme, we can't do this because they don't expose
-    // a text completions endpoint.
-    const { messages } = req.body;
-    const lastMessage = messages && messages[messages.length - 1];
-    if (lastMessage?.role === "assistant" && req.service === "aws") {
-      // enable prefix if client forgot, otherwise the template will insert an
-      // eos token which is very unlikely to be what the client wants.
-      lastMessage.prefix = true;
-      req.outboundApi = "mistral-text";
-      req.log.info(
-        "Native Mistral chat prompt relies on assistant message prefix. Converting to text completions request."
-      );
-    }
-  }
-}

src/proxy/middleware/request/preprocessors/validate-vision.ts

@@ -1,44 +0,0 @@
-import { config } from "../../../../config";
-import { assertNever } from "../../../../shared/utils";
-import { RequestPreprocessor } from "../index";
-import { containsImageContent as containsImageContentOpenAI } from "../../../../shared/api-schemas/openai";
-import { containsImageContent as containsImageContentAnthropic } from "../../../../shared/api-schemas/anthropic";
-import { ForbiddenError } from "../../../../shared/errors";
-
-/**
- * Rejects prompts containing images if multimodal prompts are disabled.
- */
-export const validateVision: RequestPreprocessor = async (req) => {
-  if (req.service === undefined) {
-    throw new Error("Request service must be set before validateVision");
-  }
-
-  if (req.user?.type === "special") return;
-  if (config.allowedVisionServices.includes(req.service)) return;
-
-  // vision not allowed for req's service, block prompts with images
-  let hasImage = false;
-  switch (req.outboundApi) {
-    case "openai":
-      hasImage = containsImageContentOpenAI(req.body.messages);
-      break;
-    case "anthropic-chat":
-      hasImage = containsImageContentAnthropic(req.body.messages);
-      break;
-    case "anthropic-text":
-    case "google-ai":
-    case "mistral-ai":
-    case "mistral-text":
-    case "openai-image":
-    case "openai-text":
-      return;
-    default:
-      assertNever(req.outboundApi);
-  }
-
-  if (hasImage) {
-    throw new ForbiddenError(
-      "Prompts containing images are not permitted. Disable 'Send Inline Images' in your client and try again."
-    );
-  }
-};

src/proxy/middleware/request/rewrite.ts

@@ -0,0 +1,35 @@
+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,7 +1,6 @@
 import { Request } from "express";
-import { APIFormat } from "../../../../shared/key-management";
-import { LLMService } from "../../../../shared/models";
-import { RequestPreprocessor } from "../index";
+import { APIFormat, LLMService } from "../../../shared/key-management";
+import { RequestPreprocessor } from ".";
 
 export const setApiFormat = (api: {
   inApi: Request["inboundApi"];

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

@@ -0,0 +1,96 @@
+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

@@ -0,0 +1,16 @@
+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-outbound-payload.ts

@@ -0,0 +1,332 @@
+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";
+
+const CLAUDE_OUTPUT_MAX = config.maxOutputTokensAnthropic;
+const OPENAI_OUTPUT_MAX = config.maxOutputTokensOpenAI;
+
+// https://console.anthropic.com/docs/api/reference#-v1-complete
+export const AnthropicV1CompleteSchema = z.object({
+  model: z.string(),
+  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
+    .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_p: z.coerce.number().optional(),
+  metadata: z.any().optional(),
+});
+
+// https://platform.openai.com/docs/api-reference/chat/create
+const OpenAIV1ChatCompletionSchema = z.object({
+  model: z.string(),
+  messages: z.array(
+    z.object({
+      role: z.enum(["system", "user", "assistant"]),
+      content: z.string(),
+      name: z.string().optional(),
+    }),
+    {
+      required_error:
+        "No `messages` found. Ensure you've set the correct completion 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),
+  top_p: z.number().optional().default(1),
+  n: z
+    .literal(1, {
+      errorMap: () => ({
+        message: "You may only request a single completion at a time.",
+      }),
+    })
+    .optional(),
+  stream: z.boolean().optional().default(false),
+  stop: z.union([z.string(), z.array(z.string())]).optional(),
+  max_tokens: z.coerce
+    .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) {
+    return;
+  }
+
+  if (sameService) {
+    const result = VALIDATORS[req.inboundApi].safeParse(req.body);
+    if (!result.success) {
+      req.log.error(
+        { issues: result.error.issues, body: req.body },
+        "Request validation failed"
+      );
+      throw result.error;
+    }
+    req.body = result.data;
+    return;
+  }
+
+  if (req.inboundApi === "openai" && req.outboundApi === "anthropic") {
+    req.body = openaiToAnthropic(req);
+    return;
+  }
+
+  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;
+  }
+
+  throw new Error(
+    `'${req.inboundApi}' -> '${req.outboundApi}' request proxying is not supported. Make sure your client is configured to use the correct API.`
+  );
+};
+
+function openaiToAnthropic(req: Request) {
+  const { body } = req;
+  const result = OpenAIV1ChatCompletionSchema.safeParse(body);
+  if (!result.success) {
+    req.log.warn(
+      { issues: result.error.issues, body },
+      "Invalid OpenAI-to-Anthropic request"
+    );
+    throw result.error;
+  }
+
+  req.headers["anthropic-version"] = "2023-06-01";
+
+  const { messages, ...rest } = result.data;
+  const prompt = openAIMessagesToClaudePrompt(messages);
+
+  let stops = rest.stop
+    ? Array.isArray(rest.stop)
+      ? rest.stop
+      : [rest.stop]
+    : [];
+  // Recommended by Anthropic
+  stops.push("\n\nHuman:");
+  // Helps with jailbreak prompts that send fake system messages and multi-bot
+  // chats that prefix bot messages with "System: Respond as <bot name>".
+  stops.push("\n\nSystem:");
+  // Remove duplicates
+  stops = [...new Set(stops)];
+
+  return {
+    // Model may be overridden in `calculate-context-size.ts` to avoid having
+    // a circular dependency (`calculate-context-size.ts` needs an already-
+    // 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" },
+    ],
+  };
+}
+
+export function openAIMessagesToClaudePrompt(messages: OpenAIPromptMessage[]) {
+  return (
+    messages
+      .map((m) => {
+        let role: string = m.role;
+        if (role === "assistant") {
+          role = "Assistant";
+        } else if (role === "system") {
+          role = "System";
+        } else if (role === "user") {
+          role = "Human";
+        }
+        // https://console.anthropic.com/docs/prompt-design
+        // `name` isn't supported by Anthropic but we can still try to use it.
+        return `\n\n${role}: ${m.name?.trim() ? `(as ${m.name}) ` : ""}${
+          m.content
+        }`;
+      })
+      .join("") + "\n\nAssistant:"
+  );
+}
+
+function flattenOpenAiChatMessages(messages: OpenAIPromptMessage[]) {
+  // Temporary to allow experimenting with prompt strategies
+  const PROMPT_VERSION: number = 1;
+  switch (PROMPT_VERSION) {
+    case 1:
+      return (
+        messages
+          .map((m) => {
+            // Claude-style human/assistant turns
+            let role: string = m.role;
+            if (role === "assistant") {
+              role = "Assistant";
+            } else if (role === "system") {
+              role = "System";
+            } else if (role === "user") {
+              role = "User";
+            }
+            return `\n\n${role}: ${m.content}`;
+          })
+          .join("") + "\n\nAssistant:"
+      );
+    case 2:
+      return messages
+        .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}`);
+  }
+}

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

@@ -1,14 +1,12 @@
 import { Request } from "express";
 import { z } from "zod";
-import { config } from "../../../../config";
-import { assertNever } from "../../../../shared/utils";
-import { RequestPreprocessor } from "../index";
+import { config } from "../../../config";
+import { assertNever } from "../../../shared/utils";
+import { RequestPreprocessor } from ".";
 
 const CLAUDE_MAX_CONTEXT = config.maxContextTokensAnthropic;
 const OPENAI_MAX_CONTEXT = config.maxContextTokensOpenAI;
-// todo: make configurable
-const GOOGLE_AI_MAX_CONTEXT = 2048000;
-const MISTRAL_AI_MAX_CONTENT = 131072;
+const BISON_MAX_CONTEXT = 8100;
 
 /**
  * Assigns `req.promptTokens` and `req.outputTokens` based on the request body
@@ -30,52 +28,22 @@ export const validateContextSize: RequestPreprocessor = async (req) => {
     case "openai-text":
       proxyMax = OPENAI_MAX_CONTEXT;
       break;
-    case "anthropic-chat":
-    case "anthropic-text":
+    case "anthropic":
       proxyMax = CLAUDE_MAX_CONTEXT;
       break;
-    case "google-ai":
-      proxyMax = GOOGLE_AI_MAX_CONTEXT;
+    case "google-palm":
+      proxyMax = BISON_MAX_CONTEXT;
       break;
-    case "mistral-ai":
-    case "mistral-text":
-      proxyMax = MISTRAL_AI_MAX_CONTENT;
-      break;
-    case "openai-image":
-      return;
     default:
       assertNever(req.outboundApi);
   }
   proxyMax ||= Number.MAX_SAFE_INTEGER;
 
-  if (req.user?.type === "special") {
-    req.log.debug("Special user, not enforcing proxy context limit.");
-    proxyMax = Number.MAX_SAFE_INTEGER;
-  }
-
   let modelMax: number;
   if (model.match(/gpt-3.5-turbo-16k/)) {
     modelMax = 16384;
-  } else if (model.match(/^gpt-4o/)) {
-    modelMax = 128000;
-  } else if (model.match(/^chatgpt-4o/)) {
-    modelMax = 128000;
-  } else if (model.match(/gpt-4-turbo(-\d{4}-\d{2}-\d{2})?$/)) {
-    modelMax = 131072;
-  } else if (model.match(/gpt-4-turbo(-preview)?$/)) {
-    modelMax = 131072;
-  } else if (model.match(/gpt-4-(0125|1106)(-preview)?$/)) {
-    modelMax = 131072;
-  } else if (model.match(/^gpt-4(-\d{4})?-vision(-preview)?$/)) {
-    modelMax = 131072;
-  } else if (model.match(/^o1(-\d{4}-\d{2}-\d{2})?$/)) {
-    modelMax = 200000;
-  } else if (model.match(/^o1-mini(-\d{4}-\d{2}-\d{2})?$/)) {
-    modelMax = 128000;
-  } else if (model.match(/^o1-preview(-\d{4}-\d{2}-\d{2})?$/)) {
-    modelMax = 128000;
   } else if (model.match(/gpt-3.5-turbo/)) {
-    modelMax = 16384;
+    modelMax = 4096;
   } else if (model.match(/gpt-4-32k/)) {
     modelMax = 32768;
   } else if (model.match(/gpt-4/)) {
@@ -84,28 +52,18 @@ export const validateContextSize: RequestPreprocessor = async (req) => {
     modelMax = 100000;
   } else if (model.match(/^claude-(?:instant-)?v1(?:\.\d)?$/)) {
     modelMax = 9000;
-  } else if (model.match(/^claude-2\.0/)) {
-    modelMax = 100000;
   } else if (model.match(/^claude-2/)) {
-    modelMax = 200000;
-  } else if (model.match(/^claude-3/)) {
-    modelMax = 200000;
-  } else if (model.match(/^gemini-/)) {
-    modelMax = 1024000;
-  } else if (model.match(/^anthropic\.claude-3/)) {
-    modelMax = 200000;
-  } else if (model.match(/^anthropic\.claude-v2:\d/)) {
-    modelMax = 200000;
-  } else if (model.match(/^anthropic\.claude/)) {
     modelMax = 100000;
-  } else if (model.match(/tral/)) {
-    // catches mistral, mixtral, codestral, mathstral, etc. mistral models have
-    // no name convention and wildly different context windows so this is a
-    // catch-all
-    modelMax = MISTRAL_AI_MAX_CONTENT;
+  } 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 {
-    req.log.warn({ model }, "Unknown model, using 200k token limit.");
-    modelMax = 200000;
+    // 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);
@@ -123,10 +81,10 @@ export const validateContextSize: RequestPreprocessor = async (req) => {
     "Prompt size validated"
   );
 
-  req.tokenizerInfo.prompt_tokens = promptTokens;
-  req.tokenizerInfo.completion_tokens = outputTokens;
-  req.tokenizerInfo.max_model_tokens = modelMax;
-  req.tokenizerInfo.max_proxy_tokens = proxyMax;
+  req.debug.prompt_tokens = promptTokens;
+  req.debug.completion_tokens = outputTokens;
+  req.debug.max_model_tokens = modelMax;
+  req.debug.max_proxy_tokens = proxyMax;
 };
 
 function assertRequestHasTokenCounts(

src/proxy/middleware/response/error-generator.ts

@@ -1,385 +0,0 @@
-import express from "express";
-import { APIFormat } from "../../../shared/key-management";
-import { assertNever } from "../../../shared/utils";
-import { initializeSseStream } from "../../../shared/streaming";
-
-function getMessageContent({
-  title,
-  message,
-  obj,
-}: {
-  title: string;
-  message: string;
-  obj?: Record<string, any>;
-}) {
-  /*
-  Constructs a Markdown-formatted message that renders semi-nicely in most chat
-  frontends. For example:
-  
-  **Proxy error (HTTP 404 Not Found)**
-  The proxy encountered an error while trying to send your prompt to the upstream service. Further technical details are provided below.
-  ***
-  *The requested Claude model might not exist, or the key might not be provisioned for it.*
-  ```
-  {
-   "type": "error",
-   "error": {
-     "type": "not_found_error",
-     "message": "model: some-invalid-model-id",
-    },
-   "proxy_note": "The requested Claude model might not exist, or the key might not be provisioned for it."
-  }
-  ```
-   */
-
-  const note = obj?.proxy_note || obj?.error?.message || "";
-  const header = `### **${title}**`;
-  const friendlyMessage = note ? `${message}\n\n----\n\n*${note}*` : message;
-
-  const serializedObj = obj
-    ? ["```", JSON.stringify(obj, null, 2), "```"].join("\n")
-    : "";
-
-  const { stack } = JSON.parse(JSON.stringify(obj ?? {}));
-  let prettyTrace = "";
-  if (stack && obj) {
-    prettyTrace = [
-      "Include this trace when reporting an issue.",
-      "```",
-      stack,
-      "```",
-    ].join("\n");
-    delete obj.stack;
-  }
-
-  return [
-    header,
-    friendlyMessage,
-    serializedObj,
-    prettyTrace,
-    "<!-- oai-proxy-error -->",
-  ].join("\n\n");
-}
-
-type ErrorGeneratorOptions = {
-  format: APIFormat | "unknown";
-  title: string;
-  message: string;
-  obj?: Record<string, any>;
-  reqId: string | number | object;
-  model?: string;
-  statusCode?: number;
-};
-
-export function tryInferFormat(body: any): APIFormat | "unknown" {
-  if (typeof body !== "object" || !body.model) {
-    return "unknown";
-  }
-
-  if (body.model.includes("gpt")) {
-    return "openai";
-  }
-
-  if (body.model.includes("mistral")) {
-    return "mistral-ai";
-  }
-
-  if (body.model.includes("claude")) {
-    return body.messages?.length ? "anthropic-chat" : "anthropic-text";
-  }
-
-  if (body.model.includes("gemini")) {
-    return "google-ai";
-  }
-
-  return "unknown";
-}
-
-// avoid leaking upstream hostname on dns resolution error
-function redactHostname(options: ErrorGeneratorOptions): ErrorGeneratorOptions {
-  if (!options.message.includes("getaddrinfo")) return options;
-
-  const redacted = { ...options };
-  redacted.message = "Could not resolve hostname";
-
-  if (typeof redacted.obj?.error === "object") {
-    redacted.obj = {
-      ...redacted.obj,
-      error: { message: "Could not resolve hostname" },
-    };
-  }
-
-  return redacted;
-}
-
-export function sendErrorToClient({
-  options,
-  req,
-  res,
-}: {
-  options: ErrorGeneratorOptions;
-  req: express.Request;
-  res: express.Response;
-}) {
-  const redactedOpts = redactHostname(options);
-  const { format: inputFormat } = redactedOpts;
-
-  const format =
-    inputFormat === "unknown" ? tryInferFormat(req.body) : inputFormat;
-  if (format === "unknown") {
-    return res.status(redactedOpts.statusCode || 400).json({
-      error: redactedOpts.message,
-      details: redactedOpts.obj,
-    });
-  }
-
-  const completion = buildSpoofedCompletion({ ...redactedOpts, format });
-  const event = buildSpoofedSSE({ ...redactedOpts, format });
-  const isStreaming =
-    req.isStreaming || req.body.stream === true || req.body.stream === "true";
-
-  if (!res.headersSent) {
-    res.setHeader("x-oai-proxy-error", redactedOpts.title);
-    res.setHeader("x-oai-proxy-error-status", redactedOpts.statusCode || 500);
-  }
-
-  if (isStreaming) {
-    if (!res.headersSent) {
-      initializeSseStream(res);
-    }
-    res.write(event);
-    res.write(`data: [DONE]\n\n`);
-    res.end();
-  } else {
-    res.status(200).json(completion);
-  }
-}
-
-/**
- * Returns a non-streaming completion object that looks like it came from the
- * service that the request is being proxied to. Used to send error messages to
- * the client and have them look like normal responses, for clients with poor
- * error handling.
- */
-export function buildSpoofedCompletion({
-  format,
-  title,
-  message,
-  obj,
-  reqId,
-  model = "unknown",
-}: ErrorGeneratorOptions & { format: Exclude<APIFormat, "unknown"> }) {
-  const id = String(reqId);
-  const content = getMessageContent({ title, message, obj });
-
-  switch (format) {
-    case "openai":
-    case "mistral-ai":
-      return {
-        id: "error-" + id,
-        object: "chat.completion",
-        created: Date.now(),
-        model,
-        usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 },
-        choices: [
-          {
-            message: { role: "assistant", content },
-            finish_reason: title,
-            index: 0,
-          },
-        ],
-      };
-    case "mistral-text":
-      return {
-        outputs: [{ text: content, stop_reason: title }],
-        model,
-      }
-    case "openai-text":
-      return {
-        id: "error-" + id,
-        object: "text_completion",
-        created: Date.now(),
-        model,
-        usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 },
-        choices: [
-          { text: content, index: 0, logprobs: null, finish_reason: title },
-        ],
-      };
-    case "anthropic-text":
-      return {
-        id: "error-" + id,
-        type: "completion",
-        completion: content,
-        stop_reason: title,
-        stop: null,
-        model,
-      };
-    case "anthropic-chat":
-      return {
-        id: "error-" + id,
-        type: "message",
-        role: "assistant",
-        content: [{ type: "text", text: content }],
-        model,
-        stop_reason: title,
-        stop_sequence: null,
-      };
-    case "google-ai":
-      return {
-        candidates: [
-          {
-            content: { parts: [{ text: content }], role: "model" },
-            finishReason: title,
-            index: 0,
-            tokenCount: null,
-            safetyRatings: [],
-          },
-        ],
-      };
-    case "openai-image":
-      return obj;
-    default:
-      assertNever(format);
-  }
-}
-
-/**
- * Returns an SSE message that looks like a completion event for the service
- * that the request is being proxied to. Used to send error messages to the
- * client in the middle of a streaming request.
- */
-export function buildSpoofedSSE({
-  format,
-  title,
-  message,
-  obj,
-  reqId,
-  model = "unknown",
-}: ErrorGeneratorOptions & { format: Exclude<APIFormat, "unknown"> }) {
-  const id = String(reqId);
-  const content = getMessageContent({ title, message, obj });
-
-  let event;
-
-  switch (format) {
-    case "openai":
-    case "mistral-ai":
-      event = {
-        id: "chatcmpl-" + id,
-        object: "chat.completion.chunk",
-        created: Date.now(),
-        model,
-        choices: [{ delta: { content }, index: 0, finish_reason: title }],
-      };
-      break;
-    case "mistral-text":
-      event = {
-        outputs: [{ text: content, stop_reason: title }],
-      };
-      break;
-    case "openai-text":
-      event = {
-        id: "cmpl-" + id,
-        object: "text_completion",
-        created: Date.now(),
-        choices: [
-          { text: content, index: 0, logprobs: null, finish_reason: title },
-        ],
-        model,
-      };
-      break;
-    case "anthropic-text":
-      event = {
-        completion: content,
-        stop_reason: title,
-        truncated: false,
-        stop: null,
-        model,
-        log_id: "proxy-req-" + id,
-      };
-      break;
-    case "anthropic-chat":
-      event = {
-        type: "content_block_delta",
-        index: 0,
-        delta: { type: "text_delta", text: content },
-      };
-      break;
-    case "google-ai":
-      // TODO: google ai supports two streaming transports, SSE and JSON.
-      // we currently only support SSE.
-      // return JSON.stringify({
-      event = {
-        candidates: [
-          {
-            content: { parts: [{ text: content }], role: "model" },
-            finishReason: title,
-            index: 0,
-            tokenCount: null,
-            safetyRatings: [],
-          },
-        ],
-      };
-      break;
-    case "openai-image":
-      return JSON.stringify(obj);
-    default:
-      assertNever(format);
-  }
-
-  if (format === "anthropic-text") {
-    return (
-      ["event: completion", `data: ${JSON.stringify(event)}`].join("\n") +
-      "\n\n"
-    );
-  }
-
-  // ugh.
-  if (format === "anthropic-chat") {
-    return (
-      [
-        [
-          "event: message_start",
-          `data: ${JSON.stringify({
-            type: "message_start",
-            message: {
-              id: "error-" + id,
-              type: "message",
-              role: "assistant",
-              content: [],
-              model,
-            },
-          })}`,
-        ].join("\n"),
-        [
-          "event: content_block_start",
-          `data: ${JSON.stringify({
-            type: "content_block_start",
-            index: 0,
-            content_block: { type: "text", text: "" },
-          })}`,
-        ].join("\n"),
-        ["event: content_block_delta", `data: ${JSON.stringify(event)}`].join(
-          "\n"
-        ),
-        [
-          "event: content_block_stop",
-          `data: ${JSON.stringify({ type: "content_block_stop", index: 0 })}`,
-        ].join("\n"),
-        [
-          "event: message_delta",
-          `data: ${JSON.stringify({
-            type: "message_delta",
-            delta: { stop_reason: title, stop_sequence: null, usage: null },
-          })}`,
-        ],
-        [
-          "event: message_stop",
-          `data: ${JSON.stringify({ type: "message_stop" })}`,
-        ].join("\n"),
-      ].join("\n\n") + "\n\n"
-    );
-  }
-
-  return `data: ${JSON.stringify(event)}\n\n`;
-}

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

@@ -1,76 +0,0 @@
-import util from "util";
-import zlib from "zlib";
-import { sendProxyError } from "../common";
-import type { RawResponseBodyHandler } from "./index";
-
-const DECODER_MAP = {
-  gzip: util.promisify(zlib.gunzip),
-  deflate: util.promisify(zlib.inflate),
-  br: util.promisify(zlib.brotliDecompress),
-};
-
-const isSupportedContentEncoding = (
-  contentEncoding: string
-): contentEncoding is keyof typeof DECODER_MAP => {
-  return contentEncoding in DECODER_MAP;
-};
-
-/**
- * Handles the response from the upstream service and decodes the body if
- * necessary. If the response is JSON, it will be parsed and returned as an
- * object. Otherwise, it will be returned as a string. Does not handle streaming
- * responses.
- * @throws {Error} Unsupported content-encoding or invalid application/json body
- */
-export const handleBlockingResponse: RawResponseBodyHandler = async (
-  proxyRes,
-  req,
-  res
-) => {
-  if (req.isStreaming) {
-    const err = new Error(
-      "handleBlockingResponse called for a streaming request."
-    );
-    req.log.error({ stack: err.stack, api: req.inboundApi }, err.message);
-    throw err;
-  }
-
-  return new Promise<string>((resolve, reject) => {
-    let chunks: Buffer[] = [];
-    proxyRes.on("data", (chunk) => chunks.push(chunk));
-    proxyRes.on("end", async () => {
-      let body = Buffer.concat(chunks);
-
-      const contentEncoding = proxyRes.headers["content-encoding"];
-      if (contentEncoding) {
-        if (isSupportedContentEncoding(contentEncoding)) {
-          const decoder = DECODER_MAP[contentEncoding];
-          // @ts-ignore - started failing after upgrading TypeScript, don't care
-          // as it was never a problem.
-          body = await decoder(body);
-        } else {
-          const error = `Proxy received response with unsupported content-encoding: ${contentEncoding}`;
-          req.log.warn({ contentEncoding, key: req.key?.hash }, error);
-          sendProxyError(req, res, 500, "Internal Server Error", {
-            error,
-            contentEncoding,
-          });
-          return reject(error);
-        }
-      }
-
-      try {
-        if (proxyRes.headers["content-type"]?.includes("application/json")) {
-          const json = JSON.parse(body.toString());
-          return resolve(json);
-        }
-        return resolve(body.toString());
-      } catch (e) {
-        const msg = `Proxy received response with invalid JSON: ${e.message}`;
-        req.log.warn({ error: e.stack, key: req.key?.hash }, msg);
-        sendProxyError(req, res, 500, "Internal Server Error", { error: msg });
-        return reject(msg);
-      }
-    });
-  });
-};

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

@@ -1,40 +1,26 @@
-import express from "express";
-import { pipeline, Readable, Transform } from "stream";
-import StreamArray from "stream-json/streamers/StreamArray";
-import { StringDecoder } from "string_decoder";
+import { pipeline } from "stream";
 import { promisify } from "util";
-import type { logger } from "../../../logger";
-import { BadRequestError, RetryableError } from "../../../shared/errors";
-import { APIFormat, keyPool } from "../../../shared/key-management";
 import {
+  buildFakeSse,
   copySseResponseHeaders,
-  initializeSseStream,
+  initializeSseStream
 } from "../../../shared/streaming";
-import { reenqueueRequest } from "../../queue";
-import type { RawResponseBodyHandler } from ".";
-import { handleBlockingResponse } from "./handle-blocking-response";
-import { buildSpoofedSSE, sendErrorToClient } from "./error-generator";
-import { getAwsEventStreamDecoder } from "./streaming/aws-event-stream-decoder";
-import { EventAggregator } from "./streaming/event-aggregator";
-import { SSEMessageTransformer } from "./streaming/sse-message-transformer";
+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);
 
 /**
- * `handleStreamedResponse` consumes a streamed response from the upstream API,
- * decodes chunk-by-chunk into a stream of events, transforms those events into
- * the client's requested format, and forwards the result to the client.
+ * Consume the SSE stream and forward events to the client. Once the stream is
+ * stream is closed, resolve with the full response body so that subsequent
+ * middleware can work with it.
  *
- * After the entire stream has been consumed, it resolves with the full response
- * body so that subsequent middleware in the chain can process it as if it were
- * a non-streaming response (to count output tokens, track usage, etc).
- *
- * In the event of an error, the request's streaming flag is unset and the
- * request is bounced back to the non-streaming response handler. If the error
- * is retryable, that handler will re-enqueue the request and also reset the
- * streaming flag. Unfortunately the streaming flag is set and unset in multiple
- * places, so it's hard to keep track of.
+ * Typically we would only need of the raw response handlers to execute, but
+ * 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.
  */
 export const handleStreamedResponse: RawResponseBodyHandler = async (
   proxyRes,
@@ -47,50 +33,33 @@ export const handleStreamedResponse: RawResponseBodyHandler = async (
   }
 
   if (proxyRes.statusCode! > 201) {
-    req.isStreaming = false;
+    req.isStreaming = false; // Forces non-streaming response handler to execute
     req.log.warn(
       { statusCode: proxyRes.statusCode, key: hash },
       `Streaming request returned error status code. Falling back to non-streaming response handler.`
     );
-    return handleBlockingResponse(proxyRes, req, res);
+    return decodeResponseBody(proxyRes, req, res);
   }
 
-  req.log.debug({ headers: proxyRes.headers }, `Starting to proxy SSE stream.`);
+  req.log.debug(
+    { headers: proxyRes.headers, key: hash },
+    `Starting to proxy SSE stream.`
+  );
 
-  // Typically, streaming will have already been initialized by the request
-  // queue to send heartbeat pings.
+  // Users waiting in the queue already have a SSE connection open for the
+  // heartbeat, so we can't always send the stream headers.
   if (!res.headersSent) {
     copySseResponseHeaders(proxyRes, res);
     initializeSseStream(res);
   }
 
   const prefersNativeEvents = req.inboundApi === req.outboundApi;
-  const streamOptions = {
-    contentType: proxyRes.headers["content-type"],
-    api: req.outboundApi,
-    logger: req.log,
-  };
+  const contentType = proxyRes.headers["content-type"];
 
-  // While the request is streaming, aggregator collects all events so that we
-  // can compile them into a single response object and publish that to the
-  // remaining middleware. Because we have an OpenAI transformer for every
-  // supported format, EventAggregator always consumes OpenAI events so that we
-  // only have to write one aggregator (OpenAI input) for each output format.
-  const aggregator = new EventAggregator(req);
-
-  // Decoder reads from the raw response buffer and produces a stream of
-  // discrete events in some format (text/event-stream, vnd.amazon.event-stream,
-  // streaming JSON, etc).
-  const decoder = getDecoder({ ...streamOptions, input: proxyRes });
-  // Adapter consumes the decoded events and produces server-sent events so we
-  // have a standard event format for the client and to translate between API
-  // message formats.
-  const adapter = new SSEStreamAdapter(streamOptions);
-  // Transformer converts server-sent events from one vendor's API message
-  // format to another.
+  const adapter = new SSEStreamAdapter({ contentType });
+  const aggregator = new EventAggregator({ format: req.outboundApi });
   const transformer = new SSEMessageTransformer({
-    inputFormat: req.outboundApi, // The format of the upstream service's events
-    outputFormat: req.inboundApi, // The format the client requested
+    inputFormat: req.outboundApi, // outbound from the request's perspective
     inputApiVersion: String(req.headers["anthropic-version"]),
     logger: req.log,
     requestId: String(req.id),
@@ -105,92 +74,14 @@ export const handleStreamedResponse: RawResponseBodyHandler = async (
     });
 
   try {
-    await Promise.race([
-      handleAbortedStream(req, res),
-      pipelineAsync(proxyRes, decoder, adapter, transformer),
-    ]);
-    req.log.debug(`Finished proxying SSE stream.`);
+    await pipelineAsync(proxyRes, adapter, transformer);
+    req.log.debug({ key: hash }, `Finished proxying SSE stream.`);
     res.end();
     return aggregator.getFinalResponse();
   } catch (err) {
-    if (err instanceof RetryableError) {
-      keyPool.markRateLimited(req.key!);
-      await reenqueueRequest(req);
-    } else if (err instanceof BadRequestError) {
-      sendErrorToClient({
-        req,
-        res,
-        options: {
-          format: req.inboundApi,
-          title: "Proxy streaming error (Bad Request)",
-          message: `The API returned an error while streaming your request. Your prompt might not be formatted correctly.\n\n*${err.message}*`,
-          reqId: req.id,
-          model: req.body?.model,
-        },
-      });
-    } else {
-      const { message, stack, lastEvent } = err;
-      const eventText = JSON.stringify(lastEvent, null, 2) ?? "undefined";
-      const errorEvent = buildSpoofedSSE({
-        format: req.inboundApi,
-        title: "Proxy stream error",
-        message: "An unexpected error occurred while streaming the response.",
-        obj: { message, stack, lastEvent: eventText },
-        reqId: req.id,
-        model: req.body?.model,
-      });
-      res.write(errorEvent);
-      res.write(`data: [DONE]\n\n`);
-      res.end();
-    }
-
-    // At this point the response is closed. If the request resulted in any
-    // tokens being consumed (suggesting a mid-stream error), we will resolve
-    // and continue the middleware chain so tokens can be counted.
-    if (aggregator.hasEvents()) {
-      return aggregator.getFinalResponse();
-    } else {
-      // If there is nothing, then this was a completely failed prompt that
-      // will not have billed any tokens. Throw to stop the middleware chain.
-      throw err;
-    }
+    const errorEvent = buildFakeSse("stream-error", err.message, req);
+    res.write(`${errorEvent}data: [DONE]\n\n`);
+    res.end();
+    throw err;
   }
 };
-
-function handleAbortedStream(req: express.Request, res: express.Response) {
-  return new Promise<void>((resolve) =>
-    res.on("close", () => {
-      if (!res.writableEnded) {
-        req.log.info("Client prematurely closed connection during stream.");
-      }
-      resolve();
-    })
-  );
-}
-
-function getDecoder(options: {
-  input: Readable;
-  api: APIFormat;
-  logger: typeof logger;
-  contentType?: string;
-}) {
-  const { api, contentType, input, logger } = options;
-  if (contentType?.includes("application/vnd.amazon.eventstream")) {
-    return getAwsEventStreamDecoder({ input, logger });
-  } else if (api === "google-ai") {
-    return StreamArray.withParser();
-  } else {
-    // Passthrough stream, but ensures split chunks across multi-byte characters
-    // are handled correctly.
-    const stringDecoder = new StringDecoder("utf8");
-    return new Transform({
-      readableObjectMode: true,
-      writableObjectMode: false,
-      transform(chunk, _encoding, callback) {
-        const text = stringDecoder.write(chunk);
-        if (text) this.push(text);
-        callback();
-      },
-    });
-  }
-}

src/proxy/middleware/response/index.ts

@@ -1,10 +1,12 @@
 /* This file is fucking horrendous, sorry */
-// TODO: extract all per-service error response handling into its own modules
 import { Request, Response } from "express";
 import * as http from "http";
-import { config } from "../../../config";
-import { HttpError, RetryableError } from "../../../shared/errors";
-import { keyPool } from "../../../shared/key-management";
+import util from "util";
+import zlib from "zlib";
+import { logger } from "../../../logger";
+import { enqueue, trackWaitTime } from "../../queue";
+import { HttpError } from "../../../shared/errors";
+import { AnthropicKey, keyPool } from "../../../shared/key-management";
 import { getOpenAIModelFamily } from "../../../shared/models";
 import { countTokens } from "../../../shared/tokenization";
 import {
@@ -12,31 +14,42 @@ import {
   incrementTokenCount,
 } from "../../../shared/users/user-store";
 import { assertNever } from "../../../shared/utils";
-import { reenqueueRequest, trackWaitTime } from "../../queue";
-import { refundLastAttempt } from "../../rate-limit";
 import {
   getCompletionFromBody,
-  isImageGenerationRequest,
-  isTextGenerationRequest,
-  sendProxyError,
+  isCompletionRequest,
+  writeErrorResponse,
 } from "../common";
-import { handleBlockingResponse } from "./handle-blocking-response";
 import { handleStreamedResponse } from "./handle-streamed-response";
 import { logPrompt } from "./log-prompt";
-import { logEvent } from "./log-event";
-import { saveImage } from "./save-image";
+
+const DECODER_MAP = {
+  gzip: util.promisify(zlib.gunzip),
+  deflate: util.promisify(zlib.inflate),
+  br: util.promisify(zlib.brotliDecompress),
+};
+
+const isSupportedContentEncoding = (
+  contentEncoding: string
+): contentEncoding is keyof typeof DECODER_MAP => {
+  return contentEncoding in DECODER_MAP;
+};
+
+class RetryableError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "RetryableError";
+  }
+}
 
 /**
- * Either decodes or streams the entire response body and then resolves with it.
- * @returns The response body as a string or parsed JSON object depending on the
- * response's content-type.
+ * Either decodes or streams the entire response body and then passes it as the
+ * last argument to the rest of the middleware stack.
  */
 export type RawResponseBodyHandler = (
   proxyRes: http.IncomingMessage,
   req: Request,
   res: Response
 ) => Promise<string | Record<string, any>>;
-
 export type ProxyResHandlerWithBody = (
   proxyRes: http.IncomingMessage,
   req: Request,
@@ -60,10 +73,6 @@ export type ProxyResMiddleware = ProxyResHandlerWithBody[];
  * middleware from executing as it consumes the stream and forwards events to
  * the client. Once the stream is closed, the finalized body will be attached
  * to res.body and the remaining middleware will execute.
- *
- * @param apiMiddleware - Custom middleware to execute after the common response
- * handlers. These *only* execute for non-streaming responses, so should be used
- * to transform non-streaming responses into the desired format.
  */
 export const createOnProxyResHandler = (apiMiddleware: ProxyResMiddleware) => {
   return async (
@@ -71,35 +80,34 @@ export const createOnProxyResHandler = (apiMiddleware: ProxyResMiddleware) => {
     req: Request,
     res: Response
   ) => {
-    const initialHandler: RawResponseBodyHandler = req.isStreaming
+    const initialHandler = req.isStreaming
       ? handleStreamedResponse
-      : handleBlockingResponse;
+      : decodeResponseBody;
+
     let lastMiddleware = initialHandler.name;
 
     try {
       const body = await initialHandler(proxyRes, req, res);
+
       const middlewareStack: ProxyResMiddleware = [];
 
       if (req.isStreaming) {
-        // Handlers for streaming requests must never write to the response.
+        // `handleStreamedResponse` writes to the response and ends it, so
+        // we can only execute middleware that doesn't write to the response.
         middlewareStack.push(
-          trackKeyRateLimit,
+          trackRateLimit,
           countResponseTokens,
           incrementUsage,
-          logPrompt,
-          logEvent
+          logPrompt
         );
       } else {
         middlewareStack.push(
-          trackKeyRateLimit,
-          injectProxyInfo,
+          trackRateLimit,
           handleUpstreamErrors,
           countResponseTokens,
           incrementUsage,
           copyHttpHeaders,
-          saveImage,
           logPrompt,
-          logEvent,
           ...apiMiddleware
         );
       }
@@ -141,6 +149,70 @@ export const createOnProxyResHandler = (apiMiddleware: ProxyResMiddleware) => {
   };
 };
 
+function reenqueueRequest(req: Request) {
+  req.log.info(
+    { key: req.key?.hash, retryCount: req.retryCount },
+    `Re-enqueueing request due to retryable error`
+  );
+  req.retryCount++;
+  enqueue(req);
+}
+
+/**
+ * Handles the response from the upstream service and decodes the body if
+ * necessary.  If the response is JSON, it will be parsed and returned as an
+ * object.  Otherwise, it will be returned as a string.
+ * @throws {Error} Unsupported content-encoding or invalid application/json body
+ */
+export const decodeResponseBody: RawResponseBodyHandler = async (
+  proxyRes,
+  req,
+  res
+) => {
+  if (req.isStreaming) {
+    const err = new Error("decodeResponseBody called for a streaming request.");
+    req.log.error({ stack: err.stack, api: req.inboundApi }, err.message);
+    throw err;
+  }
+
+  return new Promise<string>((resolve, reject) => {
+    let chunks: Buffer[] = [];
+    proxyRes.on("data", (chunk) => chunks.push(chunk));
+    proxyRes.on("end", async () => {
+      let body = Buffer.concat(chunks);
+
+      const contentEncoding = proxyRes.headers["content-encoding"];
+      if (contentEncoding) {
+        if (isSupportedContentEncoding(contentEncoding)) {
+          const decoder = DECODER_MAP[contentEncoding];
+          body = await decoder(body);
+        } else {
+          const errorMessage = `Proxy received response with unsupported content-encoding: ${contentEncoding}`;
+          logger.warn({ contentEncoding, key: req.key?.hash }, errorMessage);
+          writeErrorResponse(req, res, 500, {
+            error: errorMessage,
+            contentEncoding,
+          });
+          return reject(errorMessage);
+        }
+      }
+
+      try {
+        if (proxyRes.headers["content-type"]?.includes("application/json")) {
+          const json = JSON.parse(body.toString());
+          return resolve(json);
+        }
+        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);
+        writeErrorResponse(req, res, 500, { error: errorMessage });
+        return reject(errorMessage);
+      }
+    });
+  });
+};
+
 type ProxiedErrorPayload = {
   error?: Record<string, any>;
   message?: string;
@@ -162,10 +234,15 @@ const handleUpstreamErrors: ProxyResHandlerWithBody = async (
   body
 ) => {
   const statusCode = proxyRes.statusCode || 500;
-  const statusMessage = proxyRes.statusMessage || "Internal Server Error";
-  let errorPayload: ProxiedErrorPayload;
 
-  if (statusCode < 400) return;
+  if (statusCode < 400) {
+    return;
+  }
+
+  let errorPayload: ProxiedErrorPayload;
+  const tryAgainMessage = keyPool.available(req.body?.model)
+    ? `There may be more keys available for this model; try again in a few seconds.`
+    : "There are no more keys available for this model.";
 
   try {
     assertJsonResponse(body);
@@ -173,74 +250,47 @@ const handleUpstreamErrors: ProxyResHandlerWithBody = async (
   } catch (parseError) {
     // Likely Bad Gateway or Gateway Timeout from upstream's reverse proxy
     const hash = req.key?.hash;
-    req.log.warn({ statusCode, statusMessage, key: hash }, parseError.message);
+    const statusMessage = proxyRes.statusMessage || "Unknown error";
+    logger.warn({ statusCode, statusMessage, key: hash }, parseError.message);
 
     const errorObject = {
+      statusCode,
+      statusMessage: proxyRes.statusMessage,
       error: parseError.message,
-      status: statusCode,
-      statusMessage,
-      proxy_note: `Proxy got back an error, but it was not in JSON format. This is likely a temporary problem with the upstream service.`,
+      proxy_note: `This is likely a temporary error with the upstream service.`,
     };
-
-    sendProxyError(req, res, statusCode, statusMessage, errorObject);
+    writeErrorResponse(req, res, statusCode, errorObject);
     throw new HttpError(statusCode, parseError.message);
   }
 
-  const service = req.key!.service;
-  if (service === "gcp") {
-    if (Array.isArray(errorPayload)) {
-      errorPayload = errorPayload[0];
-    }
-  }
-
   const errorType =
     errorPayload.error?.code ||
     errorPayload.error?.type ||
     getAwsErrorType(proxyRes.headers["x-amzn-errortype"]);
 
-  req.log.warn(
+  logger.warn(
     { statusCode, type: errorType, errorPayload, key: req.key?.hash },
     `Received error response from upstream. (${proxyRes.statusMessage})`
   );
 
-  // TODO: split upstream error handling into separate modules for each service,
-  // this is out of control.
-
+  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;
-  } else if (service === "gcp") {
-    // Try to standardize the error format for GCP
-    if (errorPayload.error?.code) { // GCP Error
-      errorPayload.error = { message: errorPayload.error.message, type: errorPayload.error.status || errorPayload.error.code };
-    }
   }
 
   if (statusCode === 400) {
+    // Bad request. For OpenAI, this is usually due to prompt length.
+    // For Anthropic, this is usually due to missing preamble.
     switch (service) {
       case "openai":
-      case "mistral-ai":
-      case "azure":
-        const filteredCodes = ["content_policy_violation", "content_filter"];
-        if (filteredCodes.includes(errorPayload.error?.code)) {
-          errorPayload.proxy_note = `Request was filtered by the upstream API's content moderation system. Modify your prompt and try again.`;
-          refundLastAttempt(req);
-        } else if (errorPayload.error?.code === "billing_hard_limit_reached") {
-          // For some reason, some models return this 400 error instead of the
-          // same 429 billing error that other models return.
-          await handleOpenAIRateLimitError(req, errorPayload);
-        } else {
-          errorPayload.proxy_note = `The upstream API rejected the request. Your prompt may be too long for ${req.body?.model}.`;
-        }
+      case "google-palm":
+        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":
-      case "gcp":
-        await handleAnthropicAwsBadRequestError(req, errorPayload);
-        break;
-      case "google-ai":
-        await handleGoogleAIBadRequestError(req, errorPayload);
+        maybeHandleMissingPreambleError(req, errorPayload);
         break;
       default:
         assertNever(service);
@@ -248,78 +298,39 @@ const handleUpstreamErrors: ProxyResHandlerWithBody = async (
   } else if (statusCode === 401) {
     // Key is invalid or was revoked
     keyPool.disable(req.key!, "revoked");
-    errorPayload.proxy_note = `Assigned API key is invalid or revoked, please try again.`;
+    errorPayload.proxy_note = `API key is invalid or revoked. ${tryAgainMessage}`;
   } else if (statusCode === 403) {
-    switch (service) {
-      case "anthropic":
-        if (
-          errorType === "permission_error" &&
-          errorPayload.error?.message?.toLowerCase().includes("multimodal")
-        ) {
-          req.log.warn(
-            { key: req.key?.hash },
-            "This Anthropic key does not support multimodal prompts."
-          );
-          keyPool.update(req.key!, { allowsMultimodality: false });
-          await reenqueueRequest(req);
-          throw new RetryableError(
-            "Claude request re-enqueued because key does not support multimodality."
-          );
-        } else {
-          keyPool.disable(req.key!, "revoked");
-          errorPayload.proxy_note = `Assigned API key is invalid or revoked, please try again.`;
-        }
-        return;
-      case "aws":
-        switch (errorType) {
-          case "UnrecognizedClientException":
-            // Key is invalid.
-            keyPool.disable(req.key!, "revoked");
-            errorPayload.proxy_note = `Assigned API key is invalid or revoked, please try again.`;
-            break;
-          case "AccessDeniedException":
-            const isModelAccessError =
-              errorPayload.error?.message?.includes(`specified model ID`);
-            if (!isModelAccessError) {
-              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. Model ID: ${req.body?.model}`;
-            break;
-          default:
-            errorPayload.proxy_note = `Received 403 error. Key may be invalid.`;
-        }
-        return;
-        case "mistral-ai":
-        case "gcp":
+    // Amazon is the only service that returns 403.
+    switch (errorType) {
+      case "UnrecognizedClientException":
+        // Key is invalid.
         keyPool.disable(req.key!, "revoked");
-        errorPayload.proxy_note = `Assigned API key is invalid or revoked, please try again.`;
-        return;
+        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) {
       case "openai":
-        await handleOpenAIRateLimitError(req, errorPayload);
+        handleOpenAIRateLimitError(req, tryAgainMessage, errorPayload);
         break;
       case "anthropic":
-        await handleAnthropicRateLimitError(req, errorPayload);
+        handleAnthropicRateLimitError(req, errorPayload);
         break;
       case "aws":
-        await handleAwsRateLimitError(req, errorPayload);
-        break;
-      case "gcp":
-        await handleGcpRateLimitError(req, errorPayload);
-        break;
-      case "azure":
-      case "mistral-ai":
-        await handleAzureRateLimitError(req, errorPayload);
-        break;
-      case "google-ai":
-        await handleGoogleAIRateLimitError(req, errorPayload);
+        handleAwsRateLimitError(req, errorPayload);
         break;
+      case "google-palm":
+        throw new Error("Rate limit handling not implemented for PaLM");
       default:
         assertNever(service);
     }
@@ -340,21 +351,12 @@ const handleUpstreamErrors: ProxyResHandlerWithBody = async (
       case "anthropic":
         errorPayload.proxy_note = `The requested Claude model might not exist, or the key might not be provisioned for it.`;
         break;
-      case "google-ai":
-        errorPayload.proxy_note = `The requested Google AI model might not exist, or the key might not be provisioned for it.`;
-        break;
-      case "mistral-ai":
-        errorPayload.proxy_note = `The requested Mistral AI model might not exist, or the key might not be provisioned for it.`;
+      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;
-      case "gcp":
-        errorPayload.proxy_note = `The requested GCP resource might not exist, or the key might not have access to it.`;
-        break;
-      case "azure":
-        errorPayload.proxy_note = `The assigned Azure deployment does not support the requested model.`;
-        break;
       default:
         assertNever(service);
     }
@@ -370,77 +372,63 @@ const handleUpstreamErrors: ProxyResHandlerWithBody = async (
     );
   }
 
-  sendProxyError(req, res, statusCode, statusMessage, errorPayload);
-  // This is bubbled up to onProxyRes's handler for logging but will not trigger
-  // a write to the response as `sendProxyError` has just done that.
+  writeErrorResponse(req, res, statusCode, errorPayload);
   throw new HttpError(statusCode, errorPayload.error?.message);
 };
 
-async function handleAnthropicAwsBadRequestError(
+/**
+ * This is a workaround for a very strange issue where certain API keys seem to
+ * enforce more strict input validation than others -- specifically, they will
+ * require a `\n\nHuman:` prefix on the prompt, perhaps to prevent the key from
+ * being used as a generic text completion service and to enforce the use of
+ * the chat RLHF.  This is not documented anywhere, and it's not clear why some
+ * keys enforce this and others don't.
+ * This middleware checks for that specific error and marks the key as being
+ * one that requires the prefix, and then re-enqueues the request.
+ * The exact error is:
+ * ```
+ * {
+ *   "error": {
+ *     "type": "invalid_request_error",
+ *     "message": "prompt must start with \"\n\nHuman:\" turn"
+ *   }
+ * }
+ * ```
+ */
+function maybeHandleMissingPreambleError(
   req: Request,
   errorPayload: ProxiedErrorPayload
 ) {
-  const { error } = errorPayload;
-  const isMissingPreamble = error?.message.startsWith(
-    `prompt must start with "\n\nHuman:" turn`
-  );
-
-  // Some keys mandate a \n\nHuman: preamble, which we can add and retry
-  if (isMissingPreamble) {
+  if (
+    errorPayload.error?.type === "invalid_request_error" &&
+    errorPayload.error?.message === 'prompt must start with "\n\nHuman:" turn'
+  ) {
     req.log.warn(
       { key: req.key?.hash },
       "Request failed due to missing preamble. Key will be marked as such for subsequent requests."
     );
-    keyPool.update(req.key!, { requiresPreamble: true });
-    await reenqueueRequest(req);
+    keyPool.update(req.key as AnthropicKey, { requiresPreamble: true });
+    reenqueueRequest(req);
     throw new RetryableError("Claude request re-enqueued to add preamble.");
+  } else {
+    errorPayload.proxy_note = `Proxy received unrecognized error from Anthropic. Check the specific error for more information.`;
   }
-
-  // {"type":"error","error":{"type":"invalid_request_error","message":"Usage blocked until 2024-03-01T00:00:00+00:00 due to user specified spend limits."}}
-  // {"type":"error","error":{"type":"invalid_request_error","message":"Your credit balance is too low to access the Claude API. Please go to Plans & Billing to upgrade or purchase credits."}}
-  const isOverQuota =
-    error?.message?.match(/usage blocked until/i) ||
-    error?.message?.match(/credit balance is too low/i);
-  if (isOverQuota) {
-    req.log.warn(
-      { key: req.key?.hash, message: error?.message },
-      "Anthropic key has hit spending limit and will be disabled."
-    );
-    keyPool.disable(req.key!, "quota");
-    errorPayload.proxy_note = `Assigned key has hit its spending limit. ${error?.message}`;
-    return;
-  }
-
-  const isDisabled =
-    error?.message?.match(/organization has been disabled/i) ||
-    error?.message?.match(/^operation not allowed/i);
-  if (isDisabled) {
-    req.log.warn(
-      { key: req.key?.hash, message: error?.message },
-      "Anthropic/AWS key has been disabled."
-    );
-    keyPool.disable(req.key!, "revoked");
-    errorPayload.proxy_note = `Assigned key has been disabled. (${error?.message})`;
-    return;
-  }
-
-  errorPayload.proxy_note = `Unrecognized error from the API. (${error?.message})`;
 }
 
-async function handleAnthropicRateLimitError(
+function handleAnthropicRateLimitError(
   req: Request,
   errorPayload: ProxiedErrorPayload
 ) {
   if (errorPayload.error?.type === "rate_limit_error") {
     keyPool.markRateLimited(req.key!);
-    await reenqueueRequest(req);
+    reenqueueRequest(req);
     throw new RetryableError("Claude rate-limited request re-enqueued.");
   } else {
-    errorPayload.proxy_note = `Unrecognized 429 Too Many Requests error from the API.`;
+    errorPayload.proxy_note = `Unrecognized rate limit error from Anthropic. Key may be over quota.`;
   }
 }
 
-async function handleAwsRateLimitError(
+function handleAwsRateLimitError(
   req: Request,
   errorPayload: ProxiedErrorPayload
 ) {
@@ -448,7 +436,7 @@ async function handleAwsRateLimitError(
   switch (errorType) {
     case "ThrottlingException":
       keyPool.markRateLimited(req.key!);
-      await reenqueueRequest(req);
+      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.`;
@@ -458,196 +446,49 @@ async function handleAwsRateLimitError(
   }
 }
 
-async function handleGcpRateLimitError(
+function handleOpenAIRateLimitError(
   req: Request,
+  tryAgainMessage: string,
   errorPayload: ProxiedErrorPayload
-) {
-  if (errorPayload.error?.type === "RESOURCE_EXHAUSTED") {
-    keyPool.markRateLimited(req.key!);
-    await reenqueueRequest(req);
-    throw new RetryableError("GCP rate-limited request re-enqueued.");
-  } else {
-    errorPayload.proxy_note = `Unrecognized 429 Too Many Requests error from GCP.`;
-  }
-}
-
-async function handleOpenAIRateLimitError(
-  req: Request,
-  errorPayload: ProxiedErrorPayload
-): Promise<Record<string, any>> {
+): Record<string, any> {
   const type = errorPayload.error?.type;
   switch (type) {
     case "insufficient_quota":
-    case "invalid_request_error": // this is the billing_hard_limit_reached error seen in some cases
       // Billing quota exceeded (key is dead, disable it)
       keyPool.disable(req.key!, "quota");
-      errorPayload.proxy_note = `Assigned key's quota has been exceeded. Please try again.`;
+      errorPayload.proxy_note = `Assigned key's quota has been exceeded. ${tryAgainMessage}`;
       break;
     case "access_terminated":
       // Account banned (key is dead, disable it)
       keyPool.disable(req.key!, "revoked");
-      errorPayload.proxy_note = `Assigned key has been banned by OpenAI for policy violations. Please try again.`;
+      errorPayload.proxy_note = `Assigned key has been banned by OpenAI for policy violations. ${tryAgainMessage}`;
       break;
     case "billing_not_active":
       // Key valid but account billing is delinquent
       keyPool.disable(req.key!, "quota");
-      errorPayload.proxy_note = `Assigned key has been disabled due to delinquent billing. Please try again.`;
+      errorPayload.proxy_note = `Assigned key has been disabled due to delinquent billing. ${tryAgainMessage}`;
       break;
     case "requests":
     case "tokens":
-      keyPool.markRateLimited(req.key!);
-      if (errorPayload.error?.message?.match(/on requests per day/)) {
-        // This key has a very low rate limit, so we can't re-enqueue it.
-        errorPayload.proxy_note = `Assigned key has reached its per-day request limit for this model. Try another model.`;
-        break;
-      }
-
       // Per-minute request or token rate limit is exceeded, which we can retry
-      await reenqueueRequest(req);
+      keyPool.markRateLimited(req.key!);
+      reenqueueRequest(req);
       throw new RetryableError("Rate-limited request re-enqueued.");
-    // WIP/nonfunctional
-    // case "tokens_usage_based":
-    //   // Weird new rate limit type that seems limited to preview models.
-    //   // Distinct from `tokens` type. Can be per-minute or per-day.
-    //
-    //   // I've seen reports of this error for 500k tokens/day and 10k tokens/min.
-    //   // 10k tokens per minute is problematic, because this is much less than
-    //   // GPT4-Turbo's max context size for a single prompt and is effectively a
-    //   // cap on the max context size for just that key+model, which the app is
-    //   // not able to deal with.
-    //
-    //   // Similarly if there is a 500k tokens per day limit and 450k tokens have
-    //   // been used today, the max context for that key becomes 50k tokens until
-    //   // the next day and becomes progressively smaller as more tokens are used.
-    //
-    //   // To work around these keys we will first retry the request a few times.
-    //   // After that we will reject the request, and if it's a per-day limit we
-    //   // will also disable the key.
-    //
-    //   // "Rate limit reached for gpt-4-1106-preview in organization org-xxxxxxxxxxxxxxxxxxx on tokens_usage_based per day: Limit 500000, Used 460000, Requested 50000"
-    //   // "Rate limit reached for gpt-4-1106-preview in organization org-xxxxxxxxxxxxxxxxxxx on tokens_usage_based per min: Limit 10000, Requested 40000"
-    //
-    //   const regex =
-    //     /Rate limit reached for .+ in organization .+ on \w+ per (day|min): Limit (\d+)(?:, Used (\d+))?, Requested (\d+)/;
-    //   const [, period, limit, used, requested] =
-    //     errorPayload.error?.message?.match(regex) || [];
-    //
-    //   req.log.warn(
-    //     { key: req.key?.hash, period, limit, used, requested },
-    //     "Received `tokens_usage_based` rate limit error from OpenAI."
-    //   );
-    //
-    //   if (!period || !limit || !requested) {
-    //     errorPayload.proxy_note = `Unrecognized rate limit error from OpenAI. (${errorPayload.error?.message})`;
-    //     break;
-    //   }
-    //
-    //   if (req.retryCount < 2) {
-    //     await reenqueueRequest(req);
-    //     throw new RetryableError("Rate-limited request re-enqueued.");
-    //   }
-    //
-    //   if (period === "min") {
-    //     errorPayload.proxy_note = `Assigned key can't be used for prompts longer than ${limit} tokens, and no other keys are available right now. Reduce the length of your prompt or try again in a few minutes.`;
-    //   } else {
-    //     errorPayload.proxy_note = `Assigned key  has reached its per-day request limit for this model. Try another model.`;
-    //   }
-    //
-    //   keyPool.markRateLimited(req.key!);
-    //   break;
     default:
-      errorPayload.proxy_note = `This is likely a temporary error with the API. Try again in a few seconds.`;
+      errorPayload.proxy_note = `This is likely a temporary error with OpenAI. Try again in a few seconds.`;
       break;
   }
   return errorPayload;
 }
 
-async function handleAzureRateLimitError(
-  req: Request,
-  errorPayload: ProxiedErrorPayload
-) {
-  const code = errorPayload.error?.code;
-  switch (code) {
-    case "429":
-      keyPool.markRateLimited(req.key!);
-      await reenqueueRequest(req);
-      throw new RetryableError("Rate-limited request re-enqueued.");
-    default:
-      errorPayload.proxy_note = `Unrecognized rate limit error from Azure (${code}). Please report this.`;
-      break;
-  }
-}
-
-//{"error":{"code":400,"message":"API Key not found. Please pass a valid API key.","status":"INVALID_ARGUMENT","details":[{"@type":"type.googleapis.com/google.rpc.ErrorInfo","reason":"API_KEY_INVALID","domain":"googleapis.com","metadata":{"service":"generativelanguage.googleapis.com"}}]}}
-//{"error":{"code":400,"message":"Gemini API free tier is not available in your country. Please enable billing on your project in Google AI Studio.","status":"FAILED_PRECONDITION"}}
-async function handleGoogleAIBadRequestError(
-  req: Request,
-  errorPayload: ProxiedErrorPayload
-) {
-  const error = errorPayload.error || {};
-  const { message, status, details } = error;
-
-  if (status === "INVALID_ARGUMENT") {
-    const reason = details?.[0]?.reason;
-    if (reason === "API_KEY_INVALID") {
-      req.log.warn(
-        { key: req.key?.hash, status, reason, msg: error.message },
-        "Received `API_KEY_INVALID` error from Google AI. Check the configured API key."
-      );
-      keyPool.disable(req.key!, "revoked");
-      errorPayload.proxy_note = `Assigned API key is invalid.`;
-    }
-  } else if (status === "FAILED_PRECONDITION") {
-    if (message.match(/please enable billing/i)) {
-      req.log.warn(
-        { key: req.key?.hash, status, msg: error.message },
-        "Cannot use key due to billing restrictions."
-      );
-      keyPool.disable(req.key!, "revoked");
-      errorPayload.proxy_note = `Assigned API key cannot be used.`;
-    }
-  } else {
-    req.log.warn(
-      { key: req.key?.hash, status, msg: error.message },
-      "Received unexpected 400 error from Google AI."
-    );
-  }
-}
-
-//{"error":{"code":429,"message":"Resource has been exhausted (e.g. check quota).","status":"RESOURCE_EXHAUSTED"}
-async function handleGoogleAIRateLimitError(
-  req: Request,
-  errorPayload: ProxiedErrorPayload
-) {
-  const status = errorPayload.error?.status;
-  switch (status) {
-    case "RESOURCE_EXHAUSTED":
-      keyPool.markRateLimited(req.key!);
-      await reenqueueRequest(req);
-      throw new RetryableError("Rate-limited request re-enqueued.");
-    default:
-      errorPayload.proxy_note = `Unrecognized rate limit error from Google AI (${status}). Please report this.`;
-      break;
-  }
-}
-
 const incrementUsage: ProxyResHandlerWithBody = async (_proxyRes, req) => {
-  if (isTextGenerationRequest(req) || isImageGenerationRequest(req)) {
+  if (isCompletionRequest(req)) {
     const model = req.body.model;
     const tokensUsed = req.promptTokens! + req.outputTokens!;
-    req.log.debug(
-      {
-        model,
-        tokensUsed,
-        promptTokens: req.promptTokens,
-        outputTokens: req.outputTokens,
-      },
-      `Incrementing usage for model`
-    );
     keyPool.incrementUsage(req.key!, model, tokensUsed);
     if (req.user) {
       incrementPromptCount(req.user.token);
-      incrementTokenCount(req.user.token, model, req.outboundApi, tokensUsed);
+      incrementTokenCount(req.user.token, model, tokensUsed);
     }
   }
 };
@@ -658,12 +499,6 @@ const countResponseTokens: ProxyResHandlerWithBody = async (
   _res,
   body
 ) => {
-  if (req.outboundApi === "openai-image") {
-    req.outputTokens = req.promptTokens;
-    req.promptTokens = 0;
-    return;
-  }
-
   // 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
@@ -678,8 +513,8 @@ const countResponseTokens: ProxyResHandlerWithBody = async (
       { service, tokens, prevOutputTokens: req.outputTokens },
       `Counted tokens for completion`
     );
-    if (req.tokenizerInfo) {
-      req.tokenizerInfo.completion_tokens = tokens;
+    if (req.debug) {
+      req.debug.completion_tokens = tokens;
     }
 
     req.outputTokens = tokens.token_count;
@@ -693,7 +528,7 @@ const countResponseTokens: ProxyResHandlerWithBody = async (
   }
 };
 
-const trackKeyRateLimit: ProxyResHandlerWithBody = async (proxyRes, req) => {
+const trackRateLimit: ProxyResHandlerWithBody = async (proxyRes, req) => {
   keyPool.updateRateLimits(req.key!, proxyRes.headers);
 };
 
@@ -717,38 +552,6 @@ const copyHttpHeaders: ProxyResHandlerWithBody = async (
   });
 };
 
-/**
- * Injects metadata into the response, such as the tokenizer used, logging
- * status, upstream API endpoint used, and whether the input prompt was modified
- * or transformed.
- * Only used for non-streaming requests.
- */
-const injectProxyInfo: ProxyResHandlerWithBody = async (
-  _proxyRes,
-  req,
-  res,
-  body
-) => {
-  const { service, inboundApi, outboundApi, tokenizerInfo } = req;
-  const native = inboundApi === outboundApi;
-  const info: any = {
-    logged: config.promptLogging,
-    tokens: tokenizerInfo,
-    service,
-    in_api: inboundApi,
-    out_api: outboundApi,
-    prompt_transformed: !native,
-  };
-
-  if (req.query?.debug?.length) {
-    info.final_request_body = req.signedRequest?.body || req.body;
-  }
-
-  if (typeof body === "object") {
-    body.proxy = info;
-  }
-};
-
 function getAwsErrorType(header: string | string[] | undefined) {
   const val = String(header).match(/^(\w+):?/)?.[1];
   return val || String(header);

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

@@ -1,81 +0,0 @@
-import { createHash } from "crypto";
-import { config } from "../../../config";
-import { eventLogger } from "../../../shared/prompt-logging";
-import { getModelFromBody, isTextGenerationRequest } from "../common";
-import { ProxyResHandlerWithBody } from ".";
-import {
-  OpenAIChatMessage,
-  AnthropicChatMessage,
-} from "../../../shared/api-schemas";
-
-/** If event logging is enabled, logs a chat completion event. */
-export const logEvent: ProxyResHandlerWithBody = async (
-  _proxyRes,
-  req,
-  _res,
-  responseBody
-) => {
-  if (!config.eventLogging) {
-    return;
-  }
-  if (typeof responseBody !== "object") {
-    throw new Error("Expected body to be an object");
-  }
-  if (!["openai", "anthropic-chat"].includes(req.outboundApi)) {
-    // only chat apis are supported
-    return;
-  }
-  if (!req.user) {
-    return;
-  }
-
-  const loggable = isTextGenerationRequest(req);
-  if (!loggable) return;
-
-  const messages = req.body.messages as
-    | OpenAIChatMessage[]
-    | AnthropicChatMessage[];
-
-  let hashes = [];
-  hashes.push(hashMessages(messages));
-  for (
-    let i = 1;
-    i <= Math.min(config.eventLoggingTrim!, messages.length);
-    i++
-  ) {
-    hashes.push(hashMessages(messages.slice(0, -i)));
-  }
-
-  const model = getModelFromBody(req, responseBody);
-  const userToken = req.user!.token;
-  const family = req.modelFamily!;
-  eventLogger.logEvent({
-    ip: req.ip,
-    type: "chat_completion",
-    model,
-    family,
-    hashes,
-    userToken,
-    inputTokens: req.promptTokens ?? 0,
-    outputTokens: req.outputTokens ?? 0,
-  });
-};
-
-const hashMessages = (
-  messages: OpenAIChatMessage[] | AnthropicChatMessage[]
-): string => {
-  let hasher = createHash("sha256");
-  let messageTexts = [];
-  for (const msg of messages) {
-    if (!["system", "user", "assistant"].includes(msg.role)) continue;
-    if (typeof msg.content === "string") {
-      messageTexts.push(msg.content);
-    } else if (Array.isArray(msg.content)) {
-      if (msg.content[0].type === "text") {
-        messageTexts.push(msg.content[0].text);
-      }
-    }
-  }
-  hasher.update(messageTexts.join("<|im_sep|>"));
-  return hasher.digest("hex");
-};

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

@@ -4,18 +4,10 @@ import { logQueue } from "../../../shared/prompt-logging";
 import {
   getCompletionFromBody,
   getModelFromBody,
-  isImageGenerationRequest,
-  isTextGenerationRequest,
+  isCompletionRequest,
 } from "../common";
 import { ProxyResHandlerWithBody } from ".";
 import { assertNever } from "../../../shared/utils";
-import {
-  AnthropicChatMessage,
-  flattenAnthropicMessages,
-  GoogleAIChatMessage,
-  MistralAIChatMessage,
-  OpenAIChatMessage,
-} from "../../../shared/api-schemas";
 
 /** If prompt logging is enabled, enqueues the prompt for logging. */
 export const logPrompt: ProxyResHandlerWithBody = async (
@@ -31,11 +23,11 @@ export const logPrompt: ProxyResHandlerWithBody = async (
     throw new Error("Expected body to be an object");
   }
 
-  const loggable =
-    isTextGenerationRequest(req) || isImageGenerationRequest(req);
-  if (!loggable) return;
+  if (!isCompletionRequest(req)) {
+    return;
+  }
 
-  const promptPayload = getPromptForRequest(req, responseBody);
+  const promptPayload = getPromptForRequest(req);
   const promptFlattened = flattenMessages(promptPayload);
   const response = getCompletionFromBody(req, responseBody);
   const model = getModelFromBody(req, responseBody);
@@ -49,109 +41,32 @@ export const logPrompt: ProxyResHandlerWithBody = async (
   });
 };
 
-type OaiImageResult = {
-  prompt: string;
-  size: string;
-  style: string;
-  quality: string;
-  revisedPrompt?: string;
+type OaiMessage = {
+  role: "user" | "assistant" | "system";
+  content: string;
 };
 
-const getPromptForRequest = (
-  req: Request,
-  responseBody: Record<string, any>
-):
-  | string
-  | OpenAIChatMessage[]
-  | { contents: GoogleAIChatMessage[] }
-  | { system: string; messages: AnthropicChatMessage[] }
-  | MistralAIChatMessage[]
-  | OaiImageResult => {
+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) {
     case "openai":
-    case "mistral-ai":
       return req.body.messages;
-    case "anthropic-chat":
-      return { system: req.body.system, messages: req.body.messages };
     case "openai-text":
-    case "anthropic-text":
-    case "mistral-text":
       return req.body.prompt;
-    case "openai-image":
-      return {
-        prompt: req.body.prompt,
-        size: req.body.size,
-        style: req.body.style,
-        quality: req.body.quality,
-        revisedPrompt: responseBody.data[0].revised_prompt,
-      };
-    case "google-ai":
-      return { contents: req.body.contents };
+    case "anthropic":
+      return req.body.prompt;
+    case "google-palm":
+      return req.body.prompt.text;
     default:
       assertNever(req.outboundApi);
   }
 };
 
-const flattenMessages = (
-  val:
-    | string
-    | OaiImageResult
-    | OpenAIChatMessage[]
-    | { contents: GoogleAIChatMessage[] }
-    | { system: string; messages: AnthropicChatMessage[] }
-    | MistralAIChatMessage[]
-): string => {
-  if (typeof val === "string") {
-    return val.trim();
+const flattenMessages = (messages: string | OaiMessage[]): string => {
+  if (typeof messages === "string") {
+    return messages.trim();
   }
-  if (isAnthropicChatPrompt(val)) {
-    const { system, messages } = val;
-    return `System: ${system}\n\n${flattenAnthropicMessages(messages)}`;
-  }
-  if (isGoogleAIChatPrompt(val)) {
-    return val.contents
-      .map(({ parts, role }) => {
-        const text = parts.map((p) => p.text).join("\n");
-        return `${role}: ${text}`;
-      })
-      .join("\n");
-  }
-  if (Array.isArray(val)) {
-    return val
-      .map(({ content, role }) => {
-        const text = Array.isArray(content)
-          ? content
-              .map((c) => {
-                if ("text" in c) return c.text;
-                if ("image_url" in c) return "(( Attached Image ))";
-                if ("source" in c) return "(( Attached Image ))";
-                return "(( Unsupported Content ))";
-              })
-              .join("\n")
-          : content;
-        return `${role}: ${text}`;
-      })
-      .join("\n");
-  }
-  return val.prompt.trim();
+  return messages.map((m) => `${m.role}: ${m.content}`).join("\n");
 };
-
-function isGoogleAIChatPrompt(
-  val: unknown
-): val is { contents: GoogleAIChatMessage[] } {
-  return typeof val === "object" && val !== null && "contents" in val;
-}
-
-function isAnthropicChatPrompt(
-  val: unknown
-): val is { system: string; messages: AnthropicChatMessage[] } {
-  return (
-    typeof val === "object" &&
-    val !== null &&
-    "system" in val &&
-    "messages" in val
-  );
-}

src/proxy/middleware/response/save-image.ts

@@ -1,33 +0,0 @@
-import { ProxyResHandlerWithBody } from "./index";
-import {
-  mirrorGeneratedImage,
-  OpenAIImageGenerationResult,
-} from "../../../shared/file-storage/mirror-generated-image";
-
-export const saveImage: ProxyResHandlerWithBody = async (
-  _proxyRes,
-  req,
-  _res,
-  body
-) => {
-  if (req.outboundApi !== "openai-image") {
-    return;
-  }
-
-  if (typeof body !== "object") {
-    throw new Error("Expected body to be an object");
-  }
-
-  if (body.data) {
-    const prompt = body.data[0].revised_prompt ?? req.body.prompt;
-    const res = await mirrorGeneratedImage(
-      req,
-      prompt,
-      body as OpenAIImageGenerationResult
-    );
-    req.log.info(
-      { urls: res.data.map((item) => item.url) },
-      "Saved generated image to user_content"
-    );
-  }
-};

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

@@ -1,49 +0,0 @@
-import { OpenAIChatCompletionStreamEvent } from "../index";
-
-export type AnthropicChatCompletionResponse = {
-  id: string;
-  type: "message";
-  role: "assistant";
-  content: { type: "text"; text: string }[];
-  model: string;
-  stop_reason: string | null;
-  stop_sequence: string | null;
-  usage: { input_tokens: number; output_tokens: number };
-};
-
-/**
- * Given a list of OpenAI chat completion events, compiles them into a single
- * finalized Anthropic chat completion response so that non-streaming middleware
- * can operate on it as if it were a blocking response.
- */
-export function mergeEventsForAnthropicChat(
-  events: OpenAIChatCompletionStreamEvent[]
-): AnthropicChatCompletionResponse {
-  let merged: AnthropicChatCompletionResponse = {
-    id: "",
-    type: "message",
-    role: "assistant",
-    content: [],
-    model: "",
-    stop_reason: null,
-    stop_sequence: null,
-    usage: { input_tokens: 0, output_tokens: 0 },
-  };
-  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.model = event.model;
-      acc.content = [{ type: "text", text: "" }];
-      return acc;
-    }
-
-    acc.stop_reason = event.choices[0].finish_reason ?? "";
-    if (event.choices[0].delta.content) {
-      acc.content[0].text += event.choices[0].delta.content;
-    }
-
-    return acc;
-  }, merged);
-  return merged;
-}

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

@@ -1,6 +1,6 @@
 import { OpenAIChatCompletionStreamEvent } from "../index";
 
-export type AnthropicTextCompletionResponse = {
+export type AnthropicCompletionResponse = {
   completion: string;
   stop_reason: string;
   truncated: boolean;
@@ -15,10 +15,10 @@ export type AnthropicTextCompletionResponse = {
  * finalized Anthropic completion response so that non-streaming middleware
  * can operate on it as if it were a blocking response.
  */
-export function mergeEventsForAnthropicText(
+export function mergeEventsForAnthropic(
   events: OpenAIChatCompletionStreamEvent[]
-): AnthropicTextCompletionResponse {
-  let merged: AnthropicTextCompletionResponse = {
+): AnthropicCompletionResponse {
+  let merged: AnthropicCompletionResponse = {
     log_id: "",
     exception: null,
     model: "",

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

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

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

src/proxy/middleware/response/streaming/aws-event-stream-decoder.ts

@@ -1,93 +0,0 @@
-import pino from "pino";
-import { Duplex, Readable } from "stream";
-import { EventStreamMarshaller } from "@smithy/eventstream-serde-node";
-import { fromUtf8, toUtf8 } from "@smithy/util-utf8";
-import { Message } from "@smithy/eventstream-codec";
-
-/**
- * Decodes a Readable stream, such as a proxied HTTP response, into a stream of
- * Message objects using the AWS SDK's EventStreamMarshaller. Error events in
- * the amazon eventstream protocol are decoded as Message objects and will not
- * emit an error event on the decoder stream.
- */
-export function getAwsEventStreamDecoder(params: {
-  input: Readable;
-  logger: pino.Logger;
-}): Duplex {
-  const { input, logger } = params;
-  const config = { utf8Encoder: toUtf8, utf8Decoder: fromUtf8 };
-  const eventStream = new EventStreamMarshaller(config).deserialize(
-    input,
-    async (input: Record<string, Message>) => {
-      const eventType = Object.keys(input)[0];
-      let result;
-      if (eventType === "chunk") {
-        result = input[eventType];
-      } else {
-        // AWS unmarshaller treats non-chunk events (errors and exceptions) oddly.
-        result = { [eventType]: input[eventType] } as any;
-      }
-      return result;
-    }
-  );
-  return new AWSEventStreamDecoder(eventStream, { logger });
-}
-
-class AWSEventStreamDecoder extends Duplex {
-  private readonly asyncIterable: AsyncIterable<Message>;
-  private iterator: AsyncIterator<Message>;
-  private reading: boolean;
-  private logger: pino.Logger;
-
-  constructor(
-    asyncIterable: AsyncIterable<Message>,
-    options: { logger: pino.Logger }
-  ) {
-    super({ ...options, objectMode: true });
-    this.asyncIterable = asyncIterable;
-    this.iterator = this.asyncIterable[Symbol.asyncIterator]();
-    this.reading = false;
-    this.logger = options.logger.child({ module: "aws-eventstream-decoder" });
-  }
-
-  async _read(_size: number) {
-    if (this.reading) return;
-    this.reading = true;
-
-    try {
-      while (true) {
-        const { value, done } = await this.iterator.next();
-        if (done) {
-          this.push(null);
-          break;
-        }
-        if (!this.push(value)) break;
-      }
-    } catch (err) {
-      // AWS SDK's EventStreamMarshaller emits errors in the stream itself as
-      // whatever our deserializer returns, which will not be Error objects
-      // because we want to pass the Message to the next stream for processing.
-      // Any actual Error thrown here is some failure during deserialization.
-      const isAwsError = !(err instanceof Error);
-
-      if (isAwsError) {
-        this.logger.warn({ err: err.headers }, "Received AWS error event");
-        this.push(err);
-        this.push(null);
-      } else {
-        this.logger.error(err, "Error during AWS stream deserialization");
-        this.destroy(err);
-      }
-    } finally {
-      this.reading = false;
-    }
-  }
-
-  _write(_chunk: any, _encoding: string, callback: () => void) {
-    callback();
-  }
-
-  _final(callback: () => void) {
-    callback();
-  }
-}

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

@@ -1,19 +1,10 @@
-import express from "express";
 import { APIFormat } from "../../../../shared/key-management";
 import { assertNever } from "../../../../shared/utils";
 import {
-  anthropicV2ToOpenAI,
-  mergeEventsForAnthropicChat,
-  mergeEventsForAnthropicText,
+  mergeEventsForAnthropic,
   mergeEventsForOpenAIChat,
   mergeEventsForOpenAIText,
-  mergeEventsForMistralChat,
-  mergeEventsForMistralText,
-  AnthropicV2StreamEvent,
   OpenAIChatCompletionStreamEvent,
-  mistralAIToOpenAI,
-  MistralAIStreamEvent,
-  MistralChatCompletionEvent,
 } from "./index";
 
 /**
@@ -21,111 +12,30 @@ import {
  * compiles them into a single finalized response for downstream middleware.
  */
 export class EventAggregator {
-  private readonly model: string;
-  private readonly requestFormat: APIFormat;
-  private readonly responseFormat: APIFormat;
+  private readonly format: APIFormat;
   private readonly events: OpenAIChatCompletionStreamEvent[];
 
-  constructor({ body, inboundApi, outboundApi }: express.Request) {
+  constructor({ format }: { format: APIFormat }) {
     this.events = [];
-    this.requestFormat = inboundApi;
-    this.responseFormat = outboundApi;
-    this.model = body.model;
+    this.format = format;
   }
 
-  addEvent(
-    event:
-      | OpenAIChatCompletionStreamEvent
-      | AnthropicV2StreamEvent
-      | MistralAIStreamEvent
-  ) {
-    if (eventIsOpenAIEvent(event)) {
-      this.events.push(event);
-    } else {
-      // horrible special case. previously all transformers' target format was
-      // openai, so the event aggregator could conveniently assume all incoming
-      // events were in openai format.
-      // now we have added some transformers that convert between non-openai
-      // formats, so aggregator needs to know how to collapse for more than
-      // just openai.
-      // because writing aggregation logic for every possible output format is
-      // annoying, we will just transform any non-openai output events to openai
-      // format (even if the client did not request openai at all) so that we
-      // still only need to write aggregators for openai SSEs.
-      let openAIEvent: OpenAIChatCompletionStreamEvent | undefined;
-      switch (this.requestFormat) {
-        case "anthropic-text":
-          assertIsAnthropicV2Event(event);
-          openAIEvent = anthropicV2ToOpenAI({
-            data: `event: completion\ndata: ${JSON.stringify(event)}\n\n`,
-            lastPosition: -1,
-            index: 0,
-            fallbackId: event.log_id || "fallback-" + Date.now(),
-            fallbackModel: event.model || this.model || "fallback-claude-3",
-          })?.event;
-          break;
-        case "mistral-ai":
-          assertIsMistralChatEvent(event);
-          openAIEvent = mistralAIToOpenAI({
-            data: `data: ${JSON.stringify(event)}\n\n`,
-            lastPosition: -1,
-            index: 0,
-            fallbackId: "fallback-" + Date.now(),
-            fallbackModel: this.model || "fallback-mistral",
-          })?.event;
-          break;
-      }
-      if (openAIEvent) {
-        this.events.push(openAIEvent);
-      }
-    }
+  addEvent(event: OpenAIChatCompletionStreamEvent) {
+    this.events.push(event);
   }
 
   getFinalResponse() {
-    switch (this.responseFormat) {
+    switch (this.format) {
       case "openai":
-      case "google-ai": // TODO: this is probably wrong now that we support native Google Makersuite prompts
         return mergeEventsForOpenAIChat(this.events);
       case "openai-text":
         return mergeEventsForOpenAIText(this.events);
-      case "anthropic-text":
-        return mergeEventsForAnthropicText(this.events);
-      case "anthropic-chat":
-        return mergeEventsForAnthropicChat(this.events);
-      case "mistral-ai":
-        return mergeEventsForMistralChat(this.events);
-      case "mistral-text":
-        return mergeEventsForMistralText(this.events);
-      case "openai-image":
-        throw new Error(
-          `SSE aggregation not supported for ${this.responseFormat}`
-        );
+      case "anthropic":
+        return mergeEventsForAnthropic(this.events);
+      case "google-palm":
+        throw new Error("Google PaLM API does not support streaming responses");
       default:
-        assertNever(this.responseFormat);
+        assertNever(this.format);
     }
   }
-
-  hasEvents() {
-    return this.events.length > 0;
-  }
-}
-
-function eventIsOpenAIEvent(
-  event: any
-): event is OpenAIChatCompletionStreamEvent {
-  return event?.object === "chat.completion.chunk";
-}
-
-function assertIsAnthropicV2Event(event: any): asserts event is AnthropicV2StreamEvent {
-  if (!event?.completion) {
-    throw new Error(`Bad event for Anthropic V2 SSE aggregation`);
-  }
-}
-
-function assertIsMistralChatEvent(
-  event: any
-): asserts event is MistralChatCompletionEvent {
-  if (!event?.choices) {
-    throw new Error(`Bad event for Mistral SSE aggregation`);
-  }
-}
+}

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

@@ -1,36 +1,9 @@
-export type SSEResponseTransformArgs<S = Record<string, any>> = {
+export type SSEResponseTransformArgs = {
   data: string;
   lastPosition: number;
   index: number;
   fallbackId: string;
   fallbackModel: string;
-  state?: S;
-};
-
-export type MistralChatCompletionEvent = {
-  choices: {
-    index: number;
-    message: { role: string; content: string };
-    stop_reason: string | null;
-  }[];
-};
-export type MistralTextCompletionEvent = {
-  outputs: { text: string; stop_reason: string | null }[];
-};
-export type MistralAIStreamEvent = {
-  "amazon-bedrock-invocationMetrics"?: {
-    inputTokenCount: number;
-    outputTokenCount: number;
-    invocationLatency: number;
-    firstByteLatency: number;
-  };
-} & (MistralChatCompletionEvent | MistralTextCompletionEvent);
-
-export type AnthropicV2StreamEvent = {
-  log_id?: string;
-  model?: string;
-  completion: string;
-  stop_reason: string | null;
 };
 
 export type OpenAIChatCompletionStreamEvent = {
@@ -43,29 +16,15 @@ export type OpenAIChatCompletionStreamEvent = {
     delta: { role?: string; content?: string };
     finish_reason: string | null;
   }[];
-};
+}
 
-export type StreamingCompletionTransformer<
-  T = OpenAIChatCompletionStreamEvent,
-  S = any,
-> = (params: SSEResponseTransformArgs<S>) => {
-  position: number;
-  event?: T;
-  state?: S;
-};
+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 { anthropicChatToAnthropicV2 } from "./transformers/anthropic-chat-to-anthropic-v2";
-export { anthropicChatToOpenAI } from "./transformers/anthropic-chat-to-openai";
-export { googleAIToOpenAI } from "./transformers/google-ai-to-openai";
-export { mistralAIToOpenAI } from "./transformers/mistral-ai-to-openai";
-export { mistralTextToMistralChat } from "./transformers/mistral-text-to-mistral-chat";
-export { passthroughToOpenAI } from "./transformers/passthrough-to-openai";
 export { mergeEventsForOpenAIChat } from "./aggregators/openai-chat";
 export { mergeEventsForOpenAIText } from "./aggregators/openai-text";
-export { mergeEventsForAnthropicText } from "./aggregators/anthropic-text";
-export { mergeEventsForAnthropicChat } from "./aggregators/anthropic-chat";
-export { mergeEventsForMistralChat } from "./aggregators/mistral-chat";
-export { mergeEventsForMistralText } from "./aggregators/mistral-text";
+export { mergeEventsForAnthropic } from "./aggregators/anthropic";

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

@@ -3,27 +3,27 @@ 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);
+  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 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;
+    case 'id':
+      event.id = value.trim()
+      break
+    case 'event':
+      event.type = value.trim()
+      break
+    case 'data':
+      event.data += value.trimStart()
+      break
     default:
-      break;
+      break
   }
 
-  return event;
-}
+  return event
+}

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

@@ -3,28 +3,22 @@ import { logger } from "../../../../logger";
 import { APIFormat } from "../../../../shared/key-management";
 import { assertNever } from "../../../../shared/utils";
 import {
-  anthropicChatToOpenAI,
-  anthropicChatToAnthropicV2,
   anthropicV1ToOpenAI,
-  AnthropicV2StreamEvent,
   anthropicV2ToOpenAI,
-  googleAIToOpenAI,
   OpenAIChatCompletionStreamEvent,
   openAITextToOpenAIChat,
-  mistralAIToOpenAI,
-  mistralTextToMistralChat,
-  passthroughToOpenAI,
   StreamingCompletionTransformer,
-  MistralChatCompletionEvent,
 } 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;
-  outputFormat?: APIFormat;
-  logger: typeof logger;
+  logger?: typeof logger;
 };
 
 /**
@@ -33,30 +27,21 @@ type SSEMessageTransformerOptions = TransformOptions & {
  */
 export class SSEMessageTransformer extends Transform {
   private lastPosition: number;
-  private transformState: any;
   private msgCount: number;
-  private readonly inputFormat: APIFormat;
-  private readonly transformFn: StreamingCompletionTransformer<
-    // TODO: Refactor transformers to not assume only OpenAI events as output
-    | OpenAIChatCompletionStreamEvent
-    | AnthropicV2StreamEvent
-    | MistralChatCompletionEvent
-  >;
+  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" });
+    this.log = options.logger?.child({ module: "sse-transformer" }) ?? genlog;
     this.lastPosition = 0;
     this.msgCount = 0;
     this.transformFn = getTransformer(
       options.inputFormat,
-      options.inputApiVersion,
-      options.outputFormat
+      options.inputApiVersion
     );
-    this.inputFormat = options.inputFormat;
     this.fallbackId = options.requestId;
     this.fallbackModel = options.requestedModel;
     this.log.debug(
@@ -72,92 +57,48 @@ export class SSEMessageTransformer extends Transform {
   _transform(chunk: Buffer, _encoding: BufferEncoding, callback: Function) {
     try {
       const originalMessage = chunk.toString();
-      const {
-        event: transformedMessage,
-        position: newPosition,
-        state,
-      } = this.transformFn({
-        data: originalMessage,
-        lastPosition: this.lastPosition,
-        index: this.msgCount++,
-        fallbackId: this.fallbackId,
-        fallbackModel: this.fallbackModel,
-        state: this.transformState,
-      });
+      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.transformState = state;
-
-      // Special case for Azure OpenAI, which is 99% the same as OpenAI but
-      // sometimes emits an extra event at the beginning of the stream with the
-      // content moderation system's response to the prompt. A lot of frontends
-      // don't expect this and neither does our event aggregator so we drop it.
-      if (this.inputFormat === "openai" && this.msgCount <= 1) {
-        if (originalMessage.includes("prompt_filter_results")) {
-          this.log.debug("Dropping Azure OpenAI content moderation SSE event");
-          return callback();
-        }
-      }
 
       this.emit("originalMessage", originalMessage);
 
       // Some events may not be transformed, e.g. ping events
       if (!transformedMessage) return callback();
 
-      if (this.msgCount === 1 && eventIsOpenAIEvent(transformedMessage)) {
-        // TODO: does this need to be skipped for passthroughToOpenAI?
+      if (this.msgCount === 1) {
         this.push(createInitialMessage(transformedMessage));
       }
       this.push(transformedMessage);
       callback();
     } catch (err) {
-      err.lastEvent = chunk?.toString();
       this.log.error(err, "Error transforming SSE message");
       callback(err);
     }
   }
 }
 
-function eventIsOpenAIEvent(
-  event: any
-): event is OpenAIChatCompletionStreamEvent {
-  return event?.object === "chat.completion.chunk";
-}
-
 function getTransformer(
   responseApi: APIFormat,
-  version?: string,
-  // In most cases, we are transforming back to OpenAI. Some responses can be
-  // translated between two non-OpenAI formats, eg Anthropic Chat -> Anthropic
-  // Text, or Mistral Text -> Mistral Chat.
-  requestApi: APIFormat = "openai"
-): StreamingCompletionTransformer<
-  | OpenAIChatCompletionStreamEvent
-  | AnthropicV2StreamEvent
-  | MistralChatCompletionEvent
-> {
+  version?: string
+): StreamingCompletionTransformer {
   switch (responseApi) {
     case "openai":
       return passthroughToOpenAI;
     case "openai-text":
       return openAITextToOpenAIChat;
-    case "anthropic-text":
+    case "anthropic":
       return version === "2023-01-01"
         ? anthropicV1ToOpenAI
         : anthropicV2ToOpenAI;
-    case "anthropic-chat":
-      return requestApi === "anthropic-text"
-        ? anthropicChatToAnthropicV2 // User's legacy text prompt was converted to chat, and response must be converted back to text
-        : anthropicChatToOpenAI;
-    case "google-ai":
-      return googleAIToOpenAI;
-    case "mistral-ai":
-      return mistralAIToOpenAI;
-    case "mistral-text":
-      return requestApi === "mistral-ai"
-        ? mistralTextToMistralChat // User's chat request was converted to text, and response must be converted back to chat
-        : mistralAIToOpenAI;
-    case "openai-image":
-      throw new Error(`SSE transformation not supported for ${responseApi}`);
+    case "google-palm":
+      throw new Error("Google PaLM does not support streaming responses");
     default:
       assertNever(responseApi);
   }