Add smoketest (broken)

.github/workflows/ci.yaml

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

.gitignore

@@ -1,3 +0,0 @@
-.env
-.venv/
-*.pyc

app/.env.example

@@ -26,11 +26,6 @@ NEXT_PUBLIC_SOCKET_URL="http://localhost:3318"
 NEXTAUTH_SECRET="your_secret"
 NEXTAUTH_URL="http://localhost:3000"
 
-NEXT_PUBLIC_HOST="http://localhost:3000"
-
 # Next Auth Github Provider
 GITHUB_CLIENT_ID="your_client_id"
 GITHUB_CLIENT_SECRET="your_secret"
-
-OPENPIPE_BASE_URL="http://localhost:3000/api"
-OPENPIPE_API_KEY="your_key"

app/.eslintrc.cjs

@@ -37,7 +37,6 @@ const config = {
       "warn",
       { vars: "all", varsIgnorePattern: "^_", args: "after-used", argsIgnorePattern: "^_" },
     ],
-    "react/no-unescaped-entities": "off",
   },
 };
 

app/.gitignore

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

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

@@ -14,20 +14,11 @@ declare module "nextjs-routes" {
     | StaticRoute<"/account/signin">
     | 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<"/data/[id]", { "id": string }>
-    | StaticRoute<"/data">
     | DynamicRoute<"/experiments/[id]", { "id": string }>
     | StaticRoute<"/experiments">
-    | StaticRoute<"/">
-    | StaticRoute<"/logged-calls">
-    | StaticRoute<"/project/settings">
-    | StaticRoute<"/sentry-example-page">
-    | StaticRoute<"/world-champs">
-    | StaticRoute<"/world-champs/signup">;
+    | StaticRoute<"/">;
 
   interface StaticRoute<Pathname> {
     pathname: Pathname;

app/Dockerfile

@@ -20,10 +20,6 @@ FROM base as builder
 # Include all NEXT_PUBLIC_* env vars here
 ARG NEXT_PUBLIC_POSTHOG_KEY
 ARG NEXT_PUBLIC_SOCKET_URL
-ARG NEXT_PUBLIC_HOST
-ARG NEXT_PUBLIC_SENTRY_DSN
-ARG SENTRY_AUTH_TOKEN
-ARG NEXT_PUBLIC_FF_SHOW_LOGGED_CALLS
 
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules

app/README.md

@@ -1,62 +1,52 @@
-<!-- <img src="https://github.com/openpipe/openpipe/assets/41524992/ca59596e-eb80-40f9-921f-6d67f6e6d8fa" width="72px" /> -->
+<img src="https://github.com/openpipe/openpipe/assets/41524992/ca59596e-eb80-40f9-921f-6d67f6e6d8fa" width="72px" />
 
 # OpenPipe
 
-OpenPipe is a flexible playground for comparing and optimizing LLM prompts. It lets you quickly generate, test and compare candidate prompts, and can automatically [translate](#-translate-between-model-apis) those prompts between models.
-
-<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).
+OpenPipe is a flexible playground for comparing and optimizing LLM prompts. It lets you quickly generate, test and compare candidate prompts with realistic sample data.
 
 ## Sample Experiments
 
-These are simple experiments users have created that show how OpenPipe works. Feel free to fork them and start experimenting yourself.
+These are simple experiments users have created that show how OpenPipe works.
 
-- [Twitter Sentiment Analysis](https://app.openpipe.ai/experiments/62c20a73-2012-4a64-973c-4b665ad46a57)
+- [Country Capitals](https://app.openpipe.ai/experiments/11111111-1111-1111-1111-111111111111)
 - [Reddit User Needs](https://app.openpipe.ai/experiments/22222222-2222-2222-2222-222222222222)
 - [OpenAI Function Calls](https://app.openpipe.ai/experiments/2ebbdcb3-ed51-456e-87dc-91f72eaf3e2b)
 - [Activity Classification](https://app.openpipe.ai/experiments/3950940f-ab6b-4b74-841d-7e9dbc4e4ff8)
 
+<img src="https://github.com/openpipe/openpipe/assets/176426/fc7624c6-5b65-4d4d-82b7-4a816f3e5678" alt="demo" height="400px">
+
+You can use our hosted version of OpenPipe at [https://openpipe.ai]. You can also clone this repository and [run it locally](#running-locally).
+
+## High-Level Features
+
+**Configure Multiple Prompts**  
+Set up multiple prompt configurations and compare their output side-by-side. Each configuration can be configured independently.
+
+**Visualize Responses**  
+Inspect prompt completions side-by-side.
+
+**Test Many Inputs**  
+OpenPipe lets you _template_ a prompt. Use the templating feature to run the prompts you're testing against many potential inputs for broader coverage of your problem space than you'd get with manual testing.
+
+**🪄 Auto-generate Test Scenarios**  
+OpenPipe includes a tool to generate new test scenarios based on your existing prompts and scenarios. Just click "Autogenerate Scenario" to try it out!
+
+**Prompt Validation and Typeahead**  
+We use OpenAI's OpenAPI spec to automatically provide typeahead and validate prompts.
+
+<img alt="typeahead" src="https://github.com/openpipe/openpipe/assets/176426/acc638f8-d851-4742-8d01-fe6f98890840" height="300px">
+
+**Function Call Support**  
+Natively supports [OpenAI function calls](https://openai.com/blog/function-calling-and-other-api-updates) on supported models.
+
+<img height="300px" alt="function calls" src="https://github.com/openpipe/openpipe/assets/176426/48ad13fe-af2f-4294-bf32-62015597fd9b">
+
 ## Supported Models
 
 - All models available through the OpenAI [chat completion API](https://platform.openai.com/docs/guides/gpt/chat-completions-api)
 - Llama2 [7b chat](https://replicate.com/a16z-infra/llama7b-v2-chat), [13b chat](https://replicate.com/a16z-infra/llama13b-v2-chat), [70b chat](https://replicate.com/replicate/llama70b-v2-chat).
 - Anthropic's [Claude 1 Instant](https://www.anthropic.com/index/introducing-claude) and [Claude 2](https://www.anthropic.com/index/claude-2)
 
-## 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
 
 1. Install [Postgresql](https://www.postgresql.org/download/).
@@ -65,14 +55,7 @@ OpenPipe includes a tool to generate new test scenarios based on your existing p
 4. Clone this repository: `git clone https://github.com/openpipe/openpipe`
 5. Install the dependencies: `cd openpipe && pnpm install`
 6. Create a `.env` file (`cp .env.example .env`) and enter your `OPENAI_API_KEY`.
-7. Update `DATABASE_URL` if necessary to point to your Postgres instance and run `pnpm prisma migrate dev` to create the database.
+7. Update `DATABASE_URL` if necessary to point to your Postgres instance and run `pnpm prisma db push` to create the database.
 8. Create a [GitHub OAuth App](https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/creating-an-oauth-app) and update the `GITHUB_CLIENT_ID` and `GITHUB_CLIENT_SECRET` values. (Note: a PR to make auth optional when running locally would be a great contribution!)
 9. Start the app: `pnpm dev`.
 10. Navigate to [http://localhost:3000](http://localhost:3000)
-
-## Testing Locally
-
-1. Copy your `.env` file to `.env.test`.
-2. Update the `DATABASE_URL` to have a different database name than your development one
-3. Run `DATABASE_URL=[your new datatase url] pnpm prisma migrate dev --skip-seed --skip-generate`
-4. Run `pnpm test`

app/next.config.mjs

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

app/package.json

@@ -16,20 +16,17 @@
     "postinstall": "prisma generate",
     "lint": "next lint",
     "start": "next start",
-    "codegen": "tsx src/server/scripts/client-codegen.ts",
+    "codegen": "tsx src/codegen/export-client-types.ts",
     "seed": "tsx prisma/seed.ts",
-    "check": "concurrently 'pnpm lint' 'pnpm tsc' 'pnpm prettier . --check'",
-    "test": "pnpm vitest"
+    "check": "concurrently 'pnpm lint' 'pnpm tsc' 'pnpm prettier . --check'"
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.5.8",
     "@apidevtools/json-schema-ref-parser": "^10.1.0",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/standalone": "^7.22.9",
-    "@chakra-ui/anatomy": "^2.2.0",
     "@chakra-ui/next-js": "^2.1.4",
     "@chakra-ui/react": "^2.7.1",
-    "@chakra-ui/styled-system": "^2.9.1",
     "@emotion/react": "^11.11.1",
     "@emotion/server": "^11.11.0",
     "@emotion/styled": "^11.11.0",
@@ -37,7 +34,6 @@
     "@monaco-editor/loader": "^1.3.3",
     "@next-auth/prisma-adapter": "^1.0.5",
     "@prisma/client": "^4.14.0",
-    "@sentry/nextjs": "^7.61.0",
     "@t3-oss/env-nextjs": "^0.3.1",
     "@tabler/icons-react": "^2.22.0",
     "@tanstack/react-query": "^4.29.7",
@@ -45,12 +41,10 @@
     "@trpc/next": "^10.26.0",
     "@trpc/react-query": "^10.26.0",
     "@trpc/server": "^10.26.0",
-    "@vercel/og": "^0.5.9",
     "ast-types": "^0.14.2",
     "chroma-js": "^2.4.2",
     "concurrently": "^8.2.0",
     "cors": "^2.8.5",
-    "crypto-random-string": "^5.0.0",
     "dayjs": "^1.11.8",
     "dedent": "^1.0.1",
     "dotenv": "^16.3.1",
@@ -63,32 +57,25 @@
     "json-schema-to-typescript": "^13.0.2",
     "json-stringify-pretty-compact": "^4.0.0",
     "jsonschema": "^1.4.1",
-    "kysely": "^0.26.1",
     "lodash-es": "^4.17.21",
-    "lucide-react": "^0.265.0",
     "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",
-    "openai": "4.0.0-beta.7",
-    "pg": "^8.11.2",
+    "openai": "4.0.0-beta.2",
     "pluralize": "^8.0.0",
-    "posthog-js": "^1.75.3",
-    "posthog-node": "^3.1.1",
+    "posthog-js": "^1.68.4",
     "prettier": "^3.0.0",
     "prismjs": "^1.29.0",
     "react": "18.2.0",
     "react-diff-viewer": "^3.1.1",
     "react-dom": "18.2.0",
-    "react-github-btn": "^1.4.0",
     "react-icons": "^4.10.1",
-    "react-json-tree": "^0.18.0",
     "react-select": "^5.7.4",
     "react-syntax-highlighter": "^15.5.0",
     "react-textarea-autosize": "^8.5.0",
     "recast": "^0.23.3",
-    "recharts": "^2.7.2",
     "replicate": "^0.12.3",
     "socket.io": "^4.7.1",
     "socket.io-client": "^4.7.1",
@@ -113,7 +100,6 @@
     "@types/json-schema": "^7.0.12",
     "@types/lodash-es": "^4.17.8",
     "@types/node": "^18.16.0",
-    "@types/pg": "^8.10.2",
     "@types/pluralize": "^0.0.30",
     "@types/prismjs": "^1.26.0",
     "@types/react": "^18.2.6",
@@ -122,7 +108,6 @@
     "@types/uuid": "^9.0.2",
     "@typescript-eslint/eslint-plugin": "^5.59.6",
     "@typescript-eslint/parser": "^5.59.6",
-    "csv-parse": "^5.4.0",
     "eslint": "^8.40.0",
     "eslint-config-next": "^13.4.2",
     "eslint-plugin-unused-imports": "^2.0.0",

app/prisma/datasets/validated_tweets.csv

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

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

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

app/prisma/migrations/20230801195916_add_world_champs/migration.sql

@@ -1,16 +0,0 @@
--- CreateTable
-CREATE TABLE "WorldChampEntrant" (
-    "id" UUID NOT NULL,
-    "userId" UUID NOT NULL,
-    "approved" BOOLEAN NOT NULL DEFAULT false,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "WorldChampEntrant_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "WorldChampEntrant_userId_key" ON "WorldChampEntrant"("userId");
-
--- AddForeignKey
-ALTER TABLE "WorldChampEntrant" ADD CONSTRAINT "WorldChampEntrant_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

app/prisma/migrations/20230801234208_add_created_at_and_updated_at_to_users_table/migration.sql

@@ -1,3 +0,0 @@
--- AlterTable
-ALTER TABLE "User" ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

app/prisma/schema.prisma

@@ -16,8 +16,11 @@ model Experiment {
 
     sortIndex Int @default(0)
 
-    projectId String   @db.Uuid
-    project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade)
+    organizationId String        @db.Uuid
+    organization   Organization? @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+
+    dataFlowId String?     @db.Uuid
+    dataFlow   DataFlow?   @relation(fields: [dataFlowId], references: [id], onDelete: Cascade)
 
     createdAt DateTime @default(now())
     updatedAt DateTime @updatedAt
@@ -31,11 +34,11 @@ model Experiment {
 model PromptVariant {
     id String @id @default(uuid()) @db.Uuid
 
-    label                    String
-    promptConstructor        String
-    promptConstructorVersion Int
-    model                    String
-    modelProvider            String
+    label              String
+    constructFn        String
+    constructFnVersion Int
+    model              String
+    modelProvider      String
 
     uiId      String  @default(uuid()) @db.Uuid
     visible   Boolean @default(true)
@@ -112,26 +115,29 @@ 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)
+    inputHash           String
+    requestedAt         DateTime?
+    receivedAt          DateTime?
+    output              Json?
+    cost                Float?
+    promptTokens        Int?
+    completionTokens    Int?
+    statusCode          Int?
+    errorMessage        String?
+    retryTime           DateTime?
+    outdated            Boolean @default(false)
 
     createdAt DateTime @default(now())
     updatedAt DateTime @updatedAt
 
-    scenarioVariantCellId String              @db.Uuid
-    scenarioVariantCell   ScenarioVariantCell @relation(fields: [scenarioVariantCellId], references: [id], onDelete: Cascade)
-    outputEvaluations     OutputEvaluation[]
+    scenarioVariantCellId String?              @db.Uuid
+    scenarioVariantCell   ScenarioVariantCell? @relation(fields: [scenarioVariantCellId], references: [id], onDelete: Cascade)
+    outputEvaluations      OutputEvaluation[]
 
-    @@index([cacheKey])
+    loggedCallId String? @db.Uuid
+    loggedCall   LoggedCall? @relation(fields: [loggedCallId], references: [id], onDelete: Cascade)
+
+    @@index([inputHash])
 }
 
 enum EvalType {
@@ -150,8 +156,8 @@ model Evaluation {
     experimentId String     @db.Uuid
     experiment   Experiment @relation(fields: [experimentId], references: [id], onDelete: Cascade)
 
-    createdAt         DateTime           @default(now())
-    updatedAt         DateTime           @updatedAt
+    createdAt        DateTime           @default(now())
+    updatedAt        DateTime           @updatedAt
     outputEvaluations OutputEvaluation[]
 }
 
@@ -162,7 +168,7 @@ model OutputEvaluation {
     result  Float
     details String?
 
-    modelResponseId String        @db.Uuid
+    modelResponseId String      @db.Uuid
     modelResponse   ModelResponse @relation(fields: [modelResponseId], references: [id], onDelete: Cascade)
 
     evaluationId String     @db.Uuid
@@ -174,61 +180,77 @@ model OutputEvaluation {
     @@unique([modelResponseId, evaluationId])
 }
 
-model Dataset {
+model LoggedCall {
     id String @id @default(uuid()) @db.Uuid
 
-    name           String
-    datasetEntries DatasetEntry[]
+    promptFunctionHash String
+    promptFunction     String
+    prompt     Json
+    responsePayload    Json?
+    scenarioVariables Json
+    model              String
+    modelProvider      String
 
-    projectId String  @db.Uuid
-    project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
+    dataFlowId String     @db.Uuid
+    dataFlow   DataFlow   @relation(fields: [dataFlowId], references: [id], onDelete: Cascade)
+
+    modelResponse      ModelResponse[]
 
     createdAt DateTime @default(now())
     updatedAt DateTime @updatedAt
 }
 
-model DatasetEntry {
+model DataFlow {
     id String @id @default(uuid()) @db.Uuid
 
-    input  String
-    output String?
-
-    datasetId String   @db.Uuid
-    dataset   Dataset? @relation(fields: [datasetId], references: [id], onDelete: Cascade)
+    label String
+    experiments   Experiment[]
+    loggedCalls      LoggedCall[]
+    organizationId String        @db.Uuid
+    organization   Organization? @relation(fields: [organizationId], references: [id], onDelete: Cascade)
 
     createdAt DateTime @default(now())
     updatedAt DateTime @updatedAt
 }
 
-model Project {
-    id   String @id @default(uuid()) @db.Uuid
-    name String @default("Project 1")
+model ApiKey {
+    id        String  @id @default(uuid()) @db.Uuid
 
-    personalProjectUserId String? @unique @db.Uuid
-    personalProjectUser   User?   @relation(fields: [personalProjectUserId], references: [id], onDelete: Cascade)
+    name      String
+    key     String  @unique
+    organizationId String        @db.Uuid
+    organization   Organization? @relation(fields: [organizationId], references: [id], onDelete: Cascade)
 
-    createdAt    DateTime      @default(now())
-    updatedAt    DateTime      @updatedAt
-    projectUsers ProjectUser[]
-    experiments  Experiment[]
-    datasets     Dataset[]
-    loggedCalls  LoggedCall[]
-    apiKeys      ApiKey[]
+    createdAt DateTime @default(now())
+    updatedAt DateTime @updatedAt
 }
 
-enum ProjectUserRole {
+model Organization {
+    id                String  @id @default(uuid()) @db.Uuid
+    personalOrgUserId String? @unique @db.Uuid
+    personalOrgUser   User?   @relation(fields: [personalOrgUserId], references: [id], onDelete: Cascade)
+    apiKeys         ApiKey[]
+    dataFlows         DataFlow[]
+
+    createdAt        DateTime           @default(now())
+    updatedAt        DateTime           @updatedAt
+    organizationUsers OrganizationUser[]
+    experiments       Experiment[]
+}
+
+enum OrganizationUserRole {
     ADMIN
     MEMBER
     VIEWER
 }
 
-model ProjectUser {
+model OrganizationUser {
     id String @id @default(uuid()) @db.Uuid
 
-    role ProjectUserRole
+    role OrganizationUserRole
 
-    projectId String   @db.Uuid
-    project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade)
+    organizationId String        @db.Uuid
+    organization   Organization? @relation(fields: [organizationId], references: [id], onDelete: Cascade)
 
     userId String @db.Uuid
     user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
@@ -236,114 +258,7 @@ model ProjectUser {
     createdAt DateTime @default(now())
     updatedAt DateTime @updatedAt
 
-    @@unique([projectId, userId])
-}
-
-model WorldChampEntrant {
-    id String @id @default(uuid()) @db.Uuid
-
-    userId String @db.Uuid
-    user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
-
-    approved Boolean @default(false)
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
-
-    @@unique([userId])
-}
-
-model LoggedCall {
-    id String @id @default(uuid()) @db.Uuid
-
-    requestedAt DateTime
-
-    // True if this call was served from the cache, false otherwise
-    cacheHit Boolean
-
-    // A LoggedCall is always associated with a LoggedCallModelResponse. If this
-    // is a cache miss, we create a new LoggedCallModelResponse.
-    // If it's a cache hit, it's a pre-existing LoggedCallModelResponse.    
-    modelResponseId String?                  @db.Uuid
-    modelResponse   LoggedCallModelResponse? @relation(fields: [modelResponseId], references: [id], onDelete: Cascade)
-
-    // The responses created by this LoggedCall. Will be empty if this LoggedCall was a cache hit.
-    createdResponses LoggedCallModelResponse[] @relation(name: "ModelResponseOriginalCall")
-
-    projectId String   @db.Uuid
-    project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade)
-
-    tags LoggedCallTag[]
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
-
-    @@index([requestedAt])
-}
-
-model LoggedCallModelResponse {
-    id String @id @default(uuid()) @db.Uuid
-
-    reqPayload Json
-
-    // The HTTP status returned by the model provider
-    statusCode  Int?
-    respPayload Json?
-
-    // Should be null if the request was successful, and some string if the request failed.
-    errorMessage String?
-
-    requestedAt DateTime
-    receivedAt   DateTime
-
-    // Note: the function to calculate the cacheKey should include the project
-    // ID so we don't share cached responses between projects, which could be an
-    // attack vector. Also, we should only set the cacheKey on the model if the
-    // request was successful.
-    cacheKey String?
-
-    // Derived fields
-    durationMs   Int?
-    inputTokens  Int?
-    outputTokens Int?
-    finishReason String?
-    completionId String?
-    cost         Decimal? @db.Decimal(18, 12)
-
-    // The LoggedCall that created this LoggedCallModelResponse
-    originalLoggedCallId String     @unique @db.Uuid
-    originalLoggedCall   LoggedCall @relation(name: "ModelResponseOriginalCall", fields: [originalLoggedCallId], references: [id], onDelete: Cascade)
-
-    createdAt   DateTime     @default(now())
-    updatedAt   DateTime     @updatedAt
-    loggedCalls LoggedCall[]
-
-    @@index([cacheKey])
-}
-
-model LoggedCallTag {
-    id    String  @id @default(uuid()) @db.Uuid
-    name  String
-    value String?
-
-    loggedCallId String     @db.Uuid
-    loggedCall   LoggedCall @relation(fields: [loggedCallId], references: [id], onDelete: Cascade)
-
-    @@index([name])
-    @@index([name, value])
-}
-
-model ApiKey {
-    id String @id @default(uuid()) @db.Uuid
-
-    name   String
-    apiKey String @unique
-
-    projectId String   @db.Uuid
-    project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade)
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
+    @@unique([organizationId, userId])
 }
 
 model Account {
@@ -373,28 +288,16 @@ model Session {
     user         User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
-enum UserRole {
-    ADMIN
-    USER
-}
-
 model User {
-    id            String    @id @default(uuid()) @db.Uuid
-    name          String?
-    email         String?   @unique
-    emailVerified DateTime?
-    image         String?
-
-    role UserRole @default(USER)
-
+    id                String             @id @default(uuid()) @db.Uuid
+    name              String?
+    email             String?            @unique
+    emailVerified     DateTime?
+    image             String?
     accounts          Account[]
     sessions          Session[]
-    projectUsers      ProjectUser[]
-    projects          Project[]
-    worldChampEntrant WorldChampEntrant?
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @default(now()) @updatedAt
+    organizationUsers OrganizationUser[]
+    organizations     Organization[]
 }
 
 model VerificationToken {

app/prisma/seed.ts

@@ -1,18 +1,17 @@
 import { prisma } from "~/server/db";
 import dedent from "dedent";
 import { generateNewCell } from "~/server/utils/generateNewCell";
-import { promptConstructorVersion } from "~/promptConstructor/version";
 
 const defaultId = "11111111-1111-1111-1111-111111111111";
 
-await prisma.project.deleteMany({
+await prisma.organization.deleteMany({
   where: { id: defaultId },
 });
 
-// If there's an existing project, just seed into it
-const project =
-  (await prisma.project.findFirst({})) ??
-  (await prisma.project.create({
+// If there's an existing org, just seed into it
+const org =
+  (await prisma.organization.findFirst({})) ??
+  (await prisma.organization.create({
     data: { id: defaultId },
   }));
 
@@ -26,7 +25,7 @@ await prisma.experiment.create({
   data: {
     id: defaultId,
     label: "Country Capitals Example",
-    projectId: project.id,
+    organizationId: org.id,
   },
 });
 
@@ -52,8 +51,8 @@ await prisma.promptVariant.createMany({
       sortIndex: 0,
       model: "gpt-3.5-turbo-0613",
       modelProvider: "openai/ChatCompletion",
-      promptConstructorVersion,
-      promptConstructor: dedent`
+      constructFnVersion: 1,
+      constructFn: dedent`
         definePrompt("openai/ChatCompletion", {
           model: "gpt-3.5-turbo-0613",
           messages: [
@@ -71,8 +70,8 @@ await prisma.promptVariant.createMany({
       sortIndex: 1,
       model: "gpt-3.5-turbo-0613",
       modelProvider: "openai/ChatCompletion",
-      promptConstructorVersion,
-      promptConstructor: dedent`
+      constructFnVersion: 1,
+      constructFn: dedent`
         definePrompt("openai/ChatCompletion", {
           model: "gpt-3.5-turbo-0613",
           messages: [

app/prisma/seedAgiEval.ts

@@ -1,128 +0,0 @@
-import { prisma } from "~/server/db";
-import { generateNewCell } from "~/server/utils/generateNewCell";
-import dedent from "dedent";
-import { execSync } from "child_process";
-import fs from "fs";
-import { promptConstructorVersion } from "~/promptConstructor/version";
-
-const defaultId = "11111111-1111-1111-1111-111111111112";
-
-await prisma.project.deleteMany({
-  where: { id: defaultId },
-});
-
-// If there's an existing project, just seed into it
-const project =
-  (await prisma.project.findFirst({})) ??
-  (await prisma.project.create({
-    data: { id: defaultId },
-  }));
-
-// Clone the repo from git@github.com:microsoft/AGIEval.git into a tmp dir if it doesn't exist
-const tmpDir = "/tmp/agi-eval";
-if (!fs.existsSync(tmpDir)) {
-  execSync(`git clone git@github.com:microsoft/AGIEval.git ${tmpDir}`);
-}
-
-const datasets = [
-  "sat-en",
-  "sat-math",
-  "lsat-rc",
-  "lsat-ar",
-  "aqua-rat",
-  "logiqa-en",
-  "lsat-lr",
-  "math",
-];
-
-type Scenario = {
-  passage: string | null;
-  question: string;
-  options: string[] | null;
-  label: string;
-};
-
-for (const dataset of datasets) {
-  const experimentName = `AGI-Eval: ${dataset}`;
-  const oldExperiment = await prisma.experiment.findFirst({
-    where: {
-      label: experimentName,
-      projectId: project.id,
-    },
-  });
-  if (oldExperiment) {
-    await prisma.experiment.deleteMany({
-      where: { id: oldExperiment.id },
-    });
-  }
-
-  const experiment = await prisma.experiment.create({
-    data: {
-      id: oldExperiment?.id ?? undefined,
-      label: experimentName,
-      projectId: project.id,
-    },
-  });
-
-  const scenarios: Scenario[] = fs
-    .readFileSync(`${tmpDir}/data/v1/${dataset}.jsonl`, "utf8")
-    .split("\n")
-    .filter((line) => line.length > 0)
-    .map((line) => JSON.parse(line) as Scenario);
-  console.log("scenarios", scenarios.length);
-
-  await prisma.testScenario.createMany({
-    data: scenarios.slice(0, 30).map((scenario, i) => ({
-      experimentId: experiment.id,
-      sortIndex: i,
-      variableValues: {
-        passage: scenario.passage,
-        question: scenario.question,
-        options: scenario.options?.join("\n"),
-        label: scenario.label,
-      },
-    })),
-  });
-
-  await prisma.templateVariable.createMany({
-    data: ["passage", "question", "options", "label"].map((label) => ({
-      experimentId: experiment.id,
-      label,
-    })),
-  });
-
-  await prisma.promptVariant.createMany({
-    data: [
-      {
-        experimentId: experiment.id,
-        label: "Prompt Variant 1",
-        sortIndex: 0,
-        model: "gpt-3.5-turbo-0613",
-        modelProvider: "openai/ChatCompletion",
-        promptConstructorVersion,
-        promptConstructor: dedent`
-          definePrompt("openai/ChatCompletion", {
-            model: "gpt-3.5-turbo-0613",
-            messages: [
-              {
-                role: "user",
-                content: \`Passage: ${"$"}{scenario.passage}\n\nQuestion: ${"$"}{scenario.question}\n\nOptions: ${"$"}{scenario.options}\n\n Respond with just the letter of the best option in the format Answer: (A).\`
-              }
-            ],
-            temperature: 0,
-          })`,
-      },
-    ],
-  });
-
-  await prisma.evaluation.createMany({
-    data: [
-      {
-        experimentId: experiment.id,
-        label: "Eval",
-        evalType: "CONTAINS",
-        value: "Answer: ({{label}})",
-      },
-    ],
-  });
-}

app/prisma/seedTwitterSentiment.ts

@@ -1,114 +0,0 @@
-import { prisma } from "~/server/db";
-import dedent from "dedent";
-import fs from "fs";
-import { parse } from "csv-parse/sync";
-import { promptConstructorVersion } from "~/promptConstructor/version";
-
-const defaultId = "11111111-1111-1111-1111-111111111112";
-
-await prisma.project.deleteMany({
-  where: { id: defaultId },
-});
-
-// If there's an existing project, just seed into it
-const project =
-  (await prisma.project.findFirst({})) ??
-  (await prisma.project.create({
-    data: { id: defaultId },
-  }));
-
-type Scenario = {
-  text: string;
-  sentiment: string;
-  emotion: string;
-};
-
-const experimentName = `Twitter Sentiment Analysis`;
-const oldExperiment = await prisma.experiment.findFirst({
-  where: {
-    label: experimentName,
-    projectId: project.id,
-  },
-});
-if (oldExperiment) {
-  await prisma.experiment.deleteMany({
-    where: { id: oldExperiment.id },
-  });
-}
-
-const experiment = await prisma.experiment.create({
-  data: {
-    id: oldExperiment?.id ?? undefined,
-    label: experimentName,
-    projectId: project.id,
-  },
-});
-
-const content = fs.readFileSync("./prisma/datasets/validated_tweets.csv", "utf8");
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const records: any[] = parse(content, { delimiter: ",", from_line: 2 });
-
-console.log("records", records);
-
-const scenarios: Scenario[] = records.map((row) => ({
-  text: row[0],
-  sentiment: row[1],
-  emotion: row[2],
-}));
-
-console.log("scenarios", scenarios.length);
-
-await prisma.testScenario.createMany({
-  data: scenarios.slice(0, 30).map((scenario, i) => ({
-    experimentId: experiment.id,
-    sortIndex: i,
-    variableValues: {
-      text: scenario.text,
-      sentiment: scenario.sentiment,
-      emotion: scenario.emotion,
-    },
-  })),
-});
-
-await prisma.templateVariable.createMany({
-  data: ["text", "sentiment", "emotion"].map((label) => ({
-    experimentId: experiment.id,
-    label,
-  })),
-});
-
-await prisma.promptVariant.createMany({
-  data: [
-    {
-      experimentId: experiment.id,
-      label: "Prompt Variant 1",
-      sortIndex: 0,
-      model: "gpt-3.5-turbo-0613",
-      modelProvider: "openai/ChatCompletion",
-      promptConstructorVersion,
-      promptConstructor: dedent`
-          definePrompt("openai/ChatCompletion", {
-            model: "gpt-3.5-turbo-0613",
-            messages: [
-              {
-                role: "user",
-                content: \`Text: ${"$"}{scenario.text}\n\nRespond with the sentiment (negative|neutral|positive) and emotion (optimism|joy|anger|sadness) of the tweet in this format: "answer: <sentiment>-<emotion>".\`
-              }
-            ],
-            temperature: 0,
-          })`,
-    },
-  ],
-});
-
-await prisma.evaluation.createMany({
-  data: [
-    {
-      experimentId: experiment.id,
-      label: "Eval",
-      evalType: "CONTAINS",
-      value: "answer: {{sentiment}}-{{emotion}}",
-    },
-  ],
-});

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

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

app/public/logo.svg

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

app/render.yaml

@@ -7,7 +7,6 @@ databases:
 services:
   - type: web
     name: querykey-prod-web
-    rootDir: app
     env: docker
     dockerfilePath: Dockerfile
     dockerContext: .
@@ -32,7 +31,6 @@ services:
 
   - type: web
     name: querykey-prod-wss
-    rootDir: app
     env: docker
     dockerfilePath: Dockerfile
     dockerContext: .

app/run-prod.sh

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

app/sentry.client.config.ts

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

app/sentry.edge.config.ts

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

app/sentry.server.config.ts

@@ -1,18 +0,0 @@
-// This file configures the initialization of Sentry on the server.
-// The config you add here will be used whenever the server handles a request.
-// https://docs.sentry.io/platforms/javascript/guides/nextjs/
-
-import * as Sentry from "@sentry/nextjs";
-import { env } from "~/env.mjs";
-
-if (env.NEXT_PUBLIC_SENTRY_DSN) {
-  Sentry.init({
-    dsn: env.NEXT_PUBLIC_SENTRY_DSN,
-
-    // Adjust this value in production, or use tracesSampler for greater control
-    tracesSampleRate: 1,
-
-    // Setting this option to true will print useful information to the console while you're setting up Sentry.
-    debug: false,
-  });
-}

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

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

app/src/components/ChangeModelModal/ChangeModelModal.tsx

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

app/src/components/ChangeModelModal/ModelSearch.tsx

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

app/src/components/ChangeModelModal/ModelStatsCard.tsx

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

app/src/components/CopiableCode.tsx

@@ -1,40 +0,0 @@
-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 }: { code: string }) => {
-  const [copied, setCopied] = useState(false);
-
-  const [copyToClipboard] = useHandledAsyncCallback(async () => {
-    await navigator.clipboard.writeText(code);
-    setCopied(true);
-  }, [code]);
-  return (
-    <HStack
-      backgroundColor="blackAlpha.800"
-      color="white"
-      borderRadius={4}
-      padding={3}
-      w="full"
-      justifyContent="space-between"
-    >
-      <Text fontFamily="inconsolata" fontWeight="bold" letterSpacing={0.5} overflowX="auto">
-        {code}
-      </Text>
-      <Tooltip closeOnClick={false} label={copied ? "Copied!" : "Copy to clipboard"}>
-        <IconButton
-          aria-label="Copy"
-          icon={<Icon as={MdContentCopy} boxSize={5} />}
-          size="xs"
-          colorScheme="white"
-          variant="ghost"
-          onClick={copyToClipboard}
-          onMouseLeave={() => setCopied(false)}
-        />
-      </Tooltip>
-    </HStack>
-  );
-};
-
-export default CopiableCode;

app/src/components/ExperimentSettingsDrawer/DeleteButton.tsx

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

app/src/components/Favicon.tsx

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

app/src/components/OutputsTable/EditEvaluations.tsx

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

app/src/components/OutputsTable/EditScenarioVars.tsx

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

app/src/components/OutputsTable/FloatingLabelInput.tsx

@@ -37,6 +37,7 @@ export const FloatingLabelInput = ({
         borderColor={isFocused ? "blue.500" : "gray.400"}
         autoComplete="off"
         value={value}
+        maxHeight={32}
         overflowY="auto"
         overflowX="hidden"
         {...props}

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

@@ -0,0 +1,19 @@
+import { type StackProps, VStack } from "@chakra-ui/react";
+import { CellOptions } from "./CellOptions";
+
+export const CellContent = ({
+  hardRefetch,
+  hardRefetching,
+  children,
+  ...props
+}: {
+  hardRefetch: () => void;
+  hardRefetching: boolean;
+} & StackProps) => (
+  <VStack w="full" alignItems="flex-start" {...props}>
+    <CellOptions refetchingOutput={hardRefetching} refetchOutput={hardRefetch} />
+    <VStack w="full" alignItems="flex-start" maxH={500} overflowY="auto">
+      {children}
+    </VStack>
+  </VStack>
+);

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

@@ -0,0 +1,37 @@
+import { Button, HStack, Icon, Spinner, Tooltip } from "@chakra-ui/react";
+import { BsArrowClockwise } from "react-icons/bs";
+import { useExperimentAccess } from "~/utils/hooks";
+
+export const CellOptions = ({
+  refetchingOutput,
+  refetchOutput,
+}: {
+  refetchingOutput: boolean;
+  refetchOutput: () => void;
+}) => {
+  const { canModify } = useExperimentAccess();
+  return (
+    <HStack justifyContent="flex-end" w="full">
+      {canModify && (
+        <Tooltip label="Refetch output" aria-label="refetch output">
+          <Button
+            size="xs"
+            w={4}
+            h={4}
+            py={4}
+            px={4}
+            minW={0}
+            borderRadius={8}
+            color="gray.500"
+            variant="ghost"
+            cursor="pointer"
+            onClick={refetchOutput}
+            aria-label="refetch output"
+          >
+            <Icon as={refetchingOutput ? Spinner : BsArrowClockwise} boxSize={4} />
+          </Button>
+        </Tooltip>
+      )}
+    </HStack>
+  );
+};

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

@@ -1,17 +1,17 @@
 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 { Text, VStack } from "@chakra-ui/react";
+import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
 import SyntaxHighlighter from "react-syntax-highlighter";
 import { docco } from "react-syntax-highlighter/dist/cjs/styles/hljs";
 import stringify from "json-stringify-pretty-compact";
-import { type ReactElement, useState, useEffect, Fragment, useCallback } from "react";
+import { type ReactElement, useState, useEffect, Fragment } from "react";
 import useSocket from "~/utils/useSocket";
 import { OutputStats } from "./OutputStats";
 import { RetryCountdown } from "./RetryCountdown";
 import frontendModelProviders from "~/modelProviders/frontendModelProviders";
 import { ResponseLog } from "./ResponseLog";
-import { CellOptions } from "./TopActions";
+import { CellContent } from "./CellContent";
 
 const WAITING_MESSAGE_INTERVAL = 20000;
 
@@ -23,7 +23,10 @@ export default function OutputCell({
   variant: PromptVariant;
 }): ReactElement | null {
   const utils = api.useContext();
-  const vars = useScenarioVars().data;
+  const experiment = useExperiment();
+  const vars = api.templateVars.list.useQuery({
+    experimentId: experiment.data?.id ?? "",
+  }).data;
 
   const scenarioVariables = scenario.variableValues as Record<string, string>;
   const templateHasVariables =
@@ -69,49 +72,37 @@ export default function OutputCell({
   // 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 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>
+      <CellContent hardRefetching={hardRefetching} hardRefetch={hardRefetch}>
         <Text color="gray.500">Error retrieving output</Text>
-      </CellWrapper>
+      </CellContent>
     );
 
   if (cell && cell.errorMessage) {
     return (
-      <CellWrapper>
+      <CellContent hardRefetching={hardRefetching} hardRefetch={hardRefetch}>
         <Text color="red.500">{cell.errorMessage}</Text>
-      </CellWrapper>
+      </CellContent>
     );
   }
 
   if (disabledReason) return <Text color="gray.500">{disabledReason}</Text>;
 
-  const showLogs = !streamedMessage && !mostRecentResponse?.respPayload;
+  const mostRecentResponse = cell?.modelResponses[cell.modelResponses.length - 1];
+  const showLogs = !streamedMessage && !mostRecentResponse?.output;
 
   if (showLogs)
     return (
-      <CellWrapper alignItems="flex-start" fontFamily="inconsolata, monospace" spacing={0}>
+      <CellContent
+        hardRefetching={hardRefetching}
+        hardRefetch={hardRefetch}
+        alignItems="flex-start"
+        fontFamily="inconsolata, monospace"
+        spacing={0}
+      >
         {cell?.jobQueuedAt && <ResponseLog time={cell.jobQueuedAt} title="Job queued" />}
         {cell?.jobStartedAt && <ResponseLog time={cell.jobStartedAt} title="Job started" />}
         {cell?.modelResponses?.map((response) => {
@@ -133,13 +124,9 @@ export default function OutputCell({
                 Array.from({ length: numWaitingMessages }, (_, i) => (
                   <ResponseLog
                     key={`waiting-${i}`}
-                    time={
-                      new Date(
-                        (response.requestedAt?.getTime?.() ?? 0) +
-                          (i + 1) * WAITING_MESSAGE_INTERVAL,
-                      )
-                    }
-                    title="Waiting for response..."
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    time={new Date(response.requestedAt!.getTime() + i * WAITING_MESSAGE_INTERVAL)}
+                    title="Waiting for response"
                   />
                 ))}
               {response.receivedAt && (
@@ -157,38 +144,61 @@ export default function OutputCell({
         {mostRecentResponse?.retryTime && (
           <RetryCountdown retryTime={mostRecentResponse.retryTime} />
         )}
-      </CellWrapper>
+      </CellContent>
     );
 
-  const normalizedOutput = mostRecentResponse?.respPayload
-    ? provider.normalizeOutput(mostRecentResponse?.respPayload)
+  const normalizedOutput = mostRecentResponse?.output
+    ? provider.normalizeOutput(mostRecentResponse?.output)
     : streamedMessage
     ? provider.normalizeOutput(streamedMessage)
     : null;
 
-  if (mostRecentResponse?.respPayload && normalizedOutput?.type === "json") {
+  if (mostRecentResponse?.output && normalizedOutput?.type === "json") {
     return (
-      <CellWrapper>
-        <SyntaxHighlighter
-          customStyle={{ overflowX: "unset", width: "100%", flex: 1 }}
-          language="json"
-          style={docco}
-          lineProps={{
-            style: { wordBreak: "break-all", whiteSpace: "pre-wrap" },
-          }}
-          wrapLines
+      <VStack
+        w="100%"
+        h="100%"
+        fontSize="xs"
+        flexWrap="wrap"
+        overflowX="hidden"
+        justifyContent="space-between"
+      >
+        <CellContent
+          hardRefetching={hardRefetching}
+          hardRefetch={hardRefetch}
+          w="full"
+          flex={1}
+          spacing={0}
         >
-          {stringify(normalizedOutput.value, { maxLength: 40 })}
-        </SyntaxHighlighter>
-      </CellWrapper>
+          <SyntaxHighlighter
+            customStyle={{ overflowX: "unset", width: "100%", flex: 1 }}
+            language="json"
+            style={docco}
+            lineProps={{
+              style: { wordBreak: "break-all", whiteSpace: "pre-wrap" },
+            }}
+            wrapLines
+          >
+            {stringify(normalizedOutput.value, { maxLength: 40 })}
+          </SyntaxHighlighter>
+        </CellContent>
+        <OutputStats modelResponse={mostRecentResponse} scenario={scenario} />
+      </VStack>
     );
   }
 
   const contentToDisplay = (normalizedOutput?.type === "text" && normalizedOutput.value) || "";
 
   return (
-    <CellWrapper>
-      <Text whiteSpace="pre-wrap">{contentToDisplay}</Text>
-    </CellWrapper>
+    <VStack w="100%" h="100%" justifyContent="space-between" whiteSpace="pre-wrap">
+      <VStack w="full" alignItems="flex-start" spacing={0}>
+        <CellContent hardRefetching={hardRefetching} hardRefetch={hardRefetch}>
+          <Text>{contentToDisplay}</Text>
+        </CellContent>
+      </VStack>
+      {mostRecentResponse?.output && (
+        <OutputStats modelResponse={mostRecentResponse} scenario={scenario} />
+      )}
+    </VStack>
   );
 }

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

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

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

@@ -1,36 +0,0 @@
-import {
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalHeader,
-  ModalOverlay,
-  type UseDisclosureReturn,
-} from "@chakra-ui/react";
-import { type RouterOutputs } from "~/utils/api";
-import { JSONTree } from "react-json-tree";
-
-export default function ExpandedModal(props: {
-  cell: NonNullable<RouterOutputs["scenarioVariantCells"]["get"]>;
-  disclosure: UseDisclosureReturn;
-}) {
-  return (
-    <Modal isOpen={props.disclosure.isOpen} onClose={props.disclosure.onClose} size="2xl">
-      <ModalOverlay />
-      <ModalContent>
-        <ModalHeader>Prompt</ModalHeader>
-        <ModalCloseButton />
-        <ModalBody>
-          <JSONTree
-            data={props.cell.prompt}
-            invertTheme={true}
-            theme="chalk"
-            shouldExpandNodeInitially={() => true}
-            getItemString={() => ""}
-            hideRoot
-          />
-        </ModalBody>
-      </ModalContent>
-    </Modal>
-  );
-}

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

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

app/src/components/OutputsTable/ScenarioEditor.tsx

@@ -1,24 +1,15 @@
-import { isEqual } from "lodash-es";
-import { useEffect, useState, type DragEvent } from "react";
+import { type DragEvent } from "react";
 import { api } from "~/utils/api";
-import { useExperimentAccess, useHandledAsyncCallback, useScenarioVars } from "~/utils/hooks";
+import { isEqual } from "lodash-es";
 import { type Scenario } from "./types";
+import { useExperiment, useExperimentAccess, useHandledAsyncCallback } from "~/utils/hooks";
+import { useState } from "react";
 
-import {
-  Box,
-  Button,
-  HStack,
-  Icon,
-  IconButton,
-  Spinner,
-  Text,
-  Tooltip,
-  VStack,
-} from "@chakra-ui/react";
-import { BsArrowsAngleExpand, BsX } from "react-icons/bs";
+import { Box, Button, Flex, HStack, Icon, Spinner, Stack, Tooltip, VStack } from "@chakra-ui/react";
 import { cellPadding } from "../constants";
+import { BsX } from "react-icons/bs";
+import { RiDraggable } from "react-icons/ri";
 import { FloatingLabelInput } from "./FloatingLabelInput";
-import { ScenarioEditorModal } from "./ScenarioEditorModal";
 
 export default function ScenarioEditor({
   scenario,
@@ -37,11 +28,8 @@ export default function ScenarioEditor({
 
   const [values, setValues] = useState<Record<string, string>>(savedValues);
 
-  useEffect(() => {
-    if (savedValues) setValues(savedValues);
-  }, [savedValues]);
-
-  const vars = useScenarioVars();
+  const experiment = useExperiment();
+  const vars = api.templateVars.list.useQuery({ experimentId: experiment.data?.id ?? "" });
 
   const variableLabels = vars.data?.map((v) => v.label) ?? [];
 
@@ -83,82 +71,83 @@ export default function ScenarioEditor({
     [reorderMutation, scenario.id],
   );
 
-  const [scenarioEditorModalOpen, setScenarioEditorModalOpen] = useState(false);
-
   return (
-    <>
-      <HStack
-        alignItems="flex-start"
-        px={cellPadding.x}
-        py={cellPadding.y}
-        spacing={0}
-        height="100%"
-        draggable={!variableInputHovered}
-        onDragStart={(e) => {
-          e.dataTransfer.setData("text/plain", scenario.id);
-          e.currentTarget.style.opacity = "0.4";
-        }}
-        onDragEnd={(e) => {
-          e.currentTarget.style.opacity = "1";
-        }}
-        onDragOver={(e) => {
-          e.preventDefault();
-          setIsDragTarget(true);
-        }}
-        onDragLeave={() => {
-          setIsDragTarget(false);
-        }}
-        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>
-              <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
-                    aria-label="Delete"
-                    icon={
-                      <Icon
-                        as={hidingInProgress ? Spinner : BsX}
-                        boxSize={hidingInProgress ? 4 : 6}
-                      />
-                    }
-                    onClick={onHide}
-                    size="xs"
-                    display="flex"
-                    colorScheme="gray"
-                    color="gray.500"
-                    variant="ghost"
-                  />
-                </Tooltip>
-              )}
-            </HStack>
-            {variableLabels.map((key) => {
-              const value = values[key] ?? "";
-              return (
+    <HStack
+      alignItems="flex-start"
+      px={cellPadding.x}
+      py={cellPadding.y}
+      spacing={0}
+      height="100%"
+      draggable={!variableInputHovered}
+      onDragStart={(e) => {
+        e.dataTransfer.setData("text/plain", scenario.id);
+        e.currentTarget.style.opacity = "0.4";
+      }}
+      onDragEnd={(e) => {
+        e.currentTarget.style.opacity = "1";
+      }}
+      onDragOver={(e) => {
+        e.preventDefault();
+        setIsDragTarget(true);
+      }}
+      onDragLeave={() => {
+        setIsDragTarget(false);
+      }}
+      onDrop={onReorder}
+      backgroundColor={isDragTarget ? "gray.100" : "transparent"}
+    >
+      {canModify && props.canHide && (
+        <Stack
+          alignSelf="flex-start"
+          opacity={props.hovered ? 1 : 0}
+          spacing={0}
+          ml={-cellPadding.x}
+        >
+          <Tooltip label="Hide scenario" hasArrow>
+            {/* for some reason the tooltip can't position itself properly relative to the icon without the wrapping box */}
+            <Button
+              variant="unstyled"
+              color="gray.400"
+              height="unset"
+              width="unset"
+              minW="unset"
+              onClick={onHide}
+              _hover={{
+                color: "gray.800",
+                cursor: "pointer",
+              }}
+            >
+              <Icon as={hidingInProgress ? Spinner : BsX} boxSize={hidingInProgress ? 4 : 6} />
+            </Button>
+          </Tooltip>
+          <Icon
+            as={RiDraggable}
+            boxSize={6}
+            color="gray.400"
+            _hover={{ color: "gray.800", cursor: "pointer" }}
+          />
+        </Stack>
+      )}
+
+      {variableLabels.length === 0 ? (
+        <Box color="gray.500">{vars.data ? "No scenario variables configured" : "Loading..."}</Box>
+      ) : (
+        <VStack spacing={4} flex={1} py={2}>
+          {variableLabels.map((key) => {
+            const value = values[key] ?? "";
+            const layoutDirection = value.length > 20 ? "column" : "row";
+            return (
+              <Flex
+                key={key}
+                direction={layoutDirection}
+                alignItems={layoutDirection === "column" ? "flex-start" : "center"}
+                flexWrap="wrap"
+                width="full"
+              >
                 <FloatingLabelInput
-                  key={key}
                   label={key}
                   isDisabled={!canModify}
                   style={{ width: "100%" }}
-                  maxHeight={32}
                   value={value}
                   onChange={(e) => {
                     setValues((prev) => ({ ...prev, [key]: e.target.value }));
@@ -173,34 +162,27 @@ export default function ScenarioEditor({
                   onMouseEnter={() => setVariableInputHovered(true)}
                   onMouseLeave={() => setVariableInputHovered(false)}
                 />
-              );
-            })}
-            {hasChanged && (
-              <HStack justify="right">
-                <Button
-                  size="sm"
-                  onMouseDown={() => {
-                    setValues(savedValues);
-                  }}
-                  colorScheme="gray"
-                >
-                  Reset
-                </Button>
-                <Button size="sm" onMouseDown={onSave} colorScheme="blue">
-                  Save
-                </Button>
-              </HStack>
-            )}
-          </VStack>
-        )}
-      </HStack>
-      {scenarioEditorModalOpen && (
-        <ScenarioEditorModal
-          scenarioId={scenario.id}
-          initialValues={savedValues}
-          onClose={() => setScenarioEditorModalOpen(false)}
-        />
+              </Flex>
+            );
+          })}
+          {hasChanged && (
+            <HStack justify="right">
+              <Button
+                size="sm"
+                onMouseDown={() => {
+                  setValues(savedValues);
+                }}
+                colorScheme="gray"
+              >
+                Reset
+              </Button>
+              <Button size="sm" onMouseDown={onSave} colorScheme="blue">
+                Save
+              </Button>
+            </HStack>
+          )}
+        </VStack>
       )}
-    </>
+    </HStack>
   );
 }

app/src/components/OutputsTable/ScenarioEditorModal.tsx

@@ -1,123 +0,0 @@
-import {
-  Button,
-  HStack,
-  Modal,
-  ModalBody,
-  ModalCloseButton,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  Spinner,
-  Text,
-  VStack,
-} from "@chakra-ui/react";
-import { useEffect, useState } from "react";
-import { isEqual } from "lodash-es";
-
-import { api } from "~/utils/api";
-import {
-  useScenario,
-  useHandledAsyncCallback,
-  useExperiment,
-  useExperimentAccess,
-} from "~/utils/hooks";
-import { FloatingLabelInput } from "./FloatingLabelInput";
-
-export const ScenarioEditorModal = ({
-  scenarioId,
-  initialValues,
-  onClose,
-}: {
-  scenarioId: string;
-  initialValues: Record<string, string>;
-  onClose: () => void;
-}) => {
-  const utils = api.useContext();
-  const experiment = useExperiment();
-  const { canModify } = useExperimentAccess();
-  const scenario = useScenario(scenarioId);
-
-  const savedValues = scenario.data?.variableValues as Record<string, string>;
-
-  const [values, setValues] = useState<Record<string, string>>(initialValues);
-
-  useEffect(() => {
-    if (savedValues) setValues(savedValues);
-  }, [savedValues]);
-
-  const hasChanged = !isEqual(savedValues, values);
-
-  const mutation = api.scenarios.replaceWithValues.useMutation();
-
-  const [onSave, saving] = useHandledAsyncCallback(async () => {
-    await mutation.mutateAsync({
-      id: scenarioId,
-      values,
-    });
-    await utils.scenarios.list.invalidate();
-  }, [mutation, values]);
-
-  const vars = api.scenarioVars.list.useQuery({ experimentId: experiment.data?.id ?? "" });
-  const variableLabels = vars.data?.map((v) => v.label) ?? [];
-
-  return (
-    <Modal
-      isOpen
-      onClose={onClose}
-      size={{ base: "xl", sm: "2xl", md: "3xl", lg: "5xl", xl: "7xl" }}
-    >
-      <ModalOverlay />
-      <ModalContent w={1200}>
-        <ModalHeader />
-        <ModalCloseButton />
-        <ModalBody maxW="unset">
-          <VStack spacing={8}>
-            {values &&
-              variableLabels.map((key) => {
-                const value = values[key] ?? "";
-                return (
-                  <FloatingLabelInput
-                    key={key}
-                    label={key}
-                    isDisabled={!canModify}
-                    _disabled={{ opacity: 1 }}
-                    style={{ width: "100%" }}
-                    value={value}
-                    onChange={(e) => {
-                      setValues((prev) => ({ ...prev, [key]: e.target.value }));
-                    }}
-                    onKeyDown={(e) => {
-                      if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
-                        e.preventDefault();
-                        e.currentTarget.blur();
-                        onSave();
-                      }
-                    }}
-                  />
-                );
-              })}
-          </VStack>
-        </ModalBody>
-
-        <ModalFooter>
-          {canModify && (
-            <HStack>
-              <Button
-                colorScheme="gray"
-                onClick={() => setValues(savedValues)}
-                minW={24}
-                isDisabled={!hasChanged}
-              >
-                <Text>Reset</Text>
-              </Button>
-              <Button colorScheme="blue" onClick={onSave} minW={24} isDisabled={!hasChanged}>
-                {saving ? <Spinner boxSize={4} /> : <Text>Save</Text>}
-              </Button>
-            </HStack>
-          )}
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-};

app/src/components/OutputsTable/ScenarioPaginator.tsx

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

app/src/components/OutputsTable/ScenarioRow.tsx

@@ -1,5 +1,6 @@
-import { GridItem } from "@chakra-ui/react";
+import { Box, GridItem } from "@chakra-ui/react";
 import React, { useState } from "react";
+import { cellPadding } from "../constants";
 import OutputCell from "./OutputCell/OutputCell";
 import ScenarioEditor from "./ScenarioEditor";
 import type { PromptVariant, Scenario } from "./types";
@@ -38,7 +39,9 @@ const ScenarioRow = (props: {
           colStart={i + 2}
           {...borders}
         >
-          <OutputCell key={variant.id} scenario={props.scenario} variant={variant} />
+          <Box h="100%" w="100%" px={cellPadding.x} py={cellPadding.y}>
+            <OutputCell key={variant.id} scenario={props.scenario} variant={variant} />
+          </Box>
         </GridItem>
       ))}
     </>

app/src/components/OutputsTable/ScenariosHeader.tsx

@@ -72,7 +72,7 @@ export const ScenariosHeader = () => {
               Autogenerate Scenario
             </MenuItem>
             <MenuItem icon={<BsPencil />} onClick={openDrawer}>
-              Add or Remove Variables
+              Edit Vars
             </MenuItem>
           </MenuList>
         </Menu>

app/src/components/OutputsTable/VariantEditor.tsx

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

app/src/components/OutputsTable/VariantStats.tsx

@@ -17,8 +17,8 @@ export default function VariantStats(props: { variant: PromptVariant }) {
       initialData: {
         evalResults: [],
         overallCost: 0,
-        inputTokens: 0,
-        outputTokens: 0,
+        promptTokens: 0,
+        completionTokens: 0,
         scenarioCount: 0,
         outputCount: 0,
         awaitingEvals: false,
@@ -43,17 +43,17 @@ export default function VariantStats(props: { variant: PromptVariant }) {
   return (
     <HStack
       justifyContent="space-between"
-      alignItems="flex-end"
+      alignItems="center"
       mx="2"
       fontSize="xs"
       py={cellPadding.y}
     >
-      <HStack px={cellPadding.x} flexWrap="wrap">
-        {showNumFinished && (
-          <Text>
-            {data.outputCount} / {data.scenarioCount}
-          </Text>
-        )}
+      {showNumFinished && (
+        <Text>
+          {data.outputCount} / {data.scenarioCount}
+        </Text>
+      )}
+      <HStack px={cellPadding.x}>
         {data.evalResults.map((result) => {
           const passedFrac = result.passCount / result.totalCount;
           return (
@@ -68,8 +68,8 @@ export default function VariantStats(props: { variant: PromptVariant }) {
       </HStack>
       {data.overallCost && (
         <CostTooltip
-          inputTokens={data.inputTokens}
-          outputTokens={data.outputTokens}
+          promptTokens={data.promptTokens}
+          completionTokens={data.completionTokens}
           cost={data.overallCost}
         >
           <HStack spacing={0} align="center" color="gray.500">

app/src/components/OutputsTable/index.tsx

@@ -35,7 +35,7 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
       pb={24}
       pl={8}
       display="grid"
-      gridTemplateColumns={`250px repeat(${variants.data.length}, minmax(320px, 1fr)) auto`}
+      gridTemplateColumns={`250px repeat(${variants.data.length}, minmax(300px, 1fr)) auto`}
       sx={{
         "> *": {
           borderColor: "gray.300",

app/src/components/Paginator.tsx

@@ -1,79 +0,0 @@
-import { Box, HStack, IconButton } from "@chakra-ui/react";
-import {
-  BsChevronDoubleLeft,
-  BsChevronDoubleRight,
-  BsChevronLeft,
-  BsChevronRight,
-} from "react-icons/bs";
-import { usePage } from "~/utils/hooks";
-
-const Paginator = ({
-  numItemsLoaded,
-  startIndex,
-  lastPage,
-  count,
-}: {
-  numItemsLoaded: number;
-  startIndex: number;
-  lastPage: number;
-  count: number;
-}) => {
-  const [page, setPage] = usePage();
-
-  const nextPage = () => {
-    if (page < lastPage) {
-      setPage(page + 1, "replace");
-    }
-  };
-
-  const prevPage = () => {
-    if (page > 1) {
-      setPage(page - 1, "replace");
-    }
-  };
-
-  const goToLastPage = () => setPage(lastPage, "replace");
-  const goToFirstPage = () => setPage(1, "replace");
-
-  return (
-    <HStack pt={4}>
-      <IconButton
-        variant="ghost"
-        size="sm"
-        onClick={goToFirstPage}
-        isDisabled={page === 1}
-        aria-label="Go to first page"
-        icon={<BsChevronDoubleLeft />}
-      />
-      <IconButton
-        variant="ghost"
-        size="sm"
-        onClick={prevPage}
-        isDisabled={page === 1}
-        aria-label="Previous page"
-        icon={<BsChevronLeft />}
-      />
-      <Box>
-        {startIndex}-{startIndex + numItemsLoaded - 1} / {count}
-      </Box>
-      <IconButton
-        variant="ghost"
-        size="sm"
-        onClick={nextPage}
-        isDisabled={page === lastPage}
-        aria-label="Next page"
-        icon={<BsChevronRight />}
-      />
-      <IconButton
-        variant="ghost"
-        size="sm"
-        onClick={goToLastPage}
-        isDisabled={page === lastPage}
-        aria-label="Go to last page"
-        icon={<BsChevronDoubleRight />}
-      />
-    </HStack>
-  );
-};
-
-export default Paginator;

app/src/components/RefinePromptModal/CustomInstructionsInput.tsx

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

app/src/components/RefinePromptModal/RefinePromptModal.tsx

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

app/src/components/StatsCard.tsx

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

app/src/components/dashboard/LoggedCallTable.tsx

@@ -1,209 +0,0 @@
-import {
-  Box,
-  Card,
-  CardHeader,
-  Heading,
-  Table,
-  Tbody,
-  Td,
-  Th,
-  Thead,
-  Tr,
-  Tooltip,
-  Collapse,
-  HStack,
-  VStack,
-  IconButton,
-  useToast,
-  Icon,
-  Button,
-  ButtonGroup,
-} from "@chakra-ui/react";
-import dayjs from "dayjs";
-import relativeTime from "dayjs/plugin/relativeTime";
-import { ChevronUpIcon, ChevronDownIcon, CopyIcon } from "lucide-react";
-import { useMemo, useState } from "react";
-import { type RouterOutputs, api } from "~/utils/api";
-import SyntaxHighlighter from "react-syntax-highlighter";
-import { atelierCaveLight } from "react-syntax-highlighter/dist/cjs/styles/hljs";
-import stringify from "json-stringify-pretty-compact";
-import Link from "next/link";
-
-dayjs.extend(relativeTime);
-
-type LoggedCall = RouterOutputs["dashboard"]["loggedCalls"][0];
-
-const FormattedJson = ({ json }: { json: any }) => {
-  const jsonString = stringify(json, { maxLength: 40 });
-  const toast = useToast();
-
-  const copyToClipboard = async (text: string) => {
-    try {
-      await navigator.clipboard.writeText(text);
-      toast({
-        title: "Copied to clipboard",
-        status: "success",
-        duration: 2000,
-      });
-    } catch (err) {
-      toast({
-        title: "Failed to copy to clipboard",
-        status: "error",
-        duration: 2000,
-      });
-    }
-  };
-
-  return (
-    <Box position="relative" fontSize="sm" borderRadius="md" overflow="hidden">
-      <SyntaxHighlighter
-        customStyle={{ overflowX: "unset" }}
-        language="json"
-        style={atelierCaveLight}
-        lineProps={{
-          style: { wordBreak: "break-all", whiteSpace: "pre-wrap" },
-        }}
-        wrapLines
-      >
-        {jsonString}
-      </SyntaxHighlighter>
-      <IconButton
-        aria-label="Copy"
-        icon={<CopyIcon />}
-        position="absolute"
-        top={1}
-        right={1}
-        size="xs"
-        variant="ghost"
-        onClick={() => void copyToClipboard(jsonString)}
-      />
-    </Box>
-  );
-};
-
-function TableRow({
-  loggedCall,
-  isExpanded,
-  onToggle,
-}: {
-  loggedCall: LoggedCall;
-  isExpanded: boolean;
-  onToggle: () => void;
-}) {
-  const isError = loggedCall.modelResponse?.statusCode !== 200;
-  const timeAgo = dayjs(loggedCall.requestedAt).fromNow();
-  const fullTime = dayjs(loggedCall.requestedAt).toString();
-
-  const model = useMemo(
-    () => loggedCall.tags.find((tag) => tag.name.startsWith("$model"))?.value,
-    [loggedCall.tags],
-  );
-
-  const durationCell = (
-    <Td isNumeric>
-      {loggedCall.cacheHit
-        ? "Cache hit"
-        : ((loggedCall.modelResponse?.durationMs ?? 0) / 1000).toFixed(2) + "s"}
-    </Td>
-  );
-
-  return (
-    <>
-      <Tr
-        onClick={onToggle}
-        key={loggedCall.id}
-        _hover={{ bgColor: "gray.100", cursor: "pointer" }}
-        sx={{
-          "> td": { borderBottom: "none" },
-        }}
-      >
-        <Td>
-          <Icon boxSize={6} as={isExpanded ? ChevronUpIcon : ChevronDownIcon} />
-        </Td>
-        <Td>
-          <Tooltip label={fullTime} placement="top">
-            <Box whiteSpace="nowrap" minW="120px">
-              {timeAgo}
-            </Box>
-          </Tooltip>
-        </Td>
-        <Td width="100%">{model}</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={8} p={0}>
-          <Collapse in={isExpanded} unmountOnExit={true}>
-            <VStack p={4} align="stretch">
-              <HStack align="stretch">
-                <VStack flex={1} align="stretch">
-                  <Heading size="sm">Input</Heading>
-                  <FormattedJson json={loggedCall.modelResponse?.reqPayload} />
-                </VStack>
-                <VStack flex={1} align="stretch">
-                  <Heading size="sm">Output</Heading>
-                  <FormattedJson json={loggedCall.modelResponse?.respPayload} />
-                </VStack>
-              </HStack>
-              <ButtonGroup alignSelf="flex-end">
-                <Button as={Link} colorScheme="blue" href={{ pathname: "/experiments" }}>
-                  Experiments
-                </Button>
-              </ButtonGroup>
-            </VStack>
-          </Collapse>
-        </Td>
-      </Tr>
-    </>
-  );
-}
-
-export default function LoggedCallTable() {
-  const [expandedRow, setExpandedRow] = useState<string | null>(null);
-  const loggedCalls = api.dashboard.loggedCalls.useQuery({});
-
-  return (
-    <Card variant="outline" width="100%" overflow="hidden">
-      <CardHeader>
-        <Heading as="h3" size="sm">
-          Logged Calls
-        </Heading>
-      </CardHeader>
-      <Table>
-        <Thead>
-          <Tr>
-            <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>
-        <Tbody>
-          {loggedCalls.data?.map((loggedCall) => {
-            return (
-              <TableRow
-                key={loggedCall.id}
-                loggedCall={loggedCall}
-                isExpanded={loggedCall.id === expandedRow}
-                onToggle={() => {
-                  if (loggedCall.id === expandedRow) {
-                    setExpandedRow(null);
-                  } else {
-                    setExpandedRow(loggedCall.id);
-                  }
-                }}
-              />
-            );
-          })}
-        </Tbody>
-      </Table>
-    </Card>
-  );
-}

app/src/components/dashboard/UsageGraph.tsx

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

app/src/components/datasets/DatasetCard.tsx

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

app/src/components/datasets/DatasetEntriesPaginator.tsx

@@ -1,21 +0,0 @@
-import { useDatasetEntries } from "~/utils/hooks";
-import Paginator from "../Paginator";
-
-const DatasetEntriesPaginator = () => {
-  const { data } = useDatasetEntries();
-
-  if (!data) return null;
-
-  const { entries, startIndex, lastPage, count } = data;
-
-  return (
-    <Paginator
-      numItemsLoaded={entries.length}
-      startIndex={startIndex}
-      lastPage={lastPage}
-      count={count}
-    />
-  );
-};
-
-export default DatasetEntriesPaginator;

app/src/components/datasets/DatasetEntriesTable.tsx

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

app/src/components/datasets/DatasetHeaderButtons/DatasetHeaderButtons.tsx

@@ -1,26 +0,0 @@
-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}
-      />
-    </>
-  );
-};

app/src/components/datasets/DatasetHeaderButtons/GenerateDataModal.tsx

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

app/src/components/datasets/TableRow.tsx

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

app/src/components/experiments/ExperimentCard.tsx

@@ -15,7 +15,6 @@ 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 ExperimentData = {
   testScenarioCount: number;
@@ -76,17 +75,11 @@ const CountLabel = ({ label, count }: { label: string; count: number }) => {
 
 export const NewExperimentCard = () => {
   const router = useRouter();
-  const selectedProjectId = useAppStore((s) => s.selectedProjectId);
   const createMutation = api.experiments.create.useMutation();
   const [createExperiment, isLoading] = useHandledAsyncCallback(async () => {
-    const newExperiment = await createMutation.mutateAsync({
-      projectId: selectedProjectId ?? "",
-    });
-    await router.push({
-      pathname: "/experiments/[id]",
-      query: { id: newExperiment.id },
-    });
-  }, [createMutation, router, selectedProjectId]);
+    const newExperiment = await createMutation.mutateAsync({ label: "New Experiment" });
+    await router.push({ pathname: "/experiments/[id]", query: { id: newExperiment.id } });
+  }, [createMutation, router]);
 
   return (
     <AspectRatio ratio={1.2} w="full">

app/src/components/experiments/HeaderButtons/HeaderButtons.tsx

@@ -5,7 +5,7 @@ import { BsGearFill } from "react-icons/bs";
 import { TbGitFork } from "react-icons/tb";
 import { useAppStore } from "~/state/store";
 
-export const ExperimentHeaderButtons = () => {
+export const HeaderButtons = () => {
   const experiment = useExperiment();
 
   const canModify = experiment.data?.access.canModify ?? false;

app/src/components/experiments/HeaderButtons/useOnForkButtonPressed.tsx

@@ -3,23 +3,18 @@ import { api } from "~/utils/api";
 import { useExperiment, useHandledAsyncCallback } from "~/utils/hooks";
 import { signIn, useSession } from "next-auth/react";
 import { useRouter } from "next/router";
-import { useAppStore } from "~/state/store";
 
 export const useOnForkButtonPressed = () => {
   const router = useRouter();
 
   const user = useSession().data;
   const experiment = useExperiment();
-  const selectedProjectId = useAppStore((state) => state.selectedProjectId);
 
   const forkMutation = api.experiments.fork.useMutation();
 
   const [onFork, isForking] = useHandledAsyncCallback(async () => {
-    if (!experiment.data?.id || !selectedProjectId) return;
-    const forkedExperimentId = await forkMutation.mutateAsync({
-      id: experiment.data.id,
-      projectId: selectedProjectId,
-    });
+    if (!experiment.data?.id) return;
+    const forkedExperimentId = await forkMutation.mutateAsync({ id: experiment.data.id });
     await router.push({ pathname: "/experiments/[id]", query: { id: forkedExperimentId } });
   }, [forkMutation, experiment.data?.id, router]);
 

app/src/components/nav/AppShell.tsx

@@ -7,22 +7,47 @@ import {
   Image,
   Text,
   Box,
-  Link as ChakraLink,
+  type BoxProps,
+  type LinkProps,
+  Link,
   Flex,
 } from "@chakra-ui/react";
 import Head from "next/head";
-import Link from "next/link";
-import { BsGearFill, BsGithub, BsPersonCircle } from "react-icons/bs";
-import { IoStatsChartOutline } from "react-icons/io5";
-import { RiDatabase2Line, RiFlaskLine } from "react-icons/ri";
+import { BsGithub, BsPersonCircle } from "react-icons/bs";
+import { useRouter } from "next/router";
+import { type IconType } from "react-icons";
+import { RiFlaskLine } from "react-icons/ri";
 import { signIn, useSession } from "next-auth/react";
 import UserMenu from "./UserMenu";
-import { env } from "~/env.mjs";
-import ProjectMenu from "./ProjectMenu";
-import NavSidebarOption from "./NavSidebarOption";
-import IconLink from "./IconLink";
 
-const Divider = () => <Box h="1px" bgColor="gray.300" w="full" />;
+type IconLinkProps = BoxProps & LinkProps & { label?: string; icon: IconType };
+
+const IconLink = ({ icon, label, href, target, color, ...props }: IconLinkProps) => {
+  const router = useRouter();
+  const isActive = href && router.pathname.startsWith(href);
+  return (
+    <HStack
+      w="full"
+      p={4}
+      color={color}
+      as={Link}
+      href={href}
+      target={target}
+      bgColor={isActive ? "gray.200" : "transparent"}
+      _hover={{ bgColor: "gray.200", textDecoration: "none" }}
+      justifyContent="start"
+      cursor="pointer"
+      {...props}
+    >
+      <Icon as={icon} boxSize={6} mr={2} />
+      <Text fontWeight="bold" fontSize="sm">
+        {label}
+      </Text>
+    </HStack>
+  );
+};
+
+const Divider = () => <Box h="1px" bgColor="gray.200" />;
 
 const NavSidebar = () => {
   const user = useSession().data;
@@ -30,80 +55,38 @@ const NavSidebar = () => {
   return (
     <VStack
       align="stretch"
-      bgColor="gray.50"
+      bgColor="gray.100"
       py={2}
-      px={2}
       pb={0}
       height="100%"
-      w={{ base: "56px", md: "240px" }}
+      w={{ base: "56px", md: "200px" }}
       overflow="hidden"
-      borderRightWidth={1}
-      borderColor="gray.300"
     >
-      <HStack
-        as={Link}
-        href="/"
-        _hover={{ textDecoration: "none" }}
-        spacing={{ base: 1, md: 0 }}
-        mx={2}
-        py={{ base: 1, md: 2 }}
-      >
-        <Image src="/logo.svg" alt="" boxSize={6} mr={4} ml={{ base: 0.5, md: 0 }} />
+      <HStack as={Link} href="/" _hover={{ textDecoration: "none" }} spacing={0} px={4} py={2}>
+        <Image src="/logo.svg" alt="" boxSize={6} mr={4} />
         <Heading size="md" fontFamily="inconsolata, monospace">
           OpenPipe
         </Heading>
       </HStack>
-      <Divider />
-      <VStack align="flex-start" overflowY="auto" overflowX="hidden" flex={1}>
+      <VStack spacing={0} align="flex-start" overflowY="auto" overflowX="hidden" flex={1}>
         {user != null && (
           <>
-            <ProjectMenu />
-            <Divider />
-            {env.NEXT_PUBLIC_FF_SHOW_LOGGED_CALLS && (
-              <IconLink icon={IoStatsChartOutline} label="Logged Calls" href="/logged-calls" beta />
-            )}
             <IconLink icon={RiFlaskLine} label="Experiments" href="/experiments" />
-            {env.NEXT_PUBLIC_SHOW_DATA && (
-              <IconLink icon={RiDatabase2Line} label="Data" href="/data" />
-            )}
           </>
         )}
         {user === null && (
-          <NavSidebarOption>
-            <HStack
-              w="full"
-              p={4}
-              as={ChakraLink}
-              justifyContent="start"
-              onClick={() => {
-                signIn("github").catch(console.error);
-              }}
-            >
-              <Icon as={BsPersonCircle} boxSize={6} mr={2} />
-              <Text fontWeight="bold" fontSize="sm">
-                Sign In
-              </Text>
-            </HStack>
-          </NavSidebarOption>
+          <IconLink
+            icon={BsPersonCircle}
+            label="Sign In"
+            onClick={() => {
+              signIn("github").catch(console.error);
+            }}
+          />
         )}
       </VStack>
-      <VStack w="full" alignItems="flex-start" spacing={0}>
-        <Text
-          pl={2}
-          pb={2}
-          fontSize="xs"
-          fontWeight="bold"
-          color="gray.500"
-          display={{ base: "none", md: "flex" }}
-        >
-          CONFIGURATION
-        </Text>
-        <IconLink icon={BsGearFill} label="Project Settings" href="/project/settings" />
-      </VStack>
-      {user && <UserMenu user={user} borderColor={"gray.200"} />}
-      <Divider />
+      {user ? <UserMenu user={user} /> : <Divider />}
       <VStack spacing={0} align="center">
-        <ChakraLink
+        <Link
           href="https://github.com/openpipe/openpipe"
           target="_blank"
           color="gray.500"
@@ -111,21 +94,13 @@ const NavSidebar = () => {
           p={2}
         >
           <Icon as={BsGithub} boxSize={6} />
-        </ChakraLink>
+        </Link>
       </VStack>
     </VStack>
   );
 };
 
-export default function AppShell({
-  children,
-  title,
-  requireAuth,
-}: {
-  children: React.ReactNode;
-  title?: string;
-  requireAuth?: boolean;
-}) {
+export default function AppShell(props: { children: React.ReactNode; title?: string }) {
   const [vh, setVh] = useState("100vh"); // Default height to prevent flicker on initial render
 
   useEffect(() => {
@@ -145,23 +120,14 @@ export default function AppShell({
     };
   }, []);
 
-  const user = useSession().data;
-  const authLoading = useSession().status === "loading";
-
-  useEffect(() => {
-    if (requireAuth && user === null && !authLoading) {
-      signIn("github").catch(console.error);
-    }
-  }, [requireAuth, user, authLoading]);
-
   return (
     <Flex h={vh} w="100vw">
       <Head>
-        <title>{title ? `${title} | OpenPipe` : "OpenPipe"}</title>
+        <title>{props.title ? `${props.title} | OpenPipe` : "OpenPipe"}</title>
       </Head>
       <NavSidebar />
       <Box h="100%" flex={1} overflowY="auto">
-        {children}
+        {props.children}
       </Box>
     </Flex>
   );

app/src/components/nav/IconLink.tsx

@@ -1,31 +0,0 @@
-import { Icon, HStack, Text, type BoxProps } from "@chakra-ui/react";
-import Link, { type LinkProps } from "next/link";
-import { type IconType } from "react-icons";
-import NavSidebarOption from "./NavSidebarOption";
-
-type IconLinkProps = BoxProps &
-  LinkProps & { label?: string; icon: IconType; href: string; beta?: boolean };
-
-const IconLink = ({ icon, label, href, color, beta, ...props }: IconLinkProps) => {
-  return (
-    <Link href={href} style={{ width: "100%" }}>
-      <NavSidebarOption activeHrefPattern={href}>
-        <HStack w="full" justifyContent="space-between" p={2} color={color} {...props}>
-          <HStack w="full" justifyContent="start">
-            <Icon as={icon} boxSize={6} mr={2} />
-            <Text fontSize="sm" display={{ base: "none", md: "block" }}>
-              {label}
-            </Text>
-          </HStack>
-          {beta && (
-            <Text fontSize="xs" ml={2} fontWeight="bold" color="orange.400">
-              BETA
-            </Text>
-          )}
-        </HStack>
-      </NavSidebarOption>
-    </Link>
-  );
-};
-
-export default IconLink;

app/src/components/nav/NavSidebarOption.tsx

@@ -1,29 +0,0 @@
-import { Box, type BoxProps, forwardRef } from "@chakra-ui/react";
-import { useRouter } from "next/router";
-
-const NavSidebarOption = forwardRef<
-  { activeHrefPattern?: string; disableHoverEffect?: boolean } & BoxProps,
-  "div"
->(({ activeHrefPattern, disableHoverEffect, ...props }, ref) => {
-  const router = useRouter();
-  const isActive = activeHrefPattern && router.pathname.startsWith(activeHrefPattern);
-  return (
-    <Box
-      w="full"
-      fontWeight={isActive ? "bold" : "500"}
-      bgColor={isActive ? "gray.200" : "transparent"}
-      _hover={disableHoverEffect ? undefined : { bgColor: "gray.200", textDecoration: "none" }}
-      justifyContent="start"
-      cursor="pointer"
-      borderRadius={4}
-      {...props}
-      ref={ref}
-    >
-      {props.children}
-    </Box>
-  );
-});
-
-NavSidebarOption.displayName = "NavSidebarOption";
-
-export default NavSidebarOption;

app/src/components/nav/PageHeaderContainer.tsx

@@ -1,19 +0,0 @@
-import { Flex, type FlexProps } from "@chakra-ui/react";
-
-const PageHeaderContainer = (props: FlexProps) => {
-  return (
-    <Flex
-      px={8}
-      py={2}
-      minH={16}
-      w="full"
-      direction={{ base: "column", sm: "row" }}
-      alignItems={{ base: "flex-start", sm: "center" }}
-      justifyContent="space-between"
-      fontWeight="500"
-      {...props}
-    />
-  );
-};
-
-export default PageHeaderContainer;

app/src/components/nav/ProjectBreadcrumbContents.tsx

@@ -1,28 +0,0 @@
-import { HStack, Flex, Text } from "@chakra-ui/react";
-import { useSelectedProject } from "~/utils/hooks";
-
-// Have to export only contents here instead of full BreadcrumbItem because Chakra doesn't
-// recognize a BreadcrumbItem exported with this component as a valid child of Breadcrumb.
-export default function ProjectBreadcrumbContents({ projectName = "" }: { projectName?: string }) {
-  const { data: selectedProject } = useSelectedProject();
-
-  projectName = projectName || selectedProject?.name || "";
-
-  return (
-    <HStack w="full">
-      <Flex
-        p={1}
-        borderRadius={4}
-        backgroundColor="orange.100"
-        boxSize={6}
-        alignItems="center"
-        justifyContent="center"
-      >
-        <Text>{projectName[0]?.toUpperCase()}</Text>
-      </Flex>
-      <Text display={{ base: "none", md: "block" }} py={1}>
-        {projectName}
-      </Text>
-    </HStack>
-  );
-}

app/src/components/nav/ProjectMenu.tsx

@@ -1,171 +0,0 @@
-import {
-  HStack,
-  VStack,
-  Text,
-  Popover,
-  PopoverTrigger,
-  PopoverContent,
-  Flex,
-  IconButton,
-  Icon,
-  Divider,
-  Button,
-  useDisclosure,
-  Spinner,
-} from "@chakra-ui/react";
-import React, { useEffect, useState } from "react";
-import Link from "next/link";
-import { BsChevronRight, BsGear, BsPlus } from "react-icons/bs";
-import { type Project } from "@prisma/client";
-
-import { useAppStore } from "~/state/store";
-import { api } from "~/utils/api";
-import NavSidebarOption from "./NavSidebarOption";
-import { useHandledAsyncCallback, useSelectedProject } from "~/utils/hooks";
-import { useRouter } from "next/router";
-
-export default function ProjectMenu() {
-  const router = useRouter();
-  const utils = api.useContext();
-
-  const selectedProjectId = useAppStore((s) => s.selectedProjectId);
-  const setselectedProjectId = useAppStore((s) => s.setselectedProjectId);
-
-  const { data: projects } = api.projects.list.useQuery();
-
-  useEffect(() => {
-    if (
-      projects &&
-      projects[0] &&
-      (!selectedProjectId || !projects.find((proj) => proj.id === selectedProjectId))
-    ) {
-      setselectedProjectId(projects[0].id);
-    }
-  }, [selectedProjectId, setselectedProjectId, projects]);
-
-  const { data: selectedProject } = useSelectedProject();
-
-  const popover = useDisclosure();
-
-  const createMutation = api.projects.create.useMutation();
-  const [createProject, isLoading] = useHandledAsyncCallback(async () => {
-    const newProj = await createMutation.mutateAsync({ name: "New Project" });
-    await utils.projects.list.invalidate();
-    setselectedProjectId(newProj.id);
-    await router.push({ pathname: "/project/settings" });
-  }, [createMutation, router]);
-
-  return (
-    <VStack w="full" alignItems="flex-start" spacing={0}>
-      <Text
-        pl={2}
-        pb={2}
-        fontSize="xs"
-        fontWeight="bold"
-        color="gray.500"
-        display={{ base: "none", md: "flex" }}
-      >
-        PROJECT
-      </Text>
-      <Popover placement="right-end" isOpen={popover.isOpen} onClose={popover.onClose} closeOnBlur>
-        <PopoverTrigger>
-          <NavSidebarOption>
-            <HStack w="full" onClick={popover.onToggle}>
-              <Flex
-                p={1}
-                borderRadius={4}
-                backgroundColor="orange.100"
-                minW={{ base: 10, md: 8 }}
-                minH={{ base: 10, md: 8 }}
-                m={{ base: 0, md: 1 }}
-                alignItems="center"
-                justifyContent="center"
-              >
-                <Text>{selectedProject?.name[0]?.toUpperCase()}</Text>
-              </Flex>
-              <Text fontSize="sm" display={{ base: "none", md: "block" }} py={1} flex={1}>
-                {selectedProject?.name}
-              </Text>
-              <Icon as={BsChevronRight} boxSize={4} color="gray.500" />
-            </HStack>
-          </NavSidebarOption>
-        </PopoverTrigger>
-        <PopoverContent _focusVisible={{ outline: "unset" }} ml={-1} w="auto" minW={100} maxW={280}>
-          <VStack alignItems="flex-start" spacing={2} py={4} px={2}>
-            <Text color="gray.500" fontSize="xs" fontWeight="bold" pb={1}>
-              PROJECTS
-            </Text>
-            <Divider />
-            <VStack spacing={0} w="full">
-              {projects?.map((proj) => (
-                <ProjectOption
-                  key={proj.id}
-                  proj={proj}
-                  isActive={proj.id === selectedProjectId}
-                  onClose={popover.onClose}
-                />
-              ))}
-            </VStack>
-            <HStack
-              as={Button}
-              variant="ghost"
-              colorScheme="blue"
-              color="blue.400"
-              pr={8}
-              w="full"
-              onClick={createProject}
-            >
-              <Icon as={isLoading ? Spinner : BsPlus} boxSize={6} />
-              <Text>New project</Text>
-            </HStack>
-          </VStack>
-        </PopoverContent>
-      </Popover>
-    </VStack>
-  );
-}
-
-const ProjectOption = ({
-  proj,
-  isActive,
-  onClose,
-}: {
-  proj: Project;
-  isActive: boolean;
-  onClose: () => void;
-}) => {
-  const setselectedProjectId = useAppStore((s) => s.setselectedProjectId);
-  const [gearHovered, setGearHovered] = useState(false);
-  return (
-    <HStack
-      as={Link}
-      href="/experiments"
-      onClick={() => {
-        setselectedProjectId(proj.id);
-        onClose();
-      }}
-      w="full"
-      justifyContent="space-between"
-      bgColor={isActive ? "gray.100" : "transparent"}
-      _hover={gearHovered ? undefined : { bgColor: "gray.200", textDecoration: "none" }}
-      p={2}
-      borderRadius={4}
-      spacing={4}
-    >
-      <Text>{proj.name}</Text>
-      <IconButton
-        as={Link}
-        href="/project/settings"
-        aria-label={`Open ${proj.name} settings`}
-        icon={<Icon as={BsGear} boxSize={5} strokeWidth={0.5} color="gray.500" />}
-        variant="ghost"
-        size="xs"
-        p={0}
-        onMouseEnter={() => setGearHovered(true)}
-        onMouseLeave={() => setGearHovered(false)}
-        _hover={{ bgColor: isActive ? "gray.300" : "gray.100", transitionDelay: 0 }}
-        borderRadius={4}
-      />
-    </HStack>
-  );
-};

app/src/components/nav/UserMenu.tsx

@@ -8,14 +8,12 @@ import {
   PopoverTrigger,
   PopoverContent,
   Link,
-  type StackProps,
 } from "@chakra-ui/react";
 import { type Session } from "next-auth";
 import { signOut } from "next-auth/react";
 import { BsBoxArrowRight, BsChevronRight, BsPersonCircle } from "react-icons/bs";
-import NavSidebarOption from "./NavSidebarOption";
 
-export default function UserMenu({ user, ...rest }: { user: Session } & StackProps) {
+export default function UserMenu({ user }: { user: Session }) {
   const profileImage = user.user.image ? (
     <Image src={user.user.image} alt="profile picture" boxSize={8} borderRadius="50%" />
   ) : (
@@ -26,28 +24,32 @@ export default function UserMenu({ user, ...rest }: { user: Session } & StackPro
     <>
       <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>
+          <HStack
+            // Weird values to make mobile look right; can clean up when we make the sidebar disappear on mobile
+            px={3}
+            spacing={3}
+            py={2}
+            borderColor={"gray.200"}
+            borderTopWidth={1}
+            borderBottomWidth={1}
+            cursor="pointer"
+            _hover={{
+              bgColor: "gray.200",
+            }}
+          >
+            {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>
         </PopoverTrigger>
-        <PopoverContent _focusVisible={{ outline: "unset" }} ml={-1} minW={48} w="full">
+        <PopoverContent _focusVisible={{ boxShadow: "unset", outline: "unset" }} maxW="200px">
           <VStack align="stretch" spacing={0}>
             {/* sign out */}
             <HStack

app/src/components/projectSettings/DeleteProjectDialog.tsx

@@ -1,89 +0,0 @@
-import {
-  Button,
-  AlertDialog,
-  AlertDialogBody,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogContent,
-  AlertDialogOverlay,
-  Input,
-  Text,
-  VStack,
-  Box,
-  Spinner,
-} from "@chakra-ui/react";
-
-import { useRouter } from "next/router";
-import { useRef, useState } from "react";
-import { api } from "~/utils/api";
-import { useHandledAsyncCallback, useSelectedProject } from "~/utils/hooks";
-
-export const DeleteProjectDialog = ({
-  isOpen,
-  onClose,
-}: {
-  isOpen: boolean;
-  onClose: () => void;
-}) => {
-  const selectedProject = useSelectedProject();
-  const deleteMutation = api.projects.delete.useMutation();
-  const utils = api.useContext();
-  const router = useRouter();
-
-  const cancelRef = useRef<HTMLButtonElement>(null);
-
-  const [onDeleteConfirm, isDeleting] = useHandledAsyncCallback(async () => {
-    if (!selectedProject.data?.id) return;
-    await deleteMutation.mutateAsync({ id: selectedProject.data.id });
-    await utils.projects.list.invalidate();
-    await router.push({ pathname: "/experiments" });
-    onClose();
-  }, [deleteMutation, selectedProject, router]);
-
-  const [nameToDelete, setNameToDelete] = useState("");
-
-  return (
-    <AlertDialog isOpen={isOpen} leastDestructiveRef={cancelRef} onClose={onClose}>
-      <AlertDialogOverlay>
-        <AlertDialogContent>
-          <AlertDialogHeader fontSize="lg" fontWeight="bold">
-            Delete Project
-          </AlertDialogHeader>
-
-          <AlertDialogBody>
-            <VStack spacing={4} alignItems="flex-start">
-              <Text>
-                If you delete this project all the associated data and experiments will be deleted
-                as well. If you are sure that you want to delete this project, please type the name
-                of the project below.
-              </Text>
-              <Box bgColor="orange.100" w="full" p={2} borderRadius={4}>
-                <Text fontFamily="inconsolata">{selectedProject.data?.name}</Text>
-              </Box>
-              <Input
-                placeholder={selectedProject.data?.name}
-                value={nameToDelete}
-                onChange={(e) => setNameToDelete(e.target.value)}
-              />
-            </VStack>
-          </AlertDialogBody>
-
-          <AlertDialogFooter>
-            <Button ref={cancelRef} onClick={onClose}>
-              Cancel
-            </Button>
-            <Button
-              colorScheme="red"
-              onClick={onDeleteConfirm}
-              ml={3}
-              isDisabled={nameToDelete !== selectedProject.data?.name}
-              w={20}
-            >
-              {isDeleting ? <Spinner /> : "Delete"}
-            </Button>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialogOverlay>
-    </AlertDialog>
-  );
-};

app/src/components/tooltip/CostTooltip.tsx

@@ -2,14 +2,14 @@ import { HStack, Icon, Text, Tooltip, type TooltipProps, VStack, Divider } from
 import { BsCurrencyDollar } from "react-icons/bs";
 
 type CostTooltipProps = {
-  inputTokens: number | null;
-  outputTokens: number | null;
+  promptTokens: number | null;
+  completionTokens: number | null;
   cost: number;
 } & TooltipProps;
 
 export const CostTooltip = ({
-  inputTokens,
-  outputTokens,
+  promptTokens,
+  completionTokens,
   cost,
   children,
   ...props
@@ -36,12 +36,12 @@ export const CostTooltip = ({
             <HStack>
               <VStack w="28" spacing={1}>
                 <Text>Prompt</Text>
-                <Text>{inputTokens ?? 0}</Text>
+                <Text>{promptTokens ?? 0}</Text>
               </VStack>
               <Divider borderColor="gray.200" h={8} orientation="vertical" />
               <VStack w="28" spacing={1}>
                 <Text whiteSpace="nowrap">Completion</Text>
-                <Text>{outputTokens ?? 0}</Text>
+                <Text>{completionTokens ?? 0}</Text>
               </VStack>
             </HStack>
           </VStack>

app/src/env.mjs

@@ -19,8 +19,6 @@ export const env = createEnv({
     OPENAI_API_KEY: z.string().min(1),
     REPLICATE_API_TOKEN: z.string().default("placeholder"),
     ANTHROPIC_API_KEY: z.string().default("placeholder"),
-    SENTRY_AUTH_TOKEN: z.string().optional(),
-    OPENPIPE_API_KEY: z.string().optional(),
   },
 
   /**
@@ -31,10 +29,6 @@ export const env = createEnv({
   client: {
     NEXT_PUBLIC_POSTHOG_KEY: z.string().optional(),
     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(),
   },
 
   /**
@@ -48,16 +42,10 @@ export const env = createEnv({
     RESTRICT_PRISMA_LOGS: process.env.RESTRICT_PRISMA_LOGS,
     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,
     ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY,
-    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,
-    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.

app/src/modelProviders/anthropic-completion/codegen/input.schema.json

@@ -1,64 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "model": {
-      "description": "The model that will complete your prompt.",
-      "x-oaiTypeLabel": "string",
-      "type": "string",
-      "enum": [
-        "claude-2",
-        "claude-2.0",
-        "claude-instant-1",
-        "claude-instant-1.1",
-        "claude-instant-1.2"
-      ]
-    },
-    "prompt": {
-      "description": "The prompt that you want Claude to complete.\n\nFor proper response generation you will need to format your prompt as follows:\n\"\\n\\nHuman: all instructions for the assistant\\n\\nAssistant:\". The prompt string should begin with the characters \"Human:\" and end with \"Assistant:\".",
-      "default": "<|endoftext|>",
-      "example": "\\n\\nHuman: What is the correct translation of ${scenario.input}? I would like a long analysis followed by a short answer.\\n\\nAssistant:",
-      "type": "string"
-    },
-    "max_tokens_to_sample": {
-      "type": "integer",
-      "minimum": 1,
-      "default": 256,
-      "nullable": true,
-      "description": "The maximum number of tokens to generate before stopping."
-    },
-    "temperature": {
-      "type": "number",
-      "minimum": 0,
-      "maximum": 1,
-      "nullable": true,
-      "description": "Amount of randomness injected into the response.\n\nDefaults to 1."
-    },
-    "top_p": {
-      "type": "number",
-      "minimum": 0,
-      "maximum": 1,
-      "nullable": true,
-      "description": "Use nucleus sampling.\n\nYou should either alter temperature or top_p, but not both.\n"
-    },
-    "top_k": {
-      "type": "number",
-      "minimum": 0,
-      "default": 5,
-      "nullable": true,
-      "description": "Only sample from the top K options for each subsequent token."
-    },
-    "stream": {
-      "description": "Whether to incrementally stream the response using server-sent events.",
-      "type": "boolean",
-      "nullable": true,
-      "default": false
-    },
-    "stop_sequences": {
-      "description": "Sequences that will cause the model to stop generating completion text.\nBy default, our models stop on \"\\n\\nHuman:\".",
-      "default": null,
-      "nullable": true,
-      "type": "array"
-    }
-  },
-  "required": ["model", "prompt", "max_tokens_to_sample"]
-}