@mastra/pg 1.26.0 → 1.27.0-alpha.1

package/dist/index.js

@@ -5642,6 +5642,19 @@ var ChannelsPG = class ChannelsPG extends ChannelsStorage {
 function jsonbArg(value) {
 	return value === void 0 || value === null ? null : JSON.stringify(value);
 }
+/** Preserve JSON null as data, rather than converting it to an absent SQL value. */
+function jsonDataArg(value) {
+	return value === void 0 ? null : JSON.stringify(value);
+}
+const ITEM_SELECT_COLUMNS = [
+	...Object.keys(DATASET_ITEMS_SCHEMA),
+	"createdAtZ",
+	"updatedAtZ"
+].map((column) => [
+	"input",
+	"groundTruth",
+	"expectedTrajectory"
+].includes(column) ? `"${column}"::text AS "${column}"` : `"${column}"`).join(", ");
 function parseStoredJSON(value) {
 	if (typeof value === "string") try {
 		return JSON.parse(value);
@@ -5816,9 +5829,9 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 			groundTruthSchema: row.groundTruthSchema ? safelyParseJSON(row.groundTruthSchema) : void 0,
 			requestContextSchema: row.requestContextSchema ? safelyParseJSON(row.requestContextSchema) : void 0,
 			tags: row.tags ? safelyParseJSON(row.tags) : void 0,
-			targetType: row.targetType || null,
-			targetIds: row.targetIds || null,
-			scorerIds: row.scorerIds || null,
+			targetType: row.targetType || void 0,
+			targetIds: row.targetIds ?? void 0,
+			scorerIds: row.scorerIds ?? void 0,
 			organizationId: row.organizationId ?? null,
 			projectId: row.projectId ?? null,
 			candidateKey: row.candidateKey ?? null,
@@ -5920,9 +5933,9 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 				inputSchema: input.inputSchema ?? void 0,
 				groundTruthSchema: input.groundTruthSchema ?? void 0,
 				requestContextSchema: input.requestContextSchema ?? void 0,
-				targetType: input.targetType ?? null,
-				targetIds: input.targetIds ?? null,
-				scorerIds: input.scorerIds ?? null,
+				targetType: input.targetType ?? void 0,
+				targetIds: input.targetIds ?? void 0,
+				scorerIds: input.scorerIds ?? void 0,
 				organizationId: input.organizationId ?? null,
 				projectId: input.projectId ?? null,
 				candidateKey: input.candidateKey ?? null,
@@ -6049,9 +6062,9 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 				groundTruthSchema: (args.groundTruthSchema !== void 0 ? args.groundTruthSchema : existing.groundTruthSchema) ?? void 0,
 				requestContextSchema: (args.requestContextSchema !== void 0 ? args.requestContextSchema : existing.requestContextSchema) ?? void 0,
 				tags: (args.tags !== void 0 ? args.tags : existing.tags) ?? void 0,
-				targetType: (args.targetType !== void 0 ? args.targetType : existing.targetType) ?? null,
-				targetIds: (args.targetIds !== void 0 ? args.targetIds : existing.targetIds) ?? null,
-				scorerIds: (args.scorerIds !== void 0 ? args.scorerIds : existing.scorerIds) ?? null,
+				targetType: (args.targetType !== void 0 ? args.targetType : existing.targetType) ?? void 0,
+				targetIds: (args.targetIds !== void 0 ? args.targetIds : existing.targetIds) ?? void 0,
+				scorerIds: (args.scorerIds !== void 0 ? args.scorerIds : existing.scorerIds) ?? void 0,
 				organizationId: existing.organizationId ?? null,
 				projectId: existing.projectId ?? null,
 				candidateKey: existing.candidateKey ?? null,
@@ -6229,8 +6242,8 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 					parentOrganizationId,
 					parentProjectId,
 					JSON.stringify(args.input),
-					jsonbArg(args.groundTruth),
-					jsonbArg(args.expectedTrajectory),
+					jsonDataArg(args.groundTruth),
+					jsonDataArg(args.expectedTrajectory),
 					jsonbArg(args.toolMocks),
 					args.unmockedToolPolicy ?? null,
 					jsonbArg(args.scorerIds),
@@ -6346,8 +6359,8 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 					parentOrganizationId,
 					parentProjectId,
 					JSON.stringify(mergedInput),
-					jsonbArg(mergedGroundTruth),
-					jsonbArg(mergedExpectedTrajectory),
+					jsonDataArg(mergedGroundTruth),
+					jsonDataArg(mergedExpectedTrajectory),
 					jsonbArg(mergedToolMocks),
 					mergedUnmockedToolPolicy ?? null,
 					jsonbArg(mergedScorerIds),
@@ -6436,8 +6449,8 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 					parentOrganizationId,
 					parentProjectId,
 					JSON.stringify(existing.input),
-					jsonbArg(existing.groundTruth),
-					jsonbArg(existing.expectedTrajectory),
+					jsonDataArg(existing.groundTruth),
+					jsonDataArg(existing.expectedTrajectory),
 					jsonbArg(existing.toolMocks),
 					existing.unmockedToolPolicy ?? null,
 					jsonbArg(existing.scorerIds),
@@ -6537,7 +6550,7 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 					details: { datasetId: input.datasetId }
 				});
 				const externalIds = [...new Set(input.items.flatMap((item) => item.externalId ? [item.externalId] : []))];
-				const historyRows = externalIds.length ? await t.manyOrNone(`SELECT * FROM ${itemsTable} WHERE "datasetId" = $1 AND "externalId" = ANY($2::text[]) ORDER BY "datasetVersion"`, [input.datasetId, externalIds]) : [];
+				const historyRows = externalIds.length ? await t.manyOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${itemsTable} WHERE "datasetId" = $1 AND "externalId" = ANY($2::text[]) ORDER BY "datasetVersion"`, [input.datasetId, externalIds]) : [];
 				const plan = this.planDatasetItemBatch(input.items, historyRows.map((row) => this.transformItemRowFull(row)), () => crypto.randomUUID());
 				const resolved = new Map([...plan.existingCurrentItems].map(([id, row]) => [id, this.datasetItemFromRow(row)]));
 				if (plan.inserts.length > 0) {
@@ -6554,8 +6567,8 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 							dataset.organizationId ?? null,
 							dataset.projectId ?? null,
 							JSON.stringify(item.input),
-							jsonbArg(item.groundTruth),
-							jsonbArg(item.expectedTrajectory),
+							jsonDataArg(item.groundTruth),
+							jsonDataArg(item.expectedTrajectory),
 							jsonbArg(item.toolMocks),
 							item.unmockedToolPolicy ?? null,
 							jsonbArg(item.scorerIds),
@@ -6632,7 +6645,7 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 					category: ErrorCategory.USER,
 					details: { datasetId: input.datasetId }
 				});
-				const currentItems = (await t.manyOrNone(`SELECT * FROM ${itemsTable} WHERE "id" = ANY($1::text[]) AND "datasetId" = $2 AND "validTo" IS NULL AND "isDeleted" = false`, [input.itemIds, input.datasetId])).map((row) => this.transformItemRow(row));
+				const currentItems = (await t.manyOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${itemsTable} WHERE "id" = ANY($1::text[]) AND "datasetId" = $2 AND "validTo" IS NULL AND "isDeleted" = false`, [input.itemIds, input.datasetId])).map((row) => this.transformItemRow(row));
 				if (currentItems.length === 0) return;
 				const parentOrganizationId = dataset.organizationId ?? null;
 				const parentProjectId = dataset.projectId ?? null;
