chore: release v2.4.2

---------

Co-authored-by: Marc Klingen <git@marcklingen.com>

.codespellrc

@@ -1,3 +1,4 @@
 [codespell]
 skip = .git,*.pdf,*.svg,package-lock.json,*.prisma
-ignore-words-list = afterall
+ignore-words-list = afterall,vertx
+

.env.dev.example

@@ -16,8 +16,21 @@ NEXTAUTH_SECRET="secret"
 
 # Langfuse experimental features
 LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES="true"
+
+# Salt for API key hashing
 SALT="salt"
 
 # Email
 EMAIL_FROM_ADDRESS=""  # Defines the email address to use as the from address.
 SMTP_CONNECTION_URL=""  # Defines the connection url for smtp server.
+
+# S3 storage
+S3_ENDPOINT=
+S3_ACCESS_KEY_ID=
+S3_SECRET_ACCESS_KEY=
+S3_BUCKET_NAME=
+S3_REGION=
+
+# Set during docker build of application
+# Used to disable environment verification at build time
+# DOCKER_BUILD=1

.env.local.example

@@ -1,21 +1,14 @@
 # When adding additional environment variables, the schema in "/src/env.mjs"
 # should be updated accordingly.
+
 # Prisma
 # https://www.prisma.io/docs/reference/database-reference/connection-urls#env
 DIRECT_URL="postgresql://postgres:postgres@db:5432/postgres"
 DATABASE_URL="postgresql://postgres:postgres@db:5432/postgres"
 # Next Auth
-# You can generate a new secret on the command line with:
-# openssl rand -base64 32
-# https://next-auth.js.org/configuration/options#secret
 NEXTAUTH_SECRET="secret"
 NEXTAUTH_URL="http://localhost:3000"
 
 # feature flag to enable experimental features locally
 LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES="false"
 SALT="salt"
-
-
-# Email
-EMAIL_FROM_ADDRESS=""  # Defines the email address to use as the from address.
-SMTP_CONNECTION_URL=""  # Defines the connection url for smtp server.

.env.prod.example

@@ -1,32 +1,75 @@
-# Assuming deployment on Vercel with Postgres database on Supabase
-NEXT_PUBLIC_LANGFUSE_CLOUD_REGION="US"
-NEXTAUTH_COOKIE_DOMAIN=".langfuse.com"
+# More information: https://langfuse.com/docs/deployment/self-host
+
+# When adding additional environment variables, the schema in "/src/env.mjs"
+# should be updated accordingly.
 
 # Prisma
-
 # https://www.prisma.io/docs/reference/database-reference/connection-urls#env
-DIRECT_URL="postgresql://postgres:[pw]@db.[db_id].supabase.co:5432/postgres"
-DATABASE_URL="postgres://postgres:[pw]@db.[db_id].supabase.co:6543/postgres?pgbouncer=true&connection_limit=1"
+# DATABASE_URL supports pooled connections, but then you need to set DIRECT_URL
+DATABASE_URL="postgresql://postgres:postgres@db:5432/postgres"
+# DIRECT_URL="postgresql://postgres:postgres@db:5432/postgres"
 # SHADOW_DATABASE_URL=
 
 # Next Auth
-
 # NEXTAUTH_URL does not need to be set when deploying on Vercel
-# NEXTAUTH_URL="http://localhost:3000"
-
-# AUTH_REDIRECT_PROXY_URL used to proxy oauth callbacks on e.g. preview deployments. optional.
-# AUTH_REDIRECT_PROXY_URL="https://example.com/api/auth"
+NEXTAUTH_URL="http://localhost:3000"
 
 # You can generate a new secret on the command line with:
 # openssl rand -base64 32
 # https://next-auth.js.org/configuration/options#secret
 NEXTAUTH_SECRET="secret"
 SALT="salt"
-# Sentry; set via Vercel integration
-# NEXT_PUBLIC_SENTRY_DSN=
-# NEXT_SENTRY_ORG=
-# NEXT_SENTRY_PROJECT=
-# SENTRY_AUTH_TOKEN=
+
+# Docker only, optional
+# PORT=3000
+# HOSTNAME=localhost
+
+# Default project, optional
+# LANGFUSE_DEFAULT_PROJECT_ID=
+# LANGFUSE_DEFAULT_PROJECT_ROLE=
+
+# Enable experimental features, optional
+# NEXT_PUBLIC_ENABLE_EXPERIMENTAL_FEATURES
+
+# Auth, optional configuration
+# AUTH_DOMAINS_WITH_SSO_ENFORCEMENT=domain1.com,domain2.com
+# AUTH_DISABLE_USERNAME_PASSWORD=true
+
+# SSO, each group is optional
+# AUTH_GOOGLE_CLIENT_ID=
+# AUTH_GOOGLE_CLIENT_SECRET=
+# AUTH_GITHUB_CLIENT_ID=
+# AUTH_GITHUB_CLIENT_SECRET=
+# AUTH_AZURE_AD_CLIENT_ID=
+# AUTH_AZURE_AD_CLIENT_SECRET=
+# AUTH_AZURE_AD_TENANT_ID=
+
+# Transactional email, optional
+# Defines the email address to use as the from address.
+# EMAIL_FROM_ADDRESS=
+# Defines the connection url for smtp server. 
+# SMTP_CONNECTION_URL=
+
+# S3 storage, optional, used for exports from the UI
+# S3_ENDPOINT=
+# S3_ACCESS_KEY_ID=
+# S3_SECRET_ACCESS_KEY=
+# S3_BUCKET_NAME=
+# S3_REGION=
+
+# Exports are streamed to S3 in pages to avoid memory issues
+# The page size can be adjusted if needed to optimize performance
+# DB_EXPORT_PAGE_SIZE=1000
+
+
+
+
+### START Langfuse Cloud Config
+# Used for Langfuse Cloud deployments
+# Not recommended for self-hosted deployments as these are NOT COVERED BY SEMVER
+
+# NEXT_PUBLIC_LANGFUSE_CLOUD_REGION="US"
+# NEXTAUTH_COOKIE_DOMAIN=".langfuse.com"
 
 # LANGFUSE_TEAM_SLACK_WEBHOOK=
 # LANGFUSE_NEW_USER_SIGNUP_WEBHOOK=
@@ -35,24 +78,19 @@ SALT="salt"
 # NEXT_PUBLIC_POSTHOG_HOST=
 # NEXT_PUBLIC_POSTHOG_KEY=
 
-# Id of demo project to automatically assign new users to
+# Sentry
+# NEXT_PUBLIC_SENTRY_DSN=
+# NEXT_SENTRY_ORG=
+# NEXT_SENTRY_PROJECT=
+# SENTRY_AUTH_TOKEN=
+
+# Betterstack
+# LANGFUSE_TEAM_BETTERSTACK_TOKEN=
+
+# Demo project that users can use to try the platform
 # NEXT_PUBLIC_DEMO_PROJECT_ID=
 
-# Auth, each group is optional
-AUTH_GOOGLE_CLIENT_ID=
-AUTH_GOOGLE_CLIENT_SECRET=
-AUTH_GITHUB_CLIENT_ID=
-AUTH_GITHUB_CLIENT_SECRET=
-# AUTH_DOMAINS_WITH_SSO_ENFORCEMENT=domain1.com,domain2.com
-# AUTH_DISABLE_USERNAME_PASSWORD=true
+# Crisp chat
+# NEXT_PUBLIC_CRISP_WEBSITE_ID=
 
-# Email
-EMAIL_FROM_ADDRESS=""  # Defines the email address to use as the from address.
-SMTP_CONNECTION_URL=""  # Defines the connection url for smtp server.
-
-# S3 storage (eg for exports), necessary for serverless deployments
-S3_ENDPOINT=""
-S3_ACCESS_KEY_ID=""
-S3_SECRET_ACCESS_KEY=""
-S3_BUCKET_NAME=""
-S3_REGION=""
+### END Langfuse Cloud Config

.eslintrc.cjs

@@ -16,7 +16,7 @@ const config = {
       rules: {
         "@typescript-eslint/no-non-null-assertion": "off",
         "@typescript-eslint/no-confusing-void-expression": "off",
-      }
+      },
     },
   ],
   parser: "@typescript-eslint/parser",
@@ -35,6 +35,12 @@ const config = {
       },
     ],
     "@typescript-eslint/no-unused-vars": ["warn", { argsIgnorePattern: "^_" }],
+    "react/jsx-key": [
+      "error",
+      {
+        warnOnDuplicates: true,
+      },
+    ],
   },
 };
 

.github/DISCUSSION_TEMPLATE/ideas.yml

@@ -0,0 +1,11 @@
+body:
+  - type: textarea
+    attributes:
+      label: Describe the feature or potential improvement
+      description: Please describe the change as clear and concise as possible. Remember to add context as to why you believe this is needed.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: Add any other information related to the change here. If your idea is related to any issues or discussions, link them here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,7 @@
+contact_links:
+  - name: 💡 Feature Request
+    url: https://github.com/orgs/langfuse/discussions/new?category=ideas
+    about: Suggest any ideas you have using our discussion forums.
+  - name: 🤗 Get Help
+    url: https://github.com/orgs/langfuse/discussions/new?category=support
+    about: If you can’t get something to work the way you expect, open a question in our discussion forums.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,36 +0,0 @@
-# This template is heavily inspired by the Next.js's template:
-# See here: https://github.com/vercel/next.js/blob/canary/.github/ISSUE_TEMPLATE/3.feature_request.yml
-
-name: 🛠 Feature Request
-description: Create a feature request for the core packages
-title: "feat: "
-labels: ["✨ enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for taking the time to file a feature request. Please fill out this form as completely as possible.
-  - type: textarea
-    attributes:
-      label: Describe the feature you'd like to request
-      description: Please describe the feature as clear and concise as possible. Remember to add context as to why you believe this feature is needed.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the solution you'd like to see
-      description: Please describe the solution you would like to see. Adding example usage is a good way to provide context.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional information
-      description: Add any other information related to the feature here. If your feature request is related to any issues or discussions, link them here.
-  - type: checkboxes
-    id: contribute
-    attributes:
-      label: Contribute
-      description: Are you willing to contribute to the implementation of this feature?
-      options:
-        - label: Yes, I can implement this and raise a PR
-    

.github/workflows/pipeline.yml

@@ -30,12 +30,38 @@ jobs:
       - name: lint
         run: npm run lint
 
+  test-docker-build:
+    runs-on: ubuntu-latest
+    env:
+      REGISTRY: ghcr.io
+      IMAGE_NAME: ${{ github.repository }}
+
+    steps:
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: false
+
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [18, 20]
     steps:
+      - name: Set Swap Space
+        uses: pierotofy/set-swap-space@master
+        with:
+          swap-size-gb: 10
+
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
@@ -101,7 +127,7 @@ jobs:
   all-ci-passed:
     # This allows us to have a branch protection rule for tests and deploys with matrix
     runs-on: ubuntu-latest
-    needs: [lint, tests, e2e-tests]
+    needs: [lint, tests, e2e-tests, test-docker-build]
     if: always()
     steps:
       - name: Successful deploy
@@ -117,10 +143,6 @@ jobs:
     environment: "protected branches"
     runs-on: ubuntu-latest
     env:
-      DATABASE_URL: postgresql://postgres:postgres@localhost:5432/postgres
-      NEXTAUTH_SECRET: "secret"
-      SALT: "salt"
-      NEXTAUTH_URL: "http://localhost:3030"
       REGISTRY: ghcr.io
       IMAGE_NAME: ${{ github.repository }}
     permissions:
@@ -163,8 +185,3 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            DATABASE_URL=${{ env.DATABASE_URL }}
-            NEXTAUTH_SECRET=${{ env.NEXTAUTH_SECRET }}
-            NEXTAUTH_URL=${{ env.NEXTAUTH_URL }}
-            SALT=${{ env.SALT }}

.gitignore

@@ -48,4 +48,8 @@ yarn-error.log*
 /generated/typescript-server
 
 # openapi spec that is copied during build
-/public/openapi*.yml
+/public/openapi*.yml
+
+
+# vscode
+.devcontainer

CONTRIBUTING.md

@@ -2,32 +2,40 @@
 
 First off, thanks for taking the time to contribute! ❤️
 
-Langfuse is an open-source observability and analytics solution for LLM-based applications. We welcome contributions through GitHub pull requests. This document outlines our conventions regarding development workflow, commit message formatting, contact points, and other resources. Our goal is to simplify the process and ensure that your contributions are easily accepted.
+The best ways to contribute to Langfuse:
 
-We gratefully welcome improvements to documentation as well as to code.
+- Submit and vote on [Ideas](https://github.com/orgs/langfuse/discussions/categories/ideas)
+- Create and comment on [Issues](https://github.com/langfuse/langfuse/issues)
+- Open a PR.
+
+We welcome contributions through GitHub pull requests. This document outlines our conventions regarding development workflow, commit message formatting, contact points, and other resources. Our goal is to simplify the process and ensure that your contributions are easily accepted.
+
+We gratefully welcome improvements to documentation ([docs repo](https://github.com/langfuse/langfuse-docs)), the core application (this repo) and the SDKs ([Python](https://github.com/langfuse/langfuse-python), [JS](https://github.com/langfuse/langfuse-js)).
 
 The maintainers are available on [Discord](https://langfuse.com/discord) in case you have any questions.
 
-> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
+> And if you like the project, but just don't have time to contribute code, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
 >
 > - Star the project;
 > - Tweet about it;
 > - Refer to this project in your project's readme;
+> - Submit and vote on [Ideas](https://github.com/orgs/langfuse/discussions/categories/ideas);
+> - Create and comment on [Issues](https://github.com/langfuse/langfuse/issues);
 > - Mention the project at local meetups and tell your friends/colleagues.
 
 ## Making a change
 
-_Before making any significant changes, please [open an issue](https://github.com/langfuse/langfuse/issues)._ Discussing your proposed changes ahead of time will make the contribution process smooth for everyone.
+_Before making any significant changes, please [open an issue](https://github.com/langfuse/langfuse/issues)._ Discussing your proposed changes ahead of time will make the contribution process smooth for everyone. Large changes that were not discussed in an issue may be rejected.
 
 Once we've discussed your changes and you've got your code ready, make sure that tests are passing and open your pull request.
 
-## Getting started
-
 A good first step is to search for open [issues](https://github.com/langfuse/langfuse/issues). Issues are labeled, and some good issues to start with are labeled: [good first issue](https://github.com/langfuse/langfuse/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22).
 
+## Project Overview
+
 ### Technologies we use
 
-- Application (langfuse/langfuse)
+- Application (this repository)
   - NextJS 14, pages router
   - NextAuth.js / Auth.js
   - tRPC: Frontend APIs
@@ -36,9 +44,9 @@ A good first step is to search for open [issues](https://github.com/langfuse/lan
   - Tailwind CSS
   - shadcn/ui tailwind components (using Radix and tanstack)
   - Fern: generate OpenAPI spec and Pydantic models
-- JS SDK
+- JS SDK ([langfuse/langfuse-js](https://github.com/langfuse/langfuse-js))
   - openapi-typescript to generated types based on OpenAPI spec
-- Python SDK
+- Python SDK ([langfuse/langfuse-python](https://github.com/langfuse/langfuse-python))
   - Pydantic for input validation, models generated by fern
 
 ### Architecture Overview
@@ -62,7 +70,7 @@ flowchart TB
 
    DB[Postgres Database]
 	subgraph s1["Application (langfuse/langfuse)"]
-      API[Public API]
+      API[Public HTTP API]
       G[TRPC API]
       I[NextAuth]
       H[React Frontend]
@@ -79,11 +87,27 @@ flowchart TB
    Python --- API
 ```
 
-### Infrastructure
+### Database Overview
+
+The diagram below may not show all relationships if the foreign key is not defined in the database schema. For instance, `trace_id` in the `observation` table is not defined as a foreign key to the `trace` table to allow unordered ingestion of these objects, but it is still a foreign key in the application code.
+
+Full database schema: [prisma/schema.prisma](prisma/schema.prisma)
+
+<img src="./prisma/database.svg">
+
+### Infrastructure & Network Overview
 
 ```mermaid
 flowchart LR
-   App["Langfuse Application Container (Docker)"] --> DB["Postgres Database"]
+   Browser ---|Web UI & TRPC API| App
+   Integrations/SDKs ---|Public HTTP API| App
+   subgraph i1["Application Network"]
+      App["Langfuse Application (Docker or Serverless)"]
+   end
+   subgraph i2["Database Network"]
+      DB["Postgres Database"]
+   end
+   App --- DB
 ```
 
 ## Development Setup
@@ -130,6 +154,9 @@ Requirements
     npm run dev
    ```
 
+> [!NOTE]
+> If you frequently switch branches, use `npm run dx` instead of `npm run dev`. This command will install dependencies, reset the database (wipe and apply all migrations), and run the database seeder with example data before starting the development server.
+
 ## Commit messages
 
 On the main branch, we adhere to the best practices of [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/). All pull requests and branches are squash-merged to maintain a clean and readable history. This approach ensures the addition of a conventional commit message when merging contributions.
@@ -187,3 +214,5 @@ When a new release is tagged on the `main` branch (excluding prereleases), it tr
 ## License
 
 Langfuse is MIT licensed, except for `ee/` folder. See [LICENSE](LICENSE) and [docs](https://langfuse.com/docs/open-source) for more details.
+
+When contributing to the Langfuse codebase, you need to agree to the [Contributor License Agreement](https://cla-assistant.io/langfuse/langfuse). You only need to do this once and the CLA bot will remind you if you haven't signed it yet.

Dockerfile

@@ -1,19 +1,11 @@
 # Base image
 FROM node:20-alpine AS base
-ARG DATABASE_URL
-ARG NEXTAUTH_SECRET
-ARG NEXTAUTH_URL
-ARG SALT
 
 # It's important to update the index before installing packages to ensure you're getting the latest versions.
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk update && apk upgrade --no-cache libcrypto3 libssl3 libc6-compat
 
 FROM base AS deps
-ARG DATABASE_URL
-ARG NEXTAUTH_SECRET
-ARG NEXTAUTH_URL
-ARG SALT
 
 WORKDIR /app
 
@@ -29,10 +21,6 @@ RUN \
 
 # Rebuild the source code only when needed
 FROM base AS builder
-ARG DATABASE_URL
-ARG NEXTAUTH_SECRET
-ARG NEXTAUTH_URL
-ARG SALT
 
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
@@ -46,6 +34,9 @@ RUN rm -f ./src/middleware.ts
 # Uncomment the following line in case you want to disable telemetry during the build.
 ENV NEXT_TELEMETRY_DISABLED 1
 
+# Disable validation of environment variables during build
+ENV DOCKER_BUILD 1
+
 # Generate prisma client
 RUN npx prisma generate
 
@@ -54,10 +45,6 @@ RUN npm run build
 
 # Production image, copy all the files and run next
 FROM base AS runner
-ARG DATABASE_URL
-ARG NEXTAUTH_SECRET
-ARG NEXTAUTH_URL
-ARG SALT
 
 RUN apk add --no-cache dumb-init
 
@@ -66,6 +53,8 @@ WORKDIR /app
 ENV NODE_ENV production
 # Uncomment the following line in case you want to disable telemetry during runtime.
 ENV NEXT_TELEMETRY_DISABLED 1
+# Needed to re-enable validation of environment variables during runtime
+ENV DOCKER_BUILD 0
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs

README.md

@@ -2,42 +2,43 @@
    <a href="https://langfuse.com">
       <h1>🪢 Langfuse</h1>
    </a>
+ <div>
+      <h3> <a href="https://cloud.langfuse.com">
+         <strong>Sign up</strong>
+       </a> · 
+      <a href="https://langfuse.com/docs/deployment/self-host">
+         <strong>Self Host Langfuse</strong>
+      </a> · 
+      <a href="https://langfuse.com/demo">
+         <strong>Demo Project (live data)</strong>
+      </a>
+      </h3>
    <h3>
-      Open source observability & analytics for LLM-based applications
+      Langfuse is the open source LLM engineering platform.   
    </h3>
-   <div>
-      <strong>Observability:</strong> Explore and debug complex logs & traces in a visual UI
-   </div>
-   <div>
-      <strong>Analytics:</strong> Measure & improve costs, latency and response quality
+    <div>
+     Debug, analyze and iterate - together
    </div>
    </br>
    <div>
-      <a href="https://discord.gg/7NXusRtqYU">
-         <strong>Join the Langfuse Discord »</strong>
-      </a>
-      </br>
-      <a href="https://langfuse.com">
-         <strong>langfuse.com</strong>
-      </a> ·
       <a href="https://langfuse.com/docs">
          <strong>Docs</strong>
       </a> ·
-      <a href="https://github.com/langfuse/langfuse/issues/new?labels=%F0%9F%90%9E%E2%9D%94+unconfirmed+bug&projects=&template=bug_report.yml&title=bug%3A+">
+      <a href="https://langfuse.com/issue">
          <strong>Report Bug</strong>
       </a> ·
-      <a href="https://github.com/langfuse/langfuse/issues/new?assignees=&labels=%E2%9C%A8+enhancement&projects=&template=feature_request.yml&title=feat%3A+">
+      <a href="https://langfuse.com/idea">
          <strong>Feature Request</strong>
-      </a>
+      </a> ·
+      <a href="https://langfuse.com/changelog">
+         <strong>Changelog</strong>
+      </a> ·
+      <a href="https://langfuse.com/discord">
+         <strong>Discord</strong>
+      </a> 
    </div>
    </br>
-   <div>
       <img src="https://img.shields.io/badge/License-MIT-red.svg?style=flat-square" alt="MIT License">
-      <a href="https://discord.gg/7NXusRtqYU"><img src="https://img.shields.io/discord/1111061815649124414?style=flat-square&logo=Discord&logoColor=white&label=Discord&color=%23434EE4" alt="Discord"></a>
-      <a href="https://github.com/langfuse/langfuse"><img src="https://img.shields.io/github/stars/langfuse/langfuse?style=flat-square&logo=GitHub&label=langfuse%2Flangfuse" alt="Github Repo Stars"></a>
-      <a href="https://github.com/langfuse/langfuse/releases"><img src="https://img.shields.io/github/v/release/langfuse/langfuse?include_prereleases&style=flat-square" alt="langfuse releases"></a>
-      <a href="https://github.com/langfuse/langfuse/actions/workflows/pipeline.yml?query=branch:main"><img src="https://img.shields.io/github/actions/workflow/status/langfuse/langfuse/pipeline.yml?style=flat-square&label=All%20tests" alt="CI test status"></a>
-      <a href="https://status.langfuse.com"><img src="https://uptime.betterstack.com/status-badges/v1/monitor/udlc.svg" alt="Uptime Status"/></a>
       <a href="https://www.ycombinator.com/companies/langfuse"><img src="https://img.shields.io/badge/Y%20Combinator-W23-orange?style=flat-square" alt="Y Combinator W23"></a>
       <a href="https://github.com/langfuse/langfuse/pkgs/container/langfuse"><img alt="Docker Image" src="https://img.shields.io/badge/docker-langfuse-blue?logo=Docker&logoColor=white&style=flat-square"></a>
       <a href="https://www.npmjs.com/package/langfuse"><img src="https://img.shields.io/npm/v/langfuse?style=flat-square&label=npm+langfuse" alt="langfuse npm package"></a>
@@ -45,61 +46,44 @@
    </div>
 </div>
 </br>
-</div>
-</br>
 
-## What is Langfuse?
+## Overview
 
-Langfuse is an open source observability & analytics solution for LLM-based applications. It is mostly geared towards production usage but some users also use it for local development of their LLM applications.
+### Develop
 
-Langfuse is focused on applications built on top of LLMs. Many new abstractions and common best practices evolved recently, e.g. agents, chained prompts, embedding-based retrieval, LLM access to REPLs & APIs. These make applications more powerful but also unpredictable for developers as they cannot fully anticipate how changes impact the quality, cost and overall latency of their application. Thus Langfuse helps to monitor and debug these applications.
+- **Observability:** Instrument your app and start ingesting traces to Langfuse ([Quickstart](https://langfuse.com/docs/get-started), [Integrations](https://langfuse.com/docs/integrations) [Tracing](https://langfuse.com/docs/tracing))
+- **Langfuse UI:** Inspect and debug complex logs ([Demo](https://langfuse.com/docs/demo), [Tracing](https://langfuse.com/docs/tracing))
+- **Prompts:** Manage, version and deploy prompts from within Langfuse ([Prompt Management](https://langfuse.com/docs/prompts))
 
-**Demo (2 min)**
+### Monitor
+
+- **Analytics:** Track metrics (cost, latency, quality) and gain insights from dashboards & data exports ([Analytics](https://langfuse.com/docs/analytics))
+- **Evals:** Collect and calculate scores for your LLM completions ([Scores & Evaluations](https://langfuse.com/docs/scores))
+  - Run model-based evaluations ([Model-based evaluations](https://langfuse.com/docs/scores/model-based-evals))
+  - Collect user feedback ([User Feedback](https://langfuse.com/docs/scores/user-feedback))
+  - Manually score observations in Langfuse ([Manual Scores](https://langfuse.com/docs/scores/manually))
+
+### Test
+
+- **Experiments:** Track and test app behaviour before deploying a new version
+  - Datasets let you test expected in and output pairs and benchmark performance before deployiong ([Datasets](https://langfuse.com/docs/datasets))
+  - Track versions and releases in your application ([Experimentation](https://langfuse.com/docs/experimentation), [Prompt Management](https://langfuse.com/docs/prompts))
+
+### Video: Langfuse in two minutes
 
 https://github.com/langfuse/langfuse/assets/2834609/6041347a-b517-4a11-8737-93ef8f8af49f
 
 _Muted by default, enable sound for voice-over_
 
-Explore demo project in Langfuse here (free account required): https://langfuse.com/demo
-
-### Observability
-
-Langfuse offers an admin UI to explore the ingested data.
-
-- Nested view of LLM app executions; detailed information along the traces on: latency, cost, scores
-- Segment execution traces by user feedback, to e.g. identify production issues
-
-### Analytics
-
-Reporting on
-
-- Token usage by model
-- Volume of traces
-- Scores/evals
-
-Broken down by
-
-- Users
-- Releases
-- Prompt/chain versions
-- Prompt/chain types
-- Time
-
-→ Expect releases with more ways to analyze the data over the next weeks.
-
 ## Get started
 
-### Step 1: Run Server
+### Langfuse Cloud
 
-#### Langfuse Cloud
+Managed deployment by the Langfuse team, generous free-tier (hobby plan), no credit card required.
 
-Managed deployment by the Langfuse team, generous free-tier (hobby plan) available, no credit card required.
+**[» Langfuse Cloud](https://cloud.langfuse.com)**
 
-Links: [Create account](https://cloud.langfuse.com), [learn more](https://cloud.langfuse.com)
-
-#### Localhost
-
-Requirements: docker, docker compose (e.g. using Docker Desktop)
+### Localhost (docker)
 
 ```bash
 # Clone repository
@@ -110,143 +94,84 @@ cd langfuse
 docker compose up -d
 ```
 
-#### Self-host (Docker)
+[→ Learn more about deploying locally](https://langfuse.com/docs/deployment/local)
 
-[→ Instructions](https://langfuse.com/docs/deployment/self-host)
+### Self-host (docker)
 
-[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/gmbqa_)
+Langfuse is simple to self-host and keep updated. It currently requires only a single docker container.
+[→ Self Hosting Instructions](https://langfuse.com/docs/deployment/self-host)
 
-### Step 2: Data ingestion
+Templated deployments: [Railway, GCP Cloud Run, AWS Fargate, Kubernetes and others](https://langfuse.com/docs/deployment/self-host#platform-specific-information)
 
-#### SDKs to instrument application
+## Get Started
 
-Fully async, typed SDKs to instrument any LLM application. Currently available for Python & JS/TS.
+### API Keys
 
-→ [Guide](https://langfuse.com/docs/guides/sdk-integration) with an example of how the SDK can be used
+You require a Langfuse public and secret key to get started. Sign up [here](https://cloud.langfuse.com) and find them in your project settings.
 
-| Package                                                                                                                                             | Description                      | Links                                                                                                          |
-| --------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------- | -------------------------------------------------------------------------------------------------------------- |
-| [![PyPI Version](https://img.shields.io/pypi/v/langfuse.svg?style=flat-square&label=pypi+langfuse)](https://pypi.python.org/pypi/langfuse)          | Python                           | [docs](https://langfuse.com/docs/integrations/sdk/python), [repo](https://github.com/langfuse/langfuse-python) |
-| [![npm Version](https://img.shields.io/npm/v/langfuse?style=flat-square&label=npm+langfuse)](https://www.npmjs.com/package/langfuse)                | JS/TS: Node >= 18, Edge runtimes | [docs](https://langfuse.com/docs/integrations/sdk/typescript), [repo](https://github.com/langfuse/langfuse-js) |
-| [![npm package](https://img.shields.io/npm/v/langfuse-node?style=flat-square&label=npm+langfuse-node)](https://www.npmjs.com/package/langfuse-node) | JS/TS: Node <18                  | [docs](https://langfuse.com/docs/integrations/sdk/typescript), [repo](https://github.com/langfuse/langfuse-js) |
+### Ingesting Data · Instrumenting Your Application
 
-#### Langchain applications
+Note: We recommend using our fully async, typed [SDKs](https://langfuse.com/docs/sdk) that allow you to instrument any LLM application with any underlying model. They are available in [Python](https://langfuse.com/docs/sdk/python) & [JS/TS](https://langfuse.com/docs/sdk/typescript). The SDKs will always be the most fully featured and stable way to ingest data into Langfuse.
 
-The Langfuse callback handler automatically instruments Langchain applications. Currently available for Python and JS/TS.
+You may want to use another integration to get started quickly or implement a use case that we do not yet support. However, we recommend to migrate to the Langfuse SDKs over time to ensure performance and stability.
 
-**Python**
+See our the [→ Quickstart](https://langfuse.com/docs/get-started) to get started in integrating Langfuse.
 
-```shell
-pip install langfuse
-```
+### Integrations
 
-```python
-# Initialize Langfuse handler
-from langfuse.callback import CallbackHandler
-handler = CallbackHandler(PUBLIC_KEY, SECRET_KEY)
+| Integration                                              | Supports      | Description                                                                     |
+| -------------------------------------------------------- | ------------- | ------------------------------------------------------------------------------- |
+| [**SDK** - _recommended_](https://langfuse.com/docs/sdk) | Python, JS/TS | Manual instrumentation using the SDKs for full flexibility.                     |
+| [OpenAI](https://langfuse.com/docs/openai)               | Python        | Automated instrumentation using drop-in replacement of OpenAI SDK.              |
+| [Langchain](https://langfuse.com/docs/langchain)         | Python, JS/TS | Automated instrumentation by passing callback handler to Langchain application. |
+| [API](https://langfuse.com/docs/api)                     |               | Directly call the public API. OpenAPI spec available.                           |
 
-# Setup Langchain
-from langchain.chains import LLMChain
-...
-chain = LLMChain(llm=llm, prompt=prompt)
+External projects/packages that integrate with Langfuse:
 
-# Add Langfuse handler as callback
-chain.run(input="<user_input", callbacks=[handler])
-```
+| Name                                           | Description                                                                                                                                      |
+| ---------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| [LiteLLM](/https://langfuse.comdocs/litellm)   | Use any LLM as a drop in replacement for GPT. Use Azure, OpenAI, Cohere, Anthropic, Ollama, VLLM, Sagemaker, HuggingFace, Replicate (100+ LLMs). |
+| [Flowise](https://langfuse.com/docs/flowise)   | JS/TS no-code builder for customized LLM flows.                                                                                                  |
+| [Langflow](https://langfuse.com/docs/langflow) | Python-based UI for LangChain, designed with react-flow to provide an effortless way to experiment and prototype flows.                          |
 
-→ [Langchain integration docs for Python](https://langfuse.com/docs/integrations/langchain/python)
+## Questions and feedback
 
-**JS/TS**
+### Ideas and roadmap
 
-→ [Langchain integration docs for JS/TS](https://langfuse.com/docs/integrations/langchain/typescript)
+- [GitHub Discussions](https://github.com/orgs/langfuse/discussions)
+- [Feature Requests](https://langfuse.com/idea)
 
-#### Add scores/evaluations to traces (optional)
+### Support and feedback
 
-Quality/evaluation of traces is tracked via scores ([docs](https://langfuse.com/docs/scores)). Scores are related to traces and optionally to observations. Scores can be added via:
+In order of preference the best way to communicate with us:
 
-- **Backend SDKs** (see docs above): `{trace, event, span, generation}.score()`
-- **API** (see docs below): `POST /api/public/scores`
-- **Client-side using Web SDK**, e.g. to capture user feedback or other user-based quality metrics:
-
-  ```sh
-  npm install langfuse
-  ```
-
-  ```ts
-  // Client-side (browser)
-
-  import { LangfuseWeb } from "langfuse";
-
-  const langfuseWeb = new LangfuseWeb({
-    publicKey: process.env.LANGFUSE_PUBLIC_KEY,
-  });
-
-  // frontend handler (example: React)
-  export function UserFeedbackComponent(props: { traceId: string }) {
-    const handleUserFeedback = async (value: number) => {
-      await langfuseWeb.score({
-        traceId: props.traceId,
-        name: "user_feedback",
-        value,
-      });
-    };
-    return (
-      <div>
-        <button onClick={() => handleUserFeedback(1)}>👍</button>
-        <button onClick={() => handleUserFeedback(-1)}>👎</button>
-      </div>
-    );
-  }
-  ```
-
-#### API
-
-[**Api reference**](https://langfuse.com/docs/integrations/api)
-
-- POST/PATCH routes to ingest data
-- GET routes to use data in downstream applications (e.g. embedded analytics)
-
-## Questions / Feedback
-
-The maintainers are very active in the Langfuse [Discord](https://langfuse.com/discord) and are happy to answer questions or discuss feedback/ideas regarding the future of the project.
+- [GitHub Discussions](https://github.com/orgs/langfuse/discussions): Contribute [ideas](https://langfuse.com/idea) [support requests](https://github.com/orgs/langfuse/discussions/categories/support) and [report bugs](https://github.com/langfuse/langfuse/issues/new?labels=%F0%9F%90%9E%E2%9D%94+unconfirmed+bug&projects=&template=bug_report.yml&title=bug%3A+) (preferred as we create a permanent, indexed artifact for other community members)
+- [Discord](https://langfuse.com/discord): For community support and to chat directly with maintainers
+- Privately: Email contact at langfuse dot com
 
 ## Contributing to Langfuse
 
-Join the community [on Discord](https://discord.gg/7NXusRtqYU).
-
-To contribute, send us a PR, raise a GitHub issue, or email at contributing@langfuse.com
-
-### Development setup
-
-See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to setup a development environment.
+- Vote on [Ideas](https://github.com/orgs/langfuse/discussions/categories/ideas)
+- Raise and comment on [Issues](https://github.com/langfuse/langfuse/issues)
+- Open a PR - see [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to setup a development environment.
 
 ## License
 
-Langfuse is MIT licensed, except for `ee/` folder. See [LICENSE](LICENSE) and [docs](https://langfuse.com/docs/open-source) for more details.
+This repository is MIT licensed, except for the `ee/` folder. See [LICENSE](LICENSE) and [docs](https://langfuse.com/docs/open-source) for more details.
 
 ## Misc
 
-### Upgrade Langfuse (localhost)
+### GET API to export your data
 
-```bash
-# Stop server and db
-docker compose down
+[**GET routes**](https://langfuse.com/docs/integrations/api) to use data in downstream applications (e.g. embedded analytics).
 
-# Pull latest changes
-git pull
-docker-compose pull
+### Security & Privacy
 
-# Run server and db
-docker compose up -d
-```
-
-### Run Langfuse in CI for integration tests
-
-Checkout GitHub Actions workflows of [Python SDK](https://github.com/langfuse/langfuse-python/blob/main/.github/workflows/ci.yml) and [JS/TS SDK](https://github.com/langfuse/langfuse-js/blob/main/.github/workflows/ci.yml).
+We take data security and privacy seriously. Please refer to our [Security and Privacy](https://langfuse.com/security) page for more information.
 
 ### Telemetry
 
-By default, Langfuse automatically reports basic usage statistics to a centralized server (PostHog).
+By default, Langfuse automatically reports basic usage statistics of self-hosted instances to a centralized server (PostHog).
 
 This helps us to:
 

docker-compose.build.yml

@@ -4,17 +4,11 @@ services:
   langfuse-server:
     build:
       dockerfile: Dockerfile
-      args:
-        - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres
-        - NEXTAUTH_SECRET=mysecret
-        - SALT=mysalt
-        - NEXTAUTH_URL=http://localhost:3000
     depends_on:
       - db
     ports:
       - "3000:3000"
     environment:
-      - NODE_ENV=production
       - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres
       - NEXTAUTH_SECRET=mysecret
       - SALT=mysalt

docker-compose.yml

@@ -8,7 +8,6 @@ services:
     ports:
       - "3000:3000"
     environment:
-      - NODE_ENV=production
       - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres
       - NEXTAUTH_SECRET=mysecret
       - SALT=mysalt

fern/apis/server/definition/api.yml

@@ -5,6 +5,7 @@ docs: |
 
   - username: Langfuse Public Key
   - password: Langfuse Secret Key
+
 error-discrimination:
   strategy: status-code
 auth: basic

fern/apis/server/definition/commons.yml

@@ -14,6 +14,7 @@ types:
       version: optional<string>
       userId: optional<string>
       metadata: optional<unknown>
+      tags: optional<list<string>>
       public:
         type: optional<boolean>
         docs: Public traces are accessible via url without login
@@ -29,7 +30,7 @@ types:
   TraceWithFullDetails:
     extends: Trace
     properties:
-      observations: list<Observation>
+      observations: list<ObservationsView>
       scores: list<Score>
   Session:
     properties:
@@ -59,12 +60,28 @@ types:
       level: ObservationLevel
       statusMessage: optional<string>
       parentObservationId: optional<string>
+      promptId: optional<string>
+
+  ObservationsView:
+    extends: Observation
+    properties:
+      modelId: optional<string>
+      inputPrice: optional<double>
+      outputPrice: optional<double>
+      totalPrice: optional<double>
+      calculatedInputCost: optional<double>
+      calculatedOutputCost: optional<double>
+      calculatedTotalCost: optional<double>
+
   Usage:
     properties:
       input: optional<integer>
       output: optional<integer>
       total: optional<integer>
       unit: optional<ModelUsageUnit>
+      inputCost: optional<double>
+      outputCost: optional<double>
+      totalCost: optional<double>
   Score:
     properties:
       id: string
@@ -78,7 +95,6 @@ types:
     properties:
       id: string
       name: string
-      status: DatasetStatus
       projectId: string
       createdAt: datetime
       updatedAt: datetime
@@ -116,6 +132,9 @@ types:
     enum:
       - CHARACTERS
       - TOKENS
+      - MILLISECONDS
+      - SECONDS
+      - IMAGES
   ObservationLevel:
     enum:
       - DEBUG
@@ -128,6 +147,7 @@ types:
       - optional<string>
       - optional<integer>
       - optional<boolean>
+      - optional<list<string>>
   DatasetStatus:
     enum:
       - ACTIVE

fern/apis/server/definition/health.yml

@@ -7,9 +7,22 @@ service:
       docs: Check health of API and database
       method: GET
       path: /health
+      response: HealthResponse
       errors:
         - ServiceUnavailableError
 
+types:
+  HealthResponse:
+    properties:
+      version:
+        type: string
+        docs: Langfuse server version
+      status: string
+    examples:
+      - value:
+          version: 1.25.0
+          status: OK
+
 errors:
   ServiceUnavailableError:
     status-code: 503

fern/apis/server/definition/ingestion.yml

@@ -92,6 +92,8 @@ types:
       model: optional<string>
       modelParameters: optional<map<string, commons.MapValue>>
       usage: optional<IngestionUsage>
+      promptName: optional<string>
+      promptVersion: optional<integer>
 
   UpdateGenerationBody:
     extends: UpdateSpanBody
@@ -100,6 +102,8 @@ types:
       model: optional<string>
       modelParameters: optional<map<string, commons.MapValue>>
       usage: optional<IngestionUsage>
+      promptName: optional<string>
+      promptVersion: optional<integer>
 
   ObservationBody:
     properties:
@@ -132,6 +136,7 @@ types:
       release: optional<string>
       version: optional<string>
       metadata: optional<unknown>
+      tags: optional<list<string>>
       public:
         type: optional<boolean>
         docs: Make trace publicly accessible via url

fern/apis/server/definition/observations.yml

@@ -14,7 +14,7 @@ service:
         observationId:
           type: string
           docs: The unique langfuse identifier of an observation, can be an event, span or generation
-      response: commons.Observation
+      response: commons.ObservationsView
     getMany:
       docs: Get a list of observations
       method: GET
@@ -29,10 +29,15 @@ service:
           type: optional<string>
           traceId: optional<string>
           parentObservationId: optional<string>
-      response: Observations
+      response: ObservationsViews
 
 types:
   Observations:
     properties:
       data: list<commons.Observation>
       meta: pagination.MetaResponse
+
+  ObservationsViews:
+    properties:
+      data: list<commons.ObservationsView>
+      meta: pagination.MetaResponse

fern/apis/server/definition/prompts.yml

@@ -0,0 +1,36 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/fern-api/fern/main/fern.schema.json
+imports:
+  commons: ./commons.yml
+  pagination: ./utils/pagination.yml
+service:
+  auth: true
+  base-path: /api/public
+  endpoints:
+    get:
+      docs: Get a specific prompt
+      method: GET
+      path: /prompts
+      request:
+        name: GetParameterRequest
+        query-parameters:
+          name: string
+          version: optional<integer>
+      response: Prompt
+    create:
+      docs: Create a specific prompt
+      method: POST
+      path: /prompts
+      request: CreatePromptRequest
+      response: Prompt
+
+types:
+  CreatePromptRequest:
+    properties:
+      name: string
+      isActive: boolean
+      prompt: string
+  Prompt:
+    properties:
+      name: string
+      version: integer
+      prompt: string

fern/apis/server/definition/trace.yml

@@ -26,6 +26,13 @@ service:
           limit: optional<integer>
           userId: optional<string>
           name: optional<string>
+          orderBy:
+            type: string
+            docs: Format of the string sort_by=timestamp.asc (id, timestamp, name, userId, release, version, public, bookmarked, sessionId)
+          tags:
+            type: optional<string>
+            allow-multiple: true
+            docs: Only traces that include all of these tags will be returned.
       response: Traces
 
 types:
@@ -33,3 +40,6 @@ types:
     properties:
       data: list<commons.TraceWithDetails>
       meta: pagination.MetaResponse
+  Sort:
+    properties:
+      id: string

fern/fern.config.json

@@ -1,4 +1,4 @@
 {
   "organization": "finto",
-  "version": "0.16.7"
+  "version": "0.16.36"
 }

generated/openapi-server/openapi.yml

@@ -2,9 +2,10 @@ openapi: 3.0.1
 info:
   title: langfuse
   version: ''
-  description: >
+  description: >-
     ## Authentication
 
+
     Authenticate with the API using Basic Auth, get API keys in the project
     settings:
 
@@ -300,8 +301,12 @@ paths:
         - Health
       parameters: []
       responses:
-        '204':
+        '200':
           description: ''
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/HealthResponse'
         '400':
           description: ''
           content:
@@ -403,7 +408,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Observation'
+                $ref: '#/components/schemas/ObservationsView'
         '400':
           description: ''
           content:
@@ -485,7 +490,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Observations'
+                $ref: '#/components/schemas/ObservationsViews'
         '400':
           description: ''
           content:
@@ -551,6 +556,102 @@ paths:
             application/json:
               schema: {}
       security: *ref_0
+  /api/public/prompts:
+    get:
+      description: Get a specific prompt
+      operationId: prompts_get
+      tags:
+        - Prompts
+      parameters:
+        - name: name
+          in: query
+          required: true
+          schema:
+            type: string
+        - name: version
+          in: query
+          required: false
+          schema:
+            type: integer
+            nullable: true
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Prompt'
+        '400':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '401':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '403':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '404':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '405':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+      security: *ref_0
+    post:
+      description: Create a specific prompt
+      operationId: prompts_create
+      tags:
+        - Prompts
+      parameters: []
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Prompt'
+        '400':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '401':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '403':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '404':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '405':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+      security: *ref_0
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CreatePromptRequest'
   /api/public/scores:
     post:
       description: Add a score to the database, upserts on id
@@ -783,6 +884,23 @@ paths:
           schema:
             type: string
             nullable: true
+        - name: orderBy
+          in: query
+          description: >-
+            Format of the string sort_by=timestamp.asc (id, timestamp, name,
+            userId, release, version, public, bookmarked, sessionId)
+          required: true
+          schema:
+            type: string
+        - name: tags
+          in: query
+          description: Only traces that include all of these tags will be returned.
+          required: false
+          schema:
+            type: array
+            items:
+              type: string
+              nullable: true
       responses:
         '200':
           description: ''
@@ -849,6 +967,11 @@ components:
           nullable: true
         metadata:
           nullable: true
+        tags:
+          type: array
+          items:
+            type: string
+          nullable: true
         public:
           type: boolean
           nullable: true
@@ -882,7 +1005,7 @@ components:
         observations:
           type: array
           items:
-            $ref: '#/components/schemas/Observation'
+            $ref: '#/components/schemas/ObservationsView'
         scores:
           type: array
           items:
@@ -972,11 +1095,47 @@ components:
         parentObservationId:
           type: string
           nullable: true
+        promptId:
+          type: string
+          nullable: true
       required:
         - id
         - type
         - startTime
         - level
+    ObservationsView:
+      title: ObservationsView
+      type: object
+      properties:
+        modelId:
+          type: string
+          nullable: true
+        inputPrice:
+          type: number
+          format: double
+          nullable: true
+        outputPrice:
+          type: number
+          format: double
+          nullable: true
+        totalPrice:
+          type: number
+          format: double
+          nullable: true
+        calculatedInputCost:
+          type: number
+          format: double
+          nullable: true
+        calculatedOutputCost:
+          type: number
+          format: double
+          nullable: true
+        calculatedTotalCost:
+          type: number
+          format: double
+          nullable: true
+      allOf:
+        - $ref: '#/components/schemas/Observation'
     Usage:
       title: Usage
       type: object
@@ -993,6 +1152,18 @@ components:
         unit:
           $ref: '#/components/schemas/ModelUsageUnit'
           nullable: true
+        inputCost:
+          type: number
+          format: double
+          nullable: true
+        outputCost:
+          type: number
+          format: double
+          nullable: true
+        totalCost:
+          type: number
+          format: double
+          nullable: true
     Score:
       title: Score
       type: object
@@ -1029,8 +1200,6 @@ components:
           type: string
         name:
           type: string
-        status:
-          $ref: '#/components/schemas/DatasetStatus'
         projectId:
           type: string
         createdAt:
@@ -1050,7 +1219,6 @@ components:
       required:
         - id
         - name
-        - status
         - projectId
         - createdAt
         - updatedAt
@@ -1143,6 +1311,9 @@ components:
       enum:
         - CHARACTERS
         - TOKENS
+        - MILLISECONDS
+        - SECONDS
+        - IMAGES
     ObservationLevel:
       title: ObservationLevel
       type: string
@@ -1160,6 +1331,10 @@ components:
           nullable: true
         - type: boolean
           nullable: true
+        - type: array
+          items:
+            type: string
+          nullable: true
     DatasetStatus:
       title: DatasetStatus
       type: string
@@ -1203,6 +1378,20 @@ components:
           type: string
       required:
         - name
+    HealthResponse:
+      title: HealthResponse
+      type: object
+      properties:
+        version:
+          type: string
+          description: Langfuse server version
+          example: 1.25.0
+        status:
+          type: string
+          example: OK
+      required:
+        - version
+        - status
     IngestionEvent:
       title: IngestionEvent
       oneOf:
@@ -1431,6 +1620,12 @@ components:
         usage:
           $ref: '#/components/schemas/IngestionUsage'
           nullable: true
+        promptName:
+          type: string
+          nullable: true
+        promptVersion:
+          type: integer
+          nullable: true
       allOf:
         - $ref: '#/components/schemas/CreateSpanBody'
     UpdateGenerationBody:
@@ -1452,6 +1647,12 @@ components:
         usage:
           $ref: '#/components/schemas/IngestionUsage'
           nullable: true
+        promptName:
+          type: string
+          nullable: true
+        promptVersion:
+          type: integer
+          nullable: true
       allOf:
         - $ref: '#/components/schemas/UpdateSpanBody'
     ObservationBody:
@@ -1540,6 +1741,11 @@ components:
           nullable: true
         metadata:
           nullable: true
+        tags:
+          type: array
+          items:
+            type: string
+          nullable: true
         public:
           type: boolean
           nullable: true
@@ -1743,6 +1949,19 @@ components:
       required:
         - data
         - meta
+    ObservationsViews:
+      title: ObservationsViews
+      type: object
+      properties:
+        data:
+          type: array
+          items:
+            $ref: '#/components/schemas/ObservationsView'
+        meta:
+          $ref: '#/components/schemas/utilsMetaResponse'
+      required:
+        - data
+        - meta
     Projects:
       title: Projects
       type: object
@@ -1764,6 +1983,34 @@ components:
       required:
         - id
         - name
+    CreatePromptRequest:
+      title: CreatePromptRequest
+      type: object
+      properties:
+        name:
+          type: string
+        isActive:
+          type: boolean
+        prompt:
+          type: string
+      required:
+        - name
+        - isActive
+        - prompt
+    Prompt:
+      title: Prompt
+      type: object
+      properties:
+        name:
+          type: string
+        version:
+          type: integer
+        prompt:
+          type: string
+      required:
+        - name
+        - version
+        - prompt
     CreateScoreRequest:
       title: CreateScoreRequest
       type: object
@@ -1814,6 +2061,14 @@ components:
       required:
         - data
         - meta
+    Sort:
+      title: Sort
+      type: object
+      properties:
+        id:
+          type: string
+      required:
+        - id
     utilsMetaResponse:
       title: utilsMetaResponse
       type: object

generated/postman/collection.json

@@ -2,7 +2,7 @@
   "info": {
     "name": "Langfuse",
     "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
-    "description": "## Authentication\nAuthenticate with the API using Basic Auth, get API keys in the project settings:\n\n- username: Langfuse Public Key\n- password: Langfuse Secret Key\n"
+    "description": "## Authentication\n\nAuthenticate with the API using Basic Auth, get API keys in the project settings:\n\n- username: Langfuse Public Key\n- password: Langfuse Secret Key"
   },
   "variable": [
     {
@@ -320,7 +320,7 @@
             "auth": null,
             "body": {
               "mode": "raw",
-              "raw": "{\n    \"batch\": [\n        {\n            \"type\": \"trace-create\",\n            \"body\": {\n                \"id\": \"example\",\n                \"name\": \"example\",\n                \"userId\": \"example\",\n                \"input\": \"UNKNOWN\",\n                \"output\": \"UNKNOWN\",\n                \"sessionId\": \"example\",\n                \"release\": \"example\",\n                \"version\": \"example\",\n                \"metadata\": \"UNKNOWN\",\n                \"public\": true\n            },\n            \"id\": \"example\",\n            \"timestamp\": \"example\",\n            \"metadata\": \"UNKNOWN\"\n        }\n    ]\n}",
+              "raw": "{\n    \"batch\": [\n        {\n            \"type\": \"trace-create\",\n            \"body\": {\n                \"id\": \"example\",\n                \"name\": \"example\",\n                \"userId\": \"example\",\n                \"input\": \"UNKNOWN\",\n                \"output\": \"UNKNOWN\",\n                \"sessionId\": \"example\",\n                \"release\": \"example\",\n                \"version\": \"example\",\n                \"metadata\": \"UNKNOWN\",\n                \"tags\": [\n                    \"example\"\n                ],\n                \"public\": true\n            },\n            \"id\": \"example\",\n            \"timestamp\": \"example\",\n            \"metadata\": \"UNKNOWN\"\n        }\n    ]\n}",
               "options": {
                 "raw": {
                   "language": "json"
@@ -464,6 +464,82 @@
         }
       ]
     },
+    {
+      "_type": "container",
+      "description": null,
+      "name": "Prompts",
+      "item": [
+        {
+          "_type": "endpoint",
+          "name": "Get",
+          "request": {
+            "description": "Get a specific prompt",
+            "url": {
+              "raw": "{{baseUrl}}/api/public/prompts?name=&version=",
+              "host": [
+                "{{baseUrl}}"
+              ],
+              "path": [
+                "api",
+                "public",
+                "prompts"
+              ],
+              "query": [
+                {
+                  "key": "name",
+                  "value": "",
+                  "description": null
+                },
+                {
+                  "key": "version",
+                  "value": "",
+                  "description": null
+                }
+              ],
+              "variable": []
+            },
+            "header": [],
+            "method": "GET",
+            "auth": null,
+            "body": null
+          },
+          "response": []
+        },
+        {
+          "_type": "endpoint",
+          "name": "Create",
+          "request": {
+            "description": "Create a specific prompt",
+            "url": {
+              "raw": "{{baseUrl}}/api/public/prompts",
+              "host": [
+                "{{baseUrl}}"
+              ],
+              "path": [
+                "api",
+                "public",
+                "prompts"
+              ],
+              "query": [],
+              "variable": []
+            },
+            "header": [],
+            "method": "POST",
+            "auth": null,
+            "body": {
+              "mode": "raw",
+              "raw": "{\n    \"name\": \"example\",\n    \"isActive\": true,\n    \"prompt\": \"example\"\n}",
+              "options": {
+                "raw": {
+                  "language": "json"
+                }
+              }
+            }
+          },
+          "response": []
+        }
+      ]
+    },
     {
       "_type": "container",
       "description": null,
@@ -632,7 +708,7 @@
           "request": {
             "description": "Get list of traces",
             "url": {
-              "raw": "{{baseUrl}}/api/public/traces?page=&limit=&userId=&name=",
+              "raw": "{{baseUrl}}/api/public/traces?page=&limit=&userId=&name=&orderBy=&tags=",
               "host": [
                 "{{baseUrl}}"
               ],
@@ -661,6 +737,16 @@
                   "key": "name",
                   "value": "",
                   "description": null
+                },
+                {
+                  "key": "orderBy",
+                  "value": "",
+                  "description": "Format of the string sort_by=timestamp.asc (id, timestamp, name, userId, release, version, public, bookmarked, sessionId)"
+                },
+                {
+                  "key": "tags",
+                  "value": "",
+                  "description": "Only traces that include all of these tags will be returned."
                 }
               ],
               "variable": []

jest.config.mjs

@@ -18,6 +18,8 @@ const serverTestConfig = {
   testEnvironment: "jest-environment-node",
 };
 
+// To avoid the "Cannot use import statement outside a module" errors while transforming ESM.
+const esModules = ["superjson"];
 // Add any custom config to be passed to Jest
 /** @type {import('jest').Config} */
 const config = {
@@ -26,7 +28,10 @@ const config = {
   verbose: true,
   projects: [
     await createJestConfig(clientTestConfig)(),
-    await createJestConfig(serverTestConfig)(),
+    {
+      ...(await createJestConfig(serverTestConfig)()),
+      transformIgnorePatterns: [`/node_modules/(?!(${esModules.join("|")})/)`],
+    },
   ],
 };
 

package.json

@@ -1,11 +1,12 @@
 {
   "name": "langfuse-core",
-  "version": "1.24.2",
+  "version": "2.4.2",
   "private": true,
   "scripts": {
     "prebuild": "cp generated/openapi-client/openapi.yml public/openapi-client.yml && cp generated/openapi-server/openapi.yml public/openapi-server.yml",
     "build": "next build",
     "dev": "next dev",
+    "dx": "npm i && npm run db:reset && npm run db:seed:examples && npm run dev",
     "postinstall": "prisma generate",
     "lint": "next lint",
     "lint:fix": "next lint --fix",
@@ -15,26 +16,30 @@
     "test": "jest --runInBand",
     "test:watch": "jest --watch --runInBand",
     "test:e2e": "playwright test",
-    "db:migrate": "npx prisma migrate dev",
+    "infra:dev:up": "docker-compose  -f docker-compose.dev.yml up -d",
+    "infra:dev:down": "docker-compose -f docker-compose.dev.yml down",
+    "db:migrate": "DISABLE_ERD=false npx prisma migrate dev",
+    "db:reset": "npx prisma migrate reset",
     "db:seed": "npx prisma db seed",
     "db:seed:examples": "npx prisma db seed -- --environment examples",
-    "release": "release-it"
+    "release": "release-it",
+    "models:migrate": "tsx scripts/model-match.ts"
   },
   "prisma": {
     "seed": "ts-node -r tsconfig-paths/register --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
   },
   "dependencies": {
     "@anthropic-ai/tokenizer": "^0.0.4",
-    "@aws-sdk/client-s3": "^3.478.0",
-    "@aws-sdk/s3-request-presigner": "^3.478.0",
-    "@emotion/react": "^11.11.1",
-    "@emotion/styled": "^11.11.0",
-    "@formkit/auto-animate": "^0.8.1",
-    "@headlessui/react": "^1.7.17",
+    "@aws-sdk/client-s3": "^3.507.0",
+    "@aws-sdk/lib-storage": "^3.511.0",
+    "@aws-sdk/s3-request-presigner": "^3.507.0",
+    "@headlessui/react": "^1.7.18",
     "@heroicons/react": "^2.1.1",
-    "@hookform/resolvers": "^3.3.2",
+    "@hookform/resolvers": "^3.3.4",
     "@next-auth/prisma-adapter": "^1.0.7",
-    "@prisma/client": "^5.7.1",
+    "@prisma/client": "^5.9.1",
+    "@radix-ui/react-accordion": "^1.1.2",
+    "@radix-ui/react-alert-dialog": "^1.0.5",
     "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-collapsible": "^1.0.3",
@@ -44,6 +49,7 @@
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-label": "^2.0.2",
     "@radix-ui/react-popover": "^1.0.7",
+    "@radix-ui/react-scroll-area": "^1.0.5",
     "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/react-separator": "^1.0.3",
     "@radix-ui/react-slider": "^1.1.2",
@@ -52,91 +58,88 @@
     "@radix-ui/react-tabs": "^1.0.4",
     "@radix-ui/react-toggle": "^1.0.3",
     "@radix-ui/react-tooltip": "^1.0.7",
-    "@react-email/components": "^0.0.12",
-    "@react-email/render": "^0.0.10",
-    "@sentry/nextjs": "^7.91.0",
-    "@sentry/profiling-node": "^1.3.2",
+    "@react-email/components": "^0.0.14",
+    "@react-email/render": "^0.0.12",
+    "@sentry/nextjs": "^7.100.1",
+    "@sentry/profiling-node": "^7.100.1",
     "@sentry/types": "^7.88.0",
-    "@t3-oss/env-nextjs": "^0.7.1",
+    "@t3-oss/env-nextjs": "^0.8.0",
     "@tailwindcss/forms": "^0.5.7",
-    "@tailwindcss/line-clamp": "^0.4.4",
     "@tanstack/react-query": "^4.36.1",
-    "@tanstack/react-table": "^8.11.2",
+    "@tanstack/react-table": "^8.11.8",
     "@tremor/react": "^3.11.1",
-    "@trpc/client": "^10.44.1",
-    "@trpc/next": "^10.44.1",
-    "@trpc/react-query": "^10.44.1",
-    "@trpc/server": "^10.44.1",
-    "@vercel/edge-config": "^0.4.1",
-    "axios": "^1.6.2",
+    "@trpc/client": "^10.45.0",
+    "@trpc/next": "^10.45.0",
+    "@trpc/react-query": "^10.45.0",
+    "@trpc/server": "^10.45.0",
     "bcryptjs": "^2.4.3",
     "class-variance-authority": "^0.7.0",
-    "clsx": "^2.0.0",
-    "cmdk": "^0.2.0",
-    "core-js": "^3.34.0",
+    "clsx": "^2.1.0",
+    "cmdk": "^0.2.1",
+    "core-js": "^3.35.1",
     "cors": "^2.8.5",
-    "date-fns": "^2.30.0",
+    "date-fns": "^3.3.1",
     "decimal.js": "^10.4.3",
     "exponential-backoff": "^3.1.1",
-    "js-yaml": "^4.1.0",
+    "js-tiktoken": "^1.0.10",
     "lodash": "^4.17.21",
-    "lucide-react": "^0.302.0",
-    "next": "^14.0.4",
+    "lucide-react": "^0.330.0",
+    "next": "^14.1.0",
     "next-auth": "^4.24.5",
     "next-query-params": "^5.0.0",
-    "nodemailer": "^6.9.7",
-    "posthog-js": "^1.96.1",
-    "posthog-node": "^3.2.1",
+    "nodemailer": "^6.9.9",
+    "posthog-js": "^1.105.7",
+    "posthog-node": "^3.6.2",
     "react": "18.2.0",
     "react-day-picker": "^8.10.0",
     "react-dom": "18.2.0",
-    "react-hook-form": "^7.49.2",
-    "react-icons": "^4.12.0",
+    "react-hook-form": "^7.50.1",
+    "react-icons": "^5.0.1",
     "react-responsive": "^9.0.2",
-    "react18-json-view": "^0.2.7-canary.2",
-    "superagent": "^8.1.2",
+    "react18-json-view": "^0.2.7",
+    "sonner": "^1.4.0",
     "superjson": "2.2.1",
-    "tailwind-merge": "^2.2.0",
+    "tailwind-merge": "^2.2.1",
     "tailwindcss-animate": "^1.0.7",
-    "tiktoken": "^1.0.11",
-    "ts-pattern": "^5.0.6",
     "use-query-params": "^2.2.1",
     "uuid": "^9.0.1",
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@playwright/test": "^1.40.1",
+    "@jedmao/location": "^3.0.0",
+    "@mermaid-js/mermaid-cli": "^10.7.0",
+    "@playwright/test": "^1.41.2",
     "@release-it/bumper": "^6.0.1",
-    "@testing-library/jest-dom": "^6.1.5",
+    "@testing-library/jest-dom": "^6.4.2",
+    "@testing-library/react": "^14.2.1",
     "@types/bcryptjs": "^2.4.6",
     "@types/cors": "^2.8.17",
-    "@types/eslint": "^8.56.0",
-    "@types/jest": "^29.5.11",
-    "@types/js-yaml": "^4.0.9",
+    "@types/eslint": "^8.56.2",
+    "@types/jest": "^29.5.12",
     "@types/lodash": "^4.14.202",
     "@types/node": "20.10.5",
     "@types/nodemailer": "^6.4.14",
-    "@types/react": "^18.2.45",
-    "@types/react-dom": "^18.2.18",
-    "@types/swagger-ui-react": "^4.18.3",
-    "@types/uuid": "^9.0.7",
-    "@typescript-eslint/eslint-plugin": "^6.16.0",
-    "@typescript-eslint/parser": "^6.16.0",
-    "autoprefixer": "^10.4.16",
+    "@types/react": "^18.2.55",
+    "@types/react-dom": "^18.2.19",
+    "@types/uuid": "^9.0.8",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "autoprefixer": "^10.4.17",
     "dotenv-cli": "^7.3.0",
     "eslint": "^8.56.0",
-    "eslint-config-next": "^14.0.4",
+    "eslint-config-next": "^14.1.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "postcss": "^8.4.32",
-    "prettier": "^3.1.1",
-    "prettier-plugin-tailwindcss": "^0.5.9",
-    "prisma": "^5.7.1",
-    "release-it": "^17.0.1",
-    "swagger-jsdoc": "^6.2.8",
-    "tailwindcss": "^3.4.0",
+    "postcss": "^8.4.35",
+    "prettier": "^3.2.5",
+    "prettier-plugin-tailwindcss": "^0.5.11",
+    "prisma": "^5.9.1",
+    "prisma-erd-generator": "^1.11.2",
+    "release-it": "^17.0.3",
+    "tailwindcss": "^3.4.1",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
+    "tsx": "^4.7.1",
     "typescript": "^5.3.3"
   },
   "ct3aMetadata": {

prisma/migrations/20231230151856_add_prompt_table/migration.sql

@@ -0,0 +1,29 @@
+-- AlterTable
+ALTER TABLE "observations" ADD COLUMN     "prompt_id" TEXT;
+
+-- CreateTable
+CREATE TABLE "prompts" (
+    "id" TEXT NOT NULL,
+    "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "project_id" TEXT NOT NULL,
+    "created_by" TEXT NOT NULL,
+    "prompt" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "version" INTEGER NOT NULL,
+    "is_active" BOOLEAN NOT NULL,
+
+    CONSTRAINT "prompts_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "prompts_project_id_name_version_idx" ON "prompts"("project_id", "name", "version");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "prompts_project_id_name_version_key" ON "prompts"("project_id", "name", "version");
+
+-- AddForeignKey
+ALTER TABLE "observations" ADD CONSTRAINT "observations_prompt_id_fkey" FOREIGN KEY ("prompt_id") REFERENCES "prompts"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "prompts" ADD CONSTRAINT "prompts_project_id_fkey" FOREIGN KEY ("project_id") REFERENCES "projects"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/migrations/20240103135918_add_pricings/migration.sql

@@ -0,0 +1,30 @@
+-- Migration to add gpt-3.5-turbo-1106 and gpt-3.5-turbo-instruct models
+
+INSERT INTO pricings (
+  id,
+  model_name, 
+  pricing_unit, 
+  price,
+  currency,
+  token_type
+)
+VALUES
+  ('clqqpc2pr000008l3hvy63gxy','gpt-3.5-turbo-1106', 'PER_1000_TOKENS', 0.001, 'USD', 'PROMPT'),
+  ('clqqpcb6d000208l3atrfbmou','gpt-3.5-turbo-1106', 'PER_1000_TOKENS', 0.002, 'USD', 'COMPLETION'),
+  ('clqqpdh45000008lfgrnx76cv','gpt-3.5-turbo-instruct', 'PER_1000_TOKENS', 0.0015, 'USD', 'PROMPT'),
+  ('clqqpdjya000108lf3s4b4c4m','gpt-3.5-turbo-instruct', 'PER_1000_TOKENS', 0.002, 'USD', 'COMPLETION'),
+  ('clnnuiuq6000008l4dxp43wc6', 'claude-instant-1.2', 'PER_1000_TOKENS', 0.00163, 'USD', 'PROMPT'),
+  ('clnnujlmj000108l48wne4ii9', 'claude-instant-1.2', 'PER_1000_TOKENS', 0.00551, 'USD', 'COMPLETION'),
+  ('clnnukutg000208l49qqt9lyr', 'claude-instant-1.1', 'PER_1000_TOKENS', 0.00163, 'USD', 'PROMPT'),
+  ('clnnun3x3000408l490qz9uv0', 'claude-instant-1.1', 'PER_1000_TOKENS', 0.00551, 'USD', 'COMPLETION'),
+  ('clnnuosvy000508l4gsjy2pp4', 'claude-2.0', 'PER_1000_TOKENS', 0.01102, 'USD', 'PROMPT'),
+  ('clnnuqcns000608l40qaz8trt', 'claude-2.0', 'PER_1000_TOKENS', 0.03268, 'USD', 'COMPLETION'),
+  ('clnnuuif8000808l4gal4fjq4', 'claude-1.0', 'PER_1000_TOKENS', 0.01102, 'USD', 'PROMPT'),
+  ('clnnutptp000708l47r091vvd', 'claude-1.0', 'PER_1000_TOKENS', 0.03268, 'USD', 'COMPLETION'),
+  ('clnon8riv000308mlgfr1agiv', 'text-embedding-ada-002', 'PER_1000_TOKENS', 0.0001, 'USD', 'PROMPT'),
+  ('clnon9kfz000408ml1bg81o6z', 'text-embedding-ada-002', 'PER_1000_TOKENS', 0.0001, 'USD', 'COMPLETION'),
+  ('clqwniv8a000d08l2frjl7mmw', 'codechat-bison-32k', 'PER_1000_CHARS', 0.0005, 'USD', 'PROMPT'),
+  ('clqwnj044000e08l2dfjm5g90', 'chat-bison-32k', 'PER_1000_CHARS', 0.0005, 'USD', 'PROMPT'),
+  ('clqwnj47r000f08l2a16fekls', 'chat-bison-32k', 'PER_1000_CHARS', 0.0005, 'USD', 'COMPLETION'),
+  ('clqwnj863000g08l2bwxgdapm', 'codechat-bison-32k', 'PER_1000_CHARS', 0.0005, 'USD', 'COMPLETION')
+ON CONFLICT (id) DO NOTHING;

prisma/migrations/20240104210051_add_model_indices/migration.sql

@@ -0,0 +1,3 @@
+-- CreateIndex
+CREATE INDEX CONCURRENTLY "observations_model_idx" ON "observations"("model");
+

prisma/migrations/20240104210052_add_model_indices_pricing/migration.sql

@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX CONCURRENTLY "pricings_model_name_idx" ON "pricings"("model_name");

prisma/migrations/20240105010215_add_tags_in_traces/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "traces" ADD COLUMN     "tags" TEXT[] DEFAULT ARRAY[]::TEXT[];

prisma/migrations/20240105170551_index_tags_in_traces/migration.sql

@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX "traces_tags_idx" ON "traces" USING GIN ("tags" array_ops);

prisma/migrations/20240106195340_drop_dataset_status/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `status` on the `datasets` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "datasets" DROP COLUMN "status";

prisma/migrations/20240111152124_add_gpt_35_pricing/migration.sql

@@ -0,0 +1,16 @@
+-- Migration to add gpt-35 spelling
+
+INSERT INTO pricings (
+  id,
+  model_name, 
+  pricing_unit, 
+  price,
+  currency,
+  token_type
+)
+VALUES
+  ('clqqpc2pr000008l3hvy63gxy1','gpt-35-turbo-1106', 'PER_1000_TOKENS', 0.001, 'USD', 'PROMPT'),
+  ('clqqpcb6d000208l3atrfbmou1','gpt-35-turbo-1106', 'PER_1000_TOKENS', 0.002, 'USD', 'COMPLETION'),
+  ('clqqpdh45000008lfgrnx76cv1','gpt-35-turbo-instruct', 'PER_1000_TOKENS', 0.0015, 'USD', 'PROMPT'),
+  ('clqqpdjya000108lf3s4b4c4m1','gpt-35-turbo-instruct', 'PER_1000_TOKENS', 0.002, 'USD', 'COMPLETION')
+ON CONFLICT (id) DO NOTHING;

prisma/migrations/20240117151938_traces_remove_unique_id_external/migration.sql

@@ -0,0 +1,2 @@
+-- DropIndex
+DROP INDEX "traces_project_id_external_id_key";

prisma/migrations/20240117165747_add_cost_to_observations/migration.sql

@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "observations" ADD COLUMN     "input_cost" DECIMAL(65,30),
+ADD COLUMN     "output_cost" DECIMAL(65,30),
+ADD COLUMN     "total_cost" DECIMAL(65,30);

prisma/migrations/20240118204639_add_models_table/migration.sql

@@ -0,0 +1,20 @@
+-- CreateTable
+CREATE TABLE "models" (
+    "id" TEXT NOT NULL,
+    "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "project_id" TEXT,
+    "model_name" TEXT NOT NULL,
+    "match_pattern" TEXT NOT NULL,
+    "start_date" TIMESTAMP(3),
+    "input_price" DECIMAL(65,30),
+    "output_price" DECIMAL(65,30),
+    "total_price" DECIMAL(65,30),
+    "unit" TEXT NOT NULL DEFAULT 'TOKENS',
+    "tokenizer_config" JSONB NOT NULL,
+
+    CONSTRAINT "models_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "models" ADD CONSTRAINT "models_project_id_fkey" FOREIGN KEY ("project_id") REFERENCES "projects"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/migrations/20240118204936_add_internal_model/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "observations" ADD COLUMN     "internal_model" TEXT;

prisma/migrations/20240118204937_add_observations_view/migration.sql

@@ -0,0 +1,49 @@
+CREATE VIEW "observations_view" AS
+SELECT
+    o.*,
+    m.id AS "model_id",
+    m.start_date AS "model_start_date",
+    m.input_price,
+    m.output_price,
+    m.total_price,
+    m.tokenizer_config AS "tokenizer_config",
+    CASE 
+        WHEN o.input_cost IS NULL AND o.output_cost IS NULL AND o.total_cost IS NULL THEN
+            o.prompt_tokens::decimal * m.input_price
+        ELSE
+            o.input_cost
+    END AS "calculated_input_cost",
+    CASE 
+        WHEN o.input_cost IS NULL AND o.output_cost IS NULL AND o.total_cost IS NULL THEN
+            o.completion_tokens::decimal * m.output_price
+        ELSE
+            o.output_cost
+    END AS "calculated_output_cost",
+    CASE 
+        WHEN o.input_cost IS NULL AND o.output_cost IS NULL AND o.total_cost IS NULL THEN
+            CASE 
+                WHEN m.total_price IS NOT NULL AND o.total_tokens IS NOT NULL THEN
+                    m.total_price * o.total_tokens
+                ELSE
+                    o.prompt_tokens::decimal * m.input_price + 
+                    o.completion_tokens::decimal * m.output_price
+            END
+        ELSE
+            o.total_cost
+    END AS "calculated_total_cost"
+FROM
+    observations o
+LEFT JOIN models m ON m.id = (
+    SELECT
+        id
+    FROM
+        models
+    WHERE (project_id = o.project_id OR project_id IS NULL)
+    AND model_name = o.internal_model
+    AND (start_date < o.start_time OR start_date is NULL)
+    AND o.unit::TEXT = unit
+    ORDER BY
+        project_id ASC, -- in postgres, NULLs are sorted first
+        start_date DESC
+    LIMIT 1
+)

prisma/migrations/20240118235424_add_index_to_models/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[project_id,model_name,start_date,unit]` on the table `models` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateIndex
+CREATE INDEX "models_project_id_model_name_idx" ON "models"("project_id", "model_name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "models_project_id_model_name_start_date_unit_key" ON "models"("project_id", "model_name", "start_date", "unit");

prisma/migrations/20240119140941_add_tokenizer_id/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "models" ADD COLUMN     "tokenizer_id" TEXT;

prisma/migrations/20240119164147_make_model_params_nullable/migration.sql

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

prisma/migrations/20240119164148_add_models/migration.sql

@@ -0,0 +1,84 @@
+-- This is an empty migration.
+
+
+INSERT INTO models (
+  id,
+  project_id,
+  model_name,
+  match_pattern,
+  start_date,
+  input_price,
+  output_price,
+  total_price,
+  unit,
+  tokenizer_id,
+  tokenizer_config
+)
+VALUES
+  --project_id, model_name, match_pattern, start_date, input_price, output_price, total_price, unit, tokenizer_id, tokenizer_config
+  --https://openai.com/pricing
+  -- GPT-4 Turbo
+  ('clrkvq6iq000008ju6c16gynt', NULL, 'gpt-4-turbo', '(?i)^(gpt-4-1106-preview)$', NULL, 0.00001, 0.00003, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4-1106-preview" }'),
+  ('clrkvx5gp000108juaogs54ea', NULL, 'gpt-4-turbo-vision', '(?i)^(gpt-4-vision-preview)$', NULL, 0.00001, 0.00003, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4-vision-preview" }'),
+  
+  -- GPT-4
+  ('clrntkjgy000f08jx79v9g1xj', NULL, 'gpt-4', '(?i)^(gpt-4)$', NULL, 0.00003, 0.00006, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4" }'),
+  ('clrkwk4cc000908l537kl0rx3', NULL, 'gpt-4-0613', '(?i)^(gpt-4-0613)$', NULL, 0.00003, 0.00006, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4-0613" }'),
+  ('clrntkjgy000e08jx4x6uawoo', NULL, 'gpt-4-0314', '(?i)^(gpt-4-0314)$', NULL, 0.00003, 0.00006, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4-0314" }'),
+  
+  ('clrkvyzgw000308jue4hse4j9', NULL, 'gpt-4-32k', '(?i)^(gpt-4-32k)$', NULL, 0.00006, 0.00012, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4-32k" }'),
+  ('clrkwk4cb000108l5hwwh3zdi', NULL, 'gpt-4-32k-0613', '(?i)^(gpt-4-32k-0613)$', NULL, 0.00006, 0.00012, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4-32k-0613" }'),
+  ('clrntkjgy000d08jx0p4y9h4l', NULL, 'gpt-4-32k-0314', '(?i)^(gpt-4-32k-0314)$', NULL, 0.00006, 0.00012, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4-32k-0314" }'),
+  
+  -- GPT 3
+  
+  ('clrkwk4cc000a08l562uc3s9g', NULL, 'gpt-3.5-turbo-instruct', '(?i)^(gpt-)(35|3.5)(-turbo-instruct)$', NULL, 0.0000015, 0.000002, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo" }'),
+  ('clrkwk4cb000408l576jl7koo', NULL, 'gpt-3.5-turbo', '(?i)^(gpt-)(35|3.5)(-turbo)$', '2023-11-06', 0.000001, 0.000002, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo" }'),
+  ('clrkwk4cb000208l59yvb9yq8', NULL, 'gpt-3.5-turbo-1106', '(?i)^(gpt-)(35|3.5)(-turbo-1106)$', NULL, 0.000001, 0.000002, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo-1106" }'),
+
+  ('clrntkjgy000c08jxesb30p3f', NULL, 'gpt-3.5-turbo', '(?i)^(gpt-)(35|3.5)(-turbo)$', '2023-06-27', 0.0000015, 0.000002, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo" }'),
+  ('clrkwk4cc000808l51xmk4uic', NULL, 'gpt-3.5-turbo-0613', '(?i)^(gpt-)(35|3.5)(-turbo-0613)$', NULL, 0.0000015, 0.000002, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo-0613" }'),
+
+  ('clrntkjgy000b08jx769q1bah', NULL, 'gpt-3.5-turbo', '(?i)^(gpt-)(35|3.5)(-turbo)$', NULL,  0.000002,  0.000002, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 4, "tokensPerName": -1, "tokenizerModel": "gpt-3.5-turbo" }'),
+  ('clrntkjgy000a08jx4e062mr0', NULL, 'gpt-3.5-turbo-0301', '(?i)^(gpt-)(35|3.5)(-turbo-0301)$', NULL,  0.000002,  0.000002, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 4, "tokensPerName": -1, "tokenizerModel": "gpt-3.5-turbo-0301" }'),
+
+
+  ('clrkwk4cb000308l5go4b6otm', NULL, 'gpt-3.5-turbo-16k', '(?i)^(gpt-)(35|3.5)(-turbo-16k)$', NULL, 0.00003, 0.00004, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo-16k" }'),
+  ('clrntjt89000a08jw0gcdbd5a', NULL, 'gpt-3.5-turbo-16k-0613', '(?i)^(gpt-)(35|3.5)(-turbo-16k-0613)$', NULL, 0.00003, 0.00004, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo-16k-0613" }'),
+
+
+
+
+  -- nothing earlier required for ada
+  ('clrntjt89000908jwhvkz5crm', NULL, 'text-embedding-ada-002', '(?i)^(text-embedding-ada-002)$', '2022-12-06', NULL, NULL, 0.0000001, 'TOKENS', 'openai', NULL),
+  ('clrntjt89000908jwhvkz5crg', NULL, 'text-embedding-ada-002-v2', '(?i)^(text-embedding-ada-002-v2)$', '2022-12-06', NULL, NULL, 0.0000001, 'TOKENS', 'openai', NULL),
+  
+
+  
+  
+  -- legacy price 2023-08-22 https://platform.openai.com/docs/deprecations/2023-07-06-gpt-and-embeddings
+  ('clrntjt89000108jwcou1af71', NULL, 'text-ada-001', '(?i)^(text-ada-001)$', NULL, NULL, NULL, 0.000004, 'TOKENS', 'openai', NULL),
+  ('clrntjt89000208jwawjr894q', NULL, 'text-babbage-001', '(?i)^(text-babbage-001)$', NULL, NULL, NULL, 0.0000005, 'TOKENS', 'openai', NULL),
+  ('clrp1wopz000708l079w02hkc', NULL, 'text-babbage-002', '(?i)^(text-babbage-002)$', NULL, NULL, NULL, 0.0000005, 'TOKENS', 'openai', NULL),
+  ('clrntjt89000308jw0jtfa4rs', NULL, 'text-curie-001', '(?i)^(text-curie-001)$', NULL, NULL, NULL, 0.00002, 'TOKENS', 'openai', NULL),
+  ('clrntjt89000408jwc2c93h6i', NULL, 'text-davinci-001', '(?i)^(text-davinci-001)$', NULL, NULL, NULL, 0.00002, 'TOKENS', 'openai', NULL),
+  ('clrntjt89000508jw192m64qi', NULL, 'text-davinci-002', '(?i)^(text-davinci-002)$', NULL, NULL, NULL, 0.00002, 'TOKENS', 'openai', NULL),
+  ('clrntjt89000608jw4m3x5s55', NULL, 'text-davinci-003', '(?i)^(text-davinci-003)$', NULL, NULL, NULL, 0.00002, 'TOKENS', 'openai', NULL),
+
+
+  -- claude
+  ('clrnwbota000908jsgg9mb1ml', NULL, 'claude-instant-1', '(?i)^(claude-instant-1)$', NULL, 0.00000163, 0.00000551, NULL, 'CHARACTERS', 'claude', NULL),
+  ('clrnwb41q000308jsfrac9uh6', NULL, 'claude-instant-1.2', '(?i)^(claude-instant-1.2)$', NULL, 0.00000163, 0.00000551, NULL, 'CHARACTERS', 'claude', NULL),
+  ('clrnwbd1m000508js4hxu6o7n', NULL, 'claude-2.1', '(?i)^(claude-2.1)$', NULL, 0.000008, 0.000024, NULL, 'CHARACTERS', 'claude', NULL),
+  ('clrnwb836000408jsallr6u11', NULL, 'claude-2.0', '(?i)^(claude-2.0)$', NULL, 0.000008, 0.000024, NULL, 'CHARACTERS', 'claude', NULL),
+  ('clrnwbg2b000608jse2pp4q2d', NULL, 'claude-1.3', '(?i)^(claude-1.3)$', NULL, 0.000008, 0.000024, NULL, 'CHARACTERS', 'claude', NULL),
+  ('clrnwbi9d000708jseiy44k26', NULL, 'claude-1.2', '(?i)^(claude-1.2)$', NULL, 0.000008, 0.000024, NULL, 'CHARACTERS', 'claude', NULL),
+  ('clrnwblo0000808jsc1385hdp', NULL, 'claude-1.1', '(?i)^(claude-1.1)$', NULL, 0.000008, 0.000024, NULL, 'CHARACTERS', 'claude', NULL),
+
+
+  -- vertex
+  ('clrp1wopz000808l09nwy32xh', NULL, 'codechat-bison-32k', '(?i)^(codechat-bison-32k)$', NULL, 0.0000005, 0.0000025, NULL, 'TOKENS', 'vertex', NULL),
+  ('clrp1wopz000408l05xcycki1', NULL, 'chat-bison-32k', '(?i)^(chat-bison-32k)$', NULL, 0.0000005, 0.0000025, NULL, 'TOKENS', 'vertex', NULL)
+
+
+

prisma/migrations/20240124140443_session_composite_key/migration.sql

@@ -0,0 +1,18 @@
+/*
+  Warnings:
+
+  - The primary key for the `trace_sessions` table will be changed. If it partially fails, the table could be left without primary key constraint.
+
+*/
+-- DropForeignKey
+ALTER TABLE "traces" DROP CONSTRAINT "traces_session_id_fkey";
+
+-- DropIndex
+DROP INDEX "trace_sessions_id_project_id_key";
+
+-- AlterTable
+ALTER TABLE "trace_sessions" DROP CONSTRAINT "trace_sessions_pkey",
+ADD CONSTRAINT "trace_sessions_pkey" PRIMARY KEY ("id", "project_id");
+
+-- AddForeignKey
+ALTER TABLE "traces" ADD CONSTRAINT "traces_session_id_project_id_fkey" FOREIGN KEY ("session_id", "project_id") REFERENCES "trace_sessions"("id", "project_id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20240124164148_correct_models/migration.sql

@@ -0,0 +1,42 @@
+-- This is an empty migration.
+
+DELETE FROM models
+WHERE id in ('clrntjt89000908jwhvkz5crm', 'clrntjt89000908jwhvkz5crg', 'clrntjt89000108jwcou1af71', 'clrntjt89000208jwawjr894q', 'clrntjt89000308jw0jtfa4rs', 'clrntjt89000408jwc2c93h6i', 'clrntjt89000508jw192m64qi', 'clrntjt89000608jw4m3x5s55', 'clrp1wopz000708l079w02hkc');
+
+
+
+INSERT INTO models (
+  id,
+  project_id,
+  model_name,
+  match_pattern,
+  start_date,
+  input_price,
+  output_price,
+  total_price,
+  unit,
+  tokenizer_id,
+  tokenizer_config
+)
+VALUES
+  -- nothing earlier required for ada
+  ('clrntjt89000908jwhvkz5crm', NULL, 'text-embedding-ada-002', '(?i)^(text-embedding-ada-002)$', '2022-12-06', NULL, NULL, 0.0000001, 'TOKENS', 'openai', '{"tokenizerModel": "text-embedding-ada-002"}'),
+  ('clrntjt89000908jwhvkz5crg', NULL, 'text-embedding-ada-002-v2', '(?i)^(text-embedding-ada-002-v2)$', '2022-12-06', NULL, NULL, 0.0000001, 'TOKENS', 'openai', '{"tokenizerModel": "text-embedding-ada-002"}'),
+  
+
+  
+  
+  -- -- legacy price 2023-08-22 https://platform.openai.com/docs/deprecations/2023-07-06-gpt-and-embeddings
+  ('clrntjt89000108jwcou1af71', NULL, 'text-ada-001', '(?i)^(text-ada-001)$', NULL, NULL, NULL, 0.000004, 'TOKENS', 'openai', '{"tokenizerModel": "text-ada-001"}'),
+  ('clrntjt89000208jwawjr894q', NULL, 'text-babbage-001', '(?i)^(text-babbage-001)$', NULL, NULL, NULL, 0.0000005, 'TOKENS', 'openai', '{"tokenizerModel": "text-babbage-001"}'),
+  ('clrntjt89000308jw0jtfa4rs', NULL, 'text-curie-001', '(?i)^(text-curie-001)$', NULL, NULL, NULL, 0.00002, 'TOKENS', 'openai', '{"tokenizerModel": "text-curie-001"}'),
+  ('clrntjt89000408jwc2c93h6i', NULL, 'text-davinci-001', '(?i)^(text-davinci-001)$', NULL, NULL, NULL, 0.00002, 'TOKENS', 'openai', '{"tokenizerModel": "text-davinci-001"}'),
+  ('clrntjt89000508jw192m64qi', NULL, 'text-davinci-002', '(?i)^(text-davinci-002)$', NULL, NULL, NULL, 0.00002, 'TOKENS', 'openai', '{"tokenizerModel": "text-davinci-002"}'),
+  ('clrntjt89000608jw4m3x5s55', NULL, 'text-davinci-003', '(?i)^(text-davinci-003)$', NULL, NULL, NULL, 0.00002, 'TOKENS', 'openai', '{"tokenizerModel": "text-davinci-003"}'),
+
+  ('clrs2dnql000108l46vo0gp2t', NULL, 'babbage-002', '(?i)^(babbage-002)$', NULL, 0.0000004, 0.0000016, 0.0000005, 'TOKENS', 'openai', '{"tokenizerModel": "babbage-002"}'),
+  ('clrs2ds35000208l4g4b0hi3u', NULL, 'davinci-002', '(?i)^(davinci-002)$', NULL, 0.0000060, 0.0000120, 0.0000005, 'TOKENS', 'openai', '{"tokenizerModel": "davinci-002"}')
+
+
+
+

prisma/migrations/20240126184148_new_models copy/migration.sql

@@ -0,0 +1,39 @@
+-- This is an empty migration.
+
+DELETE FROM models
+WHERE id in ('clrp1wopz000808l09nwy32xh', 'clrp1wopz000408l05xcycki1','clrs2dnql000108l46vo0gp2t', 'clrs2ds35000208l4g4b0hi3u');
+
+
+
+INSERT INTO models (
+  id,
+  project_id,
+  model_name,
+  match_pattern,
+  start_date,
+  input_price,
+  output_price,
+  total_price,
+  unit,
+  tokenizer_id,
+  tokenizer_config
+)
+VALUES
+  -- https://openai.com/blog/new-embedding-models-and-api-updates
+  -- tokenizers are best guess for embedding models
+  ('clruwn3pc00010al7bl611c8o', NULL, 'text-embedding-3-small', '(?i)^(text-embedding-3-small)$', NULL, NULL, NULL, 0.00000002, 'TOKENS', 'openai', '{"tokenizerModel": "text-embedding-ada-002"}'),
+  ('clruwn76700020al7gp8e4g4l', NULL, 'text-embedding-ada-002-v2', '(?i)^(text-embedding-3-large)$', NULL, NULL, NULL, 0.00000013, 'TOKENS', 'openai', '{"tokenizerModel": "text-embedding-ada-002"}'),
+  
+  ('clruwnahl00030al7ab9rark7', NULL, 'gpt-3.5-turbo-0125', '(?i)^(gpt-)(35|3.5)(-turbo-0125)$', NULL, 0.0000005, 0.0000015, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo" }'),
+  ('clruwnahl00040al78f1lb0at', NULL, 'gpt-3.5-turbo', '(?i)^(gpt-)(35|3.5)(-turbo)$', '2024-02-08', 0.0000005, 0.0000015, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo" }'),
+
+  ('clruwnahl00050al796ck3p44', NULL, 'gpt-4-0125-preview', '(?i)^(gpt-4-0125-preview)$', NULL, 0.00001, 0.00003, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4" }'),
+  ('clruwnahl00060al74fcfehas', NULL, 'gpt-4-turbo-preview', '(?i)^(gpt-4-turbo-preview)$', NULL, 0.00003, 0.00006, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4" }'),
+
+  -- fix tokenizer for vertx
+  ('clrp1wopz000808l09nwy32xh', NULL, 'codechat-bison-32k', '(?i)^(codechat-bison-32k)$', NULL, 0.0000005, 0.0000025, NULL, 'TOKENS', NULL, NULL),
+  ('clrp1wopz000408l05xcycki1', NULL, 'chat-bison-32k', '(?i)^(chat-bison-32k)$', NULL, 0.0000005, 0.0000025, NULL, 'TOKENS', NULL, NULL),
+
+  -- fix prices
+  ('clrs2dnql000108l46vo0gp2t', NULL, 'babbage-002', '(?i)^(babbage-002)$', NULL, 0.0000004, 0.0000016, NULL, 'TOKENS', 'openai', '{"tokenizerModel": "babbage-002"}'),
+  ('clrs2ds35000208l4g4b0hi3u', NULL, 'davinci-002', '(?i)^(davinci-002)$', NULL, 0.0000060, 0.0000120, NULL, 'TOKENS', 'openai', '{"tokenizerModel": "davinci-002"}')

prisma/migrations/20240130100110_usage_unit_nullable/migration.sql

@@ -0,0 +1,6 @@
+-- AlterTable
+ALTER TABLE "models" ALTER COLUMN "unit" DROP DEFAULT;
+
+-- AlterTable
+ALTER TABLE "observations" ALTER COLUMN "unit" DROP NOT NULL,
+ALTER COLUMN "unit" DROP DEFAULT;

prisma/migrations/20240130160110_claude_models/migration.sql

@@ -0,0 +1,40 @@
+-- This is an empty migration.
+
+DELETE FROM models
+WHERE id in (
+  'clrnwbota000908jsgg9mb1ml',
+  'clrnwb41q000308jsfrac9uh6', 
+  'clrnwbd1m000508js4hxu6o7n', 
+  'clrnwb836000408jsallr6u11', 
+  'clrnwbg2b000608jse2pp4q2d', 
+  'clrnwbi9d000708jseiy44k26',
+  'clrnwblo0000808jsc1385hdp'
+);
+
+
+
+INSERT INTO models (
+  id,
+  project_id,
+  model_name,
+  match_pattern,
+  start_date,
+  input_price,
+  output_price,
+  total_price,
+  unit,
+  tokenizer_id,
+  tokenizer_config
+)
+VALUES
+  -- nothing earlier required for ada
+  ('clrnwbota000908jsgg9mb1ml', NULL, 'claude-instant-1', '(?i)^(claude-instant-1)$', NULL, 0.00000163, 0.00000551, NULL, 'TOKENS', 'claude', NULL),
+  ('clrnwb41q000308jsfrac9uh6', NULL, 'claude-instant-1.2', '(?i)^(claude-instant-1.2)$', NULL, 0.00000163, 0.00000551, NULL, 'TOKENS', 'claude', NULL),
+  ('clrnwbd1m000508js4hxu6o7n', NULL, 'claude-2.1', '(?i)^(claude-2.1)$', NULL, 0.000008, 0.000024, NULL, 'TOKENS', 'claude', NULL),
+  ('clrnwb836000408jsallr6u11', NULL, 'claude-2.0', '(?i)^(claude-2.0)$', NULL, 0.000008, 0.000024, NULL, 'TOKENS', 'claude', NULL),
+  ('clrnwbg2b000608jse2pp4q2d', NULL, 'claude-1.3', '(?i)^(claude-1.3)$', NULL, 0.000008, 0.000024, NULL, 'TOKENS', 'claude', NULL),
+  ('clrnwbi9d000708jseiy44k26', NULL, 'claude-1.2', '(?i)^(claude-1.2)$', NULL, 0.000008, 0.000024, NULL, 'TOKENS', 'claude', NULL),
+  ('clrnwblo0000808jsc1385hdp', NULL, 'claude-1.1', '(?i)^(claude-1.1)$', NULL, 0.000008, 0.000024, NULL, 'TOKENS', 'claude', NULL)
+
+
+

prisma/migrations/20240131184148_add_finetuned_and_vertex_models/migration.sql

@@ -0,0 +1,40 @@
+DELETE FROM models
+WHERE id in ('clrp1wopz000808l09nwy32xh', 'clrp1wopz000408l05xcycki1');
+
+INSERT INTO models (
+  id,
+  project_id,
+  model_name,
+  match_pattern,
+  start_date,
+  input_price,
+  output_price,
+  total_price,
+  unit,
+  tokenizer_id,
+  tokenizer_config
+)
+VALUES
+  -- https://openai.com/blog/new-embedding-models-and-api-updates
+  -- https://openai.com/blog/gpt-3-5-turbo-fine-tuning-and-api-updates
+  -- ft model tokens are getting counted like the base model https://github.com/openai/tiktoken/blob/db5bda9fc93b3171db6c4afea329394e6b6d31ca/tiktoken/model.py
+  
+  ('cls08r8sq000308jq14ae96f0', NULL, 'ft:gpt-3.5-turbo-1106', '(?i)^(ft:)(gpt-3.5-turbo-1106:)(.+)(:)(.*)(:)(.+)$', NULL, 0.000003, 0.000006, NULL, 'TOKENS', 'openai', '{"tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo-1106", "tokensPerMessage": 3}'),
+  ('cls08rp99000408jqepxoakjv', NULL, 'ft:gpt-3.5-turbo-0613', '(?i)^(ft:)(gpt-3.5-turbo-0613:)(.+)(:)(.*)(:)(.+)$', NULL, 0.000012, 0.000016, NULL, 'TOKENS', 'openai', '{"tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo-0613", "tokensPerMessage": 3}'),
+  ('cls08rv9g000508jq5p4z4nlr', NULL, 'ft:davinci-002', '(?i)^(ft:)(davinci-002:)(.+)(:)(.*)(:)(.+)$$', NULL, 0.000012, 0.000012, NULL, 'TOKENS', 'openai', '{"tokenizerModel": "davinci-002"}'),
+  ('cls08s2bw000608jq57wj4un2', NULL, 'ft:babbage-002', '(?i)^(ft:)(babbage-002:)(.+)(:)(.*)(:)(.+)$$', NULL, 0.0000016, 0.0000016, NULL, 'TOKENS', 'openai', '{"tokenizerModel": "babbage-002"}'),
+
+  -- https://cloud.google.com/vertex-ai/docs/generative-ai/pricing
+  ('cls0k4lqt000008ky1o1s8wd5', NULL, 'gemini-pro', '(?i)^(gemini-pro)(@[a-zA-Z0-9]+)?$', NULL, 0.00000025, 0.0000005, NULL, 'CHARACTERS', NULL, NULL),
+  ('cls0jni4t000008jk3kyy803r', NULL, 'chat-bison-32k', '(?i)^(chat-bison-32k)(@[a-zA-Z0-9]+)?$', NULL, 0.00000025, 0.0000005, NULL, 'CHARACTERS', NULL, NULL),
+  ('cls0iv12d000108l251gf3038', NULL, 'chat-bison', '(?i)^(chat-bison)(@[a-zA-Z0-9]+)?$', NULL, 0.00000025, 0.0000005, NULL, 'CHARACTERS', NULL, NULL),
+  ('cls0jmjt3000108l83ix86w0d', NULL, 'text-bison-32k', '(?i)^(text-bison-32k)(@[a-zA-Z0-9]+)?$', NULL, 0.00000025, 0.0000005, NULL, 'CHARACTERS', NULL, NULL),
+  ('cls0juygp000308jk2a6x9my2', NULL, 'text-bison', '(?i)^(text-bison)(@[a-zA-Z0-9]+)?$', NULL, 0.00000025, 0.0000005, NULL, 'CHARACTERS', NULL, NULL),
+  ('cls0jungb000208jk12gm4gk1', NULL, 'text-unicorn', '(?i)^(text-unicorn)(@[a-zA-Z0-9]+)?$', NULL, 0.0000025, 0.0000075, NULL, 'CHARACTERS', NULL, NULL),
+  ('cls1nyj5q000208l33ne901d8', NULL, 'textembedding-gecko', '(?i)^(textembedding-gecko)(@[a-zA-Z0-9]+)?$', NULL, NULL, NULL, 0.0000001, 'CHARACTERS', NULL, NULL),
+  ('cls1nyyjp000308l31gxy1bih', NULL, 'textembedding-gecko-multilingual', '(?i)^(textembedding-gecko-multilingual)(@[a-zA-Z0-9]+)?$', NULL, NULL, NULL, 0.0000001, 'CHARACTERS', NULL, NULL),
+  ('cls1nzjt3000508l3dnwad3g0', NULL, 'code-gecko', '(?i)^(code-gecko)(@[a-zA-Z0-9]+)?$', NULL, 0.00000025, 0.0000005, NULL, 'CHARACTERS', NULL, NULL),
+  ('cls1nzwx4000608l38va7e4tv', NULL, 'code-bison', '(?i)^(code-bison)(@[a-zA-Z0-9]+)?$', NULL, 0.00000025, 0.0000005, NULL, 'CHARACTERS', NULL, NULL),
+  ('cls1o053j000708l39f8g4bgs', NULL, 'code-bison-32k', '(?i)^(code-bison-32k)(@[a-zA-Z0-9]+)?$', NULL, 0.00000025, 0.0000005, NULL, 'CHARACTERS', NULL, NULL),
+  ('cls0j33v1000008joagkc4lql', NULL, 'codechat-bison-32k', '(?i)^(codechat-bison-32k)(@[a-zA-Z0-9]+)?$', NULL, 0.00000025, 0.0000005, NULL, 'CHARACTERS', NULL, NULL),
+  ('cls0jmc9v000008l8ee6r3gsd', NULL, 'codechat-bison', '(?i)^(codechat-bison)(@[a-zA-Z0-9]+)?$', NULL, 0.00000025, 0.0000005, NULL, 'CHARACTERS', NULL, NULL)

prisma/migrations/20240203184148_update_pricing/migration.sql

@@ -0,0 +1,27 @@
+-- This is an empty migration.
+
+DELETE FROM models
+WHERE id in ('clrkwk4cb000308l5go4b6otm', 'clrntjt89000a08jw0gcdbd5a');
+
+
+
+INSERT INTO models (
+  id,
+  project_id,
+  model_name,
+  match_pattern,
+  start_date,
+  input_price,
+  output_price,
+  total_price,
+  unit,
+  tokenizer_id,
+  tokenizer_config
+)
+VALUES
+  -- https://openai.com/blog/new-embedding-models-and-api-updates
+  
+
+  -- fix prices
+  ('clrkwk4cb000308l5go4b6otm', NULL, 'gpt-3.5-turbo-16k', '(?i)^(gpt-)(35|3.5)(-turbo-16k)$', NULL, 0.000003, 0.000004, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo-16k" }'),
+  ('clrntjt89000a08jw0gcdbd5a', NULL, 'gpt-3.5-turbo-16k-0613', '(?i)^(gpt-)(35|3.5)(-turbo-16k-0613)$', NULL, 0.000003, 0.000004, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo-16k-0613" }')

prisma/migrations/20240212175433_add_audit_log_table/migration.sql

@@ -0,0 +1,28 @@
+-- CreateTable
+CREATE TABLE "audit_logs" (
+    "id" TEXT NOT NULL,
+    "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "user_id" TEXT NOT NULL,
+    "project_id" TEXT NOT NULL,
+    "user_project_role" "MembershipRole" NOT NULL,
+    "resource_type" TEXT NOT NULL,
+    "resource_id" TEXT NOT NULL,
+    "action" TEXT NOT NULL,
+    "before" TEXT,
+    "after" TEXT,
+
+    CONSTRAINT "audit_logs_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "audit_logs_project_id_idx" ON "audit_logs"("project_id");
+
+-- CreateIndex
+CREATE INDEX "audit_logs_created_at_idx" ON "audit_logs"("created_at");
+
+-- AddForeignKey
+ALTER TABLE "audit_logs" ADD CONSTRAINT "audit_logs_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "audit_logs" ADD CONSTRAINT "audit_logs_project_id_fkey" FOREIGN KEY ("project_id") REFERENCES "projects"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/migrations/20240213124148_update_openai_pricing/migration.sql

@@ -0,0 +1,25 @@
+-- This is an empty migration.
+
+DELETE FROM models
+WHERE id in ('clruwnahl00040al78f1lb0at');
+
+
+
+INSERT INTO models (
+  id,
+  project_id,
+  model_name,
+  match_pattern,
+  start_date,
+  input_price,
+  output_price,
+  total_price,
+  unit,
+  tokenizer_id,
+  tokenizer_config
+)
+VALUES
+  -- according to email, gpt-3.5-turbo and gpt-3.5-turbo-16k will point to 0125 models as of 2024-02-16
+  -- gpt-3.5-turbo-0125 now supports 16k token length. 16k model will point to regular 3.5 turbo model according to mail.
+  ('clruwnahl00040al78f1lb0at', NULL, 'gpt-3.5-turbo', '(?i)^(gpt-)(35|3.5)(-turbo)$', '2024-02-16', 0.0000005, 0.0000015, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo" }'),
+  ('clsk9lntu000008jwfc51bbqv', NULL, 'gpt-3.5-turbo-16k', '(?i)^(gpt-)(35|3.5)(-turbo-16k)$', '2024-02-16', 0.0000005, 0.0000015, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-3.5-turbo-16k" }')

prisma/schema.prisma

@@ -3,7 +3,7 @@
 
 generator client {
     provider        = "prisma-client-js"
-    previewFeatures = ["tracing"]
+    previewFeatures = ["tracing", "views"]
 }
 
 datasource db {
@@ -13,6 +13,14 @@ datasource db {
     shadowDatabaseUrl = env("SHADOW_DATABASE_URL")
 }
 
+generator erd {
+    provider     = "prisma-erd-generator"
+    ignoreTables = ["_prisma_migrations", "Session", "Account", "Example"]
+    disabled     = true
+    ignoreEnums  = true
+    output       = "database.svg"
+}
+
 model Example {
     id        String   @id @default(cuid())
     createdAt DateTime @default(now()) @map("created_at")
@@ -64,6 +72,7 @@ model User {
     createdAt     DateTime               @default(now()) @map("created_at")
     updatedAt     DateTime               @default(now()) @updatedAt @map("updated_at")
     featureFlags  String[]               @default([]) @map("feature_flags")
+    AuditLog      AuditLog[]
 
     @@map("users")
 }
@@ -91,6 +100,9 @@ model Project {
     RawEvents    Events[]
     invitations  MembershipInvitation[]
     sessions     TraceSession[]
+    Prompt       Prompt[]
+    Model        Model[]
+    AuditLog     AuditLog[]
 
     @@map("projects")
 }
@@ -153,7 +165,7 @@ enum MembershipRole {
 }
 
 model TraceSession {
-    id         String   @id @default(cuid())
+    id         String   @default(cuid())
     createdAt  DateTime @default(now()) @map("created_at")
     updatedAt  DateTime @default(now()) @updatedAt @map("updated_at")
     projectId  String   @map("project_id")
@@ -162,7 +174,7 @@ model TraceSession {
     public     Boolean  @default(false)
     traces     Trace[]
 
-    @@unique([id, projectId])
+    @@id([id, projectId])
     @@index([projectId])
     @@index([createdAt])
     @@map("trace_sessions")
@@ -177,18 +189,18 @@ model Trace {
     metadata   Json?
     release    String?
     version    String?
-    input      Json?
-    output     Json?
-    sessionId  String?       @map("session_id")
-    session    TraceSession? @relation(fields: [sessionId], references: [id], onDelete: SetNull)
     projectId  String        @map("project_id")
     project    Project       @relation(fields: [projectId], references: [id], onDelete: Cascade)
     public     Boolean       @default(false)
     bookmarked Boolean       @default(false)
+    tags       String[]      @default([])
+    input      Json?
+    output     Json?
+    sessionId  String?       @map("session_id")
+    session    TraceSession? @relation(fields: [sessionId, projectId], references: [id, projectId])
 
     scores Score[]
 
-    @@unique([projectId, externalId])
     @@index([projectId])
     @@index([sessionId])
     @@index([name])
@@ -196,6 +208,7 @@ model Trace {
     @@index([externalId])
     @@index(timestamp)
     @@index(release)
+    @@index([tags(ops: ArrayOps)], type: Gin)
     @@map("traces")
 }
 
@@ -216,19 +229,26 @@ model Observation {
 
     // GENERATION ONLY
     model               String?
+    internalModel       String?           @map("internal_model")
     modelParameters     Json?
     input               Json?
     output              Json?
     promptTokens        Int               @default(0) @map("prompt_tokens")
     completionTokens    Int               @default(0) @map("completion_tokens")
     totalTokens         Int               @default(0) @map("total_tokens")
-    unit                String            @default("TOKENS")
+    unit                String?
+    inputCost           Decimal?          @map("input_cost")
+    outputCost          Decimal?          @map("output_cost")
+    totalCost           Decimal?          @map("total_cost")
     completionStartTime DateTime?         @map("completion_start_time")
     scores              Score[]
     project             Project           @relation(fields: [projectId], references: [id], onDelete: Cascade)
     derivedDatasetItems DatasetItem[]
     datasetRunItems     DatasetRunItems[]
 
+    promptId String? @map("prompt_id")
+    prompt   Prompt? @relation(fields: [promptId], onDelete: SetNull, references: [id])
+
     @@unique([id, projectId])
     @@index([traceId])
     @@index([type])
@@ -236,6 +256,7 @@ model Observation {
     @@index(createdAt)
     @@index(projectId)
     @@index(parentObservationId)
+    @@index(model)
     @@map("observations")
 }
 
@@ -289,6 +310,7 @@ model Pricing {
     currency    String      @default("USD")
     tokenType   TokenType   @map("token_type")
 
+    @@index(modelName)
     @@map("pricings")
 }
 
@@ -304,7 +326,6 @@ model CronJobs {
 model Dataset {
     id           String        @id @default(cuid())
     name         String
-    status       DatasetStatus @default(ACTIVE)
     projectId    String        @map("project_id")
     project      Project       @relation(fields: [projectId], references: [id], onDelete: Cascade)
     createdAt    DateTime      @default(now()) @map("created_at")
@@ -385,3 +406,111 @@ model Events {
     @@index(projectId)
     @@map("events")
 }
+
+model Prompt {
+    id        String   @id @default(cuid())
+    createdAt DateTime @default(now()) @map("created_at")
+    updatedAt DateTime @default(now()) @updatedAt @map("updated_at")
+
+    projectId String  @map("project_id")
+    project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
+
+    createdBy String @map("created_by")
+
+    prompt      String
+    name        String
+    version     Int
+    isActive    Boolean       @map("is_active")
+    Observation Observation[]
+
+    @@unique([projectId, name, version])
+    @@index([projectId, name, version])
+    @@map("prompts")
+}
+
+model Model {
+    id        String   @id @default(cuid())
+    createdAt DateTime @default(now()) @map("created_at")
+    updatedAt DateTime @default(now()) @updatedAt @map("updated_at")
+
+    projectId String?  @map("project_id")
+    project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade)
+
+    modelName       String    @map("model_name")
+    matchPattern    String    @map("match_pattern")
+    startDate       DateTime? @map("start_date")
+    inputPrice      Decimal?  @map("input_price")
+    outputPrice     Decimal?  @map("output_price")
+    totalPrice      Decimal?  @map("total_price")
+    unit            String // TOKENS, CHARACTERS, MILLISECONDS, SECONDS, or IMAGES
+    tokenizerId     String?   @map("tokenizer_id")
+    tokenizerConfig Json?     @map("tokenizer_config")
+
+    @@unique([projectId, modelName, startDate, unit])
+    @@index([projectId, modelName])
+    @@map("models")
+}
+
+// This view is a mix of the observation and model. Once prisma supports
+// inheritance, we should remove code duplication here.
+view ObservationView {
+    id                  String           @id @default(cuid())
+    traceId             String?          @map("trace_id")
+    projectId           String           @map("project_id")
+    type                ObservationType
+    startTime           DateTime         @default(now()) @map("start_time")
+    endTime             DateTime?        @map("end_time")
+    name                String?
+    metadata            Json?
+    parentObservationId String?          @map("parent_observation_id")
+    level               ObservationLevel @default(DEFAULT)
+    statusMessage       String?          @map("status_message")
+    version             String?
+    createdAt           DateTime         @default(now()) @map("created_at")
+
+    // GENERATION ONLY
+    model               String?
+    modelParameters     Json?
+    input               Json?
+    output              Json?
+    promptTokens        Int       @default(0) @map("prompt_tokens")
+    completionTokens    Int       @default(0) @map("completion_tokens")
+    totalTokens         Int       @default(0) @map("total_tokens")
+    unit                String?
+    completionStartTime DateTime? @map("completion_start_time")
+
+    promptId String? @map("prompt_id")
+
+    // Model
+    modelId     String?  @map("model_id")
+    inputPrice  Decimal? @map("input_price")
+    outputPrice Decimal? @map("output_price")
+    totalPrice  Decimal? @map("total_price")
+
+    // calculated fields
+    calculatedInputCost  Decimal? @map("calculated_input_cost")
+    calculatedOutputCost Decimal? @map("calculated_output_cost")
+    calculatedTotalCost  Decimal? @map("calculated_total_cost")
+
+    @@map("observations_view")
+}
+
+model AuditLog {
+    id              String         @id @default(cuid())
+    createdAt       DateTime       @default(now()) @map("created_at")
+    updatedAt       DateTime       @default(now()) @updatedAt @map("updated_at")
+    userId          String         @map("user_id")
+    user            User           @relation(fields: [userId], references: [id], onDelete: Cascade)
+    projectId       String         @map("project_id")
+    project         Project        @relation(fields: [projectId], references: [id], onDelete: Cascade)
+    userProjectRole MembershipRole @map("user_project_role")
+    resourceType    String         @map("resource_type")
+    resourceId      String         @map("resource_id")
+    action          String
+    before          String? //stringified JSON
+    after           String? // stringified JSON
+
+    @@index([projectId])
+    @@index([createdAt])
+    @@map("audit_logs")
+}

prisma/seed.ts

@@ -5,6 +5,7 @@ import {
 } from "@/src/features/public-api/lib/apiKeys";
 import { hash } from "bcryptjs";
 import { parseArgs } from "node:util";
+import { ModelUsageUnit } from "@/src/constants";
 
 const options = {
   environment: { type: "string" },
@@ -53,6 +54,25 @@ async function main() {
     },
   });
 
+  const prompt = await prisma.prompt.upsert({
+    where: {
+      projectId_name_version: {
+        projectId: seedProjectId,
+        name: "summary-prompt",
+        version: 1,
+      },
+    },
+    create: {
+      name: "summary-prompt",
+      project: { connect: { id: seedProjectId } },
+      prompt: "prompt {{variable}} {{anotherVariable}}",
+      isActive: true,
+      version: 1,
+      createdBy: "user-1",
+    },
+    update: {},
+  });
+
   const seedApiKey = {
     id: "seed-api-key",
     secret: process.env.SEED_SECRET_KEY ?? "sk-lf-1234567890",
@@ -79,9 +99,9 @@ async function main() {
 
   // Do not run the following for local docker compose setup
   if (environment === "examples") {
-    const project2 = await prisma.project.create({
-      data: {
-        id: "239ad00f-562f-411d-af14-831c75ddd875",
+    const project2 = await prisma.project.upsert({
+      where: { id: "239ad00f-562f-411d-af14-831c75ddd875" },
+      create: {
         name: "demo-app",
         apiKeys: {
           create: [
@@ -100,16 +120,130 @@ async function main() {
           },
         },
       },
+      update: {},
     });
 
+    const promptIds: string[] = [];
+
+    const prompts = [
+      {
+        id: `prompt-${Math.floor(Math.random() * 1000000000)}`,
+        projectId: project2.id,
+        createdBy: "user-1",
+        prompt: "Prompt 1 content",
+        name: "Prompt 1",
+        version: 1,
+        isActive: true,
+      },
+      {
+        id: `prompt-${Math.floor(Math.random() * 1000000000)}`,
+        projectId: project2.id,
+        createdBy: "user-1",
+        prompt: "Prompt 2 content",
+        name: "Prompt 2",
+        version: 1,
+        isActive: true,
+      },
+      {
+        id: `prompt-${Math.floor(Math.random() * 1000000000)}`,
+        projectId: project2.id,
+        createdBy: "API",
+        prompt: "Prompt 3 content",
+        name: "Prompt 3 by API",
+        version: 1,
+        isActive: true,
+      },
+    ];
+
+    for (const prompt of prompts) {
+      await prisma.prompt.create({
+        data: {
+          id: prompt.id,
+          projectId: prompt.projectId,
+          createdBy: prompt.createdBy,
+          prompt: prompt.prompt,
+          name: prompt.name,
+          version: prompt.version,
+          isActive: prompt.isActive,
+        },
+      });
+      promptIds.push(prompt.id);
+    }
+
+    const promptVersionsWithVariables = [
+      {
+        id: `prompt-${Math.floor(Math.random() * 1000000000)}`,
+        projectId: project2.id,
+        createdBy: "user-1",
+        prompt: "Prompt 4 version 1 content with {{variable}}",
+        name: "Prompt 4 with variable",
+        version: 1,
+        isActive: false,
+      },
+      {
+        id: `prompt-${Math.floor(Math.random() * 1000000000)}`,
+        projectId: project2.id,
+        createdBy: "user-1",
+        prompt: "Prompt 4 version 2 content with {{variable}}",
+        name: "Prompt 4 with variable",
+        version: 2,
+        isActive: true,
+      },
+      {
+        id: `prompt-${Math.floor(Math.random() * 1000000000)}`,
+        projectId: project2.id,
+        createdBy: "user-1",
+        prompt: "Prompt 4 version 3 content with {{variable}}",
+        name: "Prompt 4 with variable",
+        version: 3,
+        isActive: false,
+      },
+    ];
+
+    for (const version of promptVersionsWithVariables) {
+      await prisma.prompt.create({
+        data: {
+          id: version.id,
+          projectId: version.projectId,
+          createdBy: version.createdBy,
+          prompt: version.prompt,
+          name: version.name,
+          version: version.version,
+          isActive: version.isActive,
+        },
+      });
+      promptIds.push(version.id);
+    }
+    const promptName = "Prompt with Longer Name";
+    const projectId = project2.id;
+    const createdBy = "user-1";
+
+    for (let i = 1; i <= 20; i++) {
+      const promptId = `prompt-${Math.floor(Math.random() * 1000000000)}`;
+      await prisma.prompt.create({
+        data: {
+          id: promptId,
+          projectId: projectId,
+          createdBy: createdBy,
+          prompt: `${promptName} version ${i} content`,
+          name: promptName,
+          version: i,
+          isActive: i === 20,
+        },
+      });
+      promptIds.push(promptId);
+    }
+
     const generationIds: string[] = [];
+    const envTags = [null, "development", "staging", "production"];
+    const colorTags = [null, "red", "blue", "yellow"];
 
     for (let i = 0; i < TRACE_VOLUME; i++) {
       // print progress to console with a progress bar that refreshes every 10 iterations
-      if (i % 10 === 0) {
+      if ((i + 1) % 10 === 0 || i === TRACE_VOLUME - 1) {
         process.stdout.clearLine(0);
         process.stdout.cursorTo(0);
-        process.stdout.write(`Seeding ${i} of ${TRACE_VOLUME}`);
+        process.stdout.write(`Seeding ${i + 1} of ${TRACE_VOLUME}`);
       }
       // random date within last 90 days, with a linear bias towards more recent dates
       const traceTs = new Date(
@@ -117,6 +251,13 @@ async function main() {
           Math.floor(Math.random() ** 1.5 * 90 * 24 * 60 * 60 * 1000),
       );
 
+      const envTag = envTags[Math.floor(Math.random() * envTags.length)];
+      const colorTag = colorTags[Math.floor(Math.random() * colorTags.length)];
+
+      const tags = [envTag, colorTag].filter((tag) => tag !== null);
+
+      const projectId = [project1.id, project2.id][i % 2] as string;
+
       const trace = await prisma.trace.create({
         data: {
           id: `trace-${Math.floor(Math.random() * 1000000000)}`,
@@ -127,10 +268,9 @@ async function main() {
           metadata: {
             user: `user-${i}@langfuse.com`,
           },
+          tags: tags as string[],
           project: {
-            connect: {
-              id: [project1.id, project2.id][i % 2],
-            },
+            connect: { id: projectId },
           },
           userId: `user-${i % 10}`,
           session:
@@ -138,13 +278,14 @@ async function main() {
               ? {
                   connectOrCreate: {
                     where: {
-                      id: `session-${i % 10}`,
+                      id_projectId: {
+                        id: `session-${i % 10}`,
+                        projectId: projectId,
+                      },
                     },
                     create: {
                       id: `session-${i % 10}`,
-                      project: {
-                        connect: { id: [project1.id, project2.id][i % 2] },
-                      },
+                      projectId: projectId,
                     },
                   },
                 }
@@ -241,6 +382,20 @@ async function main() {
           const promptTokens = Math.floor(Math.random() * 1000) + 300;
           const completionTokens = Math.floor(Math.random() * 500) + 100;
 
+          const models = [
+            "gpt-3.5-turbo",
+            "gpt-4",
+            "gpt-4-32k-0613",
+            "gpt-3.5-turbo-16k-0613",
+            "claude-instant-1",
+            "claude-2.1",
+            "gpt-4-vision-preview",
+            "MIXTRAL-8X7B",
+          ];
+
+          const model = models[Math.floor(Math.random() * models.length)];
+          const promptId =
+            promptIds[Math.floor(Math.random() * promptIds.length)];
           const generation = await prisma.observation.create({
             data: {
               type: "GENERATION",
@@ -249,6 +404,7 @@ async function main() {
               endTime: generationTsEnd,
               name: `generation-${i}-${j}-${k}`,
               project: { connect: { id: trace.projectId } },
+              prompt: { connect: { id: promptId } },
               input:
                 Math.random() > 0.5
                   ? [
@@ -307,7 +463,8 @@ async function main() {
               
               Remember to import React at the top of your file whenever you're creating a component, because JSX transpiles to 'React.createElement' calls under the hood.`,
               },
-              model: Math.random() > 0.5 ? "gpt-3.5-turbo" : "gpt-4",
+              model: model,
+              internalModel: model,
               modelParameters: {
                 temperature:
                   Math.random() > 0.9 ? undefined : Math.random().toFixed(2),
@@ -326,6 +483,12 @@ async function main() {
               totalTokens: promptTokens + completionTokens,
               parentObservationId: span.id,
               traceId: trace.id,
+              ...{
+                ...(Math.random() > 0.5 && trace.projectId === prompt.projectId
+                  ? { prompt: { connect: { id: prompt.id } } }
+                  : {}),
+              },
+              unit: ModelUsageUnit.Tokens,
             },
           });
           if (Math.random() > 0.6)
@@ -377,47 +540,54 @@ async function main() {
       }
     }
 
-    const dataset = await prisma.dataset.create({
-      data: {
-        name: "demo-dataset",
-        projectId: project2.id,
-      },
-    });
-
-    const datasetRun = await prisma.datasetRuns.create({
-      data: {
-        name: "demo-dataset-run",
-        datasetId: dataset.id,
-      },
-    });
-
-    for (let runNumber = 0; runNumber < 10; runNumber++) {
-      //pick randomly from existingSpanIds
-      const sourceObservationId =
-        generationIds[Math.floor(Math.random() * generationIds.length)];
-      const runObservationId =
-        generationIds[Math.floor(Math.random() * generationIds.length)];
-
-      const datasetItem = await prisma.datasetItem.create({
+    for (let datasetNumber = 0; datasetNumber < 2; datasetNumber++) {
+      const dataset = await prisma.dataset.create({
         data: {
-          datasetId: dataset.id,
-          sourceObservationId:
-            Math.random() > 0.5 ? sourceObservationId : undefined,
-          input: [
-            { role: "user", content: "How can i create a React component?" },
-          ],
-          expectedOutput:
-            "Creating a React component can be done in two ways: as a functional component or as a class component. Let's start with a basic example of both.",
+          name: `demo-dataset-${datasetNumber}`,
+          projectId: project2.id,
         },
       });
 
-      await prisma.datasetRunItems.create({
-        data: {
-          datasetItemId: datasetItem.id,
-          observationId: runObservationId!,
-          datasetRunId: datasetRun.id,
-        },
-      });
+      for (let datasetRunNumber = 0; datasetRunNumber < 2; datasetRunNumber++) {
+        const datasetRun = await prisma.datasetRuns.create({
+          data: {
+            name: `demo-dataset-run-${datasetRunNumber}`,
+            datasetId: dataset.id,
+          },
+        });
+
+        for (let runNumber = 0; runNumber < 10; runNumber++) {
+          //pick randomly from existingSpanIds
+          const sourceObservationId =
+            generationIds[Math.floor(Math.random() * generationIds.length)];
+          const runObservationId =
+            generationIds[Math.floor(Math.random() * generationIds.length)];
+
+          const datasetItem = await prisma.datasetItem.create({
+            data: {
+              datasetId: dataset.id,
+              sourceObservationId:
+                Math.random() > 0.5 ? sourceObservationId : undefined,
+              input: [
+                {
+                  role: "user",
+                  content: "How can i create a React component?",
+                },
+              ],
+              expectedOutput:
+                "Creating a React component can be done in two ways: as a functional component or as a class component. Let's start with a basic example of both.",
+            },
+          });
+
+          await prisma.datasetRunItems.create({
+            data: {
+              datasetItemId: datasetItem.id,
+              observationId: runObservationId!,
+              datasetRunId: datasetRun.id,
+            },
+          });
+        }
+      }
     }
   }
 }

scripts/model-match.ts

@@ -0,0 +1,250 @@
+// Description: New model definitions in Langfuse are automatically applied to new observations.
+// You can optionally run this script to apply new model definitions to existing observations.
+// See docs: https://langfuse.com/docs/deployment/self-host#migrate-models
+// Execute: `npm run models:migrate`
+
+import "dotenv/config";
+
+import { findModel } from "@/src/server/api/services/EventProcessor";
+import { prisma } from "@/src/server/db";
+import lodash from "lodash";
+import { tokenCount } from "@/src/features/ingest/lib/usage";
+import { type Prisma } from "@prisma/client";
+
+async function main() {
+  return await modelMatch();
+}
+
+// Call the function
+main().catch((err) => {
+  console.error("An error occurred:", err);
+});
+
+export async function modelMatch() {
+  console.log("Starting model match");
+  const start = Date.now();
+
+  const BATCH_SIZE = 10_000;
+  let continueLoop = true;
+  let index = 0;
+  let totalObservations = 0;
+
+  while (continueLoop) {
+    type ObservationSelect = {
+      model: string | null;
+      id: string;
+      projectId: string;
+      startTime: Date;
+      unit: string | null;
+      promptTokens: number;
+      completionTokens: number;
+      totalTokens: number;
+      input: Prisma.JsonValue;
+      output: Prisma.JsonValue;
+    };
+
+    const observations = await prisma.observation.findMany({
+      select: {
+        id: true,
+        startTime: true,
+        model: true,
+        unit: true,
+        projectId: true,
+        promptTokens: true,
+        completionTokens: true,
+        totalTokens: true,
+        input: true,
+        output: true,
+      },
+      orderBy: {
+        startTime: "desc",
+      },
+      where: {
+        internalModel: null,
+        type: "GENERATION",
+      },
+      take: BATCH_SIZE,
+      skip: index * BATCH_SIZE,
+    });
+
+    console.log(`Found ${observations.length} observations to migrate`);
+
+    type Config = {
+      startTime: Date;
+      model: string;
+      unit: string;
+      projectId: string | null;
+    };
+
+    interface GroupedObservations {
+      [key: string]: ObservationSelect[];
+    }
+
+    const groupedObservations = observations.reduce<GroupedObservations>(
+      (acc, observation) => {
+        const config = {
+          startTime: observation.startTime.toISOString().slice(0, 10),
+          model: observation.model,
+          unit: observation.unit,
+          projectId: observation.projectId,
+        };
+
+        const key = JSON.stringify(config);
+
+        // Ensure the array is initialized before using it
+        acc[key] = acc[key] ?? [];
+        acc[key]?.push(observation);
+
+        return acc;
+      },
+      {},
+    );
+
+    let updatedObservations = 0;
+    const dbPromises = [];
+
+    for (const [key, observationsGroup] of Object.entries(
+      groupedObservations,
+    )) {
+      const { startTime, model, unit, projectId } = JSON.parse(key) as Config;
+
+      console.log("Execute key: ", startTime, model, unit, projectId);
+
+      if (!projectId) {
+        throw new Error("No project id");
+      }
+
+      const foundModel = await findModel({
+        event: { projectId, model, unit, startTime: startTime },
+      });
+
+      console.log(
+        "Found model: ",
+        foundModel?.id,
+        " for key: ",
+        key,
+        " with observations: ",
+        observationsGroup.length,
+      );
+
+      if (foundModel) {
+        // find all the observations with all tokens 0 and tokenize them individually
+        const observationsWithAllTokensZero = observationsGroup.filter(
+          (observation) =>
+            observation.promptTokens === 0 &&
+            observation.completionTokens === 0 &&
+            observation.totalTokens === 0,
+        );
+
+        for (const observation of observationsWithAllTokensZero) {
+          console.log("Tokenizing observation: ", observation.id);
+          const newInputCount = tokenCount({
+            model: foundModel,
+            text: observation.input,
+          });
+          const newOutputCount = tokenCount({
+            model: foundModel,
+            text: observation.output,
+          });
+
+          dbPromises.push(
+            prisma.observation.update({
+              where: {
+                id: observation.id,
+              },
+              data: {
+                promptTokens: newInputCount,
+                completionTokens: newOutputCount,
+                totalTokens: (newInputCount ?? 0) + (newOutputCount ?? 0),
+                internalModel: foundModel.modelName,
+              },
+            }),
+          );
+        }
+
+        // for all remaining observations, batch update them with the model id
+        const observationsWithTokens = observationsGroup.filter(
+          (observation) =>
+            observation.promptTokens !== 0 ||
+            observation.completionTokens !== 0 ||
+            observation.totalTokens !== 0,
+        );
+
+        // Push the promise for updating observations into the array
+        lodash.chunk(observationsWithTokens, 32000).map((chunk) => {
+          dbPromises.push(
+            prisma.observation.updateMany({
+              where: {
+                id: {
+                  in: chunk.map((observation) => observation.id),
+                },
+              },
+              data: {
+                internalModel: foundModel.modelName,
+              },
+            }),
+          );
+        });
+
+        updatedObservations += observationsGroup.length;
+      } else {
+        lodash.chunk(observationsGroup, 32000).map((chunk) => {
+          dbPromises.push(
+            prisma.observation.updateMany({
+              where: {
+                id: {
+                  in: chunk.map((observation) => observation.id),
+                },
+              },
+              data: {
+                internalModel: "LANGFUSETMPNOMODEL",
+              },
+            }),
+          );
+        });
+
+        updatedObservations += observationsGroup.length;
+      }
+    }
+
+    totalObservations += updatedObservations;
+    // Wait for all update operations to complete
+    const promiseChunk = lodash.chunk(dbPromises, 10);
+
+    for (const promises of promiseChunk) {
+      console.log("Waiting for promises to complete", promises.length);
+      await Promise.all(promises);
+    }
+
+    console.log(
+      "Updated observations count: ",
+      updatedObservations,
+      " in total: ",
+      totalObservations,
+    );
+
+    console.log(updatedObservations, observations.length);
+
+    if (updatedObservations === 0) {
+      index++;
+    }
+
+    if (observations.length === 0) {
+      console.log("No more observations to migrate");
+      continueLoop = false;
+    }
+  }
+
+  await prisma.observation.updateMany({
+    where: {
+      internalModel: "LANGFUSETMPNOMODEL",
+    },
+    data: {
+      internalModel: null,
+    },
+  });
+
+  const end = Date.now();
+
+  console.log(`Model match took ${end - start} ms`);
+}

sentry.client.config.ts

@@ -9,7 +9,7 @@ if (process.env.NEXT_PUBLIC_SENTRY_DSN)
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production
-    tracesSampleRate: 0.8,
+    tracesSampleRate: 0.3,
 
     // Capture Replay for 100% of all sessions,
     // plus for 100% of sessions with an error

sentry.edge.config.ts

@@ -7,7 +7,7 @@ if (process.env.NEXT_PUBLIC_SENTRY_DSN)
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production
-    tracesSampleRate: 0.75,
+    tracesSampleRate: 0.3,
 
     // ...
 

sentry.server.config.ts

@@ -12,9 +12,9 @@ if (process.env.NEXT_PUBLIC_SENTRY_DSN)
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production
-    tracesSampleRate: 0.8,
+    tracesSampleRate: 0.3,
 
-    profilesSampleRate: 0.8, // Profiling sample rate is relative to tracesSampleRate
+    profilesSampleRate: 0.3, // Profiling sample rate is relative to tracesSampleRate
     integrations: [
       // Add profiling integration to list of integrations
       new ProfilingIntegration(),

src/__e2e__/auth.spec.ts

@@ -2,6 +2,7 @@ import { test, expect } from "@playwright/test";
 
 test("should redirect to sign-in if not signed in", async ({ page }) => {
   await page.goto("/");
+  await page.waitForTimeout(2000);
   await expect(page).toHaveURL("/auth/sign-in");
 });
 

src/__e2e__/create-project.spec.ts

@@ -3,28 +3,33 @@ import { test, expect } from "@playwright/test";
 test("should see new projects dialog open after clicking new project btn", async ({
   page,
 }) => {
-  await page.goto("/auth/sign-in");
-  await page.fill('input[name="email"]', "demo@langfuse.com");
+  await page.goto("auth/sign-up");
+  await page.fill('input[name="name"]', "demo user");
+  await page.fill('input[name="email"]', randomEmailAddress());
   await page.fill('input[type="password"]', "password");
   await page.click('button[type="submit"]');
   await page.waitForTimeout(2000);
   await page.waitForTimeout(2000);
-  await page.isVisible("Create new project");
+  expect(await page.innerHTML("data-testid=create-new-project-title")).toBe(
+    "Create new project",
+  );
   await page.click('[data-testid="create-project-btn"]');
   await page.waitForTimeout(2000);
-  await page.isVisible('[data-testid="new-project-form"]');
+  await expect(page.locator("data-testid=new-project-form")).toBeVisible();
 });
 
 test("Create a project with provided name", async ({ page }) => {
+  test.setTimeout(60000);
+
   await page.goto("/auth/sign-in");
   await page.fill('input[name="email"]', "demo@langfuse.com");
   await page.fill('input[type="password"]', "password");
   await page.click('button[type="submit"]');
   await page.waitForTimeout(2000);
-  await page.isVisible("Create new project");
+  await page.isVisible('[data-testid="new-project-form"]');
   await page.click('[data-testid="create-project-btn"]');
   await page.waitForTimeout(2000);
-  await page.isVisible('[data-testid="new-project-form"]');
+  await expect(page.locator("data-testid=new-project-form")).toBeVisible();
   await page.fill(
     '[data-testid="new-project-name-input"]',
     "my e2e demo project",
@@ -33,7 +38,11 @@ test("Create a project with provided name", async ({ page }) => {
   await page.waitForTimeout(2000);
   expect(page.url()).toContain("/project/");
   await page.waitForTimeout(2000);
-  expect(await page.getByTestId("project-title-span-1").textContent()).toBe(
+  expect(await page.getByTestId("project-name").textContent()).toContain(
     "my e2e demo project",
   );
 });
+
+// random email address to be used in tests
+const randomEmailAddress = () =>
+  Math.random().toString(36).substring(2, 11) + "@example.com";

src/__tests__/cost.servertest.ts

@@ -0,0 +1,442 @@
+/** @jest-environment node */
+
+import { pruneDatabase } from "@/src/__tests__/test-utils";
+import { ModelUsageUnit } from "@/src/constants";
+import { prisma } from "@/src/server/db";
+
+describe("cost retrieval tests", () => {
+  beforeEach(async () => await pruneDatabase());
+
+  [
+    {
+      testDescription: "prompt and completion tokens",
+      promptTokens: 200,
+      completionTokens: 3000,
+      totalTokens: undefined,
+      inputPrice: "0.0000010",
+      outputPrice: "0.0000020",
+      totalPrice: undefined,
+      expectedPromptTokens: 200,
+      expectedCompletionTokens: 3000,
+      expectedTotalTokens: 0,
+      expectedInputCost: "0.0002", // 200 / 1000 * 0.0010
+      expectedOutputCost: "0.006", // 3000 / 1000 * 0.0020
+      expectedTotalCost: "0.0062", // 0.0002 + 0.006
+    },
+    {
+      testDescription: "missing completion tokens",
+      promptTokens: 200,
+      completionTokens: undefined,
+      totalTokens: undefined,
+      inputPrice: "0.0000010",
+      outputPrice: "0.0000020",
+      totalPrice: undefined,
+      expectedPromptTokens: 200,
+      expectedCompletionTokens: 0,
+      expectedTotalTokens: 0,
+      expectedInputCost: "0.0002",
+      expectedOutputCost: "0", // completionTokens are set to 0 when ingesting undefined, hence 0 cost
+      expectedTotalCost: "0.0002",
+    },
+    {
+      testDescription: "missing prompt tokens",
+      promptTokens: undefined,
+      completionTokens: 3000,
+      totalTokens: undefined,
+      inputPrice: "0.0000010",
+      outputPrice: "0.0000020",
+      totalPrice: undefined,
+      expectedPromptTokens: 0,
+      expectedCompletionTokens: 3000,
+      expectedTotalTokens: 0,
+      expectedInputCost: "0", // promptTokens are set to 0 when ingesting undefined, hence 0 cost
+      expectedOutputCost: "0.006",
+      expectedTotalCost: "0.006",
+    },
+    {
+      testDescription: "prompt and completion and total",
+      promptTokens: 200,
+      completionTokens: 3000,
+      totalTokens: 3200,
+      inputPrice: "0.0000010",
+      outputPrice: "0.0000020",
+      totalPrice: undefined,
+      expectedPromptTokens: 200,
+      expectedCompletionTokens: 3000,
+      expectedTotalTokens: 3200,
+      expectedInputCost: "0.0002", // 200 / 1000 * 0.0010
+      expectedOutputCost: "0.006", // 3000 / 1000 * 0.0020
+      expectedTotalCost: "0.0062", // 0.0002 + 0.006
+    },
+    {
+      testDescription: "total only without price",
+      promptTokens: undefined,
+      completionTokens: undefined,
+      totalTokens: 3200,
+      inputPrice: "0.0000010",
+      outputPrice: "0.0000020",
+      totalPrice: undefined,
+      expectedPromptTokens: 0,
+      expectedCompletionTokens: 0,
+      expectedTotalTokens: 3200,
+      expectedInputCost: "0",
+      expectedOutputCost: "0",
+      expectedTotalCost: "0",
+    },
+    {
+      testDescription: "total only",
+      promptTokens: undefined,
+      completionTokens: undefined,
+      totalTokens: 3200,
+      inputPrice: "0.0000010",
+      outputPrice: "0.0000020",
+      totalPrice: "0.1",
+      expectedPromptTokens: 0,
+      expectedCompletionTokens: 0,
+      expectedTotalTokens: 3200,
+      expectedInputCost: "0",
+      expectedOutputCost: "0",
+      expectedTotalCost: "320",
+    },
+  ].forEach((input) => {
+    it(`should calculate cost correctly ${input.testDescription}`, async () => {
+      await pruneDatabase();
+
+      await prisma.model.create({
+        data: {
+          modelName: "gpt-3.5-turbo",
+          inputPrice: input.inputPrice,
+          outputPrice: input.outputPrice,
+          totalPrice: input.totalPrice,
+          matchPattern: "(.*)(gpt-)(35|3.5)(-turbo)?(.*)",
+          projectId: null,
+          startDate: new Date("2023-12-01"),
+          tokenizerConfig: { tokensPerMessage: 3, tokensPerName: 1 },
+          unit: ModelUsageUnit.Tokens,
+        },
+      });
+
+      const dbTrace = await prisma.trace.create({
+        data: {
+          name: "trace-name",
+          project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+        },
+      });
+
+      await prisma.observation.create({
+        data: {
+          traceId: dbTrace.id,
+          type: "GENERATION",
+          project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+          model: "gpt-3.5-turbo",
+          internalModel: "gpt-3.5-turbo",
+          startTime: new Date("2024-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          promptTokens: input.promptTokens,
+          completionTokens: input.completionTokens,
+          totalTokens: input.totalTokens,
+        },
+      });
+
+      const view = await prisma.observationView.findFirst({
+        where: { traceId: dbTrace.id },
+      });
+
+      expect(view?.promptTokens).toBe(input.expectedPromptTokens);
+      expect(view?.completionTokens).toBe(input.expectedCompletionTokens);
+      expect(view?.totalTokens).toBe(input.expectedTotalTokens);
+
+      // calculated cost fields
+      expect(view?.calculatedInputCost?.toString()).toBe(
+        input.expectedInputCost,
+      );
+      expect(view?.calculatedOutputCost?.toString()).toBe(
+        input.expectedOutputCost,
+      );
+      expect(view?.calculatedTotalCost?.toString()).toBe(
+        input.expectedTotalCost,
+      );
+    });
+  });
+
+  [
+    {
+      testDescription: "overwriting project specific model",
+      expectedInputCost: "0.0004", // 200 / 1000 * 0.0010
+      expectedOutputCost: "0.012", // 3000 / 1000 * 0.0020
+      expectedTotalCost: "0.0124", // 0.0002 + 0.006
+      expectedModelId: "model-2",
+    },
+  ].forEach((input) => {
+    it(`should calculate cost correctly with multiple models ${input.testDescription}`, async () => {
+      await pruneDatabase();
+
+      await prisma.model.create({
+        data: {
+          id: "model-1",
+          modelName: "gpt-3.5-turbo",
+          inputPrice: "0.0000010",
+          outputPrice: "0.0000020",
+          totalPrice: "0.1",
+          matchPattern: "(.*)(gpt-)(35|3.5)(-turbo)?(.*)",
+          projectId: null,
+          startDate: new Date("2023-12-01"),
+          tokenizerConfig: { tokensPerMessage: 3, tokensPerName: 1 },
+          unit: ModelUsageUnit.Tokens,
+        },
+      });
+      await prisma.model.create({
+        data: {
+          id: "model-2",
+          modelName: "gpt-3.5-turbo",
+          inputPrice: "0.0000020",
+          outputPrice: "0.0000040",
+          totalPrice: undefined,
+          matchPattern: "(.*)(gpt-)(35|3.5)(-turbo)?(.*)",
+          startDate: new Date("2023-12-01"),
+          tokenizerConfig: { tokensPerMessage: 3, tokensPerName: 1 },
+          unit: ModelUsageUnit.Tokens,
+          project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+        },
+      });
+
+      const dbTrace = await prisma.trace.create({
+        data: {
+          name: "trace-name",
+          project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+        },
+      });
+
+      await prisma.observation.create({
+        data: {
+          traceId: dbTrace.id,
+          type: "GENERATION",
+          project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+          model: "gpt-3.5-turbo",
+          internalModel: "gpt-3.5-turbo",
+          startTime: new Date("2024-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          promptTokens: 200,
+          completionTokens: 3000,
+          totalTokens: undefined,
+        },
+      });
+
+      const view = await prisma.observationView.findFirst({
+        where: { traceId: dbTrace.id },
+      });
+
+      // calculated cost fields
+      expect(view?.modelId).toBe(input.expectedModelId);
+      expect(view?.calculatedInputCost?.toString()).toBe(
+        input.expectedInputCost,
+      );
+      expect(view?.calculatedOutputCost?.toString()).toBe(
+        input.expectedOutputCost,
+      );
+      expect(view?.calculatedTotalCost?.toString()).toBe(
+        input.expectedTotalCost,
+      );
+    });
+  });
+  it(`should prioritize latest models`, async () => {
+    await pruneDatabase();
+
+    await prisma.model.create({
+      data: {
+        id: "model-1",
+        modelName: "gpt-3.5-turbo",
+        inputPrice: "0.0000010",
+        outputPrice: "0.0000020",
+        totalPrice: "0.1",
+        matchPattern: "(.*)(gpt-)(35|3.5)(-turbo)?(.*)",
+        projectId: null,
+        startDate: new Date("2023-12-01"),
+        tokenizerConfig: { tokensPerMessage: 3, tokensPerName: 1 },
+        unit: ModelUsageUnit.Tokens,
+      },
+    });
+    await prisma.model.create({
+      data: {
+        id: "model-2",
+        modelName: "gpt-3.5-turbo",
+        inputPrice: "0.0000020",
+        outputPrice: "0.0000040",
+        totalPrice: undefined,
+        matchPattern: "(.*)(gpt-)(35|3.5)(-turbo)?(.*)",
+        startDate: new Date("2023-12-02"),
+        tokenizerConfig: { tokensPerMessage: 3, tokensPerName: 1 },
+        unit: ModelUsageUnit.Tokens,
+      },
+    });
+
+    const dbTrace = await prisma.trace.create({
+      data: {
+        name: "trace-name",
+        project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+      },
+    });
+
+    await prisma.observation.create({
+      data: {
+        traceId: dbTrace.id,
+        type: "GENERATION",
+        project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+        model: "gpt-3.5-turbo",
+        internalModel: "gpt-3.5-turbo",
+        startTime: new Date("2024-01-01T00:00:00.000Z"),
+        unit: ModelUsageUnit.Tokens,
+        promptTokens: 200,
+        completionTokens: 3000,
+        totalTokens: undefined,
+      },
+    });
+
+    const view = await prisma.observationView.findFirst({
+      where: { traceId: dbTrace.id },
+    });
+
+    console.log(view);
+
+    // calculated cost fields
+    expect(view?.modelId).toBe("model-2");
+    expect(view?.calculatedInputCost?.toString()).toBe("0.0004");
+    expect(view?.calculatedOutputCost?.toString()).toBe("0.012");
+    expect(view?.calculatedTotalCost?.toString()).toBe("0.0124");
+  });
+
+  it(`should prioritize old model if the latest model is not own one`, async () => {
+    await pruneDatabase();
+
+    await prisma.model.create({
+      data: {
+        id: "model-1",
+        modelName: "gpt-3.5-turbo",
+        inputPrice: "0.0010",
+        outputPrice: "0.0020",
+        totalPrice: "0.1",
+        matchPattern: "(.*)(gpt-)(35|3.5)(-turbo)?(.*)",
+        startDate: new Date("2023-12-02"),
+        tokenizerConfig: { tokensPerMessage: 3, tokensPerName: 1 },
+        unit: ModelUsageUnit.Tokens,
+      },
+    });
+    await prisma.model.create({
+      data: {
+        id: "model-2",
+        modelName: "gpt-3.5-turbo",
+        inputPrice: "0.0000020",
+        outputPrice: "0.0000040",
+        totalPrice: undefined,
+        matchPattern: "(.*)(gpt-)(35|3.5)(-turbo)?(.*)",
+        startDate: new Date("2023-12-01"),
+        tokenizerConfig: { tokensPerMessage: 3, tokensPerName: 1 },
+        project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+        unit: ModelUsageUnit.Tokens,
+      },
+    });
+
+    const dbTrace = await prisma.trace.create({
+      data: {
+        name: "trace-name",
+        project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+      },
+    });
+
+    await prisma.observation.create({
+      data: {
+        traceId: dbTrace.id,
+        type: "GENERATION",
+        project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+        model: "gpt-3.5-turbo",
+        internalModel: "gpt-3.5-turbo",
+        startTime: new Date("2024-01-01T00:00:00.000Z"),
+        unit: ModelUsageUnit.Tokens,
+        promptTokens: 200,
+        completionTokens: 3000,
+        totalTokens: undefined,
+      },
+    });
+
+    const view = await prisma.observationView.findFirst({
+      where: { traceId: dbTrace.id },
+    });
+
+    console.log(view);
+
+    // calculated cost fields
+    expect(view?.modelId).toBe("model-2");
+    expect(view?.calculatedInputCost?.toString()).toBe("0.0004");
+    expect(view?.calculatedOutputCost?.toString()).toBe("0.012");
+    expect(view?.calculatedTotalCost?.toString()).toBe("0.0124");
+  });
+
+  it(`should prioritize user provided cost`, async () => {
+    await pruneDatabase();
+
+    await prisma.model.create({
+      data: {
+        id: "model-1",
+        modelName: "gpt-3.5-turbo",
+        inputPrice: "0.0010",
+        outputPrice: "0.0020",
+        totalPrice: "0.1",
+        matchPattern: "(.*)(gpt-)(35|3.5)(-turbo)?(.*)",
+        startDate: new Date("2023-12-02"),
+        tokenizerConfig: { tokensPerMessage: 3, tokensPerName: 1 },
+        unit: ModelUsageUnit.Tokens,
+      },
+    });
+    await prisma.model.create({
+      data: {
+        id: "model-2",
+        modelName: "gpt-3.5-turbo",
+        inputPrice: "0.0020",
+        outputPrice: "0.0040",
+        totalPrice: undefined,
+        matchPattern: "(.*)(gpt-)(35|3.5)(-turbo)?(.*)",
+        startDate: new Date("2023-12-01"),
+        tokenizerConfig: { tokensPerMessage: 3, tokensPerName: 1 },
+        project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+        unit: ModelUsageUnit.Tokens,
+      },
+    });
+
+    const dbTrace = await prisma.trace.create({
+      data: {
+        name: "trace-name",
+        project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+      },
+    });
+
+    await prisma.observation.create({
+      data: {
+        traceId: dbTrace.id,
+        type: "GENERATION",
+        project: { connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" } },
+        model: "gpt-3.5-turbo",
+        internalModel: "gpt-3.5-turbo",
+        startTime: new Date("2024-01-01T00:00:00.000Z"),
+        unit: ModelUsageUnit.Tokens,
+        promptTokens: 200,
+        completionTokens: 3000,
+        totalTokens: undefined,
+        inputCost: "1",
+        outputCost: "2",
+        totalCost: "3",
+      },
+    });
+
+    const view = await prisma.observationView.findFirst({
+      where: { traceId: dbTrace.id },
+    });
+
+    console.log(view);
+
+    // calculated cost fields
+    expect(view?.modelId).toBe("model-2");
+    expect(view?.calculatedInputCost?.toString()).toBe("1");
+    expect(view?.calculatedOutputCost?.toString()).toBe("2");
+    expect(view?.calculatedTotalCost?.toString()).toBe("3");
+  });
+});

src/__tests__/features/orderBy/hooks/useOrderByState.clienttest.tsx

@@ -0,0 +1,110 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+import { cleanup, render } from "@testing-library/react";
+
+import { TestRouter } from "@/src/__tests__/fixtures/TestRouter";
+import { useOrderByState } from "@/src/features/orderBy/hooks/useOrderByState";
+import { LocationMock } from "@jedmao/location";
+import NextAdapterPages from "next-query-params/pages";
+import { useRouter } from "next/router";
+import { QueryParamProvider } from "use-query-params";
+
+afterEach(cleanup);
+
+jest.mock("next/router", () => ({
+  useRouter: jest.fn(),
+}));
+
+const { location: savedLocation } = window;
+
+// The test for the useOrderByState hook
+describe("useOrderByState hook", () => {
+  let testRouter: TestRouter;
+  let locationMock: LocationMock;
+
+  beforeAll(() => {
+    // @ts-expect-error - TS only allows to delete optional params; but here we want to delete it
+    // as it will be set in beforeEach
+    delete window.location;
+  });
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    locationMock = new LocationMock("https://langfuse.com");
+    testRouter = new TestRouter(locationMock);
+    window.location = locationMock;
+
+    (useRouter as jest.Mock).mockReturnValue(testRouter);
+  });
+
+  afterAll(() => {
+    window.location = savedLocation;
+  });
+
+  test("orderBy takes the default value if no url param is given", () => {
+    const result = render(
+      <QueryParamProvider adapter={NextAdapterPages}>
+        <UseOrderByStateExample />
+      </QueryParamProvider>,
+    );
+
+    expect(result.queryByText(/column Column 1, order DESC/)).toBeTruthy();
+  });
+
+  test("setOrderBy updates orderBy query param", () => {
+    const result = render(
+      <QueryParamProvider adapter={NextAdapterPages}>
+        <UseOrderByStateExample />
+      </QueryParamProvider>,
+    );
+
+    result.queryByText(/Set Order/)!.click();
+    result.rerender(
+      <QueryParamProvider adapter={NextAdapterPages}>
+        <UseOrderByStateExample />
+      </QueryParamProvider>,
+    );
+
+    expect(result.queryByText(/column Column 2, order ASC/)).toBeTruthy();
+    expect(locationMock.searchParams.get("orderBy")).toBe(
+      "column-Column 2_order-ASC",
+    );
+  });
+
+  test("orderBy reads the given param from the url", () => {
+    locationMock.replace(
+      "https://langfuse.com?orderBy=column-Column 3_order-DESC",
+    );
+
+    const result = render(
+      <QueryParamProvider adapter={NextAdapterPages}>
+        <UseOrderByStateExample />
+      </QueryParamProvider>,
+    );
+
+    expect(result.queryByText(/column Column 3, order DESC/)).toBeTruthy();
+  });
+});
+
+const UseOrderByStateExample = () => {
+  const [orderBy, setOrderBy] = useOrderByState({
+    column: "Column 1",
+    order: "DESC",
+  });
+
+  return (
+    <>
+      <h1>{`column ${orderBy?.column}, order ${orderBy?.order}`}</h1>
+      <button
+        onClick={() => {
+          setOrderBy({
+            column: "Column 2",
+            order: "ASC",
+          });
+        }}
+      >
+        Set Order
+      </button>
+    </>
+  );
+};

src/__tests__/features/orderBy/server/orderByToPrisma.clienttest.ts

@@ -0,0 +1,29 @@
+import { orderByToPrismaSql } from "@/src/features/orderBy/server/orderByToPrisma";
+import { tracesTableCols } from "@/src/server/api/definitions/tracesTable";
+
+// The test for the orderByToPrisma function
+describe("orderByToPrisma (Convert orderBy to Prisma.sql)", () => {
+  test("orderByToPrisma throws error for orderBy column not included in column defs", () => {
+    expect(() =>
+      orderByToPrismaSql(
+        {
+          column: "InvalidCol",
+          order: "ASC",
+        },
+        tracesTableCols,
+      ),
+    ).toThrow(/Invalid filter column: InvalidCol/);
+  });
+
+  test("orderByToPrisma throws error for orderBy order that is not valid", () => {
+    expect(() =>
+      orderByToPrismaSql(
+        {
+          column: "latency",
+          order: "test" as "ASC" | "DESC",
+        },
+        tracesTableCols,
+      ),
+    ).toThrow(/Invalid order: test/);
+  });
+});

src/__tests__/fixtures/TestRouter.ts

@@ -0,0 +1,56 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+import { type Router } from "next/router";
+import type { UrlObject } from "url";
+import { type LocationMock } from "@jedmao/location";
+
+type PartialRouter = Partial<Router>;
+
+export const BASE_URL = "https://langfuse.com";
+
+/**
+ * A Router to be used for testing which provides the bare minimum needed
+ * for the useQueryParam(s) hook and NextAdapter to work.
+ */
+export class TestRouter implements PartialRouter {
+  isReady = true;
+  pathname = "/";
+  private currentUrl = "";
+  private history: string[] = [];
+
+  constructor(private locationMock: LocationMock) {}
+
+  replace = (url: string | UrlObject) => {
+    // eslint-disable-next-line @typescript-eslint/no-base-to-string, @typescript-eslint/restrict-template-expressions
+    this.locationMock.assign(`${BASE_URL}${url}`);
+    this.currentUrl = TestRouter.getURLString(url);
+    this.locationMock.assign(`${BASE_URL}${this.currentUrl}`);
+    return Promise.resolve(true);
+  };
+
+  push = (url: string | UrlObject) => {
+    this.history.push(this.currentUrl);
+    this.currentUrl = TestRouter.getURLString(url);
+    this.locationMock.assign(`${BASE_URL}${this.currentUrl}`);
+    return Promise.resolve(true);
+  };
+
+  setIsReady = (isReady: boolean) => {
+    this.isReady = isReady;
+  };
+
+  get asPath() {
+    return this.pathname;
+  }
+
+  static getURLString(url: string | UrlObject): string {
+    if (typeof url === "string") {
+      return url;
+    }
+    return `${url.pathname}${url.search}`;
+  }
+
+  getParams(): URLSearchParams {
+    return new URL(`${BASE_URL}${this.currentUrl}`).searchParams;
+  }
+}

src/__tests__/generation-exports.servertest.ts

@@ -0,0 +1,194 @@
+/** @jest-environment node */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+
+import { pruneDatabase } from "@/src/__tests__/test-utils";
+import { ModelUsageUnit } from "@/src/constants";
+import { appRouter } from "@/src/server/api/root";
+import { createInnerTRPCContext } from "@/src/server/api/trpc";
+import { prisma } from "@/src/server/db";
+import type { Session } from "next-auth";
+
+describe("observations.export RPC", () => {
+  const numberOfGenerations = 5;
+  const projectId = "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a";
+
+  beforeAll(async () => {
+    // Disable S3 upload
+    process.env.S3_ENDPOINT = "";
+
+    await pruneDatabase();
+    const traceId = "trace-1";
+
+    await prisma.trace.create({
+      data: {
+        id: traceId,
+        name: "trace-name",
+        userId: "user-1",
+        projectId,
+        metadata: { key: "value" },
+        release: "1.0.0",
+        version: "2.0.0",
+      },
+    });
+
+    for (let i = 1; i <= numberOfGenerations; i++) {
+      await prisma.observation.create({
+        data: {
+          type: "GENERATION",
+          id: `generation-${i}`,
+          name: `generation-${i}`,
+          model: "gpt-3.5-turbo",
+          totalCost: 1,
+          startTime: new Date("2021-01-01T00:00:00.000Z"),
+          endTime: new Date("2021-01-01T00:00:05.000Z"),
+          project: { connect: { id: projectId } },
+          traceId,
+          input: [
+            {
+              role: "system",
+              content: "Be a helpful assistant",
+            },
+            {
+              role: "user",
+              content: "How can i create a React component?",
+            },
+          ],
+          output: {
+            completion: `Creating a React component can be done in two ways.`,
+          },
+          metadata: {
+            user: `user-@langfuse.com`,
+          },
+          unit: ModelUsageUnit.Tokens,
+        },
+      });
+    }
+  });
+
+  afterAll(async () => await pruneDatabase());
+
+  const session: Session = {
+    expires: "1",
+    user: {
+      id: "clgb17vnp000008jjere5g15i",
+      name: "John Doe",
+      projects: [
+        {
+          id: projectId,
+          role: "ADMIN",
+          name: "test",
+        },
+      ],
+      featureFlags: {
+        templateFlag: true,
+      },
+      admin: true,
+    },
+  };
+
+  const ctx = createInnerTRPCContext({ session });
+  const caller = appRouter.createCaller({ ...ctx, prisma });
+
+  it("should return a CSV file", async () => {
+    const result = await caller.generations.export({
+      fileFormat: "CSV",
+      orderBy: { column: "id", order: "ASC" },
+      filter: [
+        {
+          column: "start_time",
+          type: "datetime",
+          operator: ">",
+          value: new Date("1990-01-01"),
+        },
+      ],
+      projectId,
+      searchQuery: null,
+    });
+
+    if (result.type !== "data")
+      throw new Error("No data returned. Is S3 accidentally enabled?");
+    const { data, fileName } = result;
+
+    const fileExtension = fileName.split(".").pop();
+    expect(fileName).toContain(`lf-export-${projectId}`);
+    expect(fileExtension).toBe("csv");
+    expect(data.split("\n").filter(Boolean).length).toBe(
+      numberOfGenerations + 1,
+    );
+  });
+
+  it("should return a JSON file", async () => {
+    const result = await caller.generations.export({
+      fileFormat: "JSON",
+      orderBy: { column: "id", order: "ASC" },
+      filter: [
+        {
+          column: "start_time",
+          type: "datetime",
+          operator: ">",
+          value: new Date("1990-01-01"),
+        },
+      ],
+      projectId,
+      searchQuery: null,
+    });
+
+    if (result.type !== "data")
+      throw new Error("No data returned. Is S3 accidentally enabled?");
+    const { data, fileName } = result;
+
+    const fileExtension = fileName.split(".").pop();
+    expect(fileName).toContain(`lf-export-${projectId}`);
+    expect(fileExtension).toBe("json");
+
+    expect(JSON.parse(data).length).toBe(numberOfGenerations);
+  });
+
+  it("should return a OPENAI-JSONL file", async () => {
+    const result = await caller.generations.export({
+      fileFormat: "OPENAI-JSONL",
+      orderBy: { column: "id", order: "ASC" },
+      filter: [
+        {
+          column: "start_time",
+          type: "datetime",
+          operator: ">",
+          value: new Date("1990-01-01"),
+        },
+      ],
+      projectId,
+      searchQuery: null,
+    });
+
+    if (result.type !== "data")
+      throw new Error("No data returned. Is S3 accidentally enabled?");
+    const { data, fileName } = result;
+
+    const fileExtension = fileName.split(".").pop();
+    expect(fileName).toContain(`lf-export-${projectId}`);
+    expect(fileExtension).toBe("jsonl");
+
+    expect(data.split("\n").filter(Boolean).length).toBe(numberOfGenerations);
+  });
+
+  it("should throw on unsupported file formats", async () => {
+    const unsupportedFileFormat = "XLSX";
+
+    const call = caller.generations.export({
+      fileFormat: unsupportedFileFormat as unknown as "JSON",
+      orderBy: { column: "id", order: "ASC" },
+      filter: [
+        {
+          column: "start_time",
+          type: "datetime",
+          operator: ">",
+          value: new Date("1990-01-01"),
+        },
+      ],
+      projectId,
+      searchQuery: null,
+    });
+
+    await expect(call).rejects.toThrow();
+  });
+});

src/__tests__/generations.servertest.ts

@@ -1,9 +1,11 @@
 /** @jest-environment node */
 
-import { prisma } from "@/src/server/db";
-import { makeAPICall, pruneDatabase } from "@/src/__tests__/test-utils";
 import { v4 as uuidv4 } from "uuid";
 
+import { makeAPICall, pruneDatabase } from "@/src/__tests__/test-utils";
+import { ModelUsageUnit } from "@/src/constants";
+import { prisma } from "@/src/server/db";
+
 describe("/api/public/generations API Endpoint", () => {
   beforeEach(async () => await pruneDatabase());
 
@@ -13,9 +15,9 @@ describe("/api/public/generations API Endpoint", () => {
         input: 100,
         output: 200,
         total: 100,
-        unit: "CHARACTERS",
+        unit: ModelUsageUnit.Characters,
       },
-      expectedUnit: "CHARACTERS",
+      expectedUnit: ModelUsageUnit.Characters,
       expectedPromptTokens: 100,
       expectedCompletionTokens: 200,
       expectedTotalTokens: 100,
@@ -23,9 +25,9 @@ describe("/api/public/generations API Endpoint", () => {
     {
       usage: {
         total: 100,
-        unit: "CHARACTERS",
+        unit: ModelUsageUnit.Characters,
       },
-      expectedUnit: "CHARACTERS",
+      expectedUnit: ModelUsageUnit.Characters,
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 100,
@@ -34,7 +36,7 @@ describe("/api/public/generations API Endpoint", () => {
       usage: {
         total: 100,
       },
-      expectedUnit: "TOKENS",
+      expectedUnit: null,
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 100,
@@ -48,7 +50,7 @@ describe("/api/public/generations API Endpoint", () => {
       expectedPromptTokens: 100,
       expectedCompletionTokens: 200,
       expectedTotalTokens: 100,
-      expectedUnit: "TOKENS",
+      expectedUnit: ModelUsageUnit.Tokens,
     },
     {
       usage: {
@@ -57,28 +59,28 @@ describe("/api/public/generations API Endpoint", () => {
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 100,
-      expectedUnit: "TOKENS",
+      expectedUnit: ModelUsageUnit.Tokens,
     },
     {
       usage: undefined,
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 0,
-      expectedUnit: "TOKENS",
+      expectedUnit: null,
     },
     {
       usage: null,
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 0,
-      expectedUnit: "TOKENS",
+      expectedUnit: null,
     },
     {
       usage: {},
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 0,
-      expectedUnit: "TOKENS",
+      expectedUnit: null,
     },
   ].forEach((testConfig) => {
     it(`should create generation after trace 1 ${JSON.stringify(

src/__tests__/ingestion.servertest.ts

@@ -1,9 +1,11 @@
 /** @jest-environment node */
 
+import { v4 } from "uuid";
+
 import { makeAPICall, pruneDatabase } from "@/src/__tests__/test-utils";
+import { ModelUsageUnit } from "@/src/constants";
 import { cleanEvent } from "@/src/pages/api/public/ingestion";
 import { prisma } from "@/src/server/db";
-import { v4 } from "uuid";
 
 describe("/api/public/ingestion API Endpoint", () => {
   beforeEach(async () => await pruneDatabase());
@@ -14,9 +16,12 @@ describe("/api/public/ingestion API Endpoint", () => {
         input: 100,
         output: 200,
         total: 100,
-        unit: "CHARACTERS",
+        unit: ModelUsageUnit.Characters,
+        inputCost: 123,
+        outputCost: 456,
+        totalCost: 789,
       },
-      expectedUnit: "CHARACTERS",
+      expectedUnit: ModelUsageUnit.Characters,
       expectedPromptTokens: 100,
       expectedCompletionTokens: 200,
       expectedTotalTokens: 100,
@@ -24,9 +29,9 @@ describe("/api/public/ingestion API Endpoint", () => {
     {
       usage: {
         total: 100,
-        unit: "CHARACTERS",
+        unit: ModelUsageUnit.Characters,
       },
-      expectedUnit: "CHARACTERS",
+      expectedUnit: ModelUsageUnit.Characters,
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 100,
@@ -34,8 +39,40 @@ describe("/api/public/ingestion API Endpoint", () => {
     {
       usage: {
         total: 100,
+        unit: ModelUsageUnit.Milliseconds,
       },
-      expectedUnit: "TOKENS",
+      expectedUnit: ModelUsageUnit.Milliseconds,
+      expectedPromptTokens: 0,
+      expectedCompletionTokens: 0,
+      expectedTotalTokens: 100,
+    },
+    {
+      usage: {
+        input: 1,
+        output: 2,
+        unit: ModelUsageUnit.Images,
+      },
+      expectedUnit: ModelUsageUnit.Images,
+      expectedPromptTokens: 1,
+      expectedCompletionTokens: 2,
+      expectedTotalTokens: 3,
+    },
+    {
+      usage: {
+        input: 30,
+        output: 10,
+        unit: ModelUsageUnit.Seconds,
+      },
+      expectedUnit: ModelUsageUnit.Seconds,
+      expectedPromptTokens: 30,
+      expectedCompletionTokens: 10,
+      expectedTotalTokens: 40,
+    },
+    {
+      usage: {
+        total: 100,
+      },
+      expectedUnit: null,
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 100,
@@ -49,7 +86,7 @@ describe("/api/public/ingestion API Endpoint", () => {
       expectedPromptTokens: 100,
       expectedCompletionTokens: 200,
       expectedTotalTokens: 100,
-      expectedUnit: "TOKENS",
+      expectedUnit: ModelUsageUnit.Tokens,
     },
     {
       usage: {
@@ -58,31 +95,31 @@ describe("/api/public/ingestion API Endpoint", () => {
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 100,
-      expectedUnit: "TOKENS",
+      expectedUnit: ModelUsageUnit.Tokens,
     },
     {
       usage: undefined,
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 0,
-      expectedUnit: "TOKENS",
+      expectedUnit: null,
     },
     {
       usage: null,
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 0,
-      expectedUnit: "TOKENS",
+      expectedUnit: null,
     },
     {
       usage: {},
       expectedPromptTokens: 0,
       expectedCompletionTokens: 0,
       expectedTotalTokens: 0,
-      expectedUnit: "TOKENS",
+      expectedUnit: null,
     },
   ].forEach((testConfig) => {
-    it(`should create trace and generation ${JSON.stringify(
+    it(`should create trace, generation and score without matching models ${JSON.stringify(
       testConfig,
     )}`, async () => {
       const traceId = v4();
@@ -107,6 +144,7 @@ describe("/api/public/ingestion API Endpoint", () => {
               metadata: { key: "value" },
               release: "1.0.0",
               version: "2.0.0",
+              tags: ["tag-1", "tag-2"],
             },
           },
           {
@@ -185,6 +223,7 @@ describe("/api/public/ingestion API Endpoint", () => {
       expect(dbTrace[0]?.projectId).toBe(
         "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
       );
+      expect(dbTrace[0]?.tags).toEqual(["tag-1", "tag-2"]);
 
       const dbGeneration = await prisma.observation.findUnique({
         where: {
@@ -206,6 +245,7 @@ describe("/api/public/ingestion API Endpoint", () => {
       expect(dbGeneration?.input).toEqual({ key: "value" });
       expect(dbGeneration?.metadata).toEqual({ key: "value" });
       expect(dbGeneration?.version).toBe("2.0.0");
+      expect(dbGeneration?.internalModel).toBeNull();
       expect(dbGeneration?.promptTokens).toEqual(
         testConfig.expectedPromptTokens,
       );
@@ -246,6 +286,265 @@ describe("/api/public/ingestion API Endpoint", () => {
     });
   });
 
+  [
+    {
+      observationExternalModel: "gpt-3.5",
+      observationStartTime: new Date("2021-01-01T00:00:00.000Z"),
+      modelUnit: ModelUsageUnit.Tokens,
+      expectedInternalModel: "gpt-3.5-turbo",
+      expectedPromptTokens: 5,
+      expectedCompletionTokens: 7,
+      models: [
+        {
+          modelName: "gpt-3.5-turbo",
+          matchPattern: "(?i)^(gpt-)(35|3.5)(-turbo)?$",
+          startDate: new Date("2021-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          tokenizerId: "openai",
+        },
+      ],
+    },
+    {
+      observationExternalModel: "gpt-3.5",
+      observationStartTime: new Date("2021-01-01T00:00:00.000Z"),
+      modelUnit: ModelUsageUnit.Tokens,
+      expectedInternalModel: "gpt-3.5-turbo",
+      expectedPromptTokens: 5,
+      expectedCompletionTokens: 7,
+      models: [
+        {
+          modelName: "gpt-3.5-turbo",
+          matchPattern: "(?i)^(gpt-)(35|3.5)(-turbo)?$",
+          startDate: null,
+          unit: ModelUsageUnit.Tokens,
+          tokenizerId: "openai",
+        },
+      ],
+    },
+    {
+      observationExternalModel: "GPT-3.5",
+      observationStartTime: new Date("2021-01-01T00:00:00.000Z"),
+      modelUnit: ModelUsageUnit.Tokens,
+      expectedInternalModel: "gpt-3.5-turbo",
+      expectedPromptTokens: 5,
+      expectedCompletionTokens: 7,
+      models: [
+        {
+          modelName: "gpt-3.5-turbo",
+          matchPattern: "(?i)^(gpt-)(35|3.5)(-turbo)?$",
+          startDate: new Date("2021-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          tokenizerId: "openai",
+        },
+      ],
+    },
+    {
+      observationExternalModel: "GPT-3.5",
+      observationStartTime: new Date("2021-01-01T00:00:00.000Z"),
+      modelUnit: ModelUsageUnit.Tokens,
+      expectedInternalModel: "gpt-3.5-turbo",
+      expectedPromptTokens: 5,
+      expectedCompletionTokens: 7,
+      models: [
+        {
+          modelName: "gpt-3.5-turbo",
+          matchPattern: "(?i)^(gpt-)(35|3.5)(-turbo)?$",
+          startDate: new Date("2021-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          tokenizerId: "openai",
+        },
+        {
+          modelName: "gpt-3.5-turbo-new",
+          matchPattern: "(?i)^(gpt-)(35|3.5)(-turbo)?$",
+          startDate: new Date("2021-01-01T10:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          tokenizerId: "openai",
+        },
+      ],
+    },
+    {
+      observationExternalModel: "GPT-3.5",
+      observationStartTime: new Date("2021-01-02T00:00:00.000Z"),
+      modelUnit: ModelUsageUnit.Tokens,
+      expectedInternalModel: "gpt-3.5-turbo",
+      expectedPromptTokens: 5,
+      expectedCompletionTokens: 7,
+      models: [
+        {
+          modelName: "gpt-3.5-turbo-new",
+          matchPattern: "(?i)^(gpt-)(35|3.5)(-turbo)?$",
+          startDate: new Date("2021-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          tokenizerId: "openai",
+        },
+        {
+          modelName: "gpt-3.5-turbo",
+          matchPattern: "(?i)^(gpt-)(35|3.5)(-turbo)?$",
+          startDate: new Date("2021-01-01T10:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          tokenizerId: "openai",
+          tokenizerModel: "gpt-3.5-turbo",
+        },
+      ],
+    },
+    {
+      observationExternalModel: "ft:gpt-3.5-turbo-1106:my-org:custom_suffix:id",
+      observationStartTime: new Date("2022-01-01T10:00:00.000Z"),
+      modelUnit: ModelUsageUnit.Tokens,
+      expectedInternalModel: "ft:gpt-3.5-turbo-1106",
+      expectedPromptTokens: 0,
+      expectedCompletionTokens: 0,
+      models: [
+        {
+          modelName: "ft:gpt-3.5-turbo-1106",
+          matchPattern: "(?i)^(ft:)(gpt-3.5-turbo-1106:)(.+)(:)(.*)(:)(.+)$",
+          startDate: new Date("2022-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          tokenizerId: "openai",
+        },
+      ],
+    },
+    {
+      observationExternalModel: "ft:babbage-002:my-org#2:custom_suffix-2:id",
+      observationStartTime: new Date("2022-01-01T10:00:00.000Z"),
+      modelUnit: ModelUsageUnit.Tokens,
+      expectedInternalModel: "ft:babbage-002",
+      expectedPromptTokens: 0,
+      expectedCompletionTokens: 0,
+      models: [
+        {
+          modelName: "ft:babbage-002",
+          matchPattern: "(?i)^(ft:)(babbage-002:)(.+)(:)(.*)(:)(.+)$",
+          startDate: new Date("2022-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          tokenizerId: "openai",
+        },
+      ],
+    },
+    {
+      observationExternalModel: "GPT-4",
+      observationStartTime: new Date("2021-01-01T00:00:00.000Z"),
+      modelUnit: ModelUsageUnit.Tokens,
+      expectedInternalModel: null,
+      expectedPromptTokens: 0,
+      expectedCompletionTokens: 0,
+      models: [
+        {
+          modelName: "gpt-3.5-turbo",
+          matchPattern: "(?i)^(gpt-)(35|3.5)(-turbo)?$",
+          startDate: new Date("2021-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          tokenizerId: "openai",
+        },
+      ],
+    },
+    {
+      observationExternalModel: "GPT-3",
+      observationStartTime: new Date("2021-01-01T00:00:00.000Z"),
+      modelUnit: ModelUsageUnit.Characters,
+      expectedInternalModel: null,
+      expectedPromptTokens: 0,
+      expectedCompletionTokens: 0,
+      models: [
+        {
+          modelName: "gpt-3.5-turbo",
+          matchPattern: "(?i)^(gpt-)(35|3.5)(-turbo)?$",
+          startDate: new Date("2021-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          tokenizerId: "openai",
+        },
+      ],
+    },
+  ].forEach((testConfig) => {
+    it(`should match observations to internal models ${JSON.stringify(
+      testConfig,
+    )}`, async () => {
+      const traceId = v4();
+      const generationId = v4();
+
+      await Promise.all(
+        testConfig.models.map(async (model) =>
+          prisma.model.create({
+            data: {
+              modelName: model.modelName,
+              matchPattern: model.matchPattern,
+              startDate: model.startDate,
+              unit: model.unit,
+              tokenizerId: model.tokenizerId,
+              tokenizerConfig: {
+                tokensPerMessage: 3,
+                tokensPerName: 1,
+                tokenizerModel:
+                  "tokenizerModel" in model
+                    ? model.tokenizerModel
+                    : model.modelName,
+              },
+            },
+          }),
+        ),
+      );
+
+      const response = await makeAPICall("POST", "/api/public/ingestion", {
+        metadata: {
+          sdk_verion: "1.0.0",
+          sdk_name: "python",
+        },
+        batch: [
+          {
+            id: v4(),
+            type: "trace-create",
+            timestamp: new Date().toISOString(),
+            body: {
+              id: traceId,
+              name: "trace-name",
+            },
+          },
+          {
+            id: v4(),
+            type: "observation-create",
+            timestamp: new Date().toISOString(),
+            body: {
+              id: generationId,
+              traceId: traceId,
+              type: "GENERATION",
+              name: "generation-name",
+              startTime: testConfig.observationStartTime.toISOString(),
+              model: testConfig.observationExternalModel,
+              usage: {
+                unit: testConfig.modelUnit,
+              },
+              input: "This is a great prompt",
+              output: "This is a great gpt output",
+            },
+          },
+        ],
+      });
+
+      expect(response.status).toBe(207);
+
+      console.log("response body", response.body);
+
+      const dbGeneration = await prisma.observation.findUnique({
+        where: {
+          id: generationId,
+        },
+      });
+
+      expect(dbGeneration?.id).toBe(generationId);
+      expect(dbGeneration?.traceId).toBe(traceId);
+      expect(dbGeneration?.name).toBe("generation-name");
+      expect(dbGeneration?.startTime).toEqual(testConfig.observationStartTime);
+      expect(dbGeneration?.model).toBe(testConfig.observationExternalModel);
+      expect(dbGeneration?.promptTokens).toBe(testConfig.expectedPromptTokens);
+      expect(dbGeneration?.completionTokens).toBe(
+        testConfig.expectedCompletionTokens,
+      );
+      expect(dbGeneration?.internalModel).toBe(
+        testConfig.expectedInternalModel,
+      );
+    });
+  });
+
   it("should create and update all events", async () => {
     const traceId = v4();
     const generationId = v4();
@@ -298,6 +597,7 @@ describe("/api/public/ingestion API Endpoint", () => {
             id: generationId,
             traceId: traceId,
             parentObservationId: spanId,
+            modelParameters: { someKey: ["user-1", "user-2"] },
           },
         },
         {
@@ -374,6 +674,9 @@ describe("/api/public/ingestion API Endpoint", () => {
     expect(dbGeneration?.traceId).toBe(traceId);
     expect(dbGeneration?.name).toBe("generation-name");
     expect(dbGeneration?.parentObservationId).toBe(spanId);
+    expect(dbGeneration?.modelParameters).toEqual({
+      someKey: ["user-1", "user-2"],
+    });
 
     const dbEvent = await prisma.observation.findUnique({
       where: {
@@ -492,10 +795,10 @@ describe("/api/public/ingestion API Endpoint", () => {
 
     expect("errors" in responseOne.body).toBe(true);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    expect(responseOne.body?.errors.length).toBe(1);
+    expect(responseOne.body.errors.length).toBe(1);
     expect("successes" in responseOne.body).toBe(true);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    expect(responseOne.body?.successes.length).toBe(1);
+    expect(responseOne.body.successes.length).toBe(1);
 
     const dbTrace = await prisma.trace.findMany({
       where: {
@@ -544,10 +847,10 @@ describe("/api/public/ingestion API Endpoint", () => {
 
     expect("errors" in responseOne.body).toBe(true);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    expect(responseOne.body?.errors.length).toBe(1);
+    expect(responseOne.body.errors.length).toBe(1);
     expect("successes" in responseOne.body).toBe(true);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    expect(responseOne.body?.successes.length).toBe(1);
+    expect(responseOne.body.successes.length).toBe(1);
 
     const dbTrace = await prisma.trace.findMany({
       where: {
@@ -594,10 +897,10 @@ describe("/api/public/ingestion API Endpoint", () => {
 
     expect("errors" in responseOne.body).toBe(true);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    expect(responseOne.body?.errors.length).toBe(1);
+    expect(responseOne.body.errors.length).toBe(1);
     expect("successes" in responseOne.body).toBe(true);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    expect(responseOne.body?.successes.length).toBe(1);
+    expect(responseOne.body.successes.length).toBe(1);
 
     const dbTrace = await prisma.trace.findMany({
       where: {
@@ -612,6 +915,21 @@ describe("/api/public/ingestion API Endpoint", () => {
     const traceId = v4();
     const generationId = v4();
 
+    await prisma.model.create({
+      data: {
+        modelName: "gpt-3.5",
+        matchPattern: "(?i)^(gpt-)(35|3.5)(-turbo)?$",
+        startDate: new Date("2021-01-01T00:00:00.000Z"),
+        unit: ModelUsageUnit.Tokens,
+        tokenizerId: "openai",
+        tokenizerConfig: {
+          tokensPerMessage: 3,
+          tokensPerName: 1,
+          tokenizerModel: "gpt-3.5-turbo",
+        },
+      },
+    });
+
     const responseOne = await makeAPICall("POST", "/api/public/ingestion", {
       batch: [
         {
@@ -679,6 +997,21 @@ describe("/api/public/ingestion API Endpoint", () => {
     const traceId = v4();
     const generationId = v4();
 
+    await prisma.model.create({
+      data: {
+        modelName: "gpt-3.5",
+        matchPattern: "(?i)^(gpt-)(35|3.5)(-turbo)?$",
+        startDate: new Date("2021-01-01T00:00:00.000Z"),
+        unit: ModelUsageUnit.Tokens,
+        tokenizerId: "openai",
+        tokenizerConfig: {
+          tokensPerMessage: 3,
+          tokensPerName: 1,
+          tokenizerModel: "gpt-3.5-turbo",
+        },
+      },
+    });
+
     const responseOne = await makeAPICall("POST", "/api/public/ingestion", {
       batch: [
         {
@@ -788,6 +1121,66 @@ describe("/api/public/ingestion API Endpoint", () => {
     expect(dbTrace[0]?.version).toBe("2.0.0");
   });
 
+  it("should not override a trace from a different project", async () => {
+    const traceId = v4();
+    const newProjectId = v4();
+
+    await prisma.project.create({
+      data: {
+        id: newProjectId,
+        name: "another-project",
+      },
+    });
+
+    await prisma.trace.create({
+      data: {
+        id: traceId,
+        project: { connect: { id: newProjectId } },
+      },
+    });
+
+    const responseOne = await makeAPICall("POST", "/api/public/ingestion", {
+      batch: [
+        {
+          id: v4(),
+          type: "trace-create",
+          timestamp: new Date().toISOString(),
+          body: {
+            id: traceId,
+            name: "trace-name",
+            userId: "user-1",
+            metadata: { key: "value" },
+            release: "1.0.0",
+            version: "2.0.0",
+          },
+        },
+      ],
+    });
+    expect(responseOne.status).toBe(207);
+
+    console.log(responseOne.body);
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+    const errors = responseOne.body.errors;
+
+    expect(errors).toBeDefined();
+    console.log(errors);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    expect(errors.length).toBe(1);
+
+    const dbTrace = await prisma.trace.findMany({
+      where: {
+        id: traceId,
+      },
+    });
+
+    expect(dbTrace.length).toEqual(1);
+    expect(dbTrace[0]?.name).toBeNull();
+    expect(dbTrace[0]?.release).toBeNull();
+    expect(dbTrace[0]?.metadata).toBeNull();
+    expect(dbTrace[0]?.version).toBeNull();
+  });
+
   [
     {
       inputs: [{ a: "a" }, { b: "b" }],
@@ -1021,4 +1414,355 @@ IB Home   /   . . .   /   News   /   News about the IB   /   Why ChatGPT is an o
       expect(cleanedEvent).toStrictEqual(expected);
     });
   });
+
+  it("should allow score ingestion via Basic auth", async () => {
+    const projectId = "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a";
+    const traceId = "trace_id";
+
+    const scoreId = "score_id";
+    const scoreEventId = "score_event_id";
+    const scoreName = "score-name";
+    const scoreValue = 100.5;
+
+    // Seed db with a trace to be scored
+    await prisma.trace.create({
+      data: {
+        id: traceId,
+        name: "trace-name",
+        project: { connect: { id: projectId } },
+      },
+    });
+
+    const response = await makeAPICall("POST", "/api/public/ingestion", {
+      batch: [
+        {
+          id: scoreEventId,
+          type: "score-create",
+          timestamp: new Date().toISOString(),
+          body: {
+            id: scoreId,
+            name: scoreName,
+            value: scoreValue,
+            traceId: traceId,
+          },
+        },
+      ],
+    });
+
+    expect(response.status).toBe(207);
+    expect(response.body.successes.length).toBe(1);
+    expect(response.body.successes[0]?.id).toBe(scoreEventId);
+    expect(response.body.errors.length).toBe(0);
+
+    const dbScore = await prisma.score.findUnique({
+      where: {
+        id: scoreId,
+      },
+    });
+
+    expect(dbScore?.id).toBe(scoreId);
+    expect(dbScore?.traceId).toBe(traceId);
+    expect(dbScore?.name).toBe(scoreName);
+    expect(dbScore?.value).toBe(scoreValue);
+  });
+
+  it("should allow score ingestion via Bearer auth", async () => {
+    const projectId = "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a";
+    const traceId = "trace_id";
+    const bearerAuth = "Bearer pk-lf-1234567890";
+
+    const scoreId = "score_id";
+    const scoreEventId = "score_event_id";
+    const scoreName = "score-name";
+    const scoreValue = 100.5;
+
+    // Seed db with a trace to be scored
+    await prisma.trace.create({
+      data: {
+        id: traceId,
+        name: "trace-name",
+        project: { connect: { id: projectId } },
+      },
+    });
+
+    const response = await makeAPICall(
+      "POST",
+      "/api/public/ingestion",
+      {
+        batch: [
+          {
+            id: scoreEventId,
+            type: "score-create",
+            timestamp: new Date().toISOString(),
+            body: {
+              id: scoreId,
+              name: scoreName,
+              value: scoreValue,
+              traceId: traceId,
+            },
+          },
+        ],
+      },
+      bearerAuth,
+    );
+
+    expect(response.status).toBe(207);
+    expect(response.body.successes.length).toEqual(1);
+    expect(response.body.successes[0]?.id).toBe(scoreEventId);
+    expect(response.body.errors.length).toBe(0);
+
+    const dbScore = await prisma.score.findUnique({
+      where: {
+        id: scoreId,
+      },
+    });
+
+    expect(dbScore?.id).toBe(scoreId);
+    expect(dbScore?.traceId).toBe(traceId);
+    expect(dbScore?.name).toBe(scoreName);
+    expect(dbScore?.value).toBe(scoreValue);
+  });
+
+  it("should throw an Auth error on Bearer Auth for all events that are NOT 'score-create'", async () => {
+    const projectId = "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a";
+    const traceId = "trace_id";
+    const bearerAuth = "Bearer pk-lf-1234567890";
+
+    const scoreId = "score_id";
+    const scoreEventId = "score_event_id";
+    const scoreName = "score-name";
+    const scoreValue = 100.5;
+
+    const generationId = v4();
+    const spanId = v4();
+
+    const anotherTraceId = "another_trace_id";
+
+    // Seed db with a trace to be scored
+    await prisma.trace.create({
+      data: {
+        id: traceId,
+        name: "trace-name",
+        project: { connect: { id: projectId } },
+      },
+    });
+
+    const response = await makeAPICall(
+      "POST",
+      "/api/public/ingestion",
+      {
+        metadata: {
+          sdk_verion: "1.0.0",
+          sdk_name: "python",
+        },
+        batch: [
+          {
+            id: v4(),
+            type: "trace-create",
+            timestamp: new Date().toISOString(),
+            body: {
+              id: anotherTraceId,
+              name: "trace-name",
+              userId: "user-1",
+              metadata: { key: "value" },
+              release: "1.0.0",
+              version: "2.0.0",
+              tags: ["tag-1", "tag-2"],
+            },
+          },
+          {
+            id: v4(),
+            type: "observation-create",
+            timestamp: new Date().toISOString(),
+            body: {
+              id: generationId,
+              traceId: traceId,
+              type: "GENERATION",
+              name: "generation-name",
+              startTime: "2021-01-01T00:00:00.000Z",
+              endTime: "2021-01-01T00:00:00.000Z",
+              modelParameters: { key: "value" },
+              input: { key: "value" },
+              metadata: { key: "value" },
+              version: "2.0.0",
+            },
+          },
+          {
+            id: v4(),
+            type: "observation-update",
+            timestamp: new Date().toISOString(),
+            body: {
+              id: generationId,
+              type: "GENERATION",
+              output: { key: "this is a great gpt output" },
+            },
+          },
+          {
+            id: v4(),
+            type: "observation-create",
+            timestamp: new Date().toISOString(),
+            body: {
+              id: spanId,
+              traceId: traceId,
+              type: "SPAN",
+              name: "span-name",
+              startTime: "2021-01-01T00:00:00.000Z",
+              endTime: "2021-01-01T00:00:00.000Z",
+              input: { input: "value" },
+              metadata: { meta: "value" },
+              version: "2.0.0",
+            },
+          },
+          {
+            id: scoreEventId,
+            type: "score-create",
+            timestamp: new Date().toISOString(),
+            body: {
+              id: scoreId,
+              name: "score-name",
+              value: 100.5,
+              traceId: traceId,
+            },
+          },
+        ],
+      },
+      bearerAuth,
+    );
+
+    expect(response.status).toBe(207);
+    expect(response.body.successes.length).toEqual(1);
+    expect(response.body.successes[0]?.id).toEqual(scoreEventId);
+
+    expect(response.body.errors.length).toEqual(4);
+
+    const dbScore = await prisma.score.findUnique({
+      where: {
+        id: scoreId,
+      },
+    });
+
+    expect(await prisma.trace.count()).toBe(1);
+    expect(await prisma.trace.count({ where: { id: traceId } })).toBe(1);
+    expect(await prisma.observation.count()).toBe(0);
+
+    expect(dbScore?.id).toBe(scoreId);
+    expect(dbScore?.traceId).toBe(traceId);
+    expect(dbScore?.name).toBe(scoreName);
+    expect(dbScore?.value).toBe(scoreValue);
+  });
+
+  it("should error on Bearer Auth for a trace from different project", async () => {
+    const otherProjectId = "other_project_id";
+    const traceId = "trace_id";
+    const bearerAuth = "Bearer pk-lf-1234567890";
+
+    const scoreId = "score_id";
+    const scoreEventId = "score_event_id";
+    const scoreName = "score-name";
+    const scoreValue = 100.5;
+
+    // Seed db with a trace to be scored
+    try {
+      await prisma.project.create({
+        data: {
+          id: otherProjectId,
+          name: "another-project",
+        },
+      });
+
+      await prisma.trace.create({
+        data: {
+          id: traceId,
+          name: "trace-name",
+          project: { connect: { id: otherProjectId } },
+        },
+      });
+
+      const response = await makeAPICall(
+        "POST",
+        "/api/public/ingestion",
+        {
+          batch: [
+            {
+              id: scoreEventId,
+              type: "score-create",
+              timestamp: new Date().toISOString(),
+              body: {
+                id: scoreId,
+                name: scoreName,
+                value: scoreValue,
+                traceId: traceId,
+              },
+            },
+          ],
+        },
+        bearerAuth,
+      );
+
+      expect(response.status).toBe(207);
+      expect(response.body.successes.length).toBe(0);
+      expect(response.body).toHaveProperty("errors");
+      expect(response.body.errors.length).toEqual(1);
+      expect(response.body.errors[0]?.id).toEqual(scoreEventId);
+
+      expect(await prisma.trace.count()).toBe(1);
+      expect(await prisma.trace.count({ where: { id: traceId } })).toBe(1);
+
+      const dbScore = await prisma.score.findUnique({
+        where: {
+          id: scoreId,
+        },
+      });
+
+      expect(dbScore).toBeNull();
+    } finally {
+      await prisma.project.delete({ where: { id: otherProjectId } });
+    }
+  });
+
+  it("should error on Bearer Auth with a trace that does not exist", async () => {
+    const traceId = "trace_id";
+    const bearerAuth = "Bearer pk-lf-1234567890";
+
+    const scoreId = "score_id";
+    const scoreEventId = "score_event_id";
+    const scoreName = "score-name";
+    const scoreValue = 100.5;
+
+    const response = await makeAPICall(
+      "POST",
+      "/api/public/ingestion",
+      {
+        batch: [
+          {
+            id: scoreEventId,
+            type: "score-create",
+            timestamp: new Date().toISOString(),
+            body: {
+              id: scoreId,
+              name: scoreName,
+              value: scoreValue,
+              traceId: traceId,
+            },
+          },
+        ],
+      },
+      bearerAuth,
+    );
+
+    expect(response.status).toBe(207);
+    expect(response.body.successes.length).toBe(0);
+    expect(response.body.errors.length).toBe(1);
+    expect(response.body.errors[0]?.id).toBe(scoreEventId);
+
+    expect(await prisma.trace.count()).toBe(0);
+
+    const dbScore = await prisma.score.findUnique({
+      where: {
+        id: scoreId,
+      },
+    });
+
+    expect(dbScore).toBeNull();
+  });
 });

src/__tests__/model-match.servertest.ts

@@ -0,0 +1,100 @@
+/** @jest-environment node */
+
+import { modelMatch } from "@/scripts/model-match";
+import { pruneDatabase } from "@/src/__tests__/test-utils";
+import { ModelUsageUnit } from "@/src/constants";
+import { prisma } from "@/src/server/db";
+
+describe("model match", () => {
+  beforeEach(async () => await pruneDatabase());
+
+  it("should match historic observations to models", async () => {
+    await prisma.model.create({
+      data: {
+        id: "model-1",
+        modelName: "gpt-3.5-turbo",
+        inputPrice: "0.0000010",
+        outputPrice: "0.0000020",
+        totalPrice: "0.1",
+        matchPattern: "(.*)(gpt-3.5-turbo)?(.*)",
+        projectId: null,
+        unit: ModelUsageUnit.Tokens,
+        tokenizerConfig: {
+          tokensPerMessage: 3,
+          tokensPerName: 1,
+          tokenizerModel: "gpt-3.5-turbo",
+        },
+        tokenizerId: "openai",
+      },
+    });
+    await prisma.model.create({
+      data: {
+        id: "model-2",
+        modelName: "claude-1.3",
+        inputPrice: "0.0000010",
+        outputPrice: "0.0000020",
+        totalPrice: "0.1",
+        matchPattern: "(.*)(claude-1.3)?(.*)",
+        projectId: null,
+        unit: ModelUsageUnit.Tokens,
+        tokenizerId: "claude",
+      },
+    });
+
+    await prisma.observation.createMany({
+      data: [
+        {
+          id: "observation-1",
+          type: "GENERATION",
+          projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+          model: "gpt-3.5-turbo",
+          startTime: new Date("2024-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          promptTokens: 200,
+          completionTokens: 3000,
+          input: "I am a prompt",
+          output: "I am a completion",
+        },
+        {
+          type: "GENERATION",
+          projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+          model: "claude-1.3",
+          startTime: new Date("2024-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          input: "I am a prompt",
+          output: "I am a completion",
+        },
+        {
+          type: "GENERATION",
+          projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+          model: "claude-1.3",
+          startTime: new Date("2024-01-01T00:00:00.000Z"),
+          unit: ModelUsageUnit.Tokens,
+          input: "I am a prompt",
+          output: "I am a completion",
+        },
+      ],
+    });
+
+    await modelMatch();
+
+    const observations = await prisma.observation.findMany();
+
+    // check that tokens from observation-1 are not changed
+    const observation1 = observations.find((o) => o.id === "observation-1");
+    expect(observation1?.promptTokens).toEqual(200);
+    expect(observation1?.completionTokens).toEqual(3000);
+    expect(observation1?.totalTokens).toEqual(0);
+
+    expect(observations.length).toEqual(3);
+    observations.forEach((observation) => {
+      expect(observation.internalModel).toBeDefined();
+      expect(observation.promptTokens).toBeGreaterThan(0);
+      expect(observation.completionTokens).toBeGreaterThan(0);
+    });
+
+    // temporary fix: wait for 5 additional seconds to ensure that the model match is complete
+    // had issue with the test failing because the model match was not complete and logged to console
+    await new Promise((resolve) => setTimeout(resolve, 5000));
+  }, 10000);
+});

src/__tests__/observations.servertest.ts

@@ -1,11 +1,13 @@
 /** @jest-environment node */
 
-import { prisma } from "@/src/server/db";
-import { makeAPICall, pruneDatabase } from "@/src/__tests__/test-utils";
 import { v4 as uuidv4 } from "uuid";
-import { type Observation } from "@prisma/client";
 
-describe("/api/public/generations API Endpoint", () => {
+import { makeAPICall, pruneDatabase } from "@/src/__tests__/test-utils";
+import { ModelUsageUnit } from "@/src/constants";
+import { prisma } from "@/src/server/db";
+import { type ObservationView } from "@prisma/client";
+
+describe("/api/public/observations API Endpoint", () => {
   beforeEach(async () => await pruneDatabase());
   afterEach(async () => await pruneDatabase());
 
@@ -26,6 +28,19 @@ describe("/api/public/generations API Endpoint", () => {
       },
     });
 
+    const model = await prisma.model.create({
+      data: {
+        id: "model-1",
+        modelName: "gpt-3.5-turbo",
+        inputPrice: "0.0000010",
+        outputPrice: "0.0000020",
+        totalPrice: "0.1",
+        matchPattern: "(.*)(gpt-)(35|3.5)(-turbo)?(.*)",
+        projectId: null,
+        unit: ModelUsageUnit.Tokens,
+      },
+    });
+
     await prisma.observation.create({
       data: {
         id: uuidv4(),
@@ -33,15 +48,20 @@ describe("/api/public/generations API Endpoint", () => {
         name: "generation-name",
         startTime: new Date("2021-01-01T00:00:00.000Z"),
         endTime: new Date("2021-01-01T00:00:00.000Z"),
-        model: "model-name",
+        model: "gpt-3.5-turbo",
         modelParameters: { key: "value" },
         input: { key: "input" },
         output: { key: "output" },
+        promptTokens: 10,
+        completionTokens: 20,
+        totalTokens: 30,
         version: "2.0.0",
         type: "GENERATION",
         project: {
           connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
         },
+        internalModel: "gpt-3.5-turbo",
+        unit: ModelUsageUnit.Tokens,
       },
     });
 
@@ -54,13 +74,27 @@ describe("/api/public/generations API Endpoint", () => {
     expect(fetchedObservations.status).toBe(200);
 
     if (!isObservationList(fetchedObservations.body)) {
-      throw new Error("Expected body to be an array of observations");
+      throw new Error(
+        "Expected body to be an array of observations" +
+          JSON.stringify(fetchedObservations.body),
+      );
     }
 
     expect(fetchedObservations.body.data.length).toBe(1);
     expect(fetchedObservations.body.data[0]?.traceId).toBe(traceId);
     expect(fetchedObservations.body.data[0]?.input).toEqual({ key: "input" });
     expect(fetchedObservations.body.data[0]?.output).toEqual({ key: "output" });
+    expect(fetchedObservations.body.data[0]?.model).toEqual("gpt-3.5-turbo");
+    expect(fetchedObservations.body.data[0]?.modelId).toEqual(model.id);
+    expect(
+      fetchedObservations.body.data[0]?.calculatedInputCost,
+    ).toBeGreaterThan(0);
+    expect(
+      fetchedObservations.body.data[0]?.calculatedOutputCost,
+    ).toBeGreaterThan(0);
+    expect(
+      fetchedObservations.body.data[0]?.calculatedTotalCost,
+    ).toBeGreaterThan(0);
   });
   it("should fetch all observations, filtered by generations", async () => {
     await pruneDatabase();
@@ -79,6 +113,19 @@ describe("/api/public/generations API Endpoint", () => {
       },
     });
 
+    await prisma.model.create({
+      data: {
+        id: "model-1",
+        modelName: "gpt-3.5-turbo",
+        inputPrice: "0.0000010",
+        outputPrice: "0.0000020",
+        totalPrice: "0.1",
+        matchPattern: "(.*)(gpt-)(35|3.5)(-turbo)?(.*)",
+        projectId: null,
+        unit: ModelUsageUnit.Tokens,
+      },
+    });
+
     await prisma.observation.create({
       data: {
         id: uuidv4(),
@@ -86,11 +133,16 @@ describe("/api/public/generations API Endpoint", () => {
         name: "generation-name",
         startTime: new Date("2021-01-01T00:00:00.000Z"),
         endTime: new Date("2021-01-01T00:00:00.000Z"),
-        model: "model-name",
+        model: "gpt-3.5-turbo",
+        internalModel: "gpt-3.5-turbo",
         modelParameters: { key: "value" },
         input: { key: "input" },
         output: { key: "output" },
+        promptTokens: 10,
+        completionTokens: 20,
+        totalTokens: 30,
         version: "2.0.0",
+        unit: ModelUsageUnit.Tokens,
         type: "GENERATION",
         project: {
           connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
@@ -105,7 +157,6 @@ describe("/api/public/generations API Endpoint", () => {
         name: "generation-name",
         startTime: new Date("2021-01-01T00:00:00.000Z"),
         endTime: new Date("2021-01-01T00:00:00.000Z"),
-        model: "model-name",
         modelParameters: { key: "value" },
         input: { key: "input" },
         output: { key: "output" },
@@ -123,6 +174,8 @@ describe("/api/public/generations API Endpoint", () => {
       undefined,
     );
 
+    console.log(fetchedObservations.body);
+
     expect(fetchedObservations.status).toBe(200);
 
     if (!isObservationList(fetchedObservations.body)) {
@@ -156,11 +209,18 @@ const isObservationList = (val: unknown): val is ObservationResponse => {
         "input" in element &&
         "output" in element &&
         "metadata" in element &&
-        "version" in element,
+        "version" in element &&
+        "modelId" in element &&
+        "inputPrice" in element &&
+        "outputPrice" in element &&
+        "totalPrice" in element &&
+        "calculatedInputCost" in element &&
+        "calculatedOutputCost" in element &&
+        "calculatedTotalCost" in element,
     )
   );
 };
 
 type ObservationResponse = {
-  data: Observation[];
+  data: ObservationView[];
 };

src/__tests__/prompts.servertest.ts

@@ -0,0 +1,344 @@
+/** @jest-environment node */
+
+import { prisma } from "@/src/server/db";
+import { makeAPICall, pruneDatabase } from "@/src/__tests__/test-utils";
+import { v4 as uuidv4, v4 } from "uuid";
+import { type Prompt } from "@prisma/client";
+
+describe("/api/public/prompts API Endpoint", () => {
+  beforeEach(async () => await pruneDatabase());
+
+  it("should fetch a prompt", async () => {
+    const promptId = uuidv4();
+
+    await prisma.prompt.create({
+      data: {
+        id: promptId,
+        name: "prompt-name",
+        prompt: "prompt",
+        isActive: true,
+        version: 1,
+        project: {
+          connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
+        },
+        createdBy: "user-1",
+      },
+    });
+
+    const fetchedObservations = await makeAPICall(
+      "GET",
+      "/api/public/prompts?name=prompt-name&version=1",
+      undefined,
+    );
+
+    expect(fetchedObservations.status).toBe(200);
+
+    if (!isPrompt(fetchedObservations.body)) {
+      throw new Error("Expected body to be a prompt");
+    }
+
+    expect(fetchedObservations.body.id).toBe(promptId);
+    expect(fetchedObservations.body.name).toBe("prompt-name");
+    expect(fetchedObservations.body.prompt).toBe("prompt");
+    expect(fetchedObservations.body.version).toBe(1);
+    expect(fetchedObservations.body.isActive).toBe(true);
+    expect(fetchedObservations.body.createdBy).toBe("user-1");
+  });
+
+  it("should fetch active prompt only if no prompt version is given", async () => {
+    const promptId = uuidv4();
+
+    await prisma.prompt.create({
+      data: {
+        id: promptId,
+        name: "prompt-name",
+        prompt: "prompt",
+        isActive: false,
+        version: 1,
+        project: {
+          connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
+        },
+        createdBy: "user-1",
+      },
+    });
+
+    const fetchedObservations = await makeAPICall(
+      "GET",
+      "/api/public/prompts?name=prompt-name",
+      undefined,
+    );
+
+    expect(fetchedObservations.status).toBe(404);
+  });
+
+  it("should fetch inactive prompt if prompt version is given", async () => {
+    const promptId = uuidv4();
+    const promptTwoId = uuidv4();
+
+    await prisma.prompt.create({
+      data: {
+        id: promptId,
+        name: "prompt-name",
+        prompt: "prompt-one",
+        isActive: false,
+        version: 1,
+        project: {
+          connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
+        },
+        createdBy: "user-1",
+      },
+    });
+
+    await prisma.prompt.create({
+      data: {
+        id: promptTwoId,
+        name: "prompt-name",
+        prompt: "prompt",
+        isActive: true,
+        version: 2,
+        project: {
+          connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
+        },
+        createdBy: "user-1",
+      },
+    });
+
+    const fetchedObservations = await makeAPICall(
+      "GET",
+      "/api/public/prompts?name=prompt-name&version=1",
+      undefined,
+    );
+
+    expect(fetchedObservations.status).toBe(200);
+
+    if (!isPrompt(fetchedObservations.body)) {
+      throw new Error("Expected body to be a prompt");
+    }
+
+    expect(fetchedObservations.body.id).toBe(promptId);
+    expect(fetchedObservations.body.name).toBe("prompt-name");
+    expect(fetchedObservations.body.prompt).toBe("prompt-one");
+    expect(fetchedObservations.body.version).toBe(1);
+    expect(fetchedObservations.body.isActive).toBe(false);
+    expect(fetchedObservations.body.createdBy).toBe("user-1");
+  });
+
+  it("should fetch active prompt when multiple exist", async () => {
+    const promptIdOne = uuidv4();
+    const promptIdTwo = uuidv4();
+
+    await prisma.prompt.create({
+      data: {
+        id: promptIdOne,
+        name: "prompt-name",
+        prompt: "prompt",
+        isActive: false,
+        version: 1,
+        project: {
+          connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
+        },
+        createdBy: "user-1",
+      },
+    });
+
+    await prisma.prompt.create({
+      data: {
+        id: promptIdTwo,
+        name: "prompt-name",
+        prompt: "prompt",
+        isActive: true,
+        version: 2,
+        project: {
+          connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
+        },
+        createdBy: "user-1",
+      },
+    });
+
+    const fetchedObservations = await makeAPICall(
+      "GET",
+      "/api/public/prompts?name=prompt-name",
+      undefined,
+    );
+
+    expect(fetchedObservations.status).toBe(200);
+
+    if (!isPrompt(fetchedObservations.body)) {
+      throw new Error("Expected body to be a prompt");
+    }
+
+    expect(fetchedObservations.body.id).toBe(promptIdTwo);
+    expect(fetchedObservations.body.name).toBe("prompt-name");
+    expect(fetchedObservations.body.prompt).toBe("prompt");
+    expect(fetchedObservations.body.version).toBe(2);
+    expect(fetchedObservations.body.isActive).toBe(true);
+    expect(fetchedObservations.body.createdBy).toBe("user-1");
+  });
+
+  it("should create and fetch a prompt", async () => {
+    await makeAPICall("POST", "/api/public/prompts", {
+      name: "prompt-name",
+      prompt: "prompt",
+      isActive: true,
+      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+    });
+
+    const fetchedObservations = await makeAPICall(
+      "GET",
+      "/api/public/prompts?name=prompt-name&version=1",
+      undefined,
+    );
+
+    expect(fetchedObservations.status).toBe(200);
+
+    if (!isPrompt(fetchedObservations.body)) {
+      throw new Error("Expected body to be an array of observations");
+    }
+
+    expect(fetchedObservations.body.name).toBe("prompt-name");
+    expect(fetchedObservations.body.prompt).toBe("prompt");
+    expect(fetchedObservations.body.version).toBe(1);
+    expect(fetchedObservations.body.isActive).toBe(true);
+    expect(fetchedObservations.body.createdBy).toBe("API");
+  });
+
+  it("should relate generation to prompt", async () => {
+    const traceId = v4();
+    const generationId = v4();
+
+    const promptId = uuidv4();
+
+    await prisma.prompt.create({
+      data: {
+        id: promptId,
+        name: "prompt-name",
+        prompt: "prompt",
+        isActive: true,
+        version: 1,
+        project: {
+          connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
+        },
+        createdBy: "user-1",
+      },
+    });
+
+    const response = await makeAPICall("POST", "/api/public/ingestion", {
+      metadata: {
+        sdk_verion: "1.0.0",
+        sdk_name: "python",
+      },
+      batch: [
+        {
+          id: v4(),
+          type: "trace-create",
+          timestamp: new Date().toISOString(),
+          body: {
+            id: traceId,
+            name: "trace-name",
+          },
+        },
+        {
+          id: v4(),
+          type: "generation-create",
+          timestamp: new Date().toISOString(),
+          body: {
+            id: generationId,
+            traceId: traceId,
+            type: "GENERATION",
+            name: "generation-name",
+            promptName: "prompt-name",
+            promptVersion: 1,
+          },
+        },
+      ],
+    });
+
+    expect(response.status).toBe(207);
+
+    const dbGeneration = await prisma.observation.findUnique({
+      where: {
+        id: generationId,
+      },
+    });
+
+    expect(dbGeneration?.id).toBe(generationId);
+    expect(dbGeneration?.promptId).toBe(promptId);
+  });
+
+  it("should fail if prompt version is missing", async () => {
+    const traceId = v4();
+    const generationId = v4();
+
+    const promptId = uuidv4();
+
+    await prisma.prompt.create({
+      data: {
+        id: promptId,
+        name: "prompt-name",
+        prompt: "prompt",
+        isActive: true,
+        version: 1,
+        project: {
+          connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
+        },
+        createdBy: "user-1",
+      },
+    });
+
+    const response = await makeAPICall("POST", "/api/public/ingestion", {
+      metadata: {
+        sdk_verion: "1.0.0",
+        sdk_name: "python",
+      },
+      batch: [
+        {
+          id: v4(),
+          type: "trace-create",
+          timestamp: new Date().toISOString(),
+          body: {
+            id: traceId,
+            name: "trace-name",
+          },
+        },
+        {
+          id: v4(),
+          type: "generation-create",
+          timestamp: new Date().toISOString(),
+          body: {
+            id: generationId,
+            traceId: traceId,
+            type: "GENERATION",
+            name: "generation-name",
+            promptName: "prompt-name",
+          },
+        },
+      ],
+    });
+
+    expect(response.status).toBe(207);
+
+    console.log("response body", response.body);
+
+    const dbGeneration = await prisma.observation.findUnique({
+      where: {
+        id: generationId,
+      },
+    });
+
+    expect(dbGeneration).toBeNull();
+  });
+});
+
+const isPrompt = (x: unknown): x is Prompt => {
+  if (typeof x !== "object" || x === null) return false;
+  const prompt = x as Prompt;
+  return (
+    typeof prompt.id === "string" &&
+    typeof prompt.name === "string" &&
+    typeof prompt.version === "number" &&
+    typeof prompt.prompt === "string" &&
+    typeof prompt.isActive === "boolean" &&
+    typeof prompt.projectId === "string" &&
+    typeof prompt.createdBy === "string"
+  );
+};

src/__tests__/query-builder.servertest.ts

@@ -22,7 +22,7 @@ describe("Build valid SQL queries", () => {
         table: "traces_observations",
         values: ["project-id", "project-id"],
         strings: [
-          ' FROM  traces t LEFT JOIN observations o ON t.id = o.trace_id  WHERE  t."project_id" = ',
+          ' FROM  traces t LEFT JOIN observations_view o ON t.id = o.trace_id  WHERE  t."project_id" = ',
           '  AND o."project_id" = ',
           " ;",
         ],
@@ -30,7 +30,7 @@ describe("Build valid SQL queries", () => {
       {
         table: "observations",
         values: ["project-id"],
-        strings: [' FROM  observations o  WHERE  o."project_id" = ', " ;"],
+        strings: [' FROM  observations_view o  WHERE  o."project_id" = ', " ;"],
       } as const,
       {
         table: "traces_scores",

src/__tests__/server/api/routers/traces.servertest.ts

@@ -0,0 +1,107 @@
+/** @jest-environment node */
+import { pruneDatabase } from "@/src/__tests__/test-utils";
+import { appRouter } from "@/src/server/api/root";
+import { createInnerTRPCContext } from "@/src/server/api/trpc";
+import { prisma } from "@/src/server/db";
+import type { Session } from "next-auth";
+
+describe("Traces TRPC Router", () => {
+  beforeEach(async () => await pruneDatabase());
+  afterEach(async () => await pruneDatabase());
+
+  const session: Session = {
+    expires: "1",
+    user: {
+      id: "clgb17vnp000008jjere5g15i",
+      name: "John Doe",
+      projects: [
+        {
+          id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+          role: "ADMIN",
+          name: "test",
+        },
+      ],
+      featureFlags: {
+        templateFlag: true,
+      },
+      admin: true,
+    },
+  };
+
+  const ctx = createInnerTRPCContext({ session });
+  const caller = appRouter.createCaller({ ...ctx, prisma });
+
+  test("traces.all RPC returns an array of traces", async () => {
+    const trace = {
+      name: "trace-name",
+      userId: "user-1",
+      metadata: { key: "value" },
+      release: "1.0.0",
+      version: "2.0.0",
+    };
+    await prisma.trace.create({
+      data: { ...trace, projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
+    });
+
+    const traces = await caller.traces.all({
+      page: 0,
+      limit: 10,
+      // projectId from `seed.ts`
+      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+      filter: null,
+      searchQuery: "",
+      orderBy: null,
+    });
+    expect(traces).toBeDefined();
+    expect(traces).toMatchObject({ traces: [trace] });
+  });
+
+  test("traces.all RPC orders traces by userId", async () => {
+    const traceTmpl = {
+      name: "trace-name",
+      userId: "user-1",
+      metadata: { key: "value" },
+      release: "1.0.0",
+      version: "2.0.0",
+    };
+    const trace1 = traceTmpl;
+    const trace2 = { ...traceTmpl, userId: "user-2" };
+    await prisma.trace.create({
+      data: { ...traceTmpl, projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
+    });
+    await prisma.trace.create({
+      data: {
+        ...trace2,
+        projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+      },
+    });
+
+    const tracesASC = await caller.traces.all({
+      page: 0,
+      limit: 10,
+      // projectId from `seed.ts`
+      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+      filter: null,
+      searchQuery: "",
+      orderBy: {
+        column: "userId",
+        order: "ASC",
+      },
+    });
+    expect(tracesASC).toMatchObject({ traces: [trace1, trace2] });
+
+    const tracesDESC = await caller.traces.all({
+      page: 0,
+      limit: 10,
+      // projectId from `seed.ts`
+      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+      filter: null,
+      searchQuery: "",
+      orderBy: {
+        column: "userId",
+        order: "DESC",
+      },
+    });
+    expect(tracesDESC).toMatchObject({ traces: [trace2, trace1] });
+  });
+});

src/__tests__/test-utils.ts

@@ -12,6 +12,9 @@ export const pruneDatabase = async () => {
   await prisma.datasetItem.deleteMany();
   await prisma.dataset.deleteMany();
   await prisma.datasetRuns.deleteMany();
+  await prisma.prompt.deleteMany();
+  await prisma.events.deleteMany();
+  await prisma.model.deleteMany();
 };
 
 export function createBasicAuthHeader(
@@ -24,21 +27,38 @@ export function createBasicAuthHeader(
   return `Basic ${base64Credentials}`;
 }
 
+export type IngestionAPIResponse = {
+  errors: ErrorIngestion[];
+  successes: SuccessfulIngestion[];
+};
+
+export type SuccessfulIngestion = {
+  id: string;
+  status: number;
+};
+
+export type ErrorIngestion = {
+  id: string;
+  status: number;
+  message: string;
+  error: string;
+};
+
 export async function makeAPICall(
   method: "POST" | "GET" | "PUT" | "DELETE" | "PATCH",
   url: string,
   body?: unknown,
+  auth?: string,
 ) {
   const finalUrl = `http://localhost:3000/${url}`;
+  const authorization =
+    auth || createBasicAuthHeader("pk-lf-1234567890", "sk-lf-1234567890");
   const options = {
     method: method,
     headers: {
       Accept: "application/json",
       "Content-Type": "application/json;charset=UTF-8",
-      Authorization: createBasicAuthHeader(
-        "pk-lf-1234567890",
-        "sk-lf-1234567890",
-      ),
+      Authorization: authorization,
     },
     // Conditionally include the body property if the method is not "GET"
     ...(method !== "GET" &&
@@ -47,7 +67,7 @@ export async function makeAPICall(
   const a = await fetch(finalUrl, options);
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  return { body: await a.json(), status: a.status };
+  return { body: (await a.json()) as IngestionAPIResponse, status: a.status };
 }
 
 export const setupUserAndProject = async () => {

src/__tests__/traces.servertest.ts

@@ -40,7 +40,6 @@ describe("/api/public/traces API Endpoint", () => {
       id: "trace-id",
       name: "trace-name",
       userId: "user-1",
-      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
       metadata: { key: "value" },
       release: "1.0.0",
       version: "2.0.0",
@@ -65,7 +64,6 @@ describe("/api/public/traces API Endpoint", () => {
 
     await makeAPICall("POST", "/api/public/traces", {
       id: "trace-id",
-      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
       metadata: { key: "value" },
       release: "1.0.0",
       version: "5.0.0",
@@ -88,4 +86,54 @@ describe("/api/public/traces API Endpoint", () => {
       userId: "user-1",
     });
   });
+
+  it("should use tags correctly on POST and GET", async () => {
+    await pruneDatabase();
+
+    await makeAPICall("POST", "/api/public/traces", {
+      id: "trace-1",
+      tags: ["tag-1", "tag-2", "tag-3"],
+    });
+
+    await makeAPICall("POST", "/api/public/traces", {
+      id: "trace-2",
+      tags: ["tag-1"],
+    });
+
+    await makeAPICall("POST", "/api/public/traces", {
+      id: "trace-3",
+      tags: ["tag-2", "tag-3"],
+    });
+
+    // multiple tags
+    const traces = await makeAPICall(
+      "GET",
+      "/api/public/traces?tags=tag-2&tags=tag-3",
+    );
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    const traceIds = traces.body.data.map((t: { id: string }) => t.id);
+    // check for equality ok as ordered by timestamp
+    expect(traceIds).toEqual(["trace-3", "trace-1"]);
+
+    // single tag
+    const traces2 = await makeAPICall("GET", "/api/public/traces?tags=tag-1");
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    const traceIds2 = traces2.body.data.map((t: { id: string }) => t.id);
+    // check for equality ok as ordered by timestamp
+    expect(traceIds2).toEqual(["trace-2", "trace-1"]);
+
+    // wrong tag
+    const traces3 = await makeAPICall("GET", "/api/public/traces?tags=tag-10");
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    const traceIds3 = traces3.body.data.map((t: { id: string }) => t.id);
+    // check for equality ok as ordered by timestamp
+    expect(traceIds3).toEqual([]);
+
+    // no tag
+    const traces4 = await makeAPICall("GET", "/api/public/traces?tags=");
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    const traceIds4 = traces4.body.data.map((t: { id: string }) => t.id);
+    // check for equality ok as ordered by timestamp
+    expect(traceIds4).toEqual(["trace-3", "trace-2", "trace-1"]);
+  });
 });

src/__tests__/usage.servertest.ts

@@ -1,18 +1,42 @@
+import { ModelUsageUnit } from "@/src/constants";
 import { tokenCount } from "@/src/features/ingest/lib/usage";
 
 describe("Token Count Functions", () => {
+  const generateModel = (model: string, tokenizer: string) => {
+    return {
+      id: "1",
+      modelName: model,
+      tokenizerId: tokenizer,
+      tokenizerConfig: {
+        tokensPerMessage: 3,
+        tokensPerName: 1,
+        tokenizerModel: model,
+      },
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      matchPattern: "",
+      projectId: null,
+      startDate: null,
+      inputPrice: null,
+      outputPrice: null,
+      totalPrice: null,
+      unit: ModelUsageUnit.Tokens,
+    };
+  };
+
   describe("token count for strings", () => {
     [
-      { model: "gpt-3.5", tokens: 114 },
-      { model: "gpt-4-1106-preview", tokens: 114 },
-      { model: "gpt-4-vision-preview", tokens: 114 },
-      { model: "claude", tokens: 118 },
-      { model: "claude-instant-1.2", tokens: 118 },
-      { model: "gpt-3.5-turbo-1106", tokens: 114 },
-    ].forEach(({ model, tokens }) => {
+      { model: "gpt-3.5-turbo", tokenizer: "openai", tokens: 114 },
+      { model: "text-embedding-ada-002", tokenizer: "openai", tokens: 114 },
+      { model: "gpt-4-1106-preview", tokenizer: "openai", tokens: 114 },
+      { model: "gpt-4-vision-preview", tokenizer: "openai", tokens: 114 },
+      { model: "claude", tokenizer: "claude", tokens: 118 },
+      { model: "claude-instant-1.2", tokenizer: "claude", tokens: 118 },
+      { model: "gpt-3.5-turbo-1106", tokenizer: "openai", tokens: 114 },
+    ].forEach(({ model, tokens, tokenizer }) => {
       it(`should return token count ${tokens} for ${model}`, () => {
         const result = tokenCount({
-          model: model,
+          model: generateModel(model, tokenizer),
           text: "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
         });
         expect(result).toBeDefined();
@@ -22,20 +46,67 @@ describe("Token Count Functions", () => {
 
     it("should return undefined for unknown model", () => {
       const result = tokenCount({
-        model: "unknown-model",
+        model: generateModel("unknown-model", "unknown-tokenizer"),
         text: "Hello, World!",
       });
       expect(result).toBeUndefined();
     });
 
+    it("check extensive openai chat message", () => {
+      const result = tokenCount({
+        model: generateModel("gpt-3.5-turbo", "openai"),
+        text: [
+          {
+            role: "system",
+            content: "some test",
+            id: "some-id",
+            isPersisted: true,
+          },
+          {
+            id: "some-id",
+            content: "some test",
+            role: "user",
+            timestamp: "2024-01-00:00:00.488Z",
+            isPersisted: true,
+          },
+          {
+            id: "some id",
+            content:
+              "Hey Simon! 😊 How's your day going? Have you been up to anything interesting lately?",
+            role: "user",
+            timestamp: "2024-01-24T10:00:00.929Z",
+            isPersisted: true,
+          },
+          {
+            content: true,
+            role: "user",
+            id: "some id",
+          },
+          {
+            role: "system",
+            content: "This is some content",
+          },
+          {
+            id: "another id",
+            role: "assistant",
+            content: "This is some content",
+          },
+        ],
+      });
+      expect(result).toBe(155);
+    });
+
     it("should return for invalid text type", () => {
-      const result = tokenCount({ model: "gpt-4", text: 1234 });
+      const result = tokenCount({
+        model: generateModel("gpt-4", "openai"),
+        text: 1234,
+      });
       expect(result).toBe(2);
     });
 
     it("should return correct token count for empty string", () => {
       const result = tokenCount({
-        model: "gpt-4",
+        model: generateModel("gpt-4", "openai"),
         text: "",
       });
       expect(result).toBe(0);
@@ -44,7 +115,7 @@ describe("Token Count Functions", () => {
     it("should return correct token count for very long string", () => {
       const longString = "A".repeat(10000);
       const result = tokenCount({
-        model: "gpt-4",
+        model: generateModel("gpt-4", "openai"),
         text: longString,
       });
       expect(result).toBeDefined();
@@ -53,14 +124,14 @@ describe("Token Count Functions", () => {
 
     it("should return undefined for null text input", () => {
       const result = tokenCount({
-        model: "gpt-4",
+        model: generateModel("gpt-4", "openai"),
         text: null,
       });
       expect(result).toBeUndefined();
     });
     it("should return undefined for undefined text input", () => {
       const result = tokenCount({
-        model: "gpt-4",
+        model: generateModel("gpt-4", "openai"),
         text: undefined,
       });
       expect(result).toBeUndefined();
@@ -69,13 +140,14 @@ describe("Token Count Functions", () => {
 
   describe("token count for chat messages", () => {
     [
-      { model: "gpt-4", tokens: 44 },
-      { model: "gpt-3.5-turbo-16k-0613", tokens: 44 },
-      { model: "claude-instant-1.2", tokens: 48 },
-    ].forEach(({ model, tokens }) => {
+      { model: "gpt-4", tokenizer: "openai", tokens: 44 },
+      { model: "gpt-3.5-turbo-16k-0613", tokenizer: "openai", tokens: 44 },
+      { model: "gpt-3.5-turbo-16k-0613", tokenizer: "openai", tokens: 44 },
+      { model: "claude-instant-1.2", tokenizer: "claude", tokens: 48 },
+    ].forEach(({ model, tokens, tokenizer }) => {
       it(`should return token count ${tokens} for ${model}`, () => {
         const result = tokenCount({
-          model: model,
+          model: generateModel(model, tokenizer),
           text: [
             { role: "system", content: "You are a helpful assistant." },
             { role: "user", content: "Who won the world series in 2020?" },
@@ -92,7 +164,7 @@ describe("Token Count Functions", () => {
 
     it("should return for non array", () => {
       const result = tokenCount({
-        model: "gpt-4",
+        model: generateModel("gpt-4", "openai"),
         text: { role: "Helo world" },
       });
       expect(result).toBe(7);
@@ -100,7 +172,7 @@ describe("Token Count Functions", () => {
 
     it("should return for empty array", () => {
       const result = tokenCount({
-        model: "gpt-4",
+        model: generateModel("gpt-4", "openai"),
         text: [],
       });
       expect(result).toBeUndefined();
@@ -108,7 +180,7 @@ describe("Token Count Functions", () => {
 
     it("should return for array of invalid object", () => {
       const result = tokenCount({
-        model: "gpt-4",
+        model: generateModel("gpt-4", "openai"),
         text: [{ role: "Helo world" }],
       });
       expect(result).toBe(9);

src/components/LangfuseLogo.tsx

@@ -1,4 +1,7 @@
-import { VERSION } from "@/src/constants/VERSION";
+import { AlertTriangle } from "lucide-react";
+
+import { VERSION } from "@/src/constants";
+import { env } from "@/src/env.mjs";
 import { cn } from "@/src/utils/tailwind";
 
 export const LangfuseIcon = ({
@@ -22,21 +25,54 @@ export const LangfuseLogo = ({
   className,
   size = "sm",
   version = false,
+  showEnvLabel = false,
 }: {
   size?: "sm" | "xl";
   className?: string;
   version?: boolean;
+  showEnvLabel?: boolean;
 }) => (
-  <div className={cn("flex items-center", className)}>
-    <LangfuseIcon size={size === "sm" ? 16 : 20} />
-    <span
-      className={cn(
-        "font-mono font-semibold",
-        size === "sm" ? "ml-2 text-sm" : "ml-3 text-xl",
+  <div className={cn("flex gap-4 xl:flex-col xl:items-start", className)}>
+    {/* Environment Labeling for Langfuse Maintainers */}
+    {showEnvLabel && env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION && (
+      <div
+        className={cn(
+          "flex items-center gap-2 self-stretch rounded-md  px-3 py-1  ring-1  xl:-mx-2",
+          env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION === "STAGING"
+            ? "bg-blue-100 text-blue-500 ring-blue-500"
+            : "bg-red-100 text-red-500 ring-red-500",
+        )}
+      >
+        <AlertTriangle size={16} />
+        <span className="whitespace-nowrap">
+          {["EU", "US"].includes(env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION)
+            ? `PRODUCTION-${env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION}`
+            : env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION}
+        </span>
+      </div>
+    )}
+    {/* Langfuse Logo */}
+    <div className="flex items-center">
+      <LangfuseIcon size={size === "sm" ? 16 : 20} />
+      <span
+        className={cn(
+          "font-mono font-semibold",
+          size === "sm" ? "ml-2 text-sm" : "ml-3 text-xl",
+        )}
+      >
+        Langfuse
+      </span>
+      {version && (
+        <a
+          href="https://github.com/langfuse/langfuse/releases"
+          target="_blank"
+          rel="noopener"
+          title="View releases on GitHub"
+          className="ml-2 text-xs text-gray-400"
+        >
+          {VERSION}
+        </a>
       )}
-    >
-      Langfuse
-    </span>
-    {version && <span className="ml-2 text-xs text-gray-400">{VERSION}</span>}
+    </div>
   </div>
 );

src/components/date-picker.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import * as React from "react";
-import { Calendar as CalendarIcon } from "lucide-react";
+import { Calendar as CalendarIcon, X } from "lucide-react";
 import { Button } from "@/src/components/ui/button";
 import { Calendar } from "@/src/components/ui/calendar";
 import {
@@ -39,36 +39,50 @@ export type AvailableDateRangeSelections =
 export function DatePicker({
   date,
   onChange,
+  clearable = false,
   className,
 }: {
   date?: Date | undefined;
   onChange: (date: Date | undefined) => void;
+  clearable?: boolean;
   className?: string;
 }) {
   return (
-    <Popover>
-      <PopoverTrigger asChild>
+    <div className="flex flex-row gap-2 align-middle">
+      <Popover>
+        <PopoverTrigger asChild>
+          <Button
+            variant={"outline"}
+            className={cn(
+              "justify-start text-left font-normal",
+              !date && "text-muted-foreground",
+              className,
+            )}
+          >
+            <CalendarIcon className="mr-2 h-4 w-4" />
+            {date ? format(date, "PPP") : <span>Pick a date</span>}
+          </Button>
+        </PopoverTrigger>
+        <PopoverContent className="w-auto p-0">
+          <Calendar
+            mode="single"
+            selected={date}
+            onSelect={(d) => onChange(d)}
+            initialFocus
+          />
+        </PopoverContent>
+      </Popover>
+      {date && clearable && (
         <Button
-          variant={"outline"}
-          className={cn(
-            "justify-start text-left font-normal",
-            !date && "text-muted-foreground",
-            className,
-          )}
+          variant="ghost"
+          size="icon"
+          onClick={() => onChange(undefined)}
+          title="reset date"
         >
-          <CalendarIcon className="mr-2 h-4 w-4" />
-          {date ? format(date, "PPP") : <span>Pick a date</span>}
+          <X size={14} />
         </Button>
-      </PopoverTrigger>
-      <PopoverContent className="w-auto p-0">
-        <Calendar
-          mode="single"
-          selected={date}
-          onSelect={(d) => onChange(d)}
-          initialFocus
-        />
-      </PopoverContent>
-    </Popover>
+      )}
+    </div>
   );
 }
 

src/components/delete-trace.tsx

@@ -30,12 +30,9 @@ export function DeleteTrace({
   const mutDeleteTraces = api.traces.deleteMany.useMutation({
     onSuccess: () => {
       setIsDeleted(true);
+      void utils.traces.invalidate();
       if (!isTableAction) {
-        void router
-          .push(`/project/${projectId}/traces`)
-          .then(() => utils.traces.invalidate());
-      } else {
-        void utils.traces.invalidate();
+        void router.push(`/project/${projectId}/traces`);
       }
     },
   });
@@ -52,7 +49,7 @@ export function DeleteTrace({
             <TrashIcon className="h-4 w-4" />
           </Button>
         ) : (
-          <Button variant="outline" type="button" size="sm">
+          <Button variant="outline" type="button" size="icon">
             <TrashIcon className="h-4 w-4" />
           </Button>
         )}

src/components/layouts/doc-popup.tsx

@@ -3,22 +3,25 @@ import {
   HoverCardContent,
   HoverCardTrigger,
 } from "@/src/components/ui/hover-card";
-import { HelpCircle } from "lucide-react";
+import { HelpCircle, Info } from "lucide-react";
 import Link from "next/link";
 import { usePostHog } from "posthog-js/react";
 
 export type DocPopupProps = {
   description: React.ReactNode;
-  href: string;
-  size?: "sm" | "md" | "lg";
+  href?: string;
+  style?: "question" | "info";
+  size?: "xs" | "sm" | "md" | "lg";
 };
 
 export default function DocPopup({
   description,
   href,
+  style = "info",
   size = "sm",
 }: DocPopupProps) {
   const sizes = {
+    xs: "w-3 h-3",
     sm: "w-4 h-4",
     md: "w-6 h-6",
     lg: "w-8 h-8",
@@ -35,14 +38,30 @@ export default function DocPopup({
       }}
     >
       <HoverCardTrigger className="mx-1 cursor-pointer" asChild>
-        <Link
-          href={href}
-          rel="noopener"
-          target="_blank"
-          className="inline-block whitespace-nowrap text-gray-500 sm:pl-0"
-        >
-          <HelpCircle className={sizes[size]} />
-        </Link>
+        {href ? (
+          <Link
+            href={href}
+            rel="noopener"
+            target="_blank"
+            className="inline-block whitespace-nowrap text-gray-500 sm:pl-0"
+          >
+            {
+              {
+                question: <HelpCircle className={sizes[size]} />,
+                info: <Info className={sizes[size]} />,
+              }[style]
+            }
+          </Link>
+        ) : (
+          <div className="inline-block whitespace-nowrap text-gray-500 sm:pl-0">
+            {
+              {
+                question: <HelpCircle className={sizes[size]} />,
+                info: <Info className={sizes[size]} />,
+              }[style]
+            }
+          </div>
+        )}
       </HoverCardTrigger>
       <HoverCardContent>
         {typeof description === "string" ? (

src/components/layouts/header.tsx

@@ -3,13 +3,19 @@ import Link from "next/link";
 import { useRouter } from "next/router";
 import { useSession } from "next-auth/react";
 import DocPopup from "@/src/components/layouts/doc-popup";
+import { type Status, StatusBadge } from "./status-badge";
+import { cn } from "@/src/utils/tailwind";
 
-export default function Header(props: {
+export default function Header({
+  level = "h2",
+  ...props
+}: {
   title: string;
   breadcrumb?: { name: string; href?: string }[];
-  live?: boolean;
-  help?: { description: string; href: string };
+  status?: Status;
+  help?: { description: string; href?: string };
   actionButtons?: React.ReactNode;
+  level?: "h2" | "h3";
 }) {
   const router = useRouter();
   const session = useSession();
@@ -34,7 +40,7 @@ export default function Header(props: {
     [...props.breadcrumb.map((i) => i.href).filter(Boolean)].pop();
 
   return (
-    <div className="mb-8">
+    <div className={cn(level === "h2" ? "mb-4" : "mb-1")}>
       <div>
         {backHref ? (
           <nav className="sm:hidden" aria-label="Back">
@@ -50,7 +56,7 @@ export default function Header(props: {
             </Link>
           </nav>
         ) : null}
-        {breadcrumb.length ? (
+        {(level === "h2" || props.breadcrumb) && breadcrumb.length ? (
           <nav className="hidden sm:flex" aria-label="Breadcrumb">
             <ol role="list" className="flex items-center space-x-4">
               {breadcrumb.map(({ name, href }, index) => (
@@ -84,9 +90,15 @@ export default function Header(props: {
       <div className="mt-2 flex flex-wrap items-center justify-between gap-2">
         <div className="flex items-center gap-3 md:gap-5">
           <div className="flex min-w-0 flex-row">
-            <h2 className="text-2xl font-bold leading-7 text-gray-900 sm:truncate sm:text-3xl sm:tracking-tight">
-              {props.title}
-            </h2>
+            {level === "h2" ? (
+              <h2 className="text-2xl font-bold leading-7 text-gray-900 sm:truncate sm:text-3xl sm:tracking-tight">
+                {props.title}
+              </h2>
+            ) : (
+              <h3 className="text-lg font-bold leading-7 text-gray-900 sm:truncate sm:text-xl sm:tracking-tight">
+                {props.title}
+              </h3>
+            )}
             {props.help ? (
               <DocPopup
                 description={props.help.description}
@@ -95,15 +107,7 @@ export default function Header(props: {
               />
             ) : null}
           </div>
-          {props.live ? (
-            <div className="flex items-center gap-2 rounded-sm bg-green-100 px-3  text-green-600">
-              <span className="relative flex h-2 w-2 ">
-                <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-500 opacity-75"></span>
-                <span className="relative inline-flex h-2 w-2 rounded-full bg-green-600"></span>
-              </span>
-              Live
-            </div>
-          ) : null}
+          {props.status && <StatusBadge type={props.status} />}
         </div>
         <div className="flex items-center gap-3">
           {props.actionButtons ?? null}

src/components/layouts/layout.tsx

@@ -1,14 +1,13 @@
-import { ROUTES } from "@/src/components/layouts/routes";
+import { ROUTES, type Route } from "@/src/components/layouts/routes";
 import { Fragment, type PropsWithChildren, useState } from "react";
-import { Dialog, Menu, Transition } from "@headlessui/react";
+import { Dialog, Disclosure, Menu, Transition } from "@headlessui/react";
 import { Bars3Icon, XMarkIcon } from "@heroicons/react/24/outline";
 
 import Link from "next/link";
 import { useRouter } from "next/router";
 import clsx from "clsx";
-import { Code, MessageSquarePlus, Info } from "lucide-react";
+import { Code, MessageSquarePlus, Info, ChevronRightIcon } from "lucide-react";
 import { signOut, useSession } from "next-auth/react";
-import { ChevronDownIcon } from "@heroicons/react/20/solid";
 import { cn } from "@/src/utils/tailwind";
 import {
   Avatar,
@@ -23,6 +22,14 @@ import Head from "next/head";
 import { env } from "@/src/env.mjs";
 import { LangfuseLogo } from "@/src/components/LangfuseLogo";
 import { Spinner } from "@/src/components/layouts/spinner";
+import { hasAccess } from "@/src/features/rbac/utils/checkAccess";
+import { Toaster } from "@/src/components/ui/sonner";
+import {
+  NOTIFICATIONS,
+  useCheckNotification,
+} from "@/src/features/notifications/checkNotifications";
+import { ChevronDownIcon } from "@heroicons/react/20/solid";
+import useLocalStorage from "@/src/components/useLocalStorage";
 
 const userNavigation = [
   {
@@ -34,9 +41,9 @@ const userNavigation = [
   },
 ];
 
-const pathsWithoutNavigation: string[] = [];
-const unauthenticatedPaths = ["/auth/sign-in", "/auth/sign-up"];
-const publishablePaths = [
+const pathsWithoutNavigation: string[] = ["/onboarding"];
+const unauthenticatedPaths: string[] = ["/auth/sign-in", "/auth/sign-up"];
+const publishablePaths: string[] = [
   "/project/[projectId]/sessions/[sessionId]",
   "/project/[projectId]/traces/[traceId]",
 ];
@@ -45,29 +52,54 @@ export default function Layout(props: PropsWithChildren) {
   const [sidebarOpen, setSidebarOpen] = useState(false);
   const router = useRouter();
   const session = useSession();
+
+  useCheckNotification(NOTIFICATIONS, session.status === "authenticated");
+
   const enableExperimentalFeatures =
     api.environment.enableExperimentalFeatures.useQuery().data ?? false;
 
   const projectId = router.query.projectId as string | undefined;
-  const navigation = ROUTES.filter(
-    ({ pathname }) => projectId || !pathname.includes("[projectId]"),
-  )
-    .filter(
-      ({ featureFlag }) =>
-        featureFlag === undefined ||
+
+  const mapNavigation = (route: Route): NavigationItem | null => {
+    // Project-level routes
+    if (!projectId && route.pathname?.includes("[projectId]")) return null;
+
+    // Feature Flags
+    if (
+      !(
+        route.featureFlag === undefined ||
         enableExperimentalFeatures ||
-        session.data?.user?.featureFlags[featureFlag],
+        session.data?.user?.featureFlags[route.featureFlag]
+      )
     )
-    .map(({ pathname, ...rest }) => ({
-      pathname,
-      href: pathname.replace("[projectId]", projectId ?? ""),
-      ...rest,
-    }))
-    .map(({ pathname, ...rest }) => ({
-      pathname,
-      current: router.pathname === pathname,
-      ...rest,
-    }));
+      return null;
+
+    // RBAC
+    if (
+      route.rbacScope !== undefined &&
+      (!projectId || !hasAccess({ projectId, scope: route.rbacScope, session }))
+    )
+      return null;
+
+    // apply to children as well
+    const children: (NavigationItem | null)[] =
+      route.children?.map((child) => mapNavigation(child)).filter(Boolean) ??
+      [];
+    return {
+      ...route,
+      href: route.pathname?.replace("[projectId]", projectId ?? ""),
+      current: router.pathname === route.pathname,
+      children:
+        children.length > 0
+          ? (children as NavigationItem[]) // does not include null due to filter
+          : undefined,
+    };
+  };
+
+  const navigationMapped: (NavigationItem | null)[] = ROUTES.map((route) =>
+    mapNavigation(route),
+  ).filter(Boolean);
+  const navigation = navigationMapped.filter(Boolean) as NavigationItem[]; // does not include null due to filter
 
   const currentPathName = navigation.find(({ current }) => current)?.name;
 
@@ -118,7 +150,6 @@ export default function Layout(props: PropsWithChildren) {
         {props.children}
       </main>
     );
-
   return (
     <>
       <Head>
@@ -198,58 +229,16 @@ export default function Layout(props: PropsWithChildren) {
                   </Transition.Child>
                   {/* Sidebar component, swap this element with another sidebar if you like */}
                   <div className="flex grow flex-col gap-y-5 overflow-y-auto bg-white px-6 py-4">
-                    <LangfuseLogo version size="xl" />
+                    <LangfuseLogo
+                      version
+                      size="xl"
+                      showEnvLabel={session.data?.user?.email?.endsWith(
+                        "@langfuse.com",
+                      )}
+                    />
                     <nav className="flex flex-1 flex-col">
                       <ul role="list" className="flex flex-1 flex-col gap-y-7">
-                        <li>
-                          <ul role="list" className="-mx-2 space-y-1">
-                            {navigation.map((item) => (
-                              <li key={item.name}>
-                                <Link
-                                  href={item.href}
-                                  className={clsx(
-                                    item.current
-                                      ? "bg-gray-50 text-indigo-600"
-                                      : "text-gray-700 hover:bg-gray-50 hover:text-indigo-600",
-                                    "group flex gap-x-3 rounded-md p-2 text-sm font-semibold leading-6",
-                                  )}
-                                >
-                                  <item.icon
-                                    className={clsx(
-                                      item.current
-                                        ? "text-indigo-600"
-                                        : "text-gray-400 group-hover:text-indigo-600",
-                                      "h-6 w-6 shrink-0",
-                                    )}
-                                    aria-hidden="true"
-                                  />
-                                  {item.name}
-                                  {item.label && (
-                                    <span
-                                      className={cn(
-                                        "self-center whitespace-nowrap break-keep rounded-sm border px-1 py-0.5 text-xs",
-                                        item.current
-                                          ? "border-indigo-600 text-indigo-600"
-                                          : "border-gray-200 text-gray-400 group-hover:border-indigo-600 group-hover:text-indigo-600",
-                                      )}
-                                    >
-                                      {item.label}
-                                    </span>
-                                  )}
-                                </Link>
-                              </li>
-                            ))}
-                            <FeedbackButtonWrapper className="w-full">
-                              <li className="group flex cursor-pointer gap-x-3 rounded-md p-2 text-sm font-semibold leading-6 text-gray-700 hover:bg-gray-50 hover:text-indigo-600">
-                                <MessageSquarePlus
-                                  className="h-6 w-6 shrink-0 text-gray-400 group-hover:text-indigo-600"
-                                  aria-hidden="true"
-                                />
-                                Feedback
-                              </li>
-                            </FeedbackButtonWrapper>
-                          </ul>
-                        </li>
+                        <MainNavigation nav={navigation} />
                         <li>
                           <div className="flex flex-row place-content-between items-center">
                             <div className="text-xs font-semibold leading-6 text-gray-400">
@@ -312,59 +301,17 @@ export default function Layout(props: PropsWithChildren) {
         <div className="hidden xl:fixed xl:inset-y-0 xl:z-50 xl:flex xl:w-72 xl:flex-col">
           {/* Sidebar component, swap this element with another sidebar if you like */}
           <div className="flex h-screen grow flex-col gap-y-5 border-r border-gray-200 bg-white pt-7">
-            <LangfuseLogo version size="xl" className="mb-2 px-6" />
+            <LangfuseLogo
+              version
+              size="xl"
+              className="mb-2 px-6"
+              showEnvLabel={session.data?.user?.email?.endsWith(
+                "@langfuse.com",
+              )}
+            />
             <nav className="flex h-full flex-1 flex-col overflow-y-auto px-6 pb-3">
               <ul role="list" className="flex h-full flex-col gap-y-4">
-                <li>
-                  <ul role="list" className="-mx-2 space-y-1">
-                    {navigation.map((item) => (
-                      <li key={item.name}>
-                        <Link
-                          href={item.href}
-                          className={clsx(
-                            item.current
-                              ? "bg-gray-50 text-indigo-600"
-                              : "text-gray-700 hover:bg-gray-50 hover:text-indigo-600",
-                            "group flex gap-x-3 rounded-md p-2 text-sm font-semibold leading-6",
-                          )}
-                        >
-                          <item.icon
-                            className={clsx(
-                              item.current
-                                ? "text-indigo-600"
-                                : "text-gray-400 group-hover:text-indigo-600",
-                              "h-6 w-6 shrink-0",
-                            )}
-                            aria-hidden="true"
-                          />
-                          {item.name}
-                          {item.label && (
-                            <span
-                              className={cn(
-                                "self-center whitespace-nowrap break-keep rounded-sm border px-1 py-0.5 text-xs",
-                                item.current
-                                  ? "border-indigo-600 text-indigo-600"
-                                  : "border-gray-200 text-gray-400 group-hover:border-indigo-600 group-hover:text-indigo-600",
-                              )}
-                            >
-                              {item.label}
-                            </span>
-                          )}
-                        </Link>
-                      </li>
-                    ))}
-                    <FeedbackButtonWrapper className="w-full">
-                      <li className="group flex cursor-pointer gap-x-3 rounded-md p-2 text-sm font-semibold leading-6 text-gray-700 hover:bg-gray-50 hover:text-indigo-600">
-                        <MessageSquarePlus
-                          className="h-6 w-6 shrink-0 text-gray-400 group-hover:text-indigo-600"
-                          aria-hidden="true"
-                        />
-                        Feedback
-                      </li>
-                    </FeedbackButtonWrapper>
-                  </ul>
-                </li>
-
+                <MainNavigation nav={navigation} />
                 <li className="mt-auto">
                   <div className="flex flex-row place-content-between items-center">
                     <div className="text-xs font-semibold leading-6 text-gray-400">
@@ -417,64 +364,60 @@ export default function Layout(props: PropsWithChildren) {
                     ))}
                   </ul>
                 </li>
-
-                <li className="-mx-6">
-                  <Menu as="div" className="relative">
-                    <Menu.Button className="flex w-full items-center gap-x-4 p-1.5 px-6 py-3 text-sm font-semibold leading-6 text-gray-900 hover:bg-gray-50">
-                      <span className="sr-only">Open user menu</span>
-                      <Avatar className="h-8 w-8">
-                        <AvatarImage
-                          src={session.data?.user?.image ?? undefined}
-                        />
-                        <AvatarFallback>
-                          {session.data?.user?.name
-                            ? session.data.user.name
-                                .split(" ")
-                                .map((word) => word[0])
-                                .slice(0, 2)
-                                .concat("")
-                            : null}
-                        </AvatarFallback>
-                      </Avatar>
-                      <span className="flex-shrink truncate text-sm font-semibold leading-6 text-gray-900">
-                        {session.data?.user?.name}
-                      </span>
-                      <ChevronDownIcon
-                        className="h-5 w-5 text-gray-400"
-                        aria-hidden="true"
-                      />
-                    </Menu.Button>
-                    <Transition
-                      as={Fragment}
-                      enter="transition ease-out duration-100"
-                      enterFrom="transform opacity-0 scale-95"
-                      enterTo="transform opacity-100 scale-100"
-                      leave="transition ease-in duration-75"
-                      leaveFrom="transform opacity-100 scale-100"
-                      leaveTo="transform opacity-0 scale-95"
-                    >
-                      <Menu.Items className="absolute -top-full right-0 z-10 mt-2.5 w-32 rounded-md bg-white py-2 shadow-lg ring-1 ring-gray-900/5 focus:outline-none">
-                        {userNavigation.map((item) => (
-                          <Menu.Item key={item.name}>
-                            {({ active }) => (
-                              <a
-                                onClick={() => void item.onClick()}
-                                className={cn(
-                                  active ? "bg-gray-50" : "",
-                                  "block cursor-pointer px-3 py-1 text-sm leading-6 text-gray-900",
-                                )}
-                              >
-                                {item.name}
-                              </a>
-                            )}
-                          </Menu.Item>
-                        ))}
-                      </Menu.Items>
-                    </Transition>
-                  </Menu>
-                </li>
               </ul>
             </nav>
+
+            <Menu as="div" className="relative left-1">
+              <Menu.Button className="flex w-full items-center gap-x-4 p-1.5 px-6 py-3 text-sm font-semibold leading-6 text-gray-900 hover:bg-gray-50">
+                <span className="sr-only">Open user menu</span>
+                <Avatar className="h-8 w-8">
+                  <AvatarImage src={session.data?.user?.image ?? undefined} />
+                  <AvatarFallback>
+                    {session.data?.user?.name
+                      ? session.data.user.name
+                          .split(" ")
+                          .map((word) => word[0])
+                          .slice(0, 2)
+                          .concat("")
+                      : null}
+                  </AvatarFallback>
+                </Avatar>
+                <span className="flex-shrink truncate text-sm font-semibold leading-6 text-gray-900">
+                  {session.data?.user?.name}
+                </span>
+                <ChevronDownIcon
+                  className="h-5 w-5 text-gray-400"
+                  aria-hidden="true"
+                />
+              </Menu.Button>
+              <Transition
+                as={Fragment}
+                enter="transition ease-out duration-100"
+                enterFrom="transform opacity-0 scale-95"
+                enterTo="transform opacity-100 scale-100"
+                leave="transition ease-in duration-75"
+                leaveFrom="transform opacity-100 scale-100"
+                leaveTo="transform opacity-0 scale-95"
+              >
+                <Menu.Items className="absolute -top-full right-0 z-10 mt-2.5 w-32 rounded-md bg-white py-2 shadow-lg ring-1 ring-gray-900/5 focus:outline-none">
+                  {userNavigation.map((item) => (
+                    <Menu.Item key={item.name}>
+                      {({ active }) => (
+                        <a
+                          onClick={() => void item.onClick()}
+                          className={cn(
+                            active ? "bg-gray-50" : "",
+                            "block cursor-pointer px-3 py-1 text-sm leading-6 text-gray-900",
+                          )}
+                        >
+                          {item.name}
+                        </a>
+                      )}
+                    </Menu.Item>
+                  ))}
+                </Menu.Items>
+              </Transition>
+            </Menu>
           </div>
         </div>
 
@@ -487,7 +430,11 @@ export default function Layout(props: PropsWithChildren) {
             <span className="sr-only">Open sidebar</span>
             <Bars3Icon className="h-6 w-6" aria-hidden="true" />
           </button>
-          <LangfuseLogo version className="flex-1" />
+          <LangfuseLogo
+            version
+            className="flex-1"
+            showEnvLabel={session.data?.user?.email?.endsWith("@langfuse.com")}
+          />
           <Menu as="div" className="relative">
             <Menu.Button className="flex items-center gap-x-4 text-sm font-semibold leading-6 text-gray-900">
               <span className="sr-only">Open user menu</span>
@@ -545,30 +492,176 @@ export default function Layout(props: PropsWithChildren) {
                   <Info className="h-4 w-4" />
                   <span className="font-semibold">DEMO (view-only)</span>
                 </div>
-                <div>Live data from the Langfuse Q&A Chatbot.</div>
+                <div>Use demo RAG chat to see live data in this project.</div>
               </div>
 
               <Button size="sm" asChild className="ml-2">
                 <Link
                   href={
                     env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION === "EU"
-                      ? "https://langfuse.com/docs/qa-chatbot"
-                      : "https://docs-staging.langfuse.com/docs/qa-chatbot"
+                      ? "https://langfuse.com/docs/demo"
+                      : "https://docs-staging.langfuse.com/docs/demo"
                   }
                   target="_blank"
                 >
                   {env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION === "EU"
-                    ? "Q&A Chatbot ↗"
-                    : "Q&A Chatbot (staging) ↗"}
+                    ? "Use Chat ↗"
+                    : "Use Chat (staging) ↗"}
                 </Link>
               </Button>
             </div>
           ) : null}
-          <main className="py-4">
-            <div className="px-4">{props.children}</div>
-          </main>
+          <main className="p-4">{props.children}</main>
+          <Toaster visibleToasts={1} />
         </div>
       </div>
     </>
   );
 }
+
+type NavigationItem = NestedNavigationItem & {
+  children?: NestedNavigationItem[];
+};
+
+type NestedNavigationItem = Omit<Route, "children"> & {
+  href?: string;
+  current: boolean;
+};
+
+const MainNavigation: React.FC<{
+  nav: NavigationItem[];
+  onNavitemClick?: () => void;
+}> = ({ nav, onNavitemClick }) => {
+  const [isOpen, setIsOpen] = useLocalStorage(
+    "sidebar-tracing-default-open",
+    false,
+  );
+
+  return (
+    <li>
+      <ul role="list" className="-mx-2 space-y-1">
+        {nav.map((item) => (
+          <li key={item.name}>
+            {(!item.children || item.children.length === 0) && item.href ? (
+              <Link
+                href={item.href}
+                className={clsx(
+                  item.current
+                    ? "bg-gray-50 text-indigo-600"
+                    : "text-gray-700 hover:bg-gray-50 hover:text-indigo-600",
+                  "group flex gap-x-3 rounded-md p-2 text-sm font-semibold leading-6",
+                )}
+                onClick={onNavitemClick}
+              >
+                {item.icon && (
+                  <item.icon
+                    className={clsx(
+                      item.current
+                        ? "text-indigo-600"
+                        : "text-gray-400 group-hover:text-indigo-600",
+                      "h-6 w-6 shrink-0",
+                    )}
+                    aria-hidden="true"
+                  />
+                )}
+                {item.name}
+                {item.label && (
+                  <span
+                    className={cn(
+                      "self-center whitespace-nowrap break-keep rounded-sm border px-1 py-0.5 text-xs",
+                      item.current
+                        ? "border-indigo-600 text-indigo-600"
+                        : "border-gray-200 text-gray-400 group-hover:border-indigo-600 group-hover:text-indigo-600",
+                    )}
+                  >
+                    {item.label}
+                  </span>
+                )}
+              </Link>
+            ) : item.children && item.children.length > 0 ? (
+              <Disclosure
+                as="div"
+                defaultOpen={
+                  item.children.some((child) => child.current) || isOpen
+                }
+              >
+                {({ open }) => (
+                  <>
+                    <Disclosure.Button
+                      className="group flex w-full items-center gap-x-3 rounded-md p-2 text-left text-sm font-semibold leading-6 hover:bg-gray-50 hover:text-indigo-600"
+                      onClick={() => setIsOpen(!isOpen)}
+                    >
+                      {item.icon && (
+                        <item.icon
+                          className="h-6 w-6 shrink-0 text-gray-400 group-hover:text-indigo-600"
+                          aria-hidden="true"
+                        />
+                      )}
+                      {item.name}
+                      {item.label && (
+                        <span
+                          className={cn(
+                            "self-center whitespace-nowrap break-keep rounded-sm border px-1 py-0.5 text-xs",
+                            item.current
+                              ? "border-indigo-600 text-indigo-600"
+                              : "border-gray-200 text-gray-400 group-hover:border-indigo-600 group-hover:text-indigo-600",
+                          )}
+                        >
+                          {item.label}
+                        </span>
+                      )}
+                      <ChevronRightIcon
+                        className={clsx(
+                          open ? "rotate-90 text-gray-500" : "text-gray-400",
+                          "ml-auto h-5 w-5 shrink-0",
+                        )}
+                        aria-hidden="true"
+                      />
+                    </Disclosure.Button>
+                    <Disclosure.Panel as="ul" className="mt-1 px-2">
+                      {item.children?.map((subItem) => (
+                        <li key={subItem.name}>
+                          {/* 44px */}
+                          <Link
+                            href={subItem.href ?? "#"}
+                            className={clsx(
+                              subItem.current
+                                ? "bg-gray-50 text-indigo-600"
+                                : "text-gray-700 hover:bg-gray-50 hover:text-indigo-600",
+                              "flex w-full items-center gap-x-3 rounded-md py-2 pl-9 pr-2 text-sm leading-6",
+                            )}
+                          >
+                            {subItem.name}
+                            {subItem.label && (
+                              <span className="self-center whitespace-nowrap break-keep rounded-sm border border-gray-200 px-1 py-0.5 text-xs text-gray-400 group-hover:border-indigo-600 group-hover:text-indigo-600">
+                                {subItem.label}
+                              </span>
+                            )}
+                          </Link>
+                        </li>
+                      ))}
+                    </Disclosure.Panel>
+                  </>
+                )}
+              </Disclosure>
+            ) : null}
+          </li>
+        ))}
+        <FeedbackButtonWrapper
+          className="w-full"
+          title="Provide feedback"
+          description="What do you think about this project? What can be improved?"
+          type="feedback"
+        >
+          <li className="group flex cursor-pointer gap-x-3 rounded-md p-2 text-sm font-semibold leading-6 text-gray-700 hover:bg-gray-50 hover:text-indigo-600">
+            <MessageSquarePlus
+              className="h-6 w-6 shrink-0 text-gray-400 group-hover:text-indigo-600"
+              aria-hidden="true"
+            />
+            Feedback
+          </li>
+        </FeedbackButtonWrapper>
+      </ul>
+    </li>
+  );
+};

src/components/layouts/routes.ts

@@ -1,54 +1,70 @@
 import { type Flag } from "@/src/features/feature-flags/types";
+import { type Scope } from "@/src/features/rbac/constants/roleAccessRights";
 import {
   Database,
   LayoutDashboard,
   LifeBuoy,
-  LineChart,
   ListTree,
   type LucideIcon,
   Settings,
-  TextSelect,
   UsersIcon,
-  Route,
+  PenSquareIcon,
 } from "lucide-react";
 
-export const ROUTES: Array<{
+export type Route = {
   name: string;
-  pathname: string;
-  icon: LucideIcon;
   featureFlag?: Flag;
   label?: string;
-}> = [
+  rbacScope?: Scope;
+  icon?: LucideIcon; // ignored for nested routes
+  pathname?: string; // link, ignored if children
+  children?: Array<Route>; // folder
+};
+
+export const ROUTES: Route[] = [
   {
     name: "Dashboard",
     pathname: `/project/[projectId]`,
     icon: LayoutDashboard,
   },
   {
-    name: "Sessions",
-    pathname: `/project/[projectId]/sessions`,
-    icon: Route,
-  },
-  {
-    name: "Traces",
-    pathname: `/project/[projectId]/traces`,
+    name: "Tracing",
     icon: ListTree,
-  },
-  {
-    name: "Generations",
-    pathname: `/project/[projectId]/generations`,
-    icon: TextSelect,
-  },
-  {
-    name: "Scores",
-    pathname: `/project/[projectId]/scores`,
-    icon: LineChart,
+    children: [
+      {
+        name: "Traces",
+        pathname: `/project/[projectId]/traces`,
+      },
+      {
+        name: "Sessions",
+        pathname: `/project/[projectId]/sessions`,
+      },
+      {
+        name: "Generations",
+        pathname: `/project/[projectId]/generations`,
+      },
+      {
+        name: "Scores",
+        pathname: `/project/[projectId]/scores`,
+      },
+      {
+        name: "Models",
+        pathname: `/project/[projectId]/models`,
+      },
+    ],
   },
   {
     name: "Users",
     pathname: `/project/[projectId]/users`,
     icon: UsersIcon,
   },
+  {
+    name: "Prompts",
+    pathname: "/project/[projectId]/prompts",
+    icon: PenSquareIcon,
+    label: "Beta",
+    rbacScope: "prompts:read",
+  },
   {
     name: "Datasets",
     pathname: `/project/[projectId]/datasets`,

src/components/layouts/status-badge.tsx

@@ -0,0 +1,43 @@
+import { cn } from "@/src/utils/tailwind";
+
+const statusCategories = {
+  active: ["production", "live"],
+  inactive: ["disabled", "inactive"],
+};
+
+export type Status =
+  (typeof statusCategories)[keyof typeof statusCategories][number];
+
+export const StatusBadge = (props: { className?: string; type: Status }) => {
+  return (
+    <div
+      className={cn(
+        "inline-flex items-center gap-2 rounded-sm px-2 py-1 text-xs",
+        statusCategories.active.includes(props.type)
+          ? " bg-green-100 text-green-600"
+          : "bg-gray-100 text-gray-800",
+        props.className,
+      )}
+    >
+      <span className="relative inline-flex h-2 w-2">
+        <span
+          className={cn(
+            "absolute inline-flex h-full w-full  rounded-full opacity-75",
+            statusCategories.active.includes(props.type)
+              ? "animate-ping bg-green-500"
+              : "bg-gray-500",
+          )}
+        ></span>
+        <span
+          className={cn(
+            "relative inline-flex h-2 w-2 rounded-full ",
+            statusCategories.active.includes(props.type)
+              ? "bg-green-600"
+              : "bg-gray-600",
+          )}
+        ></span>
+      </span>
+      <span>{props.type}</span>
+    </div>
+  );
+};

src/components/session/index.tsx

@@ -8,13 +8,16 @@ import { Badge } from "@/src/components/ui/badge";
 import { Card } from "@/src/components/ui/card";
 import { ManualScoreButton } from "@/src/features/manual-scoring/components/ManualScoreButton";
 import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
+import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
 import { api } from "@/src/utils/api";
 import Link from "next/link";
+import { useEffect } from "react";
 
 export const SessionPage: React.FC<{
   sessionId: string;
   projectId: string;
 }> = ({ sessionId, projectId }) => {
+  const { setDetailPageList } = useDetailPageLists();
   const session = api.sessions.byId.useQuery(
     {
       sessionId,
@@ -27,6 +30,15 @@ export const SessionPage: React.FC<{
       },
     },
   );
+  useEffect(() => {
+    if (session.isSuccess) {
+      setDetailPageList(
+        "traces",
+        session.data.traces.map((t) => t.id),
+      );
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [session.isSuccess, session.data]);
 
   if (session.error?.data?.code === "UNAUTHORIZED") return <NoAccessError />;
 
@@ -56,15 +68,22 @@ export const SessionPage: React.FC<{
           />,
           <DetailPageNav
             key="nav"
-            currentId={sessionId}
-            path={(id) => `/project/${projectId}/sessions/${id}`}
+            currentId={encodeURIComponent(sessionId)}
+            path={(id) =>
+              `/project/${projectId}/sessions/${encodeURIComponent(id)}`
+            }
             listKey="sessions"
           />,
         ]}
       />
       <div className="flex flex-wrap gap-2">
-        {session.data?.users.map((userId) => (
-          <Link key={userId} href={`/project/${projectId}/users/${userId}`}>
+        {session.data?.users.filter(Boolean).map((userId) => (
+          <Link
+            key={userId}
+            href={`/project/${projectId}/users/${encodeURIComponent(
+              userId ?? "",
+            )}`}
+          >
             <Badge>User ID: {userId}</Badge>
           </Link>
         ))}

src/components/star-toggle.tsx

@@ -1,50 +1,37 @@
 import { StarIcon } from "lucide-react";
 
 import { Button } from "@/src/components/ui/button";
-import { useEffect, useState } from "react";
 import { api } from "@/src/utils/api";
 import { useHasAccess } from "@/src/features/rbac/utils/checkAccess";
 import { cn } from "@/src/utils/tailwind";
+import { type RouterOutput, type RouterInput } from "@/src/utils/types";
+import { useState } from "react";
 
 export function StarToggle({
   value,
   disabled = false,
   onClick,
   size = "sm",
+  isLoading,
 }: {
   value: boolean;
   disabled?: boolean;
   onClick: (value: boolean) => Promise<unknown>;
   size?: "sm" | "xs";
+  isLoading: boolean;
 }) {
-  const [cachedValue, setCachedValue] = useState<boolean | null>(null);
-  const [loading, setLoading] = useState(false);
-  const optimisticValue = cachedValue ?? value;
-
-  useEffect(() => {
-    setCachedValue(null);
-  }, [value]);
-
-  const handleBookmarkClick = async () => {
-    if (disabled) return;
-    setLoading(true);
-    setCachedValue(!optimisticValue);
-    await onClick(!optimisticValue);
-    setLoading(false);
-  };
-
   return (
     <Button
       variant="ghost"
       size={size}
-      onClick={() => void handleBookmarkClick()}
+      onClick={() => void onClick(!value)}
       disabled={disabled}
-      loading={loading}
+      loading={isLoading}
     >
       <StarIcon
         className={cn(
           "h-4 w-4",
-          optimisticValue ? "fill-current text-yellow-500" : "text-gray-500",
+          value ? "fill-current text-yellow-500" : "text-gray-500",
         )}
       />
     </Button>
@@ -52,6 +39,88 @@ export function StarToggle({
 }
 
 export function StarTraceToggle({
+  tracesFilter,
+  projectId,
+  traceId,
+  value,
+  size = "sm",
+}: {
+  tracesFilter: RouterInput["traces"]["all"];
+  projectId: string;
+  traceId: string;
+  value: boolean;
+  size?: "sm" | "xs";
+}) {
+  const utils = api.useUtils();
+  const hasAccess = useHasAccess({ projectId, scope: "objects:bookmark" });
+
+  const [isLoading, setIsLoading] = useState(false);
+
+  const mutBookmarkTrace = api.traces.bookmark.useMutation({
+    // Optimistic update
+    // Tanstack docs: https://tanstack.com/query/v4/docs/react/guides/optimistic-updates
+
+    onMutate: async () => {
+      // Cancel any outgoing refetches
+      // (so they don't overwrite our optimistic update)
+      await utils.traces.all.cancel();
+
+      setIsLoading(true);
+
+      // Snapshot the previous value
+      const prev = utils.traces.all.getData(tracesFilter);
+
+      return { prev };
+    },
+    onError: (err, _newTodo, context) => {
+      setIsLoading(false);
+      // Rollback to the previous value if mutation fails
+      console.log("error", err);
+      utils.traces.all.setData(tracesFilter, context?.prev);
+    },
+    onSettled: () => {
+      setIsLoading(false);
+      utils.traces.all.setData(
+        tracesFilter,
+        (oldQueryData: RouterOutput["traces"]["all"] | undefined) => {
+          return {
+            totalCount: oldQueryData?.totalCount,
+            traces: oldQueryData?.traces
+              ? oldQueryData.traces.map((trace) => {
+                  return {
+                    ...trace,
+                    bookmarked:
+                      trace.id === traceId
+                        ? !trace.bookmarked
+                        : trace.bookmarked,
+                  };
+                })
+              : [],
+          };
+        },
+      );
+      void utils.traces.all.invalidate();
+    },
+  });
+
+  return (
+    <StarToggle
+      value={value}
+      size={size}
+      disabled={!hasAccess}
+      isLoading={isLoading}
+      onClick={(value) =>
+        mutBookmarkTrace.mutateAsync({
+          projectId,
+          traceId,
+          bookmarked: value,
+        })
+      }
+    />
+  );
+}
+
+export function StarTraceDetailsToggle({
   projectId,
   traceId,
   value,
@@ -64,9 +133,44 @@ export function StarTraceToggle({
 }) {
   const utils = api.useUtils();
   const hasAccess = useHasAccess({ projectId, scope: "objects:bookmark" });
+
+  const [isLoading, setIsLoading] = useState(false);
+
   const mutBookmarkTrace = api.traces.bookmark.useMutation({
-    onSuccess: () => {
-      void utils.traces.invalidate();
+    onMutate: async () => {
+      // Cancel any outgoing refetches
+      // (so they don't overwrite our optimistic update)
+      await utils.traces.byId.cancel();
+
+      setIsLoading(true);
+
+      // Snapshot the previous value
+      const prevData = utils.traces.byId.getData({ traceId });
+
+      return { prevData };
+    },
+    onError: (err, _newTodo, context) => {
+      setIsLoading(false);
+      console.log("error", err);
+      // Rollback to the previous value if mutation fails
+      utils.traces.byId.setData({ traceId }, context?.prevData);
+    },
+    onSettled: () => {
+      setIsLoading(false);
+
+      utils.traces.byId.setData(
+        { traceId },
+        (oldQueryData: RouterOutput["traces"]["byId"] | undefined) => {
+          return oldQueryData
+            ? {
+                ...oldQueryData,
+                bookmarked: !oldQueryData.bookmarked,
+              }
+            : undefined;
+        },
+      );
+      void utils.traces.byId.invalidate();
+      void utils.traces.all.invalidate();
     },
   });
 
@@ -75,6 +179,7 @@ export function StarTraceToggle({
       value={value}
       size={size}
       disabled={!hasAccess}
+      isLoading={isLoading}
       onClick={(value) =>
         mutBookmarkTrace.mutateAsync({
           projectId,
@@ -109,6 +214,7 @@ export function StarSessionToggle({
     <StarToggle
       value={value}
       size={size}
+      isLoading={mutBookmarkSession.isLoading}
       disabled={!hasAccess}
       onClick={(value) =>
         mutBookmarkSession.mutateAsync({

src/components/table/data-table.tsx

@@ -1,16 +1,9 @@
 "use client";
 
-import {
-  flexRender,
-  getCoreRowModel,
-  useReactTable,
-  type ColumnFiltersState,
-  getFilteredRowModel,
-  type OnChangeFn,
-  type PaginationState,
-  type RowSelectionState,
-  type VisibilityState,
-} from "@tanstack/react-table";
+import DocPopup from "@/src/components/layouts/doc-popup";
+import { DataTablePagination } from "@/src/components/table/data-table-pagination";
+import { type LangfuseColumnDef } from "@/src/components/table/types";
+import { type ModelTableRow } from "@/src/components/table/use-cases/models";
 import {
   Table,
   TableBody,
@@ -19,10 +12,20 @@ import {
   TableHeader,
   TableRow,
 } from "@/src/components/ui/table";
+import { type OrderByState } from "@/src/features/orderBy/types";
+import { cn } from "@/src/utils/tailwind";
+import {
+  flexRender,
+  getCoreRowModel,
+  getFilteredRowModel,
+  useReactTable,
+  type ColumnFiltersState,
+  type OnChangeFn,
+  type PaginationState,
+  type RowSelectionState,
+  type VisibilityState,
+} from "@tanstack/react-table";
 import { useState } from "react";
-import { DataTablePagination } from "@/src/components/table/data-table-pagination";
-import { type LangfuseColumnDef } from "@/src/components/table/types";
-import DocPopup from "@/src/components/layouts/doc-popup";
 
 interface DataTableProps<TData, TValue> {
   columns: LangfuseColumnDef<TData, TValue>[];
@@ -36,6 +39,8 @@ interface DataTableProps<TData, TValue> {
   setRowSelection?: OnChangeFn<RowSelectionState>;
   columnVisibility?: VisibilityState;
   onColumnVisibilityChange?: OnChangeFn<VisibilityState>;
+  orderBy?: OrderByState;
+  setOrderBy?: (s: OrderByState) => void;
   help?: { description: string; href: string };
 }
 
@@ -55,8 +60,11 @@ export function DataTable<TData extends object, TValue>({
   columnVisibility,
   onColumnVisibilityChange,
   help,
+  orderBy,
+  setOrderBy,
 }: DataTableProps<TData, TValue>) {
   const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
+
   const table = useReactTable({
     data: data.data ?? [],
     columns,
@@ -93,17 +101,65 @@ export function DataTable<TData extends object, TValue>({
               {table.getHeaderGroups().map((headerGroup) => (
                 <TableRow key={headerGroup.id}>
                   {headerGroup.headers.map((header) => {
+                    const columnDef = header.column
+                      .columnDef as LangfuseColumnDef<ModelTableRow>;
+                    const sortingEnabled = columnDef.enableSorting;
                     return header.column.getIsVisible() ? (
                       <TableHead
                         key={header.id}
-                        className="whitespace-nowrap p-2"
+                        className={cn(
+                          sortingEnabled ? "cursor-pointer" : null,
+                          "whitespace-nowrap p-2",
+                        )}
+                        title={sortingEnabled ? "Sort by this column" : ""}
+                        onClick={(event) => {
+                          event.preventDefault(); // Add this line
+
+                          if (!setOrderBy || !columnDef.id || !sortingEnabled) {
+                            return;
+                          }
+
+                          if (orderBy?.column === columnDef.id) {
+                            if (orderBy.order === "DESC") {
+                              setOrderBy({
+                                column: columnDef.id,
+                                order: "ASC",
+                              });
+                            } else {
+                              setOrderBy(null);
+                            }
+                          } else {
+                            setOrderBy({
+                              column: columnDef.id,
+                              order: "DESC",
+                            });
+                          }
+                        }}
                       >
-                        {header.isPlaceholder
-                          ? null
-                          : flexRender(
-                              header.column.columnDef.header,
-                              header.getContext(),
-                            )}
+                        {header.isPlaceholder ? null : (
+                          <>
+                            <div className="select-none">
+                              {flexRender(
+                                header.column.columnDef.header,
+                                header.getContext(),
+                              )}
+
+                              {columnDef.headerTooltip && (
+                                <DocPopup
+                                  description={
+                                    columnDef.headerTooltip.description
+                                  }
+                                  href={columnDef.headerTooltip.href}
+                                  size="xs"
+                                />
+                              )}
+
+                              {orderBy?.column === columnDef.id
+                                ? renderOrderingIndicator(orderBy)
+                                : null}
+                            </div>
+                          </>
+                        )}
                       </TableHead>
                     ) : null;
                   })}
@@ -163,3 +219,9 @@ export function DataTable<TData extends object, TValue>({
     </>
   );
 }
+
+function renderOrderingIndicator(orderBy?: OrderByState) {
+  if (!orderBy) return;
+  if (orderBy.order === "ASC") return <span className="ml-1">▲</span>;
+  else return <span className="ml-1">▼</span>;
+}

src/components/table/types.ts

@@ -9,4 +9,10 @@ export type TableRowOptions = {
 export type LangfuseColumnDef<
   TData extends RowData,
   TValue = unknown,
-> = ColumnDef<TData, TValue> & { defaultHidden?: boolean };
+> = ColumnDef<TData, TValue> & {
+  defaultHidden?: boolean;
+  headerTooltip?: {
+    description: string;
+    href?: string;
+  };
+};

src/components/table/use-cases/generations.tsx

@@ -1,4 +1,5 @@
 import { api, directApi } from "@/src/utils/api";
+import { GroupedScoreBadges } from "@/src/components/grouped-score-badge";
 import { DataTable } from "@/src/components/table/data-table";
 import TableLink from "@/src/components/table/table-link";
 import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
@@ -26,7 +27,7 @@ import { formatInterval, utcDateOffsetByDays } from "@/src/utils/dates";
 import useColumnVisibility from "@/src/features/column-visibility/hooks/useColumnVisibility";
 import { JSONView } from "@/src/components/ui/code";
 import { type LangfuseColumnDef } from "@/src/components/table/types";
-import { type ObservationLevel } from "@prisma/client";
+import { type Score, type ObservationLevel } from "@prisma/client";
 import { cn } from "@/src/utils/tailwind";
 import { LevelColors } from "@/src/components/level-colors";
 import { usdFormatter } from "@/src/utils/numbers";
@@ -34,6 +35,7 @@ import {
   exportOptions,
   type ExportFileFormats,
 } from "@/src/server/api/interfaces/exportTypes";
+import { useOrderByState } from "@/src/features/orderBy/hooks/useOrderByState";
 
 export type GenerationsTableRow = {
   id: string;
@@ -49,6 +51,7 @@ export type GenerationsTableRow = {
   output?: unknown;
   traceName?: string;
   metadata?: string;
+  scores: Score[];
   usage: {
     promptTokens: number;
     completionTokens: number;
@@ -82,18 +85,34 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
     },
   ]);
 
+  const [orderByState, setOrderByState] = useOrderByState({
+    column: "startTime",
+    order: "DESC",
+  });
+
   const generations = api.generations.all.useQuery({
     page: paginationState.pageIndex,
     limit: paginationState.pageSize,
     projectId,
     filter: filterState,
+    orderBy: orderByState,
     searchQuery,
   });
-  const totalCount = generations.data?.slice(1)[0]?.totalCount ?? 0;
 
-  const filterOptions = api.generations.filterOptions.useQuery({
-    projectId,
-  });
+  const totalCount = generations.data?.totalCount ?? 0;
+
+  const filterOptions = api.generations.filterOptions.useQuery(
+    {
+      projectId,
+    },
+    {
+      trpc: {
+        context: {
+          skipBatch: true,
+        },
+      },
+    },
+  );
 
   const handleExport = async (fileFormat: ExportFileFormats) => {
     if (isExporting) return;
@@ -106,6 +125,7 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
         fileFormat,
         filter: filterState,
         searchQuery,
+        orderBy: orderByState,
       });
 
       let url: string;
@@ -143,6 +163,7 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
   const columns: LangfuseColumnDef<GenerationsTableRow>[] = [
     {
       accessorKey: "id",
+      id: "id",
       header: "ID",
       cell: ({ row }) => {
         const observationId = row.getValue("id");
@@ -155,13 +176,17 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
           />
         ) : null;
       },
+      enableSorting: true,
     },
     {
       accessorKey: "name",
+      id: "name",
       header: "name",
+      enableSorting: true,
     },
     {
       accessorKey: "traceId",
+      id: "traceId",
       header: "Trace ID",
       cell: ({ row }) => {
         const value = row.getValue("traceId");
@@ -172,19 +197,35 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
           />
         ) : undefined;
       },
+      enableSorting: true,
     },
     {
       accessorKey: "traceName",
+      id: "traceName",
       header: "Trace Name",
       enableHiding: true,
+      enableSorting: true,
     },
     {
       accessorKey: "startTime",
+      id: "startTime",
       header: "Start Time",
       enableHiding: true,
+      enableSorting: true,
+    },
+    {
+      accessorKey: "scores",
+      id: "scores",
+      header: "Scores",
+      cell: ({ row }) => {
+        const values: Score[] = row.getValue("scores");
+        return <GroupedScoreBadges scores={values} variant="headings" />;
+      },
+      enableHiding: true,
     },
     {
       accessorKey: "latency",
+      id: "latency",
       header: "Latency",
       cell: ({ row }) => {
         const value: number | undefined = row.getValue("latency");
@@ -193,6 +234,7 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
         ) : undefined;
       },
       enableHiding: true,
+      enableSorting: true,
     },
     {
       accessorKey: "cost",
@@ -208,6 +250,7 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
     },
     {
       accessorKey: "level",
+      id: "level",
       header: "Level",
       enableHiding: true,
       cell({ row }) {
@@ -224,6 +267,7 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
           </span>
         ) : undefined;
       },
+      enableSorting: true,
     },
     {
       accessorKey: "statusMessage",
@@ -233,8 +277,10 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
     },
     {
       accessorKey: "model",
+      id: "model",
       header: "Model",
       enableHiding: true,
+      enableSorting: true,
     },
     {
       accessorKey: "usage",
@@ -288,8 +334,10 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
     },
     {
       accessorKey: "version",
+      id: "version",
       header: "Version",
       enableHiding: true,
+      enableSorting: true,
     },
   ];
   const [columnVisibility, setColumnVisibility] =
@@ -299,7 +347,7 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
     );
 
   const rows: GenerationsTableRow[] = generations.isSuccess
-    ? generations.data.map((generation) => {
+    ? generations.data.generations.map((generation) => {
         return {
           id: generation.id,
           traceId: generation.traceId,
@@ -307,11 +355,12 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
           startTime: generation.startTime.toLocaleString(),
           endTime: generation.endTime?.toLocaleString() ?? undefined,
           latency: generation.latency === null ? undefined : generation.latency,
-          cost: generation.cost,
+          cost: generation.calculatedTotalCost,
           name: generation.name ?? undefined,
           version: generation.version ?? "",
           model: generation.model ?? "",
           input: generation.input,
+          scores: generation.scores,
           output: generation.output,
           level: generation.level,
           metadata: generation.metadata
@@ -380,7 +429,7 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
         data={
           generations.isLoading
             ? { isLoading: true, isError: false }
-            : generations.isError
+            : generations.error
               ? {
                   isLoading: false,
                   isError: true,
@@ -397,6 +446,8 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
           onChange: setPaginationState,
           state: paginationState,
         }}
+        setOrderBy={setOrderByState}
+        orderBy={orderByState}
         columnVisibility={columnVisibility}
         onColumnVisibilityChange={setColumnVisibility}
       />

src/components/table/use-cases/models.tsx

@@ -0,0 +1,330 @@
+import { DataTable } from "@/src/components/table/data-table";
+import { type LangfuseColumnDef } from "@/src/components/table/types";
+import { Button } from "@/src/components/ui/button";
+import useColumnVisibility from "@/src/features/column-visibility/hooks/useColumnVisibility";
+import { useHasAccess } from "@/src/features/rbac/utils/checkAccess";
+import { api } from "@/src/utils/api";
+import { usdFormatter } from "@/src/utils/numbers";
+import { type Prisma, type Model } from "@prisma/client";
+import Decimal from "decimal.js";
+import { Trash } from "lucide-react";
+import { useQueryParams, withDefault, NumberParam } from "use-query-params";
+
+export type ModelTableRow = {
+  modelId: string;
+  maintainer: string;
+  modelName: string;
+  matchPattern: string;
+  startDate?: Date;
+  inputPrice?: Decimal;
+  outputPrice?: Decimal;
+  totalPrice?: Decimal;
+  unit: string;
+  tokenizerId?: string;
+  config?: Prisma.JsonValue;
+};
+
+const modelConfigDescriptions = {
+  modelName:
+    "Standardized model name. Generations are assigned to this model name if they match the `matchPattern` upon ingestion.",
+  matchPattern:
+    "Regex pattern to match `model` parameter of generations to model pricing",
+  startDate:
+    "Date to start pricing model. If not set, model is active unless a more recent version exists.",
+  inputPrice: "Price per 1000 units of input",
+  outputPrice: "Price per 1000 units of output",
+  totalPrice:
+    "Price per 1000 units, for models that don't have input/output specific prices",
+  unit: "Unit of measurement for generative model, can be TOKENS, CHARACTERS, SECONDS, MILLISECONDS, or IMAGES.",
+  tokenizerId:
+    "Tokenizer used for this model to calculate token counts if none are ingested. Pick from list of supported tokenizers.",
+  config:
+    "Some tokenizers require additional configuration (e.g. openai tiktoken). See docs for details.",
+} as const;
+
+export default function ModelTable({ projectId }: { projectId: string }) {
+  const [paginationState, setPaginationState] = useQueryParams({
+    pageIndex: withDefault(NumberParam, 0),
+    pageSize: withDefault(NumberParam, 50),
+  });
+
+  const models = api.models.all.useQuery({
+    page: paginationState.pageIndex,
+    limit: paginationState.pageSize,
+    projectId,
+  });
+  const totalCount = models.data?.totalCount ?? 0;
+
+  const columns: LangfuseColumnDef<ModelTableRow>[] = [
+    {
+      accessorKey: "maintainer",
+      id: "maintainer",
+      enableColumnFilter: true,
+      header: "Maintainer",
+    },
+    {
+      accessorKey: "modelName",
+      id: "modelName",
+      header: "Model Name",
+      headerTooltip: {
+        description: modelConfigDescriptions.modelName,
+      },
+    },
+    {
+      accessorKey: "startDate",
+      id: "startDate",
+      header: "Start Date",
+      headerTooltip: {
+        description: modelConfigDescriptions.startDate,
+      },
+      cell: ({ row }) => {
+        const value: Date | undefined = row.getValue("startDate");
+
+        return value ? (
+          <span className="text-xs">{value.toISOString().slice(0, 10)} </span>
+        ) : (
+          <span className="text-xs">-</span>
+        );
+      },
+    },
+    {
+      accessorKey: "matchPattern",
+      id: "matchPattern",
+      headerTooltip: {
+        description: modelConfigDescriptions.matchPattern,
+      },
+      header: "Match Pattern",
+      cell: ({ row }) => {
+        const value: string = row.getValue("matchPattern");
+
+        return (
+          <code className="relative rounded bg-muted px-[0.3rem] py-[0.2rem] font-mono text-xs ">
+            {value}
+          </code>
+        );
+      },
+    },
+    {
+      accessorKey: "inputPrice",
+      id: "inputPrice",
+      header: () => {
+        return (
+          <>
+            Input Price{" "}
+            <span className="text-xs text-gray-400">/ 1k units</span>
+          </>
+        );
+      },
+      headerTooltip: {
+        description: modelConfigDescriptions.inputPrice,
+      },
+      cell: ({ row }) => {
+        const value: Decimal | undefined = row.getValue("inputPrice");
+
+        return value ? (
+          <span className="text-xs">
+            {usdFormatter(value.toNumber() * 1000, 2, 8)}
+          </span>
+        ) : (
+          <span className="text-xs">-</span>
+        );
+      },
+    },
+    {
+      accessorKey: "outputPrice",
+      id: "outputPrice",
+      headerTooltip: {
+        description: modelConfigDescriptions.outputPrice,
+      },
+      header: () => {
+        return (
+          <>
+            Output Price{" "}
+            <span className="text-xs text-gray-400">/ 1k units</span>
+          </>
+        );
+      },
+      cell: ({ row }) => {
+        const value: Decimal | undefined = row.getValue("outputPrice");
+
+        return value ? (
+          <span className="text-xs">
+            {usdFormatter(value.toNumber() * 1000, 2, 8)}
+          </span>
+        ) : (
+          <span className="text-xs">-</span>
+        );
+      },
+    },
+    {
+      accessorKey: "totalPrice",
+      id: "totalPrice",
+      header: () => {
+        return (
+          <>
+            Total Price{" "}
+            <span className="text-xs text-gray-400">/ 1k units</span>
+          </>
+        );
+      },
+      headerTooltip: {
+        description: modelConfigDescriptions.totalPrice,
+      },
+      cell: ({ row }) => {
+        const value: Decimal | undefined = row.getValue("totalPrice");
+
+        return value ? (
+          <span className="text-xs">
+            {usdFormatter(value.toNumber() * 1000, 2, 8)}
+          </span>
+        ) : (
+          <span className="text-xs">-</span>
+        );
+      },
+    },
+    {
+      accessorKey: "unit",
+      id: "unit",
+      header: "Unit",
+      headerTooltip: {
+        description: modelConfigDescriptions.unit,
+      },
+      enableHiding: true,
+    },
+    {
+      accessorKey: "tokenizerId",
+      id: "tokenizerId",
+      header: "Tokenizer",
+      headerTooltip: {
+        description: modelConfigDescriptions.tokenizerId,
+      },
+      enableHiding: true,
+    },
+    {
+      accessorKey: "config",
+      id: "config",
+      header: "Tokenizer Configuration",
+      headerTooltip: {
+        description: modelConfigDescriptions.config,
+      },
+      enableHiding: true,
+      cell: ({ row }) => {
+        const value: Prisma.JsonValue | undefined = row.getValue("config");
+
+        return value ? (
+          <span className="text-xs">{JSON.stringify(value)}</span>
+        ) : (
+          <span className="text-xs">-</span>
+        );
+      },
+    },
+    {
+      accessorKey: "actions",
+      header: "Actions",
+      cell: ({ row }) => {
+        return row.original.maintainer === "User" ? (
+          <DeleteModelButton
+            projectId={projectId}
+            modelId={row.original.modelId}
+          />
+        ) : (
+          <div className="h-6" />
+        );
+      },
+    },
+  ];
+
+  const [columnVisibility, setColumnVisibility] =
+    useColumnVisibility<ModelTableRow>("scoresColumnVisibility", columns);
+
+  const convertToTableRow = (model: Model): ModelTableRow => {
+    return {
+      modelId: model.id,
+      maintainer: model.projectId ? "User" : "Langfuse",
+      modelName: model.modelName,
+      matchPattern: model.matchPattern,
+      startDate: model.startDate ? new Date(model.startDate) : undefined,
+      inputPrice: model.inputPrice ? new Decimal(model.inputPrice) : undefined,
+      outputPrice: model.outputPrice
+        ? new Decimal(model.outputPrice)
+        : undefined,
+      totalPrice: model.totalPrice ? new Decimal(model.totalPrice) : undefined,
+      unit: model.unit,
+      tokenizerId: model.tokenizerId ?? undefined,
+      config: model.tokenizerConfig,
+    };
+  };
+
+  return (
+    <div>
+      <DataTable
+        columns={columns}
+        data={
+          models.isLoading
+            ? { isLoading: true, isError: false }
+            : models.isError
+              ? {
+                  isLoading: false,
+                  isError: true,
+                  error: models.error.message,
+                }
+              : {
+                  isLoading: false,
+                  isError: false,
+                  data: models.data.models.map((t) => convertToTableRow(t)),
+                }
+        }
+        pagination={{
+          pageCount: Math.ceil(totalCount / paginationState.pageSize),
+          onChange: setPaginationState,
+          state: paginationState,
+        }}
+        columnVisibility={columnVisibility}
+        onColumnVisibilityChange={setColumnVisibility}
+      />
+    </div>
+  );
+}
+
+const DeleteModelButton = ({
+  modelId,
+  projectId,
+}: {
+  modelId: string;
+  projectId: string;
+}) => {
+  const utils = api.useUtils();
+  const mut = api.models.delete.useMutation({
+    onSuccess: () => {
+      void utils.models.invalidate();
+    },
+  });
+
+  const hasAccess = useHasAccess({
+    projectId,
+    scope: "models:CUD",
+  });
+
+  if (!hasAccess) {
+    return null;
+  }
+
+  return (
+    <Button
+      size="xs"
+      variant="ghost"
+      onClick={() => {
+        mut
+          .mutateAsync({
+            projectId,
+            modelId,
+          })
+          .catch((error) => {
+            console.error(error);
+          });
+      }}
+    >
+      <Trash size={14} />
+    </Button>
+  );
+};

src/components/table/use-cases/sessions.tsx

@@ -7,6 +7,7 @@ import useColumnVisibility from "@/src/features/column-visibility/hooks/useColum
 import { useQueryFilterState } from "@/src/features/filters/hooks/useFilterState";
 import { type FilterState } from "@/src/features/filters/types";
 import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useOrderByState } from "@/src/features/orderBy/hooks/useOrderByState";
 import { sessionsViewCols } from "@/src/server/api/definitions/sessionsView";
 import { api } from "@/src/utils/api";
 import { formatInterval, utcDateOffsetByDays } from "@/src/utils/dates";
@@ -63,12 +64,19 @@ export default function SessionsTable({
     pageSize: withDefault(NumberParam, 50),
   });
 
+  const [orderByState, setOrderByState] = useOrderByState({
+    column: "createdAt",
+    order: "DESC",
+  });
+
   const sessions = api.sessions.all.useQuery({
     page: paginationState.pageIndex,
     limit: paginationState.pageSize,
     projectId,
     filter: filterState,
+    orderBy: orderByState,
   });
+
   const totalCount = sessions.data?.slice(1)[0]?.totalCount ?? 0;
   useEffect(() => {
     if (sessions.isSuccess) {
@@ -96,6 +104,7 @@ export default function SessionsTable({
   const columns: LangfuseColumnDef<SessionTableRow>[] = [
     {
       accessorKey: "bookmarked",
+      id: "bookmarked",
       header: undefined,
       cell: ({ row }) => {
         const bookmarked = row.getValue("bookmarked");
@@ -111,27 +120,33 @@ export default function SessionsTable({
           />
         ) : undefined;
       },
+      enableSorting: true,
     },
     {
       accessorKey: "id",
+      id: "id",
       header: "ID",
       cell: ({ row }) => {
         const value = row.getValue("id");
         return value && typeof value === "string" ? (
           <TableLink
-            path={`/project/${projectId}/sessions/${value}`}
+            path={`/project/${projectId}/sessions/${encodeURIComponent(value)}`}
             value={value}
           />
         ) : undefined;
       },
+      enableSorting: true,
     },
     {
       accessorKey: "createdAt",
+      id: "createdAt",
       header: "Created At",
       enableHiding: true,
+      enableSorting: true,
     },
     {
       accessorKey: "sessionDuration",
+      id: "sessionDuration",
       header: "Duration",
       enableHiding: true,
       cell: ({ row }) => {
@@ -140,6 +155,7 @@ export default function SessionsTable({
           ? formatInterval(value)
           : undefined;
       },
+      enableSorting: true,
     },
     {
       accessorKey: "userIds",
@@ -153,7 +169,7 @@ export default function SessionsTable({
             {(value as string[]).map((user) => (
               <TableLink
                 key={user}
-                path={`/project/${projectId}/users/${user}`}
+                path={`/project/${projectId}/users/${encodeURIComponent(user)}`}
                 value={user}
                 truncateAt={40}
               />
@@ -164,8 +180,10 @@ export default function SessionsTable({
     },
     {
       accessorKey: "countTraces",
+      id: "countTraces",
       header: "Traces",
       enableHiding: true,
+      enableSorting: true,
     },
   ];
 
@@ -204,6 +222,8 @@ export default function SessionsTable({
           onChange: setPaginationState,
           state: paginationState,
         }}
+        setOrderBy={setOrderByState}
+        orderBy={orderByState}
         columnVisibility={columnVisibility}
         onColumnVisibilityChange={setColumnVisibility}
         help={{

src/components/table/use-cases/traces.tsx

@@ -1,20 +1,26 @@
 import { DeleteTrace } from "@/src/components/delete-trace";
-import { TraceTableMultiSelectAction } from "@/src/components/table/data-table-multi-select-actions/trace-table-multi-select-action";
 import { GroupedScoreBadges } from "@/src/components/grouped-score-badge";
+import { StarTraceToggle } from "@/src/components/star-toggle";
 import { DataTable } from "@/src/components/table/data-table";
+import { TraceTableMultiSelectAction } from "@/src/components/table/data-table-multi-select-actions/trace-table-multi-select-action";
 import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
 import TableLink from "@/src/components/table/table-link";
+import { type LangfuseColumnDef } from "@/src/components/table/types";
+import { TagTracePopver } from "@/src/features/tag/components/TagTracePopver";
 import { TokenUsageBadge } from "@/src/components/token-usage-badge";
 import { Checkbox } from "@/src/components/ui/checkbox";
+import { JSONView } from "@/src/components/ui/code";
 import useColumnVisibility from "@/src/features/column-visibility/hooks/useColumnVisibility";
 import { useQueryFilterState } from "@/src/features/filters/hooks/useFilterState";
 import { type FilterState } from "@/src/features/filters/types";
 import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
+import { useOrderByState } from "@/src/features/orderBy/hooks/useOrderByState";
 import { tracesTableColsWithOptions } from "@/src/server/api/definitions/tracesTable";
 import { api } from "@/src/utils/api";
 import { formatInterval, utcDateOffsetByDays } from "@/src/utils/dates";
 import { type RouterInput, type RouterOutput } from "@/src/utils/types";
 import { type Score } from "@prisma/client";
+import { type RowSelectionState } from "@tanstack/react-table";
 import { useEffect, useState } from "react";
 import {
   NumberParam,
@@ -23,10 +29,8 @@ import {
   useQueryParams,
   withDefault,
 } from "use-query-params";
-import { StarTraceToggle } from "@/src/components/star-toggle";
-import { JSONView } from "@/src/components/ui/code";
-import { type LangfuseColumnDef } from "@/src/components/table/types";
-import { type RowSelectionState } from "@tanstack/react-table";
+import type Decimal from "decimal.js";
+import { usdFormatter } from "@/src/utils/numbers";
 
 export type TracesTableRow = {
   bookmarked: boolean;
@@ -42,11 +46,13 @@ export type TracesTableRow = {
   output?: unknown;
   sessionId?: string;
   scores: Score[];
+  tags: string[];
   usage: {
     promptTokens: number;
     completionTokens: number;
     totalTokens: number;
   };
+  cost?: Decimal;
 };
 
 export type TracesTableProps = {
@@ -76,6 +82,10 @@ export default function TracesTable({
       value: utcDateOffsetByDays(-14),
     },
   ]);
+  const [orderByState, setOrderByState] = useOrderByState({
+    column: "timestamp",
+    order: "DESC",
+  });
 
   const userIdFilter: FilterState = userId
     ? [
@@ -93,31 +103,44 @@ export default function TracesTable({
     pageIndex: withDefault(NumberParam, 0),
     pageSize: withDefault(NumberParam, 50),
   });
-
-  const traces = api.traces.all.useQuery({
+  const tracesAllQueryFilter = {
     page: paginationState.pageIndex,
     limit: paginationState.pageSize,
     projectId,
     filter: filterState,
     searchQuery,
-  });
-  const totalCount = traces.data?.slice(1)[0]?.totalCount ?? 0;
+    orderBy: orderByState,
+  };
+  const traces = api.traces.all.useQuery(tracesAllQueryFilter);
+
+  const totalCount = traces.data?.totalCount ?? 0;
   useEffect(() => {
     if (traces.isSuccess) {
       setDetailPageList(
         "traces",
-        traces.data.map((t) => t.id),
+        traces.data.traces.map((t) => t.id),
       );
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [traces.isSuccess, traces.data]);
 
-  const traceFilterOptions = api.traces.filterOptions.useQuery({
-    projectId,
-  });
-
+  // loading filter options individually from the remaining calls
+  // traces.all should load first together with everything else.
+  // This here happens in the background.
+  const traceFilterOptions = api.traces.filterOptions.useQuery(
+    {
+      projectId,
+    },
+    {
+      trpc: {
+        context: {
+          skipBatch: true,
+        },
+      },
+    },
+  );
   const convertToTableRow = (
-    trace: RouterOutput["traces"]["all"][0],
+    trace: RouterOutput["traces"]["all"]["traces"][0],
   ): TracesTableRow => {
     return {
       bookmarked: trace.bookmarked,
@@ -133,11 +156,13 @@ export default function TracesTable({
       input: trace.input,
       output: trace.output,
       latency: trace.latency === null ? undefined : trace.latency,
+      tags: trace.tags,
       usage: {
         promptTokens: trace.promptTokens,
         completionTokens: trace.completionTokens,
         totalTokens: trace.totalTokens,
       },
+      cost: trace.calculatedTotalCost ?? undefined,
     };
   };
 
@@ -173,13 +198,14 @@ export default function TracesTable({
     {
       accessorKey: "bookmarked",
       header: undefined,
+      id: "bookmarked",
       cell: ({ row }) => {
         const bookmarked = row.getValue("bookmarked");
         const traceId = row.getValue("id");
-
         return typeof traceId === "string" &&
           typeof bookmarked === "boolean" ? (
           <StarTraceToggle
+            tracesFilter={tracesAllQueryFilter}
             traceId={traceId}
             projectId={projectId}
             value={bookmarked}
@@ -191,6 +217,7 @@ export default function TracesTable({
     {
       accessorKey: "id",
       header: "ID",
+      id: "id",
       cell: ({ row }) => {
         const value = row.getValue("id");
         return value && typeof value === "string" ? (
@@ -200,32 +227,38 @@ export default function TracesTable({
           />
         ) : undefined;
       },
+      enableSorting: true,
     },
     {
       accessorKey: "timestamp",
       header: "Timestamp",
+      id: "timestamp",
       enableHiding: true,
+      enableSorting: true,
     },
     {
       accessorKey: "name",
       header: "Name",
+      id: "name",
       enableHiding: true,
     },
     {
       accessorKey: "userId",
       enableColumnFilter: !omittedFilter.find((f) => f === "userId"),
       header: "User ID",
+      id: "userId",
       cell: ({ row }) => {
         const value = row.getValue("userId");
         return value && typeof value === "string" ? (
           <TableLink
-            path={`/project/${projectId}/users/${value}`}
+            path={`/project/${projectId}/users/${encodeURIComponent(value)}`}
             value={value}
             truncateAt={40}
           />
         ) : undefined;
       },
       enableHiding: true,
+      enableSorting: true,
     },
     {
       accessorKey: "sessionId",
@@ -235,7 +268,7 @@ export default function TracesTable({
         const value = row.getValue("sessionId");
         return value && typeof value === "string" ? (
           <TableLink
-            path={`/project/${projectId}/sessions/${value}`}
+            path={`/project/${projectId}/sessions/${encodeURIComponent(value)}`}
             value={value}
             truncateAt={40}
           />
@@ -245,6 +278,7 @@ export default function TracesTable({
     },
     {
       accessorKey: "latency",
+      id: "latency",
       header: "Latency",
       // add seconds to the end of the latency
       cell: ({ row }) => {
@@ -252,8 +286,10 @@ export default function TracesTable({
         return value !== undefined ? formatInterval(value) : undefined;
       },
       enableHiding: true,
+      enableSorting: true,
     },
     {
+      // TODO: Enable Ordering By Usage (not covered by API yet)
       accessorKey: "usage",
       header: "Usage",
       cell: ({ row }) => {
@@ -273,8 +309,28 @@ export default function TracesTable({
       },
       enableHiding: true,
     },
+    {
+      accessorKey: "cost",
+      id: "cost",
+      header: "Cost",
+      cell: ({ row }) => {
+        const cost: Decimal | undefined = row.getValue("cost");
+        return (
+          <div>
+            {cost ? (
+              <span>{usdFormatter(cost.toNumber())}</span>
+            ) : (
+              <span>Not Available</span>
+            )}
+          </div>
+        );
+      },
+      enableHiding: true,
+      enableSorting: true,
+    },
     {
       accessorKey: "scores",
+      id: "scores",
       header: "Scores",
       enableColumnFilter: !omittedFilter.find((f) => f === "scores"),
       cell: ({ row }) => {
@@ -314,13 +370,38 @@ export default function TracesTable({
     },
     {
       accessorKey: "version",
+      id: "version",
       header: "Version",
       enableHiding: true,
+      enableSorting: true,
     },
     {
       accessorKey: "release",
+      id: "release",
       header: "Release",
       enableHiding: true,
+      enableSorting: true,
+    },
+    {
+      accessorKey: "tags",
+      id: "tags",
+      header: "Tags",
+      cell: ({ row }) => {
+        const tags: string[] = row.getValue("tags");
+        const traceId: string = row.getValue("id");
+        const filterOptionTags = traceFilterOptions.data?.tags ?? [];
+        const allTags = filterOptionTags.map((t) => t.value);
+        return (
+          <TagTracePopver
+            tags={tags}
+            availableTags={allTags}
+            projectId={projectId}
+            traceId={traceId}
+            tracesFilter={tracesAllQueryFilter}
+          />
+        );
+      },
+      enableHiding: true,
     },
     {
       accessorKey: "action",
@@ -359,7 +440,8 @@ export default function TracesTable({
           <TraceTableMultiSelectAction
             // Exclude traces that are not in the current page
             selectedTraceIds={Object.keys(selectedRows).filter(
-              (traceId) => traces.data?.map((t) => t.id).includes(traceId),
+              (traceId) =>
+                traces.data?.traces.map((t) => t.id).includes(traceId),
             )}
             projectId={projectId}
             onDeleteSuccess={() => {
@@ -384,14 +466,16 @@ export default function TracesTable({
               : {
                   isLoading: false,
                   isError: false,
-                  data: traces.data.map((t) => convertToTableRow(t)),
+                  data: traces.data.traces.map((t) => convertToTableRow(t)),
                 }
         }
         pagination={{
-          pageCount: Math.ceil(totalCount / paginationState.pageSize),
+          pageCount: Math.ceil(Number(totalCount) / paginationState.pageSize),
           onChange: setPaginationState,
           state: paginationState,
         }}
+        setOrderBy={setOrderByState}
+        orderBy={orderByState}
         rowSelection={selectedRows}
         setRowSelection={setSelectedRows}
         columnVisibility={columnVisibility}

src/components/trace/ObservationPreview.tsx

@@ -22,6 +22,9 @@ import { type ObservationReturnType } from "@/src/server/api/routers/traces";
 import { api } from "@/src/utils/api";
 import { IOPreview } from "@/src/components/trace/IOPreview";
 import { formatInterval } from "@/src/utils/dates";
+import Link from "next/link";
+import { usdFormatter } from "@/src/utils/numbers";
+import { calculateDisplayTotalCost } from "@/src/components/trace";
 
 export const ObservationPreview = (props: {
   observations: Array<ObservationReturnType>;
@@ -39,6 +42,10 @@ export const ObservationPreview = (props: {
     (o) => o.id === props.currentObservationId,
   );
 
+  const totalCost = calculateDisplayTotalCost(
+    preloadedObservation ? [preloadedObservation] : [],
+  );
+
   if (!preloadedObservation) return <div className="flex-1">Not found</div>;
   return (
     <Card className="flex-1">
@@ -54,8 +61,25 @@ export const ObservationPreview = (props: {
             {preloadedObservation.startTime.toLocaleString()}
           </CardDescription>
           <div className="flex flex-wrap gap-2">
+            {preloadedObservation.promptId ? (
+              <PromptBadge
+                promptId={preloadedObservation.promptId}
+                projectId={preloadedObservation.projectId}
+              />
+            ) : undefined}
+            {preloadedObservation.completionStartTime ? (
+              <Badge variant="outline">
+                Time to first token:{" "}
+                {formatInterval(
+                  (preloadedObservation.completionStartTime.getTime() -
+                    preloadedObservation.startTime.getTime()) /
+                    1000,
+                )}
+              </Badge>
+            ) : null}
             {preloadedObservation.endTime ? (
               <Badge variant="outline">
+                Latency:{" "}
                 {formatInterval(
                   (preloadedObservation.endTime.getTime() -
                     preloadedObservation.startTime.getTime()) /
@@ -78,11 +102,12 @@ export const ObservationPreview = (props: {
             {preloadedObservation.model ? (
               <Badge variant="outline">{preloadedObservation.model}</Badge>
             ) : null}
-            {preloadedObservation.price ? (
+            {totalCost ? (
               <Badge variant="outline">
-                {preloadedObservation.price.toString()} USD
+                {usdFormatter(totalCost.toNumber())}
               </Badge>
             ) : undefined}
+
             {preloadedObservation.modelParameters &&
             typeof preloadedObservation.modelParameters === "object"
               ? Object.entries(preloadedObservation.modelParameters)
@@ -173,3 +198,23 @@ export const ObservationPreview = (props: {
     </Card>
   );
 };
+
+const PromptBadge = (props: { promptId: string; projectId: string }) => {
+  const prompt = api.prompts.byId.useQuery({
+    id: props.promptId,
+    projectId: props.projectId,
+  });
+
+  if (prompt.isLoading || !prompt.data) return null;
+  return (
+    <Link
+      href={`/project/${props.projectId}/prompts/${prompt.data.name}?version=${prompt.data.version}`}
+    >
+      <Badge>
+        Prompt: {prompt.data.name}
+        {" - v"}
+        {prompt.data.version}
+      </Badge>
+    </Link>
+  );
+};

src/components/trace/ObservationTree.tsx

@@ -1,47 +1,70 @@
 import { type NestedObservation } from "@/src/utils/types";
 import { cn } from "@/src/utils/tailwind";
-import { type Trace, type Score } from "@prisma/client";
+import { type Trace, type Score, $Enums } from "@prisma/client";
 import { GroupedScoreBadges } from "@/src/components/grouped-score-badge";
 import { Fragment } from "react";
 import { type ObservationReturnType } from "@/src/server/api/routers/traces";
 import { LevelColors } from "@/src/components/level-colors";
 import { formatInterval } from "@/src/utils/dates";
+import { MinusCircle, MinusIcon, PlusCircleIcon, PlusIcon } from "lucide-react";
+import { Toggle } from "@/src/components/ui/toggle";
+import { Button } from "@/src/components/ui/button";
 
 export const ObservationTree = (props: {
   observations: ObservationReturnType[];
+  collapsedObservations: string[];
+  toggleCollapsedObservation: (id: string) => void;
+  collapseAll: () => void;
+  expandAll: () => void;
   trace: Trace;
   scores: Score[];
   currentObservationId: string | undefined;
   setCurrentObservationId: (id: string | undefined) => void;
+  showMetrics: boolean;
+  showScores: boolean;
+  className?: string;
 }) => {
   const nestedObservations = nestObservations(props.observations);
   return (
-    <div className="flex flex-col">
+    <div className={props.className}>
       <ObservationTreeTraceNode
+        expandAll={props.expandAll}
+        collapseAll={props.collapseAll}
         trace={props.trace}
         scores={props.scores}
         currentObservationId={props.currentObservationId}
         setCurrentObservationId={props.setCurrentObservationId}
+        showMetrics={props.showMetrics}
+        showScores={props.showScores}
       />
       <ObservationTreeNode
         observations={nestedObservations}
+        collapsedObservations={props.collapsedObservations}
+        toggleCollapsedObservation={props.toggleCollapsedObservation}
         scores={props.scores}
         indentationLevel={1}
         currentObservationId={props.currentObservationId}
         setCurrentObservationId={props.setCurrentObservationId}
+        showMetrics={props.showMetrics}
+        showScores={props.showScores}
       />
     </div>
   );
 };
+
 const ObservationTreeTraceNode = (props: {
   trace: Trace & { latency?: number };
+  expandAll: () => void;
+  collapseAll: () => void;
   scores: Score[];
   currentObservationId: string | undefined;
   setCurrentObservationId: (id: string | undefined) => void;
+  showMetrics?: boolean;
+  showScores?: boolean;
 }) => (
   <div
     className={cn(
-      "group my-1 flex cursor-pointer flex-col gap-1 rounded-sm p-2",
+      "group mb-0.5 flex cursor-pointer flex-col gap-1 rounded-sm p-1",
       props.currentObservationId === undefined ||
         props.currentObservationId === ""
         ? "bg-gray-100"
@@ -51,115 +74,194 @@ const ObservationTreeTraceNode = (props: {
   >
     <div className="flex gap-2">
       <span className={cn("rounded-sm bg-gray-200 p-1 text-xs")}>TRACE</span>
-      <span>{props.trace.name}</span>
+      <span className="flex-1 text-sm">{props.trace.name}</span>
+      <Button
+        onClick={(ev) => (ev.stopPropagation(), props.expandAll())}
+        size="xs"
+        variant="ghost"
+        title="Expand all"
+      >
+        <PlusCircleIcon className="h-4 w-4" />
+      </Button>
+      <Button
+        onClick={(ev) => (ev.stopPropagation(), props.collapseAll())}
+        size="xs"
+        variant="ghost"
+        title="Collapse all"
+      >
+        <MinusCircle className="h-4 w-4" />
+      </Button>
     </div>
 
-    {props.trace.latency ? (
+    {props.showMetrics && props.trace.latency ? (
       <div className="flex gap-2">
         <span className="text-xs text-gray-500">
           {formatInterval(props.trace.latency)}
         </span>
       </div>
     ) : null}
-    <div className="flex flex-wrap gap-1">
-      {props.scores.find((s) => s.observationId === null) ? (
+    {props.showScores && props.scores.find((s) => s.observationId === null) ? (
+      <div className="flex flex-wrap gap-1">
         <GroupedScoreBadges
           scores={props.scores.filter((s) => s.observationId === null)}
         />
-      ) : null}
-    </div>
+      </div>
+    ) : null}
   </div>
 );
+
 const ObservationTreeNode = (props: {
   observations: NestedObservation[];
+  collapsedObservations: string[];
+  toggleCollapsedObservation: (id: string) => void;
   scores: Score[];
   indentationLevel: number;
   currentObservationId: string | undefined;
   setCurrentObservationId: (id: string | undefined) => void;
+  showMetrics?: boolean;
+  showScores?: boolean;
 }) => (
   <>
     {props.observations
       .sort((a, b) => a.startTime.getTime() - b.startTime.getTime())
-      .map((observation) => (
-        <Fragment key={observation.id}>
-          <div className="flex">
-            {Array.from({ length: props.indentationLevel }, (_, i) => (
-              <div className="mx-2 border-r lg:mr-4" key={i} />
-            ))}
-            <div
-              className={cn(
-                "group my-1 flex flex-1 cursor-pointer flex-col gap-1 rounded-sm p-2 ",
-                props.currentObservationId === observation.id
-                  ? "bg-gray-100"
-                  : "hover:bg-gray-50",
-              )}
-              onClick={() => props.setCurrentObservationId(observation.id)}
-            >
-              <div className="flex gap-2">
-                <span
-                  className={cn(
-                    "self-start rounded-sm bg-gray-200 p-1 text-xs",
-                  )}
-                >
-                  {observation.type}
-                </span>
-                <span className="line-clamp-1">{observation.name}</span>
-              </div>
-              <div className="flex gap-2">
-                {observation.endTime ? (
-                  <span className="text-xs text-gray-500">
-                    {formatInterval(
-                      (observation.endTime.getTime() -
-                        observation.startTime.getTime()) /
-                        1000,
-                    )}
-                  </span>
-                ) : null}
-                {observation.promptTokens ||
-                observation.completionTokens ||
-                observation.totalTokens ? (
-                  <span className="text-xs text-gray-500">
-                    {observation.promptTokens} → {observation.completionTokens}{" "}
-                    (∑ {observation.totalTokens})
-                  </span>
-                ) : null}
-              </div>
-              {observation.level !== "DEFAULT" ? (
-                <div className="flex">
-                  <span
-                    className={cn(
-                      "rounded-sm p-0.5 text-xs",
-                      LevelColors[observation.level].bg,
-                      LevelColors[observation.level].text,
-                    )}
-                  >
-                    {observation.level}
-                  </span>
-                </div>
-              ) : null}
-              {props.scores.find((s) => s.observationId === observation.id) ? (
-                <div className="flex flex-wrap gap-1">
-                  <GroupedScoreBadges
-                    scores={props.scores.filter(
-                      (s) => s.observationId === observation.id,
-                    )}
+      .map((observation) => {
+        const collapsed = props.collapsedObservations.includes(observation.id);
+
+        return (
+          <Fragment key={observation.id}>
+            <div className="flex">
+              {Array.from({ length: props.indentationLevel }, (_, i) => (
+                <div className="mx-2 border-r" key={i} />
+              ))}
+              <div
+                className={cn(
+                  "group my-0.5 flex flex-1 cursor-pointer flex-col gap-1 rounded-sm p-1",
+                  props.currentObservationId === observation.id
+                    ? "bg-gray-100"
+                    : "hover:bg-gray-50",
+                )}
+                onClick={() => props.setCurrentObservationId(observation.id)}
+              >
+                <div className="flex gap-2">
+                  <ColorCodedObservationType
+                    observationType={observation.type}
                   />
+                  <span className="line-clamp-1 flex-1 text-sm">
+                    {observation.name}
+                  </span>
+                  {observation.children.length === 0 ? null : (
+                    <Toggle
+                      onClick={(ev) => (
+                        ev.stopPropagation(),
+                        props.toggleCollapsedObservation(observation.id)
+                      )}
+                      variant="default"
+                      pressed={collapsed}
+                      size="xs"
+                      className="w-7"
+                      title={
+                        collapsed ? "Expand children" : "Collapse children"
+                      }
+                    >
+                      {collapsed ? (
+                        <PlusIcon className="h-4 w-4" />
+                      ) : (
+                        <MinusIcon className="h-4 w-4" />
+                      )}
+                    </Toggle>
+                  )}
                 </div>
-              ) : null}
+                {props.showMetrics &&
+                  (observation.promptTokens ||
+                    observation.completionTokens ||
+                    observation.totalTokens ||
+                    observation.endTime) && (
+                    <div className="flex gap-2">
+                      {observation.endTime ? (
+                        <span className="text-xs text-gray-500">
+                          {formatInterval(
+                            (observation.endTime.getTime() -
+                              observation.startTime.getTime()) /
+                              1000,
+                          )}
+                        </span>
+                      ) : null}
+                      {observation.promptTokens ||
+                      observation.completionTokens ||
+                      observation.totalTokens ? (
+                        <span className="text-xs text-gray-500">
+                          {observation.promptTokens} →{" "}
+                          {observation.completionTokens} (∑{" "}
+                          {observation.totalTokens})
+                        </span>
+                      ) : null}
+                    </div>
+                  )}
+                {observation.level !== "DEFAULT" ? (
+                  <div className="flex">
+                    <span
+                      className={cn(
+                        "rounded-sm p-0.5 text-xs",
+                        LevelColors[observation.level].bg,
+                        LevelColors[observation.level].text,
+                      )}
+                    >
+                      {observation.level}
+                    </span>
+                  </div>
+                ) : null}
+                {props.showScores &&
+                props.scores.find((s) => s.observationId === observation.id) ? (
+                  <div className="flex flex-wrap gap-1">
+                    <GroupedScoreBadges
+                      scores={props.scores.filter(
+                        (s) => s.observationId === observation.id,
+                      )}
+                    />
+                  </div>
+                ) : null}
+              </div>
             </div>
-          </div>
-          <ObservationTreeNode
-            observations={observation.children}
-            scores={props.scores}
-            indentationLevel={props.indentationLevel + 1}
-            currentObservationId={props.currentObservationId}
-            setCurrentObservationId={props.setCurrentObservationId}
-          />
-        </Fragment>
-      ))}
+            {!collapsed && (
+              <ObservationTreeNode
+                observations={observation.children}
+                collapsedObservations={props.collapsedObservations}
+                toggleCollapsedObservation={props.toggleCollapsedObservation}
+                scores={props.scores}
+                indentationLevel={props.indentationLevel + 1}
+                currentObservationId={props.currentObservationId}
+                setCurrentObservationId={props.setCurrentObservationId}
+                showMetrics={props.showMetrics}
+                showScores={props.showScores}
+              />
+            )}
+          </Fragment>
+        );
+      })}
   </>
 );
 
+const ColorCodedObservationType = (props: {
+  observationType: $Enums.ObservationType;
+}) => {
+  const colors: Record<$Enums.ObservationType, string> = {
+    [$Enums.ObservationType.SPAN]: "bg-blue-100",
+    [$Enums.ObservationType.GENERATION]: "bg-orange-100",
+    [$Enums.ObservationType.EVENT]: "bg-green-100",
+  };
+
+  return (
+    <span
+      className={cn(
+        "self-start rounded-sm p-1 text-xs",
+        colors[props.observationType],
+      )}
+    >
+      {props.observationType}
+    </span>
+  );
+};
+
 export function nestObservations(
   list: ObservationReturnType[],
 ): NestedObservation[] {

src/components/trace/index.tsx

@@ -6,7 +6,6 @@ import { TracePreview } from "./TracePreview";
 import Header from "@/src/components/layouts/header";
 import { Badge } from "@/src/components/ui/badge";
 import { TraceAggUsageBadge } from "@/src/components/token-usage-badge";
-import Decimal from "decimal.js";
 import { StringParam, useQueryParam } from "use-query-params";
 import { PublishTraceSwitch } from "@/src/components/publish-object-switch";
 import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
@@ -14,9 +13,17 @@ import { useRouter } from "next/router";
 import { type ObservationReturnType } from "@/src/server/api/routers/traces";
 import { api } from "@/src/utils/api";
 import { DeleteTrace } from "@/src/components/delete-trace";
-import { StarTraceToggle } from "@/src/components/star-toggle";
+import { StarTraceDetailsToggle } from "@/src/components/star-toggle";
 import Link from "next/link";
 import { NoAccessError } from "@/src/components/no-access";
+import { TagTraceDetailsPopover } from "@/src/features/tag/components/TagTraceDetailsPopover";
+import useLocalStorage from "@/src/components/useLocalStorage";
+import { Toggle } from "@/src/components/ui/toggle";
+import { Award, ChevronsDownUp, ChevronsUpDown } from "lucide-react";
+import { ScrollArea } from "@/src/components/ui/scroll-area";
+import { usdFormatter } from "@/src/utils/numbers";
+import Decimal from "decimal.js";
+import { useCallback, useState } from "react";
 
 export function Trace(props: {
   observations: Array<ObservationReturnType>;
@@ -28,10 +35,64 @@ export function Trace(props: {
     "observation",
     StringParam,
   );
+  const [metricsOnObservationTree, setMetricsOnObservationTree] =
+    useLocalStorage("metricsOnObservationTree", true);
+  const [scoresOnObservationTree, setScoresOnObservationTree] = useLocalStorage(
+    "scoresOnObservationTree",
+    true,
+  );
+
+  const [collapsedObservations, setCollapsedObservations] = useState<string[]>(
+    [],
+  );
+
+  const toggleCollapsedObservation = useCallback(
+    (id: string) => {
+      if (collapsedObservations.includes(id)) {
+        setCollapsedObservations(collapsedObservations.filter((i) => i !== id));
+      } else {
+        setCollapsedObservations([...collapsedObservations, id]);
+      }
+    },
+    [collapsedObservations],
+  );
+
+  const collapseAll = useCallback(() => {
+    // exclude all parents of the current observation
+    let excludeParentObservations = new Set<string>();
+    let newExcludeParentObservations = new Set<string>();
+    do {
+      excludeParentObservations = new Set<string>([
+        ...excludeParentObservations,
+        ...newExcludeParentObservations,
+      ]);
+      newExcludeParentObservations = new Set<string>(
+        props.observations
+          .filter(
+            (o) =>
+              o.parentObservationId !== null &&
+              (o.id === currentObservationId ||
+                excludeParentObservations.has(o.id)),
+          )
+          .map((o) => o.parentObservationId as string)
+          .filter((id) => !excludeParentObservations.has(id)),
+      );
+    } while (newExcludeParentObservations.size > 0);
+
+    setCollapsedObservations(
+      props.observations
+        .map((o) => o.id)
+        .filter((id) => !excludeParentObservations.has(id)),
+    );
+  }, [props.observations, currentObservationId]);
+
+  const expandAll = useCallback(() => {
+    setCollapsedObservations([]);
+  }, [setCollapsedObservations]);
 
   return (
-    <div className="grid h-full gap-4 md:grid-cols-3">
-      <div className="md:col-span-2 md:h-full md:overflow-y-auto">
+    <div className="grid gap-4 md:h-full md:grid-cols-5">
+      <ScrollArea className="md:col-span-3 md:h-full">
         {currentObservationId === undefined ||
         currentObservationId === "" ||
         currentObservationId === null ? (
@@ -49,15 +110,49 @@ export function Trace(props: {
             traceId={props.trace.id}
           />
         )}
-      </div>
-      <div className="md:h-full md:overflow-y-auto">
-        <ObservationTree
-          observations={props.observations}
-          trace={props.trace}
-          scores={props.scores}
-          currentObservationId={currentObservationId ?? undefined}
-          setCurrentObservationId={setCurrentObservationId}
-        />
+      </ScrollArea>
+      <div className="md:col-span-2 md:flex md:h-full md:flex-col md:overflow-hidden">
+        <div className="mb-2 flex flex-shrink-0 flex-row justify-end gap-2">
+          <Toggle
+            pressed={scoresOnObservationTree}
+            onPressedChange={(e) => {
+              setScoresOnObservationTree(e);
+            }}
+            size="sm"
+            title="Show scores"
+          >
+            <Award className="h-4 w-4" />
+          </Toggle>
+          <Toggle
+            pressed={metricsOnObservationTree}
+            onPressedChange={(e) => {
+              setMetricsOnObservationTree(e);
+            }}
+            size="sm"
+            title="Show metrics"
+          >
+            {metricsOnObservationTree ? (
+              <ChevronsDownUp className="h-4 w-4" />
+            ) : (
+              <ChevronsUpDown className="h-4 w-4" />
+            )}
+          </Toggle>
+        </div>
+        <ScrollArea className="flex flex-grow">
+          <ObservationTree
+            observations={props.observations}
+            collapsedObservations={collapsedObservations}
+            toggleCollapsedObservation={toggleCollapsedObservation}
+            collapseAll={collapseAll}
+            expandAll={expandAll}
+            trace={props.trace}
+            scores={props.scores}
+            currentObservationId={currentObservationId ?? undefined}
+            setCurrentObservationId={setCurrentObservationId}
+            showMetrics={metricsOnObservationTree}
+            showScores={scoresOnObservationTree}
+          />
+        </ScrollArea>
       </div>
     </div>
   );
@@ -74,20 +169,30 @@ export function TracePage({ traceId }: { traceId: string }) {
       },
     },
   );
-  const totalCost = trace.data?.observations.reduce(
-    (acc, o) => {
-      if (!o.price) return acc;
 
-      return acc ? acc.plus(o.price) : new Decimal(0).plus(o.price);
+  const traceFilterOptions = api.traces.filterOptions.useQuery(
+    {
+      projectId: trace.data?.projectId ?? "",
+    },
+    {
+      trpc: {
+        context: {
+          skipBatch: true,
+        },
+      },
+      enabled: !!trace.data?.projectId && trace.isSuccess,
     },
-    undefined as Decimal | undefined,
   );
 
+  const filterOptionTags = traceFilterOptions.data?.tags ?? [];
+  const allTags = filterOptionTags.map((t) => t.value);
+
+  const totalCost = calculateDisplayTotalCost(trace.data?.observations ?? []);
+
   if (trace.error?.data?.code === "UNAUTHORIZED") return <NoAccessError />;
   if (!trace.data) return <div>loading...</div>;
-
   return (
-    <div className="flex flex-col overflow-hidden xl:container md:h-[calc(100vh-100px)] xl:h-[calc(100vh-40px)]">
+    <div className="flex flex-col overflow-hidden xl:container md:h-[calc(100vh-2rem)]">
       <Header
         title="Trace Detail"
         breadcrumb={[
@@ -99,7 +204,7 @@ export function TracePage({ traceId }: { traceId: string }) {
         ]}
         actionButtons={
           <>
-            <StarTraceToggle
+            <StarTraceDetailsToggle
               traceId={trace.data.id}
               projectId={trace.data.projectId}
               value={trace.data.bookmarked}
@@ -126,18 +231,18 @@ export function TracePage({ traceId }: { traceId: string }) {
       <div className="flex flex-wrap gap-2">
         {trace.data.sessionId ? (
           <Link
-            href={`/project/${router.query.projectId as string}/sessions/${
-              trace.data.sessionId
-            }`}
+            href={`/project/${
+              router.query.projectId as string
+            }/sessions/${encodeURIComponent(trace.data.sessionId)}`}
           >
             <Badge>Session: {trace.data.sessionId}</Badge>
           </Link>
         ) : null}
         {trace.data.userId ? (
           <Link
-            href={`/project/${router.query.projectId as string}/users/${
-              trace.data.userId
-            }`}
+            href={`/project/${
+              router.query.projectId as string
+            }/users/${encodeURIComponent(trace.data.userId)}`}
           >
             <Badge>User ID: {trace.data.userId}</Badge>
           </Link>
@@ -145,10 +250,21 @@ export function TracePage({ traceId }: { traceId: string }) {
         <TraceAggUsageBadge observations={trace.data.observations} />
         {totalCost ? (
           <Badge variant="outline">
-            Total cost: {totalCost.toString()} USD
+            Total cost: {usdFormatter(totalCost.toNumber())}
           </Badge>
         ) : undefined}
       </div>
+      <div className="mt-5 rounded-lg border bg-card font-semibold text-card-foreground shadow-sm">
+        <div className="flex flex-row items-center gap-3 p-2.5">
+          Tags
+          <TagTraceDetailsPopover
+            tags={trace.data.tags}
+            availableTags={allTags}
+            traceId={trace.data.id}
+            projectId={trace.data.projectId}
+          />
+        </div>
+      </div>
       <div className="mt-5 flex-1 overflow-hidden border-t pt-5">
         <Trace
           key={trace.data.id}
@@ -161,3 +277,42 @@ export function TracePage({ traceId }: { traceId: string }) {
     </div>
   );
 }
+
+export const calculateDisplayTotalCost = (
+  observations: ObservationReturnType[],
+) => {
+  return observations.reduce(
+    (prev: Decimal | undefined, curr: ObservationReturnType) => {
+      // if we don't have any calculated costs, we can't do anything
+      if (
+        !curr.calculatedTotalCost &&
+        !curr.calculatedInputCost &&
+        !curr.calculatedOutputCost
+      )
+        return prev;
+
+      // if we have either input or output cost, but not total cost, we can use that
+      if (
+        !curr.calculatedTotalCost &&
+        (curr.calculatedInputCost || curr.calculatedOutputCost)
+      ) {
+        return prev
+          ? prev.plus(
+              curr.calculatedInputCost ??
+                new Decimal(0).plus(
+                  curr.calculatedOutputCost ?? new Decimal(0),
+                ),
+            )
+          : curr.calculatedInputCost ?? curr.calculatedOutputCost ?? undefined;
+      }
+
+      if (!curr.calculatedTotalCost) return prev;
+
+      // if we have total cost, we can use that
+      return prev
+        ? prev.plus(curr.calculatedTotalCost)
+        : curr.calculatedTotalCost;
+    },
+    undefined,
+  );
+};

src/components/ui/command.tsx

@@ -5,8 +5,8 @@ import { type DialogProps } from "@radix-ui/react-dialog";
 import { Command as CommandPrimitive } from "cmdk";
 import { Search } from "lucide-react";
 
-import { cn } from "@/src/utils/tailwind";
 import { Dialog, DialogContent } from "@/src/components/ui/dialog";
+import { cn } from "@/src/utils/tailwind";
 
 const Command = React.forwardRef<
   React.ElementRef<typeof CommandPrimitive>,
@@ -15,7 +15,7 @@ const Command = React.forwardRef<
   <CommandPrimitive
     ref={ref}
     className={cn(
-      "flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground",
+      "flex h-full w-full flex-col overflow-hidden rounded-md bg-white text-slate-950 dark:bg-slate-950 dark:text-slate-50",
       className,
     )}
     {...props}
@@ -29,7 +29,7 @@ const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
   return (
     <Dialog {...props}>
       <DialogContent className="overflow-hidden p-0 shadow-lg">
-        <Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
+        <Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-slate-500 dark:[&_[cmdk-group-heading]]:text-slate-400 [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
           {children}
         </Command>
       </DialogContent>
@@ -41,12 +41,15 @@ const CommandInput = React.forwardRef<
   React.ElementRef<typeof CommandPrimitive.Input>,
   React.ComponentPropsWithoutRef<typeof CommandPrimitive.Input>
 >(({ className, ...props }, ref) => (
-  <div className="flex items-center border-b px-3" cmdk-input-wrapper="">
+  <div
+    className="flex items-center rounded-lg border px-3"
+    cmdk-input-wrapper=""
+  >
     <Search className="mr-2 h-4 w-4 shrink-0 opacity-50" />
     <CommandPrimitive.Input
       ref={ref}
       className={cn(
-        "flex h-11 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50",
+        "flex h-11 w-full rounded-md border-transparent bg-transparent py-3 text-sm outline-none placeholder:text-slate-500 focus:border-0  focus:border-none focus:border-transparent focus:ring-0 disabled:cursor-not-allowed disabled:opacity-50 dark:placeholder:text-slate-400	",
         className,
       )}
       {...props}
@@ -89,7 +92,7 @@ const CommandGroup = React.forwardRef<
   <CommandPrimitive.Group
     ref={ref}
     className={cn(
-      "overflow-hidden p-1 text-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground",
+      "overflow-hidden p-1 text-slate-950 dark:text-slate-50 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-slate-500 dark:[&_[cmdk-group-heading]]:text-slate-400",
       className,
     )}
     {...props}
@@ -104,7 +107,7 @@ const CommandSeparator = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <CommandPrimitive.Separator
     ref={ref}
-    className={cn("-mx-1 h-px bg-border", className)}
+    className={cn("-mx-1 h-px bg-slate-200 dark:bg-slate-800", className)}
     {...props}
   />
 ));
@@ -117,7 +120,7 @@ const CommandItem = React.forwardRef<
   <CommandPrimitive.Item
     ref={ref}
     className={cn(
-      "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none aria-selected:bg-accent aria-selected:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      "relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none aria-selected:bg-slate-100 aria-selected:text-slate-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:aria-selected:bg-slate-800 dark:aria-selected:text-slate-50",
       className,
     )}
     {...props}
@@ -133,7 +136,7 @@ const CommandShortcut = ({
   return (
     <span
       className={cn(
-        "ml-auto text-xs tracking-widest text-muted-foreground",
+        "ml-auto text-xs tracking-widest text-slate-500 dark:text-slate-400",
         className,
       )}
       {...props}

src/components/ui/password-input.tsx

@@ -0,0 +1,42 @@
+import * as React from "react";
+import { cn } from "@/src/utils/tailwind";
+import { Eye, EyeOff } from "lucide-react";
+
+export interface PasswordInputProps
+  extends React.InputHTMLAttributes<HTMLInputElement> {}
+
+const PasswordInput = React.forwardRef<HTMLInputElement, PasswordInputProps>(
+  ({ className, ...props }, ref) => {
+    const [showPassword, setShowPassword] = React.useState(false);
+
+    return (
+      <div className="relative">
+        <input
+          type={showPassword ? "text" : "password"}
+          className={cn(
+            "flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 pr-10 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50",
+            className,
+          )}
+          ref={ref}
+          {...props}
+        />
+        <button
+          type="button"
+          className="absolute right-3 top-1/2 -translate-y-1/2 transform cursor-pointer"
+          onClick={() => setShowPassword(!showPassword)}
+          title={showPassword ? "Hide password" : "Show password"}
+        >
+          {showPassword ? (
+            <EyeOff className="h-5 w-5 text-gray-400" />
+          ) : (
+            <Eye className="h-5 w-5 text-gray-400" />
+          )}
+        </button>
+      </div>
+    );
+  },
+);
+
+PasswordInput.displayName = "PasswordInput";
+
+export { PasswordInput };

src/components/ui/scroll-area.tsx

@@ -0,0 +1,48 @@
+"use client";
+
+import * as React from "react";
+import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area";
+
+import { cn } from "@/src/utils/tailwind";
+
+const ScrollArea = React.forwardRef<
+  React.ElementRef<typeof ScrollAreaPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
+>(({ className, children, ...props }, ref) => (
+  <ScrollAreaPrimitive.Root
+    ref={ref}
+    className={cn("relative overflow-hidden", className)}
+    {...props}
+  >
+    <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
+      {children}
+    </ScrollAreaPrimitive.Viewport>
+    <ScrollBar />
+    <ScrollAreaPrimitive.Corner />
+  </ScrollAreaPrimitive.Root>
+));
+ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName;
+
+const ScrollBar = React.forwardRef<
+  React.ElementRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>,
+  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>
+>(({ className, orientation = "vertical", ...props }, ref) => (
+  <ScrollAreaPrimitive.ScrollAreaScrollbar
+    ref={ref}
+    orientation={orientation}
+    className={cn(
+      "flex touch-none select-none transition-colors",
+      orientation === "vertical" &&
+        "h-full w-2.5 border-l border-l-transparent p-[1px]",
+      orientation === "horizontal" &&
+        "h-2.5 flex-col border-t border-t-transparent p-[1px]",
+      className,
+    )}
+    {...props}
+  >
+    <ScrollAreaPrimitive.ScrollAreaThumb className="relative flex-1 rounded-full bg-border" />
+  </ScrollAreaPrimitive.ScrollAreaScrollbar>
+));
+ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName;
+
+export { ScrollArea, ScrollBar };