@mastra/duckdb 1.10.0 → 1.11.0-alpha.1

package/dist/{observability-D3311DPa.js → observability-DtZoxBur.js}

@@ -687,6 +687,23 @@ function jsonV(val) {
 	if (val === null || val === void 0) return "NULL";
 	return DuckDBConnection.sqlValue(JSON.stringify(val));
 }
+/**
+* Trim, drop blank, and dedupe tags before they are written, matching the
+* PostgreSQL and ClickHouse stores so tag predicates and discovery agree.
+*/
+function normalizeTags(tags) {
+	if (!Array.isArray(tags)) return [];
+	const seen = /* @__PURE__ */ new Set();
+	const result = [];
+	for (const t of tags) {
+		if (typeof t !== "string") continue;
+		const trimmed = t.trim();
+		if (trimmed === "" || seen.has(trimmed)) continue;
+		seen.add(trimmed);
+		result.push(trimmed);
+	}
+	return result;
+}
 /** Coerce a value to a Date. Throws if value is nullish. */
 function toDate(val) {
 	if (val === null || val === void 0) throw new Error("Expected date value but received null/undefined");
@@ -2719,6 +2736,10 @@ const TRACE_FIELDS = {
 	status: {
 		sql: TRACE_STATUS_SQL,
 		parameterType: "scalar"
+	},
+	tags: {
+		sql: "r.tags",
+		parameterType: "scalar"
 	}
 };
 const SPAN_FIELDS = {
@@ -2921,6 +2942,25 @@ function compileScalarPredicate(predicate, registry, allowMetadata = false) {
 		sql: `${field.sql} IS ${predicate.operator === "exists" ? "NOT " : ""}NULL`,
 		values: fieldValues
 	};
+	if (predicate.type === "collection") {
+		const members = `coalesce(TRY_CAST(${field.sql} AS VARCHAR[]), []::VARCHAR[])`;
+		if (!("value" in predicate)) return {
+			sql: `len(${members}) ${predicate.operator === "empty" ? "=" : ">"} 0`,
+			values: fieldValues
+		};
+		if (predicate.operator === "includes") return {
+			sql: `list_contains(${members}, ?)`,
+			values: [...fieldValues, predicate.value]
+		};
+		return {
+			sql: `len(${members}) > 0 AND NOT list_contains(${members}, ?)`,
+			values: [
+				...fieldValues,
+				...fieldValues,
+				predicate.value
+			]
+		};
+	}
 	if (predicate.type === "membership") {
 		const list = predicate.values.map(() => parameterSql(field.parameterType)).join(", ");
 		if (predicate.operator === "in") return {
@@ -2985,7 +3025,7 @@ function compileFeedbackScalarPredicate(predicate) {
 			values: compiled.values
 		};
 	}
-	if (predicate.field !== "value") return compileScalarPredicate(predicate, FEEDBACK_FIELDS);
+	if (predicate.field !== "value" || predicate.type === "collection") return compileScalarPredicate(predicate, FEEDBACK_FIELDS);
 	if (predicate.type === "presence") return {
 		sql: `s.value IS ${predicate.operator === "exists" ? "NOT " : ""}NULL`,
 		values: []
@@ -3073,7 +3113,14 @@ function collectThreadRelatedCollections(predicate, collections) {
 	else collectThreadRelatedCollections(predicate.arg, collections);
 	return collections;
 }
-function compileDuckDBTraceScope(relatedCollections) {
+function compileDuckDBTraceScope(relatedCollections, scope) {
+	const tenantConditions = (alias) => scope ? [`${alias}.organizationId = ?`, ...scope.resourceId === void 0 ? [] : [`${alias}.resourceId = ?`]] : [];
+	const tenantValues = scope ? scope.resourceId === void 0 ? [scope.organizationId] : [scope.organizationId, scope.resourceId] : [];
+	const tenantWhere = (alias) => {
+		const conditions = tenantConditions(alias);
+		return conditions.length ? `\n      WHERE ${conditions.join(" AND ")}` : "";
+	};
+	const values = [...tenantValues];
 	const ctes = [
 		`root_events AS (
       SELECT
@@ -3096,12 +3143,16 @@ function compileDuckDBTraceScope(relatedCollections) {
 		`root_scope AS (
       SELECT *
       FROM current_roots r
-      WHERE r.endedAt IS NOT NULL
-        AND r.startedAt >= CAST(? AS TIMESTAMP)
-        AND r.startedAt < CAST(? AS TIMESTAMP)
+      WHERE ${[
+			"r.endedAt IS NOT NULL",
+			"r.startedAt >= CAST(? AS TIMESTAMP)",
+			"r.startedAt < CAST(? AS TIMESTAMP)",
+			...tenantConditions("r")
+		].join("\n        AND ")}
     )`
 	];
-	if (relatedCollections.has("spans")) ctes.push(`current_span_rows AS (
+	if (relatedCollections.has("spans")) {
+		ctes.push(`current_span_rows AS (
       SELECT
         e.*,
         coalesce(
@@ -3113,7 +3164,7 @@ function compileDuckDBTraceScope(relatedCollections) {
           ORDER BY CASE WHEN e.endedAt IS NULL THEN 1 ELSE 0 END ASC, e.cursorId DESC
         ) AS currentRank
       FROM span_events e
-      INNER JOIN root_scope roots ON roots.traceId = e.traceId
+      INNER JOIN root_scope roots ON roots.traceId = e.traceId${tenantWhere("e")}
     ),
     current_spans AS (
       SELECT
@@ -3140,20 +3191,36 @@ function compileDuckDBTraceScope(relatedCollections) {
       FROM current_span_rows
       WHERE currentRank = 1
     )`);
-	if (relatedCollections.has("scores")) ctes.push(`current_scores AS (
+		values.push(...tenantValues);
+	}
+	if (relatedCollections.has("scores")) {
+		ctes.push(`current_scores AS (
       SELECT s.*
       FROM score_events s
-      INNER JOIN root_scope roots ON roots.traceId = s.traceId
+      INNER JOIN root_scope roots ON roots.traceId = s.traceId${tenantWhere("s")}
     )`);
-	if (relatedCollections.has("feedback")) ctes.push(`current_feedback AS (
+		values.push(...tenantValues);
+	}
+	if (relatedCollections.has("feedback")) {
+		ctes.push(`current_feedback AS (
       SELECT f.*
       FROM feedback_events f
-      INNER JOIN root_scope roots ON roots.traceId = f.traceId
+      INNER JOIN root_scope roots ON roots.traceId = f.traceId${tenantWhere("f")}
     )`);
-	return ctes;
+		values.push(...tenantValues);
+	}
+	return {
+		ctes,
+		values
+	};
 }
 function compileDuckDBTraceQuery(plan) {
-	const values = [plan.timeRange.from, plan.timeRange.to];
+	const { ctes, values: scopeValues } = compileDuckDBTraceScope(collectRelatedCollections(plan.where), plan.scope);
+	const values = [
+		plan.timeRange.from,
+		plan.timeRange.to,
+		...scopeValues
+	];
 	const conditions = [
 		`r.endedAt IS NOT NULL`,
 		`r.startedAt >= CAST(? AS TIMESTAMP)`,
@@ -3164,7 +3231,6 @@ function compileDuckDBTraceQuery(plan) {
 		conditions.push(`(${predicate.sql})`);
 		values.push(...predicate.values);
 	}
-	const ctes = compileDuckDBTraceScope(collectRelatedCollections(plan.where));
 	ctes.push(`candidates AS (
     SELECT ${TRACE_SELECT}${plan.paginationMode === "delta" ? ", r.cursorId AS deltaWatermark" : ""}
     FROM root_scope r
@@ -3246,10 +3312,14 @@ LIMIT ?`,
 	};
 }
 function compileDuckDBThreadQuery(plan) {
-	const values = [plan.traces.timeRange.from, plan.traces.timeRange.to];
 	const relatedCollections = collectRelatedCollections(plan.traces.where);
 	collectThreadRelatedCollections(plan.where, relatedCollections);
-	const ctes = compileDuckDBTraceScope(relatedCollections);
+	const { ctes, values: scopeValues } = compileDuckDBTraceScope(relatedCollections, plan.scope);
+	const values = [
+		plan.traces.timeRange.from,
+		plan.traces.timeRange.to,
+		...scopeValues
+	];
 	let eligibilitySql = "TRUE";
 	if (plan.traces.where) {
 		const eligibility = compilePredicate(plan.traces.where);
@@ -3307,12 +3377,17 @@ function discoveryCollections(scope) {
 	return scope === "trace" ? /* @__PURE__ */ new Set() : /* @__PURE__ */ new Set([scope]);
 }
 function compileDuckDBTraceQueryObservedFields(plan) {
-	const values = [plan.timeRange.from, plan.timeRange.to];
+	const { ctes, values: scopeValues } = compileDuckDBTraceScope(/* @__PURE__ */ new Set(), plan.scope);
+	const values = [
+		plan.timeRange.from,
+		plan.timeRange.to,
+		...scopeValues
+	];
 	if (plan.search) values.push(plan.search);
 	values.push(plan.limit + 1);
 	const search = plan.search ? `AND strpos(lower('metadata.' || entry.key), lower(?)) > 0` : "";
 	return {
-		sql: `WITH ${compileDuckDBTraceScope(/* @__PURE__ */ new Set()).join(",\n  ")}
+		sql: `WITH ${ctes.join(",\n  ")}
 SELECT 'metadata.' || entry.key AS path, count(*) AS occurrences
 FROM root_scope r, LATERAL json_each(r.metadata) entry
 WHERE entry.type = 'VARCHAR'
@@ -3329,10 +3404,18 @@ LIMIT ?`,
 	};
 }
 function compileDuckDBTraceQueryValues(plan) {
-	const values = [plan.timeRange.from, plan.timeRange.to];
-	const ctes = compileDuckDBTraceScope(discoveryCollections(plan.predicateScope));
+	const { ctes, values: scopeValues } = compileDuckDBTraceScope(discoveryCollections(plan.predicateScope), plan.scope);
+	const values = [
+		plan.timeRange.from,
+		plan.timeRange.to,
+		...scopeValues
+	];
 	let fieldSql;
-	if (plan.predicateScope === "trace" && plan.path.startsWith("metadata.")) {
+	let source = discoverySource(plan.predicateScope);
+	if (plan.predicateScope === "trace" && plan.path === "tags") {
+		fieldSql = "unnest(list_distinct(TRY_CAST(r.tags AS VARCHAR[])))";
+		source = `${source} WHERE r.tags IS NOT NULL`;
+	} else if (plan.predicateScope === "trace" && plan.path.startsWith("metadata.")) {
 		const jsonPath = `$.${JSON.stringify(plan.path.slice(9))}`;
 		fieldSql = `NULLIF(trim(CASE WHEN json_type(r.metadata, ?) = 'VARCHAR' THEN json_extract_string(r.metadata, ?) END), '')`;
 		values.push(jsonPath, jsonPath);
@@ -3342,7 +3425,7 @@ function compileDuckDBTraceQueryValues(plan) {
 	const search = plan.search ? "AND strpos(lower(CAST(value AS VARCHAR)), lower(?)) > 0" : "";
 	return {
 		sql: `WITH ${ctes.join(",\n  ")}, extracted AS (
-  SELECT ${fieldSql} AS value FROM ${discoverySource(plan.predicateScope)}
+  SELECT ${fieldSql} AS value FROM ${source}
 )
 SELECT CAST(value AS VARCHAR) AS value, count(*) AS count
 FROM extracted
@@ -3940,7 +4023,7 @@ function createStartSpanRow(s) {
 		serviceName: s.serviceName ?? null,
 		attributes: s.attributes ?? null,
 		metadata: s.metadata ?? null,
-		tags: s.tags ?? null,
+		tags: s.tags == null ? null : normalizeTags(s.tags),
 		scope: s.scope ?? null,
 		links: null,
 		input: s.input ?? null,
@@ -3979,7 +4062,7 @@ function createEndSpanRow(s) {
 		serviceName: s.serviceName ?? null,
 		attributes: s.attributes ?? null,
 		metadata: s.metadata ?? null,
-		tags: s.tags ?? null,
+		tags: s.tags == null ? null : normalizeTags(s.tags),
 		scope: s.scope ?? null,
 		links: s.links ?? null,
 		input: s.input ?? null,
@@ -4782,7 +4865,8 @@ var ObservabilityStorageDuckDB = class ObservabilityStorageDuckDB extends Observ
 			"logs",
 			"trace-query",
 			"trace-query-discovery",
-			"thread-query"
+			"thread-query",
+			"trace-query-tenant-scope"
 		];
 		return [
 			"metrics",
@@ -4790,7 +4874,8 @@ var ObservabilityStorageDuckDB = class ObservabilityStorageDuckDB extends Observ
 			"delta-polling",
 			"trace-query",
 			"trace-query-discovery",
-			"thread-query"
+			"thread-query",
+			"trace-query-tenant-scope"
 		];
 	}
 	async createSpan(args) {
@@ -4945,4 +5030,4 @@ var ObservabilityStorageDuckDB = class ObservabilityStorageDuckDB extends Observ
 //#endregion
 export { ObservabilityStorageDuckDB };
 
-//# sourceMappingURL=observability-D3311DPa.js.map
+//# sourceMappingURL=observability-DtZoxBur.js.map