Give negative margin to account for border

2023-07-23 16:46:34 -07:00
99 changed files with 1161 additions and 3311 deletions
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -37,7 +37,6 @@ const config = {
      "warn",
      { vars: "all", varsIgnorePattern: "^_", args: "after-used", argsIgnorePattern: "^_" },
    ],
-    "react/no-unescaped-entities": "off",
  },
 };

--- a/.prettierignore
+++ b/.prettierignore
@@ -1,2 +1,2 @@
-*.schema.json
+src/codegen/openai.schema.json
 pnpm-lock.yaml
--- a/@types/nextjs-routes.d.ts
+++ b/@types/nextjs-routes.d.ts
@@ -13,13 +13,10 @@ declare module "nextjs-routes" {
  export type Route =
    | StaticRoute<"/account/signin">
    | DynamicRoute<"/api/auth/[...nextauth]", { "nextauth": string[] }>
-    | StaticRoute<"/api/experiments/og-image">
    | DynamicRoute<"/api/trpc/[trpc]", { "trpc": string }>
    | DynamicRoute<"/experiments/[id]", { "id": string }>
    | StaticRoute<"/experiments">
-    | StaticRoute<"/">
-    | StaticRoute<"/world-champs">
-    | StaticRoute<"/world-champs/signup">;
+    | StaticRoute<"/">;

  interface StaticRoute<Pathname> {
    pathname: Pathname;
--- a/README.md
+++ b/README.md
@@ -45,7 +45,6 @@ Natively supports [OpenAI function calls](https://openai.com/blog/function-calli

 - All models available through the OpenAI [chat completion API](https://platform.openai.com/docs/guides/gpt/chat-completions-api)
 - Llama2 [7b chat](https://replicate.com/a16z-infra/llama7b-v2-chat), [13b chat](https://replicate.com/a16z-infra/llama13b-v2-chat), [70b chat](https://replicate.com/replicate/llama70b-v2-chat).
- Anthropic's [Claude 1 Instant](https://www.anthropic.com/index/introducing-claude) and [Claude 2](https://www.anthropic.com/index/claude-2)

 ## Running Locally

--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
    "dev:next": "next dev",
    "dev:wss": "pnpm tsx --watch src/wss-server.ts",
    "dev:worker": "NODE_ENV='development' pnpm tsx --watch src/server/tasks/worker.ts",
-    "dev": "concurrently --kill-others 'pnpm dev:next' 'pnpm dev:wss' 'pnpm dev:worker'",
+    "dev": "concurrently --kill-others 'pnpm dev:next' 'pnpm dev:wss'",
    "postinstall": "prisma generate",
    "lint": "next lint",
    "start": "next start",
@@ -21,7 +21,6 @@
    "check": "concurrently 'pnpm lint' 'pnpm tsc' 'pnpm prettier . --check'"
  },
  "dependencies": {
-    "@anthropic-ai/sdk": "^0.5.8",
    "@apidevtools/json-schema-ref-parser": "^10.1.0",
    "@babel/preset-typescript": "^7.22.5",
    "@babel/standalone": "^7.22.9",
@@ -41,7 +40,6 @@
    "@trpc/next": "^10.26.0",
    "@trpc/react-query": "^10.26.0",
    "@trpc/server": "^10.26.0",
-    "@vercel/og": "^0.5.9",
    "ast-types": "^0.14.2",
    "chroma-js": "^2.4.2",
    "concurrently": "^8.2.0",
@@ -83,7 +81,6 @@
    "tsx": "^3.12.7",
    "type-fest": "^4.0.0",
    "use-query-params": "^2.2.1",
-    "uuid": "^9.0.0",
    "vite-tsconfig-paths": "^4.2.0",
    "zod": "^3.21.4",
    "zustand": "^4.3.9"
@@ -104,10 +101,8 @@
    "@types/react": "^18.2.6",
    "@types/react-dom": "^18.2.4",
    "@types/react-syntax-highlighter": "^15.5.7",
-    "@types/uuid": "^9.0.2",
    "@typescript-eslint/eslint-plugin": "^5.59.6",
    "@typescript-eslint/parser": "^5.59.6",
-    "csv-parse": "^5.4.0",
    "eslint": "^8.40.0",
    "eslint-config-next": "^13.4.2",
    "eslint-plugin-unused-imports": "^2.0.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,9 +5,6 @@ settings:
  excludeLinksFromLockfile: false

 dependencies:
-  '@anthropic-ai/sdk':
-    specifier: ^0.5.8
-    version: 0.5.8
  '@apidevtools/json-schema-ref-parser':
    specifier: ^10.1.0
    version: 10.1.0
@@ -65,9 +62,6 @@ dependencies:
  '@trpc/server':
    specifier: ^10.26.0
    version: 10.26.0
-  '@vercel/og':
-    specifier: ^0.5.9
-    version: 0.5.9
  ast-types:
    specifier: ^0.14.2
    version: 0.14.2
@@ -191,9 +185,6 @@ dependencies:
  use-query-params:
    specifier: ^2.2.1
    version: 2.2.1(react-dom@18.2.0)(react@18.2.0)
-  uuid:
-    specifier: ^9.0.0
-    version: 9.0.0
  vite-tsconfig-paths:
    specifier: ^4.2.0
    version: 4.2.0(typescript@5.0.4)
@@ -250,18 +241,12 @@ devDependencies:
  '@types/react-syntax-highlighter':
    specifier: ^15.5.7
    version: 15.5.7
-  '@types/uuid':
-    specifier: ^9.0.2
-    version: 9.0.2
  '@typescript-eslint/eslint-plugin':
    specifier: ^5.59.6
    version: 5.59.6(@typescript-eslint/parser@5.59.6)(eslint@8.40.0)(typescript@5.0.4)
  '@typescript-eslint/parser':
    specifier: ^5.59.6
    version: 5.59.6(eslint@8.40.0)(typescript@5.0.4)
-  csv-parse:
-    specifier: ^5.4.0
-    version: 5.4.0
  eslint:
    specifier: ^8.40.0
    version: 8.40.0
@@ -307,22 +292,6 @@ packages:
      '@jridgewell/gen-mapping': 0.3.3
      '@jridgewell/trace-mapping': 0.3.18

-  /@anthropic-ai/sdk@0.5.8:
-    resolution: {integrity: sha512-iHenjcE2Q/az6VZiP1DueOSvKNRmxsly6Rx2yjJBoy7OBYVFGVjEdgs2mPQHtTX0ibKAR7tPq6F6MQbKDPWcKg==}
-    dependencies:
-      '@types/node': 18.16.0
-      '@types/node-fetch': 2.6.4
-      abort-controller: 3.0.0
-      agentkeepalive: 4.3.0
-      digest-fetch: 1.3.0
-      form-data-encoder: 1.7.2
-      formdata-node: 4.4.1
-      node-fetch: 2.6.12
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: false
-
  /@apidevtools/json-schema-ref-parser@10.1.0:
    resolution: {integrity: sha512-3e+viyMuXdrcK8v5pvP+SDoAQ77FH6OyRmuK48SZKmdHJRFm87RsSs8qm6kP39a/pOPURByJw+OXzQIqcfmKtA==}
    engines: {node: '>= 16'}
@@ -2656,24 +2625,10 @@ packages:
    resolution: {integrity: sha512-PDNlhP/1vyTgmNyiucGqGCdXIp7HIkkvKO50si3y3PcceeHvqtiKPaH1iJdz63jCWMVMbj2MElSxXPOeBvEVIQ==}
    requiresBuild: true

-  /@resvg/resvg-wasm@2.4.1:
-    resolution: {integrity: sha512-yi6R0HyHtsoWTRA06Col4WoDs7SvlXU3DLMNP2bdAgs7HK18dTEVl1weXgxRzi8gwLteGUbIg29zulxIB3GSdg==}
-    engines: {node: '>= 10'}
-    dev: false
-
  /@rushstack/eslint-patch@1.3.2:
    resolution: {integrity: sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw==}
    dev: true

-  /@shuding/opentype.js@1.4.0-beta.0:
-    resolution: {integrity: sha512-3NgmNyH3l/Hv6EvsWJbsvpcpUba6R8IREQ83nH83cyakCw7uM1arZKNfHwv1Wz6jgqrF/j4x5ELvR6PnK9nTcA==}
-    engines: {node: '>= 8.0.0'}
-    hasBin: true
-    dependencies:
-      fflate: 0.7.4
-      string.prototype.codepointat: 0.2.1
-    dev: false
-
  /@sinclair/typebox@0.27.8:
    resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
    dev: true
@@ -3069,10 +3024,6 @@ packages:
    resolution: {integrity: sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==}
    dev: false

-  /@types/uuid@9.0.2:
-    resolution: {integrity: sha512-kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ==}
-    dev: true
-
  /@typescript-eslint/eslint-plugin@5.59.6(@typescript-eslint/parser@5.59.6)(eslint@8.40.0)(typescript@5.0.4):
    resolution: {integrity: sha512-sXtOgJNEuRU5RLwPUb1jxtToZbgvq3M6FPpY4QENxoOggK+UpTxUBpj6tD8+Qh2g46Pi9We87E+eHnUw8YcGsw==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -3203,15 +3154,6 @@ packages:
      eslint-visitor-keys: 3.4.1
    dev: true

-  /@vercel/og@0.5.9:
-    resolution: {integrity: sha512-CtjaV/BVHtNCjRtxGqn8Q6AKFLqcG34Byxr91+mY+4eqyp/09LVe9jEeY9WXjbaKvu8syWPMteTpY+YQUQYzSg==}
-    engines: {node: '>=16'}
-    dependencies:
-      '@resvg/resvg-wasm': 2.4.1
-      satori: 0.10.1
-      yoga-wasm-web: 0.3.3
-    dev: false
-
  /@vitest/expect@0.33.0:
    resolution: {integrity: sha512-sVNf+Gla3mhTCxNJx+wJLDPp/WcstOe0Ksqz4Vec51MmgMth/ia0MGFEkIZmVGeTL5HtjYR4Wl/ZxBxBXZJTzQ==}
    dependencies:
@@ -3658,11 +3600,6 @@ packages:
    resolution: {integrity: sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA==}
    dev: false

-  /base64-js@0.0.8:
-    resolution: {integrity: sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==}
-    engines: {node: '>= 0.4'}
-    dev: false
-
  /base64-js@1.5.1:
    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
    dev: false
@@ -3784,10 +3721,6 @@ packages:
    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
    engines: {node: '>=6'}

-  /camelize@1.0.1:
-    resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==}
-    dev: false
-
  /caniuse-lite@1.0.30001517:
    resolution: {integrity: sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==}

@@ -4056,33 +3989,12 @@ packages:
    resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
    dev: false

-  /css-background-parser@0.1.0:
-    resolution: {integrity: sha512-2EZLisiZQ+7m4wwur/qiYJRniHX4K5Tc9w93MT3AS0WS1u5kaZ4FKXlOTBhOjc+CgEgPiGY+fX1yWD8UwpEqUA==}
-    dev: false
-
  /css-box-model@1.2.1:
    resolution: {integrity: sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==}
    dependencies:
      tiny-invariant: 1.3.1
    dev: false

-  /css-box-shadow@1.0.0-3:
-    resolution: {integrity: sha512-9jaqR6e7Ohds+aWwmhe6wILJ99xYQbfmK9QQB9CcMjDbTxPZjwEmUQpU91OG05Xgm8BahT5fW+svbsQGjS/zPg==}
-    dev: false
-
-  /css-color-keywords@1.0.0:
-    resolution: {integrity: sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==}
-    engines: {node: '>=4'}
-    dev: false
-
-  /css-to-react-native@3.2.0:
-    resolution: {integrity: sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==}
-    dependencies:
-      camelize: 1.0.1
-      css-color-keywords: 1.0.0
-      postcss-value-parser: 4.2.0
-    dev: false
-
  /csstype@2.6.21:
    resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
    dev: false
@@ -4090,10 +4002,6 @@ packages:
  /csstype@3.1.2:
    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}

-  /csv-parse@5.4.0:
-    resolution: {integrity: sha512-JiQosUWiOFgp4hQn0an+SBoV9IKdqzhROM0iiN4LB7UpfJBlsSJlWl9nq4zGgxgMAzHJ6V4t29VAVD+3+2NJAg==}
-    dev: true
-
  /d@1.0.1:
    resolution: {integrity: sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==}
    dependencies:
@@ -4287,10 +4195,6 @@ packages:
  /electron-to-chromium@1.4.465:
    resolution: {integrity: sha512-XQcuHvEJRMU97UJ75e170mgcITZoz0lIyiaVjk6R+NMTJ8KBIvUHYd1779swgOppUlzxR+JsLpq59PumaXS1jQ==}

-  /emoji-regex@10.2.1:
-    resolution: {integrity: sha512-97g6QgOk8zlDRdgq1WxwgTMgEWGVAQvB5Fdpgc1MkNy56la5SKP9GsMXKDOdqwn90/41a8yPwIGk1Y6WVbeMQA==}
-    dev: false
-
  /emoji-regex@8.0.0:
    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
    dev: false
@@ -5006,10 +4910,6 @@ packages:
    resolution: {integrity: sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==}
    dev: false

-  /fflate@0.7.4:
-    resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==}
-    dev: false
-
  /file-entry-cache@6.0.1:
    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
    engines: {node: ^10.12.0 || >=12.0.0}
@@ -5395,11 +5295,6 @@ packages:
      space-separated-tokens: 1.1.5
    dev: false

-  /hex-rgb@4.3.0:
-    resolution: {integrity: sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw==}
-    engines: {node: '>=6'}
-    dev: false
-
  /highlight.js@10.7.3:
    resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
    dev: false
@@ -5865,13 +5760,6 @@ packages:
      type-check: 0.4.0
    dev: true

-  /linebreak@1.1.0:
-    resolution: {integrity: sha512-MHp03UImeVhB7XZtjd0E4n6+3xr5Dq/9xI/5FptGk5FrbDR3zagPa2DS6U8ks/3HjbKWG9Q1M2ufOzxV2qLYSQ==}
-    dependencies:
-      base64-js: 0.0.8
-      unicode-trie: 2.0.0
-    dev: false
-
  /lines-and-columns@1.2.4:
    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
    dev: false
@@ -6476,23 +6364,12 @@ packages:
    resolution: {integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==}
    dev: false

-  /pako@0.2.9:
-    resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}
-    dev: false
-
  /parent-module@1.0.1:
    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
    engines: {node: '>=6'}
    dependencies:
      callsites: 3.1.0

-  /parse-css-color@0.2.1:
-    resolution: {integrity: sha512-bwS/GGIFV3b6KS4uwpzCFj4w297Yl3uqnSgIPsoQkx7GMLROXfMnWvxfNkL0oh8HVhZA4hvJoEoEIqonfJ3BWg==}
-    dependencies:
-      color-name: 1.1.4
-      hex-rgb: 4.3.0
-    dev: false
-
  /parse-entities@2.0.0:
    resolution: {integrity: sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==}
    dependencies:
@@ -6659,10 +6536,6 @@ packages:
    engines: {node: '>=4'}
    dev: false

-  /postcss-value-parser@4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
-    dev: false
-
  /postcss@8.4.14:
    resolution: {integrity: sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==}
    engines: {node: ^10 || ^12 || >=14}
@@ -7239,22 +7112,6 @@ packages:
    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
    dev: false

-  /satori@0.10.1:
-    resolution: {integrity: sha512-F4bTCkDp931tLb7+UCNPBuSQwXhikrUkI4fBQo6fA8lF0Evqqgg3nDyUpRktQpR5Ry1DIiIVqLyEwkAms87ykg==}
-    engines: {node: '>=16'}
-    dependencies:
-      '@shuding/opentype.js': 1.4.0-beta.0
-      css-background-parser: 0.1.0
-      css-box-shadow: 1.0.0-3
-      css-to-react-native: 3.2.0
-      emoji-regex: 10.2.1
-      escape-html: 1.0.3
-      linebreak: 1.1.0
-      parse-css-color: 0.2.1
-      postcss-value-parser: 4.2.0
-      yoga-wasm-web: 0.3.3
-    dev: false
-
  /scheduler@0.23.0:
    resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==}
    dependencies:
@@ -7482,10 +7339,6 @@ packages:
      strip-ansi: 6.0.1
    dev: false

-  /string.prototype.codepointat@0.2.1:
-    resolution: {integrity: sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg==}
-    dev: false
-
  /string.prototype.matchall@4.0.8:
    resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==}
    dependencies:
@@ -7712,10 +7565,6 @@ packages:
      globrex: 0.1.2
    dev: true

-  /tiny-inflate@1.0.3:
-    resolution: {integrity: sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==}
-    dev: false
-
  /tiny-invariant@1.3.1:
    resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
    dev: false
@@ -7922,13 +7771,6 @@ packages:
      busboy: 1.6.0
    dev: true

-  /unicode-trie@2.0.0:
-    resolution: {integrity: sha512-x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ==}
-    dependencies:
-      pako: 0.2.9
-      tiny-inflate: 1.0.3
-    dev: false
-
  /unpipe@1.0.0:
    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
    engines: {node: '>= 0.8'}
@@ -8071,11 +7913,6 @@ packages:
    hasBin: true
    dev: false

-  /uuid@9.0.0:
-    resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
-    hasBin: true
-    dev: false
-
  /vary@1.1.2:
    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
    engines: {node: '>= 0.8'}
@@ -8434,10 +8271,6 @@ packages:
    engines: {node: '>=12.20'}
    dev: true

-  /yoga-wasm-web@0.3.3:
-    resolution: {integrity: sha512-N+d4UJSJbt/R3wqY7Coqs5pcV0aUj2j9IaQ3rNj9bVCLld8tTGKRa2USARjnvZJWVx1NDmQev8EknoczaOQDOA==}
-    dev: false
-
  /zod@3.21.4:
    resolution: {integrity: sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==}
    dev: false
