Remove unused import

Square header border when scrolled down
2023-08-18 01:35:01 -07:00 · 2023-08-18 01:33:13 -07:00
85 changed files with 1539 additions and 1873 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@
 *.pyc
 node_modules/
 *.tsbuildinfo
-dist/
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
+<!-- <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/66bb1843-cb72-4130-a369-eec2df3b8201" alt="demo">
+<img src="https://github.com/openpipe/openpipe/assets/41524992/219a844e-3f4e-4f6b-8066-41348b42977b" alt="demo">

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

@@ -35,19 +37,25 @@ OpenPipe lets you _template_ a prompt. Use the templating feature to run the pro

 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"> -->
+<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"> -->
+<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"> -->
+<img width="600" src="https://github.com/openpipe/openpipe/assets/41524992/219a844e-3f4e-4f6b-8066-41348b42977b" alt="auto-generate">
+
+<br><br>

 ## Running Locally

--- a/app/@types/nextjs-routes.d.ts
+++ b/app/@types/nextjs-routes.d.ts
@@ -19,9 +19,10 @@ declare module "nextjs-routes" {
    | DynamicRoute<"/api/v1/[...trpc]", { "trpc": string[] }>
    | StaticRoute<"/api/v1/openapi">
    | StaticRoute<"/dashboard">
+    | DynamicRoute<"/data/[id]", { "id": string }>
+    | StaticRoute<"/data">
    | DynamicRoute<"/experiments/[experimentSlug]", { "experimentSlug": string }>
    | StaticRoute<"/experiments">
-    | StaticRoute<"/fine-tunes">
    | StaticRoute<"/">
    | DynamicRoute<"/invitations/[invitationToken]", { "invitationToken": string }>
    | StaticRoute<"/project/settings">
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -23,7 +23,7 @@ ARG NEXT_PUBLIC_SOCKET_URL
 ARG NEXT_PUBLIC_HOST
 ARG NEXT_PUBLIC_SENTRY_DSN
 ARG SENTRY_AUTH_TOKEN
-ARG NEXT_PUBLIC_FF_SHOW_BETA_FEATURES
+ARG NEXT_PUBLIC_FF_SHOW_LOGGED_CALLS

 WORKDIR /code
 COPY --from=deps /code/node_modules ./node_modules
@@ -45,4 +45,4 @@ EXPOSE 3000
 ENV PORT 3000

 # Run the "run-prod.sh" script
-CMD /code/app/scripts/run-prod.sh
+CMD /code/app/run-prod.sh
--- a/app/package.json
+++ b/app/package.json
@@ -12,8 +12,8 @@
    "build": "next build",
    "dev:next": "TZ=UTC next dev",
    "dev:wss": "pnpm tsx --watch src/wss-server.ts",
-    "worker": "NODE_ENV='development' pnpm tsx --watch src/server/tasks/worker.ts",
-    "dev": "concurrently --kill-others 'pnpm dev:next' 'pnpm dev:wss' 'pnpm worker --watch'",
+    "dev:worker": "NODE_ENV='development' pnpm tsx --watch src/server/tasks/worker.ts",
+    "dev": "concurrently --kill-others 'pnpm dev:next' 'pnpm dev:wss' 'pnpm dev:worker'",
    "postinstall": "prisma generate",
    "lint": "next lint",
    "start": "TZ=UTC next start",
@@ -60,7 +60,6 @@
    "framer-motion": "^10.12.17",
    "gpt-tokens": "^1.0.10",
    "graphile-worker": "^0.13.0",
-    "human-id": "^4.0.0",
    "immer": "^10.0.2",
    "isolated-vm": "^4.5.0",
    "json-schema-to-typescript": "^13.0.2",
--- a/app/prisma/migrations/20230822234224_add_fine_tunes/migration.sql
+++ b/app/prisma/migrations/20230822234224_add_fine_tunes/migration.sql
@@ -1,48 +0,0 @@
-/*
-  Warnings:
-
-  - You are about to drop the column `input` on the `DatasetEntry` table. All the data in the column will be lost.
-  - You are about to drop the column `output` on the `DatasetEntry` table. All the data in the column will be lost.
-  - Added the required column `loggedCallId` to the `DatasetEntry` table without a default value. This is not possible if the table is not empty.
-
-*/
-- AlterTable
-ALTER TABLE "DatasetEntry" DROP COLUMN "input",
-DROP COLUMN "output",
-ADD COLUMN     "loggedCallId" UUID NOT NULL;
-
-- AddForeignKey
-ALTER TABLE "DatasetEntry" ADD CONSTRAINT "DatasetEntry_loggedCallId_fkey" FOREIGN KEY ("loggedCallId") REFERENCES "LoggedCall"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
-- AlterTable
-ALTER TABLE "LoggedCallModelResponse" ALTER COLUMN "cost" SET DATA TYPE DOUBLE PRECISION;
-
-- CreateEnum
-CREATE TYPE "FineTuneStatus" AS ENUM ('PENDING', 'TRAINING', 'AWAITING_DEPLOYMENT', 'DEPLOYING', 'DEPLOYED', 'ERROR');
-
-- CreateTable
-CREATE TABLE "FineTune" (
-    "id" UUID NOT NULL,
-    "slug" TEXT NOT NULL,
-    "baseModel" TEXT NOT NULL,
-    "status" "FineTuneStatus" NOT NULL DEFAULT 'PENDING',
-    "trainingStartedAt" TIMESTAMP(3),
-    "trainingFinishedAt" TIMESTAMP(3),
-    "deploymentStartedAt" TIMESTAMP(3),
-    "deploymentFinishedAt" TIMESTAMP(3),
-    "datasetId" UUID NOT NULL,
-    "projectId" UUID NOT NULL,
-    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "FineTune_pkey" PRIMARY KEY ("id")
-);
-
-- CreateIndex
-CREATE UNIQUE INDEX "FineTune_slug_key" ON "FineTune"("slug");
-
-- AddForeignKey
-ALTER TABLE "FineTune" ADD CONSTRAINT "FineTune_datasetId_fkey" FOREIGN KEY ("datasetId") REFERENCES "Dataset"("id") ON DELETE CASCADE ON UPDATE CASCADE;
-
-- AddForeignKey
-ALTER TABLE "FineTune" ADD CONSTRAINT "FineTune_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
--- a/app/prisma/schema.prisma
+++ b/app/prisma/schema.prisma
@@ -181,7 +181,6 @@ model Dataset {

    name           String
    datasetEntries DatasetEntry[]
-    fineTunes      FineTune[]

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

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

    datasetId String   @db.Uuid
    dataset   Dataset? @relation(fields: [datasetId], references: [id], onDelete: Cascade)
@@ -217,7 +216,6 @@ model Project {
    experiments            Experiment[]
    datasets               Dataset[]
    loggedCalls            LoggedCall[]
-    fineTunes              FineTune[]
    apiKeys                ApiKey[]
 }

@@ -280,7 +278,6 @@ model LoggedCall {

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

    createdAt DateTime @default(now())
    updatedAt DateTime @updatedAt
@@ -315,7 +312,7 @@ model LoggedCallModelResponse {
    outputTokens Int?
    finishReason String?
    completionId String?
-    cost         Float?
+    cost         Decimal? @db.Decimal(18, 12)

    // The LoggedCall that created this LoggedCallModelResponse
    originalLoggedCallId String     @unique @db.Uuid
@@ -430,33 +427,3 @@ model VerificationToken {

    @@unique([identifier, token])
 }
-
-enum FineTuneStatus {
-    PENDING
-    TRAINING
-    AWAITING_DEPLOYMENT
-    DEPLOYING
-    DEPLOYED
-    ERROR
-}
-
-model FineTune {
-    id String @id @default(uuid()) @db.Uuid
-
-    slug      String @unique
-    baseModel String
-    status    FineTuneStatus @default(PENDING)
-    trainingStartedAt    DateTime?
-    trainingFinishedAt   DateTime?
-    deploymentStartedAt  DateTime?
-    deploymentFinishedAt DateTime?
-
-    datasetId String   @db.Uuid
-    dataset   Dataset @relation(fields: [datasetId], references: [id], onDelete: Cascade)
-
-    projectId String  @db.Uuid
-    project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
-
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
-}
--- a/app/scripts/run-prod.sh
+++ b/app/scripts/run-prod.sh
@@ -10,4 +10,6 @@ pnpm tsx src/promptConstructor/migrate.ts

 echo "Starting the server"

-pnpm start
+pnpm concurrently --kill-others \
+  "pnpm start" \
+  "pnpm tsx src/server/tasks/worker.ts"
--- a/app/scripts/debug-prod.sh
+++ b/app/scripts/debug-prod.sh
@@ -1,6 +0,0 @@
-#! /bin/bash
-
-set -e
-cd "$(dirname "$0")/.."
-apt-get update
-apt-get install -y htop psql
--- a/app/scripts/run-workers-prod.sh
+++ b/app/scripts/run-workers-prod.sh
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-set -e
-
-echo "Migrating the database"
-pnpm prisma migrate deploy
-
-echo "Starting 4 workers"
-
-pnpm concurrently "pnpm worker" "pnpm worker" "pnpm worker" "pnpm worker"
--- a/app/scripts/test-docker.sh
+++ b/app/scripts/test-docker.sh
@@ -1,13 +0,0 @@
-#! /bin/bash
-
-set -e
-
-cd "$(dirname "$0")/../.."
-
-echo "Env is"
-echo $ENVIRONMENT
-
-docker build . --file app/Dockerfile --tag "openpipe-prod"
-
-# Run the image
-docker run --env-file app/.env -it --entrypoint "/bin/bash" "openpipe-prod"
--- a/app/sentry.server.config.ts
+++ b/app/sentry.server.config.ts
@@ -3,7 +3,6 @@
 // https://docs.sentry.io/platforms/javascript/guides/nextjs/

 import * as Sentry from "@sentry/nextjs";
-import { isError } from "lodash-es";
 import { env } from "~/env.mjs";

 if (env.NEXT_PUBLIC_SENTRY_DSN) {
@@ -16,10 +15,4 @@ if (env.NEXT_PUBLIC_SENTRY_DSN) {
    // Setting this option to true will print useful information to the console while you're setting up Sentry.
    debug: false,
  });
-} else {
-  // Install local debug exception handler for rejected promises
-  process.on("unhandledRejection", (reason) => {
-    const reasonDetails = isError(reason) ? reason?.stack : reason;
-    console.log("Unhandled Rejection at:", reasonDetails);
-  });
 }
--- a/app/src/components/InputDropdown.tsx
+++ b/app/src/components/InputDropdown.tsx
@@ -11,7 +11,6 @@ import {
  Button,
  Text,
  useDisclosure,
-  type InputGroupProps,
 } from "@chakra-ui/react";

 import { FiChevronDown } from "react-icons/fi";
@@ -21,25 +20,15 @@ type InputDropdownProps<T> = {
  options: ReadonlyArray<T>;
  selectedOption: T;
  onSelect: (option: T) => void;
-  inputGroupProps?: InputGroupProps;
 };

-const InputDropdown = <T,>({
-  options,
-  selectedOption,
-  onSelect,
-  inputGroupProps,
-}: InputDropdownProps<T>) => {
+const InputDropdown = <T,>({ options, selectedOption, onSelect }: InputDropdownProps<T>) => {
  const popover = useDisclosure();

  return (
    <Popover placement="bottom-start" {...popover}>
      <PopoverTrigger>
-        <InputGroup
-          cursor="pointer"
-          w={(selectedOption as string).length * 14 + 180}
-          {...inputGroupProps}
-        >
+        <InputGroup cursor="pointer" w={(selectedOption as string).length * 14 + 180}>
          <Input
            value={selectedOption as string}
            // eslint-disable-next-line @typescript-eslint/no-empty-function -- controlled input requires onChange
--- a/app/src/components/OutputsTable/OutputCell/OutputCell.tsx
+++ b/app/src/components/OutputsTable/OutputCell/OutputCell.tsx
@@ -43,7 +43,7 @@ export default function OutputCell({

  type OutputSchema = Parameters<typeof provider.normalizeOutput>[0];

-  const { mutateAsync: hardRefetchMutate } = api.scenarioVariantCells.hardRefetch.useMutation();
+  const { mutateAsync: hardRefetchMutate } = api.scenarioVariantCells.forceRefetch.useMutation();
  const [hardRefetch, hardRefetching] = useHandledAsyncCallback(async () => {
    await hardRefetchMutate({ scenarioId: scenario.id, variantId: variant.id });
    await utils.scenarioVariantCells.get.invalidate({
--- a/app/src/components/OutputsTable/VariantEditor.tsx
+++ b/app/src/components/OutputsTable/VariantEditor.tsx
@@ -110,7 +110,7 @@ export default function VariantEditor(props: { variant: PromptVariant }) {
    setIsChanged(false);

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

  useEffect(() => {
    if (monaco) {
--- a/app/src/components/OutputsTable/index.tsx
+++ b/app/src/components/OutputsTable/index.tsx
@@ -77,7 +77,6 @@ export default function OutputsTable({ experimentId }: { experimentId: string |
              {...sharedProps}
              borderBottomLeftRadius={isFirst ? 8 : 0}
              borderBottomRightRadius={isLast ? 8 : 0}
-              boxShadow="5px 5px 15px 1px rgba(0, 0, 0, 0.1);"
            >
              <VariantStats variant={variant} />
            </GridItem>
--- a/app/src/components/Paginator.tsx
+++ b/app/src/components/Paginator.tsx
@@ -1,19 +1,15 @@
-import {
-  HStack,
-  IconButton,
-  Text,
-  Select,
-  type StackProps,
-  Icon,
-  useBreakpointValue,
-} from "@chakra-ui/react";
+import { HStack, IconButton, Text, Select, type StackProps, Icon } from "@chakra-ui/react";
 import React, { useCallback } from "react";
 import { FiChevronsLeft, FiChevronsRight, FiChevronLeft, FiChevronRight } from "react-icons/fi";
 import { usePageParams } from "~/utils/hooks";

 const pageSizeOptions = [10, 25, 50, 100];

-const Paginator = ({ count, ...props }: { count: number; condense?: boolean } & StackProps) => {
+const Paginator = ({
+  count,
+  condense,
+  ...props
+}: { count: number; condense?: boolean } & StackProps) => {
  const { page, pageSize, setPageParams } = usePageParams();

  const lastPage = Math.ceil(count / pageSize);
@@ -41,9 +37,6 @@ const Paginator = ({ count, ...props }: { count: number; condense?: boolean } &
  const goToLastPage = () => setPageParams({ page: lastPage }, "replace");
  const goToFirstPage = () => setPageParams({ page: 1 }, "replace");

-  const isMobile = useBreakpointValue({ base: true, md: false });
-  const condense = isMobile || props.condense;
-
  if (count === 0) return null;

  return (
--- a/app/src/components/datasets/DatasetCard.tsx
+++ b/app/src/components/datasets/DatasetCard.tsx
@@ -0,0 +1,112 @@
+import {
+  HStack,
+  Icon,
+  VStack,
+  Text,
+  Divider,
+  Spinner,
+  AspectRatio,
+  SkeletonText,
+} from "@chakra-ui/react";
+import { RiDatabase2Line } from "react-icons/ri";
+import { formatTimePast } from "~/utils/dayjs";
+import Link from "next/link";
+import { useRouter } from "next/router";
+import { BsPlusSquare } from "react-icons/bs";
+import { api } from "~/utils/api";
+import { useHandledAsyncCallback } from "~/utils/hooks";
+import { useAppStore } from "~/state/store";
+
+type DatasetData = {
+  name: string;
+  numEntries: number;
+  id: string;
+  createdAt: Date;
+  updatedAt: Date;
+};
+
+export const DatasetCard = ({ dataset }: { dataset: DatasetData }) => {
+  return (
+    <AspectRatio ratio={1.2} w="full">
+      <VStack
+        as={Link}
+        href={{ pathname: "/data/[id]", query: { id: dataset.id } }}
+        bg="gray.50"
+        _hover={{ bg: "gray.100" }}
+        transition="background 0.2s"
+        cursor="pointer"
+        borderColor="gray.200"
+        borderWidth={1}
+        p={4}
+        justify="space-between"
+      >
+        <HStack w="full" color="gray.700" justify="center">
+          <Icon as={RiDatabase2Line} boxSize={4} />
+          <Text fontWeight="bold">{dataset.name}</Text>
+        </HStack>
+        <HStack h="full" spacing={4} flex={1} align="center">
+          <CountLabel label="Rows" count={dataset.numEntries} />
+        </HStack>
+        <HStack w="full" color="gray.500" fontSize="xs" textAlign="center">
+          <Text flex={1}>Created {formatTimePast(dataset.createdAt)}</Text>
+          <Divider h={4} orientation="vertical" />
+          <Text flex={1}>Updated {formatTimePast(dataset.updatedAt)}</Text>
+        </HStack>
+      </VStack>
+    </AspectRatio>
+  );
+};
+
+const CountLabel = ({ label, count }: { label: string; count: number }) => {
+  return (
+    <VStack alignItems="center" flex={1}>
+      <Text color="gray.500" fontWeight="bold">
+        {label}
+      </Text>
+      <Text fontSize="sm" color="gray.500">
+        {count}
+      </Text>
+    </VStack>
+  );
+};
+
+export const NewDatasetCard = () => {
+  const router = useRouter();
+  const selectedProjectId = useAppStore((s) => s.selectedProjectId);
+  const createMutation = api.datasets.create.useMutation();
+  const [createDataset, isLoading] = useHandledAsyncCallback(async () => {
+    const newDataset = await createMutation.mutateAsync({ projectId: selectedProjectId ?? "" });
+    await router.push({ pathname: "/data/[id]", query: { id: newDataset.id } });
+  }, [createMutation, router, selectedProjectId]);
+
+  return (
+    <AspectRatio ratio={1.2} w="full">
+      <VStack
+        align="center"
+        justify="center"
+        _hover={{ cursor: "pointer", bg: "gray.50" }}
+        transition="background 0.2s"
+        cursor="pointer"
+        borderColor="gray.200"
+        borderWidth={1}
+        p={4}
+        onClick={createDataset}
+      >
+        <Icon as={isLoading ? Spinner : BsPlusSquare} boxSize={8} />
+        <Text display={{ base: "none", md: "block" }} ml={2}>
+          New Dataset
+        </Text>
+      </VStack>
+    </AspectRatio>
+  );
+};
+
+export const DatasetCardSkeleton = () => (
+  <AspectRatio ratio={1.2} w="full">
+    <VStack align="center" borderColor="gray.200" borderWidth={1} p={4} bg="gray.50">
+      <SkeletonText noOfLines={1} w="80%" />
+      <SkeletonText noOfLines={2} w="60%" />
+      <SkeletonText noOfLines={1} w="80%" />
+    </VStack>
+  </AspectRatio>
+);
--- a/app/src/components/datasets/DatasetEntriesPaginator.tsx
+++ b/app/src/components/datasets/DatasetEntriesPaginator.tsx
@@ -0,0 +1,16 @@
+import { type StackProps } from "@chakra-ui/react";
+
+import { useDatasetEntries } from "~/utils/hooks";
+import Paginator from "../Paginator";
+
+const DatasetEntriesPaginator = (props: StackProps) => {
+  const { data } = useDatasetEntries();
+
+  if (!data) return null;
+
+  const { count } = data;
+
+  return <Paginator count={count} {...props} />;
+};
+
+export default DatasetEntriesPaginator;
--- a/app/src/components/datasets/DatasetEntriesTable.tsx
+++ b/app/src/components/datasets/DatasetEntriesTable.tsx
@@ -0,0 +1,31 @@
+import { type StackProps, VStack, Table, Th, Tr, Thead, Tbody, Text } from "@chakra-ui/react";
+import { useDatasetEntries } from "~/utils/hooks";
+import TableRow from "./TableRow";
+import DatasetEntriesPaginator from "./DatasetEntriesPaginator";
+
+const DatasetEntriesTable = (props: StackProps) => {
+  const { data } = useDatasetEntries();
+
+  return (
+    <VStack justifyContent="space-between" {...props}>
+      <Table variant="simple" sx={{ "table-layout": "fixed", width: "full" }}>
+        <Thead>
+          <Tr>
+            <Th>Input</Th>
+            <Th>Output</Th>
+          </Tr>
+        </Thead>
+        <Tbody>{data?.entries.map((entry) => <TableRow key={entry.id} entry={entry} />)}</Tbody>
+      </Table>
+      {(!data || data.entries.length) === 0 ? (
+        <Text alignSelf="flex-start" pl={6} color="gray.500">
+          No entries found
+        </Text>
+      ) : (
+        <DatasetEntriesPaginator />
+      )}
+    </VStack>
+  );
+};
+
+export default DatasetEntriesTable;
--- a/app/src/components/datasets/DatasetHeaderButtons/DatasetHeaderButtons.tsx
+++ b/app/src/components/datasets/DatasetHeaderButtons/DatasetHeaderButtons.tsx
@@ -0,0 +1,26 @@
+import { Button, HStack, useDisclosure } from "@chakra-ui/react";
+import { BiImport } from "react-icons/bi";
+import { BsStars } from "react-icons/bs";
+
+import { GenerateDataModal } from "./GenerateDataModal";
+
+export const DatasetHeaderButtons = () => {
+  const generateModalDisclosure = useDisclosure();
+
+  return (
+    <>
+      <HStack>
+        <Button leftIcon={<BiImport />} colorScheme="blue" variant="ghost">
+          Import Data
+        </Button>
+        <Button leftIcon={<BsStars />} colorScheme="blue" onClick={generateModalDisclosure.onOpen}>
+          Generate Data
+        </Button>
+      </HStack>
+      <GenerateDataModal
+        isOpen={generateModalDisclosure.isOpen}
+        onClose={generateModalDisclosure.onClose}
+      />
+    </>
+  );
+};
--- a/app/src/components/datasets/DatasetHeaderButtons/GenerateDataModal.tsx
+++ b/app/src/components/datasets/DatasetHeaderButtons/GenerateDataModal.tsx
@@ -0,0 +1,128 @@
+import {
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalHeader,
+  ModalOverlay,
+  ModalFooter,
+  Text,
+  HStack,
+  VStack,
+  Icon,
+  NumberInput,
+  NumberInputField,
+  NumberInputStepper,
+  NumberIncrementStepper,
+  NumberDecrementStepper,
+  Button,
+} from "@chakra-ui/react";
+import { BsStars } from "react-icons/bs";
+import { useState } from "react";
+import { useDataset, useHandledAsyncCallback } from "~/utils/hooks";
+import { api } from "~/utils/api";
+import AutoResizeTextArea from "~/components/AutoResizeTextArea";
+
+export const GenerateDataModal = ({
+  isOpen,
+  onClose,
+}: {
+  isOpen: boolean;
+  onClose: () => void;
+}) => {
+  const utils = api.useContext();
+
+  const datasetId = useDataset().data?.id;
+
+  const [numToGenerate, setNumToGenerate] = useState<number>(20);
+  const [inputDescription, setInputDescription] = useState<string>(
+    "Each input should contain an email body. Half of the emails should contain event details, and the other half should not.",
+  );
+  const [outputDescription, setOutputDescription] = useState<string>(
+    `Each output should contain "true" or "false", where "true" indicates that the email contains event details.`,
+  );
+
+  const generateEntriesMutation = api.datasetEntries.autogenerateEntries.useMutation();
+
+  const [generateEntries, generateEntriesInProgress] = useHandledAsyncCallback(async () => {
+    if (!inputDescription || !outputDescription || !numToGenerate || !datasetId) return;
+    await generateEntriesMutation.mutateAsync({
+      datasetId,
+      inputDescription,
+      outputDescription,
+      numToGenerate,
+    });
+    await utils.datasetEntries.list.invalidate();
+    onClose();
+  }, [
+    generateEntriesMutation,
+    onClose,
+    inputDescription,
+    outputDescription,
+    numToGenerate,
+    datasetId,
+  ]);
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose} size={{ base: "xl", sm: "2xl", md: "3xl" }}>
+      <ModalOverlay />
+      <ModalContent w={1200}>
+        <ModalHeader>
+          <HStack>
+            <Icon as={BsStars} />
+            <Text>Generate Data</Text>
+          </HStack>
+        </ModalHeader>
+        <ModalCloseButton />
+        <ModalBody maxW="unset">
+          <VStack w="full" spacing={8} padding={8} alignItems="flex-start">
+            <VStack alignItems="flex-start" spacing={2}>
+              <Text fontWeight="bold">Number of Rows:</Text>
+              <NumberInput
+                step={5}
+                defaultValue={15}
+                min={0}
+                max={100}
+                onChange={(valueString) => setNumToGenerate(parseInt(valueString) || 0)}
+                value={numToGenerate}
+                w="24"
+              >
+                <NumberInputField />
+                <NumberInputStepper>
+                  <NumberIncrementStepper />
+                  <NumberDecrementStepper />
+                </NumberInputStepper>
+              </NumberInput>
+            </VStack>
+            <VStack alignItems="flex-start" w="full" spacing={2}>
+              <Text fontWeight="bold">Input Description:</Text>
+              <AutoResizeTextArea
+                value={inputDescription}
+                onChange={(e) => setInputDescription(e.target.value)}
+                placeholder="Each input should contain..."
+              />
+            </VStack>
+            <VStack alignItems="flex-start" w="full" spacing={2}>
+              <Text fontWeight="bold">Output Description (optional):</Text>
+              <AutoResizeTextArea
+                value={outputDescription}
+                onChange={(e) => setOutputDescription(e.target.value)}
+                placeholder="The output should contain..."
+              />
+            </VStack>
+          </VStack>
+        </ModalBody>
+        <ModalFooter>
+          <Button
+            colorScheme="blue"
+            isLoading={generateEntriesInProgress}
+            isDisabled={!numToGenerate || !inputDescription || !outputDescription}
+            onClick={generateEntries}
+          >
+            Generate
+          </Button>
+        </ModalFooter>
+      </ModalContent>
+    </Modal>
+  );
+};
--- a/app/src/components/datasets/TableRow.tsx
+++ b/app/src/components/datasets/TableRow.tsx
@@ -0,0 +1,13 @@
+import { Td, Tr } from "@chakra-ui/react";
+import { type DatasetEntry } from "@prisma/client";
+
+const TableRow = ({ entry }: { entry: DatasetEntry }) => {
+  return (
+    <Tr key={entry.id}>
+      <Td>{entry.input}</Td>
+      <Td>{entry.output}</Td>
+    </Tr>
+  );
+};
+
+export default TableRow;
--- a/app/src/components/fineTunes/FineTunesTable.tsx
+++ b/app/src/components/fineTunes/FineTunesTable.tsx
@@ -1,65 +0,0 @@
-import { Card, Table, Thead, Tr, Th, Tbody, Td, VStack, Icon, Text } from "@chakra-ui/react";
-import { FaTable } from "react-icons/fa";
-import { type FineTuneStatus } from "@prisma/client";
-
-import dayjs from "~/utils/dayjs";
-import { useFineTunes } from "~/utils/hooks";
-
-const FineTunesTable = ({}) => {
-  const { data } = useFineTunes();
-
-  const fineTunes = data?.fineTunes || [];
-
-  return (
-    <Card width="100%" overflowX="auto">
-      {fineTunes.length ? (
-        <Table>
-          <Thead>
-            <Tr>
-              <Th>ID</Th>
-              <Th>Created At</Th>
-              <Th>Base Model</Th>
-              <Th>Dataset Size</Th>
-              <Th>Status</Th>
-            </Tr>
-          </Thead>
-          <Tbody>
-            {fineTunes.map((fineTune) => {
-              return (
-                <Tr key={fineTune.id}>
-                  <Td>{fineTune.slug}</Td>
-                  <Td>{dayjs(fineTune.createdAt).format("MMMM D h:mm A")}</Td>
-                  <Td>{fineTune.baseModel}</Td>
-                  <Td>{fineTune.dataset._count.datasetEntries}</Td>
-                  <Td fontSize="sm" fontWeight="bold">
-                    <Text color={getStatusColor(fineTune.status)}>{fineTune.status}</Text>
-                  </Td>
-                </Tr>
-              );
-            })}
-          </Tbody>
-        </Table>
-      ) : (
-        <VStack py={8}>
-          <Icon as={FaTable} boxSize={16} color="gray.300" />
-          <Text color="gray.400" fontSize="lg" fontWeight="bold">
-            No Fine Tunes Found
-          </Text>
-        </VStack>
-      )}
-    </Card>
-  );
-};
-
-export default FineTunesTable;
-
-const getStatusColor = (status: FineTuneStatus) => {
-  switch (status) {
-    case "DEPLOYED":
-      return "green.500";
-    case "ERROR":
-      return "red.500";
-    default:
-      return "yellow.500";
-  }
-};
--- a/app/src/components/nav/AppShell.tsx
+++ b/app/src/components/nav/AppShell.tsx
@@ -15,14 +15,12 @@ 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 { RiHome3Line, RiFlaskLine } from "react-icons/ri";
-import { FaRobot } from "react-icons/fa";
+import { RiHome3Line, RiDatabase2Line, RiFlaskLine } from "react-icons/ri";
 import { signIn, useSession } from "next-auth/react";
 import { env } from "~/env.mjs";
 import ProjectMenu from "./ProjectMenu";
 import NavSidebarOption from "./NavSidebarOption";
 import IconLink from "./IconLink";
-import { BetaModal } from "./BetaModal";

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

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

+            {env.NEXT_PUBLIC_FF_SHOW_LOGGED_CALLS && (
+              <>
                <IconLink icon={RiHome3Line} label="Dashboard" href="/dashboard" beta />
-            <IconLink icon={IoStatsChartOutline} label="Request Logs" href="/request-logs" beta />
-            <IconLink icon={FaRobot} label="Fine Tunes" href="/fine-tunes" beta />
+                <IconLink
+                  icon={IoStatsChartOutline}
+                  label="Request Logs"
+                  href="/request-logs"
+                  beta
+                />
+              </>
+            )}
            <IconLink icon={RiFlaskLine} label="Experiments" href="/experiments" />
+            {env.NEXT_PUBLIC_SHOW_DATA && (
+              <IconLink icon={RiDatabase2Line} label="Data" href="/data" />
+            )}
            <VStack w="full" alignItems="flex-start" spacing={0} pt={8}>
              <Text
                pl={2}
@@ -96,7 +105,7 @@ const NavSidebar = () => {
          <NavSidebarOption>
            <HStack
              w="full"
-              p={{ base: 2, md: 4 }}
+              p={4}
              as={ChakraLink}
              justifyContent="start"
              onClick={() => {
@@ -132,12 +141,10 @@ export default function AppShell({
  children,
  title,
  requireAuth,
-  requireBeta,
 }: {
  children: React.ReactNode;
  title?: string;
  requireAuth?: boolean;
-  requireBeta?: boolean;
 }) {
  const [vh, setVh] = useState("100vh"); // Default height to prevent flicker on initial render

@@ -168,7 +175,6 @@ export default function AppShell({
  }, [requireAuth, user, authLoading]);

  return (
-    <>
    <Flex h={vh} w="100vw">
      <Head>
        <title>{title ? `${title} | OpenPipe` : "OpenPipe"}</title>
@@ -178,7 +184,5 @@ export default function AppShell({
        {children}
      </Box>
    </Flex>
-      {requireBeta && !env.NEXT_PUBLIC_FF_SHOW_BETA_FEATURES && <BetaModal />}
-    </>
  );
 }
--- a/app/src/components/nav/BetaModal.tsx
+++ b/app/src/components/nav/BetaModal.tsx
@@ -1,67 +0,0 @@
-import {
-  Button,
-  Modal,
-  ModalBody,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  ModalOverlay,
-  VStack,
-  Text,
-  HStack,
-  Icon,
-  Link,
-} from "@chakra-ui/react";
-import { BsStars } from "react-icons/bs";
-import { useRouter } from "next/router";
-import { useSession } from "next-auth/react";
-
-export const BetaModal = () => {
-  const router = useRouter();
-  const session = useSession();
-
-  const email = session.data?.user.email ?? "";
-
-  return (
-    <Modal
-      isOpen
-      onClose={router.back}
-      closeOnOverlayClick={false}
-      size={{ base: "xl", md: "2xl" }}
-    >
-      <ModalOverlay />
-      <ModalContent w={1200}>
-        <ModalHeader>
-          <HStack>
-            <Icon as={BsStars} />
-            <Text>Beta-Only Feature</Text>
-          </HStack>
-        </ModalHeader>
-        <ModalBody maxW="unset">
-          <VStack spacing={8} py={4} alignItems="flex-start">
-            <Text fontSize="md">
-              This feature is currently in beta. To receive early access to beta-only features, join
-              the waitlist. You'll receive an email at <b>{email}</b> when you're approved.
-            </Text>
-          </VStack>
-        </ModalBody>
-        <ModalFooter>
-          <HStack spacing={4}>
-            <Button
-              as={Link}
-              textDecoration="none !important"
-              colorScheme="orange"
-              target="_blank"
-              href={`https://ax3nafkw0jp.typeform.com/to/ZNpYqvAc#email=${email}`}
-            >
-              Join Waitlist
-            </Button>
-            <Button colorScheme="blue" onClick={router.back}>
-              Done
-            </Button>
-          </HStack>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-};
--- a/app/src/components/nav/UserMenu.tsx
+++ b/app/src/components/nav/UserMenu.tsx
@@ -23,6 +23,7 @@ export default function UserMenu({ user, ...rest }: { user: Session } & StackPro
  );

  return (
+    <>
      <Popover placement="right">
        <PopoverTrigger>
          <NavSidebarOption>
@@ -66,5 +67,6 @@ export default function UserMenu({ user, ...rest }: { user: Session } & StackPro
          </VStack>
        </PopoverContent>
      </Popover>
+    </>
  );
 }
--- a/app/src/components/requestLogs/ActionButton.tsx
+++ b/app/src/components/requestLogs/ActionButton.tsx
@@ -21,7 +21,7 @@ const ActionButton = ({
    >
      <HStack spacing={1}>
        {icon && <Icon as={icon} />}
-        <Text display={{ base: "none", md: "flex" }}>{label}</Text>
+        <Text>{label}</Text>
      </HStack>
    </Button>
  );
--- a/app/src/components/requestLogs/ColumnVisiblityDropdown.tsx
+++ b/app/src/components/requestLogs/ColumnVisiblityDropdown.tsx
@@ -1,117 +0,0 @@
-import {
-  Icon,
-  Popover,
-  PopoverTrigger,
-  PopoverContent,
-  VStack,
-  HStack,
-  Button,
-  Text,
-  useDisclosure,
-  Box,
-} from "@chakra-ui/react";
-import { BiCheck } from "react-icons/bi";
-import { BsToggles } from "react-icons/bs";
-import { useMemo } from "react";
-
-import { useIsClientRehydrated, useTagNames } from "~/utils/hooks";
-import { useAppStore } from "~/state/store";
-import { StaticColumnKeys } from "~/state/columnVisiblitySlice";
-import ActionButton from "./ActionButton";
-
-const ColumnVisiblityDropdown = () => {
-  const tagNames = useTagNames().data;
-
-  const visibleColumns = useAppStore((s) => s.columnVisibility.visibleColumns);
-  const toggleColumnVisibility = useAppStore((s) => s.columnVisibility.toggleColumnVisibility);
-  const totalColumns = Object.keys(StaticColumnKeys).length + (tagNames?.length ?? 0);
-
-  const popover = useDisclosure();
-
-  const columnVisiblityOptions = useMemo(() => {
-    const options: { label: string; key: string }[] = [
-      {
-        label: "Sent At",
-        key: StaticColumnKeys.SENT_AT,
-      },
-      {
-        label: "Model",
-        key: StaticColumnKeys.MODEL,
-      },
-      {
-        label: "Duration",
-        key: StaticColumnKeys.DURATION,
-      },
-      {
-        label: "Input Tokens",
-        key: StaticColumnKeys.INPUT_TOKENS,
-      },
-      {
-        label: "Output Tokens",
-        key: StaticColumnKeys.OUTPUT_TOKENS,
-      },
-      {
-        label: "Status Code",
-        key: StaticColumnKeys.STATUS_CODE,
-      },
-    ];
-    for (const tagName of tagNames ?? []) {
-      options.push({
-        label: tagName,
-        key: tagName,
-      });
-    }
-    return options;
-  }, [tagNames]);
-
-  const isClientRehydrated = useIsClientRehydrated();
-  if (!isClientRehydrated) return null;
-
-  return (
-    <Popover
-      placement="bottom-start"
-      isOpen={popover.isOpen}
-      onOpen={popover.onOpen}
-      onClose={popover.onClose}
-    >
-      <PopoverTrigger>
-        <Box>
-          <ActionButton
-            label={`Columns (${visibleColumns.size}/${totalColumns})`}
-            icon={BsToggles}
-          />
-        </Box>
-      </PopoverTrigger>
-      <PopoverContent boxShadow="0 0 40px 4px rgba(0, 0, 0, 0.1);" minW={0} w="auto">
-        <VStack spacing={0} maxH={400} overflowY="auto">
-          {columnVisiblityOptions?.map((option, index) => (
-            <HStack
-              key={index}
-              as={Button}
-              onClick={() => toggleColumnVisibility(option.key)}
-              w="full"
-              minH={10}
-              variant="ghost"
-              justifyContent="space-between"
-              fontWeight="semibold"
-              borderRadius={0}
-              colorScheme="blue"
-              color="black"
-              fontSize="sm"
-              borderBottomWidth={1}
-            >
-              <Text mr={16}>{option.label}</Text>
-              <Box w={5}>
-                {visibleColumns.has(option.key) && (
-                  <Icon as={BiCheck} color="blue.500" boxSize={5} />
-                )}
-              </Box>
-            </HStack>
-          ))}
-        </VStack>
-      </PopoverContent>
-    </Popover>
-  );
-};
-
-export default ColumnVisiblityDropdown;
--- a/app/src/components/requestLogs/FineTuneButton.tsx
+++ b/app/src/components/requestLogs/FineTuneButton.tsx
@@ -1,161 +0,0 @@
-import { useState, useEffect } from "react";
-import {
-  Modal,
-  ModalOverlay,
-  ModalContent,
-  ModalHeader,
-  ModalCloseButton,
-  ModalBody,
-  ModalFooter,
-  HStack,
-  VStack,
-  Icon,
-  Text,
-  Button,
-  useDisclosure,
-  type UseDisclosureReturn,
-  Input,
-} from "@chakra-ui/react";
-import { FaRobot } from "react-icons/fa";
-import humanId from "human-id";
-import { useRouter } from "next/router";
-
-import { useHandledAsyncCallback } from "~/utils/hooks";
-import { api } from "~/utils/api";
-import { useAppStore } from "~/state/store";
-import ActionButton from "./ActionButton";
-import InputDropdown from "../InputDropdown";
-import { FiChevronDown } from "react-icons/fi";
-
-const SUPPORTED_BASE_MODELS = ["llama2-7b", "llama2-13b", "llama2-70b", "gpt-3.5-turbo"];
-
-const FineTuneButton = () => {
-  const selectedLogIds = useAppStore((s) => s.selectedLogs.selectedLogIds);
-
-  const disclosure = useDisclosure();
-
-  return (
-    <>
-      <ActionButton
-        onClick={disclosure.onOpen}
-        label="Fine Tune"
-        icon={FaRobot}
-        isDisabled={selectedLogIds.size === 0}
-      />
-      <FineTuneModal disclosure={disclosure} />
-    </>
-  );
-};
-
-export default FineTuneButton;
-
-const FineTuneModal = ({ disclosure }: { disclosure: UseDisclosureReturn }) => {
-  const selectedProjectId = useAppStore((s) => s.selectedProjectId);
-  const selectedLogIds = useAppStore((s) => s.selectedLogs.selectedLogIds);
-  const clearSelectedLogIds = useAppStore((s) => s.selectedLogs.clearSelectedLogIds);
-
-  const [selectedBaseModel, setSelectedBaseModel] = useState(SUPPORTED_BASE_MODELS[0]);
-  const [modelSlug, setModelSlug] = useState(humanId({ separator: "-", capitalize: false }));
-
-  useEffect(() => {
-    if (disclosure.isOpen) {
-      setSelectedBaseModel(SUPPORTED_BASE_MODELS[0]);
-      setModelSlug(humanId({ separator: "-", capitalize: false }));
-    }
-  }, [disclosure.isOpen]);
-
-  const utils = api.useContext();
-  const router = useRouter();
-
-  const createFineTuneMutation = api.fineTunes.create.useMutation();
-
-  const [createFineTune, creationInProgress] = useHandledAsyncCallback(async () => {
-    if (!selectedProjectId || !modelSlug || !selectedBaseModel || !selectedLogIds.size) return;
-    await createFineTuneMutation.mutateAsync({
-      projectId: selectedProjectId,
-      slug: modelSlug,
-      baseModel: selectedBaseModel,
-      selectedLogIds: Array.from(selectedLogIds),
-    });
-
-    await utils.fineTunes.list.invalidate();
-    await router.push({ pathname: "/fine-tunes" });
-    clearSelectedLogIds();
-    disclosure.onClose();
-  }, [createFineTuneMutation, selectedProjectId, selectedLogIds, modelSlug, selectedBaseModel]);
-
-  return (
-    <Modal size={{ base: "xl", md: "2xl" }} {...disclosure}>
-      <ModalOverlay />
-      <ModalContent w={1200}>
-        <ModalHeader>
-          <HStack>
-            <Icon as={FaRobot} />
-            <Text>Fine Tune</Text>
-          </HStack>
-        </ModalHeader>
-        <ModalCloseButton />
-        <ModalBody maxW="unset">
-          <VStack w="full" spacing={8} pt={4} alignItems="flex-start">
-            <Text>
-              We'll train on the <b>{selectedLogIds.size}</b> logs you've selected.
-            </Text>
-            <VStack>
-              <HStack spacing={2} w="full">
-                <Text fontWeight="bold" w={36}>
-                  Model ID:
-                </Text>
-                <Input
-                  value={modelSlug}
-                  onChange={(e) => setModelSlug(e.target.value)}
-                  w={48}
-                  placeholder="unique-id"
-                  onKeyDown={(e) => {
-                    // If the user types anything other than a-z, A-Z, or 0-9, replace it with -
-                    if (!/[a-zA-Z0-9]/.test(e.key)) {
-                      e.preventDefault();
-                      setModelSlug((s) => s && `${s}-`);
-                    }
-                  }}
-                />
-              </HStack>
-              <HStack spacing={2}>
-                <Text fontWeight="bold" w={36}>
-                  Base model:
-                </Text>
-                <InputDropdown
-                  options={SUPPORTED_BASE_MODELS}
-                  selectedOption={selectedBaseModel}
-                  onSelect={(option) => setSelectedBaseModel(option)}
-                  inputGroupProps={{ w: 48 }}
-                />
-              </HStack>
-            </VStack>
-            <Button variant="unstyled" color="blue.600">
-              <HStack>
-                <Text>Advanced Options</Text>
-                <Icon as={FiChevronDown} />
-              </HStack>
-            </Button>
-          </VStack>
-        </ModalBody>
-        <ModalFooter>
-          <HStack>
-            <Button colorScheme="gray" onClick={disclosure.onClose} minW={24}>
-              Cancel
-            </Button>
-            <Button
-              colorScheme="blue"
-              onClick={createFineTune}
-              isLoading={creationInProgress}
-              minW={24}
-              isDisabled={!modelSlug}
-            >
-              Start Training
-            </Button>
-          </HStack>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  );
-};
--- a/app/src/components/requestLogs/LoggedCallsTable.tsx
+++ b/app/src/components/requestLogs/LoggedCallsTable.tsx
@@ -10,7 +10,7 @@ export default function LoggedCallsTable() {
  return (
    <Card width="100%" overflowX="auto">
      <Table>
-        <TableHeader showOptions />
+        <TableHeader showCheckbox />
        <Tbody>
          {loggedCalls?.calls?.map((loggedCall) => {
            return (
@@ -25,7 +25,7 @@ export default function LoggedCallsTable() {
                    setExpandedRow(loggedCall.id);
                  }
                }}
-                showOptions
+                showCheckbox
              />
            );
          })}
--- a/app/src/components/requestLogs/TableRow.tsx
+++ b/app/src/components/requestLogs/TableRow.tsx
@@ -14,19 +14,21 @@ import {
  Text,
  Checkbox,
 } from "@chakra-ui/react";
+import dayjs from "dayjs";
+import relativeTime from "dayjs/plugin/relativeTime";
 import Link from "next/link";

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

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

-export const TableHeader = ({ showOptions }: { showOptions?: boolean }) => {
+export const TableHeader = ({ showCheckbox }: { showCheckbox?: boolean }) => {
  const matchingLogIds = useLoggedCalls().data?.matchingLogIds;
  const selectedLogIds = useAppStore((s) => s.selectedLogs.selectedLogIds);
  const addAll = useAppStore((s) => s.selectedLogs.addSelectedLogIds);
@@ -36,14 +38,10 @@ export const TableHeader = ({ showOptions }: { showOptions?: boolean }) => {
    return matchingLogIds.every((id) => selectedLogIds.has(id));
  }, [selectedLogIds, matchingLogIds]);
  const tagNames = useTagNames().data;
-  const visibleColumns = useAppStore((s) => s.columnVisibility.visibleColumns);
-  const isClientRehydrated = useIsClientRehydrated();
-  if (!isClientRehydrated) return null;
-
  return (
    <Thead>
      <Tr>
-        {showOptions && (
+        {showCheckbox && (
          <Th pr={0}>
            <HStack minW={16}>
              <Checkbox
@@ -59,19 +57,13 @@ export const TableHeader = ({ showOptions }: { showOptions?: boolean }) => {
            </HStack>
          </Th>
        )}
-        {visibleColumns.has(StaticColumnKeys.SENT_AT) && <Th>Sent At</Th>}
-        {visibleColumns.has(StaticColumnKeys.MODEL) && <Th>Model</Th>}
-        {tagNames
-          ?.filter((tagName) => visibleColumns.has(tagName))
-          .map((tagName) => (
-            <Th key={tagName} textTransform={"none"}>
-              {tagName}
-            </Th>
-          ))}
-        {visibleColumns.has(StaticColumnKeys.DURATION) && <Th isNumeric>Duration</Th>}
-        {visibleColumns.has(StaticColumnKeys.INPUT_TOKENS) && <Th isNumeric>Input tokens</Th>}
-        {visibleColumns.has(StaticColumnKeys.OUTPUT_TOKENS) && <Th isNumeric>Output tokens</Th>}
-        {visibleColumns.has(StaticColumnKeys.STATUS_CODE) && <Th isNumeric>Status</Th>}
+        <Th>Sent At</Th>
+        <Th>Model</Th>
+        {tagNames?.map((tagName) => <Th key={tagName}>{tagName}</Th>)}
+        <Th isNumeric>Duration</Th>
+        <Th isNumeric>Input tokens</Th>
+        <Th isNumeric>Output tokens</Th>
+        <Th isNumeric>Status</Th>
      </Tr>
    </Thead>
  );
@@ -81,12 +73,12 @@ export const TableRow = ({
  loggedCall,
  isExpanded,
  onToggle,
-  showOptions,
+  showCheckbox,
 }: {
  loggedCall: LoggedCall;
  isExpanded: boolean;
  onToggle: () => void;
-  showOptions?: boolean;
+  showCheckbox?: boolean;
 }) => {
  const isError = loggedCall.modelResponse?.statusCode !== 200;
  const requestedAt = dayjs(loggedCall.requestedAt).format("MMMM D h:mm A");
@@ -96,14 +88,6 @@ export const TableRow = ({
  const toggleChecked = useAppStore((s) => s.selectedLogs.toggleSelectedLogId);

  const tagNames = useTagNames().data;
-  const visibleColumns = useAppStore((s) => s.columnVisibility.visibleColumns);
-
-  const visibleTagNames = useMemo(() => {
-    return tagNames?.filter((tagName) => visibleColumns.has(tagName)) ?? [];
-  }, [tagNames, visibleColumns]);
-
-  const isClientRehydrated = useIsClientRehydrated();
-  if (!isClientRehydrated) return null;

  return (
    <>
@@ -116,12 +100,11 @@ export const TableRow = ({
        }}
        fontSize="sm"
      >
-        {showOptions && (
+        {showCheckbox && (
          <Td>
            <Checkbox isChecked={isChecked} onChange={() => toggleChecked(loggedCall.id)} />
          </Td>
        )}
-        {visibleColumns.has(StaticColumnKeys.SENT_AT) && (
        <Td>
          <Tooltip label={fullTime} placement="top">
            <Box whiteSpace="nowrap" minW="120px">
@@ -129,8 +112,6 @@ export const TableRow = ({
            </Box>
          </Tooltip>
        </Td>
-        )}
-        {visibleColumns.has(StaticColumnKeys.MODEL) && (
        <Td>
          <HStack justifyContent="flex-start">
            <Text
@@ -147,11 +128,7 @@ export const TableRow = ({
            </Text>
          </HStack>
        </Td>
-        )}
-        {visibleTagNames.map((tagName) => (
-          <Td key={tagName}>{loggedCall.tags[tagName]}</Td>
-        ))}
-        {visibleColumns.has(StaticColumnKeys.DURATION) && (
+        {tagNames?.map((tagName) => <Td key={tagName}>{loggedCall.tags[tagName]}</Td>)}
        <Td isNumeric>
          {loggedCall.cacheHit ? (
            <Text color="gray.500">Cached</Text>
@@ -159,21 +136,14 @@ export const TableRow = ({
            ((loggedCall.modelResponse?.durationMs ?? 0) / 1000).toFixed(2) + "s"
          )}
        </Td>
-        )}
-        {visibleColumns.has(StaticColumnKeys.INPUT_TOKENS) && (
        <Td isNumeric>{loggedCall.modelResponse?.inputTokens}</Td>
-        )}
-        {visibleColumns.has(StaticColumnKeys.OUTPUT_TOKENS) && (
        <Td isNumeric>{loggedCall.modelResponse?.outputTokens}</Td>
-        )}
-        {visibleColumns.has(StaticColumnKeys.STATUS_CODE) && (
        <Td sx={{ color: isError ? "red.500" : "green.500", fontWeight: "semibold" }} isNumeric>
          {loggedCall.modelResponse?.statusCode ?? "No response"}
        </Td>
-        )}
      </Tr>
      <Tr>
-        <Td colSpan={visibleColumns.size + 1} w="full" p={0}>
+        <Td colSpan={8} p={0}>
          <Collapse in={isExpanded} unmountOnExit={true}>
            <VStack p={4} align="stretch">
              <HStack align="stretch">
--- a/app/src/env.mjs
+++ b/app/src/env.mjs
@@ -26,14 +26,6 @@ export const env = createEnv({
    SMTP_PORT: z.string().default("placeholder"),
    SMTP_LOGIN: z.string().default("placeholder"),
    SMTP_PASSWORD: z.string().default("placeholder"),
-    WORKER_CONCURRENCY: z
-      .string()
-      .default("10")
-      .transform((val) => parseInt(val)),
-    WORKER_MAX_POOL_SIZE: z
-      .string()
-      .default("10")
-      .transform((val) => parseInt(val)),
  },

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

  /**
@@ -61,6 +54,7 @@ export const env = createEnv({
    NEXT_PUBLIC_POSTHOG_KEY: process.env.NEXT_PUBLIC_POSTHOG_KEY,
    NEXT_PUBLIC_SOCKET_URL: process.env.NEXT_PUBLIC_SOCKET_URL,
    NEXT_PUBLIC_HOST: process.env.NEXT_PUBLIC_HOST,
+    NEXT_PUBLIC_SHOW_DATA: process.env.NEXT_PUBLIC_SHOW_DATA,
    GITHUB_CLIENT_ID: process.env.GITHUB_CLIENT_ID,
    GITHUB_CLIENT_SECRET: process.env.GITHUB_CLIENT_SECRET,
    REPLICATE_API_TOKEN: process.env.REPLICATE_API_TOKEN,
@@ -68,14 +62,12 @@ export const env = createEnv({
    NEXT_PUBLIC_SENTRY_DSN: process.env.NEXT_PUBLIC_SENTRY_DSN,
    SENTRY_AUTH_TOKEN: process.env.SENTRY_AUTH_TOKEN,
    OPENPIPE_API_KEY: process.env.OPENPIPE_API_KEY,
-    NEXT_PUBLIC_FF_SHOW_BETA_FEATURES: process.env.NEXT_PUBLIC_FF_SHOW_BETA_FEATURES,
+    NEXT_PUBLIC_FF_SHOW_LOGGED_CALLS: process.env.NEXT_PUBLIC_FF_SHOW_LOGGED_CALLS,
    SENDER_EMAIL: process.env.SENDER_EMAIL,
    SMTP_HOST: process.env.SMTP_HOST,
    SMTP_PORT: process.env.SMTP_PORT,
    SMTP_LOGIN: process.env.SMTP_LOGIN,
    SMTP_PASSWORD: process.env.SMTP_PASSWORD,
-    WORKER_CONCURRENCY: process.env.WORKER_CONCURRENCY,
-    WORKER_MAX_POOL_SIZE: process.env.WORKER_MAX_POOL_SIZE,
  },
  /**
   * Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation.
--- a/app/src/modelProviders/openai-ChatCompletion/getCompletion.ts
+++ b/app/src/modelProviders/openai-ChatCompletion/getCompletion.ts
@@ -16,16 +16,7 @@ export async function getCompletion(
  try {
    if (onStream) {
      const resp = await openai.chat.completions.create(
-        {
-          ...input,
-          stream: true,
-          openpipe: {
-            tags: {
-              prompt_id: "getCompletion",
-              stream: "true",
-            },
-          },
-        },
+        { ...input, stream: true },
        {
          maxRetries: 0,
        },
@@ -43,16 +34,7 @@ export async function getCompletion(
      }
    } else {
      const resp = await openai.chat.completions.create(
-        {
-          ...input,
-          stream: false,
-          openpipe: {
-            tags: {
-              prompt_id: "getCompletion",
-              stream: "false",
-            },
-          },
-        },
+        { ...input, stream: false },
        {
          maxRetries: 0,
        },
--- a/app/src/pages/dashboard/index.tsx
+++ b/app/src/pages/dashboard/index.tsx
@@ -33,7 +33,7 @@ export default function Dashboard() {
  );

  return (
-    <AppShell title="Dashboard" requireAuth requireBeta>
+    <AppShell title="Dashboard" requireAuth>
      <VStack px={8} py={8} alignItems="flex-start" spacing={4}>
        <Text fontSize="2xl" fontWeight="bold">
          Dashboard
--- a/app/src/pages/data/[id].tsx
+++ b/app/src/pages/data/[id].tsx
@@ -0,0 +1,97 @@
+import {
+  Box,
+  Breadcrumb,
+  BreadcrumbItem,
+  Center,
+  Flex,
+  Icon,
+  Input,
+  VStack,
+} from "@chakra-ui/react";
+import Link from "next/link";
+
+import { useRouter } from "next/router";
+import { useState, useEffect } from "react";
+import { RiDatabase2Line } from "react-icons/ri";
+import AppShell from "~/components/nav/AppShell";
+import { api } from "~/utils/api";
+import { useDataset, useHandledAsyncCallback } from "~/utils/hooks";
+import DatasetEntriesTable from "~/components/datasets/DatasetEntriesTable";
+import { DatasetHeaderButtons } from "~/components/datasets/DatasetHeaderButtons/DatasetHeaderButtons";
+import PageHeaderContainer from "~/components/nav/PageHeaderContainer";
+import ProjectBreadcrumbContents from "~/components/nav/ProjectBreadcrumbContents";
+
+export default function Dataset() {
+  const router = useRouter();
+  const utils = api.useContext();
+
+  const dataset = useDataset();
+  const datasetId = router.query.id as string;
+
+  const [name, setName] = useState(dataset.data?.name || "");
+  useEffect(() => {
+    setName(dataset.data?.name || "");
+  }, [dataset.data?.name]);
+
+  const updateMutation = api.datasets.update.useMutation();
+  const [onSaveName] = useHandledAsyncCallback(async () => {
+    if (name && name !== dataset.data?.name && dataset.data?.id) {
+      await updateMutation.mutateAsync({
+        id: dataset.data.id,
+        updates: { name: name },
+      });
+      await Promise.all([utils.datasets.list.invalidate(), utils.datasets.get.invalidate()]);
+    }
+  }, [updateMutation, dataset.data?.id, dataset.data?.name, name]);
+
+  if (!dataset.isLoading && !dataset.data) {
+    return (
+      <AppShell title="Dataset not found">
+        <Center h="100%">
+          <div>Dataset not found 😕</div>
+        </Center>
+      </AppShell>
+    );
+  }
+
+  return (
+    <AppShell title={dataset.data?.name}>
+      <VStack h="full">
+        <PageHeaderContainer>
+          <Breadcrumb>
+            <BreadcrumbItem>
+              <ProjectBreadcrumbContents projectName={dataset.data?.project?.name} />
+            </BreadcrumbItem>
+            <BreadcrumbItem>
+              <Link href="/data">
+                <Flex alignItems="center" _hover={{ textDecoration: "underline" }}>
+                  <Icon as={RiDatabase2Line} boxSize={4} mr={2} /> Datasets
+                </Flex>
+              </Link>
+            </BreadcrumbItem>
+            <BreadcrumbItem isCurrentPage>
+              <Input
+                size="sm"
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                onBlur={onSaveName}
+                borderWidth={1}
+                borderColor="transparent"
+                fontSize={16}
+                px={0}
+                minW={{ base: 100, lg: 300 }}
+                flex={1}
+                _hover={{ borderColor: "gray.300" }}
+                _focus={{ borderColor: "blue.500", outline: "none" }}
+              />
+            </BreadcrumbItem>
+          </Breadcrumb>
+          <DatasetHeaderButtons />
+        </PageHeaderContainer>
+        <Box w="full" overflowX="auto" flex={1} px={8} pt={8} pb={16}>
+          {datasetId && <DatasetEntriesTable />}
+        </Box>
+      </VStack>
+    </AppShell>
+  );
+}
--- a/app/src/pages/data/index.tsx
+++ b/app/src/pages/data/index.tsx
@@ -0,0 +1,49 @@
+import { SimpleGrid, Icon, Breadcrumb, BreadcrumbItem, Flex } from "@chakra-ui/react";
+import AppShell from "~/components/nav/AppShell";
+import { RiDatabase2Line } from "react-icons/ri";
+import {
+  DatasetCard,
+  DatasetCardSkeleton,
+  NewDatasetCard,
+} from "~/components/datasets/DatasetCard";
+import PageHeaderContainer from "~/components/nav/PageHeaderContainer";
+import ProjectBreadcrumbContents from "~/components/nav/ProjectBreadcrumbContents";
+import { useDatasets } from "~/utils/hooks";
+
+export default function DatasetsPage() {
+  const datasets = useDatasets();
+
+  return (
+    <AppShell title="Data" requireAuth>
+      <PageHeaderContainer>
+        <Breadcrumb>
+          <BreadcrumbItem>
+            <ProjectBreadcrumbContents />
+          </BreadcrumbItem>
+          <BreadcrumbItem minH={8}>
+            <Flex alignItems="center">
+              <Icon as={RiDatabase2Line} boxSize={4} mr={2} /> Datasets
+            </Flex>
+          </BreadcrumbItem>
+        </Breadcrumb>
+      </PageHeaderContainer>
+      <SimpleGrid w="full" columns={{ base: 1, md: 2, lg: 3, xl: 4 }} spacing={8} py={4} px={8}>
+        <NewDatasetCard />
+        {datasets.data && !datasets.isLoading ? (
+          datasets?.data?.map((dataset) => (
+            <DatasetCard
+              key={dataset.id}
+              dataset={{ ...dataset, numEntries: dataset._count.datasetEntries }}
+            />
+          ))
+        ) : (
+          <>
+            <DatasetCardSkeleton />
+            <DatasetCardSkeleton />
+            <DatasetCardSkeleton />
+          </>
+        )}
+      </SimpleGrid>
+    </AppShell>
+  );
+}
--- a/app/src/pages/fine-tunes/index.tsx
+++ b/app/src/pages/fine-tunes/index.tsx
@@ -1,18 +0,0 @@
-import { Text, VStack, Divider } from "@chakra-ui/react";
-import FineTunesTable from "~/components/fineTunes/FineTunesTable";
-
-import AppShell from "~/components/nav/AppShell";
-
-export default function FineTunes() {
-  return (
-    <AppShell title="Fine Tunes" requireAuth requireBeta>
-      <VStack px={8} py={8} alignItems="flex-start" spacing={4} w="full">
-        <Text fontSize="2xl" fontWeight="bold">
-          Fine Tunes
-        </Text>
-        <Divider />
-        <FineTunesTable />
-      </VStack>
-    </AppShell>
-  );
-}
--- a/app/src/pages/request-logs/index.tsx
+++ b/app/src/pages/request-logs/index.tsx
@@ -1,5 +1,5 @@
 import { useState } from "react";
-import { Text, VStack, Divider, HStack, Box } from "@chakra-ui/react";
+import { Text, VStack, Divider, HStack } from "@chakra-ui/react";

 import AppShell from "~/components/nav/AppShell";
 import LoggedCallTable from "~/components/requestLogs/LoggedCallsTable";
@@ -9,8 +9,6 @@ import { useAppStore } from "~/state/store";
 import { RiFlaskLine } from "react-icons/ri";
 import { FiFilter } from "react-icons/fi";
 import LogFilters from "~/components/requestLogs/LogFilters/LogFilters";
-import ColumnVisiblityDropdown from "~/components/requestLogs/ColumnVisiblityDropdown";
-import FineTuneButton from "~/components/requestLogs/FineTuneButton";

 export default function LoggedCalls() {
  const selectedLogIds = useAppStore((s) => s.selectedLogs.selectedLogIds);
@@ -18,15 +16,20 @@ export default function LoggedCalls() {
  const [filtersShown, setFiltersShown] = useState(true);

  return (
-    <AppShell title="Request Logs" requireAuth requireBeta>
-      <Box h="100vh" overflowY="scroll">
+    <AppShell title="Request Logs" requireAuth>
      <VStack px={8} py={8} alignItems="flex-start" spacing={4} w="full">
        <Text fontSize="2xl" fontWeight="bold">
          Request Logs
        </Text>
        <Divider />
        <HStack w="full" justifyContent="flex-end">
-            <FineTuneButton />
+          <ActionButton
+            onClick={() => {
+              setFiltersShown(!filtersShown);
+            }}
+            label={filtersShown ? "Hide Filters" : "Show Filters"}
+            icon={FiFilter}
+          />
          <ActionButton
            onClick={() => {
              console.log("experimenting with these ids", selectedLogIds);
@@ -35,20 +38,11 @@ export default function LoggedCalls() {
            icon={RiFlaskLine}
            isDisabled={selectedLogIds.size === 0}
          />
-            <ColumnVisiblityDropdown />
-            <ActionButton
-              onClick={() => {
-                setFiltersShown(!filtersShown);
-              }}
-              label={filtersShown ? "Hide Filters" : "Show Filters"}
-              icon={FiFilter}
-            />
        </HStack>
        {filtersShown && <LogFilters />}
        <LoggedCallTable />
        <LoggedCallsPaginator />
      </VStack>
-      </Box>
    </AppShell>
  );
 }
--- a/app/src/server/api/autogenerate/autogenerateDatasetEntries.ts
+++ b/app/src/server/api/autogenerate/autogenerateDatasetEntries.ts
@@ -0,0 +1,108 @@
+import { type ChatCompletion } from "openai/resources/chat";
+import { openai } from "../../utils/openai";
+import { isAxiosError } from "./utils";
+import { type APIResponse } from "openai/core";
+import { sleep } from "~/server/utils/sleep";
+
+const MAX_AUTO_RETRIES = 50;
+const MIN_DELAY = 500; // milliseconds
+const MAX_DELAY = 15000; // milliseconds
+
+function calculateDelay(numPreviousTries: number): number {
+  const baseDelay = Math.min(MAX_DELAY, MIN_DELAY * Math.pow(2, numPreviousTries));
+  const jitter = Math.random() * baseDelay;
+  return baseDelay + jitter;
+}
+
+const getCompletionWithBackoff = async (
+  getCompletion: () => Promise<APIResponse<ChatCompletion>>,
+) => {
+  let completion;
+  let tries = 0;
+  while (tries < MAX_AUTO_RETRIES) {
+    try {
+      completion = await getCompletion();
+      break;
+    } catch (e) {
+      if (isAxiosError(e)) {
+        console.error(e?.response?.data?.error?.message);
+      } else {
+        await sleep(calculateDelay(tries));
+        console.error(e);
+      }
+    }
+    tries++;
+  }
+  return completion;
+};
+// TODO: Add seeds to ensure batches don't contain duplicate data
+const MAX_BATCH_SIZE = 5;
+
+export const autogenerateDatasetEntries = async (
+  numToGenerate: number,
+  inputDescription: string,
+  outputDescription: string,
+): Promise<{ input: string; output: string }[]> => {
+  const batchSizes = Array.from({ length: Math.ceil(numToGenerate / MAX_BATCH_SIZE) }, (_, i) =>
+    i === Math.ceil(numToGenerate / MAX_BATCH_SIZE) - 1 && numToGenerate % MAX_BATCH_SIZE
+      ? numToGenerate % MAX_BATCH_SIZE
+      : MAX_BATCH_SIZE,
+  );
+
+  const getCompletion = (batchSize: number) =>
+    openai.chat.completions.create({
+      model: "gpt-4",
+      messages: [
+        {
+          role: "system",
+          content: `The user needs ${batchSize} rows of data, each with an input and an output.\n---\n The input should follow these requirements: ${inputDescription}\n---\n The output should follow these requirements: ${outputDescription}`,
+        },
+      ],
+      functions: [
+        {
+          name: "add_list_of_data",
+          description: "Add a list of data to the database",
+          parameters: {
+            type: "object",
+            properties: {
+              rows: {
+                type: "array",
+                description: "The rows of data that match the description",
+                items: {
+                  type: "object",
+                  properties: {
+                    input: {
+                      type: "string",
+                      description: "The input for this row",
+                    },
+                    output: {
+                      type: "string",
+                      description: "The output for this row",
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      ],
+
+      function_call: { name: "add_list_of_data" },
+      temperature: 0.5,
+    });
+
+  const completionCallbacks = batchSizes.map((batchSize) =>
+    getCompletionWithBackoff(() => getCompletion(batchSize)),
+  );
+
+  const completions = await Promise.all(completionCallbacks);
+
+  const rows = completions.flatMap((completion) => {
+    const parsed = JSON.parse(
+      completion?.choices[0]?.message?.function_call?.arguments ?? "{rows: []}",
+    ) as { rows: { input: string; output: string }[] };
+    return parsed.rows;
+  });
+
+  return rows;
+};
--- a/app/src/server/api/autogenerate/autogenerateScenarioValues.ts
+++ b/app/src/server/api/autogenerate/autogenerateScenarioValues.ts
@@ -98,11 +98,6 @@ export const autogenerateScenarioValues = async (

      function_call: { name: "add_scenario" },
      temperature: 0.5,
-      openpipe: {
-        tags: {
-          prompt_id: "autogenerateScenarioValues",
-        },
-      },
    });

    const parsed = JSON.parse(
--- a/app/src/server/api/external/v1Api.router.ts
+++ b/app/src/server/api/external/v1Api.router.ts
@@ -66,7 +66,7 @@ export const v1ApiRouter = createOpenApiRouter({

      if (!existingResponse) return { respPayload: null };

-      const newCall = await prisma.loggedCall.create({
+      await prisma.loggedCall.create({
        data: {
          projectId: ctx.key.projectId,
          requestedAt: new Date(input.requestedAt),
@@ -75,7 +75,11 @@ export const v1ApiRouter = createOpenApiRouter({
        },
      });

-      await createTags(newCall.projectId, newCall.id, input.tags);
+      await createTags(
+        existingResponse.originalLoggedCall.projectId,
+        existingResponse.originalLoggedCallId,
+        input.tags,
+      );
      return {
        respPayload: existingResponse.respPayload,
      };
@@ -107,7 +111,7 @@ export const v1ApiRouter = createOpenApiRouter({
          .default({}),
      }),
    )
-    .output(z.object({ status: z.union([z.literal("ok"), z.literal("error")]) }))
+    .output(z.object({ status: z.literal("ok") }))
    .mutation(async ({ input, ctx }) => {
      const reqPayload = await reqValidator.spa(input.reqPayload);
      const respPayload = await respValidator.spa(input.respPayload);
@@ -208,7 +212,6 @@ export const v1ApiRouter = createOpenApiRouter({
          createdAt: true,
          cacheHit: true,
          tags: true,
-          id: true,
          modelResponse: {
            select: {
              id: true,
@@ -234,7 +237,7 @@ async function createTags(projectId: string, loggedCallId: string, tags: Record<
  const tagsToCreate = Object.entries(tags).map(([name, value]) => ({
    projectId,
    loggedCallId,
-    name: name.replaceAll(/[^a-zA-Z0-9_$.]/g, "_"),
+    name: name.replaceAll(/[^a-zA-Z0-9_$]/g, "_"),
    value,
  }));
  await prisma.loggedCallTag.createMany({
--- a/app/src/server/api/root.router.ts
+++ b/app/src/server/api/root.router.ts
@@ -6,10 +6,11 @@ import { scenarioVariantCellsRouter } from "./routers/scenarioVariantCells.route
 import { scenarioVarsRouter } from "./routers/scenarioVariables.router";
 import { evaluationsRouter } from "./routers/evaluations.router";
 import { worldChampsRouter } from "./routers/worldChamps.router";
+import { datasetsRouter } from "./routers/datasets.router";
+import { datasetEntries } from "./routers/datasetEntries.router";
 import { projectsRouter } from "./routers/projects.router";
 import { dashboardRouter } from "./routers/dashboard.router";
 import { loggedCallsRouter } from "./routers/loggedCalls.router";
-import { fineTunesRouter } from "./routers/fineTunes.router";
 import { usersRouter } from "./routers/users.router";
 import { adminJobsRouter } from "./routers/adminJobs.router";

@@ -26,10 +27,11 @@ export const appRouter = createTRPCRouter({
  scenarioVars: scenarioVarsRouter,
  evaluations: evaluationsRouter,
  worldChamps: worldChampsRouter,
+  datasets: datasetsRouter,
+  datasetEntries: datasetEntries,
  projects: projectsRouter,
  dashboard: dashboardRouter,
  loggedCalls: loggedCallsRouter,
-  fineTunes: fineTunesRouter,
  users: usersRouter,
  adminJobs: adminJobsRouter,
 });
--- a/app/src/server/api/routers/datasetEntries.router.ts
+++ b/app/src/server/api/routers/datasetEntries.router.ts
@@ -0,0 +1,145 @@
+import { z } from "zod";
+import { createTRPCRouter, protectedProcedure } from "~/server/api/trpc";
+import { prisma } from "~/server/db";
+import { requireCanModifyDataset, requireCanViewDataset } from "~/utils/accessControl";
+import { autogenerateDatasetEntries } from "../autogenerate/autogenerateDatasetEntries";
+
+export const datasetEntries = createTRPCRouter({
+  list: protectedProcedure
+    .input(z.object({ datasetId: z.string(), page: z.number(), pageSize: z.number() }))
+    .query(async ({ input, ctx }) => {
+      await requireCanViewDataset(input.datasetId, ctx);
+
+      const { datasetId, page, pageSize } = input;
+
+      const entries = await prisma.datasetEntry.findMany({
+        where: {
+          datasetId,
+        },
+        orderBy: { createdAt: "desc" },
+        skip: (page - 1) * pageSize,
+        take: pageSize,
+      });
+
+      const count = await prisma.datasetEntry.count({
+        where: {
+          datasetId,
+        },
+      });
+
+      return {
+        entries,
+        count,
+      };
+    }),
+  createOne: protectedProcedure
+    .input(
+      z.object({
+        datasetId: z.string(),
+        input: z.string(),
+        output: z.string().optional(),
+      }),
+    )
+    .mutation(async ({ input, ctx }) => {
+      await requireCanModifyDataset(input.datasetId, ctx);
+
+      return await prisma.datasetEntry.create({
+        data: {
+          datasetId: input.datasetId,
+          input: input.input,
+          output: input.output,
+        },
+      });
+    }),
+
+  autogenerateEntries: protectedProcedure
+    .input(
+      z.object({
+        datasetId: z.string(),
+        numToGenerate: z.number(),
+        inputDescription: z.string(),
+        outputDescription: z.string(),
+      }),
+    )
+    .mutation(async ({ input, ctx }) => {
+      await requireCanModifyDataset(input.datasetId, ctx);
+
+      const dataset = await prisma.dataset.findUnique({
+        where: {
+          id: input.datasetId,
+        },
+      });
+
+      if (!dataset) {
+        throw new Error(`Dataset with id ${input.datasetId} does not exist`);
+      }
+
+      const entries = await autogenerateDatasetEntries(
+        input.numToGenerate,
+        input.inputDescription,
+        input.outputDescription,
+      );
+
+      const createdEntries = await prisma.datasetEntry.createMany({
+        data: entries.map((entry) => ({
+          datasetId: input.datasetId,
+          input: entry.input,
+          output: entry.output,
+        })),
+      });
+
+      return createdEntries;
+    }),
+
+  delete: protectedProcedure
+    .input(z.object({ id: z.string() }))
+    .mutation(async ({ input, ctx }) => {
+      const datasetId = (
+        await prisma.datasetEntry.findUniqueOrThrow({
+          where: { id: input.id },
+        })
+      ).datasetId;
+
+      await requireCanModifyDataset(datasetId, ctx);
+
+      return await prisma.datasetEntry.delete({
+        where: {
+          id: input.id,
+        },
+      });
+    }),
+
+  update: protectedProcedure
+    .input(
+      z.object({
+        id: z.string(),
+        updates: z.object({
+          input: z.string(),
+          output: z.string().optional(),
+        }),
+      }),
+    )
+    .mutation(async ({ input, ctx }) => {
+      const existing = await prisma.datasetEntry.findUnique({
+        where: {
+          id: input.id,
+        },
+      });
+
+      if (!existing) {
+        throw new Error(`dataEntry with id ${input.id} does not exist`);
+      }
+
+      await requireCanModifyDataset(existing.datasetId, ctx);
+
+      return await prisma.datasetEntry.update({
+        where: {
+          id: input.id,
+        },
+        data: {
+          input: input.updates.input,
+          output: input.updates.output,
+        },
+      });
+    }),
+});
--- a/app/src/server/api/routers/datasets.router.ts
+++ b/app/src/server/api/routers/datasets.router.ts
@@ -0,0 +1,88 @@
+import { z } from "zod";
+import { createTRPCRouter, protectedProcedure, publicProcedure } from "~/server/api/trpc";
+import { prisma } from "~/server/db";
+import {
+  requireCanModifyDataset,
+  requireCanModifyProject,
+  requireCanViewDataset,
+  requireCanViewProject,
+} from "~/utils/accessControl";
+
+export const datasetsRouter = createTRPCRouter({
+  list: protectedProcedure
+    .input(z.object({ projectId: z.string() }))
+    .query(async ({ input, ctx }) => {
+      await requireCanViewProject(input.projectId, ctx);
+
+      const datasets = await prisma.dataset.findMany({
+        where: {
+          projectId: input.projectId,
+        },
+        orderBy: {
+          createdAt: "desc",
+        },
+        include: {
+          _count: {
+            select: { datasetEntries: true },
+          },
+        },
+      });
+
+      return datasets;
+    }),
+
+  get: publicProcedure.input(z.object({ id: z.string() })).query(async ({ input, ctx }) => {
+    await requireCanViewDataset(input.id, ctx);
+    return await prisma.dataset.findFirstOrThrow({
+      where: { id: input.id },
+      include: {
+        project: true,
+      },
+    });
+  }),
+
+  create: protectedProcedure
+    .input(z.object({ projectId: z.string() }))
+    .mutation(async ({ input, ctx }) => {
+      await requireCanModifyProject(input.projectId, ctx);
+
+      const numDatasets = await prisma.dataset.count({
+        where: {
+          projectId: input.projectId,
+        },
+      });
+
+      return await prisma.dataset.create({
+        data: {
+          name: `Dataset ${numDatasets + 1}`,
+          projectId: input.projectId,
+        },
+      });
+    }),
+
+  update: protectedProcedure
+    .input(z.object({ id: z.string(), updates: z.object({ name: z.string() }) }))
+    .mutation(async ({ input, ctx }) => {
+      await requireCanModifyDataset(input.id, ctx);
+      return await prisma.dataset.update({
+        where: {
+          id: input.id,
+        },
+        data: {
+          name: input.updates.name,
+        },
+      });
+    }),
+
+  delete: protectedProcedure
+    .input(z.object({ id: z.string() }))
+    .mutation(async ({ input, ctx }) => {
+      await requireCanModifyDataset(input.id, ctx);
+
+      await prisma.dataset.delete({
+        where: {
+          id: input.id,
+        },
+      });
+    }),
+});
--- a/app/src/server/api/routers/experiments.router.ts
+++ b/app/src/server/api/routers/experiments.router.ts
@@ -178,7 +178,6 @@ export const experimentsRouter = createTRPCRouter({
        existingToNewVariantIds.set(variant.id, newVariantId);
        variantsToCreate.push({
          ...variant,
-          uiId: uuidv4(),
          id: newVariantId,
          experimentId: newExperimentId,
        });
@@ -192,7 +191,6 @@ export const experimentsRouter = createTRPCRouter({
        scenariosToCreate.push({
          ...scenario,
          id: newScenarioId,
-          uiId: uuidv4(),
          experimentId: newExperimentId,
          variableValues: scenario.variableValues as Prisma.InputJsonValue,
        });
--- a/app/src/server/api/routers/fineTunes.router.ts
+++ b/app/src/server/api/routers/fineTunes.router.ts
@@ -1,113 +0,0 @@
-import { z } from "zod";
-import { v4 as uuidv4 } from "uuid";
-import { type Prisma } from "@prisma/client";
-
-import { createTRPCRouter, protectedProcedure } from "~/server/api/trpc";
-import { prisma } from "~/server/db";
-import { requireCanViewProject, requireCanModifyProject } from "~/utils/accessControl";
-import { error, success } from "~/utils/errorHandling/standardResponses";
-
-export const fineTunesRouter = createTRPCRouter({
-  list: protectedProcedure
-    .input(
-      z.object({
-        projectId: z.string(),
-        page: z.number(),
-        pageSize: z.number(),
-      }),
-    )
-    .query(async ({ input, ctx }) => {
-      const { projectId, page, pageSize } = input;
-
-      await requireCanViewProject(projectId, ctx);
-
-      const fineTunes = await prisma.fineTune.findMany({
-        where: {
-          projectId,
-        },
-        include: {
-          dataset: {
-            include: {
-              _count: {
-                select: {
-                  datasetEntries: true,
-                },
-              },
-            },
-          },
-        },
-        orderBy: { createdAt: "asc" },
-        skip: (page - 1) * pageSize,
-        take: pageSize,
-      });
-
-      const count = await prisma.fineTune.count({
-        where: {
-          projectId,
-        },
-      });
-
-      return {
-        fineTunes,
-        count,
-      };
-    }),
-  create: protectedProcedure
-    .input(
-      z.object({
-        projectId: z.string(),
-        selectedLogIds: z.array(z.string()),
-        slug: z.string(),
-        baseModel: z.string(),
-      }),
-    )
-    .mutation(async ({ input, ctx }) => {
-      await requireCanModifyProject(input.projectId, ctx);
-
-      const existingFineTune = await prisma.fineTune.findFirst({
-        where: {
-          slug: input.slug,
-        },
-      });
-
-      if (existingFineTune) {
-        return error("A fine tune with that slug already exists");
-      }
-
-      const newDatasetId = uuidv4();
-
-      const datasetEntriesToCreate: Prisma.DatasetEntryCreateManyDatasetInput[] =
-        input.selectedLogIds.map((loggedCallId) => ({
-          loggedCallId,
-        }));
-
-      await prisma.$transaction([
-        prisma.dataset.create({
-          data: {
-            id: newDatasetId,
-            name: input.slug,
-            project: {
-              connect: {
-                id: input.projectId,
-              },
-            },
-            datasetEntries: {
-              createMany: {
-                data: datasetEntriesToCreate,
-              },
-            },
-          },
-        }),
-        prisma.fineTune.create({
-          data: {
-            projectId: input.projectId,
-            slug: input.slug,
-            baseModel: input.baseModel,
-            datasetId: newDatasetId,
-          },
-        }),
-      ]);
-
-      return success();
-    }),
-});
--- a/app/src/server/api/routers/scenarioVariantCells.router.ts
+++ b/app/src/server/api/routers/scenarioVariantCells.router.ts
@@ -61,7 +61,7 @@ export const scenarioVariantCellsRouter = createTRPCRouter({
        evalsComplete,
      };
    }),
-  hardRefetch: protectedProcedure
+  forceRefetch: protectedProcedure
    .input(
      z.object({
        scenarioId: z.string(),
@@ -85,10 +85,7 @@ export const scenarioVariantCellsRouter = createTRPCRouter({
      });

      if (!cell) {
-        await generateNewCell(input.variantId, input.scenarioId, {
-          stream: true,
-          hardRefetch: true,
-        });
+        await generateNewCell(input.variantId, input.scenarioId, { stream: true });
        return;
      }

@@ -99,7 +96,7 @@ export const scenarioVariantCellsRouter = createTRPCRouter({
        },
      });

-      await queueQueryModel(cell.id, { stream: true, hardRefetch: true });
+      await queueQueryModel(cell.id, true);
    }),
  getTemplatedPromptMessage: publicProcedure
    .input(
--- a/app/src/server/scripts/openai-test.ts
+++ b/app/src/server/scripts/openai-test.ts
@@ -0,0 +1,19 @@
+import "dotenv/config";
+import { openai } from "../utils/openai";
+
+const resp = await openai.chat.completions.create({
+  model: "gpt-3.5-turbo-0613",
+  stream: true,
+  messages: [
+    {
+      role: "user",
+      content: "count to 20",
+    },
+  ],
+});
+
+for await (const part of resp) {
+  console.log("part", part);
+}
+
+console.log("final resp", resp);
--- a/app/src/server/tasks/defineTask.ts
+++ b/app/src/server/tasks/defineTask.ts
@@ -1,4 +1,4 @@
-import { type Helpers, type Task, makeWorkerUtils, TaskSpec } from "graphile-worker";
+import { type Helpers, type Task, makeWorkerUtils } from "graphile-worker";
 import { env } from "~/env.mjs";

 let workerUtilsPromise: ReturnType<typeof makeWorkerUtils> | null = null;
@@ -16,11 +16,9 @@ function defineTask<TPayload>(
  taskIdentifier: string,
  taskHandler: (payload: TPayload, helpers: Helpers) => Promise<void>,
 ) {
-  const enqueue = async (payload: TPayload, spec?: TaskSpec) => {
+  const enqueue = async (payload: TPayload, runAt?: Date) => {
    console.log("Enqueuing task", taskIdentifier, payload);
-
-    const utils = await workerUtils();
-    return await utils.addJob(taskIdentifier, payload, spec);
+    await (await workerUtils()).addJob(taskIdentifier, payload, { runAt });
  };

  const handler = (payload: TPayload, helpers: Helpers) => {
--- a/app/src/server/tasks/queryModel.task.ts
+++ b/app/src/server/tasks/queryModel.task.ts
@@ -25,6 +25,7 @@ function calculateDelay(numPreviousTries: number): number {
 }

 export const queryModel = defineTask<QueryModelJob>("queryModel", async (task) => {
+  console.log("RUNNING TASK", task);
  const { cellId, stream, numPreviousTries } = task;
  const cell = await prisma.scenarioVariantCell.findUnique({
    where: { id: cellId },
@@ -152,7 +153,7 @@ export const queryModel = defineTask<QueryModelJob>("queryModel", async (task) =
          stream,
          numPreviousTries: numPreviousTries + 1,
        },
-        { runAt: retryTime, jobKey: cellId, priority: 3 },
+        retryTime,
      );
      await prisma.scenarioVariantCell.update({
        where: { id: cellId },
@@ -171,13 +172,7 @@ export const queryModel = defineTask<QueryModelJob>("queryModel", async (task) =
  }
 });

-export const queueQueryModel = async (
-  cellId: string,
-  options: { stream?: boolean; hardRefetch?: boolean } = {},
-) => {
-  // Hard refetches are higher priority than streamed queries, which are higher priority than non-streamed queries.
-  const jobPriority = options.hardRefetch ? 0 : options.stream ? 1 : 2;
-
+export const queueQueryModel = async (cellId: string, stream: boolean) => {
  await Promise.all([
    prisma.scenarioVariantCell.update({
      where: {
@@ -189,13 +184,6 @@ export const queueQueryModel = async (
        jobQueuedAt: new Date(),
      },
    }),
-
-    queryModel.enqueue(
-      { cellId, stream: options.stream ?? false, numPreviousTries: 0 },
-
-      // Streamed queries are higher priority than non-streamed queries. Lower
-      // numbers are higher priority in graphile-worker.
-      { jobKey: cellId, priority: jobPriority },
-    ),
+    queryModel.enqueue({ cellId, stream, numPreviousTries: 0 }),
  ]);
 };
--- a/app/src/server/tasks/runNewEval.task.ts
+++ b/app/src/server/tasks/runNewEval.task.ts
@@ -13,6 +13,5 @@ export const runNewEval = defineTask<RunNewEvalJob>("runNewEval", async (task) =
 });

 export const queueRunNewEval = async (experimentId: string) => {
-  // Evals are lower priority than completions
-  await runNewEval.enqueue({ experimentId }, { priority: 4 });
+  await runNewEval.enqueue({ experimentId });
 };
--- a/app/src/server/tasks/test-tasks.ts
+++ b/app/src/server/tasks/test-tasks.ts
@@ -1,47 +0,0 @@
-import "dotenv/config";
-
-import defineTask from "./defineTask";
-import { type TaskList, run } from "graphile-worker";
-import { env } from "~/env.mjs";
-
-import "../../../sentry.server.config";
-
-export type TestTask = { i: number };
-
-// When a new eval is created, we want to run it on all existing outputs, but return the new eval first
-export const testTask = defineTask<TestTask>("testTask", (task) => {
-  console.log("ran task ", task.i);
-
-  void new Promise((_resolve, reject) => setTimeout(reject, 500));
-  return Promise.resolve();
-});
-
-const registeredTasks = [testTask];
-
-const taskList = registeredTasks.reduce((acc, task) => {
-  acc[task.task.identifier] = task.task.handler;
-  return acc;
-}, {} as TaskList);
-
-// process.on("unhandledRejection", (reason, promise) => {
-//   console.log("Unhandled Rejection at:", reason?.stack || reason);
-// });
-
-// Run a worker to execute jobs:
-const runner = await run({
-  connectionString: env.DATABASE_URL,
-  concurrency: 10,
-  // Install signal handlers for graceful shutdown on SIGINT, SIGTERM, etc
-  noHandleSignals: false,
-  pollInterval: 1000,
-  taskList,
-});
-
-console.log("Worker successfully started");
-
-for (let i = 0; i < 10; i++) {
-  await testTask.enqueue({ i });
-  await new Promise((resolve) => setTimeout(resolve, 1000));
-}
-
-await runner.promise;
--- a/app/src/server/tasks/worker.ts
+++ b/app/src/server/tasks/worker.ts
@@ -1,6 +1,5 @@
 import { type TaskList, run } from "graphile-worker";
 import "dotenv/config";
-import "../../../sentry.server.config";

 import { env } from "~/env.mjs";
 import { queryModel } from "./queryModel.task";
@@ -18,8 +17,7 @@ const taskList = registeredTasks.reduce((acc, task) => {
 // Run a worker to execute jobs:
 const runner = await run({
  connectionString: env.DATABASE_URL,
-  concurrency: env.WORKER_CONCURRENCY,
-  maxPoolSize: env.WORKER_MAX_POOL_SIZE,
+  concurrency: 10,
  // Install signal handlers for graceful shutdown on SIGINT, SIGTERM, etc
  noHandleSignals: false,
  pollInterval: 1000,
--- a/app/src/server/utils/deriveNewContructFn.ts
+++ b/app/src/server/utils/deriveNewContructFn.ts
@@ -41,7 +41,7 @@ const requestUpdatedPromptFunction = async (
 ) => {
  const originalModelProvider = modelProviders[originalVariant.modelProvider as SupportedProvider];
  const originalModel = originalModelProvider.models[originalVariant.model] as Model;
-  let newConstructionFn = "";
+  let newContructionFn = "";
  for (let i = 0; i < NUM_RETRIES; i++) {
    try {
      const messages: CreateChatCompletionRequestMessage[] = [
@@ -109,12 +109,6 @@ const requestUpdatedPromptFunction = async (
        function_call: {
          name: "update_prompt_constructor_function",
        },
-        openpipe: {
-          tags: {
-            prompt_id: "deriveNewConstructFn",
-            model_translation: (!!newModel).toString(),
-          },
-        },
      });
      const argString = completion.choices[0]?.message?.function_call?.arguments || "{}";

@@ -137,7 +131,7 @@ const requestUpdatedPromptFunction = async (
      const args = await contructPromptFunctionArgs.copy(); // Get the actual value from the isolate

      if (args && isObject(args) && "new_prompt_function" in args) {
-        newConstructionFn = await formatPromptConstructor(args.new_prompt_function as string);
+        newContructionFn = await formatPromptConstructor(args.new_prompt_function as string);
        break;
      }
    } catch (e) {
@@ -145,5 +139,5 @@ const requestUpdatedPromptFunction = async (
    }
  }

-  return newConstructionFn;
+  return newContructionFn;
 };
--- a/app/src/server/utils/generateNewCell.ts
+++ b/app/src/server/utils/generateNewCell.ts
@@ -9,8 +9,10 @@ import parsePromptConstructor from "~/promptConstructor/parse";
 export const generateNewCell = async (
  variantId: string,
  scenarioId: string,
-  options: { stream?: boolean; hardRefetch?: boolean } = {},
+  options?: { stream?: boolean },
 ): Promise<void> => {
+  const stream = options?.stream ?? false;
+
  const variant = await prisma.promptVariant.findUnique({
    where: {
      id: variantId,
@@ -119,6 +121,6 @@ export const generateNewCell = async (
      }),
    );
  } else {
-    await queueQueryModel(cell.id, options);
+    await queueQueryModel(cell.id, stream);
  }
 };
--- a/app/src/server/utils/openai.ts
+++ b/app/src/server/utils/openai.ts
@@ -27,4 +27,3 @@ try {
 // export const openai = env.OPENPIPE_API_KEY ? new OpenAI.OpenAI(config) : new OriginalOpenAI(config);

 export const openai = new OpenAI(config);
-`
--- a/app/src/server/utils/runOneEval.ts
+++ b/app/src/server/utils/runOneEval.ts
@@ -53,11 +53,6 @@ export const runGpt4Eval = async (
        },
      },
    ],
-    openpipe: {
-      tags: {
-        prompt_id: "runOneEval",
-      },
-    },
  });

  try {
--- a/app/src/state/columnVisiblitySlice.ts
+++ b/app/src/state/columnVisiblitySlice.ts
@@ -1,37 +0,0 @@
-import { type SliceCreator } from "./store";
-
-export const comparators = ["=", "!=", "CONTAINS", "NOT_CONTAINS"] as const;
-
-export const defaultFilterableFields = ["Request", "Response", "Model", "Status Code"] as const;
-
-export enum StaticColumnKeys {
-  SENT_AT = "sentAt",
-  MODEL = "model",
-  DURATION = "duration",
-  INPUT_TOKENS = "inputTokens",
-  OUTPUT_TOKENS = "outputTokens",
-  STATUS_CODE = "statusCode",
-}
-
-export type ColumnVisibilitySlice = {
-  visibleColumns: Set<string>;
-  toggleColumnVisibility: (columnKey: string) => void;
-  showAllColumns: (columnKeys: string[]) => void;
-};
-
-export const createColumnVisibilitySlice: SliceCreator<ColumnVisibilitySlice> = (set, get) => ({
-  // initialize with all static columns visible
-  visibleColumns: new Set(Object.values(StaticColumnKeys)),
-  toggleColumnVisibility: (columnKey: string) =>
-    set((state) => {
-      if (state.columnVisibility.visibleColumns.has(columnKey)) {
-        state.columnVisibility.visibleColumns.delete(columnKey);
-      } else {
-        state.columnVisibility.visibleColumns.add(columnKey);
-      }
-    }),
-  showAllColumns: (columnKeys: string[]) =>
-    set((state) => {
-      state.columnVisibility.visibleColumns = new Set(columnKeys);
-    }),
-});
--- a/app/src/state/persist.ts
+++ b/app/src/state/persist.ts
@@ -1,27 +1,13 @@
 import { type PersistOptions } from "zustand/middleware/persist";
 import { type State } from "./store";
-import SuperJSON from "superjson";
-import { merge, pick } from "lodash-es";
-import { type PartialDeep } from "type-fest";

-export type PersistedState = PartialDeep<State>;
+export const stateToPersist = {
+  selectedProjectId: null as string | null,
+};

-export const persistOptions: PersistOptions<State, PersistedState> = {
+export const persistOptions: PersistOptions<State, typeof stateToPersist> = {
  name: "persisted-app-store",
  partialize: (state) => ({
    selectedProjectId: state.selectedProjectId,
-    columnVisibility: pick(state.columnVisibility, ["visibleColumns"]),
  }),
-  merge: (saved, state) => merge(state, saved),
-  storage: {
-    getItem: (key) => {
-      const data = localStorage.getItem(key);
-      return data ? SuperJSON.parse(data) : null;
-    },
-    setItem: (key, value) => localStorage.setItem(key, SuperJSON.stringify(value)),
-    removeItem: (key) => localStorage.removeItem(key),
-  },
-  onRehydrateStorage: (state) => {
-    if (state) state.isRehydrated = true;
-  },
 };
--- a/app/src/state/store.ts
+++ b/app/src/state/store.ts
@@ -8,15 +8,13 @@ import {
  createVariantEditorSlice,
 } from "./sharedVariantEditor.slice";
 import { type APIClient } from "~/utils/api";
-import { type PersistedState, persistOptions } from "./persist";
+import { persistOptions, type stateToPersist } from "./persist";
 import { type SelectedLogsSlice, createSelectedLogsSlice } from "./selectedLogsSlice";
 import { type LogFiltersSlice, createLogFiltersSlice } from "./logFiltersSlice";
-import { createColumnVisibilitySlice, type ColumnVisibilitySlice } from "./columnVisiblitySlice";

 enableMapSet();

 export type State = {
-  isRehydrated: boolean;
  drawerOpen: boolean;
  openDrawer: () => void;
  closeDrawer: () => void;
@@ -27,7 +25,6 @@ export type State = {
  setSelectedProjectId: (id: string) => void;
  selectedLogs: SelectedLogsSlice;
  logFilters: LogFiltersSlice;
-  columnVisibility: ColumnVisibilitySlice;
 };

 export type SliceCreator<T> = StateCreator<State, [["zustand/immer", never]], [], T>;
@@ -35,15 +32,18 @@ export type SliceCreator<T> = StateCreator<State, [["zustand/immer", never]], []
 export type SetFn = Parameters<SliceCreator<unknown>>[0];
 export type GetFn = Parameters<SliceCreator<unknown>>[1];

-const useBaseStore = create<State, [["zustand/persist", PersistedState], ["zustand/immer", never]]>(
+const useBaseStore = create<
+  State,
+  [["zustand/persist", typeof stateToPersist], ["zustand/immer", never]]
+>(
  persist(
    immer((set, get, ...rest) => ({
-      isRehydrated: false,
      api: null,
      setApi: (api) =>
        set((state) => {
          state.api = api;
        }),
+
      drawerOpen: false,
      openDrawer: () =>
        set((state) => {
@@ -61,7 +61,6 @@ const useBaseStore = create<State, [["zustand/persist", PersistedState], ["zusta
        }),
      selectedLogs: createSelectedLogsSlice(set, get, ...rest),
      logFilters: createLogFiltersSlice(set, get, ...rest),
-      columnVisibility: createColumnVisibilitySlice(set, get, ...rest),
    })),
    persistOptions,
  ),
--- a/app/src/utils/accessControl.ts
+++ b/app/src/utils/accessControl.ts
@@ -78,6 +78,33 @@ export const requireCanModifyProject = async (projectId: string, ctx: TRPCContex
  }
 };

+export const requireCanViewDataset = async (datasetId: string, ctx: TRPCContext) => {
+  ctx.markAccessControlRun();
+
+  const dataset = await prisma.dataset.findFirst({
+    where: {
+      id: datasetId,
+      project: {
+        projectUsers: {
+          some: {
+            role: { in: [ProjectUserRole.ADMIN, ProjectUserRole.MEMBER] },
+            userId: ctx.session?.user.id,
+          },
+        },
+      },
+    },
+  });
+
+  if (!dataset) {
+    throw new TRPCError({ code: "UNAUTHORIZED" });
+  }
+};
+
+export const requireCanModifyDataset = async (datasetId: string, ctx: TRPCContext) => {
+  // Right now all users who can view a dataset can also modify it
+  await requireCanViewDataset(datasetId, ctx);
+};
+
 export const requireCanViewExperiment = (experimentId: string, ctx: TRPCContext): Promise<void> => {
  // Right now all experiments are publicly viewable, so this is a no-op.
  ctx.markAccessControlRun();
--- a/app/src/utils/hooks.ts
+++ b/app/src/utils/hooks.ts
@@ -26,6 +26,34 @@ export const useExperimentAccess = () => {
  return useExperiment().data?.access ?? { canView: false, canModify: false };
 };

+export const useDatasets = () => {
+  const selectedProjectId = useAppStore((state) => state.selectedProjectId);
+  return api.datasets.list.useQuery(
+    { projectId: selectedProjectId ?? "" },
+    { enabled: !!selectedProjectId },
+  );
+};
+
+export const useDataset = () => {
+  const router = useRouter();
+  const dataset = api.datasets.get.useQuery(
+    { id: router.query.id as string },
+    { enabled: !!router.query.id },
+  );
+
+  return dataset;
+};
+
+export const useDatasetEntries = () => {
+  const dataset = useDataset();
+  const { page, pageSize } = usePageParams();
+
+  return api.datasetEntries.list.useQuery(
+    { datasetId: dataset.data?.id ?? "", page, pageSize },
+    { enabled: dataset.data?.id != null },
+  );
+};
+
 type AsyncFunction<T extends unknown[], U> = (...args: T) => Promise<U>;

 export function useHandledAsyncCallback<T extends unknown[], U>(
@@ -177,22 +205,3 @@ export const useTagNames = () => {
    { enabled: !!selectedProjectId },
  );
 };
-
-export const useFineTunes = () => {
-  const selectedProjectId = useAppStore((state) => state.selectedProjectId);
-  const { page, pageSize } = usePageParams();
-
-  return api.fineTunes.list.useQuery(
-    { projectId: selectedProjectId ?? "", page, pageSize },
-    { enabled: !!selectedProjectId },
-  );
-};
-
-export const useIsClientRehydrated = () => {
-  const isRehydrated = useAppStore((state) => state.isRehydrated);
-  const [isMounted, setIsMounted] = useState(false);
-  useEffect(() => {
-    setIsMounted(true);
-  }, []);
-  return isRehydrated && isMounted;
-};
--- a/app/test-docker.sh
+++ b/app/test-docker.sh
@@ -0,0 +1,9 @@
+#! /bin/bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+source app/.env
+
+docker build . --file app/Dockerfile
--- a/client-libs/openapi.json
+++ b/client-libs/openapi.json
@@ -141,20 +141,10 @@
                  "type": "object",
                  "properties": {
                    "status": {
-                      "anyOf": [
-                        {
                      "type": "string",
                      "enum": [
                        "ok"
                      ]
-                        },
-                        {
-                          "type": "string",
-                          "enum": [
-                            "error"
-                          ]
-                        }
-                      ]
                    }
                  },
                  "required": [
--- a/client-libs/python/README.md
+++ b/client-libs/python/README.md
@@ -1,40 +0,0 @@
-# OpenPipe Python Client
-
-This client allows you automatically report your OpenAI calls to [OpenPipe](https://openpipe.ai/). OpenPipe
-
-## Installation
-`pip install openpipe`
-
-## Usage
-
-1. Create a project at https://app.openpipe.ai
-2. Find your project's API key at https://app.openpipe.ai/project/settings
-3. Configure the OpenPipe client as shown below.
-
-```python
-from openpipe import openai, configure_openpipe
-import os
-
-# Set the OpenPipe API key you got in step (3) above.
-# If you have the `OPENPIPE_API_KEY` environment variable set we'll read from it by default.
-configure_openpipe(api_key=os.getenv("OPENPIPE_API_KEY"))
-
-# Configure OpenAI the same way you would normally
-openai.api_key = os.getenv("OPENAI_API_KEY")
-```
-
-You can use the OpenPipe client for normal
-
-## Special Features
-
-### Tagging
-
-OpenPipe has a concept of "tagging." This is very useful for grouping a certain set of completions together. When you're using a dataset for fine-tuning, you can select all the prompts that match a certain set of tags. Here's how you can use the tagging feature:
-
-```python
-completion = openai.ChatCompletion.create(
-    model="gpt-3.5-turbo",
-    messages=[{"role": "system", "content": "count to 10"}],
-    openpipe={"tags": {"prompt_id": "counting"}},
-)
-```
--- a/client-libs/python/openpipe/LICENSE
+++ b/client-libs/python/openpipe/LICENSE
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--- a/client-libs/python/openpipe/api_client/models/init.py
+++ b/client-libs/python/openpipe/api_client/models/init.py
@@ -13,8 +13,7 @@ from .local_testing_only_get_latest_logged_call_response_200_tags import (
 from .report_json_body import ReportJsonBody
 from .report_json_body_tags import ReportJsonBodyTags
 from .report_response_200 import ReportResponse200
-from .report_response_200_status_type_0 import ReportResponse200StatusType0
-from .report_response_200_status_type_1 import ReportResponse200StatusType1
+from .report_response_200_status import ReportResponse200Status

 __all__ = (
    "CheckCacheJsonBody",
@@ -26,6 +25,5 @@ __all__ = (
    "ReportJsonBody",
    "ReportJsonBodyTags",
    "ReportResponse200",
-    "ReportResponse200StatusType0",
-    "ReportResponse200StatusType1",
+    "ReportResponse200Status",
 )
--- a/client-libs/python/openpipe/api_client/models/report_response_200.py
+++ b/client-libs/python/openpipe/api_client/models/report_response_200.py
@@ -1,9 +1,8 @@
-from typing import Any, Dict, Type, TypeVar, Union
+from typing import Any, Dict, Type, TypeVar

 from attrs import define

-from ..models.report_response_200_status_type_0 import ReportResponse200StatusType0
-from ..models.report_response_200_status_type_1 import ReportResponse200StatusType1
+from ..models.report_response_200_status import ReportResponse200Status

 T = TypeVar("T", bound="ReportResponse200")

@@ -12,18 +11,12 @@ T = TypeVar("T", bound="ReportResponse200")
 class ReportResponse200:
    """
    Attributes:
-        status (Union[ReportResponse200StatusType0, ReportResponse200StatusType1]):
+        status (ReportResponse200Status):
    """

-    status: Union[ReportResponse200StatusType0, ReportResponse200StatusType1]
+    status: ReportResponse200Status

    def to_dict(self) -> Dict[str, Any]:
-        status: str
-
-        if isinstance(self.status, ReportResponse200StatusType0):
-            status = self.status.value
-
-        else:
        status = self.status.value

        field_dict: Dict[str, Any] = {}
@@ -38,23 +31,7 @@ class ReportResponse200:
    @classmethod
    def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
        d = src_dict.copy()
-
-        def _parse_status(data: object) -> Union[ReportResponse200StatusType0, ReportResponse200StatusType1]:
-            try:
-                if not isinstance(data, str):
-                    raise TypeError()
-                status_type_0 = ReportResponse200StatusType0(data)
-
-                return status_type_0
-            except:  # noqa: E722
-                pass
-            if not isinstance(data, str):
-                raise TypeError()
-            status_type_1 = ReportResponse200StatusType1(data)
-
-            return status_type_1
-
-        status = _parse_status(d.pop("status"))
+        status = ReportResponse200Status(d.pop("status"))

        report_response_200 = cls(
            status=status,
--- a/client-libs/python/openpipe/api_client/models/report_response_200_status_type_0.py
+++ b/client-libs/python/openpipe/api_client/models/report_response_200_status_type_0.py
@@ -1,7 +1,7 @@
 from enum import Enum


-class ReportResponse200StatusType0(str, Enum):
+class ReportResponse200Status(str, Enum):
    OK = "ok"

    def __str__(self) -> str:
--- a/client-libs/python/openpipe/api_client/models/report_response_200_status_type_1.py
+++ b/client-libs/python/openpipe/api_client/models/report_response_200_status_type_1.py
@@ -1,8 +0,0 @@
-from enum import Enum
-
-
-class ReportResponse200StatusType1(str, Enum):
-    ERROR = "error"
-
-    def __str__(self) -> str:
-        return str(self.value)
--- a/client-libs/python/openpipe/openai.py
+++ b/client-libs/python/openpipe/openai.py
@@ -4,7 +4,7 @@ import time
 import inspect

 from openpipe.merge_openai_chunks import merge_openai_chunks
-from openpipe.openpipe_meta import openpipe_meta
+from openpipe.openpipe_meta import OpenPipeMeta

 from .shared import (
    _should_check_cache,
@@ -41,11 +41,9 @@ class WrappedChatCompletion(original_openai.ChatCompletion):
                        )

                        cache_status = (
-                            "MISS"
-                            if _should_check_cache(openpipe_options, kwargs)
-                            else "SKIP"
+                            "MISS" if _should_check_cache(openpipe_options) else "SKIP"
                        )
-                        chunk.openpipe = openpipe_meta(cache_status=cache_status)
+                        chunk.openpipe = OpenPipeMeta(cache_status=cache_status)

                        yield chunk

@@ -74,9 +72,9 @@ class WrappedChatCompletion(original_openai.ChatCompletion):
                )

                cache_status = (
-                    "MISS" if _should_check_cache(openpipe_options, kwargs) else "SKIP"
+                    "MISS" if _should_check_cache(openpipe_options) else "SKIP"
                )
-                chat_completion["openpipe"] = openpipe_meta(cache_status=cache_status)
+                chat_completion["openpipe"] = OpenPipeMeta(cache_status=cache_status)
            return chat_completion
        except Exception as e:
            received_at = int(time.time() * 1000)
@@ -128,11 +126,9 @@ class WrappedChatCompletion(original_openai.ChatCompletion):
                            assembled_completion, chunk
                        )
                        cache_status = (
-                            "MISS"
-                            if _should_check_cache(openpipe_options, kwargs)
-                            else "SKIP"
+                            "MISS" if _should_check_cache(openpipe_options) else "SKIP"
                        )
-                        chunk.openpipe = openpipe_meta(cache_status=cache_status)
+                        chunk.openpipe = OpenPipeMeta(cache_status=cache_status)

                        yield chunk

@@ -161,9 +157,9 @@ class WrappedChatCompletion(original_openai.ChatCompletion):
                )

                cache_status = (
-                    "MISS" if _should_check_cache(openpipe_options, kwargs) else "SKIP"
+                    "MISS" if _should_check_cache(openpipe_options) else "SKIP"
                )
-                chat_completion["openpipe"] = openpipe_meta(cache_status=cache_status)
+                chat_completion["openpipe"] = OpenPipeMeta(cache_status=cache_status)

            return chat_completion
        except Exception as e:
--- a/client-libs/python/openpipe/openpipe_meta.py
+++ b/client-libs/python/openpipe/openpipe_meta.py
@@ -1,2 +1,7 @@
-def openpipe_meta(cache_status: str):
-    return {"cache_status": cache_status}
+from attr import dataclass
+
+
+@dataclass
+class OpenPipeMeta:
+    # Cache status. One of 'HIT', 'MISS', 'SKIP'
+    cache_status: str
--- a/client-libs/python/openpipe/shared.py
+++ b/client-libs/python/openpipe/shared.py
@@ -6,19 +6,15 @@ from openpipe.api_client.client import AuthenticatedClient
 from openpipe.api_client.models.report_json_body_tags import (
    ReportJsonBodyTags,
 )
+import toml
 import time
-import os

-# TODO: sync with pyproject.toml
-version = "3.0.3"
+version = toml.load("pyproject.toml")["tool"]["poetry"]["version"]

 configured_client = AuthenticatedClient(
    base_url="https://app.openpipe.ai/api/v1", token=""
 )

-if os.environ.get("OPENPIPE_API_KEY"):
-    configured_client.token = os.environ["OPENPIPE_API_KEY"]
-

 def _get_tags(openpipe_options):
    tags = openpipe_options.get("tags") or {}
@@ -28,18 +24,10 @@ def _get_tags(openpipe_options):
    return ReportJsonBodyTags.from_dict(tags)


-def _should_check_cache(openpipe_options, req_payload):
+def _should_check_cache(openpipe_options):
    if configured_client.token == "":
        return False
-
-    cache_requested = openpipe_options.get("cache", False)
-    streaming = req_payload.get("stream", False)
-    if cache_requested and streaming:
-        print(
-            "Caching is not yet supported for streaming requests. Ignoring cache flag. Vote for this feature at https://github.com/OpenPipe/OpenPipe/issues/159"
-        )
-        return False
-    return cache_requested
+    return openpipe_options.get("cache", False)


 def _process_cache_payload(
@@ -56,7 +44,7 @@ def maybe_check_cache(
    openpipe_options={},
    req_payload={},
 ):
-    if not _should_check_cache(openpipe_options, req_payload):
+    if not _should_check_cache(openpipe_options):
        return None
    try:
        payload = check_cache.sync(
@@ -80,7 +68,7 @@ async def maybe_check_cache_async(
    openpipe_options={},
    req_payload={},
 ):
-    if not _should_check_cache(openpipe_options, req_payload):
+    if not _should_check_cache(openpipe_options):
        return None

    try:
--- a/client-libs/python/openpipe/test_client.py
+++ b/client-libs/python/openpipe/test_client.py
@@ -27,14 +27,12 @@ def last_logged_call():
    return local_testing_only_get_latest_logged_call.sync(client=configured_client)


-@pytest.mark.focus
 def test_sync():
    completion = openai.ChatCompletion.create(
        model="gpt-3.5-turbo",
        messages=[{"role": "system", "content": "count to 3"}],
    )

-    print("completion is", completion)
    last_logged = last_logged_call()
    assert (
        last_logged.model_response.resp_payload["choices"][0]["message"]["content"]
@@ -44,7 +42,7 @@ def test_sync():
        last_logged.model_response.req_payload["messages"][0]["content"] == "count to 3"
    )

-    assert completion.openpipe["cache_status"] == "SKIP"
+    assert completion.openpipe.cache_status == "SKIP"


 def test_streaming():
@@ -77,7 +75,7 @@ async def test_async():
        == "count down from 5"
    )

-    assert completion.openpipe["cache_status"] == "SKIP"
+    assert completion.openpipe.cache_status == "SKIP"


 async def test_async_streaming():
@@ -89,7 +87,7 @@ async def test_async_streaming():

    merged = None
    async for chunk in completion:
-        assert chunk.openpipe["cache_status"] == "SKIP"
+        assert chunk.openpipe.cache_status == "SKIP"
        merged = merge_openai_chunks(merged, chunk)

    last_logged = last_logged_call()
@@ -102,7 +100,7 @@ async def test_async_streaming():
        last_logged.model_response.req_payload["messages"][0]["content"]
        == "count down from 5"
    )
-    assert merged["openpipe"]["cache_status"] == "SKIP"
+    assert merged["openpipe"].cache_status == "SKIP"


 def test_sync_with_tags():
@@ -148,7 +146,7 @@ async def test_caching():
        messages=messages,
        openpipe={"cache": True},
    )
-    assert completion.openpipe["cache_status"] == "MISS"
+    assert completion.openpipe.cache_status == "MISS"

    first_logged = last_logged_call()
    assert (
@@ -161,4 +159,4 @@ async def test_caching():
        messages=messages,
        openpipe={"cache": True},
    )
-    assert completion2.openpipe["cache_status"] == "HIT"
+    assert completion2.openpipe.cache_status == "HIT"
--- a/client-libs/python/pyproject.toml
+++ b/client-libs/python/pyproject.toml
@@ -1,13 +1,9 @@
 [tool.poetry]
 name = "openpipe"
-version = "3.0.3"
-description = "Python client library for the OpenPipe service"
-authors = ["Kyle Corbitt <kyle@openpipe.ai>"]
+version = "0.1.0"
+description = ""
+authors = ["Kyle Corbitt <kyle@corbt.com>"]
 license = "Apache-2.0"
-readme = "README.md"
-homepage = "https://github.com/OpenPipe/OpenPipe"
-repository = "https://github.com/OpenPipe/OpenPipe"
-include = ["pyproject.toml"]

 [tool.poetry.dependencies]
 python = "^3.9"
--- a/client-libs/typescript/package.json
+++ b/client-libs/typescript/package.json
@@ -13,17 +13,15 @@
  "author": "",
  "license": "Apache-2.0",
  "dependencies": {
-    "encoding": "^0.1.13",
    "form-data": "^4.0.0",
    "lodash-es": "^4.17.21",
-    "node-fetch": "^2.6.12",
+    "node-fetch": "^3.3.2",
    "openai-beta": "npm:openai@4.0.0-beta.7",
    "openai-legacy": "npm:openai@3.3.0"
  },
  "devDependencies": {
    "@types/lodash-es": "^4.17.8",
    "@types/node": "^20.4.8",
-    "@types/node-fetch": "^2.6.4",
    "dotenv": "^16.3.1",
    "tsx": "^3.12.7",
    "typescript": "^5.0.4",
--- a/client-libs/typescript/src/codegen/core/request.ts
+++ b/client-libs/typescript/src/codegen/core/request.ts
@@ -2,38 +2,42 @@
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
-import FormData from 'form-data';
-import fetch, { Headers } from 'node-fetch';
-import type { RequestInit, Response } from 'node-fetch';
-import type { AbortSignal } from 'node-fetch/externals';
+import FormData from "form-data";
+import fetch, { Headers } from "node-fetch";
+import type { RequestInit, Response } from "node-fetch";

-import { ApiError } from './ApiError';
-import type { ApiRequestOptions } from './ApiRequestOptions';
-import type { ApiResult } from './ApiResult';
-import { CancelablePromise } from './CancelablePromise';
-import type { OnCancel } from './CancelablePromise';
-import type { OpenAPIConfig } from './OpenAPI';
+// @ts-expect-error TODO maybe I need an older node-fetch or something?
+import type { AbortSignal } from "node-fetch/externals";

-export const isDefined = <T>(value: T | null | undefined): value is Exclude<T, null | undefined> => {
+import { ApiError } from "./ApiError";
+import type { ApiRequestOptions } from "./ApiRequestOptions";
+import type { ApiResult } from "./ApiResult";
+import { CancelablePromise } from "./CancelablePromise";
+import type { OnCancel } from "./CancelablePromise";
+import type { OpenAPIConfig } from "./OpenAPI";
+
+export const isDefined = <T>(
+  value: T | null | undefined
+): value is Exclude<T, null | undefined> => {
  return value !== undefined && value !== null;
 };

 export const isString = (value: any): value is string => {
-    return typeof value === 'string';
+  return typeof value === "string";
 };

 export const isStringWithValue = (value: any): value is string => {
-    return isString(value) && value !== '';
+  return isString(value) && value !== "";
 };

 export const isBlob = (value: any): value is Blob => {
  return (
-        typeof value === 'object' &&
-        typeof value.type === 'string' &&
-        typeof value.stream === 'function' &&
-        typeof value.arrayBuffer === 'function' &&
-        typeof value.constructor === 'function' &&
-        typeof value.constructor.name === 'string' &&
+    typeof value === "object" &&
+    typeof value.type === "string" &&
+    typeof value.stream === "function" &&
+    typeof value.arrayBuffer === "function" &&
+    typeof value.constructor === "function" &&
+    typeof value.constructor.name === "string" &&
    /^(Blob|File)$/.test(value.constructor.name) &&
    /^(Blob|File)$/.test(value[Symbol.toStringTag])
  );
@@ -48,7 +52,7 @@ export const base64 = (str: string): string => {
    return btoa(str);
  } catch (err) {
    // @ts-ignore
-        return Buffer.from(str).toString('base64');
+    return Buffer.from(str).toString("base64");
  }
 };

@@ -62,10 +66,10 @@ export const getQueryString = (params: Record<string, any>): string => {
  const process = (key: string, value: any) => {
    if (isDefined(value)) {
      if (Array.isArray(value)) {
-                value.forEach(v => {
+        value.forEach((v) => {
          process(key, v);
        });
-            } else if (typeof value === 'object') {
+      } else if (typeof value === "object") {
        Object.entries(value).forEach(([k, v]) => {
          process(`${key}[${k}]`, v);
        });
@@ -80,17 +84,17 @@ export const getQueryString = (params: Record<string, any>): string => {
  });

  if (qs.length > 0) {
-        return `?${qs.join('&')}`;
+    return `?${qs.join("&")}`;
  }

-    return '';
+  return "";
 };

 const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => {
  const encoder = config.ENCODE_PATH || encodeURI;

  const path = options.url
-        .replace('{api-version}', config.VERSION)
+    .replace("{api-version}", config.VERSION)
    .replace(/{(.*?)}/g, (substring: string, group: string) => {
      if (options.path?.hasOwnProperty(group)) {
        return encoder(String(options.path[group]));
@@ -121,7 +125,7 @@ export const getFormData = (options: ApiRequestOptions): FormData | undefined =>
      .filter(([_, value]) => isDefined(value))
      .forEach(([key, value]) => {
        if (Array.isArray(value)) {
-                    value.forEach(v => process(key, v));
+          value.forEach((v) => process(key, v));
        } else {
          process(key, value);
        }
@@ -134,48 +138,57 @@ export const getFormData = (options: ApiRequestOptions): FormData | undefined =>

 type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;

-export const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => {
-    if (typeof resolver === 'function') {
+export const resolve = async <T>(
+  options: ApiRequestOptions,
+  resolver?: T | Resolver<T>
+): Promise<T | undefined> => {
+  if (typeof resolver === "function") {
    return (resolver as Resolver<T>)(options);
  }
  return resolver;
 };

-export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
+export const getHeaders = async (
+  config: OpenAPIConfig,
+  options: ApiRequestOptions
+): Promise<Headers> => {
  const token = await resolve(options, config.TOKEN);
  const username = await resolve(options, config.USERNAME);
  const password = await resolve(options, config.PASSWORD);
  const additionalHeaders = await resolve(options, config.HEADERS);

  const headers = Object.entries({
-        Accept: 'application/json',
+    Accept: "application/json",
    ...additionalHeaders,
    ...options.headers,
  })
    .filter(([_, value]) => isDefined(value))
-        .reduce((headers, [key, value]) => ({
+    .reduce(
+      (headers, [key, value]) => ({
        ...headers,
        [key]: String(value),
-        }), {} as Record<string, string>);
+      }),
+      {} as Record<string, string>
+    );

  if (isStringWithValue(token)) {
-        headers['Authorization'] = `Bearer ${token}`;
+    headers["Authorization"] = `Bearer ${token}`;
  }

  if (isStringWithValue(username) && isStringWithValue(password)) {
    const credentials = base64(`${username}:${password}`);
-        headers['Authorization'] = `Basic ${credentials}`;
+    headers["Authorization"] = `Basic ${credentials}`;
  }

  if (options.body) {
    if (options.mediaType) {
-            headers['Content-Type'] = options.mediaType;
+      headers["Content-Type"] = options.mediaType;
    } else if (isBlob(options.body)) {
-            headers['Content-Type'] = 'application/octet-stream';
+      headers["Content-Type"] = "application/octet-stream";
    } else if (isString(options.body)) {
-            headers['Content-Type'] = 'text/plain';
+      headers["Content-Type"] = "text/plain";
    } else if (!isFormData(options.body)) {
-            headers['Content-Type'] = 'application/json';
+      headers["Content-Type"] = "application/json";
    }
  }

@@ -184,8 +197,8 @@ export const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptio

 export const getRequestBody = (options: ApiRequestOptions): any => {
  if (options.body !== undefined) {
-        if (options.mediaType?.includes('/json')) {
-            return JSON.stringify(options.body)
+    if (options.mediaType?.includes("/json")) {
+      return JSON.stringify(options.body);
    } else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
      return options.body as any;
    } else {
@@ -217,7 +230,10 @@ export const sendRequest = async (
  return await fetch(url, request);
 };

-export const getResponseHeader = (response: Response, responseHeader?: string): string | undefined => {
+export const getResponseHeader = (
+  response: Response,
+  responseHeader?: string
+): string | undefined => {
  if (responseHeader) {
    const content = response.headers.get(responseHeader);
    if (isString(content)) {
@@ -230,10 +246,10 @@ export const getResponseHeader = (response: Response, responseHeader?: string):
 export const getResponseBody = async (response: Response): Promise<any> => {
  if (response.status !== 204) {
    try {
-            const contentType = response.headers.get('Content-Type');
+      const contentType = response.headers.get("Content-Type");
      if (contentType) {
-                const jsonTypes = ['application/json', 'application/problem+json']
-                const isJSON = jsonTypes.some(type => contentType.toLowerCase().startsWith(type));
+        const jsonTypes = ["application/json", "application/problem+json"];
+        const isJSON = jsonTypes.some((type) => contentType.toLowerCase().startsWith(type));
        if (isJSON) {
          return await response.json();
        } else {
@@ -249,15 +265,15 @@ export const getResponseBody = async (response: Response): Promise<any> => {

 export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void => {
  const errors: Record<number, string> = {
-        400: 'Bad Request',
-        401: 'Unauthorized',
-        403: 'Forbidden',
-        404: 'Not Found',
-        500: 'Internal Server Error',
-        502: 'Bad Gateway',
-        503: 'Service Unavailable',
+    400: "Bad Request",
+    401: "Unauthorized",
+    403: "Forbidden",
+    404: "Not Found",
+    500: "Internal Server Error",
+    502: "Bad Gateway",
+    503: "Service Unavailable",
    ...options.errors,
-    }
+  };

  const error = errors[result.status];
  if (error) {
@@ -265,8 +281,8 @@ export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult):
  }

  if (!result.ok) {
-        const errorStatus = result.status ?? 'unknown';
-        const errorStatusText = result.statusText ?? 'unknown';
+    const errorStatus = result.status ?? "unknown";
+    const errorStatusText = result.statusText ?? "unknown";
    const errorBody = (() => {
      try {
        return JSON.stringify(result.body, null, 2);
@@ -275,7 +291,9 @@ export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult):
      }
    })();

-        throw new ApiError(options, result,
+    throw new ApiError(
+      options,
+      result,
      `Generic Error: status: ${errorStatus}; status text: ${errorStatusText}; body: ${errorBody}`
    );
  }
@@ -288,7 +306,10 @@ export const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult):
 * @returns CancelablePromise<T>
 * @throws ApiError
 */
-export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): CancelablePromise<T> => {
+export const request = <T>(
+  config: OpenAPIConfig,
+  options: ApiRequestOptions
+): CancelablePromise<T> => {
  return new CancelablePromise(async (resolve, reject, onCancel) => {
    try {
      const url = getUrl(config, options);
--- a/client-libs/typescript/src/codegen/services/DefaultService.ts
+++ b/client-libs/typescript/src/codegen/services/DefaultService.ts
@@ -82,7 +82,7 @@ export class DefaultService {
            tags?: Record<string, string>;
        },
    ): CancelablePromise<{
-        status: ('ok' | 'error');
+        status: 'ok';
    }> {
        return this.httpRequest.request({
            method: 'POST',
--- a/client-libs/typescript/src/openai/index.test.ts
+++ b/client-libs/typescript/src/openai/index.test.ts
@@ -2,13 +2,10 @@ import dotenv from "dotenv";
 import { expect, test } from "vitest";
 import OpenAI from ".";
 import {
-  ChatCompletion,
  CompletionCreateParams,
  CreateChatCompletionRequestMessage,
 } from "openai-beta/resources/chat/completions";
 import { OPClient } from "../codegen";
-import mergeChunks from "./mergeChunks";
-import assert from "assert";

 dotenv.config({ path: "../.env" });

@@ -34,7 +31,9 @@ test("basic call", async () => {
  };
  const completion = await oaiClient.chat.completions.create({
    ...payload,
-    openpipe: { tags: { promptId: "test" } },
+    openpipe: {
+      tags: { promptId: "test" },
+    },
  });
  await completion.openpipe.reportingFinished;
  const lastLogged = await lastLoggedCall();
@@ -47,32 +46,29 @@ const randomString = (length: number) => {
  const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
  return Array.from(
    { length },
-    () => characters[Math.floor(Math.random() * characters.length)],
+    () => characters[Math.floor(Math.random() * characters.length)]
  ).join("");
 };

-test("streaming", async () => {
+test.skip("streaming", async () => {
  const completion = await oaiClient.chat.completions.create({
    model: "gpt-3.5-turbo",
-    messages: [{ role: "system", content: "count to 3" }],
+    messages: [{ role: "system", content: "count to 4" }],
    stream: true,
  });

-  let merged: ChatCompletion | null = null;
+  let merged = null;
  for await (const chunk of completion) {
-    merged = mergeChunks(merged, chunk);
+    merged = merge_openai_chunks(merged, chunk);
  }

  const lastLogged = await lastLoggedCall();
-  await completion.openpipe.reportingFinished;
-
-  expect(merged).toMatchObject(lastLogged?.modelResponse?.respPayload);
-  expect(lastLogged?.modelResponse?.reqPayload.messages).toMatchObject([
-    { role: "system", content: "count to 3" },
-  ]);
+  expect(lastLogged?.modelResponse?.respPayload.choices[0].message.content).toBe(
+    merged.choices[0].message.content
+  );
 });

-test("bad call streaming", async () => {
+test.skip("bad call streaming", async () => {
  try {
    await oaiClient.chat.completions.create({
      model: "gpt-3.5-turbo-blaster",
@@ -80,29 +76,26 @@ test("bad call streaming", async () => {
      stream: true,
    });
  } catch (e) {
-    await e.openpipe.reportingFinished;
    const lastLogged = await lastLoggedCall();
-    expect(lastLogged?.modelResponse?.errorMessage).toEqual(
-      "The model `gpt-3.5-turbo-blaster` does not exist",
+    expect(lastLogged?.modelResponse?.errorMessage).toBe(
+      "The model `gpt-3.5-turbo-blaster` does not exist"
    );
-    expect(lastLogged?.modelResponse?.statusCode).toEqual(404);
+    expect(lastLogged?.modelResponse?.statusCode).toBe(404);
  }
 });

 test("bad call", async () => {
  try {
    await oaiClient.chat.completions.create({
-      model: "gpt-3.5-turbo-buster",
+      model: "gpt-3.5-turbo-booster",
      messages: [{ role: "system", content: "count to 10" }],
    });
  } catch (e) {
-    assert("openpipe" in e);
-    await e.openpipe.reportingFinished;
    const lastLogged = await lastLoggedCall();
-    expect(lastLogged?.modelResponse?.errorMessage).toEqual(
-      "The model `gpt-3.5-turbo-buster` does not exist",
+    expect(lastLogged?.modelResponse?.errorMessage).toBe(
+      "The model `gpt-3.5-turbo-booster` does not exist"
    );
-    expect(lastLogged?.modelResponse?.statusCode).toEqual(404);
+    expect(lastLogged?.modelResponse?.statusCode).toBe(404);
  }
 });

@@ -116,12 +109,12 @@ test("caching", async () => {
    messages: [message],
    openpipe: { cache: true },
  });
-  expect(completion.openpipe.cacheStatus).toEqual("MISS");
+  expect(completion.openpipe.cacheStatus).toBe("MISS");

  await completion.openpipe.reportingFinished;
  const firstLogged = await lastLoggedCall();
-  expect(completion.choices[0].message.content).toEqual(
-    firstLogged?.modelResponse?.respPayload.choices[0].message.content,
+  expect(completion.choices[0].message.content).toBe(
+    firstLogged?.modelResponse?.respPayload.choices[0].message.content
  );

  const completion2 = await oaiClient.chat.completions.create({
@@ -129,5 +122,5 @@ test("caching", async () => {
    messages: [message],
    openpipe: { cache: true },
  });
-  expect(completion2.openpipe.cacheStatus).toEqual("HIT");
+  expect(completion2.openpipe.cacheStatus).toBe("HIT");
 });
--- a/client-libs/typescript/src/openai/index.ts
+++ b/client-libs/typescript/src/openai/index.ts
@@ -5,9 +5,9 @@ import {
  ChatCompletion,
  ChatCompletionChunk,
  CompletionCreateParams,
+  Completions,
 } from "openai-beta/resources/chat/completions";

-import { WrappedStream } from "./streaming";
 import { DefaultService, OPClient } from "../codegen";
 import { Stream } from "openai-beta/streaming";
 import { OpenPipeArgs, OpenPipeMeta, type OpenPipeConfig, getTags } from "../shared";
@@ -27,11 +27,11 @@ export default class OpenAI extends openai.OpenAI {
          BASE:
            openpipe?.baseUrl ?? readEnv("OPENPIPE_BASE_URL") ?? "https://app.openpipe.ai/api/v1",
          TOKEN: openPipeApiKey,
-        }),
+        })
      );
    } else {
      console.warn(
-        "You're using the OpenPipe client without an API key. No completion requests will be logged.",
+        "You're using the OpenPipe client without an API key. No completion requests will be logged."
      );
    }
  }
@@ -43,10 +43,10 @@ class WrappedChat extends openai.OpenAI.Chat {
    this.completions.opClient = client;
  }

-  completions: WrappedCompletions = new WrappedCompletions(this.client);
+  completions: InstrumentedCompletions = new InstrumentedCompletions(this.client);
 }

-class WrappedCompletions extends openai.OpenAI.Chat.Completions {
+class InstrumentedCompletions extends openai.OpenAI.Chat.Completions {
  opClient?: OPClient;

  constructor(client: openai.OpenAI, opClient?: OPClient) {
@@ -54,35 +54,32 @@ class WrappedCompletions extends openai.OpenAI.Chat.Completions {
    this.opClient = opClient;
  }

-  async _report(args: Parameters<DefaultService["report"]>[0]) {
+  _report(args: Parameters<DefaultService["report"]>[0]) {
    try {
-      this.opClient ? await this.opClient.default.report(args) : Promise.resolve();
+      return this.opClient ? this.opClient.default.report(args) : Promise.resolve();
    } catch (e) {
      console.error(e);
+      return Promise.resolve();
    }
  }

  create(
    body: CompletionCreateParams.CreateChatCompletionRequestNonStreaming & OpenPipeArgs,
-    options?: Core.RequestOptions,
+    options?: Core.RequestOptions
  ): Promise<Core.APIResponse<ChatCompletion & { openpipe: OpenPipeMeta }>>;
  create(
    body: CompletionCreateParams.CreateChatCompletionRequestStreaming & OpenPipeArgs,
-    options?: Core.RequestOptions,
-  ): Promise<Core.APIResponse<WrappedStream>>;
+    options?: Core.RequestOptions
+  ): Promise<Core.APIResponse<Stream<ChatCompletionChunk>>>;
  async create(
    { openpipe, ...body }: CompletionCreateParams & OpenPipeArgs,
-    options?: Core.RequestOptions,
-  ): Promise<Core.APIResponse<(ChatCompletion & { openpipe: OpenPipeMeta }) | WrappedStream>> {
+    options?: Core.RequestOptions
+  ): Promise<
+    Core.APIResponse<(ChatCompletion & { openpipe: OpenPipeMeta }) | Stream<ChatCompletionChunk>>
+  > {
+    console.log("LALALA REPORT", this.opClient);
    const requestedAt = Date.now();
-    let reportingFinished: OpenPipeMeta["reportingFinished"] = Promise.resolve();
-    let cacheRequested = openpipe?.cache ?? false;
-    if (cacheRequested && body.stream) {
-      console.warn(
-        `Caching is not yet supported for streaming requests. Ignoring cache flag. Vote for this feature at https://github.com/OpenPipe/OpenPipe/issues/159`,
-      );
-      cacheRequested = false;
-    }
+    const cacheRequested = openpipe?.cache ?? false;

    if (cacheRequested) {
      try {
@@ -95,13 +92,12 @@ class WrappedCompletions extends openai.OpenAI.Chat.Completions {
          .then((res) => res.respPayload);

        if (cached) {
-          const meta = {
-            cacheStatus: "HIT",
-            reportingFinished,
-          };
          return {
            ...cached,
-            openpipe: meta,
+            openpipe: {
+              cacheStatus: "HIT",
+              reportingFinished: Promise.resolve(),
+            },
          };
        }
      } catch (e) {
@@ -109,23 +105,15 @@ class WrappedCompletions extends openai.OpenAI.Chat.Completions {
      }
    }

+    let reportingFinished: OpenPipeMeta["reportingFinished"] = Promise.resolve();
+
    try {
      if (body.stream) {
        const stream = await super.create(body, options);
-        const wrappedStream = new WrappedStream(stream, (response) =>
-          this._report({
-            requestedAt,
-            receivedAt: Date.now(),
-            reqPayload: body,
-            respPayload: response,
-            statusCode: 200,
-            tags: getTags(openpipe),
-          }),
-        );

        // Do some logging of each chunk here

-        return wrappedStream;
+        return stream;
      } else {
        const response = await super.create(body, options);

@@ -159,16 +147,6 @@ class WrappedCompletions extends openai.OpenAI.Chat.Completions {
          tags: getTags(openpipe),
        });
      }
-      // make sure error is an object we can add properties to
-      if (typeof error === "object" && error !== null) {
-        error = {
-          ...error,
-          openpipe: {
-            cacheStatus: cacheRequested ? "MISS" : "SKIP",
-            reportingFinished,
-          },
-        };
-      }

      throw error;
    }
--- a/client-libs/typescript/src/openai/streaming.ts
+++ b/client-libs/typescript/src/openai/streaming.ts
@@ -1,43 +0,0 @@
-import { ChatCompletion, ChatCompletionChunk } from "openai-beta/resources/chat";
-import { Stream } from "openai-beta/streaming";
-import { OpenPipeMeta } from "../shared";
-import mergeChunks from "./mergeChunks";
-
-export class WrappedStream extends Stream<ChatCompletionChunk> {
-  openpipe: OpenPipeMeta;
-
-  private resolveReportingFinished: () => void = () => {};
-  private report: (response: unknown) => Promise<void>;
-
-  constructor(stream: Stream<ChatCompletionChunk>, report: (response: unknown) => Promise<void>) {
-    super(stream.response, stream.controller);
-    this.report = report;
-
-    const reportingFinished = new Promise<void>((resolve) => {
-      this.resolveReportingFinished = resolve;
-    });
-
-    this.openpipe = {
-      cacheStatus: "MISS",
-      reportingFinished,
-    };
-  }
-
-  async *[Symbol.asyncIterator](): AsyncIterator<ChatCompletionChunk, any, undefined> {
-    const iterator = super[Symbol.asyncIterator]();
-
-    let combinedResponse: ChatCompletion | null = null;
-    while (true) {
-      const result = await iterator.next();
-      if (result.done) break;
-      combinedResponse = mergeChunks(combinedResponse, result.value);
-
-      yield result.value;
-    }
-
-    await this.report(combinedResponse);
-
-    // Resolve the promise here
-    this.resolveReportingFinished();
-  }
-}
--- a/client-libs/typescript/src/shared.ts
+++ b/client-libs/typescript/src/shared.ts
@@ -1,5 +1,4 @@
 import pkg from "../package.json";
-import { DefaultService } from "./codegen";

 export type OpenPipeConfig = {
  apiKey?: string;
@@ -16,11 +15,9 @@ export type OpenPipeMeta = {
  // We report your call to OpenPipe asynchronously in the background. If you
  // need to wait until the report is sent to take further action, you can await
  // this promise.
-  reportingFinished: Promise<void>;
+  reportingFinished: Promise<void | { status: "ok" }>;
 };

-export type ReportFn = (...args: Parameters<DefaultService["report"]>) => Promise<void>;
-
 export const getTags = (args: OpenPipeArgs["openpipe"]): Record<string, string> => ({
  ...args?.tags,
  ...(args?.cache ? { $cache: args.cache?.toString() } : {}),
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -116,9 +116,6 @@ importers:
      graphile-worker:
        specifier: ^0.13.0
        version: 0.13.0
-      human-id:
-        specifier: ^4.0.0
-        version: 4.0.0
      immer:
        specifier: ^10.0.2
        version: 10.0.2
@@ -169,7 +166,7 @@ importers:
        version: 6.9.4
      openai:
        specifier: 4.0.0-beta.7
-        version: 4.0.0-beta.7(encoding@0.1.13)
+        version: 4.0.0-beta.7
      openpipe:
        specifier: workspace:*
        version: link:../client-libs/typescript
@@ -360,9 +357,6 @@ importers:

  client-libs/typescript:
    dependencies:
-      encoding:
-        specifier: ^0.1.13
-        version: 0.1.13
      form-data:
        specifier: ^4.0.0
        version: 4.0.0
@@ -370,11 +364,11 @@ importers:
        specifier: ^4.17.21
        version: 4.17.21
      node-fetch:
-        specifier: ^2.6.12
-        version: 2.6.12(encoding@0.1.13)
+        specifier: ^3.3.2
+        version: 3.3.2
      openai-beta:
        specifier: npm:openai@4.0.0-beta.7
-        version: /openai@4.0.0-beta.7(encoding@0.1.13)
+        version: /openai@4.0.0-beta.7
      openai-legacy:
        specifier: npm:openai@3.3.0
        version: /openai@3.3.0
@@ -385,9 +379,6 @@ importers:
      '@types/node':
        specifier: ^20.4.8
        version: 20.4.8
-      '@types/node-fetch':
-        specifier: ^2.6.4
-        version: 2.6.4
      dotenv:
        specifier: ^16.3.1
        version: 16.3.1
@@ -425,7 +416,7 @@ packages:
      digest-fetch: 1.3.0
      form-data-encoder: 1.7.2
      formdata-node: 4.4.1
-      node-fetch: 2.6.12(encoding@0.1.13)
+      node-fetch: 2.6.12
    transitivePeerDependencies:
      - encoding
    dev: false
@@ -2699,7 +2690,7 @@ packages:
    dependencies:
      https-proxy-agent: 5.0.1
      mkdirp: 0.5.6
-      node-fetch: 2.6.12(encoding@0.1.13)
+      node-fetch: 2.6.12
      progress: 2.0.3
      proxy-from-env: 1.1.0
      which: 2.0.2
@@ -3189,6 +3180,7 @@ packages:
    dependencies:
      '@types/node': 20.4.10
      form-data: 3.0.1
+    dev: false

  /@types/node@18.16.0:
    resolution: {integrity: sha512-BsAaKhB+7X+H4GnSjGhJG9Qi8Tw+inU9nJDwmD5CgOmBLEI6ArdhikpLX7DjbjDRDTbqZzU2LSQNZg8WGPiSZQ==}
@@ -3839,6 +3831,7 @@ packages:

  /asynckit@0.4.0:
    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+    dev: false

  /available-typed-arrays@1.0.5:
    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
@@ -4229,6 +4222,7 @@ packages:
    engines: {node: '>= 0.8'}
    dependencies:
      delayed-stream: 1.0.0
+    dev: false

  /comma-separated-tokens@1.0.8:
    resolution: {integrity: sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==}
@@ -4513,6 +4507,11 @@ packages:
      assert-plus: 1.0.0
    dev: false

+  /data-uri-to-buffer@4.0.1:
+    resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
+    engines: {node: '>= 12'}
+    dev: false
+
  /date-fns@2.30.0:
    resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
    engines: {node: '>=0.11'}
@@ -4596,6 +4595,7 @@ packages:
  /delayed-stream@1.0.0:
    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
    engines: {node: '>=0.4.0'}
+    dev: false

  /depd@1.1.2:
    resolution: {integrity: sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==}
@@ -4729,12 +4729,6 @@ packages:
    engines: {node: '>= 0.8'}
    dev: false

-  /encoding@0.1.13:
-    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
-    dependencies:
-      iconv-lite: 0.6.3
-    dev: false
-
  /engine.io-client@6.5.2:
    resolution: {integrity: sha512-CQZqbrpEYnrpGqC07a9dJDz4gePZUgTPMU3NKJPSeQOyw27Tst4Pl3FemKoFGAlHzgZmKjoRmiJvbWfhCXUlIg==}
    dependencies:
@@ -5405,6 +5399,14 @@ packages:
      format: 0.2.2
    dev: false

+  /fetch-blob@3.2.0:
+    resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
+    engines: {node: ^12.20 || >= 14.13}
+    dependencies:
+      node-domexception: 1.0.0
+      web-streams-polyfill: 3.2.1
+    dev: false
+
  /fflate@0.4.8:
    resolution: {integrity: sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==}
    dev: false
@@ -5520,6 +5522,7 @@ packages:
      asynckit: 0.4.0
      combined-stream: 1.0.8
      mime-types: 2.1.35
+    dev: false

  /form-data@4.0.0:
    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
@@ -5543,6 +5546,13 @@ packages:
      web-streams-polyfill: 4.0.0-beta.3
    dev: false

+  /formdata-polyfill@4.0.10:
+    resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
+    engines: {node: '>=12.20.0'}
+    dependencies:
+      fetch-blob: 3.2.0
+    dev: false
+
  /forwarded@0.2.0:
    resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
    engines: {node: '>= 0.6'}
@@ -5945,10 +5955,6 @@ packages:
      - supports-color
    dev: false

-  /human-id@4.0.0:
-    resolution: {integrity: sha512-pui0xZRgeAlaRt0I9r8N2pNlbNmluvn71EfjKRpM7jOpZbuHe5mm76r67gcprjw/Nd+GpvB9C3OlTbh7ZKLg7A==}
-    dev: false
-
  /humanize-ms@1.2.1:
    resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
    dependencies:
@@ -5962,13 +5968,6 @@ packages:
      safer-buffer: 2.1.2
    dev: false

-  /iconv-lite@0.6.3:
-    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      safer-buffer: 2.1.2
-    dev: false
-
  /ignore@5.2.4:
    resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
    engines: {node: '>= 4'}
@@ -6260,7 +6259,7 @@ packages:
    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
    engines: {node: '>= 10.13.0'}
    dependencies:
-      '@types/node': 20.4.10
+      '@types/node': 18.16.0
      merge-stream: 2.0.0
      supports-color: 8.1.1

@@ -6860,7 +6859,7 @@ packages:
    engines: {node: '>=10.5.0'}
    dev: false

-  /node-fetch@2.6.12(encoding@0.1.13):
+  /node-fetch@2.6.12:
    resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==}
    engines: {node: 4.x || >=6.0.0}
    peerDependencies:
@@ -6869,10 +6868,18 @@ packages:
      encoding:
        optional: true
    dependencies:
-      encoding: 0.1.13
      whatwg-url: 5.0.0
    dev: false

+  /node-fetch@3.3.2:
+    resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      data-uri-to-buffer: 4.0.1
+      fetch-blob: 3.2.0
+      formdata-polyfill: 4.0.10
+    dev: false
+
  /node-mocks-http@1.12.2:
    resolution: {integrity: sha512-xhWwC0dh35R9rf0j3bRZXuISXdHxxtMx0ywZQBwjrg3yl7KpRETzogfeCamUIjltpn0Fxvs/ZhGJul1vPLrdJQ==}
    engines: {node: '>=0.6'}
@@ -7020,7 +7027,7 @@ packages:
      - debug
    dev: false

-  /openai@4.0.0-beta.7(encoding@0.1.13):
+  /openai@4.0.0-beta.7:
    resolution: {integrity: sha512-jHjwvpMuGkNxiQ3erwLZsOvPEhcVrMtwtfNeYmGCjhbdB+oStVw/7pIhIPkualu8rlhLwgMR7awknIaN3IQcOA==}
    dependencies:
      '@types/node': 18.16.0
@@ -7030,7 +7037,7 @@ packages:
      digest-fetch: 1.3.0
      form-data-encoder: 1.7.2
      formdata-node: 4.4.1
-      node-fetch: 2.6.12(encoding@0.1.13)
+      node-fetch: 2.6.12
    transitivePeerDependencies:
      - encoding
    dev: false
@@ -9130,6 +9137,11 @@ packages:
      glob-to-regexp: 0.4.1
      graceful-fs: 4.2.11

+  /web-streams-polyfill@3.2.1:
+    resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
+    engines: {node: '>= 8'}
+    dev: false
+
  /web-streams-polyfill@4.0.0-beta.3:
    resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==}
    engines: {node: '>= 14'}
--- a/render.yaml
+++ b/render.yaml
@@ -2,23 +2,27 @@ databases:
  - name: querykey-prod
    databaseName: querykey_prod
    user: querykey
-    plan: standard
+    plan: starter

 services:
  - type: web
    name: querykey-prod-web
-    runtime: docker
+    env: docker
    dockerfilePath: ./app/Dockerfile
    dockerContext: .
-    plan: pro
+    plan: standard
    domains:
      - app.openpipe.ai
    envVars:
+      - key: NODE_ENV
+        value: production
      - key: DATABASE_URL
        fromDatabase:
          name: querykey-prod
          property: connectionString
      - fromGroup: querykey-prod
+      - key: NEXT_PUBLIC_SOCKET_URL
+        value: https://querykey-prod-wss.onrender.com
      # Render support says we need to manually set this because otherwise
      # sometimes it checks a different random port that NextJS opens for
      # liveness and the liveness check fails.
@@ -27,22 +31,8 @@ services:

  - type: web
    name: querykey-prod-wss
-    runtime: docker
+    env: docker
    dockerfilePath: ./app/Dockerfile
    dockerContext: .
    plan: free
    dockerCommand: pnpm tsx src/wss-server.ts
-
-  - type: worker
-    name: querykey-prod-worker
-    runtime: docker
-    dockerfilePath: ./app/Dockerfile
-    dockerContext: .
-    plan: pro
-    dockerCommand: /code/app/scripts/run-workers-prod.sh
-    envVars:
-      - key: DATABASE_URL
-        fromDatabase:
-          name: querykey-prod
-          property: connectionString
-      - fromGroup: querykey-prod
Author	SHA1	Message	Date
David Corbitt	a1e3036064	Remove unused import	2023-08-18 01:35:01 -07:00
David Corbitt	22a1423690	Square header border when scrolled down	2023-08-18 01:33:13 -07:00