Add smoketest (broken)

.dockerignore

@@ -1,5 +0,0 @@
-**/node_modules/
-.git
-**/.venv/
-**/.env*
-**/.next/

.github/workflows/ci.yaml

@@ -6,10 +6,6 @@ on:
   push:
     branches: [main]
 
-defaults:
-  run:
-    working-directory: app
-
 jobs:
   run-checks:
     runs-on: ubuntu-latest

.gitignore

@@ -1,6 +0,0 @@
-.env
-.venv/
-*.pyc
-node_modules/
-*.tsbuildinfo
-dist/

.prettierignore

@@ -1,2 +0,0 @@
-*.schema.json
-app/pnpm-lock.yaml

README.md

@@ -1,96 +0,0 @@
- <p align="center">
-  <a href="https://openpipe.ai">
-    <img height="70" src="https://github.com/openpipe/openpipe/assets/41524992/70af25fb-1f90-42d9-8a20-3606e3b5aaba" alt="logo">
-  </a>
-</p>
-<h1 align="center">
-  OpenPipe
-</h1>
-
-<p align="center">
-  <i>Turn expensive prompts into cheap fine-tuned models.</i>
-</p>
-
-<p align="center">
-  <a href="/LICENSE"><img alt="License Apache-2.0" src="https://img.shields.io/github/license/openpipe/openpipe?style=flat-square"></a>
-  <a href='http://makeapullrequest.com'><img alt='PRs Welcome' src='https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square'/></a>
-  <a href="https://github.com/openpipe/openpipe/graphs/commit-activity"><img alt="GitHub commit activity" src="https://img.shields.io/github/commit-activity/m/openpipe/openpipe?style=flat-square"/></a>
-  <a href="https://github.com/openpipe/openpipe/issues"><img alt="GitHub closed issues" src="https://img.shields.io/github/issues-closed/openpipe/openpipe?style=flat-square"/></a>
-</p>
-
-<p align="center">
-  <a href="https://app.openpipe.ai/">Hosted App</a> - <a href="#running-locally">Running Locally</a> - <a href="#sample-experiments">Experiments</a>
-</p>
-
-<br>
-Use powerful but expensive LLMs to fine-tune smaller and cheaper models suited to your exact needs. Evaluate model and prompt combinations in the playground. Query your past requests and export optimized training data.
-<br>
-
-
-## 🪛 Features
-
- * <b>Fine-Tune</b>
-   * Easy integration with OpenPipe's SDK in both Python and JS.
-   * Swiftly query logs using intuitive built-in filters.
-   * Export data in multiple training formats, including Alpaca and ChatGPT, with deduplication.
-
- * <b>Experiment</b>
-   * Bulk-test wide-reaching scenarios using code templating.
-   * Seamlessly translate prompts across different model APIs.
-   * Tap into autogenerated scenarios for fresh test perspectives.
-   
-<img src="https://github.com/openpipe/openpipe/assets/41524992/eaa8b92d-4536-4f63-bbef-4b0b1a60f6b5" alt="fine-tune demo">
-
-<!-- <img height="400px" src="https://github.com/openpipe/openpipe/assets/41524992/66bb1843-cb72-4130-a369-eec2df3b8201" alt="playground demo"> -->
-
-
-## Sample Experiments
-
-These are sample experiments users have created that show how OpenPipe works. Feel free to fork them and start experimenting yourself.
-
-- [Twitter Sentiment Analysis](https://app.openpipe.ai/experiments/62c20a73-2012-4a64-973c-4b665ad46a57)
-- [Reddit User Needs](https://app.openpipe.ai/experiments/22222222-2222-2222-2222-222222222222)
-- [OpenAI Function Calls](https://app.openpipe.ai/experiments/2ebbdcb3-ed51-456e-87dc-91f72eaf3e2b)
-- [Activity Classification](https://app.openpipe.ai/experiments/3950940f-ab6b-4b74-841d-7e9dbc4e4ff8)
-
-## Supported Models
-
-#### OpenAI
-  - [GPT 3.5 Turbo](https://platform.openai.com/docs/guides/gpt/chat-completions-api)
-  - [GPT 3.5 Turbo 16k](https://platform.openai.com/docs/guides/gpt/chat-completions-api)
-  - [GPT 4](https://openai.com/gpt-4)
-#### 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)
-#### Llama2 Fine-Tunes
-  - [Open-Orca/OpenOrcaxOpenChat-Preview2-13B](https://huggingface.co/Open-Orca/OpenOrcaxOpenChat-Preview2-13B)
-  - [Open-Orca/OpenOrca-Platypus2-13B](https://huggingface.co/Open-Orca/OpenOrca-Platypus2-13B)
-  - [NousResearch/Nous-Hermes-Llama2-13b](https://huggingface.co/NousResearch/Nous-Hermes-Llama2-13b)
-  - [jondurbin/airoboros-l2-13b-gpt4-2.0](https://huggingface.co/jondurbin/airoboros-l2-13b-gpt4-2.0)
-  - [lmsys/vicuna-13b-v1.5](https://huggingface.co/lmsys/vicuna-13b-v1.5)
-  - [Gryphe/MythoMax-L2-13b](https://huggingface.co/Gryphe/MythoMax-L2-13b)
-  - [NousResearch/Nous-Hermes-llama-2-7b](https://huggingface.co/NousResearch/Nous-Hermes-llama-2-7b)
-#### Anthropic
-  - [Claude 1 Instant](https://www.anthropic.com/index/introducing-claude)
-  - [Claude 2](https://www.anthropic.com/index/claude-2)
-
-## Running Locally
-
-1. Install [Postgresql](https://www.postgresql.org/download/).
-2. Install [NodeJS 20](https://nodejs.org/en/download/current) (earlier versions will very likely work but aren't tested).
-3. Install `pnpm`: `npm i -g pnpm`
-4. Clone this repository: `git clone https://github.com/openpipe/openpipe`
-5. Install the dependencies: `cd openpipe && pnpm install`
-6. Create a `.env` file (`cp .env.example .env`) and enter your `OPENAI_API_KEY`.
-7. Update `DATABASE_URL` if necessary to point to your Postgres instance and run `pnpm prisma migrate dev` to create the database.
-8. Create a [GitHub OAuth App](https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app) and update the `GITHUB_CLIENT_ID` and `GITHUB_CLIENT_SECRET` values. (Note: a PR to make auth optional when running locally would be a great contribution!)
-9. Start the app: `pnpm dev`.
-10. Navigate to [http://localhost:3000](http://localhost:3000)
-
-## Testing Locally
-
-1. Copy your `.env` file to `.env.test`.
-2. Update the `DATABASE_URL` to have a different database name than your development one
-3. Run `DATABASE_URL=[your new datatase url] pnpm prisma migrate dev --skip-seed --skip-generate`
-4. Run `pnpm test`

app/.env.example

@@ -26,17 +26,6 @@ NEXT_PUBLIC_SOCKET_URL="http://localhost:3318"
 NEXTAUTH_SECRET="your_secret"
 NEXTAUTH_URL="http://localhost:3000"
 
-NEXT_PUBLIC_HOST="http://localhost:3000"
-
 # Next Auth Github Provider
 GITHUB_CLIENT_ID="your_client_id"
 GITHUB_CLIENT_SECRET="your_secret"
-
-OPENPIPE_BASE_URL="http://localhost:3000/api/v1"
-OPENPIPE_API_KEY="your_key"
-
-SENDER_EMAIL="placeholder"
-SMTP_HOST="placeholder"
-SMTP_PORT="placeholder"
-SMTP_LOGIN="placeholder"
-SMTP_PASSWORD="placeholder"

app/.eslintrc.cjs

@@ -6,7 +6,7 @@ const config = {
   overrides: [
     {
       extends: ["plugin:@typescript-eslint/recommended-requiring-type-checking"],
-      files: ["*.mts", "*.ts", "*.tsx"],
+      files: ["*.ts", "*.tsx"],
       parserOptions: {
         project: path.join(__dirname, "tsconfig.json"),
       },
@@ -37,7 +37,6 @@ const config = {
       "warn",
       { vars: "all", varsIgnorePattern: "^_", args: "after-used", argsIgnorePattern: "^_" },
     ],
-    "react/no-unescaped-entities": "off",
   },
 };
 

app/.gitignore

@@ -1,9 +1,11 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
+# App files
+
 # dependencies
 /node_modules
 /.pnp
-.pnp.js
+/.pnp.js
 
 # testing
 /coverage
@@ -15,35 +17,28 @@
 # next.js
 /.next/
 /out/
-next-env.d.ts
+/next-env.d.ts
 
 # production
 /build
 
 # misc
-.DS_Store
+/.DS_Store
-*.pem
+/*.pem
 
 # debug
-npm-debug.log*
+/npm-debug.log*
-yarn-debug.log*
+/yarn-debug.log*
-yarn-error.log*
+/yarn-error.log*
-.pnpm-debug.log*
+/.pnpm-debug.log*
 
 # local env files
 # do not commit any .env files to git, except for the .env.example file. https://create.t3.gg/en/usage/env-variables#using-environment-variables
-.env
+/.env
-.env*.local
+/.env*.local
-.env.test
 
 # vercel
-.vercel
+/.vercel
 
 # typescript
-*.tsbuildinfo
+/*.tsbuildinfo
-
-# Sentry Auth Token
-.sentryclirc
-
-# custom openai intialization
-src/server/utils/openaiCustomConfig.json

app/.prettierignore

@@ -0,0 +1,2 @@
+*.schema.json
+pnpm-lock.yaml

app/@types/nextjs-routes.d.ts

@@ -12,23 +12,13 @@ declare module "nextjs-routes" {
 
   export type Route =
     | StaticRoute<"/account/signin">
-    | StaticRoute<"/admin/jobs">
+    | DynamicRoute<"/api/[...trpc]", { "trpc": string[] }>
     | DynamicRoute<"/api/auth/[...nextauth]", { "nextauth": string[] }>
-    | StaticRoute<"/api/experiments/og-image">
+    | StaticRoute<"/api/openapi">
     | DynamicRoute<"/api/trpc/[trpc]", { "trpc": string }>
-    | DynamicRoute<"/api/v1/[...trpc]", { "trpc": string[] }>
+    | DynamicRoute<"/experiments/[id]", { "id": string }>
-    | StaticRoute<"/api/v1/openapi">
-    | StaticRoute<"/dashboard">
-    | DynamicRoute<"/experiments/[experimentSlug]", { "experimentSlug": string }>
     | StaticRoute<"/experiments">
-    | StaticRoute<"/fine-tunes">
+    | StaticRoute<"/">;
-    | StaticRoute<"/">
-    | DynamicRoute<"/invitations/[invitationToken]", { "invitationToken": string }>
-    | StaticRoute<"/project/settings">
-    | StaticRoute<"/request-logs">
-    | StaticRoute<"/sentry-example-page">
-    | StaticRoute<"/world-champs">
-    | StaticRoute<"/world-champs/signup">;
 
   interface StaticRoute<Pathname> {
     pathname: Pathname;

app/Dockerfile

@@ -6,13 +6,13 @@ RUN yarn global add pnpm
 # DEPS
 FROM base as deps
 
-WORKDIR /code
+WORKDIR /app
 
-COPY app/prisma app/package.json ./app/
+COPY prisma ./
-COPY client-libs/typescript/package.json ./client-libs/typescript/
-COPY pnpm-lock.yaml pnpm-workspace.yaml ./
 
-RUN cd app && pnpm install --frozen-lockfile
+COPY package.json pnpm-lock.yaml ./
+
+RUN pnpm install --frozen-lockfile
 
 # BUILDER
 FROM base as builder
@@ -20,28 +20,23 @@ FROM base as builder
 # Include all NEXT_PUBLIC_* env vars here
 ARG NEXT_PUBLIC_POSTHOG_KEY
 ARG NEXT_PUBLIC_SOCKET_URL
-ARG NEXT_PUBLIC_HOST
-ARG NEXT_PUBLIC_SENTRY_DSN
-ARG SENTRY_AUTH_TOKEN
 
-WORKDIR /code
+WORKDIR /app
-COPY --from=deps /code/node_modules ./node_modules
+COPY --from=deps /app/node_modules ./node_modules
-COPY --from=deps /code/app/node_modules ./app/node_modules
-COPY --from=deps /code/client-libs/typescript/node_modules ./client-libs/typescript/node_modules
 COPY . .
-RUN cd app && SKIP_ENV_VALIDATION=1 pnpm build
+RUN SKIP_ENV_VALIDATION=1 pnpm build
 
 # RUNNER
 FROM base as runner
-WORKDIR /code/app
+WORKDIR /app
 
 ENV NODE_ENV production
 ENV NEXT_TELEMETRY_DISABLED 1
 
-COPY --from=builder /code/ /code/
+COPY --from=builder /app/ ./
 
 EXPOSE 3000
 ENV PORT 3000
 
 # Run the "run-prod.sh" script
-CMD /code/app/scripts/run-prod.sh
+CMD /app/run-prod.sh

app/README.md

@@ -0,0 +1,61 @@
+<img src="https://github.com/openpipe/openpipe/assets/41524992/ca59596e-eb80-40f9-921f-6d67f6e6d8fa" width="72px" />
+
+# OpenPipe
+
+OpenPipe is a flexible playground for comparing and optimizing LLM prompts. It lets you quickly generate, test and compare candidate prompts with realistic sample data.
+
+## Sample Experiments
+
+These are simple experiments users have created that show how OpenPipe works.
+
+- [Country Capitals](https://app.openpipe.ai/experiments/11111111-1111-1111-1111-111111111111)
+- [Reddit User Needs](https://app.openpipe.ai/experiments/22222222-2222-2222-2222-222222222222)
+- [OpenAI Function Calls](https://app.openpipe.ai/experiments/2ebbdcb3-ed51-456e-87dc-91f72eaf3e2b)
+- [Activity Classification](https://app.openpipe.ai/experiments/3950940f-ab6b-4b74-841d-7e9dbc4e4ff8)
+
+<img src="https://github.com/openpipe/openpipe/assets/176426/fc7624c6-5b65-4d4d-82b7-4a816f3e5678" alt="demo" height="400px">
+
+You can use our hosted version of OpenPipe at [https://openpipe.ai]. You can also clone this repository and [run it locally](#running-locally).
+
+## High-Level Features
+
+**Configure Multiple Prompts**  
+Set up multiple prompt configurations and compare their output side-by-side. Each configuration can be configured independently.
+
+**Visualize Responses**  
+Inspect prompt completions side-by-side.
+
+**Test Many Inputs**  
+OpenPipe lets you _template_ a prompt. Use the templating feature to run the prompts you're testing against many potential inputs for broader coverage of your problem space than you'd get with manual testing.
+
+**🪄 Auto-generate Test Scenarios**  
+OpenPipe includes a tool to generate new test scenarios based on your existing prompts and scenarios. Just click "Autogenerate Scenario" to try it out!
+
+**Prompt Validation and Typeahead**  
+We use OpenAI's OpenAPI spec to automatically provide typeahead and validate prompts.
+
+<img alt="typeahead" src="https://github.com/openpipe/openpipe/assets/176426/acc638f8-d851-4742-8d01-fe6f98890840" height="300px">
+
+**Function Call Support**  
+Natively supports [OpenAI function calls](https://openai.com/blog/function-calling-and-other-api-updates) on supported models.
+
+<img height="300px" alt="function calls" src="https://github.com/openpipe/openpipe/assets/176426/48ad13fe-af2f-4294-bf32-62015597fd9b">
+
+## Supported Models
+
+- 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
+
+1. Install [Postgresql](https://www.postgresql.org/download/).
+2. Install [NodeJS 20](https://nodejs.org/en/download/current) (earlier versions will very likely work but aren't tested).
+3. Install `pnpm`: `npm i -g pnpm`
+4. Clone this repository: `git clone https://github.com/openpipe/openpipe`
+5. Install the dependencies: `cd openpipe && pnpm install`
+6. Create a `.env` file (`cp .env.example .env`) and enter your `OPENAI_API_KEY`.
+7. Update `DATABASE_URL` if necessary to point to your Postgres instance and run `pnpm prisma db push` to create the database.
+8. Create a [GitHub OAuth App](https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app) and update the `GITHUB_CLIENT_ID` and `GITHUB_CLIENT_SECRET` values. (Note: a PR to make auth optional when running locally would be a great contribution!)
+9. Start the app: `pnpm dev`.
+10. Navigate to [http://localhost:3000](http://localhost:3000)

app/next.config.mjs

@@ -1,14 +1,13 @@
 import nextRoutes from "nextjs-routes/config";
-import { withSentryConfig } from "@sentry/nextjs";
 
 /**
  * Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation. This is especially useful
  * for Docker builds.
  */
-const { env } = await import("./src/env.mjs");
+await import("./src/env.mjs");
 
 /** @type {import("next").NextConfig} */
-let config = {
+const config = {
   reactStrictMode: true,
 
   /**
@@ -22,13 +21,6 @@ let config = {
     defaultLocale: "en",
   },
 
-  rewrites: async () => [
-    {
-      source: "/ingest/:path*",
-      destination: "https://app.posthog.com/:path*",
-    },
-  ],
-
   webpack: (config) => {
     config.module.rules.push({
       test: /\.txt$/,
@@ -36,28 +28,6 @@ let config = {
     });
     return config;
   },
-
-  transpilePackages: ["openpipe"],
 };
 
-config = nextRoutes()(config);
+export default nextRoutes()(config);
-
-if (env.NEXT_PUBLIC_SENTRY_DSN && env.SENTRY_AUTH_TOKEN) {
-  // @ts-expect-error - `withSentryConfig` is not typed correctly
-  config = withSentryConfig(
-    config,
-    {
-      authToken: env.SENTRY_AUTH_TOKEN,
-      silent: true,
-      org: "openpipe",
-      project: "openpipe",
-    },
-    {
-      widenClientFileUpload: true,
-      tunnelRoute: "/monitoring",
-      disableLogger: true,
-    },
-  );
-}
-
-export default config;

app/package.json

@@ -1,6 +1,5 @@
 {
-  "name": "openpipe-app",
+  "name": "openpipe",
-  "private": true,
   "type": "module",
   "version": "0.1.0",
   "license": "Apache-2.0",
@@ -10,27 +9,24 @@
   },
   "scripts": {
     "build": "next build",
-    "dev:next": "TZ=UTC next dev",
+    "dev:next": "next dev",
     "dev:wss": "pnpm tsx --watch src/wss-server.ts",
-    "worker": "NODE_ENV='development' pnpm tsx --watch src/server/tasks/worker.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 worker --watch'",
+    "dev": "concurrently --kill-others 'pnpm dev:next' 'pnpm dev:wss' 'pnpm dev:worker'",
     "postinstall": "prisma generate",
     "lint": "next lint",
-    "start": "TZ=UTC next start",
+    "start": "next start",
-    "codegen:clients": "tsx src/server/scripts/client-codegen.ts",
+    "codegen": "tsx src/codegen/export-client-types.ts",
-    "codegen:db": "prisma generate && kysely-codegen --dialect postgres --out-file src/server/db.types.ts",
     "seed": "tsx prisma/seed.ts",
-    "check": "concurrently 'pnpm lint' 'pnpm tsc' 'pnpm prettier . --check'",
+    "check": "concurrently 'pnpm lint' 'pnpm tsc' 'pnpm prettier . --check'"
-    "test": "pnpm vitest"
   },
   "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",
-    "@chakra-ui/anatomy": "^2.2.0",
     "@chakra-ui/next-js": "^2.1.4",
     "@chakra-ui/react": "^2.7.1",
-    "@chakra-ui/styled-system": "^2.9.1",
     "@emotion/react": "^11.11.1",
     "@emotion/server": "^11.11.0",
     "@emotion/styled": "^11.11.0",
@@ -38,8 +34,6 @@
     "@monaco-editor/loader": "^1.3.3",
     "@next-auth/prisma-adapter": "^1.0.5",
     "@prisma/client": "^4.14.0",
-    "@sendinblue/client": "^3.3.1",
-    "@sentry/nextjs": "^7.61.0",
     "@t3-oss/env-nextjs": "^0.3.1",
     "@tabler/icons-react": "^2.22.0",
     "@tanstack/react-query": "^4.29.7",
@@ -47,13 +41,10 @@
     "@trpc/next": "^10.26.0",
     "@trpc/react-query": "^10.26.0",
     "@trpc/server": "^10.26.0",
-    "@vercel/og": "^0.5.9",
-    "archiver": "^6.0.0",
     "ast-types": "^0.14.2",
     "chroma-js": "^2.4.2",
     "concurrently": "^8.2.0",
     "cors": "^2.8.5",
-    "crypto-random-string": "^5.0.0",
     "dayjs": "^1.11.8",
     "dedent": "^1.0.1",
     "dotenv": "^16.3.1",
@@ -61,46 +52,33 @@
     "framer-motion": "^10.12.17",
     "gpt-tokens": "^1.0.10",
     "graphile-worker": "^0.13.0",
-    "human-id": "^4.0.0",
     "immer": "^10.0.2",
     "isolated-vm": "^4.5.0",
     "json-schema-to-typescript": "^13.0.2",
     "json-stringify-pretty-compact": "^4.0.0",
     "jsonschema": "^1.4.1",
-    "kysely": "^0.26.1",
-    "kysely-codegen": "^0.10.1",
     "lodash-es": "^4.17.21",
-    "lucide-react": "^0.265.0",
-    "marked": "^7.0.3",
     "next": "^13.4.2",
     "next-auth": "^4.22.1",
     "next-query-params": "^4.2.3",
     "nextjs-cors": "^2.1.2",
     "nextjs-routes": "^2.0.1",
-    "nodemailer": "^6.9.4",
+    "openai": "4.0.0-beta.2",
-    "openai": "4.0.0-beta.7",
-    "openpipe": "workspace:*",
-    "pg": "^8.11.2",
     "pluralize": "^8.0.0",
-    "posthog-js": "^1.75.3",
+    "posthog-js": "^1.68.4",
-    "posthog-node": "^3.1.1",
     "prettier": "^3.0.0",
     "prismjs": "^1.29.0",
     "react": "18.2.0",
     "react-diff-viewer": "^3.1.1",
     "react-dom": "18.2.0",
-    "react-github-btn": "^1.4.0",
     "react-icons": "^4.10.1",
-    "react-json-tree": "^0.18.0",
     "react-select": "^5.7.4",
     "react-syntax-highlighter": "^15.5.0",
     "react-textarea-autosize": "^8.5.0",
     "recast": "^0.23.3",
-    "recharts": "^2.7.2",
     "replicate": "^0.12.3",
     "socket.io": "^4.7.1",
     "socket.io-client": "^4.7.1",
-    "stream-buffers": "^3.0.2",
     "superjson": "1.12.2",
     "trpc-openapi": "^1.2.0",
     "tsx": "^3.12.7",
@@ -113,7 +91,6 @@
   },
   "devDependencies": {
     "@openapi-contrib/openapi-schema-to-json-schema": "^4.0.5",
-    "@types/archiver": "^5.3.2",
     "@types/babel__core": "^7.20.1",
     "@types/babel__standalone": "^7.1.4",
     "@types/chroma-js": "^2.4.0",
@@ -123,24 +100,19 @@
     "@types/json-schema": "^7.0.12",
     "@types/lodash-es": "^4.17.8",
     "@types/node": "^18.16.0",
-    "@types/nodemailer": "^6.4.9",
-    "@types/pg": "^8.10.2",
     "@types/pluralize": "^0.0.30",
     "@types/prismjs": "^1.26.0",
     "@types/react": "^18.2.6",
     "@types/react-dom": "^18.2.4",
     "@types/react-syntax-highlighter": "^15.5.7",
-    "@types/stream-buffers": "^3.0.4",
     "@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",
     "monaco-editor": "^0.40.0",
     "openapi-typescript": "^6.3.4",
-    "openapi-typescript-codegen": "^0.25.0",
     "prisma": "^4.14.0",
     "raw-loader": "^4.0.2",
     "typescript": "^5.0.4",

app/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 & 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 & @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

app/prisma/migrations/20230730061804_add_logged_calls_and_data_flows/migration.sql

@@ -0,0 +1,64 @@
+-- AlterTable
+ALTER TABLE "Experiment" ADD COLUMN     "dataFlowId" UUID;
+
+-- AlterTable
+ALTER TABLE "ModelResponse" ADD COLUMN     "loggedCallId" UUID,
+ALTER COLUMN "scenarioVariantCellId" DROP NOT NULL;
+
+-- CreateTable
+CREATE TABLE "LoggedCall" (
+    "id" UUID NOT NULL,
+    "promptFunctionHash" TEXT NOT NULL,
+    "promptFunction" TEXT NOT NULL,
+    "prompt" JSONB NOT NULL,
+    "responsePayload" JSONB,
+    "scenarioVariables" JSONB NOT NULL,
+    "model" TEXT NOT NULL,
+    "modelProvider" TEXT NOT NULL,
+    "dataFlowId" UUID NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "LoggedCall_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "DataFlow" (
+    "id" UUID NOT NULL,
+    "label" TEXT NOT NULL,
+    "organizationId" UUID NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "DataFlow_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "ApiKey" (
+    "id" UUID NOT NULL,
+    "name" TEXT NOT NULL,
+    "key" TEXT NOT NULL,
+    "organizationId" UUID NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "ApiKey_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ApiKey_key_key" ON "ApiKey"("key");
+
+-- AddForeignKey
+ALTER TABLE "Experiment" ADD CONSTRAINT "Experiment_dataFlowId_fkey" FOREIGN KEY ("dataFlowId") REFERENCES "DataFlow"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ModelResponse" ADD CONSTRAINT "ModelResponse_loggedCallId_fkey" FOREIGN KEY ("loggedCallId") REFERENCES "LoggedCall"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "LoggedCall" ADD CONSTRAINT "LoggedCall_dataFlowId_fkey" FOREIGN KEY ("dataFlowId") REFERENCES "DataFlow"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "DataFlow" ADD CONSTRAINT "DataFlow_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ApiKey" ADD CONSTRAINT "ApiKey_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;

app/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;

app/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;

app/prisma/migrations/20230803163242_add_admin_role/migration.sql

@@ -1,5 +0,0 @@
--- CreateEnum
-CREATE TYPE "UserRole" AS ENUM ('ADMIN', 'USER');
-
--- AlterTable
-ALTER TABLE "User" ADD COLUMN     "role" "UserRole" NOT NULL DEFAULT 'USER';

app/prisma/migrations/20230804042305_add_datasets/migration.sql

@@ -1,28 +0,0 @@
--- CreateTable
-CREATE TABLE "Dataset" (
-    "id" UUID NOT NULL,
-    "name" TEXT NOT NULL,
-    "organizationId" UUID NOT NULL,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "Dataset_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "DatasetEntry" (
-    "id" UUID NOT NULL,
-    "input" TEXT NOT NULL,
-    "output" TEXT,
-    "datasetId" UUID NOT NULL,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "DatasetEntry_pkey" PRIMARY KEY ("id")
-);
-
--- AddForeignKey
-ALTER TABLE "Dataset" ADD CONSTRAINT "Dataset_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "DatasetEntry" ADD CONSTRAINT "DatasetEntry_datasetId_fkey" FOREIGN KEY ("datasetId") REFERENCES "Dataset"("id") ON DELETE CASCADE ON UPDATE CASCADE;

app/prisma/migrations/20230805054033_migrate_construct_fn_to_prompt_constructor/migration.sql

@@ -1,13 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to drop the column `constructFn` on the `PromptVariant` table. All the data in the column will be lost.
-  - You are about to drop the column `constructFnVersion` on the `PromptVariant` table. All the data in the column will be lost.
-  - Added the required column `promptConstructor` to the `PromptVariant` table without a default value. This is not possible if the table is not empty.
-  - Added the required column `promptConstructorVersion` to the `PromptVariant` table without a default value. This is not possible if the table is not empty.
-
-*/
--- AlterTable
-
-ALTER TABLE "PromptVariant" RENAME COLUMN "constructFn" TO "promptConstructor";
-ALTER TABLE "PromptVariant" RENAME COLUMN "constructFnVersion" TO "promptConstructorVersion";

app/prisma/migrations/20230806024615_add_logged_calls_and_api_keys/migration.sql

@@ -1,90 +0,0 @@
--- CreateTable
-CREATE TABLE "LoggedCall" (
-    "id" UUID NOT NULL,
-    "startTime" TIMESTAMP(3) NOT NULL,
-    "cacheHit" BOOLEAN NOT NULL,
-    "modelResponseId" UUID NOT NULL,
-    "organizationId" UUID NOT NULL,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "LoggedCall_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "LoggedCallModelResponse" (
-    "id" UUID NOT NULL,
-    "reqPayload" JSONB NOT NULL,
-    "respStatus" INTEGER,
-    "respPayload" JSONB,
-    "error" TEXT,
-    "startTime" TIMESTAMP(3) NOT NULL,
-    "endTime" TIMESTAMP(3) NOT NULL,
-    "cacheKey" TEXT,
-    "durationMs" INTEGER,
-    "inputTokens" INTEGER,
-    "outputTokens" INTEGER,
-    "finishReason" TEXT,
-    "completionId" TEXT,
-    "totalCost" DECIMAL(18,12),
-    "originalLoggedCallId" UUID NOT NULL,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "LoggedCallModelResponse_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "LoggedCallTag" (
-    "id" UUID NOT NULL,
-    "name" TEXT NOT NULL,
-    "value" TEXT,
-    "loggedCallId" UUID NOT NULL,
-
-    CONSTRAINT "LoggedCallTag_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "ApiKey" (
-    "id" UUID NOT NULL,
-    "name" TEXT NOT NULL,
-    "apiKey" TEXT NOT NULL,
-    "organizationId" UUID NOT NULL,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "ApiKey_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE INDEX "LoggedCall_startTime_idx" ON "LoggedCall"("startTime");
-
--- CreateIndex
-CREATE UNIQUE INDEX "LoggedCallModelResponse_originalLoggedCallId_key" ON "LoggedCallModelResponse"("originalLoggedCallId");
-
--- CreateIndex
-CREATE INDEX "LoggedCallModelResponse_cacheKey_idx" ON "LoggedCallModelResponse"("cacheKey");
-
--- CreateIndex
-CREATE INDEX "LoggedCallTag_name_idx" ON "LoggedCallTag"("name");
-
--- CreateIndex
-CREATE INDEX "LoggedCallTag_name_value_idx" ON "LoggedCallTag"("name", "value");
-
--- CreateIndex
-CREATE UNIQUE INDEX "ApiKey_apiKey_key" ON "ApiKey"("apiKey");
-
--- AddForeignKey
-ALTER TABLE "LoggedCall" ADD CONSTRAINT "LoggedCall_modelResponseId_fkey" FOREIGN KEY ("modelResponseId") REFERENCES "LoggedCallModelResponse"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "LoggedCall" ADD CONSTRAINT "LoggedCall_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "LoggedCallModelResponse" ADD CONSTRAINT "LoggedCallModelResponse_originalLoggedCallId_fkey" FOREIGN KEY ("originalLoggedCallId") REFERENCES "LoggedCall"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "LoggedCallTag" ADD CONSTRAINT "LoggedCallTag_loggedCallId_fkey" FOREIGN KEY ("loggedCallId") REFERENCES "LoggedCall"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "ApiKey" ADD CONSTRAINT "ApiKey_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;

app/prisma/migrations/20230807044936_add_name_to_organization/migration.sql

@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "Organization" ADD COLUMN     "name" TEXT NOT NULL DEFAULT 'Project 1';

app/prisma/migrations/20230808034313_make_model_response_optional/migration.sql

@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "LoggedCall" ALTER COLUMN "modelResponseId" DROP NOT NULL;

app/prisma/migrations/20230809222649_rename_organization_to_project/migration.sql

@@ -1,37 +0,0 @@
--- Rename Enum
-ALTER TYPE "OrganizationUserRole" RENAME TO "ProjectUserRole";
-
--- Drop and recreate foreign keys
-ALTER TABLE "ApiKey" DROP CONSTRAINT "ApiKey_organizationId_fkey";
-ALTER TABLE "Dataset" DROP CONSTRAINT "Dataset_organizationId_fkey";
-ALTER TABLE "Experiment" DROP CONSTRAINT "Experiment_organizationId_fkey";
-ALTER TABLE "LoggedCall" DROP CONSTRAINT "LoggedCall_organizationId_fkey";
-ALTER TABLE "OrganizationUser" DROP CONSTRAINT "OrganizationUser_organizationId_fkey";
-ALTER TABLE "OrganizationUser" DROP CONSTRAINT "OrganizationUser_userId_fkey";
-
--- Rename columns
-ALTER TABLE "ApiKey" RENAME COLUMN "organizationId" TO "projectId";
-ALTER TABLE "Dataset" RENAME COLUMN "organizationId" TO "projectId";
-ALTER TABLE "Experiment" RENAME COLUMN "organizationId" TO "projectId";
-ALTER TABLE "LoggedCall" RENAME COLUMN "organizationId" TO "projectId";
-ALTER TABLE "OrganizationUser" RENAME COLUMN "organizationId" TO "projectId";
-ALTER TABLE "Organization" RENAME COLUMN "personalOrgUserId" TO "personalProjectUserId";
-
--- Rename table
-ALTER TABLE "Organization" RENAME TO "Project";
-ALTER TABLE "OrganizationUser" RENAME TO "ProjectUser";
-
--- Recreate foreign keys
-ALTER TABLE "Experiment" ADD CONSTRAINT "Experiment_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE "Dataset" ADD CONSTRAINT "Dataset_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE "ProjectUser" ADD CONSTRAINT "ProjectUser_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE "ProjectUser" ADD CONSTRAINT "ProjectUser_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE "LoggedCall" ADD CONSTRAINT "LoggedCall_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE "ApiKey" ADD CONSTRAINT "ApiKey_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- Rename indexes
-ALTER TABLE "Project" RENAME CONSTRAINT "Organization_pkey" TO "Project_pkey";
-ALTER TABLE "ProjectUser" RENAME CONSTRAINT "OrganizationUser_pkey" TO "ProjectUser_pkey";
-ALTER TABLE "Project" RENAME CONSTRAINT "Organization_personalOrgUserId_fkey" TO "Project_personalProjectUserId_fkey";
-ALTER INDEX "Organization_personalOrgUserId_key" RENAME TO "Project_personalProjectUserId_key";
-ALTER INDEX "OrganizationUser_organizationId_userId_key" RENAME TO "ProjectUser_projectId_userId_key";

app/prisma/migrations/20230810161437_add_uuid_extension/migration.sql

@@ -1 +0,0 @@
-CREATE EXTENSION IF NOT EXISTS "uuid-ossp";

app/prisma/migrations/20230811200114_rename_model_response_fields/migration.sql

@@ -1,66 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to rename the column `completionTokens` to `outputTokens` on the `ModelResponse` table.
-  - You are about to rename the column `promptTokens` to `inputTokens` on the `ModelResponse` table.
-  - You are about to rename the column `startTime` on the `LoggedCall` table to `requestedAt`. Ensure compatibility with application logic.
-  - You are about to rename the column `startTime` on the `LoggedCallModelResponse` table to `requestedAt`. Ensure compatibility with application logic.
-  - You are about to rename the column `endTime` on the `LoggedCallModelResponse` table to `receivedAt`. Ensure compatibility with application logic.
-  - You are about to rename the column `error` on the `LoggedCallModelResponse` table to `errorMessage`. Ensure compatibility with application logic.
-  - You are about to rename the column `respStatus` on the `LoggedCallModelResponse` table to `statusCode`. Ensure compatibility with application logic.
-  - You are about to rename the column `totalCost` on the `LoggedCallModelResponse` table to `cost`. Ensure compatibility with application logic.
-  - You are about to rename the column `inputHash` on the `ModelResponse` table to `cacheKey`. Ensure compatibility with application logic.
-  - You are about to rename the column `output` on the `ModelResponse` table to `respPayload`. Ensure compatibility with application logic.
-
-*/
--- DropIndex
-DROP INDEX "LoggedCall_startTime_idx";
-
--- DropIndex
-DROP INDEX "ModelResponse_inputHash_idx";
-
--- Rename completionTokens to outputTokens
-ALTER TABLE "ModelResponse"
-RENAME COLUMN "completionTokens" TO "outputTokens";
-
--- Rename promptTokens to inputTokens
-ALTER TABLE "ModelResponse"
-RENAME COLUMN "promptTokens" TO "inputTokens";
-
--- AlterTable
-ALTER TABLE "LoggedCall"
-RENAME COLUMN "startTime" TO "requestedAt";
-
--- AlterTable
-ALTER TABLE "LoggedCallModelResponse"
-RENAME COLUMN "startTime" TO "requestedAt";
-
--- AlterTable
-ALTER TABLE "LoggedCallModelResponse"
-RENAME COLUMN "endTime" TO "receivedAt";
-
--- AlterTable
-ALTER TABLE "LoggedCallModelResponse"
-RENAME COLUMN "error" TO "errorMessage";
-
--- AlterTable
-ALTER TABLE "LoggedCallModelResponse"
-RENAME COLUMN "respStatus" TO "statusCode";
-
--- AlterTable
-ALTER TABLE "LoggedCallModelResponse"
-RENAME COLUMN "totalCost" TO "cost";
-
--- AlterTable
-ALTER TABLE "ModelResponse"
-RENAME COLUMN "inputHash" TO "cacheKey";
-
--- AlterTable
-ALTER TABLE "ModelResponse"
-RENAME COLUMN "output" TO "respPayload";
-
--- CreateIndex
-CREATE INDEX "LoggedCall_requestedAt_idx" ON "LoggedCall"("requestedAt");
-
--- CreateIndex
-CREATE INDEX "ModelResponse_cacheKey_idx" ON "ModelResponse"("cacheKey");

app/prisma/migrations/20230811231429_add_model_to_logged_call/migration.sql

@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "LoggedCall" ADD COLUMN     "model" TEXT;

app/prisma/migrations/20230814233722_index_tags_by_project/migration.sql

@@ -1,22 +0,0 @@
--- DropIndex
-DROP INDEX "LoggedCallTag_name_idx";
-DROP INDEX "LoggedCallTag_name_value_idx";
-
--- AlterTable: Add projectId column without NOT NULL constraint for now
-ALTER TABLE "LoggedCallTag" ADD COLUMN "projectId" UUID;
-
--- Set the default value
-UPDATE "LoggedCallTag" lct
-SET "projectId" = lc."projectId"
-FROM "LoggedCall" lc
-WHERE lct."loggedCallId" = lc.id;
-
--- Now set the NOT NULL constraint
-ALTER TABLE "LoggedCallTag" ALTER COLUMN "projectId" SET NOT NULL;
-
--- CreateIndex
-CREATE INDEX "LoggedCallTag_projectId_name_idx" ON "LoggedCallTag"("projectId", "name");
-CREATE INDEX "LoggedCallTag_projectId_name_value_idx" ON "LoggedCallTag"("projectId", "name", "value");
-
--- CreateIndex
-CREATE UNIQUE INDEX "LoggedCallTag_loggedCallId_name_key" ON "LoggedCallTag"("loggedCallId", "name");

app/prisma/migrations/20230815234811_add_user_invitations/migration.sql

@@ -1,25 +0,0 @@
--- CreateTable
-CREATE TABLE "UserInvitation" (
-    "id" UUID NOT NULL,
-    "projectId" UUID NOT NULL,
-    "email" TEXT NOT NULL,
-    "role" "ProjectUserRole" NOT NULL,
-    "invitationToken" TEXT NOT NULL,
-    "senderId" UUID NOT NULL,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "UserInvitation_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "UserInvitation_invitationToken_key" ON "UserInvitation"("invitationToken");
-
--- CreateIndex
-CREATE UNIQUE INDEX "UserInvitation_projectId_email_key" ON "UserInvitation"("projectId", "email");
-
--- AddForeignKey
-ALTER TABLE "UserInvitation" ADD CONSTRAINT "UserInvitation_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "UserInvitation" ADD CONSTRAINT "UserInvitation_senderId_fkey" FOREIGN KEY ("senderId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

app/prisma/migrations/20230818055303_add_slug_to_experiment/migration.sql

@@ -1,88 +0,0 @@
-/*
- * Copyright 2023 Viascom Ltd liab. Co
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-CREATE EXTENSION IF NOT EXISTS pgcrypto;
-
-CREATE OR REPLACE FUNCTION nanoid(
-    size int DEFAULT 21,
-    alphabet text DEFAULT '_-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-)
-    RETURNS text
-    LANGUAGE plpgsql
-    volatile
-AS
-$$
-DECLARE
-    idBuilder      text := '';
-    counter        int  := 0;
-    bytes          bytea;
-    alphabetIndex  int;
-    alphabetArray  text[];
-    alphabetLength int;
-    mask           int;
-    step           int;
-BEGIN
-    alphabetArray := regexp_split_to_array(alphabet, '');
-    alphabetLength := array_length(alphabetArray, 1);
-    mask := (2 << cast(floor(log(alphabetLength - 1) / log(2)) as int)) - 1;
-    step := cast(ceil(1.6 * mask * size / alphabetLength) AS int);
-
-    while true
-        loop
-            bytes := gen_random_bytes(step);
-            while counter < step
-                loop
-                    alphabetIndex := (get_byte(bytes, counter) & mask) + 1;
-                    if alphabetIndex <= alphabetLength then
-                        idBuilder := idBuilder || alphabetArray[alphabetIndex];
-                        if length(idBuilder) = size then
-                            return idBuilder;
-                        end if;
-                    end if;
-                    counter := counter + 1;
-                end loop;
-
-            counter := 0;
-        end loop;
-END
-$$;
-
-
--- Make a short_nanoid function that uses the default alphabet and length of 15
-CREATE OR REPLACE FUNCTION short_nanoid()
-    RETURNS text
-    LANGUAGE plpgsql
-    volatile
-AS
-$$
-BEGIN
-    RETURN nanoid(15, '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
-END
-$$;
-
--- AlterTable
-ALTER TABLE "Experiment" ADD COLUMN     "slug" TEXT NOT NULL DEFAULT short_nanoid();
-
--- For existing experiments, keep the existing id as the slug for backwards compatibility
-UPDATE "Experiment" SET "slug" = "id";
-
--- CreateIndex
-CREATE UNIQUE INDEX "Experiment_slug_key" ON "Experiment"("slug");

app/prisma/migrations/20230822234224_add_fine_tunes/migration.sql

@@ -1,48 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to drop the column `input` on the `DatasetEntry` table. All the data in the column will be lost.
-  - You are about to drop the column `output` on the `DatasetEntry` table. All the data in the column will be lost.
-  - Added the required column `loggedCallId` to the `DatasetEntry` table without a default value. This is not possible if the table is not empty.
-
-*/
--- AlterTable
-ALTER TABLE "DatasetEntry" DROP COLUMN "input",
-DROP COLUMN "output",
-ADD COLUMN     "loggedCallId" UUID NOT NULL;
-
--- AddForeignKey
-ALTER TABLE "DatasetEntry" ADD CONSTRAINT "DatasetEntry_loggedCallId_fkey" FOREIGN KEY ("loggedCallId") REFERENCES "LoggedCall"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AlterTable
-ALTER TABLE "LoggedCallModelResponse" ALTER COLUMN "cost" SET DATA TYPE DOUBLE PRECISION;
-
--- CreateEnum
-CREATE TYPE "FineTuneStatus" AS ENUM ('PENDING', 'TRAINING', 'AWAITING_DEPLOYMENT', 'DEPLOYING', 'DEPLOYED', 'ERROR');
-
--- CreateTable
-CREATE TABLE "FineTune" (
-    "id" UUID NOT NULL,
-    "slug" TEXT NOT NULL,
-    "baseModel" TEXT NOT NULL,
-    "status" "FineTuneStatus" NOT NULL DEFAULT 'PENDING',
-    "trainingStartedAt" TIMESTAMP(3),
-    "trainingFinishedAt" TIMESTAMP(3),
-    "deploymentStartedAt" TIMESTAMP(3),
-    "deploymentFinishedAt" TIMESTAMP(3),
-    "datasetId" UUID NOT NULL,
-    "projectId" UUID NOT NULL,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "FineTune_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "FineTune_slug_key" ON "FineTune"("slug");
-
--- AddForeignKey
-ALTER TABLE "FineTune" ADD CONSTRAINT "FineTune_datasetId_fkey" FOREIGN KEY ("datasetId") REFERENCES "Dataset"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
--- AddForeignKey
-ALTER TABLE "FineTune" ADD CONSTRAINT "FineTune_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;

app/prisma/schema.prisma

@@ -12,14 +12,15 @@ datasource db {
 
 model Experiment {
     id    String @id @default(uuid()) @db.Uuid
-
-    slug  String @unique @default(dbgenerated("short_nanoid()"))
     label String
 
     sortIndex Int @default(0)
 
-    projectId String   @db.Uuid
+    organizationId String        @db.Uuid
-    project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade)
+    organization   Organization? @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+
+    dataFlowId String?     @db.Uuid
+    dataFlow   DataFlow?   @relation(fields: [dataFlowId], references: [id], onDelete: Cascade)
 
     createdAt DateTime @default(now())
     updatedAt DateTime @updatedAt
@@ -34,8 +35,8 @@ model PromptVariant {
     id String @id @default(uuid()) @db.Uuid
 
     label              String
-    promptConstructor        String
+    constructFn        String
-    promptConstructorVersion Int
+    constructFnVersion Int
     model              String
     modelProvider      String
 
@@ -114,13 +115,13 @@ model ScenarioVariantCell {
 model ModelResponse {
     id String @id @default(uuid()) @db.Uuid
 
-    cacheKey     String
+    inputHash           String
     requestedAt         DateTime?
     receivedAt          DateTime?
-    respPayload  Json?
+    output              Json?
     cost                Float?
-    inputTokens  Int?
+    promptTokens        Int?
-    outputTokens Int?
+    completionTokens    Int?
     statusCode          Int?
     errorMessage        String?
     retryTime           DateTime?
@@ -129,11 +130,14 @@ model ModelResponse {
     createdAt DateTime @default(now())
     updatedAt DateTime @updatedAt
 
-    scenarioVariantCellId String              @db.Uuid
+    scenarioVariantCellId String?              @db.Uuid
-    scenarioVariantCell   ScenarioVariantCell @relation(fields: [scenarioVariantCellId], references: [id], onDelete: Cascade)
+    scenarioVariantCell   ScenarioVariantCell? @relation(fields: [scenarioVariantCellId], references: [id], onDelete: Cascade)
     outputEvaluations      OutputEvaluation[]
 
-    @@index([cacheKey])
+    loggedCallId String? @db.Uuid
+    loggedCall   LoggedCall? @relation(fields: [loggedCallId], references: [id], onDelete: Cascade)
+
+    @@index([inputHash])
 }
 
 enum EvalType {
@@ -176,185 +180,87 @@ model OutputEvaluation {
     @@unique([modelResponseId, evaluationId])
 }
 
-model Dataset {
-    id String @id @default(uuid()) @db.Uuid
-
-    name           String
-    datasetEntries DatasetEntry[]
-    fineTunes      FineTune[]
-
-    projectId String  @db.Uuid
-    project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
-}
-
-model DatasetEntry {
-    id String @id @default(uuid()) @db.Uuid
-
-    loggedCallId String @db.Uuid
-    loggedCall   LoggedCall @relation(fields: [loggedCallId], references: [id], onDelete: Cascade)
-
-    datasetId String   @db.Uuid
-    dataset   Dataset? @relation(fields: [datasetId], references: [id], onDelete: Cascade)
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
-}
-
-model Project {
-    id   String @id @default(uuid()) @db.Uuid
-    name String @default("Project 1")
-
-    personalProjectUserId String? @unique @db.Uuid
-    personalProjectUser   User?   @relation(fields: [personalProjectUserId], references: [id], onDelete: Cascade)
-
-    createdAt              DateTime         @default(now())
-    updatedAt              DateTime         @updatedAt
-    projectUsers           ProjectUser[]
-    projectUserInvitations UserInvitation[]
-    experiments            Experiment[]
-    datasets               Dataset[]
-    loggedCalls            LoggedCall[]
-    fineTunes              FineTune[]
-    apiKeys                ApiKey[]
-}
-
-enum ProjectUserRole {
-    ADMIN
-    MEMBER
-    VIEWER
-}
-
-model ProjectUser {
-    id String @id @default(uuid()) @db.Uuid
-
-    role ProjectUserRole
-
-    projectId String   @db.Uuid
-    project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade)
-
-    userId String @db.Uuid
-    user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
-
-    @@unique([projectId, 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 LoggedCall {
     id String @id @default(uuid()) @db.Uuid
 
-    requestedAt DateTime
+    promptFunctionHash String
+    promptFunction     String
+    prompt     Json
+    responsePayload    Json?
+    scenarioVariables Json
+    model              String
+    modelProvider      String
 
-    // True if this call was served from the cache, false otherwise
+    dataFlowId String     @db.Uuid
-    cacheHit Boolean
+    dataFlow   DataFlow   @relation(fields: [dataFlowId], references: [id], onDelete: Cascade)
 
-    // A LoggedCall is always associated with a LoggedCallModelResponse. If this
+    modelResponse      ModelResponse[]
-    // is a cache miss, we create a new LoggedCallModelResponse.
-    // If it's a cache hit, it's a pre-existing LoggedCallModelResponse.    
-    modelResponseId String?                  @db.Uuid
-    modelResponse   LoggedCallModelResponse? @relation(fields: [modelResponseId], references: [id], onDelete: Cascade)
-
-    // The responses created by this LoggedCall. Will be empty if this LoggedCall was a cache hit.
-    createdResponses LoggedCallModelResponse[] @relation(name: "ModelResponseOriginalCall")
-
-    projectId String   @db.Uuid
-    project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade)
-
-    model           String?
-    tags            LoggedCallTag[]
-    datasetEntries  DatasetEntry[]
 
     createdAt DateTime @default(now())
     updatedAt DateTime @updatedAt
-
-    @@index([requestedAt])
 }
 
-model LoggedCallModelResponse {
+model DataFlow {
     id String @id @default(uuid()) @db.Uuid
 
-    reqPayload Json
+    label String
-
+    experiments   Experiment[]
-    // The HTTP status returned by the model provider
-    statusCode  Int?
-    respPayload Json?
-
-    // Should be null if the request was successful, and some string if the request failed.
-    errorMessage String?
-
-    requestedAt DateTime
-    receivedAt  DateTime
-
-    // Note: the function to calculate the cacheKey should include the project
-    // ID so we don't share cached responses between projects, which could be an
-    // attack vector. Also, we should only set the cacheKey on the model if the
-    // request was successful.
-    cacheKey String?
-
-    // Derived fields
-    durationMs   Int?
-    inputTokens  Int?
-    outputTokens Int?
-    finishReason String?
-    completionId String?
-    cost         Float?
-
-    // The LoggedCall that created this LoggedCallModelResponse
-    originalLoggedCallId String     @unique @db.Uuid
-    originalLoggedCall   LoggedCall @relation(name: "ModelResponseOriginalCall", fields: [originalLoggedCallId], references: [id], onDelete: Cascade)
-
-    createdAt   DateTime     @default(now())
-    updatedAt   DateTime     @updatedAt
     loggedCalls      LoggedCall[]
+    organizationId String        @db.Uuid
+    organization   Organization? @relation(fields: [organizationId], references: [id], onDelete: Cascade)
 
-    @@index([cacheKey])
+    createdAt DateTime @default(now())
-}
+    updatedAt DateTime @updatedAt
-
-model LoggedCallTag {
-    id        String  @id @default(uuid()) @db.Uuid
-    name      String
-    value     String?
-    projectId String  @db.Uuid
-
-    loggedCallId String     @db.Uuid
-    loggedCall   LoggedCall @relation(fields: [loggedCallId], references: [id], onDelete: Cascade)
-
-    @@unique([loggedCallId, name])
-    @@index([projectId, name])
-    @@index([projectId, name, value])
 }
 
 model ApiKey {
     id        String  @id @default(uuid()) @db.Uuid
 
     name      String
-    apiKey String @unique
+    key     String  @unique
-
+    organizationId String        @db.Uuid
-    projectId String  @db.Uuid
+    organization   Organization? @relation(fields: [organizationId], references: [id], onDelete: Cascade)
-    project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
 
     createdAt DateTime @default(now())
     updatedAt DateTime @updatedAt
 }
 
+model Organization {
+    id                String  @id @default(uuid()) @db.Uuid
+    personalOrgUserId String? @unique @db.Uuid
+    personalOrgUser   User?   @relation(fields: [personalOrgUserId], references: [id], onDelete: Cascade)
+    apiKeys         ApiKey[]
+    dataFlows         DataFlow[]
+
+    createdAt        DateTime           @default(now())
+    updatedAt        DateTime           @updatedAt
+    organizationUsers OrganizationUser[]
+    experiments       Experiment[]
+}
+
+enum OrganizationUserRole {
+    ADMIN
+    MEMBER
+    VIEWER
+}
+
+model OrganizationUser {
+    id String @id @default(uuid()) @db.Uuid
+
+    role OrganizationUserRole
+
+    organizationId String        @db.Uuid
+    organization   Organization? @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+
+    userId String @db.Uuid
+    user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+    createdAt DateTime @default(now())
+    updatedAt DateTime @updatedAt
+
+    @@unique([organizationId, userId])
+}
+
 model Account {
     id                       String  @id @default(uuid()) @db.Uuid
     userId                   String  @db.Uuid
@@ -382,45 +288,16 @@ model Session {
     user         User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
-enum UserRole {
-    ADMIN
-    USER
-}
-
 model User {
     id                String             @id @default(uuid()) @db.Uuid
     name              String?
     email             String?            @unique
     emailVerified     DateTime?
     image             String?
-
-    role UserRole @default(USER)
-
     accounts          Account[]
     sessions          Session[]
-    projectUsers        ProjectUser[]
+    organizationUsers OrganizationUser[]
-    projects            Project[]
+    organizations     Organization[]
-    worldChampEntrant   WorldChampEntrant?
-    sentUserInvitations UserInvitation[]
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @default(now()) @updatedAt
-}
-
-model UserInvitation {
-    id String @id @default(uuid()) @db.Uuid
-
-    projectId       String          @db.Uuid
-    project         Project         @relation(fields: [projectId], references: [id], onDelete: Cascade)
-    email           String
-    role            ProjectUserRole
-    invitationToken String          @unique
-    senderId        String          @db.Uuid
-    sender          User            @relation(fields: [senderId], references: [id], onDelete: Cascade)
-    createdAt       DateTime        @default(now())
-    updatedAt       DateTime        @updatedAt
-
-    @@unique([projectId, email])
 }
 
 model VerificationToken {
@@ -430,33 +307,3 @@ model VerificationToken {
 
     @@unique([identifier, token])
 }
-
-enum FineTuneStatus {
-    PENDING
-    TRAINING
-    AWAITING_DEPLOYMENT
-    DEPLOYING
-    DEPLOYED
-    ERROR
-}
-
-model FineTune {
-    id String @id @default(uuid()) @db.Uuid
-
-    slug      String @unique
-    baseModel String
-    status    FineTuneStatus @default(PENDING)
-    trainingStartedAt    DateTime?
-    trainingFinishedAt   DateTime?
-    deploymentStartedAt  DateTime?
-    deploymentFinishedAt DateTime?
-
-    datasetId String   @db.Uuid
-    dataset   Dataset @relation(fields: [datasetId], references: [id], onDelete: Cascade)
-
-    projectId String  @db.Uuid
-    project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
-}

app/prisma/seed.ts

@@ -1,44 +1,20 @@
 import { prisma } from "~/server/db";
 import dedent from "dedent";
 import { generateNewCell } from "~/server/utils/generateNewCell";
-import { promptConstructorVersion } from "~/promptConstructor/version";
-import { env } from "~/env.mjs";
 
 const defaultId = "11111111-1111-1111-1111-111111111111";
 
-await prisma.project.deleteMany({
+await prisma.organization.deleteMany({
   where: { id: defaultId },
 });
 
-// Mark all users as admins
+// If there's an existing org, just seed into it
-await prisma.user.updateMany({
+const org =
-  where: {},
+  (await prisma.organization.findFirst({})) ??
-  data: {
+  (await prisma.organization.create({
-    role: "ADMIN",
-  },
-});
-
-// If there's an existing project, just seed into it
-const project =
-  (await prisma.project.findFirst({})) ??
-  (await prisma.project.create({
     data: { id: defaultId },
   }));
 
-if (env.OPENPIPE_API_KEY) {
-  await prisma.apiKey.upsert({
-    where: {
-      apiKey: env.OPENPIPE_API_KEY,
-    },
-    create: {
-      projectId: project.id,
-      name: "Default API Key",
-      apiKey: env.OPENPIPE_API_KEY,
-    },
-    update: {},
-  });
-}
-
 await prisma.experiment.deleteMany({
   where: {
     id: defaultId,
@@ -49,7 +25,7 @@ await prisma.experiment.create({
   data: {
     id: defaultId,
     label: "Country Capitals Example",
-    projectId: project.id,
+    organizationId: org.id,
   },
 });
 
@@ -75,8 +51,8 @@ await prisma.promptVariant.createMany({
       sortIndex: 0,
       model: "gpt-3.5-turbo-0613",
       modelProvider: "openai/ChatCompletion",
-      promptConstructorVersion,
+      constructFnVersion: 1,
-      promptConstructor: dedent`
+      constructFn: dedent`
         definePrompt("openai/ChatCompletion", {
           model: "gpt-3.5-turbo-0613",
           messages: [
@@ -94,8 +70,8 @@ await prisma.promptVariant.createMany({
       sortIndex: 1,
       model: "gpt-3.5-turbo-0613",
       modelProvider: "openai/ChatCompletion",
-      promptConstructorVersion,
+      constructFnVersion: 1,
-      promptConstructor: dedent`
+      constructFn: dedent`
         definePrompt("openai/ChatCompletion", {
           model: "gpt-3.5-turbo-0613",
           messages: [

app/prisma/seedAgiEval.ts

@@ -1,128 +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";
-import { promptConstructorVersion } from "~/promptConstructor/version";
-
-const defaultId = "11111111-1111-1111-1111-111111111112";
-
-await prisma.project.deleteMany({
-  where: { id: defaultId },
-});
-
-// If there's an existing project, just seed into it
-const project =
-  (await prisma.project.findFirst({})) ??
-  (await prisma.project.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,
-      projectId: project.id,
-    },
-  });
-  if (oldExperiment) {
-    await prisma.experiment.deleteMany({
-      where: { id: oldExperiment.id },
-    });
-  }
-
-  const experiment = await prisma.experiment.create({
-    data: {
-      id: oldExperiment?.id ?? undefined,
-      label: experimentName,
-      projectId: project.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",
-        promptConstructorVersion,
-        promptConstructor: 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}})",
-      },
-    ],
-  });
-}

app/prisma/seedTwitterSentiment.ts

@@ -1,114 +0,0 @@
-import { prisma } from "~/server/db";
-import dedent from "dedent";
-import fs from "fs";
-import { parse } from "csv-parse/sync";
-import { promptConstructorVersion } from "~/promptConstructor/version";
-
-const defaultId = "11111111-1111-1111-1111-111111111112";
-
-await prisma.project.deleteMany({
-  where: { id: defaultId },
-});
-
-// If there's an existing project, just seed into it
-const project =
-  (await prisma.project.findFirst({})) ??
-  (await prisma.project.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,
-    projectId: project.id,
-  },
-});
-if (oldExperiment) {
-  await prisma.experiment.deleteMany({
-    where: { id: oldExperiment.id },
-  });
-}
-
-const experiment = await prisma.experiment.create({
-  data: {
-    id: oldExperiment?.id ?? undefined,
-    label: experimentName,
-    projectId: project.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",
-      promptConstructorVersion,
-      promptConstructor: 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}}",
-    },
-  ],
-});

app/public/favicons/safari-pinned-tab.svg

@@ -9,9 +9,10 @@ Created by potrace 1.14, written by Peter Selinger 2001-2017
 </metadata>
 <g transform="translate(0.000000,550.000000) scale(0.100000,-0.100000)"
 fill="#000000" stroke="none">
-<path d="M785 5474 l-25 -27 0 -622 0 -622 25 -27 24 -26 171 0 170 0 0 -2050
+<path d="M813 5478 c-18 -13 -37 -36 -43 -52 -6 -19 -10 -236 -10 -603 0 -638
-0 -2051 25 -25 24 -24 1557 2 1556 3 19 24 c19 23 19 70 19 2072 l0 2049 169
+-1 -626 65 -657 25 -12 67 -16 179 -16 l146 0 0 -2032 0 -2032 23 -33 c12 -18
-0 c165 0 169 1 195 25 l26 24 0 626 0 626 -26 24 -27 25 -1939 0 -1939 0 -24
+35 -37 51 -43 19 -7 539 -10 1528 -10 1663 0 1549 -5 1582 65 14 30 16 235 16
--26z"/>
+2059 l0 2026 156 0 156 0 39 39 39 39 0 587 c0 651 1 638 -65 669 -30 14 -223
+16 -1932 16 l-1898 0 -32 -22z"/>
 </g>
 </svg>

app/public/logo.svg

@@ -1,28 +1,5 @@
-<svg width="398" height="550" viewBox="0 0 398 550" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg width="380" height="320" viewBox="0 0 380 320" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M39 125H359V542C359 546.418 355.418 550 351 550H47C42.5817 550 39 546.418 39 542V125Z" fill="black"/>
+<path d="M72 320L122.5 231L130.5 150.5L115 73L72 0H312L265 64.5L257 158.5L265 249L312 320H72Z" fill="#FF5733"/>
-<path d="M0 8C0 3.58172 3.58172 0 8 0H390C394.418 0 398 3.58172 398 8V127C398 131.418 394.418 135 390 135H7.99999C3.58171 135 0 131.418 0 127V8Z" fill="black"/>
+<path d="M67.027 9.5C72.9909 9.5 79.5196 12.3449 86.3672 19.2588C93.2495 26.2075 99.8845 36.7468 105.66 50.5336C117.194 78.0671 124.554 116.764 124.554 160C124.554 203.236 117.194 241.933 105.66 269.466C99.8845 283.253 93.2495 293.793 86.3672 300.741C79.5196 307.655 72.9909 310.5 67.027 310.5C61.0632 310.5 54.5345 307.655 47.6868 300.741C40.8045 293.793 34.1695 283.253 28.394 269.466C16.8596 241.933 9.5 203.236 9.5 160C9.5 116.764 16.8596 78.0671 28.394 50.5336C34.1695 36.7468 40.8045 26.2075 47.6868 19.2588C54.5345 12.3449 61.0632 9.5 67.027 9.5Z" stroke="#FF5733" stroke-width="19"/>
-<path d="M50 135H348V535C348 537.209 346.209 539 344 539H54C51.7909 539 50 537.209 50 535V135Z" fill="#FF5733"/>
+<path d="M312.027 9.5C317.991 9.5 324.52 12.3449 331.367 19.2588C338.25 26.2075 344.885 36.7468 350.66 50.5336C362.194 78.0671 369.554 116.764 369.554 160C369.554 203.236 362.194 241.933 350.66 269.466C344.885 283.253 338.25 293.793 331.367 300.741C324.52 307.655 317.991 310.5 312.027 310.5C306.063 310.5 299.534 307.655 292.687 300.741C285.805 293.793 279.17 283.253 273.394 269.466C261.86 241.933 254.5 203.236 254.5 160C254.5 116.764 261.86 78.0671 273.394 50.5336C279.17 36.7468 285.805 26.2075 292.687 19.2588C299.534 12.3449 306.063 9.5 312.027 9.5Z" stroke="#FF5733" stroke-width="19"/>
-<path d="M11 14.0001C11 11.791 12.7909 10.0001 15 10.0001H384C386.209 10.0001 388 11.791 388 14.0001V120C388 122.209 386.209 124 384 124H15C12.7909 124 11 122.209 11 120V14.0001Z" fill="#FF5733"/>
-<path d="M11 14.0001C11 11.791 12.7909 10.0001 15 10.0001H384C386.209 10.0001 388 11.791 388 14.0001V120C388 122.209 386.209 124 384 124H15C12.7909 124 11 122.209 11 120V14.0001Z" fill="url(#paint0_linear_102_49)"/>
-<path d="M50 134H348V535C348 537.209 346.209 539 344 539H54C51.7909 539 50 537.209 50 535V134Z" fill="url(#paint1_linear_102_49)"/>
-<path d="M108 142H156V535H108V142Z" fill="white"/>
-<path d="M300 135H348V535C348 537.209 346.209 539 344 539H300V135Z" fill="white" fill-opacity="0.25"/>
-<path d="M96 142H108V535H96V142Z" fill="white" fill-opacity="0.5"/>
-<path d="M84 10.0001H133V120H84V10.0001Z" fill="white"/>
-<path d="M339 10.0001H384C386.209 10.0001 388 11.791 388 14.0001V120C388 122.209 386.209 124 384 124H339V10.0001Z" fill="white" fill-opacity="0.25"/>
-<path d="M71.9995 10.0001H83.9995V120H71.9995V10.0001Z" fill="white" fill-opacity="0.5"/>
-<path d="M108 534.529H156V539.019H108V534.529Z" fill="#AAAAAA"/>
-<path opacity="0.5" d="M95.9927 534.529H107.982V539.019H95.9927V534.529Z" fill="#AAAAAA"/>
-<path d="M84.0029 119.887H133.007V124.027H84.0029V119.887Z" fill="#AAAAAA"/>
-<path opacity="0.5" d="M71.9883 119.887H83.978V124.027H71.9883V119.887Z" fill="#AAAAAA"/>
-<defs>
-<linearGradient id="paint0_linear_102_49" x1="335" y1="67.0001" x2="137" y2="67.0001" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D62600"/>
-<stop offset="1" stop-color="#FF5733" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint1_linear_102_49" x1="306.106" y1="336.5" x2="149.597" y2="336.5" gradientUnits="userSpaceOnUse">
-<stop stop-color="#D62600"/>
-<stop offset="1" stop-color="#FF5733" stop-opacity="0"/>
-</linearGradient>
-</defs>
 </svg>

app/render.yaml

@@ -2,23 +2,27 @@ databases:
   - name: querykey-prod
     databaseName: querykey_prod
     user: querykey
-    plan: standard
+    plan: starter
 
 services:
   - type: web
     name: querykey-prod-web
-    runtime: docker
+    env: docker
-    dockerfilePath: ./app/Dockerfile
+    dockerfilePath: Dockerfile
     dockerContext: .
-    plan: pro
+    plan: standard
     domains:
       - app.openpipe.ai
     envVars:
+      - key: NODE_ENV
+        value: production
       - key: DATABASE_URL
         fromDatabase:
           name: querykey-prod
           property: connectionString
       - fromGroup: querykey-prod
+      - key: NEXT_PUBLIC_SOCKET_URL
+        value: https://querykey-prod-wss.onrender.com
       # Render support says we need to manually set this because otherwise
       # sometimes it checks a different random port that NextJS opens for
       # liveness and the liveness check fails.
@@ -27,22 +31,8 @@ services:
 
   - type: web
     name: querykey-prod-wss
-    runtime: docker
+    env: docker
-    dockerfilePath: ./app/Dockerfile
+    dockerfilePath: Dockerfile
     dockerContext: .
     plan: free
     dockerCommand: pnpm tsx src/wss-server.ts
-
-  - type: worker
-    name: querykey-prod-worker
-    runtime: docker
-    dockerfilePath: ./app/Dockerfile
-    dockerContext: .
-    plan: pro
-    dockerCommand: /code/app/scripts/run-workers-prod.sh
-    envVars:
-      - key: DATABASE_URL
-        fromDatabase:
-          name: querykey-prod
-          property: connectionString
-      - fromGroup: querykey-prod

app/run-prod.sh

@@ -5,9 +5,8 @@ set -e
 echo "Migrating the database"
 pnpm prisma migrate deploy
 
-echo "Migrating promptConstructors"
-pnpm tsx src/promptConstructor/migrate.ts
-
 echo "Starting the server"
 
-pnpm start
+pnpm concurrently --kill-others \
+  "pnpm start" \
+  "pnpm tsx src/server/tasks/worker.ts"

app/scripts/debug-prod.sh

@@ -1,6 +0,0 @@
-#! /bin/bash
-
-set -e
-cd "$(dirname "$0")/.."
-apt-get update
-apt-get install -y htop psql

app/scripts/run-workers-prod.sh

@@ -1,10 +0,0 @@
-#! /bin/bash
-
-set -e
-
-echo "Migrating the database"
-pnpm prisma migrate deploy
-
-echo "Starting 4 workers"
-
-pnpm concurrently "pnpm worker" "pnpm worker" "pnpm worker" "pnpm worker"

app/scripts/test-docker.sh

@@ -1,13 +0,0 @@
-#! /bin/bash
-
-set -e
-
-cd "$(dirname "$0")/../.."
-
-echo "Env is"
-echo $ENVIRONMENT
-
-docker build . --file app/Dockerfile --tag "openpipe-prod"
-
-# Run the image
-docker run --env-file app/.env -it --entrypoint "/bin/bash" "openpipe-prod"

app/sentry.client.config.ts

@@ -1,33 +0,0 @@
-// This file configures the initialization of Sentry on the client.
-// The config you add here will be used whenever a users loads a page in their browser.
-// https://docs.sentry.io/platforms/javascript/guides/nextjs/
-
-import * as Sentry from "@sentry/nextjs";
-import { env } from "~/env.mjs";
-
-if (env.NEXT_PUBLIC_SENTRY_DSN) {
-  Sentry.init({
-    dsn: env.NEXT_PUBLIC_SENTRY_DSN,
-
-    // Adjust this value in production, or use tracesSampler for greater control
-    tracesSampleRate: 1,
-
-    // Setting this option to true will print useful information to the console while you're setting up Sentry.
-    debug: false,
-
-    replaysOnErrorSampleRate: 1.0,
-
-    // This sets the sample rate to be 10%. You may want this to be 100% while
-    // in development and sample at a lower rate in production
-    replaysSessionSampleRate: 0.1,
-
-    // You can remove this option if you're not planning to use the Sentry Session Replay feature:
-    integrations: [
-      new Sentry.Replay({
-        // Additional Replay configuration goes in here, for example:
-        maskAllText: true,
-        blockAllMedia: true,
-      }),
-    ],
-  });
-}

app/sentry.edge.config.ts

@@ -1,19 +0,0 @@
-// This file configures the initialization of Sentry for edge features (middleware, edge routes, and so on).
-// The config you add here will be used whenever one of the edge features is loaded.
-// Note that this config is unrelated to the Vercel Edge Runtime and is also required when running locally.
-// https://docs.sentry.io/platforms/javascript/guides/nextjs/
-
-import * as Sentry from "@sentry/nextjs";
-import { env } from "~/env.mjs";
-
-if (env.NEXT_PUBLIC_SENTRY_DSN) {
-  Sentry.init({
-    dsn: env.NEXT_PUBLIC_SENTRY_DSN,
-
-    // Adjust this value in production, or use tracesSampler for greater control
-    tracesSampleRate: 1,
-
-    // Setting this option to true will print useful information to the console while you're setting up Sentry.
-    debug: false,
-  });
-}

app/sentry.server.config.ts

@@ -1,25 +0,0 @@
-// This file configures the initialization of Sentry on the server.
-// The config you add here will be used whenever the server handles a request.
-// https://docs.sentry.io/platforms/javascript/guides/nextjs/
-
-import * as Sentry from "@sentry/nextjs";
-import { isError } from "lodash-es";
-import { env } from "~/env.mjs";
-
-if (env.NEXT_PUBLIC_SENTRY_DSN) {
-  Sentry.init({
-    dsn: env.NEXT_PUBLIC_SENTRY_DSN,
-
-    // Adjust this value in production, or use tracesSampler for greater control
-    tracesSampleRate: 1,
-
-    // Setting this option to true will print useful information to the console while you're setting up Sentry.
-    debug: false,
-  });
-} else {
-  // Install local debug exception handler for rejected promises
-  process.on("unhandledRejection", (reason) => {
-    const reasonDetails = isError(reason) ? reason?.stack : reason;
-    console.log("Unhandled Rejection at:", reasonDetails);
-  });
-}

app/src/codegen/export-client-types.ts

@@ -0,0 +1,42 @@
+import "dotenv/config";
+import { openApiDocument } from "~/pages/api/openapi.json";
+import fs from "fs";
+import path from "path";
+import { execSync } from "child_process";
+import { generatePromptTypes } from "~/modelProviders/generatePromptTypes";
+
+console.log("Exporting public OpenAPI schema to client-libs/schema.json");
+
+const executionDir = import.meta.url.replace("file://", "");
+const schemaPath = path.join(
+  path.dirname(executionDir),
+  "../../../client-libs/schema.json"
+);
+
+console.log("Exporting schema");
+fs.writeFileSync(schemaPath, JSON.stringify(openApiDocument, null, 2), "utf-8");
+
+console.log("Generating Typescript client");
+
+const tsClientPath = path.join(
+  path.dirname(executionDir),
+  "../../../client-libs/js/codegen"
+);
+
+fs.rmSync(tsClientPath, { recursive: true, force: true });
+
+execSync(
+  `pnpm dlx @openapitools/openapi-generator-cli generate -i "${schemaPath}" -g typescript-axios -o "${tsClientPath}"`,
+  {
+    stdio: "inherit",
+  }
+);
+
+const promptTypes = await generatePromptTypes();
+
+const promptTypesPath = path.join(tsClientPath, "promptTypes.ts");
+
+console.log(`Writing promptTypes to ${promptTypesPath}`);
+fs.writeFileSync(promptTypesPath, promptTypes, "utf-8");
+
+console.log("Done!");

app/src/components/AutoResizeTextArea.tsx

@@ -1,13 +1,13 @@
 import { Textarea, type TextareaProps } from "@chakra-ui/react";
 import ResizeTextarea from "react-textarea-autosize";
-import React, { useEffect, useState } from "react";
+import React, { useLayoutEffect, useState } from "react";
 
 export const AutoResizeTextarea: React.ForwardRefRenderFunction<
   HTMLTextAreaElement,
   TextareaProps & { minRows?: number }
 > = ({ minRows = 1, overflowY = "hidden", ...props }, ref) => {
   const [isRerendered, setIsRerendered] = useState(false);
-  useEffect(() => setIsRerendered(true), []);
+  useLayoutEffect(() => setIsRerendered(true), []);
 
   return (
     <Textarea

app/src/components/ChangeModelModal/ChangeModelModal.tsx

@@ -68,7 +68,7 @@ export const ChangeModelModal = ({
       return;
     await replaceVariantMutation.mutateAsync({
       id: variant.id,
-      promptConstructor: modifiedPromptFn,
+      constructFn: modifiedPromptFn,
       streamScenarios: visibleScenarios,
     });
     await utils.promptVariants.list.invalidate();
@@ -107,7 +107,7 @@ export const ChangeModelModal = ({
             <ModelSearch selectedModel={selectedModel} setSelectedModel={setSelectedModel} />
             {isString(modifiedPromptFn) && (
               <CompareFunctions
-                originalFunction={variant.promptConstructor}
+                originalFunction={variant.constructFn}
                 newFunction={modifiedPromptFn}
                 leftTitle={originalLabel}
                 rightTitle={convertedLabel}

app/src/components/ChangeModelModal/ModelSearch.tsx

@@ -22,8 +22,8 @@ export const ModelSearch = (props: {
   const [containerRef, containerDimensions] = useElementDimensions();
 
   return (
-    <VStack ref={containerRef as LegacyRef<HTMLDivElement>} w="full" fontFamily="inconsolata">
+    <VStack ref={containerRef as LegacyRef<HTMLDivElement>} w="full">
-      <Text fontWeight="bold">Browse Models</Text>
+      <Text>Browse Models</Text>
       <Select<ProviderModel>
         styles={{ control: (provided) => ({ ...provided, width: containerDimensions?.width }) }}
         getOptionLabel={(data) => modelLabel(data.provider, data.model)}

app/src/components/ChangeModelModal/ModelStatsCard.tsx

@@ -23,24 +23,16 @@ export const ModelStatsCard = ({
         {label}
       </Text>
 
-      <VStack
+      <VStack w="full" spacing={6} bgColor="gray.100" p={4} borderRadius={4}>
-        w="full"
-        spacing={6}
-        borderWidth={1}
-        borderColor="gray.300"
-        p={4}
-        borderRadius={8}
-        fontFamily="inconsolata"
-      >
         <HStack w="full" align="flex-start">
-          <VStack flex={1} fontSize="lg" alignItems="flex-start">
+          <Text flex={1} fontSize="lg">
+            <Text as="span" color="gray.600">
+              {model.provider} /{" "}
+            </Text>
             <Text as="span" fontWeight="bold" color="gray.900">
               {model.name}
             </Text>
-            <Text as="span" color="gray.600" fontSize="sm">
-              Provider: {model.provider}
           </Text>
-          </VStack>
           <Link
             href={model.learnMoreUrl}
             isExternal
@@ -87,7 +79,7 @@ export const ModelStatsCard = ({
               label="Price"
               info={
                 <Text>
-                  ${model.pricePerSecond.toFixed(4)}
+                  ${model.pricePerSecond.toFixed(3)}
                   <Text color="gray.500"> / second</Text>
                 </Text>
               }

app/src/components/CopiableCode.tsx

@@ -1,51 +0,0 @@
-import { HStack, Icon, IconButton, Tooltip, Text, type StackProps } from "@chakra-ui/react";
-import { useState } from "react";
-import { MdContentCopy } from "react-icons/md";
-import { useHandledAsyncCallback } from "~/utils/hooks";
-
-const CopiableCode = ({ code, ...rest }: { code: string } & StackProps) => {
-  const [copied, setCopied] = useState(false);
-
-  const [copyToClipboard] = useHandledAsyncCallback(async () => {
-    await navigator.clipboard.writeText(code);
-    setCopied(true);
-  }, [code]);
-
-  return (
-    <HStack
-      backgroundColor="blackAlpha.800"
-      color="white"
-      borderRadius={4}
-      padding={3}
-      w="full"
-      justifyContent="space-between"
-      alignItems="flex-start"
-      {...rest}
-    >
-      <Text
-        fontFamily="inconsolata"
-        fontWeight="bold"
-        letterSpacing={0.5}
-        overflowX="auto"
-        whiteSpace="pre-wrap"
-      >
-        {code}
-        {/* Necessary for trailing newline to actually be displayed */}
-        {code.endsWith("\n") ? "\n" : ""}
-      </Text>
-      <Tooltip closeOnClick={false} label={copied ? "Copied!" : "Copy to clipboard"}>
-        <IconButton
-          aria-label="Copy"
-          icon={<Icon as={MdContentCopy} boxSize={5} />}
-          size="xs"
-          colorScheme="white"
-          variant="ghost"
-          onClick={copyToClipboard}
-          onMouseLeave={() => setCopied(false)}
-        />
-      </Tooltip>
-    </HStack>
-  );
-};
-
-export default CopiableCode;

app/src/components/ExperimentSettingsDrawer/DeleteButton.tsx

@@ -14,7 +14,6 @@ import {
 import { useRouter } from "next/router";
 import { useRef } from "react";
 import { BsTrash } from "react-icons/bs";
-import { useAppStore } from "~/state/store";
 import { api } from "~/utils/api";
 import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
 
@@ -24,8 +23,6 @@ export const DeleteButton = () => {
   const utils = api.useContext();
   const router = useRouter();
 
-  const closeDrawer = useAppStore((s) => s.closeDrawer);
-
   const { isOpen, onOpen, onClose } = useDisclosure();
   const cancelRef = useRef<HTMLButtonElement>(null);
 
@@ -34,8 +31,6 @@ export const DeleteButton = () => {
     await mutation.mutateAsync({ id: experiment.data.id });
     await utils.experiments.list.invalidate();
     await router.push({ pathname: "/experiments" });
-    closeDrawer();
-
     onClose();
   }, [mutation, experiment.data?.id, router]);
 

app/src/components/Favicon.tsx

@@ -8,8 +8,8 @@ export default function Favicon() {
       <link rel="icon" type="image/png" sizes="16x16" href="/favicons/favicon-16x16.png" />
       <link rel="manifest" href="/favicons/site.webmanifest" />
       <link rel="shortcut icon" href="/favicons/favicon.ico" />
-      <link rel="mask-icon" href="/favicons/safari-pinned-tab.svg" color="#5bbad5" />
       <meta name="msapplication-TileColor" content="#da532c" />
+      <meta name="msapplication-config" content="/favicons/browserconfig.xml" />
       <meta name="theme-color" content="#ffffff" />
     </Head>
   );

app/src/components/InfoCircle.tsx

@@ -1,14 +0,0 @@
-import { Tooltip, Icon, VStack } from "@chakra-ui/react";
-import { RiInformationFill } from "react-icons/ri";
-
-const InfoCircle = ({ tooltipText }: { tooltipText: string }) => {
-  return (
-    <Tooltip label={tooltipText} fontSize="sm" shouldWrapChildren maxW={80}>
-      <VStack>
-        <Icon as={RiInformationFill} boxSize={5} color="gray.500" />
-      </VStack>
-    </Tooltip>
-  );
-};
-
-export default InfoCircle;

app/src/components/InputDropdown.tsx

@@ -1,91 +0,0 @@
-import {
-  Input,
-  InputGroup,
-  InputRightElement,
-  Icon,
-  Popover,
-  PopoverTrigger,
-  PopoverContent,
-  VStack,
-  HStack,
-  Button,
-  Text,
-  useDisclosure,
-  type InputGroupProps,
-} from "@chakra-ui/react";
-
-import { FiChevronDown } from "react-icons/fi";
-import { BiCheck } from "react-icons/bi";
-
-type InputDropdownProps<T> = {
-  options: ReadonlyArray<T>;
-  selectedOption: T;
-  onSelect: (option: T) => void;
-  inputGroupProps?: InputGroupProps;
-};
-
-const InputDropdown = <T,>({
-  options,
-  selectedOption,
-  onSelect,
-  inputGroupProps,
-}: InputDropdownProps<T>) => {
-  const popover = useDisclosure();
-
-  return (
-    <Popover placement="bottom-start" {...popover}>
-      <PopoverTrigger>
-        <InputGroup
-          cursor="pointer"
-          w={(selectedOption as string).length * 14 + 180}
-          {...inputGroupProps}
-        >
-          <Input
-            value={selectedOption as string}
-            // eslint-disable-next-line @typescript-eslint/no-empty-function -- controlled input requires onChange
-            onChange={() => {}}
-            cursor="pointer"
-            borderColor={popover.isOpen ? "blue.500" : undefined}
-            _hover={popover.isOpen ? { borderColor: "blue.500" } : undefined}
-            contentEditable={false}
-            // disable focus
-            onFocus={(e) => {
-              e.target.blur();
-            }}
-          />
-          <InputRightElement>
-            <Icon as={FiChevronDown} />
-          </InputRightElement>
-        </InputGroup>
-      </PopoverTrigger>
-      <PopoverContent boxShadow="0 0 40px 4px rgba(0, 0, 0, 0.1);" minW={0} w="auto">
-        <VStack spacing={0}>
-          {options?.map((option, index) => (
-            <HStack
-              key={index}
-              as={Button}
-              onClick={() => {
-                onSelect(option);
-                popover.onClose();
-              }}
-              w="full"
-              variant="ghost"
-              justifyContent="space-between"
-              fontWeight="semibold"
-              borderRadius={0}
-              colorScheme="blue"
-              color="black"
-              fontSize="sm"
-              borderBottomWidth={1}
-            >
-              <Text mr={16}>{option as string}</Text>
-              {option === selectedOption && <Icon as={BiCheck} color="blue.500" boxSize={5} />}
-            </HStack>
-          ))}
-        </VStack>
-      </PopoverContent>
-    </Popover>
-  );
-};
-
-export default InputDropdown;

app/src/components/OutputsTable/AddVariantButton.tsx

@@ -8,7 +8,7 @@ import {
   useHandledAsyncCallback,
   useVisibleScenarioIds,
 } from "~/utils/hooks";
-import { cellPadding } from "./constants";
+import { cellPadding } from "../constants";
 import { ActionButton } from "./ScenariosHeader";
 
 export default function AddVariantButton() {
@@ -33,11 +33,25 @@ export default function AddVariantButton() {
     <Flex w="100%" justifyContent="flex-end">
       <ActionButton
         onClick={onClick}
-        py={7}
+        py={5}
         leftIcon={<Icon as={loading ? Spinner : BsPlus} boxSize={6} mr={loading ? 1 : 0} />}
       >
         <Text display={{ base: "none", md: "flex" }}>Add Variant</Text>
       </ActionButton>
+      {/* <Button
+        alignItems="center"
+        justifyContent="center"
+        fontWeight="normal"
+        bgColor="transparent"
+        _hover={{ bgColor: "gray.100" }}
+        px={cellPadding.x}
+        onClick={onClick}
+        height="unset"
+        minH={headerMinHeight}
+      >
+        <Icon as={loading ? Spinner : BsPlus} boxSize={6} mr={loading ? 1 : 0} />
+        <Text display={{ base: "none", md: "flex" }}>Add Variant</Text>
+      </Button> */}
     </Flex>
   );
 }

app/src/components/OutputsTable/EditEvaluations.tsx

@@ -12,7 +12,6 @@ import {
   Select,
   FormHelperText,
   Code,
-  IconButton,
 } from "@chakra-ui/react";
 import { type Evaluation, EvalType } from "@prisma/client";
 import { useCallback, useState } from "react";
@@ -184,37 +183,46 @@ export default function EditEvaluations() {
                 <Text flex={1}>
                   {evaluation.evalType}: &quot;{evaluation.value}&quot;
                 </Text>
-
+                <Button
-                <IconButton
-                  aria-label="Edit"
                   variant="unstyled"
-                  minW="unset"
                   color="gray.400"
+                  height="unset"
+                  width="unset"
+                  minW="unset"
                   onClick={() => setEditingId(evaluation.id)}
-                  _hover={{ color: "gray.800", cursor: "pointer" }}
+                  _hover={{
-                  icon={<Icon as={BsPencil} />}
+                    color: "gray.800",
-                />
+                    cursor: "pointer",
-                <IconButton
+                  }}
-                  aria-label="Delete"
+                >
+                  <Icon as={BsPencil} boxSize={4} />
+                </Button>
+                <Button
                   variant="unstyled"
-                  minW="unset"
                   color="gray.400"
+                  height="unset"
+                  width="unset"
+                  minW="unset"
                   onClick={() => onDelete(evaluation.id)}
-                  _hover={{ color: "gray.800", cursor: "pointer" }}
+                  _hover={{
-                  icon={<Icon as={BsX} boxSize={6} />}
+                    color: "gray.800",
-                />
+                    cursor: "pointer",
+                  }}
+                >
+                  <Icon as={BsX} boxSize={6} />
+                </Button>
               </HStack>
             ),
           )}
           {editingId == null && (
             <Button
               onClick={() => setEditingId("new")}
-              alignSelf="end"
+              alignSelf="flex-start"
               size="sm"
               mt={4}
               colorScheme="blue"
             >
-              New Evaluation
+              Add Evaluation
             </Button>
           )}
           {editingId == "new" && (

app/src/components/OutputsTable/EditScenarioVars.tsx

@@ -1,162 +1,49 @@
-import { Text, Button, HStack, Heading, Icon, IconButton, Stack, VStack } from "@chakra-ui/react";
+import { Text, Button, HStack, Heading, Icon, Input, Stack } from "@chakra-ui/react";
-import { type TemplateVariable } from "@prisma/client";
+import { useState } from "react";
-import { useEffect, useState } from "react";
+import { BsCheck, BsX } from "react-icons/bs";
-import { BsPencil, BsX } from "react-icons/bs";
 import { api } from "~/utils/api";
-import { useExperiment, useHandledAsyncCallback, useScenarioVars } from "~/utils/hooks";
+import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
-import { maybeReportError } from "~/utils/errorHandling/maybeReportError";
-import { FloatingLabelInput } from "./FloatingLabelInput";
-
-export const ScenarioVar = ({
-  variable,
-  isEditing,
-  setIsEditing,
-}: {
-  variable: Pick<TemplateVariable, "id" | "label">;
-  isEditing: boolean;
-  setIsEditing: (isEditing: boolean) => void;
-}) => {
-  const utils = api.useContext();
-
-  const [label, setLabel] = useState(variable.label);
-
-  useEffect(() => {
-    setLabel(variable.label);
-  }, [variable.label]);
-
-  const renameVarMutation = api.scenarioVars.rename.useMutation();
-  const [onRename] = useHandledAsyncCallback(async () => {
-    const resp = await renameVarMutation.mutateAsync({ id: variable.id, label });
-    if (maybeReportError(resp)) return;
-
-    setIsEditing(false);
-    await utils.scenarioVars.list.invalidate();
-    await utils.scenarios.list.invalidate();
-  }, [label, variable.id]);
-
-  const deleteMutation = api.scenarioVars.delete.useMutation();
-  const [onDeleteVar] = useHandledAsyncCallback(async () => {
-    await deleteMutation.mutateAsync({ id: variable.id });
-    await utils.scenarioVars.list.invalidate();
-  }, [variable.id]);
-
-  if (isEditing) {
-    return (
-      <HStack w="full">
-        <FloatingLabelInput
-          flex={1}
-          label="Renamed Variable"
-          value={label}
-          onChange={(e) => setLabel(e.target.value)}
-          onKeyDown={(e) => {
-            if (e.key === "Enter") {
-              e.preventDefault();
-              onRename();
-            }
-            // If the user types a space, replace it with an underscore
-            if (e.key === " ") {
-              e.preventDefault();
-              setLabel((label) => label && `${label}_`);
-            }
-          }}
-        />
-        <Button size="sm" onClick={() => setIsEditing(false)}>
-          Cancel
-        </Button>
-        <Button size="sm" colorScheme="blue" onClick={onRename}>
-          Save
-        </Button>
-      </HStack>
-    );
-  } else {
-    return (
-      <HStack w="full" borderTopWidth={1} borderColor="gray.200">
-        <Text flex={1}>{variable.label}</Text>
-        <IconButton
-          aria-label="Edit"
-          variant="unstyled"
-          minW="unset"
-          color="gray.400"
-          onClick={() => setIsEditing(true)}
-          _hover={{ color: "gray.800", cursor: "pointer" }}
-          icon={<Icon as={BsPencil} />}
-        />
-        <IconButton
-          aria-label="Delete"
-          variant="unstyled"
-          minW="unset"
-          color="gray.400"
-          onClick={onDeleteVar}
-          _hover={{ color: "gray.800", cursor: "pointer" }}
-          icon={<Icon as={BsX} boxSize={6} />}
-        />
-      </HStack>
-    );
-  }
-};
 
 export default function EditScenarioVars() {
   const experiment = useExperiment();
-  const vars = useScenarioVars();
+  const vars =
-
+    api.templateVars.list.useQuery({ experimentId: experiment.data?.id ?? "" }).data ?? [];
-  const [currentlyEditingId, setCurrentlyEditingId] = useState<string | null>(null);
 
   const [newVariable, setNewVariable] = useState<string>("");
-  const newVarIsValid = newVariable?.length ?? 0 > 0;
+  const newVarIsValid = newVariable.length > 0 && !vars.map((v) => v.label).includes(newVariable);
 
   const utils = api.useContext();
-  const addVarMutation = api.scenarioVars.create.useMutation();
+  const addVarMutation = api.templateVars.create.useMutation();
   const [onAddVar] = useHandledAsyncCallback(async () => {
     if (!experiment.data?.id) return;
-    if (!newVariable) return;
+    if (!newVarIsValid) return;
-    const resp = await addVarMutation.mutateAsync({
+    await addVarMutation.mutateAsync({
       experimentId: experiment.data.id,
       label: newVariable,
     });
-    if (maybeReportError(resp)) return;
+    await utils.templateVars.list.invalidate();
-
-    await utils.scenarioVars.list.invalidate();
     setNewVariable("");
   }, [addVarMutation, experiment.data?.id, newVarIsValid, newVariable]);
 
+  const deleteMutation = api.templateVars.delete.useMutation();
+  const [onDeleteVar] = useHandledAsyncCallback(async (id: string) => {
+    await deleteMutation.mutateAsync({ id });
+    await utils.templateVars.list.invalidate();
+  }, []);
+
   return (
     <Stack>
       <Heading size="sm">Scenario Variables</Heading>
-      <VStack spacing={4}>
+      <Stack spacing={2}>
         <Text fontSize="sm">
           Scenario variables can be used in your prompt variants as well as evaluations.
         </Text>
-        <VStack spacing={0} w="full">
+        <HStack spacing={0}>
-          {vars.data?.map((variable) => (
+          <Input
-            <ScenarioVar
+            placeholder="Add Scenario Variable"
-              variable={variable}
-              key={variable.id}
-              isEditing={currentlyEditingId === variable.id}
-              setIsEditing={(isEditing) => {
-                if (isEditing) {
-                  setCurrentlyEditingId(variable.id);
-                } else {
-                  setCurrentlyEditingId(null);
-                }
-              }}
-            />
-          ))}
-        </VStack>
-        {currentlyEditingId !== "new" && (
-          <Button
-            colorScheme="blue"
             size="sm"
-            onClick={() => setCurrentlyEditingId("new")}
+            borderTopRadius={0}
-            alignSelf="end"
+            borderRightRadius={0}
-          >
-            New Variable
-          </Button>
-        )}
-        {currentlyEditingId === "new" && (
-          <HStack w="full">
-            <FloatingLabelInput
-              flex={1}
-              label="New Variable"
             value={newVariable}
             onChange={(e) => setNewVariable(e.target.value)}
             onKeyDown={(e) => {
@@ -167,19 +54,50 @@ export default function EditScenarioVars() {
               // If the user types a space, replace it with an underscore
               if (e.key === " ") {
                 e.preventDefault();
-                  setNewVariable((v) => v && `${v}_`);
+                setNewVariable((v) => v + "_");
               }
             }}
           />
-            <Button size="sm" onClick={() => setCurrentlyEditingId(null)}>
+          <Button
-              Cancel
+            size="xs"
-            </Button>
+            height="100%"
-            <Button size="sm" colorScheme="blue" onClick={onAddVar}>
+            borderLeftRadius={0}
-              Save
+            isDisabled={!newVarIsValid}
+            onClick={onAddVar}
+          >
+            <Icon as={BsCheck} boxSize={8} />
           </Button>
         </HStack>
-        )}
+
-      </VStack>
+        <HStack spacing={2} py={4} wrap="wrap">
+          {vars.map((variable) => (
+            <HStack
+              key={variable.id}
+              spacing={0}
+              bgColor="blue.100"
+              color="blue.600"
+              pl={2}
+              pr={0}
+              fontWeight="bold"
+            >
+              <Text fontSize="sm" flex={1}>
+                {variable.label}
+              </Text>
+              <Button
+                size="xs"
+                variant="ghost"
+                colorScheme="blue"
+                p="unset"
+                minW="unset"
+                px="unset"
+                onClick={() => onDeleteVar(variable.id)}
+              >
+                <Icon as={BsX} boxSize={6} color="blue.800" />
+              </Button>
+            </HStack>
+          ))}
+        </HStack>
+      </Stack>
     </Stack>
   );
 }

app/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}

app/src/components/OutputsTable/OutputCell/CellContent.tsx

@@ -0,0 +1,19 @@
+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>
+);

app/src/components/OutputsTable/OutputCell/CellOptions.tsx

@@ -1,51 +1,35 @@
-import { HStack, Icon, IconButton, Spinner, Tooltip, useDisclosure } from "@chakra-ui/react";
+import { Button, HStack, Icon, Spinner, Tooltip } from "@chakra-ui/react";
-import { BsArrowClockwise, BsInfoCircle } from "react-icons/bs";
+import { BsArrowClockwise } from "react-icons/bs";
 import { useExperimentAccess } from "~/utils/hooks";
-import PromptModal from "./PromptModal";
-import { type RouterOutputs } from "~/utils/api";
 
 export const CellOptions = ({
-  cell,
   refetchingOutput,
   refetchOutput,
 }: {
-  cell: RouterOutputs["scenarioVariantCells"]["get"];
   refetchingOutput: boolean;
   refetchOutput: () => void;
 }) => {
   const { canModify } = useExperimentAccess();
-
-  const modalDisclosure = useDisclosure();
-
   return (
-    <HStack justifyContent="flex-end" w="full" spacing={1}>
+    <HStack justifyContent="flex-end" w="full">
-      {cell && (
-        <>
-          <Tooltip label="See Prompt">
-            <IconButton
-              aria-label="See Prompt"
-              icon={<Icon as={BsInfoCircle} boxSize={3.5} />}
-              onClick={modalDisclosure.onOpen}
-              size="xs"
-              colorScheme="gray"
-              color="gray.500"
-              variant="ghost"
-            />
-          </Tooltip>
-          <PromptModal cell={cell} disclosure={modalDisclosure} />
-        </>
-      )}
       {canModify && (
-        <Tooltip label="Refetch output">
+        <Tooltip label="Refetch output" aria-label="refetch output">
-          <IconButton
+          <Button
             size="xs"
+            w={4}
+            h={4}
+            py={4}
+            px={4}
+            minW={0}
+            borderRadius={8}
             color="gray.500"
             variant="ghost"
             cursor="pointer"
             onClick={refetchOutput}
             aria-label="refetch output"
-            icon={<Icon as={refetchingOutput ? Spinner : BsArrowClockwise} boxSize={4} />}
+          >
-          />
+            <Icon as={refetchingOutput ? Spinner : BsArrowClockwise} boxSize={4} />
+          </Button>
         </Tooltip>
       )}
     </HStack>

app/src/components/OutputsTable/OutputCell/CellWrapper.tsx

@@ -1,29 +0,0 @@
-import { type StackProps, VStack } from "@chakra-ui/react";
-import { type RouterOutputs } from "~/utils/api";
-import { type Scenario } from "../types";
-import { CellOptions } from "./CellOptions";
-import { OutputStats } from "./OutputStats";
-
-const CellWrapper: React.FC<
-  StackProps & {
-    cell: RouterOutputs["scenarioVariantCells"]["get"] | undefined;
-    hardRefetching: boolean;
-    hardRefetch: () => void;
-    mostRecentResponse:
-      | NonNullable<RouterOutputs["scenarioVariantCells"]["get"]>["modelResponses"][0]
-      | undefined;
-    scenario: Scenario;
-  }
-> = ({ children, cell, hardRefetching, hardRefetch, mostRecentResponse, scenario, ...props }) => (
-  <VStack w="full" alignItems="flex-start" {...props} px={2} py={2} h="100%">
-    {cell && (
-      <CellOptions refetchingOutput={hardRefetching} refetchOutput={hardRefetch} cell={cell} />
-    )}
-    <VStack w="full" alignItems="flex-start" maxH={500} overflowY="auto" flex={1}>
-      {children}
-    </VStack>
-    {mostRecentResponse && <OutputStats modelResponse={mostRecentResponse} scenario={scenario} />}
-  </VStack>
-);
-
-export default CellWrapper;

app/src/components/OutputsTable/OutputCell/OutputCell.tsx

@@ -1,16 +1,17 @@
-import { Text } from "@chakra-ui/react";
+import { api } from "~/utils/api";
-import stringify from "json-stringify-pretty-compact";
+import { type PromptVariant, type Scenario } from "../types";
-import { Fragment, useEffect, useState, type ReactElement } from "react";
+import { Text, 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 frontendModelProviders from "~/modelProviders/frontendModelProviders";
+import stringify from "json-stringify-pretty-compact";
-import { api } from "~/utils/api";
+import { type ReactElement, useState, useEffect, Fragment } from "react";
-import { useHandledAsyncCallback, useScenarioVars } from "~/utils/hooks";
 import useSocket from "~/utils/useSocket";
-import { type PromptVariant, type Scenario } from "../types";
+import { OutputStats } from "./OutputStats";
-import CellWrapper from "./CellWrapper";
-import { ResponseLog } from "./ResponseLog";
 import { RetryCountdown } from "./RetryCountdown";
+import frontendModelProviders from "~/modelProviders/frontendModelProviders";
+import { ResponseLog } from "./ResponseLog";
+import { CellContent } from "./CellContent";
 
 const WAITING_MESSAGE_INTERVAL = 20000;
 
@@ -22,7 +23,10 @@ export default function OutputCell({
   variant: PromptVariant;
 }): ReactElement | null {
   const utils = api.useContext();
-  const vars = useScenarioVars().data;
+  const experiment = useExperiment();
+  const vars = api.templateVars.list.useQuery({
+    experimentId: experiment.data?.id ?? "",
+  }).data;
 
   const scenarioVariables = scenario.variableValues as Record<string, string>;
   const templateHasVariables =
@@ -32,7 +36,7 @@ export default function OutputCell({
 
   if (!templateHasVariables) disabledReason = "Add a value to the scenario variables to see output";
 
-  const [refetchInterval, setRefetchInterval] = useState<number | false>(false);
+  const [refetchInterval, setRefetchInterval] = useState(0);
   const { data: cell, isLoading: queryLoading } = api.scenarioVariantCells.get.useQuery(
     { scenarioId: scenario.id, variantId: variant.id },
     { refetchInterval },
@@ -43,7 +47,7 @@ export default function OutputCell({
 
   type OutputSchema = Parameters<typeof provider.normalizeOutput>[0];
 
-  const { mutateAsync: hardRefetchMutate } = api.scenarioVariantCells.hardRefetch.useMutation();
+  const { mutateAsync: hardRefetchMutate } = api.scenarioVariantCells.forceRefetch.useMutation();
   const [hardRefetch, hardRefetching] = useHandledAsyncCallback(async () => {
     await hardRefetchMutate({ scenarioId: scenario.id, variantId: variant.id });
     await utils.scenarioVariantCells.get.invalidate({
@@ -63,47 +67,38 @@ export default function OutputCell({
     cell.retrievalStatus === "PENDING" ||
     cell.retrievalStatus === "IN_PROGRESS" ||
     hardRefetching;
-
+  useEffect(() => setRefetchInterval(awaitingOutput ? 1000 : 0), [awaitingOutput]);
-  useEffect(() => setRefetchInterval(awaitingOutput ? 1000 : false), [awaitingOutput]);
 
   // TODO: disconnect from socket if we're not streaming anymore
   const streamedMessage = useSocket<OutputSchema>(cell?.id);
 
-  const mostRecentResponse = cell?.modelResponses[cell.modelResponses.length - 1];
-
-  const wrapperProps: Parameters<typeof CellWrapper>[0] = {
-    cell,
-    hardRefetching,
-    hardRefetch,
-    mostRecentResponse,
-    scenario,
-  };
-
   if (!vars) return null;
 
   if (!cell && !fetchingOutput)
     return (
-      <CellWrapper {...wrapperProps}>
+      <CellContent hardRefetching={hardRefetching} hardRefetch={hardRefetch}>
         <Text color="gray.500">Error retrieving output</Text>
-      </CellWrapper>
+      </CellContent>
     );
 
   if (cell && cell.errorMessage) {
     return (
-      <CellWrapper {...wrapperProps}>
+      <CellContent hardRefetching={hardRefetching} hardRefetch={hardRefetch}>
         <Text color="red.500">{cell.errorMessage}</Text>
-      </CellWrapper>
+      </CellContent>
     );
   }
 
   if (disabledReason) return <Text color="gray.500">{disabledReason}</Text>;
 
-  const showLogs = !streamedMessage && !mostRecentResponse?.respPayload;
+  const mostRecentResponse = cell?.modelResponses[cell.modelResponses.length - 1];
+  const showLogs = !streamedMessage && !mostRecentResponse?.output;
 
   if (showLogs)
     return (
-      <CellWrapper
+      <CellContent
-        {...wrapperProps}
+        hardRefetching={hardRefetching}
+        hardRefetch={hardRefetch}
         alignItems="flex-start"
         fontFamily="inconsolata, monospace"
         spacing={0}
@@ -116,13 +111,8 @@ export default function OutputCell({
             ? response.receivedAt.getTime()
             : Date.now();
           if (response.requestedAt) {
-            numWaitingMessages = Math.min(
+            numWaitingMessages = Math.floor(
-              Math.floor(
               (relativeWaitingTime - response.requestedAt.getTime()) / WAITING_MESSAGE_INTERVAL,
-              ),
-              // Don't try to render more than 15, it'll use too much CPU and
-              // break the page
-              15,
             );
           }
           return (
@@ -134,13 +124,9 @@ export default function OutputCell({
                 Array.from({ length: numWaitingMessages }, (_, i) => (
                   <ResponseLog
                     key={`waiting-${i}`}
-                    time={
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                      new Date(
+                    time={new Date(response.requestedAt!.getTime() + i * WAITING_MESSAGE_INTERVAL)}
-                        (response.requestedAt?.getTime?.() ?? 0) +
+                    title="Waiting for response"
-                          (i + 1) * WAITING_MESSAGE_INTERVAL,
-                      )
-                    }
-                    title="Waiting for response..."
                   />
                 ))}
               {response.receivedAt && (
@@ -158,18 +144,32 @@ export default function OutputCell({
         {mostRecentResponse?.retryTime && (
           <RetryCountdown retryTime={mostRecentResponse.retryTime} />
         )}
-      </CellWrapper>
+      </CellContent>
     );
 
-  const normalizedOutput = mostRecentResponse?.respPayload
+  const normalizedOutput = mostRecentResponse?.output
-    ? provider.normalizeOutput(mostRecentResponse?.respPayload)
+    ? provider.normalizeOutput(mostRecentResponse?.output)
     : streamedMessage
     ? provider.normalizeOutput(streamedMessage)
     : null;
 
-  if (mostRecentResponse?.respPayload && normalizedOutput?.type === "json") {
+  if (mostRecentResponse?.output && normalizedOutput?.type === "json") {
     return (
-      <CellWrapper {...wrapperProps}>
+      <VStack
+        w="100%"
+        h="100%"
+        fontSize="xs"
+        flexWrap="wrap"
+        overflowX="hidden"
+        justifyContent="space-between"
+      >
+        <CellContent
+          hardRefetching={hardRefetching}
+          hardRefetch={hardRefetch}
+          w="full"
+          flex={1}
+          spacing={0}
+        >
           <SyntaxHighlighter
             customStyle={{ overflowX: "unset", width: "100%", flex: 1 }}
             language="json"
@@ -181,15 +181,24 @@ export default function OutputCell({
           >
             {stringify(normalizedOutput.value, { maxLength: 40 })}
           </SyntaxHighlighter>
-      </CellWrapper>
+        </CellContent>
+        <OutputStats modelResponse={mostRecentResponse} scenario={scenario} />
+      </VStack>
     );
   }
 
   const contentToDisplay = (normalizedOutput?.type === "text" && normalizedOutput.value) || "";
 
   return (
-    <CellWrapper {...wrapperProps}>
+    <VStack w="100%" h="100%" justifyContent="space-between" whiteSpace="pre-wrap">
-      <Text whiteSpace="pre-wrap">{contentToDisplay}</Text>
+      <VStack w="full" alignItems="flex-start" spacing={0}>
-    </CellWrapper>
+        <CellContent hardRefetching={hardRefetching} hardRefetch={hardRefetch}>
+          <Text>{contentToDisplay}</Text>
+        </CellContent>
+      </VStack>
+      {mostRecentResponse?.output && (
+        <OutputStats modelResponse={mostRecentResponse} scenario={scenario} />
+      )}
+    </VStack>
   );
 }

app/src/components/OutputsTable/OutputCell/OutputStats.tsx

@@ -19,19 +19,12 @@ export const OutputStats = ({
       ? modelResponse.receivedAt.getTime() - modelResponse.requestedAt.getTime()
       : 0;
 
-  const inputTokens = modelResponse.inputTokens;
+  const promptTokens = modelResponse.promptTokens;
-  const outputTokens = modelResponse.outputTokens;
+  const completionTokens = modelResponse.completionTokens;
 
   return (
-    <HStack
+    <HStack w="full" align="center" color="gray.500" fontSize="2xs" mt={{ base: 0, md: 1 }}>
-      w="full"
+      <HStack flex={1}>
-      align="center"
-      color="gray.500"
-      fontSize="2xs"
-      mt={{ base: 0, md: 1 }}
-      alignItems="flex-end"
-    >
-      <HStack flex={1} flexWrap="wrap">
         {modelResponse.outputEvaluations.map((evaluation) => {
           const passed = evaluation.result > 0.5;
           return (
@@ -55,8 +48,8 @@ export const OutputStats = ({
       </HStack>
       {modelResponse.cost && (
         <CostTooltip
-          inputTokens={inputTokens}
+          promptTokens={promptTokens}
-          outputTokens={outputTokens}
+          completionTokens={completionTokens}
           cost={modelResponse.cost}
         >
           <HStack spacing={0}>

app/src/components/OutputsTable/OutputCell/PromptModal.tsx

@@ -1,109 +0,0 @@
-import {
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalHeader,
-  ModalOverlay,
-  VStack,
-  Text,
-  Box,
-  type UseDisclosureReturn,
-  Link,
-} from "@chakra-ui/react";
-import { api, type RouterOutputs } from "~/utils/api";
-import { JSONTree } from "react-json-tree";
-import CopiableCode from "~/components/CopiableCode";
-
-const theme = {
-  scheme: "chalk",
-  author: "chris kempson (http://chriskempson.com)",
-  base00: "transparent",
-  base01: "#202020",
-  base02: "#303030",
-  base03: "#505050",
-  base04: "#b0b0b0",
-  base05: "#d0d0d0",
-  base06: "#e0e0e0",
-  base07: "#f5f5f5",
-  base08: "#fb9fb1",
-  base09: "#eda987",
-  base0A: "#ddb26f",
-  base0B: "#acc267",
-  base0C: "#12cfc0",
-  base0D: "#6fc2ef",
-  base0E: "#e1a3ee",
-  base0F: "#deaf8f",
-};
-
-export default function PromptModal(props: {
-  cell: NonNullable<RouterOutputs["scenarioVariantCells"]["get"]>;
-  disclosure: UseDisclosureReturn;
-}) {
-  const { data } = api.scenarioVariantCells.getTemplatedPromptMessage.useQuery(
-    {
-      cellId: props.cell.id,
-    },
-    {
-      enabled: props.disclosure.isOpen,
-    },
-  );
-
-  return (
-    <Modal isOpen={props.disclosure.isOpen} onClose={props.disclosure.onClose} size="xl">
-      <ModalOverlay />
-      <ModalContent>
-        <ModalHeader>Prompt Details</ModalHeader>
-        <ModalCloseButton />
-        <ModalBody>
-          <VStack py={4} w="">
-            <VStack w="full" alignItems="flex-start">
-              <Text fontWeight="bold">Full Prompt</Text>
-              <Box
-                w="full"
-                p={4}
-                alignItems="flex-start"
-                backgroundColor="blackAlpha.800"
-                borderRadius={4}
-              >
-                <JSONTree
-                  data={props.cell.prompt}
-                  theme={theme}
-                  shouldExpandNodeInitially={() => true}
-                  getItemString={() => ""}
-                  hideRoot
-                />
-              </Box>
-            </VStack>
-            {data?.templatedPrompt && (
-              <VStack w="full" mt={4} alignItems="flex-start">
-                <Text fontWeight="bold">Templated prompt message:</Text>
-                <CopiableCode
-                  w="full"
-                  // bgColor="gray.100"
-                  p={4}
-                  borderWidth={1}
-                  whiteSpace="pre-wrap"
-                  code={data.templatedPrompt}
-                />
-              </VStack>
-            )}
-            {data?.learnMoreUrl && (
-              <Link
-                href={data.learnMoreUrl}
-                isExternal
-                color="blue.500"
-                fontWeight="bold"
-                fontSize="sm"
-                mt={4}
-                alignSelf="flex-end"
-              >
-                Learn More
-              </Link>
-            )}
-          </VStack>
-        </ModalBody>
-      </ModalContent>
-    </Modal>
-  );
-}

app/src/components/OutputsTable/ScenarioEditor.tsx

@@ -1,24 +1,15 @@
-import { isEqual } from "lodash-es";
+import { type DragEvent } from "react";
-import { useEffect, useState, type DragEvent } from "react";
 import { api } from "~/utils/api";
-import { useExperimentAccess, useHandledAsyncCallback, useScenarioVars } from "~/utils/hooks";
+import { isEqual } from "lodash-es";
 import { type Scenario } from "./types";
+import { useExperiment, useExperimentAccess, useHandledAsyncCallback } from "~/utils/hooks";
+import { useState } from "react";
 
-import {
+import { Box, Button, Flex, HStack, Icon, Spinner, Stack, Tooltip, VStack } from "@chakra-ui/react";
-  Box,
+import { cellPadding } from "../constants";
-  Button,
+import { BsX } from "react-icons/bs";
-  HStack,
+import { RiDraggable } from "react-icons/ri";
-  Icon,
-  IconButton,
-  Spinner,
-  Text,
-  Tooltip,
-  VStack,
-} from "@chakra-ui/react";
-import { BsArrowsAngleExpand, BsX } from "react-icons/bs";
-import { cellPadding } from "./constants";
 import { FloatingLabelInput } from "./FloatingLabelInput";
-import { ScenarioEditorModal } from "./ScenarioEditorModal";
 
 export default function ScenarioEditor({
   scenario,
@@ -37,11 +28,8 @@ export default function ScenarioEditor({
 
   const [values, setValues] = useState<Record<string, string>>(savedValues);
 
-  useEffect(() => {
+  const experiment = useExperiment();
-    if (savedValues) setValues(savedValues);
+  const vars = api.templateVars.list.useQuery({ experimentId: experiment.data?.id ?? "" });
-  }, [savedValues]);
-
-  const vars = useScenarioVars();
 
   const variableLabels = vars.data?.map((v) => v.label) ?? [];
 
@@ -83,10 +71,7 @@ export default function ScenarioEditor({
     [reorderMutation, scenario.id],
   );
 
-  const [scenarioEditorModalOpen, setScenarioEditorModalOpen] = useState(false);
-
   return (
-    <>
     <HStack
       alignItems="flex-start"
       px={cellPadding.x}
@@ -111,58 +96,58 @@ export default function ScenarioEditor({
       onDrop={onReorder}
       backgroundColor={isDragTarget ? "gray.100" : "transparent"}
     >
-        {
-          <VStack spacing={4} flex={1} py={2}>
-            <HStack justifyContent="space-between" w="100%" align="center" spacing={0}>
-              <Text flex={1}>Scenario</Text>
-              {variableLabels.length && (
-                <Tooltip label="Expand" hasArrow>
-                  <IconButton
-                    aria-label="Expand"
-                    icon={<Icon as={BsArrowsAngleExpand} boxSize={3} />}
-                    onClick={() => setScenarioEditorModalOpen(true)}
-                    size="xs"
-                    colorScheme="gray"
-                    color="gray.500"
-                    variant="ghost"
-                  />
-                </Tooltip>
-              )}
       {canModify && props.canHide && (
-                <Tooltip label="Delete" hasArrow>
+        <Stack
-                  <IconButton
+          alignSelf="flex-start"
-                    aria-label="Delete"
+          opacity={props.hovered ? 1 : 0}
-                    icon={
+          spacing={0}
-                      <Icon
+          ml={-cellPadding.x}
-                        as={hidingInProgress ? Spinner : BsX}
+        >
-                        boxSize={hidingInProgress ? 4 : 6}
+          <Tooltip label="Hide scenario" hasArrow>
-                      />
+            {/* for some reason the tooltip can't position itself properly relative to the icon without the wrapping box */}
-                    }
+            <Button
+              variant="unstyled"
+              color="gray.400"
+              height="unset"
+              width="unset"
+              minW="unset"
               onClick={onHide}
-                    size="xs"
+              _hover={{
-                    display="flex"
+                color: "gray.800",
-                    colorScheme="gray"
+                cursor: "pointer",
-                    color="gray.500"
+              }}
-                    variant="ghost"
+            >
-                  />
+              <Icon as={hidingInProgress ? Spinner : BsX} boxSize={hidingInProgress ? 4 : 6} />
+            </Button>
           </Tooltip>
+          <Icon
+            as={RiDraggable}
+            boxSize={6}
+            color="gray.400"
+            _hover={{ color: "gray.800", cursor: "pointer" }}
+          />
+        </Stack>
       )}
-            </HStack>
 
       {variableLabels.length === 0 ? (
-              <Box color="gray.500">
+        <Box color="gray.500">{vars.data ? "No scenario variables configured" : "Loading..."}</Box>
-                {vars.data ? "No scenario variables configured" : "Loading..."}
-              </Box>
       ) : (
-              variableLabels.map((key) => {
+        <VStack spacing={4} flex={1} py={2}>
+          {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 }));
@@ -177,9 +162,9 @@ export default function ScenarioEditor({
                   onMouseEnter={() => setVariableInputHovered(true)}
                   onMouseLeave={() => setVariableInputHovered(false)}
                 />
+              </Flex>
             );
-              })
+          })}
-            )}
           {hasChanged && (
             <HStack justify="right">
               <Button
@@ -197,15 +182,7 @@ export default function ScenarioEditor({
             </HStack>
           )}
         </VStack>
-        }
-      </HStack>
-      {scenarioEditorModalOpen && (
-        <ScenarioEditorModal
-          scenarioId={scenario.id}
-          initialValues={savedValues}
-          onClose={() => setScenarioEditorModalOpen(false)}
-        />
       )}
-    </>
+    </HStack>
   );
 }

app/src/components/OutputsTable/ScenarioEditorModal.tsx

@@ -1,123 +0,0 @@
-import {
-  Button,
-  HStack,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Spinner,
-  Text,
-  VStack,
-} from "@chakra-ui/react";
-import { useEffect, useState } from "react";
-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]);
-
-  const vars = api.scenarioVars.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: "4xl", xl: "5xl" }}
-    >
-      <ModalOverlay />
-      <ModalContent w={1200}>
-        <ModalHeader>Edit Scenario</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>
-  );
-};

app/src/components/OutputsTable/ScenarioPaginator.tsx

@@ -1,16 +1,74 @@
-import { type StackProps } from "@chakra-ui/react";
+import { Box, HStack, IconButton } from "@chakra-ui/react";
+import {
+  BsChevronDoubleLeft,
+  BsChevronDoubleRight,
+  BsChevronLeft,
+  BsChevronRight,
+} from "react-icons/bs";
+import { usePage, useScenarios } from "~/utils/hooks";
 
-import { useScenarios } from "~/utils/hooks";
+const ScenarioPaginator = () => {
-import Paginator from "../Paginator";
+  const [page, setPage] = usePage();
-
-const ScenarioPaginator = (props: StackProps) => {
   const { data } = useScenarios();
 
   if (!data) return null;
 
-  const { count } = data;
+  const { scenarios, startIndex, lastPage, count } = data;
 
-  return <Paginator count={count} condense {...props} />;
+  const nextPage = () => {
+    if (page < lastPage) {
+      setPage(page + 1, "replace");
+    }
+  };
+
+  const prevPage = () => {
+    if (page > 1) {
+      setPage(page - 1, "replace");
+    }
+  };
+
+  const goToLastPage = () => setPage(lastPage, "replace");
+  const goToFirstPage = () => setPage(1, "replace");
+
+  return (
+    <HStack pt={4}>
+      <IconButton
+        variant="ghost"
+        size="sm"
+        onClick={goToFirstPage}
+        isDisabled={page === 1}
+        aria-label="Go to first page"
+        icon={<BsChevronDoubleLeft />}
+      />
+      <IconButton
+        variant="ghost"
+        size="sm"
+        onClick={prevPage}
+        isDisabled={page === 1}
+        aria-label="Previous page"
+        icon={<BsChevronLeft />}
+      />
+      <Box>
+        {startIndex}-{startIndex + scenarios.length - 1} / {count}
+      </Box>
+      <IconButton
+        variant="ghost"
+        size="sm"
+        onClick={nextPage}
+        isDisabled={page === lastPage}
+        aria-label="Next page"
+        icon={<BsChevronRight />}
+      />
+      <IconButton
+        variant="ghost"
+        size="sm"
+        onClick={goToLastPage}
+        isDisabled={page === lastPage}
+        aria-label="Go to last page"
+        icon={<BsChevronDoubleRight />}
+      />
+    </HStack>
+  );
 };
 
 export default ScenarioPaginator;

app/src/components/OutputsTable/ScenarioRow.tsx

@@ -1,5 +1,6 @@
-import { GridItem } from "@chakra-ui/react";
+import { Box, GridItem } from "@chakra-ui/react";
 import React, { useState } from "react";
+import { cellPadding } from "../constants";
 import OutputCell from "./OutputCell/OutputCell";
 import ScenarioEditor from "./ScenarioEditor";
 import type { PromptVariant, Scenario } from "./types";
@@ -10,8 +11,6 @@ const ScenarioRow = (props: {
   variants: PromptVariant[];
   canHide: boolean;
   rowStart: number;
-  isFirst: boolean;
-  isLast: boolean;
 }) => {
   const [isHovered, setIsHovered] = useState(false);
 
@@ -23,14 +22,10 @@ const ScenarioRow = (props: {
         onMouseEnter={() => setIsHovered(true)}
         onMouseLeave={() => setIsHovered(false)}
         sx={isHovered ? highlightStyle : undefined}
-        bgColor="white"
+        borderLeftWidth={1}
+        {...borders}
         rowStart={props.rowStart}
         colStart={1}
-        borderLeftWidth={1}
-        borderTopWidth={props.isFirst ? 1 : 0}
-        borderTopLeftRadius={props.isFirst ? 8 : 0}
-        borderBottomLeftRadius={props.isLast ? 8 : 0}
-        {...borders}
       >
         <ScenarioEditor scenario={props.scenario} hovered={isHovered} canHide={props.canHide} />
       </GridItem>
@@ -40,15 +35,13 @@ const ScenarioRow = (props: {
           onMouseEnter={() => setIsHovered(true)}
           onMouseLeave={() => setIsHovered(false)}
           sx={isHovered ? highlightStyle : undefined}
-          bgColor="white"
           rowStart={props.rowStart}
           colStart={i + 2}
-          borderTopWidth={props.isFirst ? 1 : 0}
-          borderTopRightRadius={props.isFirst && i === props.variants.length - 1 ? 8 : 0}
-          borderBottomRightRadius={props.isLast && i === props.variants.length - 1 ? 8 : 0}
           {...borders}
         >
+          <Box h="100%" w="100%" px={cellPadding.x} py={cellPadding.y}>
             <OutputCell key={variant.id} scenario={props.scenario} variant={variant} />
+          </Box>
         </GridItem>
       ))}
     </>

app/src/components/OutputsTable/ScenariosHeader.tsx

@@ -11,7 +11,7 @@ import {
   IconButton,
   Spinner,
 } from "@chakra-ui/react";
-import { cellPadding } from "./constants";
+import { cellPadding } from "../constants";
 import {
   useExperiment,
   useExperimentAccess,
@@ -48,7 +48,7 @@ export const ScenariosHeader = () => {
   );
 
   return (
-    <HStack w="100%" py={cellPadding.y} px={cellPadding.x} align="center" spacing={0}>
+    <HStack w="100%" pb={cellPadding.y} pt={0} align="center" spacing={0}>
       <Text fontSize={16} fontWeight="bold">
         Scenarios ({scenarios.data?.count})
       </Text>
@@ -57,16 +57,11 @@ export const ScenariosHeader = () => {
           <MenuButton
             as={IconButton}
             mt={1}
-            ml={2}
             variant="ghost"
             aria-label="Edit Scenarios"
             icon={<Icon as={loading ? Spinner : BsGear} />}
-            maxW={8}
-            minW={8}
-            minH={8}
-            maxH={8}
           />
-          <MenuList fontSize="md" zIndex="dropdown" mt={-1}>
+          <MenuList fontSize="md" zIndex="dropdown" mt={-3}>
             <MenuItem
               icon={<Icon as={BsPlus} boxSize={6} mx="-5px" />}
               onClick={() => onAddScenario(false)}
@@ -77,7 +72,7 @@ export const ScenariosHeader = () => {
               Autogenerate Scenario
             </MenuItem>
             <MenuItem icon={<BsPencil />} onClick={openDrawer}>
-              Add or Remove Variables
+              Edit Vars
             </MenuItem>
           </MenuList>
         </Menu>

app/src/components/OutputsTable/VariantEditor.tsx

@@ -47,7 +47,7 @@ export default function VariantEditor(props: { variant: PromptVariant }) {
     return () => window.removeEventListener("keydown", handleEsc);
   }, [isFullscreen, toggleFullscreen]);
 
-  const lastSavedFn = props.variant.promptConstructor;
+  const lastSavedFn = props.variant.constructFn;
 
   const modifierKey = useModifierKeyLabel();
 
@@ -96,7 +96,7 @@ export default function VariantEditor(props: { variant: PromptVariant }) {
 
     const resp = await replaceVariant.mutateAsync({
       id: props.variant.id,
-      promptConstructor: currentFn,
+      constructFn: currentFn,
       streamScenarios: visibleScenarios,
     });
     if (resp.status === "error") {
@@ -110,7 +110,7 @@ export default function VariantEditor(props: { variant: PromptVariant }) {
     setIsChanged(false);
 
     await utils.promptVariants.list.invalidate();
-  }, [checkForChanges, replaceVariant.mutateAsync]);
+  }, [checkForChanges]);
 
   useEffect(() => {
     if (monaco) {

app/src/components/OutputsTable/VariantStats.tsx

@@ -1,6 +1,6 @@
 import { HStack, Icon, Text, useToken } from "@chakra-ui/react";
 import { type PromptVariant } from "./types";
-import { cellPadding } from "./constants";
+import { cellPadding } from "../constants";
 import { api } from "~/utils/api";
 import chroma from "chroma-js";
 import { BsCurrencyDollar } from "react-icons/bs";
@@ -17,22 +17,18 @@ export default function VariantStats(props: { variant: PromptVariant }) {
       initialData: {
         evalResults: [],
         overallCost: 0,
-        inputTokens: 0,
+        promptTokens: 0,
-        outputTokens: 0,
+        completionTokens: 0,
         scenarioCount: 0,
         outputCount: 0,
-        awaitingCompletions: false,
         awaitingEvals: false,
       },
       refetchInterval,
     },
   );
 
-  // Poll every five seconds while we are waiting for LLM retrievals to finish
+  // Poll every two seconds while we are waiting for LLM retrievals to finish
-  useEffect(
+  useEffect(() => setRefetchInterval(data.awaitingEvals ? 5000 : 0), [data.awaitingEvals]);
-    () => setRefetchInterval(data.awaitingCompletions || data.awaitingEvals ? 5000 : 0),
-    [data.awaitingCompletions, data.awaitingEvals],
-  );
 
   const [passColor, neutralColor, failColor] = useToken("colors", [
     "green.500",
@@ -47,17 +43,17 @@ export default function VariantStats(props: { variant: PromptVariant }) {
   return (
     <HStack
       justifyContent="space-between"
-      alignItems="flex-end"
+      alignItems="center"
       mx="2"
       fontSize="xs"
       py={cellPadding.y}
     >
-      <HStack px={cellPadding.x} flexWrap="wrap">
       {showNumFinished && (
         <Text>
           {data.outputCount} / {data.scenarioCount}
         </Text>
       )}
+      <HStack px={cellPadding.x}>
         {data.evalResults.map((result) => {
           const passedFrac = result.passCount / result.totalCount;
           return (
@@ -72,8 +68,8 @@ export default function VariantStats(props: { variant: PromptVariant }) {
       </HStack>
       {data.overallCost && (
         <CostTooltip
-          inputTokens={data.inputTokens}
+          promptTokens={data.promptTokens}
-          outputTokens={data.outputTokens}
+          completionTokens={data.completionTokens}
           cost={data.overallCost}
         >
           <HStack spacing={0} align="center" color="gray.500">

app/src/components/OutputsTable/index.tsx

@@ -3,14 +3,13 @@ import { api } from "~/utils/api";
 import AddVariantButton from "./AddVariantButton";
 import ScenarioRow from "./ScenarioRow";
 import VariantEditor from "./VariantEditor";
-import VariantHeader from "./VariantHeader/VariantHeader";
+import VariantHeader from "../VariantHeader/VariantHeader";
 import VariantStats from "./VariantStats";
 import { ScenariosHeader } from "./ScenariosHeader";
 import { borders } from "./styles";
 import { useScenarios } from "~/utils/hooks";
 import ScenarioPaginator from "./ScenarioPaginator";
 import { Fragment } from "react";
-import useScrolledPast from "./useHasScrolledPast";
 
 export default function OutputsTable({ experimentId }: { experimentId: string | undefined }) {
   const variants = api.promptVariants.list.useQuery(
@@ -19,7 +18,6 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
   );
 
   const scenarios = useScenarios();
-  const shouldFlattenHeader = useScrolledPast(50);
 
   if (!variants.data || !scenarios.data) return null;
 
@@ -37,7 +35,7 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
       pb={24}
       pl={8}
       display="grid"
-      gridTemplateColumns={`250px repeat(${variants.data.length}, minmax(320px, 1fr)) auto`}
+      gridTemplateColumns={`250px repeat(${variants.data.length}, minmax(300px, 1fr)) auto`}
       sx={{
         "> *": {
           borderColor: "gray.300",
@@ -55,30 +53,20 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
           colStart: i + 2,
           borderLeftWidth: i === 0 ? 1 : 0,
           marginLeft: i === 0 ? "-1px" : 0,
-          backgroundColor: "white",
+          backgroundColor: "gray.100",
         };
-        const isFirst = i === 0;
-        const isLast = i === variants.data.length - 1;
         return (
           <Fragment key={variant.uiId}>
             <VariantHeader
               variant={variant}
               canHide={variants.data.length > 1}
               rowStart={1}
-              borderTopLeftRadius={isFirst && !shouldFlattenHeader ? 8 : 0}
-              borderTopRightRadius={isLast && !shouldFlattenHeader ? 8 : 0}
               {...sharedProps}
             />
             <GridItem rowStart={2} {...sharedProps}>
               <VariantEditor variant={variant} />
             </GridItem>
-            <GridItem
+            <GridItem rowStart={3} {...sharedProps}>
-              rowStart={3}
-              {...sharedProps}
-              borderBottomLeftRadius={isFirst ? 8 : 0}
-              borderBottomRightRadius={isLast ? 8 : 0}
-              boxShadow="5px 5px 15px 1px rgba(0, 0, 0, 0.1);"
-            >
               <VariantStats variant={variant} />
             </GridItem>
           </Fragment>
@@ -89,6 +77,7 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
         colSpan={allCols - 1}
         rowStart={variantHeaderRows + 1}
         colStart={1}
+        {...borders}
         borderRightWidth={0}
       >
         <ScenariosHeader />
@@ -101,8 +90,6 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
           scenario={scenario}
           variants={variants.data}
           canHide={visibleScenariosCount > 1}
-          isFirst={i === 0}
-          isLast={i === visibleScenariosCount - 1}
         />
       ))}
       <GridItem

app/src/components/OutputsTable/useHasScrolledPast.tsx

@@ -1,34 +0,0 @@
-import { useState, useEffect } from "react";
-
-const useScrolledPast = (scrollThreshold: number) => {
-  const [hasScrolledPast, setHasScrolledPast] = useState(true);
-
-  useEffect(() => {
-    const container = document.getElementById("output-container");
-
-    if (!container) {
-      console.warn('Element with id "outputs-container" not found.');
-      return;
-    }
-
-    const checkScroll = () => {
-      const { scrollTop } = container;
-
-      // Check if scrollTop is greater than or equal to scrollThreshold
-      setHasScrolledPast(scrollTop > scrollThreshold);
-    };
-
-    checkScroll();
-
-    container.addEventListener("scroll", checkScroll);
-
-    // Cleanup
-    return () => {
-      container.removeEventListener("scroll", checkScroll);
-    };
-  }, []);
-
-  return hasScrolledPast;
-};
-
-export default useScrolledPast;

app/src/components/Paginator.tsx

@@ -1,128 +0,0 @@
-import {
-  HStack,
-  IconButton,
-  Text,
-  Select,
-  type StackProps,
-  Icon,
-  useBreakpointValue,
-} from "@chakra-ui/react";
-import React, { useCallback } from "react";
-import { FiChevronsLeft, FiChevronsRight, FiChevronLeft, FiChevronRight } from "react-icons/fi";
-import { usePageParams } from "~/utils/hooks";
-
-const pageSizeOptions = [10, 25, 50, 100];
-
-const Paginator = ({ count, ...props }: { count: number; condense?: boolean } & StackProps) => {
-  const { page, pageSize, setPageParams } = usePageParams();
-
-  const lastPage = Math.ceil(count / pageSize);
-
-  const updatePageSize = useCallback(
-    (newPageSize: number) => {
-      const newPage = Math.floor(((page - 1) * pageSize) / newPageSize) + 1;
-      setPageParams({ page: newPage, pageSize: newPageSize }, "replace");
-    },
-    [page, pageSize, setPageParams],
-  );
-
-  const nextPage = () => {
-    if (page < lastPage) {
-      setPageParams({ page: page + 1 }, "replace");
-    }
-  };
-
-  const prevPage = () => {
-    if (page > 1) {
-      setPageParams({ page: page - 1 }, "replace");
-    }
-  };
-
-  const goToLastPage = () => setPageParams({ page: lastPage }, "replace");
-  const goToFirstPage = () => setPageParams({ page: 1 }, "replace");
-
-  const isMobile = useBreakpointValue({ base: true, md: false });
-  const condense = isMobile || props.condense;
-
-  if (count === 0) return null;
-
-  return (
-    <HStack
-      pt={4}
-      spacing={8}
-      justifyContent={condense ? "flex-start" : "space-between"}
-      alignItems="center"
-      w="full"
-      {...props}
-    >
-      {!condense && (
-        <>
-          <HStack>
-            <Text>Rows</Text>
-            <Select
-              value={pageSize}
-              onChange={(e) => updatePageSize(parseInt(e.target.value))}
-              w={20}
-              backgroundColor="white"
-            >
-              {pageSizeOptions.map((option) => (
-                <option key={option} value={option}>
-                  {option}
-                </option>
-              ))}
-            </Select>
-          </HStack>
-          <Text>
-            Page {page} of {lastPage}
-          </Text>
-        </>
-      )}
-
-      <HStack>
-        <IconButton
-          variant="outline"
-          size="sm"
-          onClick={goToFirstPage}
-          isDisabled={page === 1}
-          aria-label="Go to first page"
-          icon={<Icon as={FiChevronsLeft} boxSize={5} strokeWidth={1.5} />}
-          bgColor="white"
-        />
-        <IconButton
-          variant="outline"
-          size="sm"
-          onClick={prevPage}
-          isDisabled={page === 1}
-          aria-label="Previous page"
-          icon={<Icon as={FiChevronLeft} boxSize={5} strokeWidth={1.5} />}
-          bgColor="white"
-        />
-        {condense && (
-          <Text>
-            Page {page} of {lastPage}
-          </Text>
-        )}
-        <IconButton
-          variant="outline"
-          size="sm"
-          onClick={nextPage}
-          isDisabled={page === lastPage}
-          aria-label="Next page"
-          icon={<Icon as={FiChevronRight} boxSize={5} strokeWidth={1.5} />}
-          bgColor="white"
-        />
-        <IconButton
-          variant="outline"
-          size="sm"
-          onClick={goToLastPage}
-          isDisabled={page === lastPage}
-          aria-label="Go to last page"
-          icon={<Icon as={FiChevronsRight} boxSize={5} strokeWidth={1.5} />}
-          bgColor="white"
-        />
-      </HStack>
-    </HStack>
-  );
-};
-
-export default Paginator;

app/src/components/RefinePromptModal/CustomInstructionsInput.tsx

@@ -1,29 +1,18 @@
-import {
+import { Button, Spinner, InputGroup, InputRightElement, Icon, HStack } from "@chakra-ui/react";
-  Button,
-  Spinner,
-  InputGroup,
-  InputRightElement,
-  Icon,
-  HStack,
-  type InputGroupProps,
-} from "@chakra-ui/react";
 import { IoMdSend } from "react-icons/io";
-import AutoResizeTextArea from "./AutoResizeTextArea";
+import AutoResizeTextArea from "../AutoResizeTextArea";
 
 export const CustomInstructionsInput = ({
   instructions,
   setInstructions,
   loading,
   onSubmit,
-  placeholder = "Send custom instructions",
-  ...props
 }: {
   instructions: string;
   setInstructions: (instructions: string) => void;
   loading: boolean;
   onSubmit: () => void;
-  placeholder?: string;
+}) => {
-} & InputGroupProps) => {
   return (
     <InputGroup
       size="md"
@@ -33,7 +22,6 @@ export const CustomInstructionsInput = ({
       borderRadius={8}
       alignItems="center"
       colorScheme="orange"
-      {...props}
     >
       <AutoResizeTextArea
         value={instructions}
@@ -45,7 +33,7 @@ export const CustomInstructionsInput = ({
             onSubmit();
           }
         }}
-        placeholder={placeholder}
+        placeholder="Send custom instructions"
         py={4}
         pl={4}
         pr={12}

app/src/components/RefinePromptModal/RefinePromptModal.tsx

@@ -20,7 +20,7 @@ import { useHandledAsyncCallback, useVisibleScenarioIds } from "~/utils/hooks";
 import { type PromptVariant } from "@prisma/client";
 import { useState } from "react";
 import CompareFunctions from "./CompareFunctions";
-import { CustomInstructionsInput } from "../CustomInstructionsInput";
+import { CustomInstructionsInput } from "./CustomInstructionsInput";
 import { RefineAction } from "./RefineAction";
 import { isObject, isString } from "lodash-es";
 import { type RefinementAction, type SupportedProvider } from "~/modelProviders/types";
@@ -73,7 +73,7 @@ export const RefinePromptModal = ({
       return;
     await replaceVariantMutation.mutateAsync({
       id: variant.id,
-      promptConstructor: refinedPromptFn,
+      constructFn: refinedPromptFn,
       streamScenarios: visibleScenarios,
     });
     await utils.promptVariants.list.invalidate();
@@ -97,7 +97,7 @@ export const RefinePromptModal = ({
         <ModalCloseButton />
         <ModalBody maxW="unset">
           <VStack spacing={8}>
-            <VStack spacing={4} w="full">
+            <VStack spacing={4}>
               {Object.keys(refinementActions).length && (
                 <>
                   <SimpleGrid columns={{ base: 1, md: 2 }} spacing={8}>
@@ -122,11 +122,11 @@ export const RefinePromptModal = ({
                 instructions={instructions}
                 setInstructions={setInstructions}
                 loading={modificationInProgress}
-                onSubmit={() => getModifiedPromptFn()}
+                onSubmit={getModifiedPromptFn}
               />
             </VStack>
             <CompareFunctions
-              originalFunction={variant.promptConstructor}
+              originalFunction={variant.constructFn}
               newFunction={isString(refinedPromptFn) ? refinedPromptFn : undefined}
               maxH="40vh"
             />

app/src/components/StatsCard.tsx

@@ -1,26 +0,0 @@
-import { VStack, HStack, type StackProps, Text, Divider } from "@chakra-ui/react";
-import Link, { type LinkProps } from "next/link";
-
-const StatsCard = ({
-  title,
-  href,
-  children,
-  ...rest
-}: { title: string; href: string } & StackProps & LinkProps) => {
-  return (
-    <VStack flex={1} borderWidth={1} padding={4} borderRadius={4} borderColor="gray.300" {...rest}>
-      <HStack w="full" justifyContent="space-between">
-        <Text fontSize="md" fontWeight="bold">
-          {title}
-        </Text>
-        <Link href={href}>
-          <Text color="blue">View all</Text>
-        </Link>
-      </HStack>
-      <Divider />
-      {children}
-    </VStack>
-  );
-};
-
-export default StatsCard;

app/src/components/VariantHeader/VariantHeader.tsx

@@ -1,11 +1,11 @@
 import { useState, type DragEvent } from "react";
-import { type PromptVariant } from "../types";
+import { type PromptVariant } from "../OutputsTable/types";
 import { api } from "~/utils/api";
 import { RiDraggable } from "react-icons/ri";
 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 AutoResizeTextArea from "../AutoResizeTextArea";
 import VariantHeaderMenuButton from "./VariantHeaderMenuButton";
 
 export default function VariantHeader(
@@ -84,7 +84,6 @@ export default function VariantHeader(
     >
       <HStack
         spacing={2}
-        py={2}
         alignItems="flex-start"
         minH={headerMinHeight}
         draggable={!isInputHovered}
@@ -103,9 +102,7 @@ export default function VariantHeader(
           setIsDragTarget(false);
         }}
         onDrop={onReorder}
-        backgroundColor={isDragTarget ? "gray.200" : "white"}
+        backgroundColor={isDragTarget ? "gray.200" : "gray.100"}
-        borderTopLeftRadius={gridItemProps.borderTopLeftRadius}
-        borderTopRightRadius={gridItemProps.borderTopRightRadius}
         h="full"
       >
         <Icon

app/src/components/VariantHeader/VariantHeaderMenuButton.tsx

@@ -1,4 +1,6 @@
-import { useState } from "react";
+import { type PromptVariant } from "../OutputsTable/types";
+import { api } from "~/utils/api";
+import { useHandledAsyncCallback, useVisibleScenarioIds } from "~/utils/hooks";
 import {
   Icon,
   Menu,
@@ -12,13 +14,10 @@ import {
 } from "@chakra-ui/react";
 import { BsFillTrashFill, BsGear, BsStars } from "react-icons/bs";
 import { FaRegClone } from "react-icons/fa";
+import { useState } from "react";
+import { RefinePromptModal } from "../RefinePromptModal/RefinePromptModal";
 import { RiExchangeFundsFill } from "react-icons/ri";
-
+import { ChangeModelModal } from "../ChangeModelModal/ChangeModelModal";
-import { api } from "~/utils/api";
-import { useHandledAsyncCallback, useVisibleScenarioIds } from "~/utils/hooks";
-import { type PromptVariant } from "../types";
-import { RefinePromptModal } from "../../RefinePromptModal/RefinePromptModal";
-import { ChangeModelModal } from "../../ChangeModelModal/ChangeModelModal";
 
 export default function VariantHeaderMenuButton({
   variant,

app/src/components/dashboard/LoggedCallsTable.tsx

@@ -1,46 +0,0 @@
-import { Card, CardHeader, Heading, Table, Tbody, HStack, Button, Text } from "@chakra-ui/react";
-import { useState } from "react";
-import Link from "next/link";
-import { useLoggedCalls } from "~/utils/hooks";
-import { TableHeader, TableRow } from "../requestLogs/TableRow";
-
-export default function LoggedCallsTable() {
-  const [expandedRow, setExpandedRow] = useState<string | null>(null);
-  const { data: loggedCalls } = useLoggedCalls();
-
-  return (
-    <Card width="100%" overflow="hidden">
-      <CardHeader>
-        <HStack justifyContent="space-between">
-          <Heading as="h3" size="sm">
-            Request Logs
-          </Heading>
-          <Button as={Link} href="/request-logs" variant="ghost" colorScheme="blue">
-            <Text>View All</Text>
-          </Button>
-        </HStack>
-      </CardHeader>
-      <Table>
-        <TableHeader />
-        <Tbody>
-          {loggedCalls?.calls.map((loggedCall) => {
-            return (
-              <TableRow
-                key={loggedCall.id}
-                loggedCall={loggedCall}
-                isExpanded={loggedCall.id === expandedRow}
-                onToggle={() => {
-                  if (loggedCall.id === expandedRow) {
-                    setExpandedRow(null);
-                  } else {
-                    setExpandedRow(loggedCall.id);
-                  }
-                }}
-              />
-            );
-          })}
-        </Tbody>
-      </Table>
-    </Card>
-  );
-}

app/src/components/dashboard/UsageGraph.tsx

@@ -1,61 +0,0 @@
-import {
-  ResponsiveContainer,
-  LineChart,
-  Line,
-  XAxis,
-  YAxis,
-  CartesianGrid,
-  Tooltip,
-  Legend,
-} from "recharts";
-import { useMemo } from "react";
-
-import { useSelectedProject } from "~/utils/hooks";
-import dayjs from "~/utils/dayjs";
-import { api } from "~/utils/api";
-
-export default function UsageGraph() {
-  const { data: selectedProject } = useSelectedProject();
-
-  const stats = api.dashboard.stats.useQuery(
-    { projectId: selectedProject?.id ?? "" },
-    { enabled: !!selectedProject },
-  );
-
-  const data = useMemo(() => {
-    return (
-      stats.data?.periods.map(({ period, numQueries, cost }) => ({
-        period,
-        Requests: numQueries,
-        "Total Spent (USD)": parseFloat(cost.toString()),
-      })) || []
-    );
-  }, [stats.data]);
-
-  return (
-    <ResponsiveContainer width="100%" height={400}>
-      <LineChart data={data} margin={{ top: 5, right: 20, left: 10, bottom: 5 }}>
-        <XAxis dataKey="period" tickFormatter={(str: string) => dayjs(str).format("MMM D")} />
-        <YAxis yAxisId="left" dataKey="Requests" orientation="left" stroke="#8884d8" />
-        <YAxis
-          yAxisId="right"
-          dataKey="Total Spent (USD)"
-          orientation="right"
-          unit="$"
-          stroke="#82ca9d"
-        />
-        <Tooltip />
-        <Legend />
-        <CartesianGrid stroke="#f5f5f5" />
-        <Line dataKey="Requests" stroke="#8884d8" yAxisId="left" dot={false} strokeWidth={2} />
-        <Line
-          dataKey="Total Spent (USD)"
-          stroke="#82ca9d"
-          yAxisId="right"
-          dot={false}
-          strokeWidth={2}
-        />
-      </LineChart>
-    </ResponsiveContainer>
-  );
-}