@mastra/clickhouse 1.17.0 → 1.18.0-alpha.0

package/dist/index.js

@@ -6225,13 +6225,65 @@ const TRACE_FIELDS = {
 	}
 };
 const SPAN_FIELDS = {
+	name: {
+		sql: "s.name",
+		parameterType: "String"
+	},
 	spanType: {
 		sql: "s.spanType",
 		parameterType: "String"
 	},
+	model: {
+		sql: "s.model",
+		parameterType: "String"
+	},
+	provider: {
+		sql: "s.provider",
+		parameterType: "String"
+	},
+	startedAt: {
+		sql: "s.startedAt",
+		parameterType: "DateTime64(3, 'UTC')"
+	},
+	endedAt: {
+		sql: "s.endedAt",
+		parameterType: "DateTime64(3, 'UTC')"
+	},
+	durationMs: {
+		sql: "s.durationMs",
+		parameterType: "Float64"
+	},
+	status: {
+		sql: "s.status",
+		parameterType: "String"
+	},
 	error: {
 		sql: "s.error",
 		parameterType: "String"
+	},
+	entityType: {
+		sql: "s.entityType",
+		parameterType: "String"
+	},
+	entityId: {
+		sql: "s.entityId",
+		parameterType: "String"
+	},
+	entityName: {
+		sql: "s.entityName",
+		parameterType: "String"
+	},
+	entityVersionId: {
+		sql: "s.entityVersionId",
+		parameterType: "String"
+	},
+	parentEntityVersionId: {
+		sql: "s.parentEntityVersionId",
+		parameterType: "String"
+	},
+	rootEntityVersionId: {
+		sql: "s.rootEntityVersionId",
+		parameterType: "String"
 	}
 };
 const SCORE_FIELDS = {
@@ -6239,9 +6291,37 @@ const SCORE_FIELDS = {
 		sql: "s.scorerId",
 		parameterType: "String"
 	},
+	scorerVersion: {
+		sql: "s.scorerVersion",
+		parameterType: "String"
+	},
+	scoreSource: {
+		sql: "s.scoreSource",
+		parameterType: "String"
+	},
 	score: {
 		sql: "s.score",
 		parameterType: "Float64"
+	},
+	timestamp: {
+		sql: "s.timestamp",
+		parameterType: "DateTime64(3, 'UTC')"
+	},
+	spanId: {
+		sql: "s.spanId",
+		parameterType: "String"
+	},
+	entityVersionId: {
+		sql: "s.entityVersionId",
+		parameterType: "String"
+	},
+	parentEntityVersionId: {
+		sql: "s.parentEntityVersionId",
+		parameterType: "String"
+	},
+	rootEntityVersionId: {
+		sql: "s.rootEntityVersionId",
+		parameterType: "String"
 	}
 };
 const TRACE_SELECT = `
@@ -6273,10 +6353,20 @@ function resolveOrderField(field) {
 	if (field === "startedAt" || field === "endedAt") return field;
 	throw new Error(`Unsupported trusted trace-query field: ${field}`);
 }
-function compileScalarPredicate(predicate, registry, parameters) {
-	if (predicate.type === "boolean") return predicate.args.map((arg) => `(${compileScalarPredicate(arg, registry, parameters)})`).join(predicate.operator === "and" ? " AND " : " OR ");
-	if (predicate.type === "not") return `NOT (${compileScalarPredicate(predicate.arg, registry, parameters)})`;
-	const field = fieldDefinition(registry, predicate.field);
+function isMetadataField(field) {
+	return field.startsWith("metadata.");
+}
+function compileScalarPredicate(predicate, registry, parameters, allowMetadata = false) {
+	if (predicate.type === "boolean") return predicate.args.map((arg) => `(${compileScalarPredicate(arg, registry, parameters, allowMetadata)})`).join(predicate.operator === "and" ? " AND " : " OR ");
+	if (predicate.type === "not") return `NOT (${compileScalarPredicate(predicate.arg, registry, parameters, allowMetadata)})`;
+	const field = isMetadataField(predicate.field) ? (() => {
+		if (!allowMetadata) throw new Error(`Unsupported trusted trace-query field: ${predicate.field}`);
+		const key = parameters.add(predicate.field.slice(9), "String");
+		return {
+			sql: `coalesce(if(mapContains(r.metadataSearch, ${key}), r.metadataSearch[${key}], NULL), nullIf(trim(JSONExtractString(r.metadataRaw, ${key})), ''))`,
+			parameterType: "String"
+		};
+	})() : fieldDefinition(registry, predicate.field);
 	if (predicate.type === "presence") return `${predicate.operator === "exists" ? "isNotNull" : "isNull"}(${field.sql})`;
 	if (predicate.type === "membership") {
 		const values = predicate.values.map((value) => parameters.add(value, field.parameterType)).join(", ");
@@ -6313,7 +6403,7 @@ function compilePredicate(predicate, parameters) {
 	}
 	if (predicate.type === "boolean") return predicate.args.map((arg) => `(${compilePredicate(arg, parameters)})`).join(predicate.operator === "and" ? " AND " : " OR ");
 	if (predicate.type === "not") return `NOT (${compilePredicate(predicate.arg, parameters)})`;
-	return compileScalarPredicate(predicate, TRACE_FIELDS, parameters);
+	return compileScalarPredicate(predicate, TRACE_FIELDS, parameters, true);
 }
 function compileClickHouseTraceQuery(plan) {
 	const parameters = new ParameterBuilder();
@@ -6336,17 +6426,46 @@ function compileClickHouseTraceQuery(plan) {
       AND startedAt < ${to}
   )`];
 	if (relationCollections.has("spans")) ctes.push(`current_spans AS (
-    SELECT traceId, spanType, error
+    SELECT
+      traceId,
+      name,
+      spanType,
+      if(JSONType(attributes, 'model') = 'String', JSONExtractString(attributes, 'model'), NULL) AS model,
+      if(JSONType(attributes, 'provider') = 'String', JSONExtractString(attributes, 'provider'), NULL) AS provider,
+      startedAt,
+      endedAt,
+      dateDiff('millisecond', startedAt, endedAt) AS durationMs,
+      if(isNotNull(error), 'error', 'success') AS status,
+      error,
+      entityType,
+      entityId,
+      entityName,
+      entityVersionId,
+      parentEntityVersionId,
+      rootEntityVersionId
     FROM ${TABLE_SPAN_EVENTS}
-    WHERE traceId IN (SELECT traceId FROM root_scope)
+    WHERE isNotNull(traceId)
+      AND traceId IN (SELECT traceId FROM root_scope)
     ORDER BY dedupeKey
     LIMIT 1 BY dedupeKey
   )`);
 	if (relationCollections.has("scores")) ctes.push(`current_scores AS (
-    SELECT traceId, scorerId, score
+    SELECT
+      traceId,
+      spanId,
+      timestamp,
+      scorerId,
+      scorerVersion,
+      scoreSource,
+      score,
+      entityVersionId,
+      parentEntityVersionId,
+      rootEntityVersionId
     FROM ${TABLE_SCORE_EVENTS}
     WHERE isNotNull(traceId)
       AND traceId IN (SELECT traceId FROM root_scope)
+    ORDER BY scoreId, timestamp DESC
+    LIMIT 1 BY scoreId
   )`);
 	const predicate = plan.where ? compilePredicate(plan.where, parameters) : "1";
 	ctes.push(`candidates AS (