--- a/prisma/datasets/validated_tweets.csv
+++ b/prisma/datasets/validated_tweets.csv
@@ -1,84 +0,0 @@
-Text,sentiment,emotion
-@dell your customer service is horrible especially agent syedfaisal who has made this experience of purchasing a new computer downright awful and I’ll reconsider ever buying a Dell in the future @DellTech,negative,anger
-@zacokalo @Dell @DellCares @Dell give the man what he paid for!,neutral,anger
-"COOKING STREAM DAY!!! Ty to @Alienware for sponsoring this stream! I’ll be making a bunch of Japanese Alien themed foods hehe 
-
-Come check it out! https://t.co/m06tJQ06zk 
-
-#alienwarepartner #intelgaming @Dell @IntelGaming https://t.co/qOdQX2E8VD",positive,joy
-@emijuju_ @Alienware @Dell @intel Beautiful 😍❤️😻,positive,joy
-"What's your biggest data management challenge?     • Cloud complexity?   • Lengthy tech refresh cycles?   • Capital budget constraints?      Solve your challenges with as-a-Storage. Get simplicity, agility &amp; control with @Dell #APEX. https://t.co/mCblMtH931 https://t.co/eepKNZ4Ai3",neutral,optimism
-"This week we were at the ""Top Gun"" themed @Dell Product Expo. Eddie Muñoz met Maverick look-alike, California Tom Cruise (Jerome LeBlanc)!
-
-""I feel the need, the need for speed."" - Maverick
-#topgun #topgunmaverick #dell #delltechnologies #lockncharge https://t.co/QHYH2EbMjq",positive,joy
-"Itsss been more than a week...i m following up with dell for troubleshootings...my https://t.co/lWhg2YKhQa suffering so as my hard earned money...hightly disappointed...contd..
-@DellCares @Dell",negative,sadness
-"@ashu_k7 @Dell Pathetic!!!!! I Dont mind taking legal action, this is deficency of service for which the customer is nt getting help..",negative,anger
-@ashu_k7 @Dell Making life unhappy is the new tag line of #Dell,negative,sadness
-"@Dell If you are buying a Dell, make sure you are making your life hell.
-Better buy other laptops. If you wanted to opt for Dell better opt for garbage on the streets.",negative,anger
-"MY DESK'S FINAL FORM? Seriously, I'm finally happy with my monitor setup here... and I'll keep this setup whenever I move... FOREVER. What do you think?
-https://t.co/WJZ2JXtOnX
-@Alienware @Dell cheers. https://t.co/6Whhldfpv0",positive,joy
-"@Dell Dell Alienware computer has had software problems with SupportAssist since purchase.  Dell, despite paying for Premium Support, has never fixed issues.  Latest solution was to erase everything and reload....SupportAssist still doesn't work.",negative,anger
-"HUGE congratulations to Startup Battle 3.0 winner ➡️ @Ox_Fulfillment x @cyborgcharu for being featured in @BusinessInsider &amp; @Dell showcasing the journey at Ox! 🚀🚀🚀
-
-We love to see our portfolio companies continuing to BUILD SOMETHING FROM NOTHING! 🔥 https://t.co/awBkn5ippB",positive,joy
-@Dell happy Friday!,positive,joy
-"@intel Core i5 1135G7 - 4732 points
-@intel Core i5 1235 - 6619 points 
-@Dell Latitude 5420 x 5430.
-Cinebench R23. Good job Intel!",positive,joy
-@Dell india we purchased 52 docking station and we have around 100 users using dell laptop as well as dell monitor now they are refusing to replace my faulty product and disconnecting my every call....,negative,anger
-"It's another year ans another day But cant fill it in yet the child hood dreams.
-It's my birthdy today. Can anyone of you guys bless me with  a simplest gaming oc that can run 
-@DOTA2 ?
-@Dell @HP @VastGG @Acer @Alienware @Lenovo @toshiba @IBM @Fujitsu_Global @NEC https://t.co/69G8tL9sN8",neutral,joy
-"@idoccor @Dell That's always the decision—wait, or, look elsewhere. In this case, I think I unfortunately need to wait since there are only two monitors with these specs and I don't like the other one 😂",negative,sadness
-"@MichaelDell @Dell @DellCares For how long this will continue. It is high time you either fix the problem for good or replace the complete laptop. Spent over 60+ hours with Customer Care teams, which is not helping. Cannot keep going on like this.",negative,anger
-"@Dell @DellCares but no, not really",neutral,sadness
-"Business innovation requires insight, agility and efficiency. How do you get there? RP PRO, LLC recommends starting by proactively managing IT infrastructure with #OpenManage Systems from @Dell. https://t.co/fBcK1lfFMu https://t.co/xWHLkkHCjn",neutral,optimism
-@Dell Yessirrrrr #NationalCoffeeDay,positive,joy
-"New blog post from @Dell shared on https://t.co/EgfPChB8AT 
-
-Re-routing Our Connected and Autonomous Future https://t.co/AW8EHQrbd6
-
-#future #futuretech #techinnovation https://t.co/koX8stKPsr",neutral,joy
-"In a free-market economy, the folks @IronMountain can set prices as they see fit. Their customers are also free to find better prices at competitors like @Dell 
-@H3CGlobal @HPE
-https://t.co/reZ56DNTBI",neutral,optimism
-"Delighted to chat with many of our partners here in person at @Intel Innovation! @Dell, @Lenovo, @Supermicro_SMCI, @QuantaQCT #IntelON https://t.co/BxIeGW8deN",positive,joy
-"A special gracias to our Startup Chica San Antonio 2022 sponsors @eBay, @jcpenney, @Barbie, @HEB, @Dell, @Honda, @SouthsideSATX💜✨ https://t.co/lZ6WWkziHl",positive,joy
-"When your team decides to start supporting developers, your #ops must change too. More from @cote and @Dell Developer Community Manager @barton808: https://t.co/W6f1oMiTgV",neutral,optimism
-@EmDStowers @LASERGIANT1 @ohwormongod @Ludovician_Vega @Dell our boy snitchin,neutral,anger
-A 1st place dmi:Design Value Award goes to @Dell for a packaging modernization initiative that helped them get closer to their corporate Moonshot Sustainability Goal of 100% recycled or renewable packaging by 2030. More at https://t.co/dnhZWWLCQC #designvalue #DVA22,positive,optimism
-Reducing deployment and maintenance complexity is the goal behind @dell and @WindRiver's new collaboration. https://t.co/2PxQgPuHUU,positive,optimism
-@jaserhunter @Dell Love the sales pitch lol,positive,joy
-@Dell india we purchased 52 docking station and we have around 100 users using dell laptop as well as dell monitor now they are refusing to replace my faulty product and disconnecting my every call....,negative,anger
-@ashu_k7 @Dell One more example.. their technical support is also worse. https://t.co/20atSgI4fg,negative,anger
-*angry screeches about @Dell proprietary MBR windows 8.1 partitions not being able to save as an img in clonezilla *,negative,anger
-@socialitebooks @BBYC_Gamers @Dell @Alienware @BestBuyCanada @intelcanada Congratulations!!!,positive,joy
-"Thank you to the @dell team for coming out to volunteer today! We truly appreciate your hard work and look forward to seeing you again soon!
-
-If you and your team are interested in helping out at the UMLAUF, visit our website for more information: https://t.co/lVfsZT2ogS https://t.co/eLz0FY0y4M",positive,joy
-"@TheCaramelGamer @intel @bravadogaming @Intel_Africa @Dell @DellTech @DellTechMEA @Alienware @IntelUK we love to see it. 
-
-Also also actually actually whoever did that artwork? 🔥🔥🔥 am a fan.",positive,joy
-"LOVING MY DELL 2 IN 1 LAPTOP
-YAYY 🥳🥳
-@Dell #DellInspiron #DellLaptop https://t.co/vib96jf3tC",positive,joy
-@Azure @OracleItalia @AWS_Italy @lenovoitalia @Dell discussing the future of #HPC during the #hpcroundtable22 in Turin today #highperformancecomputing https://t.co/jJ1WqBulPF,neutral,joy
-Attracting talent @AmericanChamber. @marg_cola @Dell speaks of quality of life connectivity and the Opportunity for development being so crucial. Housing  availability is now impacting on decision making for potential candidates. #WhyCork,positive,optimism
-.@Dell partners with @WindRiver on modular cloud-native telecommunications infrastructure https://t.co/4SWATspwCP @SiliconANGLE @Mike_Wheatley @holgermu @constellationr,neutral,joy
-@Dell Not buy Dell Inspiron laptop,neutral,sadness
-"@dell #delltechforum reminding us IDC have predicted that by 2024, 50% of everything we consume in technology will be as a service https://t.co/3UBiZJX0LE",neutral,optimism
-@RachMurph @HETTShow @Dell Thank you for coming! Great evening,positive,joy
-Congratulations to Jason M of Moncton NB on winning a @Dell  @Alienware m15 R7 15.6″ gaming laptop from @BestBuyCanada and @intelcanada's gaming days #contest on the blog. Visit https://t.co/VryaY5Rvv9 to learn about tech and for chances to win new tech. https://t.co/T6n0dzF6oL,positive,joy
-@MattVisiwig @Dell Sour taste for sure 😶 But don't let ego distract you from what you really want to buy 😁,neutral,optimism
-"Massive thank you goes to sponsors @HendersonLoggie @lindsaysnews @Dell @unity, all of our fantastic judges and mentors and the team at @EGX and @ExCeLLondon. 
-
-Big congratulations also to all of our other @AbertayDare teams - an amazing year! #Dare2022 https://t.co/jYe4agO7lW",positive,joy
-"@timetcetera @rahaug Nah, I just need @Dell to start paying me comissions 😂",neutral,joy
-"""Whether you’re an engineer, a designer, or work in supply chain management or sales, there are always opportunities to think about sustainability and how you can do things more efficiently."" 👏 — Oliver Campbell, Director of Packaging Engineering, @Dell https://t.co/vUJLTWNFwP https://t.co/GJWAzGfAxJ",positive,optimism
-"Hi, my name is @listerepvp and I support @Dell, always.",positive,joy
--- a/prisma/migrations/20230725005817_use_id_as_streaming_channel/migration.sql
+++ b/prisma/migrations/20230725005817_use_id_as_streaming_channel/migration.sql
@@ -1,8 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to drop the column `streamingChannel` on the `ScenarioVariantCell` table. All the data in the column will be lost.
-
-*/
-- AlterTable
-ALTER TABLE "ScenarioVariantCell" DROP COLUMN "streamingChannel";
--- a/prisma/migrations/20230725191512_migrate_model_response/migration.sql
+++ b/prisma/migrations/20230725191512_migrate_model_response/migration.sql
@@ -1,52 +0,0 @@
-- DropForeignKey
-ALTER TABLE "ModelOutput" DROP CONSTRAINT "ModelOutput_scenarioVariantCellId_fkey";
-
-- DropForeignKey
-ALTER TABLE "OutputEvaluation" DROP CONSTRAINT "OutputEvaluation_modelOutputId_fkey";
-
-- DropIndex
-DROP INDEX "OutputEvaluation_modelOutputId_evaluationId_key";
-
-- AlterTable
-ALTER TABLE "OutputEvaluation" RENAME COLUMN "modelOutputId" TO "modelResponseId";
-
-- AlterTable
-ALTER TABLE "ScenarioVariantCell" DROP COLUMN "retryTime",
-DROP COLUMN "statusCode",
-ADD COLUMN     "jobQueuedAt" TIMESTAMP(3),
-ADD COLUMN     "jobStartedAt" TIMESTAMP(3);
-
-ALTER TABLE "ModelOutput" RENAME TO "ModelResponse";
-
-ALTER TABLE "ModelResponse" 
-ADD COLUMN "requestedAt" TIMESTAMP(3),
-ADD COLUMN "receivedAt" TIMESTAMP(3),
-ADD COLUMN "statusCode" INTEGER,
-ADD COLUMN "errorMessage" TEXT,
-ADD COLUMN "retryTime" TIMESTAMP(3),
-ADD COLUMN "outdated" BOOLEAN NOT NULL DEFAULT false;
-
-- 3. Remove the unnecessary column
-ALTER TABLE "ModelResponse"
-DROP COLUMN "timeToComplete";
-
-- AlterTable
-ALTER TABLE "ModelResponse" RENAME CONSTRAINT "ModelOutput_pkey" TO "ModelResponse_pkey";
-ALTER TABLE "ModelResponse" ALTER COLUMN "output" DROP NOT NULL;
-
-- DropIndex
-DROP INDEX "ModelOutput_scenarioVariantCellId_key";
-
-- AddForeignKey
-ALTER TABLE "ModelResponse" ADD CONSTRAINT "ModelResponse_scenarioVariantCellId_fkey" FOREIGN KEY ("scenarioVariantCellId") REFERENCES "ScenarioVariantCell"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
-- RenameIndex
-ALTER INDEX "ModelOutput_inputHash_idx" RENAME TO "ModelResponse_inputHash_idx";
-
-- CreateIndex
-CREATE UNIQUE INDEX "OutputEvaluation_modelResponseId_evaluationId_key" ON "OutputEvaluation"("modelResponseId", "evaluationId");
-
-- AddForeignKey
-ALTER TABLE "OutputEvaluation" ADD CONSTRAINT "OutputEvaluation_modelResponseId_fkey" FOREIGN KEY ("modelResponseId") REFERENCES "ModelResponse"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
-
--- a/prisma/migrations/20230801195916_add_world_champs/migration.sql
+++ b/prisma/migrations/20230801195916_add_world_champs/migration.sql
@@ -1,16 +0,0 @@
-- CreateTable
-CREATE TABLE "WorldChampEntrant" (
-    "id" UUID NOT NULL,
-    "userId" UUID NOT NULL,
-    "approved" BOOLEAN NOT NULL DEFAULT false,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "WorldChampEntrant_pkey" PRIMARY KEY ("id")
-);
-
-- CreateIndex
-CREATE UNIQUE INDEX "WorldChampEntrant_userId_key" ON "WorldChampEntrant"("userId");
-
-- AddForeignKey
-ALTER TABLE "WorldChampEntrant" ADD CONSTRAINT "WorldChampEntrant_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
--- a/prisma/migrations/20230801234208_add_created_at_and_updated_at_to_users_table/migration.sql
+++ b/prisma/migrations/20230801234208_add_created_at_and_updated_at_to_users_table/migration.sql
@@ -1,3 +0,0 @@
-- AlterTable
-ALTER TABLE "User" ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -22,10 +22,10 @@ model Experiment {
    createdAt DateTime @default(now())
    updatedAt DateTime @updatedAt

-    templateVariables TemplateVariable[]
-    promptVariants    PromptVariant[]
-    testScenarios     TestScenario[]
-    evaluations       Evaluation[]
+    TemplateVariable TemplateVariable[]
+    PromptVariant    PromptVariant[]
+    TestScenario     TestScenario[]
+    Evaluation       Evaluation[]
 }

 model PromptVariant {
@@ -90,11 +90,13 @@ enum CellRetrievalStatus {
 model ScenarioVariantCell {
    id String @id @default(uuid()) @db.Uuid

+    statusCode       Int?
+    errorMessage     String?
+    retryTime        DateTime?
+    streamingChannel String?
    retrievalStatus  CellRetrievalStatus @default(COMPLETE)
-    jobQueuedAt     DateTime?
-    jobStartedAt    DateTime?
-    modelResponses  ModelResponse[]
-    errorMessage    String? // Contains errors that occurred independently of model responses
+
+    modelOutput ModelOutput?

    promptVariantId String        @db.Uuid
    promptVariant   PromptVariant @relation(fields: [promptVariantId], references: [id], onDelete: Cascade)
@@ -109,28 +111,24 @@ model ScenarioVariantCell {
    @@unique([promptVariantId, testScenarioId])
 }

-model ModelResponse {
+model ModelOutput {
    id String @id @default(uuid()) @db.Uuid

    inputHash        String
-    requestedAt      DateTime?
-    receivedAt       DateTime?
-    output           Json?
+    output           Json
+    timeToComplete   Int    @default(0)
    cost             Float?
    promptTokens     Int?
    completionTokens Int?
-    statusCode       Int?
-    errorMessage     String?
-    retryTime        DateTime?
-    outdated         Boolean   @default(false)

    createdAt DateTime @default(now())
    updatedAt DateTime @updatedAt

    scenarioVariantCellId String              @db.Uuid
    scenarioVariantCell   ScenarioVariantCell @relation(fields: [scenarioVariantCellId], references: [id], onDelete: Cascade)
-    outputEvaluations     OutputEvaluation[]
+    outputEvaluation      OutputEvaluation[]

+    @@unique([scenarioVariantCellId])
    @@index([inputHash])
 }

@@ -152,7 +150,7 @@ model Evaluation {

    createdAt        DateTime           @default(now())
    updatedAt        DateTime           @updatedAt
-    outputEvaluations OutputEvaluation[]
+    OutputEvaluation OutputEvaluation[]
 }

 model OutputEvaluation {
@@ -162,8 +160,8 @@ model OutputEvaluation {
    result  Float
    details String?

-    modelResponseId String        @db.Uuid
-    modelResponse   ModelResponse @relation(fields: [modelResponseId], references: [id], onDelete: Cascade)
+    modelOutputId String      @db.Uuid
+    modelOutput   ModelOutput @relation(fields: [modelOutputId], references: [id], onDelete: Cascade)

    evaluationId String     @db.Uuid
    evaluation   Evaluation @relation(fields: [evaluationId], references: [id], onDelete: Cascade)
@@ -171,7 +169,7 @@ model OutputEvaluation {
    createdAt DateTime @default(now())
    updatedAt DateTime @updatedAt

-    @@unique([modelResponseId, evaluationId])
+    @@unique([modelOutputId, evaluationId])
 }

 model Organization {
@@ -181,8 +179,8 @@ model Organization {

    createdAt        DateTime           @default(now())
    updatedAt        DateTime           @updatedAt
-    organizationUsers OrganizationUser[]
-    experiments       Experiment[]
+    OrganizationUser OrganizationUser[]
+    Experiment       Experiment[]
 }

 enum OrganizationUserRole {
@@ -208,20 +206,6 @@ model OrganizationUser {
    @@unique([organizationId, userId])
 }

-model WorldChampEntrant {
-    id String @id @default(uuid()) @db.Uuid
-
-    userId String @db.Uuid
-    user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
-
-    approved Boolean @default(false)
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
-
-    @@unique([userId])
-}
-
 model Account {
    id                       String  @id @default(uuid()) @db.Uuid
    userId                   String  @db.Uuid
@@ -257,12 +241,8 @@ model User {
    image            String?
    accounts         Account[]
    sessions         Session[]
-    organizationUsers OrganizationUser[]
-    organizations     Organization[]
-    worldChampEntrant WorldChampEntrant?
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @default(now()) @updatedAt
+    OrganizationUser OrganizationUser[]
+    Organization     Organization[]
 }

 model VerificationToken {
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
@@ -164,5 +164,5 @@ await Promise.all(
        testScenarioId: scenario.id,
      })),
    )
-    .map((cell) => generateNewCell(cell.promptVariantId, cell.testScenarioId, { stream: false })),
+    .map((cell) => generateNewCell(cell.promptVariantId, cell.testScenarioId)),
 );
--- a/prisma/seedAgiEval.ts
+++ b/prisma/seedAgiEval.ts
@@ -1,127 +0,0 @@
-import { prisma } from "~/server/db";
-import { generateNewCell } from "~/server/utils/generateNewCell";
-import dedent from "dedent";
-import { execSync } from "child_process";
-import fs from "fs";
-
-const defaultId = "11111111-1111-1111-1111-111111111112";
-
-await prisma.organization.deleteMany({
-  where: { id: defaultId },
-});
-
-// If there's an existing org, just seed into it
-const org =
-  (await prisma.organization.findFirst({})) ??
-  (await prisma.organization.create({
-    data: { id: defaultId },
-  }));
-
-// Clone the repo from git@github.com:microsoft/AGIEval.git into a tmp dir if it doesn't exist
-const tmpDir = "/tmp/agi-eval";
-if (!fs.existsSync(tmpDir)) {
-  execSync(`git clone git@github.com:microsoft/AGIEval.git ${tmpDir}`);
-}
-
-const datasets = [
-  "sat-en",
-  "sat-math",
-  "lsat-rc",
-  "lsat-ar",
-  "aqua-rat",
-  "logiqa-en",
-  "lsat-lr",
-  "math",
-];
-
-type Scenario = {
-  passage: string | null;
-  question: string;
-  options: string[] | null;
-  label: string;
-};
-
-for (const dataset of datasets) {
-  const experimentName = `AGI-Eval: ${dataset}`;
-  const oldExperiment = await prisma.experiment.findFirst({
-    where: {
-      label: experimentName,
-      organizationId: org.id,
-    },
-  });
-  if (oldExperiment) {
-    await prisma.experiment.deleteMany({
-      where: { id: oldExperiment.id },
-    });
-  }
-
-  const experiment = await prisma.experiment.create({
-    data: {
-      id: oldExperiment?.id ?? undefined,
-      label: experimentName,
-      organizationId: org.id,
-    },
-  });
-
-  const scenarios: Scenario[] = fs
-    .readFileSync(`${tmpDir}/data/v1/${dataset}.jsonl`, "utf8")
-    .split("\n")
-    .filter((line) => line.length > 0)
-    .map((line) => JSON.parse(line) as Scenario);
-  console.log("scenarios", scenarios.length);
-
-  await prisma.testScenario.createMany({
-    data: scenarios.slice(0, 30).map((scenario, i) => ({
-      experimentId: experiment.id,
-      sortIndex: i,
-      variableValues: {
-        passage: scenario.passage,
-        question: scenario.question,
-        options: scenario.options?.join("\n"),
-        label: scenario.label,
-      },
-    })),
-  });
-
-  await prisma.templateVariable.createMany({
-    data: ["passage", "question", "options", "label"].map((label) => ({
-      experimentId: experiment.id,
-      label,
-    })),
-  });
-
-  await prisma.promptVariant.createMany({
-    data: [
-      {
-        experimentId: experiment.id,
-        label: "Prompt Variant 1",
-        sortIndex: 0,
-        model: "gpt-3.5-turbo-0613",
-        modelProvider: "openai/ChatCompletion",
-        constructFnVersion: 1,
-        constructFn: dedent`
-          definePrompt("openai/ChatCompletion", {
-            model: "gpt-3.5-turbo-0613",
-            messages: [
-              {
-                role: "user",
-                content: \`Passage: ${"$"}{scenario.passage}\n\nQuestion: ${"$"}{scenario.question}\n\nOptions: ${"$"}{scenario.options}\n\n Respond with just the letter of the best option in the format Answer: (A).\`
-              }
-            ],
-            temperature: 0,
-          })`,
-      },
-    ],
-  });
-
-  await prisma.evaluation.createMany({
-    data: [
-      {
-        experimentId: experiment.id,
-        label: "Eval",
-        evalType: "CONTAINS",
-        value: "Answer: ({{label}})",
-      },
-    ],
-  });
-}
--- a/prisma/seedTwitterSentiment.ts
+++ b/prisma/seedTwitterSentiment.ts
@@ -1,113 +0,0 @@
-import { prisma } from "~/server/db";
-import dedent from "dedent";
-import fs from "fs";
-import { parse } from "csv-parse/sync";
-
-const defaultId = "11111111-1111-1111-1111-111111111112";
-
-await prisma.organization.deleteMany({
-  where: { id: defaultId },
-});
-
-// If there's an existing org, just seed into it
-const org =
-  (await prisma.organization.findFirst({})) ??
-  (await prisma.organization.create({
-    data: { id: defaultId },
-  }));
-
-type Scenario = {
-  text: string;
-  sentiment: string;
-  emotion: string;
-};
-
-const experimentName = `Twitter Sentiment Analysis`;
-const oldExperiment = await prisma.experiment.findFirst({
-  where: {
-    label: experimentName,
-    organizationId: org.id,
-  },
-});
-if (oldExperiment) {
-  await prisma.experiment.deleteMany({
-    where: { id: oldExperiment.id },
-  });
-}
-
-const experiment = await prisma.experiment.create({
-  data: {
-    id: oldExperiment?.id ?? undefined,
-    label: experimentName,
-    organizationId: org.id,
-  },
-});
-
-const content = fs.readFileSync("./prisma/datasets/validated_tweets.csv", "utf8");
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const records: any[] = parse(content, { delimiter: ",", from_line: 2 });
-
-console.log("records", records);
-
-const scenarios: Scenario[] = records.map((row) => ({
-  text: row[0],
-  sentiment: row[1],
-  emotion: row[2],
-}));
-
-console.log("scenarios", scenarios.length);
-
-await prisma.testScenario.createMany({
-  data: scenarios.slice(0, 30).map((scenario, i) => ({
-    experimentId: experiment.id,
-    sortIndex: i,
-    variableValues: {
-      text: scenario.text,
-      sentiment: scenario.sentiment,
-      emotion: scenario.emotion,
-    },
-  })),
-});
-
-await prisma.templateVariable.createMany({
-  data: ["text", "sentiment", "emotion"].map((label) => ({
-    experimentId: experiment.id,
-    label,
-  })),
-});
-
-await prisma.promptVariant.createMany({
-  data: [
-    {
-      experimentId: experiment.id,
-      label: "Prompt Variant 1",
-      sortIndex: 0,
-      model: "gpt-3.5-turbo-0613",
-      modelProvider: "openai/ChatCompletion",
-      constructFnVersion: 1,
-      constructFn: dedent`
-          definePrompt("openai/ChatCompletion", {
-            model: "gpt-3.5-turbo-0613",
-            messages: [
-              {
-                role: "user",
-                content: \`Text: ${"$"}{scenario.text}\n\nRespond with the sentiment (negative|neutral|positive) and emotion (optimism|joy|anger|sadness) of the tweet in this format: "answer: <sentiment>-<emotion>".\`
-              }
-            ],
-            temperature: 0,
-          })`,
-    },
-  ],
-});
-
-await prisma.evaluation.createMany({
-  data: [
-    {
-      experimentId: experiment.id,
-      label: "Eval",
-      evalType: "CONTAINS",
-      value: "answer: {{sentiment}}-{{emotion}}",
-    },
-  ],
-});
--- a/public/fonts/Inconsolata_SemiExpanded-Medium.ttf
+++ b/public/fonts/Inconsolata_SemiExpanded-Medium.ttf
--- a/public/og.png
+++ b/public/og.png
--- a/run-prod.sh
+++ b/run-prod.sh
@@ -6,7 +6,4 @@ echo "Migrating the database"
 pnpm prisma migrate deploy

 echo "Starting the server"
-
-pnpm concurrently --kill-others \
-  "pnpm start" \
-  "pnpm tsx src/server/tasks/worker.ts"
+pnpm start
--- a/src/components/ChangeModelModal/ChangeModelModal.tsx
+++ b/src/components/ChangeModelModal/ChangeModelModal.tsx
@@ -1,7 +1,5 @@
 import {
  Button,
-  HStack,
-  Icon,
  Modal,
  ModalBody,
  ModalCloseButton,
@@ -9,21 +7,24 @@ import {
  ModalFooter,
  ModalHeader,
  ModalOverlay,
-  Spinner,
-  Text,
  VStack,
+  Text,
+  Spinner,
+  HStack,
+  Icon,
 } from "@chakra-ui/react";
+import { RiExchangeFundsFill } from "react-icons/ri";
+import { useState } from "react";
+import { ModelStatsCard } from "./ModelStatsCard";
+import { ModelSearch } from "./ModelSearch";
+import { api } from "~/utils/api";
+import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
+import CompareFunctions from "../RefinePromptModal/CompareFunctions";
 import { type PromptVariant } from "@prisma/client";
 import { isObject, isString } from "lodash-es";
-import { useState } from "react";
-import { RiExchangeFundsFill } from "react-icons/ri";
-import { type ProviderModel } from "~/modelProviders/types";
-import { api } from "~/utils/api";
-import { useExperiment, useHandledAsyncCallback, useVisibleScenarioIds } from "~/utils/hooks";
-import { lookupModel, modelLabel } from "~/utils/utils";
-import CompareFunctions from "../RefinePromptModal/CompareFunctions";
-import { ModelSearch } from "./ModelSearch";
-import { ModelStatsCard } from "./ModelStatsCard";
+import { type Model, type SupportedProvider } from "~/modelProviders/types";
+import frontendModelProviders from "~/modelProviders/frontendModelProviders";
+import { keyForModel } from "~/utils/utils";

 export const ChangeModelModal = ({
  variant,
@@ -32,14 +33,11 @@ export const ChangeModelModal = ({
  variant: PromptVariant;
  onClose: () => void;
 }) => {
-  const originalModel = lookupModel(variant.modelProvider, variant.model);
-  const [selectedModel, setSelectedModel] = useState({
-    provider: variant.modelProvider,
-    model: variant.model,
-  } as ProviderModel);
-  const [convertedModel, setConvertedModel] = useState<ProviderModel | undefined>();
-  const visibleScenarios = useVisibleScenarioIds();
-
+  const originalModelProviderName = variant.modelProvider as SupportedProvider;
+  const originalModelProvider = frontendModelProviders[originalModelProviderName];
+  const originalModel = originalModelProvider.models[variant.model] as Model;
+  const [selectedModel, setSelectedModel] = useState<Model>(originalModel);
+  const [convertedModel, setConvertedModel] = useState<Model | undefined>(undefined);
  const utils = api.useContext();

  const experiment = useExperiment();
@@ -69,16 +67,14 @@ export const ChangeModelModal = ({
    await replaceVariantMutation.mutateAsync({
      id: variant.id,
      constructFn: modifiedPromptFn,
-      streamScenarios: visibleScenarios,
    });
    await utils.promptVariants.list.invalidate();
    onClose();
  }, [replaceVariantMutation, variant, onClose, modifiedPromptFn]);

-  const originalLabel = modelLabel(variant.modelProvider, variant.model);
-  const selectedLabel = modelLabel(selectedModel.provider, selectedModel.model);
-  const convertedLabel =
-    convertedModel && modelLabel(convertedModel.provider, convertedModel.model);
+  const originalModelLabel = keyForModel(originalModel);
+  const selectedModelLabel = keyForModel(selectedModel);
+  const convertedModelLabel = convertedModel ? keyForModel(convertedModel) : undefined;

  return (
    <Modal
@@ -98,19 +94,16 @@ export const ChangeModelModal = ({
        <ModalBody maxW="unset">
          <VStack spacing={8}>
            <ModelStatsCard label="Original Model" model={originalModel} />
-            {originalLabel !== selectedLabel && (
-              <ModelStatsCard
-                label="New Model"
-                model={lookupModel(selectedModel.provider, selectedModel.model)}
-              />
+            {originalModelLabel !== selectedModelLabel && (
+              <ModelStatsCard label="New Model" model={selectedModel} />
            )}
            <ModelSearch selectedModel={selectedModel} setSelectedModel={setSelectedModel} />
            {isString(modifiedPromptFn) && (
              <CompareFunctions
                originalFunction={variant.constructFn}
                newFunction={modifiedPromptFn}
-                leftTitle={originalLabel}
-                rightTitle={convertedLabel}
+                leftTitle={originalModelLabel}
+                rightTitle={convertedModelLabel}
              />
            )}
          </VStack>
@@ -122,7 +115,7 @@ export const ChangeModelModal = ({
              colorScheme="gray"
              onClick={getModifiedPromptFn}
              minW={24}
-              isDisabled={originalLabel === selectedLabel || modificationInProgress}
+              isDisabled={originalModel === selectedModel || modificationInProgress}
            >
              {modificationInProgress ? <Spinner boxSize={4} /> : <Text>Convert</Text>}
            </Button>
--- a/src/components/ChangeModelModal/ModelSearch.tsx
+++ b/src/components/ChangeModelModal/ModelSearch.tsx
@@ -1,35 +1,49 @@
-import { Text, VStack } from "@chakra-ui/react";
-import { type LegacyRef } from "react";
-import Select from "react-select";
+import { VStack, Text } from "@chakra-ui/react";
+import { type LegacyRef, useCallback } from "react";
+import Select, { type SingleValue } from "react-select";
 import { useElementDimensions } from "~/utils/hooks";

-import { flatMap } from "lodash-es";
 import frontendModelProviders from "~/modelProviders/frontendModelProviders";
-import { type ProviderModel } from "~/modelProviders/types";
-import { modelLabel } from "~/utils/utils";
+import { type Model } from "~/modelProviders/types";
+import { keyForModel } from "~/utils/utils";

-const modelOptions = flatMap(Object.entries(frontendModelProviders), ([providerId, provider]) =>
-  Object.entries(provider.models).map(([modelId]) => ({
-    provider: providerId,
-    model: modelId,
-  })),
-) as ProviderModel[];
+const modelOptions: { label: string; value: Model }[] = [];

-export const ModelSearch = (props: {
-  selectedModel: ProviderModel;
-  setSelectedModel: (model: ProviderModel) => void;
+for (const [_, providerValue] of Object.entries(frontendModelProviders)) {
+  for (const [_, modelValue] of Object.entries(providerValue.models)) {
+    modelOptions.push({
+      label: keyForModel(modelValue),
+      value: modelValue,
+    });
+  }
+}
+
+export const ModelSearch = ({
+  selectedModel,
+  setSelectedModel,
+}: {
+  selectedModel: Model;
+  setSelectedModel: (model: Model) => void;
 }) => {
+  const handleSelection = useCallback(
+    (option: SingleValue<{ label: string; value: Model }>) => {
+      if (!option) return;
+      setSelectedModel(option.value);
+    },
+    [setSelectedModel],
+  );
+  const selectedOption = modelOptions.find((option) => option.label === keyForModel(selectedModel));
+
  const [containerRef, containerDimensions] = useElementDimensions();

  return (
    <VStack ref={containerRef as LegacyRef<HTMLDivElement>} w="full">
      <Text>Browse Models</Text>
-      <Select<ProviderModel>
+      <Select
        styles={{ control: (provided) => ({ ...provided, width: containerDimensions?.width }) }}
-        getOptionLabel={(data) => modelLabel(data.provider, data.model)}
-        getOptionValue={(data) => modelLabel(data.provider, data.model)}
+        value={selectedOption}
        options={modelOptions}
-        onChange={(option) => option && props.setSelectedModel(option)}
+        onChange={handleSelection}
      />
    </VStack>
  );
--- a/src/components/ChangeModelModal/ModelStatsCard.tsx
+++ b/src/components/ChangeModelModal/ModelStatsCard.tsx
@@ -1,22 +1,15 @@
 import {
-  GridItem,
-  HStack,
-  Link,
-  SimpleGrid,
-  Text,
  VStack,
+  Text,
+  HStack,
  type StackProps,
+  GridItem,
+  SimpleGrid,
+  Link,
 } from "@chakra-ui/react";
-import { type lookupModel } from "~/utils/utils";
+import { type Model } from "~/modelProviders/types";

-export const ModelStatsCard = ({
-  label,
-  model,
-}: {
-  label: string;
-  model: ReturnType<typeof lookupModel>;
-}) => {
-  if (!model) return null;
+export const ModelStatsCard = ({ label, model }: { label: string; model: Model }) => {
  return (
    <VStack w="full" align="start">
      <Text fontWeight="bold" fontSize="sm" textTransform="uppercase">
--- a/src/components/ExperimentSettingsDrawer/DeleteButton.tsx
+++ b/src/components/ExperimentSettingsDrawer/DeleteButton.tsx
@@ -1,69 +0,0 @@
-import {
-  Button,
-  Icon,
-  AlertDialog,
-  AlertDialogBody,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogContent,
-  AlertDialogOverlay,
-  useDisclosure,
-  Text,
-} from "@chakra-ui/react";
-
-import { useRouter } from "next/router";
-import { useRef } from "react";
-import { BsTrash } from "react-icons/bs";
-import { api } from "~/utils/api";
-import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
-
-export const DeleteButton = () => {
-  const experiment = useExperiment();
-  const mutation = api.experiments.delete.useMutation();
-  const utils = api.useContext();
-  const router = useRouter();
-
-  const { isOpen, onOpen, onClose } = useDisclosure();
-  const cancelRef = useRef<HTMLButtonElement>(null);
-
-  const [onDeleteConfirm] = useHandledAsyncCallback(async () => {
-    if (!experiment.data?.id) return;
-    await mutation.mutateAsync({ id: experiment.data.id });
-    await utils.experiments.list.invalidate();
-    await router.push({ pathname: "/experiments" });
-    onClose();
-  }, [mutation, experiment.data?.id, router]);
-
-  return (
-    <>
-      <Button size="sm" variant="ghost" colorScheme="red" fontWeight="normal" onClick={onOpen}>
-        <Icon as={BsTrash} boxSize={4} />
-        <Text ml={2}>Delete Experiment</Text>
-      </Button>
-
-      <AlertDialog isOpen={isOpen} leastDestructiveRef={cancelRef} onClose={onClose}>
-        <AlertDialogOverlay>
-          <AlertDialogContent>
-            <AlertDialogHeader fontSize="lg" fontWeight="bold">
-              Delete Experiment
-            </AlertDialogHeader>
-
-            <AlertDialogBody>
-              If you delete this experiment all the associated prompts and scenarios will be deleted
-              as well. Are you sure?
-            </AlertDialogBody>
-
-            <AlertDialogFooter>
-              <Button ref={cancelRef} onClick={onClose}>
-                Cancel
-              </Button>
-              <Button colorScheme="red" onClick={onDeleteConfirm} ml={3}>
-                Delete
-              </Button>
-            </AlertDialogFooter>
-          </AlertDialogContent>
-        </AlertDialogOverlay>
-      </AlertDialog>
-    </>
-  );
-};
--- a/src/components/OutputsTable/AddVariantButton.tsx
+++ b/src/components/OutputsTable/AddVariantButton.tsx
@@ -2,12 +2,7 @@ import { Box, Flex, Icon, Spinner } from "@chakra-ui/react";
 import { BsPlus } from "react-icons/bs";
 import { Text } from "@chakra-ui/react";
 import { api } from "~/utils/api";
-import {
-  useExperiment,
-  useExperimentAccess,
-  useHandledAsyncCallback,
-  useVisibleScenarioIds,
-} from "~/utils/hooks";
+import { useExperiment, useExperimentAccess, useHandledAsyncCallback } from "~/utils/hooks";
 import { cellPadding } from "../constants";
 import { ActionButton } from "./ScenariosHeader";

@@ -15,13 +10,11 @@ export default function AddVariantButton() {
  const experiment = useExperiment();
  const mutation = api.promptVariants.create.useMutation();
  const utils = api.useContext();
-  const visibleScenarios = useVisibleScenarioIds();

  const [onClick, loading] = useHandledAsyncCallback(async () => {
    if (!experiment.data) return;
    await mutation.mutateAsync({
      experimentId: experiment.data.id,
-      streamScenarios: visibleScenarios,
    });
    await utils.promptVariants.list.invalidate();
  }, [mutation]);
--- a/src/components/OutputsTable/FloatingLabelInput.tsx
+++ b/src/components/OutputsTable/FloatingLabelInput.tsx
@@ -37,6 +37,7 @@ export const FloatingLabelInput = ({
        borderColor={isFocused ? "blue.500" : "gray.400"}
        autoComplete="off"
        value={value}
+        maxHeight={32}
        overflowY="auto"
        overflowX="hidden"
        {...props}
--- a/src/components/OutputsTable/OutputCell/CellContent.tsx
+++ b/src/components/OutputsTable/OutputCell/CellContent.tsx
@@ -1,19 +0,0 @@
-import { type StackProps, VStack } from "@chakra-ui/react";
-import { CellOptions } from "./CellOptions";
-
-export const CellContent = ({
-  hardRefetch,
-  hardRefetching,
-  children,
-  ...props
-}: {
-  hardRefetch: () => void;
-  hardRefetching: boolean;
-} & StackProps) => (
-  <VStack w="full" alignItems="flex-start" {...props}>
-    <CellOptions refetchingOutput={hardRefetching} refetchOutput={hardRefetch} />
-    <VStack w="full" alignItems="flex-start" maxH={500} overflowY="auto">
-      {children}
-    </VStack>
-  </VStack>
-);
--- a/src/components/OutputsTable/OutputCell/CellOptions.tsx
+++ b/src/components/OutputsTable/OutputCell/CellOptions.tsx
@@ -1,4 +1,4 @@
-import { Button, HStack, Icon, Spinner, Tooltip } from "@chakra-ui/react";
+import { Button, HStack, Icon, Tooltip } from "@chakra-ui/react";
 import { BsArrowClockwise } from "react-icons/bs";
 import { useExperimentAccess } from "~/utils/hooks";

@@ -12,7 +12,7 @@ export const CellOptions = ({
  const { canModify } = useExperimentAccess();
  return (
    <HStack justifyContent="flex-end" w="full">
-      {canModify && (
+      {!refetchingOutput && canModify && (
        <Tooltip label="Refetch output" aria-label="refetch output">
          <Button
            size="xs"
@@ -28,7 +28,7 @@ export const CellOptions = ({
            onClick={refetchOutput}
            aria-label="refetch output"
          >
-            <Icon as={refetchingOutput ? Spinner : BsArrowClockwise} boxSize={4} />
+            <Icon as={BsArrowClockwise} boxSize={4} />
          </Button>
        </Tooltip>
      )}
--- a/src/components/OutputsTable/OutputCell/RetryCountdown.tsx
+++ b/src/components/OutputsTable/OutputCell/RetryCountdown.tsx
@@ -1,12 +1,21 @@
-import { Text } from "@chakra-ui/react";
+import { type ScenarioVariantCell } from "@prisma/client";
+import { VStack, Text } from "@chakra-ui/react";
 import { useEffect, useState } from "react";
 import pluralize from "pluralize";

-export const RetryCountdown = ({ retryTime }: { retryTime: Date }) => {
+export const ErrorHandler = ({
+  cell,
+  refetchOutput,
+}: {
+  cell: ScenarioVariantCell;
+  refetchOutput: () => void;
+}) => {
  const [msToWait, setMsToWait] = useState(0);

  useEffect(() => {
-    const initialWaitTime = retryTime.getTime() - Date.now();
+    if (!cell.retryTime) return;
+
+    const initialWaitTime = cell.retryTime.getTime() - Date.now();
    const msModuloOneSecond = initialWaitTime % 1000;
    let remainingTime = initialWaitTime - msModuloOneSecond;
    setMsToWait(remainingTime);
@@ -27,13 +36,18 @@ export const RetryCountdown = ({ retryTime }: { retryTime: Date }) => {
      clearInterval(interval);
      clearTimeout(timeout);
    };
-  }, [retryTime]);
-
-  if (msToWait <= 0) return null;
+  }, [cell.retryTime, cell.statusCode, setMsToWait, refetchOutput]);

  return (
+    <VStack w="full">
+      <Text color="red.600" wordBreak="break-word">
+        {cell.errorMessage}
+      </Text>
+      {msToWait > 0 && (
        <Text color="red.600" fontSize="sm">
          Retrying in {pluralize("second", Math.ceil(msToWait / 1000), true)}...
        </Text>
+      )}
+    </VStack>
  );
 };
--- a/src/components/OutputsTable/OutputCell/OutputCell.tsx
+++ b/src/components/OutputsTable/OutputCell/OutputCell.tsx
@@ -1,19 +1,16 @@
 import { api } from "~/utils/api";
 import { type PromptVariant, type Scenario } from "../types";
-import { Text, VStack } from "@chakra-ui/react";
+import { Spinner, Text, Center, VStack } from "@chakra-ui/react";
 import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
 import SyntaxHighlighter from "react-syntax-highlighter";
 import { docco } from "react-syntax-highlighter/dist/cjs/styles/hljs";
 import stringify from "json-stringify-pretty-compact";
-import { type ReactElement, useState, useEffect, Fragment } from "react";
+import { type ReactElement, useState, useEffect } from "react";
 import useSocket from "~/utils/useSocket";
 import { OutputStats } from "./OutputStats";
-import { RetryCountdown } from "./RetryCountdown";
+import { ErrorHandler } from "./ErrorHandler";
+import { CellOptions } from "./CellOptions";
 import frontendModelProviders from "~/modelProviders/frontendModelProviders";
-import { ResponseLog } from "./ResponseLog";
-import { CellContent } from "./CellContent";
-
-const WAITING_MESSAGE_INTERVAL = 20000;

 export default function OutputCell({
  scenario,
@@ -63,97 +60,40 @@ export default function OutputCell({

  const awaitingOutput =
    !cell ||
-    !cell.evalsComplete ||
    cell.retrievalStatus === "PENDING" ||
    cell.retrievalStatus === "IN_PROGRESS" ||
    hardRefetching;
  useEffect(() => setRefetchInterval(awaitingOutput ? 1000 : 0), [awaitingOutput]);

-  // TODO: disconnect from socket if we're not streaming anymore
-  const streamedMessage = useSocket<OutputSchema>(cell?.id);
+  const modelOutput = cell?.modelOutput;
+
+  // Disconnect from socket if we're not streaming anymore
+  const streamedMessage = useSocket<OutputSchema>(cell?.streamingChannel);

  if (!vars) return null;

-  if (!cell && !fetchingOutput)
-    return (
-      <CellContent hardRefetching={hardRefetching} hardRefetch={hardRefetch}>
-        <Text color="gray.500">Error retrieving output</Text>
-      </CellContent>
-    );
-
-  if (cell && cell.errorMessage) {
-    return (
-      <CellContent hardRefetching={hardRefetching} hardRefetch={hardRefetch}>
-        <Text color="red.500">{cell.errorMessage}</Text>
-      </CellContent>
-    );
-  }
-
  if (disabledReason) return <Text color="gray.500">{disabledReason}</Text>;

-  const mostRecentResponse = cell?.modelResponses[cell.modelResponses.length - 1];
-  const showLogs = !streamedMessage && !mostRecentResponse?.output;
-
-  if (showLogs)
+  if (awaitingOutput && !streamedMessage)
    return (
-      <CellContent
-        hardRefetching={hardRefetching}
-        hardRefetch={hardRefetch}
-        alignItems="flex-start"
-        fontFamily="inconsolata, monospace"
-        spacing={0}
-      >
-        {cell?.jobQueuedAt && <ResponseLog time={cell.jobQueuedAt} title="Job queued" />}
-        {cell?.jobStartedAt && <ResponseLog time={cell.jobStartedAt} title="Job started" />}
-        {cell?.modelResponses?.map((response) => {
-          let numWaitingMessages = 0;
-          const relativeWaitingTime = response.receivedAt
-            ? response.receivedAt.getTime()
-            : Date.now();
-          if (response.requestedAt) {
-            numWaitingMessages = Math.floor(
-              (relativeWaitingTime - response.requestedAt.getTime()) / WAITING_MESSAGE_INTERVAL,
+      <Center h="100%" w="100%">
+        <Spinner />
+      </Center>
    );
+
+  if (!cell && !fetchingOutput) return <Text color="gray.500">Error retrieving output</Text>;
+
+  if (cell && cell.errorMessage) {
+    return <ErrorHandler cell={cell} refetchOutput={hardRefetch} />;
  }
-          return (
-            <Fragment key={response.id}>
-              {response.requestedAt && (
-                <ResponseLog time={response.requestedAt} title="Request sent to API" />
-              )}
-              {response.requestedAt &&
-                Array.from({ length: numWaitingMessages }, (_, i) => (
-                  <ResponseLog
-                    key={`waiting-${i}`}
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    time={new Date(response.requestedAt!.getTime() + i * WAITING_MESSAGE_INTERVAL)}
-                    title="Waiting for response"
-                  />
-                ))}
-              {response.receivedAt && (
-                <ResponseLog
-                  time={response.receivedAt}
-                  title="Response received from API"
-                  message={`statusCode: ${response.statusCode ?? ""}\n ${
-                    response.errorMessage ?? ""
-                  }`}
-                />
-              )}
-            </Fragment>
-          );
-        }) ?? null}
-        {mostRecentResponse?.retryTime && (
-          <RetryCountdown retryTime={mostRecentResponse.retryTime} />
-        )}
-      </CellContent>
-    );

-  const normalizedOutput = mostRecentResponse?.output
-    ? provider.normalizeOutput(mostRecentResponse?.output)
+  const normalizedOutput = modelOutput
+    ? provider.normalizeOutput(modelOutput.output)
    : streamedMessage
    ? provider.normalizeOutput(streamedMessage)
    : null;

-  if (mostRecentResponse?.output && normalizedOutput?.type === "json") {
+  if (modelOutput && normalizedOutput?.type === "json") {
    return (
      <VStack
        w="100%"
@@ -163,13 +103,8 @@ export default function OutputCell({
        overflowX="hidden"
        justifyContent="space-between"
      >
-        <CellContent
-          hardRefetching={hardRefetching}
-          hardRefetch={hardRefetch}
-          w="full"
-          flex={1}
-          spacing={0}
-        >
+        <VStack w="full" flex={1} spacing={0}>
+          <CellOptions refetchingOutput={hardRefetching} refetchOutput={hardRefetch} />
          <SyntaxHighlighter
            customStyle={{ overflowX: "unset", width: "100%", flex: 1 }}
            language="json"
@@ -181,8 +116,8 @@ export default function OutputCell({
          >
            {stringify(normalizedOutput.value, { maxLength: 40 })}
          </SyntaxHighlighter>
-        </CellContent>
-        <OutputStats modelResponse={mostRecentResponse} scenario={scenario} />
+        </VStack>
+        <OutputStats modelOutput={modelOutput} scenario={scenario} />
      </VStack>
    );
  }
@@ -192,13 +127,10 @@ export default function OutputCell({
  return (
    <VStack w="100%" h="100%" justifyContent="space-between" whiteSpace="pre-wrap">
      <VStack w="full" alignItems="flex-start" spacing={0}>
-        <CellContent hardRefetching={hardRefetching} hardRefetch={hardRefetch}>
+        <CellOptions refetchingOutput={hardRefetching} refetchOutput={hardRefetch} />
        <Text>{contentToDisplay}</Text>
-        </CellContent>
      </VStack>
-      {mostRecentResponse?.output && (
-        <OutputStats modelResponse={mostRecentResponse} scenario={scenario} />
-      )}
+      {modelOutput && <OutputStats modelOutput={modelOutput} scenario={scenario} />}
    </VStack>
  );
 }
--- a/src/components/OutputsTable/OutputCell/OutputStats.tsx
+++ b/src/components/OutputsTable/OutputCell/OutputStats.tsx
@@ -7,32 +7,28 @@ import { CostTooltip } from "~/components/tooltip/CostTooltip";
 const SHOW_TIME = true;

 export const OutputStats = ({
-  modelResponse,
+  modelOutput,
 }: {
-  modelResponse: NonNullable<
-    NonNullable<RouterOutputs["scenarioVariantCells"]["get"]>["modelResponses"][0]
+  modelOutput: NonNullable<
+    NonNullable<RouterOutputs["scenarioVariantCells"]["get"]>["modelOutput"]
  >;
  scenario: Scenario;
 }) => {
-  const timeToComplete =
-    modelResponse.receivedAt && modelResponse.requestedAt
-      ? modelResponse.receivedAt.getTime() - modelResponse.requestedAt.getTime()
-      : 0;
+  const timeToComplete = modelOutput.timeToComplete;

-  const promptTokens = modelResponse.promptTokens;
-  const completionTokens = modelResponse.completionTokens;
+  const promptTokens = modelOutput.promptTokens;
+  const completionTokens = modelOutput.completionTokens;

  return (
    <HStack w="full" align="center" color="gray.500" fontSize="2xs" mt={{ base: 0, md: 1 }}>
      <HStack flex={1}>
-        {modelResponse.outputEvaluations.map((evaluation) => {
+        {modelOutput.outputEvaluation.map((evaluation) => {
          const passed = evaluation.result > 0.5;
          return (
            <Tooltip
              isDisabled={!evaluation.details}
              label={evaluation.details}
              key={evaluation.id}
-              shouldWrapChildren
            >
              <HStack spacing={0}>
                <Text>{evaluation.evaluation.label}</Text>
@@ -46,15 +42,15 @@ export const OutputStats = ({
          );
        })}
      </HStack>
-      {modelResponse.cost && (
+      {modelOutput.cost && (
        <CostTooltip
          promptTokens={promptTokens}
          completionTokens={completionTokens}
-          cost={modelResponse.cost}
+          cost={modelOutput.cost}
        >
          <HStack spacing={0}>
            <Icon as={BsCurrencyDollar} />
-            <Text mr={1}>{modelResponse.cost.toFixed(3)}</Text>
+            <Text mr={1}>{modelOutput.cost.toFixed(3)}</Text>
          </HStack>
        </CostTooltip>
      )}
--- a/src/components/OutputsTable/OutputCell/ResponseLog.tsx
+++ b/src/components/OutputsTable/OutputCell/ResponseLog.tsx
@@ -1,22 +0,0 @@
-import { HStack, VStack, Text } from "@chakra-ui/react";
-import dayjs from "dayjs";
-
-export const ResponseLog = ({
-  time,
-  title,
-  message,
-}: {
-  time: Date;
-  title: string;
-  message?: string;
-}) => {
-  return (
-    <VStack spacing={0} alignItems="flex-start">
-      <HStack>
-        <Text>{dayjs(time).format("HH:mm:ss")}</Text>
-        <Text>{title}</Text>
-      </HStack>
-      {message && <Text pl={4}>{message}</Text>}
-    </VStack>
-  );
-};
--- a/src/components/OutputsTable/ScenarioEditor.tsx
+++ b/src/components/OutputsTable/ScenarioEditor.tsx
@@ -1,27 +1,15 @@
-import { useEffect, type DragEvent } from "react";
+import { type DragEvent } from "react";
 import { api } from "~/utils/api";
 import { isEqual } from "lodash-es";
 import { type Scenario } from "./types";
 import { useExperiment, useExperimentAccess, useHandledAsyncCallback } from "~/utils/hooks";
 import { useState } from "react";

-import {
-  Box,
-  Button,
-  HStack,
-  Icon,
-  IconButton,
-  Spinner,
-  Stack,
-  Tooltip,
-  VStack,
-  Text,
-} from "@chakra-ui/react";
+import { Box, Button, Flex, HStack, Icon, Spinner, Stack, Tooltip, VStack } from "@chakra-ui/react";
 import { cellPadding } from "../constants";
-import { BsArrowsAngleExpand, BsX } from "react-icons/bs";
+import { BsX } from "react-icons/bs";
 import { RiDraggable } from "react-icons/ri";
 import { FloatingLabelInput } from "./FloatingLabelInput";
-import { ScenarioEditorModal } from "./ScenarioEditorModal";

 export default function ScenarioEditor({
  scenario,
@@ -40,10 +28,6 @@ export default function ScenarioEditor({

  const [values, setValues] = useState<Record<string, string>>(savedValues);

-  useEffect(() => {
-    if (savedValues) setValues(savedValues);
-  }, [savedValues]);
-
  const experiment = useExperiment();
  const vars = api.templateVars.list.useQuery({ experimentId: experiment.data?.id ?? "" });

@@ -87,10 +71,7 @@ export default function ScenarioEditor({
    [reorderMutation, scenario.id],
  );

-  const [scenarioEditorModalOpen, setScenarioEditorModalOpen] = useState(false);
-
  return (
-    <>
    <HStack
      alignItems="flex-start"
      px={cellPadding.x}
@@ -149,36 +130,24 @@ export default function ScenarioEditor({
      )}

      {variableLabels.length === 0 ? (
-          <Box color="gray.500">
-            {vars.data ? "No scenario variables configured" : "Loading..."}
-          </Box>
+        <Box color="gray.500">{vars.data ? "No scenario variables configured" : "Loading..."}</Box>
      ) : (
        <VStack spacing={4} flex={1} py={2}>
-            <HStack justifyContent="space-between" w="100%">
-              <Text color="gray.500">Scenario</Text>
-              <IconButton
-                className="fullscreen-toggle"
-                aria-label="Maximize"
-                icon={<BsArrowsAngleExpand />}
-                onClick={() => setScenarioEditorModalOpen(true)}
-                boxSize={6}
-                borderRadius={4}
-                p={1.5}
-                minW={0}
-                colorScheme="gray"
-                color="gray.500"
-                variant="ghost"
-              />
-            </HStack>
          {variableLabels.map((key) => {
            const value = values[key] ?? "";
+            const layoutDirection = value.length > 20 ? "column" : "row";
            return (
-                <FloatingLabelInput
+              <Flex
                key={key}
+                direction={layoutDirection}
+                alignItems={layoutDirection === "column" ? "flex-start" : "center"}
+                flexWrap="wrap"
+                width="full"
+              >
+                <FloatingLabelInput
                  label={key}
                  isDisabled={!canModify}
                  style={{ width: "100%" }}
-                  maxHeight={32}
                  value={value}
                  onChange={(e) => {
                    setValues((prev) => ({ ...prev, [key]: e.target.value }));
@@ -193,6 +162,7 @@ export default function ScenarioEditor({
                  onMouseEnter={() => setVariableInputHovered(true)}
                  onMouseLeave={() => setVariableInputHovered(false)}
                />
+              </Flex>
            );
          })}
          {hasChanged && (
@@ -214,13 +184,5 @@ export default function ScenarioEditor({
        </VStack>
      )}
    </HStack>
-      {scenarioEditorModalOpen && (
-        <ScenarioEditorModal
-          scenarioId={scenario.id}
-          initialValues={savedValues}
-          onClose={() => setScenarioEditorModalOpen(false)}
-        />
-      )}
-    </>
  );
 }
--- a/src/components/OutputsTable/ScenarioEditorModal.tsx
+++ b/src/components/OutputsTable/ScenarioEditorModal.tsx
@@ -1,132 +0,0 @@
-import {
-  Button,
-  HStack,
-  Icon,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Spinner,
-  Text,
-  VStack,
-} from "@chakra-ui/react";
-import { useEffect, useState } from "react";
-import { BsFileTextFill } from "react-icons/bs";
-import { isEqual } from "lodash-es";
-
-import { api } from "~/utils/api";
-import {
-  useScenario,
-  useHandledAsyncCallback,
-  useExperiment,
-  useExperimentAccess,
-} from "~/utils/hooks";
-import { FloatingLabelInput } from "./FloatingLabelInput";
-
-export const ScenarioEditorModal = ({
-  scenarioId,
-  initialValues,
-  onClose,
-}: {
-  scenarioId: string;
-  initialValues: Record<string, string>;
-  onClose: () => void;
-}) => {
-  const utils = api.useContext();
-  const experiment = useExperiment();
-  const { canModify } = useExperimentAccess();
-  const scenario = useScenario(scenarioId);
-
-  const savedValues = scenario.data?.variableValues as Record<string, string>;
-
-  const [values, setValues] = useState<Record<string, string>>(initialValues);
-
-  useEffect(() => {
-    if (savedValues) setValues(savedValues);
-  }, [savedValues]);
-
-  const hasChanged = !isEqual(savedValues, values);
-
-  const mutation = api.scenarios.replaceWithValues.useMutation();
-
-  const [onSave, saving] = useHandledAsyncCallback(async () => {
-    await mutation.mutateAsync({
-      id: scenarioId,
-      values,
-    });
-    await utils.scenarios.list.invalidate();
-  }, [mutation, values]);
-
-  console.log("scenario", scenario);
-
-  const vars = api.templateVars.list.useQuery({ experimentId: experiment.data?.id ?? "" });
-  const variableLabels = vars.data?.map((v) => v.label) ?? [];
-
-  return (
-    <Modal
-      isOpen
-      onClose={onClose}
-      size={{ base: "xl", sm: "2xl", md: "3xl", lg: "5xl", xl: "7xl" }}
-    >
-      <ModalOverlay />
-      <ModalContent w={1200}>
-        <ModalHeader>
-          <HStack>
-            <Icon as={BsFileTextFill} />
-            <Text>Scenario</Text>
-          </HStack>
-        </ModalHeader>
-        <ModalCloseButton />
-        <ModalBody maxW="unset">
-          <VStack spacing={8}>
-            {values &&
-              variableLabels.map((key) => {
-                const value = values[key] ?? "";
-                return (
-                  <FloatingLabelInput
-                    key={key}
-                    label={key}
-                    isDisabled={!canModify}
-                    _disabled={{ opacity: 1 }}
-                    style={{ width: "100%" }}
-                    value={value}
-                    onChange={(e) => {
-                      setValues((prev) => ({ ...prev, [key]: e.target.value }));
-                    }}
-                    onKeyDown={(e) => {
-                      if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
-                        e.preventDefault();
-                        e.currentTarget.blur();
-                        onSave();
-                      }
-                    }}
-                  />
-                );
-              })}
-          </VStack>
-        </ModalBody>
-
-        <ModalFooter>
-          {canModify && (
-            <HStack>
-              <Button
-                colorScheme="gray"
-                onClick={() => setValues(savedValues)}
-                minW={24}
-                isDisabled={!hasChanged}
-              >
-                <Text>Reset</Text>
-              </Button>
-              <Button colorScheme="blue" onClick={onSave} minW={24} isDisabled={!hasChanged}>
-                {saving ? <Spinner boxSize={4} /> : <Text>Save</Text>}
-              </Button>
-            </HStack>
-          )}
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-};
--- a/src/components/OutputsTable/ScenariosHeader.tsx
+++ b/src/components/OutputsTable/ScenariosHeader.tsx
@@ -54,16 +54,16 @@ export const ScenariosHeader = () => {
      </Text>
      {canModify && (
        <Menu>
-          <MenuButton
-            as={IconButton}
-            mt={1}
+          <MenuButton mt={1}>
+            <IconButton
              variant="ghost"
              aria-label="Edit Scenarios"
              icon={<Icon as={loading ? Spinner : BsGear} />}
            />
+          </MenuButton>
          <MenuList fontSize="md" zIndex="dropdown" mt={-3}>
            <MenuItem
-              icon={<Icon as={BsPlus} boxSize={6} mx="-5px" />}
+              icon={<Icon as={BsPlus} boxSize={6} mx={-1} />}
              onClick={() => onAddScenario(false)}
            >
              Add Scenario
--- a/src/components/ExperimentSettingsDrawer/ExperimentSettingsDrawer.tsx
+++ b/src/components/ExperimentSettingsDrawer/ExperimentSettingsDrawer.tsx
@@ -6,14 +6,13 @@ import {
  DrawerHeader,
  DrawerOverlay,
  Heading,
-  VStack,
+  Stack,
 } from "@chakra-ui/react";
-import EditScenarioVars from "../OutputsTable/EditScenarioVars";
-import EditEvaluations from "../OutputsTable/EditEvaluations";
+import EditScenarioVars from "./EditScenarioVars";
+import EditEvaluations from "./EditEvaluations";
 import { useAppStore } from "~/state/store";
-import { DeleteButton } from "./DeleteButton";

-export default function ExperimentSettingsDrawer() {
+export default function SettingsDrawer() {
  const isOpen = useAppStore((state) => state.drawerOpen);
  const closeDrawer = useAppStore((state) => state.closeDrawer);

@@ -23,16 +22,13 @@ export default function ExperimentSettingsDrawer() {
      <DrawerContent>
        <DrawerCloseButton />
        <DrawerHeader>
-          <Heading size="md">Experiment Settings</Heading>
+          <Heading size="md">Settings</Heading>
        </DrawerHeader>
-        <DrawerBody h="full" pb={4}>
-          <VStack h="full" justifyContent="space-between">
-            <VStack spacing={6}>
+        <DrawerBody>
+          <Stack spacing={6}>
            <EditScenarioVars />
            <EditEvaluations />
-            </VStack>
-            <DeleteButton />
-          </VStack>
+          </Stack>
        </DrawerBody>
      </DrawerContent>
    </Drawer>
--- a/src/components/OutputsTable/VariantEditor.tsx
+++ b/src/components/OutputsTable/VariantEditor.tsx
@@ -2,24 +2,19 @@ import {
  Box,
  Button,
  HStack,
-  IconButton,
  Spinner,
-  Text,
  Tooltip,
  useToast,
+  Text,
+  IconButton,
 } from "@chakra-ui/react";
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useRef, useEffect, useState, useCallback } from "react";
+import { useExperimentAccess, useHandledAsyncCallback, useModifierKeyLabel } from "~/utils/hooks";
+import { type PromptVariant } from "./types";
+import { api } from "~/utils/api";
+import { useAppStore } from "~/state/store";
 import { FiMaximize, FiMinimize } from "react-icons/fi";
 import { editorBackground } from "~/state/sharedVariantEditor.slice";
-import { useAppStore } from "~/state/store";
-import { api } from "~/utils/api";
-import {
-  useExperimentAccess,
-  useHandledAsyncCallback,
-  useModifierKeyLabel,
-  useVisibleScenarioIds,
-} from "~/utils/hooks";
-import { type PromptVariant } from "./types";

 export default function VariantEditor(props: { variant: PromptVariant }) {
  const { canModify } = useExperimentAccess();
@@ -68,7 +63,6 @@ export default function VariantEditor(props: { variant: PromptVariant }) {
  const replaceVariant = api.promptVariants.replaceVariant.useMutation();
  const utils = api.useContext();
  const toast = useToast();
-  const visibleScenarios = useVisibleScenarioIds();

  const [onSave, saveInProgress] = useHandledAsyncCallback(async () => {
    if (!editorRef.current) return;
@@ -97,7 +91,6 @@ export default function VariantEditor(props: { variant: PromptVariant }) {
    const resp = await replaceVariant.mutateAsync({
      id: props.variant.id,
      constructFn: currentFn,
-      streamScenarios: visibleScenarios,
    });
    if (resp.status === "error") {
      return toast({
--- a/src/components/OutputsTable/VariantStats.tsx
+++ b/src/components/OutputsTable/VariantStats.tsx
@@ -21,14 +21,17 @@ export default function VariantStats(props: { variant: PromptVariant }) {
        completionTokens: 0,
        scenarioCount: 0,
        outputCount: 0,
-        awaitingEvals: false,
+        awaitingRetrievals: false,
      },
      refetchInterval,
    },
  );

  // Poll every two seconds while we are waiting for LLM retrievals to finish
-  useEffect(() => setRefetchInterval(data.awaitingEvals ? 5000 : 0), [data.awaitingEvals]);
+  useEffect(
+    () => setRefetchInterval(data.awaitingRetrievals ? 2000 : 0),
+    [data.awaitingRetrievals],
+  );

  const [passColor, neutralColor, failColor] = useToken("colors", [
    "green.500",
@@ -48,12 +51,12 @@ export default function VariantStats(props: { variant: PromptVariant }) {
      fontSize="xs"
      py={cellPadding.y}
    >
-      <HStack px={cellPadding.x}>
      {showNumFinished && (
        <Text>
          {data.outputCount} / {data.scenarioCount}
        </Text>
      )}
+      <HStack px={cellPadding.x}>
        {data.evalResults.map((result) => {
          const passedFrac = result.passCount / result.totalCount;
          return (
@@ -66,7 +69,7 @@ export default function VariantStats(props: { variant: PromptVariant }) {
          );
        })}
      </HStack>
-      {data.overallCost && (
+      {data.overallCost && !data.awaitingRetrievals && (
        <CostTooltip
          promptTokens={data.promptTokens}
          completionTokens={data.completionTokens}
--- a/src/components/OutputsTable/index.tsx
+++ b/src/components/OutputsTable/index.tsx
@@ -9,7 +9,6 @@ import { ScenariosHeader } from "./ScenariosHeader";
 import { borders } from "./styles";
 import { useScenarios } from "~/utils/hooks";
 import ScenarioPaginator from "./ScenarioPaginator";
-import { Fragment } from "react";

 export default function OutputsTable({ experimentId }: { experimentId: string | undefined }) {
  const variants = api.promptVariants.list.useQuery(
@@ -33,7 +32,7 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
    <Grid
      pt={4}
      pb={24}
-      pl={8}
+      pl={4}
      display="grid"
      gridTemplateColumns={`250px repeat(${variants.data.length}, minmax(300px, 1fr)) auto`}
      sx={{
@@ -53,11 +52,11 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
          colStart: i + 2,
          borderLeftWidth: i === 0 ? 1 : 0,
          marginLeft: i === 0 ? "-1px" : 0,
-          backgroundColor: "gray.100",
        };
        return (
-          <Fragment key={variant.uiId}>
+          <>
            <VariantHeader
+              key={variant.uiId}
              variant={variant}
              canHide={variants.data.length > 1}
              rowStart={1}
@@ -69,7 +68,7 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
            <GridItem rowStart={3} {...sharedProps}>
              <VariantStats variant={variant} />
            </GridItem>
-          </Fragment>
+          </>
        );
      })}

--- a/src/components/OutputsTable/styles.ts
+++ b/src/components/OutputsTable/styles.ts
@@ -1,4 +1,11 @@
-import { type GridItemProps } from "@chakra-ui/react";
+import { type GridItemProps, type SystemStyleObject } from "@chakra-ui/react";
+
+export const stickyHeaderStyle: SystemStyleObject = {
+  position: "sticky",
+  top: "0",
+  backgroundColor: "#fff",
+  zIndex: 10,
+};

 export const borders: GridItemProps = {
  borderRightWidth: 1,
--- a/src/components/RefinePromptModal/RefineOption.tsx
+++ b/src/components/RefinePromptModal/RefineOption.tsx
@@ -1,8 +1,7 @@
 import { HStack, Icon, Heading, Text, VStack, GridItem } from "@chakra-ui/react";
 import { type IconType } from "react-icons";
-import { BsStars } from "react-icons/bs";

-export const RefineAction = ({
+export const RefineOption = ({
  label,
  icon,
  desciption,
@@ -11,7 +10,7 @@ export const RefineAction = ({
  loading,
 }: {
  label: string;
-  icon?: IconType;
+  icon: IconType;
  desciption: string;
  activeLabel: string | undefined;
  onClick: (label: string) => void;
@@ -45,7 +44,7 @@ export const RefineAction = ({
        opacity={loading ? 0.5 : 1}
      >
        <HStack cursor="pointer" spacing={6} fontSize="sm" fontWeight="medium" color="gray.500">
-          <Icon as={icon || BsStars} boxSize={12} />
+          <Icon as={icon} boxSize={12} />
          <Heading size="md" fontFamily="inconsolata, monospace">
            {label}
          </Heading>
--- a/src/components/RefinePromptModal/RefinePromptModal.tsx
+++ b/src/components/RefinePromptModal/RefinePromptModal.tsx
@@ -16,15 +16,15 @@ import {
 } from "@chakra-ui/react";
 import { BsStars } from "react-icons/bs";
 import { api } from "~/utils/api";
-import { useHandledAsyncCallback, useVisibleScenarioIds } from "~/utils/hooks";
+import { useHandledAsyncCallback } from "~/utils/hooks";
 import { type PromptVariant } from "@prisma/client";
 import { useState } from "react";
 import CompareFunctions from "./CompareFunctions";
 import { CustomInstructionsInput } from "./CustomInstructionsInput";
-import { RefineAction } from "./RefineAction";
+import { type RefineOptionInfo, refineOptions } from "./refineOptions";
+import { RefineOption } from "./RefineOption";
 import { isObject, isString } from "lodash-es";
-import { type RefinementAction, type SupportedProvider } from "~/modelProviders/types";
-import frontendModelProviders from "~/modelProviders/frontendModelProviders";
+import { type SupportedProvider } from "~/modelProviders/types";

 export const RefinePromptModal = ({
  variant,
@@ -34,16 +34,14 @@ export const RefinePromptModal = ({
  onClose: () => void;
 }) => {
  const utils = api.useContext();
-  const visibleScenarios = useVisibleScenarioIds();

-  const refinementActions =
-    frontendModelProviders[variant.modelProvider as SupportedProvider].refinementActions || {};
+  const providerRefineOptions = refineOptions[variant.modelProvider as SupportedProvider];

  const { mutateAsync: getModifiedPromptMutateAsync, data: refinedPromptFn } =
    api.promptVariants.getModifiedPromptFn.useMutation();
  const [instructions, setInstructions] = useState<string>("");

-  const [activeRefineActionLabel, setActiveRefineActionLabel] = useState<string | undefined>(
+  const [activeRefineOptionLabel, setActiveRefineOptionLabel] = useState<string | undefined>(
    undefined,
  );

@@ -51,15 +49,15 @@ export const RefinePromptModal = ({
    async (label?: string) => {
      if (!variant.experimentId) return;
      const updatedInstructions = label
-        ? (refinementActions[label] as RefinementAction).instructions
+        ? (providerRefineOptions[label] as RefineOptionInfo).instructions
        : instructions;
-      setActiveRefineActionLabel(label);
+      setActiveRefineOptionLabel(label);
      await getModifiedPromptMutateAsync({
        id: variant.id,
        instructions: updatedInstructions,
      });
    },
-    [getModifiedPromptMutateAsync, onClose, variant, instructions, setActiveRefineActionLabel],
+    [getModifiedPromptMutateAsync, onClose, variant, instructions, setActiveRefineOptionLabel],
  );

  const replaceVariantMutation = api.promptVariants.replaceVariant.useMutation();
@@ -74,7 +72,6 @@ export const RefinePromptModal = ({
    await replaceVariantMutation.mutateAsync({
      id: variant.id,
      constructFn: refinedPromptFn,
-      streamScenarios: visibleScenarios,
    });
    await utils.promptVariants.list.invalidate();
    onClose();
@@ -98,18 +95,18 @@ export const RefinePromptModal = ({
        <ModalBody maxW="unset">
          <VStack spacing={8}>
            <VStack spacing={4}>
-              {Object.keys(refinementActions).length && (
+              {Object.keys(providerRefineOptions).length && (
                <>
                  <SimpleGrid columns={{ base: 1, md: 2 }} spacing={8}>
-                    {Object.keys(refinementActions).map((label) => (
-                      <RefineAction
+                    {Object.keys(providerRefineOptions).map((label) => (
+                      <RefineOption
                        key={label}
                        label={label}
                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        icon={refinementActions[label]!.icon}
+                        icon={providerRefineOptions[label]!.icon}
                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                        desciption={refinementActions[label]!.description}
-                        activeLabel={activeRefineActionLabel}
+                        desciption={providerRefineOptions[label]!.description}
+                        activeLabel={activeRefineOptionLabel}
                        onClick={getModifiedPromptFn}
                        loading={modificationInProgress}
                      />
--- a/src/components/RefinePromptModal/refineOptions.ts
+++ b/src/components/RefinePromptModal/refineOptions.ts
@@ -0,0 +1,287 @@
+// Super hacky, but we'll redo the organization when we have more models
+
+import { type SupportedProvider } from "~/modelProviders/types";
+import { VscJson } from "react-icons/vsc";
+import { TfiThought } from "react-icons/tfi";
+import { type IconType } from "react-icons";
+
+export type RefineOptionInfo = { icon: IconType; description: string; instructions: string };
+
+export const refineOptions: Record<SupportedProvider, { [key: string]: RefineOptionInfo }> = {
+  "openai/ChatCompletion": {
+    "Add chain of thought": {
+      icon: VscJson,
+      description: "Asking the model to plan its answer can increase accuracy.",
+      instructions: `Adding chain of thought means asking the model to think about its answer before it gives it to you. This is useful for getting more accurate answers. Do not add an assistant message.
+
+    This is what a prompt looks like before adding chain of thought:
+
+    definePrompt("openai/ChatCompletion", {
+        model: "gpt-4",
+        stream: true,
+        messages: [
+            {
+            role: "system",
+            content: \`Evaluate sentiment.\`,
+            },
+            {
+            role: "user",
+            content: \`This is the user's message: \${scenario.user_message}. Return "positive" or "negative" or "neutral"\`,
+            },
+        ],
+    });
+
+    This is what one looks like after adding chain of thought:
+
+    definePrompt("openai/ChatCompletion", {
+        model: "gpt-4",
+        stream: true,
+        messages: [
+            {
+            role: "system",
+            content: \`Evaluate sentiment.\`,
+            },
+            {
+            role: "user",
+            content: \`This is the user's message: \${scenario.user_message}. Return "positive" or "negative" or "neutral". Explain your answer before you give a score, then return the score on a new line.\`,
+            },
+        ],
+    });
+
+    Here's another example:
+
+    Before:
+
+    definePrompt("openai/ChatCompletion", {
+        model: "gpt-3.5-turbo",
+        messages: [
+          {
+            role: "user",
+            content: \`Title: \${scenario.title}
+      Body: \${scenario.body}
+
+      Need: \${scenario.need}
+
+      Rate likelihood on 1-3 scale.\`,
+          },
+        ],
+        temperature: 0,
+        functions: [
+          {
+            name: "score_post",
+            parameters: {
+              type: "object",
+              properties: {
+                score: {
+                  type: "number",
+                },
+              },
+            },
+          },
+        ],
+        function_call: {
+          name: "score_post",
+        },
+      });
+
+    After:
+
+    definePrompt("openai/ChatCompletion", {
+        model: "gpt-3.5-turbo",
+        messages: [
+          {
+            role: "user",
+            content: \`Title: \${scenario.title}
+      Body: \${scenario.body}
+
+      Need: \${scenario.need}
+
+      Rate likelihood on 1-3 scale. Provide an explanation, but always provide a score afterward.\`,
+          },
+        ],
+        temperature: 0,
+        functions: [
+          {
+            name: "score_post",
+            parameters: {
+              type: "object",
+              properties: {
+                explanation: {
+                  type: "string",
+                }
+                score: {
+                  type: "number",
+                },
+              },
+            },
+          },
+        ],
+        function_call: {
+          name: "score_post",
+        },
+      });
+
+    Add chain of thought to the original prompt.`,
+    },
+    "Convert to function call": {
+      icon: TfiThought,
+      description: "Use function calls to get output from the model in a more structured way.",
+      instructions: `OpenAI functions are a specialized way for an LLM to return output.
+
+    This is what a prompt looks like before adding a function:
+
+    definePrompt("openai/ChatCompletion", {
+      model: "gpt-4",
+      stream: true,
+      messages: [
+        {
+          role: "system",
+          content: \`Evaluate sentiment.\`,
+        },
+        {
+          role: "user",
+          content: \`This is the user's message: \${scenario.user_message}. Return "positive" or "negative" or "neutral"\`,
+        },
+      ],
+    });
+
+    This is what one looks like after adding a function:
+
+    definePrompt("openai/ChatCompletion", {
+      model: "gpt-4",
+      stream: true,
+      messages: [
+        {
+          role: "system",
+          content: "Evaluate sentiment.",
+        },
+        {
+          role: "user",
+          content: scenario.user_message,
+        },
+      ],
+      functions: [
+        {
+          name: "extract_sentiment",
+          parameters: {
+            type: "object", // parameters must always be an object with a properties key
+            properties: { // properties key is required
+              sentiment: {
+                type: "string",
+                description: "one of positive/negative/neutral",
+              },
+            },
+          },
+        },
+      ],
+      function_call: {
+        name: "extract_sentiment",
+      },
+    });
+
+    Here's another example of adding a function:
+
+    Before:
+
+    definePrompt("openai/ChatCompletion", {
+        model: "gpt-3.5-turbo",
+        messages: [
+          {
+            role: "user",
+            content: \`Here is the title and body of a reddit post I am interested in:
+
+            title: \${scenario.title}
+            body: \${scenario.body}
+
+            On a scale from 1 to 3, how likely is it that the person writing this post has the following need? If you are not sure, make your best guess, or answer 1.
+
+            Need: \${scenario.need}
+
+            Answer one integer between 1 and 3.\`,
+          },
+        ],
+        temperature: 0,
+    });
+
+    After:
+
+    definePrompt("openai/ChatCompletion", {
+        model: "gpt-3.5-turbo",
+        messages: [
+          {
+            role: "user",
+            content: \`Title: \${scenario.title}
+      Body: \${scenario.body}
+
+      Need: \${scenario.need}
+
+      Rate likelihood on 1-3 scale.\`,
+          },
+        ],
+        temperature: 0,
+        functions: [
+          {
+            name: "score_post",
+            parameters: {
+              type: "object",
+              properties: {
+                score: {
+                  type: "number",
+                },
+              },
+            },
+          },
+        ],
+        function_call: {
+          name: "score_post",
+        },
+      });
+
+    Another example
+
+    Before:
+
+    definePrompt("openai/ChatCompletion", {
+      model: "gpt-3.5-turbo",
+      stream: true,
+      messages: [
+        {
+          role: "system",
+          content: \`Write 'Start experimenting!' in \${scenario.language}\`,
+        },
+      ],
+    });
+
+    After:
+
+    definePrompt("openai/ChatCompletion", {
+      model: "gpt-3.5-turbo",
+      messages: [
+        {
+          role: "system",
+          content: \`Write 'Start experimenting!' in \${scenario.language}\`,
+        },
+      ],
+      functions: [
+        {
+          name: "write_in_language",
+          parameters: {
+            type: "object",
+            properties: {
+              text: {
+                type: "string",
+              },
+            },
+          },
+        },
+      ],
+      function_call: {
+        name: "write_in_language",
+      },
+    });
+
+    Add an OpenAI function that takes one or more nested parameters that match the expected output from this prompt.`,
+    },
+  },
+  "replicate/llama2": {},
+};
--- a/src/components/VariantHeader/VariantHeader.tsx
+++ b/src/components/VariantHeader/VariantHeader.tsx
@@ -6,6 +6,7 @@ import { useExperimentAccess, useHandledAsyncCallback } from "~/utils/hooks";
 import { HStack, Icon, Text, GridItem, type GridItemProps } from "@chakra-ui/react"; // Changed here
 import { cellPadding, headerMinHeight } from "../constants";
 import AutoResizeTextArea from "../AutoResizeTextArea";
+import { stickyHeaderStyle } from "../OutputsTable/styles";
 import VariantHeaderMenuButton from "./VariantHeaderMenuButton";

 export default function VariantHeader(
@@ -52,17 +53,7 @@ export default function VariantHeader(

  if (!canModify) {
    return (
-      <GridItem
-        padding={0}
-        sx={{
-          position: "sticky",
-          top: "0",
-          // Ensure that the menu always appears above the sticky header of other variants
-          zIndex: menuOpen ? "dropdown" : 10,
-        }}
-        borderTopWidth={1}
-        {...gridItemProps}
-      >
+      <GridItem padding={0} sx={stickyHeaderStyle} borderTopWidth={1} {...gridItemProps}>
        <Text fontSize={16} fontWeight="bold" px={cellPadding.x} py={cellPadding.y}>
          {variant.label}
        </Text>
@@ -74,16 +65,15 @@ export default function VariantHeader(
    <GridItem
      padding={0}
      sx={{
-        position: "sticky",
-        top: "0",
+        ...stickyHeaderStyle,
        // Ensure that the menu always appears above the sticky header of other variants
-        zIndex: menuOpen ? "dropdown" : 10,
+        zIndex: menuOpen ? "dropdown" : stickyHeaderStyle.zIndex,
      }}
      borderTopWidth={1}
      {...gridItemProps}
    >
      <HStack
-        spacing={2}
+        spacing={4}
        alignItems="flex-start"
        minH={headerMinHeight}
        draggable={!isInputHovered}
@@ -102,8 +92,7 @@ export default function VariantHeader(
          setIsDragTarget(false);
        }}
        onDrop={onReorder}
-        backgroundColor={isDragTarget ? "gray.200" : "gray.100"}
-        h="full"
+        backgroundColor={isDragTarget ? "gray.100" : "transparent"}
      >
        <Icon
          as={RiDraggable}
--- a/src/components/VariantHeader/VariantHeaderMenuButton.tsx
+++ b/src/components/VariantHeader/VariantHeaderMenuButton.tsx
@@ -1,7 +1,8 @@
 import { type PromptVariant } from "../OutputsTable/types";
 import { api } from "~/utils/api";
-import { useHandledAsyncCallback, useVisibleScenarioIds } from "~/utils/hooks";
+import { useHandledAsyncCallback } from "~/utils/hooks";
 import {
+  Button,
  Icon,
  Menu,
  MenuButton,
@@ -10,7 +11,6 @@ import {
  MenuDivider,
  Text,
  Spinner,
-  IconButton,
 } from "@chakra-ui/react";
 import { BsFillTrashFill, BsGear, BsStars } from "react-icons/bs";
 import { FaRegClone } from "react-icons/fa";
@@ -33,13 +33,11 @@ export default function VariantHeaderMenuButton({
  const utils = api.useContext();

  const duplicateMutation = api.promptVariants.create.useMutation();
-  const visibleScenarios = useVisibleScenarioIds();

  const [duplicateVariant, duplicationInProgress] = useHandledAsyncCallback(async () => {
    await duplicateMutation.mutateAsync({
      experimentId: variant.experimentId,
      variantId: variant.id,
-      streamScenarios: visibleScenarios,
    });
    await utils.promptVariants.list.invalidate();
  }, [duplicateMutation, variant.experimentId, variant.id]);
@@ -58,12 +56,15 @@ export default function VariantHeaderMenuButton({
  return (
    <>
      <Menu isOpen={menuOpen} onOpen={() => setMenuOpen(true)} onClose={() => setMenuOpen(false)}>
-        <MenuButton
-          as={IconButton}
-          variant="ghost"
-          aria-label="Edit Scenarios"
-          icon={<Icon as={duplicationInProgress ? Spinner : BsGear} />}
-        />
+        {duplicationInProgress ? (
+          <Spinner boxSize={4} mx={3} my={3} />
+        ) : (
+          <MenuButton>
+            <Button variant="ghost">
+              <Icon as={BsGear} />
+            </Button>
+          </MenuButton>
+        )}

        <MenuList mt={-3} fontSize="md">
          <MenuItem icon={<Icon as={FaRegClone} boxSize={4} w={5} />} onClick={duplicateVariant}>
--- a/src/components/experiments/ExperimentCard.tsx
+++ b/src/components/experiments/ExperimentCard.tsx
@@ -1,13 +1,4 @@
-import {
-  HStack,
-  Icon,
-  VStack,
-  Text,
-  Divider,
-  Spinner,
-  AspectRatio,
-  SkeletonText,
-} from "@chakra-ui/react";
+import { HStack, Icon, VStack, Text, Divider, Spinner, AspectRatio } from "@chakra-ui/react";
 import { RiFlaskLine } from "react-icons/ri";
 import { formatTimePast } from "~/utils/dayjs";
 import Link from "next/link";
@@ -102,13 +93,3 @@ export const NewExperimentCard = () => {
    </AspectRatio>
  );
 };
-
-export const ExperimentCardSkeleton = () => (
-  <AspectRatio ratio={1.2} w="full">
-    <VStack align="center" borderColor="gray.200" borderWidth={1} p={4} bg="gray.50">
-      <SkeletonText noOfLines={1} w="80%" />
-      <SkeletonText noOfLines={2} w="60%" />
-      <SkeletonText noOfLines={1} w="80%" />
-    </VStack>
-  </AspectRatio>
-);
--- a/src/components/experiments/HeaderButtons/DeleteDialog.tsx
+++ b/src/components/experiments/HeaderButtons/DeleteDialog.tsx
@@ -1,57 +0,0 @@
-import {
-  Button,
-  AlertDialog,
-  AlertDialogBody,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogContent,
-  AlertDialogOverlay,
-} from "@chakra-ui/react";
-
-import { useRouter } from "next/router";
-import { useRef } from "react";
-import { api } from "~/utils/api";
-import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
-
-export const DeleteDialog = ({ onClose }: { onClose: () => void }) => {
-  const experiment = useExperiment();
-  const deleteMutation = api.experiments.delete.useMutation();
-  const utils = api.useContext();
-  const router = useRouter();
-
-  const cancelRef = useRef<HTMLButtonElement>(null);
-
-  const [onDeleteConfirm] = useHandledAsyncCallback(async () => {
-    if (!experiment.data?.id) return;
-    await deleteMutation.mutateAsync({ id: experiment.data.id });
-    await utils.experiments.list.invalidate();
-    await router.push({ pathname: "/experiments" });
-    onClose();
-  }, [deleteMutation, experiment.data?.id, router]);
-
-  return (
-    <AlertDialog isOpen leastDestructiveRef={cancelRef} onClose={onClose}>
-      <AlertDialogOverlay>
-        <AlertDialogContent>
-          <AlertDialogHeader fontSize="lg" fontWeight="bold">
-            Delete Experiment
-          </AlertDialogHeader>
-
-          <AlertDialogBody>
-            If you delete this experiment all the associated prompts and scenarios will be deleted
-            as well. Are you sure?
-          </AlertDialogBody>
-
-          <AlertDialogFooter>
-            <Button ref={cancelRef} onClick={onClose}>
-              Cancel
-            </Button>
-            <Button colorScheme="red" onClick={onDeleteConfirm} ml={3}>
-              Delete
-            </Button>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialogOverlay>
-    </AlertDialog>
-  );
-};
--- a/src/components/experiments/HeaderButtons/HeaderButtons.tsx
+++ b/src/components/experiments/HeaderButtons/HeaderButtons.tsx
@@ -1,42 +0,0 @@
-import { Button, HStack, Icon, Spinner, Text } from "@chakra-ui/react";
-import { useOnForkButtonPressed } from "./useOnForkButtonPressed";
-import { useExperiment } from "~/utils/hooks";
-import { BsGearFill } from "react-icons/bs";
-import { TbGitFork } from "react-icons/tb";
-import { useAppStore } from "~/state/store";
-
-export const HeaderButtons = () => {
-  const experiment = useExperiment();
-
-  const canModify = experiment.data?.access.canModify ?? false;
-
-  const { onForkButtonPressed, isForking } = useOnForkButtonPressed();
-
-  const openDrawer = useAppStore((s) => s.openDrawer);
-
-  if (experiment.isLoading) return null;
-
-  return (
-    <HStack spacing={0} mt={{ base: 2, md: 0 }}>
-      <Button
-        onClick={onForkButtonPressed}
-        mr={4}
-        colorScheme={canModify ? undefined : "orange"}
-        bgColor={canModify ? undefined : "orange.400"}
-        minW={0}
-        variant={{ base: "solid", md: canModify ? "ghost" : "solid" }}
-      >
-        {isForking ? <Spinner boxSize={5} /> : <Icon as={TbGitFork} boxSize={5} />}
-        <Text ml={2}>Fork</Text>
-      </Button>
-      {canModify && (
-        <Button variant={{ base: "solid", md: "ghost" }} onClick={openDrawer}>
-          <HStack>
-            <Icon as={BsGearFill} />
-            <Text>Settings</Text>
-          </HStack>
-        </Button>
-      )}
-    </HStack>
-  );
-};
--- a/src/components/experiments/HeaderButtons/useOnForkButtonPressed.tsx
+++ b/src/components/experiments/HeaderButtons/useOnForkButtonPressed.tsx
@@ -1,30 +0,0 @@
-import { useCallback } from "react";
-import { api } from "~/utils/api";
-import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
-import { signIn, useSession } from "next-auth/react";
-import { useRouter } from "next/router";
-
-export const useOnForkButtonPressed = () => {
-  const router = useRouter();
-
-  const user = useSession().data;
-  const experiment = useExperiment();
-
-  const forkMutation = api.experiments.fork.useMutation();
-
-  const [onFork, isForking] = useHandledAsyncCallback(async () => {
-    if (!experiment.data?.id) return;
-    const forkedExperimentId = await forkMutation.mutateAsync({ id: experiment.data.id });
-    await router.push({ pathname: "/experiments/[id]", query: { id: forkedExperimentId } });
-  }, [forkMutation, experiment.data?.id, router]);
-
-  const onForkButtonPressed = useCallback(() => {
-    if (user === null) {
-      signIn("github").catch(console.error);
-    } else {
-      onFork();
-    }
-  }, [onFork, user]);
-
-  return { onForkButtonPressed, isForking };
-};
--- a/src/components/nav/AppShell.tsx
+++ b/src/components/nav/AppShell.tsx
@@ -84,11 +84,7 @@ const NavSidebar = () => {
          />
        )}
      </VStack>
-      {user ? (
-        <UserMenu user={user} borderColor={"gray.200"} borderTopWidth={1} borderBottomWidth={1} />
-      ) : (
-        <Divider />
-      )}
+      {user ? <UserMenu user={user} /> : <Divider />}
      <VStack spacing={0} align="center">
        <Link
          href="https://github.com/openpipe/openpipe"
--- a/src/components/nav/UserMenu.tsx
+++ b/src/components/nav/UserMenu.tsx
@@ -8,16 +8,12 @@ import {
  PopoverTrigger,
  PopoverContent,
  Link,
-  useColorMode,
-  type StackProps,
 } from "@chakra-ui/react";
 import { type Session } from "next-auth";
 import { signOut } from "next-auth/react";
 import { BsBoxArrowRight, BsChevronRight, BsPersonCircle } from "react-icons/bs";

-export default function UserMenu({ user, ...rest }: { user: Session } & StackProps) {
-  const { colorMode } = useColorMode();
-
+export default function UserMenu({ user }: { user: Session }) {
  const profileImage = user.user.image ? (
    <Image src={user.user.image} alt="profile picture" boxSize={8} borderRadius="50%" />
  ) : (
@@ -33,10 +29,12 @@ export default function UserMenu({ user, ...rest }: { user: Session } & StackPro
            px={3}
            spacing={3}
            py={2}
-            {...rest}
+            borderColor={"gray.200"}
+            borderTopWidth={1}
+            borderBottomWidth={1}
            cursor="pointer"
            _hover={{
-              bgColor: colorMode === "light" ? "gray.200" : "gray.700",
+              bgColor: "gray.200",
            }}
          >
            {profileImage}
--- a/src/env.mjs
+++ b/src/env.mjs
@@ -18,7 +18,6 @@ export const env = createEnv({
    GITHUB_CLIENT_SECRET: z.string().min(1),
    OPENAI_API_KEY: z.string().min(1),
    REPLICATE_API_TOKEN: z.string().default("placeholder"),
-    ANTHROPIC_API_KEY: z.string().default("placeholder"),
  },

  /**
@@ -45,7 +44,6 @@ export const env = createEnv({
    GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID,
    GITHUB_CLIENT_SECRET: process.env.GITHUB_CLIENT_SECRET,
    REPLICATE_API_TOKEN: process.env.REPLICATE_API_TOKEN,
-    ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY,
  },
  /**
   * Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation.
--- a/src/modelProviders/anthropic/codegen/codegen.ts
+++ b/src/modelProviders/anthropic/codegen/codegen.ts
@@ -1,69 +0,0 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-
-import YAML from "yaml";
-import fs from "fs";
-import path from "path";
-import { openapiSchemaToJsonSchema } from "@openapi-contrib/openapi-schema-to-json-schema";
-import $RefParser from "@apidevtools/json-schema-ref-parser";
-import { type JSONObject } from "superjson/dist/types";
-import assert from "assert";
-import { type JSONSchema4Object } from "json-schema";
-import { isObject } from "lodash-es";
-
-// @ts-expect-error for some reason missing from types
-import parserEstree from "prettier/plugins/estree";
-import parserBabel from "prettier/plugins/babel";
-import prettier from "prettier/standalone";
-
-const OPENAPI_URL =
-  "https://raw.githubusercontent.com/tryAGI/Anthropic/1c0871e861de60a4c3a843cb90e17d63e86c234a/docs/openapi.yaml";
-
-// Fetch the openapi document
-const response = await fetch(OPENAPI_URL);
-const openApiYaml = await response.text();
-
-// Parse the yaml document
-let schema = YAML.parse(openApiYaml) as JSONObject;
-schema = openapiSchemaToJsonSchema(schema);
-
-const jsonSchema = await $RefParser.dereference(schema);
-
-assert("components" in jsonSchema);
-const completionRequestSchema = jsonSchema.components.schemas
-  .CreateCompletionRequest as JSONSchema4Object;
-
-// We need to do a bit of surgery here since the Monaco editor doesn't like
-// the fact that the schema says `model` can be either a string or an enum,
-// and displays a warning in the editor. Let's stick with just an enum for
-// now and drop the string option.
-assert(
-  "properties" in completionRequestSchema &&
-    isObject(completionRequestSchema.properties) &&
-    "model" in completionRequestSchema.properties &&
-    isObject(completionRequestSchema.properties.model),
-);
-
-const modelProperty = completionRequestSchema.properties.model;
-assert(
-  "oneOf" in modelProperty &&
-    Array.isArray(modelProperty.oneOf) &&
-    modelProperty.oneOf.length === 2 &&
-    isObject(modelProperty.oneOf[1]) &&
-    "enum" in modelProperty.oneOf[1],
-  "Expected model to have oneOf length of 2",
-);
-modelProperty.type = "string";
-modelProperty.enum = modelProperty.oneOf[1].enum;
-delete modelProperty["oneOf"];
-
-// Get the directory of the current script
-const currentDirectory = path.dirname(import.meta.url).replace("file://", "");
-
-// Write the JSON schema to a file in the current directory
-fs.writeFileSync(
-  path.join(currentDirectory, "input.schema.json"),
-  await prettier.format(JSON.stringify(completionRequestSchema, null, 2), {
-    parser: "json",
-    plugins: [parserBabel, parserEstree],
-  }),
-);
--- a/src/modelProviders/anthropic/codegen/input.schema.json
+++ b/src/modelProviders/anthropic/codegen/input.schema.json
@@ -1,129 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "model": {
-      "description": "The model that will complete your prompt.\nAs we improve Claude, we develop new versions of it that you can query.\nThis parameter controls which version of Claude answers your request.\nRight now we are offering two model families: Claude, and Claude Instant.\nYou can use them by setting model to \"claude-2\" or \"claude-instant-1\", respectively.\nSee models for additional details.\n",
-      "x-oaiTypeLabel": "string",
-      "type": "string",
-      "enum": [
-        "claude-2",
-        "claude-2.0",
-        "claude-instant-1",
-        "claude-instant-1.1"
-      ]
-    },
-    "prompt": {
-      "description": "The prompt that you want Claude to complete.\n\nFor proper response generation you will need to format your prompt as follows:\n\\n\\nHuman: ${userQuestion}\\n\\nAssistant:\nSee our comments on prompts for more context.\n",
-      "default": "<|endoftext|>",
-      "nullable": true,
-      "oneOf": [
-        {
-          "type": "string",
-          "default": "",
-          "example": "This is a test."
-        },
-        {
-          "type": "array",
-          "items": {
-            "type": "string",
-            "default": "",
-            "example": "This is a test."
-          }
-        },
-        {
-          "type": "array",
-          "minItems": 1,
-          "items": {
-            "type": "integer"
-          },
-          "example": "[1212, 318, 257, 1332, 13]"
-        },
-        {
-          "type": "array",
-          "minItems": 1,
-          "items": {
-            "type": "array",
-            "minItems": 1,
-            "items": {
-              "type": "integer"
-            }
-          },
-          "example": "[[1212, 318, 257, 1332, 13]]"
-        }
-      ]
-    },
-    "max_tokens_to_sample": {
-      "type": "integer",
-      "minimum": 1,
-      "default": 256,
-      "example": 256,
-      "nullable": true,
-      "description": "The maximum number of tokens to generate before stopping.\n\nNote that our models may stop before reaching this maximum. This parameter only specifies the absolute maximum number of tokens to generate.\n"
-    },
-    "temperature": {
-      "type": "number",
-      "minimum": 0,
-      "maximum": 1,
-      "default": 1,
-      "example": 1,
-      "nullable": true,
-      "description": "Amount of randomness injected into the response.\n\nDefaults to 1. Ranges from 0 to 1. Use temp closer to 0 for analytical / multiple choice, and closer to 1 for creative and generative tasks.\n"
-    },
-    "top_p": {
-      "type": "number",
-      "minimum": 0,
-      "maximum": 1,
-      "default": 1,
-      "example": 1,
-      "nullable": true,
-      "description": "Use nucleus sampling.\n\nIn nucleus sampling, we compute the cumulative distribution over all the options \nfor each subsequent token in decreasing probability order and cut it off once \nit reaches a particular probability specified by top_p. You should either alter temperature or top_p, but not both.\n"
-    },
-    "top_k": {
-      "type": "number",
-      "minimum": 0,
-      "default": 5,
-      "example": 5,
-      "nullable": true,
-      "description": "Only sample from the top K options for each subsequent token.\n\nUsed to remove \"long tail\" low probability responses. Learn more technical details here.\n"
-    },
-    "stream": {
-      "description": "Whether to incrementally stream the response using server-sent events.\nSee this guide to SSE events for details.type: boolean\n",
-      "nullable": true,
-      "default": false
-    },
-    "stop_sequences": {
-      "description": "Sequences that will cause the model to stop generating completion text.\nOur models stop on \"\\n\\nHuman:\", and may include additional built-in stop sequences in the future. By providing the stop_sequences parameter, you may include additional strings that will cause the model to stop generating.\n",
-      "default": null,
-      "nullable": true,
-      "oneOf": [
-        {
-          "type": "string",
-          "default": "<|endoftext|>",
-          "example": "\n",
-          "nullable": true
-        },
-        {
-          "type": "array",
-          "minItems": 1,
-          "maxItems": 4,
-          "items": {
-            "type": "string",
-            "example": "[\"\\n\"]"
-          }
-        }
-      ]
-    },
-    "metadata": {
-      "type": "object",
-      "properties": {
-        "user_id": {
-          "type": "string",
-          "example": "13803d75-b4b5-4c3e-b2a2-6f21399b021b",
-          "description": "An external identifier for the user who is associated with the request.\n\nThis should be a uuid, hash value, or other opaque identifier. Anthropic may use this id to help detect abuse. \nDo not include any identifying information such as name, email address, or phone number.\n"
-        }
-      },
-      "description": "An object describing metadata about the request.\n"
-    }
-  },
-  "required": ["model", "prompt", "max_tokens_to_sample"]
-}
--- a/src/modelProviders/anthropic/frontend.ts
+++ b/src/modelProviders/anthropic/frontend.ts
@@ -1,40 +0,0 @@
-import { type Completion } from "@anthropic-ai/sdk/resources";
-import { type SupportedModel } from ".";
-import { type FrontendModelProvider } from "../types";
-import { refinementActions } from "./refinementActions";
-
-const frontendModelProvider: FrontendModelProvider<SupportedModel, Completion> = {
-  name: "Replicate Llama2",
-
-  models: {
-    "claude-2.0": {
-      name: "Claude 2.0",
-      contextWindow: 100000,
-      promptTokenPrice: 11.02 / 1000000,
-      completionTokenPrice: 32.68 / 1000000,
-      speed: "medium",
-      provider: "anthropic",
-      learnMoreUrl: "https://www.anthropic.com/product",
-    },
-    "claude-instant-1.1": {
-      name: "Claude Instant 1.1",
-      contextWindow: 100000,
-      promptTokenPrice: 1.63 / 1000000,
-      completionTokenPrice: 5.51 / 1000000,
-      speed: "fast",
-      provider: "anthropic",
-      learnMoreUrl: "https://www.anthropic.com/product",
-    },
-  },
-
-  refinementActions,
-
-  normalizeOutput: (output) => {
-    return {
-      type: "text",
-      value: output.completion,
-    };
-  },
-};
-
-export default frontendModelProvider;
--- a/src/modelProviders/anthropic/getCompletion.ts
+++ b/src/modelProviders/anthropic/getCompletion.ts
@@ -1,86 +0,0 @@
-import { env } from "~/env.mjs";
-import { type CompletionResponse } from "../types";
-
-import Anthropic, { APIError } from "@anthropic-ai/sdk";
-import { type Completion, type CompletionCreateParams } from "@anthropic-ai/sdk/resources";
-import { isObject, isString } from "lodash-es";
-
-const anthropic = new Anthropic({
-  apiKey: env.ANTHROPIC_API_KEY,
-});
-
-export async function getCompletion(
-  input: CompletionCreateParams,
-  onStream: ((partialOutput: Completion) => void) | null,
-): Promise<CompletionResponse<Completion>> {
-  const start = Date.now();
-  let finalCompletion: Completion | null = null;
-
-  try {
-    if (onStream) {
-      const resp = await anthropic.completions.create(
-        { ...input, stream: true },
-        {
-          maxRetries: 0,
-        },
-      );
-
-      for await (const part of resp) {
-        if (finalCompletion === null) {
-          finalCompletion = part;
-        } else {
-          finalCompletion = { ...part, completion: finalCompletion.completion + part.completion };
-        }
-        onStream(finalCompletion);
-      }
-      if (!finalCompletion) {
-        return {
-          type: "error",
-          message: "Streaming failed to return a completion",
-          autoRetry: false,
-        };
-      }
-    } else {
-      const resp = await anthropic.completions.create(
-        { ...input, stream: false },
-        {
-          maxRetries: 0,
-        },
-      );
-      finalCompletion = resp;
-    }
-    const timeToComplete = Date.now() - start;
-
-    return {
-      type: "success",
-      statusCode: 200,
-      value: finalCompletion,
-      timeToComplete,
-    };
-  } catch (error: unknown) {
-    console.log("CAUGHT ERROR", error);
-    if (error instanceof APIError) {
-      const message =
-        isObject(error.error) &&
-        "error" in error.error &&
-        isObject(error.error.error) &&
-        "message" in error.error.error &&
-        isString(error.error.error.message)
-          ? error.error.error.message
-          : error.message;
-
-      return {
-        type: "error",
-        message,
-        autoRetry: error.status === 429 || error.status === 503,
-        statusCode: error.status,
-      };
-    } else {
-      return {
-        type: "error",
-        message: (error as Error).message,
-        autoRetry: true,
-      };
-    }
-  }
-}
--- a/src/modelProviders/anthropic/index.ts
+++ b/src/modelProviders/anthropic/index.ts
@@ -1,34 +0,0 @@
-import { type JSONSchema4 } from "json-schema";
-import { type ModelProvider } from "../types";
-import inputSchema from "./codegen/input.schema.json";
-import { getCompletion } from "./getCompletion";
-import frontendModelProvider from "./frontend";
-import type { Completion, CompletionCreateParams } from "@anthropic-ai/sdk/resources";
-
-const supportedModels = ["claude-2.0", "claude-instant-1.1"] as const;
-
-export type SupportedModel = (typeof supportedModels)[number];
-
-export type AnthropicProvider = ModelProvider<SupportedModel, CompletionCreateParams, Completion>;
-
-const modelProvider: AnthropicProvider = {
-  getModel: (input) => {
-    if (supportedModels.includes(input.model as SupportedModel))
-      return input.model as SupportedModel;
-
-    const modelMaps: Record<string, SupportedModel> = {
-      "claude-2": "claude-2.0",
-      "claude-instant-1": "claude-instant-1.1",
-    };
-
-    if (input.model in modelMaps) return modelMaps[input.model] as SupportedModel;
-
-    return null;
-  },
-  inputSchema: inputSchema as JSONSchema4,
-  canStream: true,
-  getCompletion,
-  ...frontendModelProvider,
-};
-
-export default modelProvider;
--- a/src/modelProviders/anthropic/refinementActions.ts
+++ b/src/modelProviders/anthropic/refinementActions.ts
@@ -1,3 +0,0 @@
-import { type RefinementAction } from "../types";
-
-export const refinementActions: Record<string, RefinementAction> = {};
--- a/src/modelProviders/frontendModelProviders.ts
+++ b/src/modelProviders/frontendModelProviders.ts
@@ -1,15 +1,15 @@
 import openaiChatCompletionFrontend from "./openai-ChatCompletion/frontend";
 import replicateLlama2Frontend from "./replicate-llama2/frontend";
-import anthropicFrontend from "./anthropic/frontend";
 import { type SupportedProvider, type FrontendModelProvider } from "./types";

+// TODO: make sure we get a typescript error if you forget to add a provider here
+
 // Keep attributes here that need to be accessible from the frontend. We can't
 // just include them in the default `modelProviders` object because it has some
 // transient dependencies that can only be imported on the server.
 const frontendModelProviders: Record<SupportedProvider, FrontendModelProvider<any, any>> = {
  "openai/ChatCompletion": openaiChatCompletionFrontend,
  "replicate/llama2": replicateLlama2Frontend,
-  anthropic: anthropicFrontend,
 };

 export default frontendModelProviders;
--- a/src/modelProviders/modelProviders.ts
+++ b/src/modelProviders/modelProviders.ts
@@ -1,12 +1,10 @@
 import openaiChatCompletion from "./openai-ChatCompletion";
 import replicateLlama2 from "./replicate-llama2";
-import anthropic from "./anthropic";
 import { type SupportedProvider, type ModelProvider } from "./types";

 const modelProviders: Record<SupportedProvider, ModelProvider<any, any, any>> = {
  "openai/ChatCompletion": openaiChatCompletion,
  "replicate/llama2": replicateLlama2,
-  anthropic,
 };

 export default modelProviders;
--- a/src/modelProviders/openai-ChatCompletion/frontend.ts
+++ b/src/modelProviders/openai-ChatCompletion/frontend.ts
@@ -2,7 +2,6 @@ import { type JsonValue } from "type-fest";
 import { type SupportedModel } from ".";
 import { type FrontendModelProvider } from "../types";
 import { type ChatCompletion } from "openai/resources/chat";
-import { refinementActions } from "./refinementActions";

 const frontendModelProvider: FrontendModelProvider<SupportedModel, ChatCompletion> = {
  name: "OpenAI ChatCompletion",
@@ -46,8 +45,6 @@ const frontendModelProvider: FrontendModelProvider<SupportedModel, ChatCompletio
    },
  },

-  refinementActions,
-
  normalizeOutput: (output) => {
    const message = output.choices[0]?.message;
    if (!message)
--- a/src/modelProviders/openai-ChatCompletion/getCompletion.ts
+++ b/src/modelProviders/openai-ChatCompletion/getCompletion.ts
@@ -120,6 +120,7 @@ export async function getCompletion(
      cost,
    };
  } catch (error: unknown) {
+    console.error("ERROR IS", error);
    if (error instanceof APIError) {
      return {
        type: "error",
--- a/src/modelProviders/openai-ChatCompletion/index.ts
+++ b/src/modelProviders/openai-ChatCompletion/index.ts
@@ -37,7 +37,7 @@ const modelProvider: OpenaiChatModelProvider = {
    return null;
  },
  inputSchema: inputSchema as JSONSchema4,
-  canStream: true,
+  shouldStream: (input) => input.stream ?? false,
  getCompletion,
  ...frontendModelProvider,
 };
--- a/src/modelProviders/openai-ChatCompletion/refinementActions.ts
+++ b/src/modelProviders/openai-ChatCompletion/refinementActions.ts
@@ -1,279 +0,0 @@
-import { TfiThought } from "react-icons/tfi";
-import { type RefinementAction } from "../types";
-import { VscJson } from "react-icons/vsc";
-
-export const refinementActions: Record<string, RefinementAction> = {
-  "Add chain of thought": {
-    icon: VscJson,
-    description: "Asking the model to plan its answer can increase accuracy.",
-    instructions: `Adding chain of thought means asking the model to think about its answer before it gives it to you. This is useful for getting more accurate answers. Do not add an assistant message.
-  
-      This is what a prompt looks like before adding chain of thought:
-  
-      definePrompt("openai/ChatCompletion", {
-          model: "gpt-4",
-          stream: true,
-          messages: [
-              {
-              role: "system",
-              content: \`Evaluate sentiment.\`,
-              },
-              {
-              role: "user",
-              content: \`This is the user's message: \${scenario.user_message}. Return "positive" or "negative" or "neutral"\`,
-              },
-          ],
-      });
-  
-      This is what one looks like after adding chain of thought:
-  
-      definePrompt("openai/ChatCompletion", {
-          model: "gpt-4",
-          stream: true,
-          messages: [
-              {
-              role: "system",
-              content: \`Evaluate sentiment.\`,
-              },
-              {
-              role: "user",
-              content: \`This is the user's message: \${scenario.user_message}. Return "positive" or "negative" or "neutral". Explain your answer before you give a score, then return the score on a new line.\`,
-              },
-          ],
-      });
-  
-      Here's another example:
-  
-      Before:
-  
-      definePrompt("openai/ChatCompletion", {
-          model: "gpt-3.5-turbo",
-          messages: [
-            {
-              role: "user",
-              content: \`Title: \${scenario.title}
-        Body: \${scenario.body}
-  
-        Need: \${scenario.need}
-  
-        Rate likelihood on 1-3 scale.\`,
-            },
-          ],
-          temperature: 0,
-          functions: [
-            {
-              name: "score_post",
-              parameters: {
-                type: "object",
-                properties: {
-                  score: {
-                    type: "number",
-                  },
-                },
-              },
-            },
-          ],
-          function_call: {
-            name: "score_post",
-          },
-        });
-  
-      After:
-  
-      definePrompt("openai/ChatCompletion", {
-          model: "gpt-3.5-turbo",
-          messages: [
-            {
-              role: "user",
-              content: \`Title: \${scenario.title}
-        Body: \${scenario.body}
-  
-        Need: \${scenario.need}
-  
-        Rate likelihood on 1-3 scale. Provide an explanation, but always provide a score afterward.\`,
-            },
-          ],
-          temperature: 0,
-          functions: [
-            {
-              name: "score_post",
-              parameters: {
-                type: "object",
-                properties: {
-                  explanation: {
-                    type: "string",
-                  }
-                  score: {
-                    type: "number",
-                  },
-                },
-              },
-            },
-          ],
-          function_call: {
-            name: "score_post",
-          },
-        });
-  
-      Add chain of thought to the original prompt.`,
-  },
-  "Convert to function call": {
-    icon: TfiThought,
-    description: "Use function calls to get output from the model in a more structured way.",
-    instructions: `OpenAI functions are a specialized way for an LLM to return output.
-  
-      This is what a prompt looks like before adding a function:
-  
-      definePrompt("openai/ChatCompletion", {
-        model: "gpt-4",
-        stream: true,
-        messages: [
-          {
-            role: "system",
-            content: \`Evaluate sentiment.\`,
-          },
-          {
-            role: "user",
-            content: \`This is the user's message: \${scenario.user_message}. Return "positive" or "negative" or "neutral"\`,
-          },
-        ],
-      });
-  
-      This is what one looks like after adding a function:
-  
-      definePrompt("openai/ChatCompletion", {
-        model: "gpt-4",
-        stream: true,
-        messages: [
-          {
-            role: "system",
-            content: "Evaluate sentiment.",
-          },
-          {
-            role: "user",
-            content: scenario.user_message,
-          },
-        ],
-        functions: [
-          {
-            name: "extract_sentiment",
-            parameters: {
-              type: "object", // parameters must always be an object with a properties key
-              properties: { // properties key is required
-                sentiment: {
-                  type: "string",
-                  description: "one of positive/negative/neutral",
-                },
-              },
-            },
-          },
-        ],
-        function_call: {
-          name: "extract_sentiment",
-        },
-      });
-  
-      Here's another example of adding a function:
-  
-      Before:
-  
-      definePrompt("openai/ChatCompletion", {
-          model: "gpt-3.5-turbo",
-          messages: [
-            {
-              role: "user",
-              content: \`Here is the title and body of a reddit post I am interested in:
-  
-              title: \${scenario.title}
-              body: \${scenario.body}
-  
-              On a scale from 1 to 3, how likely is it that the person writing this post has the following need? If you are not sure, make your best guess, or answer 1.
-  
-              Need: \${scenario.need}
-  
-              Answer one integer between 1 and 3.\`,
-            },
-          ],
-          temperature: 0,
-      });
-  
-      After:
-  
-      definePrompt("openai/ChatCompletion", {
-          model: "gpt-3.5-turbo",
-          messages: [
-            {
-              role: "user",
-              content: \`Title: \${scenario.title}
-        Body: \${scenario.body}
-  
-        Need: \${scenario.need}
-  
-        Rate likelihood on 1-3 scale.\`,
-            },
-          ],
-          temperature: 0,
-          functions: [
-            {
-              name: "score_post",
-              parameters: {
-                type: "object",
-                properties: {
-                  score: {
-                    type: "number",
-                  },
-                },
-              },
-            },
-          ],
-          function_call: {
-            name: "score_post",
-          },
-        });
-  
-      Another example
-  
-      Before:
-  
-      definePrompt("openai/ChatCompletion", {
-        model: "gpt-3.5-turbo",
-        stream: true,
-        messages: [
-          {
-            role: "system",
-            content: \`Write 'Start experimenting!' in \${scenario.language}\`,
-          },
-        ],
-      });
-  
-      After:
-  
-      definePrompt("openai/ChatCompletion", {
-        model: "gpt-3.5-turbo",
-        messages: [
-          {
-            role: "system",
-            content: \`Write 'Start experimenting!' in \${scenario.language}\`,
-          },
-        ],
-        functions: [
-          {
-            name: "write_in_language",
-            parameters: {
-              type: "object",
-              properties: {
-                text: {
-                  type: "string",
-                },
-              },
-            },
-          },
-        ],
-        function_call: {
-          name: "write_in_language",
-        },
-      });
-  
-      Add an OpenAI function that takes one or more nested parameters that match the expected output from this prompt.`,
-  },
-};
--- a/src/modelProviders/replicate-llama2/frontend.ts
+++ b/src/modelProviders/replicate-llama2/frontend.ts
@@ -1,6 +1,5 @@
 import { type SupportedModel, type ReplicateLlama2Output } from ".";
 import { type FrontendModelProvider } from "../types";
-import { refinementActions } from "./refinementActions";

 const frontendModelProvider: FrontendModelProvider<SupportedModel, ReplicateLlama2Output> = {
  name: "Replicate Llama2",
@@ -32,8 +31,6 @@ const frontendModelProvider: FrontendModelProvider<SupportedModel, ReplicateLlam
    },
  },

-  refinementActions,
-
  normalizeOutput: (output) => {
    return {
      type: "text",
--- a/src/modelProviders/replicate-llama2/getCompletion.ts
+++ b/src/modelProviders/replicate-llama2/getCompletion.ts
@@ -8,9 +8,9 @@ const replicate = new Replicate({
 });

 const modelIds: Record<ReplicateLlama2Input["model"], string> = {
-  "7b-chat": "058333670f2a6e88cf1b29b8183405b17bb997767282f790b82137df8c090c1f",
-  "13b-chat": "d5da4236b006f967ceb7da037be9cfc3924b20d21fed88e1e94f19d56e2d3111",
-  "70b-chat": "2c1608e18606fad2812020dc541930f2d0495ce32eee50074220b87300bc16e1",
+  "7b-chat": "3725a659b5afff1a0ba9bead5fac3899d998feaad00e07032ca2b0e35eb14f8a",
+  "13b-chat": "5c785d117c5bcdd1928d5a9acb1ffa6272d6cf13fcb722e90886a0196633f9d3",
+  "70b-chat": "e951f18578850b652510200860fc4ea62b3b16fac280f83ff32282f87bbd2e48",
 };

 export async function getCompletion(
@@ -19,7 +19,7 @@ export async function getCompletion(
 ): Promise<CompletionResponse<ReplicateLlama2Output>> {
  const start = Date.now();

-  const { model, ...rest } = input;
+  const { model, stream, ...rest } = input;

  try {
    const prediction = await replicate.predictions.create({
--- a/src/modelProviders/replicate-llama2/index.ts
+++ b/src/modelProviders/replicate-llama2/index.ts
@@ -9,6 +9,7 @@ export type SupportedModel = (typeof supportedModels)[number];
 export type ReplicateLlama2Input = {
  model: SupportedModel;
  prompt: string;
+  stream?: boolean;
  max_length?: number;
  temperature?: number;
  top_p?: number;
@@ -37,43 +38,31 @@ const modelProvider: ReplicateLlama2Provider = {
        type: "string",
        enum: supportedModels as unknown as string[],
      },
-      system_prompt: {
-        type: "string",
-        description:
-          "System prompt to send to Llama v2. This is prepended to the prompt and helps guide system behavior.",
-      },
      prompt: {
        type: "string",
-        description: "Prompt to send to Llama v2.",
      },
-      max_new_tokens: {
+      stream: {
+        type: "boolean",
+      },
+      max_length: {
        type: "number",
-        description:
-          "Maximum number of tokens to generate. A word is generally 2-3 tokens (minimum: 1)",
      },
      temperature: {
        type: "number",
-        description:
-          "Adjusts randomness of outputs, greater than 1 is random and 0 is deterministic, 0.75 is a good starting value. (minimum: 0.01; maximum: 5)",
      },
      top_p: {
        type: "number",
-        description:
-          "When decoding text, samples from the top p percentage of most likely tokens; lower to ignore less likely tokens (minimum: 0.01; maximum: 1)",
      },
      repetition_penalty: {
        type: "number",
-        description:
-          "Penalty for repeated words in generated text; 1 is no penalty, values greater than 1 discourage repetition, less than 1 encourage it. (minimum: 0.01; maximum: 5)",
      },
      debug: {
        type: "boolean",
-        description: "provide debugging output in logs",
      },
    },
    required: ["model", "prompt"],
  },
-  canStream: true,
+  shouldStream: (input) => input.stream ?? false,
  getCompletion,
  ...frontendModelProvider,
 };
--- a/src/modelProviders/replicate-llama2/refinementActions.ts
+++ b/src/modelProviders/replicate-llama2/refinementActions.ts
@@ -1,3 +0,0 @@
-import { type RefinementAction } from "../types";
-
-export const refinementActions: Record<string, RefinementAction> = {};
--- a/src/modelProviders/types.ts
+++ b/src/modelProviders/types.ts
@@ -1,36 +1,31 @@
 import { type JSONSchema4 } from "json-schema";
-import { type IconType } from "react-icons";
 import { type JsonValue } from "type-fest";
 import { z } from "zod";

-export const ZodSupportedProvider = z.union([
+const ZodSupportedProvider = z.union([
  z.literal("openai/ChatCompletion"),
  z.literal("replicate/llama2"),
-  z.literal("anthropic"),
 ]);

 export type SupportedProvider = z.infer<typeof ZodSupportedProvider>;

-export type Model = {
-  name: string;
-  contextWindow: number;
-  promptTokenPrice?: number;
-  completionTokenPrice?: number;
-  pricePerSecond?: number;
-  speed: "fast" | "medium" | "slow";
-  provider: SupportedProvider;
-  description?: string;
-  learnMoreUrl?: string;
-};
+export const ZodModel = z.object({
+  name: z.string(),
+  contextWindow: z.number(),
+  promptTokenPrice: z.number().optional(),
+  completionTokenPrice: z.number().optional(),
+  pricePerSecond: z.number().optional(),
+  speed: z.union([z.literal("fast"), z.literal("medium"), z.literal("slow")]),
+  provider: ZodSupportedProvider,
+  description: z.string().optional(),
+  learnMoreUrl: z.string().optional(),
+});

-export type ProviderModel = { provider: z.infer<typeof ZodSupportedProvider>; model: string };
-
-export type RefinementAction = { icon?: IconType; description: string; instructions: string };
+export type Model = z.infer<typeof ZodModel>;

 export type FrontendModelProvider<SupportedModels extends string, OutputSchema> = {
  name: string;
  models: Record<SupportedModels, Model>;
-  refinementActions?: Record<string, RefinementAction>;

  normalizeOutput: (output: OutputSchema) => NormalizedOutput;
 };
@@ -49,7 +44,7 @@ export type CompletionResponse<T> =

 export type ModelProvider<SupportedModels extends string, InputSchema, OutputSchema> = {
  getModel: (input: InputSchema) => SupportedModels | null;
-  canStream: boolean;
+  shouldStream: (input: InputSchema) => boolean;
  inputSchema: JSONSchema4;
  getCompletion: (
    input: InputSchema,
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -21,17 +21,6 @@ const MyApp: AppType<{ session: Session | null }> = ({
          name="viewport"
          content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"
        />
-        <meta name="og:title" content="OpenPipe: Open-Source Lab for LLMs" key="title" />
-        <meta
-          name="og:description"
-          content="OpenPipe is a powerful playground for quickly optimizing performance, cost, and speed across models."
-          key="description"
-        />
-        <meta name="og:image" content="/og.png" key="og-image" />
-        <meta property="og:image:height" content="630" />
-        <meta property="og:image:width" content="1200" />
-        <meta name="twitter:card" content="summary_large_image" />
-        <meta name="twitter:image" content="/og.png" />
      </Head>
      <SessionProvider session={session}>
        <SyncAppStore />
--- a/src/pages/api/experiments/og-image.tsx
+++ b/src/pages/api/experiments/og-image.tsx
@@ -1,81 +0,0 @@
-import { ImageResponse } from "@vercel/og";
-import { type NextApiRequest, type NextApiResponse } from "next";
-
-export const config = {
-  runtime: "experimental-edge",
-};
-
-const inconsolataRegularFontP = fetch(
-  new URL("../../../../public/fonts/Inconsolata_SemiExpanded-Medium.ttf", import.meta.url),
-).then((res) => res.arrayBuffer());
-
-const OgImage = async (req: NextApiRequest, res: NextApiResponse) => {
-  // @ts-expect-error - nextUrl is not defined on NextApiRequest for some reason
-  const searchParams = req.nextUrl?.searchParams as URLSearchParams;
-  const experimentLabel = searchParams.get("experimentLabel");
-  const variantsCount = searchParams.get("variantsCount");
-  const scenariosCount = searchParams.get("scenariosCount");
-
-  const inconsolataRegularFont = await inconsolataRegularFontP;
-
-  return new ImageResponse(
-    (
-      <div
-        style={{
-          width: "100%",
-          height: "100%",
-          display: "flex",
-          flexDirection: "column",
-          alignItems: "center",
-          justifyContent: "center",
-          fontSize: 48,
-          padding: "48px",
-          background: "white",
-          position: "relative",
-        }}
-      >
-        <div
-          style={{
-            position: "absolute",
-            top: 0,
-            left: 0,
-            display: "flex",
-            alignItems: "center",
-            padding: 48,
-          }}
-        >
-          {/* eslint-disable-next-line @next/next/no-img-element */}
-          <img
-            src="https://app.openpipe.ai/logo.svg"
-            alt="OpenPipe Logo"
-            height={100}
-            width={120}
-          />
-          <div style={{ marginLeft: 24, fontSize: 64, fontFamily: "Inconsolata" }}>OpenPipe</div>
-        </div>
-
-        <div style={{ display: "flex", fontSize: 72, marginTop: 108 }}>{experimentLabel}</div>
-        <div style={{ display: "flex", flexDirection: "column", marginTop: 36 }}>
-          <div style={{ display: "flex" }}>
-            <span style={{ width: 320 }}>Variants:</span> {variantsCount}
-          </div>
-          <div style={{ display: "flex", marginTop: 24 }}>
-            <span style={{ width: 320 }}>Scenarios:</span> {scenariosCount}
-          </div>
-        </div>
-      </div>
-    ),
-    {
-      fonts: [
-        {
-          name: "inconsolata",
-          data: inconsolataRegularFont,
-          style: "normal",
-          weight: 400,
-        },
-      ],
-    },
-  );
-};
-
-export default OgImage;
--- a/src/pages/experiments/[id].tsx
+++ b/src/pages/experiments/[id].tsx
@@ -2,66 +2,106 @@ import {
  Box,
  Breadcrumb,
  BreadcrumbItem,
+  Button,
  Center,
  Flex,
  Icon,
  Input,
+  AlertDialog,
+  AlertDialogBody,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogContent,
+  AlertDialogOverlay,
+  useDisclosure,
  Text,
+  HStack,
  VStack,
 } from "@chakra-ui/react";
 import Link from "next/link";

 import { useRouter } from "next/router";
-import { useState, useEffect } from "react";
+import { useState, useEffect, useRef } from "react";
+import { BsGearFill, BsTrash } from "react-icons/bs";
 import { RiFlaskLine } from "react-icons/ri";
 import OutputsTable from "~/components/OutputsTable";
-import ExperimentSettingsDrawer from "~/components/ExperimentSettingsDrawer/ExperimentSettingsDrawer";
+import SettingsDrawer from "~/components/OutputsTable/SettingsDrawer";
 import AppShell from "~/components/nav/AppShell";
 import { api } from "~/utils/api";
 import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
 import { useAppStore } from "~/state/store";
 import { useSyncVariantEditor } from "~/state/sync";
-import { HeaderButtons } from "~/components/experiments/HeaderButtons/HeaderButtons";
-import Head from "next/head";
-
-// TODO: import less to fix deployment with server side props
-// export const getServerSideProps = async (context: GetServerSidePropsContext<{ id: string }>) => {
-//   const experimentId = context.params?.id as string;
-
-//   const helpers = createServerSideHelpers({
-//     router: appRouter,
-//     ctx: createInnerTRPCContext({ session: null }),
-//     transformer: superjson, // optional - adds superjson serialization
-//   });
-
-//   // prefetch query
-//   await helpers.experiments.stats.prefetch({ id: experimentId });
-
-//   return {
-//     props: {
-//       trpcState: helpers.dehydrate(),
-//     },
-//   };
-// };
-
-export default function Experiment() {
-  const router = useRouter();
-  const utils = api.useContext();
-  useSyncVariantEditor();

+const DeleteButton = () => {
  const experiment = useExperiment();
-  const experimentStats = api.experiments.stats.useQuery(
-    { id: router.query.id as string },
-    {
-      enabled: !!router.query.id,
-    },
-  );
-  const stats = experimentStats.data;
+  const mutation = api.experiments.delete.useMutation();
+  const utils = api.useContext();
+  const router = useRouter();
+
+  const { isOpen, onOpen, onClose } = useDisclosure();
+  const cancelRef = useRef<HTMLButtonElement>(null);
+
+  const [onDeleteConfirm] = useHandledAsyncCallback(async () => {
+    if (!experiment.data?.id) return;
+    await mutation.mutateAsync({ id: experiment.data.id });
+    await utils.experiments.list.invalidate();
+    await router.push({ pathname: "/experiments" });
+    onClose();
+  }, [mutation, experiment.data?.id, router]);

  useEffect(() => {
    useAppStore.getState().sharedVariantEditor.loadMonaco().catch(console.error);
  });

+  return (
+    <>
+      <Button
+        size="sm"
+        variant={{ base: "outline", lg: "ghost" }}
+        colorScheme="gray"
+        fontWeight="normal"
+        onClick={onOpen}
+      >
+        <Icon as={BsTrash} boxSize={4} color="gray.600" />
+        <Text display={{ base: "none", lg: "block" }} ml={2}>
+          Delete Experiment
+        </Text>
+      </Button>
+
+      <AlertDialog isOpen={isOpen} leastDestructiveRef={cancelRef} onClose={onClose}>
+        <AlertDialogOverlay>
+          <AlertDialogContent>
+            <AlertDialogHeader fontSize="lg" fontWeight="bold">
+              Delete Experiment
+            </AlertDialogHeader>
+
+            <AlertDialogBody>
+              If you delete this experiment all the associated prompts and scenarios will be deleted
+              as well. Are you sure?
+            </AlertDialogBody>
+
+            <AlertDialogFooter>
+              <Button ref={cancelRef} onClick={onClose}>
+                Cancel
+              </Button>
+              <Button colorScheme="red" onClick={onDeleteConfirm} ml={3}>
+                Delete
+              </Button>
+            </AlertDialogFooter>
+          </AlertDialogContent>
+        </AlertDialogOverlay>
+      </AlertDialog>
+    </>
+  );
+};
+
+export default function Experiment() {
+  const router = useRouter();
+  const experiment = useExperiment();
+  const utils = api.useContext();
+  const openDrawer = useAppStore((s) => s.openDrawer);
+  useSyncVariantEditor();
+
  const [label, setLabel] = useState(experiment.data?.label || "");
  useEffect(() => {
    setLabel(experiment.data?.label || "");
@@ -91,17 +131,6 @@ export default function Experiment() {
  const canModify = experiment.data?.access.canModify ?? false;

  return (
-    <>
-      {stats && (
-        <Head>
-          <meta property="og:title" content={stats.experimentLabel} key="title" />
-          <meta
-            property="og:image"
-            content={`/api/experiments/og-image?experimentLabel=${stats.experimentLabel}&variantsCount=${stats.promptVariantCount}&scenariosCount=${stats.testScenarioCount}`}
-            key="og-image"
-          />
-        </Head>
-      )}
    <AppShell title={experiment.data?.label}>
      <VStack h="full">
        <Flex
@@ -109,7 +138,7 @@ export default function Experiment() {
          py={2}
          w="full"
          direction={{ base: "column", sm: "row" }}
-            alignItems={{ base: "flex-start", sm: "center" }}
+          alignItems="flex-start"
        >
          <Breadcrumb flex={1}>
            <BreadcrumbItem>
@@ -142,14 +171,29 @@ export default function Experiment() {
              )}
            </BreadcrumbItem>
          </Breadcrumb>
-            <HeaderButtons />
+          {canModify && (
+            <HStack>
+              <Button
+                size="sm"
+                variant={{ base: "outline", lg: "ghost" }}
+                colorScheme="gray"
+                fontWeight="normal"
+                onClick={openDrawer}
+              >
+                <Icon as={BsGearFill} boxSize={4} color="gray.600" />
+                <Text display={{ base: "none", lg: "block" }} ml={2}>
+                  Edit Vars & Evals
+                </Text>
+              </Button>
+              <DeleteButton />
+            </HStack>
+          )}
        </Flex>
-          <ExperimentSettingsDrawer />
+        <SettingsDrawer />
        <Box w="100%" overflowX="auto" flex={1}>
          <OutputsTable experimentId={router.query.id as string | undefined} />
        </Box>
      </VStack>
    </AppShell>
-    </>
  );
 }
--- a/src/pages/experiments/index.tsx
+++ b/src/pages/experiments/index.tsx
@@ -13,11 +13,7 @@ import {
 import { RiFlaskLine } from "react-icons/ri";
 import AppShell from "~/components/nav/AppShell";
 import { api } from "~/utils/api";
-import {
-  ExperimentCard,
-  ExperimentCardSkeleton,
-  NewExperimentCard,
-} from "~/components/experiments/ExperimentCard";
+import { ExperimentCard, NewExperimentCard } from "~/components/experiments/ExperimentCard";
 import { signIn, useSession } from "next-auth/react";

 export default function ExperimentsPage() {
@@ -51,7 +47,7 @@ export default function ExperimentsPage() {
  return (
    <AppShell title="Experiments">
      <VStack alignItems={"flex-start"} px={4} py={2}>
-        <HStack minH={8} align="center" pt={2}>
+        <HStack minH={8} align="center">
          <Breadcrumb flex={1}>
            <BreadcrumbItem>
              <Flex alignItems="center">
@@ -62,15 +58,7 @@ export default function ExperimentsPage() {
        </HStack>
        <SimpleGrid w="full" columns={{ base: 1, md: 2, lg: 3, xl: 4 }} spacing={8} p="4">
          <NewExperimentCard />
-          {experiments.data && !experiments.isLoading ? (
-            experiments?.data?.map((exp) => <ExperimentCard key={exp.id} exp={exp} />)
-          ) : (
-            <>
-              <ExperimentCardSkeleton />
-              <ExperimentCardSkeleton />
-              <ExperimentCardSkeleton />
-            </>
-          )}
+          {experiments?.data?.map((exp) => <ExperimentCard key={exp.id} exp={exp} />)}
        </SimpleGrid>
      </VStack>
    </AppShell>
--- a/src/pages/world-champs/index.tsx
+++ b/src/pages/world-champs/index.tsx
@@ -1,15 +0,0 @@
-import { type GetServerSideProps } from "next";
-
-// eslint-disable-next-line @typescript-eslint/require-await
-export const getServerSideProps: GetServerSideProps = async () => {
-  return {
-    redirect: {
-      destination: "/world-champs/signup",
-      permanent: false,
-    },
-  };
-};
-
-export default function WorldChamps() {
-  return null;
-}
--- a/src/pages/world-champs/signup.tsx
+++ b/src/pages/world-champs/signup.tsx
@@ -1,217 +0,0 @@
-import {
-  Box,
-  type BoxProps,
-  Button,
-  DarkMode,
-  GlobalStyle,
-  HStack,
-  Heading,
-  Icon,
-  Link,
-  Table,
-  Tbody,
-  Td,
-  Text,
-  type TextProps,
-  Th,
-  Tr,
-  VStack,
-  useInterval,
-  Image,
-} from "@chakra-ui/react";
-import { signIn, useSession } from "next-auth/react";
-import Head from "next/head";
-import { useCallback, useState } from "react";
-import { BsGithub } from "react-icons/bs";
-import UserMenu from "~/components/nav/UserMenu";
-import { api } from "~/utils/api";
-import dayjs from "~/utils/dayjs";
-import { useHandledAsyncCallback } from "~/utils/hooks";
-
-const TopNavbar = () => (
-  <DarkMode>
-    <GlobalStyle />
-    <HStack px={4} py={2}>
-      <HStack as={Link} href="/" _hover={{ textDecoration: "none" }} spacing={0} py={2} pr={16}>
-        <Image src="/logo.svg" alt="" boxSize={6} mr={4} />
-        <Heading size="md" fontFamily="inconsolata, monospace">
-          OpenPipe
-        </Heading>
-      </HStack>
-    </HStack>
-  </DarkMode>
-);
-
-// Shows how long until the competition starts. Refreshes every second
-function CountdownTimer(props: { date: Date } & TextProps) {
-  const [now, setNow] = useState(dayjs(0));
-
-  useInterval(() => {
-    setNow(dayjs());
-  }, 1000);
-
-  const { date, ...rest } = props;
-
-  const kickoff = dayjs(props.date);
-  const diff = kickoff.diff(now, "second");
-  const days = Math.floor(diff / 86400);
-  const hours = Math.floor((diff % 86400) / 3600);
-  const minutes = Math.floor((diff % 3600) / 60);
-  const seconds = Math.floor(diff % 60);
-
-  return (
-    <Text {...rest}>
-      <Text as="span" fontWeight="bold">
-        Kickoff in
-      </Text>{" "}
-      {days}d {hours}h {minutes}m {seconds}s
-    </Text>
-  );
-}
-
-function ApplicationStatus(props: BoxProps) {
-  const user = useSession().data;
-  const entrant = api.worldChamps.userStatus.useQuery().data;
-  const applyMutation = api.worldChamps.apply.useMutation();
-
-  const utils = api.useContext();
-
-  const [onSignIn] = useHandledAsyncCallback(async () => {
-    await signIn("github");
-  }, []);
-
-  const [onApply] = useHandledAsyncCallback(async () => {
-    await applyMutation.mutateAsync();
-    await utils.worldChamps.userStatus.invalidate();
-  }, []);
-
-  const Wrapper = useCallback(
-    (wrapperProps: BoxProps) => (
-      <Box {...props} {...wrapperProps} minH="120px" alignItems="center" justifyItems="center" />
-    ),
-    [props],
-  );
-
-  if (user === null) {
-    return (
-      <Wrapper>
-        <Button onClick={onSignIn} colorScheme="orange" leftIcon={<Icon as={BsGithub} />}>
-          Connect GitHub to apply
-        </Button>
-      </Wrapper>
-    );
-  } else if (user) {
-    return (
-      <Wrapper>
-        <HStack spacing={8}>
-          <UserMenu user={user} borderRadius={2} borderColor={"gray.700"} borderWidth={1} pr={6} />
-          <Box flex={1}>
-            {entrant?.approved ? (
-              <Text fontSize="sm">
-                You're accepted! We'll send you more details before August 14th.
-              </Text>
-            ) : entrant ? (
-              <Text fontSize="sm">
-                Application submitted successfully! We'll notify you by email before August 14th.
-              </Text>
-            ) : (
-              <Button onClick={onApply} colorScheme="orange">
-                Apply to compete
-              </Button>
-            )}
-          </Box>
-        </HStack>
-      </Wrapper>
-    );
-  }
-
-  return <Wrapper />;
-}
-
-export default function Signup() {
-  return (
-    <DarkMode>
-      <GlobalStyle />
-
-      <Head>
-        <title>🏆 Prompt Engineering World Championships</title>
-        <meta property="og:title" content="🏆 Prompt Engineering World Championships" key="title" />
-        <meta
-          property="og:description"
-          content="Think you have what it takes to be the best? Compete with the world's top prompt engineers and see where you rank!"
-          key="description"
-        />
-      </Head>
-
-      <Box bgColor="gray.900" color="gray.200" minH="100vh" w="full">
-        <TopNavbar />
-        <VStack mx="auto" py={24} maxW="2xl" align="start" fontSize="lg">
-          <Heading size="lg">🏆 Prompt Engineering World Championships</Heading>
-          <CountdownTimer
-            date={new Date("2023-08-14T00:00:00Z")}
-            fontSize="2xl"
-            alignSelf="center"
-            color="gray.500"
-          />
-
-          <ApplicationStatus py={8} alignSelf="center" />
-
-          <Text fontSize="lg">
-            Think you have what it takes to be the best? Compete with the world's top prompt
-            engineers and see where you rank!
-          </Text>
-
-          <Heading size="lg" pt={12} alignSelf="left">
-            Event Details
-          </Heading>
-          <Table variant="simple">
-            <Tbody>
-              <Tr>
-                <Th>Kickoff</Th>
-                <Td>August 14</Td>
-              </Tr>
-              <Tr>
-                <Th>Prize</Th>
-                <Td>$15,000 grand prize + smaller category prizes.</Td>
-              </Tr>
-              <Tr>
-                <Th>Events</Th>
-                <Td>
-                  Optimize prompts for multiple tasks selected from academic benchmarks and
-                  real-world applications.
-                </Td>
-              </Tr>
-              <Tr>
-                <Th>Models</Th>
-                <Td>Separate "weight classes" for GPT 3.5, Claude Instant, and Llama 2.</Td>
-              </Tr>
-              <Tr>
-                <Th>Qualifications</Th>
-                <Td>Open to entrants with any level of experience.</Td>
-              </Tr>
-              <Tr>
-                <Th>Certificates</Th>
-                <Td>Certificate of mastery for all qualifying participants.</Td>
-              </Tr>
-              <Tr>
-                <Th>Cost</Th>
-                <Td>
-                  <strong>Free</strong>. We'll cover your inference budget.
-                </Td>
-              </Tr>
-              <Tr>
-                <Th>Questions?</Th>
-                <Td>
-                  <Link href="mailto:world-champs@openpipe.ai" textDecor="underline">
-                    Email us
-                  </Link>{" "}
-                  with any follow-up questions!
-                </Td>
-              </Tr>
-            </Tbody>
-          </Table>
-        </VStack>
-      </Box>
-    </DarkMode>
-  );
-}
--- a/src/server/api/root.router.ts
+++ b/src/server/api/root.router.ts
@@ -5,7 +5,6 @@ import { scenariosRouter } from "./routers/scenarios.router";
 import { scenarioVariantCellsRouter } from "./routers/scenarioVariantCells.router";
 import { templateVarsRouter } from "./routers/templateVariables.router";
 import { evaluationsRouter } from "./routers/evaluations.router";
-import { worldChampsRouter } from "./routers/worldChamps.router";

 /**
 * This is the primary router for your server.
@@ -19,7 +18,6 @@ export const appRouter = createTRPCRouter({
  scenarioVariantCells: scenarioVariantCellsRouter,
  templateVars: templateVarsRouter,
  evaluations: evaluationsRouter,
-  worldChamps: worldChampsRouter,
 });

 // export type definition of API
--- a/src/server/api/routers/evaluations.router.ts
+++ b/src/server/api/routers/evaluations.router.ts
@@ -2,7 +2,7 @@ import { EvalType } from "@prisma/client";
 import { z } from "zod";
 import { createTRPCRouter, protectedProcedure, publicProcedure } from "~/server/api/trpc";
 import { prisma } from "~/server/db";
-import { queueRunNewEval } from "~/server/tasks/runNewEval.task";
+import { runAllEvals } from "~/server/utils/evaluations";
 import { requireCanModifyExperiment, requireCanViewExperiment } from "~/utils/accessControl";

 export const evaluationsRouter = createTRPCRouter({
@@ -40,7 +40,9 @@ export const evaluationsRouter = createTRPCRouter({
        },
      });

-      await queueRunNewEval(input.experimentId);
+      // TODO: this may be a bad UX for slow evals (eg. GPT-4 evals) Maybe need
+      // to kick off a background job or something instead
+      await runAllEvals(input.experimentId);
    }),

  update: protectedProcedure
@@ -76,7 +78,7 @@ export const evaluationsRouter = createTRPCRouter({
      });
      // Re-run all evals. Other eval results will already be cached, so this
      // should only re-run the updated one.
-      await queueRunNewEval(experimentId);
+      await runAllEvals(evaluation.experimentId);
    }),

  delete: protectedProcedure
--- a/src/server/api/routers/experiments.router.ts
+++ b/src/server/api/routers/experiments.router.ts
@@ -1,7 +1,5 @@
 import { z } from "zod";
-import { v4 as uuidv4 } from "uuid";
 import { createTRPCRouter, protectedProcedure, publicProcedure } from "~/server/api/trpc";
-import { type Prisma } from "@prisma/client";
 import { prisma } from "~/server/db";
 import dedent from "dedent";
 import { generateNewCell } from "~/server/utils/generateNewCell";
@@ -15,33 +13,6 @@ import userOrg from "~/server/utils/userOrg";
 import generateTypes from "~/modelProviders/generateTypes";

 export const experimentsRouter = createTRPCRouter({
-  stats: publicProcedure.input(z.object({ id: z.string() })).query(async ({ input, ctx }) => {
-    await requireCanViewExperiment(input.id, ctx);
-
-    const [experiment, promptVariantCount, testScenarioCount] = await prisma.$transaction([
-      prisma.experiment.findFirstOrThrow({
-        where: { id: input.id },
-      }),
-      prisma.promptVariant.count({
-        where: {
-          experimentId: input.id,
-          visible: true,
-        },
-      }),
-      prisma.testScenario.count({
-        where: {
-          experimentId: input.id,
-          visible: true,
-        },
-      }),
-    ]);
-
-    return {
-      experimentLabel: experiment.label,
-      promptVariantCount,
-      testScenarioCount,
-    };
-  }),
  list: protectedProcedure.query(async ({ ctx }) => {
    // Anyone can list experiments
    requireNothing(ctx);
@@ -49,7 +20,7 @@ export const experimentsRouter = createTRPCRouter({
    const experiments = await prisma.experiment.findMany({
      where: {
        organization: {
-          organizationUsers: {
+          OrganizationUser: {
            some: { userId: ctx.session.user.id },
          },
        },
@@ -106,189 +77,6 @@ export const experimentsRouter = createTRPCRouter({
    };
  }),

-  fork: protectedProcedure.input(z.object({ id: z.string() })).mutation(async ({ input, ctx }) => {
-    await requireCanViewExperiment(input.id, ctx);
-
-    const [
-      existingExp,
-      existingVariants,
-      existingScenarios,
-      existingCells,
-      evaluations,
-      templateVariables,
-    ] = await prisma.$transaction([
-      prisma.experiment.findUniqueOrThrow({
-        where: {
-          id: input.id,
-        },
-      }),
-      prisma.promptVariant.findMany({
-        where: {
-          experimentId: input.id,
-          visible: true,
-        },
-      }),
-      prisma.testScenario.findMany({
-        where: {
-          experimentId: input.id,
-          visible: true,
-        },
-      }),
-      prisma.scenarioVariantCell.findMany({
-        where: {
-          testScenario: {
-            visible: true,
-          },
-          promptVariant: {
-            experimentId: input.id,
-            visible: true,
-          },
-        },
-        include: {
-          modelResponses: {
-            include: {
-              outputEvaluations: true,
-            },
-          },
-        },
-      }),
-      prisma.evaluation.findMany({
-        where: {
-          experimentId: input.id,
-        },
-      }),
-      prisma.templateVariable.findMany({
-        where: {
-          experimentId: input.id,
-        },
-      }),
-    ]);
-
-    const newExperimentId = uuidv4();
-
-    const existingToNewVariantIds = new Map<string, string>();
-    const variantsToCreate: Prisma.PromptVariantCreateManyInput[] = [];
-    for (const variant of existingVariants) {
-      const newVariantId = uuidv4();
-      existingToNewVariantIds.set(variant.id, newVariantId);
-      variantsToCreate.push({
-        ...variant,
-        id: newVariantId,
-        experimentId: newExperimentId,
-      });
-    }
-
-    const existingToNewScenarioIds = new Map<string, string>();
-    const scenariosToCreate: Prisma.TestScenarioCreateManyInput[] = [];
-    for (const scenario of existingScenarios) {
-      const newScenarioId = uuidv4();
-      existingToNewScenarioIds.set(scenario.id, newScenarioId);
-      scenariosToCreate.push({
-        ...scenario,
-        id: newScenarioId,
-        experimentId: newExperimentId,
-        variableValues: scenario.variableValues as Prisma.InputJsonValue,
-      });
-    }
-
-    const existingToNewEvaluationIds = new Map<string, string>();
-    const evaluationsToCreate: Prisma.EvaluationCreateManyInput[] = [];
-    for (const evaluation of evaluations) {
-      const newEvaluationId = uuidv4();
-      existingToNewEvaluationIds.set(evaluation.id, newEvaluationId);
-      evaluationsToCreate.push({
-        ...evaluation,
-        id: newEvaluationId,
-        experimentId: newExperimentId,
-      });
-    }
-
-    const cellsToCreate: Prisma.ScenarioVariantCellCreateManyInput[] = [];
-    const modelResponsesToCreate: Prisma.ModelResponseCreateManyInput[] = [];
-    const outputEvaluationsToCreate: Prisma.OutputEvaluationCreateManyInput[] = [];
-    for (const cell of existingCells) {
-      const newCellId = uuidv4();
-      const { modelResponses, ...cellData } = cell;
-      cellsToCreate.push({
-        ...cellData,
-        id: newCellId,
-        promptVariantId: existingToNewVariantIds.get(cell.promptVariantId) ?? "",
-        testScenarioId: existingToNewScenarioIds.get(cell.testScenarioId) ?? "",
-        prompt: (cell.prompt as Prisma.InputJsonValue) ?? undefined,
-      });
-      for (const modelResponse of modelResponses) {
-        const newModelResponseId = uuidv4();
-        const { outputEvaluations, ...modelResponseData } = modelResponse;
-        modelResponsesToCreate.push({
-          ...modelResponseData,
-          id: newModelResponseId,
-          scenarioVariantCellId: newCellId,
-          output: (modelResponse.output as Prisma.InputJsonValue) ?? undefined,
-        });
-        for (const evaluation of outputEvaluations) {
-          outputEvaluationsToCreate.push({
-            ...evaluation,
-            id: uuidv4(),
-            modelResponseId: newModelResponseId,
-            evaluationId: existingToNewEvaluationIds.get(evaluation.evaluationId) ?? "",
-          });
-        }
-      }
-    }
-
-    const templateVariablesToCreate: Prisma.TemplateVariableCreateManyInput[] = [];
-    for (const templateVariable of templateVariables) {
-      templateVariablesToCreate.push({
-        ...templateVariable,
-        id: uuidv4(),
-        experimentId: newExperimentId,
-      });
-    }
-
-    const maxSortIndex =
-      (
-        await prisma.experiment.aggregate({
-          _max: {
-            sortIndex: true,
-          },
-        })
-      )._max?.sortIndex ?? 0;
-
-    await prisma.$transaction([
-      prisma.experiment.create({
-        data: {
-          id: newExperimentId,
-          sortIndex: maxSortIndex + 1,
-          label: `${existingExp.label} (forked)`,
-          organizationId: (await userOrg(ctx.session.user.id)).id,
-        },
-      }),
-      prisma.promptVariant.createMany({
-        data: variantsToCreate,
-      }),
-      prisma.testScenario.createMany({
-        data: scenariosToCreate,
-      }),
-      prisma.scenarioVariantCell.createMany({
-        data: cellsToCreate,
-      }),
-      prisma.modelResponse.createMany({
-        data: modelResponsesToCreate,
-      }),
-      prisma.evaluation.createMany({
-        data: evaluationsToCreate,
-      }),
-      prisma.outputEvaluation.createMany({
-        data: outputEvaluationsToCreate,
-      }),
-      prisma.templateVariable.createMany({
-        data: templateVariablesToCreate,
-      }),
-    ]);
-
-    return newExperimentId;
-  }),
-
  create: protectedProcedure.input(z.object({})).mutation(async ({ ctx }) => {
    // Anyone can create an experiment
    requireNothing(ctx);
--- a/src/server/api/routers/promptVariants.router.ts
+++ b/src/server/api/routers/promptVariants.router.ts
@@ -1,7 +1,6 @@
 import { z } from "zod";
 import { createTRPCRouter, protectedProcedure, publicProcedure } from "~/server/api/trpc";
 import { prisma } from "~/server/db";
-import { Prisma } from "@prisma/client";
 import { generateNewCell } from "~/server/utils/generateNewCell";
 import userError from "~/server/utils/error";
 import { recordExperimentUpdated } from "~/server/utils/recordExperimentUpdated";
@@ -10,8 +9,7 @@ import { type PromptVariant } from "@prisma/client";
 import { deriveNewConstructFn } from "~/server/utils/deriveNewContructFn";
 import { requireCanModifyExperiment, requireCanViewExperiment } from "~/utils/accessControl";
 import parseConstructFn from "~/server/utils/parseConstructFn";
-import modelProviders from "~/modelProviders/modelProviders";
-import { ZodSupportedProvider } from "~/modelProviders/types";
+import { ZodModel } from "~/modelProviders/types";

 export const promptVariantsRouter = createTRPCRouter({
  list: publicProcedure
@@ -52,9 +50,7 @@ export const promptVariantsRouter = createTRPCRouter({
          id: true,
        },
        where: {
-          modelResponse: {
-            outdated: false,
-            output: { not: Prisma.AnyNull },
+          modelOutput: {
            scenarioVariantCell: {
              promptVariant: {
                id: input.variantId,
@@ -96,23 +92,14 @@ export const promptVariantsRouter = createTRPCRouter({
        where: {
          promptVariantId: input.variantId,
          testScenario: { visible: true },
-          modelResponses: {
-            some: {
-              outdated: false,
-              output: {
-                not: Prisma.AnyNull,
-              },
-            },
+          modelOutput: {
+            is: {},
          },
        },
      });

-      const overallTokens = await prisma.modelResponse.aggregate({
+      const overallTokens = await prisma.modelOutput.aggregate({
        where: {
-          outdated: false,
-          output: {
-            not: Prisma.AnyNull,
-          },
          scenarioVariantCell: {
            promptVariantId: input.variantId,
            testScenario: {
@@ -130,9 +117,16 @@ export const promptVariantsRouter = createTRPCRouter({
      const promptTokens = overallTokens._sum?.promptTokens ?? 0;
      const completionTokens = overallTokens._sum?.completionTokens ?? 0;

-      const awaitingEvals = !!evalResults.find(
-        (result) => result.totalCount < scenarioCount * evals.length,
-      );
+      const awaitingRetrievals = !!(await prisma.scenarioVariantCell.findFirst({
+        where: {
+          promptVariantId: input.variantId,
+          testScenario: { visible: true },
+          // Check if is PENDING or IN_PROGRESS
+          retrievalStatus: {
+            in: ["PENDING", "IN_PROGRESS"],
+          },
+        },
+      }));

      return {
        evalResults,
@@ -141,7 +135,7 @@ export const promptVariantsRouter = createTRPCRouter({
        overallCost: overallTokens._sum?.cost ?? 0,
        scenarioCount,
        outputCount,
-        awaitingEvals,
+        awaitingRetrievals,
      };
    }),

@@ -150,7 +144,7 @@ export const promptVariantsRouter = createTRPCRouter({
      z.object({
        experimentId: z.string(),
        variantId: z.string().optional(),
-        streamScenarios: z.array(z.string()),
+        newModel: ZodModel.optional(),
      }),
    )
    .mutation(async ({ input, ctx }) => {
@@ -192,7 +186,7 @@ export const promptVariantsRouter = createTRPCRouter({
          ? `${originalVariant?.label} Copy`
          : `Prompt Variant ${largestSortIndex + 2}`;

-      const newConstructFn = await deriveNewConstructFn(originalVariant);
+      const newConstructFn = await deriveNewConstructFn(originalVariant, input.newModel);

      const createNewVariantAction = prisma.promptVariant.create({
        data: {
@@ -224,9 +218,7 @@ export const promptVariantsRouter = createTRPCRouter({
      });

      for (const scenario of scenarios) {
-        await generateNewCell(newVariant.id, scenario.id, {
-          stream: input.streamScenarios.includes(scenario.id),
-        });
+        await generateNewCell(newVariant.id, scenario.id);
      }

      return newVariant;
@@ -294,12 +286,7 @@ export const promptVariantsRouter = createTRPCRouter({
      z.object({
        id: z.string(),
        instructions: z.string().optional(),
-        newModel: z
-          .object({
-            provider: ZodSupportedProvider,
-            model: z.string(),
-          })
-          .optional(),
+        newModel: ZodModel.optional(),
      }),
    )
    .mutation(async ({ input, ctx }) => {
@@ -316,11 +303,11 @@ export const promptVariantsRouter = createTRPCRouter({
        return userError(constructedPrompt.error);
      }

-      const model = input.newModel
-        ? modelProviders[input.newModel.provider].models[input.newModel.model]
-        : undefined;
-
-      const promptConstructionFn = await deriveNewConstructFn(existing, model, input.instructions);
+      const promptConstructionFn = await deriveNewConstructFn(
+        existing,
+        input.newModel,
+        input.instructions,
+      );

      // TODO: Validate promptConstructionFn
      // TODO: Record in some sort of history
@@ -333,7 +320,6 @@ export const promptVariantsRouter = createTRPCRouter({
      z.object({
        id: z.string(),
        constructFn: z.string(),
-        streamScenarios: z.array(z.string()),
      }),
    )
    .mutation(async ({ input, ctx }) => {
@@ -391,9 +377,7 @@ export const promptVariantsRouter = createTRPCRouter({
      });

      for (const scenario of scenarios) {
-        await generateNewCell(newVariant.id, scenario.id, {
-          stream: input.streamScenarios.includes(scenario.id),
-        });
+        await generateNewCell(newVariant.id, scenario.id);
      }

      return { status: "ok" } as const;
--- a/src/server/api/routers/scenarioVariantCells.router.ts
+++ b/src/server/api/routers/scenarioVariantCells.router.ts
@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { createTRPCRouter, protectedProcedure, publicProcedure } from "~/server/api/trpc";
 import { prisma } from "~/server/db";
-import { queueQueryModel } from "~/server/tasks/queryModel.task";
 import { generateNewCell } from "~/server/utils/generateNewCell";
+import { queueLLMRetrievalTask } from "~/server/utils/queueLLMRetrievalTask";
 import { requireCanModifyExperiment, requireCanViewExperiment } from "~/utils/accessControl";

 export const scenarioVariantCellsRouter = createTRPCRouter({
@@ -19,8 +19,7 @@ export const scenarioVariantCellsRouter = createTRPCRouter({
      });
      await requireCanViewExperiment(experimentId, ctx);

-      const [cell, numTotalEvals] = await prisma.$transaction([
-        prisma.scenarioVariantCell.findUnique({
+      return await prisma.scenarioVariantCell.findUnique({
        where: {
          promptVariantId_testScenarioId: {
            promptVariantId: input.variantId,
@@ -28,12 +27,9 @@ export const scenarioVariantCellsRouter = createTRPCRouter({
          },
        },
        include: {
-            modelResponses: {
-              where: {
-                outdated: false,
-              },
+          modelOutput: {
            include: {
-                outputEvaluations: {
+              outputEvaluation: {
                include: {
                  evaluation: {
                    select: { label: true },
@@ -43,21 +39,7 @@ export const scenarioVariantCellsRouter = createTRPCRouter({
            },
          },
        },
-        }),
-        prisma.evaluation.count({
-          where: { experimentId },
-        }),
-      ]);
-
-      if (!cell) return null;
-
-      const lastResponse = cell.modelResponses?.[cell.modelResponses?.length - 1];
-      const evalsComplete = lastResponse?.outputEvaluations?.length === numTotalEvals;
-
-      return {
-        ...cell,
-        evalsComplete,
-      };
+      });
    }),
  forceRefetch: protectedProcedure
    .input(
@@ -80,20 +62,29 @@ export const scenarioVariantCellsRouter = createTRPCRouter({
            testScenarioId: input.scenarioId,
          },
        },
-      });
-
-      if (!cell) {
-        await generateNewCell(input.variantId, input.scenarioId, { stream: true });
-        return;
-      }
-
-      await prisma.modelResponse.updateMany({
-        where: { scenarioVariantCellId: cell.id },
-        data: {
-          outdated: true,
+        include: {
+          modelOutput: true,
        },
      });

-      await queueQueryModel(cell.id, true);
+      if (!cell) {
+        await generateNewCell(input.variantId, input.scenarioId);
+        return true;
+      }
+
+      if (cell.modelOutput) {
+        // TODO: Maybe keep these around to show previous generations?
+        await prisma.modelOutput.delete({
+          where: { id: cell.modelOutput.id },
+        });
+      }
+
+      await prisma.scenarioVariantCell.update({
+        where: { id: cell.id },
+        data: { retrievalStatus: "PENDING" },
+      });
+
+      await queueLLMRetrievalTask(cell.id);
+      return true;
    }),
 });
--- a/src/server/api/routers/scenarios.router.ts
+++ b/src/server/api/routers/scenarios.router.ts
@@ -41,21 +41,7 @@ export const scenariosRouter = createTRPCRouter({
        count,
      };
    }),
-  get: protectedProcedure.input(z.object({ id: z.string() })).query(async ({ input, ctx }) => {
-    const scenario = await prisma.testScenario.findUnique({
-      where: {
-        id: input.id,
-      },
-    });

-    if (!scenario) {
-      throw new Error(`Scenario with id ${input.id} does not exist`);
-    }
-
-    await requireCanViewExperiment(scenario.experimentId, ctx);
-
-    return scenario;
-  }),
  create: protectedProcedure
    .input(
      z.object({
@@ -100,7 +86,7 @@ export const scenariosRouter = createTRPCRouter({
      });

      for (const variant of promptVariants) {
-        await generateNewCell(variant.id, scenario.id, { stream: true });
+        await generateNewCell(variant.id, scenario.id);
      }
    }),

@@ -244,7 +230,7 @@ export const scenariosRouter = createTRPCRouter({
      });

      for (const variant of promptVariants) {
-        await generateNewCell(variant.id, newScenario.id, { stream: true });
+        await generateNewCell(variant.id, newScenario.id);
      }

      return newScenario;
--- a/src/server/api/routers/worldChamps.router.ts
+++ b/src/server/api/routers/worldChamps.router.ts
@@ -1,36 +0,0 @@
-import { createTRPCRouter, protectedProcedure, publicProcedure } from "~/server/api/trpc";
-import { prisma } from "~/server/db";
-import { requireNothing } from "~/utils/accessControl";
-
-export const worldChampsRouter = createTRPCRouter({
-  userStatus: publicProcedure.query(async ({ input, ctx }) => {
-    const userId = ctx.session?.user.id;
-
-    if (!userId) {
-      return null;
-    }
-
-    return await prisma.worldChampEntrant.findUnique({
-      where: { userId },
-    });
-  }),
-
-  apply: protectedProcedure.mutation(async ({ ctx }) => {
-    const userId = ctx.session.user.id;
-    requireNothing(ctx);
-
-    const existingEntrant = await prisma.worldChampEntrant.findUnique({
-      where: { userId },
-    });
-
-    if (existingEntrant) {
-      return existingEntrant;
-    }
-
-    return await prisma.worldChampEntrant.create({
-      data: {
-        userId,
-      },
-    });
-  }),
-});
--- a/src/server/api/trpc.ts
+++ b/src/server/api/trpc.ts
@@ -40,7 +40,7 @@ const noOp = () => {};
 *
 * @see https://create.t3.gg/en/usage/trpc#-serverapitrpcts
 */
-export const createInnerTRPCContext = (opts: CreateContextOptions) => {
+const createInnerTRPCContext = (opts: CreateContextOptions) => {
  return {
    session: opts.session,
    prisma,
--- a/src/server/scripts/studio-prod.sh
+++ b/src/server/scripts/studio-prod.sh
@@ -1,12 +0,0 @@
-#! /bin/bash
-
-set -e
-cd "$(dirname "$0")/../../.."
-
-
-set -o allexport
-source .env
-set +o allexport
-
-echo "Connecting to prod db"
-DATABASE_URL=$PROD_DATABASE_URL pnpm prisma studio
--- a/src/server/tasks/defineTask.ts
+++ b/src/server/tasks/defineTask.ts
@@ -7,9 +7,9 @@ function defineTask<TPayload>(
  taskIdentifier: string,
  taskHandler: (payload: TPayload, helpers: Helpers) => Promise<void>,
 ) {
-  const enqueue = async (payload: TPayload, runAt?: Date) => {
+  const enqueue = async (payload: TPayload) => {
    console.log("Enqueuing task", taskIdentifier, payload);
-    await quickAddJob({ connectionString: env.DATABASE_URL }, taskIdentifier, payload, { runAt });
+    await quickAddJob({ connectionString: env.DATABASE_URL }, taskIdentifier, payload);
  };

  const handler = (payload: TPayload, helpers: Helpers) => {
--- a/src/server/tasks/queryLLM.task.ts
+++ b/src/server/tasks/queryLLM.task.ts
@@ -0,0 +1,165 @@
+import { prisma } from "~/server/db";
+import defineTask from "./defineTask";
+import { sleep } from "../utils/sleep";
+import { generateChannel } from "~/utils/generateChannel";
+import { runEvalsForOutput } from "../utils/evaluations";
+import { type Prisma } from "@prisma/client";
+import parseConstructFn from "../utils/parseConstructFn";
+import hashPrompt from "../utils/hashPrompt";
+import { type JsonObject } from "type-fest";
+import modelProviders from "~/modelProviders/modelProviders";
+import { wsConnection } from "~/utils/wsConnection";
+
+export type queryLLMJob = {
+  scenarioVariantCellId: string;
+};
+
+const MAX_AUTO_RETRIES = 10;
+const MIN_DELAY = 500; // milliseconds
+const MAX_DELAY = 15000; // milliseconds
+
+function calculateDelay(numPreviousTries: number): number {
+  const baseDelay = Math.min(MAX_DELAY, MIN_DELAY * Math.pow(2, numPreviousTries));
+  const jitter = Math.random() * baseDelay;
+  return baseDelay + jitter;
+}
+
+export const queryLLM = defineTask<queryLLMJob>("queryLLM", async (task) => {
+  const { scenarioVariantCellId } = task;
+  const cell = await prisma.scenarioVariantCell.findUnique({
+    where: { id: scenarioVariantCellId },
+    include: { modelOutput: true },
+  });
+  if (!cell) {
+    await prisma.scenarioVariantCell.update({
+      where: { id: scenarioVariantCellId },
+      data: {
+        statusCode: 404,
+        errorMessage: "Cell not found",
+        retrievalStatus: "ERROR",
+      },
+    });
+    return;
+  }
+
+  // If cell is not pending, then some other job is already processing it
+  if (cell.retrievalStatus !== "PENDING") {
+    return;
+  }
+  await prisma.scenarioVariantCell.update({
+    where: { id: scenarioVariantCellId },
+    data: {
+      retrievalStatus: "IN_PROGRESS",
+    },
+  });
+
+  const variant = await prisma.promptVariant.findUnique({
+    where: { id: cell.promptVariantId },
+  });
+  if (!variant) {
+    await prisma.scenarioVariantCell.update({
+      where: { id: scenarioVariantCellId },
+      data: {
+        statusCode: 404,
+        errorMessage: "Prompt Variant not found",
+        retrievalStatus: "ERROR",
+      },
+    });
+    return;
+  }
+
+  const scenario = await prisma.testScenario.findUnique({
+    where: { id: cell.testScenarioId },
+  });
+  if (!scenario) {
+    await prisma.scenarioVariantCell.update({
+      where: { id: scenarioVariantCellId },
+      data: {
+        statusCode: 404,
+        errorMessage: "Scenario not found",
+        retrievalStatus: "ERROR",
+      },
+    });
+    return;
+  }
+
+  const prompt = await parseConstructFn(variant.constructFn, scenario.variableValues as JsonObject);
+
+  if ("error" in prompt) {
+    await prisma.scenarioVariantCell.update({
+      where: { id: scenarioVariantCellId },
+      data: {
+        statusCode: 400,
+        errorMessage: prompt.error,
+        retrievalStatus: "ERROR",
+      },
+    });
+    return;
+  }
+
+  const provider = modelProviders[prompt.modelProvider];
+
+  const streamingChannel = provider.shouldStream(prompt.modelInput) ? generateChannel() : null;
+
+  if (streamingChannel) {
+    // Save streaming channel so that UI can connect to it
+    await prisma.scenarioVariantCell.update({
+      where: { id: scenarioVariantCellId },
+      data: { streamingChannel },
+    });
+  }
+  const onStream = streamingChannel
+    ? (partialOutput: (typeof provider)["_outputSchema"]) => {
+        wsConnection.emit("message", { channel: streamingChannel, payload: partialOutput });
+      }
+    : null;
+
+  for (let i = 0; true; i++) {
+    const response = await provider.getCompletion(prompt.modelInput, onStream);
+    if (response.type === "success") {
+      const inputHash = hashPrompt(prompt);
+
+      const modelOutput = await prisma.modelOutput.create({
+        data: {
+          scenarioVariantCellId,
+          inputHash,
+          output: response.value as Prisma.InputJsonObject,
+          timeToComplete: response.timeToComplete,
+          promptTokens: response.promptTokens,
+          completionTokens: response.completionTokens,
+          cost: response.cost,
+        },
+      });
+
+      await prisma.scenarioVariantCell.update({
+        where: { id: scenarioVariantCellId },
+        data: {
+          statusCode: response.statusCode,
+          retrievalStatus: "COMPLETE",
+        },
+      });
+
+      await runEvalsForOutput(variant.experimentId, scenario, modelOutput);
+      break;
+    } else {
+      const shouldRetry = response.autoRetry && i < MAX_AUTO_RETRIES;
+      const delay = calculateDelay(i);
+
+      await prisma.scenarioVariantCell.update({
+        where: { id: scenarioVariantCellId },
+        data: {
+          errorMessage: response.message,
+          statusCode: response.statusCode,
+          retryTime: shouldRetry ? new Date(Date.now() + delay) : null,
+          retrievalStatus: "ERROR",
+        },
+      });
+
+      if (shouldRetry) {
+        await sleep(delay);
+      } else {
+        break;
+      }
+    }
+  }
+});
--- a/src/server/tasks/queryModel.task.ts
+++ b/src/server/tasks/queryModel.task.ts
@@ -1,185 +0,0 @@
-import { type Prisma } from "@prisma/client";
-import { type JsonObject } from "type-fest";
-import modelProviders from "~/modelProviders/modelProviders";
-import { prisma } from "~/server/db";
-import { wsConnection } from "~/utils/wsConnection";
-import { runEvalsForOutput } from "../utils/evaluations";
-import hashPrompt from "../utils/hashPrompt";
-import parseConstructFn from "../utils/parseConstructFn";
-import defineTask from "./defineTask";
-
-export type QueryModelJob = {
-  cellId: string;
-  stream: boolean;
-  numPreviousTries: number;
-};
-
-const MAX_AUTO_RETRIES = 50;
-const MIN_DELAY = 500; // milliseconds
-const MAX_DELAY = 15000; // milliseconds
-
-function calculateDelay(numPreviousTries: number): number {
-  const baseDelay = Math.min(MAX_DELAY, MIN_DELAY * Math.pow(2, numPreviousTries));
-  const jitter = Math.random() * baseDelay;
-  return baseDelay + jitter;
-}
-
-export const queryModel = defineTask<QueryModelJob>("queryModel", async (task) => {
-  console.log("RUNNING TASK", task);
-  const { cellId, stream, numPreviousTries } = task;
-  const cell = await prisma.scenarioVariantCell.findUnique({
-    where: { id: cellId },
-    include: { modelResponses: true },
-  });
-  if (!cell) {
-    return;
-  }
-
-  // If cell is not pending, then some other job is already processing it
-  if (cell.retrievalStatus !== "PENDING") {
-    return;
-  }
-  await prisma.scenarioVariantCell.update({
-    where: { id: cellId },
-    data: {
-      retrievalStatus: "IN_PROGRESS",
-      jobStartedAt: new Date(),
-    },
-  });
-
-  const variant = await prisma.promptVariant.findUnique({
-    where: { id: cell.promptVariantId },
-  });
-  if (!variant) {
-    await prisma.scenarioVariantCell.update({
-      where: { id: cellId },
-      data: {
-        errorMessage: "Prompt Variant not found",
-        retrievalStatus: "ERROR",
-      },
-    });
-    return;
-  }
-
-  const scenario = await prisma.testScenario.findUnique({
-    where: { id: cell.testScenarioId },
-  });
-  if (!scenario) {
-    await prisma.scenarioVariantCell.update({
-      where: { id: cellId },
-      data: {
-        errorMessage: "Scenario not found",
-        retrievalStatus: "ERROR",
-      },
-    });
-    return;
-  }
-
-  const prompt = await parseConstructFn(variant.constructFn, scenario.variableValues as JsonObject);
-
-  if ("error" in prompt) {
-    await prisma.scenarioVariantCell.update({
-      where: { id: cellId },
-      data: {
-        errorMessage: prompt.error,
-        retrievalStatus: "ERROR",
-      },
-    });
-    return;
-  }
-
-  const provider = modelProviders[prompt.modelProvider];
-
-  const onStream = stream
-    ? (partialOutput: (typeof provider)["_outputSchema"]) => {
-        wsConnection.emit("message", { channel: cell.id, payload: partialOutput });
-      }
-    : null;
-
-  const inputHash = hashPrompt(prompt);
-
-  let modelResponse = await prisma.modelResponse.create({
-    data: {
-      inputHash,
-      scenarioVariantCellId: cellId,
-      requestedAt: new Date(),
-    },
-  });
-  const response = await provider.getCompletion(prompt.modelInput, onStream);
-  if (response.type === "success") {
-    modelResponse = await prisma.modelResponse.update({
-      where: { id: modelResponse.id },
-      data: {
-        output: response.value as Prisma.InputJsonObject,
-        statusCode: response.statusCode,
-        receivedAt: new Date(),
-        promptTokens: response.promptTokens,
-        completionTokens: response.completionTokens,
-        cost: response.cost,
-      },
-    });
-
-    await prisma.scenarioVariantCell.update({
-      where: { id: cellId },
-      data: {
-        retrievalStatus: "COMPLETE",
-      },
-    });
-
-    await runEvalsForOutput(variant.experimentId, scenario, modelResponse, prompt.modelProvider);
-  } else {
-    const shouldRetry = response.autoRetry && numPreviousTries < MAX_AUTO_RETRIES;
-    const delay = calculateDelay(numPreviousTries);
-    const retryTime = new Date(Date.now() + delay);
-
-    await prisma.modelResponse.update({
-      where: { id: modelResponse.id },
-      data: {
-        statusCode: response.statusCode,
-        errorMessage: response.message,
-        receivedAt: new Date(),
-        retryTime: shouldRetry ? retryTime : null,
-      },
-    });
-
-    if (shouldRetry) {
-      await queryModel.enqueue(
-        {
-          cellId,
-          stream,
-          numPreviousTries: numPreviousTries + 1,
-        },
-        retryTime,
-      );
-      await prisma.scenarioVariantCell.update({
-        where: { id: cellId },
-        data: {
-          retrievalStatus: "PENDING",
-        },
-      });
-    } else {
-      await prisma.scenarioVariantCell.update({
-        where: { id: cellId },
-        data: {
-          retrievalStatus: "ERROR",
-        },
-      });
-    }
-  }
-});
-
-export const queueQueryModel = async (cellId: string, stream: boolean) => {
-  await Promise.all([
-    prisma.scenarioVariantCell.update({
-      where: {
-        id: cellId,
-      },
-      data: {
-        retrievalStatus: "PENDING",
-        errorMessage: null,
-        jobQueuedAt: new Date(),
-      },
-    }),
-    queryModel.enqueue({ cellId, stream, numPreviousTries: 0 }),
-  ]);
-};
--- a/src/server/tasks/runNewEval.task.ts
+++ b/src/server/tasks/runNewEval.task.ts
@@ -1,17 +0,0 @@
-import { runAllEvals } from "../utils/evaluations";
-import defineTask from "./defineTask";
-
-export type RunNewEvalJob = {
-  experimentId: string;
-};
-
-// When a new eval is created, we want to run it on all existing outputs, but return the new eval first
-export const runNewEval = defineTask<RunNewEvalJob>("runNewEval", async (task) => {
-  console.log("RUNNING TASK", task);
-  const { experimentId } = task;
-  await runAllEvals(experimentId);
-});
-
-export const queueRunNewEval = async (experimentId: string) => {
-  await runNewEval.enqueue({ experimentId });
-};
--- a/src/server/tasks/worker.ts
+++ b/src/server/tasks/worker.ts
@@ -2,28 +2,39 @@ import { type TaskList, run } from "graphile-worker";
 import "dotenv/config";

 import { env } from "~/env.mjs";
-import { queryModel } from "./queryModel.task";
-import { runNewEval } from "./runNewEval.task";
+import { queryLLM } from "./queryLLM.task";

-console.log("Starting worker");
-
-const registeredTasks = [queryModel, runNewEval];
+const registeredTasks = [queryLLM];

 const taskList = registeredTasks.reduce((acc, task) => {
  acc[task.task.identifier] = task.task.handler;
  return acc;
 }, {} as TaskList);

-// Run a worker to execute jobs:
-const runner = await run({
+async function main() {
+  // Run a worker to execute jobs:
+  const runner = await run({
    connectionString: env.DATABASE_URL,
-  concurrency: 50,
+    concurrency: 20,
    // Install signal handlers for graceful shutdown on SIGINT, SIGTERM, etc
    noHandleSignals: false,
    pollInterval: 1000,
+    // you can set the taskList or taskDirectory but not both
    taskList,
+    // or:
+    //   taskDirectory: `${__dirname}/tasks`,
+  });
+
+  // Immediately await (or otherwise handled) the resulting promise, to avoid
+  // "unhandled rejection" errors causing a process crash in the event of
+  // something going wrong.
+  await runner.promise;
+
+  // If the worker exits (whether through fatal error or otherwise), the above
+  // promise will resolve/reject.
+}
+
+main().catch((err) => {
+  console.error("Unhandled error occurred running worker: ", err);
+  process.exit(1);
 });
-
-console.log("Worker successfully started");
-
-await runner.promise;
--- a/src/server/utils/deriveNewContructFn.ts
+++ b/src/server/utils/deriveNewContructFn.ts
@@ -74,11 +74,6 @@ const requestUpdatedPromptFunction = async (
              2,
            )}`,
          });
-        } else {
-          messages.push({
-            role: "user",
-            content: `The provider is the same as the old provider: ${originalModel.provider}`,
-          });
        }
      }
      if (instructions) {
--- a/src/server/utils/evaluations.ts
+++ b/src/server/utils/evaluations.ts
@@ -1,25 +1,19 @@
-import { type ModelResponse, type Evaluation, Prisma } from "@prisma/client";
+import { type ModelOutput, type Evaluation } from "@prisma/client";
 import { prisma } from "../db";
 import { runOneEval } from "./runOneEval";
 import { type Scenario } from "~/components/OutputsTable/types";
-import { type SupportedProvider } from "~/modelProviders/types";

-const runAndSaveEval = async (
-  evaluation: Evaluation,
-  scenario: Scenario,
-  modelResponse: ModelResponse,
-  provider: SupportedProvider,
-) => {
-  const result = await runOneEval(evaluation, scenario, modelResponse, provider);
+const saveResult = async (evaluation: Evaluation, scenario: Scenario, modelOutput: ModelOutput) => {
+  const result = await runOneEval(evaluation, scenario, modelOutput);
  return await prisma.outputEvaluation.upsert({
    where: {
-      modelResponseId_evaluationId: {
-        modelResponseId: modelResponse.id,
+      modelOutputId_evaluationId: {
+        modelOutputId: modelOutput.id,
        evaluationId: evaluation.id,
      },
    },
    create: {
-      modelResponseId: modelResponse.id,
+      modelOutputId: modelOutput.id,
      evaluationId: evaluation.id,
      ...result,
    },
@@ -32,28 +26,20 @@ const runAndSaveEval = async (
 export const runEvalsForOutput = async (
  experimentId: string,
  scenario: Scenario,
-  modelResponse: ModelResponse,
-  provider: SupportedProvider,
+  modelOutput: ModelOutput,
 ) => {
  const evaluations = await prisma.evaluation.findMany({
    where: { experimentId },
  });

  await Promise.all(
-    evaluations.map(
-      async (evaluation) => await runAndSaveEval(evaluation, scenario, modelResponse, provider),
-    ),
+    evaluations.map(async (evaluation) => await saveResult(evaluation, scenario, modelOutput)),
  );
 };

-// Will not run eval-output pairs that already exist in the database
 export const runAllEvals = async (experimentId: string) => {
-  const outputs = await prisma.modelResponse.findMany({
+  const outputs = await prisma.modelOutput.findMany({
    where: {
-      outdated: false,
-      output: {
-        not: Prisma.AnyNull,
-      },
      scenarioVariantCell: {
        promptVariant: {
          experimentId,
@@ -68,10 +54,9 @@ export const runAllEvals = async (experimentId: string) => {
      scenarioVariantCell: {
        include: {
          testScenario: true,
-          promptVariant: true,
        },
      },
-      outputEvaluations: true,
+      outputEvaluation: true,
    },
  });
  const evals = await prisma.evaluation.findMany({
@@ -80,18 +65,13 @@ export const runAllEvals = async (experimentId: string) => {

  await Promise.all(
    outputs.map(async (output) => {
-      const evalsToBeRun = evals.filter(
-        (evaluation) => !output.outputEvaluations.find((e) => e.evaluationId === evaluation.id),
+      const unrunEvals = evals.filter(
+        (evaluation) => !output.outputEvaluation.find((e) => e.evaluationId === evaluation.id),
      );

      await Promise.all(
-        evalsToBeRun.map(async (evaluation) => {
-          await runAndSaveEval(
-            evaluation,
-            output.scenarioVariantCell.testScenario,
-            output,
-            output.scenarioVariantCell.promptVariant.modelProvider as SupportedProvider,
-          );
+        unrunEvals.map(async (evaluation) => {
+          await saveResult(evaluation, output.scenarioVariantCell.testScenario, output);
        }),
      );
    }),
--- a/src/server/utils/generateNewCell.ts
+++ b/src/server/utils/generateNewCell.ts
@@ -1,18 +1,12 @@
-import { Prisma } from "@prisma/client";
+import { type Prisma } from "@prisma/client";
 import { prisma } from "../db";
+import { queueLLMRetrievalTask } from "./queueLLMRetrievalTask";
 import parseConstructFn from "./parseConstructFn";
 import { type JsonObject } from "type-fest";
 import hashPrompt from "./hashPrompt";
 import { omit } from "lodash-es";
-import { queueQueryModel } from "../tasks/queryModel.task";
-
-export const generateNewCell = async (
-  variantId: string,
-  scenarioId: string,
-  options?: { stream?: boolean },
-): Promise<void> => {
-  const stream = options?.stream ?? false;

+export const generateNewCell = async (variantId: string, scenarioId: string): Promise<void> => {
  const variant = await prisma.promptVariant.findUnique({
    where: {
      id: variantId,
@@ -35,7 +29,7 @@ export const generateNewCell = async (
      },
    },
    include: {
-      modelResponses: true,
+      modelOutput: true,
    },
  });

@@ -51,6 +45,8 @@ export const generateNewCell = async (
      data: {
        promptVariantId: variantId,
        testScenarioId: scenarioId,
+        statusCode: 400,
+        errorMessage: parsedConstructFn.error,
        retrievalStatus: "ERROR",
      },
    });
@@ -67,60 +63,41 @@ export const generateNewCell = async (
      retrievalStatus: "PENDING",
    },
    include: {
-      modelResponses: true,
+      modelOutput: true,
    },
  });

-  const matchingModelResponse = await prisma.modelResponse.findFirst({
-    where: {
-      inputHash,
-      output: {
-        not: Prisma.AnyNull,
-      },
-    },
-    orderBy: {
-      receivedAt: "desc",
-    },
-    include: {
-      scenarioVariantCell: true,
-    },
-    take: 1,
+  const matchingModelOutput = await prisma.modelOutput.findFirst({
+    where: { inputHash },
  });

-  if (matchingModelResponse) {
-    const newModelResponse = await prisma.modelResponse.create({
+  if (matchingModelOutput) {
+    const newModelOutput = await prisma.modelOutput.create({
      data: {
-        ...omit(matchingModelResponse, ["id", "scenarioVariantCell"]),
+        ...omit(matchingModelOutput, ["id"]),
        scenarioVariantCellId: cell.id,
-        output: matchingModelResponse.output as Prisma.InputJsonValue,
+        output: matchingModelOutput.output as Prisma.InputJsonValue,
      },
    });
-
    await prisma.scenarioVariantCell.update({
      where: { id: cell.id },
-      data: {
-        retrievalStatus: "COMPLETE",
-        jobStartedAt: matchingModelResponse.scenarioVariantCell.jobStartedAt,
-        jobQueuedAt: matchingModelResponse.scenarioVariantCell.jobQueuedAt,
-      },
+      data: { retrievalStatus: "COMPLETE" },
    });

    // Copy over all eval results as well
    await Promise.all(
      (
-        await prisma.outputEvaluation.findMany({
-          where: { modelResponseId: matchingModelResponse.id },
-        })
+        await prisma.outputEvaluation.findMany({ where: { modelOutputId: matchingModelOutput.id } })
      ).map(async (evaluation) => {
        await prisma.outputEvaluation.create({
          data: {
            ...omit(evaluation, ["id"]),
-            modelResponseId: newModelResponse.id,
+            modelOutputId: newModelOutput.id,
          },
        });
      }),
    );
  } else {
-    await queueQueryModel(cell.id, stream);
+    cell = await queueLLMRetrievalTask(cell.id);
  }
 };
--- a/src/server/utils/openai.ts
+++ b/src/server/utils/openai.ts
@@ -2,5 +2,4 @@ import { env } from "~/env.mjs";

 import OpenAI from "openai";

-// Set a dummy key so it doesn't fail at build time
-export const openai = new OpenAI({ apiKey: env.OPENAI_API_KEY ?? "dummy-key" });
+export const openai = new OpenAI({ apiKey: env.OPENAI_API_KEY });
--- a/src/server/utils/queueLLMRetrievalTask.ts
+++ b/src/server/utils/queueLLMRetrievalTask.ts
@@ -0,0 +1,22 @@
+import { prisma } from "../db";
+import { queryLLM } from "../tasks/queryLLM.task";
+
+export const queueLLMRetrievalTask = async (cellId: string) => {
+  const updatedCell = await prisma.scenarioVariantCell.update({
+    where: {
+      id: cellId,
+    },
+    data: {
+      retrievalStatus: "PENDING",
+      errorMessage: null,
+    },
+    include: {
+      modelOutput: true,
+    },
+  });
+
+  // @ts-expect-error we aren't passing the helpers but that's ok
+  void queryLLM.task.handler({ scenarioVariantCellId: cellId }, { logger: console });
+
+  return updatedCell;
+};
--- a/src/server/utils/runOneEval.ts
+++ b/src/server/utils/runOneEval.ts
@@ -1,14 +1,13 @@
-import { type Evaluation, type ModelResponse, type TestScenario } from "@prisma/client";
+import { type Evaluation, type ModelOutput, type TestScenario } from "@prisma/client";
+import { type ChatCompletion } from "openai/resources/chat";
 import { type VariableMap, fillTemplate, escapeRegExp, escapeQuotes } from "./fillTemplate";
 import { openai } from "./openai";
 import dedent from "dedent";
-import modelProviders from "~/modelProviders/modelProviders";
-import { type SupportedProvider } from "~/modelProviders/types";

 export const runGpt4Eval = async (
  evaluation: Evaluation,
  scenario: TestScenario,
-  stringifiedOutput: string,
+  message: ChatCompletion.Choice.Message,
 ): Promise<{ result: number; details: string }> => {
  const output = await openai.chat.completions.create({
    model: "gpt-4-0613",
@@ -27,7 +26,11 @@ export const runGpt4Eval = async (
      },
      {
        role: "user",
-        content: `The full output of the simpler message:\n---\n${stringifiedOutput}`,
+        content: `The full output of the simpler message:\n---\n${JSON.stringify(
+          message.content ?? message.function_call,
+          null,
+          2,
+        )}`,
      },
    ],
    function_call: {
@@ -67,16 +70,15 @@ export const runGpt4Eval = async (
 export const runOneEval = async (
  evaluation: Evaluation,
  scenario: TestScenario,
-  modelResponse: ModelResponse,
-  provider: SupportedProvider,
+  modelOutput: ModelOutput,
 ): Promise<{ result: number; details?: string }> => {
-  const modelProvider = modelProviders[provider];
-  const message = modelProvider.normalizeOutput(modelResponse.output);
+  const output = modelOutput.output as unknown as ChatCompletion;
+
+  const message = output?.choices?.[0]?.message;

  if (!message) return { result: 0 };

-  const stringifiedOutput =
-    message.type === "json" ? JSON.stringify(message.value, null, 2) : message.value;
+  const stringifiedMessage = message.content ?? JSON.stringify(message.function_call);

  const matchRegex = escapeRegExp(
    fillTemplate(escapeQuotes(evaluation.value), scenario.variableValues as VariableMap),
@@ -84,10 +86,10 @@ export const runOneEval = async (

  switch (evaluation.evalType) {
    case "CONTAINS":
-      return { result: stringifiedOutput.match(matchRegex) !== null ? 1 : 0 };
+      return { result: stringifiedMessage.match(matchRegex) !== null ? 1 : 0 };
    case "DOES_NOT_CONTAIN":
-      return { result: stringifiedOutput.match(matchRegex) === null ? 1 : 0 };
+      return { result: stringifiedMessage.match(matchRegex) === null ? 1 : 0 };
    case "GPT4_EVAL":
-      return await runGpt4Eval(evaluation, scenario, stringifiedOutput);
+      return await runGpt4Eval(evaluation, scenario, message);
  }
 };
--- a/src/server/utils/userOrg.ts
+++ b/src/server/utils/userOrg.ts
@@ -8,7 +8,7 @@ export default async function userOrg(userId: string) {
    update: {},
    create: {
      personalOrgUserId: userId,
-      organizationUsers: {
+      OrganizationUser: {
        create: {
          userId: userId,
          role: "ADMIN",
--- a/src/utils/accessControl.ts
+++ b/src/utils/accessControl.ts
@@ -22,7 +22,7 @@ export const canModifyExperiment = async (experimentId: string, userId: string)
    where: {
      id: experimentId,
      organization: {
-        organizationUsers: {
+        OrganizationUser: {
          some: {
            role: { in: [OrganizationUserRole.ADMIN, OrganizationUserRole.MEMBER] },
            userId,
--- a/src/utils/dayjs.ts
+++ b/src/utils/dayjs.ts
@@ -7,5 +7,3 @@ dayjs.extend(relativeTime);

 export const formatTimePast = (date: Date) =>
  dayjs.duration(dayjs(date).diff(dayjs())).humanize(true);
-
-export default dayjs;
--- a/src/utils/generateChannel.ts
+++ b/src/utils/generateChannel.ts
@@ -0,0 +1,5 @@
+// generate random channel id
+
+export const generateChannel = () => {
+  return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
+};
--- a/src/utils/hooks.ts
+++ b/src/utils/hooks.ts
@@ -106,9 +106,3 @@ export const useScenarios = () => {
    { enabled: experiment.data?.id != null },
  );
 };
-
-export const useScenario = (scenarioId: string) => {
-  return api.scenarios.get.useQuery({ id: scenarioId });
-};
-
-export const useVisibleScenarioIds = () => useScenarios().data?.scenarios.map((s) => s.id) ?? [];
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,12 +1,5 @@
-import frontendModelProviders from "~/modelProviders/frontendModelProviders";
-import { type ProviderModel } from "~/modelProviders/types";
+import { type Model } from "~/modelProviders/types";

 export const truthyFilter = <T>(x: T | null | undefined): x is T => Boolean(x);

-export const lookupModel = (provider: string, model: string) => {
-  const modelObj = frontendModelProviders[provider as ProviderModel["provider"]]?.models[model];
-  return modelObj ? { ...modelObj, provider } : null;
-};
-
-export const modelLabel = (provider: string, model: string) =>
-  `${provider}/${lookupModel(provider, model)?.name ?? model}`;
+export const keyForModel = (model: Model) => `${model.provider}/${model.name}`;