@@ -6647,8 +6660,8 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 						parentOrganizationId,
 						parentProjectId,
 						JSON.stringify(item.input),
-						jsonbArg(item.groundTruth),
-						jsonbArg(item.expectedTrajectory),
+						jsonDataArg(item.groundTruth),
+						jsonDataArg(item.expectedTrajectory),
 						jsonbArg(item.toolMocks),
 						item.unmockedToolPolicy ?? null,
 						jsonbArg(item.scorerIds),
@@ -6688,8 +6701,8 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 				schemaName: getSchemaName$5(this.#schema)
 			});
 			let result;
-			if (args.datasetVersion !== void 0) result = await client.oneOrNone(`SELECT * FROM ${tableName} WHERE "id" = $1 AND "datasetVersion" <= $2 AND ("validTo" IS NULL OR "validTo" > $2) AND "isDeleted" = false ORDER BY "datasetVersion" DESC LIMIT 1`, [args.id, args.datasetVersion]);
-			else result = await client.oneOrNone(`SELECT * FROM ${tableName} WHERE "id" = $1 AND "validTo" IS NULL AND "isDeleted" = false`, [args.id]);
+			if (args.datasetVersion !== void 0) result = await client.oneOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableName} WHERE "id" = $1 AND "datasetVersion" <= $2 AND ("validTo" IS NULL OR "validTo" > $2) AND "isDeleted" = false ORDER BY "datasetVersion" DESC LIMIT 1`, [args.id, args.datasetVersion]);
+			else result = await client.oneOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableName} WHERE "id" = $1 AND "validTo" IS NULL AND "isDeleted" = false`, [args.id]);
 			return result ? this.transformItemRow(result) : null;
 		} catch (error) {
 			throw new MastraError({
@@ -6705,7 +6718,7 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 				indexName: TABLE_DATASET_ITEMS,
 				schemaName: getSchemaName$5(this.#schema)
 			});
-			return (await this.#db.readClient.manyOrNone(`SELECT * FROM ${tableName} WHERE "datasetId" = $1 AND "datasetVersion" <= $2 AND ("validTo" IS NULL OR "validTo" > $3) AND "isDeleted" = false ORDER BY "createdAt" DESC, "id" ASC`, [
+			return (await this.#db.readClient.manyOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableName} WHERE "datasetId" = $1 AND "datasetVersion" <= $2 AND ("validTo" IS NULL OR "validTo" > $3) AND "isDeleted" = false ORDER BY "createdAt" DESC, "id" ASC`, [
 				datasetId,
 				version,
 				version
@@ -6724,7 +6737,7 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 				indexName: TABLE_DATASET_ITEMS,
 				schemaName: getSchemaName$5(this.#schema)
 			});
-			return (await this.#db.readClient.manyOrNone(`SELECT * FROM ${tableName} WHERE "id" = $1 ORDER BY "datasetVersion" DESC`, [itemId]) || []).map((row) => this.transformItemRowFull(row));
+			return (await this.#db.readClient.manyOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableName} WHERE "id" = $1 ORDER BY "datasetVersion" DESC`, [itemId]) || []).map((row) => this.transformItemRowFull(row));
 		} catch (error) {
 			throw new MastraError({
 				id: createStorageErrorId("PG", "GET_ITEM_HISTORY", "FAILED"),
@@ -6796,7 +6809,7 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 			const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
 			const limitValue = perPageInput === false ? total : perPage;
 			return {
-				items: (await client.manyOrNone(`SELECT * FROM ${tableName} ${whereClause} ORDER BY "${orderBy.field}" ${orderBy.direction}, "id" ASC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`, [
+				items: (await client.manyOrNone(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableName} ${whereClause} ORDER BY "${orderBy.field}" ${orderBy.direction}, "id" ASC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`, [
 					...queryParams,
 					limitValue,
 					offset
@@ -17246,7 +17259,8 @@ const TRACE_FIELDS = {
 	entityName: "r.\"entityName\"",
 	entityType: "r.\"entityType\"",
 	environment: "r.\"environment\"",
-	status: TRACE_STATUS_SQL
+	status: TRACE_STATUS_SQL,
+	tags: "r.\"tags\""
 };
 const SPAN_FIELDS = {
 	name: "s.\"name\"",
@@ -17348,6 +17362,19 @@ function compileScalarPredicate(predicate, registry, parameterOffset, allowMetad
 		sql: `${field} IS ${predicate.operator === "exists" ? "NOT " : ""}NULL`,
 		values: fieldValues
 	};
+	if (predicate.type === "collection") {
+		if (predicate.operator === "includes" || predicate.operator === "notIncludes") {
+			const contains = `${field} @> ARRAY[$${parameterOffset}]::text[]`;
+			return {
+				sql: predicate.operator === "includes" ? contains : `cardinality(${field}) > 0 AND NOT (${contains})`,
+				values: [...fieldValues, predicate.value]
+			};
+		}
+		return {
+			sql: `cardinality(${field}) ${predicate.operator === "empty" ? "=" : ">"} 0`,
+			values: fieldValues
+		};
+	}
 	if (predicate.type === "membership") {
 		const list = placeholders(predicate.values, parameterOffset);
 		if (predicate.operator === "in") return {
@@ -17401,6 +17428,7 @@ function compileFeedbackScalarPredicate(predicate, parameterOffset) {
 		};
 	}
 	if (predicate.field !== "value") return compileScalarPredicate(predicate, FEEDBACK_FIELDS, parameterOffset);
+	if (predicate.type === "collection") throw new Error(`Unsupported trusted trace-query field: ${predicate.field}`);
 	if (predicate.type === "presence") {
 		const present = `(s."valueString" IS NOT NULL OR s."valueNumber" IS NOT NULL)`;
 		return {
@@ -17511,27 +17539,39 @@ function compileThreadPredicate(predicate, parameterOffset) {
 		values: compiled.values
 	};
 }
-function compilePostgresTraceScope(schema, selection, relationCollections, deltaWindow) {
+function compilePostgresTraceScope(schema, selection, relationCollections, scope, deltaWindow) {
 	const spanTable = qualifiedTable(schema, TABLE_SPAN_EVENTS);
 	const scoreTable = qualifiedTable(schema, TABLE_SCORE_EVENTS);
 	const feedbackTable = qualifiedTable(schema, TABLE_FEEDBACK_EVENTS);
 	const values = [selection.timeRange.from, selection.timeRange.to];
-	const rootConditions = [
-		`r."parentSpanId" IS NULL`,
-		latestRootPredicate$1(spanTable),
-		`NOT r."isPending"`,
-		`r."endedAt" IS NOT NULL`,
-		`r."startedAt" >= $1`,
-		`r."startedAt" < $2`
-	];
+	const deltaConditions = [];
 	if (deltaWindow) {
 		values.push(deltaWindow.xactId, deltaWindow.cursorId, deltaWindow.safeHorizon);
-		rootConditions.push(`(r."xactId", r."cursorId") > ($3::xid8, $4::bigint)`, `r."xactId" < $5::xid8`);
+		deltaConditions.push(`(r."xactId", r."cursorId") > ($3::xid8, $4::bigint)`, `r."xactId" < $5::xid8`);
+	}
+	const scopeConditions = [];
+	if (scope) {
+		values.push(scope.organizationId);
+		scopeConditions.push(`"organizationId" = $${values.length}`);
+		if (scope.resourceId !== void 0) {
+			values.push(scope.resourceId);
+			scopeConditions.push(`"resourceId" = $${values.length}`);
+		}
 	}
+	const scopeSql = (alias) => scopeConditions.map((condition) => `\n      AND ${alias}.${condition}`).join("");
 	const ctes = [`root_scope AS MATERIALIZED (
     SELECT *
     FROM ${spanTable} r
-    WHERE ${rootConditions.join("\n      AND ")}
+    WHERE ${[
+		`r."parentSpanId" IS NULL`,
+		latestRootPredicate$1(spanTable),
+		`NOT r."isPending"`,
+		`r."endedAt" IS NOT NULL`,
+		`r."startedAt" >= $1`,
+		`r."startedAt" < $2`,
+		...deltaConditions,
+		...scopeConditions.map((condition) => `r.${condition}`)
+	].join("\n      AND ")}
   )`];
 	if (relationCollections.has("spans")) ctes.push(`current_spans AS MATERIALIZED (
     SELECT
@@ -17557,7 +17597,7 @@ function compilePostgresTraceScope(schema, selection, relationCollections, delta
     FROM ${spanTable} s
     WHERE s."traceId" IS NOT NULL
       AND s."traceId" IN (SELECT "traceId" FROM root_scope)
-      AND ${latestSpanPredicate$1(spanTable)}
+      AND ${latestSpanPredicate$1(spanTable)}${scopeSql("s")}
   )`);
 	if (relationCollections.has("scores")) ctes.push(`current_scores AS MATERIALIZED (
     SELECT
@@ -17574,7 +17614,7 @@ function compilePostgresTraceScope(schema, selection, relationCollections, delta
     FROM ${scoreTable} s
     WHERE s."traceId" IS NOT NULL
       AND s."traceId" IN (SELECT "traceId" FROM root_scope)
-      AND ${latestScorePredicate(scoreTable)}
+      AND ${latestScorePredicate(scoreTable)}${scopeSql("s")}
   )`);
 	if (relationCollections.has("feedback")) ctes.push(`current_feedback AS MATERIALIZED (
     SELECT
@@ -17593,7 +17633,7 @@ function compilePostgresTraceScope(schema, selection, relationCollections, delta
     FROM ${feedbackTable} s
     WHERE s."traceId" IS NOT NULL
       AND s."traceId" IN (SELECT "traceId" FROM root_scope)
-      AND ${latestFeedbackPredicate(feedbackTable)}
+      AND ${latestFeedbackPredicate(feedbackTable)}${scopeSql("s")}
   )`);
 	return {
 		ctes,
@@ -17611,7 +17651,7 @@ function compilePostgresTraceQuery(schema, plan, mode = "data", safeHorizon) {
 			safeHorizon
 		};
 	}
-	const { ctes, values } = compilePostgresTraceScope(schema, plan, relationCollections, deltaWindow);
+	const { ctes, values } = compilePostgresTraceScope(schema, plan, relationCollections, plan.scope, deltaWindow);
 	let predicateSql = "TRUE";
 	if (plan.where) {
 		const predicate = compilePredicate(plan.where, values.length + 1);
@@ -17689,7 +17729,7 @@ LIMIT $${values.length}`,
 function compilePostgresThreadQuery(schema, plan) {
 	const relationCollections = collectRelationCollections(plan.traces.where);
 	collectThreadRelationCollections(plan.where, relationCollections);
-	const { ctes, values } = compilePostgresTraceScope(schema, plan.traces, relationCollections);
+	const { ctes, values } = compilePostgresTraceScope(schema, plan.traces, relationCollections, plan.scope);
 	let eligibilitySql = "TRUE";
 	if (plan.traces.where) {
 		const eligibility = compilePredicate(plan.traces.where, values.length + 1);
@@ -17747,7 +17787,7 @@ function discoveryCollections(scope) {
 	return scope === "trace" ? /* @__PURE__ */ new Set() : /* @__PURE__ */ new Set([scope]);
 }
 function compilePostgresTraceQueryObservedFields(schema, plan) {
-	const { ctes, values } = compilePostgresTraceScope(schema, plan, /* @__PURE__ */ new Set());
+	const { ctes, values } = compilePostgresTraceScope(schema, plan, /* @__PURE__ */ new Set(), plan.scope);
 	const searchParameter = values.length + 1;
 	const search = plan.search ? `AND strpos(lower('metadata.' || entry.key), lower($${searchParameter})) > 0` : "";
 	if (plan.search) values.push(plan.search);
@@ -17771,23 +17811,24 @@ LIMIT $${values.length}`,
 	};
 }
 function compilePostgresTraceQueryValues(schema, plan) {
-	const { ctes, values } = compilePostgresTraceScope(schema, plan, discoveryCollections(plan.predicateScope));
-	let field;
-	if (plan.predicateScope === "trace" && plan.path.startsWith("metadata.")) {
+	const { ctes, values } = compilePostgresTraceScope(schema, plan, discoveryCollections(plan.predicateScope), plan.scope);
+	let extracted;
+	if (plan.predicateScope === "trace" && plan.path === "tags") extracted = `SELECT value FROM (SELECT DISTINCT r."traceId", UNNEST(r."tags") AS value FROM root_scope r) t`;
+	else if (plan.predicateScope === "trace" && plan.path.startsWith("metadata.")) {
 		const keyParameter = `$${values.length + 1}`;
-		field = `COALESCE(
+		extracted = `SELECT COALESCE(
       CASE WHEN jsonb_typeof(r."metadataSearch" -> ${keyParameter}) = 'string' THEN r."metadataSearch" ->> ${keyParameter} END,
       CASE WHEN jsonb_typeof(r."metadataRaw" -> ${keyParameter}) = 'string' THEN NULLIF(btrim(r."metadataRaw" ->> ${keyParameter}), '') END
-    )`;
+    )::text AS value FROM root_scope r`;
 		values.push(plan.path.slice(9));
-	} else field = fieldSql(discoveryRegistry(plan.predicateScope), plan.path);
+	} else extracted = `SELECT ${fieldSql(discoveryRegistry(plan.predicateScope), plan.path)}::text AS value FROM ${discoverySource(plan.predicateScope)}`;
 	const searchParameter = values.length + 1;
 	const search = plan.search ? `AND strpos(lower(value), lower($${searchParameter})) > 0` : "";
 	if (plan.search) values.push(plan.search);
 	values.push(plan.limit + 1);
 	return {
 		text: `WITH ${ctes.join(",\n")}, extracted AS (
-  SELECT ${field}::text AS value FROM ${discoverySource(plan.predicateScope)}
+  ${extracted}
 )
 SELECT value, count(*)::bigint AS count
 FROM extracted
@@ -18886,7 +18927,8 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"logs",
 			"trace-query",
 			"trace-query-discovery",
-			"thread-query"
+			"thread-query",
+			"trace-query-tenant-scope"
 		];
 		return [
 			"metrics",
@@ -18894,7 +18936,8 @@ var ObservabilityStoragePostgresVNext = class ObservabilityStoragePostgresVNext
 			"delta-polling",
 			"trace-query",
 			"trace-query-discovery",
-			"thread-query"
+			"thread-query",
+			"trace-query-tenant-scope"
 		];
 	}
 	async #run(op, fn, details) {