chore: release v2.37.0

Fixes #1787

.env.dev.example

@@ -14,6 +14,9 @@ DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres"
 NEXTAUTH_URL="http://localhost:3000"
 NEXTAUTH_SECRET="secret"
 
+# Langfuse Cloud Environment
+NEXT_PUBLIC_LANGFUSE_CLOUD_REGION="DEV"
+
 # Langfuse experimental features
 LANGFUSE_ENABLE_EXPERIMENTAL_FEATURES="true"
 
@@ -43,4 +46,6 @@ REDIS_HOST="127.0.0.1"
 REDIS_PORT=6379
 REDIS_AUTH="myredissecret"
 
-LANGFUSE_WORKER_PASSWORD=mybasicauthsecret
+LANGFUSE_WORKER_PASSWORD=mybasicauthsecret
+# openssl rand -base64 32 used only here
+ENCRYPTION_KEY=6c16874e5c0f0cc74ddec00425fa99fbe9ffbe412b7d5d906a4b00005df91403 

.env.prod.example

@@ -76,6 +76,9 @@ LANGFUSE_CSP_ENFORCE_HTTPS="true"
 # The page size can be adjusted if needed to optimize performance
 # DB_EXPORT_PAGE_SIZE=1000
 
+# Disable logging to `events` table in db
+# ENABLE_EVENT_LOG=false
+
 
 ### START Langfuse Cloud Config
 # Used for Langfuse Cloud deployments
@@ -114,4 +117,10 @@ LANGFUSE_CSP_ENFORCE_HTTPS="true"
 # Crisp chat
 # NEXT_PUBLIC_CRISP_WEBSITE_ID=
 
+# Encryption
+# ENCRYPTION_KEY=
+
+# Admin API
+# ADMIN_API_KEY=
+
 ### END Langfuse Cloud Config

.github/workflows/pipeline.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v3
         with:
-          version: 8
+          version: 8.15.5
       - uses: actions/setup-node@v3
         with:
           node-version: 20
@@ -68,7 +68,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v3
         with:
-          version: 8
+          version: 8.15.5
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -111,6 +111,7 @@ jobs:
         node-version: [20]
     env:
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+      ENCRYPTION_KEY: ${{ secrets.ENCRYPTION_KEY }}
     steps:
       - name: Set Swap Space
         uses: pierotofy/set-swap-space@master
@@ -120,7 +121,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v3
         with:
-          version: 8
+          version: 8.15.5
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -159,7 +160,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v3
         with:
-          version: 8
+          version: 8.15.5
       - uses: actions/setup-node@v3
         with:
           node-version: 20
@@ -221,7 +222,7 @@ jobs:
     steps:
       - uses: pnpm/action-setup@v3
         with:
-          version: 8
+          version: 8.15.5
       - name: Setup node
         uses: actions/setup-node@v3
         with:

CONTRIBUTING.md

