Remove scenarios header from output table card

2023-08-13 01:40:03 -07:00
241 changed files with 3203 additions and 12094 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +0,0 @@
-**/node_modules/
-.git
-**/.venv/
-**/.env*
-**/.next/
--- a/.github/ISSUE_TEMPLATE/sweep-fast-template.yml
+++ b/.github/ISSUE_TEMPLATE/sweep-fast-template.yml
@@ -1,14 +0,0 @@
-name: Sweep Fast Issue
-title: 'Sweep (fast): '
-description: For few-line fixes to be handled by Sweep, an AI-powered junior developer. Sweep will use GPT-3.5 to quickly create a PR for very small changes.
-labels: sweep
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Details
-      description: Tell Sweep where and what to edit and provide enough context for a new developer to the codebase
-      placeholder: |
-        Bugs: The bug might be in ... file. Here are the logs: ...
-        Features: the new endpoint should use the ... class from ... file because it contains ... logic.
-        Refactors: We are migrating this function to ... version because ...
--- a/.github/ISSUE_TEMPLATE/sweep-slow-template.yml
+++ b/.github/ISSUE_TEMPLATE/sweep-slow-template.yml
@@ -1,14 +0,0 @@
-name: Sweep Slow Issue
-title: 'Sweep (slow): '
-description: For larger bugs, features, refactors, and tests to be handled by Sweep, an AI-powered junior developer. Sweep will perform a deeper search and more self-reviews but will take longer.
-labels: sweep
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Details
-      description: Tell Sweep where and what to edit and provide enough context for a new developer to the codebase
-      placeholder: |
-        Bugs: The bug might be in ... file. Here are the logs: ...
-        Features: the new endpoint should use the ... class from ... file because it contains ... logic.
-        Refactors: We are migrating this function to ... version because ...
--- a/.github/ISSUE_TEMPLATE/sweep-template.yml
+++ b/.github/ISSUE_TEMPLATE/sweep-template.yml
@@ -1,14 +0,0 @@
-name: Sweep Issue
-title: 'Sweep: '
-description: For small bugs, features, refactors, and tests to be handled by Sweep, an AI-powered junior developer.
-labels: sweep
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Details
-      description: Tell Sweep where and what to edit and provide enough context for a new developer to the codebase
-      placeholder: |
-        Bugs: The bug might be in ... file. Here are the logs: ...
-        Features: the new endpoint should use the ... class from ... file because it contains ... logic.
-        Refactors: We are migrating this function to ... version because ...
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@
 *.pyc
 node_modules/
 *.tsbuildinfo
-dist/
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,2 +0,0 @@
-*.schema.json
-app/pnpm-lock.yaml
--- a/README.md
+++ b/README.md
@@ -1,53 +1,16 @@
- <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>
+<!-- <img src="https://github.com/openpipe/openpipe/assets/41524992/ca59596e-eb80-40f9-921f-6d67f6e6d8fa" width="72px" /> -->

-<p align="center">
-  <i>Turn expensive prompts into cheap fine-tuned models.</i>
-</p>
+# OpenPipe

-<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>
- <img src="https://img.shields.io/badge/Y%20Combinator-S23-orange?style=flat-square" alt="Y Combinator S23">
-</p>
+OpenPipe is a flexible playground for comparing and optimizing LLM prompts. It lets you quickly generate, test and compare candidate prompts, and can automatically [translate](#-translate-between-model-apis) those prompts between models.

-<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. Try it out at https://app.openpipe.ai or <a href="#running-locally">run it locally</a>.
-<br>
-
-
-## Features
-
- * <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.
-
- * <b>Fine-Tune (Beta)</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.
-   
-<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"> -->
+<img src="https://github.com/openpipe/openpipe/assets/41524992/219a844e-3f4e-4f6b-8066-41348b42977b" alt="demo">

+You can use our hosted version of OpenPipe at https://openpipe.ai. You can also clone this repository and [run it locally](#running-locally).

 ## Sample Experiments

-These are sample experiments users have created that show how OpenPipe works. Feel free to fork them and start experimenting yourself.
+These are simple 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)
@@ -56,25 +19,43 @@ These are sample experiments users have created that show how OpenPipe works. Fe

 ## 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)
+- 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)
+
+## Features
+
+### 🔍 Visualize Responses
+
+Inspect prompt completions side-by-side.
+
+### 🧪 Bulk-Test
+
+OpenPipe lets you _template_ a prompt. Use the templating feature to run the prompts you're testing against many potential inputs for broad coverage of your problem space.
+
+### 📟 Translate between Model APIs
+
+Write your prompt in one format and automatically convert it to work with any other model.
+
+<img width="480" alt="Screenshot 2023-08-01 at 11 55 38 PM" src="https://github.com/OpenPipe/OpenPipe/assets/41524992/1e19ccf2-96b6-4e93-a3a5-1449710d1b5b" alt="translate between models">
+
+<br><br>
+
+### 🛠️ Refine Your Prompts Automatically
+
+Use a growing database of best-practice refinements to improve your prompts automatically.
+
+<img width="480" alt="Screenshot 2023-08-01 at 11 55 38 PM" src="https://github.com/OpenPipe/OpenPipe/assets/41524992/87a27fe7-daef-445c-a5e2-1c82b23f9f99" alt="add function call">
+
+<br><br>
+
+### 🪄 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!
+
+<img width="600" src="https://github.com/openpipe/openpipe/assets/41524992/219a844e-3f4e-4f6b-8066-41348b42977b" alt="auto-generate">
+
+<br><br>

 ## Running Locally

