chore: release v2.95.2

security: upgrade dompurify

.env.dev-azure.example

@@ -11,7 +11,7 @@ CLICKHOUSE_MIGRATION_URL="clickhouse://localhost:9000"
 CLICKHOUSE_URL="http://localhost:8123"
 CLICKHOUSE_USER="clickhouse"
 CLICKHOUSE_PASSWORD="clickhouse"
-CLICKHOUSE_CLUSTER_ENABLED="false"
+CLICKHOUSE_MIGRATION_CLUSTER_DISABLED="true"
 
 # Next Auth
 # You can generate a new secret on the command line with:
@@ -35,18 +35,17 @@ EMAIL_FROM_ADDRESS=""  # Defines the email address to use as the from address.
 SMTP_CONNECTION_URL=""  # Defines the connection url for smtp server.
 
 # DON'T PANIC: The Azurite Secrets are well-known and meant to be hard-coded
-# S3 Batch Exports
-LANGFUSE_S3_BATCH_EXPORT_ENABLED=true
-LANGFUSE_S3_BATCH_EXPORT_BUCKET=langfuse
-LANGFUSE_S3_BATCH_EXPORT_ACCESS_KEY_ID=devstoreaccount1
-LANGFUSE_S3_BATCH_EXPORT_SECRET_ACCESS_KEY=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==
-LANGFUSE_S3_BATCH_EXPORT_REGION=auto
-LANGFUSE_S3_BATCH_EXPORT_ENDPOINT=http://localhost:10000/devstoreaccount1
+# S3 storage
+S3_ENDPOINT=http://localhost:10000/devstoreaccount1
+S3_ACCESS_KEY_ID=devstoreaccount1
+S3_SECRET_ACCESS_KEY=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==
+S3_BUCKET_NAME=langfuse
+S3_REGION=auto
 ## Necessary for minio compatibility
-LANGFUSE_S3_BATCH_EXPORT_FORCE_PATH_STYLE=true
-LANGFUSE_S3_BATCH_EXPORT_PREFIX=exports/
+S3_FORCE_PATH_STYLE=true
 
 # S3 Media Upload LOCAL
+LANGFUSE_S3_MEDIA_UPLOAD_ENABLED=true
 LANGFUSE_S3_MEDIA_UPLOAD_BUCKET=langfuse
 LANGFUSE_S3_MEDIA_UPLOAD_ACCESS_KEY_ID=devstoreaccount1
 LANGFUSE_S3_MEDIA_UPLOAD_SECRET_ACCESS_KEY=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==
@@ -58,6 +57,7 @@ LANGFUSE_S3_MEDIA_UPLOAD_PREFIX=media/
 
 # S3 Event Bucket Upload
 ## Set to true to test uploading all events to S3
+LANGFUSE_S3_EVENT_UPLOAD_ENABLED=true
 LANGFUSE_S3_EVENT_UPLOAD_BUCKET=langfuse
 LANGFUSE_S3_EVENT_UPLOAD_ACCESS_KEY_ID=devstoreaccount1
 LANGFUSE_S3_EVENT_UPLOAD_SECRET_ACCESS_KEY=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==
@@ -82,3 +82,11 @@ ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000
 
 # speeds up local development by not executing init scripts on server startup
 NEXT_PUBLIC_LANGFUSE_RUN_NEXT_INIT="false"
+
+LANGFUSE_READ_FROM_POSTGRES_ONLY=false
+LANGFUSE_RETURN_FROM_CLICKHOUSE=true
+LANGFUSE_READ_DASHBOARDS_FROM_CLICKHOUSE=true
+LANGFUSE_READ_FROM_CLICKHOUSE_ONLY=true
+
+LANGFUSE_ASYNC_INGESTION_PROCESSING="true"
+LANGFUSE_ASYNC_CLICKHOUSE_INGESTION_PROCESSING="true"

.env.dev.example

@@ -11,7 +11,7 @@ CLICKHOUSE_MIGRATION_URL="clickhouse://localhost:9000"
 CLICKHOUSE_URL="http://localhost:8123"
 CLICKHOUSE_USER="clickhouse"
 CLICKHOUSE_PASSWORD="clickhouse"
-CLICKHOUSE_CLUSTER_ENABLED="false"
+CLICKHOUSE_CLUSTER_DISABLED="true"
 
 # Next Auth
 # You can generate a new secret on the command line with:
@@ -34,18 +34,17 @@ SALT="salt"
 EMAIL_FROM_ADDRESS=""  # Defines the email address to use as the from address.
 SMTP_CONNECTION_URL=""  # Defines the connection url for smtp server.
 
-# S3 Batch Exports
-LANGFUSE_S3_BATCH_EXPORT_ENABLED=true
-LANGFUSE_S3_BATCH_EXPORT_BUCKET=langfuse
-LANGFUSE_S3_BATCH_EXPORT_ACCESS_KEY_ID=minio
-LANGFUSE_S3_BATCH_EXPORT_SECRET_ACCESS_KEY=miniosecret
-LANGFUSE_S3_BATCH_EXPORT_REGION=us-east-1
-LANGFUSE_S3_BATCH_EXPORT_ENDPOINT=http://localhost:9090
+# S3 storage
+S3_ENDPOINT=http://localhost:9090
+S3_ACCESS_KEY_ID=minio
+S3_SECRET_ACCESS_KEY=miniosecret
+S3_BUCKET_NAME=langfuse
+S3_REGION=us-east-1
 ## Necessary for minio compatibility
-LANGFUSE_S3_BATCH_EXPORT_FORCE_PATH_STYLE=true
-LANGFUSE_S3_BATCH_EXPORT_PREFIX=exports/
+S3_FORCE_PATH_STYLE=true
 
 # S3 Media Upload LOCAL
+LANGFUSE_S3_MEDIA_UPLOAD_ENABLED=true
 LANGFUSE_S3_MEDIA_UPLOAD_BUCKET=langfuse
 LANGFUSE_S3_MEDIA_UPLOAD_ACCESS_KEY_ID=minio
 LANGFUSE_S3_MEDIA_UPLOAD_SECRET_ACCESS_KEY=miniosecret
@@ -57,6 +56,7 @@ LANGFUSE_S3_MEDIA_UPLOAD_PREFIX=media/
 
 # S3 Event Bucket Upload
 ## Set to true to test uploading all events to S3
+LANGFUSE_S3_EVENT_UPLOAD_ENABLED=true
 LANGFUSE_S3_EVENT_UPLOAD_BUCKET=langfuse
 LANGFUSE_S3_EVENT_UPLOAD_ACCESS_KEY_ID=minio
 LANGFUSE_S3_EVENT_UPLOAD_SECRET_ACCESS_KEY=miniosecret
@@ -79,3 +79,11 @@ ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000
 
 # speeds up local development by not executing init scripts on server startup
 NEXT_PUBLIC_LANGFUSE_RUN_NEXT_INIT="false"
+
+LANGFUSE_READ_FROM_POSTGRES_ONLY=false
+LANGFUSE_RETURN_FROM_CLICKHOUSE=true
+LANGFUSE_READ_DASHBOARDS_FROM_CLICKHOUSE=true
+LANGFUSE_READ_FROM_CLICKHOUSE_ONLY=true
+
+LANGFUSE_ASYNC_INGESTION_PROCESSING="true"
+LANGFUSE_ASYNC_CLICKHOUSE_INGESTION_PROCESSING="true"

.env.dev.legacy.example

@@ -34,18 +34,17 @@ SALT="salt"
 EMAIL_FROM_ADDRESS=""  # Defines the email address to use as the from address.
 SMTP_CONNECTION_URL=""  # Defines the connection url for smtp server.
 
-# S3 Batch Exports
-LANGFUSE_S3_BATCH_EXPORT_ENABLED=true
-LANGFUSE_S3_BATCH_EXPORT_BUCKET=langfuse
-LANGFUSE_S3_BATCH_EXPORT_ACCESS_KEY_ID=minio
-LANGFUSE_S3_BATCH_EXPORT_SECRET_ACCESS_KEY=miniosecret
-LANGFUSE_S3_BATCH_EXPORT_REGION=us-east-1
-LANGFUSE_S3_BATCH_EXPORT_ENDPOINT=http://localhost:9090
+# S3 storage
+S3_ENDPOINT=http://localhost:9090
+S3_ACCESS_KEY_ID=minio
+S3_SECRET_ACCESS_KEY=miniosecret
+S3_BUCKET_NAME=langfuse
+S3_REGION=us-east-1
 ## Necessary for minio compatibility
-LANGFUSE_S3_BATCH_EXPORT_FORCE_PATH_STYLE=true
-LANGFUSE_S3_BATCH_EXPORT_PREFIX=exports/
+S3_FORCE_PATH_STYLE=true
 
 # # S3 Media Upload LOCAL
+LANGFUSE_S3_MEDIA_UPLOAD_ENABLED=true
 LANGFUSE_S3_MEDIA_UPLOAD_BUCKET=langfuse
 LANGFUSE_S3_MEDIA_UPLOAD_ACCESS_KEY_ID=minio
 LANGFUSE_S3_MEDIA_UPLOAD_SECRET_ACCESS_KEY=miniosecret
@@ -57,6 +56,7 @@ LANGFUSE_S3_MEDIA_UPLOAD_PREFIX=media/
 
 # S3 Event Bucket Upload
 ## Set to true to test uploading all events to S3
+LANGFUSE_S3_EVENT_UPLOAD_ENABLED=true
 LANGFUSE_S3_EVENT_UPLOAD_BUCKET=langfuse
 LANGFUSE_S3_EVENT_UPLOAD_ACCESS_KEY_ID=minio
 LANGFUSE_S3_EVENT_UPLOAD_SECRET_ACCESS_KEY=miniosecret
@@ -78,9 +78,4 @@ REDIS_AUTH="myredissecret"
 ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000 
 
 # speeds up local development by not executing init scripts on server startup
-NEXT_PUBLIC_LANGFUSE_RUN_NEXT_INIT="false"
-
-LANGFUSE_READ_FROM_POSTGRES_ONLY=true
-LANGFUSE_RETURN_FROM_CLICKHOUSE=false
-LANGFUSE_READ_DASHBOARDS_FROM_CLICKHOUSE=false
-LANGFUSE_READ_FROM_CLICKHOUSE_ONLY=false
+NEXT_PUBLIC_LANGFUSE_RUN_NEXT_INIT="false"

.env.local.example

@@ -0,0 +1,22 @@
+# 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
+NEXTAUTH_SECRET="secret"
+NEXTAUTH_URL="http://localhost:3000"
+
+# feature flag to enable experimental features locally
+LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES="false"
+SALT="salt"
+
+# Redis
+REDIS_HOST="127.0.0.1"
+REDIS_PORT=6379
+REDIS_AUTH="myredissecret"
+
+# openssl rand -hex 32 used only here
+ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000

.env.prod.example

@@ -101,8 +101,8 @@ OTEL_SERVICE_NAME="langfuse"
 # AUTH_CUSTOM_ISSUER=
 # AUTH_CUSTOM_NAME=
 # AUTH_CUSTOM_SCOPE="openid email profile" # optional
-# AUTH_CUSTOM_CLIENT_AUTH_METHOD="client_secret_basic" # optional
 # AUTH_CUSTOM_ALLOW_ACCOUNT_LINKING=false
+# AUTH_CUSTOM_ID_TOKEN=false # optional, default is true
 
 # Transactional email, optional
 # Defines the email address to use as the from address.
@@ -110,16 +110,16 @@ OTEL_SERVICE_NAME="langfuse"
 # Defines the connection url for smtp server. 
 # SMTP_CONNECTION_URL=
 
-# S3 Batch Exports
-# LANGFUSE_S3_BATCH_EXPORT_ENABLED=
-# LANGFUSE_S3_BATCH_EXPORT_BUCKET=
-# LANGFUSE_S3_BATCH_EXPORT_ACCESS_KEY_ID=
-# LANGFUSE_S3_BATCH_EXPORT_SECRET_ACCESS_KEY=
-# LANGFUSE_S3_BATCH_EXPORT_REGION=
-# LANGFUSE_S3_BATCH_EXPORT_ENDPOINT=
-# LANGFUSE_S3_BATCH_EXPORT_PREFIX=
+# S3 storage, optional, used for exports from the UI
+# S3_ENDPOINT=
+# S3_ACCESS_KEY_ID=
+# S3_SECRET_ACCESS_KEY=
+# S3_BUCKET_NAME=
+# S3_REGION=
+# BATCH_EXPORT_DOWNLOAD_LINK_EXPIRATION_HOURS=
 
 # S3 storage for events, optional, used to persist all incoming events
+# LANGFUSE_S3_EVENT_UPLOAD_ENABLED="true"
 # LANGFUSE_S3_EVENT_UPLOAD_BUCKET=
 # Optional prefix to be used within the bucket. Must end with `/` if set
 # LANGFUSE_S3_EVENT_UPLOAD_PREFIX=events/
@@ -252,6 +252,7 @@ OTEL_SERVICE_NAME="langfuse"
 # LANGFUSE_INGESTION_CLICKHOUSE_WRITE_INTERVAL_MS= 
 # LANGFUSE_INGESTION_CLICKHOUSE_MAX_ATTEMPTS=
 # LANGFUSE_LEGACY_INGESTION_WORKER_CONCURRENCY=
+# LANGFUSE_ASYNC_INGESTION_PROCESSING="true"
 # QUEUE_CONSUMER_LEGACY_INGESTION_QUEUE_IS_ENABLED="true"
 
-## END Langfuse V3 Ingestion
+## END Langfuse V3 Ingestion

.github/workflows/_deploy_ecs_service.yml

@@ -58,6 +58,7 @@ jobs:
             --build-arg SENTRY_PROJECT=${{ vars.SENTRY_PROJECT }} \
             .
           docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG
+
       - name: Render AWS ECS Task Definition
         id: render-task-definition
         uses: aws-actions/amazon-ecs-render-task-definition@v1

.github/workflows/codespell.yml

@@ -3,9 +3,13 @@ name: Codespell
 
 on:
   push:
-    branches: [main]
+    branches:
+      - "main"
+    tags:
+      - "v*"
   pull_request:
-    branches: [main]
+    branches:
+      - "**"
   merge_group:
 
 permissions:

.github/workflows/pipeline.yml

@@ -10,11 +10,7 @@ on:
   merge_group:
   pull_request:
     branches:
-      - "**"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+      - "*"
 
 jobs:
   lint:
@@ -45,7 +41,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Login to Docker Hub
-        if: github.repository == 'langfuse/langfuse' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME_READ }}
@@ -87,14 +82,13 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install golang-migrate for Clickhouse migrations
         run: |
-          curl -L https://github.com/golang-migrate/migrate/releases/download/v4.16.2/migrate.linux-amd64.tar.gz | tar xvz
+          curl -L https://github.com/golang-migrate/migrate/releases/download/v4.18.2/migrate.linux-amd64.tar.gz | tar xvz
           sudo mv migrate /usr/bin/migrate
           which migrate
       - uses: pnpm/action-setup@v3
         with:
           version: 9.5.0
       - name: Login to Docker Hub
-        if: github.repository == 'langfuse/langfuse' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME_READ }}
@@ -111,8 +105,7 @@ jobs:
       - name: Load default env
         run: |
           cp .env.dev.example .env
-          grep -v -e '^LANGFUSE_S3_BATCH_EXPORT_ENABLED=' -e '^REDIS_HOST=' -e '^NEXT_PUBLIC_LANGFUSE_RUN_NEXT_INIT=' .env.dev.legacy.example > .env
-          echo "LANGFUSE_POSTGRES_INGESTION_ENABLED=true" >> .env
+          grep -v -e '^S3_BUCKET_NAME=' -e '^REDIS_HOST=' -e '^NEXT_PUBLIC_LANGFUSE_RUN_NEXT_INIT=' .env.dev.legacy.example > .env
       - name: Run + migrate
         run: |
           docker compose -f docker-compose.dev.yml up -d
@@ -140,8 +133,6 @@ jobs:
           LANGFUSE_INIT_USER_PASSWORD: "password"
       - name: run test-sync
         run: pnpm --filter=web run test-sync
-      - name: run test-client
-        run: pnpm --filter=web run test-client
 
   tests-web-async:
     timeout-minutes: 20
@@ -160,14 +151,13 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install golang-migrate for Clickhouse migrations
         run: |
-          curl -L https://github.com/golang-migrate/migrate/releases/download/v4.16.2/migrate.linux-amd64.tar.gz | tar xvz
+          curl -L https://github.com/golang-migrate/migrate/releases/download/v4.18.2/migrate.linux-amd64.tar.gz | tar xvz
           sudo mv migrate /usr/bin/migrate
           which migrate
       - uses: pnpm/action-setup@v3
         with:
           version: 9.5.0
       - name: Login to Docker Hub
-        if: github.repository == 'langfuse/langfuse' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME_READ }}
@@ -184,7 +174,7 @@ jobs:
       - name: Load default env
         run: |
           cp .env.dev${{ matrix.blob-provider }}.example .env
-          grep -v -e '^LANGFUSE_S3_BATCH_EXPORT_ENABLED=' -e '^REDIS_HOST=' -e '^NEXT_PUBLIC_LANGFUSE_RUN_NEXT_INIT=' .env.dev${{ matrix.blob-provider }}.example > .env
+          grep -v -e '^S3_BUCKET_NAME=' -e '^REDIS_HOST=' -e '^NEXT_PUBLIC_LANGFUSE_RUN_NEXT_INIT=' .env.dev${{ matrix.blob-provider }}.example > .env
       - name: Run + migrate
         run: |
           docker compose -f docker-compose.dev${{ matrix.blob-provider }}.yml up -d
@@ -232,7 +222,6 @@ jobs:
         with:
           version: 9.5.0
       - name: Login to Docker Hub
-        if: github.repository == 'langfuse/langfuse' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME_READ }}
@@ -248,7 +237,7 @@ jobs:
           pnpm install
       - name: Install golang-migrate for Clickhouse migrations
         run: |
-          curl -L https://github.com/golang-migrate/migrate/releases/download/v4.16.2/migrate.linux-amd64.tar.gz | tar xvz
+          curl -L https://github.com/golang-migrate/migrate/releases/download/v4.18.2/migrate.linux-amd64.tar.gz | tar xvz
           sudo mv migrate /usr/bin/migrate
           which migrate
       - name: Load default env
@@ -292,7 +281,6 @@ jobs:
           cache: "pnpm"
           cache-dependency-path: "pnpm-lock.yaml"
       - name: Login to Docker Hub
-        if: github.repository == 'langfuse/langfuse' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME_READ }}
@@ -325,7 +313,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Login to Docker Hub
-        if: github.repository == 'langfuse/langfuse' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository)
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME_READ }}
@@ -343,12 +330,14 @@ jobs:
           pnpm install
       - name: Install golang-migrate for Clickhouse migrations
         run: |
-          curl -L https://github.com/golang-migrate/migrate/releases/download/v4.16.2/migrate.linux-amd64.tar.gz | tar xvz
+          curl -L https://github.com/golang-migrate/migrate/releases/download/v4.18.2/migrate.linux-amd64.tar.gz | tar xvz
           sudo mv migrate /usr/bin/migrate
           which migrate
       - name: Load default env
         run: |
           cp .env.dev.example .env
+          echo "LANGFUSE_ASYNC_CLICKHOUSE_INGESTION_PROCESSING=true" >> .env
+          echo "LANGFUSE_ASYNC_INGESTION_PROCESSING=true" >> .env
           echo "LANGFUSE_CACHE_API_KEY_ENABLED=true" >> .env
           echo "LANGFUSE_CACHE_PROMPT_ENABLED=true" >> .env
       - name: Run + migrate
@@ -459,9 +448,9 @@ jobs:
             type=ref,event=pr
             type=sha
             type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}},enable=${{ !contains(github.ref, '-rc') }}
-            type=semver,pattern={{major}},enable=${{ !contains(github.ref, '-rc') }}
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v3') && !contains(github.ref, '-rc') }}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v3') }}
       - name: Build and push Docker image (web)
         uses: docker/build-push-action@v4
         with:
@@ -480,16 +469,13 @@ jobs:
           images: |
             ghcr.io/langfuse/langfuse-worker # GitHub
             langfuse/langfuse-worker # Docker Hub
-          flavor: |
-            latest=false
           tags: |
             type=ref,event=branch
             type=ref,event=pr
             type=sha
             type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}},enable=${{ !contains(github.ref, '-rc') }}
-            type=semver,pattern={{major}},enable=${{ !contains(github.ref, '-rc') }}
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v3') && !contains(github.ref, '-rc') }}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
       - name: Build and push Docker image (worker)
         uses: docker/build-push-action@v4
         with:

.github/workflows/snyk.yml

@@ -6,11 +6,6 @@ on:
   push:
     branches:
       - main
-  merge_group:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
   snyk:
@@ -20,13 +15,13 @@ jobs:
       - name: Build a Docker image
         run: docker compose -f docker-compose.build.yml up -d
 
-      - name: Run Snyk to check Docker image for vulnerabilities (langfuse-web)
+      - name: Run Snyk to check Docker image for vulnerabilities (langfuse-server)
         continue-on-error: true
         uses: snyk/actions/docker@master
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:
-          image: langfuse-langfuse-web
+          image: langfuse-server
           args: --file=web/Dockerfile
 
       - name: Upload result to GitHub Code Scanning
@@ -41,7 +36,7 @@ jobs:
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:
-          image: langfuse-langfuse-worker
+          image: langfuse-worker
           args: --file=worker/Dockerfile
 
       - name: Upload result to GitHub Code Scanning

.gitignore

@@ -38,6 +38,7 @@ yarn-error.log*
 .env*
 !.env.dev.example
 !.env.dev-azure.example
+!.env.local.example
 !.env.prod.example
 !.env.dev.legacy.example
 

LICENSE

@@ -2,8 +2,8 @@ Copyright (c) 2023--2024 Langfuse GmbH
 
 Portions of this software are licensed as follows:
 
-- All content that resides under the "ee/", "web/src/ee/", and/or "worker/src/ee/" directories of this repository, if these directories exist, is licensed under the license defined in "ee/LICENSE".
-- All third party components incorporated into the Langfuse Software are licensed under the original license provided by the owner of the applicable component.
+- All content that resides under the "ee/" and/or "web/src/ee" directories of this repository, if these directories exist, is licensed under the license defined in "ee/LICENSE".
+- All third party components incorporated into the Finto Technologies Software are licensed under the original license provided by the owner of the applicable component.
 - Content outside of the above mentioned directories or restrictions above is available under the "MIT Expat" license as defined below.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

README.md

@@ -42,7 +42,9 @@
 
 ## Langfuse Overview
 