@@ -53,42 +53,55 @@ A good first step is to search for open [issues](https://github.com/langfuse/lan
 
 ### Architecture Overview
 
+> [!NOTE] > `langfuse/langfuse/worker` is under active development and will be included in Langfuse version 3.0. More in the [GitHub Discussions](https://github.com/orgs/langfuse/discussions/1902).
+
 ```mermaid
 flowchart TB
-   subgraph s4["Clients"]
-      subgraph s2["langfuse/langfuse-python"]
-         Python["Python low-level SDK"]
-         Decorator["observe() decorator"] -->|extends| Python
-         OAI["OpenAI drop-in replacement"] -->|extends| Python
-         Llamaindex["LlamaIndex Integration"] -->|extends| Python
-         LCPYTHON["Langchain Python Integration"] -->|extends| Python
-         Langflow -->|uses| LCPYTHON
-         LiteLLM -->|uses| Python
-      end
-      subgraph s3["langfuse/langfuse-js"]
-         JS["JS SDK"]
-         LCJS["Langchain JS Integration"]  -->|extends| JS
-         Flowise -->|uses| LCJS
-      end
-   end
+    subgraph s4["Clients"]
+        subgraph s2["langfuse/langfuse-python"]
+            Python["Python low-level SDK"]
+            Decorator["observe() decorator"] -->|extends| Python
+            OAI["OpenAI drop-in replacement"] -->|extends| Python
+            Llamaindex["LlamaIndex Integration"] -->|extends| Python
+            LCPYTHON["Langchain Python Integration"] -->|extends| Python
+            Langflow -->|uses| LCPYTHON
+            LiteLLM -->|uses| Python
+        end
+        subgraph s3["langfuse/langfuse-js"]
+            JS["JS SDK"]
+            LCJS["Langchain JS Integration"]  -->|extends| JS
+            Flowise -->|uses| LCJS
+        end
+    end
 
-   DB[Postgres Database]
-	subgraph s1["Application (langfuse/langfuse)"]
-      API[Public HTTP API]
-      G[TRPC API]
-      I[NextAuth]
-      H[React Frontend]
-      Prisma[Prisma ORM]
-      H --> G
-      H --> I
-      G --> I
-      G --- Prisma
-      API --- Prisma
-      I --- Prisma
-	end
-   Prisma --- DB
-   JS --- API
-   Python --- API
+    DB[Postgres Database]
+    Redis[Redis]
+
+    subgraph s1["Application (langfuse/langfuse/web)"]
+        API[Public HTTP API]
+        G[TRPC API]
+        I[NextAuth]
+        H[React Frontend]
+        Prisma[Prisma ORM]
+        H --> G
+        H --> I
+        G --> I
+        G --- Prisma
+        API --- Prisma
+        I --- Prisma
+    end
+
+    subgraph s5["Application (langfuse/langfuse/worker)"]
+        Worker_API[Public HTTP API]
+    end
+
+    API --> Worker_API
+    Worker_API --- DB
+    Worker_API --- Redis
+
+    Prisma --- DB
+    JS --- API
+    Python --- API
 ```
 
 ### Database Overview
@@ -120,9 +133,11 @@ We built a monorepo using [pnpm](https://pnpm.io/motivation) and [turbo](https:/
 
 - `web`: is the main application package providing Frontend and Backend APIs for Langfuse.
 - `worker` (no production yet): contains an application for asynchronous processing of tasks. This package is not yet used in production.
-- `shared`: contains shared code between the above packages.
-- `config-eslint`: contains eslint configurations which are shared between the above packages.
-- `config-typescript`: contains typescript configurations which are shared between the above packages.
+- `packages`:
+  - `shared`: contains shared code between the above packages.
+  - `config-eslint`: contains eslint configurations which are shared between the above packages.
+  - `config-typescript`: contains typescript configurations which are shared between the above packages.
+- `ee`: contains all enterprise features. See [EE README](ee/README.md) for more details.
 
 ## Development Setup
 
@@ -133,7 +148,7 @@ Requirements
 
 **Steps**
 
-1. Fork the the repository and clone it locally
+1. Fork the repository and clone it locally
 2. Run the development database
 
    ```bash

LICENSE

@@ -2,9 +2,9 @@ Copyright (c) 2023 Finto Technologies GmbH
 
 Portions of this software are licensed as follows:
 
-* All content that resides under the "ee/" directory of this repository, if that directory exists, 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.
+- 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
 of this software and associated documentation files (the "Software"), to deal
@@ -22,4 +22,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -26,7 +26,7 @@
    <br/>
    <br/>
    <div>
-      <img src="https://img.shields.io/badge/License-MIT-red.svg?style=flat-square" alt="MIT License">
+      <a href="https://github.com/langfuse/langfuse/blob/main/LICENSE"><img src="https://img.shields.io/badge/License-MIT-red.svg?style=flat-square" alt="MIT License"></a>
       <a href="https://www.ycombinator.com/companies/langfuse"><img src="https://img.shields.io/badge/Y%20Combinator-W23-orange?style=flat-square" alt="Y Combinator W23"></a>
       <a href="https://github.com/langfuse/langfuse/pkgs/container/langfuse"><img alt="Docker Image" src="https://img.shields.io/badge/docker-langfuse-blue?logo=Docker&logoColor=white&style=flat-square"></a>
       <a href="https://www.npmjs.com/package/langfuse"><img src="https://img.shields.io/npm/v/langfuse?style=flat-square&label=npm+langfuse" alt="langfuse npm package"></a>
@@ -37,17 +37,22 @@
 
 ## Overview
 
+_Unmute video for voice-over_
+
+https://github.com/langfuse/langfuse/assets/2834609/a94062e9-c782-4ee9-af59-dee6370149a8
+
 ### Develop
 
 - **Observability:** Instrument your app and start ingesting traces to Langfuse ([Quickstart](https://langfuse.com/docs/get-started), [Integrations](https://langfuse.com/docs/integrations) [Tracing](https://langfuse.com/docs/tracing))
 - **Langfuse UI:** Inspect and debug complex logs ([Demo](https://langfuse.com/docs/demo), [Tracing](https://langfuse.com/docs/tracing))
-- **Prompts:** Manage, version and deploy prompts from within Langfuse ([Prompt Management](https://langfuse.com/docs/prompts))
+- **Prompt Management:** Manage, version and deploy prompts from within Langfuse ([Prompt Management](https://langfuse.com/docs/prompts/get-started))
+- **Prompt Engineering:** Test and iterate on your prompts with the [LLM Playground](https://langfuse.com/docs/playground)
 
 ### Monitor
 
 - **Analytics:** Track metrics (cost, latency, quality) and gain insights from dashboards & data exports ([Analytics](https://langfuse.com/docs/analytics))
 - **Evals:** Collect and calculate scores for your LLM completions ([Scores & Evaluations](https://langfuse.com/docs/scores))
-  - Run model-based evaluations ([Model-based evaluations](https://langfuse.com/docs/scores/model-based-evals))
+  - Run model-based evaluations ([Model-based evaluations](https://langfuse.com/docs/scores/model-based-evals)) within Langfuse
   - Collect user feedback ([User Feedback](https://langfuse.com/docs/scores/user-feedback))
   - Manually score observations in Langfuse ([Manual Scores](https://langfuse.com/docs/scores/manually))
 
@@ -101,13 +106,13 @@ See the [→ Quickstart](https://langfuse.com/docs/get-started) to integrate Lan
 
 ### Integrations
 
-| Integration                                                      | Supports      | Description                                                      |
-| ---------------------------------------------------------------- | ------------- | ---------------------------------------------------------------- |
-| [**SDK** - _recommended_](https://langfuse.com/docs/sdk)         | Python, JS/TS | Manual instrumentation using the SDKs for full flexibility.      |
-| [OpenAI SDK](https://langfuse.com/docs/integrations/openai)      | Python, JS/TS | Automated instrumentation of OpenAI SDK.                         |
-| [Langchain](https://langfuse.com/docs/integrations/langchain)    | Python, JS/TS | Instrumentation via Langchain callbacks.                         |
-| [LlamaIndex](https://langfuse.com/docs/integrations/llama-index) | Python        | Automated instrumentation via LlamaIndex callback system.        |
-| [API](https://langfuse.com/docs/api)                             |               | Directly call the public API. OpenAPI spec available.            |
+| Integration                                                      | Supports      | Description                                                 |
+| ---------------------------------------------------------------- | ------------- | ----------------------------------------------------------- |
+| [**SDK** - _recommended_](https://langfuse.com/docs/sdk)         | Python, JS/TS | Manual instrumentation using the SDKs for full flexibility. |
+| [OpenAI SDK](https://langfuse.com/docs/integrations/openai)      | Python, JS/TS | Automated instrumentation of OpenAI SDK.                    |
+| [Langchain](https://langfuse.com/docs/integrations/langchain)    | Python, JS/TS | Instrumentation via Langchain callbacks.                    |
+| [LlamaIndex](https://langfuse.com/docs/integrations/llama-index) | Python        | Automated instrumentation via LlamaIndex callback system.   |
+| [API](https://langfuse.com/docs/api)                             |               | Directly call the public API. OpenAPI spec available.       |
 
 External projects/packages that integrate with Langfuse:
 
@@ -142,7 +147,7 @@ In order of preference the best way to communicate with us:
 
 ## License
 
-This repository is MIT licensed, except for the `ee/` folder. See [LICENSE](LICENSE) and [docs](https://langfuse.com/docs/open-source) for more details.
+This repository is MIT licensed, except for the `ee` folders. See [LICENSE](LICENSE) and [docs](https://langfuse.com/docs/open-source) for more details.
 
 ## Misc
 

ee/.eslintrc.js

@@ -0,0 +1,8 @@
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  extends: ["@repo/eslint-config/library.js"],
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    project: true,
+  },
+};

ee/Readme.md

@@ -1,3 +1,5 @@
 # Enterprise Edition
 
-While we are currently working 100% on the open source version, we consider financing the project by developing some premium features as part of an enterprise version under a commercial license. Please reach out to us if you have specific requirements: enterprise@langfuse.com
+This folder includes features that are only available in the Enterprise Edition of Langfuse and on Langfuse Cloud.
+
+See [LICENSE](../LICENSE) and [docs](https://langfuse.com/docs/open-source) for more details.

ee/package.json

@@ -0,0 +1,46 @@
+{
+  "name": "@langfuse/ee",
+  "version": "1.0.0",
+  "private": true,
+  "main": "./dist/src/index.js",
+  "types": "./dist/src/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/src/index.js",
+      "require": "./dist/src/index.js"
+    },
+    "./sso": {
+      "import": "./dist/src/sso/index.js",
+      "require": "./dist/src/sso/index.js"
+    }
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc --watch",
+    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix"
+  },
+  "dependencies": {
+    "@langfuse/shared": "workspace:*",
+    "next": "^14.2.1",
+    "next-auth": "^4.24.7",
+    "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "@repo/eslint-config": "*",
+    "@repo/typescript-config": "*",
+    "@types/node": "^20.11.29",
+    "@typescript-eslint/parser": "^7.7.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "prettier": "^3.2.5",
+    "ts-node": "^10.9.2",
+    "tsc-watch": "^6.2.0",
+    "typescript": "^5.4.5"
+  }
+}

ee/prettierrc.json

@@ -0,0 +1,4 @@
+{
+  "trailingComma": "es5",
+  "printWidth": 120
+}

ee/src/ee-license-check/index.ts

@@ -0,0 +1,4 @@
+import { env } from "../env";
+
+export const isEeAvailable: boolean =
+  env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION !== undefined;

ee/src/env.ts

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

ee/src/index.ts

@@ -0,0 +1 @@
+export { isEeAvailable } from "./ee-license-check";

ee/src/sso/index.ts

@@ -0,0 +1,236 @@
+import { type Provider } from "next-auth/providers/index";
+import GoogleProvider from "next-auth/providers/google";
+import GitHubProvider from "next-auth/providers/github";
+import OktaProvider from "next-auth/providers/okta";
+import Auth0Provider from "next-auth/providers/auth0";
+import AzureADProvider from "next-auth/providers/azure-ad";
+import { isEeAvailable } from "..";
+import { prisma } from "@langfuse/shared/src/db";
+import { encrypt, decrypt } from "@langfuse/shared/encryption";
+import { SsoProviderSchema } from "./types";
+import { type NextApiRequest, type NextApiResponse } from "next";
+import { env } from "../env";
+
+// Local cache for SSO configurations
+let cachedSsoConfigs: {
+  data: SsoProviderSchema[];
+  timestamp: number;
+} | null = null;
+
+/**
+ * Get all SSO configurations from the database or from local cache and parse them into SsoProviderSchema objects.
+ *
+ * @returns {Promise<SsoProviderSchema[]>} - A list of all SSO configurations. Empty array if none are configured or EE is not available.
+ */
+async function getSsoConfigs(): Promise<SsoProviderSchema[]> {
+  if (!isEeAvailable) return [];
+  const CACHE_TTL = 60 * 1000; // 1 minute
+
+  // Set/refresh the cache if it's empty or expired
+  if (
+    cachedSsoConfigs === null ||
+    Date.now() - cachedSsoConfigs.timestamp > CACHE_TTL
+  ) {
+    // transform into zod object
+    const dbConfigs = await prisma.ssoConfig.findMany();
+    const parsedSsoConfigs = dbConfigs
+      .map((v) => {
+        try {
+          const parsedValue = SsoProviderSchema.parse(v);
+          return parsedValue;
+        } catch (e) {
+          console.error(
+            `Failed to parse SSO provider config for domain ${v.domain}`,
+            e
+          );
+          return null;
+        }
+      })
+      .filter((parsed) => parsed !== null) as SsoProviderSchema[];
+
+    cachedSsoConfigs = {
+      data: parsedSsoConfigs,
+      timestamp: Date.now(),
+    };
+  }
+
+  return cachedSsoConfigs.data;
+}
+
+/**
+ * Load all custom SSO providers from the database. To be used within `providers` in NextAuth backend configuration.
+ *
+ * @returns {Promise<Provider[]>} - A list of all custom SSO providers.
+ */
+export async function loadSsoProviders(): Promise<Provider[]> {
+  if (!isEeAvailable) return [];
+
+  const ssoConfigs = await getSsoConfigs();
+
+  const providers: Provider[] = [];
+
+  for (const dbSsoConfig of ssoConfigs) {
+    const provider = dbToNextAuthProvider(dbSsoConfig);
+    if (provider !== null) providers.push(provider);
+  }
+
+  return providers;
+}
+
+/**
+ * @returns `true` if any custom SSO provider is configured in the database.
+ */
+export async function isAnySsoConfigured(): Promise<boolean> {
+  if (!isEeAvailable) return false;
+  const ssoConfigs = await getSsoConfigs();
+  return ssoConfigs.length > 0;
+}
+
+/**
+ * Get the custom SSO providerId for a domain. To be used with NextAuth's `signIn(providerId)`.
+ *
+ * @param domain - The domain to check for a custom SSO provider, e.g. "example.com".
+ * @returns `providerId` or null if none is configured or EE is not available.
+ */
+export async function getSsoAuthProviderIdForDomain(
+  domain: string
+): Promise<string | null> {
+  if (!isEeAvailable) return null;
+  const ssoConfig = (await getSsoConfigs()).find(
+    (ssoConfig) => ssoConfig.domain === domain.toLowerCase()
+  );
+
+  if (!ssoConfig) return null;
+  return getAuthProviderIdForSsoConfig(ssoConfig);
+}
+
+/**
+ * Converts a SsoProviderConfig to a NextAuth Provider instance.
+ *
+ * @param {SsoProviderSchema} provider - The SSO configuration from the database.
+ * @returns {Provider | null} - A NextAuth Provider instance or null if parsing fails or no custom credentials are used for this SSO config.
+ */
+const dbToNextAuthProvider = (provider: SsoProviderSchema): Provider | null => {
+  // If the SsoConfig does not use custom credentials, return null as no additional provider needs to be added to NextAuth
+  if (!provider.authConfig) return null;
+
+  if (provider.authProvider === "google")
+    return GoogleProvider({
+      id: getAuthProviderIdForSsoConfig(provider), // use the domain as the provider id as we use domain-specific credentials
+      ...provider.authConfig,
+      clientSecret: decrypt(provider.authConfig.clientSecret),
+    });
+  else if (provider.authProvider === "github")
+    return GitHubProvider({
+      id: getAuthProviderIdForSsoConfig(provider), // use the domain as the provider id as we use domain-specific credentials
+      ...provider.authConfig,
+      clientSecret: decrypt(provider.authConfig.clientSecret),
+    });
+  else if (provider.authProvider === "auth0")
+    return Auth0Provider({
+      id: getAuthProviderIdForSsoConfig(provider), // use the domain as the provider id as we use domain-specific credentials
+      ...provider.authConfig,
+      clientSecret: decrypt(provider.authConfig.clientSecret),
+    });
+  else if (provider.authProvider === "okta")
+    return OktaProvider({
+      id: getAuthProviderIdForSsoConfig(provider), // use the domain as the provider id as we use domain-specific credentials
+      ...provider.authConfig,
+      clientSecret: decrypt(provider.authConfig.clientSecret),
+    });
+  else if (provider.authProvider === "azure-ad")
+    return AzureADProvider({
+      id: getAuthProviderIdForSsoConfig(provider), // use the domain as the provider id as we use domain-specific credentials
+      ...provider.authConfig,
+      clientSecret: decrypt(provider.authConfig.clientSecret),
+    });
+  else {
+    // Type check to ensure we handle all providers
+    // eslint-disable-next-line no-unused-vars
+    const _: never = provider;
+    throw new Error(
+      `Unrecognized SSO provider for domain ${(provider as any).domain}`
+    );
+  }
+};
+
+/**
+ * Get the custom SSO providerId for a database SSO configuration. To be used with NextAuth's `signIn(providerId)`.
+ *
+ * @param {DbSsoConfig} dbSsoConfig - The SSO configuration from the database.
+ * @returns {string} - The providerId used in NextAuth.
+ */
+const getAuthProviderIdForSsoConfig = (
+  dbSsoConfig: SsoProviderSchema
+): string => {
+  if (!dbSsoConfig.authConfig) return dbSsoConfig.authProvider;
+  return `${dbSsoConfig.domain}.${dbSsoConfig.authProvider}`;
+};
+
+export async function createNewSsoConfigHandler(
+  req: NextApiRequest,
+  res: NextApiResponse
+) {
+  try {
+    if (!isEeAvailable) {
+      res.status(403).json({ error: "EE is not available" });
+      return;
+    }
+    // allow only POST requests
+    if (req.method !== "POST") {
+      res.status(405).json({ error: "Method Not Allowed" });
+      return;
+    }
+    // check if ADMIN_API_KEY is set
+    if (!env.ADMIN_API_KEY) {
+      res.status(500).json({ error: "ADMIN_API_KEY is not set" });
+      return;
+    }
+    if (!env.ENCRYPTION_KEY) {
+      res.status(500).json({ error: "ENCRYPTION_KEY is not set" });
+      return;
+    }
+    // check bearer token
+    const { authorization } = req.headers;
+    if (!authorization) {
+      res
+        .status(401)
+        .json({ error: "Unauthorized: No authorization header provided" });
+      return;
+    }
+    const [scheme, token] = authorization.split(" ");
+    if (scheme !== "Bearer" || !token || token !== env.ADMIN_API_KEY) {
+      res.status(401).json({ error: "Unauthorized: Invalid token" });
+      return;
+    }
+
+    const body = SsoProviderSchema.safeParse(req.body);
+    if (!body.success) {
+      res.status(400).json({ error: body.error });
+      return;
+    }
+
+    const { domain, authProvider, authConfig } = body.data;
+
+    const encryptedClientSecret = authConfig
+      ? {
+          ...authConfig,
+          clientSecret: encrypt(authConfig.clientSecret),
+        }
+      : undefined;
+
+    await prisma.ssoConfig.create({
+      data: {
+        domain,
+        authProvider,
+        authConfig: encryptedClientSecret,
+      },
+    });
+    res.status(201).json({
+      message: "SSO configuration created successfully",
+    });
+  } catch (e) {
+    console.log(e);
+    res.status(500).json({ error: "Internal Server Error" });
+  }
+}

ee/src/sso/types.ts

@@ -0,0 +1,81 @@
+import { z } from "zod";
+
+const base = z.object({
+  domain: z.string().refine((v) => v === v.toLowerCase(), {
+    message: "Domain must be lowercase",
+  }),
+});
+
+export const GoogleProviderSchema = base.extend({
+  authProvider: z.literal("google"),
+  authConfig: z
+    .object({
+      clientId: z.string(),
+      clientSecret: z.string(),
+      allowDangerousEmailAccountLinking: z.boolean().optional().default(false),
+    })
+    .nullish(),
+});
+
+export const GithubProviderSchema = base.extend({
+  authProvider: z.literal("github"),
+  authConfig: z
+    .object({
+      clientId: z.string(),
+      clientSecret: z.string(),
+      allowDangerousEmailAccountLinking: z.boolean().optional().default(false),
+    })
+    .nullish(),
+});
+
+export const Auth0ProviderSchema = base.extend({
+  authProvider: z.literal("auth0"),
+  authConfig: z
+    .object({
+      clientId: z.string(),
+      clientSecret: z.string(),
+      issuer: z.string(),
+      allowDangerousEmailAccountLinking: z.boolean().optional().default(false),
+    })
+    .nullish(),
+});
+
+export const OktaProviderSchema = base.extend({
+  authProvider: z.literal("okta"),
+  authConfig: z
+    .object({
+      clientId: z.string(),
+      clientSecret: z.string(),
+      issuer: z.string(),
+      allowDangerousEmailAccountLinking: z.boolean().optional().default(false),
+    })
+    .nullish(),
+});
+
+export const AzureAdProviderSchema = base.extend({
+  authProvider: z.literal("azure-ad"),
+  authConfig: z
+    .object({
+      clientId: z.string(),
+      clientSecret: z.string(),
+      tenantId: z.string(),
+      allowDangerousEmailAccountLinking: z.boolean().optional().default(false),
+    })
+    .nullish(),
+});
+
+export type GoogleProviderSchema = z.infer<typeof GoogleProviderSchema>;
+export type GithubProviderSchema = z.infer<typeof GithubProviderSchema>;
+export type Auth0ProviderSchema = z.infer<typeof Auth0ProviderSchema>;
+export type OktaProviderSchema = z.infer<typeof OktaProviderSchema>;
+export type AzureAdProviderSchema = z.infer<typeof AzureAdProviderSchema>;
+
+export const SsoProviderSchema = z.discriminatedUnion("authProvider", [
+  GoogleProviderSchema,
+  GithubProviderSchema,
+  Auth0ProviderSchema,
+  OktaProviderSchema,
+  AzureAdProviderSchema,
+]);
+
+export type SsoProviderSchema = z.infer<typeof SsoProviderSchema>;

ee/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "extends": "@repo/typescript-config/base.json",
+  "compilerOptions": {
+    "moduleResolution": "NodeNext",
+    "module": "NodeNext",
+    "lib": ["ES2020"],
+    "outDir": "./dist",
+    "types": ["node"],
+    "target": "ES2020",
+    "rootDir": "."
+  },
+  "include": ["."],
+  "exclude": ["node_modules", "dist"]
+}

fern/apis/server/definition/commons.yml

@@ -127,6 +127,7 @@ types:
       id: string
       name: string
       description: optional<string>
+      metadata: optional<unknown>
       projectId: string
       createdAt: datetime
       updatedAt: datetime
@@ -151,6 +152,7 @@ types:
       status: DatasetStatus
       input: optional<unknown>
       expectedOutput: optional<unknown>
+      metadata: optional<unknown>
       sourceTraceId: optional<string>
       sourceObservationId: optional<string>
       datasetId: string
@@ -209,6 +211,7 @@ types:
     enum:
       - API
       - REVIEW
+      - EVAL
 
 errors:
   Error:

fern/apis/server/definition/dataset-items.yml

@@ -26,6 +26,9 @@ types:
       datasetName: string
       input: optional<unknown>
       expectedOutput: optional<unknown>
+      metadata: optional<unknown>
+      sourceTraceId: optional<string>
+      sourceObservationId: optional<string>
       id:
         type: optional<string>
         docs: Dataset items are upserted on their id

fern/apis/server/definition/datasets.yml

@@ -47,3 +47,4 @@ types:
     properties:
       name: string
       description: optional<string>
+      metadata: optional<unknown>

fern/apis/server/definition/metrics.yml

@@ -29,6 +29,12 @@ service:
             type: optional<string>
             allow-multiple: true
             docs: Optional filter for metrics where traces include all of these tags
+          fromTimestamp:
+            type: optional<datetime>
+            docs: Optional filter to only include traces on or after a certain timestamp
+          toTimestamp:
+            type: optional<datetime>
+            docs: Optional filter to only include traces before a certain timestamp
       response: DailyMetrics
 types:
   DailyMetrics:
@@ -41,12 +47,13 @@ types:
     properties:
       date: date
       countTraces: integer
+      countObservations: integer
       totalCost: double
       usage: list<UsageByModel>
   UsageByModel:
     docs: Daily usage of a given model. Usage corresponds to the unit set for the specific model (e.g. tokens).
     properties:
-      model: string
+      model: optional<string>
       inputUsage: integer
       outputUsage: integer
       totalUsage: integer

fern/apis/server/definition/observations.yml

@@ -24,10 +24,10 @@ service:
         query-parameters:
           page:
             type: optional<integer>
-            docs: page number, starts at 1
+            docs: Page number, starts at 1.
           limit:
             type: optional<integer>
-            docs: limit of items per page
+            docs: Limit of items per page. If you encounter api issues due to too large page sizes, try to reduce the limit.
           name: optional<string>
           userId: optional<string>
           type: optional<string>

fern/apis/server/definition/prompts.yml

@@ -4,18 +4,38 @@ imports:
   pagination: ./utils/pagination.yml
 service:
   auth: true
-  base-path: /api/public
+  base-path: /api/public/v2
   endpoints:
     get:
       docs: Get a prompt
       method: GET
+      path: /prompts/{promptName}
+      path-parameters:
+        promptName:
+          type: string
+          docs: The name of the prompt
+      request:
+        name: GetPromptRequest
+        query-parameters:
+          version: optional<integer>
+          label: optional<string>
+      response: Prompt
+
+    list:
+      docs: Get a list of prompt names with versions and labels
+      method: GET
       path: /prompts
       request:
-        name: GetParameterRequest
+        name: ListPromptsMetaRequest
         query-parameters:
-          name: string
-          version: optional<integer>
-      response: Prompt
+          name: optional<string>
+          label: optional<string>
+          tag: optional<string>
+          page: optional<integer>
+          limit: optional<integer>
+
+      response: PromptMetaListResponse
+
     create:
       docs: Create a prompt
       method: POST
@@ -24,6 +44,18 @@ service:
       response: Prompt
 
 types:
+  PromptMetaListResponse:
+    properties:
+      data: list<PromptMeta>
+      meta: pagination.MetaResponse
+
+  PromptMeta:
+    properties:
+      name: string
+      versions: list<integer>
+      labels: list<string>
+      tags: list<string>
+
   CreatePromptRequest:
     union:
       chat: CreateChatPromptRequest
@@ -32,20 +64,16 @@ types:
   CreateChatPromptRequest:
     properties:
       name: string
-      isActive:
-        docs: Should the prompt be promoted to production immediately?
-        type: boolean
       prompt: list<ChatMessage>
       config: optional<unknown>
+      labels: optional<list<string>>
 
   CreateTextPromptRequest:
     properties:
       name: string
-      isActive:
-        docs: Should the prompt be promoted to production immediately?
-        type: boolean
       prompt: string
       config: optional<unknown>
+      labels: optional<list<string>>
 
   Prompt:
     union:

fern/apis/server/definition/score.yml

@@ -21,15 +21,24 @@ service:
         query-parameters:
           page:
             type: optional<integer>
-            docs: page number, starts at 1
+            docs: Page number, starts at 1.
           limit:
             type: optional<integer>
-            docs: limit of items per page
+            docs: Limit of items per page. If you encounter api issues due to too large page sizes, try to reduce the limit.
           userId: optional<string>
           name: optional<string>
           fromTimestamp:
             type: optional<datetime>
             docs: Retrieve only scores newer than this timestamp.
+          source:
+            type: commons.ScoreSource
+            docs: Retrieve only scores from a specific source.
+          operator:
+            type: optional<string>
+            docs: Retrieve only scores with <operator> value.
+          value:
+            type: optional<double>
+            docs: Retrieve only scores with <operator> value.
       response: Scores
     get-by-id:
       docs: Get a score

fern/apis/server/definition/trace.yml

@@ -16,7 +16,7 @@ service:
           docs: The unique langfuse identifier of a trace
       response: commons.TraceWithFullDetails
     list:
-      docs: Get list of traces
+      docs: Get list of traces.
       method: GET
       path: /traces
       request:
@@ -24,10 +24,10 @@ service:
         query-parameters:
           page:
             type: optional<integer>
-            docs: page number, starts at 1
+            docs: Page number, starts at 1
           limit:
             type: optional<integer>
-            docs: limit of items per page
+            docs: Limit of items per page. If you encounter api issues due to too large page sizes, try to reduce the limit.
           userId: optional<string>
           name: optional<string>
           fromTimestamp:

fern/fern.config.json

@@ -1,4 +1,4 @@
 {
   "organization": "finto",
-  "version": "0.19.30"
+  "version": "0.21.0"
 }

generated/postman/collection.json

@@ -65,7 +65,7 @@
             "auth": null,
             "body": {
               "mode": "raw",
-              "raw": "{\n    \"datasetName\": \"example\",\n    \"input\": \"UNKNOWN\",\n    \"expectedOutput\": \"UNKNOWN\",\n    \"id\": \"example\"\n}",
+              "raw": "{\n    \"datasetName\": \"example\",\n    \"input\": \"UNKNOWN\",\n    \"expectedOutput\": \"UNKNOWN\",\n    \"metadata\": \"UNKNOWN\",\n    \"sourceTraceId\": \"example\",\n    \"sourceObservationId\": \"example\",\n    \"id\": \"example\"\n}",
               "options": {
                 "raw": {
                   "language": "json"
@@ -245,7 +245,7 @@
             "auth": null,
             "body": {
               "mode": "raw",
-              "raw": "{\n    \"name\": \"example\",\n    \"description\": \"example\"\n}",
+              "raw": "{\n    \"name\": \"example\",\n    \"description\": \"example\",\n    \"metadata\": \"UNKNOWN\"\n}",
               "options": {
                 "raw": {
                   "language": "json"
@@ -379,7 +379,7 @@
           "request": {
             "description": "Get daily metrics of the Langfuse project",
             "url": {
-              "raw": "{{baseUrl}}/api/public/metrics/daily?page=&limit=&traceName=&userId=&tags=",
+              "raw": "{{baseUrl}}/api/public/metrics/daily?page=&limit=&traceName=&userId=&tags=&fromTimestamp=&toTimestamp=",
               "host": [
                 "{{baseUrl}}"
               ],
@@ -414,6 +414,16 @@
                   "key": "tags",
                   "value": "",
                   "description": "Optional filter for metrics where traces include all of these tags"
+                },
+                {
+                  "key": "fromTimestamp",
+                  "value": "",
+                  "description": "Optional filter to only include traces on or after a certain timestamp"
+                },
+                {
+                  "key": "toTimestamp",
+                  "value": "",
+                  "description": "Optional filter to only include traces before a certain timestamp"
                 }
               ],
               "variable": []
@@ -483,12 +493,12 @@
                 {
                   "key": "page",
                   "value": "",
-                  "description": "page number, starts at 1"
+                  "description": "Page number, starts at 1."
                 },
                 {
                   "key": "limit",
                   "value": "",
-                  "description": "limit of items per page"
+                  "description": "Limit of items per page. If you encounter api issues due to too large page sizes, try to reduce the limit."
                 },
                 {
                   "key": "name",
@@ -575,13 +585,58 @@
           "request": {
             "description": "Get a prompt",
             "url": {
-              "raw": "{{baseUrl}}/api/public/prompts?name=&version=",
+              "raw": "{{baseUrl}}/api/public/v2/prompts/:promptName?version=&label=",
               "host": [
                 "{{baseUrl}}"
               ],
               "path": [
                 "api",
                 "public",
+                "v2",
+                "prompts",
+                ":promptName"
+              ],
+              "query": [
+                {
+                  "key": "version",
+                  "value": "",
+                  "description": null
+                },
+                {
+                  "key": "label",
+                  "value": "",
+                  "description": null
+                }
+              ],
+              "variable": [
+                {
+                  "key": "promptName",
+                  "value": "",
+                  "description": "The name of the prompt"
+                }
+              ]
+            },
+            "header": [],
+            "method": "GET",
+            "auth": null,
+            "body": null
+          },
+          "response": []
+        },
+        {
+          "_type": "endpoint",
+          "name": "List",
+          "request": {
+            "description": "Get a list of prompt names with versions and labels",
+            "url": {
+              "raw": "{{baseUrl}}/api/public/v2/prompts?name=&label=&tag=&page=&limit=",
+              "host": [
+                "{{baseUrl}}"
+              ],
+              "path": [
+                "api",
+                "public",
+                "v2",
                 "prompts"
               ],
               "query": [
@@ -591,7 +646,22 @@
                   "description": null
                 },
                 {
-                  "key": "version",
+                  "key": "label",
+                  "value": "",
+                  "description": null
+                },
+                {
+                  "key": "tag",
+                  "value": "",
+                  "description": null
+                },
+                {
+                  "key": "page",
+                  "value": "",
+                  "description": null
+                },
+                {
+                  "key": "limit",
                   "value": "",
                   "description": null
                 }
@@ -611,13 +681,14 @@
           "request": {
             "description": "Create a prompt",
             "url": {
-              "raw": "{{baseUrl}}/api/public/prompts",
+              "raw": "{{baseUrl}}/api/public/v2/prompts",
               "host": [
                 "{{baseUrl}}"
               ],
               "path": [
                 "api",
                 "public",
+                "v2",
                 "prompts"
               ],
               "query": [],
@@ -628,7 +699,7 @@
             "auth": null,
             "body": {
               "mode": "raw",
-              "raw": "{\n    \"type\": \"chat\",\n    \"name\": \"example\",\n    \"isActive\": true,\n    \"prompt\": [\n        {\n            \"role\": \"example\",\n            \"content\": \"example\"\n        }\n    ],\n    \"config\": \"UNKNOWN\"\n}",
+              "raw": "{\n    \"type\": \"chat\",\n    \"name\": \"example\",\n    \"prompt\": [\n        {\n            \"role\": \"example\",\n            \"content\": \"example\"\n        }\n    ],\n    \"config\": \"UNKNOWN\",\n    \"labels\": [\n        \"example\"\n    ]\n}",
               "options": {
                 "raw": {
                   "language": "json"
@@ -684,7 +755,7 @@
           "request": {
             "description": "Get a list of scores",
             "url": {
-              "raw": "{{baseUrl}}/api/public/scores?page=&limit=&userId=&name=&fromTimestamp=",
+              "raw": "{{baseUrl}}/api/public/scores?page=&limit=&userId=&name=&fromTimestamp=&source=&operator=&value=",
               "host": [
                 "{{baseUrl}}"
               ],
@@ -697,12 +768,12 @@
                 {
                   "key": "page",
                   "value": "",
-                  "description": "page number, starts at 1"
+                  "description": "Page number, starts at 1."
                 },
                 {
                   "key": "limit",
                   "value": "",
-                  "description": "limit of items per page"
+                  "description": "Limit of items per page. If you encounter api issues due to too large page sizes, try to reduce the limit."
                 },
                 {
                   "key": "userId",
@@ -718,6 +789,21 @@
                   "key": "fromTimestamp",
                   "value": "",
                   "description": "Retrieve only scores newer than this timestamp."
+                },
+                {
+                  "key": "source",
+                  "value": "",
+                  "description": "Retrieve only scores from a specific source."
+                },
+                {
+                  "key": "operator",
+                  "value": "",
+                  "description": "Retrieve only scores with <operator> value."
+                },
+                {
+                  "key": "value",
+                  "value": "",
+                  "description": "Retrieve only scores with <operator> value."
                 }
               ],
               "variable": []
@@ -875,7 +961,7 @@
           "_type": "endpoint",
           "name": "List",
           "request": {
-            "description": "Get list of traces",
+            "description": "Get list of traces.",
             "url": {
               "raw": "{{baseUrl}}/api/public/traces?page=&limit=&userId=&name=&fromTimestamp=&orderBy=&tags=",
               "host": [
@@ -890,12 +976,12 @@
                 {
                   "key": "page",
                   "value": "",
-                  "description": "page number, starts at 1"
+                  "description": "Page number, starts at 1"
                 },
                 {
                   "key": "limit",
                   "value": "",
-                  "description": "limit of items per page"
+                  "description": "Limit of items per page. If you encounter api issues due to too large page sizes, try to reduce the limit."
                 },
                 {
                   "key": "userId",

package.json

@@ -1,11 +1,12 @@
 {
   "name": "langfuse",
-  "version": "2.26.1",
+  "version": "2.37.0",
   "author": "engineering@langfuse.com",
   "license": "MIT",
   "private": true,
   "engines": {
-    "node": ">=20"
+    "node": ">=20",
+    "pnpm": "<9"
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",

packages/config-eslint/package.json

@@ -9,7 +9,7 @@
   ],
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.6.0",
+    "@typescript-eslint/parser": "^7.7.0",
     "@vercel/style-guide": "^6.0.0",
     "eslint-config-next": "^14.2.1",
     "eslint-config-prettier": "^9.1.0",

packages/shared/package.json

@@ -20,6 +20,10 @@
     "./src/server/auth": {
       "import": "./dist/src/server/auth.js",
       "require": "./dist/src/server/auth.js"
+    },
+    "./encryption": {
+      "import": "./dist/src/encryption/index.js",
+      "require": "./dist/src/encryption/index.js"
     }
   },
   "scripts": {
@@ -28,6 +32,7 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "lint:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "db:migrate": "DISABLE_ERD=false dotenv -e ../../.env -- npx prisma migrate dev",
+    "db:push": "DISABLE_ERD=false dotenv -e ../../.env -- npx prisma db push",
     "db:reset": "dotenv -e ../../.env npx -- prisma migrate reset",
     "db:deploy": "dotenv -e ../../.env npx -- prisma migrate deploy",
     "db:seed": "dotenv -e ../../.env -- npx prisma db seed",
@@ -40,7 +45,7 @@
   },
   "dependencies": {
     "@langchain/anthropic": "^0.1.14",
-    "@langchain/core": "^0.1.57",
+    "@langchain/core": "^0.1.58",
     "@langchain/openai": "^0.0.28",
     "@prisma/client": "^5.12.1",
     "@types/bcryptjs": "^2.4.6",
@@ -58,7 +63,7 @@
     "@types/node": "^20.11.29",
     "@types/pg": "^8.11.5",
     "@types/uuid": "^9.0.8",
-    "@typescript-eslint/parser": "^7.6.0",
+    "@typescript-eslint/parser": "^7.7.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.1.0",
@@ -72,6 +77,6 @@
     "ts-node": "^10.9.2",
     "tsc-watch": "^6.2.0",
     "typescript": "^5.4.5",
-    "vitest": "^1.3.1"
+    "vitest": "^1.5.0"
   }
 }

packages/shared/prisma/generated/types.ts

@@ -113,6 +113,7 @@ export type Dataset = {
     id: string;
     name: string;
     description: string | null;
+    metadata: unknown | null;
     project_id: string;
     created_at: Generated<Timestamp>;
     updated_at: Generated<Timestamp>;
@@ -122,6 +123,7 @@ export type DatasetItem = {
     status: Generated<DatasetStatus>;
     input: unknown | null;
     expected_output: unknown | null;
+    metadata: unknown | null;
     source_trace_id: string | null;
     source_observation_id: string | null;
     dataset_id: string;
@@ -197,6 +199,15 @@ export type JobExecution = {
     job_input_trace_id: string | null;
     job_output_score_id: string | null;
 };
+export type LlmApiKeys = {
+    id: string;
+    created_at: Generated<Timestamp>;
+    updated_at: Generated<Timestamp>;
+    provider: string;
+    display_secret_key: string;
+    secret_key: string;
+    project_id: string;
+};
 export type Membership = {
     project_id: string;
     user_id: string;
@@ -290,6 +301,14 @@ export type ObservationView = {
     calculated_total_cost: string | null;
     latency: number | null;
 };
+export type PosthogIntegration = {
+    project_id: string;
+    encrypted_posthog_api_key: string;
+    posthog_host_name: string;
+    last_sync_at: Timestamp | null;
+    enabled: boolean;
+    created_at: Generated<Timestamp>;
+};
 export type Pricing = {
     id: string;
     model_name: string;
@@ -315,9 +334,10 @@ export type Prompt = {
     name: string;
     version: number;
     type: Generated<string>;
-    is_active: boolean;
+    is_active: boolean | null;
     config: Generated<unknown>;
     tags: Generated<string[]>;
+    labels: Generated<string[]>;
 };
 export type Score = {
     id: string;
@@ -335,6 +355,13 @@ export type Session = {
     user_id: string;
     expires: Timestamp;
 };
+export type SsoConfig = {
+    domain: string;
+    created_at: Generated<Timestamp>;
+    updated_at: Generated<Timestamp>;
+    auth_provider: string;
+    auth_config: unknown | null;
+};
 export type Trace = {
     id: string;
     external_id: string | null;
@@ -408,16 +435,19 @@ export type DB = {
     events: Events;
     job_configurations: JobConfiguration;
     job_executions: JobExecution;
+    llm_api_keys: LlmApiKeys;
     membership_invitations: MembershipInvitation;
     memberships: Membership;
     models: Model;
     observations: Observation;
     observations_view: ObservationView;
+    posthog_integrations: PosthogIntegration;
     pricings: Pricing;
     projects: Project;
     prompts: Prompt;
     scores: Score;
     Session: Session;
+    sso_configs: SsoConfig;
     trace_sessions: TraceSession;
     traces: Trace;
     traces_view: TraceView;

packages/shared/prisma/migrations/20240414203636_ee_add_sso_configs/migration.sql

@@ -0,0 +1,10 @@
+-- CreateTable
+CREATE TABLE "sso_configs" (
+    "domain" TEXT NOT NULL,
+    "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "auth_provider" TEXT NOT NULL,
+    "auth_config" JSONB,
+
+    CONSTRAINT "sso_configs_pkey" PRIMARY KEY ("domain")
+);

packages/shared/prisma/migrations/20240415235737_index_models_model_name/migration.sql

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

packages/shared/prisma/migrations/20240416173813_add_internal_model_index/migration.sql

@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX CONCURRENTLY "observations_internal_model_idx" ON "observations"("internal_model");

packages/shared/prisma/migrations/20240417102742_metadata_on_dataset_and_dataset_item/migration.sql

@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "dataset_items" ADD COLUMN     "metadata" JSONB;
+
+-- AlterTable
+ALTER TABLE "datasets" ADD COLUMN     "metadata" JSONB;

packages/shared/prisma/migrations/20240419152924_posthog_integration_settings/migration.sql

@@ -0,0 +1,16 @@
+-- CreateTable
+CREATE TABLE "posthog_integrations" (
+    "project_id" TEXT NOT NULL,
+    "encrypted_posthog_api_key" TEXT NOT NULL,
+    "posthog_host_name" TEXT NOT NULL,
+    "last_sync_at" TIMESTAMP(3),
+    "enabled" BOOLEAN NOT NULL,
+
+    CONSTRAINT "posthog_integrations_pkey" PRIMARY KEY ("project_id")
+);
+
+-- CreateIndex
+CREATE INDEX "posthog_integrations_project_id_idx" ON "posthog_integrations"("project_id");
+
+-- AddForeignKey
+ALTER TABLE "posthog_integrations" ADD CONSTRAINT "posthog_integrations_project_id_fkey" FOREIGN KEY ("project_id") REFERENCES "projects"("id") ON DELETE CASCADE ON UPDATE CASCADE;

packages/shared/prisma/migrations/20240420134232_posthog_integration_created_at/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "posthog_integrations" ADD COLUMN     "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;

packages/shared/prisma/migrations/20240423174013_update_models/migration.sql

@@ -0,0 +1,26 @@
+DELETE FROM models WHERE id = 'cluv2t5k3000508ih5kve9zag';
+DELETE FROM models WHERE id = 'clrkvq6iq000008ju6c16gynt';
+
+INSERT INTO models (
+  id,
+  project_id,
+  model_name,
+  match_pattern,
+  start_date,
+  input_price,
+  output_price,
+  total_price,
+  unit,
+  tokenizer_id,
+  tokenizer_config
+)
+VALUES
+  -- updating tokenizer model to gpt-4-turbo-2024-04-09
+  ('cluv2t5k3000508ih5kve9zag', NULL, 'gpt-4-turbo-2024-04-09', '(?i)^(gpt-4-turbo-2024-04-09)$', NULL, 0.00001, 0.00003, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4-turbo-2024-04-09" }'),
+  
+  -- update gpt-4-1106-preview naming replacing gpt-4-turbo
+  ('clrkvq6iq000008ju6c16gynt', NULL, 'gpt-4-1106-preview', '(?i)^(gpt-4-1106-preview)$', NULL, 0.00001, 0.00003, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4-1106-preview" }'),
+  
+  -- apparently azure supports gpt-4-preview
+  ('clv2o2x0p000008jsf9afceau', NULL, ' gpt-4-preview', '(?i)^(gpt-4-preview)$',  NULL, 0.00001, 0.00003, NULL, 'TOKENS', 'openai', '{ "tokensPerMessage": 3, "tokensPerName": 1, "tokenizerModel": "gpt-4-turbo-preview" }')
+  

packages/shared/prisma/migrations/20240423192655_add_llm_api_keys/migration.sql

@@ -0,0 +1,24 @@
+-- CreateTable
+CREATE TABLE "llm_api_keys" (
+    "id" TEXT NOT NULL,
+    "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "provider" TEXT NOT NULL,
+    "display_secret_key" TEXT NOT NULL,
+    "secret_key" TEXT NOT NULL,
+    "project_id" TEXT NOT NULL,
+
+    CONSTRAINT "llm_api_keys_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "llm_api_keys_id_key" ON "llm_api_keys"("id");
+
+-- CreateIndex
+CREATE INDEX "llm_api_keys_project_id_provider_idx" ON "llm_api_keys"("project_id", "provider");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "llm_api_keys_project_id_provider_key" ON "llm_api_keys"("project_id", "provider");
+
+-- AddForeignKey
+ALTER TABLE "llm_api_keys" ADD CONSTRAINT "llm_api_keys_project_id_fkey" FOREIGN KEY ("project_id") REFERENCES "projects"("id") ON DELETE CASCADE ON UPDATE CASCADE;

packages/shared/prisma/migrations/20240424150909_add_job_execution_index/migration.sql

@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX "job_executions_project_id_status_idx" ON "job_executions"("project_id", "status");

packages/shared/prisma/migrations/20240429124411_add_prompt_version_labels/migration.sql

@@ -0,0 +1,16 @@
+BEGIN;
+
+-- Step 1: Alter the 'prompts' table to add the 'labels' column
+ALTER TABLE prompts
+ADD COLUMN labels TEXT[] DEFAULT ARRAY[]::TEXT[];
+
+-- Step 2: Update the 'labels' column to include 'production' for active prompts
+UPDATE prompts
+SET labels = array_append(labels, 'production')
+WHERE is_active = TRUE;
+
+-- Step 3: Drop the required constraint on 'is_active' column.
+ALTER TABLE prompts
+ALTER COLUMN is_active DROP NOT NULL;
+
+COMMIT;

packages/shared/prisma/migrations/20240429194411_add_latest_prompt_tag/migration.sql

@@ -0,0 +1,15 @@
+UPDATE
+	prompts
+SET
+	labels = array_append(labels, 'latest')
+WHERE
+	id = (
+		SELECT
+			id
+		FROM
+			prompts AS p2
+		WHERE
+			p2.name = prompts.name
+		ORDER BY
+			created_at DESC
+		LIMIT 1);

packages/shared/prisma/schema.prisma

@@ -92,25 +92,27 @@ model VerificationToken {
 }
 
 model Project {
-    id               String                 @id @default(cuid())
-    createdAt        DateTime               @default(now()) @map("created_at")
-    updatedAt        DateTime               @default(now()) @updatedAt @map("updated_at")
-    name             String
-    cloudConfig      Json?                  @map("cloud_config") // Langfuse Cloud, for zod schema see projectsRouter.ts
-    members          Membership[]
-    traces           Trace[]
-    observations     Observation[]
-    apiKeys          ApiKey[]
-    dataset          Dataset[]
-    RawEvents        Events[]
-    invitations      MembershipInvitation[]
-    sessions         TraceSession[]
-    Prompt           Prompt[]
-    Model            Model[]
-    AuditLog         AuditLog[]
-    EvalTemplate     EvalTemplate[]
-    JobConfiguration JobConfiguration[]
-    JobExecution     JobExecution[]
+    id                 String                 @id @default(cuid())
+    createdAt          DateTime               @default(now()) @map("created_at")
+    updatedAt          DateTime               @default(now()) @updatedAt @map("updated_at")
+    name               String
+    cloudConfig        Json?                  @map("cloud_config") // Langfuse Cloud, for zod schema see projectsRouter.ts
+    members            Membership[]
+    traces             Trace[]
+    observations       Observation[]
+    apiKeys            ApiKey[]
+    dataset            Dataset[]
+    RawEvents          Events[]
+    invitations        MembershipInvitation[]
+    sessions           TraceSession[]
+    Prompt             Prompt[]
+    Model              Model[]
+    AuditLog           AuditLog[]
+    EvalTemplate       EvalTemplate[]
+    JobConfiguration   JobConfiguration[]
+    JobExecution       JobExecution[]
+    LlmApiKeys         LlmApiKeys[]
+    PosthogIntegration PosthogIntegration[]
 
     @@map("projects")
 }
@@ -135,6 +137,23 @@ model ApiKey {
     @@map("api_keys")
 }
 
+model LlmApiKeys {
+    id        String   @id @unique @default(cuid())
+    createdAt DateTime @default(now()) @map("created_at")
+    updatedAt DateTime @default(now()) @updatedAt @map("updated_at")
+
+    provider         String
+    displaySecretKey String @map("display_secret_key")
+    secretKey        String @map("secret_key")
+
+    projectId String  @map("project_id")
+    project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade)
+
+    @@unique([projectId, provider])
+    @@index([projectId, provider])
+    @@map("llm_api_keys")
+}
+
 model Membership {
     projectId String         @map("project_id")
     project   Project        @relation(fields: [projectId], references: [id], onDelete: Cascade)
@@ -302,6 +321,7 @@ model Observation {
     @@index(projectId)
     @@index(parentObservationId)
     @@index(model)
+    @@index(internalModel)
     @@index(promptId)
     @@index([projectId, startTime, type])
     @@map("observations")
@@ -429,6 +449,7 @@ model Dataset {
     id           String        @id @default(cuid())
     name         String
     description  String?
+    metadata     Json?
     projectId    String        @map("project_id")
     project      Project       @relation(fields: [projectId], references: [id], onDelete: Cascade)
     createdAt    DateTime      @default(now()) @map("created_at")
@@ -446,6 +467,7 @@ model DatasetItem {
     status              DatasetStatus     @default(ACTIVE)
     input               Json?
     expectedOutput      Json?             @map("expected_output")
+    metadata            Json?
     sourceTraceId       String?           @map("source_trace_id")
     sourceTrace         Trace?            @relation(fields: [sourceTraceId], references: [id], onDelete: SetNull)
     sourceObservationId String?           @map("source_observation_id")
@@ -531,9 +553,10 @@ model Prompt {
     name        String
     version     Int
     type        String        @default("text")
-    isActive    Boolean       @map("is_active")
+    isActive    Boolean?      @map("is_active") // Deprecated. To be removed once 'production' labels work as expected.
     config      Json          @default("{}")
     tags        String[]      @default([])
+    labels      String[]      @default([])
     Observation Observation[]
 
     @@unique([projectId, name, version])
@@ -566,6 +589,7 @@ model Model {
     @@unique([projectId, modelName, startDate, unit])
     @@index([projectId, modelName, startDate, unit])
     @@index([projectId, modelName])
+    @@index(modelName)
     @@map("models")
 }
 
@@ -676,7 +700,36 @@ model JobExecution {
     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])
     @@index([projectId])
     @@map("job_executions")
 }
+
+// Single Sign-On configuration for a domain
+// This feature is part of the Enterprise Edition
+model SsoConfig {
+    domain       String   @id @default(cuid()) // e.g. "google.com"
+    createdAt    DateTime @default(now()) @map("created_at")
+    updatedAt    DateTime @default(now()) @updatedAt @map("updated_at")
+    authProvider String   @map("auth_provider") // e.g. "okta", ee/sso/types.ts
+
+    authConfig Json? @map("auth_config")
+    // e.g. { "clientId": "1234", "clientSecret": "5678" }, null if credentials from env should be used
+    // secrets like clientSecret are encrypted on the application level
+
+    @@map("sso_configs")
+}
+
+model PosthogIntegration {
+    projectId              String    @id @map("project_id")
+    project                Project   @relation(fields: [projectId], references: [id], onDelete: Cascade)
+    encryptedPosthogApiKey String    @map("encrypted_posthog_api_key")
+    posthogHostName        String    @map("posthog_host_name")
+    lastSyncAt             DateTime? @map("last_sync_at")
+    enabled                Boolean
+    createdAt              DateTime  @default(now()) @map("created_at")
+
+    @@index([projectId])
+    @@map("posthog_integrations")
+}

packages/shared/prisma/seed.ts

@@ -72,7 +72,7 @@ async function main() {
       name: "summary-prompt",
       project: { connect: { id: seedProjectId } },
       prompt: "prompt {{variable}} {{anotherVariable}}",
-      isActive: true,
+      labels: ["production"],
       version: 1,
       createdBy: "user-1",
     },
@@ -240,6 +240,7 @@ async function main() {
           description:
             datasetNumber === 0 ? "Dataset test description" : undefined,
           projectId: project2.id,
+          metadata: datasetNumber === 0 ? { key: "value" } : undefined,
         },
       });
 
@@ -268,6 +269,7 @@ async function main() {
               Math.random() > 0.3
                 ? "Creating a React component can be done in two ways: as a functional component or as a class component. Let's start with a basic example of both."
                 : undefined,
+            metadata: Math.random() > 0.5 ? { key: "value" } : undefined,
           },
         });
         datasetItemIds.push(datasetItem.id);
@@ -762,7 +764,7 @@ async function generatePrompts(project: Project) {
       prompt: "Prompt 1 content",
       name: "Prompt 1",
       version: 1,
-      isActive: true,
+      labels: ["production"],
     },
     {
       id: `prompt-${v4()}`,
@@ -771,7 +773,7 @@ async function generatePrompts(project: Project) {
       prompt: "Prompt 2 content",
       name: "Prompt 2",
       version: 1,
-      isActive: true,
+      labels: ["production"],
     },
     {
       id: `prompt-${v4()}`,
@@ -780,7 +782,7 @@ async function generatePrompts(project: Project) {
       prompt: "Prompt 3 content",
       name: "Prompt 3 by API",
       version: 1,
-      isActive: true,
+      labels: ["production"],
     },
     {
       id: `prompt-${v4()}`,
@@ -789,7 +791,7 @@ async function generatePrompts(project: Project) {
       prompt: "Prompt 4 content",
       name: "Prompt 4",
       version: 1,
-      isActive: true,
+      labels: ["production"],
       tags: ["tag1", "tag2"],
     },
   ];
@@ -810,7 +812,7 @@ async function generatePrompts(project: Project) {
         prompt: prompt.prompt,
         name: prompt.name,
         version: prompt.version,
-        isActive: prompt.isActive,
+        labels: prompt.labels,
         tags: prompt.tags,
       },
       update: {
@@ -831,7 +833,6 @@ async function generatePrompts(project: Project) {
         temperature: 0.7,
       },
       version: 1,
-      isActive: false,
     },
     {
       id: `prompt-${v4()}`,
@@ -844,7 +845,7 @@ async function generatePrompts(project: Project) {
         topP: 0.9,
       },
       version: 2,
-      isActive: true,
+      labels: ["production"],
     },
     {
       id: `prompt-${v4()}`,
@@ -858,7 +859,6 @@ async function generatePrompts(project: Project) {
         frequencyPenalty: 0.5,
       },
       version: 3,
-      isActive: false,
     },
   ];
 
@@ -879,7 +879,7 @@ async function generatePrompts(project: Project) {
         name: version.name,
         config: version.config,
         version: version.version,
-        isActive: version.isActive,
+        labels: version.labels,
       },
       update: {
         id: version.id,
@@ -908,7 +908,7 @@ async function generatePrompts(project: Project) {
         prompt: `${promptName} version ${i} content`,
         name: promptName,
         version: i,
-        isActive: i === 20,
+        labels: i === 20 ? ["production"] : [],
       },
       update: {
         id: promptId,

packages/shared/src/encryption/index.ts

@@ -0,0 +1,58 @@
+import crypto from "crypto";
+import { env } from "../env";
+
+const ENCRYPTION_KEY: string = env.ENCRYPTION_KEY || ""; // Must be 256 bits (32 bytes, 64 hex characters)
+const IV_LENGTH: number = 16; // For AES, this is always 16
+
+// Alternatively: openssl rand -hex 32
+export function keyGen() {
+  return crypto.randomBytes(32).toString("hex");
+}
+
+/**
+ * Encrypts the given plain text using AES-256-GCM algorithm.
+ *
+ * @param {string} plainText - The text to encrypt.
+ * @param {string} [keyHex=ENCRYPTION_KEY] - The encryption key in hexadecimal format.
+ * @returns {string} The encrypted data in hex format, including IV and authentication tag.
+ */
+export function encrypt(
+  plainText: string,
+  keyHex: string = ENCRYPTION_KEY
+): string {
+  const iv = crypto.randomBytes(IV_LENGTH); // Directly use Buffer returned by randomBytes
+  const cipher = crypto.createCipheriv(
+    "aes-256-gcm",
+    Buffer.from(keyHex, "hex"),
+    iv
+  );
+  let encrypted = cipher.update(plainText, "utf8", "hex");
+  encrypted += cipher.final("hex");
+  const authTag = cipher.getAuthTag();
+
+  // Return iv, encrypted data, and authTag as hex, combined in one line
+  return iv.toString("hex") + ":" + encrypted + ":" + authTag.toString("hex");
+}
+
+export function decrypt(text: string, keyHex: string = ENCRYPTION_KEY): string {
+  const [ivHex, encryptedHex, authTagHex] = text.split(":");
+  if (!ivHex || !encryptedHex || !authTagHex) {
+    throw new Error("Invalid or corrupted cipher format");
+  }
+
+  const iv = Buffer.from(ivHex, "hex");
+  const encryptedText = Buffer.from(encryptedHex, "hex");
+  const authTag = Buffer.from(authTagHex, "hex");
+
+  const decipher = crypto.createDecipheriv(
+    "aes-256-gcm",
+    Buffer.from(keyHex, "hex"),
+    iv
+  );
+  decipher.setAuthTag(authTag);
+
+  let decrypted = decipher.update(encryptedText, undefined, "utf8");
+  decrypted += decipher.final("utf8");
+
+  return decrypted.toString();
+}

packages/shared/src/env.ts

@@ -0,0 +1,13 @@
+import { z } from "zod";
+
+const EnvSchema = z.object({
+  ENCRYPTION_KEY: z
+    .string()
+    .length(
+      64,
+      "ENCRYPTION_KEY must be 256 bits, 64 string characters in hex format, generate via: openssl rand -hex 32"
+    )
+    .optional(),
+});
+
+export const env = EnvSchema.parse(process.env);

packages/shared/src/errors/ApiError.ts

@@ -0,0 +1,7 @@
+import { BaseError } from "./BaseError";
+
+export class ApiError extends BaseError {
+  constructor(description = "Api call failed") {
+    super("ApiError", 500, description, true);
+  }
+}

packages/shared/src/errors/BaseError.ts

@@ -7,7 +7,7 @@ export class BaseError extends Error {
     name: string,
     httpCode: number,
     description: string,
-    isOperational: boolean,
+    isOperational: boolean
   ) {
     super(description);
     Object.setPrototypeOf(this, new.target.prototype); // restore prototype chain

packages/shared/src/errors/NotFoundError.ts

@@ -0,0 +1,7 @@
+import { BaseError } from "./BaseError";
+
+export class LangfuseNotFoundError extends BaseError {
+  constructor(description = "Not Found") {
+    super("LangfuseNotFoundError", 404, description, true);
+  }
+}

packages/shared/src/errors/index.ts

@@ -1,6 +1,7 @@
 export { BaseError } from "./BaseError";
-export { NotFoundError } from "./NotFoundError";
+export { LangfuseNotFoundError } from "./NotFoundError";
 export { ValidationError } from "./ValidationError";
 export { UnauthorizedError } from "./UnauthorizedError";
 export { ForbiddenError } from "./ForbiddenError";
 export { MethodNotAllowedError } from "./MethodNotAllowedError";
+export { ApiError } from "./ApiError";

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

@@ -1,5 +1,5 @@
 import z from "zod";
-import { ModelProvider, observationsTableCols } from "../..";
+import { ModelProvider } from "../..";
 
 export const langfuseObjects = [
   "trace",
@@ -34,6 +34,17 @@ export const wipVariableMapping = z.object({
   selectedColumnId: z.string().nullish(),
 });
 
+const observationCols = [
+  {
+    name: "Metadata",
+    id: "metadata",
+    type: "stringObject",
+    internal: 'o."metadata"',
+  },
+  { name: "Input", id: "input", internal: 'o."input"' },
+  { name: "Output", id: "output", internal: 'o."output"' },
+];
+
 export const availableEvalVariables = [
   {
     id: "trace",
@@ -52,32 +63,18 @@ export const availableEvalVariables = [
   {
     id: "span",
     display: "Span",
-    availableColumns: [
-      {
-        name: "Metadata",
-        id: "metadata",
-        type: "stringObject",
-        internal: 'o."metadata"',
-      },
-      { name: "Input", id: "input", internal: 'o."input"' },
-      { name: "Output", id: "output", internal: 'o."output"' },
-    ],
+    availableColumns: observationCols,
   },
   {
     id: "generation",
     display: "Generation",
-    availableColumns: [
-      {
-        name: "Metadata",
-        id: "metadata",
-        type: "stringObject",
-        internal: 'o."metadata"',
-      },
-      { name: "Input", id: "input", internal: 'o."input"' },
-      { name: "Output", id: "output", internal: 'o."output"' },
-    ],
+    availableColumns: observationCols,
+  },
+  {
+    id: "event",
+    display: "Event",
+    availableColumns: observationCols,
   },
-  { id: "event", display: "Event", availableColumns: observationsTableCols },
 ];
 
 export const evalLLMModels = [

packages/shared/src/index.ts

@@ -9,6 +9,7 @@ export * from "./filterToPrisma";
 export * from "./tracesTable";
 export * from "./server/auth";
 export * from "./observationsTable";
+export { env } from "./env";
 
 // llm api
 export * from "./server/llm/types";
@@ -20,3 +21,6 @@ export * from "./features/evals/types";
 // export db types only
 export * from "@prisma/client";
 export { type DB } from "../prisma/generated/types";
+
+// errors
+export * from "./errors/index";

packages/shared/src/server/auth.ts

@@ -15,6 +15,7 @@ export function getDisplaySecretKey(secretKey: string) {
 }
 
 export async function hashSecretKey(key: string) {
+  // legacy, uses bcrypt, transformed into hashed key upon first use
   const hashedKey = await hash(key, 11);
   return hashedKey;
 }

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

@@ -4,6 +4,7 @@ import {
   HumanMessage,
   SystemMessage,
 } from "@langchain/core/messages";
+import type { BaseCallbackHandler } from "@langchain/core/callbacks/base";
 import {
   BytesOutputParser,
   StringOutputParser,
@@ -25,6 +26,8 @@ type LLMCompletionParams = {
   messages: ChatMessage[];
   modelParams: ModelParams;
   functionCall?: LLMFunctionCall;
+  callbacks?: BaseCallbackHandler[];
+  apiKey?: string;
 };
 
 type FetchLLMCompletionParams = LLMCompletionParams & {
@@ -34,14 +37,12 @@ type FetchLLMCompletionParams = LLMCompletionParams & {
 export async function fetchLLMCompletion(
   params: LLMCompletionParams & {
     streaming: true;
-    functionCall: undefined;
   }
 ): Promise<IterableReadableStream<Uint8Array>>;
 
 export async function fetchLLMCompletion(
   params: LLMCompletionParams & {
     streaming: false;
-    functionCall: undefined;
   }
 ): Promise<string>;
 
@@ -55,7 +56,8 @@ export async function fetchLLMCompletion(
 export async function fetchLLMCompletion(
   params: FetchLLMCompletionParams
 ): Promise<string | IterableReadableStream<Uint8Array> | unknown> {
-  const { messages, modelParams, streaming } = params;
+  // the apiKey must never be printed to the console
+  const { messages, modelParams, streaming, callbacks, apiKey } = params;
   const finalMessages = messages.map((message) => {
     if (message.role === ChatMessageRole.User)
       return new HumanMessage(message.content);
@@ -68,20 +70,26 @@ export async function fetchLLMCompletion(
   let chatModel: ChatOpenAI | ChatAnthropic;
   if (modelParams.provider === ModelProvider.Anthropic) {
     chatModel = new ChatAnthropic({
-      anthropicApiKey: process.env.ANTHROPIC_API_KEY,
+      anthropicApiKey: apiKey,
       modelName: modelParams.model,
       temperature: modelParams.temperature,
       maxTokens: modelParams.max_tokens,
       topP: modelParams.top_p,
+      callbacks,
+    });
+  } else if (modelParams.provider === ModelProvider.OpenAI) {
+    chatModel = new ChatOpenAI({
+      openAIApiKey: apiKey,
+      modelName: modelParams.model,
+      temperature: modelParams.temperature,
+      maxTokens: modelParams.max_tokens,
+      topP: modelParams.top_p,
+      callbacks,
     });
   } else {
-    chatModel = new ChatOpenAI({
-      openAIApiKey: process.env.OPENAI_API_KEY,
-      modelName: modelParams.model,
-      temperature: modelParams.temperature,
-      maxTokens: modelParams.max_tokens,
-      topP: modelParams.top_p,
-    });
+    // eslint-disable-next-line no-unused-vars
+    const _exhaustiveCheck: never = modelParams;
+    throw new Error("This model provider is not supported.");
   }
 
   console.log("Making LLM call with params: ", modelParams);

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

@@ -13,6 +13,7 @@ export enum ModelProvider {
   Anthropic = "anthropic",
   OpenAI = "openai",
 }
+
 export enum ChatMessageRole {
   System = "system",
   User = "user",

packages/shared/src/tracesTable.ts

@@ -1,8 +1,13 @@
 import { ObservationLevel } from "@prisma/client";
 import { ColumnDefinition, OptionsDefinition } from ".";
 
-export const tracesTableCols: ColumnDefinition[] = [
-  { name: "⭐️", id: "bookmarked", type: "boolean", internal: "t.bookmarked" },
+const tracesOnlyCols: ColumnDefinition[] = [
+  {
+    name: "⭐️",
+    id: "bookmarked",
+    type: "boolean",
+    internal: "t.bookmarked",
+  },
   { name: "ID", id: "id", type: "string", internal: "t.id" },
   {
     name: "Name",
@@ -24,6 +29,41 @@ export const tracesTableCols: ColumnDefinition[] = [
     type: "string",
     internal: 't."session_id"',
   },
+  {
+    name: "Metadata",
+    id: "metadata",
+    type: "stringObject",
+    internal: 't."metadata"',
+  },
+  {
+    name: "Version",
+    id: "version",
+    type: "string",
+    internal: 't."version"',
+  },
+  {
+    name: "Release",
+    id: "release",
+    type: "string",
+    internal: 't."release"',
+  },
+  {
+    name: "Level",
+    id: "level",
+    type: "stringOptions",
+    internal: '"level"',
+    options: Object.values(ObservationLevel).map((value) => ({ value })),
+  },
+  {
+    name: "Tags",
+    id: "tags",
+    type: "arrayOptions",
+    internal: 't."tags"',
+    options: [], // to be filled in at runtime
+  },
+];
+export const tracesTableCols: ColumnDefinition[] = [
+  ...tracesOnlyCols,
   {
     name: "Input Tokens",
     id: "inputTokens",
@@ -48,12 +88,7 @@ export const tracesTableCols: ColumnDefinition[] = [
     type: "number",
     internal: 'tm."totalTokens"',
   },
-  {
-    name: "Metadata",
-    id: "metadata",
-    type: "stringObject",
-    internal: 't."metadata"',
-  },
+
   {
     name: "Scores",
     id: "scores_avg",
@@ -84,34 +119,10 @@ export const tracesTableCols: ColumnDefinition[] = [
     type: "number",
     internal: '"calculatedTotalCost"',
   },
-  {
-    name: "Version",
-    id: "version",
-    type: "string",
-    internal: 't."version"',
-  },
-  {
-    name: "Release",
-    id: "release",
-    type: "string",
-    internal: 't."release"',
-  },
-  {
-    name: "Level",
-    id: "level",
-    type: "stringOptions",
-    internal: '"level"',
-    options: Object.values(ObservationLevel).map((value) => ({ value })),
-  },
-  {
-    name: "Tags",
-    id: "tags",
-    type: "arrayOptions",
-    internal: 't."tags"',
-    options: [], // to be filled in at runtime
-  },
 ];
 
+export const evalTableCols: ColumnDefinition[] = tracesOnlyCols;
+
 export type TraceOptions = {
   scores_avg: Array<string>;
   name: Array<OptionsDefinition>;
@@ -119,9 +130,10 @@ export type TraceOptions = {
 };
 
 export function tracesTableColsWithOptions(
-  options?: TraceOptions
+  options?: TraceOptions,
+  cols: ColumnDefinition[] = tracesTableCols
 ): ColumnDefinition[] {
-  return tracesTableCols.map((col) => {
+  return cols.map((col) => {
     if (col.id === "scores_avg") {
       return { ...col, keyOptions: options?.scores_avg ?? [] };
     }

packages/shared/tsconfig.json

@@ -7,7 +7,7 @@
     "outDir": "./dist",
     "types": ["node"],
     "target": "ES2020",
-    "rootDir": ".",
+    "rootDir": "."
   },
   "include": ["."],
   "exclude": ["node_modules", "dist"]

pnpm-workspace.yaml

@@ -3,3 +3,4 @@ packages:
   - "web"
   - "worker"
   - "packages/**"
+  - "ee"

web/Dockerfile

@@ -5,10 +5,11 @@ FROM node:20-alpine AS alpine
 RUN apk update && apk upgrade --no-cache libcrypto3 libssl3 libc6-compat
 
 FROM alpine AS base
-RUN npm install pnpm turbo --global
+RUN npm install turbo --global
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
+RUN corepack prepare pnpm@8.15.5 --activate
 
 
 FROM base AS pruner

web/generated/openapi-server/openapi.yml

@@ -482,6 +482,24 @@ paths:
             items:
               type: string
               nullable: true
+        - name: fromTimestamp
+          in: query
+          description: >-
+            Optional filter to only include traces on or after a certain
+            timestamp
+          required: false
+          schema:
+            type: string
+            format: date-time
+            nullable: true
+        - name: toTimestamp
+          in: query
+          description: Optional filter to only include traces before a certain timestamp
+          required: false
+          schema:
+            type: string
+            format: date-time
+            nullable: true
       responses:
         '200':
           description: ''
@@ -572,14 +590,16 @@ paths:
       parameters:
         - name: page
           in: query
-          description: page number, starts at 1
+          description: Page number, starts at 1.
           required: false
           schema:
             type: integer
             nullable: true
         - name: limit
           in: query
-          description: limit of items per page
+          description: >-
+            Limit of items per page. If you encounter api issues due to too
+            large page sizes, try to reduce the limit.
           required: false
           schema:
             type: integer
@@ -697,15 +717,16 @@ paths:
             application/json:
               schema: {}
       security: *ref_0
-  /api/public/prompts:
+  /api/public/v2/prompts/{promptName}:
     get:
       description: Get a prompt
       operationId: prompts_get
       tags:
         - Prompts
       parameters:
-        - name: name
-          in: query
+        - name: promptName
+          in: path
+          description: The name of the prompt
           required: true
           schema:
             type: string
@@ -715,13 +736,89 @@ paths:
           schema:
             type: integer
             nullable: true
+        - name: label
+          in: query
+          required: false
+          schema:
+            type: string
+            nullable: true
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Prompt'
+        '400':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '401':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '403':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '404':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+        '405':
+          description: ''
+          content:
+            application/json:
+              schema: {}
+      security: *ref_0
+  /api/public/v2/prompts:
+    get:
+      description: Get a list of prompt names with versions and labels
+      operationId: prompts_list
+      tags:
+        - Prompts
+      parameters:
+        - name: name
+          in: query
+          required: false
+          schema:
+            type: string
+            nullable: true
+        - name: label
+          in: query
+          required: false
+          schema:
+            type: string
+            nullable: true
+        - name: tag
+          in: query
+          required: false
+          schema:
+            type: string
+            nullable: true
+        - name: page
+          in: query
+          required: false
+          schema:
+            type: integer
+            nullable: true
+        - name: limit
+          in: query
+          required: false
+          schema:
+            type: integer
+            nullable: true
       responses:
         '200':
           description: ''
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Prompt'
+                $ref: '#/components/schemas/PromptMetaListResponse'
         '400':
           description: ''
           content:
@@ -847,14 +944,16 @@ paths:
       parameters:
         - name: page
           in: query
-          description: page number, starts at 1
+          description: Page number, starts at 1.
           required: false
           schema:
             type: integer
             nullable: true
         - name: limit
           in: query
-          description: limit of items per page
+          description: >-
+            Limit of items per page. If you encounter api issues due to too
+            large page sizes, try to reduce the limit.
           required: false
           schema:
             type: integer
@@ -879,6 +978,27 @@ paths:
             type: string
             format: date-time
             nullable: true
+        - name: source
+          in: query
+          description: Retrieve only scores from a specific source.
+          required: true
+          schema:
+            $ref: '#/components/schemas/ScoreSource'
+        - name: operator
+          in: query
+          description: Retrieve only scores with <operator> value.
+          required: false
+          schema:
+            type: string
+            nullable: true
+        - name: value
+          in: query
+          description: Retrieve only scores with <operator> value.
+          required: false
+          schema:
+            type: number
+            format: double
+            nullable: true
       responses:
         '200':
           description: ''
@@ -1093,21 +1213,23 @@ paths:
       security: *ref_0
   /api/public/traces:
     get:
-      description: Get list of traces
+      description: Get list of traces.
       operationId: trace_list
       tags:
         - Trace
       parameters:
         - name: page
           in: query
-          description: page number, starts at 1
+          description: Page number, starts at 1
           required: false
           schema:
             type: integer
             nullable: true
         - name: limit
           in: query
-          description: limit of items per page
+          description: >-
+            Limit of items per page. If you encounter api issues due to too
+            large page sizes, try to reduce the limit.
           required: false
           schema:
             type: integer
@@ -1490,6 +1612,8 @@ components:
         description:
           type: string
           nullable: true
+        metadata:
+          nullable: true
         projectId:
           type: string
         createdAt:
@@ -1553,6 +1677,8 @@ components:
           nullable: true
         expectedOutput:
           nullable: true
+        metadata:
+          nullable: true
         sourceTraceId:
           type: string
           nullable: true
@@ -1685,6 +1811,7 @@ components:
       enum:
         - API
         - REVIEW
+        - EVAL
     CreateDatasetItemRequest:
       title: CreateDatasetItemRequest
       type: object
@@ -1695,6 +1822,14 @@ components:
           nullable: true
         expectedOutput:
           nullable: true
+        metadata:
+          nullable: true
+        sourceTraceId:
+          type: string
+          nullable: true
+        sourceObservationId:
+          type: string
+          nullable: true
         id:
           type: string
           nullable: true
@@ -1750,6 +1885,8 @@ components:
         description:
           type: string
           nullable: true
+        metadata:
+          nullable: true
       required:
         - name
     HealthResponse:
@@ -2337,6 +2474,8 @@ components:
           type: string
         countTraces:
           type: integer
+        countObservations:
+          type: integer
         totalCost:
           type: number
           format: double
@@ -2347,6 +2486,7 @@ components:
       required:
         - date
         - countTraces
+        - countObservations
         - totalCost
         - usage
     UsageByModel:
@@ -2358,6 +2498,7 @@ components:
       properties:
         model:
           type: string
+          nullable: true
         inputUsage:
           type: integer
         outputUsage:
@@ -2365,7 +2506,6 @@ components:
         totalUsage:
           type: integer
       required:
-        - model
         - inputUsage
         - outputUsage
         - totalUsage
@@ -2416,6 +2556,42 @@ components:
       required:
         - id
         - name
+    PromptMetaListResponse:
+      title: PromptMetaListResponse
+      type: object
+      properties:
+        data:
+          type: array
+          items:
+            $ref: '#/components/schemas/PromptMeta'
+        meta:
+          $ref: '#/components/schemas/utilsMetaResponse'
+      required:
+        - data
+        - meta
+    PromptMeta:
+      title: PromptMeta
+      type: object
+      properties:
+        name:
+          type: string
+        versions:
+          type: array
+          items:
+            type: integer
+        labels:
+          type: array
+          items:
+            type: string
+        tags:
+          type: array
+          items:
+            type: string
+      required:
+        - name
+        - versions
+        - labels
+        - tags
     CreatePromptRequest:
       title: CreatePromptRequest
       oneOf:
@@ -2447,18 +2623,19 @@ components:
       properties:
         name:
           type: string
-        isActive:
-          type: boolean
-          description: Should the prompt be promoted to production immediately?
         prompt:
           type: array
           items:
             $ref: '#/components/schemas/ChatMessage'
         config:
           nullable: true
+        labels:
+          type: array
+          items:
+            type: string
+          nullable: true
       required:
         - name
-        - isActive
         - prompt
     CreateTextPromptRequest:
       title: CreateTextPromptRequest
@@ -2466,16 +2643,17 @@ components:
       properties:
         name:
           type: string
-        isActive:
-          type: boolean
-          description: Should the prompt be promoted to production immediately?
         prompt:
           type: string
         config:
           nullable: true
+        labels:
+          type: array
+          items:
+            type: string
+          nullable: true
       required:
         - name
-        - isActive
         - prompt
     Prompt:
       title: Prompt

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "2.26.1",
+  "version": "2.37.0",
   "private": true,
   "license": "MIT",
   "engines": {
@@ -26,13 +26,14 @@
     "@aws-sdk/lib-storage": "^3.550.0",
     "@aws-sdk/s3-request-presigner": "^3.554.0",
     "@codemirror/lang-json": "^6.0.1",
-    "@headlessui/react": "^1.7.18",
+    "@headlessui/react": "^1.7.19",
     "@heroicons/react": "^2.1.3",
     "@hookform/resolvers": "^3.3.4",
     "@langchain/anthropic": "^0.1.14",
-    "@langchain/core": "^0.1.57",
+    "@langchain/core": "^0.1.58",
     "@langchain/openai": "^0.0.28",
     "@langfuse/shared": "workspace:*",
+    "@langfuse/ee": "workspace:*",
     "@marsidev/react-turnstile": "^0.5.4",
     "@next-auth/prisma-adapter": "^1.0.7",
     "@radix-ui/react-accordion": "^1.1.2",
@@ -59,10 +60,10 @@
     "@react-email/render": "^0.0.12",
     "@repo/eslint-config": "workspace:*",
     "@repo/typescript-config": "workspace:*",
-    "@sentry/nextjs": "^7.110.0",
-    "@sentry/node": "^7.110.0",
-    "@sentry/profiling-node": "^7.110.0",
-    "@sentry/types": "^7.110.0",
+    "@sentry/nextjs": "^7.110.1",
+    "@sentry/node": "^7.110.1",
+    "@sentry/profiling-node": "^7.110.1",
+    "@sentry/types": "^7.110.1",
     "@t3-oss/env-nextjs": "^0.8.0",
     "@tailwindcss/forms": "^0.5.7",
     "@tanstack/react-query": "^4.36.1",
@@ -74,7 +75,7 @@
     "@trpc/server": "^10.45.0",
     "@uiw/codemirror-theme-github": "^4.21.25",
     "@uiw/react-codemirror": "^4.21.25",
-    "ai": "^3.0.22",
+    "ai": "^3.0.23",
     "bcryptjs": "^2.4.3",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
@@ -97,11 +98,11 @@
     "posthog-node": "^3.6.3",
     "prisma": "^5.12.1",
     "react": "18.2.0",
-    "react-day-picker": "^8.10.0",
+    "react-day-picker": "^8.10.1",
     "react-dom": "18.2.0",
     "react-hook-form": "^7.51.3",
     "react-icons": "^5.0.1",
-    "react-responsive": "^9.0.2",
+    "react-responsive": "^10.0.0",
     "react18-json-view": "^0.2.8-canary.6",
     "sonner": "^1.4.41",
     "superjson": "2.2.1",
@@ -124,11 +125,11 @@
     "@types/lodash": "^4.14.202",
     "@types/node": "20.10.5",
     "@types/nodemailer": "^6.4.14",
-    "@types/react": "^18.2.78",
+    "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^7.6.0",
+    "@typescript-eslint/parser": "^7.7.0",
     "autoprefixer": "^10.4.19",
     "dotenv-cli": "^7.3.0",
     "eslint": "^8.56.0",
@@ -138,7 +139,7 @@
     "node-mocks-http": "^1.14.1",
     "postcss": "^8.4.38",
     "prettier": "^3.2.5",
-    "prettier-plugin-tailwindcss": "^0.5.13",
+    "prettier-plugin-tailwindcss": "^0.5.14",
     "tailwindcss": "^3.4.3",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",

web/public/.gitignore

@@ -1 +1 @@
-openapi*.yml
+# openapi*.yml

web/public/openapi-client.yml

@@ -0,0 +1,104 @@
+openapi: 3.0.1
+info:
+  title: langfuse
+  version: ''
+paths:
+  /api/public/scores:
+    post:
+      description: Add a score to the database, upserts on id
+      operationId: score_create
+      tags:
+        - Score
+      parameters: []
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Score'
+        '400':
+          description: ''
+          content:
+            application/json:
+              schema:
+                type: string
+        '401':
+          description: ''
+          content:
+            application/json:
+              schema:
+                type: string
+        '403':
+          description: ''
+          content:
+            application/json:
+              schema:
+                type: string
+        '405':
+          description: ''
+          content:
+            application/json:
+              schema:
+                type: string
+      security:
+        - BearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/CreateScoreRequest'
+components:
+  schemas:
+    CreateScoreRequest:
+      title: CreateScoreRequest
+      type: object
+      properties:
+        id:
+          type: string
+        traceId:
+          type: string
+        name:
+          type: string
+        value:
+          type: number
+          format: double
+        observationId:
+          type: string
+        comment:
+          type: string
+      required:
+        - traceId
+        - name
+        - value
+    Score:
+      title: Score
+      type: object
+      properties:
+        id:
+          type: string
+        traceId:
+          type: string
+        name:
+          type: string
+        value:
+          type: number
+          format: double
+        observationId:
+          type: string
+        timestamp:
+          type: string
+          format: date-time
+        comment:
+          type: string
+      required:
+        - id
+        - traceId
+        - name
+        - value
+        - timestamp
+  securitySchemes:
+    BearerAuth:
+      type: http
+      scheme: bearer

web/scripts/model-match.ts

@@ -62,6 +62,7 @@ export async function modelMatch() {
       where: {
         internalModel: null,
         type: "GENERATION",
+        model: { not: null },
       },
       take: BATCH_SIZE,
       skip: index * BATCH_SIZE,
@@ -235,14 +236,23 @@ export async function modelMatch() {
     }
   }
 
-  await prisma.observation.updateMany({
-    where: {
-      internalModel: "LANGFUSETMPNOMODEL",
-    },
-    data: {
-      internalModel: null,
-    },
-  });
+  let updatedCount;
+  do {
+    console.log(`Updating LANGFUSETMPNOMODEL ${updatedCount}`);
+    const result = await prisma.$queryRaw<[{ id: string }]>`
+    WITH to_update AS (
+      SELECT id 
+      FROM observations 
+      WHERE internal_model = 'LANGFUSETMPNOMODEL'
+      AND "type" = 'GENERATION'
+      LIMIT 50000
+    )
+    UPDATE observations
+    set internal_model = NULL
+    WHERE id IN (SELECT id FROM to_update)
+    RETURNING id;`;
+    updatedCount = result.length;
+  } while (updatedCount > 0);
 
   const end = Date.now();
 

web/sentry.server.config.ts

@@ -15,13 +15,12 @@ if (process.env.NEXT_PUBLIC_SENTRY_DSN)
     tracesSampler: (samplingContext: SamplingContext) => {
       if (
         samplingContext.request &&
-        samplingContext.request.method === "POST" &&
         samplingContext.request.url &&
         samplingContext.request.url.includes("api/trpc")
       ) {
-        return 0.9;
+        return 0.3;
       }
-      return 0.15;
+      return 0.1;
     },
 
     profilesSampleRate: 0.2, // Profiling sample rate is relative to tracesSampleRate

web/src/__e2e__/auth.spec.ts

@@ -10,7 +10,7 @@ test("should redirect to home if signed in", async ({ page }) => {
   await page.goto("/auth/sign-in");
   await page.fill('input[name="email"]', "demo@langfuse.com");
   await page.fill('input[type="password"]', "password");
-  await page.click('button[type="submit"]');
+  await page.click('button[data-testid="submit-email-password-sign-in-form"]');
 
   // wait 2 seconds
   await page.waitForTimeout(2000);
@@ -32,7 +32,7 @@ test("Successfully sign up & able to go to homepage", async ({ page }) => {
   await page.fill('input[name="name"]', "demo lang");
   await page.fill('input[name="email"]', randomEmailAddress());
   await page.fill('input[type="password"]', "password2");
-  await page.click('button[type="submit"]');
+  await page.click('button[data-testid="submit-email-password-sign-up-form"]');
   await page.waitForTimeout(2000);
   // see get started page
   await expect(page).toHaveURL("/?getStarted=1");
@@ -45,7 +45,7 @@ test("Successfully sign up & able to go to homepage with uppercase email", async
   await page.fill('input[name="name"]', "demo lang");
   await page.fill('input[name="email"]', "A" + randomEmailAddress());
   await page.fill('input[type="password"]', "password3");
-  await page.click('button[type="submit"]');
+  await page.click('button[data-testid="submit-email-password-sign-up-form"]');
   await page.waitForTimeout(2000);
   // see get started page
   await expect(page).toHaveURL("/?getStarted=1");
@@ -55,13 +55,13 @@ test("Signup input validation", async ({ page }) => {
   await page.goto("auth/sign-up");
   await page.fill('input[name="email"]', "notanemail");
   await page.fill('input[type="password"]', "shortPw");
-  await page.click('button[type="submit"]');
+  await page.click('button[data-testid="submit-email-password-sign-up-form"]');
   await page.waitForTimeout(2000);
   await expect(page.getByText("Invalid email")).toBeVisible();
   await expect(
     page.getByText("Password must be at least 8 characters long"),
   ).toBeVisible();
-  await page.click('button[type="submit"]');
+  await page.click('button[data-testid="submit-email-password-sign-up-form"]');
   await page.waitForTimeout(2000);
   // don't see get started page
   await expect(page).not.toHaveURL("/?getStarted=1");

web/src/__e2e__/create-project.spec.ts

@@ -7,7 +7,7 @@ test("should see new projects dialog open after clicking new project btn", async
   await page.fill('input[name="name"]', "demo user");
   await page.fill('input[name="email"]', randomEmailAddress());
   await page.fill('input[type="password"]', "password");
-  await page.click('button[type="submit"]');
+  await page.click('button[data-testid="submit-email-password-sign-up-form"]');
   await page.waitForTimeout(2000);
   await page.waitForTimeout(2000);
   expect(await page.innerHTML("data-testid=create-new-project-title")).toBe(
@@ -24,7 +24,7 @@ test("Create a project with provided name", async ({ page }) => {
   await page.goto("/auth/sign-in");
   await page.fill('input[name="email"]', "demo@langfuse.com");
   await page.fill('input[type="password"]', "password");
-  await page.click('button[type="submit"]');
+  await page.click('button[data-testid="submit-email-password-sign-in-form"]');
   await page.waitForTimeout(2000);
   await page.isVisible('[data-testid="new-project-form"]');
   await page.click('[data-testid="create-project-btn"]');

web/src/__tests__/datasets.servertest.ts

@@ -5,63 +5,12 @@ import { makeAPICall, pruneDatabase } from "@/src/__tests__/test-utils";
 import { v4 } from "uuid";
 
 describe("/api/public/datasets and /api/public/dataset-items API Endpoints", () => {
-  beforeEach(async () => await pruneDatabase());
-  afterEach(async () => await pruneDatabase());
-
-  it("should create and get a dataset", async () => {
-    await makeAPICall("POST", "/api/public/datasets", {
-      name: "dataset-name",
-      description: "dataset-description",
-    });
-
-    const dbDataset = await prisma.dataset.findMany({
-      where: {
-        name: "dataset-name",
-      },
-    });
-
-    expect(dbDataset.length).toBeGreaterThan(0);
-
-    const getDataset = await makeAPICall(
-      "GET",
-      `/api/public/datasets/dataset-name`,
-    );
-
-    expect(getDataset.status).toBe(200);
-    expect(getDataset.body).toMatchObject({
-      name: "dataset-name",
-      description: "dataset-description",
-    });
-  });
-
-  it("GET datasets", async () => {
-    await makeAPICall("POST", "/api/public/datasets", {
-      name: "dataset-name-1",
-    });
-
-    await makeAPICall("POST", "/api/public/datasets", {
-      name: "dataset-name-2",
-    });
-
-    const datasetItemId = v4();
-
-    const createItemRes = await makeAPICall<{
-      datasetName: string; // field that can break if the API changes as it is not a db column
-    }>("POST", "/api/public/dataset-items", {
-      datasetName: "dataset-name-2",
-      input: { key: "value" },
-      expectedOutput: { key: "value" },
-      id: datasetItemId,
-    });
-
-    expect(createItemRes.status).toBe(200);
-    expect(createItemRes.body).toMatchObject({
-      datasetName: "dataset-name-2", // not included in db table
-    });
-
-    const traceId = v4();
-    const observationId = v4();
+  const traceId = v4();
+  const observationId = v4();
+  beforeEach(async () => {
+    await pruneDatabase();
 
+    // create sample trace and observation
     const response = await makeAPICall("POST", "/api/public/ingestion", {
       batch: [
         {
@@ -97,6 +46,62 @@ describe("/api/public/datasets and /api/public/dataset-items API Endpoints", ()
       ],
     });
     expect(response.status).toBe(207);
+  });
+  afterEach(async () => await pruneDatabase());
+
+  it("should create and get a dataset, include special characters", async () => {
+    await makeAPICall("POST", "/api/public/datasets", {
+      name: "dataset + name",
+      description: "dataset-description",
+      metadata: { foo: "bar" },
+    });
+
+    const dbDataset = await prisma.dataset.findMany({
+      where: {
+        name: "dataset + name",
+      },
+    });
+
+    expect(dbDataset.length).toBeGreaterThan(0);
+
+    const getDataset = await makeAPICall(
+      "GET",
+      `/api/public/datasets/${encodeURIComponent("dataset + name")}`,
+    );
+
+    expect(getDataset.status).toBe(200);
+    expect(getDataset.body).toMatchObject({
+      name: "dataset + name",
+      description: "dataset-description",
+      metadata: { foo: "bar" },
+    });
+  });
+
+  it("GET datasets", async () => {
+    await makeAPICall("POST", "/api/public/datasets", {
+      name: "dataset-name-1",
+    });
+
+    await makeAPICall("POST", "/api/public/datasets", {
+      name: "dataset-name-2",
+    });
+
+    const datasetItemId = v4();
+
+    const createItemRes = await makeAPICall<{
+      datasetName: string; // field that can break if the API changes as it is not a db column
+    }>("POST", "/api/public/dataset-items", {
+      datasetName: "dataset-name-2",
+      input: { key: "value" },
+      expectedOutput: { key: "value" },
+      metadata: { key: "value-dataset-item" },
+      id: datasetItemId,
+    });
+
+    expect(createItemRes.status).toBe(200);
+    expect(createItemRes.body).toMatchObject({
+      datasetName: "dataset-name-2", // not included in db table
+    });
 
     await makeAPICall("POST", "/api/public/dataset-run-items", {
       datasetItemId: datasetItemId,
@@ -136,6 +141,9 @@ describe("/api/public/datasets and /api/public/dataset-items API Endpoints", ()
       datasetName: "dataset-name",
       input: { key: "value" },
       expectedOutput: { key: "value" },
+      metadata: { key: "value-dataset-item" },
+      sourceTraceId: traceId,
+      sourceObservationId: observationId,
     });
     const dbDatasetItem = await prisma.datasetItem.findFirst({
       where: {
@@ -159,6 +167,7 @@ describe("/api/public/datasets and /api/public/dataset-items API Endpoints", ()
           id: dbDatasetItem!.id,
           input: { key: "value" },
           expectedOutput: { key: "value" },
+          metadata: { key: "value-dataset-item" },
           datasetName: "dataset-name", // not included in db table
         },
       ],
@@ -173,7 +182,10 @@ describe("/api/public/datasets and /api/public/dataset-items API Endpoints", ()
       id: dbDatasetItem!.id,
       input: { key: "value" },
       expectedOutput: { key: "value" },
+      metadata: { key: "value-dataset-item" },
       datasetName: "dataset-name", // not included in db table
+      sourceTraceId: traceId,
+      sourceObservationId: observationId,
     });
   });
 
@@ -186,6 +198,7 @@ describe("/api/public/datasets and /api/public/dataset-items API Endpoints", ()
       id: "dataset-item-id",
       datasetName: "dataset-name",
       input: { key: "value" },
+      metadata: { key: "value-dataset-item" },
     });
     expect(item1.status).toBe(200);
     expect(item1.body).toMatchObject({
@@ -196,6 +209,7 @@ describe("/api/public/datasets and /api/public/dataset-items API Endpoints", ()
       id: "dataset-item-id",
       datasetName: "dataset-name",
       input: { key: "value2" },
+      metadata: ["hello-world"],
     });
     expect(item2.status).toBe(200);
     expect(item2.body).toMatchObject({
@@ -208,22 +222,23 @@ describe("/api/public/datasets and /api/public/dataset-items API Endpoints", ()
     });
     expect(dbDatasetItem).not.toBeNull();
     expect(dbDatasetItem?.input).toMatchObject({ key: "value2" });
+    expect(dbDatasetItem?.metadata).toMatchObject(["hello-world"]);
   });
 
-  it("should create and get a dataset run", async () => {
+  it("should create and get a dataset run, include special characters", async () => {
     const dataset = await makeAPICall<{ id: string }>(
       "POST",
       "/api/public/datasets",
       {
-        name: "dataset-name",
+        name: "dataset name",
       },
     );
     expect(dataset.status).toBe(200);
     expect(dataset.body).toMatchObject({
-      name: "dataset-name",
+      name: "dataset name",
     });
     await makeAPICall("POST", "/api/public/dataset-items", {
-      datasetName: "dataset-name",
+      datasetName: "dataset name",
       id: "dataset-item-id",
       input: { key: "value" },
       expectedOutput: { key: "value" },
@@ -272,14 +287,14 @@ describe("/api/public/datasets and /api/public/dataset-items API Endpoints", ()
       {
         datasetItemId: "dataset-item-id",
         observationId: observationId,
-        runName: "run-only-observation",
+        runName: "run + only + observation",
         runDescription: "run-description",
         metadata: { key: "value" },
       },
     );
     const dbRunObservation = await prisma.datasetRuns.findFirst({
       where: {
-        name: "run-only-observation",
+        name: "run + only + observation",
       },
       include: {
         datasetRunItems: true,
@@ -298,21 +313,22 @@ describe("/api/public/datasets and /api/public/dataset-items API Endpoints", ()
 
     const getRunAPI = await makeAPICall(
       "GET",
-      `/api/public/datasets/dataset-name/runs/run-only-observation`,
+
+      `/api/public/datasets/${encodeURIComponent("dataset name")}/runs/${encodeURIComponent("run + only + observation")}`,
     );
     expect(getRunAPI.status).toBe(200);
     expect(getRunAPI.body).toMatchObject({
-      name: "run-only-observation",
+      name: "run + only + observation",
       description: "run-description",
       metadata: { key: "value" },
       datasetId: dataset.body.id,
-      datasetName: "dataset-name",
+      datasetName: "dataset name",
       datasetRunItems: expect.arrayContaining([
         expect.objectContaining({
           datasetItemId: "dataset-item-id",
           observationId: observationId,
           traceId: traceId,
-          datasetRunName: "run-only-observation",
+          datasetRunName: "run + only + observation",
         }),
       ]),
     });

web/src/__tests__/llm-api-key.servertest.ts

@@ -0,0 +1,92 @@
+/** @jest-environment node */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+
+import type { Session } from "next-auth";
+import { pruneDatabase } from "@/src/__tests__/test-utils";
+import { ModelProvider } from "@langfuse/shared";
+import { prisma } from "@langfuse/shared/src/db";
+import { appRouter } from "@/src/server/api/root";
+import { createInnerTRPCContext } from "@/src/server/api/trpc";
+
+describe("llmApiKey.all RPC", () => {
+  const projectId = "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a";
+
+  beforeEach(async () => await pruneDatabase());
+
+  const session: Session = {
+    expires: "1",
+    user: {
+      id: "user-1",
+      name: "Demo User",
+      projects: [
+        {
+          id: projectId,
+          role: "ADMIN",
+          name: "test",
+        },
+      ],
+      featureFlags: {
+        templateFlag: true,
+        evals: true,
+      },
+      admin: true,
+    },
+  };
+
+  const ctx = createInnerTRPCContext({ session });
+  const caller = appRouter.createCaller({ ...ctx, prisma });
+
+  it("should create an llm api key", async () => {
+    const secret = "test-secret";
+
+    await caller.llmApiKey.create({
+      projectId,
+      secretKey: secret,
+      provider: ModelProvider.OpenAI,
+    });
+
+    const llmApiKeys = await prisma.llmApiKeys.findMany({
+      where: {
+        projectId,
+      },
+    });
+
+    expect(llmApiKeys.length).toBe(1);
+    expect(llmApiKeys[0].projectId).toBe(projectId);
+    expect(llmApiKeys[0].secretKey).not.toBeNull();
+    expect(llmApiKeys[0].secretKey).not.toEqual(secret);
+    expect(llmApiKeys[0].provider).toBe(ModelProvider.OpenAI);
+    // this has to be 3 dots and the last 4 characters of the secret
+    expect(llmApiKeys[0].displaySecretKey).toMatch(/^...[a-zA-Z0-9]{4}$/);
+  });
+
+  it("should create and get an llm api key", async () => {
+    const secret = "test-secret";
+
+    await caller.llmApiKey.create({
+      projectId,
+      secretKey: secret,
+      provider: ModelProvider.OpenAI,
+    });
+
+    const dbLlmApiKeys = await prisma.llmApiKeys.findMany({
+      where: {
+        projectId,
+      },
+    });
+
+    expect(dbLlmApiKeys.length).toBe(1);
+
+    const llmApiKeys = await caller.llmApiKey.all({
+      projectId,
+    });
+
+    expect(llmApiKeys.data.length).toBe(1);
+    expect(llmApiKeys.data[0].provider).toBe(ModelProvider.OpenAI);
+    // this has to be 3 dots and the last 4 characters of the secret
+    expect(llmApiKeys.data[0].displaySecretKey).toMatch(/^...[a-zA-Z0-9]{4}$/);
+
+    // response must not contain the secret key itself
+    expect(llmApiKeys.data[0]).not.toHaveProperty("secretKey");
+  });
+});

web/src/__tests__/prompts.v1.servertest.ts

@@ -5,10 +5,10 @@ import { makeAPICall, pruneDatabase } from "@/src/__tests__/test-utils";
 import { v4 as uuidv4, v4 } from "uuid";
 import { type Prompt } from "@langfuse/shared";
 import {
-  PromptSchema,
+  LegacyPromptSchema,
   PromptType,
-  type ValidatedPrompt,
-} from "@/src/features/prompts/server/validation";
+  type LegacyValidatedPrompt,
+} from "@/src/features/prompts/server/utils/validation";
 
 describe("/api/public/prompts API Endpoint", () => {
   beforeEach(async () => await pruneDatabase());
@@ -21,7 +21,7 @@ describe("/api/public/prompts API Endpoint", () => {
         id: promptId,
         name: "prompt-name",
         prompt: "prompt",
-        isActive: true,
+        labels: ["production"],
         version: 1,
         config: {
           temperature: 0.1,
@@ -51,6 +51,51 @@ describe("/api/public/prompts API Endpoint", () => {
     expect(fetchedObservations.body.type).toBe("text");
     expect(fetchedObservations.body.version).toBe(1);
     expect(fetchedObservations.body.isActive).toBe(true);
+    expect(fetchedObservations.body.labels).toEqual(["production"]);
+    expect(fetchedObservations.body.createdBy).toBe("user-1");
+    expect(fetchedObservations.body.config).toEqual({ temperature: 0.1 });
+    expect(fetchedObservations.body.tags).toEqual([]);
+  });
+
+  it("should fetch a prompt with special character", async () => {
+    const promptId = uuidv4();
+
+    await prisma.prompt.create({
+      data: {
+        id: promptId,
+        name: "prompt + name",
+        prompt: "prompt",
+        labels: ["production"],
+        version: 1,
+        config: {
+          temperature: 0.1,
+        },
+        project: {
+          connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
+        },
+        createdBy: "user-1",
+      },
+    });
+
+    const fetchedObservations = await makeAPICall(
+      "GET",
+      `/api/public/prompts?name=${encodeURIComponent("prompt + name")}&version=1`,
+      undefined,
+    );
+
+    expect(fetchedObservations.status).toBe(200);
+
+    if (!isPrompt(fetchedObservations.body)) {
+      throw new Error("Expected body to be a prompt");
+    }
+
+    expect(fetchedObservations.body.id).toBe(promptId);
+    expect(fetchedObservations.body.name).toBe("prompt + name");
+    expect(fetchedObservations.body.prompt).toBe("prompt");
+    expect(fetchedObservations.body.type).toBe("text");
+    expect(fetchedObservations.body.version).toBe(1);
+    expect(fetchedObservations.body.isActive).toBe(true);
+    expect(fetchedObservations.body.labels).toEqual(["production"]);
     expect(fetchedObservations.body.createdBy).toBe("user-1");
     expect(fetchedObservations.body.config).toEqual({ temperature: 0.1 });
     expect(fetchedObservations.body.tags).toEqual([]);
@@ -64,7 +109,7 @@ describe("/api/public/prompts API Endpoint", () => {
         id: promptId,
         name: "prompt-name",
         prompt: "prompt",
-        isActive: false,
+        labels: [],
         version: 1,
         config: {
           temperature: 0.1,
@@ -94,7 +139,7 @@ describe("/api/public/prompts API Endpoint", () => {
         id: promptId,
         name: "prompt-name",
         prompt: "prompt-one",
-        isActive: false,
+        labels: [],
         version: 1,
         config: {
           temperature: 0.1,
@@ -111,7 +156,7 @@ describe("/api/public/prompts API Endpoint", () => {
         id: promptTwoId,
         name: "prompt-name",
         prompt: "prompt",
-        isActive: true,
+        labels: ["production"],
         version: 2,
         config: {
           temperature: 0.2,
@@ -140,68 +185,192 @@ describe("/api/public/prompts API Endpoint", () => {
     expect(fetchedObservations.body.prompt).toBe("prompt-one");
     expect(fetchedObservations.body.version).toBe(1);
     expect(fetchedObservations.body.isActive).toBe(false);
+    expect(fetchedObservations.body.labels).toEqual([]);
     expect(fetchedObservations.body.createdBy).toBe("user-1");
     expect(fetchedObservations.body.config).toEqual({ temperature: 0.1 });
   });
 
   it("should fetch active prompt when multiple exist", async () => {
-    const promptIdOne = uuidv4();
-    const promptIdTwo = uuidv4();
-
-    await prisma.prompt.create({
-      data: {
-        id: promptIdOne,
-        name: "prompt-name",
-        prompt: "prompt",
-        isActive: false,
-        version: 1,
-        config: {
-          temperature: 0.1,
-        },
-        project: {
-          connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
-        },
-        createdBy: "user-1",
+    // First prompt is activated
+    const prompt1 = await makeAPICall("POST", "/api/public/prompts", {
+      name: "prompt-name",
+      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+      prompt: "prompt1",
+      isActive: true,
+      version: 1,
+      config: {
+        temperature: 0.1,
       },
+      createdBy: "user-1",
     });
 
-    await prisma.prompt.create({
-      data: {
-        id: promptIdTwo,
-        name: "prompt-name",
-        prompt: "prompt",
-        isActive: true,
-        version: 2,
-        config: {
-          temperature: 0.2,
-        },
-        project: {
-          connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
-        },
-        createdBy: "user-1",
+    // Second prompt also activated
+    const prompt2 = await makeAPICall("POST", "/api/public/prompts", {
+      name: "prompt-name",
+      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+      prompt: "prompt2",
+      labels: ["production"],
+      isActive: true,
+      version: 2,
+      config: {
+        temperature: 0.2,
       },
+      createdBy: "user-1",
     });
 
-    const fetchedObservations = await makeAPICall(
+    // Third prompt is deactivated
+    const prompt3 = await makeAPICall("POST", "/api/public/prompts", {
+      name: "prompt-name",
+      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+      prompt: "prompt3",
+      labels: [], // This should be ignored
+      isActive: false,
+      version: 3,
+      config: {
+        temperature: 0.3,
+      },
+      createdBy: "user-1",
+    });
+
+    // Expect the second prompt to be fetched
+    const fetchedProductionPrompt = await makeAPICall(
       "GET",
       "/api/public/prompts?name=prompt-name",
       undefined,
     );
 
-    expect(fetchedObservations.status).toBe(200);
+    expect(fetchedProductionPrompt.status).toBe(200);
 
-    if (!isPrompt(fetchedObservations.body)) {
+    if (!isPrompt(fetchedProductionPrompt.body)) {
       throw new Error("Expected body to be a prompt");
     }
 
-    expect(fetchedObservations.body.id).toBe(promptIdTwo);
-    expect(fetchedObservations.body.name).toBe("prompt-name");
-    expect(fetchedObservations.body.prompt).toBe("prompt");
-    expect(fetchedObservations.body.type).toBe("text");
-    expect(fetchedObservations.body.version).toBe(2);
-    expect(fetchedObservations.body.isActive).toBe(true);
-    expect(fetchedObservations.body.createdBy).toBe("user-1");
-    expect(fetchedObservations.body.config).toEqual({ temperature: 0.2 });
+    // @ts-expect-error
+    expect(fetchedProductionPrompt.body.id).toBe(prompt2.body.id);
+    expect(fetchedProductionPrompt.body.name).toBe("prompt-name");
+    expect(fetchedProductionPrompt.body.prompt).toBe("prompt2");
+    expect(fetchedProductionPrompt.body.type).toBe("text");
+    expect(fetchedProductionPrompt.body.version).toBe(2);
+    expect(fetchedProductionPrompt.body.isActive).toBe(true);
+    expect(fetchedProductionPrompt.body.labels).toEqual(["production"]);
+    expect(fetchedProductionPrompt.body.createdBy).toBe("API");
+    expect(fetchedProductionPrompt.body.config).toEqual({ temperature: 0.2 });
+
+    // Expect the first prompt to be deactivated
+    const fetchedOldProductionPrompt = await makeAPICall(
+      "GET",
+      "/api/public/prompts?name=prompt-name&version=1",
+      undefined,
+    );
+
+    expect(fetchedOldProductionPrompt.status).toBe(200);
+
+    if (!isPrompt(fetchedOldProductionPrompt.body)) {
+      throw new Error("Expected body to be a prompt");
+    }
+
+    // @ts-expect-error
+    expect(fetchedOldProductionPrompt.body.id).toBe(prompt1.body.id);
+    expect(fetchedOldProductionPrompt.body.name).toBe("prompt-name");
+    expect(fetchedOldProductionPrompt.body.prompt).toBe("prompt1");
+    expect(fetchedOldProductionPrompt.body.type).toBe("text");
+    expect(fetchedOldProductionPrompt.body.version).toBe(1);
+    expect(fetchedOldProductionPrompt.body.isActive).toBe(false);
+    expect(fetchedOldProductionPrompt.body.labels).toEqual([]);
+    expect(fetchedOldProductionPrompt.body.createdBy).toBe("API");
+    expect(fetchedOldProductionPrompt.body.config).toEqual({
+      temperature: 0.1,
+    });
+  });
+
+  it("should correctly handle overwriting labels", async () => {
+    // First prompt has multiple labels
+    const prompt1 = await makeAPICall("POST", "/api/public/prompts", {
+      name: "prompt-name",
+      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+      prompt: "prompt1",
+      labels: ["production", "staging", "development"],
+      isActive: true,
+      version: 1,
+      config: {
+        temperature: 0.1,
+      },
+      createdBy: "user-1",
+    });
+
+    // Second prompt overwrites production and staging label
+    const prompt2 = await makeAPICall("POST", "/api/public/prompts", {
+      name: "prompt-name",
+      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+      prompt: "prompt2",
+      labels: ["production", "production", "staging"], // Should be deduped
+      isActive: true,
+      version: 2,
+      config: {
+        temperature: 0.2,
+      },
+      createdBy: "user-1",
+    });
+
+    // Third prompt overwrites staging label
+    const prompt3 = await makeAPICall("POST", "/api/public/prompts", {
+      name: "prompt-name",
+      projectId: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a",
+      prompt: "prompt3",
+      labels: ["staging"],
+      isActive: false,
+      version: 3,
+      config: {
+        temperature: 0.3,
+      },
+      createdBy: "user-1",
+    });
+
+    // Expect the second prompt to be fetched as default production prompt
+    const fetchedProductionPrompt = await makeAPICall(
+      "GET",
+      "/api/public/prompts?name=prompt-name",
+      undefined,
+    );
+    expect(fetchedProductionPrompt.status).toBe(200);
+    if (!isPrompt(fetchedProductionPrompt.body)) {
+      throw new Error("Expected body to be a prompt");
+    }
+    // @ts-expect-error
+    expect(fetchedProductionPrompt.body.id).toBe(prompt2.body.id);
+    expect(fetchedProductionPrompt.body.labels).toEqual(["production"]); // Only production label should be present
+
+    // Expect the first prompt to have only development label
+    const fetchedFirstPrompt = await makeAPICall(
+      "GET",
+      "/api/public/prompts?name=prompt-name&version=1",
+      undefined,
+    );
+
+    expect(fetchedFirstPrompt.status).toBe(200);
+    if (!isPrompt(fetchedFirstPrompt.body)) {
+      throw new Error("Expected body to be a prompt");
+    }
+
+    // @ts-expect-error
+    expect(fetchedFirstPrompt.body.id).toBe(prompt1.body.id);
+    expect(fetchedFirstPrompt.body.labels).toEqual(["development"]);
+
+    // Expect the third prompt to have only staging label
+    const fetchedThirdPrompt = await makeAPICall(
+      "GET",
+      "/api/public/prompts?name=prompt-name&version=3",
+      undefined,
+    );
+
+    expect(fetchedThirdPrompt.status).toBe(200);
+    if (!isPrompt(fetchedThirdPrompt.body)) {
+      throw new Error("Expected body to be a prompt");
+    }
+
+    // @ts-expect-error
+    expect(fetchedThirdPrompt.body.id).toBe(prompt3.body.id);
+    expect(fetchedThirdPrompt.body.labels).toEqual(["staging", "latest"]);
   });
 
   it("should create and fetch a prompt", async () => {
@@ -232,6 +401,7 @@ describe("/api/public/prompts API Endpoint", () => {
     expect(fetchedObservations.body.type).toBe("text");
     expect(fetchedObservations.body.version).toBe(1);
     expect(fetchedObservations.body.isActive).toBe(true);
+    expect(fetchedObservations.body.labels).toEqual(["production", "latest"]);
     expect(fetchedObservations.body.createdBy).toBe("API");
     expect(fetchedObservations.body.config).toEqual({ temperature: 0.1 });
   });
@@ -247,7 +417,7 @@ describe("/api/public/prompts API Endpoint", () => {
         id: promptId,
         name: "prompt-name",
         prompt: "prompt",
-        isActive: true,
+        labels: ["production"],
         version: 1,
         project: {
           connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
@@ -310,7 +480,7 @@ describe("/api/public/prompts API Endpoint", () => {
         id: promptId,
         name: "prompt-name",
         prompt: "prompt",
-        isActive: true,
+        labels: ["production"],
         version: 1,
         project: {
           connect: { id: "7a88fb47-b4e2-43b8-a06c-a5ce950dc53a" },
@@ -385,6 +555,7 @@ describe("/api/public/prompts API Endpoint", () => {
     expect(fetchedObservations.body.type).toBe("text");
     expect(fetchedObservations.body.version).toBe(1);
     expect(fetchedObservations.body.isActive).toBe(true);
+    expect(fetchedObservations.body.labels).toEqual(["production", "latest"]);
     expect(fetchedObservations.body.createdBy).toBe("API");
     expect(fetchedObservations.body.config).toEqual({});
   });
@@ -418,6 +589,7 @@ describe("/api/public/prompts API Endpoint", () => {
     expect(validatedPrompt.type).toBe("chat");
     expect(validatedPrompt.version).toBe(1);
     expect(validatedPrompt.isActive).toBe(true);
+    expect(validatedPrompt.labels).toEqual(["production", "latest"]);
     expect(validatedPrompt.createdBy).toBe("API");
     expect(validatedPrompt.config).toEqual({});
   });
@@ -441,7 +613,7 @@ describe("/api/public/prompts API Endpoint", () => {
     );
     expect(status).toBe(404);
     expect(body).toEqual({
-      error: "NotFoundError",
+      error: "LangfuseNotFoundError",
       message: "Prompt not found",
     });
   });
@@ -469,7 +641,7 @@ describe("/api/public/prompts API Endpoint", () => {
     );
     expect(status).toBe(404);
     expect(body).toEqual({
-      error: "NotFoundError",
+      error: "LangfuseNotFoundError",
       message: "Prompt not found",
     });
   });
@@ -492,7 +664,7 @@ describe("/api/public/prompts API Endpoint", () => {
     );
     expect(status).toBe(404);
     expect(body).toEqual({
-      error: "NotFoundError",
+      error: "LangfuseNotFoundError",
       message: "Prompt not found",
     });
   });
@@ -546,6 +718,7 @@ describe("/api/public/prompts API Endpoint", () => {
     expect(validatedPrompt.type).toBe("chat");
     expect(validatedPrompt.version).toBe(1);
     expect(validatedPrompt.isActive).toBe(true);
+    expect(validatedPrompt.labels).toEqual(["production", "latest"]);
     expect(validatedPrompt.createdBy).toBe("API");
     expect(validatedPrompt.config).toEqual({});
 
@@ -557,15 +730,17 @@ describe("/api/public/prompts API Endpoint", () => {
     );
     expect(getResponse2.status).toBe(404);
     expect(getResponse2.body).toEqual({
-      error: "NotFoundError",
+      error: "LangfuseNotFoundError",
       message: "Prompt not found",
     });
   });
 });
 
-const isPrompt = (x: unknown): x is Prompt => {
+type PromptWithIsActive = Prompt & { isActive: boolean };
+
+const isPrompt = (x: unknown): x is PromptWithIsActive => {
   if (typeof x !== "object" || x === null) return false;
-  const prompt = x as Prompt;
+  const prompt = x as PromptWithIsActive;
   return (
     typeof prompt.id === "string" &&
     typeof prompt.name === "string" &&
@@ -579,7 +754,9 @@ const isPrompt = (x: unknown): x is Prompt => {
   );
 };
 
-const validatePrompt = (obj: Record<string, unknown>): ValidatedPrompt => {
+const validatePrompt = (
+  obj: Record<string, unknown>,
+): LegacyValidatedPrompt => {
   Object.keys(obj).forEach((key) => {
     obj[key] =
       key === "createdAt" || key === "updatedAt"
@@ -587,5 +764,5 @@ const validatePrompt = (obj: Record<string, unknown>): ValidatedPrompt => {
         : obj[key];
   });
 
-  return PromptSchema.parse(obj);
+  return LegacyPromptSchema.parse(obj);
 };

web/src/__tests__/scores.servertest.ts

@@ -5,8 +5,13 @@ import { makeAPICall, pruneDatabase } from "@/src/__tests__/test-utils";
 import { v4 as uuidv4 } from "uuid";
 
 describe("/api/public/scores API Endpoint", () => {
-  beforeEach(async () => await pruneDatabase());
-  afterEach(async () => await pruneDatabase());
+  let should_prune_db = true;
+  beforeEach(async () => {
+    if (should_prune_db) await pruneDatabase();
+  });
+  afterEach(async () => {
+    if (should_prune_db) await pruneDatabase();
+  });
 
   it("should create score for a trace", async () => {
     await pruneDatabase();
@@ -316,4 +321,274 @@ describe("/api/public/scores API Endpoint", () => {
       observationId: generationId,
     });
   });
+
+  describe("should Filter scores", () => {
+    const userId = "user-name";
+    const scoreName = "score-name";
+    const queryUserName = `userId=${userId}&name=${scoreName}`;
+    const traceId = uuidv4();
+    const generationId = uuidv4();
+    const scoreId_1 = uuidv4();
+    const scoreId_2 = uuidv4();
+    const scoreId_3 = uuidv4();
+    interface GetScoresAPIResponse {
+      data: [
+        {
+          id: string;
+          name: string;
+          value: number;
+        },
+      ];
+      meta: object;
+    }
+
+    beforeAll(async () => {
+      should_prune_db = false;
+      await pruneDatabase();
+
+      await makeAPICall("POST", "/api/public/traces", {
+        id: traceId,
+        userId: userId,
+      });
+      await makeAPICall("POST", "/api/public/generations", {
+        id: generationId,
+      });
+      await makeAPICall("POST", "/api/public/scores", {
+        id: scoreId_1,
+        observationId: generationId,
+        name: scoreName,
+        value: 10.5,
+        traceId: traceId,
+        comment: "comment",
+      });
+      await makeAPICall("POST", "/api/public/scores", {
+        id: scoreId_2,
+        observationId: generationId,
+        name: scoreName,
+        value: 50.5,
+        traceId: traceId,
+        comment: "comment",
+      });
+      await makeAPICall("POST", "/api/public/scores", {
+        id: scoreId_3,
+        observationId: generationId,
+        name: scoreName,
+        value: 100.8,
+        traceId: traceId,
+        comment: "comment",
+      });
+    });
+    afterAll(async () => {
+      await pruneDatabase();
+    });
+
+    it("get all scores", async () => {
+      const getAllScore = await makeAPICall<{
+        data: [
+          {
+            traceId: string;
+            observationId: string;
+          },
+        ];
+        meta: object;
+      }>("GET", `/api/public/scores?${queryUserName}`);
+      expect(getAllScore.status).toBe(200);
+      expect(getAllScore.body.meta).toMatchObject({
+        page: 1,
+        limit: 50,
+        totalItems: 3,
+        totalPages: 1,
+      });
+      for (const val of getAllScore.body.data) {
+        expect(val).toMatchObject({
+          traceId: traceId,
+          observationId: generationId,
+        });
+      }
+    });
+
+    it("test only operator", async () => {
+      const getScore = await makeAPICall<GetScoresAPIResponse>(
+        "GET",
+        `/api/public/scores?${queryUserName}&operator=<`,
+      );
+      expect(getScore.status).toBe(200);
+      expect(getScore.body.meta).toMatchObject({
+        page: 1,
+        limit: 50,
+        totalItems: 3,
+        totalPages: 1,
+      });
+    });
+
+    it("test only value", async () => {
+      const getScore = await makeAPICall<GetScoresAPIResponse>(
+        "GET",
+        `/api/public/scores?${queryUserName}&value=0.8`,
+      );
+      expect(getScore.status).toBe(200);
+      expect(getScore.body.meta).toMatchObject({
+        page: 1,
+        limit: 50,
+        totalItems: 3,
+        totalPages: 1,
+      });
+    });
+
+    it("test operator <", async () => {
+      const getScore = await makeAPICall<GetScoresAPIResponse>(
+        "GET",
+        `/api/public/scores?${queryUserName}&operator=<&value=50`,
+      );
+      expect(getScore.status).toBe(200);
+      expect(getScore.body.meta).toMatchObject({
+        page: 1,
+        limit: 50,
+        totalItems: 1,
+        totalPages: 1,
+      });
+      expect(getScore.body.data).toMatchObject([
+        {
+          id: scoreId_1,
+          name: scoreName,
+          value: 10.5,
+        },
+      ]);
+    });
+    it("test operator >", async () => {
+      const getScore = await makeAPICall<GetScoresAPIResponse>(
+        "GET",
+        `/api/public/scores?${queryUserName}&operator=>&value=100`,
+      );
+      expect(getScore.status).toBe(200);
+      expect(getScore.body.meta).toMatchObject({
+        page: 1,
+        limit: 50,
+        totalItems: 1,
+        totalPages: 1,
+      });
+      expect(getScore.body.data).toMatchObject([
+        {
+          id: scoreId_3,
+          name: scoreName,
+          value: 100.8,
+        },
+      ]);
+    });
+    it("test operator <=", async () => {
+      const getScore = await makeAPICall<GetScoresAPIResponse>(
+        "GET",
+        `/api/public/scores?${queryUserName}&operator=<=&value=50.5`,
+      );
+      expect(getScore.status).toBe(200);
+      expect(getScore.body.meta).toMatchObject({
+        page: 1,
+        limit: 50,
+        totalItems: 2,
+        totalPages: 1,
+      });
+      expect(getScore.body.data).toMatchObject([
+        {
+          id: scoreId_1,
+          name: scoreName,
+          value: 10.5,
+        },
+        {
+          id: scoreId_2,
+          name: scoreName,
+          value: 50.5,
+        },
+      ]);
+    });
+    it("test operator >=", async () => {
+      const getScore = await makeAPICall<GetScoresAPIResponse>(
+        "GET",
+        `/api/public/scores?${queryUserName}&operator=>=&value=50.5`,
+      );
+      expect(getScore.status).toBe(200);
+      expect(getScore.body.meta).toMatchObject({
+        page: 1,
+        limit: 50,
+        totalItems: 2,
+        totalPages: 1,
+      });
+      expect(getScore.body.data).toMatchObject([
+        {
+          id: scoreId_2,
+          name: scoreName,
+          value: 50.5,
+        },
+        {
+          id: scoreId_3,
+          name: scoreName,
+          value: 100.8,
+        },
+      ]);
+    });
+    it("test operator !=", async () => {
+      const getScore = await makeAPICall<GetScoresAPIResponse>(
+        "GET",
+        `/api/public/scores?${queryUserName}&operator=!=&value=50.5`,
+      );
+      expect(getScore.status).toBe(200);
+      expect(getScore.body.meta).toMatchObject({
+        page: 1,
+        limit: 50,
+        totalItems: 2,
+        totalPages: 1,
+      });
+      expect(getScore.body.data).toMatchObject([
+        {
+          id: scoreId_1,
+          name: scoreName,
+          value: 10.5,
+        },
+        {
+          id: scoreId_3,
+          name: scoreName,
+          value: 100.8,
+        },
+      ]);
+    });
+    it("test operator =", async () => {
+      const getScore = await makeAPICall<GetScoresAPIResponse>(
+        "GET",
+        `/api/public/scores?${queryUserName}&operator==&value=50.5`,
+      );
+      expect(getScore.status).toBe(200);
+      expect(getScore.body.meta).toMatchObject({
+        page: 1,
+        limit: 50,
+        totalItems: 1,
+        totalPages: 1,
+      });
+      expect(getScore.body.data).toMatchObject([
+        {
+          id: scoreId_2,
+          name: scoreName,
+          value: 50.5,
+        },
+      ]);
+    });
+    it("test invalid operator", async () => {
+      const getScore = await makeAPICall(
+        "GET",
+        `/api/public/scores?${queryUserName}&operator=op&value=50.5`,
+      );
+      expect(getScore.status).toBe(400);
+      expect(getScore.body).toMatchObject({
+        message: "Invalid request data",
+      });
+    });
+    it("test invalid value", async () => {
+      const getScore = await makeAPICall(
+        "GET",
+        `/api/public/scores?${queryUserName}&operator=<&value=myvalue`,
+      );
+      expect(getScore.status).toBe(400);
+      expect(getScore.body).toMatchObject({
+        message: "Invalid request data",
+      });
+    });
+  });
 });

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

@@ -23,6 +23,7 @@ describe("Traces TRPC Router", () => {
       ],
       featureFlags: {
         templateFlag: true,
+        evals: true,
       },
       admin: true,
     },

web/src/__tests__/test-utils.ts

@@ -12,6 +12,7 @@ export const pruneDatabase = async () => {
   await prisma.prompt.deleteMany();
   await prisma.events.deleteMany();
   await prisma.model.deleteMany();
+  await prisma.llmApiKeys.deleteMany();
 };
 
 export function createBasicAuthHeader(

web/src/components/ChatMessages/ChatMessageComponent.tsx

@@ -5,7 +5,7 @@ import { ChatMessageRole, type ChatMessageWithId } from "@langfuse/shared";
 import { Button } from "@/src/components/ui/button";
 import { Card, CardContent } from "@/src/components/ui/card";
 import { Textarea } from "@/src/components/ui/textarea";
-import type { MessagesContext } from "@/src/features/playground/client/components/Messages";
+import type { MessagesContext } from "./types";
 
 type ChatMessageProps = Pick<
   MessagesContext,

web/src/components/ChatMessages/index.tsx

@@ -1,10 +1,12 @@
 import { PlusCircleIcon } from "lucide-react";
+import { useEffect, useRef } from "react";
 
 import { Button } from "@/src/components/ui/button";
-import { ChatMessageComponent } from "@/src/features/playground/client/components/ChatMessageComponent";
-import type { MessagesContext } from "@/src/features/playground/client/components/Messages";
 import { ChatMessageRole } from "@langfuse/shared";
-import { useRef, useEffect } from "react";
+
+import { ChatMessageComponent } from "./ChatMessageComponent";
+
+import type { MessagesContext } from "./types";
 
 type ChatMessagesProps = MessagesContext;
 export const ChatMessages: React.FC<ChatMessagesProps> = (props) => {

web/src/components/ChatMessages/types.ts

@@ -0,0 +1,13 @@
+import type { ChatMessageRole, ChatMessageWithId } from "@langfuse/shared";
+
+
+export type MessagesContext = {
+  messages: ChatMessageWithId[];
+  addMessage: (role: ChatMessageRole, content?: string) => ChatMessageWithId;
+  deleteMessage: (id: string) => void;
+  updateMessage: <Key extends keyof ChatMessageWithId>(
+    id: string,
+    key: Key,
+    value: ChatMessageWithId[Key]
+  ) => void;
+};

web/src/components/LangfuseLogo.tsx

@@ -1,4 +1,4 @@
-import { AlertTriangle } from "lucide-react";
+import { AlertTriangle, Check } from "lucide-react";
 
 import { VERSION } from "@/src/constants";
 import { env } from "@/src/env.mjs";
@@ -42,10 +42,16 @@ export const LangfuseLogo = ({
           "flex items-center gap-2 self-stretch rounded-md px-3 py-2 text-xs ring-1 lg:-mx-2",
           env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION === "STAGING"
             ? "bg-blue-100 text-blue-500 ring-blue-500"
-            : "bg-red-100 text-red-500 ring-red-500",
+            : env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION === "DEV"
+              ? "bg-green-100 text-green-500 ring-green-500"
+              : "bg-red-100 text-red-500 ring-red-500",
         )}
       >
-        <AlertTriangle size={16} />
+        {env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION === "DEV" ? (
+          <Check size={16} />
+        ) : (
+          <AlertTriangle size={16} />
+        )}
         <span className="whitespace-nowrap">
           {["EU", "US"].includes(env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION)
             ? `PROD-${env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION}`

web/src/components/ModelParameters.tsx

@@ -20,7 +20,6 @@ export type ModelParamsContext = {
     key: Key,
     value: UIModelParams[Key],
   ) => void;
-  updateModelParams: <UIModelParams>(params: UIModelParams) => void;
   disabled?: boolean;
 };
 

web/src/components/Slider.tsx

@@ -0,0 +1,33 @@
+import * as React from "react";
+import { Switch } from "@headlessui/react";
+import { cn } from "@/src/utils/tailwind";
+
+export const Slider = (props: {
+  disabled: boolean; // whether the slider is clickable in the UI
+  loading?: boolean;
+  onChecked?: (checked: boolean) => void;
+  isChecked?: boolean; // whether the slider is active
+}) => {
+  console.log("props", props);
+
+  return (
+    <Switch
+      checked={props.isChecked}
+      disabled={props.loading || props.disabled}
+      onChange={props.onChecked}
+      className={cn(
+        props.isChecked ? "bg-black" : "bg-gray-200",
+        "relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-black focus:ring-offset-2",
+      )}
+    >
+      <span className="sr-only">Use setting</span>
+      <span
+        aria-hidden="true"
+        className={cn(
+          props.isChecked ? "translate-x-5" : "translate-x-0",
+          "pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out",
+        )}
+      />
+    </Switch>
+  );
+};

web/src/components/error-page.tsx

@@ -0,0 +1,46 @@
+import { Button } from "@/src/components/ui/button";
+import { AlertCircle } from "lucide-react";
+import { useSession } from "next-auth/react";
+import { useRouter } from "next/router";
+import { captureException } from "@sentry/nextjs";
+import { useEffect } from "react";
+
+export const ErrorPage = ({
+  title = "Error",
+  message,
+}: {
+  title?: string;
+  message: string;
+}) => {
+  const session = useSession();
+  const router = useRouter();
+
+  return (
+    <div className="flex h-screen flex-col items-center justify-center">
+      <AlertCircle className="mb-4 h-12 w-12 text-red-500" />
+      <h1 className="mb-4 text-xl font-bold">{title}</h1>
+      <p className="mb-8 text-center">{message}</p>
+      {session.status === "unauthenticated" ? (
+        <Button onClick={() => void router.push("/")}>Sign In</Button>
+      ) : null}
+    </div>
+  );
+};
+
+export const ErrorPageWithSentry = ({
+  title = "Error",
+  message,
+}: {
+  title?: string;
+  message: string;
+}) => {
+  useEffect(() => {
+    // Capture the error with Sentry
+    if (window !== undefined)
+      captureException(
+        new Error(`ErrorPageWithSentry rendered: ${title}, ${message}`),
+      );
+  }, [title, message]); // Empty dependency array means this effect runs once on mount
+
+  return <ErrorPage title={title} message={message} />;
+};

web/src/components/layouts/header.tsx

@@ -5,6 +5,7 @@ import { useSession } from "next-auth/react";
 import DocPopup from "@/src/components/layouts/doc-popup";
 import { type Status, StatusBadge } from "./status-badge";
 import { cn } from "@/src/utils/tailwind";
+import { Badge } from "@/src/components/ui/badge";
 
 export default function Header({
   level = "h2",
@@ -14,8 +15,10 @@ export default function Header({
   breadcrumb?: { name: string; href?: string }[];
   status?: Status;
   help?: { description: string; href?: string };
+  featureBetaURL?: string;
   actionButtons?: React.ReactNode;
   level?: "h2" | "h3";
+  className?: string;
 }) {
   const router = useRouter();
   const session = useSession();
@@ -40,7 +43,7 @@ export default function Header({
     [...props.breadcrumb.map((i) => i.href).filter(Boolean)].pop();
 
   return (
-    <div className={cn(level === "h2" ? "mb-4" : "mb-2")}>
+    <div className={cn(level === "h2" ? "mb-4" : "mb-2", props.className)}>
       <div>
         {backHref ? (
           <nav className="sm:hidden" aria-label="Back">
@@ -89,7 +92,7 @@ export default function Header({
       </div>
       <div className="mt-2 flex flex-wrap items-center justify-between gap-2">
         <div className="flex items-center gap-3 md:gap-5">
-          <div className="flex min-w-0 flex-row">
+          <div className="flex min-w-0 flex-row justify-center align-middle">
             {level === "h2" ? (
               <h2 className="text-2xl font-bold leading-7 text-gray-900 sm:truncate sm:text-3xl sm:tracking-tight">
                 {props.title}
@@ -106,10 +109,25 @@ export default function Header({
                 size="sm"
               />
             ) : null}
+            {props.featureBetaURL ? (
+              <Link
+                href={props.featureBetaURL}
+                rel="noopener noreferrer"
+                target="_blank"
+                className="flex items-center"
+              >
+                <Badge
+                  title="Feature is currently in beta. Click to learn more."
+                  className="ml-2"
+                >
+                  Beta
+                </Badge>
+              </Link>
+            ) : null}
           </div>
           {props.status && <StatusBadge type={props.status} />}
         </div>
-        <div className="flex items-center gap-3">
+        <div className="flex flex-wrap items-center gap-3">
           {props.actionButtons ?? null}
         </div>
       </div>

web/src/components/layouts/layout.tsx

@@ -43,7 +43,11 @@ const userNavigation = [
 ];
 
 const pathsWithoutNavigation: string[] = ["/onboarding"];
-const unauthenticatedPaths: string[] = ["/auth/sign-in", "/auth/sign-up"];
+const unauthenticatedPaths: string[] = [
+  "/auth/sign-in",
+  "/auth/sign-up",
+  "/auth/error",
+];
 const publishablePaths: string[] = [
   "/project/[projectId]/sessions/[sessionId]",
   "/project/[projectId]/traces/[traceId]",
@@ -157,7 +161,6 @@ export default function Layout(props: PropsWithChildren) {
 
   const hideNavigation =
     session.status === "unauthenticated" ||
-    projects.length === 0 ||
     pathsWithoutNavigation.includes(router.pathname) ||
     router.pathname.startsWith("/public/");
   if (hideNavigation)
@@ -457,13 +460,15 @@ export default function Layout(props: PropsWithChildren) {
                   href={
                     env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION === "EU"
                       ? "https://langfuse.com/docs/demo"
-                      : "https://docs-staging.langfuse.com/docs/demo"
+                      : "https://docs-staging.langfuse.com/docs/demo" // staging
                   }
                   target="_blank"
                 >
-                  {env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION === "EU"
-                    ? "Use Chat ↗"
-                    : "Use Chat (staging) ↗"}
+                  {
+                    env.NEXT_PUBLIC_LANGFUSE_CLOUD_REGION === "EU"
+                      ? "Use Chat ↗"
+                      : "Use Chat (staging) ↗" // staging
+                  }
                 </Link>
               </Button>
             </div>

web/src/components/layouts/routes.ts

@@ -11,6 +11,7 @@ import {
   PenSquareIcon,
   LibraryBig,
   TerminalIcon,
+  Lightbulb,
 } from "lucide-react";
 
 export type Route = {
@@ -56,17 +57,31 @@ export const ROUTES: Route[] = [
         name: "Models",
         pathname: `/project/[projectId]/models`,
       },
+    ],
+  },
+  {
+    name: "Evaluation",
+    icon: Lightbulb,
+    cloudOnly: true,
+    label: "Beta",
+    children: [
       {
         name: "Templates",
         pathname: `/project/[projectId]/evals/templates`,
         cloudOnly: true,
-        featureFlag: "evals",
+        rbacScope: "evalTemplate:read",
       },
       {
         name: "Configs",
         pathname: `/project/[projectId]/evals/configs`,
         cloudOnly: true,
-        featureFlag: "evals",
+        rbacScope: "job:read",
+      },
+      {
+        name: "Log",
+        pathname: `/project/[projectId]/evals/log`,
+        cloudOnly: true,
+        rbacScope: "jobExecution:read",
       },
     ],
   },
@@ -85,7 +100,8 @@ export const ROUTES: Route[] = [
     name: "Playground",
     pathname: "/project/[projectId]/playground",
     icon: TerminalIcon,
-    featureFlag: "playground",
+    cloudOnly: true,
+    label: "Beta",
   },
   {
     name: "Datasets",

web/src/components/layouts/status-badge.tsx

@@ -1,42 +1,59 @@
 import { cn } from "@/src/utils/tailwind";
 
 const statusCategories = {
-  active: ["production", "live", "active"],
+  active: ["production", "live", "active", "pending"],
   inactive: ["disabled", "inactive"],
+  completed: ["completed", "done", "finished"],
+  error: ["error", "failed"],
 };
 
 export type Status =
   (typeof statusCategories)[keyof typeof statusCategories][number];
 
 export const StatusBadge = (props: { className?: string; type: Status }) => {
+  let badgeColor = "bg-gray-100 text-gray-800";
+  let dotColor = "bg-gray-500";
+  let dotPingColor = "bg-gray-600";
+  let showDot = true;
+
+  if (statusCategories.active.includes(props.type)) {
+    badgeColor = "bg-green-100 text-green-600";
+    dotColor = "animate-ping bg-green-500";
+    dotPingColor = "bg-green-600";
+  } else if (statusCategories.error.includes(props.type)) {
+    badgeColor = "bg-red-100 text-red-600";
+    dotColor = "bg-red-500";
+    dotPingColor = "bg-red-600";
+    showDot = false;
+  } else if (statusCategories.completed.includes(props.type)) {
+    badgeColor = "bg-green-100 text-green-600";
+    showDot = false;
+  }
+
   return (
     <div
       className={cn(
         "inline-flex items-center gap-2 rounded-sm px-2 py-1 text-xs",
-        statusCategories.active.includes(props.type)
-          ? " bg-green-100 text-green-600"
-          : "bg-gray-100 text-gray-800",
+        badgeColor,
         props.className,
       )}
     >
-      <span className="relative inline-flex h-2 w-2">
-        <span
-          className={cn(
-            "absolute inline-flex h-full w-full  rounded-full opacity-75",
-            statusCategories.active.includes(props.type)
-              ? "animate-ping bg-green-500"
-              : "bg-gray-500",
-          )}
-        ></span>
-        <span
-          className={cn(
-            "relative inline-flex h-2 w-2 rounded-full ",
-            statusCategories.active.includes(props.type)
-              ? "bg-green-600"
-              : "bg-gray-600",
-          )}
-        ></span>
-      </span>
+      {showDot && (
+        <span className="relative inline-flex h-2 w-2">
+          <span
+            className={cn(
+              "absolute inline-flex h-full w-full  rounded-full opacity-75",
+              dotColor,
+            )}
+          ></span>
+          <span
+            className={cn(
+              "relative inline-flex h-2 w-2 rounded-full ",
+              dotPingColor,
+            )}
+          ></span>
+        </span>
+      )}
       <span>{props.type}</span>
     </div>
   );

web/src/components/no-access.tsx

@@ -1,22 +0,0 @@
-import { Button } from "@/src/components/ui/button";
-import { AlertCircle } from "lucide-react";
-import { useSession } from "next-auth/react";
-import { useRouter } from "next/router";
-
-export const NoAccessError = () => {
-  const session = useSession();
-  const router = useRouter();
-
-  return (
-    <div className="flex h-screen flex-col items-center justify-center">
-      <AlertCircle className="mb-4 h-12 w-12 text-red-500" />
-      <h1 className="mb-4 text-xl font-bold">Error</h1>
-      <p className="mb-8 text-center">
-        You do not have access to this resource.
-      </p>
-      {session.status === "unauthenticated" ? (
-        <Button onClick={() => void router.push("/")}>Sign In</Button>
-      ) : null}
-    </div>
-  );
-};

web/src/components/session/index.tsx

@@ -1,6 +1,6 @@
 import { GroupedScoreBadges } from "@/src/components/grouped-score-badge";
 import Header from "@/src/components/layouts/header";
-import { NoAccessError } from "@/src/components/no-access";
+import { ErrorPage } from "@/src/components/error-page";
 import { PublishSessionSwitch } from "@/src/components/publish-object-switch";
 import { StarSessionToggle } from "@/src/components/star-toggle";
 import { IOPreview } from "@/src/components/trace/IOPreview";
@@ -42,7 +42,8 @@ export const SessionPage: React.FC<{
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [session.isSuccess, session.data]);
 
-  if (session.error?.data?.code === "UNAUTHORIZED") return <NoAccessError />;
+  if (session.error?.data?.code === "UNAUTHORIZED")
+    return <ErrorPage message="You do not have access to this session." />;
 
   return (
     <div className="flex flex-col overflow-hidden xl:container">

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

@@ -487,6 +487,7 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
             observationId={observationId}
             traceId={traceId}
             io="input"
+            singleLine={rowHeight === "s"}
           />
         );
       },
@@ -505,6 +506,7 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
             observationId={observationId}
             traceId={traceId}
             io="output"
+            singleLine={rowHeight === "s"}
           />
         );
       },
@@ -518,7 +520,9 @@ export default function GenerationsTable({ projectId }: GenerationsTableProps) {
         const values = row.getValue(
           "metadata",
         ) as GenerationsTableRow["metadata"];
-        return !!values ? <IOTableCell data={values} /> : null;
+        return !!values ? (
+          <IOTableCell data={values} singleLine={rowHeight === "s"} />
+        ) : null;
       },
       enableHiding: true,
       defaultHidden: true,
@@ -673,10 +677,12 @@ const GenerationsIOCell = ({
   traceId,
   observationId,
   io,
+  singleLine = false,
 }: {
   traceId: string;
   observationId: string;
   io: "input" | "output";
+  singleLine: boolean;
 }) => {
   const observation = api.observations.byId.useQuery(
     {
@@ -700,6 +706,7 @@ const GenerationsIOCell = ({
         io === "output" ? observation.data?.output : observation.data?.input
       }
       className={cn(io === "output" && "bg-green-50")}
+      singleLine={singleLine}
     />
   );
 };

web/src/components/table/use-cases/scores.tsx

@@ -25,6 +25,7 @@ export type ScoresTableRow = {
   observationId?: string;
   traceName?: string;
   userId?: string;
+  jobConfigurationId?: string;
 };
 
 export type ScoreFilterInput = Omit<
@@ -169,7 +170,7 @@ export default function ScoresTable({
       id: "userId",
       headerTooltip: {
         description: "The user ID associated with the trace.",
-        href: "https://langfuse.com/docs/tracing/users",
+        href: "https://langfuse.com/docs/tracing-features/users",
       },
       enableHiding: true,
       enableSorting: true,
@@ -186,6 +187,29 @@ export default function ScoresTable({
         ) : undefined;
       },
     },
+    {
+      accessorKey: "jobConfigurationId",
+      header: "Eval Configuration ID",
+      id: "jobConfigurationId",
+      headerTooltip: {
+        description: "The Job Configuration ID associated with the trace.",
+        href: "https://langfuse.com/docs/scores/model-based-evals",
+      },
+      enableHiding: true,
+      enableSorting: true,
+      cell: ({ row }) => {
+        const value = row.getValue("jobConfigurationId");
+        return typeof value === "string" ? (
+          <>
+            <TableLink
+              path={`/project/${projectId}/evals/configs/${value}`}
+              value={value}
+              truncateAt={40}
+            />
+          </>
+        ) : undefined;
+      },
+    },
     {
       accessorKey: "comment",
       header: "Comment",
@@ -193,7 +217,11 @@ export default function ScoresTable({
       enableHiding: true,
       cell: ({ row }) => {
         const value = row.getValue("comment") as ScoresTableRow["comment"];
-        return value !== undefined && <IOTableCell data={value} />;
+        return (
+          value !== undefined && (
+            <IOTableCell data={value} singleLine={rowHeight === "s"} />
+          )
+        );
       },
     },
   ];
@@ -214,6 +242,7 @@ export default function ScoresTable({
       traceId: score.traceId,
       traceName: score.traceName ?? undefined,
       userId: score.userId ?? undefined,
+      jobConfigurationId: score.jobConfigurationId ?? undefined,
     };
   };
 

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

@@ -369,7 +369,7 @@ export default function SessionsTable({
         help={{
           description:
             "A session is a collection of related traces, such as a conversation or thread. To begin, add a sessionId to the trace.",
-          href: "https://langfuse.com/docs/sessions",
+          href: "https://langfuse.com/docs/tracing-features/sessions",
         }}
       />
     </div>

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

@@ -5,7 +5,7 @@ import { TraceTableMultiSelectAction } from "@/src/components/table/data-table-m
 import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
 import TableLink from "@/src/components/table/table-link";
 import { type LangfuseColumnDef } from "@/src/components/table/types";
-import { TagTracePopver } from "@/src/features/tag/components/TagTracePopver";
+import { TagTracePopover } from "@/src/features/tag/components/TagTracePopver";
 import { TokenUsageBadge } from "@/src/components/token-usage-badge";
 import { Checkbox } from "@/src/components/ui/checkbox";
 import useColumnVisibility from "@/src/features/column-visibility/hooks/useColumnVisibility";
@@ -469,7 +469,13 @@ export default function TracesTable({
       id: "input",
       cell: ({ row }) => {
         const traceId: string = row.getValue("id");
-        return <TracesIOCell traceId={traceId} io="input" />;
+        return (
+          <TracesIOCell
+            traceId={traceId}
+            io="input"
+            singleLine={rowHeight === "s"}
+          />
+        );
       },
       enableHiding: true,
       defaultHidden: true,
@@ -480,7 +486,13 @@ export default function TracesTable({
       id: "output",
       cell: ({ row }) => {
         const traceId: string = row.getValue("id");
-        return <TracesIOCell traceId={traceId} io="output" />;
+        return (
+          <TracesIOCell
+            traceId={traceId}
+            io="output"
+            singleLine={rowHeight === "s"}
+          />
+        );
       },
       enableHiding: true,
       defaultHidden: true,
@@ -490,7 +502,7 @@ export default function TracesTable({
       header: "Metadata",
       cell: ({ row }) => {
         const values: string = row.getValue("metadata");
-        return <IOTableCell data={values} />;
+        return <IOTableCell data={values} singleLine={rowHeight === "s"} />;
       },
       enableHiding: true,
     },
@@ -540,7 +552,7 @@ export default function TracesTable({
         const filterOptionTags = traceFilterOptions.data?.tags ?? [];
         const allTags = filterOptionTags.map((t) => t.value);
         return (
-          <TagTracePopver
+          <TagTracePopover
             tags={tags}
             availableTags={allTags}
             projectId={projectId}
@@ -643,9 +655,11 @@ export default function TracesTable({
 const TracesIOCell = ({
   traceId,
   io,
+  singleLine = false,
 }: {
   traceId: string;
   io: "input" | "output";
+  singleLine?: boolean;
 }) => {
   const trace = api.traces.byId.useQuery(
     { traceId: traceId },
@@ -664,6 +678,7 @@ const TracesIOCell = ({
       isLoading={trace.isLoading}
       data={io === "output" ? trace.data?.output : trace.data?.input}
       className={cn(io === "output" && "bg-green-50")}
+      singleLine={singleLine}
     />
   );
 };

web/src/components/trace/ObservationPreview.tsx

@@ -134,6 +134,7 @@ export const ObservationPreview = (props: {
               projectId={props.projectId}
               input={observationWithInputAndOutput.data.input}
               output={observationWithInputAndOutput.data.output}
+              metadata={preloadedObservation.metadata}
               key={preloadedObservation.id}
             />
           ) : null}

web/src/components/trace/TracePreview.tsx

@@ -70,6 +70,7 @@ export const TracePreview = ({
             projectId={trace.projectId}
             input={trace.input}
             output={trace.output}
+            metadata={trace.metadata}
             key={trace.id}
           />
         </div>

web/src/components/trace/index.tsx

@@ -14,7 +14,7 @@ import { type ObservationReturnType } from "@/src/server/api/routers/traces";
 import { api } from "@/src/utils/api";
 import { StarTraceDetailsToggle } from "@/src/components/star-toggle";
 import Link from "next/link";
-import { NoAccessError } from "@/src/components/no-access";
+import { ErrorPage } from "@/src/components/error-page";
 import { TagTraceDetailsPopover } from "@/src/features/tag/components/TagTraceDetailsPopover";
 import useLocalStorage from "@/src/components/useLocalStorage";
 import { Toggle } from "@/src/components/ui/toggle";
@@ -189,7 +189,8 @@ export function TracePage({ traceId }: { traceId: string }) {
 
   const totalCost = calculateDisplayTotalCost(trace.data?.observations ?? []);
 
-  if (trace.error?.data?.code === "UNAUTHORIZED") return <NoAccessError />;
+  if (trace.error?.data?.code === "UNAUTHORIZED")
+    return <ErrorPage message="You do not have access to this trace." />;
   if (!trace.data) return <div>loading...</div>;
   return (
     <div className="flex flex-col overflow-hidden 2xl:container md:h-[calc(100vh-2rem)]">