@@ -94,4 +75,4 @@ These are sample experiments users have created that show how OpenPipe works. Fe
 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`
+4. Run `pnpm test`
--- a/app/.env.example
+++ b/app/.env.example
@@ -32,11 +32,5 @@ NEXT_PUBLIC_HOST="http://localhost:3000"
 GITHUB_CLIENT_ID="your_client_id"
 GITHUB_CLIENT_SECRET="your_secret"

-OPENPIPE_BASE_URL="http://localhost:3000/api/v1"
+OPENPIPE_BASE_URL="http://localhost:3000/api"
 OPENPIPE_API_KEY="your_key"
-
-SENDER_EMAIL="placeholder"
-SMTP_HOST="placeholder"
-SMTP_PORT="placeholder"
-SMTP_LOGIN="placeholder"
-SMTP_PASSWORD="placeholder"
--- a/app/.prettierignore
+++ b/app/.prettierignore
@@ -0,0 +1,2 @@
+*.schema.json
+pnpm-lock.yaml
--- a/app/.prettierrc
+++ b/app/.prettierrc
--- a/app/@types/nextjs-routes.d.ts
+++ b/app/@types/nextjs-routes.d.ts
@@ -12,18 +12,18 @@ 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">
+    | StaticRoute<"/api/sentry-example-api">
    | DynamicRoute<"/api/trpc/[trpc]", { "trpc": string }>
-    | DynamicRoute<"/api/v1/[...trpc]", { "trpc": string[] }>
-    | StaticRoute<"/api/v1/openapi">
    | StaticRoute<"/dashboard">
-    | DynamicRoute<"/experiments/[experimentSlug]", { "experimentSlug": string }>
+    | DynamicRoute<"/data/[id]", { "id": string }>
+    | StaticRoute<"/data">
+    | DynamicRoute<"/experiments/[id]", { "id": string }>
    | StaticRoute<"/experiments">
-    | StaticRoute<"/fine-tunes">
    | StaticRoute<"/">
-    | DynamicRoute<"/invitations/[invitationToken]", { "invitationToken": string }>
    | StaticRoute<"/project/settings">
    | StaticRoute<"/request-logs">
    | StaticRoute<"/sentry-example-page">
--- a/app/Dockerfile
+++ b/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 client-libs/typescript/package.json ./client-libs/typescript/
-COPY pnpm-lock.yaml pnpm-workspace.yaml ./
+COPY prisma ./

-RUN cd app && pnpm install --frozen-lockfile
+COPY package.json pnpm-lock.yaml ./
+
+RUN pnpm install --frozen-lockfile

 # BUILDER
 FROM base as builder
@@ -23,25 +23,24 @@ ARG NEXT_PUBLIC_SOCKET_URL
 ARG NEXT_PUBLIC_HOST
 ARG NEXT_PUBLIC_SENTRY_DSN
 ARG SENTRY_AUTH_TOKEN
+ARG NEXT_PUBLIC_FF_SHOW_LOGGED_CALLS

-WORKDIR /code
-COPY --from=deps /code/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
+WORKDIR /app
+COPY --from=deps /app/node_modules ./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
--- a/app/LICENSE
+++ b/app/LICENSE
--- a/app/package.json
+++ b/app/package.json
@@ -10,15 +10,14 @@
  },
  "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": "concurrently --kill-others 'pnpm dev:next' 'pnpm dev:wss' 'pnpm worker --watch'",
+    "dev:worker": "NODE_ENV='development' pnpm tsx --watch src/server/tasks/worker.ts",
+    "dev": "concurrently --kill-others 'pnpm dev:next' 'pnpm dev:wss' 'pnpm dev:worker'",
    "postinstall": "prisma generate",
    "lint": "next lint",
-    "start": "TZ=UTC next start",
+    "start": "next start",
    "codegen:clients": "tsx src/server/scripts/client-codegen.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'",
    "test": "pnpm vitest"
@@ -38,7 +37,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",
@@ -48,7 +46,6 @@
    "@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",
@@ -61,26 +58,20 @@
    "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.7",
-    "openpipe": "^0.3.0",
-    "openpipe-dev": "workspace:^",
    "pg": "^8.11.2",
    "pluralize": "^8.0.0",
    "posthog-js": "^1.75.3",
@@ -101,7 +92,6 @@
    "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",
@@ -110,11 +100,11 @@
    "uuid": "^9.0.0",
    "vite-tsconfig-paths": "^4.2.0",
    "zod": "^3.21.4",
-    "zustand": "^4.3.9"
+    "zustand": "^4.3.9",
+    "openpipe": "workspace:*"
  },
  "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",
@@ -124,14 +114,12 @@
    "@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",
@@ -141,7 +129,6 @@
    "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",
--- a/app/prisma/deleteOneFineTune.ts
+++ b/app/prisma/deleteOneFineTune.ts
@@ -1,12 +0,0 @@
-import { prisma } from "~/server/db";
-
-// delete most recent fineTune
-const mostRecentFineTune = await prisma.fineTune.findFirst({
-  orderBy: { createdAt: "desc" },
-});
-
-if (mostRecentFineTune) {
-  await prisma.fineTune.delete({
-    where: { id: mostRecentFineTune.id },
-  });
-}
--- a/app/prisma/migrations/20230814233722_index_tags_by_project/migration.sql
+++ b/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");
--- a/app/prisma/migrations/20230815234811_add_user_invitations/migration.sql
+++ b/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;
--- a/app/prisma/migrations/20230818055303_add_slug_to_experiment/migration.sql
+++ b/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");
--- a/app/prisma/migrations/20230822234224_add_fine_tunes/migration.sql
+++ b/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;
--- a/app/prisma/schema.prisma
+++ b/app/prisma/schema.prisma
@@ -11,9 +11,7 @@ datasource db {
 }

 model Experiment {
-    id String @id @default(uuid()) @db.Uuid
-
-    slug  String @unique @default(dbgenerated("short_nanoid()"))
+    id    String @id @default(uuid()) @db.Uuid
    label String

    sortIndex Int @default(0)
@@ -114,17 +112,17 @@ model ScenarioVariantCell {
 model ModelResponse {
    id String @id @default(uuid()) @db.Uuid

-    cacheKey     String
-    requestedAt  DateTime?
-    receivedAt   DateTime?
-    respPayload  Json?
-    cost         Float?
-    inputTokens  Int?
-    outputTokens Int?
-    statusCode   Int?
-    errorMessage String?
-    retryTime    DateTime?
-    outdated     Boolean   @default(false)
+    cacheKey        String
+    requestedAt      DateTime?
+    receivedAt       DateTime?
+    respPayload      Json?
+    cost             Float?
+    inputTokens      Int?
+    outputTokens     Int?
+    statusCode       Int?
+    errorMessage     String?
+    retryTime        DateTime?
+    outdated         Boolean   @default(false)

    createdAt DateTime @default(now())
    updatedAt DateTime @updatedAt
@@ -181,7 +179,6 @@ model Dataset {

    name           String
    datasetEntries DatasetEntry[]
-    fineTunes      FineTune[]

    projectId String  @db.Uuid
    project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
@@ -193,8 +190,8 @@ model Dataset {
 model DatasetEntry {
    id String @id @default(uuid()) @db.Uuid

-    loggedCallId String @db.Uuid
-    loggedCall   LoggedCall @relation(fields: [loggedCallId], references: [id], onDelete: Cascade)
+    input  String
+    output String?

    datasetId String   @db.Uuid
    dataset   Dataset? @relation(fields: [datasetId], references: [id], onDelete: Cascade)
@@ -210,15 +207,13 @@ model Project {
    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[]
+    createdAt    DateTime      @default(now())
+    updatedAt    DateTime      @updatedAt
+    projectUsers ProjectUser[]
+    experiments  Experiment[]
+    datasets     Dataset[]
+    loggedCalls  LoggedCall[]
+    apiKeys      ApiKey[]
 }

 enum ProjectUserRole {
@@ -278,9 +273,8 @@ model LoggedCall {
    projectId String   @db.Uuid
    project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade)

-    model           String?
-    tags            LoggedCallTag[]
-    datasetEntries  DatasetEntry[]
+    model        String?
+    tags         LoggedCallTag[]

    createdAt DateTime @default(now())
    updatedAt DateTime @updatedAt
@@ -301,7 +295,7 @@ model LoggedCallModelResponse {
    errorMessage String?

    requestedAt DateTime
-    receivedAt  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
@@ -315,7 +309,7 @@ model LoggedCallModelResponse {
    outputTokens Int?
    finishReason String?
    completionId String?
-    cost         Float?
+    cost         Decimal? @db.Decimal(18, 12)

    // The LoggedCall that created this LoggedCallModelResponse
    originalLoggedCallId String     @unique @db.Uuid
@@ -329,17 +323,15 @@ model LoggedCallModelResponse {
 }

 model LoggedCallTag {
-    id        String  @id @default(uuid()) @db.Uuid
-    name      String
-    value     String?
-    projectId String  @db.Uuid
+    id    String  @id @default(uuid()) @db.Uuid
+    name  String
+    value String?

    loggedCallId String     @db.Uuid
    loggedCall   LoggedCall @relation(fields: [loggedCallId], references: [id], onDelete: Cascade)

-    @@unique([loggedCallId, name])
-    @@index([projectId, name])
-    @@index([projectId, name, value])
+    @@index([name])
+    @@index([name, value])
 }

 model ApiKey {
@@ -348,8 +340,8 @@ model ApiKey {
    name   String
    apiKey String @unique

-    projectId String  @db.Uuid
-    project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
+    projectId String   @db.Uuid
+    project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade)

    createdAt DateTime @default(now())
    updatedAt DateTime @updatedAt
@@ -396,33 +388,16 @@ model User {

    role UserRole @default(USER)

-    accounts            Account[]
-    sessions            Session[]
-    projectUsers        ProjectUser[]
-    projects            Project[]
-    worldChampEntrant   WorldChampEntrant?
-    sentUserInvitations UserInvitation[]
+    accounts          Account[]
+    sessions          Session[]
+    projectUsers      ProjectUser[]
+    projects          Project[]
+    worldChampEntrant WorldChampEntrant?

    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 {
    identifier String
    token      String   @unique
@@ -430,33 +405,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
-}
--- a/app/prisma/seed.ts
+++ b/app/prisma/seed.ts
@@ -2,7 +2,6 @@ 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";

@@ -10,14 +9,6 @@ await prisma.project.deleteMany({
  where: { id: defaultId },
 });

-// Mark all users as admins
-await prisma.user.updateMany({
-  where: {},
-  data: {
-    role: "ADMIN",
-  },
-});
-
 // If there's an existing project, just seed into it
 const project =
  (await prisma.project.findFirst({})) ??
@@ -25,20 +16,6 @@ const project =
    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,
--- a/app/prisma/seedDashboard.ts
+++ b/app/prisma/seedDashboard.ts
@@ -13,7 +13,6 @@ const MODEL_RESPONSE_TEMPLATES: {
  inputTokens: number;
  outputTokens: number;
  finishReason: string;
-  tags: { name: string; value: string }[];
 }[] = [
  {
    reqPayload: {
@@ -80,7 +79,7 @@ const MODEL_RESPONSE_TEMPLATES: {
    },
    respStatus: 200,
    respPayload: {
-      id: "chatcmpl-7",
+      id: "chatcmpl-7lNspqePJWVyXwXebupxb1eMozo6Q",
      model: "gpt-3.5-turbo-0613",
      usage: {
        total_tokens: 241,
@@ -108,7 +107,6 @@ const MODEL_RESPONSE_TEMPLATES: {
    inputTokens: 236,
    outputTokens: 5,
    finishReason: "stop",
-    tags: [{ name: "prompt_id", value: "define_func" }],
  },
  {
    reqPayload: {
@@ -167,7 +165,7 @@ const MODEL_RESPONSE_TEMPLATES: {
    },
    respStatus: 200,
    respPayload: {
-      id: "chatcmpl-7",
+      id: "chatcmpl-7lNifmc5AncyAvleZRDBhAcLFYBIT",
      model: "gpt-3.5-turbo-0613",
      usage: {
        total_tokens: 227,
@@ -195,7 +193,6 @@ const MODEL_RESPONSE_TEMPLATES: {
    inputTokens: 222,
    outputTokens: 5,
    finishReason: "stop",
-    tags: [],
  },
  {
    reqPayload: {
@@ -210,7 +207,7 @@ const MODEL_RESPONSE_TEMPLATES: {
    },
    respStatus: 200,
    respPayload: {
-      id: "chatcmpl-7",
+      id: "chatcmpl-7lNh1TtrsJVgz3Nj70bKkZZk7xPi7",
      model: "gpt-3.5-turbo-0613",
      usage: {
        total_tokens: 21,
@@ -234,7 +231,6 @@ const MODEL_RESPONSE_TEMPLATES: {
    inputTokens: 14,
    outputTokens: 7,
    finishReason: "stop",
-    tags: [{ name: "prompt_id", value: "translate_text" }],
  },
  {
    reqPayload: {
@@ -281,7 +277,7 @@ const MODEL_RESPONSE_TEMPLATES: {
    },
    respStatus: 200,
    respPayload: {
-      id: "chatcmpl-7",
+      id: "chatcmpl-7lQS3MktOT8BTgNEytl9dkyssCQqL",
      model: "gpt-4-0613",
      usage: {
        total_tokens: 2910,
@@ -310,10 +306,6 @@ const MODEL_RESPONSE_TEMPLATES: {
    inputTokens: 2802,
    outputTokens: 108,
    finishReason: "stop",
-    tags: [
-      { name: "prompt_id", value: "chatcmpl-7" },
-      { name: "some_other_tag", value: "some_other_value" },
-    ],
  },
 ];

@@ -339,7 +331,7 @@ const loggedCallsToCreate: Prisma.LoggedCallCreateManyInput[] = [];
 const loggedCallModelResponsesToCreate: Prisma.LoggedCallModelResponseCreateManyInput[] = [];
 const loggedCallsToUpdate: Prisma.LoggedCallUpdateArgs[] = [];
 const loggedCallTagsToCreate: Prisma.LoggedCallTagCreateManyInput[] = [];
-for (let i = 0; i < 11437; i++) {
+for (let i = 0; i < 1437; i++) {
  const loggedCallId = uuidv4();
  const loggedCallModelResponseId = uuidv4();
  const template =
@@ -357,7 +349,6 @@ for (let i = 0; i < 11437; i++) {
    cacheHit: false,
    requestedAt,
    projectId: project.id,
-    model: template.reqPayload.model,
    createdAt: requestedAt,
  });

@@ -397,14 +388,11 @@ for (let i = 0; i < 11437; i++) {
      modelResponseId: loggedCallModelResponseId,
    },
  });
-  for (const tag of template.tags) {
-    loggedCallTagsToCreate.push({
-      projectId: project.id,
-      loggedCallId,
-      name: tag.name,
-      value: tag.value,
-    });
-  }
+  loggedCallTagsToCreate.push({
+    loggedCallId,
+    name: "$model",
+    value: template.reqPayload.model,
+  });
 }

 await prisma.$transaction([
--- a/app/scripts/run-prod.sh
+++ b/app/scripts/run-prod.sh
@@ -10,4 +10,6 @@ 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"
--- a/app/scripts/debug-prod.sh
+++ b/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
--- a/app/scripts/run-workers-prod.sh
+++ b/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"
--- a/app/scripts/test-docker.sh
+++ b/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"
--- a/app/sentry.server.config.ts
+++ b/app/sentry.server.config.ts
@@ -3,7 +3,6 @@
 // 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) {
@@ -16,10 +15,4 @@ if (env.NEXT_PUBLIC_SENTRY_DSN) {
    // 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);
-  });
 }
--- a/app/src/components/AutoResizeTextArea.tsx
+++ b/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
--- a/app/src/components/BetaModal.tsx
+++ b/app/src/components/BetaModal.tsx
@@ -1,65 +0,0 @@
-import {
-  Button,
-  Modal,
-  ModalBody,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  VStack,
-  Text,
-  HStack,
-  Icon,
-  Link,
-} from "@chakra-ui/react";
-import { BsStars } from "react-icons/bs";
-import { useSession } from "next-auth/react";
-
-export const BetaModal = ({ isOpen, onClose }: { isOpen: boolean; onClose: () => void }) => {
-  const session = useSession();
-
-  const email = session.data?.user.email ?? "";
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      onClose={onClose}
-      closeOnOverlayClick={false}
-      size={{ base: "xl", md: "2xl" }}
-    >
-      <ModalOverlay />
-      <ModalContent w={1200}>
-        <ModalHeader>
-          <HStack>
-            <Icon as={BsStars} />
-            <Text>Beta-Only Feature</Text>
-          </HStack>
-        </ModalHeader>
-        <ModalBody maxW="unset">
-          <VStack spacing={8} py={4} alignItems="flex-start">
-            <Text fontSize="md">
-              This feature is currently in beta. To receive early access to beta-only features, join
-              the waitlist. You'll receive an email at <b>{email}</b> when you're approved.
-            </Text>
-          </VStack>
-        </ModalBody>
-        <ModalFooter>
-          <HStack spacing={4}>
-            <Button
-              as={Link}
-              textDecoration="none !important"
-              colorScheme="orange"
-              target="_blank"
-              href={`https://ax3nafkw0jp.typeform.com/to/ZNpYqvAc#email=${email}`}
-            >
-              Join Waitlist
-            </Button>
-            <Button colorScheme="blue" onClick={onClose}>
-              Done
-            </Button>
-          </HStack>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-};
--- a/app/src/components/ChangeModelModal/ChangeModelModal.tsx
+++ b/app/src/components/ChangeModelModal/ChangeModelModal.tsx
@@ -1,4 +1,3 @@
-import { useState, useMemo, useCallback } from "react";
 import {
  Button,
  HStack,
@@ -15,18 +14,16 @@ import {
  VStack,
 } from "@chakra-ui/react";
 import { type PromptVariant } from "@prisma/client";
-import { isString } from "lodash-es";
+import { isObject, isString } from "lodash-es";
+import { useState } from "react";
 import { RiExchangeFundsFill } from "react-icons/ri";
-
 import { type ProviderModel } from "~/modelProviders/types";
 import { api } from "~/utils/api";
-import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
+import { useExperiment, useHandledAsyncCallback, useVisibleScenarioIds } from "~/utils/hooks";
 import { lookupModel, modelLabel } from "~/utils/utils";
 import CompareFunctions from "../RefinePromptModal/CompareFunctions";
 import { ModelSearch } from "./ModelSearch";
 import { ModelStatsCard } from "./ModelStatsCard";
-import { maybeReportError } from "~/utils/errorHandling/maybeReportError";
-import { useAppStore } from "~/state/store";

 export const ChangeModelModal = ({
  variant,
@@ -35,43 +32,48 @@ export const ChangeModelModal = ({
  variant: PromptVariant;
  onClose: () => void;
 }) => {
-  const editorOptionsMap = useAppStore((s) => s.sharedVariantEditor.editorOptionsMap);
-  const originalPromptFn = useMemo(
-    () => editorOptionsMap[variant.uiId]?.getContent() || "",
-    [editorOptionsMap, variant.uiId],
-  );
-
  const originalModel = lookupModel(variant.modelProvider, variant.model);
  const [selectedModel, setSelectedModel] = useState({
    provider: variant.modelProvider,
    model: variant.model,
  } as ProviderModel);
  const [convertedModel, setConvertedModel] = useState<ProviderModel | undefined>();
-  const [modifiedPromptFn, setModifiedPromptFn] = useState<string>();
+  const visibleScenarios = useVisibleScenarioIds();
+
+  const utils = api.useContext();

  const experiment = useExperiment();

-  const { mutateAsync: getModifiedPromptMutateAsync } =
+  const { mutateAsync: getModifiedPromptMutateAsync, data: modifiedPromptFn } =
    api.promptVariants.getModifiedPromptFn.useMutation();

  const [getModifiedPromptFn, modificationInProgress] = useHandledAsyncCallback(async () => {
    if (!experiment) return;

-    const resp = await getModifiedPromptMutateAsync({
+    await getModifiedPromptMutateAsync({
      id: variant.id,
-      originalPromptFn,
      newModel: selectedModel,
    });
-    if (maybeReportError(resp)) return;
-    setModifiedPromptFn(resp.payload);
    setConvertedModel(selectedModel);
  }, [getModifiedPromptMutateAsync, onClose, experiment, variant, selectedModel]);

-  const replaceVariant = useCallback(() => {
-    if (!modifiedPromptFn) return;
-    editorOptionsMap[variant.uiId]?.setContent(modifiedPromptFn);
+  const replaceVariantMutation = api.promptVariants.replaceVariant.useMutation();
+
+  const [replaceVariant, replacementInProgress] = useHandledAsyncCallback(async () => {
+    if (
+      !variant.experimentId ||
+      !modifiedPromptFn ||
+      (isObject(modifiedPromptFn) && "status" in modifiedPromptFn)
+    )
+      return;
+    await replaceVariantMutation.mutateAsync({
+      id: variant.id,
+      promptConstructor: modifiedPromptFn,
+      streamScenarios: visibleScenarios,
+    });
+    await utils.promptVariants.list.invalidate();
    onClose();
-  }, [variant.uiId, editorOptionsMap, onClose, modifiedPromptFn]);
+  }, [replaceVariantMutation, variant, onClose, modifiedPromptFn]);

  const originalLabel = modelLabel(variant.modelProvider, variant.model);
  const selectedLabel = modelLabel(selectedModel.provider, selectedModel.model);
@@ -128,9 +130,9 @@ export const ChangeModelModal = ({
              colorScheme="blue"
              onClick={replaceVariant}
              minW={24}
-              isDisabled={!convertedModel || modificationInProgress}
+              isDisabled={!convertedModel || modificationInProgress || replacementInProgress}
            >
-              Accept
+              {replacementInProgress ? <Spinner boxSize={4} /> : <Text>Accept</Text>}
            </Button>
          </HStack>
        </ModalFooter>
--- a/app/src/components/ChangeModelModal/ModelStatsCard.tsx
+++ b/app/src/components/ChangeModelModal/ModelStatsCard.tsx
@@ -87,7 +87,7 @@ export const ModelStatsCard = ({
              label="Price"
              info={
                <Text>
-                  ${model.pricePerSecond.toFixed(4)}
+                  ${model.pricePerSecond.toFixed(3)}
                  <Text color="gray.500"> / second</Text>
                </Text>
              }
--- a/app/src/components/CopiableCode.tsx
+++ b/app/src/components/CopiableCode.tsx
@@ -1,16 +1,15 @@
-import { HStack, Icon, IconButton, Tooltip, Text, type StackProps } from "@chakra-ui/react";
+import { HStack, Icon, IconButton, Tooltip, Text } 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 CopiableCode = ({ code }: { code: string }) => {
  const [copied, setCopied] = useState(false);

  const [copyToClipboard] = useHandledAsyncCallback(async () => {
    await navigator.clipboard.writeText(code);
    setCopied(true);
  }, [code]);
-
  return (
    <HStack
      backgroundColor="blackAlpha.800"
@@ -19,19 +18,9 @@ const CopiableCode = ({ code, ...rest }: { code: string } & StackProps) => {
      padding={3}
      w="full"
      justifyContent="space-between"
-      alignItems="flex-start"
-      {...rest}
    >
-      <Text
-        fontFamily="inconsolata"
-        fontWeight="bold"
-        letterSpacing={0.5}
-        overflowX="auto"
-        whiteSpace="pre-wrap"
-      >
+      <Text fontFamily="inconsolata" fontWeight="bold" letterSpacing={0.5} overflowX="auto">
        {code}
-        {/* Necessary for trailing newline to actually be displayed */}
-        {code.endsWith("\n") ? "\n" : ""}
      </Text>
      <Tooltip closeOnClick={false} label={copied ? "Copied!" : "Copy to clipboard"}>
        <IconButton
--- a/app/src/components/ExperimentSettingsDrawer/DeleteButton.tsx
+++ b/app/src/components/ExperimentSettingsDrawer/DeleteButton.tsx
@@ -1,41 +1,74 @@
-import { Button, Icon, useDisclosure, Text } from "@chakra-ui/react";
-import { useRouter } from "next/router";
-import { BsTrash } from "react-icons/bs";
+import {
+  Button,
+  Icon,
+  AlertDialog,
+  AlertDialogBody,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogContent,
+  AlertDialogOverlay,
+  useDisclosure,
+  Text,
+} from "@chakra-ui/react";

+import { useRouter } from "next/router";
+import { useRef } from "react";
+import { BsTrash } from "react-icons/bs";
 import { useAppStore } from "~/state/store";
+import { api } from "~/utils/api";
 import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
-import DeleteExperimentDialog from "../experiments/DeleteExperimentDialog";

 export const DeleteButton = () => {
  const experiment = useExperiment();
+  const mutation = api.experiments.delete.useMutation();
+  const utils = api.useContext();
  const router = useRouter();

-  const disclosure = useDisclosure();
-
  const closeDrawer = useAppStore((s) => s.closeDrawer);
-  const [onDelete] = useHandledAsyncCallback(async () => {
+
+  const { isOpen, onOpen, onClose } = useDisclosure();
+  const cancelRef = useRef<HTMLButtonElement>(null);
+
+  const [onDeleteConfirm] = useHandledAsyncCallback(async () => {
+    if (!experiment.data?.id) return;
+    await mutation.mutateAsync({ id: experiment.data.id });
+    await utils.experiments.list.invalidate();
    await router.push({ pathname: "/experiments" });
    closeDrawer();
-  }, [router, closeDrawer]);
+
+    onClose();
+  }, [mutation, experiment.data?.id, router]);

  return (
    <>
-      <Button
-        size="sm"
-        variant="ghost"
-        colorScheme="red"
-        fontWeight="normal"
-        onClick={disclosure.onOpen}
-      >
+      <Button size="sm" variant="ghost" colorScheme="red" fontWeight="normal" onClick={onOpen}>
        <Icon as={BsTrash} boxSize={4} />
        <Text ml={2}>Delete Experiment</Text>
      </Button>

-      <DeleteExperimentDialog
-        experimentId={experiment.data?.id}
-        onDelete={onDelete}
-        disclosure={disclosure}
-      />
+      <AlertDialog isOpen={isOpen} leastDestructiveRef={cancelRef} onClose={onClose}>
+        <AlertDialogOverlay>
+          <AlertDialogContent>
+            <AlertDialogHeader fontSize="lg" fontWeight="bold">
+              Delete Experiment
+            </AlertDialogHeader>
+
+            <AlertDialogBody>
+              If you delete this experiment all the associated prompts and scenarios will be deleted
+              as well. Are you sure?
+            </AlertDialogBody>
+
+            <AlertDialogFooter>
+              <Button ref={cancelRef} onClick={onClose}>
+                Cancel
+              </Button>
+              <Button colorScheme="red" onClick={onDeleteConfirm} ml={3}>
+                Delete
+              </Button>
+            </AlertDialogFooter>
+          </AlertDialogContent>
+        </AlertDialogOverlay>
+      </AlertDialog>
    </>
  );
 };
--- a/app/src/components/InfoCircle.tsx
+++ b/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;
--- a/app/src/components/InputDropdown.tsx
+++ b/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;
--- a/app/src/components/OutputsTable/AddVariantButton.tsx
+++ b/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() {
--- a/app/src/components/OutputsTable/OutputCell/CellWrapper.tsx
+++ b/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;
--- a/app/src/components/OutputsTable/OutputCell/OutputCell.tsx
+++ b/app/src/components/OutputsTable/OutputCell/OutputCell.tsx
@@ -1,16 +1,17 @@
-import { Text } from "@chakra-ui/react";
-import stringify from "json-stringify-pretty-compact";
-import { Fragment, useEffect, useState, type ReactElement } from "react";
+import { api } from "~/utils/api";
+import { type PromptVariant, type Scenario } from "../types";
+import { type StackProps, Text, VStack } from "@chakra-ui/react";
+import { useScenarioVars, 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 { api } from "~/utils/api";
-import { useHandledAsyncCallback, useScenarioVars } from "~/utils/hooks";
+import stringify from "json-stringify-pretty-compact";
+import { type ReactElement, useState, useEffect, Fragment, useCallback } from "react";
 import useSocket from "~/utils/useSocket";
-import { type PromptVariant, type Scenario } from "../types";
-import CellWrapper from "./CellWrapper";
-import { ResponseLog } from "./ResponseLog";
+import { OutputStats } from "./OutputStats";
 import { RetryCountdown } from "./RetryCountdown";
+import frontendModelProviders from "~/modelProviders/frontendModelProviders";
+import { ResponseLog } from "./ResponseLog";
+import { CellOptions } from "./TopActions";

 const WAITING_MESSAGE_INTERVAL = 20000;

@@ -32,7 +33,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 +44,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,34 +64,42 @@ export default function OutputCell({
    cell.retrievalStatus === "PENDING" ||
    cell.retrievalStatus === "IN_PROGRESS" ||
    hardRefetching;
-
-  useEffect(() => setRefetchInterval(awaitingOutput ? 1000 : false), [awaitingOutput]);
+  useEffect(() => setRefetchInterval(awaitingOutput ? 1000 : 0), [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,
-  };
+  const CellWrapper = useCallback(
+    ({ children, ...props }: StackProps) => (
+      <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>
+    ),
+    [hardRefetching, hardRefetch, mostRecentResponse, scenario, cell],
+  );

  if (!vars) return null;

  if (!cell && !fetchingOutput)
    return (
-      <CellWrapper {...wrapperProps}>
+      <CellWrapper>
        <Text color="gray.500">Error retrieving output</Text>
      </CellWrapper>
    );

  if (cell && cell.errorMessage) {
    return (
-      <CellWrapper {...wrapperProps}>
+      <CellWrapper>
        <Text color="red.500">{cell.errorMessage}</Text>
      </CellWrapper>
    );
@@ -102,12 +111,7 @@ export default function OutputCell({

  if (showLogs)
    return (
-      <CellWrapper
-        {...wrapperProps}
-        alignItems="flex-start"
-        fontFamily="inconsolata, monospace"
-        spacing={0}
-      >
+      <CellWrapper alignItems="flex-start" fontFamily="inconsolata, monospace" spacing={0}>
        {cell?.jobQueuedAt && <ResponseLog time={cell.jobQueuedAt} title="Job queued" />}
        {cell?.jobStartedAt && <ResponseLog time={cell.jobStartedAt} title="Job started" />}
        {cell?.modelResponses?.map((response) => {
@@ -116,13 +120,8 @@ export default function OutputCell({
            ? response.receivedAt.getTime()
            : Date.now();
          if (response.requestedAt) {
-            numWaitingMessages = Math.min(
-              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,
+            numWaitingMessages = Math.floor(
+              (relativeWaitingTime - response.requestedAt.getTime()) / WAITING_MESSAGE_INTERVAL,
            );
          }
          return (
@@ -147,10 +146,9 @@ export default function OutputCell({
                <ResponseLog
                  time={response.receivedAt}
                  title="Response received from API"
-                  message={[
-                    response.statusCode ? `Status: ${response.statusCode}\n` : "",
-                    response.errorMessage ?? "",
-                  ].join("")}
+                  message={`statusCode: ${response.statusCode ?? ""}\n ${
+                    response.errorMessage ?? ""
+                  }`}
                />
              )}
            </Fragment>
@@ -170,7 +168,7 @@ export default function OutputCell({

  if (mostRecentResponse?.respPayload && normalizedOutput?.type === "json") {
    return (
-      <CellWrapper {...wrapperProps}>
+      <CellWrapper>
        <SyntaxHighlighter
          customStyle={{ overflowX: "unset", width: "100%", flex: 1 }}
          language="json"
@@ -189,7 +187,7 @@ export default function OutputCell({
  const contentToDisplay = (normalizedOutput?.type === "text" && normalizedOutput.value) || "";

  return (
-    <CellWrapper {...wrapperProps}>
+    <CellWrapper>
      <Text whiteSpace="pre-wrap">{contentToDisplay}</Text>
    </CellWrapper>
  );
--- a/app/src/components/OutputsTable/OutputCell/PromptModal.tsx
+++ b/app/src/components/OutputsTable/OutputCell/PromptModal.tsx
@@ -5,103 +5,30 @@ import {
  ModalContent,
  ModalHeader,
  ModalOverlay,
-  VStack,
-  Text,
-  Box,
  type UseDisclosureReturn,
-  Link,
 } from "@chakra-ui/react";
-import { api, type RouterOutputs } from "~/utils/api";
+import { 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: {
+export default function ExpandedModal(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">
+    <Modal isOpen={props.disclosure.isOpen} onClose={props.disclosure.onClose} size="2xl">
      <ModalOverlay />
      <ModalContent>
-        <ModalHeader>Prompt Details</ModalHeader>
+        <ModalHeader>Prompt</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>
+          <JSONTree
+            data={props.cell.prompt}
+            invertTheme={true}
+            theme="chalk"
+            shouldExpandNodeInitially={() => true}
+            getItemString={() => ""}
+            hideRoot
+          />
        </ModalBody>
      </ModalContent>
    </Modal>
--- a/app/src/components/OutputsTable/OutputCell/CellOptions.tsx
+++ b/app/src/components/OutputsTable/OutputCell/CellOptions.tsx
@@ -1,7 +1,7 @@
 import { HStack, Icon, IconButton, Spinner, Tooltip, useDisclosure } from "@chakra-ui/react";
 import { BsArrowClockwise, BsInfoCircle } from "react-icons/bs";
 import { useExperimentAccess } from "~/utils/hooks";
-import PromptModal from "./PromptModal";
+import ExpandedModal from "./PromptModal";
 import { type RouterOutputs } from "~/utils/api";

 export const CellOptions = ({
@@ -32,7 +32,7 @@ export const CellOptions = ({
              variant="ghost"
            />
          </Tooltip>
-          <PromptModal cell={cell} disclosure={modalDisclosure} />
+          <ExpandedModal cell={cell} disclosure={modalDisclosure} />
        </>
      )}
      {canModify && (
--- a/app/src/components/OutputsTable/ScenarioEditor.tsx
+++ b/app/src/components/OutputsTable/ScenarioEditor.tsx
@@ -16,7 +16,7 @@ import {
  VStack,
 } from "@chakra-ui/react";
 import { BsArrowsAngleExpand, BsX } from "react-icons/bs";
-import { cellPadding } from "./constants";
+import { cellPadding } from "../constants";
 import { FloatingLabelInput } from "./FloatingLabelInput";
 import { ScenarioEditorModal } from "./ScenarioEditorModal";

@@ -111,23 +111,25 @@ export default function ScenarioEditor({
        onDrop={onReorder}
        backgroundColor={isDragTarget ? "gray.100" : "transparent"}
      >
-        {
+        {variableLabels.length === 0 ? (
+          <Box color="gray.500">
+            {vars.data ? "No scenario variables configured" : "Loading..."}
+          </Box>
+        ) : (
          <VStack spacing={4} flex={1} py={2}>
            <HStack justifyContent="space-between" w="100%" 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>
-              )}
+              <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>
                  <IconButton
@@ -148,38 +150,31 @@ export default function ScenarioEditor({
                </Tooltip>
              )}
            </HStack>
-
-            {variableLabels.length === 0 ? (
-              <Box color="gray.500">
-                {vars.data ? "No scenario variables configured" : "Loading..."}
-              </Box>
-            ) : (
-              variableLabels.map((key) => {
-                const value = values[key] ?? "";
-                return (
-                  <FloatingLabelInput
-                    key={key}
-                    label={key}
-                    isDisabled={!canModify}
-                    style={{ width: "100%" }}
-                    maxHeight={32}
-                    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();
-                      }
-                    }}
-                    onMouseEnter={() => setVariableInputHovered(true)}
-                    onMouseLeave={() => setVariableInputHovered(false)}
-                  />
-                );
-              })
-            )}
+            {variableLabels.map((key) => {
+              const value = values[key] ?? "";
+              return (
+                <FloatingLabelInput
+                  key={key}
+                  label={key}
+                  isDisabled={!canModify}
+                  style={{ width: "100%" }}
+                  maxHeight={32}
+                  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();
+                    }
+                  }}
+                  onMouseEnter={() => setVariableInputHovered(true)}
+                  onMouseLeave={() => setVariableInputHovered(false)}
+                />
+              );
+            })}
            {hasChanged && (
              <HStack justify="right">
                <Button
@@ -197,7 +192,7 @@ export default function ScenarioEditor({
              </HStack>
            )}
          </VStack>
-        }
+        )}
      </HStack>
      {scenarioEditorModalOpen && (
        <ScenarioEditorModal
--- a/app/src/components/OutputsTable/ScenarioEditorModal.tsx
+++ b/app/src/components/OutputsTable/ScenarioEditorModal.tsx
@@ -65,11 +65,11 @@ export const ScenarioEditorModal = ({
    <Modal
      isOpen
      onClose={onClose}
-      size={{ base: "xl", sm: "2xl", md: "3xl", lg: "4xl", xl: "5xl" }}
+      size={{ base: "xl", sm: "2xl", md: "3xl", lg: "5xl", xl: "7xl" }}
    >
      <ModalOverlay />
      <ModalContent w={1200}>
-        <ModalHeader>Edit Scenario</ModalHeader>
+        <ModalHeader />
        <ModalCloseButton />
        <ModalBody maxW="unset">
          <VStack spacing={8}>
--- a/app/src/components/OutputsTable/ScenariosHeader.tsx
+++ b/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,
--- a/app/src/components/OutputsTable/VariantEditor.tsx
+++ b/app/src/components/OutputsTable/VariantEditor.tsx
@@ -10,7 +10,7 @@ import {
 } from "@chakra-ui/react";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { FiMaximize, FiMinimize } from "react-icons/fi";
-import { type CreatedEditor, editorBackground } from "~/state/sharedVariantEditor.slice";
+import { editorBackground } from "~/state/sharedVariantEditor.slice";
 import { useAppStore } from "~/state/store";
 import { api } from "~/utils/api";
 import {
@@ -24,10 +24,8 @@ import { type PromptVariant } from "./types";
 export default function VariantEditor(props: { variant: PromptVariant }) {
  const { canModify } = useExperimentAccess();
  const monaco = useAppStore.use.sharedVariantEditor.monaco();
-  const updateOptionsForEditor = useAppStore.use.sharedVariantEditor.updateOptionsForEditor();
-  const editorRef = useRef<CreatedEditor | null>(null);
+  const editorRef = useRef<ReturnType<NonNullable<typeof monaco>["editor"]["create"]> | null>(null);
  const containerRef = useRef<HTMLDivElement | null>(null);
-  const lastSavedFnRef = useRef(props.variant.promptConstructor);
  const [editorId] = useState(() => `editor_${Math.random().toString(36).substring(7)}`);
  const [isChanged, setIsChanged] = useState(false);

@@ -50,18 +48,22 @@ export default function VariantEditor(props: { variant: PromptVariant }) {
  }, [isFullscreen, toggleFullscreen]);

  const lastSavedFn = props.variant.promptConstructor;
-  useEffect(() => {
-    // Store in ref so that we can access it dynamically
-    lastSavedFnRef.current = lastSavedFn;
-  }, [lastSavedFn]);

  const modifierKey = useModifierKeyLabel();

  const checkForChanges = useCallback(() => {
    if (!editorRef.current) return;
    const currentFn = editorRef.current.getValue();
-    setIsChanged(currentFn.length > 0 && currentFn !== lastSavedFnRef.current);
-  }, [editorRef]);
+    setIsChanged(currentFn.length > 0 && currentFn !== lastSavedFn);
+  }, [lastSavedFn]);
+
+  const matchUpdatedSavedFn = useCallback(() => {
+    if (!editorRef.current) return;
+    editorRef.current.setValue(lastSavedFn);
+    setIsChanged(false);
+  }, [lastSavedFn]);
+
+  useEffect(matchUpdatedSavedFn, [matchUpdatedSavedFn, lastSavedFn]);

  const replaceVariant = api.promptVariants.replaceVariant.useMutation();
  const utils = api.useContext();
@@ -108,7 +110,7 @@ export default function VariantEditor(props: { variant: PromptVariant }) {
    setIsChanged(false);

    await utils.promptVariants.list.invalidate();
-  }, [checkForChanges, replaceVariant.mutateAsync]);
+  }, [checkForChanges]);

  useEffect(() => {
    if (monaco) {
@@ -134,11 +136,6 @@ export default function VariantEditor(props: { variant: PromptVariant }) {
        readOnly: !canModify,
      });

-      updateOptionsForEditor(props.variant.uiId, {
-        getContent: () => editorRef.current?.getValue() || "",
-        setContent: (content) => editorRef.current?.setValue(content),
-      });
-
      // Workaround because otherwise the commands only work on whatever
      // editor was loaded on the page last.
      // https://github.com/microsoft/monaco-editor/issues/2947#issuecomment-1422265201
@@ -158,7 +155,7 @@ export default function VariantEditor(props: { variant: PromptVariant }) {
        });
      });

-      const checkForChangesListener = editorRef.current.onDidChangeModelContent(checkForChanges);
+      editorRef.current.onDidChangeModelContent(checkForChanges);

      const resizeObserver = new ResizeObserver(() => {
        editorRef.current?.layout();
@@ -167,7 +164,6 @@ export default function VariantEditor(props: { variant: PromptVariant }) {

      return () => {
        resizeObserver.disconnect();
-        checkForChangesListener.dispose();
        editorRef.current?.dispose();
      };
    }
@@ -175,7 +171,7 @@ export default function VariantEditor(props: { variant: PromptVariant }) {
    // We intentionally skip the onSave and props.savedConfig dependencies here because
    // we don't want to re-render the editor from scratch
    /* eslint-disable-next-line react-hooks/exhaustive-deps */
-  }, [monaco, editorId, updateOptionsForEditor]);
+  }, [monaco, editorId]);

  useEffect(() => {
    if (!editorRef.current) return;
--- a/app/src/components/OutputsTable/VariantStats.tsx
+++ b/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";
@@ -21,18 +21,14 @@ export default function VariantStats(props: { variant: PromptVariant }) {
        outputTokens: 0,
        scenarioCount: 0,
        outputCount: 0,
-        awaitingCompletions: false,
        awaitingEvals: false,
      },
      refetchInterval,
    },
  );

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

  const [passColor, neutralColor, failColor] = useToken("colors", [
    "green.500",
--- a/app/src/components/OutputsTable/index.tsx
+++ b/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;

@@ -65,8 +63,8 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
              variant={variant}
              canHide={variants.data.length > 1}
              rowStart={1}
-              borderTopLeftRadius={isFirst && !shouldFlattenHeader ? 8 : 0}
-              borderTopRightRadius={isLast && !shouldFlattenHeader ? 8 : 0}
+              borderTopLeftRadius={isFirst ? 8 : 0}
+              borderTopRightRadius={isLast ? 8 : 0}
              {...sharedProps}
            />
            <GridItem rowStart={2} {...sharedProps}>
@@ -77,7 +75,6 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
              {...sharedProps}
              borderBottomLeftRadius={isFirst ? 8 : 0}
              borderBottomRightRadius={isLast ? 8 : 0}
-              boxShadow="5px 5px 15px 1px rgba(0, 0, 0, 0.1);"
            >
              <VariantStats variant={variant} />
            </GridItem>
--- a/app/src/components/OutputsTable/useHasScrolledPast.tsx
+++ b/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;
--- a/app/src/components/Paginator.tsx
+++ b/app/src/components/Paginator.tsx
@@ -1,19 +1,15 @@
-import {
-  HStack,
-  IconButton,
-  Text,
-  Select,
-  type StackProps,
-  Icon,
-  useBreakpointValue,
-} from "@chakra-ui/react";
+import { HStack, IconButton, Text, Select, type StackProps, Icon } 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 Paginator = ({
+  count,
+  condense,
+  ...props
+}: { count: number; condense?: boolean } & StackProps) => {
  const { page, pageSize, setPageParams } = usePageParams();

  const lastPage = Math.ceil(count / pageSize);
@@ -41,11 +37,6 @@ const Paginator = ({ count, ...props }: { count: number; condense?: boolean } &
  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}
--- a/app/src/components/RefinePromptModal/RefinePromptModal.tsx
+++ b/app/src/components/RefinePromptModal/RefinePromptModal.tsx
@@ -1,4 +1,3 @@
-import { useState, useMemo, useCallback } from "react";
 import {
  Button,
  Modal,
@@ -10,23 +9,22 @@ import {
  ModalOverlay,
  VStack,
  Text,
+  Spinner,
  HStack,
  Icon,
  SimpleGrid,
 } from "@chakra-ui/react";
 import { BsStars } from "react-icons/bs";
 import { api } from "~/utils/api";
-import { useHandledAsyncCallback } from "~/utils/hooks";
+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 { RefineAction } from "./RefineAction";
-import { isString } from "lodash-es";
+import { isObject, isString } from "lodash-es";
 import { type RefinementAction, type SupportedProvider } from "~/modelProviders/types";
 import frontendModelProviders from "~/modelProviders/frontendModelProviders";
-import { useAppStore } from "~/state/store";
-import { maybeReportError } from "~/utils/errorHandling/maybeReportError";

 export const RefinePromptModal = ({
  variant,
@@ -35,23 +33,19 @@ export const RefinePromptModal = ({
  variant: PromptVariant;
  onClose: () => void;
 }) => {
-  const editorOptionsMap = useAppStore((s) => s.sharedVariantEditor.editorOptionsMap);
-  const originalPromptFn = useMemo(
-    () => editorOptionsMap[variant.uiId]?.getContent() || "",
-    [editorOptionsMap, variant.uiId],
-  );
+  const utils = api.useContext();
+  const visibleScenarios = useVisibleScenarioIds();

  const refinementActions =
    frontendModelProviders[variant.modelProvider as SupportedProvider].refinementActions || {};

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

  const [activeRefineActionLabel, setActiveRefineActionLabel] = useState<string | undefined>(
    undefined,
  );
-  const [refinedPromptFn, setRefinedPromptFn] = useState<string>();

  const [getModifiedPromptFn, modificationInProgress] = useHandledAsyncCallback(
    async (label?: string) => {
@@ -60,22 +54,31 @@ export const RefinePromptModal = ({
        ? (refinementActions[label] as RefinementAction).instructions
        : instructions;
      setActiveRefineActionLabel(label);
-      const resp = await getModifiedPromptMutateAsync({
+      await getModifiedPromptMutateAsync({
        id: variant.id,
-        originalPromptFn,
        instructions: updatedInstructions,
      });
-      if (maybeReportError(resp)) return;
-      setRefinedPromptFn(resp.payload);
    },
    [getModifiedPromptMutateAsync, onClose, variant, instructions, setActiveRefineActionLabel],
  );

-  const replaceVariant = useCallback(() => {
-    if (!refinedPromptFn) return;
-    editorOptionsMap[variant.uiId]?.setContent(refinedPromptFn);
+  const replaceVariantMutation = api.promptVariants.replaceVariant.useMutation();
+
+  const [replaceVariant, replacementInProgress] = useHandledAsyncCallback(async () => {
+    if (
+      !variant.experimentId ||
+      !refinedPromptFn ||
+      (isObject(refinedPromptFn) && "status" in refinedPromptFn)
+    )
+      return;
+    await replaceVariantMutation.mutateAsync({
+      id: variant.id,
+      promptConstructor: refinedPromptFn,
+      streamScenarios: visibleScenarios,
+    });
+    await utils.promptVariants.list.invalidate();
    onClose();
-  }, [variant.uiId, editorOptionsMap, onClose, refinedPromptFn]);
+  }, [replaceVariantMutation, variant, onClose, refinedPromptFn]);

  return (
    <Modal
@@ -123,7 +126,7 @@ export const RefinePromptModal = ({
              />
            </VStack>
            <CompareFunctions
-              originalFunction={originalPromptFn}
+              originalFunction={variant.promptConstructor}
              newFunction={isString(refinedPromptFn) ? refinedPromptFn : undefined}
              maxH="40vh"
            />
@@ -136,9 +139,9 @@ export const RefinePromptModal = ({
              colorScheme="blue"
              onClick={replaceVariant}
              minW={24}
-              isDisabled={!refinedPromptFn}
+              isDisabled={replacementInProgress || !refinedPromptFn}
            >
-              Accept
+              {replacementInProgress ? <Spinner boxSize={4} /> : <Text>Accept</Text>}
            </Button>
          </HStack>
        </ModalFooter>
--- a/app/src/components/StatsCard.tsx
+++ b/app/src/components/StatsCard.tsx
@@ -0,0 +1,26 @@
+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;
--- a/app/src/components/OutputsTable/VariantHeader/VariantHeader.tsx
+++ b/app/src/components/OutputsTable/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(
@@ -75,7 +75,7 @@ export default function VariantHeader(
      padding={0}
      sx={{
        position: "sticky",
-        top: "0",
+        top: "-2",
        // Ensure that the menu always appears above the sticky header of other variants
        zIndex: menuOpen ? "dropdown" : 10,
      }}
--- a/app/src/components/OutputsTable/VariantHeader/VariantHeaderMenuButton.tsx
+++ b/app/src/components/OutputsTable/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 { 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";
+import { ChangeModelModal } from "../ChangeModelModal/ChangeModelModal";

 export default function VariantHeaderMenuButton({
  variant,
--- a/app/src/components/OutputsTable/constants.ts
+++ b/app/src/components/OutputsTable/constants.ts
--- a/app/src/components/dashboard/LoggedCallsTable.tsx
+++ b/app/src/components/dashboard/LoggedCallsTable.tsx
@@ -2,12 +2,11 @@ import { Card, CardHeader, Heading, Table, Tbody, HStack, Button, Text } from "@
 import { useState } from "react";
 import Link from "next/link";
 import { useLoggedCalls } from "~/utils/hooks";
-import { EmptyTableRow, TableHeader, TableRow } from "../requestLogs/TableRow";
+import { TableHeader, TableRow } from "../requestLogs/TableRow";

 export default function LoggedCallsTable() {
-  const { data: loggedCalls } = useLoggedCalls(false);
-
  const [expandedRow, setExpandedRow] = useState<string | null>(null);
+  const { data: loggedCalls } = useLoggedCalls();

  return (
    <Card width="100%" overflow="hidden">
@@ -24,26 +23,22 @@ export default function LoggedCallsTable() {
      <Table>
        <TableHeader />
        <Tbody>
-          {loggedCalls?.calls.length ? (
-            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);
-                    }
-                  }}
-                />
-              );
-            })
-          ) : (
-            <EmptyTableRow filtersApplied={false} />
-          )}
+          {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>
--- a/app/src/components/datasets/DatasetCard.tsx
+++ b/app/src/components/datasets/DatasetCard.tsx
@@ -0,0 +1,112 @@
+import {
+  HStack,
+  Icon,
+  VStack,
+  Text,
+  Divider,
+  Spinner,
+  AspectRatio,
+  SkeletonText,
+} from "@chakra-ui/react";
+import { RiDatabase2Line } from "react-icons/ri";
+import { formatTimePast } from "~/utils/dayjs";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import { BsPlusSquare } from "react-icons/bs";
+import { api } from "~/utils/api";
+import { useHandledAsyncCallback } from "~/utils/hooks";
+import { useAppStore } from "~/state/store";
+
+type DatasetData = {
+  name: string;
+  numEntries: number;
+  id: string;
+  createdAt: Date;
+  updatedAt: Date;
+};
+
+export const DatasetCard = ({ dataset }: { dataset: DatasetData }) => {
+  return (
+    <AspectRatio ratio={1.2} w="full">
+      <VStack
+        as={Link}
+        href={{ pathname: "/data/[id]", query: { id: dataset.id } }}
+        bg="gray.50"
+        _hover={{ bg: "gray.100" }}
+        transition="background 0.2s"
+        cursor="pointer"
+        borderColor="gray.200"
+        borderWidth={1}
+        p={4}
+        justify="space-between"
+      >
+        <HStack w="full" color="gray.700" justify="center">
+          <Icon as={RiDatabase2Line} boxSize={4} />
+          <Text fontWeight="bold">{dataset.name}</Text>
+        </HStack>
+        <HStack h="full" spacing={4} flex={1} align="center">
+          <CountLabel label="Rows" count={dataset.numEntries} />
+        </HStack>
+        <HStack w="full" color="gray.500" fontSize="xs" textAlign="center">
+          <Text flex={1}>Created {formatTimePast(dataset.createdAt)}</Text>
+          <Divider h={4} orientation="vertical" />
+          <Text flex={1}>Updated {formatTimePast(dataset.updatedAt)}</Text>
+        </HStack>
+      </VStack>
+    </AspectRatio>
+  );
+};
+
+const CountLabel = ({ label, count }: { label: string; count: number }) => {
+  return (
+    <VStack alignItems="center" flex={1}>
+      <Text color="gray.500" fontWeight="bold">
+        {label}
+      </Text>
+      <Text fontSize="sm" color="gray.500">
+        {count}
+      </Text>
+    </VStack>
+  );
+};
+
+export const NewDatasetCard = () => {
+  const router = useRouter();
+  const selectedProjectId = useAppStore((s) => s.selectedProjectId);
+  const createMutation = api.datasets.create.useMutation();
+  const [createDataset, isLoading] = useHandledAsyncCallback(async () => {
+    const newDataset = await createMutation.mutateAsync({ projectId: selectedProjectId ?? "" });
+    await router.push({ pathname: "/data/[id]", query: { id: newDataset.id } });
+  }, [createMutation, router, selectedProjectId]);
+
+  return (
+    <AspectRatio ratio={1.2} w="full">
+      <VStack
+        align="center"
+        justify="center"
+        _hover={{ cursor: "pointer", bg: "gray.50" }}
+        transition="background 0.2s"
+        cursor="pointer"
+        borderColor="gray.200"
+        borderWidth={1}
+        p={4}
+        onClick={createDataset}
+      >
+        <Icon as={isLoading ? Spinner : BsPlusSquare} boxSize={8} />
+        <Text display={{ base: "none", md: "block" }} ml={2}>
+          New Dataset
+        </Text>
+      </VStack>
+    </AspectRatio>
+  );
+};
+
+export const DatasetCardSkeleton = () => (
+  <AspectRatio ratio={1.2} w="full">
+    <VStack align="center" borderColor="gray.200" borderWidth={1} p={4} bg="gray.50">
+      <SkeletonText noOfLines={1} w="80%" />
+      <SkeletonText noOfLines={2} w="60%" />
+      <SkeletonText noOfLines={1} w="80%" />
+    </VStack>
+  </AspectRatio>
+);
--- a/app/src/components/datasets/DatasetEntriesPaginator.tsx
+++ b/app/src/components/datasets/DatasetEntriesPaginator.tsx
@@ -0,0 +1,16 @@
+import { type StackProps } from "@chakra-ui/react";
+
+import { useDatasetEntries } from "~/utils/hooks";
+import Paginator from "../Paginator";
+
+const DatasetEntriesPaginator = (props: StackProps) => {
+  const { data } = useDatasetEntries();
+
+  if (!data) return null;
+
+  const { count } = data;
+
+  return <Paginator count={count} {...props} />;
+};
+
+export default DatasetEntriesPaginator;
--- a/app/src/components/datasets/DatasetEntriesTable.tsx
+++ b/app/src/components/datasets/DatasetEntriesTable.tsx
@@ -0,0 +1,31 @@
+import { type StackProps, VStack, Table, Th, Tr, Thead, Tbody, Text } from "@chakra-ui/react";
+import { useDatasetEntries } from "~/utils/hooks";
+import TableRow from "./TableRow";
+import DatasetEntriesPaginator from "./DatasetEntriesPaginator";
+
+const DatasetEntriesTable = (props: StackProps) => {
+  const { data } = useDatasetEntries();
+
+  return (
+    <VStack justifyContent="space-between" {...props}>
+      <Table variant="simple" sx={{ "table-layout": "fixed", width: "full" }}>
+        <Thead>
+          <Tr>
+            <Th>Input</Th>
+            <Th>Output</Th>
+          </Tr>
+        </Thead>
+        <Tbody>{data?.entries.map((entry) => <TableRow key={entry.id} entry={entry} />)}</Tbody>
+      </Table>
+      {(!data || data.entries.length) === 0 ? (
+        <Text alignSelf="flex-start" pl={6} color="gray.500">
+          No entries found
+        </Text>
+      ) : (
+        <DatasetEntriesPaginator />
+      )}
+    </VStack>
+  );
+};
+
+export default DatasetEntriesTable;
--- a/app/src/components/datasets/DatasetHeaderButtons/DatasetHeaderButtons.tsx
+++ b/app/src/components/datasets/DatasetHeaderButtons/DatasetHeaderButtons.tsx
@@ -0,0 +1,26 @@
+import { Button, HStack, useDisclosure } from "@chakra-ui/react";
+import { BiImport } from "react-icons/bi";
+import { BsStars } from "react-icons/bs";
+
+import { GenerateDataModal } from "./GenerateDataModal";
+
+export const DatasetHeaderButtons = () => {
+  const generateModalDisclosure = useDisclosure();
+
+  return (
+    <>
+      <HStack>
+        <Button leftIcon={<BiImport />} colorScheme="blue" variant="ghost">
+          Import Data
+        </Button>
+        <Button leftIcon={<BsStars />} colorScheme="blue" onClick={generateModalDisclosure.onOpen}>
+          Generate Data
+        </Button>
+      </HStack>
+      <GenerateDataModal
+        isOpen={generateModalDisclosure.isOpen}
+        onClose={generateModalDisclosure.onClose}
+      />
+    </>
+  );
+};
--- a/app/src/components/datasets/DatasetHeaderButtons/GenerateDataModal.tsx
+++ b/app/src/components/datasets/DatasetHeaderButtons/GenerateDataModal.tsx
@@ -0,0 +1,128 @@
+import {
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalHeader,
+  ModalOverlay,
+  ModalFooter,
+  Text,
+  HStack,
+  VStack,
+  Icon,
+  NumberInput,
+  NumberInputField,
+  NumberInputStepper,
+  NumberIncrementStepper,
+  NumberDecrementStepper,
+  Button,
+} from "@chakra-ui/react";
+import { BsStars } from "react-icons/bs";
+import { useState } from "react";
+import { useDataset, useHandledAsyncCallback } from "~/utils/hooks";
+import { api } from "~/utils/api";
+import AutoResizeTextArea from "~/components/AutoResizeTextArea";
+
+export const GenerateDataModal = ({
+  isOpen,
+  onClose,
+}: {
+  isOpen: boolean;
+  onClose: () => void;
+}) => {
+  const utils = api.useContext();
+
+  const datasetId = useDataset().data?.id;
+
+  const [numToGenerate, setNumToGenerate] = useState<number>(20);
+  const [inputDescription, setInputDescription] = useState<string>(
+    "Each input should contain an email body. Half of the emails should contain event details, and the other half should not.",
+  );
+  const [outputDescription, setOutputDescription] = useState<string>(
+    `Each output should contain "true" or "false", where "true" indicates that the email contains event details.`,
+  );
+
+  const generateEntriesMutation = api.datasetEntries.autogenerateEntries.useMutation();
+
+  const [generateEntries, generateEntriesInProgress] = useHandledAsyncCallback(async () => {
+    if (!inputDescription || !outputDescription || !numToGenerate || !datasetId) return;
+    await generateEntriesMutation.mutateAsync({
+      datasetId,
+      inputDescription,
+      outputDescription,
+      numToGenerate,
+    });
+    await utils.datasetEntries.list.invalidate();
+    onClose();
+  }, [
+    generateEntriesMutation,
+    onClose,
+    inputDescription,
+    outputDescription,
+    numToGenerate,
+    datasetId,
+  ]);
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose} size={{ base: "xl", sm: "2xl", md: "3xl" }}>
+      <ModalOverlay />
+      <ModalContent w={1200}>
+        <ModalHeader>
+          <HStack>
+            <Icon as={BsStars} />
+            <Text>Generate Data</Text>
+          </HStack>
+        </ModalHeader>
+        <ModalCloseButton />
+        <ModalBody maxW="unset">
+          <VStack w="full" spacing={8} padding={8} alignItems="flex-start">
+            <VStack alignItems="flex-start" spacing={2}>
+              <Text fontWeight="bold">Number of Rows:</Text>
+              <NumberInput
+                step={5}
+                defaultValue={15}
+                min={0}
+                max={100}
+                onChange={(valueString) => setNumToGenerate(parseInt(valueString) || 0)}
+                value={numToGenerate}
+                w="24"
+              >
+                <NumberInputField />
+                <NumberInputStepper>
+                  <NumberIncrementStepper />
+                  <NumberDecrementStepper />
+                </NumberInputStepper>
+              </NumberInput>
+            </VStack>
+            <VStack alignItems="flex-start" w="full" spacing={2}>
+              <Text fontWeight="bold">Input Description:</Text>
+              <AutoResizeTextArea
+                value={inputDescription}
+                onChange={(e) => setInputDescription(e.target.value)}
+                placeholder="Each input should contain..."
+              />
+            </VStack>
+            <VStack alignItems="flex-start" w="full" spacing={2}>
+              <Text fontWeight="bold">Output Description (optional):</Text>
+              <AutoResizeTextArea
+                value={outputDescription}
+                onChange={(e) => setOutputDescription(e.target.value)}
+                placeholder="The output should contain..."
+              />
+            </VStack>
+          </VStack>
+        </ModalBody>
+        <ModalFooter>
+          <Button
+            colorScheme="blue"
+            isLoading={generateEntriesInProgress}
+            isDisabled={!numToGenerate || !inputDescription || !outputDescription}
+            onClick={generateEntries}
+          >
+            Generate
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+};
--- a/app/src/components/datasets/TableRow.tsx
+++ b/app/src/components/datasets/TableRow.tsx
@@ -0,0 +1,13 @@
+import { Td, Tr } from "@chakra-ui/react";
+import { type DatasetEntry } from "@prisma/client";
+
+const TableRow = ({ entry }: { entry: DatasetEntry }) => {
+  return (
+    <Tr key={entry.id}>
+      <Td>{entry.input}</Td>
+      <Td>{entry.output}</Td>
+    </Tr>
+  );
+};
+
+export default TableRow;
--- a/app/src/components/experiments/DeleteExperimentDialog.tsx
+++ b/app/src/components/experiments/DeleteExperimentDialog.tsx
@@ -1,66 +0,0 @@
-import { useRef } from "react";
-import {
-  type UseDisclosureReturn,
-  AlertDialog,
-  AlertDialogOverlay,
-  AlertDialogContent,
-  AlertDialogHeader,
-  AlertDialogBody,
-  AlertDialogFooter,
-  Button,
-} from "@chakra-ui/react";
-import { api } from "~/utils/api";
-
-import { useHandledAsyncCallback } from "~/utils/hooks";
-
-const DeleteExperimentDialog = ({
-  experimentId,
-  onDelete,
-  disclosure,
-}: {
-  experimentId?: string;
-  onDelete?: () => void;
-  disclosure: UseDisclosureReturn;
-}) => {
-  const cancelRef = useRef<HTMLButtonElement>(null);
-
-  const mutation = api.experiments.delete.useMutation();
-  const utils = api.useContext();
-
-  const [onDeleteConfirm] = useHandledAsyncCallback(async () => {
-    if (!experimentId) return;
-    await mutation.mutateAsync({ id: experimentId });
-    await utils.experiments.list.invalidate();
-    onDelete?.();
-
-    disclosure.onClose();
-  }, [mutation, experimentId, disclosure.onClose]);
-
-  return (
-    <AlertDialog leastDestructiveRef={cancelRef} {...disclosure}>
-      <AlertDialogOverlay>
-        <AlertDialogContent>
-          <AlertDialogHeader fontSize="lg" fontWeight="bold">
-            Delete Experiment
-          </AlertDialogHeader>
-
-          <AlertDialogBody>
-            If you delete this experiment all the associated prompts and scenarios will be deleted
-            as well. Are you sure?
-          </AlertDialogBody>
-
-          <AlertDialogFooter>
-            <Button ref={cancelRef} onClick={disclosure.onClose}>
-              Cancel
-            </Button>
-            <Button colorScheme="red" onClick={onDeleteConfirm} ml={3}>
-              Delete
-            </Button>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialogOverlay>
-    </AlertDialog>
-  );
-};
-
-export default DeleteExperimentDialog;
--- a/app/src/components/experiments/ExperimentCard.tsx
+++ b/app/src/components/experiments/ExperimentCard.tsx
@@ -1,4 +1,3 @@
-import { type MouseEvent, useState } from "react";
 import {
  HStack,
  Icon,
@@ -9,29 +8,27 @@ import {
  AspectRatio,
  SkeletonText,
  Card,
-  useDisclosure,
-  Box,
-  Menu,
-  MenuButton,
-  MenuList,
-  MenuItem,
-  IconButton,
-  useToast,
 } from "@chakra-ui/react";
 import { RiFlaskLine } from "react-icons/ri";
+import { formatTimePast } from "~/utils/dayjs";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { BsPlusSquare, BsThreeDotsVertical, BsLink45Deg, BsTrash } from "react-icons/bs";
-
-import { formatTimePast } from "~/utils/dayjs";
-import { type RouterOutputs, api } from "~/utils/api";
+import { BsPlusSquare } from "react-icons/bs";
+import { api } from "~/utils/api";
 import { useHandledAsyncCallback } from "~/utils/hooks";
 import { useAppStore } from "~/state/store";
-import DeleteExperimentDialog from "./DeleteExperimentDialog";

-export const ExperimentCard = ({ exp }: { exp: RouterOutputs["experiments"]["list"][0] }) => {
-  const [isMenuHovered, setIsMenuHovered] = useState(false);
+type ExperimentData = {
+  testScenarioCount: number;
+  promptVariantCount: number;
+  id: string;
+  label: string;
+  sortIndex: number;
+  createdAt: Date;
+  updatedAt: Date;
+};

+export const ExperimentCard = ({ exp }: { exp: ExperimentData }) => {
  return (
    <Card
      w="full"
@@ -40,7 +37,7 @@ export const ExperimentCard = ({ exp }: { exp: RouterOutputs["experiments"]["lis
      p={4}
      bg="white"
      borderRadius={4}
-      _hover={{ bg: isMenuHovered ? undefined : "gray.100" }}
+      _hover={{ bg: "gray.100" }}
      transition="background 0.2s"
      aspectRatio={1.2}
    >
@@ -48,20 +45,12 @@ export const ExperimentCard = ({ exp }: { exp: RouterOutputs["experiments"]["lis
        as={Link}
        w="full"
        h="full"
-        href={{ pathname: "/experiments/[experimentSlug]", query: { experimentSlug: exp.slug } }}
+        href={{ pathname: "/experiments/[id]", query: { id: exp.id } }}
        justify="space-between"
      >
-        <HStack w="full" justify="space-between" spacing={0}>
-          <Box w={6} />
-          <HStack color="gray.700" justify="center">
-            <Icon as={RiFlaskLine} boxSize={4} />
-            <Text fontWeight="bold">{exp.label}</Text>
-          </HStack>
-          <CardMenu
-            experimentId={exp.id}
-            experimentSlug={exp.slug}
-            setIsMenuHovered={setIsMenuHovered}
-          />
+        <HStack w="full" color="gray.700" justify="center">
+          <Icon as={RiFlaskLine} boxSize={4} />
+          <Text fontWeight="bold">{exp.label}</Text>
        </HStack>
        <HStack h="full" spacing={4} flex={1} align="center">
          <CountLabel label="Variants" count={exp.promptVariantCount} />
@@ -78,75 +67,6 @@ export const ExperimentCard = ({ exp }: { exp: RouterOutputs["experiments"]["lis
  );
 };

-const CardMenu = ({
-  experimentId,
-  experimentSlug,
-  setIsMenuHovered,
-}: {
-  experimentId: string;
-  experimentSlug: string;
-  setIsMenuHovered: (isHovered: boolean) => void;
-}) => {
-  const deleteDisclosure = useDisclosure();
-  const menuDisclosure = useDisclosure();
-  const toast = useToast();
-  const [copyShareLink] = useHandledAsyncCallback(
-    async (e: MouseEvent<HTMLButtonElement>) => {
-      if (typeof window === "undefined") return;
-      e.preventDefault();
-      e.stopPropagation();
-      const shareLink = `${window.location.origin}/experiments/${experimentSlug}`;
-      await navigator.clipboard.writeText(shareLink);
-      toast({
-        title: "Share link copied to clipboard",
-        status: "success",
-        duration: 2000,
-        isClosable: true,
-      });
-      menuDisclosure.onClose();
-    },
-    [toast, menuDisclosure.onClose, experimentSlug],
-  );
-  return (
-    <>
-      <Menu isLazy {...menuDisclosure}>
-        <MenuButton
-          as={IconButton}
-          aria-label="Options"
-          icon={<BsThreeDotsVertical />}
-          variant="ghost"
-          onClick={(e) => {
-            e.preventDefault();
-            e.stopPropagation();
-            menuDisclosure.onOpen();
-          }}
-          onMouseEnter={() => setIsMenuHovered(true)}
-          onMouseLeave={() => setIsMenuHovered(false)}
-          boxSize={6}
-          minW={0}
-        />
-        <MenuList>
-          <MenuItem icon={<Icon as={BsLink45Deg} boxSize={5} />} onClick={copyShareLink}>
-            Copy Link
-          </MenuItem>
-          <MenuItem
-            icon={<Icon as={BsTrash} boxSize={5} />}
-            onClick={(e) => {
-              e.preventDefault();
-              e.stopPropagation();
-              deleteDisclosure.onOpen();
-            }}
-            color="red.500"
-          >
-            Delete
-          </MenuItem>
-        </MenuList>
-      </Menu>
-      <DeleteExperimentDialog experimentId={experimentId} disclosure={deleteDisclosure} />
-    </>
-  );
-};
-
 const CountLabel = ({ label, count }: { label: string; count: number }) => {
  return (
    <VStack alignItems="center" flex={1}>
@@ -169,8 +89,8 @@ export const NewExperimentCard = () => {
      projectId: selectedProjectId ?? "",
    });
    await router.push({
-      pathname: "/experiments/[experimentSlug]",
-      query: { experimentSlug: newExperiment.slug },
+      pathname: "/experiments/[id]",
+      query: { id: newExperiment.id },
    });
  }, [createMutation, router, selectedProjectId]);

@@ -188,7 +108,9 @@ export const NewExperimentCard = () => {
    >
      <VStack align="center" justify="center" w="full" h="full" p={4} onClick={createExperiment}>
        <Icon as={isLoading ? Spinner : BsPlusSquare} boxSize={8} />
-        <Text ml={2}>New Experiment</Text>
+        <Text display={{ base: "none", md: "block" }} ml={2}>
+          New Experiment
+        </Text>
      </VStack>
    </Card>
  );
--- a/app/src/components/experiments/ExperimentHeaderButtons/useOnForkButtonPressed.tsx
+++ b/app/src/components/experiments/ExperimentHeaderButtons/useOnForkButtonPressed.tsx
@@ -16,14 +16,11 @@ export const useOnForkButtonPressed = () => {

  const [onFork, isForking] = useHandledAsyncCallback(async () => {
    if (!experiment.data?.id || !selectedProjectId) return;
-    const newExperiment = await forkMutation.mutateAsync({
+    const forkedExperimentId = await forkMutation.mutateAsync({
      id: experiment.data.id,
      projectId: selectedProjectId,
    });
-    await router.push({
-      pathname: "/experiments/[experimentSlug]",
-      query: { experimentSlug: newExperiment.slug },
-    });
+    await router.push({ pathname: "/experiments/[id]", query: { id: forkedExperimentId } });
  }, [forkMutation, experiment.data?.id, router]);

  const onForkButtonPressed = useCallback(() => {
--- a/app/src/components/fineTunes/FineTunesTable.tsx
+++ b/app/src/components/fineTunes/FineTunesTable.tsx
@@ -1,65 +0,0 @@
-import { Card, Table, Thead, Tr, Th, Tbody, Td, VStack, Icon, Text } from "@chakra-ui/react";
-import { FaTable } from "react-icons/fa";
-import { type FineTuneStatus } from "@prisma/client";
-
-import dayjs from "~/utils/dayjs";
-import { useFineTunes } from "~/utils/hooks";
-
-const FineTunesTable = ({}) => {
-  const { data } = useFineTunes();
-
-  const fineTunes = data?.fineTunes || [];
-
-  return (
-    <Card width="100%" overflowX="auto">
-      {fineTunes.length ? (
-        <Table>
-          <Thead>
-            <Tr>
-              <Th>ID</Th>
-              <Th>Created At</Th>
-              <Th>Base Model</Th>
-              <Th>Dataset Size</Th>
-              <Th>Status</Th>
-            </Tr>
-          </Thead>
-          <Tbody>
-            {fineTunes.map((fineTune) => {
-              return (
-                <Tr key={fineTune.id}>
-                  <Td>{fineTune.slug}</Td>
-                  <Td>{dayjs(fineTune.createdAt).format("MMMM D h:mm A")}</Td>
-                  <Td>{fineTune.baseModel}</Td>
-                  <Td>{fineTune.dataset._count.datasetEntries}</Td>
-                  <Td fontSize="sm" fontWeight="bold">
-                    <Text color={getStatusColor(fineTune.status)}>{fineTune.status}</Text>
-                  </Td>
-                </Tr>
-              );
-            })}
-          </Tbody>
-        </Table>
-      ) : (
-        <VStack py={8}>
-          <Icon as={FaTable} boxSize={16} color="gray.300" />
-          <Text color="gray.400" fontSize="lg" fontWeight="bold">
-            No Fine Tunes Found
-          </Text>
-        </VStack>
-      )}
-    </Card>
-  );
-};
-
-export default FineTunesTable;
-
-const getStatusColor = (status: FineTuneStatus) => {
-  switch (status) {
-    case "DEPLOYED":
-      return "green.500";
-    case "ERROR":
-      return "red.500";
-    default:
-      return "yellow.500";
-  }
-};
--- a/app/src/components/nav/AppShell.tsx
+++ b/app/src/components/nav/AppShell.tsx
@@ -13,19 +13,14 @@ import {
 } from "@chakra-ui/react";
 import Head from "next/head";
 import Link from "next/link";
-import { useRouter } from "next/router";
 import { BsGearFill, BsGithub, BsPersonCircle } from "react-icons/bs";
 import { IoStatsChartOutline } from "react-icons/io5";
-import { RiHome3Line, RiFlaskLine } from "react-icons/ri";
-import { AiOutlineThunderbolt } from "react-icons/ai";
-import { FaReadme } from "react-icons/fa";
+import { RiHome3Line, RiDatabase2Line, RiFlaskLine } from "react-icons/ri";
 import { signIn, useSession } from "next-auth/react";
-
+import { env } from "~/env.mjs";
 import ProjectMenu from "./ProjectMenu";
 import NavSidebarOption from "./NavSidebarOption";
 import IconLink from "./IconLink";
-import { BetaModal } from "../BetaModal";
-import { useAppStore } from "~/state/store";

 const Divider = () => <Box h="1px" bgColor="gray.300" w="full" />;

@@ -76,10 +71,21 @@ const NavSidebar = () => {
            <ProjectMenu />
            <Divider />

-            <IconLink icon={RiHome3Line} label="Dashboard" href="/dashboard" />
-            <IconLink icon={IoStatsChartOutline} label="Request Logs" href="/request-logs" />
-            <IconLink icon={AiOutlineThunderbolt} label="Fine Tunes" href="/fine-tunes" beta />
+            {env.NEXT_PUBLIC_FF_SHOW_LOGGED_CALLS && (
+              <>
+                <IconLink icon={RiHome3Line} label="Dashboard" href="/dashboard" beta />
+                <IconLink
+                  icon={IoStatsChartOutline}
+                  label="Request Logs"
+                  href="/request-logs"
+                  beta
+                />
+              </>
+            )}
            <IconLink icon={RiFlaskLine} label="Experiments" href="/experiments" />
+            {env.NEXT_PUBLIC_SHOW_DATA && (
+              <IconLink icon={RiDatabase2Line} label="Data" href="/data" />
+            )}
            <VStack w="full" alignItems="flex-start" spacing={0} pt={8}>
              <Text
                pl={2}
@@ -99,7 +105,7 @@ const NavSidebar = () => {
          <NavSidebarOption>
            <HStack
              w="full"
-              p={{ base: 2, md: 4 }}
+              p={4}
              as={ChakraLink}
              justifyContent="start"
              onClick={() => {
@@ -114,22 +120,7 @@ const NavSidebar = () => {
          </NavSidebarOption>
        )}
      </VStack>
-      <HStack
-        w="full"
-        px={{ base: 2, md: 4 }}
-        py={{ base: 1, md: 2 }}
-        as={ChakraLink}
-        justifyContent="start"
-        href="https://docs.openpipe.ai"
-        target="_blank"
-        color="gray.500"
-        spacing={1}
-      >
-        <Icon as={FaReadme} boxSize={4} mr={2} />
-        <Text fontWeight="bold" fontSize="sm">
-          Read the Docs
-        </Text>
-      </HStack>
+
      <Divider />
      <VStack spacing={0} align="center">
        <ChakraLink
@@ -150,15 +141,12 @@ export default function AppShell({
  children,
  title,
  requireAuth,
-  requireBeta,
 }: {
  children: React.ReactNode;
  title?: string;
  requireAuth?: boolean;
-  requireBeta?: boolean;
 }) {
  const [vh, setVh] = useState("100vh"); // Default height to prevent flicker on initial render
-  const router = useRouter();

  useEffect(() => {
    const setHeight = () => {
@@ -186,21 +174,15 @@ export default function AppShell({
    }
  }, [requireAuth, user, authLoading]);

-  const flags = useAppStore((s) => s.featureFlags.featureFlags);
-  const flagsLoaded = useAppStore((s) => s.featureFlags.flagsLoaded);
-
  return (
-    <>
-      <Flex h={vh} w="100vw">
-        <Head>
-          <title>{title ? `${title} | OpenPipe` : "OpenPipe"}</title>
-        </Head>
-        <NavSidebar />
-        <Box h="100%" flex={1} overflowY="auto" bgColor="gray.50">
-          {children}
-        </Box>
-      </Flex>
-      <BetaModal isOpen={!!requireBeta && flagsLoaded && !flags.betaAccess} onClose={router.back} />
-    </>
+    <Flex h={vh} w="100vw">
+      <Head>
+        <title>{title ? `${title} | OpenPipe` : "OpenPipe"}</title>
+      </Head>
+      <NavSidebar />
+      <Box h="100%" flex={1} overflowY="auto" bgColor="gray.50">
+        {children}
+      </Box>
+    </Flex>
  );
 }
--- a/app/src/components/nav/ProjectMenu.tsx
+++ b/app/src/components/nav/ProjectMenu.tsx
@@ -14,9 +14,8 @@ import {
  Link as ChakraLink,
  Image,
  Box,
-  Portal,
 } from "@chakra-ui/react";
-import { useEffect } from "react";
+import React, { useEffect, useState } from "react";
 import Link from "next/link";
 import { BsPlus, BsPersonCircle } from "react-icons/bs";
 import { type Project } from "@prisma/client";
@@ -57,7 +56,6 @@ export default function ProjectMenu() {
    await utils.projects.list.invalidate();
    setSelectedProjectId(newProj.id);
    await router.push({ pathname: "/project/settings" });
-    popover.onClose();
  }, [createMutation, router]);

  const user = useSession().data;
@@ -69,13 +67,7 @@ export default function ProjectMenu() {
  );

  return (
-    <VStack
-      w="full"
-      alignItems="flex-start"
-      spacing={0}
-      py={1}
-      zIndex={popover.isOpen ? "dropdown" : undefined}
-    >
+    <VStack w="full" alignItems="flex-start" spacing={0} py={1}>
      <Popover
        placement="bottom"
        isOpen={popover.isOpen}
@@ -111,66 +103,64 @@ export default function ProjectMenu() {
            </HStack>
          </NavSidebarOption>
        </PopoverTrigger>
-        <Portal>
-          <PopoverContent
-            _focusVisible={{ outline: "unset" }}
-            w={220}
-            ml={{ base: 2, md: 0 }}
-            boxShadow="0 0 40px 4px rgba(0, 0, 0, 0.1);"
-            fontSize="sm"
-          >
-            <VStack alignItems="flex-start" spacing={1} py={1}>
-              <Text px={3} py={2}>
-                {user?.user.email}
-              </Text>
-              <Divider />
-              <Text alignSelf="flex-start" fontWeight="bold" px={3} pt={2}>
-                Your Projects
-              </Text>
-              <VStack spacing={0} w="full" px={1}>
-                {projects?.map((proj) => (
-                  <ProjectOption
-                    key={proj.id}
-                    proj={proj}
-                    isActive={proj.id === selectedProjectId}
-                    onClose={popover.onClose}
-                  />
-                ))}
-                <HStack
-                  as={Button}
-                  variant="ghost"
-                  colorScheme="blue"
-                  color="blue.400"
-                  fontSize="sm"
-                  justifyContent="flex-start"
-                  onClick={createProject}
-                  w="full"
-                  borderRadius={4}
-                  spacing={0}
-                >
-                  <Text>Add project</Text>
-                  <Icon as={isLoading ? Spinner : BsPlus} boxSize={4} strokeWidth={0.5} />
-                </HStack>
-              </VStack>
-
-              <Divider />
-              <VStack w="full" px={1}>
-                <ChakraLink
-                  onClick={() => {
-                    signOut().catch(console.error);
-                  }}
-                  _hover={{ bgColor: "gray.200", textDecoration: "none" }}
-                  w="full"
-                  py={2}
-                  px={2}
-                  borderRadius={4}
-                >
-                  <Text>Sign out</Text>
-                </ChakraLink>
-              </VStack>
+        <PopoverContent
+          _focusVisible={{ outline: "unset" }}
+          ml={-1}
+          w={224}
+          boxShadow="0 0 40px 4px rgba(0, 0, 0, 0.1);"
+          fontSize="sm"
+        >
+          <VStack alignItems="flex-start" spacing={1} py={1}>
+            <Text px={3} py={2}>
+              {user?.user.email}
+            </Text>
+            <Divider />
+            <Text alignSelf="flex-start" fontWeight="bold" px={3} pt={2}>
+              Your Projects
+            </Text>
+            <VStack spacing={0} w="full" px={1}>
+              {projects?.map((proj) => (
+                <ProjectOption
+                  key={proj.id}
+                  proj={proj}
+                  isActive={proj.id === selectedProjectId}
+                  onClose={popover.onClose}
+                />
+              ))}
+              <HStack
+                as={Button}
+                variant="ghost"
+                colorScheme="blue"
+                color="blue.400"
+                fontSize="sm"
+                justifyContent="flex-start"
+                onClick={createProject}
+                w="full"
+                borderRadius={4}
+                spacing={0}
+              >
+                <Text>Add project</Text>
+                <Icon as={isLoading ? Spinner : BsPlus} boxSize={4} strokeWidth={0.5} />
+              </HStack>
            </VStack>
-          </PopoverContent>
-        </Portal>
+
+            <Divider />
+            <VStack w="full" px={1}>
+              <ChakraLink
+                onClick={() => {
+                  signOut().catch(console.error);
+                }}
+                _hover={{ bgColor: "gray.200", textDecoration: "none" }}
+                w="full"
+                py={2}
+                px={2}
+                borderRadius={4}
+              >
+                <Text>Sign out</Text>
+              </ChakraLink>
+            </VStack>
+          </VStack>
+        </PopoverContent>
      </Popover>
    </VStack>
  );
@@ -186,6 +176,7 @@ const ProjectOption = ({
  onClose: () => void;
 }) => {
  const setSelectedProjectId = useAppStore((s) => s.setSelectedProjectId);
+  const [gearHovered, setGearHovered] = useState(false);

  return (
    <HStack
@@ -197,8 +188,8 @@ const ProjectOption = ({
      }}
      w="full"
      justifyContent="space-between"
-      _hover={{ bgColor: "gray.200", textDecoration: "none" }}
-      bgColor={isActive ? "gray.100" : undefined}
+      _hover={gearHovered ? undefined : { bgColor: "gray.200", textDecoration: "none" }}
+      color={isActive ? "blue.400" : undefined}
      py={2}
      px={4}
      borderRadius={4}
--- a/app/src/components/nav/UserMenu.tsx
+++ b/app/src/components/nav/UserMenu.tsx
@@ -23,48 +23,50 @@ export default function UserMenu({ user, ...rest }: { user: Session } & StackPro
  );

  return (
-    <Popover placement="right">
-      <PopoverTrigger>
-        <NavSidebarOption>
-          <HStack
-            // Weird values to make mobile look right; can clean up when we make the sidebar disappear on mobile
-            py={2}
-            px={1}
-            spacing={3}
-            {...rest}
-          >
-            {profileImage}
-            <VStack spacing={0} align="start" flex={1} flexShrink={1}>
-              <Text fontWeight="bold" fontSize="sm">
-                {user.user.name}
-              </Text>
-              <Text color="gray.500" fontSize="xs">
-                {/* {user.user.email} */}
-              </Text>
-            </VStack>
-            <Icon as={BsChevronRight} boxSize={4} color="gray.500" />
-          </HStack>
-        </NavSidebarOption>
-      </PopoverTrigger>
-      <PopoverContent _focusVisible={{ outline: "unset" }} ml={-1} minW={48} w="full">
-        <VStack align="stretch" spacing={0}>
-          {/* sign out */}
-          <HStack
-            as={Link}
-            onClick={() => {
-              signOut().catch(console.error);
-            }}
-            px={4}
-            py={2}
-            spacing={4}
-            color="gray.500"
-            fontSize="sm"
-          >
-            <Icon as={BsBoxArrowRight} boxSize={6} />
-            <Text>Sign out</Text>
-          </HStack>
-        </VStack>
-      </PopoverContent>
-    </Popover>
+    <>
+      <Popover placement="right">
+        <PopoverTrigger>
+          <NavSidebarOption>
+            <HStack
+              // Weird values to make mobile look right; can clean up when we make the sidebar disappear on mobile
+              py={2}
+              px={1}
+              spacing={3}
+              {...rest}
+            >
+              {profileImage}
+              <VStack spacing={0} align="start" flex={1} flexShrink={1}>
+                <Text fontWeight="bold" fontSize="sm">
+                  {user.user.name}
+                </Text>
+                <Text color="gray.500" fontSize="xs">
+                  {/* {user.user.email} */}
+                </Text>
+              </VStack>
+              <Icon as={BsChevronRight} boxSize={4} color="gray.500" />
+            </HStack>
+          </NavSidebarOption>
+        </PopoverTrigger>
+        <PopoverContent _focusVisible={{ outline: "unset" }} ml={-1} minW={48} w="full">
+          <VStack align="stretch" spacing={0}>
+            {/* sign out */}
+            <HStack
+              as={Link}
+              onClick={() => {
+                signOut().catch(console.error);
+              }}
+              px={4}
+              py={2}
+              spacing={4}
+              color="gray.500"
+              fontSize="sm"
+            >
+              <Icon as={BsBoxArrowRight} boxSize={6} />
+              <Text>Sign out</Text>
+            </HStack>
+          </VStack>
+        </PopoverContent>
+      </Popover>
+    </>
  );
 }
--- a/app/src/components/projectSettings/InviteMemberModal.tsx
+++ b/app/src/components/projectSettings/InviteMemberModal.tsx
@@ -1,128 +0,0 @@
-import {
-  Button,
-  FormControl,
-  FormLabel,
-  Input,
-  FormHelperText,
-  HStack,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Spinner,
-  Text,
-  VStack,
-  RadioGroup,
-  Radio,
-} from "@chakra-ui/react";
-import { useState, useEffect } from "react";
-
-import { api } from "~/utils/api";
-import { useHandledAsyncCallback, useSelectedProject } from "~/utils/hooks";
-import { maybeReportError } from "~/utils/errorHandling/maybeReportError";
-import { type ProjectUserRole } from "@prisma/client";
-
-export const InviteMemberModal = ({
-  isOpen,
-  onClose,
-}: {
-  isOpen: boolean;
-  onClose: () => void;
-}) => {
-  const selectedProject = useSelectedProject().data;
-  const utils = api.useContext();
-
-  const [email, setEmail] = useState("");
-  const [role, setRole] = useState<ProjectUserRole>("MEMBER");
-
-  useEffect(() => {
-    setEmail("");
-    setRole("MEMBER");
-  }, [isOpen]);
-
-  const emailIsValid = !email || !email.match(/.+@.+\..+/);
-
-  const inviteMemberMutation = api.users.inviteToProject.useMutation();
-
-  const [inviteMember, isInviting] = useHandledAsyncCallback(async () => {
-    if (!selectedProject?.id || !role) return;
-    const resp = await inviteMemberMutation.mutateAsync({
-      projectId: selectedProject.id,
-      email,
-      role,
-    });
-    if (maybeReportError(resp)) return;
-    await utils.projects.get.invalidate();
-    onClose();
-  }, [inviteMemberMutation, email, role, selectedProject?.id, onClose]);
-
-  return (
-    <Modal isOpen={isOpen} onClose={onClose}>
-      <ModalOverlay />
-      <ModalContent w={1200}>
-        <ModalHeader>
-          <HStack>
-            <Text>Invite Member</Text>
-          </HStack>
-        </ModalHeader>
-        <ModalCloseButton />
-        <ModalBody>
-          <VStack spacing={8} alignItems="flex-start">
-            <Text>
-              Invite a new member to <b>{selectedProject?.name}</b>.
-            </Text>
-
-            <RadioGroup
-              value={role}
-              onChange={(e) => setRole(e as ProjectUserRole)}
-              colorScheme="orange"
-            >
-              <VStack w="full" alignItems="flex-start">
-                <Radio value="MEMBER">
-                  <Text fontSize="sm">MEMBER</Text>
-                </Radio>
-                <Radio value="ADMIN">
-                  <Text fontSize="sm">ADMIN</Text>
-                </Radio>
-              </VStack>
-            </RadioGroup>
-            <FormControl>
-              <FormLabel>Email</FormLabel>
-              <Input
-                type="email"
-                value={email}
-                onChange={(e) => setEmail(e.target.value)}
-                onKeyDown={(e) => {
-                  if (e.key === "Enter" && (e.metaKey || e.ctrlKey || e.shiftKey)) {
-                    e.preventDefault();
-                    e.currentTarget.blur();
-                    inviteMember();
-                  }
-                }}
-              />
-              <FormHelperText>Enter the email of the person you want to invite.</FormHelperText>
-            </FormControl>
-          </VStack>
-        </ModalBody>
-        <ModalFooter mt={4}>
-          <HStack>
-            <Button colorScheme="gray" onClick={onClose} minW={24}>
-              <Text>Cancel</Text>
-            </Button>
-            <Button
-              colorScheme="orange"
-              onClick={inviteMember}
-              minW={24}
-              isDisabled={emailIsValid || isInviting}
-            >
-              {isInviting ? <Spinner boxSize={4} /> : <Text>Send Invitation</Text>}
-            </Button>
-          </HStack>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-};
--- a/app/src/components/projectSettings/MemberTable.tsx
+++ b/app/src/components/projectSettings/MemberTable.tsx
@@ -1,145 +0,0 @@
-import { useMemo, useState } from "react";
-import {
-  Table,
-  Thead,
-  Tr,
-  Th,
-  Tbody,
-  Td,
-  IconButton,
-  useDisclosure,
-  Text,
-  Button,
-} from "@chakra-ui/react";
-import { useSession } from "next-auth/react";
-import { BsTrash } from "react-icons/bs";
-import { type User } from "@prisma/client";
-
-import { useHandledAsyncCallback, useSelectedProject } from "~/utils/hooks";
-import { InviteMemberModal } from "./InviteMemberModal";
-import { RemoveMemberDialog } from "./RemoveMemberDialog";
-import { api } from "~/utils/api";
-import { maybeReportError } from "~/utils/errorHandling/maybeReportError";
-
-const MemberTable = () => {
-  const selectedProject = useSelectedProject().data;
-  const session = useSession().data;
-
-  const utils = api.useContext();
-
-  const [memberToRemove, setMemberToRemove] = useState<User | null>(null);
-  const inviteMemberModal = useDisclosure();
-
-  const cancelInvitationMutation = api.users.cancelProjectInvitation.useMutation();
-
-  const [cancelInvitation, isCancelling] = useHandledAsyncCallback(
-    async (invitationToken: string) => {
-      if (!selectedProject?.id) return;
-      const resp = await cancelInvitationMutation.mutateAsync({
-        invitationToken,
-      });
-      if (maybeReportError(resp)) return;
-      await utils.projects.get.invalidate();
-    },
-    [selectedProject?.id, cancelInvitationMutation],
-  );
-
-  const sortedMembers = useMemo(() => {
-    if (!selectedProject?.projectUsers) return [];
-    return selectedProject.projectUsers.sort((a, b) => {
-      if (a.role === b.role) return a.createdAt < b.createdAt ? -1 : 1;
-      // Take advantage of fact that ADMIN is alphabetically before MEMBER
-      return a.role < b.role ? -1 : 1;
-    });
-  }, [selectedProject?.projectUsers]);
-
-  return (
-    <>
-      <Table fontSize={{ base: "sm", md: "md" }}>
-        <Thead
-          sx={{
-            th: {
-              base: { px: 0 },
-              md: { px: 6 },
-            },
-          }}
-        >
-          <Tr>
-            <Th>Name</Th>
-            <Th display={{ base: "none", md: "table-cell" }}>Email</Th>
-            <Th>Role</Th>
-            {selectedProject?.role === "ADMIN" && <Th />}
-          </Tr>
-        </Thead>
-        <Tbody
-          sx={{
-            td: {
-              base: { px: 0 },
-              md: { px: 6 },
-            },
-          }}
-        >
-          {selectedProject &&
-            sortedMembers.map((member) => {
-              return (
-                <Tr key={member.id}>
-                  <Td>
-                    <Text fontWeight="bold">{member.user.name}</Text>
-                  </Td>
-                  <Td display={{ base: "none", md: "table-cell" }} h="full">
-                    {member.user.email}
-                  </Td>
-                  <Td fontSize={{ base: "xs", md: "sm" }}>{member.role}</Td>
-                  {selectedProject.role === "ADMIN" && (
-                    <Td textAlign="end">
-                      {member.user.id !== session?.user?.id &&
-                        member.user.id !== selectedProject.personalProjectUserId && (
-                          <IconButton
-                            aria-label="Remove member"
-                            colorScheme="red"
-                            icon={<BsTrash />}
-                            onClick={() => setMemberToRemove(member.user)}
-                          />
-                        )}
-                    </Td>
-                  )}
-                </Tr>
-              );
-            })}
-          {selectedProject?.projectUserInvitations?.map((invitation) => {
-            return (
-              <Tr key={invitation.id}>
-                <Td>
-                  <Text as="i">Invitation pending</Text>
-                </Td>
-                <Td>{invitation.email}</Td>
-                <Td fontSize="sm">{invitation.role}</Td>
-                {selectedProject.role === "ADMIN" && (
-                  <Td textAlign="end">
-                    <Button
-                      size="sm"
-                      colorScheme="red"
-                      variant="ghost"
-                      onClick={() => cancelInvitation(invitation.invitationToken)}
-                      isLoading={isCancelling}
-                    >
-                      Cancel
-                    </Button>
-                  </Td>
-                )}
-              </Tr>
-            );
-          })}
-        </Tbody>
-      </Table>
-      <InviteMemberModal isOpen={inviteMemberModal.isOpen} onClose={inviteMemberModal.onClose} />
-      <RemoveMemberDialog
-        member={memberToRemove}
-        isOpen={!!memberToRemove}
-        onClose={() => setMemberToRemove(null)}
-      />
-    </>
-  );
-};
-
-export default MemberTable;
--- a/app/src/components/projectSettings/RemoveMemberDialog.tsx
+++ b/app/src/components/projectSettings/RemoveMemberDialog.tsx
@@ -1,71 +0,0 @@
-import {
-  Button,
-  AlertDialog,
-  AlertDialogBody,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogContent,
-  AlertDialogOverlay,
-  Text,
-  VStack,
-  Spinner,
-} from "@chakra-ui/react";
-import { type User } from "@prisma/client";
-
-import { useRouter } from "next/router";
-import { useRef } from "react";
-import { api } from "~/utils/api";
-import { useHandledAsyncCallback, useSelectedProject } from "~/utils/hooks";
-
-export const RemoveMemberDialog = ({
-  isOpen,
-  onClose,
-  member,
-}: {
-  isOpen: boolean;
-  onClose: () => void;
-  member: User | null;
-}) => {
-  const selectedProject = useSelectedProject();
-  const removeUserMutation = api.users.removeUserFromProject.useMutation();
-  const utils = api.useContext();
-  const router = useRouter();
-
-  const cancelRef = useRef<HTMLButtonElement>(null);
-
-  const [onRemoveConfirm, isRemoving] = useHandledAsyncCallback(async () => {
-    if (!selectedProject.data?.id || !member?.id) return;
-    await removeUserMutation.mutateAsync({ projectId: selectedProject.data.id, userId: member.id });
-    await utils.projects.get.invalidate();
-    onClose();
-  }, [removeUserMutation, selectedProject, router]);
-
-  return (
-    <AlertDialog isOpen={isOpen} leastDestructiveRef={cancelRef} onClose={onClose}>
-      <AlertDialogOverlay>
-        <AlertDialogContent>
-          <AlertDialogHeader fontSize="lg" fontWeight="bold">
-            Remove Member
-          </AlertDialogHeader>
-
-          <AlertDialogBody>
-            <VStack spacing={4} alignItems="flex-start">
-              <Text>
-                Are you sure you want to remove <b>{member?.name}</b> from the project?
-              </Text>
-            </VStack>
-          </AlertDialogBody>
-
-          <AlertDialogFooter>
-            <Button ref={cancelRef} onClick={onClose}>
-              Cancel
-            </Button>
-            <Button colorScheme="red" onClick={onRemoveConfirm} ml={3} w={20}>
-              {isRemoving ? <Spinner /> : "Remove"}
-            </Button>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialogOverlay>
-    </AlertDialog>
-  );
-};
--- a/app/src/components/requestLogs/ActionButton.tsx
+++ b/app/src/components/requestLogs/ActionButton.tsx
@@ -1,50 +1,29 @@
-import { useState } from "react";
-
 import { Button, HStack, type ButtonProps, Icon, Text } from "@chakra-ui/react";
 import { type IconType } from "react-icons";
-import { useAppStore } from "~/state/store";
-import { BetaModal } from "../BetaModal";

 const ActionButton = ({
  icon,
  label,
-  requireBeta = false,
-  onClick,
  ...buttonProps
-}: {
-  icon: IconType;
-  label: string;
-  requireBeta?: boolean;
-  onClick?: () => void;
-} & ButtonProps) => {
-  const flags = useAppStore((s) => s.featureFlags.featureFlags);
-  const flagsLoaded = useAppStore((s) => s.featureFlags.flagsLoaded);
-
-  const [betaModalOpen, setBetaModalOpen] = useState(false);
-
-  const isBetaBlocked = requireBeta && flagsLoaded && !flags.betaAccess;
+}: { icon: IconType; label: string } & ButtonProps) => {
  return (
-    <>
-      <Button
-        colorScheme="blue"
-        color="black"
-        bgColor="white"
-        borderColor="gray.300"
-        borderRadius={4}
-        variant="outline"
-        size="sm"
-        fontSize="sm"
-        fontWeight="normal"
-        onClick={isBetaBlocked ? () => setBetaModalOpen(true) : onClick}
-        {...buttonProps}
-      >
-        <HStack spacing={1}>
-          {icon && <Icon as={icon} color={requireBeta ? "orange.400" : undefined} />}
-          <Text display={{ base: "none", md: "flex" }}>{label}</Text>
-        </HStack>
-      </Button>
-      <BetaModal isOpen={betaModalOpen} onClose={() => setBetaModalOpen(false)} />
-    </>
+    <Button
+      colorScheme="blue"
+      color="black"
+      bgColor="white"
+      borderColor="gray.300"
+      borderRadius={4}
+      variant="outline"
+      size="sm"
+      fontSize="sm"
+      fontWeight="normal"
+      {...buttonProps}
+    >
+      <HStack spacing={1}>
+        {icon && <Icon as={icon} />}
+        <Text>{label}</Text>
+      </HStack>
+    </Button>
  );
 };

--- a/app/src/components/requestLogs/ColumnVisiblityDropdown.tsx
+++ b/app/src/components/requestLogs/ColumnVisiblityDropdown.tsx
@@ -1,117 +0,0 @@
-import {
-  Icon,
-  Popover,
-  PopoverTrigger,
-  PopoverContent,
-  VStack,
-  HStack,
-  Button,
-  Text,
-  useDisclosure,
-  Box,
-} from "@chakra-ui/react";
-import { BiCheck } from "react-icons/bi";
-import { BsToggles } from "react-icons/bs";
-import { useMemo } from "react";
-
-import { useIsClientRehydrated, useTagNames } from "~/utils/hooks";
-import { useAppStore } from "~/state/store";
-import { StaticColumnKeys } from "~/state/columnVisiblitySlice";
-import ActionButton from "./ActionButton";
-
-const ColumnVisiblityDropdown = () => {
-  const tagNames = useTagNames().data;
-
-  const visibleColumns = useAppStore((s) => s.columnVisibility.visibleColumns);
-  const toggleColumnVisibility = useAppStore((s) => s.columnVisibility.toggleColumnVisibility);
-  const totalColumns = Object.keys(StaticColumnKeys).length + (tagNames?.length ?? 0);
-
-  const popover = useDisclosure();
-
-  const columnVisiblityOptions = useMemo(() => {
-    const options: { label: string; key: string }[] = [
-      {
-        label: "Sent At",
-        key: StaticColumnKeys.SENT_AT,
-      },
-      {
-        label: "Model",
-        key: StaticColumnKeys.MODEL,
-      },
-      {
-        label: "Duration",
-        key: StaticColumnKeys.DURATION,
-      },
-      {
-        label: "Input Tokens",
-        key: StaticColumnKeys.INPUT_TOKENS,
-      },
-      {
-        label: "Output Tokens",
-        key: StaticColumnKeys.OUTPUT_TOKENS,
-      },
-      {
-        label: "Status Code",
-        key: StaticColumnKeys.STATUS_CODE,
-      },
-    ];
-    for (const tagName of tagNames ?? []) {
-      options.push({
-        label: tagName,
-        key: tagName,
-      });
-    }
-    return options;
-  }, [tagNames]);
-
-  const isClientRehydrated = useIsClientRehydrated();
-  if (!isClientRehydrated) return null;
-
-  return (
-    <Popover
-      placement="bottom-start"
-      isOpen={popover.isOpen}
-      onOpen={popover.onOpen}
-      onClose={popover.onClose}
-    >
-      <PopoverTrigger>
-        <Box>
-          <ActionButton
-            label={`Columns (${visibleColumns.size}/${totalColumns})`}
-            icon={BsToggles}
-          />
-        </Box>
-      </PopoverTrigger>
-      <PopoverContent boxShadow="0 0 40px 4px rgba(0, 0, 0, 0.1);" minW={0} w="auto">
-        <VStack spacing={0} maxH={400} overflowY="auto">
-          {columnVisiblityOptions?.map((option, index) => (
-            <HStack
-              key={index}
-              as={Button}
-              onClick={() => toggleColumnVisibility(option.key)}
-              w="full"
-              minH={10}
-              variant="ghost"
-              justifyContent="space-between"
-              fontWeight="semibold"
-              borderRadius={0}
-              colorScheme="blue"
-              color="black"
-              fontSize="sm"
-              borderBottomWidth={1}
-            >
-              <Text mr={16}>{option.label}</Text>
-              <Box w={5}>
-                {visibleColumns.has(option.key) && (
-                  <Icon as={BiCheck} color="blue.500" boxSize={5} />
-                )}
-              </Box>
-            </HStack>
-          ))}
-        </VStack>
-      </PopoverContent>
-    </Popover>
-  );
-};
-
-export default ColumnVisiblityDropdown;
--- a/app/src/components/requestLogs/ExportButton.tsx
+++ b/app/src/components/requestLogs/ExportButton.tsx
@@ -1,211 +0,0 @@
-import { useState, useEffect } from "react";
-import {
-  Modal,
-  ModalOverlay,
-  ModalContent,
-  ModalHeader,
-  ModalCloseButton,
-  ModalBody,
-  ModalFooter,
-  HStack,
-  VStack,
-  Icon,
-  Text,
-  Button,
-  Checkbox,
-  NumberInput,
-  NumberInputField,
-  NumberInputStepper,
-  NumberIncrementStepper,
-  NumberDecrementStepper,
-  Collapse,
-  Flex,
-  useDisclosure,
-  type UseDisclosureReturn,
-} from "@chakra-ui/react";
-import { BiExport } from "react-icons/bi";
-
-import { useHandledAsyncCallback } from "~/utils/hooks";
-import { api } from "~/utils/api";
-import { useAppStore } from "~/state/store";
-import ActionButton from "./ActionButton";
-import InputDropdown from "../InputDropdown";
-import { FiChevronUp, FiChevronDown } from "react-icons/fi";
-import InfoCircle from "../InfoCircle";
-
-const SUPPORTED_EXPORT_FORMATS = ["alpaca-finetune", "openai-fine-tune", "unformatted"];
-
-const ExportButton = () => {
-  const selectedLogIds = useAppStore((s) => s.selectedLogs.selectedLogIds);
-
-  const disclosure = useDisclosure();
-
-  return (
-    <>
-      <ActionButton
-        onClick={disclosure.onOpen}
-        label="Export"
-        icon={BiExport}
-        isDisabled={selectedLogIds.size === 0}
-        requireBeta
-      />
-      <ExportLogsModal disclosure={disclosure} />
-    </>
-  );
-};
-
-export default ExportButton;
-
-const ExportLogsModal = ({ disclosure }: { disclosure: UseDisclosureReturn }) => {
-  const selectedProjectId = useAppStore((s) => s.selectedProjectId);
-  const selectedLogIds = useAppStore((s) => s.selectedLogs.selectedLogIds);
-  const clearSelectedLogIds = useAppStore((s) => s.selectedLogs.clearSelectedLogIds);
-
-  const [selectedExportFormat, setSelectedExportFormat] = useState(SUPPORTED_EXPORT_FORMATS[0]);
-  const [testingSplit, setTestingSplit] = useState(10);
-  const [removeDuplicates, setRemoveDuplicates] = useState(true);
-  const [showAdvancedOptions, setShowAdvancedOptions] = useState(false);
-
-  useEffect(() => {
-    if (disclosure.isOpen) {
-      setSelectedExportFormat(SUPPORTED_EXPORT_FORMATS[0]);
-      setTestingSplit(10);
-      setRemoveDuplicates(true);
-    }
-  }, [disclosure.isOpen]);
-
-  const exportLogsMutation = api.loggedCalls.export.useMutation();
-
-  const [exportLogs, exportInProgress] = useHandledAsyncCallback(async () => {
-    if (!selectedProjectId || !selectedLogIds.size || !testingSplit || !selectedExportFormat)
-      return;
-    const response = await exportLogsMutation.mutateAsync({
-      projectId: selectedProjectId,
-      selectedLogIds: Array.from(selectedLogIds),
-      testingSplit,
-      selectedExportFormat,
-      removeDuplicates,
-    });
-
-    const dataUrl = `data:application/pdf;base64,${response}`;
-    const blob = await fetch(dataUrl).then((res) => res.blob());
-    const url = URL.createObjectURL(blob);
-    const a = document.createElement("a");
-
-    a.href = url;
-    a.download = `data.zip`;
-    document.body.appendChild(a);
-    a.click();
-    document.body.removeChild(a);
-
-    disclosure.onClose();
-    clearSelectedLogIds();
-  }, [
-    exportLogsMutation,
-    selectedProjectId,
-    selectedLogIds,
-    testingSplit,
-    selectedExportFormat,
-    removeDuplicates,
-  ]);
-
-  return (
-    <Modal size={{ base: "xl", md: "2xl" }} {...disclosure}>
-      <ModalOverlay />
-      <ModalContent w={1200}>
-        <ModalHeader>
-          <HStack>
-            <Icon as={BiExport} />
-            <Text>Export Logs</Text>
-          </HStack>
-        </ModalHeader>
-        <ModalCloseButton />
-        <ModalBody maxW="unset">
-          <VStack w="full" spacing={8} pt={4} alignItems="flex-start">
-            <Text>
-              We'll export the <b>{selectedLogIds.size}</b> logs you have selected in the format of
-              your choice.
-            </Text>
-            <VStack alignItems="flex-start" spacing={4}>
-              <Flex
-                flexDir={{ base: "column", md: "row" }}
-                alignItems={{ base: "flex-start", md: "center" }}
-              >
-                <HStack w={48} alignItems="center" spacing={1}>
-                  <Text fontWeight="bold">Format:</Text>
-                  <InfoCircle tooltipText="Format logs for for fine tuning or export them without formatting." />
-                </HStack>
-                <InputDropdown
-                  options={SUPPORTED_EXPORT_FORMATS}
-                  selectedOption={selectedExportFormat}
-                  onSelect={(option) => setSelectedExportFormat(option)}
-                  inputGroupProps={{ w: 48 }}
-                />
-              </Flex>
-              <Flex
-                flexDir={{ base: "column", md: "row" }}
-                alignItems={{ base: "flex-start", md: "center" }}
-              >
-                <HStack w={48} alignItems="center" spacing={1}>
-                  <Text fontWeight="bold">Testing Split:</Text>
-                  <InfoCircle tooltipText="The percent of your logs that will be reserved for testing and saved in another file. Logs are split randomly." />
-                </HStack>
-                <HStack>
-                  <NumberInput
-                    defaultValue={10}
-                    onChange={(_, num) => setTestingSplit(num)}
-                    min={1}
-                    max={100}
-                    w={48}
-                  >
-                    <NumberInputField />
-                    <NumberInputStepper>
-                      <NumberIncrementStepper />
-                      <NumberDecrementStepper />
-                    </NumberInputStepper>
-                  </NumberInput>
-                </HStack>
-              </Flex>
-            </VStack>
-            <VStack alignItems="flex-start" spacing={0}>
-              <Button
-                variant="unstyled"
-                color="blue.600"
-                onClick={() => setShowAdvancedOptions(!showAdvancedOptions)}
-              >
-                <HStack>
-                  <Text>Advanced Options</Text>
-                  <Icon as={showAdvancedOptions ? FiChevronUp : FiChevronDown} />
-                </HStack>
-              </Button>
-              <Collapse in={showAdvancedOptions} unmountOnExit={true}>
-                <VStack align="stretch" pt={4}>
-                  <HStack>
-                    <Checkbox
-                      colorScheme="blue"
-                      isChecked={removeDuplicates}
-                      onChange={(e) => setRemoveDuplicates(e.target.checked)}
-                    >
-                      <Text>Remove duplicates</Text>
-                    </Checkbox>
-                    <InfoCircle tooltipText="To avoid overfitting and speed up training, automatically deduplicate logs with matching input and output." />
-                  </HStack>
-                </VStack>
-              </Collapse>
-            </VStack>
-          </VStack>
-        </ModalBody>
-        <ModalFooter>
-          <HStack>
-            <Button colorScheme="gray" onClick={disclosure.onClose} minW={24}>
-              Cancel
-            </Button>
-            <Button colorScheme="blue" onClick={exportLogs} isLoading={exportInProgress} minW={24}>
-              Export
-            </Button>
-          </HStack>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-};
--- a/app/src/components/requestLogs/FineTuneButton.tsx
+++ b/app/src/components/requestLogs/FineTuneButton.tsx
@@ -1,162 +0,0 @@
-import { useState, useEffect } from "react";
-import {
-  Modal,
-  ModalOverlay,
-  ModalContent,
-  ModalHeader,
-  ModalCloseButton,
-  ModalBody,
-  ModalFooter,
-  HStack,
-  VStack,
-  Icon,
-  Text,
-  Button,
-  useDisclosure,
-  type UseDisclosureReturn,
-  Input,
-} from "@chakra-ui/react";
-import { AiTwotoneThunderbolt } from "react-icons/ai";
-import humanId from "human-id";
-import { useRouter } from "next/router";
-
-import { useHandledAsyncCallback } from "~/utils/hooks";
-import { api } from "~/utils/api";
-import { useAppStore } from "~/state/store";
-import ActionButton from "./ActionButton";
-import InputDropdown from "../InputDropdown";
-import { FiChevronDown } from "react-icons/fi";
-
-const SUPPORTED_BASE_MODELS = ["llama2-7b", "llama2-13b", "llama2-70b", "gpt-3.5-turbo"];
-
-const FineTuneButton = () => {
-  const selectedLogIds = useAppStore((s) => s.selectedLogs.selectedLogIds);
-
-  const disclosure = useDisclosure();
-
-  return (
-    <>
-      <ActionButton
-        onClick={disclosure.onOpen}
-        label="Fine Tune"
-        icon={AiTwotoneThunderbolt}
-        isDisabled={selectedLogIds.size === 0}
-        requireBeta
-      />
-      <FineTuneModal disclosure={disclosure} />
-    </>
-  );
-};
-
-export default FineTuneButton;
-
-const FineTuneModal = ({ disclosure }: { disclosure: UseDisclosureReturn }) => {
-  const selectedProjectId = useAppStore((s) => s.selectedProjectId);
-  const selectedLogIds = useAppStore((s) => s.selectedLogs.selectedLogIds);
-  const clearSelectedLogIds = useAppStore((s) => s.selectedLogs.clearSelectedLogIds);
-
-  const [selectedBaseModel, setSelectedBaseModel] = useState(SUPPORTED_BASE_MODELS[0]);
-  const [modelSlug, setModelSlug] = useState(humanId({ separator: "-", capitalize: false }));
-
-  useEffect(() => {
-    if (disclosure.isOpen) {
-      setSelectedBaseModel(SUPPORTED_BASE_MODELS[0]);
-      setModelSlug(humanId({ separator: "-", capitalize: false }));
-    }
-  }, [disclosure.isOpen]);
-
-  const utils = api.useContext();
-  const router = useRouter();
-
-  const createFineTuneMutation = api.fineTunes.create.useMutation();
-
-  const [createFineTune, creationInProgress] = useHandledAsyncCallback(async () => {
-    if (!selectedProjectId || !modelSlug || !selectedBaseModel || !selectedLogIds.size) return;
-    await createFineTuneMutation.mutateAsync({
-      projectId: selectedProjectId,
-      slug: modelSlug,
-      baseModel: selectedBaseModel,
-      selectedLogIds: Array.from(selectedLogIds),
-    });
-
-    await utils.fineTunes.list.invalidate();
-    await router.push({ pathname: "/fine-tunes" });
-    clearSelectedLogIds();
-    disclosure.onClose();
-  }, [createFineTuneMutation, selectedProjectId, selectedLogIds, modelSlug, selectedBaseModel]);
-
-  return (
-    <Modal size={{ base: "xl", md: "2xl" }} {...disclosure}>
-      <ModalOverlay />
-      <ModalContent w={1200}>
-        <ModalHeader>
-          <HStack>
-            <Icon as={AiTwotoneThunderbolt} />
-            <Text>Fine Tune</Text>
-          </HStack>
-        </ModalHeader>
-        <ModalCloseButton />
-        <ModalBody maxW="unset">
-          <VStack w="full" spacing={8} pt={4} alignItems="flex-start">
-            <Text>
-              We'll train on the <b>{selectedLogIds.size}</b> logs you've selected.
-            </Text>
-            <VStack>
-              <HStack spacing={2} w="full">
-                <Text fontWeight="bold" w={36}>
-                  Model ID:
-                </Text>
-                <Input
-                  value={modelSlug}
-                  onChange={(e) => setModelSlug(e.target.value)}
-                  w={48}
-                  placeholder="unique-id"
-                  onKeyDown={(e) => {
-                    // If the user types anything other than a-z, A-Z, or 0-9, replace it with -
-                    if (!/[a-zA-Z0-9]/.test(e.key)) {
-                      e.preventDefault();
-                      setModelSlug((s) => s && `${s}-`);
-                    }
-                  }}
-                />
-              </HStack>
-              <HStack spacing={2}>
-                <Text fontWeight="bold" w={36}>
-                  Base model:
-                </Text>
-                <InputDropdown
-                  options={SUPPORTED_BASE_MODELS}
-                  selectedOption={selectedBaseModel}
-                  onSelect={(option) => setSelectedBaseModel(option)}
-                  inputGroupProps={{ w: 48 }}
-                />
-              </HStack>
-            </VStack>
-            <Button variant="unstyled" color="blue.600">
-              <HStack>
-                <Text>Advanced Options</Text>
-                <Icon as={FiChevronDown} />
-              </HStack>
-            </Button>
-          </VStack>
-        </ModalBody>
-        <ModalFooter>
-          <HStack>
-            <Button colorScheme="gray" onClick={disclosure.onClose} minW={24}>
-              Cancel
-            </Button>
-            <Button
-              colorScheme="blue"
-              onClick={createFineTune}
-              isLoading={creationInProgress}
-              minW={24}
-              isDisabled={!modelSlug}
-            >
-              Start Training
-            </Button>
-          </HStack>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-};
--- a/app/src/components/requestLogs/LogFilters/AddFilterButton.tsx
+++ b/app/src/components/requestLogs/LogFilters/AddFilterButton.tsx
@@ -1,30 +0,0 @@
-import { Button, HStack, Icon, Text } from "@chakra-ui/react";
-import { BsPlus } from "react-icons/bs";
-import { comparators, defaultFilterableFields } from "~/state/logFiltersSlice";
-import { useAppStore } from "~/state/store";
-
-const AddFilterButton = () => {
-  const addFilter = useAppStore((s) => s.logFilters.addFilter);
-
-  return (
-    <HStack
-      as={Button}
-      variant="ghost"
-      onClick={() =>
-        addFilter({
-          id: Date.now().toString(),
-          field: defaultFilterableFields[0],
-          comparator: comparators[0],
-          value: "",
-        })
-      }
-      spacing={0}
-      fontSize="sm"
-    >
-      <Icon as={BsPlus} boxSize={5} />
-      <Text>Add Filter</Text>
-    </HStack>
-  );
-};
-
-export default AddFilterButton;
--- a/app/src/components/requestLogs/LogFilters/LogFilter.tsx
+++ b/app/src/components/requestLogs/LogFilters/LogFilter.tsx
@@ -1,44 +0,0 @@
-import { useCallback, useState } from "react";
-import { HStack, IconButton, Input } from "@chakra-ui/react";
-import { BsTrash } from "react-icons/bs";
-
-import { type LogFilter } from "~/state/logFiltersSlice";
-import { useAppStore } from "~/state/store";
-import { debounce } from "lodash-es";
-import SelectFieldDropdown from "./SelectFieldDropdown";
-import SelectComparatorDropdown from "./SelectComparatorDropdown";
-
-const LogFilter = ({ filter }: { filter: LogFilter }) => {
-  const updateFilter = useAppStore((s) => s.logFilters.updateFilter);
-  const deleteFilter = useAppStore((s) => s.logFilters.deleteFilter);
-
-  const [editedValue, setEditedValue] = useState(filter.value);
-
-  const debouncedUpdateFilter = useCallback(
-    debounce((filter: LogFilter) => updateFilter(filter), 500, {
-      leading: true,
-    }),
-    [updateFilter],
-  );
-
-  return (
-    <HStack>
-      <SelectFieldDropdown filter={filter} />
-      <SelectComparatorDropdown filter={filter} />
-      <Input
-        value={editedValue}
-        onChange={(e) => {
-          setEditedValue(e.target.value);
-          debouncedUpdateFilter({ ...filter, value: e.target.value });
-        }}
-      />
-      <IconButton
-        aria-label="Delete Filter"
-        icon={<BsTrash />}
-        onClick={() => deleteFilter(filter.id)}
-      />
-    </HStack>
-  );
-};
-
-export default LogFilter;
--- a/app/src/components/requestLogs/LogFilters/LogFilters.tsx
+++ b/app/src/components/requestLogs/LogFilters/LogFilters.tsx
@@ -1,30 +0,0 @@
-import { VStack, Text } from "@chakra-ui/react";
-
-import AddFilterButton from "./AddFilterButton";
-import { useAppStore } from "~/state/store";
-import LogFilter from "./LogFilter";
-
-const LogFilters = () => {
-  const filters = useAppStore((s) => s.logFilters.filters);
-  return (
-    <VStack
-      bgColor="white"
-      borderRadius={8}
-      borderWidth={1}
-      w="full"
-      alignItems="flex-start"
-      p={4}
-      spacing={4}
-    >
-      <Text fontWeight="bold" color="gray.500">
-        Filters
-      </Text>
-      {filters.map((filter) => (
-        <LogFilter key={filter.id} filter={filter} />
-      ))}
-      <AddFilterButton />
-    </VStack>
-  );
-};
-
-export default LogFilters;
--- a/app/src/components/requestLogs/LogFilters/SelectComparatorDropdown.tsx
+++ b/app/src/components/requestLogs/LogFilters/SelectComparatorDropdown.tsx
@@ -1,19 +0,0 @@
-import { comparators, type LogFilter } from "~/state/logFiltersSlice";
-import { useAppStore } from "~/state/store";
-import InputDropdown from "~/components/InputDropdown";
-
-const SelectComparatorDropdown = ({ filter }: { filter: LogFilter }) => {
-  const updateFilter = useAppStore((s) => s.logFilters.updateFilter);
-
-  const { comparator } = filter;
-
-  return (
-    <InputDropdown
-      options={comparators}
-      selectedOption={comparator}
-      onSelect={(option) => updateFilter({ ...filter, comparator: option })}
-    />
-  );
-};
-
-export default SelectComparatorDropdown;
--- a/app/src/components/requestLogs/LogFilters/SelectFieldDropdown.tsx
+++ b/app/src/components/requestLogs/LogFilters/SelectFieldDropdown.tsx
@@ -1,22 +0,0 @@
-import { defaultFilterableFields, type LogFilter } from "~/state/logFiltersSlice";
-import { useAppStore } from "~/state/store";
-import { useTagNames } from "~/utils/hooks";
-import InputDropdown from "~/components/InputDropdown";
-
-const SelectFieldDropdown = ({ filter }: { filter: LogFilter }) => {
-  const tagNames = useTagNames().data;
-
-  const updateFilter = useAppStore((s) => s.logFilters.updateFilter);
-
-  const { field } = filter;
-
-  return (
-    <InputDropdown
-      options={[...defaultFilterableFields, ...(tagNames || [])]}
-      selectedOption={field}
-      onSelect={(option) => updateFilter({ ...filter, field: option })}
-    />
-  );
-};
-
-export default SelectFieldDropdown;
--- a/app/src/components/requestLogs/LoggedCallsTable.tsx
+++ b/app/src/components/requestLogs/LoggedCallsTable.tsx
@@ -1,38 +1,34 @@
 import { Card, Table, Tbody } from "@chakra-ui/react";
 import { useState } from "react";
 import { useLoggedCalls } from "~/utils/hooks";
-import { TableHeader, TableRow, EmptyTableRow } from "./TableRow";
+import { TableHeader, TableRow } from "./TableRow";

 export default function LoggedCallsTable() {
  const [expandedRow, setExpandedRow] = useState<string | null>(null);
-  const loggedCalls = useLoggedCalls().data;
+  const { data: loggedCalls } = useLoggedCalls();

  return (
-    <Card width="100%" overflowX="auto">
+    <Card width="100%" overflow="hidden">
      <Table>
-        <TableHeader showOptions />
+        <TableHeader showCheckbox />
        <Tbody>
-          {loggedCalls?.calls.length ? (
-            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);
-                    }
-                  }}
-                  showOptions
-                />
-              );
-            })
-          ) : (
-            <EmptyTableRow />
-          )}
+          {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);
+                  }
+                }}
+                showCheckbox
+              />
+            );
+          })}
        </Tbody>
      </Table>
    </Card>
--- a/app/src/components/requestLogs/TableRow.tsx
+++ b/app/src/components/requestLogs/TableRow.tsx
@@ -13,66 +13,52 @@ import {
  ButtonGroup,
  Text,
  Checkbox,
-  Link as ChakraLink,
 } from "@chakra-ui/react";
+import dayjs from "dayjs";
+import relativeTime from "dayjs/plugin/relativeTime";
 import Link from "next/link";

-import dayjs from "~/utils/dayjs";
 import { type RouterOutputs } from "~/utils/api";
 import { FormattedJson } from "./FormattedJson";
 import { useAppStore } from "~/state/store";
-import { useIsClientRehydrated, useLoggedCalls, useTagNames } from "~/utils/hooks";
+import { useLoggedCalls } from "~/utils/hooks";
 import { useMemo } from "react";
-import { StaticColumnKeys } from "~/state/columnVisiblitySlice";
+
+dayjs.extend(relativeTime);

 type LoggedCall = RouterOutputs["loggedCalls"]["list"]["calls"][0];

-export const TableHeader = ({ showOptions }: { showOptions?: boolean }) => {
+export const TableHeader = ({ showCheckbox }: { showCheckbox?: boolean }) => {
  const matchingLogIds = useLoggedCalls().data?.matchingLogIds;
  const selectedLogIds = useAppStore((s) => s.selectedLogs.selectedLogIds);
  const addAll = useAppStore((s) => s.selectedLogs.addSelectedLogIds);
  const clearAll = useAppStore((s) => s.selectedLogs.clearSelectedLogIds);
  const allSelected = useMemo(() => {
-    if (!matchingLogIds || !matchingLogIds.length) return false;
+    if (!matchingLogIds) return false;
    return matchingLogIds.every((id) => selectedLogIds.has(id));
  }, [selectedLogIds, matchingLogIds]);
-  const tagNames = useTagNames().data;
-  const visibleColumns = useAppStore((s) => s.columnVisibility.visibleColumns);
-  const isClientRehydrated = useIsClientRehydrated();
-  if (!isClientRehydrated) return null;
-
  return (
    <Thead>
      <Tr>
-        {showOptions && (
-          <Th pr={0}>
-            <HStack minW={16}>
+        {showCheckbox && (
+          <Th>
+            <HStack w={8}>
              <Checkbox
                isChecked={allSelected}
                onChange={() => {
                  allSelected ? clearAll() : addAll(matchingLogIds || []);
                }}
              />
-              <Text>
-                ({selectedLogIds.size ? `${selectedLogIds.size}/` : ""}
-                {matchingLogIds?.length || 0})
-              </Text>
+              <Text>({selectedLogIds.size})</Text>
            </HStack>
          </Th>
        )}
-        {visibleColumns.has(StaticColumnKeys.SENT_AT) && <Th>Sent At</Th>}
-        {visibleColumns.has(StaticColumnKeys.MODEL) && <Th>Model</Th>}
-        {tagNames
-          ?.filter((tagName) => visibleColumns.has(tagName))
-          .map((tagName) => (
-            <Th key={tagName} textTransform={"none"}>
-              {tagName}
-            </Th>
-          ))}
-        {visibleColumns.has(StaticColumnKeys.DURATION) && <Th isNumeric>Duration</Th>}
-        {visibleColumns.has(StaticColumnKeys.INPUT_TOKENS) && <Th isNumeric>Input tokens</Th>}
-        {visibleColumns.has(StaticColumnKeys.OUTPUT_TOKENS) && <Th isNumeric>Output tokens</Th>}
-        {visibleColumns.has(StaticColumnKeys.STATUS_CODE) && <Th isNumeric>Status</Th>}
+        <Th>Time</Th>
+        <Th>Model</Th>
+        <Th isNumeric>Duration</Th>
+        <Th isNumeric>Input tokens</Th>
+        <Th isNumeric>Output tokens</Th>
+        <Th isNumeric>Status</Th>
      </Tr>
    </Thead>
  );
@@ -82,30 +68,30 @@ export const TableRow = ({
  loggedCall,
  isExpanded,
  onToggle,
-  showOptions,
+  showCheckbox,
 }: {
  loggedCall: LoggedCall;
  isExpanded: boolean;
  onToggle: () => void;
-  showOptions?: boolean;
+  showCheckbox?: boolean;
 }) => {
  const isError = loggedCall.modelResponse?.statusCode !== 200;
-  const requestedAt = dayjs(loggedCall.requestedAt).format("MMMM D h:mm A");
+  const timeAgo = dayjs(loggedCall.requestedAt).fromNow();
  const fullTime = dayjs(loggedCall.requestedAt).toString();

+  const durationCell = (
+    <Td isNumeric>
+      {loggedCall.cacheHit ? (
+        <Text color="gray.500">Cached</Text>
+      ) : (
+        ((loggedCall.modelResponse?.durationMs ?? 0) / 1000).toFixed(2) + "s"
+      )}
+    </Td>
+  );
+
  const isChecked = useAppStore((s) => s.selectedLogs.selectedLogIds.has(loggedCall.id));
  const toggleChecked = useAppStore((s) => s.selectedLogs.toggleSelectedLogId);

-  const tagNames = useTagNames().data;
-  const visibleColumns = useAppStore((s) => s.columnVisibility.visibleColumns);
-
-  const visibleTagNames = useMemo(() => {
-    return tagNames?.filter((tagName) => visibleColumns.has(tagName)) ?? [];
-  }, [tagNames, visibleColumns]);
-
-  const isClientRehydrated = useIsClientRehydrated();
-  if (!isClientRehydrated) return null;
-
  return (
    <>
      <Tr
@@ -115,66 +101,43 @@ export const TableRow = ({
        sx={{
          "> td": { borderBottom: "none" },
        }}
-        fontSize="sm"
      >
-        {showOptions && (
+        {showCheckbox && (
          <Td>
            <Checkbox isChecked={isChecked} onChange={() => toggleChecked(loggedCall.id)} />
          </Td>
        )}
-        {visibleColumns.has(StaticColumnKeys.SENT_AT) && (
-          <Td>
-            <Tooltip label={fullTime} placement="top">
-              <Box whiteSpace="nowrap" minW="120px">
-                {requestedAt}
-              </Box>
-            </Tooltip>
-          </Td>
-        )}
-        {visibleColumns.has(StaticColumnKeys.MODEL) && (
-          <Td>
-            <HStack justifyContent="flex-start">
-              <Text
-                colorScheme="purple"
-                color="purple.500"
-                borderColor="purple.500"
-                px={1}
-                borderRadius={4}
-                borderWidth={1}
-                fontSize="xs"
-                whiteSpace="nowrap"
-              >
-                {loggedCall.model}
-              </Text>
-            </HStack>
-          </Td>
-        )}
-        {visibleTagNames.map((tagName) => (
-          <Td key={tagName}>{loggedCall.tags[tagName]}</Td>
-        ))}
-        {visibleColumns.has(StaticColumnKeys.DURATION) && (
-          <Td isNumeric>
-            {loggedCall.cacheHit ? (
-              <Text color="gray.500">Cached</Text>
-            ) : (
-              ((loggedCall.modelResponse?.durationMs ?? 0) / 1000).toFixed(2) + "s"
-            )}
-          </Td>
-        )}
-        {visibleColumns.has(StaticColumnKeys.INPUT_TOKENS) && (
-          <Td isNumeric>{loggedCall.modelResponse?.inputTokens}</Td>
-        )}
-        {visibleColumns.has(StaticColumnKeys.OUTPUT_TOKENS) && (
-          <Td isNumeric>{loggedCall.modelResponse?.outputTokens}</Td>
-        )}
-        {visibleColumns.has(StaticColumnKeys.STATUS_CODE) && (
-          <Td sx={{ color: isError ? "red.500" : "green.500", fontWeight: "semibold" }} isNumeric>
-            {loggedCall.modelResponse?.statusCode ?? "No response"}
-          </Td>
-        )}
+        <Td>
+          <Tooltip label={fullTime} placement="top">
+            <Box whiteSpace="nowrap" minW="120px">
+              {timeAgo}
+            </Box>
+          </Tooltip>
+        </Td>
+        <Td width="100%">
+          <HStack justifyContent="flex-start">
+            <Text
+              colorScheme="purple"
+              color="purple.500"
+              borderColor="purple.500"
+              px={1}
+              borderRadius={4}
+              borderWidth={1}
+              fontSize="xs"
+            >
+              {loggedCall.model}
+            </Text>
+          </HStack>
+        </Td>
+        {durationCell}
+        <Td isNumeric>{loggedCall.modelResponse?.inputTokens}</Td>
+        <Td isNumeric>{loggedCall.modelResponse?.outputTokens}</Td>
+        <Td sx={{ color: isError ? "red.500" : "green.500", fontWeight: "semibold" }} isNumeric>
+          {loggedCall.modelResponse?.statusCode ?? "No response"}
+        </Td>
      </Tr>
      <Tr>
-        <Td colSpan={visibleColumns.size + 1} w="full" p={0}>
+        <Td colSpan={8} p={0}>
          <Collapse in={isExpanded} unmountOnExit={true}>
            <VStack p={4} align="stretch">
              <HStack align="stretch">
@@ -199,41 +162,3 @@ export const TableRow = ({
    </>
  );
 };
-
-export const EmptyTableRow = ({ filtersApplied = true }: { filtersApplied?: boolean }) => {
-  const visibleColumns = useAppStore((s) => s.columnVisibility.visibleColumns);
-  const filters = useAppStore((state) => state.logFilters.filters);
-  const { isLoading } = useLoggedCalls();
-
-  if (isLoading) return null;
-
-  if (filters.length && filtersApplied) {
-    return (
-      <Tr>
-        <Td w="full" colSpan={visibleColumns.size + 1}>
-          <Text color="gray.500" textAlign="center" w="full" p={4}>
-            No matching request logs found. Try removing some filters.
-          </Text>
-        </Td>
-      </Tr>
-    );
-  }
-
-  return (
-    <Tr>
-      <Td w="full" colSpan={visibleColumns.size + 1}>
-        <Text color="gray.500" textAlign="center" w="full" p={4}>
-          This project has no request logs. Learn how to add request logs to your project in our{" "}
-          <ChakraLink
-            href="https://docs.openpipe.ai/getting-started/quick-start"
-            target="_blank"
-            color="blue.600"
-          >
-            Quick Start
-          </ChakraLink>{" "}
-          guide.
-        </Text>
-      </Td>
-    </Tr>
-  );
-};
--- a/app/src/env.mjs
+++ b/app/src/env.mjs
@@ -21,19 +21,6 @@ export const env = createEnv({
    ANTHROPIC_API_KEY: z.string().default("placeholder"),
    SENTRY_AUTH_TOKEN: z.string().optional(),
    OPENPIPE_API_KEY: z.string().optional(),
-    SENDER_EMAIL: z.string().default("placeholder"),
-    SMTP_HOST: z.string().default("placeholder"),
-    SMTP_PORT: z.string().default("placeholder"),
-    SMTP_LOGIN: z.string().default("placeholder"),
-    SMTP_PASSWORD: z.string().default("placeholder"),
-    WORKER_CONCURRENCY: z
-      .string()
-      .default("10")
-      .transform((val) => parseInt(val)),
-    WORKER_MAX_POOL_SIZE: z
-      .string()
-      .default("10")
-      .transform((val) => parseInt(val)),
  },

  /**
@@ -46,6 +33,8 @@ export const env = createEnv({
    NEXT_PUBLIC_SOCKET_URL: z.string().url().default("http://localhost:3318"),
    NEXT_PUBLIC_HOST: z.string().url().default("http://localhost:3000"),
    NEXT_PUBLIC_SENTRY_DSN: z.string().optional(),
+    NEXT_PUBLIC_SHOW_DATA: z.string().optional(),
+    NEXT_PUBLIC_FF_SHOW_LOGGED_CALLS: z.string().optional(),
  },

  /**
@@ -60,6 +49,7 @@ export const env = createEnv({
    NEXT_PUBLIC_POSTHOG_KEY: process.env.NEXT_PUBLIC_POSTHOG_KEY,
    NEXT_PUBLIC_SOCKET_URL: process.env.NEXT_PUBLIC_SOCKET_URL,
    NEXT_PUBLIC_HOST: process.env.NEXT_PUBLIC_HOST,
+    NEXT_PUBLIC_SHOW_DATA: process.env.NEXT_PUBLIC_SHOW_DATA,
    GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID,
    GITHUB_CLIENT_SECRET: process.env.GITHUB_CLIENT_SECRET,
    REPLICATE_API_TOKEN: process.env.REPLICATE_API_TOKEN,
@@ -67,13 +57,7 @@ export const env = createEnv({
    NEXT_PUBLIC_SENTRY_DSN: process.env.NEXT_PUBLIC_SENTRY_DSN,
    SENTRY_AUTH_TOKEN: process.env.SENTRY_AUTH_TOKEN,
    OPENPIPE_API_KEY: process.env.OPENPIPE_API_KEY,
-    SENDER_EMAIL: process.env.SENDER_EMAIL,
-    SMTP_HOST: process.env.SMTP_HOST,
-    SMTP_PORT: process.env.SMTP_PORT,
-    SMTP_LOGIN: process.env.SMTP_LOGIN,
-    SMTP_PASSWORD: process.env.SMTP_PASSWORD,
-    WORKER_CONCURRENCY: process.env.WORKER_CONCURRENCY,
-    WORKER_MAX_POOL_SIZE: process.env.WORKER_MAX_POOL_SIZE,
+    NEXT_PUBLIC_FF_SHOW_LOGGED_CALLS: process.env.NEXT_PUBLIC_FF_SHOW_LOGGED_CALLS,
  },
  /**
   * Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation.
--- a/app/src/modelProviders/frontendModelProviders.ts
+++ b/app/src/modelProviders/frontendModelProviders.ts
@@ -1,7 +1,6 @@
 import openaiChatCompletionFrontend from "./openai-ChatCompletion/frontend";
 import replicateLlama2Frontend from "./replicate-llama2/frontend";
 import anthropicFrontend from "./anthropic-completion/frontend";
-import openpipeFrontend from "./openpipe-chat/frontend";
 import { type SupportedProvider, type FrontendModelProvider } from "./types";

 // Keep attributes here that need to be accessible from the frontend. We can't
@@ -11,7 +10,6 @@ const frontendModelProviders: Record<SupportedProvider, FrontendModelProvider<an
  "openai/ChatCompletion": openaiChatCompletionFrontend,
  "replicate/llama2": replicateLlama2Frontend,
  "anthropic/completion": anthropicFrontend,
-  "openpipe/Chat": openpipeFrontend,
 };

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

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

 export default modelProviders;
--- a/app/src/modelProviders/openai-ChatCompletion/getCompletion.ts
+++ b/app/src/modelProviders/openai-ChatCompletion/getCompletion.ts
@@ -1,10 +1,54 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
-import { isArray, isString } from "lodash-es";
-import { APIError } from "openai";
-import { type ChatCompletion, type CompletionCreateParams } from "openai/resources/chat";
-import mergeChunks from "openpipe/openai/mergeChunks";
-import { openai } from "~/server/utils/openai";
+import {
+  type ChatCompletionChunk,
+  type ChatCompletion,
+  type CompletionCreateParams,
+} from "openai/resources/chat";
 import { type CompletionResponse } from "../types";
+import { isArray, isString, omit } from "lodash-es";
+import { openai } from "~/server/utils/openai";
+import { APIError } from "openai";
+
+const mergeStreamedChunks = (
+  base: ChatCompletion | null,
+  chunk: ChatCompletionChunk,
+): ChatCompletion => {
+  if (base === null) {
+    return mergeStreamedChunks({ ...chunk, choices: [] }, chunk);
+  }
+
+  const choices = [...base.choices];
+  for (const choice of chunk.choices) {
+    const baseChoice = choices.find((c) => c.index === choice.index);
+    if (baseChoice) {
+      baseChoice.finish_reason = choice.finish_reason ?? baseChoice.finish_reason;
+      baseChoice.message = baseChoice.message ?? { role: "assistant" };
+
+      if (choice.delta?.content)
+        baseChoice.message.content =
+          ((baseChoice.message.content as string) ?? "") + (choice.delta.content ?? "");
+      if (choice.delta?.function_call) {
+        const fnCall = baseChoice.message.function_call ?? {};
+        fnCall.name =
+          ((fnCall.name as string) ?? "") + ((choice.delta.function_call.name as string) ?? "");
+        fnCall.arguments =
+          ((fnCall.arguments as string) ?? "") +
+          ((choice.delta.function_call.arguments as string) ?? "");
+      }
+    } else {
+      // @ts-expect-error the types are correctly telling us that finish_reason
+      // could be null, but don't want to fix it right now.
+      choices.push({ ...omit(choice, "delta"), message: { role: "assistant", ...choice.delta } });
+    }
+  }
+
+  const merged: ChatCompletion = {
+    ...base,
+    choices,
+  };
+
+  return merged;
+};

 export async function getCompletion(
  input: CompletionCreateParams,
@@ -15,25 +59,19 @@ export async function getCompletion(

  try {
    if (onStream) {
+      console.log("got started");
      const resp = await openai.chat.completions.create(
-        {
-          ...input,
-          stream: true,
-          openpipe: {
-            tags: {
-              prompt_id: "getCompletion",
-              stream: "true",
-            },
-          },
-        },
+        { ...input, stream: true },
        {
          maxRetries: 0,
        },
      );
      for await (const part of resp) {
-        finalCompletion = mergeChunks(finalCompletion, part);
+        console.log("got part", part);
+        finalCompletion = mergeStreamedChunks(finalCompletion, part);
        onStream(finalCompletion);
      }
+      console.log("got final", finalCompletion);
      if (!finalCompletion) {
        return {
          type: "error",
@@ -43,16 +81,7 @@ export async function getCompletion(
      }
    } else {
      const resp = await openai.chat.completions.create(
-        {
-          ...input,
-          stream: false,
-          openpipe: {
-            tags: {
-              prompt_id: "getCompletion",
-              stream: "false",
-            },
-          },
-        },
+        { ...input, stream: false },
        {
          maxRetries: 0,
        },
--- a/app/src/modelProviders/openai-ChatCompletion/refinementActions.ts
+++ b/app/src/modelProviders/openai-ChatCompletion/refinementActions.ts
@@ -12,6 +12,7 @@ export const refinementActions: Record<string, RefinementAction> = {
  
      definePrompt("openai/ChatCompletion", {
          model: "gpt-4",
+          stream: true,
          messages: [
              {
              role: "system",
@@ -28,6 +29,7 @@ export const refinementActions: Record<string, RefinementAction> = {
  
      definePrompt("openai/ChatCompletion", {
          model: "gpt-4",
+          stream: true,
          messages: [
              {
              role: "system",
@@ -118,12 +120,13 @@ export const refinementActions: Record<string, RefinementAction> = {
  "Convert to function call": {
    icon: TfiThought,
    description: "Use function calls to get output from the model in a more structured way.",
-    instructions: `OpenAI functions are a specialized way for an LLM to return its final output.
+    instructions: `OpenAI functions are a specialized way for an LLM to return output.
  
-      Example 1 before:
+      This is what a prompt looks like before adding a function:
  
      definePrompt("openai/ChatCompletion", {
        model: "gpt-4",
+        stream: true,
        messages: [
          {
            role: "system",
@@ -136,10 +139,11 @@ export const refinementActions: Record<string, RefinementAction> = {
        ],
      });
  
-      Example 1 after:
+      This is what one looks like after adding a function:
  
      definePrompt("openai/ChatCompletion", {
        model: "gpt-4",
+        stream: true,
        messages: [
          {
            role: "system",
@@ -152,7 +156,7 @@ export const refinementActions: Record<string, RefinementAction> = {
        ],
        functions: [
          {
-            name: "log_extracted_sentiment",
+            name: "extract_sentiment",
            parameters: {
              type: "object", // parameters must always be an object with a properties key
              properties: { // properties key is required
@@ -165,13 +169,13 @@ export const refinementActions: Record<string, RefinementAction> = {
          },
        ],
        function_call: {
-          name: "log_extracted_sentiment",
+          name: "extract_sentiment",
        },
      });
  
-      =========
-
-      Example 2 before:
+      Here's another example of adding a function:
+  
+      Before:
  
      definePrompt("openai/ChatCompletion", {
          model: "gpt-3.5-turbo",
@@ -193,7 +197,7 @@ export const refinementActions: Record<string, RefinementAction> = {
          temperature: 0,
      });
  
-      Example 2 after:
+      After:
  
      definePrompt("openai/ChatCompletion", {
          model: "gpt-3.5-turbo",
@@ -211,7 +215,7 @@ export const refinementActions: Record<string, RefinementAction> = {
          temperature: 0,
          functions: [
            {
-              name: "log_post_score",
+              name: "score_post",
              parameters: {
                type: "object",
                properties: {
@@ -223,16 +227,17 @@ export const refinementActions: Record<string, RefinementAction> = {
            },
          ],
          function_call: {
-            name: "log_post_score",
+            name: "score_post",
          },
        });
  
-      =========
+      Another example
  
-      Example 3 before:
+      Before:
  
      definePrompt("openai/ChatCompletion", {
        model: "gpt-3.5-turbo",
+        stream: true,
        messages: [
          {
            role: "system",
@@ -241,7 +246,7 @@ export const refinementActions: Record<string, RefinementAction> = {
        ],
      });
  
-      Example 3 after:
+      After:
  
      definePrompt("openai/ChatCompletion", {
        model: "gpt-3.5-turbo",
@@ -253,24 +258,21 @@ export const refinementActions: Record<string, RefinementAction> = {
        ],
        functions: [
          {
-            name: "log_translated_text",
+            name: "write_in_language",
            parameters: {
              type: "object",
              properties: {
-                translated_text: {
+                text: {
                  type: "string",
-                  description: "The text, written in the language specified in the prompt",
                },
              },
            },
          },
        ],
        function_call: {
-          name: "log_translated_text",
+          name: "write_in_language",
        },
      });
-
-      =========
  
      Add an OpenAI function that takes one or more nested parameters that match the expected output from this prompt.`,
  },
--- a/app/src/modelProviders/openpipe-chat/frontend.ts
+++ b/app/src/modelProviders/openpipe-chat/frontend.ts
@@ -1,98 +0,0 @@
-import { type OpenpipeChatOutput, type SupportedModel } from ".";
-import { type FrontendModelProvider } from "../types";
-import { refinementActions } from "./refinementActions";
-import {
-  templateOpenOrcaPrompt,
-  templateAlpacaInstructPrompt,
-  //   templateSystemUserAssistantPrompt,
-  templateInstructionInputResponsePrompt,
-  templateAiroborosPrompt,
-  templateGryphePrompt,
-  templateVicunaPrompt,
-} from "./templatePrompt";
-
-const frontendModelProvider: FrontendModelProvider<SupportedModel, OpenpipeChatOutput> = {
-  name: "OpenAI ChatCompletion",
-
-  models: {
-    "Open-Orca/OpenOrcaxOpenChat-Preview2-13B": {
-      name: "OpenOrcaxOpenChat-Preview2-13B",
-      contextWindow: 4096,
-      pricePerSecond: 0.0003,
-      speed: "medium",
-      provider: "openpipe/Chat",
-      learnMoreUrl: "https://huggingface.co/Open-Orca/OpenOrcaxOpenChat-Preview2-13B",
-      templatePrompt: templateOpenOrcaPrompt,
-    },
-    "Open-Orca/OpenOrca-Platypus2-13B": {
-      name: "OpenOrca-Platypus2-13B",
-      contextWindow: 4096,
-      pricePerSecond: 0.0003,
-      speed: "medium",
-      provider: "openpipe/Chat",
-      learnMoreUrl: "https://huggingface.co/Open-Orca/OpenOrca-Platypus2-13B",
-      templatePrompt: templateAlpacaInstructPrompt,
-      defaultStopTokens: ["</s>"],
-    },
-    // "stabilityai/StableBeluga-13B": {
-    //   name: "StableBeluga-13B",
-    //   contextWindow: 4096,
-    //   pricePerSecond: 0.0003,
-    //   speed: "medium",
-    //   provider: "openpipe/Chat",
-    //   learnMoreUrl: "https://huggingface.co/stabilityai/StableBeluga-13B",
-    //   templatePrompt: templateSystemUserAssistantPrompt,
-    // },
-    "NousResearch/Nous-Hermes-Llama2-13b": {
-      name: "Nous-Hermes-Llama2-13b",
-      contextWindow: 4096,
-      pricePerSecond: 0.0003,
-      speed: "medium",
-      provider: "openpipe/Chat",
-      learnMoreUrl: "https://huggingface.co/NousResearch/Nous-Hermes-Llama2-13b",
-      templatePrompt: templateInstructionInputResponsePrompt,
-    },
-    "jondurbin/airoboros-l2-13b-gpt4-2.0": {
-      name: "airoboros-l2-13b-gpt4-2.0",
-      contextWindow: 4096,
-      pricePerSecond: 0.0003,
-      speed: "medium",
-      provider: "openpipe/Chat",
-      learnMoreUrl: "https://huggingface.co/jondurbin/airoboros-l2-13b-gpt4-2.0",
-      templatePrompt: templateAiroborosPrompt,
-    },
-    "lmsys/vicuna-13b-v1.5": {
-      name: "vicuna-13b-v1.5",
-      contextWindow: 4096,
-      pricePerSecond: 0.0003,
-      speed: "medium",
-      provider: "openpipe/Chat",
-      learnMoreUrl: "https://huggingface.co/lmsys/vicuna-13b-v1.5",
-      templatePrompt: templateVicunaPrompt,
-    },
-    "Gryphe/MythoMax-L2-13b": {
-      name: "MythoMax-L2-13b",
-      contextWindow: 4096,
-      pricePerSecond: 0.0003,
-      speed: "medium",
-      provider: "openpipe/Chat",
-      learnMoreUrl: "https://huggingface.co/Gryphe/MythoMax-L2-13b",
-      templatePrompt: templateGryphePrompt,
-    },
-    "NousResearch/Nous-Hermes-llama-2-7b": {
-      name: "Nous-Hermes-llama-2-7b",
-      contextWindow: 4096,
-      pricePerSecond: 0.0003,
-      speed: "medium",
-      provider: "openpipe/Chat",
-      learnMoreUrl: "https://huggingface.co/NousResearch/Nous-Hermes-llama-2-7b",
-      templatePrompt: templateInstructionInputResponsePrompt,
-    },
-  },
-
-  refinementActions,
-
-  normalizeOutput: (output) => ({ type: "text", value: output }),
-};
-
-export default frontendModelProvider;
--- a/app/src/modelProviders/openpipe-chat/getCompletion.ts
+++ b/app/src/modelProviders/openpipe-chat/getCompletion.ts
@@ -1,134 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-import { isArray, isString } from "lodash-es";
-import OpenAI, { APIError } from "openai";
-
-import { type CompletionResponse } from "../types";
-import { type OpenpipeChatInput, type OpenpipeChatOutput } from ".";
-import frontendModelProvider from "./frontend";
-
-const modelEndpoints: Record<OpenpipeChatInput["model"], string> = {
-  "Open-Orca/OpenOrcaxOpenChat-Preview2-13B": "https://5ef82gjxk8kdys-8000.proxy.runpod.net/v1",
-  "Open-Orca/OpenOrca-Platypus2-13B": "https://lt5qlel6qcji8t-8000.proxy.runpod.net/v1",
-  // "stabilityai/StableBeluga-13B": "https://vcorl8mxni2ou1-8000.proxy.runpod.net/v1",
-  "NousResearch/Nous-Hermes-Llama2-13b": "https://ncv8pw3u0vb8j2-8000.proxy.runpod.net/v1",
-  "jondurbin/airoboros-l2-13b-gpt4-2.0": "https://9nrbx7oph4btou-8000.proxy.runpod.net/v1",
-  "lmsys/vicuna-13b-v1.5": "https://h88hkt3ux73rb7-8000.proxy.runpod.net/v1",
-  "Gryphe/MythoMax-L2-13b": "https://3l5jvhnxdgky3v-8000.proxy.runpod.net/v1",
-  "NousResearch/Nous-Hermes-llama-2-7b": "https://ua1bpc6kv3dgge-8000.proxy.runpod.net/v1",
-};
-
-const CUSTOM_MODELS_ENABLED = false;
-
-export async function getCompletion(
-  input: OpenpipeChatInput,
-  onStream: ((partialOutput: OpenpipeChatOutput) => void) | null,
-): Promise<CompletionResponse<OpenpipeChatOutput>> {
-  // Temporarily disable these models because of GPU constraints
-
-  if (!CUSTOM_MODELS_ENABLED) {
-    return {
-      type: "error",
-      message:
-        "We've disabled this model temporarily because of GPU capacity constraints. Check back later.",
-      autoRetry: false,
-    };
-  }
-
-  const { model, messages, ...rest } = input;
-
-  const templatedPrompt = frontendModelProvider.models[model].templatePrompt?.(messages);
-
-  if (!templatedPrompt) {
-    return {
-      type: "error",
-      message: "Failed to generate prompt",
-      autoRetry: false,
-    };
-  }
-
-  const openai = new OpenAI({
-    baseURL: modelEndpoints[model],
-  });
-  const start = Date.now();
-  let finalCompletion: OpenpipeChatOutput = "";
-
-  const completionParams = {
-    model,
-    prompt: templatedPrompt,
-    ...rest,
-  };
-
-  if (!completionParams.stop && frontendModelProvider.models[model].defaultStopTokens) {
-    completionParams.stop = frontendModelProvider.models[model].defaultStopTokens;
-  }
-
-  try {
-    if (onStream) {
-      const resp = await openai.completions.create(
-        { ...completionParams, stream: true },
-        {
-          maxRetries: 0,
-        },
-      );
-
-      for await (const part of resp) {
-        finalCompletion += part.choices[0]?.text;
-        onStream(finalCompletion);
-      }
-      if (!finalCompletion) {
-        return {
-          type: "error",
-          message: "Streaming failed to return a completion",
-          autoRetry: false,
-        };
-      }
-    } else {
-      const resp = await openai.completions.create(
-        { ...completionParams, stream: false },
-        {
-          maxRetries: 0,
-        },
-      );
-      finalCompletion = resp.choices[0]?.text || "";
-      if (!finalCompletion) {
-        return {
-          type: "error",
-          message: "Failed to return a completion",
-          autoRetry: false,
-        };
-      }
-    }
-    const timeToComplete = Date.now() - start;
-
-    return {
-      type: "success",
-      statusCode: 200,
-      value: finalCompletion,
-      timeToComplete,
-    };
-  } catch (error: unknown) {
-    if (error instanceof APIError) {
-      // The types from the sdk are wrong
-      const rawMessage = error.message as string | string[];
-      // If the message is not a string, stringify it
-      const message = isString(rawMessage)
-        ? rawMessage
-        : isArray(rawMessage)
-        ? rawMessage.map((m) => m.toString()).join("\n")
-        : (rawMessage as any).toString();
-      return {
-        type: "error",
-        message,
-        autoRetry: error.status === 429 || error.status === 503,
-        statusCode: error.status,
-      };
-    } else {
-      console.error(error);
-      return {
-        type: "error",
-        message: (error as Error).message,
-        autoRetry: true,
-      };
-    }
-  }
-}
--- a/app/src/modelProviders/openpipe-chat/index.ts
+++ b/app/src/modelProviders/openpipe-chat/index.ts
@@ -1,54 +0,0 @@
-import { type JSONSchema4 } from "json-schema";
-import { type ModelProvider } from "../types";
-import inputSchema from "./input.schema.json";
-import { getCompletion } from "./getCompletion";
-import frontendModelProvider from "./frontend";
-
-const supportedModels = [
-  "Open-Orca/OpenOrcaxOpenChat-Preview2-13B",
-  "Open-Orca/OpenOrca-Platypus2-13B",
-  // "stabilityai/StableBeluga-13B",
-  "NousResearch/Nous-Hermes-Llama2-13b",
-  "jondurbin/airoboros-l2-13b-gpt4-2.0",
-  "lmsys/vicuna-13b-v1.5",
-  "Gryphe/MythoMax-L2-13b",
-  "NousResearch/Nous-Hermes-llama-2-7b",
-] as const;
-
-export type SupportedModel = (typeof supportedModels)[number];
-
-export type OpenpipeChatInput = {
-  model: SupportedModel;
-  messages: {
-    role: "system" | "user" | "assistant";
-    content: string;
-  }[];
-  temperature?: number;
-  top_p?: number;
-  stop?: string[] | string;
-  max_tokens?: number;
-  presence_penalty?: number;
-  frequency_penalty?: number;
-};
-
-export type OpenpipeChatOutput = string;
-
-export type OpenpipeChatModelProvider = ModelProvider<
-  SupportedModel,
-  OpenpipeChatInput,
-  OpenpipeChatOutput
->;
-
-const modelProvider: OpenpipeChatModelProvider = {
-  getModel: (input) => input.model,
-  inputSchema: inputSchema as JSONSchema4,
-  canStream: true,
-  getCompletion,
-  getUsage: (input, output) => {
-    // TODO: Implement this
-    return null;
-  },
-  ...frontendModelProvider,
-};
-
-export default modelProvider;
--- a/app/src/modelProviders/openpipe-chat/input.schema.json
+++ b/app/src/modelProviders/openpipe-chat/input.schema.json
@@ -1,96 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "model": {
-      "description": "ID of the model to use.",
-      "example": "Open-Orca/OpenOrcaxOpenChat-Preview2-13B",
-      "type": "string",
-      "enum": [
-        "Open-Orca/OpenOrcaxOpenChat-Preview2-13B",
-        "Open-Orca/OpenOrca-Platypus2-13B",
-        "NousResearch/Nous-Hermes-Llama2-13b",
-        "jondurbin/airoboros-l2-13b-gpt4-2.0",
-        "lmsys/vicuna-13b-v1.5",
-        "Gryphe/MythoMax-L2-13b",
-        "NousResearch/Nous-Hermes-llama-2-7b"
-      ]
-    },
-    "messages": {
-      "description": "A list of messages comprising the conversation so far.",
-      "type": "array",
-      "minItems": 1,
-      "items": {
-        "type": "object",
-        "properties": {
-          "role": {
-            "type": "string",
-            "enum": ["system", "user", "assistant"],
-            "description": "The role of the messages author. One of `system`, `user`, or `assistant`."
-          },
-          "content": {
-            "type": "string",
-            "description": "The contents of the message. `content` is required for all messages."
-          }
-        },
-        "required": ["role", "content"]
-      }
-    },
-    "temperature": {
-      "type": "number",
-      "minimum": 0,
-      "maximum": 2,
-      "default": 1,
-      "example": 1,
-      "nullable": true,
-      "description": "What sampling temperature to use, between 0 and 2. Higher values like 0.8 will make the output more random, while lower values like 0.2 will make it more focused and deterministic.\n\nWe generally recommend altering this or `top_p` but not both.\n"
-    },
-    "top_p": {
-      "type": "number",
-      "minimum": 0,
-      "maximum": 1,
-      "default": 1,
-      "example": 1,
-      "nullable": true,
-      "description": "An alternative to sampling with temperature, called nucleus sampling, where the model considers the results of the tokens with top_p probability mass. So 0.1 means only the tokens comprising the top 10% probability mass are considered.\n\nWe generally recommend altering this or `temperature` but not both.\n"
-    },
-    "stop": {
-      "description": "Up to 4 sequences where the API will stop generating further tokens.\n",
-      "default": null,
-      "oneOf": [
-        {
-          "type": "string",
-          "nullable": true
-        },
-        {
-          "type": "array",
-          "minItems": 1,
-          "maxItems": 4,
-          "items": {
-            "type": "string"
-          }
-        }
-      ]
-    },
-    "max_tokens": {
-      "description": "The maximum number of [tokens](/tokenizer) to generate in the chat completion.\n\nThe total length of input tokens and generated tokens is limited by the model's context length. [Example Python code](https://github.com/openai/openai-cookbook/blob/main/examples/How_to_count_tokens_with_tiktoken.ipynb) for counting tokens.\n",
-      "type": "integer"
-    },
-    "presence_penalty": {
-      "type": "number",
-      "default": 0,
-      "minimum": -2,
-      "maximum": 2,
-      "nullable": true,
-      "description": "Number between -2.0 and 2.0. Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics.\n\n[See more information about frequency and presence penalties.](/docs/api-reference/parameter-details)\n"
-    },
-    "frequency_penalty": {
-      "type": "number",
-      "default": 0,
-      "minimum": -2,
-      "maximum": 2,
-      "nullable": true,
-      "description": "Number between -2.0 and 2.0. Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim.\n\n[See more information about frequency and presence penalties.](/docs/api-reference/parameter-details)\n"
-    }
-  },
-  "required": ["model", "messages"]
-}
--- a/app/src/modelProviders/openpipe-chat/refinementActions.ts
+++ b/app/src/modelProviders/openpipe-chat/refinementActions.ts
@@ -1,3 +0,0 @@
-import { type RefinementAction } from "../types";
-
-export const refinementActions: Record<string, RefinementAction> = {};
--- a/app/src/modelProviders/openpipe-chat/templatePrompt.ts
+++ b/app/src/modelProviders/openpipe-chat/templatePrompt.ts
@@ -1,274 +0,0 @@
-import { type OpenpipeChatInput } from ".";
-
-// User: Hello<|end_of_turn|>Assistant: Hi<|end_of_turn|>User: How are you today?<|end_of_turn|>Assistant:
-export const templateOpenOrcaPrompt = (messages: OpenpipeChatInput["messages"]) => {
-  const splitter = "<|end_of_turn|>";
-
-  const formattedMessages = messages.map((message) => {
-    if (message.role === "system" || message.role === "user") {
-      return "User: " + message.content;
-    } else {
-      return "Assistant: " + message.content;
-    }
-  });
-
-  let prompt = formattedMessages.join(splitter);
-
-  // Ensure that the prompt ends with an assistant message
-  const lastUserIndex = prompt.lastIndexOf("User:");
-  const lastAssistantIndex = prompt.lastIndexOf("Assistant:");
-  if (lastUserIndex > lastAssistantIndex) {
-    prompt += splitter + "Assistant:";
-  }
-
-  return prompt;
-};
-
-// ### Instruction:
-
-// <prompt> (without the <>)
-
-// ### Response: (leave two newlines for model to respond)
-export const templateAlpacaInstructPrompt = (messages: OpenpipeChatInput["messages"]) => {
-  const splitter = "\n\n";
-
-  const userTag = "### Instruction:\n\n";
-  const assistantTag = "### Response:\n\n";
-
-  const formattedMessages = messages.map((message) => {
-    if (message.role === "system" || message.role === "user") {
-      return userTag + message.content;
-    } else {
-      return assistantTag + message.content;
-    }
-  });
-
-  let prompt = formattedMessages.join(splitter);
-
-  // Ensure that the prompt ends with an assistant message
-  const lastUserIndex = prompt.lastIndexOf(userTag);
-  const lastAssistantIndex = prompt.lastIndexOf(assistantTag);
-  if (lastUserIndex > lastAssistantIndex) {
-    prompt += splitter + assistantTag;
-  }
-
-  return prompt;
-};
-
-// ### System:
-// This is a system prompt, please behave and help the user.
-
-// ### User:
-// Your prompt here
-
-// ### Assistant
-// The output of Stable Beluga 13B
-export const templateSystemUserAssistantPrompt = (messages: OpenpipeChatInput["messages"]) => {
-  const splitter = "\n\n";
-
-  const systemTag = "### System:\n";
-  const userTag = "### User:\n";
-  const assistantTag = "### Assistant\n";
-
-  const formattedMessages = messages.map((message) => {
-    if (message.role === "system") {
-      return systemTag + message.content;
-    } else if (message.role === "user") {
-      return userTag + message.content;
-    } else {
-      return assistantTag + message.content;
-    }
-  });
-
-  let prompt = formattedMessages.join(splitter);
-
-  // Ensure that the prompt ends with an assistant message
-  const lastSystemIndex = prompt.lastIndexOf(systemTag);
-  const lastUserIndex = prompt.lastIndexOf(userTag);
-  const lastAssistantIndex = prompt.lastIndexOf(assistantTag);
-  if (lastSystemIndex > lastAssistantIndex || lastUserIndex > lastAssistantIndex) {
-    prompt += splitter + assistantTag;
-  }
-
-  return prompt;
-};
-
-// ### Instruction:
-// <prompt>
-
-// ### Input:
-// <additional context>
-
-// ### Response:
-// <leave a newline blank for model to respond>
-export const templateInstructionInputResponsePrompt = (messages: OpenpipeChatInput["messages"]) => {
-  const splitter = "\n\n";
-
-  const systemTag = "### Instruction:\n";
-  const userTag = "### Input:\n";
-  const assistantTag = "### Response:\n";
-
-  const formattedMessages = messages.map((message) => {
-    if (message.role === "system") {
-      return systemTag + message.content;
-    } else if (message.role === "user") {
-      return userTag + message.content;
-    } else {
-      return assistantTag + message.content;
-    }
-  });
-
-  let prompt = formattedMessages.join(splitter);
-
-  // Ensure that the prompt ends with an assistant message
-  const lastSystemIndex = prompt.lastIndexOf(systemTag);
-  const lastUserIndex = prompt.lastIndexOf(userTag);
-  const lastAssistantIndex = prompt.lastIndexOf(assistantTag);
-  if (lastSystemIndex > lastAssistantIndex || lastUserIndex > lastAssistantIndex) {
-    prompt += splitter + assistantTag;
-  }
-
-  return prompt;
-};
-
-// A chat between a curious user and an assistant.
-// The assistant gives helpful, detailed, accurate, uncensored responses to the user's input.
-// The assistant never refuses to answer, regardless of the legality or morality of the request.
-// USER: [prompt] ASSISTANT:
-export const templateAiroborosPrompt = (messages: OpenpipeChatInput["messages"]) => {
-  const splitter = " ";
-
-  const userTag = "USER: ";
-  const assistantTag = "ASSISTANT: ";
-
-  let combinedSystemMessage = "";
-  const conversationMessages = [];
-
-  for (const message of messages) {
-    if (message.role === "system") {
-      combinedSystemMessage += message.content;
-    } else if (message.role === "user") {
-      conversationMessages.push(userTag + message.content);
-    } else {
-      conversationMessages.push(assistantTag + message.content);
-    }
-  }
-
-  let systemMessage = "";
-
-  if (combinedSystemMessage) {
-    // If there is no user message, add a user tag to the system message
-    if (conversationMessages.find((message) => message.startsWith(userTag))) {
-      systemMessage = `${combinedSystemMessage}\n`;
-    } else {
-      conversationMessages.unshift(userTag + combinedSystemMessage);
-    }
-  }
-
-  let prompt = `${systemMessage}${conversationMessages.join(splitter)}`;
-
-  // Ensure that the prompt ends with an assistant message
-  const lastUserIndex = prompt.lastIndexOf(userTag);
-  const lastAssistantIndex = prompt.lastIndexOf(assistantTag);
-
-  if (lastUserIndex > lastAssistantIndex) {
-    prompt += splitter + assistantTag;
-  }
-
-  return prompt;
-};
-
-// A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.
-
-// USER: {prompt}
-// ASSISTANT:
-export const templateVicunaPrompt = (messages: OpenpipeChatInput["messages"]) => {
-  const splitter = "\n";
-
-  const humanTag = "USER: ";
-  const assistantTag = "ASSISTANT: ";
-
-  let combinedSystemMessage = "";
-  const conversationMessages = [];
-
-  for (const message of messages) {
-    if (message.role === "system") {
-      combinedSystemMessage += message.content;
-    } else if (message.role === "user") {
-      conversationMessages.push(humanTag + message.content);
-    } else {
-      conversationMessages.push(assistantTag + message.content);
-    }
-  }
-
-  let systemMessage = "";
-
-  if (combinedSystemMessage) {
-    // If there is no user message, add a user tag to the system message
-    if (conversationMessages.find((message) => message.startsWith(humanTag))) {
-      systemMessage = `${combinedSystemMessage}\n\n`;
-    } else {
-      conversationMessages.unshift(humanTag + combinedSystemMessage);
-    }
-  }
-
-  let prompt = `${systemMessage}${conversationMessages.join(splitter)}`;
-
-  // Ensure that the prompt ends with an assistant message
-  const lastHumanIndex = prompt.lastIndexOf(humanTag);
-  const lastAssistantIndex = prompt.lastIndexOf(assistantTag);
-  if (lastHumanIndex > lastAssistantIndex) {
-    prompt += splitter + assistantTag;
-  }
-
-  return prompt.trim();
-};
-
-// <System prompt/Character Card>
-
-// ### Instruction:
-// Your instruction or question here.
-// For roleplay purposes, I suggest the following - Write <CHAR NAME>'s next reply in a chat between <YOUR NAME> and <CHAR NAME>. Write a single reply only.
-
-// ### Response:
-export const templateGryphePrompt = (messages: OpenpipeChatInput["messages"]) => {
-  const splitter = "\n\n";
-
-  const instructionTag = "### Instruction:\n";
-  const responseTag = "### Response:\n";
-
-  let combinedSystemMessage = "";
-  const conversationMessages = [];
-
-  for (const message of messages) {
-    if (message.role === "system") {
-      combinedSystemMessage += message.content;
-    } else if (message.role === "user") {
-      conversationMessages.push(instructionTag + message.content);
-    } else {
-      conversationMessages.push(responseTag + message.content);
-    }
-  }
-
-  let systemMessage = "";
-
-  if (combinedSystemMessage) {
-    // If there is no user message, add a user tag to the system message
-    if (conversationMessages.find((message) => message.startsWith(instructionTag))) {
-      systemMessage = `${combinedSystemMessage}\n\n`;
-    } else {
-      conversationMessages.unshift(instructionTag + combinedSystemMessage);
-    }
-  }
-
-  let prompt = `${systemMessage}${conversationMessages.join(splitter)}`;
-
-  // Ensure that the prompt ends with an assistant message
-  const lastInstructionIndex = prompt.lastIndexOf(instructionTag);
-  const lastAssistantIndex = prompt.lastIndexOf(responseTag);
-  if (lastInstructionIndex > lastAssistantIndex) {
-    prompt += splitter + responseTag;
-  }
-
-  return prompt;
-};
--- a/app/src/modelProviders/replicate-llama2/getCompletion.ts
+++ b/app/src/modelProviders/replicate-llama2/getCompletion.ts
@@ -8,8 +8,8 @@ const replicate = new Replicate({
 });

 const modelIds: Record<ReplicateLlama2Input["model"], string> = {
-  "7b-chat": "d24902e3fa9b698cc208b5e63136c4e26e828659a9f09827ca6ec5bb83014381",
-  "13b-chat": "9dff94b1bed5af738655d4a7cbcdcde2bd503aa85c94334fe1f42af7f3dd5ee3",
+  "7b-chat": "4f0b260b6a13eb53a6b1891f089d57c08f41003ae79458be5011303d81a394dc",
+  "13b-chat": "2a7f981751ec7fdf87b5b91ad4db53683a98082e9ff7bfd12c8cd5ea85980a52",
  "70b-chat": "2c1608e18606fad2812020dc541930f2d0495ce32eee50074220b87300bc16e1",
 };

--- a/app/src/modelProviders/types.ts
+++ b/app/src/modelProviders/types.ts
@@ -2,13 +2,11 @@ import { type JSONSchema4 } from "json-schema";
 import { type IconType } from "react-icons";
 import { type JsonValue } from "type-fest";
 import { z } from "zod";
-import { type OpenpipeChatInput } from "./openpipe-chat";

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

 export type SupportedProvider = z.infer<typeof ZodSupportedProvider>;
@@ -24,8 +22,6 @@ export type Model = {
  description?: string;
  learnMoreUrl?: string;
  apiDocsUrl?: string;
-  templatePrompt?: (initialPrompt: OpenpipeChatInput["messages"]) => string;
-  defaultStopTokens?: string[];
 };

 export type ProviderModel = { provider: z.infer<typeof ZodSupportedProvider>; model: string };
--- a/app/src/pages/admin/jobs/index.tsx
+++ b/app/src/pages/admin/jobs/index.tsx
@@ -1,54 +0,0 @@
-import { Card, Table, Tbody, Td, Th, Thead, Tr } from "@chakra-ui/react";
-import dayjs from "dayjs";
-import { isDate, isObject, isString } from "lodash-es";
-import AppShell from "~/components/nav/AppShell";
-import { type RouterOutputs, api } from "~/utils/api";
-
-const fieldsToShow: (keyof RouterOutputs["adminJobs"]["list"][0])[] = [
-  "id",
-  "queue_name",
-  "payload",
-  "priority",
-  "attempts",
-  "last_error",
-  "created_at",
-  "key",
-  "locked_at",
-  "run_at",
-];
-
-export default function Jobs() {
-  const jobs = api.adminJobs.list.useQuery({});
-
-  return (
-    <AppShell title="Admin Jobs">
-      <Card m={4} overflowX="auto">
-        <Table>
-          <Thead>
-            <Tr>
-              {fieldsToShow.map((field) => (
-                <Th key={field}>{field}</Th>
-              ))}
-            </Tr>
-          </Thead>
-          <Tbody>
-            {jobs.data?.map((job) => (
-              <Tr key={job.id}>
-                {fieldsToShow.map((field) => {
-                  // Check if object
-                  let value = job[field];
-                  if (isDate(value)) {
-                    value = dayjs(value).format("YYYY-MM-DD HH:mm:ss");
-                  } else if (isObject(value) && !isString(value)) {
-                    value = JSON.stringify(value);
-                  } // check if date
-                  return <Td key={field}>{value}</Td>;
-                })}
-              </Tr>
-            ))}
-          </Tbody>
-        </Table>
-      </Card>
-    </AppShell>
-  );
-}
--- a/app/src/pages/api/v1/[...trpc].ts
+++ b/app/src/pages/api/v1/[...trpc].ts
@@ -1,14 +1,17 @@
 import { type NextApiRequest, type NextApiResponse } from "next";
 import cors from "nextjs-cors";
 import { createOpenApiNextHandler } from "trpc-openapi";
-import { v1ApiRouter } from "~/server/api/external/v1Api.router";
-import { createOpenApiContext } from "~/server/api/external/openApiTrpc";
+import { createProcedureCache } from "trpc-openapi/dist/adapters/node-http/procedures";
+import { appRouter } from "~/server/api/root.router";
+import { createTRPCContext } from "~/server/api/trpc";

 const openApiHandler = createOpenApiNextHandler({
-  router: v1ApiRouter,
-  createContext: createOpenApiContext,
+  router: appRouter,
+  createContext: createTRPCContext,
 });

+const cache = createProcedureCache(appRouter);
+
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
  // Setup CORS
  await cors(req, res);
--- a/app/src/pages/api/v1/openapi.json.ts
+++ b/app/src/pages/api/v1/openapi.json.ts
@@ -1,12 +1,12 @@
 import { type NextApiRequest, type NextApiResponse } from "next";
 import { generateOpenApiDocument } from "trpc-openapi";
-import { v1ApiRouter } from "~/server/api/external/v1Api.router";
+import { appRouter } from "~/server/api/root.router";

-export const openApiDocument = generateOpenApiDocument(v1ApiRouter, {
+export const openApiDocument = generateOpenApiDocument(appRouter, {
  title: "OpenPipe API",
  description: "The public API for reporting API calls to OpenPipe",
-  version: "0.1.1",
-  baseUrl: "https://app.openpipe.ai/api/v1",
+  version: "0.1.0",
+  baseUrl: "https://app.openpipe.ai/api",
 });
 // Respond with our OpenAPI schema
 const hander = (req: NextApiRequest, res: NextApiResponse) => {
--- a/app/src/pages/api/sentry-example-api.js
+++ b/app/src/pages/api/sentry-example-api.js
@@ -0,0 +1,6 @@
+// A faulty API route to test Sentry's error monitoring
+// @ts-expect-error just a test file, don't care about types
+export default function handler(_req, res) {
+  throw new Error("Sentry Example API Route Error");
+  res.status(200).json({ name: "John Doe" });
+}
--- a/app/src/pages/data/[id].tsx
+++ b/app/src/pages/data/[id].tsx
@@ -0,0 +1,97 @@
+import {
+  Box,
+  Breadcrumb,
+  BreadcrumbItem,
+  Center,
+  Flex,
+  Icon,
+  Input,
+  VStack,
+} from "@chakra-ui/react";
+import Link from "next/link";
+
+import { useRouter } from "next/router";
+import { useState, useEffect } from "react";
+import { RiDatabase2Line } from "react-icons/ri";
+import AppShell from "~/components/nav/AppShell";
+import { api } from "~/utils/api";
+import { useDataset, useHandledAsyncCallback } from "~/utils/hooks";
+import DatasetEntriesTable from "~/components/datasets/DatasetEntriesTable";
+import { DatasetHeaderButtons } from "~/components/datasets/DatasetHeaderButtons/DatasetHeaderButtons";
+import PageHeaderContainer from "~/components/nav/PageHeaderContainer";
+import ProjectBreadcrumbContents from "~/components/nav/ProjectBreadcrumbContents";
+
+export default function Dataset() {
+  const router = useRouter();
+  const utils = api.useContext();
+
+  const dataset = useDataset();
+  const datasetId = router.query.id as string;
+
+  const [name, setName] = useState(dataset.data?.name || "");
+  useEffect(() => {
+    setName(dataset.data?.name || "");
+  }, [dataset.data?.name]);
+
+  const updateMutation = api.datasets.update.useMutation();
+  const [onSaveName] = useHandledAsyncCallback(async () => {
+    if (name && name !== dataset.data?.name && dataset.data?.id) {
+      await updateMutation.mutateAsync({
+        id: dataset.data.id,
+        updates: { name: name },
+      });
+      await Promise.all([utils.datasets.list.invalidate(), utils.datasets.get.invalidate()]);
+    }
+  }, [updateMutation, dataset.data?.id, dataset.data?.name, name]);
+
+  if (!dataset.isLoading && !dataset.data) {
+    return (
+      <AppShell title="Dataset not found">
+        <Center h="100%">
+          <div>Dataset not found 😕</div>
+        </Center>
+      </AppShell>
+    );
+  }
+
+  return (
+    <AppShell title={dataset.data?.name}>
+      <VStack h="full">
+        <PageHeaderContainer>
+          <Breadcrumb>
+            <BreadcrumbItem>
+              <ProjectBreadcrumbContents projectName={dataset.data?.project?.name} />
+            </BreadcrumbItem>
+            <BreadcrumbItem>
+              <Link href="/data">
+                <Flex alignItems="center" _hover={{ textDecoration: "underline" }}>
+                  <Icon as={RiDatabase2Line} boxSize={4} mr={2} /> Datasets
+                </Flex>
+              </Link>
+            </BreadcrumbItem>
+            <BreadcrumbItem isCurrentPage>
+              <Input
+                size="sm"
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                onBlur={onSaveName}
+                borderWidth={1}
+                borderColor="transparent"
+                fontSize={16}
+                px={0}
+                minW={{ base: 100, lg: 300 }}
+                flex={1}
+                _hover={{ borderColor: "gray.300" }}
+                _focus={{ borderColor: "blue.500", outline: "none" }}
+              />
+            </BreadcrumbItem>
+          </Breadcrumb>
+          <DatasetHeaderButtons />
+        </PageHeaderContainer>
+        <Box w="full" overflowX="auto" flex={1} px={8} pt={8} pb={16}>
+          {datasetId && <DatasetEntriesTable />}
+        </Box>
+      </VStack>
+    </AppShell>
+  );
+}
--- a/app/src/pages/data/index.tsx
+++ b/app/src/pages/data/index.tsx
@@ -0,0 +1,49 @@
+import { SimpleGrid, Icon, Breadcrumb, BreadcrumbItem, Flex } from "@chakra-ui/react";
+import AppShell from "~/components/nav/AppShell";
+import { RiDatabase2Line } from "react-icons/ri";
+import {
+  DatasetCard,
+  DatasetCardSkeleton,
+  NewDatasetCard,
+} from "~/components/datasets/DatasetCard";
+import PageHeaderContainer from "~/components/nav/PageHeaderContainer";
+import ProjectBreadcrumbContents from "~/components/nav/ProjectBreadcrumbContents";
+import { useDatasets } from "~/utils/hooks";
+
+export default function DatasetsPage() {
+  const datasets = useDatasets();
+
+  return (
+    <AppShell title="Data" requireAuth>
+      <PageHeaderContainer>
+        <Breadcrumb>
+          <BreadcrumbItem>
+            <ProjectBreadcrumbContents />
+          </BreadcrumbItem>
+          <BreadcrumbItem minH={8}>
+            <Flex alignItems="center">
+              <Icon as={RiDatabase2Line} boxSize={4} mr={2} /> Datasets
+            </Flex>
+          </BreadcrumbItem>
+        </Breadcrumb>
+      </PageHeaderContainer>
+      <SimpleGrid w="full" columns={{ base: 1, md: 2, lg: 3, xl: 4 }} spacing={8} py={4} px={8}>
+        <NewDatasetCard />
+        {datasets.data && !datasets.isLoading ? (
+          datasets?.data?.map((dataset) => (
+            <DatasetCard
+              key={dataset.id}
+              dataset={{ ...dataset, numEntries: dataset._count.datasetEntries }}
+            />
+          ))
+        ) : (
+          <>
+            <DatasetCardSkeleton />
+            <DatasetCardSkeleton />
+            <DatasetCardSkeleton />
+          </>
+        )}
+      </SimpleGrid>
+    </AppShell>
+  );
+}
--- a/Show More
+++ b/Show More