Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

fix(mcp): Use matches observation filters (#16410)

Ben Bachem9f6c433ccbf4
diff --git a/web/src/__tests__/server/mcp-tools-read.servertest.ts b/web/src/__tests__/server/mcp-tools-read.servertest.ts
index 9b52db4327..fd5c2d71a3 100644
--- a/web/src/__tests__/server/mcp-tools-read.servertest.ts
+++ b/web/src/__tests__/server/mcp-tools-read.servertest.ts
@@ -943,9 +943,10 @@ describe("MCP Read Tools", () => {
});
it("should return public-compatible observation filter schema", async () => {
- const { context } = await createMcpTestSetup();
-
- const result = (await handleGetObservationFilterSchema({}, context)) as {
+ const result = (await handleGetObservationFilterSchema(
+ {},
+ mockServerContext(),
+ )) as {
resource: string;
columns: Record<string, { type: string; operators: string[] }>;
};
@@ -956,9 +957,13 @@ describe("MCP Read Tools", () => {
expect(result.columns.metadata).toEqual(
expect.objectContaining({
type: "stringObject",
+ operators: expect.arrayContaining(["matches"]),
requiresKey: true,
}),
);
+ expect(result.columns.input.operators).toEqual(["=", "matches"]);
+ expect(result.columns.output.operators).toEqual(["=", "matches"]);
+ expect(result.columns.version.operators).not.toContain("matches");
expect(result.columns.traceTags).toBeUndefined();
expect(result.columns.comments).toBeUndefined();
expect(result.columns.scores).toBeUndefined();
@@ -1007,6 +1012,29 @@ describe("MCP Read Tools", () => {
);
});
+ it.each([
+ ["input", "contains"],
+ ["version", "matches"],
+ ] as const)("should reject %s filters using %s", async (column, operator) => {
+ await expect(
+ handleListObservations(
+ {
+ traceId: randomUUID(),
+ filter: [
+ {
+ type: "string",
+ column,
+ operator,
+ value: "needle",
+ },
+ ],
+ fields: ["id"],
+ limit: 100,
+ },
+ mockServerContext(),
+ ),
+ ).rejects.toThrow();
+ });
maybeEventsTable("listObservations tool", () => {
it("should have readOnlyHint annotation", () => {
verifyToolAnnotations(listObservationsTool, { readOnlyHint: true });
@@ -1394,7 +1422,7 @@ describe("MCP Read Tools", () => {
const matchingObservation = createObservationEvent({
projectId,
traceId,
- input: `${"x".repeat(250)}${needle}`,
+ input: `${"x".repeat(250)} ${needle}`,
});
await createEventsCh([
@@ -1413,7 +1441,7 @@ describe("MCP Read Tools", () => {
{
type: "string",
column: "input",
- operator: "contains",
+ operator: "matches",
value: needle,
},
],
@@ -1452,7 +1480,7 @@ describe("MCP Read Tools", () => {
{
type: "string",
column: "input",
- operator: "contains",
+ operator: "matches",
value: "secret",
},
],
diff --git a/web/src/features/mcp/features/observations/tools/getObservationFilterSchema.ts b/web/src/features/mcp/features/observations/tools/getObservationFilterSchema.ts
index a474c586b4..6291471886 100644
--- a/web/src/features/mcp/features/observations/tools/getObservationFilterSchema.ts
+++ b/web/src/features/mcp/features/observations/tools/getObservationFilterSchema.ts
@@ -2,6 +2,7 @@ import { z } from "zod";
import {
eventsTableCols,
filterOperators,
+ FTS_MATCH_OPERATOR,
OBSERVATION_MCP_ALLOWED_EVENTS_TABLE_FILTER_COLUMNS,
} from "@langfuse/shared";
import { defineTool } from "../../../core/define-tool";
@@ -26,6 +27,14 @@ const OBSERVATION_MCP_FILTER_CONFIG_COLUMN_OVERRIDES: Record<string, string> = {
tags: "traceTags",
};
+export const OBSERVATION_MCP_FTS_COLUMNS = new Set([
+ "input",
+ "output",
+ "metadata",
+]);
+
+export const OBSERVATION_MCP_INDEXED_IO_COLUMNS = new Set(["input", "output"]);
+
export const [
getObservationFilterSchemaTool,
handleGetObservationFilterSchema,
@@ -49,12 +58,20 @@ export const [
.filter((column) => column.id in publicFilterColumnsByConfigColumn)
.map((column) => {
const publicColumn = publicFilterColumnsByConfigColumn[column.id];
+ const operators = OBSERVATION_MCP_INDEXED_IO_COLUMNS.has(publicColumn)
+ ? ["=", FTS_MATCH_OPERATOR]
+ : [
+ ...filterOperators[column.type],
+ ...(OBSERVATION_MCP_FTS_COLUMNS.has(publicColumn)
+ ? [FTS_MATCH_OPERATOR]
+ : []),
+ ];
return [
publicColumn,
{
type: column.type,
- operators: filterOperators[column.type],
+ operators,
nullable: Boolean(column.nullable),
requiresKey:
column.type === "stringObject" ||
diff --git a/web/src/features/mcp/features/observations/tools/listObservations.ts b/web/src/features/mcp/features/observations/tools/listObservations.ts
index 64e6ce3012..84ff247f35 100644
--- a/web/src/features/mcp/features/observations/tools/listObservations.ts
+++ b/web/src/features/mcp/features/observations/tools/listObservations.ts
@@ -2,12 +2,15 @@ import {
InvalidRequestError,
OBSERVATION_MCP_ALLOWED_EVENTS_TABLE_FILTER_COLUMNS,
booleanFilter,
+ eventsTableSingleFilter,
+ eventsTableStringFilter,
+ eventsTableStringObjectFilter,
eventsTableCols,
filterOperators,
+ FTS_MATCH_OPERATOR,
numberFilter,
ObservationLevelDomain,
ObservationTypeDomain,
- singleFilter,
stringFilter,
stringObjectFilter,
stringOptionsFilter,
@@ -35,6 +38,10 @@ import {
ObservationLimitSchema,
projectObservation,
} from "../schema";
+import {
+ OBSERVATION_MCP_FTS_COLUMNS,
+ OBSERVATION_MCP_INDEXED_IO_COLUMNS,
+} from "./getObservationFilterSchema";
const ObservationCursorSchema =
EncodedObservationsCursorV2String.optional().describe(
@@ -85,11 +92,18 @@ const OBSERVATION_MCP_FILTER_SCHEMA_BY_TYPE = {
: z.literal("datetime").optional(),
column: z.literal(column),
}),
- string: (column: string, requireType = false) =>
- stringFilter.omit({ type: true, column: true }).extend({
+ string: (column: string, requireType = false) => {
+ const filterSchema = OBSERVATION_MCP_INDEXED_IO_COLUMNS.has(column)
+ ? eventsTableStringFilter.extend({
+ operator: z.enum(["=", FTS_MATCH_OPERATOR]),
+ })
+ : stringFilter;
+
+ return filterSchema.omit({ type: true, column: true }).extend({
type: requireType ? z.literal("string") : z.literal("string").optional(),
column: z.literal(column),
- }),
+ });
+ },
stringOptions: (column: string, requireType = false) =>
stringOptionsFilter.omit({ type: true, column: true }).extend({
type: requireType
@@ -111,13 +125,18 @@ const OBSERVATION_MCP_FILTER_SCHEMA_BY_TYPE = {
type: requireType ? z.literal("number") : z.literal("number").optional(),
column: z.literal(column),
}),
- stringObject: (column: string, requireType = false) =>
- stringObjectFilter.omit({ type: true, column: true }).extend({
+ stringObject: (column: string, requireType = false) => {
+ const filterSchema = OBSERVATION_MCP_FTS_COLUMNS.has(column)
+ ? eventsTableStringObjectFilter
+ : stringObjectFilter;
+
+ return filterSchema.omit({ type: true, column: true }).extend({
type: requireType
? z.literal("stringObject")
: z.literal("stringObject").optional(),
column: z.literal(column),
- }),
+ });
+ },
boolean: (column: string, requireType = false) =>
booleanFilter.omit({ type: true, column: true }).extend({
type: requireType
@@ -225,7 +244,7 @@ const ObservationMcpFilterSchema = z.preprocess(
const type =
filter.type ?? OBSERVATION_MCP_FILTER_COLUMN_TYPES.get(filter.column);
- return singleFilter.parse(
+ return eventsTableSingleFilter.parse(
filter.column === "tags"
? { ...filter, type, column: "traceTags" }
: { ...filter, type },
@@ -369,36 +388,31 @@ export const [listObservationsTool, handleListObservations] = defineTool({
"mcp.field_groups": fieldGroups.join(","),
});
- const items = await getObservationsV2FromEventsTableForPublicApi(
- {
- projectId: context.projectId,
- page: 0,
- limit: input.limit,
- traceId: input.traceId,
- userId: input.userId,
- level: input.level,
- name: input.name,
- type: input.type,
- environment: input.environment,
- parentObservationId: input.parentObservationId,
- isRootObservation: input.isRootObservation,
- fromStartTime: input.fromStartTime,
- toStartTime: input.toStartTime,
- version: input.version,
- advancedFilters: input.filter,
- cursor: input.cursor
- ? EncodedObservationsCursorV2.parse(input.cursor)
- : undefined,
- fields: fieldGroups,
- expandMetadataKeys: getMetadataExpansionForProjection(
- projectionFields,
- input.expandMetadataKeys,
- ),
- },
- // MCP keeps the legacy observation filter contract. Its separate
- // selective-scope guard above limits expensive input/output filters.
- { allowUnindexedIoFilters: true },
- );
+ const items = await getObservationsV2FromEventsTableForPublicApi({
+ projectId: context.projectId,
+ page: 0,
+ limit: input.limit,
+ traceId: input.traceId,
+ userId: input.userId,
+ level: input.level,
+ name: input.name,
+ type: input.type,
+ environment: input.environment,
+ parentObservationId: input.parentObservationId,
+ isRootObservation: input.isRootObservation,
+ fromStartTime: input.fromStartTime,
+ toStartTime: input.toStartTime,
+ version: input.version,
+ advancedFilters: input.filter,
+ cursor: input.cursor
+ ? EncodedObservationsCursorV2.parse(input.cursor)
+ : undefined,
+ fields: fieldGroups,
+ expandMetadataKeys: getMetadataExpansionForProjection(
+ projectionFields,
+ input.expandMetadataKeys,
+ ),
+ });
const hasMore = items.length > input.limit;
const dataToReturn = hasMore ? items.slice(0, input.limit) : items;