-[![Langfuse Overview Video](https://github.com/user-attachments/assets/3926b288-ff61-4b95-8aa1-45d041c70866)](https://langfuse.com/watch-demo)
+_Unmute video for voice-over_
+
+https://github.com/langfuse/langfuse/assets/2834609/a94062e9-c782-4ee9-af59-dee6370149a8
 
 ### Develop
 
@@ -189,54 +191,3 @@ You can opt-out by setting `TELEMETRY_ENABLED=false`.
    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=langfuse/langfuse&type=Date" />
  </picture>
 </a>
-
-### Open Source Projects Using Langfuse
-
-Top open-source Python projects that use Langfuse, ranked by stars ([Source](https://github.com/langfuse/langfuse-docs/blob/main/components-mdx/dependents)):
-
-| Repository                                                                                                                                                                                                                                                          | Stars |
-| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----: |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/127165244?s=40&v=4" width="20" height="20" alt=""> &nbsp; [langgenius](https://github.com/langgenius) / [dify](https://github.com/langgenius/dify)                                            | 54865 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/158137808?s=40&v=4" width="20" height="20" alt=""> &nbsp; [open-webui](https://github.com/open-webui) / [open-webui](https://github.com/open-webui/open-webui)                                | 51531 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/131470832?s=40&v=4" width="20" height="20" alt=""> &nbsp; [lobehub](https://github.com/lobehub) / [lobe-chat](https://github.com/lobehub/lobe-chat)                                           | 49003 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/85702467?s=40&v=4" width="20" height="20" alt=""> &nbsp; [langflow-ai](https://github.com/langflow-ai) / [langflow](https://github.com/langflow-ai/langflow)                                  | 39093 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/130722866?s=40&v=4" width="20" height="20" alt=""> &nbsp; [run-llama](https://github.com/run-llama) / [llama_index](https://github.com/run-llama/llama_index)                                 | 37368 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/139558948?s=40&v=4" width="20" height="20" alt=""> &nbsp; [chatchat-space](https://github.com/chatchat-space) / [Langchain-Chatchat](https://github.com/chatchat-space/Langchain-Chatchat)    | 32486 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/128289781?s=40&v=4" width="20" height="20" alt=""> &nbsp; [FlowiseAI](https://github.com/FlowiseAI) / [Flowise](https://github.com/FlowiseAI/Flowise)                                         | 32448 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/31035808?s=40&v=4" width="20" height="20" alt=""> &nbsp; [mindsdb](https://github.com/mindsdb) / [mindsdb](https://github.com/mindsdb/mindsdb)                                                | 26931 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/119600397?s=40&v=4" width="20" height="20" alt=""> &nbsp; [twentyhq](https://github.com/twentyhq) / [twenty](https://github.com/twentyhq/twenty)                                              | 24195 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/60330232?s=40&v=4" width="20" height="20" alt=""> &nbsp; [PostHog](https://github.com/PostHog) / [posthog](https://github.com/PostHog/posthog)                                                | 22618 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/121462774?s=40&v=4" width="20" height="20" alt=""> &nbsp; [BerriAI](https://github.com/BerriAI) / [litellm](https://github.com/BerriAI/litellm)                                               | 15151 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/179202840?s=40&v=4" width="20" height="20" alt=""> &nbsp; [mediar-ai](https://github.com/mediar-ai) / [screenpipe](https://github.com/mediar-ai/screenpipe)                                   | 11037 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/105877416?s=40&v=4" width="20" height="20" alt=""> &nbsp; [formbricks](https://github.com/formbricks) / [formbricks](https://github.com/formbricks/formbricks)                                |  9386 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/76263028?s=40&v=4" width="20" height="20" alt=""> &nbsp; [anthropics](https://github.com/anthropics) / [courses](https://github.com/anthropics/courses)                                       |  8385 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/78410652?s=40&v=4" width="20" height="20" alt=""> &nbsp; [GreyDGL](https://github.com/GreyDGL) / [PentestGPT](https://github.com/GreyDGL/PentestGPT)                                          |  7374 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/152537519?s=40&v=4" width="20" height="20" alt=""> &nbsp; [superagent-ai](https://github.com/superagent-ai) / [superagent](https://github.com/superagent-ai/superagent)                       |  5391 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/137907881?s=40&v=4" width="20" height="20" alt=""> &nbsp; [promptfoo](https://github.com/promptfoo) / [promptfoo](https://github.com/promptfoo/promptfoo)                                     |  4976 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/157326433?s=40&v=4" width="20" height="20" alt=""> &nbsp; [onlook-dev](https://github.com/onlook-dev) / [onlook](https://github.com/onlook-dev/onlook)                                        |  4141 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/7250217?s=40&v=4" width="20" height="20" alt=""> &nbsp; [Canner](https://github.com/Canner) / [WrenAI](https://github.com/Canner/WrenAI)                                                      |  2526 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/11855343?s=40&v=4" width="20" height="20" alt=""> &nbsp; [pingcap](https://github.com/pingcap) / [autoflow](https://github.com/pingcap/autoflow)                                              |  2061 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/85268109?s=40&v=4" width="20" height="20" alt=""> &nbsp; [MLSysOps](https://github.com/MLSysOps) / [MLE-agent](https://github.com/MLSysOps/MLE-agent)                                         |  1161 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/158137808?s=40&v=4" width="20" height="20" alt=""> &nbsp; [open-webui](https://github.com/open-webui) / [pipelines](https://github.com/open-webui/pipelines)                                  |  1100 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/18422723?s=40&v=4" width="20" height="20" alt=""> &nbsp; [alishobeiri](https://github.com/alishobeiri) / [thread](https://github.com/alishobeiri/thread)                                      |  1074 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/125468716?s=40&v=4" width="20" height="20" alt=""> &nbsp; [topoteretes](https://github.com/topoteretes) / [cognee](https://github.com/topoteretes/cognee)                                     |   971 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/188657705?s=40&v=4" width="20" height="20" alt=""> &nbsp; [bRAGAI](https://github.com/bRAGAI) / [bRAG-langchain](https://github.com/bRAGAI/bRAG-langchain)                                    |   823 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/169500408?s=40&v=4" width="20" height="20" alt=""> &nbsp; [opslane](https://github.com/opslane) / [opslane](https://github.com/opslane/opslane)                                               |   677 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/151867818?s=40&v=4" width="20" height="20" alt=""> &nbsp; [dynamiq-ai](https://github.com/dynamiq-ai) / [dynamiq](https://github.com/dynamiq-ai/dynamiq)                                      |   639 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/48585267?s=40&v=4" width="20" height="20" alt=""> &nbsp; [theopenconversationkit](https://github.com/theopenconversationkit) / [tock](https://github.com/theopenconversationkit/tock)         |   514 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/20493493?s=40&v=4" width="20" height="20" alt=""> &nbsp; [andysingal](https://github.com/andysingal) / [llm-course](https://github.com/andysingal/llm-course)                                 |   394 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/132396805?s=40&v=4" width="20" height="20" alt=""> &nbsp; [phospho-app](https://github.com/phospho-app) / [phospho](https://github.com/phospho-app/phospho)                                   |   384 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/178644984?s=40&v=4" width="20" height="20" alt=""> &nbsp; [sentient-engineering](https://github.com/sentient-engineering) / [agent-q](https://github.com/sentient-engineering/agent-q)        |   370 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/168552753?s=40&v=4" width="20" height="20" alt=""> &nbsp; [sql-agi](https://github.com/sql-agi) / [DB-GPT](https://github.com/sql-agi/DB-GPT)                                                 |   324 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/60330232?s=40&v=4" width="20" height="20" alt=""> &nbsp; [PostHog](https://github.com/PostHog) / [posthog-foss](https://github.com/PostHog/posthog-foss)                                      |   305 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/154247157?s=40&v=4" width="20" height="20" alt=""> &nbsp; [vespperhq](https://github.com/vespperhq) / [vespper](https://github.com/vespperhq/vespper)                                         |   304 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/185116535?s=40&v=4" width="20" height="20" alt=""> &nbsp; [block](https://github.com/block) / [goose](https://github.com/block/goose)                                                         |   295 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/609489?s=40&v=4" width="20" height="20" alt=""> &nbsp; [aorwall](https://github.com/aorwall) / [moatless-tools](https://github.com/aorwall/moatless-tools)                                    |   291 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/2357342?s=40&v=4" width="20" height="20" alt=""> &nbsp; [dmayboroda](https://github.com/dmayboroda) / [minima](https://github.com/dmayboroda/minima)                                          |   221 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/66303003?s=40&v=4" width="20" height="20" alt=""> &nbsp; [RobotecAI](https://github.com/RobotecAI) / [rai](https://github.com/RobotecAI/rai)                                                  |   172 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/148684274?s=40&v=4" width="20" height="20" alt=""> &nbsp; [i-am-alice](https://github.com/i-am-alice) / [3rd-devs](https://github.com/i-am-alice/3rd-devs)                                    |   148 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/171735272?s=40&v=4" width="20" height="20" alt=""> &nbsp; [8090-inc](https://github.com/8090-inc) / [xrx-sample-apps](https://github.com/8090-inc/xrx-sample-apps)                            |   138 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/104478511?s=40&v=4" width="20" height="20" alt=""> &nbsp; [babelcloud](https://github.com/babelcloud) / [LLM-RGB](https://github.com/babelcloud/LLM-RGB)                                      |   135 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/15125613?s=40&v=4" width="20" height="20" alt=""> &nbsp; [souzatharsis](https://github.com/souzatharsis) / [tamingLLMs](https://github.com/souzatharsis/tamingLLMs)                           |   129 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/169401942?s=40&v=4" width="20" height="20" alt=""> &nbsp; [LibreChat-AI](https://github.com/LibreChat-AI) / [librechat.ai](https://github.com/LibreChat-AI/librechat.ai)                      |   128 |
-| <img class="avatar mr-2" src="https://avatars.githubusercontent.com/u/51827949?s=40&v=4" width="20" height="20" alt=""> &nbsp; [deepset-ai](https://github.com/deepset-ai) / [haystack-core-integrations](https://github.com/deepset-ai/haystack-core-integrations) |   126 |

docker-compose.build.yml

@@ -1,53 +1,34 @@
+version: "3.5"
+
 services:
-  langfuse-web:
+  server:
     build:
       dockerfile: ./web/Dockerfile
       context: .
       args:
         - NEXT_PUBLIC_LANGFUSE_CLOUD_REGION=${NEXT_PUBLIC_LANGFUSE_CLOUD_REGION}
-    depends_on: &langfuse-depends-on
-      postgres:
-        condition: service_healthy
-      minio:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-      clickhouse:
-        condition: service_healthy
+    depends_on:
+      - db
+      - redis
     ports:
       - "3000:3000"
-    environment: &langfuse-web-env
-      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/postgres
-      NEXTAUTH_SECRET: mysecret
-      SALT: mysalt
-      ENCRYPTION_KEY: "0000000000000000000000000000000000000000000000000000000000000000" # generate via `openssl rand -hex 32`
-      NEXTAUTH_URL: http://localhost:3000
-      TELEMETRY_ENABLED: ${TELEMETRY_ENABLED:-true}
-      LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES: ${LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES:-false}
-      LANGFUSE_INIT_ORG_ID: ${LANGFUSE_INIT_ORG_ID:-}
-      LANGFUSE_INIT_ORG_NAME: ${LANGFUSE_INIT_ORG_NAME:-}
-      LANGFUSE_INIT_PROJECT_ID: ${LANGFUSE_INIT_PROJECT_ID:-}
-      LANGFUSE_INIT_PROJECT_NAME: ${LANGFUSE_INIT_PROJECT_NAME:-}
-      LANGFUSE_INIT_PROJECT_PUBLIC_KEY: ${LANGFUSE_INIT_PROJECT_PUBLIC_KEY:-}
-      LANGFUSE_INIT_PROJECT_SECRET_KEY: ${LANGFUSE_INIT_PROJECT_SECRET_KEY:-}
-      LANGFUSE_INIT_USER_EMAIL: ${LANGFUSE_INIT_USER_EMAIL:-}
-      LANGFUSE_INIT_USER_NAME: ${LANGFUSE_INIT_USER_NAME:-}
-      LANGFUSE_INIT_USER_PASSWORD: ${LANGFUSE_INIT_USER_PASSWORD:-}
-      CLICKHOUSE_MIGRATION_URL: ${CLICKHOUSE_MIGRATION_URL:-clickhouse://clickhouse:9000}
-      CLICKHOUSE_URL: ${CLICKHOUSE_URL:-http://clickhouse:8123}
-      CLICKHOUSE_USER: ${CLICKHOUSE_USER:-clickhouse}
-      CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD:-clickhouse}
-      CLICKHOUSE_CLUSTER_ENABLED: ${CLICKHOUSE_CLUSTER_ENABLED:-false}
-      LANGFUSE_S3_EVENT_UPLOAD_BUCKET: ${LANGFUSE_S3_EVENT_UPLOAD_BUCKET:-langfuse}
-      LANGFUSE_S3_EVENT_UPLOAD_REGION: ${LANGFUSE_S3_EVENT_UPLOAD_REGION:-us-east-1}
-      LANGFUSE_S3_EVENT_UPLOAD_ACCESS_KEY_ID: ${LANGFUSE_S3_EVENT_UPLOAD_ACCESS_KEY_ID:-minio}
-      LANGFUSE_S3_EVENT_UPLOAD_SECRET_ACCESS_KEY: ${LANGFUSE_S3_EVENT_UPLOAD_SECRET_ACCESS_KEY:-miniosecret}
-      LANGFUSE_S3_EVENT_UPLOAD_ENDPOINT: ${LANGFUSE_S3_EVENT_UPLOAD_ENDPOINT:-http://minio:9000}
-      LANGFUSE_S3_EVENT_UPLOAD_FORCE_PATH_STYLE: ${LANGFUSE_S3_EVENT_UPLOAD_FORCE_PATH_STYLE:-true}
-      LANGFUSE_S3_EVENT_UPLOAD_PREFIX: ${LANGFUSE_S3_EVENT_UPLOAD_PREFIX:-events/}
-      REDIS_HOST: ${REDIS_HOST:-redis}
-      REDIS_PORT: ${REDIS_PORT:-6379}
-      REDIS_AUTH: ${REDIS_AUTH:-myredissecret}
+    environment:
+      - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres
+      - NEXTAUTH_SECRET=mysecret
+      - SALT=mysalt
+      - ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000 # generate via `openssl rand -hex 32`
+      - NEXTAUTH_URL=http://localhost:3000
+      - TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-true}
+      - LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES=${LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES:-false}
+      - LANGFUSE_INIT_ORG_ID=${LANGFUSE_INIT_ORG_ID:-}
+      - LANGFUSE_INIT_ORG_NAME=${LANGFUSE_INIT_ORG_NAME:-}
+      - LANGFUSE_INIT_PROJECT_ID=${LANGFUSE_INIT_PROJECT_ID:-}
+      - LANGFUSE_INIT_PROJECT_NAME=${LANGFUSE_INIT_PROJECT_NAME:-}
+      - LANGFUSE_INIT_PROJECT_PUBLIC_KEY=${LANGFUSE_INIT_PROJECT_PUBLIC_KEY:-}
+      - LANGFUSE_INIT_PROJECT_SECRET_KEY=${LANGFUSE_INIT_PROJECT_SECRET_KEY:-}
+      - LANGFUSE_INIT_USER_EMAIL=${LANGFUSE_INIT_USER_EMAIL:-}
+      - LANGFUSE_INIT_USER_NAME=${LANGFUSE_INIT_USER_NAME:-}
+      - LANGFUSE_INIT_USER_PASSWORD=${LANGFUSE_INIT_USER_PASSWORD:-}
     restart: always
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:3000/api/public/health"]
@@ -55,17 +36,26 @@ services:
       timeout: 10s
       retries: 3
 
-  langfuse-worker:
+  worker:
     build:
       dockerfile: ./worker/Dockerfile
       context: .
       args:
         - NEXT_PUBLIC_LANGFUSE_CLOUD_REGION=${NEXT_PUBLIC_LANGFUSE_CLOUD_REGION}
-    depends_on: *langfuse-depends-on
+    depends_on:
+      - db
+      - redis
     ports:
       - "3030:3030"
     environment:
-      <<: *langfuse-web-env
+      - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres
+      - NEXTAUTH_SECRET=mysecret
+      - TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-true}
+      - LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES=${LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES:-false}
+      - PORT=${PORT:-3030}
+      - REDIS_HOST=${REDIS_HOST:-redis}
+      - REDIS_PORT=${REDIS_PORT:-6379}
+      - REDIS_AUTH=${REDIS_AUTH:-myredissecret}
     restart: always
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:3030/api/health"]
@@ -73,85 +63,26 @@ services:
       timeout: 10s
       retries: 3
 
-  clickhouse:
-    image: clickhouse/clickhouse-server
-    user: "101:101"
-    container_name: clickhouse
-    hostname: clickhouse
-    environment:
-      CLICKHOUSE_DB: default
-      CLICKHOUSE_USER: clickhouse
-      CLICKHOUSE_PASSWORD: clickhouse
-    volumes:
-      - langfuse_clickhouse_data:/var/lib/clickhouse
-      - langfuse_clickhouse_logs:/var/log/clickhouse-server
-    ports:
-      - "8123:8123"
-      - "9000:9000"
-    healthcheck:
-      test: wget --no-verbose --tries=1 --spider http://localhost:8123/ping || exit 1
-      interval: 5s
-      timeout: 5s
-      retries: 10
-      start_period: 1s
-
-  minio:
-    image: minio/minio
-    container_name: minio
-    entrypoint: sh
-    # create the 'langfuse' bucket before starting the service
-    command: -c 'mkdir -p /data/langfuse && minio server --address ":9000" --console-address ":9001" /data'
-    environment:
-      MINIO_ROOT_USER: minio
-      MINIO_ROOT_PASSWORD: miniosecret
-    ports:
-      - "9090:9000"
-      - "9091:9001"
-    volumes:
-      - langfuse_minio_data:/data
-    healthcheck:
-      test: ["CMD", "mc", "ready", "local"]
-      interval: 1s
-      timeout: 5s
-      retries: 5
-      start_period: 1s
-
   redis:
-    image: redis:7
-    restart: always
+    image: redis:7.2.4
     command: >
       --requirepass ${REDIS_AUTH:-myredissecret}
+    restart: always
     ports:
       - 6379:6379
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 3s
-      timeout: 10s
-      retries: 10
 
-  postgres:
-    image: postgres:${POSTGRES_VERSION:-latest}
+  db:
+    image: postgres
     restart: always
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
-      interval: 3s
-      timeout: 3s
-      retries: 10
     environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: postgres
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=postgres
     ports:
       - 5432:5432
     volumes:
-      - langfuse_postgres_data:/var/lib/postgresql/data
+      - database_data:/var/lib/postgresql/data
 
 volumes:
-  langfuse_postgres_data:
-    driver: local
-  langfuse_clickhouse_data:
-    driver: local
-  langfuse_clickhouse_logs:
-    driver: local
-  langfuse_minio_data:
+  database_data:
     driver: local

docker-compose.v3preview.yml

@@ -0,0 +1,145 @@
+services:
+  langfuse-worker:
+    image: langfuse/langfuse-worker:latest
+    depends_on: &langfuse-depends-on
+      postgres:
+        condition: service_healthy
+      minio:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    ports:
+      - "3030:3030"
+    environment: &langfuse-worker-env
+      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/postgres
+      SALT: "mysalt"
+      ENCRYPTION_KEY: "0000000000000000000000000000000000000000000000000000000000000000" # generate via `openssl rand -hex 32`
+      TELEMETRY_ENABLED: ${TELEMETRY_ENABLED:-true}
+      LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES: ${LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES:-true}
+      LANGFUSE_ASYNC_INGESTION_PROCESSING: ${LANGFUSE_ASYNC_INGESTION_PROCESSING:-true}
+      LANGFUSE_ASYNC_CLICKHOUSE_INGESTION_PROCESSING: ${LANGFUSE_ASYNC_CLICKHOUSE_INGESTION_PROCESSING:-true}
+      LANGFUSE_READ_DASHBOARDS_FROM_CLICKHOUSE: ${LANGFUSE_READ_DASHBOARDS_FROM_CLICKHOUSE:-true}
+      LANGFUSE_READ_FROM_POSTGRES_ONLY: ${LANGFUSE_READ_FROM_POSTGRES_ONLY:-false}
+      LANGFUSE_RETURN_FROM_CLICKHOUSE: ${LANGFUSE_RETURN_FROM_CLICKHOUSE:-true}
+      CLICKHOUSE_MIGRATION_URL: ${CLICKHOUSE_MIGRATION_URL:-clickhouse://clickhouse:9000}
+      CLICKHOUSE_URL: ${CLICKHOUSE_URL:-http://clickhouse:8123}
+      CLICKHOUSE_USER: ${CLICKHOUSE_USER:-clickhouse}
+      CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD:-clickhouse}
+      CLICKHOUSE_CLUSTER_ENABLED: ${CLICKHOUSE_CLUSTER_ENABLED:-false}
+      LANGFUSE_S3_EVENT_UPLOAD_ENABLED: ${LANGFUSE_S3_EVENT_UPLOAD_ENABLED:-true}
+      LANGFUSE_S3_EVENT_UPLOAD_BUCKET: ${LANGFUSE_S3_EVENT_UPLOAD_BUCKET:-langfuse}
+      LANGFUSE_S3_EVENT_UPLOAD_REGION: ${LANGFUSE_S3_EVENT_UPLOAD_REGION:-us-east-1}
+      LANGFUSE_S3_EVENT_UPLOAD_ACCESS_KEY_ID: ${LANGFUSE_S3_EVENT_UPLOAD_ACCESS_KEY_ID:-minio}
+      LANGFUSE_S3_EVENT_UPLOAD_SECRET_ACCESS_KEY: ${LANGFUSE_S3_EVENT_UPLOAD_SECRET_ACCESS_KEY:-miniosecret}
+      LANGFUSE_S3_EVENT_UPLOAD_ENDPOINT: ${LANGFUSE_S3_EVENT_UPLOAD_ENDPOINT:-http://minio:9000}
+      LANGFUSE_S3_EVENT_UPLOAD_FORCE_PATH_STYLE: ${LANGFUSE_S3_EVENT_UPLOAD_FORCE_PATH_STYLE:-true}
+      LANGFUSE_S3_EVENT_UPLOAD_PREFIX: ${LANGFUSE_S3_EVENT_UPLOAD_PREFIX:-events/}
+      LANGFUSE_S3_MEDIA_UPLOAD_ENABLED: ${LANGFUSE_S3_MEDIA_UPLOAD_ENABLED:-true}
+      LANGFUSE_S3_MEDIA_UPLOAD_BUCKET: ${LANGFUSE_S3_MEDIA_UPLOAD_BUCKET:-langfuse}
+      LANGFUSE_S3_MEDIA_UPLOAD_REGION: ${LANGFUSE_S3_MEDIA_UPLOAD_REGION:-us-east-1}
+      LANGFUSE_S3_MEDIA_UPLOAD_ACCESS_KEY_ID: ${LANGFUSE_S3_MEDIA_UPLOAD_ACCESS_KEY_ID:-minio}
+      LANGFUSE_S3_MEDIA_UPLOAD_SECRET_ACCESS_KEY: ${LANGFUSE_S3_MEDIA_UPLOAD_SECRET_ACCESS_KEY:-miniosecret}
+      LANGFUSE_S3_MEDIA_UPLOAD_ENDPOINT: ${LANGFUSE_S3_MEDIA_UPLOAD_ENDPOINT:-http://minio:9000}
+      LANGFUSE_S3_MEDIA_UPLOAD_FORCE_PATH_STYLE: ${LANGFUSE_S3_MEDIA_UPLOAD_FORCE_PATH_STYLE:-true}
+      LANGFUSE_S3_MEDIA_UPLOAD_PREFIX: ${LANGFUSE_S3_MEDIA_UPLOAD_PREFIX:-media/}
+      REDIS_HOST: ${REDIS_HOST:-redis}
+      REDIS_PORT: ${REDIS_PORT:-6379}
+      REDIS_AUTH: ${REDIS_AUTH:-myredissecret}
+
+  langfuse-web:
+    image: langfuse/langfuse:latest
+    depends_on: *langfuse-depends-on
+    ports:
+      - "3000:3000"
+    environment:
+      <<: *langfuse-worker-env
+      NEXTAUTH_URL: http://localhost:3000
+      NEXTAUTH_SECRET: mysecret
+      LANGFUSE_INIT_ORG_ID: ${LANGFUSE_INIT_ORG_ID:-}
+      LANGFUSE_INIT_ORG_NAME: ${LANGFUSE_INIT_ORG_NAME:-}
+      LANGFUSE_INIT_PROJECT_ID: ${LANGFUSE_INIT_PROJECT_ID:-}
+      LANGFUSE_INIT_PROJECT_NAME: ${LANGFUSE_INIT_PROJECT_NAME:-}
+      LANGFUSE_INIT_PROJECT_PUBLIC_KEY: ${LANGFUSE_INIT_PROJECT_PUBLIC_KEY:-}
+      LANGFUSE_INIT_PROJECT_SECRET_KEY: ${LANGFUSE_INIT_PROJECT_SECRET_KEY:-}
+      LANGFUSE_INIT_USER_EMAIL: ${LANGFUSE_INIT_USER_EMAIL:-}
+      LANGFUSE_INIT_USER_NAME: ${LANGFUSE_INIT_USER_NAME:-}
+      LANGFUSE_INIT_USER_PASSWORD: ${LANGFUSE_INIT_USER_PASSWORD:-}
+
+  clickhouse:
+    image: clickhouse/clickhouse-server
+    user: "101:101"
+    container_name: clickhouse
+    hostname: clickhouse
+    environment:
+      CLICKHOUSE_DB: default
+      CLICKHOUSE_USER: clickhouse
+      CLICKHOUSE_PASSWORD: clickhouse
+    volumes:
+      - langfuse_clickhouse_data:/var/lib/clickhouse
+      - langfuse_clickhouse_logs:/var/log/clickhouse-server
+    ports:
+      - "8123:8123"
+      - "9000:9000"
+    depends_on:
+      - postgres
+
+  minio:
+    image: minio/minio
+    container_name: minio
+    entrypoint: sh
+    # create the 'langfuse' bucket before starting the service
+    command: -c 'mkdir -p /data/langfuse && minio server --address ":9000" --console-address ":9001" /data'
+    environment:
+      MINIO_ROOT_USER: minio
+      MINIO_ROOT_PASSWORD: miniosecret
+    ports:
+      - "9090:9000"
+      - "9091:9001"
+    volumes:
+      - langfuse_minio_data:/data
+    healthcheck:
+      test: ["CMD", "mc", "ready", "local"]
+      interval: 1s
+      timeout: 5s
+      retries: 5
+      start_period: 1s
+
+  redis:
+    image: redis:7
+    restart: always
+    command: >
+      --requirepass ${REDIS_AUTH:-myredissecret}
+    ports:
+      - 6379:6379
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 3s
+      timeout: 10s
+      retries: 10
+
+  postgres:
+    image: postgres:${POSTGRES_VERSION:-latest}
+    restart: always
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 3s
+      timeout: 3s
+      retries: 10
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: postgres
+    ports:
+      - 5432:5432
+    volumes:
+      - langfuse_postgres_data:/var/lib/postgresql/data
+
+volumes:
+  langfuse_postgres_data:
+    driver: local
+  langfuse_clickhouse_data:
+    driver: local
+  langfuse_clickhouse_logs:
+    driver: local
+  langfuse_minio_data:
+    driver: local

docker-compose.yml

@@ -1,131 +1,31 @@
 services:
-  langfuse-worker:
-    image: langfuse/langfuse-worker:3
-    restart: always
-    depends_on: &langfuse-depends-on
-      postgres:
+  langfuse-server:
+    image: langfuse/langfuse:2
+    depends_on:
+      db:
         condition: service_healthy
-      minio:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-      clickhouse:
-        condition: service_healthy
-    ports:
-      - "3030:3030"
-    environment: &langfuse-worker-env
-      DATABASE_URL: postgresql://postgres:postgres@postgres:5432/postgres
-      SALT: "mysalt"
-      ENCRYPTION_KEY: "0000000000000000000000000000000000000000000000000000000000000000" # generate via `openssl rand -hex 32`
-      TELEMETRY_ENABLED: ${TELEMETRY_ENABLED:-true}
-      LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES: ${LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES:-true}
-      CLICKHOUSE_MIGRATION_URL: ${CLICKHOUSE_MIGRATION_URL:-clickhouse://clickhouse:9000}
-      CLICKHOUSE_URL: ${CLICKHOUSE_URL:-http://clickhouse:8123}
-      CLICKHOUSE_USER: ${CLICKHOUSE_USER:-clickhouse}
-      CLICKHOUSE_PASSWORD: ${CLICKHOUSE_PASSWORD:-clickhouse}
-      CLICKHOUSE_CLUSTER_ENABLED: ${CLICKHOUSE_CLUSTER_ENABLED:-false}
-      LANGFUSE_S3_EVENT_UPLOAD_BUCKET: ${LANGFUSE_S3_EVENT_UPLOAD_BUCKET:-langfuse}
-      LANGFUSE_S3_EVENT_UPLOAD_REGION: ${LANGFUSE_S3_EVENT_UPLOAD_REGION:-auto}
-      LANGFUSE_S3_EVENT_UPLOAD_ACCESS_KEY_ID: ${LANGFUSE_S3_EVENT_UPLOAD_ACCESS_KEY_ID:-minio}
-      LANGFUSE_S3_EVENT_UPLOAD_SECRET_ACCESS_KEY: ${LANGFUSE_S3_EVENT_UPLOAD_SECRET_ACCESS_KEY:-miniosecret}
-      LANGFUSE_S3_EVENT_UPLOAD_ENDPOINT: ${LANGFUSE_S3_EVENT_UPLOAD_ENDPOINT:-http://minio:9000}
-      LANGFUSE_S3_EVENT_UPLOAD_FORCE_PATH_STYLE: ${LANGFUSE_S3_EVENT_UPLOAD_FORCE_PATH_STYLE:-true}
-      LANGFUSE_S3_EVENT_UPLOAD_PREFIX: ${LANGFUSE_S3_EVENT_UPLOAD_PREFIX:-events/}
-      LANGFUSE_S3_MEDIA_UPLOAD_BUCKET: ${LANGFUSE_S3_MEDIA_UPLOAD_BUCKET:-langfuse}
-      LANGFUSE_S3_MEDIA_UPLOAD_REGION: ${LANGFUSE_S3_MEDIA_UPLOAD_REGION:-auto}
-      LANGFUSE_S3_MEDIA_UPLOAD_ACCESS_KEY_ID: ${LANGFUSE_S3_MEDIA_UPLOAD_ACCESS_KEY_ID:-minio}
-      LANGFUSE_S3_MEDIA_UPLOAD_SECRET_ACCESS_KEY: ${LANGFUSE_S3_MEDIA_UPLOAD_SECRET_ACCESS_KEY:-miniosecret}
-      LANGFUSE_S3_MEDIA_UPLOAD_ENDPOINT: ${LANGFUSE_S3_MEDIA_UPLOAD_ENDPOINT:-http://minio:9000}
-      LANGFUSE_S3_MEDIA_UPLOAD_FORCE_PATH_STYLE: ${LANGFUSE_S3_MEDIA_UPLOAD_FORCE_PATH_STYLE:-true}
-      LANGFUSE_S3_MEDIA_UPLOAD_PREFIX: ${LANGFUSE_S3_MEDIA_UPLOAD_PREFIX:-media/}
-      REDIS_HOST: ${REDIS_HOST:-redis}
-      REDIS_PORT: ${REDIS_PORT:-6379}
-      REDIS_AUTH: ${REDIS_AUTH:-myredissecret}
-
-  langfuse-web:
-    image: langfuse/langfuse:3
-    restart: always
-    depends_on: *langfuse-depends-on
     ports:
       - "3000:3000"
     environment:
-      <<: *langfuse-worker-env
-      NEXTAUTH_URL: http://localhost:3000
-      NEXTAUTH_SECRET: mysecret
-      LANGFUSE_INIT_ORG_ID: ${LANGFUSE_INIT_ORG_ID:-}
-      LANGFUSE_INIT_ORG_NAME: ${LANGFUSE_INIT_ORG_NAME:-}
-      LANGFUSE_INIT_PROJECT_ID: ${LANGFUSE_INIT_PROJECT_ID:-}
-      LANGFUSE_INIT_PROJECT_NAME: ${LANGFUSE_INIT_PROJECT_NAME:-}
-      LANGFUSE_INIT_PROJECT_PUBLIC_KEY: ${LANGFUSE_INIT_PROJECT_PUBLIC_KEY:-}
-      LANGFUSE_INIT_PROJECT_SECRET_KEY: ${LANGFUSE_INIT_PROJECT_SECRET_KEY:-}
-      LANGFUSE_INIT_USER_EMAIL: ${LANGFUSE_INIT_USER_EMAIL:-}
-      LANGFUSE_INIT_USER_NAME: ${LANGFUSE_INIT_USER_NAME:-}
-      LANGFUSE_INIT_USER_PASSWORD: ${LANGFUSE_INIT_USER_PASSWORD:-}
-      LANGFUSE_SDK_CI_SYNC_PROCESSING_ENABLED: ${LANGFUSE_SDK_CI_SYNC_PROCESSING_ENABLED:-false}
-      LANGFUSE_READ_FROM_POSTGRES_ONLY: ${LANGFUSE_READ_FROM_POSTGRES_ONLY:-false}
-      LANGFUSE_READ_FROM_CLICKHOUSE_ONLY: ${LANGFUSE_READ_FROM_CLICKHOUSE_ONLY:-true}
-      LANGFUSE_RETURN_FROM_CLICKHOUSE: ${LANGFUSE_RETURN_FROM_CLICKHOUSE:-true}
+      - DATABASE_URL=postgresql://postgres:postgres@db:5432/postgres
+      - NEXTAUTH_SECRET=mysecret
+      - SALT=mysalt
+      - ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000 # generate via `openssl rand -hex 32`
+      - NEXTAUTH_URL=http://localhost:3000
+      - TELEMETRY_ENABLED=${TELEMETRY_ENABLED:-true}
+      - LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES=${LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES:-false}
+      - LANGFUSE_INIT_ORG_ID=${LANGFUSE_INIT_ORG_ID:-}
+      - LANGFUSE_INIT_ORG_NAME=${LANGFUSE_INIT_ORG_NAME:-}
+      - LANGFUSE_INIT_PROJECT_ID=${LANGFUSE_INIT_PROJECT_ID:-}
+      - LANGFUSE_INIT_PROJECT_NAME=${LANGFUSE_INIT_PROJECT_NAME:-}
+      - LANGFUSE_INIT_PROJECT_PUBLIC_KEY=${LANGFUSE_INIT_PROJECT_PUBLIC_KEY:-}
+      - LANGFUSE_INIT_PROJECT_SECRET_KEY=${LANGFUSE_INIT_PROJECT_SECRET_KEY:-}
+      - LANGFUSE_INIT_USER_EMAIL=${LANGFUSE_INIT_USER_EMAIL:-}
+      - LANGFUSE_INIT_USER_NAME=${LANGFUSE_INIT_USER_NAME:-}
+      - LANGFUSE_INIT_USER_PASSWORD=${LANGFUSE_INIT_USER_PASSWORD:-}
 
-  clickhouse:
-    image: clickhouse/clickhouse-server
-    restart: always
-    user: "101:101"
-    container_name: clickhouse
-    hostname: clickhouse
-    environment:
-      CLICKHOUSE_DB: default
-      CLICKHOUSE_USER: clickhouse
-      CLICKHOUSE_PASSWORD: clickhouse
-    volumes:
-      - langfuse_clickhouse_data:/var/lib/clickhouse
-      - langfuse_clickhouse_logs:/var/log/clickhouse-server
-    ports:
-      - "8123:8123"
-      - "9000:9000"
-    healthcheck:
-      test: wget --no-verbose --tries=1 --spider http://localhost:8123/ping || exit 1
-      interval: 5s
-      timeout: 5s
-      retries: 10
-      start_period: 1s
-
-  minio:
-    image: minio/minio
-    restart: always
-    container_name: minio
-    entrypoint: sh
-    # create the 'langfuse' bucket before starting the service
-    command: -c 'mkdir -p /data/langfuse && minio server --address ":9000" --console-address ":9001" /data'
-    environment:
-      MINIO_ROOT_USER: minio
-      MINIO_ROOT_PASSWORD: miniosecret
-    ports:
-      - "9090:9000"
-      - "9091:9001"
-    volumes:
-      - langfuse_minio_data:/data
-    healthcheck:
-      test: ["CMD", "mc", "ready", "local"]
-      interval: 1s
-      timeout: 5s
-      retries: 5
-      start_period: 1s
-
-  redis:
-    image: redis:7
-    restart: always
-    command: >
-      --requirepass ${REDIS_AUTH:-myredissecret}
-    ports:
-      - 6379:6379
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 3s
-      timeout: 10s
-      retries: 10
-
-  postgres:
-    image: postgres:${POSTGRES_VERSION:-latest}
+  db:
+    image: postgres
     restart: always
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
@@ -133,20 +33,14 @@ services:
       timeout: 3s
       retries: 10
     environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: postgres
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=postgres
     ports:
       - 5432:5432
     volumes:
-      - langfuse_postgres_data:/var/lib/postgresql/data
+      - database_data:/var/lib/postgresql/data
 
 volumes:
-  langfuse_postgres_data:
-    driver: local
-  langfuse_clickhouse_data:
-    driver: local
-  langfuse_clickhouse_logs:
-    driver: local
-  langfuse_minio_data:
+  database_data:
     driver: local

ee/package.json

@@ -27,7 +27,8 @@
     "@langfuse/shared": "workspace:*",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "axios": "^1.7.7",
-    "next": "^14.2.15",
+    "https-proxy-agent": "^7.0.6",
+    "next": "^14.2.21",
     "next-auth": "^4.24.11",
     "zod": "^3.23.8"
   },
@@ -47,7 +48,7 @@
   },
   "pnpm": {
     "overrides": {
-      "jsonpath-plus": "10.0.7"
+      "jsonpath-plus": "10.2.0"
     }
   }
 }

ee/src/env.ts

@@ -1,9 +1,12 @@
 import { z } from "zod";
-import { removeEmptyEnvVariables } from "@langfuse/shared";
+import { env as sharedEnv, removeEmptyEnvVariables } from "@langfuse/shared";
 
 const EnvSchema = z.object({
   NEXT_PUBLIC_LANGFUSE_CLOUD_REGION: z.string().optional(),
   LANGFUSE_EE_LICENSE_KEY: z.string().optional(),
 });
 
-export const env = EnvSchema.parse(removeEmptyEnvVariables(process.env));
+export const env = {
+  ...sharedEnv,
+  ...EnvSchema.parse(removeEmptyEnvVariables(process.env)),
+};

fern/apis/server/definition/comments.yml

@@ -58,7 +58,7 @@ types:
         docs: The id of the object to attach the comment to. If this does not reference a valid existing object, an error will be thrown.
       content:
         type: string
-        docs: The content of the comment. May include markdown. Currently limited to 3000 characters.
+        docs: The content of the comment. May include markdown. Currently limited to 500 characters.
       authorUserId:
         type: optional<string>
         docs: The id of the user who created the comment.

fern/apis/server/definition/commons.yml

@@ -126,7 +126,7 @@ types:
         docs: The output data of the observation
       usage:
         type: optional<Usage>
-        docs: (Deprecated. Use usageDetails and costDetails instead.) The usage data of the observation
+        docs: The usage data of the observation
       level:
         type: ObservationLevel
         docs: The level of the observation
@@ -139,12 +139,6 @@ types:
       promptId:
         type: optional<string>
         docs: The prompt ID associated with the observation
-      usageDetails:
-        type: optional<map<string, integer>>
-        docs: The usage details of the observation. Key is the name of the usage metric, value is the number of units consumed. The total key is the sum of all (non-total) usage metrics or the total value ingested.
-      costDetails:
-        type: optional<map<string, double>>
-        docs: The cost details of the observation. Key is the name of the cost metric, value is the cost in USD. The total key is the sum of all (non-total) cost metrics or the total value ingested.
 
   ObservationsView:
     extends: Observation
@@ -169,13 +163,13 @@ types:
         docs: The total price in USD.
       calculatedInputCost:
         type: optional<double>
-        docs: (Deprecated. Use usageDetails and costDetails instead.) The calculated cost of the input in USD
+        docs: The calculated cost of the input in USD
       calculatedOutputCost:
         type: optional<double>
-        docs: (Deprecated. Use usageDetails and costDetails instead.) The calculated cost of the output in USD
+        docs: The calculated cost of the output in USD
       calculatedTotalCost:
         type: optional<double>
-        docs: (Deprecated. Use usageDetails and costDetails instead.) The calculated total cost in USD
+        docs: The calculated total cost in USD
       latency:
         type: optional<double>
         docs: The latency in seconds.
@@ -184,7 +178,7 @@ types:
         docs: The time to the first token in seconds
 
   Usage:
-    docs: (Deprecated. Use usageDetails and costDetails instead.) Standard interface for usage and cost
+    docs: Standard interface for usage and cost
     properties:
       input:
         docs: Number of input units (e.g. tokens)

fern/apis/server/definition/ingestion.yml

@@ -126,8 +126,6 @@ types:
       model: optional<string>
       modelParameters: optional<map<string, commons.MapValue>>
       usage: optional<IngestionUsage>
-      usageDetails: optional<UsageDetails>
-      costDetails: optional<map<string, float>>
       promptName: optional<string>
       promptVersion: optional<integer>
 
@@ -139,8 +137,6 @@ types:
       modelParameters: optional<map<string, commons.MapValue>>
       usage: optional<IngestionUsage>
       promptName: optional<string>
-      usageDetails: optional<UsageDetails>
-      costDetails: optional<map<string, float>>
       promptVersion: optional<integer>
 
   ObservationBody:
@@ -316,17 +312,3 @@ types:
     properties:
       successes: list<IngestionSuccess>
       errors: list<IngestionError>
-
-  OpenAIUsageSchema:
-    properties:
-      prompt_tokens: integer
-      completion_tokens: integer
-      total_tokens: integer
-      prompt_tokens_details: optional<map<string, integer>>
-      completion_tokens_details: optional<map<string, integer>>
-
-  UsageDetails:
-    discriminated: false
-    union:
-      - map<string, integer>
-      - OpenAIUsageSchema

fern/apis/server/definition/media.yml

@@ -99,63 +99,5 @@ types:
         docs: The unique langfuse identifier of a media record
 
   MediaContentType:
-    enum:
-      - value: image/png
-        name: IMAGE_PNG
-      - value: image/jpeg
-        name: IMAGE_JPEG
-      - value: image/jpg
-        name: IMAGE_JPG
-      - value: image/webp
-        name: IMAGE_WEBP
-      - value: image/gif
-        name: IMAGE_GIF
-      - value: image/svg+xml
-        name: IMAGE_SVG_XML
-      - value: image/tiff
-        name: IMAGE_TIFF
-      - value: image/bmp
-        name: IMAGE_BMP
-      - value: audio/mpeg
-        name: AUDIO_MPEG
-      - value: audio/mp3
-        name: AUDIO_MP3
-      - value: audio/wav
-        name: AUDIO_WAV
-      - value: audio/ogg
-        name: AUDIO_OGG
-      - value: audio/oga
-        name: AUDIO_OGA
-      - value: audio/aac
-        name: AUDIO_AAC
-      - value: audio/mp4
-        name: AUDIO_MP4
-      - value: audio/flac
-        name: AUDIO_FLAC
-      - value: video/mp4
-        name: VIDEO_MP4
-      - value: video/webm
-        name: VIDEO_WEBM
-      - value: text/plain
-        name: TEXT_PLAIN
-      - value: text/html
-        name: TEXT_HTML
-      - value: text/css
-        name: TEXT_CSS
-      - value: text/csv
-        name: TEXT_CSV
-      - value: application/pdf
-        name: APPLICATION_PDF
-      - value: application/msword
-        name: APPLICATION_MSWORD
-      - value: application/vnd.ms-excel
-        name: APPLICATION_MS_EXCEL
-      - value: application/zip
-        name: APPLICATION_ZIP
-      - value: application/json
-        name: APPLICATION_JSON
-      - value: application/xml
-        name: APPLICATION_XML
-      - value: application/octet-stream
-        name: APPLICATION_OCTET_STREAM
+    type: literal<"image/png","image/jpeg","image/jpg","image/webp","audio/mpeg","audio/mp3","audio/wav","text/plain","application/pdf">
     docs: The MIME type of the media record

package.json

@@ -1,6 +1,6 @@
 {
   "name": "langfuse",
-  "version": "3.5.0",
+  "version": "2.95.2",
   "author": "engineering@langfuse.com",
   "license": "MIT",
   "private": true,
@@ -81,10 +81,15 @@
       }
     }
   },
-  "packageManager": "pnpm@9.5.0",
   "pnpm": {
     "overrides": {
-      "jsonpath-plus": "10.0.7"
+      "jsonpath-plus": "10.2.0",
+      "nanoid": "^3.3.8",
+      "katex": "^0.16.21"
+    },
+    "patchedDependencies": {
+      "next-auth@4.24.11": "patches/next-auth@4.24.11.patch"
     }
-  }
+  },
+  "packageManager": "pnpm@9.5.0"
 }

packages/shared/clickhouse/migrations/clustered/0006_add_user_id_index.down.sql

@@ -1 +0,0 @@
-ALTER TABLE traces ON CLUSTER default DROP INDEX IF EXISTS idx_user_id;

packages/shared/clickhouse/migrations/clustered/0006_add_user_id_index.up.sql

@@ -1,2 +0,0 @@
-ALTER TABLE traces ON CLUSTER default ADD INDEX IF NOT EXISTS idx_user_id user_id TYPE bloom_filter() GRANULARITY 1;
-ALTER TABLE traces ON CLUSTER default MATERIALIZE INDEX IF EXISTS idx_user_id;

packages/shared/clickhouse/migrations/unclustered/0006_add_user_id_index.down.sql

@@ -1 +0,0 @@
-ALTER TABLE traces ON CLUSTER default DROP INDEX IF EXISTS idx_user_id;

packages/shared/clickhouse/migrations/unclustered/0006_add_user_id_index.up.sql

@@ -1,2 +0,0 @@
-ALTER TABLE traces ADD INDEX IF NOT EXISTS idx_user_id user_id TYPE bloom_filter() GRANULARITY 1;
-ALTER TABLE traces MATERIALIZE INDEX IF EXISTS idx_user_id;

packages/shared/clickhouse/scripts/down.sh

@@ -19,16 +19,7 @@ then
 fi
 
 # Construct the database URL
-if [ "$CLICKHOUSE_CLUSTER_ENABLED" == "false" ] ; then
-  if [ "$CLICKHOUSE_MIGRATION_SSL" = true ] ; then
-      DATABASE_URL="${CLICKHOUSE_MIGRATION_URL}?username=${CLICKHOUSE_USER}&password=${CLICKHOUSE_PASSWORD}&database=default&x-multi-statement=true&secure=true&skip_verify=true&x-migrations-table-engine=MergeTree"
-  else
-      DATABASE_URL="${CLICKHOUSE_MIGRATION_URL}?username=${CLICKHOUSE_USER}&password=${CLICKHOUSE_PASSWORD}&database=default&x-multi-statement=true&x-migrations-table-engine=MergeTree"
-  fi
-
-  # Execute the up command
-  migrate -source file://clickhouse/migrations/unclustered -database "$DATABASE_URL" down
-else
+if [ "$CLICKHOUSE_CLUSTER_ENABLED" == "true" ] ; then
   if [ "$CLICKHOUSE_MIGRATION_SSL" = true ] ; then
       DATABASE_URL="${CLICKHOUSE_MIGRATION_URL}?username=${CLICKHOUSE_USER}&password=${CLICKHOUSE_PASSWORD}&database=default&x-multi-statement=true&secure=true&skip_verify=true&x-cluster-name=default&x-migrations-table-engine=ReplicatedMergeTree"
   else
@@ -37,4 +28,13 @@ else
 
   # Execute the up command
   migrate -source file://clickhouse/migrations/clustered -database "$DATABASE_URL" down
+else
+  if [ "$CLICKHOUSE_MIGRATION_SSL" = true ] ; then
+      DATABASE_URL="${CLICKHOUSE_MIGRATION_URL}?username=${CLICKHOUSE_USER}&password=${CLICKHOUSE_PASSWORD}&database=default&x-multi-statement=true&secure=true&skip_verify=true&x-migrations-table-engine=MergeTree"
+  else
+      DATABASE_URL="${CLICKHOUSE_MIGRATION_URL}?username=${CLICKHOUSE_USER}&password=${CLICKHOUSE_PASSWORD}&database=default&x-multi-statement=true&x-migrations-table-engine=MergeTree"
+  fi
+
+  # Execute the up command
+  migrate -source file://clickhouse/migrations/unclustered -database "$DATABASE_URL" down
 fi

packages/shared/clickhouse/scripts/seed.ts

@@ -2,7 +2,7 @@ import {
   clickhouseClient,
   ObservationRecordReadType,
 } from "@langfuse/shared/src/server";
-import { prisma } from "../../src/db";
+import { Prisma, prisma } from "../../src/db";
 import { redis } from "@langfuse/shared/src/server";
 import { prepareClickhouse } from "../../scripts/prepareClickhouse";
 import { createDatasets } from "../../prisma/seed";

packages/shared/clickhouse/scripts/up.sh

@@ -19,7 +19,16 @@ then
 fi
 
 # Construct the database URL
-if [ "$CLICKHOUSE_CLUSTER_ENABLED" == "false" ] ; then
+if [ "$CLICKHOUSE_CLUSTER_ENABLED" == "true" ] ; then
+  if [ "$CLICKHOUSE_MIGRATION_SSL" = true ] ; then
+      DATABASE_URL="${CLICKHOUSE_MIGRATION_URL}?username=${CLICKHOUSE_USER}&password=${CLICKHOUSE_PASSWORD}&database=default&x-multi-statement=true&secure=true&skip_verify=true&x-cluster-name=default&x-migrations-table-engine=ReplicatedMergeTree"
+  else
+      DATABASE_URL="${CLICKHOUSE_MIGRATION_URL}?username=${CLICKHOUSE_USER}&password=${CLICKHOUSE_PASSWORD}&database=default&x-multi-statement=true&x-cluster-name=default&x-migrations-table-engine=ReplicatedMergeTree"
+  fi
+
+  # Execute the up command
+  migrate -source file://clickhouse/migrations/clustered -database "$DATABASE_URL" up
+else
   if [ "$CLICKHOUSE_MIGRATION_SSL" = true ] ; then
       DATABASE_URL="${CLICKHOUSE_MIGRATION_URL}?username=${CLICKHOUSE_USER}&password=${CLICKHOUSE_PASSWORD}&database=default&x-multi-statement=true&secure=true&skip_verify=true&x-migrations-table-engine=MergeTree"
   else
@@ -28,13 +37,4 @@ if [ "$CLICKHOUSE_CLUSTER_ENABLED" == "false" ] ; then
 
   # Execute the up command
   migrate -source file://clickhouse/migrations/unclustered -database "$DATABASE_URL" up
-else
-if [ "$CLICKHOUSE_MIGRATION_SSL" = true ] ; then
-      DATABASE_URL="${CLICKHOUSE_MIGRATION_URL}?username=${CLICKHOUSE_USER}&password=${CLICKHOUSE_PASSWORD}&database=default&x-multi-statement=true&secure=true&skip_verify=true&x-cluster-name=default&x-migrations-table-engine=ReplicatedMergeTree"
-  else
-      DATABASE_URL="${CLICKHOUSE_MIGRATION_URL}?username=${CLICKHOUSE_USER}&password=${CLICKHOUSE_PASSWORD}&database=default&x-multi-statement=true&x-cluster-name=default&x-migrations-table-engine=ReplicatedMergeTree"
-  fi
-
-  # Execute the up command
-  migrate -source file://clickhouse/migrations/clustered -database "$DATABASE_URL" up
 fi

packages/shared/package.json

@@ -64,7 +64,6 @@
     "@langchain/anthropic": "^0.3.8",
     "@langchain/aws": "^0.1.2",
     "@langchain/core": "^0.3.18",
-    "@langchain/google-vertexai": "^0.1.3",
     "@langchain/openai": "^0.3.14",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@prisma/client": "^5.22.0",
@@ -77,6 +76,7 @@
     "dd-trace": "^5.23.1",
     "decimal.js": "^10.4.3",
     "exponential-backoff": "^3.1.1",
+    "https-proxy-agent": "^7.0.6",
     "ioredis": "^5.4.1",
     "kysely": "^0.27.4",
     "langchain": "^0.3.6",

packages/shared/prisma/generated/types.ts

@@ -453,7 +453,6 @@ export type Project = {
     org_id: string;
     created_at: Generated<Timestamp>;
     updated_at: Generated<Timestamp>;
-    deleted_at: Timestamp | null;
     name: string;
 };
 export type ProjectMembership = {

packages/shared/prisma/migrations/20241124115100_add_projects_deleted_at/migration.sql

@@ -1,2 +0,0 @@
--- AlterTable
-ALTER TABLE "projects" ADD COLUMN "deleted_at" TIMESTAMP(3);

packages/shared/prisma/migrations/20241206115829_remove_trace_score_observation_constraints/migration.sql

@@ -1,5 +0,0 @@
--- DropForeignKey
-ALTER TABLE "job_executions" DROP CONSTRAINT "job_executions_job_output_score_id_fkey";
-
--- DropForeignKey
-ALTER TABLE "traces" DROP CONSTRAINT "traces_session_id_project_id_fkey";

packages/shared/prisma/schema.prisma

@@ -113,7 +113,6 @@ model Project {
   orgId               String                 @map("org_id")
   createdAt           DateTime               @default(now()) @map("created_at")
   updatedAt           DateTime               @default(now()) @updatedAt @map("updated_at")
-  deletedAt           DateTime?              @map("deleted_at")
   name                String
   projectMembers      ProjectMembership[]
   organization        Organization           @relation(fields: [orgId], references: [id], onUpdate: Cascade, onDelete: Cascade)
@@ -469,24 +468,25 @@ enum ObservationLevel {
 }
 
 model Score {
-  id            String        @id @default(cuid())
-  timestamp     DateTime      @default(now())
-  projectId     String        @map("project_id")
-  project       Project       @relation(fields: [projectId], references: [id], onDelete: Cascade)
+  id            String         @id @default(cuid())
+  timestamp     DateTime       @default(now())
+  projectId     String         @map("project_id")
+  project       Project        @relation(fields: [projectId], references: [id], onDelete: Cascade)
   name          String
   value         Float? // always defined if data type is NUMERIC or BOOLEAN, optional for CATEGORICAL
   source        ScoreSource
-  authorUserId  String?       @map("author_user_id")
+  authorUserId  String?        @map("author_user_id")
   comment       String?
-  traceId       String        @map("trace_id")
-  observationId String?       @map("observation_id")
-  configId      String?       @map("config_id")
-  stringValue   String?       @map("string_value") // always defined if data type is CATEGORICAL or BOOLEAN, null for NUMERIC
-  queueId       String?       @map("queue_id")
-  createdAt     DateTime      @default(now()) @map("created_at")
-  updatedAt     DateTime      @default(now()) @updatedAt @map("updated_at")
-  dataType      ScoreDataType @default(NUMERIC) @map("data_type")
-  scoreConfig   ScoreConfig?  @relation(fields: [configId], references: [id], onDelete: SetNull)
+  traceId       String         @map("trace_id")
+  observationId String?        @map("observation_id")
+  configId      String?        @map("config_id")
+  stringValue   String?        @map("string_value") // always defined if data type is CATEGORICAL or BOOLEAN, null for NUMERIC
+  queueId       String?        @map("queue_id")
+  createdAt     DateTime       @default(now()) @map("created_at")
+  updatedAt     DateTime       @default(now()) @updatedAt @map("updated_at")
+  dataType      ScoreDataType  @default(NUMERIC) @map("data_type")
+  JobExecution  JobExecution[]
+  scoreConfig   ScoreConfig?   @relation(fields: [configId], references: [id], onDelete: SetNull)
 
   @@unique([id, projectId]) // used for upserts via prisma
   @@index(timestamp)
@@ -900,9 +900,10 @@ model JobExecution {
 
   jobInputObservationId String? @map("job_input_observation_id") // no fk constraint - observations in ClickHouse, deletion handled via project cascade
 
-  jobInputDatasetItemId String? @map("job_input_dataset_item_id") // no fk constraint - job execution sensible standalone
+  jobInputDatasetItemId String?      @map("job_input_dataset_item_id") // no fk constraint - job execution sensible standalone
 
   jobOutputScoreId String? @map("job_output_score_id")
+  score            Score?  @relation(fields: [jobOutputScoreId], references: [id], onDelete: SetNull) // job remains when scores are deleted
 
   @@index([projectId, status])
   @@index([projectId, id])

packages/shared/prisma/seed.ts

@@ -450,9 +450,6 @@ export async function createDatasets(
           Math.random() > 0.3
             ? observations[Math.floor(Math.random() * observations.length)]
             : undefined;
-        if (!sourceObservation) {
-          continue;
-        }
         const datasetItem = await prisma.datasetItem.create({
           data: {
             projectId,
@@ -513,9 +510,6 @@ export async function createDatasets(
               Math.floor(Math.random() * relevantObservations.length)
             ];
 
-          if (!observation) {
-            continue;
-          }
           await prisma.datasetRunItems.create({
             data: {
               projectId,

packages/shared/scripts/prepareClickhouse.ts

@@ -110,7 +110,7 @@ export const prepareClickhouse = async (
       map('input', toDecimal64(randUniform(0, 1000), 12), 'output', toDecimal64(randUniform(0, 1000), 12), 'total', toDecimal64(randUniform(0, 2000), 12)) AS provided_cost_details,
       map('input', toDecimal64(randUniform(0, 1000), 12), 'output', toDecimal64(randUniform(0, 1000), 12), 'total', toDecimal64(randUniform(0, 2000), 12)) AS cost_details,
       toDecimal64(randUniform(0, 2000), 12) AS total_cost,
-      addMilliseconds(start_time, if(rand() < 0.6, floor(randUniform(0, 500)), floor(randUniform(0, 600)))) AS completion_start_time,
+      start_time AS completion_start_time,
       array(${SEED_PROMPTS.map((p) => `concat('${p.id}',project_id)`).join(
         ",",
       )})[(number % ${SEED_PROMPTS.length})+1] AS prompt_id,

packages/shared/src/env.ts

@@ -5,7 +5,6 @@ const EnvSchema = z.object({
   NODE_ENV: z
     .enum(["development", "test", "production"])
     .default("development"),
-  NEXTAUTH_URL: z.string().url().optional(),
   REDIS_HOST: z.string().nullish(),
   REDIS_PORT: z.coerce
     .number({
@@ -28,19 +27,15 @@ const EnvSchema = z.object({
     .optional(),
   LANGFUSE_CACHE_PROMPT_ENABLED: z.enum(["true", "false"]).default("false"),
   LANGFUSE_CACHE_PROMPT_TTL_SECONDS: z.coerce.number().default(60 * 60),
-  CLICKHOUSE_URL: z.string().url(),
-  CLICKHOUSE_USER: z.string(),
-  CLICKHOUSE_PASSWORD: z.string(),
-  LANGFUSE_SDK_CI_SYNC_PROCESSING_ENABLED: z
+  CLICKHOUSE_URL: z.string().url().optional(),
+  CLICKHOUSE_USER: z.string().optional(),
+  CLICKHOUSE_PASSWORD: z.string().optional(),
+  LANGFUSE_ASYNC_CLICKHOUSE_INGESTION_PROCESSING: z
     .enum(["true", "false"])
     .default("false"),
-  LANGFUSE_CLICKHOUSE_INGESTION_ENABLED: z
-    .enum(["true", "false"])
-    .default("true"),
-  LANGFUSE_POSTGRES_INGESTION_ENABLED: z
+  LANGFUSE_ASYNC_INGESTION_PROCESSING: z
     .enum(["true", "false"])
     .default("false"),
-
   LANGFUSE_INGESTION_QUEUE_DELAY_MS: z.coerce
     .number()
     .nonnegative()
@@ -53,9 +48,8 @@ const EnvSchema = z.object({
   ENABLE_AWS_CLOUDWATCH_METRIC_PUBLISHING: z
     .enum(["true", "false"])
     .default("false"),
-  LANGFUSE_S3_EVENT_UPLOAD_BUCKET: z.string({
-    required_error: "Langfuse requires a bucket name for S3 Event Uploads.",
-  }),
+  LANGFUSE_S3_EVENT_UPLOAD_ENABLED: z.enum(["true", "false"]).default("false"),
+  LANGFUSE_S3_EVENT_UPLOAD_BUCKET: z.string().optional(),
   LANGFUSE_S3_EVENT_UPLOAD_PREFIX: z.string().default(""),
   LANGFUSE_S3_EVENT_UPLOAD_REGION: z.string().optional(),
   LANGFUSE_S3_EVENT_UPLOAD_ENDPOINT: z.string().optional(),
@@ -66,13 +60,6 @@ const EnvSchema = z.object({
     .default("false"),
   LANGFUSE_USE_AZURE_BLOB: z.enum(["true", "false"]).default("false"),
   STRIPE_SECRET_KEY: z.string().optional(),
-
-  LANGFUSE_S3_CORE_DATA_EXPORT_IS_ENABLED: z
-    .enum(["true", "false"])
-    .default("false"),
 });
 
-export const env: z.infer<typeof EnvSchema> =
-  process.env.DOCKER_BUILD === "1"
-    ? (process.env as any)
-    : EnvSchema.parse(removeEmptyEnvVariables(process.env));
+export const env = EnvSchema.parse(removeEmptyEnvVariables(process.env));

packages/shared/src/features/comments/types.ts

@@ -1,7 +1,5 @@
 import { z } from "zod";
 
-const MAX_COMMENT_LENGTH = 3000;
-
 const COMMENT_OBJECT_TYPES = [
   "TRACE",
   "OBSERVATION",
@@ -11,7 +9,7 @@ const COMMENT_OBJECT_TYPES = [
 
 export const CreateCommentData = z.object({
   projectId: z.string(),
-  content: z.string().trim().min(1).max(MAX_COMMENT_LENGTH),
+  content: z.string().trim().min(1).max(500),
   objectId: z.string(),
   objectType: z.enum(COMMENT_OBJECT_TYPES),
 });

packages/shared/src/features/entitlements/plans.ts

@@ -3,17 +3,15 @@ export const planLabels = {
   "cloud:hobby": "Hobby",
   "cloud:pro": "Pro",
   "cloud:team": "Team",
-  "self-hosted:pro": "Pro (self-hosted)",
-  "self-hosted:enterprise": "Enterprise (self-hosted)",
+  "self-hosted:enterprise": "Enterprise",
 } as const;
 
 export type Plan = keyof typeof planLabels;
 
 export const plans = Object.keys(planLabels) as Plan[];
 
-// These functions are kept here to ensure consistency when updating plan names in the future.
+// This function is kept here to ensure consistency when updating plan names in the future.
 export const isCloudPlan = (plan: Plan) => plan.startsWith("cloud");
-export const isSelfHostedPlan = (plan: Plan) => plan.startsWith("self-hosted");
 
 export const isPlan = (value: string): value is Plan =>
   plans.includes(value as Plan);

packages/shared/src/features/experiments/utils.ts

@@ -1,15 +0,0 @@
-import { Prisma } from "../../db";
-
-export const datasetItemMatchesVariable = (
-  input: Prisma.JsonValue,
-  variable: string,
-) => {
-  if (
-    input === null ||
-    input === undefined ||
-    typeof input !== "object" ||
-    Array.isArray(input)
-  )
-    return false;
-  return Object.keys(input).includes(variable);
-};

packages/shared/src/features/scores/scoreConfigTypes.ts

@@ -6,7 +6,7 @@ import { isPresent } from "../../utils/typeChecks";
 import {
   jsonSchema,
   paginationMetaResponseZod,
-  publicApiPaginationZod,
+  paginationZod,
 } from "../../utils/zod";
 
 /**
@@ -17,7 +17,7 @@ export type ValidatedScoreConfig = z.infer<typeof ValidatedScoreConfigSchema>;
 
 const validateCategories = (
   categories: ConfigCategory[],
-  ctx: z.RefinementCtx,
+  ctx: z.RefinementCtx
 ) => {
   const uniqueNames = new Set<string>();
   const uniqueValues = new Set<number>();
@@ -94,7 +94,7 @@ const BooleanScoreConfig = z.object({
       return categories.every(
         (category, index) =>
           category.label === expectedCategories[index].label &&
-          category.value === expectedCategories[index].value,
+          category.value === expectedCategories[index].value
       );
     }),
 });
@@ -123,7 +123,7 @@ const ValidatedScoreConfigSchema = z
         minValue: z.undefined().nullish(),
         dataType: z.literal("CATEGORICAL"),
         categories: Categories.superRefine(validateCategories),
-      }),
+      })
     ),
     ScoreConfigBase.merge(BooleanScoreConfig),
   ])
@@ -150,7 +150,7 @@ const ValidatedScoreConfigSchema = z
  */
 export const filterAndValidateDbScoreConfigList = (
   scoreConfigs: ScoreConfigDbType[],
-  onParseError?: (error: z.ZodError) => void,
+  onParseError?: (error: z.ZodError) => void
 ): ValidatedScoreConfig[] =>
   scoreConfigs.reduce((acc, ts) => {
     const result = ValidatedScoreConfigSchema.safeParse(ts);
@@ -170,7 +170,7 @@ export const filterAndValidateDbScoreConfigList = (
  * @throws error if score fails validation
  */
 export const validateDbScoreConfig = (
-  scoreConfig: ScoreConfigDbType,
+  scoreConfig: ScoreConfigDbType
 ): ValidatedScoreConfig => ValidatedScoreConfigSchema.parse(scoreConfig);
 
 /**
@@ -205,7 +205,7 @@ export const PostScoreConfigBody = z
       z.object({
         dataType: z.literal("BOOLEAN"),
         categories: z.undefined().nullish(),
-      }),
+      })
     ),
   ])
   .superRefine((data, ctx) => {
@@ -227,7 +227,7 @@ export const PostScoreConfigResponse = ValidatedScoreConfigSchema;
 
 // GET /score-configs
 export const GetScoreConfigsQuery = z.object({
-  ...publicApiPaginationZod,
+  ...paginationZod,
 });
 
 export const GetScoreConfigsResponse = z.object({

packages/shared/src/features/scores/scoreTypes.ts

@@ -6,7 +6,7 @@ import { isPresent, stringDateTime } from "../../utils/typeChecks";
 import {
   NonEmptyString,
   paginationMetaResponseZod,
-  publicApiPaginationZod,
+  paginationZod,
 } from "../../utils/zod";
 import { Category as ConfigCategory } from "./scoreConfigTypes";
 
@@ -84,13 +84,13 @@ export const ScoreBodyWithoutConfig = z.discriminatedUnion("dataType", [
     z.object({
       value: z.number(),
       dataType: z.literal("NUMERIC"),
-    }),
+    })
   ),
   BaseScoreBody.merge(
     z.object({
       value: z.string(),
       dataType: z.literal("CATEGORICAL"),
-    }),
+    })
   ),
   BaseScoreBody.merge(
     z.object({
@@ -98,7 +98,7 @@ export const ScoreBodyWithoutConfig = z.discriminatedUnion("dataType", [
         message: "Value must be either 0 or 1",
       }),
       dataType: z.literal("BOOLEAN"),
-    }),
+    })
   ),
 ]);
 
@@ -162,7 +162,7 @@ export const ScorePropsAgainstConfig = z.union([
  */
 export const filterAndValidateDbScoreList = (
   scores: Score[],
-  onParseError?: (error: z.ZodError) => void,
+  onParseError?: (error: z.ZodError) => void
 ): APIScore[] =>
   scores.reduce((acc, ts) => {
     const result = APIScoreSchema.safeParse(ts);
@@ -199,14 +199,14 @@ export const PostScoresBody = z.discriminatedUnion("dataType", [
       value: z.number(),
       dataType: z.literal("NUMERIC"),
       configId: z.string().nullish(),
-    }),
+    })
   ),
   BaseScoreBody.merge(
     z.object({
       value: z.string(),
       dataType: z.literal("CATEGORICAL"),
       configId: z.string().nullish(),
-    }),
+    })
   ),
   BaseScoreBody.merge(
     z.object({
@@ -216,14 +216,14 @@ export const PostScoresBody = z.discriminatedUnion("dataType", [
       }),
       dataType: z.literal("BOOLEAN"),
       configId: z.string().nullish(),
-    }),
+    })
   ),
   BaseScoreBody.merge(
     z.object({
       value: z.union([z.string(), z.number()]),
       dataType: z.undefined(),
       configId: z.string().nullish(),
-    }),
+    })
   ),
 ]);
 
@@ -231,7 +231,7 @@ export const PostScoresResponse = z.object({ id: z.string() });
 
 // GET /scores
 export const GetScoresQuery = z.object({
-  ...publicApiPaginationZod,
+  ...paginationZod,
   userId: z.string().nullish(),
   dataType: z.enum(ScoreDataType).nullish(),
   configId: z.string().nullish(),
@@ -260,7 +260,7 @@ const LegacyGetScoreResponseDataV1 = z.intersection(
       userId: z.string().nullish(),
       tags: z.array(z.string()).nullish(),
     }),
-  }),
+  })
 );
 export const GetScoresResponse = z.object({
   data: z.array(LegacyGetScoreResponseDataV1),
@@ -269,7 +269,7 @@ export const GetScoresResponse = z.object({
 
 export const legacyFilterAndValidateV1GetScoreList = (
   scores: unknown[],
-  onParseError?: (error: z.ZodError) => void,
+  onParseError?: (error: z.ZodError) => void
 ): z.infer<typeof LegacyGetScoreResponseDataV1>[] =>
   scores.reduce(
     (acc: z.infer<typeof LegacyGetScoreResponseDataV1>[], ts) => {
@@ -282,7 +282,7 @@ export const legacyFilterAndValidateV1GetScoreList = (
       }
       return acc;
     },
-    [] as z.infer<typeof LegacyGetScoreResponseDataV1>[],
+    [] as z.infer<typeof LegacyGetScoreResponseDataV1>[]
   );
 
 // GET /scores/{scoreId}

packages/shared/src/index.ts

@@ -7,6 +7,7 @@ export * from "./interfaces/customLLMProviderConfigSchemas";
 export * from "./tableDefinitions";
 export * from "./types";
 export * from "./tableDefinitions/tracesTable";
+export * from "./server/auth/apiKeys";
 export * from "./observationsTable";
 export * from "./utils/zod";
 export * from "./utils/json";
@@ -15,6 +16,7 @@ export * from "./utils/objects";
 export * from "./utils/typeChecks";
 export * from "./features/entitlements/plans";
 export * from "./interfaces/rate-limits";
+export { env } from "./env";
 
 // llm api
 export * from "./server/llm/types";
@@ -32,9 +34,6 @@ export * from "./features/scores";
 // comments
 export * from "./features/comments/types";
 
-// experiments
-export * from "./features/experiments/utils";
-
 // export db types only
 export * from "@prisma/client";
 export { type DB } from "../prisma/generated/types";

packages/shared/src/interfaces/customLLMProviderConfigSchemas.ts

@@ -10,19 +10,3 @@ export const BedrockCredentialSchema = z
   })
   .optional();
 export type BedrockCredential = z.infer<typeof BedrockCredentialSchema>;
-
-export const GCPServiceAccountKeySchema = z.object({
-  type: z.literal("service_account"),
-  project_id: z.string(),
-  private_key_id: z.string(),
-  private_key: z.string(),
-  client_email: z.string(),
-  client_id: z.string(),
-  auth_uri: z.string(),
-  token_uri: z.string(),
-  auth_provider_x509_cert_url: z.string(),
-  client_x509_cert_url: z.string(),
-});
-
-export type GCPServiceAccountKey = z.infer<typeof GCPServiceAccountKeySchema>;
-export default GCPServiceAccountKeySchema;

packages/shared/src/observationsTable.ts

@@ -112,14 +112,6 @@ export const observationsTableCols: ColumnDefinition[] = [
     options: [], // to be added at runtime
     nullable: true,
   },
-  {
-    name: "Model ID",
-    id: "modelId",
-    type: "stringOptions",
-    internal: 'o."internal_model_id"',
-    options: [], // to be added at runtime
-    nullable: true,
-  },
   {
     name: "Input Tokens",
     id: "inputTokens",
@@ -194,7 +186,6 @@ export const observationsTableCols: ColumnDefinition[] = [
 // allows for undefined options, to offer filters while options are still loading
 export type ObservationOptions = {
   model: Array<OptionsDefinition>;
-  modelId: Array<OptionsDefinition>;
   name: Array<OptionsDefinition>;
   traceName: Array<OptionsDefinition>;
   scores_avg: Array<string>;
@@ -203,15 +194,12 @@ export type ObservationOptions = {
 };
 
 export function observationsTableColsWithOptions(
-  options?: ObservationOptions,
+  options?: ObservationOptions
 ): ColumnDefinition[] {
   return observationsTableCols.map((col) => {
     if (col.id === "model") {
       return { ...col, options: options?.model ?? [] };
     }
-    if (col.id === "modelId") {
-      return { ...col, options: options?.modelId ?? [] };
-    }
     if (col.id === "name") {
       return { ...col, options: options?.name ?? [] };
     }

packages/shared/src/server/auth/customSsoProvider.ts

@@ -17,7 +17,6 @@ export function CustomSSOProvider<P extends CustomSSOUser>(
     wellKnown: `${options.issuer}/.well-known/openid-configuration`,
     authorization: { params: { scope: "openid email profile" } }, // overridden by options.authorization to be able to set custom scopes, deep merged with this default
     checks: ["pkce", "state"],
-    idToken: true,
     profile(profile) {
       return {
         id: profile.sub,

packages/shared/src/server/index.ts

@@ -22,17 +22,12 @@ export * from "../server/ingestion/types";
 export * from "../server/ingestion/validateAndInflateScore";
 export * from "./redis/redis";
 export * from "./redis/traceUpsert";
-export * from "./redis/cloudUsageMeteringQueue";
+export * from "./redis/CloudUsageMeteringQueue";
 export * from "./redis/getQueue";
-export * from "./redis/traceDelete";
-export * from "./redis/projectDelete";
 export * from "./redis/datasetRunItemUpsert";
 export * from "./redis/batchExport";
 export * from "./redis/legacyIngestion";
 export * from "./redis/ingestionQueue";
-export * from "./redis/postHogIntegrationQueue";
-export * from "./redis/postHogIntegrationProcessingQueue";
-export * from "./redis/coreDataS3ExportQueue";
 export * from "./redis/experimentCreateQueue";
 export * from "./auth/types";
 export * from "./ingestion/legacy/index";
@@ -45,6 +40,3 @@ export * from "./logger";
 export * from "./queries";
 export * from "./repositories";
 export * from "./redis/evalExecutionQueue";
-
-// test utils
-export * from "./test-utils";

packages/shared/src/server/ingestion/legacy/EventProcessor.ts

@@ -136,7 +136,7 @@ export class ObservationProcessor implements EventProcessor {
 
     // Token counts
     const [newInputCount, newOutputCount] =
-      "usage" in this.event.body || "usageDetails" in this.event.body
+      "usage" in this.event.body
         ? await this.calculateTokenCounts(
             apiScope.projectId,
             this.event.body,
@@ -147,9 +147,8 @@ export class ObservationProcessor implements EventProcessor {
         : [undefined, undefined];
 
     const newTotalCount =
-      "usage" in this.event.body || "usageDetails" in this.event.body
+      "usage" in this.event.body
         ? (this.event.body.usage?.total ??
-          this.event.body.usageDetails?.total ??
           (newInputCount != null || newOutputCount != null
             ? (newInputCount ?? 0) + (newOutputCount ?? 0)
             : undefined))
@@ -159,24 +158,15 @@ export class ObservationProcessor implements EventProcessor {
       inputCost:
         "usage" in this.event.body && this.event.body.usage?.inputCost != null // inputCost can be explicitly 0. Note only one equal sign to capture null AND undefined
           ? new Decimal(this.event.body.usage?.inputCost)
-          : "costDetails" in this.event.body &&
-              this.event.body.costDetails?.input != null
-            ? new Decimal(this.event.body.costDetails?.input)
-            : existingObservation?.inputCost,
+          : existingObservation?.inputCost,
       outputCost:
         "usage" in this.event.body && this.event.body.usage?.outputCost != null // outputCost can be explicitly 0. Note only one equal sign to capture null AND undefined
           ? new Decimal(this.event.body.usage?.outputCost)
-          : "costDetails" in this.event.body &&
-              this.event.body.costDetails?.output != null
-            ? new Decimal(this.event.body.costDetails?.output)
-            : existingObservation?.outputCost,
+          : existingObservation?.outputCost,
       totalCost:
         "usage" in this.event.body && this.event.body.usage?.totalCost != null // totalCost can be explicitly 0. Note only one equal sign to capture null AND undefined
           ? new Decimal(this.event.body.usage?.totalCost)
-          : "costDetails" in this.event.body &&
-              this.event.body.costDetails?.total != null
-            ? new Decimal(this.event.body.costDetails?.total)
-            : existingObservation?.totalCost,
+          : existingObservation?.totalCost,
     };
 
     const tokenCounts = {
@@ -394,7 +384,7 @@ export class ObservationProcessor implements EventProcessor {
     model?: Model,
     existingObservation?: Omit<Observation, "input" | "output">,
   ) {
-    let newPromptTokens = body.usage?.input ?? body.usageDetails?.input;
+    let newPromptTokens = body.usage?.input;
     if (newPromptTokens === undefined && model && model.tokenizerId) {
       if (body.input) {
         newPromptTokens = calculateTokenDelegate({
@@ -419,7 +409,7 @@ export class ObservationProcessor implements EventProcessor {
       }
     }
 
-    let newCompletionTokens = body.usage?.output ?? body.usageDetails?.output;
+    let newCompletionTokens = body.usage?.output;
 
     if (newCompletionTokens === undefined && model && model.tokenizerId) {
       if (body.output) {

packages/shared/src/server/ingestion/legacy/index.ts

@@ -83,7 +83,7 @@ export const handleBatch = async (
 
 async function retry<T>(request: () => Promise<T>): Promise<T> {
   return await backOff(request, {
-    numOfAttempts: 5,
+    numOfAttempts: env.LANGFUSE_ASYNC_INGESTION_PROCESSING === "true" ? 5 : 3,
     retry: (e: Error, attemptNumber: number) => {
       if (e instanceof UnauthorizedError || e instanceof ForbiddenError) {
         logger.info("not retrying auth error");

packages/shared/src/server/ingestion/processEventBatch.ts

@@ -156,106 +156,91 @@ export const processEventBatch = async (
    * ASYNC PROCESSING *
    ********************/
   let s3UploadErrored = false;
-  await instrumentAsync({ name: "s3-upload-events" }, async () => {
-    const s3Client = getS3StorageServiceClient(
-      env.LANGFUSE_S3_EVENT_UPLOAD_BUCKET,
-    );
-    // S3 Event Upload is blocking, but non-failing.
-    // If a promise rejects, we log it below, but do not throw an error.
-    // In this case, we upload the full batch into the Redis queue.
+  if (env.LANGFUSE_S3_EVENT_UPLOAD_ENABLED === "true") {
+    await instrumentAsync({ name: "s3-upload-events" }, async () => {
+      if (env.LANGFUSE_S3_EVENT_UPLOAD_BUCKET === undefined) {
+        throw new Error("S3 event store is enabled but no bucket is set");
+      }
+      const s3Client = getS3StorageServiceClient(
+        env.LANGFUSE_S3_EVENT_UPLOAD_BUCKET,
+      );
+      // S3 Event Upload is currently blocking, but non-failing.
+      // If a promise rejects, we log it below, but do not throw an error.
+      // In this case, we upload the full batch into the Redis queue.
+      const results = await Promise.allSettled(
+        Object.keys(sortedBatchByEventBodyId).map(async (id) => {
+          // We upload the event in an array to the S3 bucket grouped by the eventBodyId.
+          // That way we batch updates from the same invocation into a single file and reduce
+          // write operations on S3.
+          const { data, key, type, eventBodyId } = sortedBatchByEventBodyId[id];
+          return s3Client.uploadJson(
+            `${env.LANGFUSE_S3_EVENT_UPLOAD_PREFIX}${authCheck.scope.projectId}/${getClickhouseEntityType(type)}/${eventBodyId}/${key}.json`,
+            data,
+          );
+        }),
+      );
+      results.forEach((result) => {
+        if (result.status === "rejected") {
+          s3UploadErrored = true;
+          logger.error("Failed to upload event to S3", {
+            error: result.reason,
+          });
+        }
+      });
+    });
+  }
+
+  // Send each event individually to IngestionQueue for new processing
+  if (
+    env.LANGFUSE_ASYNC_INGESTION_PROCESSING === "true" &&
+    env.LANGFUSE_S3_EVENT_UPLOAD_ENABLED === "true" &&
+    env.LANGFUSE_ASYNC_CLICKHOUSE_INGESTION_PROCESSING === "true" &&
+    redis &&
+    !s3UploadErrored
+  ) {
+    const queue = IngestionQueue.getInstance();
     const results = await Promise.allSettled(
-      Object.keys(sortedBatchByEventBodyId).map(async (id) => {
-        // We upload the event in an array to the S3 bucket grouped by the eventBodyId.
-        // That way we batch updates from the same invocation into a single file and reduce
-        // write operations on S3.
-        const { data, key, type, eventBodyId } = sortedBatchByEventBodyId[id];
-        return s3Client.uploadJson(
-          `${env.LANGFUSE_S3_EVENT_UPLOAD_PREFIX}${authCheck.scope.projectId}/${getClickhouseEntityType(type)}/${eventBodyId}/${key}.json`,
-          data,
-        );
-      }),
+      Object.keys(sortedBatchByEventBodyId).map(async (id) =>
+        queue
+          ? queue.add(
+              QueueJobs.IngestionJob,
+              {
+                id: randomUUID(),
+                timestamp: new Date(),
+                name: QueueJobs.IngestionJob as const,
+                payload: {
+                  data: {
+                    type: sortedBatchByEventBodyId[id].type,
+                    eventBodyId: sortedBatchByEventBodyId[id].eventBodyId,
+                  },
+                  authCheck,
+                },
+              },
+              {
+                delay: env.LANGFUSE_INGESTION_QUEUE_DELAY_MS,
+              },
+            )
+          : Promise.reject("Failed to instantiate queue"),
+      ),
     );
     results.forEach((result) => {
       if (result.status === "rejected") {
-        s3UploadErrored = true;
-        logger.error("Failed to upload event to S3", {
+        logger.error("Failed to add event to IngestionQueue", {
           error: result.reason,
         });
       }
     });
-  });
-
-  // This is a workaround to allow us to disable async ingestion processing for SDK CI testing
-  // TODO: remove this block after SDKs are ready for V3 async ingestion processing
-  if (env.LANGFUSE_SDK_CI_SYNC_PROCESSING_ENABLED === "true") {
-    const result = await handleBatch(
-      sortedBatch,
-      authCheck,
-      tokenCountDelegate,
-    );
-
-    //  in case we did not return early, we return the result here
-    return aggregateBatchResult(
-      [...validationErrors, ...authenticationErrors, ...result.errors],
-      result.results,
-      authCheck.scope.projectId,
-    );
   }
 
-  // Send each event individually to IngestionQueue for ClickHouse processing
-  if (env.LANGFUSE_CLICKHOUSE_INGESTION_ENABLED === "true") {
-    if (s3UploadErrored) {
-      throw new Error(
-        "Failed to upload events to blob storage, aborting event processing",
-      );
-    }
+  // As part of the legacy processing we sent the entire batch to the worker.
+  if (env.LANGFUSE_ASYNC_INGESTION_PROCESSING === "true" && redis) {
+    const queue = LegacyIngestionQueue.getInstance();
 
-    if (redis) {
-      const queue = IngestionQueue.getInstance();
-      await Promise.all(
-        Object.keys(sortedBatchByEventBodyId).map(async (id) =>
-          queue
-            ? queue.add(
-                QueueJobs.IngestionJob,
-                {
-                  id: randomUUID(),
-                  timestamp: new Date(),
-                  name: QueueJobs.IngestionJob as const,
-                  payload: {
-                    data: {
-                      type: sortedBatchByEventBodyId[id].type,
-                      eventBodyId: sortedBatchByEventBodyId[id].eventBodyId,
-                    },
-                    authCheck,
-                  },
-                },
-                {
-                  delay: env.LANGFUSE_INGESTION_QUEUE_DELAY_MS,
-                },
-              )
-            : Promise.reject("Failed to instantiate queue"),
-        ),
-      );
-      if (env.LANGFUSE_POSTGRES_INGESTION_ENABLED !== "true") {
-        // If postgres ingestion is disabled, we return early
-        return aggregateBatchResult(
-          [...validationErrors, ...authenticationErrors],
-          sortedBatch.map((event) => ({ id: event.id, result: event })),
-          authCheck.scope.projectId,
-        );
-      }
-    }
-  }
+    if (queue) {
+      let addToQueueFailed = false;
 
-  if (env.LANGFUSE_POSTGRES_INGESTION_ENABLED === "true") {
-    // As part of the legacy processing we sent the entire batch to the worker.
-    if (redis) {
-      const queue = LegacyIngestionQueue.getInstance();
-
-      if (queue) {
-        let addToQueueFailed = false;
-
-        const queuePayload: LegacyIngestionEventType = !s3UploadErrored
+      const queuePayload: LegacyIngestionEventType =
+        env.LANGFUSE_S3_EVENT_UPLOAD_ENABLED === "true" && !s3UploadErrored
           ? {
               data: Object.keys(sortedBatchByEventBodyId).map((id) => {
                 const { key, type, eventBodyId } = sortedBatchByEventBodyId[id];
@@ -270,55 +255,44 @@ export const processEventBatch = async (
             }
           : { data: sortedBatch, authCheck, useS3EventStore: false };
 
-        try {
-          await queue.add(QueueJobs.LegacyIngestionJob, {
-            payload: queuePayload,
-            id: randomUUID(),
-            timestamp: new Date(),
-            name: QueueJobs.LegacyIngestionJob as const,
-          });
-        } catch (e: unknown) {
-          logger.warn(
-            "Failed to add batch to queue, falling back to sync processing",
-            e,
-          );
-          addToQueueFailed = true;
-        }
-
-        if (!addToQueueFailed) {
-          return aggregateBatchResult(
-            // we are not sending additional server errors to the client in case of early return
-            [...validationErrors, ...authenticationErrors],
-            sortedBatch.map((event) => ({ id: event.id, result: event })),
-            authCheck.scope.projectId,
-          );
-        }
-      } else {
+      try {
+        await queue.add(QueueJobs.LegacyIngestionJob, {
+          payload: queuePayload,
+          id: randomUUID(),
+          timestamp: new Date(),
+          name: QueueJobs.LegacyIngestionJob as const,
+        });
+      } catch (e: unknown) {
         logger.warn(
-          "Ingestion queue not initialized, falling back to sync processing",
+          "Failed to add batch to queue, falling back to sync processing",
+          e,
+        );
+        addToQueueFailed = true;
+      }
+
+      if (!addToQueueFailed) {
+        return aggregateBatchResult(
+          // we are not sending additional server errors to the client in case of early return
+          [...validationErrors, ...authenticationErrors],
+          sortedBatch.map((event) => ({ id: event.id, result: event })),
         );
       }
+    } else {
+      logger.error(
+        "Ingestion queue not initialized, falling back to sync processing",
+      );
     }
-
-    /*******************
-     * SYNC PROCESSING *
-     *******************/
-    const result = await handleBatch(
-      sortedBatch,
-      authCheck,
-      tokenCountDelegate,
-    );
-
-    //  in case we did not return early, we return the result here
-    return aggregateBatchResult(
-      [...validationErrors, ...authenticationErrors, ...result.errors],
-      result.results,
-      authCheck.scope.projectId,
-    );
   }
 
-  throw new Error(
-    "Either Clickhouse or Postgres ingestion (or both) must be enabled",
+  /*******************
+   * SYNC PROCESSING *
+   *******************/
+  const result = await handleBatch(sortedBatch, authCheck, tokenCountDelegate);
+
+  //  in case we did not return early, we return the result here
+  return aggregateBatchResult(
+    [...validationErrors, ...authenticationErrors, ...result.errors],
+    result.results,
   );
 };
 
@@ -362,7 +336,6 @@ const sortBatch = (batch: Array<z.infer<typeof ingestionEvent>>) => {
 export const aggregateBatchResult = (
   errors: Array<{ id: string; error: unknown }>,
   results: Array<{ id: string; result: unknown }>,
-  projectId?: string,
 ) => {
   const returnedErrors: {
     id: string;
@@ -409,10 +382,7 @@ export const aggregateBatchResult = (
 
   if (returnedErrors.length > 0) {
     traceException(errors);
-    logger.error("Error processing events", {
-      errors: returnedErrors,
-      "langfuse.project.id": projectId,
-    });
+    logger.error("Error processing events", returnedErrors);
   }
 
   results.forEach((result) => {

packages/shared/src/server/ingestion/types.ts

@@ -56,66 +56,10 @@ export const usage = MixedUsage.nullish()
   // ensure output is always of new usage model
   .pipe(Usage.nullish());
 
-const RawUsageOrCostDetails = z.record(
-  z.string(),
-  z.number().nonnegative().nullish(),
-);
-
-const OpenAIUsageSchema = z
-  .object({
-    prompt_tokens: z.number().nonnegative(),
-    completion_tokens: z.number().nonnegative(),
-    total_tokens: z.number().nonnegative(),
-    prompt_tokens_details: z.record(z.string(), z.number().nonnegative()),
-    completion_tokens_details: z.record(z.string(), z.number().nonnegative()),
-  })
-  .strict()
-  .transform((v) => {
-    if (!v) return;
-
-    const {
-      prompt_tokens,
-      completion_tokens,
-      total_tokens,
-      prompt_tokens_details,
-      completion_tokens_details,
-    } = v;
-    const result: z.infer<typeof RawUsageOrCostDetails> & {
-      input: number;
-      output: number;
-      total: number;
-    } = {
-      input: prompt_tokens,
-      output: completion_tokens,
-      total: total_tokens,
-    };
-
-    if (prompt_tokens_details) {
-      for (const [key, value] of Object.entries(prompt_tokens_details)) {
-        result[`input_${key}`] = value;
-        result.input = Math.max(result.input - (value ?? 0), 0);
-      }
-    }
-
-    if (completion_tokens_details) {
-      for (const [key, value] of Object.entries(completion_tokens_details)) {
-        result[`output_${key}`] = value;
-        result.output = Math.max(result.output - (value ?? 0), 0);
-      }
-    }
-
-    return result;
-  })
-  .pipe(RawUsageOrCostDetails);
-
-export const UsageOrCostDetails = z
-  .union([OpenAIUsageSchema, RawUsageOrCostDetails])
-  .nullish();
-
 export const TraceBody = z.object({
   id: z.string().nullish(),
   timestamp: stringDateTime,
-  name: z.string().max(1000).nullish(),
+  name: z.string().nullish(),
   externalId: z.string().nullish(),
   input: jsonSchema.nullish(),
   output: jsonSchema.nullish(),
@@ -175,8 +119,6 @@ export const CreateGenerationBody = CreateSpanBody.extend({
     )
     .nullish(),
   usage: usage,
-  usageDetails: UsageOrCostDetails,
-  costDetails: UsageOrCostDetails,
   promptName: z.string().nullish(),
   promptVersion: z.number().int().nullish(),
 }).refine((value) => {
@@ -205,8 +147,6 @@ export const UpdateGenerationBody = UpdateSpanBody.extend({
     )
     .nullish(),
   usage: usage,
-  usageDetails: UsageOrCostDetails,
-  costDetails: UsageOrCostDetails,
   promptName: z.string().nullish(),
   promptVersion: z.number().int().nullish(),
 }).refine((value) => {
@@ -358,8 +298,6 @@ export const LegacyObservationBody = z.object({
   input: jsonSchema.nullish(),
   output: jsonSchema.nullish(),
   usage: usage,
-  usageDetails: UsageOrCostDetails,
-  costDetails: UsageOrCostDetails,
   metadata: jsonSchema.nullish(),
   parentObservationId: z.string().nullish(),
   level: z.nativeEnum(ObservationLevel).nullish(),

packages/shared/src/server/ingestion/validateAndInflateScore.ts

@@ -17,7 +17,7 @@ type ValidateAndInflateScoreParams = {
 export async function validateAndInflateScore(
   params: ValidateAndInflateScoreParams,
 ): Promise<Score> {
-  const { body, projectId, scoreId } = params;
+  const { body, projectId } = params;
 
   if (body.configId) {
     const config = await prisma.scoreConfig.findFirst({
@@ -32,22 +32,10 @@ export async function validateAndInflateScore(
         "The configId you provided does not match a valid config in this project",
       );
 
-    // Override some fields in the score body with config fields
-    // We ignore the set fields in the body
-    const bodyWithConfigOverrides = {
-      ...body,
-      name: config.name,
-    };
-
-    validateConfigAgainstBody(
-      bodyWithConfigOverrides,
-      config as ValidatedScoreConfig,
-    );
+    validateConfigAgainstBody(body, config as ValidatedScoreConfig);
 
     return inflateScoreBody({
-      projectId,
-      scoreId,
-      body: bodyWithConfigOverrides,
+      ...params,
       config: config as ValidatedScoreConfig,
     });
   }

packages/shared/src/server/llm/fetchLLMCompletion.ts

@@ -3,11 +3,9 @@ import type { ZodSchema } from "zod";
 import { CallbackHandler } from "langfuse-langchain";
 
 import { ChatAnthropic } from "@langchain/anthropic";
-import { ChatVertexAI } from "@langchain/google-vertexai";
 import { ChatBedrockConverse } from "@langchain/aws";
 import {
   AIMessage,
-  BaseMessage,
   HumanMessage,
   SystemMessage,
 } from "@langchain/core/messages";
@@ -17,7 +15,7 @@ import {
 } from "@langchain/core/output_parsers";
 import { IterableReadableStream } from "@langchain/core/utils/stream";
 import { ChatOpenAI } from "@langchain/openai";
-import GCPServiceAccountKeySchema, {
+import {
   BedrockConfigSchema,
   BedrockCredentialSchema,
 } from "../../interfaces/customLLMProviderConfigSchemas";
@@ -132,28 +130,16 @@ export async function fetchLLMCompletion(
 
   finalCallbacks = finalCallbacks.length > 0 ? finalCallbacks : undefined;
 
-  let finalMessages: BaseMessage[];
-  // VertexAI requires at least 1 user message
-  if (modelParams.adapter === LLMAdapter.VertexAI && messages.length === 1) {
-    finalMessages = [new HumanMessage(messages[0].content)];
-  } else {
-    finalMessages = messages.map((message) => {
-      if (message.role === ChatMessageRole.User)
-        return new HumanMessage(message.content);
-      if (message.role === ChatMessageRole.System)
-        return new SystemMessage(message.content);
+  const finalMessages = messages.map((message) => {
+    if (message.role === ChatMessageRole.User)
+      return new HumanMessage(message.content);
+    if (message.role === ChatMessageRole.System)
+      return new SystemMessage(message.content);
 
-      return new AIMessage(message.content);
-    });
-  }
+    return new AIMessage(message.content);
+  });
 
-  finalMessages = finalMessages.filter((m) => m.content.length > 0);
-
-  let chatModel:
-    | ChatOpenAI
-    | ChatAnthropic
-    | ChatBedrockConverse
-    | ChatVertexAI;
+  let chatModel: ChatOpenAI | ChatAnthropic | ChatBedrockConverse;
   if (modelParams.adapter === LLMAdapter.Anthropic) {
     chatModel = new ChatAnthropic({
       anthropicApiKey: apiKey,
@@ -163,7 +149,7 @@ export async function fetchLLMCompletion(
       maxTokens: modelParams.max_tokens,
       topP: modelParams.top_p,
       callbacks: finalCallbacks,
-      clientOptions: { maxRetries, timeout: 1000 * 60 * 2 }, // 2 minutes timeout
+      clientOptions: { maxRetries },
     });
   } else if (modelParams.adapter === LLMAdapter.OpenAI) {
     chatModel = new ChatOpenAI({
@@ -178,7 +164,6 @@ export async function fetchLLMCompletion(
       configuration: {
         baseURL,
       },
-      timeout: 1000 * 60 * 2, // 2 minutes timeout
     });
   } else if (modelParams.adapter === LLMAdapter.Azure) {
     chatModel = new ChatOpenAI({
@@ -191,7 +176,6 @@ export async function fetchLLMCompletion(
       topP: modelParams.top_p,
       callbacks: finalCallbacks,
       maxRetries,
-      timeout: 1000 * 60 * 2, // 2 minutes timeout
     });
   } else if (modelParams.adapter === LLMAdapter.Bedrock) {
     const { region } = BedrockConfigSchema.parse(config);
@@ -206,24 +190,6 @@ export async function fetchLLMCompletion(
       topP: modelParams.top_p,
       callbacks: finalCallbacks,
       maxRetries,
-      timeout: 1000 * 60 * 2, // 2 minutes timeout
-    });
-  } else if (modelParams.adapter === LLMAdapter.VertexAI) {
-    const credentials = GCPServiceAccountKeySchema.parse(JSON.parse(apiKey));
-
-    // Requests time out after 60 seconds for both public and private endpoints by default
-    // Reference: https://cloud.google.com/vertex-ai/docs/predictions/get-online-predictions#send-request
-    chatModel = new ChatVertexAI({
-      modelName: modelParams.model,
-      temperature: modelParams.temperature,
-      maxOutputTokens: modelParams.max_tokens,
-      topP: modelParams.top_p,
-      callbacks: finalCallbacks,
-      maxRetries,
-      authOptions: {
-        projectId: credentials.project_id,
-        credentials,
-      },
     });
   } else {
     // eslint-disable-next-line no-unused-vars
@@ -271,7 +237,6 @@ export async function fetchLLMCompletion(
         configuration: {
           baseURL,
         },
-        timeout: 1000 * 60 * 2, // 2 minutes timeout
       })
         .pipe(new StringOutputParser())
         .invoke(

packages/shared/src/server/llm/types.ts

@@ -16,7 +16,6 @@ export enum LLMAdapter {
   OpenAI = "openai",
   Azure = "azure",
   Bedrock = "bedrock",
-  VertexAI = "vertex-ai",
 }
 
 export enum ChatMessageRole {
@@ -115,18 +114,10 @@ export const anthropicModels = [
   "claude-instant-1.2",
 ] as const;
 
-export const vertexAIModels = [
-  "gemini-1.5-pro",
-  "gemini-1.5-flash",
-  "gemini-1.0-pro",
-] as const;
-
 export type AnthropicModel = (typeof anthropicModels)[number];
-export type VertexAIModel = (typeof vertexAIModels)[number];
 export const supportedModels = {
   [LLMAdapter.Anthropic]: anthropicModels,
   [LLMAdapter.OpenAI]: openAIModels,
-  [LLMAdapter.VertexAI]: vertexAIModels,
   [LLMAdapter.Azure]: [],
   [LLMAdapter.Bedrock]: [],
 } as const;

packages/shared/src/server/queries/clickhouse-sql/clickhouse-filter.ts

@@ -161,8 +161,8 @@ export class StringOptionsFilter implements Filter {
     return {
       query:
         this.operator === "any of"
-          ? `${this.tablePrefix ? this.tablePrefix + "." : ""}${this.field} IN ({${varName}: Array(String)})`
-          : `${this.tablePrefix ? this.tablePrefix + "." : ""}${this.field} NOT IN ({${varName}: Array(String)})`,
+          ? `has({${varName}: Array(String)}, ${this.tablePrefix ? this.tablePrefix + "." : ""}${this.field}) = True`
+          : `has({${varName}: Array(String)}, ${this.tablePrefix ? this.tablePrefix + "." : ""}${this.field}) = False`,
       params: { [varName]: this.values },
     };
   }

packages/shared/src/server/queries/clickhouse-sql/orderby-factory.ts

@@ -3,53 +3,31 @@ import { OrderByState } from "../../../interfaces/orderBy";
 import { UiColumnMapping } from "../../../tableDefinitions";
 import { logger } from "../../logger";
 
-type OrderByStateNotNull = Exclude<OrderByState, null>;
-
 export function orderByToClickhouseSql(
-  orderBy: OrderByState | OrderByState[] = [],
+  orderBy: OrderByState,
   tableColumns: UiColumnMapping[],
 ): string {
-  if (
-    !orderBy ||
-    (Array.isArray(orderBy) && orderBy.filter(Boolean).length === 0)
-  ) {
+  if (!orderBy) {
     return "";
   }
+  // Get column definition to map column to internal name, e.g. "t.id"
+  const col = tableColumns.find(
+    (c) => c.uiTableName === orderBy.column || c.uiTableId === orderBy.column,
+  );
 
-  if (!Array.isArray(orderBy)) {
-    orderBy = [orderBy];
-  }
-  // Initialize an array to hold order by clauses
-  const orderByClauses: string[] = [];
-
-  // Loop through each orderBy entry
-  for (const ob of orderBy.filter((o): o is OrderByStateNotNull =>
-    Boolean(o),
-  )) {
-    // Get column definition to map column to internal name, e.g. "t.id"
-    const col = tableColumns.find(
-      (c) => c.uiTableName === ob.column || c.uiTableId === ob.column,
-    );
-
-    if (!col) {
-      logger.warn("Invalid order by column", ob.column);
-      throw new Error("Invalid order by column: " + ob.column);
-    }
-
-    // Assert that ob.order is either "asc" or "desc"
-    const orderByOrder = z.enum(["ASC", "DESC"]);
-    const order = orderByOrder.safeParse(ob.order);
-    if (!order.success) {
-      logger.warn("Invalid order", ob.order);
-      throw new Error("Invalid order: " + ob.order);
-    }
-
-    // Append the order by clause to the array
-    orderByClauses.push(
-      `${col.queryPrefix ? col.queryPrefix + "." : ""}${col.clickhouseSelect} ${order.data}`,
-    );
+  if (!col) {
+    logger.warn("Invalid order by column", orderBy.column);
+    throw new Error("Invalid order by column: " + orderBy.column);
   }
 
-  // Join all order by clauses with a comma and return
-  return `ORDER BY ${orderByClauses.join(", ")}`;
+  // Assert that orderBy.order is either "asc" or "desc"
+  const orderByOrder = z.enum(["ASC", "DESC"]);
+  const order = orderByOrder.safeParse(orderBy.order);
+  if (!order.success) {
+    logger.warn("Invalid order", orderBy.order);
+    throw new Error("Invalid order: " + orderBy.order);
+  }
+
+  // Both column and order are safe, can use raw SQL
+  return `ORDER BY ${col.queryPrefix ? col.queryPrefix + "." : ""}${col.clickhouseSelect} ${order.data}`;
 }

packages/shared/src/server/queries/createGenerationsQuery.ts

@@ -10,8 +10,6 @@ import { TableFilters } from "./types";
 type AdditionalObservationFields = {
   traceName: string | null;
   traceTags: Array<string>;
-  usageDetails: Record<string, number>;
-  costDetails: Record<string, number>;
 };
 
 export type FullObservation = AdditionalObservationFields & ObservationView;

packages/shared/src/server/queries/index.ts

@@ -20,4 +20,3 @@ export {
   NullFilter,
   type ClickhouseOperator,
 } from "./clickhouse-sql/clickhouse-filter";
-export { orderByToClickhouseSql } from "./clickhouse-sql/orderby-factory";

packages/shared/src/server/queues.ts

@@ -1,6 +1,15 @@
 import { z } from "zod";
 import { eventTypes, ingestionBatchEvent } from ".";
 
+export enum EventName {
+  TraceUpsert = "TraceUpsert",
+  BatchExport = "BatchExport",
+  EvaluationExecution = "EvaluationExecution",
+  LegacyIngestion = "LegacyIngestion",
+  CloudUsageMetering = "CloudUsageMetering",
+  ExperimentCreate = "ExperimentCreate",
+}
+
 export const LegacyIngestionEventFull = z.object({
   useS3EventStore: z.literal(false),
   data: ingestionBatchEvent,
@@ -54,18 +63,10 @@ export const BatchExportJobSchema = z.object({
   projectId: z.string(),
   batchExportId: z.string(),
 });
-export const TraceQueueEventSchema = z.object({
+export const TraceUpsertEventSchema = z.object({
   projectId: z.string(),
   traceId: z.string(),
 });
-export const TracesQueueEventSchema = z.object({
-  projectId: z.string(),
-  traceIds: z.array(z.string()),
-});
-export const ProjectQueueEventSchema = z.object({
-  projectId: z.string(),
-  orgId: z.string(),
-});
 export const DatasetRunItemUpsertEventSchema = z.object({
   projectId: z.string(),
   datasetItemId: z.string(),
@@ -77,9 +78,7 @@ export const EvalExecutionEvent = z.object({
   jobExecutionId: z.string(),
   delay: z.number().nullish(),
 });
-export const PostHogIntegrationProcessingEventSchema = z.object({
-  projectId: z.string(),
-});
+
 export const ExperimentCreateEventSchema = z.object({
   projectId: z.string(),
   datasetId: z.string(),
@@ -88,9 +87,7 @@ export const ExperimentCreateEventSchema = z.object({
 });
 
 export type BatchExportJobType = z.infer<typeof BatchExportJobSchema>;
-export type TraceQueueEventType = z.infer<typeof TraceQueueEventSchema>;
-export type TracesQueueEventType = z.infer<typeof TracesQueueEventSchema>;
-export type ProjectQueueEventType = z.infer<typeof ProjectQueueEventSchema>;
+export type TraceUpsertEventType = z.infer<typeof TraceUpsertEventSchema>;
 export type DatasetRunItemUpsertEventType = z.infer<
   typeof DatasetRunItemUpsertEventSchema
 >;
@@ -100,63 +97,57 @@ export type IngestionEventQueueType = z.infer<typeof IngestionEvent>;
 export type ExperimentCreateEventType = z.infer<
   typeof ExperimentCreateEventSchema
 >;
-export type PostHogIntegrationProcessingEventType = z.infer<
-  typeof PostHogIntegrationProcessingEventSchema
->;
+
+export const EventBodySchema = z.union([
+  z.object({
+    name: z.literal(EventName.TraceUpsert),
+    payload: z.array(TraceUpsertEventSchema),
+  }),
+  z.object({
+    name: z.literal(EventName.EvaluationExecution),
+    payload: EvalExecutionEvent,
+  }),
+  z.object({
+    name: z.literal(EventName.BatchExport),
+    payload: BatchExportJobSchema,
+  }),
+  z.object({
+    name: z.literal(EventName.ExperimentCreate),
+    payload: ExperimentCreateEventSchema,
+  }),
+]);
+export type EventBodyType = z.infer<typeof EventBodySchema>;
 
 export enum QueueName {
   TraceUpsert = "trace-upsert", // Ingestion pipeline adds events on each Trace upsert
-  TraceDelete = "trace-delete",
-  ProjectDelete = "project-delete",
   EvaluationExecution = "evaluation-execution-queue", // Worker executes Evals
   DatasetRunItemUpsert = "dataset-run-item-upsert-queue",
   BatchExport = "batch-export-queue",
   IngestionQueue = "ingestion-queue", // Process single events with S3-merge
-  IngestionSecondaryQueue = "secondary-ingestion-queue", // Separates high priority + high throughput projects from other projects.
   LegacyIngestionQueue = "legacy-ingestion-queue", // Used for batch processing of Ingestion
   CloudUsageMeteringQueue = "cloud-usage-metering-queue",
   ExperimentCreate = "experiment-create-queue",
-  PostHogIntegrationQueue = "posthog-integration-queue",
-  PostHogIntegrationProcessingQueue = "posthog-integration-processing-queue",
-  CoreDataS3ExportQueue = "core-data-s3-export-queue",
 }
 
 export enum QueueJobs {
   TraceUpsert = "trace-upsert",
-  TraceDelete = "trace-delete",
-  ProjectDelete = "project-delete",
   DatasetRunItemUpsert = "dataset-run-item-upsert",
   EvaluationExecution = "evaluation-execution-job",
   BatchExportJob = "batch-export-job",
+  EnqueueBatchExportJobs = "enqueue-batch-export-jobs",
   LegacyIngestionJob = "legacy-ingestion-job",
   CloudUsageMeteringJob = "cloud-usage-metering-job",
   IngestionJob = "ingestion-job",
-  IngestionSecondaryJob = "secondary-ingestion-job",
   ExperimentCreateJob = "experiment-create-job",
-  PostHogIntegrationJob = "posthog-integration-job",
-  PostHogIntegrationProcessingJob = "posthog-integration-processing-job",
-  CoreDataS3ExportJob = "core-data-s3-export-job",
 }
 
 export type TQueueJobTypes = {
   [QueueName.TraceUpsert]: {
     timestamp: Date;
     id: string;
-    payload: TraceQueueEventType;
+    payload: TraceUpsertEventType;
     name: QueueJobs.TraceUpsert;
   };
-  [QueueName.TraceDelete]: {
-    timestamp: Date;
-    id: string;
-    payload: TracesQueueEventType | TraceQueueEventType;
-    name: QueueJobs.TraceDelete;
-  };
-  [QueueName.ProjectDelete]: {
-    timestamp: Date;
-    id: string;
-    payload: ProjectQueueEventType;
-    name: QueueJobs.ProjectDelete;
-  };
   [QueueName.DatasetRunItemUpsert]: {
     timestamp: Date;
     id: string;
@@ -187,22 +178,10 @@ export type TQueueJobTypes = {
     payload: IngestionEventQueueType;
     name: QueueJobs.IngestionJob;
   };
-  [QueueName.IngestionSecondaryQueue]: {
-    timestamp: Date;
-    id: string;
-    payload: IngestionEventQueueType;
-    name: QueueJobs.IngestionJob;
-  };
   [QueueName.ExperimentCreate]: {
     timestamp: Date;
     id: string;
     payload: ExperimentCreateEventType;
     name: QueueJobs.ExperimentCreateJob;
   };
-  [QueueName.PostHogIntegrationProcessingQueue]: {
-    timestamp: Date;
-    id: string;
-    payload: PostHogIntegrationProcessingEventType;
-    name: QueueJobs.PostHogIntegrationProcessingJob;
-  };
 };

packages/shared/src/server/redis/CloudUsageMeteringQueue.ts

@@ -1,8 +1,8 @@
 import { Queue } from "bullmq";
-import { env } from "../../env";
+import { env } from "../..";
+import { logger } from "@azure/storage-blob";
 import { QueueName, QueueJobs } from "../queues";
 import { createNewRedisInstance, redisQueueRetryOptions } from "./redis";
-import { logger } from "../logger";
 
 export class CloudUsageMeteringQueue {
   private static instance: Queue | null = null;

packages/shared/src/server/redis/coreDataS3ExportQueue.ts

@@ -1,60 +0,0 @@
-import { Queue } from "bullmq";
-import { QueueName, QueueJobs } from "../queues";
-import { createNewRedisInstance, redisQueueRetryOptions } from "./redis";
-import { logger } from "../logger";
-import { env } from "../../env";
-
-export class CoreDataS3ExportQueue {
-  private static instance: Queue | null = null;
-
-  public static getInstance(): Queue | null {
-    if (env.LANGFUSE_S3_CORE_DATA_EXPORT_IS_ENABLED !== "true") {
-      return null;
-    }
-
-    if (CoreDataS3ExportQueue.instance) {
-      return CoreDataS3ExportQueue.instance;
-    }
-
-    const newRedis = createNewRedisInstance({
-      enableOfflineQueue: false,
-      ...redisQueueRetryOptions,
-    });
-
-    CoreDataS3ExportQueue.instance = newRedis
-      ? new Queue(QueueName.CoreDataS3ExportQueue, {
-          connection: newRedis,
-          defaultJobOptions: {
-            removeOnComplete: true,
-            removeOnFail: 100,
-            attempts: 5,
-            backoff: {
-              type: "exponential",
-              delay: 5000,
-            },
-          },
-        })
-      : null;
-
-    CoreDataS3ExportQueue.instance?.on("error", (err) => {
-      logger.error("CoreDataS3ExportQueue error", err);
-    });
-
-    if (CoreDataS3ExportQueue.instance) {
-      logger.debug("Scheduling jobs for CoreDataS3ExportQueue");
-      CoreDataS3ExportQueue.instance
-        .add(
-          QueueJobs.CoreDataS3ExportJob,
-          {},
-          {
-            repeat: { pattern: "30 4 * * *" }, // every day at 4:30am
-          },
-        )
-        .catch((err) => {
-          logger.error("Error adding CoreDataS3ExportJob schedule", err);
-        });
-    }
-
-    return CoreDataS3ExportQueue.instance;
-  }
-}

packages/shared/src/server/redis/evalExecutionQueue.ts

@@ -29,7 +29,7 @@ export class EvalExecutionQueue {
               attempts: 10,
               backoff: {
                 type: "exponential",
-                delay: 1000,
+                delay: 5000,
               },
             },
           },

packages/shared/src/server/redis/experimentCreateQueue.ts

@@ -26,10 +26,10 @@ export class ExperimentCreateQueue {
             defaultJobOptions: {
               removeOnComplete: true,
               removeOnFail: 10_000,
-              attempts: 10,
+              attempts: 2,
               backoff: {
                 type: "exponential",
-                delay: 1000,
+                delay: 5000,
               },
             },
           },

packages/shared/src/server/redis/getQueue.ts

@@ -1,18 +1,13 @@
 import { Queue } from "bullmq";
 import { QueueName } from "../queues";
 import { BatchExportQueue } from "./batchExport";
-import { CloudUsageMeteringQueue } from "./cloudUsageMeteringQueue";
+import { CloudUsageMeteringQueue } from "./CloudUsageMeteringQueue";
 import { DatasetRunItemUpsertQueue } from "./datasetRunItemUpsert";
 import { EvalExecutionQueue } from "./evalExecutionQueue";
 import { ExperimentCreateQueue } from "./experimentCreateQueue";
-import { IngestionQueue, SecondaryIngestionQueue } from "./ingestionQueue";
+import { IngestionQueue } from "./ingestionQueue";
 import { LegacyIngestionQueue } from "./legacyIngestion";
 import { TraceUpsertQueue } from "./traceUpsert";
-import { TraceDeleteQueue } from "./traceDelete";
-import { ProjectDeleteQueue } from "./projectDelete";
-import { PostHogIntegrationQueue } from "./postHogIntegrationQueue";
-import { PostHogIntegrationProcessingQueue } from "./postHogIntegrationProcessingQueue";
-import { CoreDataS3ExportQueue } from "./coreDataS3ExportQueue";
 
 export function getQueue(queueName: QueueName): Queue | null {
   switch (queueName) {
@@ -30,20 +25,8 @@ export function getQueue(queueName: QueueName): Queue | null {
       return ExperimentCreateQueue.getInstance();
     case QueueName.TraceUpsert:
       return TraceUpsertQueue.getInstance();
-    case QueueName.TraceDelete:
-      return TraceDeleteQueue.getInstance();
     case QueueName.IngestionQueue:
       return IngestionQueue.getInstance();
-    case QueueName.ProjectDelete:
-      return ProjectDeleteQueue.getInstance();
-    case QueueName.PostHogIntegrationQueue:
-      return PostHogIntegrationQueue.getInstance();
-    case QueueName.PostHogIntegrationProcessingQueue:
-      return PostHogIntegrationProcessingQueue.getInstance();
-    case QueueName.IngestionSecondaryQueue:
-      return SecondaryIngestionQueue.getInstance();
-    case QueueName.CoreDataS3ExportQueue:
-      return CoreDataS3ExportQueue.getInstance();
     default:
       const exhaustiveCheckDefault: never = queueName;
       throw new Error(`Queue ${queueName} not found`);

packages/shared/src/server/redis/ingestionQueue.ts

@@ -43,45 +43,3 @@ export class IngestionQueue {
     return IngestionQueue.instance;
   }
 }
-
-export class SecondaryIngestionQueue {
-  private static instance: Queue<
-    TQueueJobTypes[QueueName.IngestionSecondaryQueue]
-  > | null = null;
-
-  public static getInstance(): Queue<
-    TQueueJobTypes[QueueName.IngestionSecondaryQueue]
-  > | null {
-    if (SecondaryIngestionQueue.instance)
-      return SecondaryIngestionQueue.instance;
-
-    const newRedis = createNewRedisInstance({
-      enableOfflineQueue: false,
-      ...redisQueueRetryOptions,
-    });
-
-    SecondaryIngestionQueue.instance = newRedis
-      ? new Queue<TQueueJobTypes[QueueName.IngestionSecondaryQueue]>(
-          QueueName.IngestionSecondaryQueue,
-          {
-            connection: newRedis,
-            defaultJobOptions: {
-              removeOnComplete: true,
-              removeOnFail: 100_000,
-              attempts: 5,
-              backoff: {
-                type: "exponential",
-                delay: 5000,
-              },
-            },
-          },
-        )
-      : null;
-
-    SecondaryIngestionQueue.instance?.on("error", (err) => {
-      logger.error("SecondaryIngestionQueue error", err);
-    });
-
-    return SecondaryIngestionQueue.instance;
-  }
-}

packages/shared/src/server/redis/postHogIntegrationProcessingQueue.ts

@@ -1,40 +0,0 @@
-import { Queue } from "bullmq";
-import { QueueName } from "../queues";
-import { createNewRedisInstance, redisQueueRetryOptions } from "./redis";
-import { logger } from "../logger";
-
-export class PostHogIntegrationProcessingQueue {
-  private static instance: Queue | null = null;
-
-  public static getInstance(): Queue | null {
-    if (PostHogIntegrationProcessingQueue.instance) {
-      return PostHogIntegrationProcessingQueue.instance;
-    }
-
-    const newRedis = createNewRedisInstance({
-      enableOfflineQueue: false,
-      ...redisQueueRetryOptions,
-    });
-
-    PostHogIntegrationProcessingQueue.instance = newRedis
-      ? new Queue(QueueName.PostHogIntegrationProcessingQueue, {
-          connection: newRedis,
-          defaultJobOptions: {
-            removeOnComplete: true,
-            removeOnFail: 100_000,
-            attempts: 5,
-            backoff: {
-              type: "exponential",
-              delay: 5000,
-            },
-          },
-        })
-      : null;
-
-    PostHogIntegrationProcessingQueue.instance?.on("error", (err) => {
-      logger.error("PostHogIntegrationProcessingQueue error", err);
-    });
-
-    return PostHogIntegrationProcessingQueue.instance;
-  }
-}

packages/shared/src/server/redis/postHogIntegrationQueue.ts

@@ -1,55 +0,0 @@
-import { Queue } from "bullmq";
-import { QueueName, QueueJobs } from "../queues";
-import { createNewRedisInstance, redisQueueRetryOptions } from "./redis";
-import { logger } from "../logger";
-
-export class PostHogIntegrationQueue {
-  private static instance: Queue | null = null;
-
-  public static getInstance(): Queue | null {
-    if (PostHogIntegrationQueue.instance) {
-      return PostHogIntegrationQueue.instance;
-    }
-
-    const newRedis = createNewRedisInstance({
-      enableOfflineQueue: false,
-      ...redisQueueRetryOptions,
-    });
-
-    PostHogIntegrationQueue.instance = newRedis
-      ? new Queue(QueueName.PostHogIntegrationQueue, {
-          connection: newRedis,
-          defaultJobOptions: {
-            removeOnComplete: true,
-            removeOnFail: 100,
-            attempts: 5,
-            backoff: {
-              type: "exponential",
-              delay: 5000,
-            },
-          },
-        })
-      : null;
-
-    PostHogIntegrationQueue.instance?.on("error", (err) => {
-      logger.error("PostHogIntegrationQueue error", err);
-    });
-
-    if (PostHogIntegrationQueue.instance) {
-      logger.debug("Scheduling jobs for PostHogIntegrationQueue");
-      PostHogIntegrationQueue.instance
-        .add(
-          QueueJobs.PostHogIntegrationJob,
-          {},
-          {
-            repeat: { pattern: "30 * * * *" }, // every hour at 30 minutes past
-          },
-        )
-        .catch((err) => {
-          logger.error("Error adding PostHogIntegrationJob schedule", err);
-        });
-    }
-
-    return PostHogIntegrationQueue.instance;
-  }
-}

packages/shared/src/server/redis/projectDelete.ts

@@ -1,45 +0,0 @@
-import { QueueName, TQueueJobTypes } from "../queues";
-import { Queue } from "bullmq";
-import { createNewRedisInstance, redisQueueRetryOptions } from "./redis";
-import { logger } from "../logger";
-
-export class ProjectDeleteQueue {
-  private static instance: Queue<
-    TQueueJobTypes[QueueName.ProjectDelete]
-  > | null = null;
-
-  public static getInstance(): Queue<
-    TQueueJobTypes[QueueName.ProjectDelete]
-  > | null {
-    if (ProjectDeleteQueue.instance) return ProjectDeleteQueue.instance;
-
-    const newRedis = createNewRedisInstance({
-      enableOfflineQueue: false,
-      ...redisQueueRetryOptions,
-    });
-
-    ProjectDeleteQueue.instance = newRedis
-      ? new Queue<TQueueJobTypes[QueueName.ProjectDelete]>(
-          QueueName.ProjectDelete,
-          {
-            connection: newRedis,
-            defaultJobOptions: {
-              removeOnComplete: true,
-              removeOnFail: 100_000,
-              attempts: 5,
-              backoff: {
-                type: "exponential",
-                delay: 5000,
-              },
-            },
-          },
-        )
-      : null;
-
-    ProjectDeleteQueue.instance?.on("error", (err) => {
-      logger.error("ProjectDeleteQueue error", err);
-    });
-
-    return ProjectDeleteQueue.instance;
-  }
-}

packages/shared/src/server/redis/traceDelete.ts

@@ -1,44 +0,0 @@
-import { QueueName, TQueueJobTypes } from "../queues";
-import { Queue } from "bullmq";
-import { createNewRedisInstance, redisQueueRetryOptions } from "./redis";
-import { logger } from "../logger";
-
-export class TraceDeleteQueue {
-  private static instance: Queue<TQueueJobTypes[QueueName.TraceDelete]> | null =
-    null;
-
-  public static getInstance(): Queue<
-    TQueueJobTypes[QueueName.TraceDelete]
-  > | null {
-    if (TraceDeleteQueue.instance) return TraceDeleteQueue.instance;
-
-    const newRedis = createNewRedisInstance({
-      enableOfflineQueue: false,
-      ...redisQueueRetryOptions,
-    });
-
-    TraceDeleteQueue.instance = newRedis
-      ? new Queue<TQueueJobTypes[QueueName.TraceDelete]>(
-          QueueName.TraceDelete,
-          {
-            connection: newRedis,
-            defaultJobOptions: {
-              removeOnComplete: true,
-              removeOnFail: 100_000,
-              attempts: 5,
-              backoff: {
-                type: "exponential",
-                delay: 5000,
-              },
-            },
-          },
-        )
-      : null;
-
-    TraceDeleteQueue.instance?.on("error", (err) => {
-      logger.error("TraceDeleteQueue error", err);
-    });
-
-    return TraceDeleteQueue.instance;
-  }
-}

packages/shared/src/server/redis/traceUpsert.ts

@@ -1,4 +1,10 @@
-import { QueueName, TQueueJobTypes } from "../queues";
+import { randomUUID } from "crypto";
+import {
+  QueueJobs,
+  QueueName,
+  TQueueJobTypes,
+  TraceUpsertEventType,
+} from "../queues";
 import { Queue } from "bullmq";
 import { createNewRedisInstance, redisQueueRetryOptions } from "./redis";
 import { logger } from "../logger";
@@ -26,7 +32,7 @@ export class TraceUpsertQueue {
               removeOnComplete: 100, // Important: If not true, new jobs for that ID would be ignored as jobs in the complete set are still considered as part of the queue
               removeOnFail: 100_000,
               attempts: 5,
-              delay: 15_000, // 15 seconds
+              delay: 10_000, // 10 seconds
               backoff: {
                 type: "exponential",
                 delay: 5000,

packages/shared/src/server/repositories/clickhouse.ts

@@ -40,31 +40,37 @@ export async function upsertClickhouse<
     // https://opentelemetry.io/docs/specs/semconv/database/database-spans/
     span.setAttribute("ch.query.table", opts.table);
 
-    const s3Client = getS3StorageServiceClient(
-      env.LANGFUSE_S3_EVENT_UPLOAD_BUCKET,
-    );
-    await Promise.all(
-      opts.records.map((record) => {
-        // drop trailing s and pretend it's always a create.
-        // Only applicable to scores and traces.
-        let eventType = `${opts.table.slice(0, -1)}-create`;
-        if (opts.table === "observations") {
-          // @ts-ignore - If it's an observation we now that `type` is a string
-          eventType = `${record["type"].toLowerCase()}-create`;
-        }
-        s3Client.uploadJson(
-          `${env.LANGFUSE_S3_EVENT_UPLOAD_PREFIX}${record.project_id}/${getClickhouseEntityType(eventType)}/${record.id}/${randomUUID()}.json`,
-          [
-            {
-              id: randomUUID(),
-              timestamp: new Date().toISOString(),
-              type: eventType,
-              body: opts.eventBodyMapper(record),
-            },
-          ],
-        );
-      }),
-    );
+    // If event upload is enabled, we store all rows in S3 to have a backup
+    if (env.LANGFUSE_S3_EVENT_UPLOAD_ENABLED === "true") {
+      if (env.LANGFUSE_S3_EVENT_UPLOAD_BUCKET === undefined) {
+        throw new Error("S3 event store is enabled but no bucket is set");
+      }
+      const s3Client = getS3StorageServiceClient(
+        env.LANGFUSE_S3_EVENT_UPLOAD_BUCKET,
+      );
+      await Promise.all(
+        opts.records.map((record) => {
+          // drop trailing s and pretend it's always a create.
+          // Only applicable to scores and traces.
+          let eventType = `${opts.table.slice(0, -1)}-create`;
+          if (opts.table === "observations") {
+            // @ts-ignore - If it's an observation we now that `type` is a string
+            eventType = `${record["type"].toLowerCase()}-create`;
+          }
+          s3Client.uploadJson(
+            `${env.LANGFUSE_S3_EVENT_UPLOAD_PREFIX}${record.project_id}/${getClickhouseEntityType(eventType)}/${record.id}/${randomUUID()}.json`,
+            [
+              {
+                id: randomUUID(),
+                timestamp: new Date().toISOString(),
+                type: eventType,
+                body: opts.eventBodyMapper(record),
+              },
+            ],
+          );
+        }),
+      );
+    }
 
     const res = await clickhouseClient().insert({
       table: opts.table,

packages/shared/src/server/repositories/dashboards.ts

@@ -1,7 +1,4 @@
-import {
-  parseClickhouseUTCDateTimeFormat,
-  queryClickhouse,
-} from "./clickhouse";
+import { queryClickhouse } from "./clickhouse";
 import { createFilterFromFilterState } from "../queries/clickhouse-sql/factory";
 import { FilterState } from "../../types";
 import {
@@ -203,8 +200,8 @@ export const getObservationUsageByTime = async (
   const query = `
     SELECT 
       ${selectTimeseriesColumn(groupBy, "start_time", "start_time")},
-      sumMap(usage_details) as units,
-      sumMap(cost_details) as cost, 
+      sumMap(usage_details)['total'] as sum_usage_details,
+      sumMap(cost_details)['total'] as sum_cost_details,
       provided_model_name
     FROM observations o FINAL
     ${tracesFilter ? "LEFT JOIN traces t ON o.trace_id = t.id AND o.project_id = t.project_id" : ""}
@@ -217,8 +214,8 @@ export const getObservationUsageByTime = async (
 
   const result = await queryClickhouse<{
     start_time: string;
-    units: Record<string, number>;
-    cost: Record<string, number>;
+    sum_usage_details: string;
+    sum_cost_details: number;
     provided_model_name: string;
   }>({
     query,
@@ -233,18 +230,8 @@ export const getObservationUsageByTime = async (
 
   return result.map((row) => ({
     start_time: new Date(row.start_time),
-    units: Object.fromEntries(
-      Object.entries(row.units ?? {}).map(([key, value]) => [
-        key,
-        Number(value),
-      ]),
-    ),
-    cost: Object.fromEntries(
-      Object.entries(row.cost ?? {}).map(([key, value]) => [
-        key,
-        Number(value),
-      ]),
-    ),
+    sum_usage_details: Number(row.sum_usage_details),
+    sum_cost_details: row.sum_cost_details,
     provided_model_name: row.provided_model_name,
   }));
 };
@@ -629,50 +616,6 @@ export const getCategoricalScoreTimeSeries = async (
   });
 };
 
-export const getObservationsStatusTimeSeries = async (
-  projectId: string,
-  filter: FilterState,
-  groupBy: DateTrunc | undefined,
-) => {
-  const chFilter = new FilterList(
-    createFilterFromFilterState(filter, dashboardColumnDefinitions),
-  );
-  const chFilterRes = chFilter.apply();
-
-  const traceFilter = chFilter.find((f) => f.clickhouseTable === "traces");
-
-  const query = `
-    SELECT 
-      ${groupBy ? selectTimeseriesColumn(groupBy, "o.start_time", "start_time_bucket") + ", " : ""}
-      count(*) as observation_count,
-      level as level
-    FROM observations o
-    ${traceFilter ? "JOIN traces t ON o.trace_id = t.id AND o.project_id = t.project_id" : ""}
-    WHERE project_id = {projectId: String}
-    AND o.level IS NOT NULL
-    AND ${chFilterRes?.query}
-    GROUP BY level ${groupBy ? ", start_time_bucket" : ""}
-    ${groupBy ? orderByTimeSeries(groupBy, "start_time_bucket") : ""}
-  `;
-
-  const result = await queryClickhouse<{
-    start_time_bucket?: string;
-    observation_count: string;
-    level: string;
-  }>({
-    query,
-    params: { projectId, ...(chFilterRes ? chFilterRes.params : {}) },
-  });
-
-  return result.map((row) => ({
-    start_time_bucket: row.start_time_bucket
-      ? parseClickhouseUTCDateTimeFormat(row.start_time_bucket)
-      : undefined,
-    count: Number(row.observation_count),
-    level: row.level,
-  }));
-};
-
 const orderByTimeSeries = (dateTrunc: DateTrunc, col: string) => {
   let interval;
   switch (dateTrunc) {

packages/shared/src/server/repositories/index.ts

@@ -7,5 +7,3 @@ export * from "./traces_converters";
 export * from "./scores_converters";
 export * from "./observations_converters";
 export * from "./clickhouse";
-export * from "./constants";
-export * from "./trace-sessions";

packages/shared/src/server/repositories/observations.ts

@@ -38,7 +38,6 @@ import {
   OBSERVATIONS_TO_TRACE_INTERVAL,
   TRACE_TO_OBSERVATIONS_INTERVAL,
 } from "./constants";
-import { env } from "../../env";
 
 export const checkObservationExists = async (
   projectId: string,
@@ -211,13 +210,11 @@ export const getObservationById = async (
   id: string,
   projectId: string,
   fetchWithInputOutput: boolean = false,
-  startTime?: Date,
 ) => {
   const records = await getObservationByIdInternal(
     id,
     projectId,
     fetchWithInputOutput,
-    startTime,
   );
   const mapped = records.map(convertObservation);
 
@@ -314,7 +311,6 @@ const getObservationByIdInternal = async (
   id: string,
   projectId: string,
   fetchWithInputOutput: boolean = false,
-  startTime?: Date,
 ) => {
   const query = `
   SELECT
@@ -349,18 +345,11 @@ const getObservationByIdInternal = async (
   FROM observations
   WHERE id = {id: String}
   AND project_id = {projectId: String}
-  ${startTime ? `AND start_time = {startTime: DateTime64(3)}` : ""}
   ORDER BY event_ts desc
   LIMIT 1 by id, project_id`;
   return await queryClickhouse<ObservationRecordReadType>({
     query,
-    params: {
-      id,
-      projectId,
-      ...(startTime
-        ? { startTime: convertDateToClickhouseDateTime(startTime) }
-        : {}),
-    },
+    params: { id, projectId },
   });
 };
 
@@ -400,7 +389,7 @@ export type ObservationsTableQueryResult = ObservationRecordReadType & {
 export const getObservationsTableCount = async (opts: ObservationTableQuery) =>
   getObservationsTableInternal<TableCount>({
     ...opts,
-    select: "count",
+    select: "count(*) as count",
   });
 
 export type ObservationsTableRow = Omit<
@@ -418,7 +407,29 @@ export const getObservationsTable = async (
     >
   >({
     ...opts,
-    select: "rows",
+    select: `
+        o.id as id,
+        o.name as name,
+        o."model_parameters" as model_parameters,
+        o.start_time as "start_time",
+        o.end_time as "end_time",
+        o.trace_id as "trace_id",
+        o.completion_start_time as "completion_start_time",
+        o.provided_usage_details as "provided_usage_details",
+        o.usage_details as "usage_details",
+        o.provided_cost_details as "provided_cost_details",
+        o.cost_details as "cost_details",
+        o.level as level,
+        o.status_message as "status_message",
+        o.version as version,
+        o.parent_observation_id as "parent_observation_id",
+        o.created_at as "created_at",
+        o.updated_at as "updated_at",
+        o.provided_model_name as "provided_model_name",
+        o.total_cost as "total_cost",
+        internal_model_id as "internal_model_id",
+        if(isNull(end_time), NULL, date_diff('milliseconds', start_time, end_time)) as latency,
+        if(isNull(completion_start_time), NULL,  date_diff('milliseconds', start_time, completion_start_time)) as "time_to_first_token"`,
   });
 
   const traces = await getTracesByIds(
@@ -453,7 +464,29 @@ export const getObservationsTableWithModelData = async (
     >
   >({
     ...opts,
-    select: "rows",
+    select: `
+        o.id as id,
+        o.name as name,
+        o."model_parameters" as model_parameters,
+        o.start_time as "start_time",
+        o.end_time as "end_time",
+        o.trace_id as "trace_id",
+        o.completion_start_time as "completion_start_time",
+        o.provided_usage_details as "provided_usage_details",
+        o.usage_details as "usage_details",
+        o.provided_cost_details as "provided_cost_details",
+        o.cost_details as "cost_details",
+        o.level as level,
+        o.status_message as "status_message",
+        o.version as version,
+        o.parent_observation_id as "parent_observation_id",
+        o.created_at as "created_at",
+        o.updated_at as "updated_at",
+        o.provided_model_name as "provided_model_name",
+        o.total_cost as "total_cost",
+        internal_model_id as "internal_model_id",
+        if(isNull(end_time), NULL, date_diff('milliseconds', start_time, end_time)) as latency,
+        if(isNull(completion_start_time), NULL,  date_diff('milliseconds', start_time, completion_start_time)) as "time_to_first_token"`,
   });
 
   const uniqueModels: string[] = Array.from(
@@ -510,48 +543,17 @@ export const getObservationsTableWithModelData = async (
 };
 
 const getObservationsTableInternal = async <T>(
-  opts: ObservationTableQuery & { select: "count" | "rows" },
+  opts: ObservationTableQuery & { select: string },
 ): Promise<Array<T>> => {
-  const select =
-    opts.select === "count"
-      ? "count(*) as count"
-      : `
-        o.id as id,
-        o.project_id as "project_id",
-        o.name as name,
-        o."model_parameters" as model_parameters,
-        o.start_time as "start_time",
-        o.end_time as "end_time",
-        o.trace_id as "trace_id",
-        o.completion_start_time as "completion_start_time",
-        o.provided_usage_details as "provided_usage_details",
-        o.usage_details as "usage_details",
-        o.provided_cost_details as "provided_cost_details",
-        o.cost_details as "cost_details",
-        o.level as level,
-        o.status_message as "status_message",
-        o.version as version,
-        o.parent_observation_id as "parent_observation_id",
-        o.created_at as "created_at",
-        o.updated_at as "updated_at",
-        o.provided_model_name as "provided_model_name",
-        o.total_cost as "total_cost",
-        o.prompt_id as "prompt_id",
-        o.prompt_name as "prompt_name",
-        o.prompt_version as "prompt_version",
-        internal_model_id as "internal_model_id",
-        if(isNull(end_time), NULL, date_diff('milliseconds', start_time, end_time)) as latency,
-        if(isNull(completion_start_time), NULL,  date_diff('milliseconds', start_time, completion_start_time)) as "time_to_first_token"`;
-
   const { projectId, filter, selectIOAndMetadata, limit, offset, orderBy } =
     opts;
 
   const selectString = selectIOAndMetadata
     ? `
-    ${select},
+    ${opts.select},
     ${selectIOAndMetadata ? `o.input, o.output, o.metadata` : ""}
   `
-    : select;
+    : opts.select;
 
   const scoresFilter = new FilterList([
     new StringFilter({
@@ -578,10 +580,6 @@ const getObservationsTableInternal = async <T>(
         .includes(f.column),
   );
 
-  const hasScoresFilter = filter.some(
-    (f) => f.column === "Scores" || f.column === "scores",
-  );
-
   const orderByTraces = opts.orderBy
     ? observationsTableTraceUiColumnDefinitions
         .map((c) => c.uiTableId)
@@ -652,58 +650,63 @@ const getObservationsTableInternal = async <T>(
       observation_id
   )`;
 
-  // if we have default ordering by time, we order by toDate(o.start_time) first and then by
-  // o.start_time. This way, clickhouse is able to read more efficiently directly from disk without ordering
-  const newDefaultOrder =
-    orderBy?.column === "startTime"
-      ? [{ column: "order_by_date", order: orderBy.order }, orderBy]
-      : [orderBy ?? null];
+  if (traceTableFilter.length > 0 || orderByTraces) {
+    // joins with traces are very expensive. We need to filter by time as well.
+    // We assume that a trace has to have been within the last 2 days to be relevant.
 
-  const chOrderBy = orderByToClickhouseSql(newDefaultOrder, [
-    ...observationsTableUiColumnDefinitions,
-    {
-      uiTableName: "order_by_date",
-      uiTableId: "order_by_date",
-      clickhouseTableName: "observation",
-      clickhouseSelect: "toDate(o.start_time)",
-    },
-  ]);
-
-  // joins with traces are very expensive. We need to filter by time as well.
-  // We assume that a trace has to have been within the last 2 days to be relevant.
-
-  const query = `
+    const query = `
       ${scoresCte}
       SELECT
        ${selectString}
-      FROM observations o 
-        ${traceTableFilter.length > 0 || orderByTraces || search.query ? "LEFT JOIN traces t FINAL ON t.id = o.trace_id AND t.project_id = o.project_id" : ""}
-        ${hasScoresFilter ? `LEFT JOIN scores_avg AS s_avg ON s_avg.trace_id = o.trace_id and s_avg.observation_id = o.id` : ""}
+      FROM observations o FINAL 
+        LEFT JOIN traces t FINAL ON t.id = o.trace_id AND t.project_id = o.project_id
+        LEFT JOIN scores_avg AS s_avg ON s_avg.trace_id = o.trace_id and s_avg.observation_id = o.id
       WHERE ${appliedObservationsFilter.query}
         AND o.type = 'GENERATION'
-        ${timeFilter && (traceTableFilter.length > 0 || orderByTraces) ? `AND t.timestamp > {tracesTimestampFilter: DateTime64(3)} - ${OBSERVATIONS_TO_TRACE_INTERVAL}` : ""}
+        ${timeFilter ? `AND t.timestamp > {tracesTimestampFilter: DateTime64(3)} - ${OBSERVATIONS_TO_TRACE_INTERVAL}` : ""}
         ${search.query}
-      ${chOrderBy}
-      ${opts.select === "rows" ? "LIMIT 1 BY o.id, o.project_id" : ""}
+      ${orderByToClickhouseSql(orderBy ?? null, observationsTableUiColumnDefinitions)}
       ${limit !== undefined && offset !== undefined ? `LIMIT ${limit} OFFSET ${offset}` : ""};`;
 
-  const res = await queryClickhouse<T>({
-    query,
-    params: {
-      ...appliedScoresFilter.params,
-      ...appliedObservationsFilter.params,
-      ...(timeFilter
-        ? {
-            tracesTimestampFilter: convertDateToClickhouseDateTime(
-              timeFilter.value as Date,
-            ),
-          }
-        : {}),
-      ...search.params,
-    },
-  });
+    const res = await queryClickhouse<T>({
+      query,
+      params: {
+        ...appliedScoresFilter.params,
+        ...appliedObservationsFilter.params,
+        ...(timeFilter
+          ? {
+              tracesTimestampFilter: convertDateToClickhouseDateTime(
+                timeFilter.value as Date,
+              ),
+            }
+          : {}),
+        ...search.params,
+      },
+    });
 
-  return res;
+    return res;
+  } else {
+    // we query by T, which could also be {count: string}.
+    const query = `
+      ${scoresCte}
+      SELECT
+       ${selectString}
+      FROM observations o FINAL 
+        LEFT JOIN scores_avg AS s_avg ON s_avg.trace_id = o.trace_id and s_avg.observation_id = o.id
+      WHERE ${appliedObservationsFilter.query}
+      ${orderByToClickhouseSql(orderBy ?? null, observationsTableUiColumnDefinitions)}
+      ${limit !== undefined && offset !== undefined ? `LIMIT ${limit} OFFSET ${offset}` : ""};`;
+
+    const res = await queryClickhouse<T>({
+      query,
+      params: {
+        ...appliedScoresFilter.params,
+        ...appliedObservationsFilter.params,
+      },
+    });
+
+    return res;
+  }
 };
 
 export const getObservationsGroupedByModel = async (
@@ -750,50 +753,6 @@ export const getObservationsGroupedByModel = async (
   return res.map((r) => ({ model: r.name }));
 };
 
-export const getObservationsGroupedByModelId = async (
-  projectId: string,
-  filter: FilterState,
-) => {
-  const observationsFilter = new FilterList([
-    new StringFilter({
-      clickhouseTable: "observations",
-      field: "project_id",
-      operator: "=",
-      value: projectId,
-      tablePrefix: "o",
-    }),
-  ]);
-
-  observationsFilter.push(
-    ...createFilterFromFilterState(
-      filter,
-      observationsTableUiColumnDefinitions,
-    ),
-  );
-
-  const appliedObservationsFilter = observationsFilter.apply();
-
-  // We mainly use queries like this to retrieve filter options.
-  // Therefore, we can skip final as some inaccuracy in count is acceptable.
-  const query = `
-    SELECT o.internal_model_id as modelId
-    FROM observations o
-    WHERE ${appliedObservationsFilter.query}
-    AND o.type = 'GENERATION'
-    GROUP BY o.internal_model_id
-    ORDER BY count() DESC
-    LIMIT 1000;
-  `;
-
-  const res = await queryClickhouse<{ modelId: string }>({
-    query,
-    params: {
-      ...appliedObservationsFilter.params,
-    },
-  });
-  return res.map((r) => ({ modelId: r.modelId }));
-};
-
 export const getObservationsGroupedByName = async (
   projectId: string,
   filter: FilterState,
@@ -948,25 +907,6 @@ export const deleteObservationsByTraceIds = async (
       projectId,
       traceIds,
     },
-    clickhouseConfigs: {
-      request_timeout: 120_000, // 2 minutes
-    },
-  });
-};
-
-export const deleteObservationsByProjectId = async (projectId: string) => {
-  const query = `
-    DELETE FROM observations
-    WHERE project_id = {projectId: String};
-  `;
-  await commandClickhouse({
-    query: query,
-    params: {
-      projectId,
-    },
-    clickhouseConfigs: {
-      request_timeout: 120_000, // 2 minutes
-    },
   });
 };
 
@@ -1024,8 +964,8 @@ export const getObservationMetricsForPrompts = async (
           prompt_version,
           min(start_time) AS first_observation,
           max(start_time) AS last_observation,
-          medianExact(arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'input') > 0, usage_details)))) AS median_input_usage,
-          medianExact(arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'output') > 0, usage_details)))) AS median_output_usage,
+          medianExact(usage_details['input']) AS median_input_usage,
+          medianExact(usage_details['output']) AS median_output_usage,
           medianExact(cost_details['total']) AS median_total_cost,
           medianExact(latency_ms) AS median_latency_ms
       FROM latencies
@@ -1129,165 +1069,3 @@ export const getLatencyAndTotalCostForObservationsByTraces = async (
     latency: Number(r.latency_ms) / 1000,
   }));
 };
-
-export const getObservationCountsByProjectInCreationInterval = async ({
-  start,
-  end,
-}: {
-  start: Date;
-  end: Date;
-}) => {
-  const query = `
-    SELECT 
-      project_id,
-      count(*) as count
-    FROM observations
-    WHERE created_at >= {start: DateTime64(3)}
-    AND created_at < {end: DateTime64(3)}
-    GROUP BY project_id
-  `;
-
-  const rows = await queryClickhouse<{ project_id: string; count: string }>({
-    query,
-    params: {
-      start: convertDateToClickhouseDateTime(start),
-      end: convertDateToClickhouseDateTime(end),
-    },
-  });
-
-  return rows.map((row) => ({
-    projectId: row.project_id,
-    count: Number(row.count),
-  }));
-};
-
-export const getObservationCountOfProjectsSinceCreationDate = async ({
-  projectIds,
-  start,
-}: {
-  projectIds: string[];
-  start: Date;
-}) => {
-  const query = `
-    SELECT 
-      count(*) as count
-    FROM observations
-    WHERE project_id IN ({projectIds: Array(String)})
-    AND created_at >= {start: DateTime64(3)}
-  `;
-
-  const rows = await queryClickhouse<{ count: string }>({
-    query,
-    params: {
-      projectIds,
-      start: convertDateToClickhouseDateTime(start),
-    },
-  });
-
-  return Number(rows[0]?.count ?? 0);
-};
-
-export const getTraceIdsForObservations = async (
-  projectId: string,
-  observationIds: string[],
-) => {
-  const query = `
-    SELECT 
-      trace_id,
-      id
-    FROM observations
-    WHERE project_id = {projectId: String}
-    AND id IN ({observationIds: Array(String)})
-  `;
-
-  const rows = await queryClickhouse<{ id: string; trace_id: string }>({
-    query,
-    params: {
-      projectId,
-      observationIds,
-    },
-  });
-
-  return rows.map((row) => ({
-    id: row.id,
-    traceId: row.trace_id,
-  }));
-};
-
-export const getGenerationsForPostHog = async (
-  projectId: string,
-  minTimestamp: Date,
-  maxTimestamp: Date,
-) => {
-  const query = `
-    SELECT
-      o.name as name,
-      o.start_time as start_time,
-      o.id as id,
-      o.total_cost as total_cost,
-      if(isNull(completion_start_time), NULL, date_diff('milliseconds', start_time, completion_start_time)) as time_to_first_token,
-      o.usage_details['total'] as input_tokens,
-      o.usage_details['output'] as output_tokens,
-      o.cost_details['total'] as total_tokens,
-      o.project_id as project_id,
-      if(isNull(end_time), NULL, date_diff('milliseconds', start_time, end_time) / 1000) as latency,
-      o.provided_model_name as model,
-      o.level as level,
-      o.version as version,
-      t.id as trace_id,
-      t.name as trace_name,
-      t.session_id as trace_session_id,
-      t.user_id as trace_user_id,
-      t.release as trace_release,
-      t.tags as trace_tags,
-      t.metadata['$posthog_session_id'] as posthog_session_id
-    FROM observations o FINAL
-    LEFT JOIN traces t FINAL ON o.trace_id = t.id AND o.project_id = t.project_id
-    WHERE o.project_id = {projectId: String}
-    AND t.project_id = {projectId: String}
-    AND o.start_time >= {minTimestamp: DateTime64(3)}
-    AND o.start_time <= {maxTimestamp: DateTime64(3)}
-    AND t.timestamp >= {minTimestamp: DateTime64(3)} - INTERVAL 7 DAY
-    AND t.timestamp <= {maxTimestamp: DateTime64(3)}
-    AND o.type = 'GENERATION'
-  `;
-
-  const records = await queryClickhouse<Record<string, unknown>>({
-    query,
-    params: {
-      projectId,
-      minTimestamp: convertDateToClickhouseDateTime(minTimestamp),
-      maxTimestamp: convertDateToClickhouseDateTime(maxTimestamp),
-    },
-  });
-
-  const baseUrl = env.NEXTAUTH_URL?.replace("/api/auth", "");
-  return records.map((record) => ({
-    timestamp: record.start_time,
-    langfuse_generation_name: record.name,
-    langfuse_trace_name: record.trace_name,
-    langfuse_url: `${baseUrl}/project/${projectId}/traces/${encodeURIComponent(record.trace_id as string)}?observation=${encodeURIComponent(record.id as string)}`,
-    langfuse_id: record.id,
-    langfuse_cost_usd: record.total_cost,
-    langfuse_input_units: record.input_tokens,
-    langfuse_output_units: record.output_tokens,
-    langfuse_total_units: record.total_tokens,
-    langfuse_session_id: record.trace_session_id,
-    langfuse_project_id: projectId,
-    langfuse_user_id: record.trace_user_id || "langfuse_unknown_user",
-    langfuse_latency: record.latency,
-    langfuse_time_to_first_token: record.time_to_first_token,
-    langfuse_release: record.trace_release,
-    langfuse_version: record.version,
-    langfuse_model: record.model,
-    langfuse_level: record.level,
-    langfuse_tags: record.trace_tags,
-    langfuse_event_version: "1.0.0",
-    $session_id: record.posthog_session_id ?? null,
-    $set: {
-      langfuse_user_url: record.user_id
-        ? `${baseUrl}/project/${projectId}/users/${encodeURIComponent(record.user_id as string)}`
-        : null,
-    },
-  }));
-};

packages/shared/src/server/repositories/observations_converters.ts

@@ -13,10 +13,7 @@ import { jsonSchema } from "../../utils/zod";
 
 export const convertObservationToView = (
   record: ObservationRecordReadType,
-): Omit<ObservationView, "inputPrice" | "outputPrice" | "totalPrice"> & {
-  usageDetails: Record<string, number>;
-  costDetails: Record<string, number>;
-} => {
+): Omit<ObservationView, "inputPrice" | "outputPrice" | "totalPrice"> => {
   // these cost are not used from the view. They are in the select statement but not in the
   // Prisma file. We will not clean this up but keep it as it is for now.
   // eslint-disable-next-line no-unused-vars
@@ -28,7 +25,10 @@ export const convertObservationToView = (
       ? parseClickhouseUTCDateTimeFormat(record.end_time).getTime() -
         parseClickhouseUTCDateTimeFormat(record.start_time).getTime()
       : null,
-
+    timeToFirstToken: record.completion_start_time
+      ? parseClickhouseUTCDateTimeFormat(record.start_time).getTime() -
+        parseClickhouseUTCDateTimeFormat(record.completion_start_time).getTime()
+      : null,
     promptName: record.prompt_name ?? null,
     promptVersion: record.prompt_version ?? null,
     modelId: record.internal_model_id ?? null,
@@ -42,15 +42,7 @@ export const convertObservation = (
   promptVersion: number | null;
   latency: number | null;
   timeToFirstToken: number | null;
-  usageDetails: Record<string, number>;
-  costDetails: Record<string, number>;
 } => {
-  const reducedUsageDetails = reduceUsageOrCostDetails(record.usage_details);
-  const reducedCostDetails = reduceUsageOrCostDetails(record.cost_details);
-  const reducedProvidedCostDetails = reduceUsageOrCostDetails(
-    record.provided_cost_details,
-  );
-
   return {
     id: record.id,
     traceId: record.trace_id ?? null,
@@ -81,41 +73,31 @@ export const convertObservation = (
     promptId: record.prompt_id ?? null,
     createdAt: parseClickhouseUTCDateTimeFormat(record.created_at),
     updatedAt: parseClickhouseUTCDateTimeFormat(record.updated_at),
-    promptTokens: reducedUsageDetails.input ?? 0,
-    completionTokens: reducedUsageDetails.output ?? 0,
-    totalTokens: reducedUsageDetails.total ?? 0,
-    calculatedInputCost:
-      reducedCostDetails.input != null
-        ? new Decimal(reducedCostDetails.input)
-        : null,
-    calculatedOutputCost:
-      reducedCostDetails.output != null
-        ? new Decimal(reducedCostDetails.output)
-        : null,
+    promptTokens: record.usage_details?.input
+      ? Number(record.usage_details?.input)
+      : 0,
+    completionTokens: record.usage_details?.output
+      ? Number(record.usage_details?.output)
+      : 0,
+    totalTokens: record.usage_details?.total
+      ? Number(record.usage_details?.total)
+      : 0,
+    calculatedInputCost: record.cost_details?.input
+      ? new Decimal(record.cost_details.input)
+      : null,
+    calculatedOutputCost: record.cost_details?.output
+      ? new Decimal(record.cost_details.output)
+      : null,
     calculatedTotalCost: record.cost_details?.total
       ? new Decimal(record.cost_details.total)
       : null,
-    inputCost:
-      reducedProvidedCostDetails.input != null
-        ? new Decimal(reducedProvidedCostDetails.input)
-        : null,
-    outputCost:
-      reducedProvidedCostDetails.output != null
-        ? new Decimal(reducedProvidedCostDetails.output)
-        : null,
+    inputCost: record.cost_details?.input
+      ? new Decimal(record.cost_details?.input)
+      : null,
+    outputCost: record.cost_details?.output
+      ? new Decimal(record.cost_details?.output)
+      : null,
     totalCost: record.total_cost ? new Decimal(record.total_cost) : null,
-    usageDetails: Object.fromEntries(
-      Object.entries(record.usage_details ?? {}).map(([key, value]) => [
-        key,
-        Number(value),
-      ]),
-    ),
-    costDetails: Object.fromEntries(
-      Object.entries(record.cost_details ?? {}).map(([key, value]) => [
-        key,
-        Number(value),
-      ]),
-    ),
     model: record.provided_model_name ?? null,
     internalModelId: record.internal_model_id ?? null,
     unit: "TOKENS", // to be removed.
@@ -126,35 +108,8 @@ export const convertObservation = (
         parseClickhouseUTCDateTimeFormat(record.start_time).getTime()
       : null,
     timeToFirstToken: record.completion_start_time
-      ? (parseClickhouseUTCDateTimeFormat(
-          record.completion_start_time,
-        ).getTime() -
-          parseClickhouseUTCDateTimeFormat(record.start_time).getTime()) /
-        1000
+      ? parseClickhouseUTCDateTimeFormat(record.start_time).getTime() -
+        parseClickhouseUTCDateTimeFormat(record.completion_start_time).getTime()
       : null,
   };
 };
-
-export const reduceUsageOrCostDetails = (
-  details: Record<string, number> | null | undefined,
-): {
-  input: number | null;
-  output: number | null;
-  total: number | null;
-} => {
-  return {
-    input: Object.entries(details ?? {})
-      .filter(([usageType]) => usageType.startsWith("input"))
-      .reduce(
-        (acc, [_, value]) => (acc ?? 0) + Number(value),
-        null as number | null, // default to null if no input usage is found
-      ),
-    output: Object.entries(details ?? {})
-      .filter(([usageType]) => usageType.startsWith("output"))
-      .reduce(
-        (acc, [_, value]) => (acc ?? 0) + Number(value),
-        null as number | null, // default to null if no output usage is found
-      ),
-    total: Number(details?.total ?? 0),
-  };
-};

packages/shared/src/server/repositories/scores.ts

@@ -6,7 +6,7 @@ import {
   upsertClickhouse,
 } from "./clickhouse";
 import { FilterList } from "../queries/clickhouse-sql/clickhouse-filter";
-import { FilterCondition, FilterState, TimeFilter } from "../../types";
+import { FilterState } from "../../types";
 import {
   createFilterFromFilterState,
   getProjectIdDefaultFilter,
@@ -25,7 +25,6 @@ import {
 import { SCORE_TO_TRACE_OBSERVATIONS_INTERVAL } from "./constants";
 import { convertDateToClickhouseDateTime } from "../clickhouse/client";
 import { ScoreRecordReadType } from "./definitions";
-import { env } from "../../env";
 
 export const searchExistingAnnotationScore = async (
   projectId: string,
@@ -94,32 +93,6 @@ export const getScoreById = async (
   return rows.map(convertToScore).shift();
 };
 
-export const getScoresByIds = async (
-  projectId: string,
-  scoreId: string[],
-  source?: ScoreSource,
-) => {
-  const query = `
-    SELECT *
-    FROM scores s
-    WHERE s.project_id = {projectId: String}
-    AND s.id IN ({scoreId: Array(String)})
-    ${source ? `AND s.source = {source: String}` : ""}
-    ORDER BY s.event_ts DESC
-    LIMIT 1 BY s.id, s.project_id
-  `;
-
-  const rows = await queryClickhouse<ScoreRecordReadType>({
-    query,
-    params: {
-      projectId,
-      scoreId,
-      ...(source !== undefined ? { source } : {}),
-    },
-  });
-  return rows.map(convertToScore);
-};
-
 /**
  * Accepts a score in a Clickhouse-ready format.
  * id, project_id, name, and timestamp must always be provided.
@@ -503,25 +476,6 @@ export const deleteScoresByTraceIds = async (
       projectId,
       traceIds,
     },
-    clickhouseConfigs: {
-      request_timeout: 120_000, // 2 minutes
-    },
-  });
-};
-
-export const deleteScoresByProjectId = async (projectId: string) => {
-  const query = `
-    DELETE FROM scores
-    WHERE project_id = {projectId: String};
-  `;
-  await commandClickhouse({
-    query: query,
-    params: {
-      projectId,
-    },
-    clickhouseConfigs: {
-      request_timeout: 120_000, // 2 minutes
-    },
   });
 };
 
@@ -535,14 +489,10 @@ export const getNumericScoreHistogram = async (
   );
   const chFilterRes = chFilter.apply();
 
-  const traceFilter = chFilter.find((f) => f.clickhouseTable === "traces");
-
   const query = `
     select s.value
     from scores s
-    ${traceFilter ? `LEFT JOIN traces t ON s.trace_id = t.id AND t.project_id = s.project_id` : ""}
     WHERE s.project_id = {projectId: String}
-    ${traceFilter ? `AND t.project_id = {projectId: String}` : ""}
     ${chFilterRes?.query ? `AND ${chFilterRes.query}` : ""}
     ORDER BY s.event_ts DESC
     LIMIT 1 BY s.id, s.project_id
@@ -599,129 +549,3 @@ export const getAggregatedScoresForPrompts = async (
     promptId: row.prompt_id,
   }));
 };
-
-export const getScoreCountsByProjectInCreationInterval = async ({
-  start,
-  end,
-}: {
-  start: Date;
-  end: Date;
-}) => {
-  const query = `
-    SELECT 
-      project_id,
-      count(*) as count
-    FROM scores
-    WHERE created_at >= {start: DateTime64(3)}
-    AND created_at < {end: DateTime64(3)}
-    GROUP BY project_id
-  `;
-
-  const rows = await queryClickhouse<{ project_id: string; count: string }>({
-    query,
-    params: {
-      start: convertDateToClickhouseDateTime(start),
-      end: convertDateToClickhouseDateTime(end),
-    },
-  });
-
-  return rows.map((row) => ({
-    projectId: row.project_id,
-    count: Number(row.count),
-  }));
-};
-
-export const getDistinctScoreNames = async (
-  projectId: string,
-  cutoffCreatedAt: Date,
-  filter: FilterState,
-  isTimestampFilter: (filter: FilterCondition) => filter is TimeFilter,
-) => {
-  const scoreTimestampFilter = filter?.find(isTimestampFilter);
-
-  const query = `
-    SELECT DISTINCT
-      name
-    FROM scores s 
-    WHERE s.project_id = {projectId: String}
-    AND s.created_at <= {cutoffCreatedAt: DateTime64(3)}
-    ${scoreTimestampFilter ? `AND s.timestamp >= {filterTimestamp: DateTime64(3)}` : ""}
-  `;
-
-  const rows = await queryClickhouse<{ name: string }>({
-    query,
-    params: {
-      projectId,
-      cutoffCreatedAt: convertDateToClickhouseDateTime(cutoffCreatedAt),
-      ...(scoreTimestampFilter
-        ? {
-            filterTimestamp: convertDateToClickhouseDateTime(
-              scoreTimestampFilter.value,
-            ),
-          }
-        : {}),
-    },
-  });
-
-  return rows.map((row) => row.name);
-};
-
-export const getScoresForPostHog = async (
-  projectId: string,
-  minTimestamp: Date,
-  maxTimestamp: Date,
-) => {
-  const query = `
-    SELECT
-      s.id as id,
-      s.timestamp as timestamp,
-      s.name as name,
-      s.value as value,
-      s.comment as comment,
-      t.name as trace_name,
-      t.session_id as trace_session_id,
-      t.user_id as trace_user_id,
-      t.release as trace_release,
-      t.tags as trace_tags,
-      t.metadata['$posthog_session_id'] as posthog_session_id
-    FROM scores s FINAL
-    LEFT JOIN traces t FINAL ON s.trace_id = t.id AND s.project_id = t.project_id
-    WHERE s.project_id = {projectId: String}
-    AND t.project_id = {projectId: String}
-    AND s.timestamp >= {minTimestamp: DateTime64(3)}
-    AND s.timestamp <= {maxTimestamp: DateTime64(3)}
-    AND t.timestamp >= {minTimestamp: DateTime64(3)} - INTERVAL 7 DAY
-    AND t.timestamp <= {maxTimestamp: DateTime64(3)}
-  `;
-
-  const records = await queryClickhouse<Record<string, unknown>>({
-    query,
-    params: {
-      projectId,
-      minTimestamp: convertDateToClickhouseDateTime(minTimestamp),
-      maxTimestamp: convertDateToClickhouseDateTime(maxTimestamp),
-    },
-  });
-
-  const baseUrl = env.NEXTAUTH_URL?.replace("/api/auth", "");
-  return records.map((record) => ({
-    timestamp: record.timestamp,
-    langfuse_score_name: record.name,
-    langfuse_score_value: record.value,
-    langfuse_score_comment: record.comment,
-    langfuse_trace_name: record.trace_name,
-    langfuse_id: record.id,
-    langfuse_session_id: record.trace_session_id,
-    langfuse_project_id: projectId,
-    langfuse_user_id: record.trace_user_id || "langfuse_unknown_user",
-    langfuse_release: record.trace_release,
-    langfuse_tags: record.trace_tags,
-    langfuse_event_version: "1.0.0",
-    $session_id: record.posthog_session_id ?? null,
-    $set: {
-      langfuse_user_url: record.user_id
-        ? `${baseUrl}/project/${projectId}/users/${encodeURIComponent(record.user_id as string)}`
-        : null,
-    },
-  }));
-};

packages/shared/src/server/repositories/scores_converters.ts

@@ -1,4 +1,4 @@
-import { ScoreSource, ScoreDataType, Score } from "@prisma/client";
+import { ScoreSource, ScoreDataType } from "@prisma/client";
 import { ScoreRecordReadType } from "./definitions";
 
 export type ScoreAggregation = {
@@ -11,7 +11,7 @@ export type ScoreAggregation = {
   comment: string | null;
 };
 
-export const convertToScore = (row: ScoreRecordReadType): Score => {
+export const convertToScore = (row: ScoreRecordReadType) => {
   return {
     id: row.id,
     timestamp: new Date(row.timestamp),

packages/shared/src/server/repositories/trace-sessions.ts

@@ -1,61 +0,0 @@
-import z from "zod";
-import { prisma } from "../../db";
-import { singleFilter, stringOptionsFilter } from "../../interfaces/filters";
-
-export const getPublicSessionsFilter = async (
-  projectId: string,
-  filter: z.infer<typeof singleFilter>[],
-) => {
-  const sessionsBookmarkedFilter = filter?.find((f) => f.column === "⭐️");
-
-  // we are only fetching bookmarked sessions.
-  // They need to be manipulated in the UI and should not be as many.
-  const filteredSessions = sessionsBookmarkedFilter
-    ? await prisma.traceSession.findMany({
-        where: {
-          projectId: projectId,
-          bookmarked: true,
-        },
-        select: {
-          id: true,
-          createdAt: true,
-          bookmarked: true,
-          public: true,
-        },
-      })
-    : [];
-
-  const additionalBookmarkFilter: z.infer<typeof stringOptionsFilter>[] =
-    sessionsBookmarkedFilter &&
-    typeof sessionsBookmarkedFilter.value === "boolean" &&
-    ((sessionsBookmarkedFilter.value === true &&
-      sessionsBookmarkedFilter.operator === "=") ||
-      (sessionsBookmarkedFilter.value === false &&
-        sessionsBookmarkedFilter.operator === "<>"))
-      ? [
-          {
-            column: "id",
-            type: "stringOptions" as const,
-            operator: "any of" as const,
-            value: filteredSessions.map((s) => s.id),
-          },
-        ]
-      : sessionsBookmarkedFilter &&
-          typeof sessionsBookmarkedFilter.value === "boolean" &&
-          (sessionsBookmarkedFilter.value === false ||
-            (sessionsBookmarkedFilter.value === true &&
-              sessionsBookmarkedFilter.operator === "<>"))
-        ? [
-            {
-              column: "id",
-              type: "stringOptions" as const,
-              operator: "none of" as const,
-              value: filteredSessions.map((s) => s.id),
-            },
-          ]
-        : [];
-
-  return filter
-    ? [...filter.filter((f) => f.column !== "⭐️"), ...additionalBookmarkFilter]
-    : [...additionalBookmarkFilter];
-};

packages/shared/src/server/repositories/traces.ts

@@ -23,11 +23,8 @@ import { sessionCols } from "../../tableDefinitions/mapSessionTable";
 import { convertDateToClickhouseDateTime } from "../clickhouse/client";
 import { convertClickhouseToDomain } from "./traces_converters";
 import { clickhouseSearchCondition } from "../queries/clickhouse-sql/search";
-import {
-  OBSERVATIONS_TO_TRACE_INTERVAL,
-  TRACE_TO_OBSERVATIONS_INTERVAL,
-} from "./constants";
-import { env } from "../../env";
+import { TRACE_TO_OBSERVATIONS_INTERVAL } from "./constants";
+import { FetchTracesTableProps } from "../services/traces-ui-table-service";
 
 export const checkTraceExists = async (
   projectId: string,
@@ -39,11 +36,6 @@ export const checkTraceExists = async (
     tracesPrefix: "t",
   });
 
-  const timeStampFilter = tracesFilter.find(
-    (f) =>
-      f.field === "timestamp" && (f.operator === ">=" || f.operator === ">"),
-  ) as DateTimeFilter | undefined;
-
   tracesFilter.push(
     ...createFilterFromFilterState(filter, tracesTableUiColumnDefinitions),
     new StringFilter({
@@ -54,46 +46,19 @@ export const checkTraceExists = async (
     }),
   );
 
-  const observationFilter = tracesFilter.find(
-    (f) => f.clickhouseTable === "observations",
-  );
   const tracesFilterRes = tracesFilter.apply();
-  const observationFilterRes = observationFilter?.apply();
 
   const query = `
-    WITH observations_agg AS (
-        SELECT
-          
-            multiIf(
-              arrayExists(x -> x = 'ERROR', groupArray(level)), 'ERROR',
-              arrayExists(x -> x = 'WARNING', groupArray(level)), 'WARNING',
-              arrayExists(x -> x = 'DEFAULT', groupArray(level)), 'DEFAULT',
-              'DEBUG'
-            ) AS level,
-            trace_id,
-            project_id
-        FROM observations o FINAL 
-        WHERE o.project_id = {projectId: String}
-        ${timeStampFilter ? `AND o.start_time >= {traceTimestamp: DateTime64(3)} - ${OBSERVATIONS_TO_TRACE_INTERVAL}` : ""}
-        GROUP BY trace_id, project_id
-      )
-    SELECT 
-      t.id as id, 
-      t.project_id as project_id
-    FROM traces t FINAL 
-    ${observationFilterRes ? `INNER JOIN observations_agg o ON t.id = o.trace_id AND t.project_id = o.project_id` : ""}
+    SELECT id, project_id
+    FROM traces t FINAL
     WHERE ${tracesFilterRes.query}
-    AND t.project_id = {projectId: String}
     ${timestamp ? `AND timestamp >= {timestamp: DateTime64(3)} - ${TRACE_TO_OBSERVATIONS_INTERVAL}` : ""}
-    GROUP BY t.id, t.project_id
   `;
 
   const rows = await queryClickhouse<{ id: string; project_id: string }>({
     query,
     params: {
-      projectId,
       ...tracesFilterRes.params,
-      ...(observationFilterRes ? observationFilterRes.params : {}),
       ...(timestamp
         ? { timestamp: convertDateToClickhouseDateTime(timestamp) }
         : {}),
@@ -186,37 +151,6 @@ export const hasAnyTrace = async (projectId: string) => {
   return rows.length > 0 && Number(rows[0].count) > 0;
 };
 
-export const getTraceCountsByProjectInCreationInterval = async ({
-  start,
-  end,
-}: {
-  start: Date;
-  end: Date;
-}) => {
-  const query = `
-    SELECT 
-      project_id,
-      count(*) as count
-    FROM traces
-    WHERE created_at >= {start: DateTime64(3)}
-    AND created_at < {end: DateTime64(3)}
-    GROUP BY project_id
-  `;
-
-  const rows = await queryClickhouse<{ project_id: string; count: string }>({
-    query,
-    params: {
-      start: convertDateToClickhouseDateTime(start),
-      end: convertDateToClickhouseDateTime(end),
-    },
-  });
-
-  return rows.map((row) => ({
-    projectId: row.project_id,
-    count: Number(row.count),
-  }));
-};
-
 export const getTraceById = async (
   traceId: string,
   projectId: string,
@@ -461,17 +395,7 @@ export const getSessionsTable = async (props: {
   return rows;
 };
 
-export type FetchSessionsTableProps = {
-  select: string;
-  projectId: string;
-  filter: FilterState;
-  searchQuery?: string;
-  orderBy?: OrderByState;
-  limit?: number;
-  page?: number;
-};
-
-const getSessionsTableGeneric = async <T>(props: FetchSessionsTableProps) => {
+const getSessionsTableGeneric = async <T>(props: FetchTracesTableProps) => {
   const { select, projectId, filter, orderBy, limit, page } = props;
 
   const { tracesFilter, scoresFilter, observationsFilter } =
@@ -529,11 +453,11 @@ const getSessionsTableGeneric = async <T>(props: FetchSessionsTableProps) => {
             date_diff('milliseconds', min(min_start_time), max(max_end_time)) as duration,
             sumMap(o.sum_usage_details) as session_usage_details,
             sumMap(o.sum_cost_details) as session_cost_details,
-            arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'input') > 0, sumMap(o.sum_cost_details)))) as session_input_cost,
-            arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'output') > 0, sumMap(o.sum_cost_details)))) as session_output_cost,
-            sumMap(o.sum_cost_details)['total'] as session_total_cost,          
-            arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'input') > 0, sumMap(o.sum_usage_details)))) as session_input_usage,
-            arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'output') > 0, sumMap(o.sum_usage_details)))) as session_output_usage,
+            sumMap(o.sum_cost_details)['input'] as session_input_cost,
+            sumMap(o.sum_cost_details)['output'] as session_output_cost,
+            sumMap(o.sum_cost_details)['total'] as session_total_cost,
+            sumMap(o.sum_usage_details)['input'] as session_input_usage,
+            sumMap(o.sum_usage_details)['output'] as session_output_usage,
             sumMap(o.sum_usage_details)['total'] as session_total_usage
         FROM traces t FINAL
         LEFT JOIN observations_agg o
@@ -624,25 +548,6 @@ export const deleteTraces = async (projectId: string, traceIds: string[]) => {
       projectId,
       traceIds,
     },
-    clickhouseConfigs: {
-      request_timeout: 120_000, // 2 minutes
-    },
-  });
-};
-
-export const deleteTracesByProjectId = async (projectId: string) => {
-  const query = `
-    DELETE FROM traces
-    WHERE project_id = {projectId: String};
-  `;
-  await commandClickhouse({
-    query: query,
-    params: {
-      projectId,
-    },
-    clickhouseConfigs: {
-      request_timeout: 120_000, // 2 minutes
-    },
   });
 };
 
@@ -680,237 +585,68 @@ export const getTotalUserCount = async (
   });
 };
 
-export const getUserMetrics = async (
-  projectId: string,
-  userIds: string[],
-  filter: FilterState,
-) => {
+export const getUserMetrics = async (projectId: string, userIds: string[]) => {
   if (userIds.length === 0) {
     return [];
   }
-
-  // filter state contains date range filter for traces so far.
-  const chFilter = new FilterList(
-    createFilterFromFilterState(filter, tracesTableUiColumnDefinitions),
-  );
-  const chFilterRes = chFilter.apply();
-
-  const timestampFilter = chFilter.find(
-    (f) => f.field === "timestamp" && f.operator === ">=",
-  );
-
-  // this query uses window functions on observations + traces to always get only the first row and thereby remove deduplicates
-  // we filter wherever possible by project id and user id
   const query = `
-      WITH stats as (
-        SELECT
-            t.user_id as user_id,
-            count(distinct o.id) as obs_count,
-            sumMap(usage_details) as sum_usage_details,
-            sum(total_cost) as sum_total_cost,
-            max(t.timestamp) as max_timestamp,
-            min(t.timestamp) as min_timestamp,
-            count(distinct t.id) as trace_count
-        FROM
-            (
-                SELECT
-                    o.project_id,
-                    o.trace_id,
-                    o.usage_details,
-                    o.total_cost,
-                    id,
-                    ROW_NUMBER() OVER (
-                        PARTITION BY id
-                        ORDER BY
-                            event_ts DESC
-                    ) AS rn
-                FROM
-                    observations o
-                WHERE
-                    o.project_id = {projectId: String }
-                    ${timestampFilter ? `AND o.start_time >= {traceTimestamp: DateTime64(3)} - ${OBSERVATIONS_TO_TRACE_INTERVAL}` : ""}
-                    AND o.trace_id in (
-                        SELECT
-                            distinct id
-                        from
-                            traces
-                        where
-                            user_id IN ({userIds: Array(String) })
-                            AND project_id = {projectId: String }
-                            ${filter.length > 0 ? `AND ${chFilterRes.query}` : ""}
-                    )
-                    AND o.type = 'GENERATION'
-            ) as o
-            JOIN (
-                SELECT
-                    t.id,
-                    t.user_id,
-                    t.project_id,
-                    t.timestamp,
-                    ROW_NUMBER() OVER (
-                        PARTITION BY id
-                        ORDER BY
-                            event_ts DESC
-                    ) AS rn
-                FROM
-                    traces t
-                WHERE
-                    t.user_id IN ({userIds: Array(String) })
-                    AND t.project_id = {projectId: String }
-                    ${filter.length > 0 ? `AND ${chFilterRes.query}` : ""}
-            ) as t on t.id = o.trace_id
-            and t.project_id = o.project_id
-        WHERE
-            o.rn = 1
-            and t.rn = 1
-        group by
-            t.user_id
+    WITH observations_agg AS (
+      SELECT o.trace_id,
+             count(*) as obs_count,
+             sumMap(usage_details) as sum_usage_details,
+             sum(total_cost) as sum_total_cost,
+             anyLast(project_id) as project_id
+      FROM observations o FINAL
+      WHERE o.project_id = {projectId: String}
+      GROUP BY o.trace_id
+    ),
+    user_metric_data AS (
+      SELECT t.user_id,
+             max(t.timestamp) as max_timestamp,
+             min(t.timestamp) as min_timestamp,
+             count(*) as trace_count,
+             sum(o.obs_count) as total_observations,
+             sum(o.sum_total_cost) as session_total_cost,
+             sumMap(o.sum_usage_details)['input'] as session_input_usage,
+             sumMap(o.sum_usage_details)['output'] as session_output_usage,
+             sumMap(o.sum_usage_details)['total'] as session_total_usage
+      FROM traces t FINAL
+      LEFT JOIN observations_agg o
+      ON t.id = o.trace_id 
+      AND t.project_id = o.project_id
+      WHERE t.user_id IS NOT NULL
+      AND t.user_id != ''
+      AND t.user_id IN ({userIds: Array(String)})
+      AND t.project_id = {projectId: String}
+      GROUP BY t.user_id
     )
-    SELECT
-        arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'input') > 0, sum_usage_details))) as input_usage,
-        arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'output') > 0, sum_usage_details))) as output_usage,
-        sum_usage_details [ 'total' ] as total_usage,
-        obs_count,
-        trace_count,
-        user_id,
-        sum_total_cost,
-        max_timestamp,
-        min_timestamp
-    FROM
-        stats
-
+    SELECT user_id AS userId,
+           min_timestamp as firstTrace,
+           max_timestamp as lastTrace,
+           trace_count as totalTraces,
+           total_observations as totalObservations,
+           session_input_usage as totalPromptTokens,
+           session_output_usage as totalCompletionTokens,
+           session_total_usage as totalTokens,
+           session_total_cost as sumCalculatedTotalCost
+    FROM user_metric_data umd
   `;
 
-  const rows = await queryClickhouse<{
-    user_id: string;
-    max_timestamp: string;
-    min_timestamp: string;
-    input_usage: string;
-    output_usage: string;
-    total_usage: string;
-    obs_count: string;
-    trace_count: string;
-    sum_total_cost: string;
+  return queryClickhouse<{
+    userId: string;
+    firstTrace: Date | null;
+    lastTrace: Date | null;
+    totalPromptTokens: bigint;
+    totalCompletionTokens: bigint;
+    totalTokens: bigint;
+    totalObservations: bigint;
+    totalTraces: bigint;
+    sumCalculatedTotalCost: number;
   }>({
     query,
     params: {
       projectId,
       userIds,
-      ...chFilterRes.params,
-      ...(timestampFilter
-        ? {
-            traceTimestamp: convertDateToClickhouseDateTime(
-              (timestampFilter as DateTimeFilter).value,
-            ),
-          }
-        : {}),
     },
   });
-
-  return rows.map((row) => ({
-    userId: row.user_id,
-    maxTimestamp: parseClickhouseUTCDateTimeFormat(row.max_timestamp),
-    minTimestamp: parseClickhouseUTCDateTimeFormat(row.min_timestamp),
-    inputUsage: Number(row.input_usage),
-    outputUsage: Number(row.output_usage),
-    totalUsage: Number(row.total_usage),
-    observationCount: Number(row.obs_count),
-    traceCount: Number(row.trace_count),
-    totalCost: Number(row.sum_total_cost),
-  }));
-};
-
-export const getTracesForPostHog = async (
-  projectId: string,
-  minTimestamp: Date,
-  maxTimestamp: Date,
-) => {
-  const query = `
-    WITH observations_agg AS (
-      SELECT o.project_id,
-             o.trace_id,
-             sum(total_cost) as total_cost,
-             count(*) as observation_count,
-             date_diff('milliseconds', least(min(start_time), min(end_time)), greatest(max(start_time), max(end_time))) as latency_milliseconds
-      FROM observations o FINAL
-      WHERE o.project_id = {projectId: String}
-      AND o.start_time >= {minTimestamp: DateTime64(3)} - ${TRACE_TO_OBSERVATIONS_INTERVAL}
-      GROUP BY o.project_id, o.trace_id
-    )
-
-    SELECT 
-      t.id as id,
-      t.timestamp as timestamp,
-      t.name as name,
-      t.session_id as session_id,
-      t.user_id as user_id,
-      t.release as release,
-      t.version as version,
-      t.tags as tags,
-      t.metadata['$posthog_session_id'] as posthog_session_id,
-      o.total_cost as total_cost,
-      o.latency_milliseconds / 1000 as latency,
-      o.observation_count as observation_count
-    FROM traces t FINAL
-    LEFT JOIN observations_agg o ON t.id = o.trace_id AND t.project_id = o.project_id
-    WHERE t.project_id = {projectId: String}
-    AND t.timestamp >= {minTimestamp: DateTime64(3)}
-    AND t.timestamp <= {maxTimestamp: DateTime64(3)}
-  `;
-
-  const records = await queryClickhouse<Record<string, unknown>>({
-    query,
-    params: {
-      projectId,
-      minTimestamp: convertDateToClickhouseDateTime(minTimestamp),
-      maxTimestamp: convertDateToClickhouseDateTime(maxTimestamp),
-    },
-  });
-
-  const baseUrl = env.NEXTAUTH_URL?.replace("/api/auth", "");
-  return records.map((record) => ({
-    timestamp: record.timestamp,
-    langfuse_id: record.id,
-    langfuse_trace_name: record.name,
-    langfuse_url: `${baseUrl}/project/${projectId}/traces/${encodeURIComponent(record.id as string)}`,
-    langfuse_cost_usd: record.total_cost,
-    langfuse_count_observations: record.observation_count,
-    langfuse_session_id: record.session_id,
-    langfuse_project_id: projectId,
-    langfuse_user_id: record.user_id || "langfuse_unknown_user",
-    langfuse_latency: record.latency,
-    langfuse_release: record.release,
-    langfuse_version: record.version,
-    langfuse_tags: record.tags,
-    langfuse_event_version: "1.0.0",
-    $session_id: record.posthog_session_id ?? null,
-    $set: {
-      langfuse_user_url: record.user_id
-        ? `${baseUrl}/project/${projectId}/users/${encodeURIComponent(record.user_id as string)}`
-        : null,
-    },
-  }));
-};
-
-export const getTracesByIdsForAnyProject = async (traceIds: string[]) => {
-  const query = `
-      SELECT id, project_id
-      FROM traces
-      WHERE id IN ({traceIds: Array(String)})
-      ORDER BY event_ts DESC
-      LIMIT 1 by id, project_id;`;
-  const records = await queryClickhouse<{
-    id: string;
-    project_id: string;
-  }>({
-    query,
-    params: {
-      traceIds,
-    },
-  });
-
-  return records.map((record) => ({
-    id: record.id,
-    projectId: record.project_id,
-  }));
 };

packages/shared/src/server/repositories/traces_converters.ts

@@ -1,9 +1,10 @@
-import { Prisma, Trace } from "@prisma/client";
+import { ObservationLevel, Trace } from "@prisma/client";
 import { parseClickhouseUTCDateTimeFormat } from "./clickhouse";
 import { TraceRecordReadType } from "./definitions";
+import Decimal from "decimal.js";
+import { ScoreAggregate } from "../../features/scores";
 import { convertDateToClickhouseDateTime } from "../clickhouse/client";
-import { parseJsonPrioritised } from "../../utils/json";
-import { jsonSchema } from "../../utils/zod";
+import { TracesTableReturnType } from "../services/traces-ui-table-service";
 
 export const convertTraceDomainToClickhouse = (
   trace: Trace,
@@ -45,15 +46,61 @@ export const convertClickhouseToDomain = (
     userId: record.user_id ?? null,
     sessionId: record.session_id ?? null,
     public: record.public,
-    input: (record.input
-      ? jsonSchema.parse(parseJsonPrioritised(record.input))
-      : null) as Prisma.JsonValue | null,
-    output: (record.output
-      ? jsonSchema.parse(parseJsonPrioritised(record.output))
-      : null) as Prisma.JsonValue | null,
+    input: record.input ?? null,
+    output: record.output ?? null,
     metadata: record.metadata,
     createdAt: parseClickhouseUTCDateTimeFormat(record.created_at),
     updatedAt: parseClickhouseUTCDateTimeFormat(record.updated_at),
     externalId: null,
   };
 };
+
+export type TracesAllReturnType = {
+  id: string;
+  timestamp: Date;
+  name: string | null;
+  projectId: string;
+  userId: string | null;
+  release: string | null;
+  version: string | null;
+  public: boolean;
+  bookmarked: boolean;
+  sessionId: string | null;
+  tags: string[];
+};
+
+export const convertToDomain = (row: TracesTableReturnType) => {
+  return {
+    id: row.id,
+    projectId: row.project_id,
+    timestamp: parseClickhouseUTCDateTimeFormat(row.timestamp),
+    tags: row.tags,
+    bookmarked: row.bookmarked,
+    name: row.name ?? null,
+    release: row.release ?? null,
+    version: row.version ?? null,
+    userId: row.user_id ?? null,
+    sessionId: row.session_id ?? null,
+    latency: Number(row.latency),
+    usageDetails: row.usage_details,
+    costDetails: row.cost_details,
+    level: row.level,
+    observationCount: Number(row.observation_count),
+    scoresAvg: row.scores_avg,
+    public: row.public,
+  };
+};
+
+export type TracesMetricsReturnType = {
+  id: string;
+  promptTokens: bigint;
+  completionTokens: bigint;
+  totalTokens: bigint;
+  latency: number | null;
+  level: ObservationLevel;
+  observationCount: bigint;
+  calculatedTotalCost: Decimal | null;
+  calculatedInputCost: Decimal | null;
+  calculatedOutputCost: Decimal | null;
+  scores: ScoreAggregate;
+};

packages/shared/src/server/services/traces-ui-table-service.ts

@@ -13,18 +13,9 @@ import {
 } from "../queries/clickhouse-sql/factory";
 import { orderByToClickhouseSql } from "../queries/clickhouse-sql/orderby-factory";
 import { clickhouseSearchCondition } from "../queries/clickhouse-sql/search";
-import {
-  parseClickhouseUTCDateTimeFormat,
-  queryClickhouse,
-} from "../repositories/clickhouse";
+import { convertToDomain } from "../repositories";
+import { queryClickhouse } from "../repositories/clickhouse";
 import { TraceRecordReadType } from "../repositories/definitions";
-import {
-  OBSERVATIONS_TO_TRACE_INTERVAL,
-  SCORE_TO_TRACE_OBSERVATIONS_INTERVAL,
-} from "../repositories/constants";
-import Decimal from "decimal.js";
-import { ScoreAggregate } from "../../features/scores";
-import { reduceUsageOrCostDetails } from "../repositories";
 
 export type TracesTableReturnType = Pick<
   TraceRecordReadType,
@@ -39,99 +30,7 @@ export type TracesTableReturnType = Pick<
   | "session_id"
   | "tags"
   | "public"
->;
-
-export type TracesAllUiReturnType = {
-  id: string;
-  timestamp: Date;
-  name: string | null;
-  projectId: string;
-  userId: string | null;
-  release: string | null;
-  version: string | null;
-  public: boolean;
-  bookmarked: boolean;
-  sessionId: string | null;
-  tags: string[];
-};
-
-export type TracesMetricsUiReturnType = {
-  id: string;
-  projectId: string;
-  promptTokens: bigint;
-  completionTokens: bigint;
-  totalTokens: bigint;
-  latency: number | null;
-  level: ObservationLevel;
-  observationCount: bigint;
-  calculatedTotalCost: Decimal | null;
-  calculatedInputCost: Decimal | null;
-  calculatedOutputCost: Decimal | null;
-  scores: ScoreAggregate;
-  usageDetails: Record<string, number>;
-  costDetails: Record<string, number>;
-};
-
-export const convertToUiTableRows = (
-  row: TracesTableReturnType,
-): TracesAllUiReturnType => {
-  return {
-    id: row.id,
-    projectId: row.project_id,
-    timestamp: parseClickhouseUTCDateTimeFormat(row.timestamp),
-    tags: row.tags,
-    bookmarked: row.bookmarked,
-    name: row.name ?? null,
-    release: row.release ?? null,
-    version: row.version ?? null,
-    userId: row.user_id ?? null,
-    sessionId: row.session_id ?? null,
-    public: row.public,
-  };
-};
-
-export const convertToUITableMetrics = (
-  row: TracesTableMetricsClickhouseReturnType,
-): Omit<TracesMetricsUiReturnType, "scores"> => {
-  const usageDetails = reduceUsageOrCostDetails(row.usage_details);
-
-  return {
-    id: row.id,
-    projectId: row.project_id,
-    latency: Number(row.latency),
-    promptTokens: BigInt(usageDetails.input ?? 0),
-    completionTokens: BigInt(usageDetails.output ?? 0),
-    totalTokens: BigInt(usageDetails.total ?? 0),
-    usageDetails: Object.fromEntries(
-      Object.entries(row.usage_details).map(([key, value]) => [
-        key,
-        Number(value),
-      ]),
-    ),
-    costDetails: Object.fromEntries(
-      Object.entries(row.cost_details).map(([key, value]) => [
-        key,
-        Number(value),
-      ]),
-    ),
-    observationCount: BigInt(row.observation_count ?? 0),
-    calculatedTotalCost: row.cost_details?.total
-      ? new Decimal(row.cost_details.total)
-      : null,
-    calculatedInputCost: row.cost_details?.input
-      ? new Decimal(row.cost_details.input)
-      : null,
-    calculatedOutputCost: row.cost_details?.output
-      ? new Decimal(row.cost_details.output)
-      : null,
-    level: row.level,
-  };
-};
-
-export type TracesTableMetricsClickhouseReturnType = {
-  id: string;
-  project_id: string;
-  timestamp: Date;
+> & {
   level: ObservationLevel;
   observation_count: number | null;
   latency: string | null;
@@ -141,7 +40,7 @@ export type TracesTableMetricsClickhouseReturnType = {
 };
 
 export type FetchTracesTableProps = {
-  select: "count" | "rows" | "metrics";
+  select: string;
   projectId: string;
   filter: FilterState;
   searchQuery?: string;
@@ -159,7 +58,7 @@ export const getTracesTableCount = async (props: {
   page?: number;
 }) => {
   const countRows = await getTracesTableGeneric<{ count: string }>({
-    select: "count",
+    select: "count(*) as count",
     ...props,
   });
 
@@ -170,23 +69,6 @@ export const getTracesTableCount = async (props: {
   return converted.length > 0 ? converted[0].count : 0;
 };
 
-export const getTracesTableMetrics = async (props: {
-  projectId: string;
-  filter: FilterState;
-  searchQuery?: string;
-  orderBy?: OrderByState;
-  limit?: number;
-  page?: number;
-}): Promise<Array<Omit<TracesMetricsUiReturnType, "scores">>> => {
-  const countRows =
-    await getTracesTableGeneric<TracesTableMetricsClickhouseReturnType>({
-      select: "metrics",
-      ...props,
-    });
-
-  return countRows.map(convertToUITableMetrics);
-};
-
 export const getTracesTable = async (
   projectId: string,
   filter: FilterState,
@@ -196,7 +78,24 @@ export const getTracesTable = async (
   page?: number,
 ) => {
   const rows = await getTracesTableGeneric<TracesTableReturnType>({
-    select: "rows",
+    select: `
+    t.id, 
+    t.project_id as project_id, 
+    t.timestamp, 
+    t.tags, 
+    t.bookmarked, 
+    t.name, 
+    t.release, 
+    t.version, 
+    t.user_id, 
+    t.session_id,
+    os.latency_milliseconds / 1000 as latency,
+    os.cost_details as cost_details,
+    os.usage_details as usage_details,
+    os.level as level,
+    os.observation_count as observation_count,
+    s.scores_avg as scores_avg,
+    t.public`,
     projectId,
     filter,
     searchQuery,
@@ -205,50 +104,13 @@ export const getTracesTable = async (
     page,
   });
 
-  return rows.map(convertToUiTableRows);
+  return rows.map(convertToDomain);
 };
 
 const getTracesTableGeneric = async <T>(props: FetchTracesTableProps) => {
   const { select, projectId, filter, orderBy, limit, page, searchQuery } =
     props;
 
-  let sqlSelect: string;
-  switch (select) {
-    case "count":
-      sqlSelect = "count(*) as count";
-      break;
-    case "metrics":
-      sqlSelect = `
-        t.id as id,
-        t.project_id as project_id,
-        t.timestamp as timestamp,
-        os.latency_milliseconds / 1000 as latency,
-        os.cost_details as cost_details,
-        os.usage_details as usage_details,
-        os.level as level,
-        os.observation_count as observation_count,
-        s.scores_avg as scores_avg,
-        t.public as public`;
-      break;
-    case "rows":
-      sqlSelect = `
-        t.id as id,
-        t.project_id as project_id,
-        t.timestamp as timestamp,
-        t.tags as tags,
-        t.bookmarked as bookmarked,
-        t.name as name,
-        t.release as release,
-        t.version as version,
-        t.user_id as user_id,
-        t.session_id as session_id,
-        t.public as public`;
-      break;
-    default:
-      const exhaustiveCheckDefault: never = select;
-      throw new Error(`Unknown select type: ${select}`);
-  }
-
   const { tracesFilter, scoresFilter, observationsFilter } =
     getProjectIdDefaultFilter(projectId, { tracesPrefix: "t" });
 
@@ -294,20 +156,27 @@ const getTracesTableGeneric = async <T>(props: FetchTracesTableProps) => {
       f.field === "timestamp" && (f.operator === ">=" || f.operator === ">"),
   ) as DateTimeFilter | undefined;
 
-  const requiresScoresJoin =
-    tracesFilter.find((f) => f.clickhouseTable === "scores") !== undefined ||
-    tracesTableUiColumnDefinitions.find(
-      (c) =>
-        c.uiTableName === orderBy?.column || c.uiTableId === orderBy?.column,
-    )?.clickhouseTableName === "scores";
+  timeStampFilter
+    ? scoresFilter.push(
+        new DateTimeFilter({
+          clickhouseTable: "scores",
+          field: "timestamp",
+          operator: ">=",
+          value: timeStampFilter.value,
+        }),
+      )
+    : null;
 
-  const requiresObservationsJoin =
-    tracesFilter.find((f) => f.clickhouseTable === "observations") !==
-      undefined ||
-    tracesTableUiColumnDefinitions.find(
-      (c) =>
-        c.uiTableName === orderBy?.column || c.uiTableId === orderBy?.column,
-    )?.clickhouseTableName === "observations";
+  timeStampFilter
+    ? observationsFilter.push(
+        new DateTimeFilter({
+          clickhouseTable: "observations",
+          field: "start_time",
+          operator: ">=",
+          value: timeStampFilter.value,
+        }),
+      )
+    : null;
 
   const tracesFilterRes = tracesFilter.apply();
   const scoresFilterRes = scoresFilter.apply();
@@ -315,36 +184,6 @@ const getTracesTableGeneric = async <T>(props: FetchTracesTableProps) => {
 
   const search = clickhouseSearchCondition(searchQuery);
 
-  const defaultOrder = orderBy?.order && orderBy?.column === "timestamp";
-  const orderByCols = [
-    ...tracesTableUiColumnDefinitions,
-    {
-      clickhouseSelect: "toDate(t.timestamp)",
-      uiTableName: "timestamp_to_date",
-      uiTableId: "timestamp_to_date",
-      clickhouseTableName: "observations",
-    },
-  ];
-  const chOrderBy = orderByToClickhouseSql(
-    [
-      defaultOrder
-        ? {
-            column: "timestamp_to_date",
-            order: orderBy.order,
-          }
-        : null,
-      orderBy ?? null,
-    ],
-    orderByCols,
-  );
-
-  // complex query ahead:
-  // - we only join scores and observations if we really need them to speed up default views
-  // - we use FINAL on traces only in case we not need to order by something different than time. Otherwise we cannot guarantee correct reads.
-  // - we filter the observations and scores as much as possible before joining them to traces.
-  // - we order by todate(timestamp), timestamp per default and do not use FINAL.
-  //   In this case, CH is able to read the data only from the latest date from disk and filtering them in memory. No need to read all data e.g. for 1 month from disk.
-
   const query = `
     WITH observations_stats AS (
       SELECT
@@ -361,10 +200,8 @@ const getTracesTableGeneric = async <T>(props: FetchTracesTableProps) => {
           sumMap(cost_details) as cost_details,
           trace_id,
           project_id
-      FROM observations o FINAL 
-      WHERE o.project_id = {projectId: String}
-      ${timeStampFilter ? `AND o.start_time >= {traceTimestamp: DateTime64(3)} - ${OBSERVATIONS_TO_TRACE_INTERVAL}` : ""}
-      ${observationsFilter ? `AND ${observationFilterRes.query}` : ""}
+      FROM observations FINAL
+      WHERE ${observationFilterRes.query}
       GROUP BY trace_id, project_id
     ),
     scores_avg AS (
@@ -377,28 +214,21 @@ const getTracesTableGeneric = async <T>(props: FetchTracesTableProps) => {
                 trace_id,
                 name,
                 avg(value) avg_value
-        FROM scores s FINAL 
-        WHERE project_id = {projectId: String}
-        ${timeStampFilter ? `AND s.timestamp >= {traceTimestamp: DateTime64(3)} - ${SCORE_TO_TRACE_OBSERVATIONS_INTERVAL}` : ""}
-        ${scoresFilterRes ? `AND ${scoresFilterRes.query}` : ""}
+        FROM scores final
+        WHERE ${scoresFilterRes.query}
         GROUP BY project_id,
                   trace_id,
                   name
       ) tmp
       GROUP BY project_id, trace_id
     )
-    SELECT ${sqlSelect}
-    -- FINAL is used for non default ordering and count.
-    FROM traces t  ${["metrics", "rows"].includes(select) && defaultOrder ? "" : "FINAL"}
-    ${select === "metrics" || requiresObservationsJoin ? `LEFT JOIN observations_stats os on os.project_id = t.project_id and os.trace_id = t.id` : ""}
-    ${select === "metrics" || requiresScoresJoin ? `LEFT JOIN scores_avg s on s.project_id = t.project_id and s.trace_id = t.id` : ""}
-    WHERE t.project_id = {projectId: String}
-    ${tracesFilterRes ? `AND ${tracesFilterRes.query}` : ""}
+    SELECT ${select}
+    FROM traces t final
+    LEFT JOIN observations_stats os on os.project_id = t.project_id and os.trace_id = t.id
+    LEFT JOIN scores_avg s on s.project_id = t.project_id and s.trace_id = t.id
+    WHERE ${tracesFilterRes.query}
     ${search.query}
-    ${chOrderBy}
-    -- This is used for metrics and row queries. Count has only one result.
-    -- This is only used for default ordering. Otherwise, we use final.
-    ${["metrics", "rows"].includes(select) && defaultOrder ? "LIMIT 1 BY id, project_id" : ""}
+    ${orderByToClickhouseSql(orderBy ?? null, tracesTableUiColumnDefinitions)}
     ${limit !== undefined && page !== undefined ? `LIMIT {limit: Int32} OFFSET {offset: Int32}` : ""}
   `;
 
@@ -407,8 +237,6 @@ const getTracesTableGeneric = async <T>(props: FetchTracesTableProps) => {
     params: {
       limit: limit,
       offset: limit && page ? limit * page : 0,
-      traceTimestamp: timeStampFilter?.value.getTime(),
-      projectId: projectId,
       ...tracesFilterRes.params,
       ...observationFilterRes.params,
       ...scoresFilterRes.params,

packages/shared/src/server/test-utils/clickhouse-helpers.ts

@@ -1,32 +0,0 @@
-import { clickhouseClient } from "../clickhouse/client";
-import {
-  TraceRecordInsertType,
-  ObservationRecordInsertType,
-  ScoreRecordInsertType,
-} from "../repositories/definitions";
-
-export const createTracesCh = async (trace: TraceRecordInsertType[]) => {
-  return await clickhouseClient().insert({
-    table: "traces",
-    format: "JSONEachRow",
-    values: trace,
-  });
-};
-
-export const createObservationsCh = async (
-  observations: ObservationRecordInsertType[],
-) => {
-  return await clickhouseClient().insert({
-    table: "observations",
-    format: "JSONEachRow",
-    values: observations,
-  });
-};
-
-export const createScoresCh = async (scores: ScoreRecordInsertType[]) => {
-  return await clickhouseClient().insert({
-    table: "scores",
-    format: "JSONEachRow",
-    values: scores,
-  });
-};

packages/shared/src/server/test-utils/index.ts

@@ -1,3 +0,0 @@
-export * from "./tracing-factory";
-export * from "./clickhouse-helpers";
-export * from "./org-factory";

packages/shared/src/server/test-utils/org-factory.ts

@@ -1,50 +0,0 @@
-import { v4 } from "uuid";
-import { prisma } from "../../db";
-import { hashSecretKey, getDisplaySecretKey } from "../auth/apiKeys";
-
-export function createBasicAuthHeader(
-  username: string,
-  password: string,
-): string {
-  const base64Credentials = Buffer.from(`${username}:${password}`).toString(
-    "base64",
-  );
-  return `Basic ${base64Credentials}`;
-}
-
-export type CreateOrgProjectAndApiKeyOptions = {
-  projectId?: string;
-};
-export const createOrgProjectAndApiKey = async (
-  props?: CreateOrgProjectAndApiKeyOptions,
-) => {
-  const projectId = props?.projectId ?? v4();
-  const org = await prisma.organization.create({
-    data: {
-      id: v4(),
-      name: v4(),
-    },
-  });
-  await prisma.project.create({
-    data: {
-      id: projectId,
-      name: v4(),
-      orgId: org.id,
-    },
-  });
-  const publicKey = v4();
-  const secretKey = v4();
-
-  const auth = createBasicAuthHeader(publicKey, secretKey);
-  await prisma.apiKey.create({
-    data: {
-      id: v4(),
-      projectId: projectId,
-      publicKey: publicKey,
-      hashedSecretKey: await hashSecretKey(secretKey),
-      displaySecretKey: getDisplaySecretKey(secretKey),
-    },
-  });
-
-  return { projectId, publicKey, secretKey, auth };
-};

packages/shared/src/server/utils/transforms/transformStreamToCsv.ts

@@ -12,7 +12,7 @@ export function transformStreamToCsv(): Transform {
     transform(
       row: Record<string, any>,
       encoding: BufferEncoding,
-      callback: TransformCallback,
+      callback: TransformCallback
     ): void {
       if (isFirstChunk) {
         // Extract headers from the first object
@@ -23,7 +23,7 @@ export function transformStreamToCsv(): Transform {
 
       // Convert the object to a CSV line and push it
       const csvRow = headers.map((header) => {
-        const field = row[header] ?? "";
+        const field = row[header];
         let str = stringify(field);
 
         // escape and format fields that contain commas

packages/shared/src/tableDefinitions/mapDashboards.ts

@@ -85,10 +85,4 @@ export const dashboardColumnDefinitions: UiColumnMapping[] = [
     uiTableId: "version",
     uiTableName: "Version",
   },
-  {
-    clickhouseTableName: "observations",
-    clickhouseSelect: "provided_model_name",
-    uiTableId: "model",
-    uiTableName: "Model",
-  },
 ];

packages/shared/src/tableDefinitions/mapObservationsTable.ts

@@ -68,7 +68,7 @@ export const observationsTableUiColumnDefinitions: UiColumnMapping[] = [
     uiTableId: "timeToFirstToken",
     clickhouseTableName: "observations",
     clickhouseSelect:
-      "if(isNull(completion_start_time), NULL,  date_diff('milliseconds', start_time, completion_start_time) / 1000)",
+      "if(isNull(completion_start_time), NULL,  date_diff('seconds', start_time, completion_start_time))",
     // If we use the default of Decimal64(12), we cannot filter for more than ~40min due to an overflow
     clickhouseTypeOverwrite: "Decimal64(3)",
   },
@@ -77,7 +77,7 @@ export const observationsTableUiColumnDefinitions: UiColumnMapping[] = [
     uiTableId: "latency",
     clickhouseTableName: "observations",
     clickhouseSelect:
-      "if(isNull(end_time), NULL, date_diff('milliseconds', start_time, end_time) / 1000)",
+      "if(isNull(end_time), NULL, date_diff('seconds', start_time, end_time))",
     // If we use the default of Decimal64(12), we cannot filter for more than ~40min due to an overflow
     clickhouseTypeOverwrite: "Decimal64(3)",
   },
@@ -86,21 +86,21 @@ export const observationsTableUiColumnDefinitions: UiColumnMapping[] = [
     uiTableId: "tokensPerSecond",
     clickhouseTableName: "observations",
     clickhouseSelect:
-      "(arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'output') > 0, usage_details))) / (date_diff('milliseconds', start_time, end_time) / 1000))",
+      "usage_details['input'] / date_diff('seconds', start_time, end_time)",
   },
   {
     uiTableName: "Input Cost ($)",
     uiTableId: "inputCost",
     clickhouseTableName: "observations",
     clickhouseSelect:
-      "arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'input') > 0, cost_details)))",
+      "if(mapExists((k, v) -> (k = 'input'), cost_details), cost_details['input'], NULL)",
   },
   {
     uiTableName: "Output Cost ($)",
     uiTableId: "outputCost",
     clickhouseTableName: "observations",
     clickhouseSelect:
-      "arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'output') > 0, cost_details)))",
+      "if(mapExists((k, v) -> (k = 'output'), cost_details), cost_details['output'], NULL)",
   },
   {
     uiTableName: "Total Cost ($)",
@@ -127,25 +127,19 @@ export const observationsTableUiColumnDefinitions: UiColumnMapping[] = [
     clickhouseTableName: "observations",
     clickhouseSelect: 'o."provided_model_name"',
   },
-  {
-    uiTableName: "Model ID",
-    uiTableId: "modelId",
-    clickhouseTableName: "observations",
-    clickhouseSelect: 'o."internal_model_id"',
-  },
   {
     uiTableName: "Input Tokens",
     uiTableId: "inputTokens",
     clickhouseTableName: "observations",
     clickhouseSelect:
-      "arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'input') > 0, usage_details)))",
+      "if(mapExists((k, v) -> (k = 'input'), usage_details), usage_details['input'], NULL)",
   },
   {
     uiTableName: "Output Tokens",
     uiTableId: "outputTokens",
     clickhouseTableName: "observations",
     clickhouseSelect:
-      "arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'output') > 0, usage_details)))",
+      "if(mapExists((k, v) -> (k = 'output'), usage_details), usage_details['output'], NULL)",
   },
   {
     uiTableName: "Total Tokens",

packages/shared/src/tableDefinitions/mapSessionTable.ts

@@ -1,7 +1,7 @@
 import { UiColumnMapping } from ".";
 
 export const sessionCols: UiColumnMapping[] = [
-  // we do not access the traces scores in ClickHouse. We default back to the trace timestamps.
+  // we do not access the traces scores in clichouse. We default back to the trace timestamps.
 
   {
     uiTableName: "⭐️",
@@ -26,8 +26,6 @@ export const sessionCols: UiColumnMapping[] = [
     uiTableId: "sessionDuration",
     clickhouseTableName: "traces",
     clickhouseSelect: "duration",
-    // If we use the default of Decimal64(12), we cannot filter for more than ~40min due to an overflow
-    clickhouseTypeOverwrite: "Decimal64(3)",
   },
   {
     uiTableName: "Count Traces",
@@ -88,8 +86,6 @@ export const sessionCols: UiColumnMapping[] = [
     uiTableId: "sessionDuration",
     clickhouseTableName: "traces",
     clickhouseSelect: "duration",
-    // If we use the default of Decimal64(12), we cannot filter for more than ~40min due to an overflow
-    clickhouseTypeOverwrite: "Decimal64(3)",
   },
   {
     uiTableName: "Traces Count",

packages/shared/src/tableDefinitions/mapTracesTable.ts

@@ -71,28 +71,28 @@ export const tracesTableUiColumnDefinitions: UiColumnMapping[] = [
   {
     uiTableName: "Input Tokens",
     uiTableId: "inputTokens",
-    clickhouseTableName: "observations",
+    clickhouseTableName: "traces",
     clickhouseSelect:
-      "arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'input') > 0, usage_details)))",
+      "if(mapExists((k, v) -> (k = 'input'), usage_details), usage_details['input'], NULL)",
   },
   {
     uiTableName: "Output Tokens",
     uiTableId: "outputTokens",
-    clickhouseTableName: "observations",
+    clickhouseTableName: "traces",
     clickhouseSelect:
-      "arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'output') > 0, usage_details)))",
+      "if(mapExists((k, v) -> (k = 'output'), usage_details), usage_details['output'], NULL)",
   },
   {
     uiTableName: "Total Tokens",
     uiTableId: "totalTokens",
-    clickhouseTableName: "observations",
+    clickhouseTableName: "traces",
     clickhouseSelect:
       "if(mapExists((k, v) -> (k = 'total'), usage_details), usage_details['total'], NULL)",
   },
   {
     uiTableName: "Usage",
     uiTableId: "usage",
-    clickhouseTableName: "observations",
+    clickhouseTableName: "traces",
     clickhouseSelect:
       "if(mapExists((k, v) -> (k = 'total'), usage_details), usage_details['total'], NULL)",
   },
@@ -105,7 +105,7 @@ export const tracesTableUiColumnDefinitions: UiColumnMapping[] = [
   {
     uiTableName: "Latency (s)",
     uiTableId: "latency",
-    clickhouseTableName: "observations",
+    clickhouseTableName: "traces",
     clickhouseSelect: "latency_milliseconds / 1000",
     // If we use the default of Decimal64(12), we cannot filter for more than ~40min due to an overflow
     clickhouseTypeOverwrite: "Decimal64(3)",
@@ -113,21 +113,19 @@ export const tracesTableUiColumnDefinitions: UiColumnMapping[] = [
   {
     uiTableName: "Input Cost ($)",
     uiTableId: "inputCost",
-    clickhouseTableName: "observations",
-    clickhouseSelect:
-      "arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'input') > 0, cost_details)))",
+    clickhouseTableName: "traces",
+    clickhouseSelect: "cost_details['input']",
   },
   {
     uiTableName: "Output Cost ($)",
     uiTableId: "outputCost",
-    clickhouseTableName: "observations",
-    clickhouseSelect:
-      "arraySum(mapValues(mapFilter(x -> positionCaseInsensitive(x.1, 'output') > 0, cost_details)))",
+    clickhouseTableName: "traces",
+    clickhouseSelect: "cost_details['output']",
   },
   {
     uiTableName: "Total Cost ($)",
     uiTableId: "totalCost",
-    clickhouseTableName: "observations",
+    clickhouseTableName: "traces",
     clickhouseSelect: "cost_details['total']",
   },
 ];

packages/shared/src/utils/stringChecks.ts

@@ -21,16 +21,3 @@ export function extractVariables(mustacheString: string): string[] {
 
   return Array.from(uniqueVariables);
 }
-
-export function stringifyValue(value: unknown) {
-  switch (typeof value) {
-    case "string":
-      return value;
-    case "number":
-      return value.toString();
-    case "boolean":
-      return value.toString();
-    default:
-      return JSON.stringify(value);
-  }
-}

packages/shared/src/utils/zod.ts

@@ -26,7 +26,7 @@ export const jsonSchemaNullable: z.ZodType<JsonNested> = z.lazy(() =>
     nestedLiteralSchema,
     z.array(jsonSchemaNullable),
     z.record(jsonSchemaNullable),
-  ]),
+  ])
 );
 
 // Root schema that does not allow nulls at the root level
@@ -35,28 +35,17 @@ export const jsonSchema: z.ZodType<Json> = z.lazy(() =>
     rootLiteralSchema,
     z.array(jsonSchemaNullable),
     z.record(jsonSchemaNullable),
-  ]),
+  ])
 );
 
 export const paginationZod = {
   page: z.preprocess(
     (x) => (x === "" ? undefined : x),
-    z.coerce.number().default(1),
+    z.coerce.number().default(1)
   ),
   limit: z.preprocess(
     (x) => (x === "" ? undefined : x),
-    z.coerce.number().lte(100).default(50),
-  ),
-};
-
-export const publicApiPaginationZod = {
-  page: z.preprocess(
-    (x) => (x === "" ? undefined : x),
-    z.coerce.number().gt(0).default(1),
-  ),
-  limit: z.preprocess(
-    (x) => (x === "" ? undefined : x),
-    z.coerce.number().lte(100).default(50),
+    z.coerce.number().lte(100).default(50)
   ),
 };
 
@@ -80,11 +69,8 @@ export const paginationMetaResponseZod = z.object({
   totalPages: z.number().int().nonnegative(),
 });
 
-export const htmlRegex = /<[^>]*>/;
-export const noHtmlCheck = (value: string) => !htmlRegex.test(value);
-
-const urlRegex = /https?:\/\/[^\s/$.?#].[^\s]*/i;
-export const noUrlCheck = (value: string) => !urlRegex.test(value);
+export const noHtmlRegex = /<[^>]*>/;
+export const noHtmlCheck = (value: string) => !noHtmlRegex.test(value);
 
 export const NonEmptyString = z.string().min(1);
 
@@ -97,7 +83,7 @@ export const NonEmptyString = z.string().min(1);
  */
 export const validateZodSchema = <T extends z.ZodTypeAny>(
   schema: T,
-  object: z.infer<T>,
+  object: z.infer<T>
 ): z.infer<T> => {
   return schema.parse(object);
 };

patches/next-auth@4.24.11.patch

@@ -0,0 +1,26 @@
+diff --git a/core/lib/oauth/client.js b/core/lib/oauth/client.js
+index 52c51eb6ff422dc0899ccec31baf3fa39e42eeae..bc50c35bb617d0e86b68ca42f64d44b475ba4abb 100644
+--- a/core/lib/oauth/client.js
++++ b/core/lib/oauth/client.js
+@@ -1,5 +1,7 @@
+ "use strict";
+ 
++var HttpsProxyAgent = require('https-proxy-agent').HttpsProxyAgent;
++
+ Object.defineProperty(exports, "__esModule", {
+   value: true
+ });
+@@ -7,7 +9,12 @@ exports.openidClient = openidClient;
+ var _openidClient = require("openid-client");
+ async function openidClient(options) {
+   const provider = options.provider;
+-  if (provider.httpOptions) _openidClient.custom.setHttpOptionsDefaults(provider.httpOptions);
++  let httpOptions = {};
++  if (provider.httpOptions) httpOptions = { ...provider.httpOptions };
++  if (process.env.AUTH_HTTPS_PROXY || process.env.AUTH_HTTP_PROXY) {
++    httpOptions.agent = new HttpsProxyAgent(process.env.AUTH_HTTPS_PROXY || process.env.AUTH_HTTP_PROXY);
++  }
++  _openidClient.custom.setHttpOptionsDefaults(httpOptions);
+   let issuer;
+   if (provider.wellKnown) {
+     issuer = await _openidClient.Issuer.discover(provider.wellKnown);

web/Dockerfile

@@ -85,14 +85,12 @@ ENV NEXT_MANUAL_SIG_HANDLE true
 # set the CI flag to true to get CI specific logs
 ENV CI true
 
-RUN NODE_OPTIONS='--max-old-space-size=4096' turbo run build --filter=web...
+
+RUN NODE_OPTIONS='--max-old-space-size=4096' turbo run build --filter=web
 
 # Production image, copy all the files and run next
 FROM --platform=${TARGETPLATFORM:-linux/amd64} base AS runner
 
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
 WORKDIR /app
 
 ENV NODE_ENV production
@@ -111,7 +109,7 @@ RUN adduser --system --uid 1001 nextjs
 RUN npm install -g --no-package-lock --no-save prisma@5.22.0
 
 RUN MIGRATE_TARGET_ARCH=$(echo ${TARGETPLATFORM:-linux/amd64} | sed 's/\//-/g') && \
-    wget -q -O- https://github.com/golang-migrate/migrate/releases/download/v4.18.0/migrate.$MIGRATE_TARGET_ARCH.tar.gz | tar xvz && \
+    wget -q -O- https://github.com/golang-migrate/migrate/releases/download/v4.18.2/migrate.$MIGRATE_TARGET_ARCH.tar.gz | tar xvz && \
     mv migrate /usr/bin/migrate
 
 COPY --from=builder --chown=nextjs:nodejs /app/web/next.config.mjs .

web/entrypoint.sh

@@ -12,17 +12,16 @@ if [ -z "$DATABASE_URL" ]; then
         echo "Error: Required database environment variables are not set. Provide a postgres url for DATABASE_URL."
         exit 1
     fi
-fi
-
-# Check if CLICKHOUSE_URL is not set
-if [ -z "$CLICKHOUSE_URL" ]; then
-    echo "Error: CLICKHOUSE_URL is not configured. Migrating from V2? Check out migration guide: https://langfuse.com/self-hosting/upgrade-guides/upgrade-v2-to-v3"
-    exit 1
+    if [ -n "$DATABASE_ARGS" ]; then
+        # Append ARGS to DATABASE_URL
+        DATABASE_URL="${DATABASE_URL}?$DATABASE_ARGS"
+        export DATABASE_URL
+    fi
 fi
 
 # Set DIRECT_URL to the value of DATABASE_URL if it is not set, required for migrations
 if [ -z "$DIRECT_URL" ]; then
-    export DIRECT_URL=$DATABASE_URL
+    export DIRECT_URL="${DATABASE_URL}"
 fi
 
 # Always execute the postgres migration, except when disabled.
@@ -58,4 +57,4 @@ if [ $status -ne 0 ]; then
 fi
 
 # Run the command passed to the docker image on start
-exec "$@"
+exec "$@"

web/jest.config.mjs

@@ -24,7 +24,7 @@ const serverTestConfig = {
 const asyncServerTestConfig = {
   displayName: "async-server",
   testPathIgnorePatterns: ["__e2e__"],
-  testMatch: ["/**/async/**/*.servertest.[jt]s?(x)"],
+  testMatch: ["/**/async/*.servertest.[jt]s?(x)"],
   testEnvironment: "jest-environment-node",
   setupFilesAfterEnv: ["<rootDir>/src/__tests__/after-teardown.ts"],
   globalTeardown: "<rootDir>/src/__tests__/teardown.ts",

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "3.5.0",
+  "version": "2.95.2",
   "private": true,
   "license": "MIT",
   "engines": {
@@ -16,7 +16,6 @@
     "start": "dotenv -e ../.env -- sh -c 'NEXT_MANUAL_SIG_HANDLE=true next start'",
     "test": "dotenv -e ../.env -- jest --silent false --verbose false --runInBand --detectOpenHandles --selectProjects async-server",
     "test-sync": "dotenv -e ../.env -- jest --silent false --verbose false --runInBand --detectOpenHandles --selectProjects sync-server",
-    "test-client": "dotenv -e ../.env -- jest --silent false --verbose false --runInBand --detectOpenHandles --selectProjects client",
     "test:watch": "dotenv -e ../.env -- jest --watch --runInBand",
     "test:e2e": "dotenv -e ../.env -- playwright test",
     "test:e2e:server": "dotenv -e ../.env -- jest --runInBand --detectOpenHandles --verbose --selectProjects e2e-server",
@@ -84,7 +83,7 @@
     "@remixicon/react": "^4.2.0",
     "@repo/eslint-config": "workspace:*",
     "@repo/typescript-config": "workspace:*",
-    "@sentry/nextjs": "^8.39.0",
+    "@sentry/nextjs": "^8.52.0",
     "@t3-oss/env-nextjs": "^0.11.1",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tanstack/react-query": "^4.36.1",
@@ -108,21 +107,22 @@
     "date-fns": "^3.3.1",
     "dd-trace": "^5.23.1",
     "decimal.js": "^10.4.3",
-    "dompurify": "^3.1.5",
+    "dompurify": "^3.2.4",
     "graphql": "^16.9.0",
+    "https-proxy-agent": "^7.0.6",
     "ioredis": "^5.4.1",
     "ip-address": "^9.0.5",
     "js-tiktoken": "^1.0.15",
     "kysely": "^0.27.4",
     "langchain": "^0.3.6",
     "lodash": "^4.17.21",
-    "lucide-react": "^0.462.0",
-    "next": "^14.2.15",
+    "lucide-react": "^0.447.0",
+    "next": "^14.2.21",
     "next-auth": "^4.24.11",
     "next-query-params": "^5.0.1",
     "next-themes": "^0.3.0",
     "posthog-js": "^1.176.0",
-    "posthog-node": "^4.3.1",
+    "posthog-node": "^3.6.3",
     "prexit": "^2.2.0",
     "prisma": "^5.22.0",
     "rate-limiter-flexible": "^5.0.3",
@@ -139,7 +139,7 @@
     "remark-gfm": "^4.0.0",
     "remark-math": "^6.0.0",
     "sonner": "^1.4.41",
-    "stripe": "^17.4.0",
+    "stripe": "^16.8.0",
     "superjson": "2.2.1",
     "tailwind-merge": "^2.5.2",
     "tailwindcss-animate": "^1.0.7",
@@ -178,7 +178,7 @@
     "postcss": "^8.4.47",
     "prettier": "^3.3.3",
     "prettier-plugin-tailwindcss": "^0.6.6",
-    "tailwindcss": "^3.4.17",
+    "tailwindcss": "^3.4.13",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "tsx": "^4.19.1",

web/public/generated/api/openapi.yml

@@ -2389,7 +2389,7 @@ components:
           type: string
           description: >-
             The content of the comment. May include markdown. Currently limited
-            to 3000 characters.
+            to 500 characters.
         authorUserId:
           type: string
           nullable: true
@@ -2627,9 +2627,7 @@ components:
         usage:
           $ref: '#/components/schemas/Usage'
           nullable: true
-          description: >-
-            (Deprecated. Use usageDetails and costDetails instead.) The usage
-            data of the observation
+          description: The usage data of the observation
         level:
           $ref: '#/components/schemas/ObservationLevel'
           description: The level of the observation
@@ -2645,25 +2643,6 @@ components:
           type: string
           nullable: true
           description: The prompt ID associated with the observation
-        usageDetails:
-          type: object
-          additionalProperties:
-            type: integer
-          nullable: true
-          description: >-
-            The usage details of the observation. Key is the name of the usage
-            metric, value is the number of units consumed. The total key is the
-            sum of all (non-total) usage metrics or the total value ingested.
-        costDetails:
-          type: object
-          additionalProperties:
-            type: number
-            format: double
-          nullable: true
-          description: >-
-            The cost details of the observation. Key is the name of the cost
-            metric, value is the cost in USD. The total key is the sum of all
-            (non-total) cost metrics or the total value ingested.
       required:
         - id
         - type
@@ -2704,23 +2683,17 @@ components:
           type: number
           format: double
           nullable: true
-          description: >-
-            (Deprecated. Use usageDetails and costDetails instead.) The
-            calculated cost of the input in USD
+          description: The calculated cost of the input in USD
         calculatedOutputCost:
           type: number
           format: double
           nullable: true
-          description: >-
-            (Deprecated. Use usageDetails and costDetails instead.) The
-            calculated cost of the output in USD
+          description: The calculated cost of the output in USD
         calculatedTotalCost:
           type: number
           format: double
           nullable: true
-          description: >-
-            (Deprecated. Use usageDetails and costDetails instead.) The
-            calculated total cost in USD
+          description: The calculated total cost in USD
         latency:
           type: number
           format: double
@@ -2736,9 +2709,7 @@ components:
     Usage:
       title: Usage
       type: object
-      description: >-
-        (Deprecated. Use usageDetails and costDetails instead.) Standard
-        interface for usage and cost
+      description: Standard interface for usage and cost
       properties:
         input:
           type: integer
@@ -3637,15 +3608,6 @@ components:
         usage:
           $ref: '#/components/schemas/IngestionUsage'
           nullable: true
-        usageDetails:
-          $ref: '#/components/schemas/UsageDetails'
-          nullable: true
-        costDetails:
-          type: object
-          additionalProperties:
-            type: number
-            format: double
-          nullable: true
         promptName:
           type: string
           nullable: true
@@ -3676,15 +3638,6 @@ components:
         promptName:
           type: string
           nullable: true
-        usageDetails:
-          $ref: '#/components/schemas/UsageDetails'
-          nullable: true
-        costDetails:
-          type: object
-          additionalProperties:
-            type: number
-            format: double
-          nullable: true
         promptVersion:
           type: integer
           nullable: true
@@ -4002,37 +3955,6 @@ components:
       required:
         - successes
         - errors
-    OpenAIUsageSchema:
-      title: OpenAIUsageSchema
-      type: object
-      properties:
-        prompt_tokens:
-          type: integer
-        completion_tokens:
-          type: integer
-        total_tokens:
-          type: integer
-        prompt_tokens_details:
-          type: object
-          additionalProperties:
-            type: integer
-          nullable: true
-        completion_tokens_details:
-          type: object
-          additionalProperties:
-            type: integer
-          nullable: true
-      required:
-        - prompt_tokens
-        - completion_tokens
-        - total_tokens
-    UsageDetails:
-      title: UsageDetails
-      oneOf:
-        - type: object
-          additionalProperties:
-            type: integer
-        - $ref: '#/components/schemas/OpenAIUsageSchema'
     GetMediaResponse:
       title: GetMediaResponse
       type: object
@@ -4136,35 +4058,8 @@ components:
       title: MediaContentType
       type: string
       enum:
-        - image/png
-        - image/jpeg
-        - image/jpg
-        - image/webp
-        - image/gif
-        - image/svg+xml
-        - image/tiff
-        - image/bmp
-        - audio/mpeg
-        - audio/mp3
-        - audio/wav
-        - audio/ogg
-        - audio/oga
-        - audio/aac
-        - audio/mp4
-        - audio/flac
-        - video/mp4
-        - video/webm
-        - text/plain
-        - text/html
-        - text/css
-        - text/csv
-        - application/pdf
-        - application/msword
-        - application/vnd.ms-excel
-        - application/zip
-        - application/json
-        - application/xml
-        - application/octet-stream
+        - >-
+          image/png","image/jpeg","image/jpg","image/webp","audio/mpeg","audio/mp3","audio/wav","text/plain","application/pdf
       description: The MIME type of the media record
     DailyMetrics:
       title: DailyMetrics

web/public/generated/postman/collection.json

@@ -689,7 +689,7 @@
             "auth": null,
             "body": {
               "mode": "raw",
-              "raw": "{\n    \"traceId\": \"example\",\n    \"observationId\": \"example\",\n    \"contentType\": \"image/png\",\n    \"contentLength\": 0,\n    \"sha256Hash\": \"example\",\n    \"field\": \"example\"\n}",
+              "raw": "{\n    \"traceId\": \"example\",\n    \"observationId\": \"example\",\n    \"contentType\": \"example\",\n    \"contentLength\": 0,\n    \"sha256Hash\": \"example\",\n    \"field\": \"example\"\n}",
               "options": {
                 "raw": {
                   "language": "json"

web/src/__e2e__/api.servertest.ts

@@ -1,8 +1,7 @@
 import { v4 } from "uuid";
 import { JobExecutionStatus, Prisma, prisma } from "@langfuse/shared/src/db";
 import {
-  getObservationById,
-  getTraceById,
+  clickhouseClient,
   OrgEnrichedApiKey,
   redis,
 } from "@langfuse/shared/src/server";
@@ -16,7 +15,6 @@ const generateAuth = (username: string, password: string) => {
 const workerAdminAuth = generateAuth("admin", "myworkerpassword");
 
 const userApiKeyAuth = generateAuth("pk-lf-1234567890", "sk-lf-1234567890");
-const projectId = "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a";
 
 describe("Health endpoints", () => {
   it("web container returns healthy", async () => {
@@ -63,7 +61,6 @@ describe("Ingestion Pipeline", () => {
           timestamp: new Date().toISOString(),
           body: {
             name: "test trace",
-            timestamp: new Date().toISOString(),
             id: traceId,
             userId: "user-1", // triggers the eval
           },
@@ -76,7 +73,6 @@ describe("Ingestion Pipeline", () => {
             id: spanId,
             traceId: traceId,
             name: "test span",
-            startTime: new Date().toISOString(),
           },
         },
       ],
@@ -107,20 +103,32 @@ describe("Ingestion Pipeline", () => {
           },
         });
 
+        const traces = await clickhouseClient().query({
+          query: "SELECT * FROM traces",
+          format: "JSONEachRow",
+        });
+        console.log("traces", await traces.text());
         expect(traceResponse.status).toBe(200);
         expect(traceResponse.body).not.toBeNull();
         expect((await traceResponse.json()).id).toBe(traceId);
 
-        const trace = await getTraceById(traceId, projectId);
+        const trace = await prisma.trace.findUnique({
+          where: {
+            id: traceId,
+          },
+        });
         expect(trace).not.toBeNull();
         expect(trace?.name).toBe("test trace");
 
-        const observation = await getObservationById(spanId, projectId);
+        const observation = await prisma.observation.findUnique({
+          where: {
+            id: spanId,
+            traceId: traceId,
+          },
+        });
         expect(observation).not.toBeNull();
         expect(observation?.name).toBe("test span");
 
-        console.log("observationFounds", observation);
-
         expect(redis).not.toBeNull();
 
         const redisKeys = await redis?.keys(`api-key:*`);
@@ -145,7 +153,6 @@ describe("Ingestion Pipeline", () => {
             projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
           },
         });
-        console.log("evalExecution", evalExecution);
 
         expect(evalExecution).not.toBeNull();
 
@@ -156,12 +163,12 @@ describe("Ingestion Pipeline", () => {
         // failure due to missing openai key in the pipeline. Expected
         expect(evalExecution.status).toBe(JobExecutionStatus.ERROR);
       },
-      60000,
+      50000,
       10000,
     );
 
     expect(response.status).toBe(207);
-  }, 70000);
+  }, 60000);
 
   it("rate limit ingestion", async () => {
     // update the org in the database and set the rate limit to 1 for ingestion