@mastra/clickhouse 1.18.0-alpha.1 → 1.18.0

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-clickhouse
 description: Documentation for @mastra/clickhouse. Use when working with @mastra/clickhouse APIs, configuration, or implementation.
 metadata:
   package: "@mastra/clickhouse"
-  version: "1.18.0-alpha.1"
+  version: "1.18.0"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.18.0-alpha.1",
+  "version": "1.18.0",
   "package": "@mastra/clickhouse",
   "exports": {},
   "modules": {}

package/dist/index.cjs

@@ -3206,6 +3206,7 @@ CREATE TABLE IF NOT EXISTS ${TABLE_FEEDBACK_EVENTS} (
 
   -- IDs
   feedbackId         String,
+  writeVersion       UInt64 DEFAULT 0,
   traceId            Nullable(String),
   spanId             Nullable(String),
   experimentId       Nullable(String),
@@ -3493,6 +3494,7 @@ const ALL_MIGRATIONS = [
 	addColumn(TABLE_SCORE_EVENTS, "entityVersionId", "Nullable(String)"),
 	addColumn(TABLE_SCORE_EVENTS, "parentEntityVersionId", "Nullable(String)"),
 	addColumn(TABLE_SCORE_EVENTS, "rootEntityVersionId", "Nullable(String)"),
+	addColumn(TABLE_FEEDBACK_EVENTS, "writeVersion", "UInt64 DEFAULT 0"),
 	addColumn(TABLE_FEEDBACK_EVENTS, "entityVersionId", "Nullable(String)"),
 	addColumn(TABLE_FEEDBACK_EVENTS, "reviewStatus", "LowCardinality(String) DEFAULT 'needs-review'"),
 	addColumn(TABLE_FEEDBACK_EVENTS, "parentEntityVersionId", "Nullable(String)"),
@@ -4656,6 +4658,26 @@ async function queryJson$2(client, query, params) {
 		clickhouse_settings: CH_SETTINGS
 	})).json();
 }
+async function feedbackRowsWithWriteVersions(client, feedbacks) {
+	const identifiedFeedback = feedbacks.map((feedback) => ({
+		...feedback,
+		feedbackId: feedback.feedbackId ?? ""
+	}));
+	const feedbackIds = [...new Set(identifiedFeedback.map((feedback) => feedback.feedbackId))];
+	const existingVersions = await queryJson$2(client, `SELECT feedbackId, toString(max(writeVersion)) AS writeVersion
+     FROM ${TABLE_FEEDBACK_EVENTS}
+     WHERE feedbackId IN ({feedbackIds:Array(String)})
+     GROUP BY feedbackId`, { feedbackIds });
+	const versions = new Map(existingVersions.map((row) => [row.feedbackId, BigInt(row.writeVersion)]));
+	return identifiedFeedback.map((feedback) => {
+		const writeVersion = (versions.get(feedback.feedbackId) ?? 0n) + 1n;
+		versions.set(feedback.feedbackId, writeVersion);
+		return {
+			...feedbackRecordToRow(feedback),
+			writeVersion: writeVersion.toString()
+		};
+	});
+}
 async function createFeedback(client, args) {
 	await batchCreateFeedback(client, { feedbacks: [args.feedback] });
 }
@@ -4663,7 +4685,7 @@ async function batchCreateFeedback(client, args) {
 	if (args.feedbacks.length === 0) return;
 	await client.insert({
 		table: TABLE_FEEDBACK_EVENTS,
-		values: args.feedbacks.map(feedbackRecordToRow),
+		values: await feedbackRowsWithWriteVersions(client, args.feedbacks),
 		format: "JSONEachRow",
 		clickhouse_settings: CH_INSERT_SETTINGS
 	});
@@ -4736,19 +4758,17 @@ async function hasFeedbackDeletionRequest(client, feedbackId, organizationId, re
 }
 async function updateFeedbackReviewStatus(client, args, replication) {
 	const { feedbackId, reviewStatus } = parseUpdateFeedbackReviewStatusArgs(args);
-	const existingRow = (await queryJson$2(client, `SELECT * FROM ${TABLE_FEEDBACK_EVENTS} FINAL WHERE feedbackId = {feedbackId:String} LIMIT 1`, { feedbackId }))[0];
+	const existingRow = (await queryJson$2(client, `SELECT * FROM ${TABLE_FEEDBACK_EVENTS} FINAL
+     WHERE feedbackId = {feedbackId:String}
+     ORDER BY writeVersion DESC, timestamp DESC
+     LIMIT 1`, { feedbackId }))[0];
 	if (!existingRow) throw feedbackNotFoundError(feedbackId);
 	if (await hasFeedbackDeletionRequest(client, feedbackId, existingRow.organizationId, existingRow.resourceId)) throw feedbackNotFoundError(feedbackId);
 	const updated = rowToFeedbackRecord({
 		...existingRow,
 		reviewStatus
 	});
-	await client.insert({
-		table: TABLE_FEEDBACK_EVENTS,
-		values: [feedbackRecordToRow(updated)],
-		format: "JSONEachRow",
-		clickhouse_settings: CH_INSERT_SETTINGS
-	});
+	await batchCreateFeedback(client, { feedbacks: [updated] });
 	if (await hasFeedbackDeletionRequest(client, feedbackId, existingRow.organizationId, existingRow.resourceId)) {
 		await deleteFeedback(client, {
 			feedbackIds: [feedbackId],
@@ -6460,6 +6480,44 @@ const SCORE_FIELDS = {
 		parameterType: "String"
 	}
 };
+const FEEDBACK_FIELDS = {
+	feedbackType: {
+		sql: "s.feedbackType",
+		parameterType: "String"
+	},
+	feedbackSource: {
+		sql: "s.feedbackSource",
+		parameterType: "String"
+	},
+	feedbackUserId: {
+		sql: "s.feedbackUserId",
+		parameterType: "String"
+	},
+	sourceId: {
+		sql: "s.sourceId",
+		parameterType: "String"
+	},
+	entityVersionId: {
+		sql: "s.entityVersionId",
+		parameterType: "String"
+	},
+	parentEntityVersionId: {
+		sql: "s.parentEntityVersionId",
+		parameterType: "String"
+	},
+	rootEntityVersionId: {
+		sql: "s.rootEntityVersionId",
+		parameterType: "String"
+	},
+	timestamp: {
+		sql: "s.timestamp",
+		parameterType: "DateTime64(3, 'UTC')"
+	},
+	comment: {
+		sql: "s.comment",
+		parameterType: "String"
+	}
+};
 const TRACE_SELECT = `
   r.traceId AS traceId,
   r.spanId AS rootSpanId,
@@ -6520,6 +6578,22 @@ function compileScalarPredicate(predicate, registry, parameters, allowMetadata =
 	if (operator === void 0) throw new Error(`Unsupported trusted trace-query operator: ${predicate.operator}`);
 	return `ifNull(${field.sql} ${operator} ${parameter}, ${predicate.operator === "ne" ? "1" : "0"})`;
 }
+function compileFeedbackScalarPredicate(predicate, parameters) {
+	if (predicate.type === "boolean") return predicate.args.map((arg) => `(${compileFeedbackScalarPredicate(arg, parameters)})`).join(predicate.operator === "and" ? " AND " : " OR ");
+	if (predicate.type === "not") return `NOT (${compileFeedbackScalarPredicate(predicate.arg, parameters)})`;
+	if (predicate.field !== "value") return compileScalarPredicate(predicate, FEEDBACK_FIELDS, parameters);
+	if (predicate.type === "presence") {
+		const present = `(isNotNull(s.valueString) OR isNotNull(s.valueNumber))`;
+		return predicate.operator === "exists" ? present : `NOT ${present}`;
+	}
+	return compileScalarPredicate(predicate, typeof (predicate.type === "membership" ? predicate.values[0] : predicate.value) === "number" ? { value: {
+		sql: "s.valueNumber",
+		parameterType: "Float64"
+	} } : { value: {
+		sql: "s.valueString",
+		parameterType: "String"
+	} }, parameters);
+}
 function collectRelationCollections(predicate, collections = /* @__PURE__ */ new Set()) {
 	if (!predicate) return collections;
 	if (predicate.type === "relation") collections.add(predicate.collection);
@@ -6529,11 +6603,11 @@ function collectRelationCollections(predicate, collections = /* @__PURE__ */ new
 }
 function compilePredicate(predicate, parameters) {
 	if (predicate.type === "relation") {
-		const registry = predicate.collection === "spans" ? SPAN_FIELDS : SCORE_FIELDS;
 		const existence = `EXISTS (
-      SELECT 1 FROM ${predicate.collection === "spans" ? "current_spans" : "current_scores"} s
-      WHERE s.traceId = r.traceId
-        AND (${compileScalarPredicate(predicate.predicate, registry, parameters)})
+      SELECT 1 FROM ${predicate.collection === "spans" ? "current_spans" : predicate.collection === "scores" ? "current_scores" : "current_feedback"} s
+      WHERE isNotNull(s.traceId)
+        AND s.traceId = r.traceId
+        AND (${predicate.collection === "feedback" ? compileFeedbackScalarPredicate(predicate.predicate, parameters) : compileScalarPredicate(predicate.predicate, predicate.collection === "spans" ? SPAN_FIELDS : SCORE_FIELDS, parameters)})
     )`;
 		return predicate.quantifier === "some" ? existence : `NOT ${existence}`;
 	}
@@ -6602,6 +6676,29 @@ function compileClickHouseTraceQuery(plan) {
       AND traceId IN (SELECT traceId FROM root_scope)
     ORDER BY scoreId, timestamp DESC
     LIMIT 1 BY scoreId
+  )`);
+	if (relationCollections.has("feedback")) ctes.push(`current_feedback AS (
+    SELECT
+      traceId,
+      feedbackType,
+      feedbackSource,
+      feedbackUserId,
+      sourceId,
+      valueString,
+      valueNumber,
+      comment,
+      timestamp,
+      entityVersionId,
+      parentEntityVersionId,
+      rootEntityVersionId
+    FROM (
+      SELECT *
+      FROM ${TABLE_FEEDBACK_EVENTS} FINAL
+      ORDER BY feedbackId, writeVersion DESC, timestamp DESC
+      LIMIT 1 BY feedbackId
+    ) AS current
+    WHERE isNotNull(traceId)
+      AND traceId IN (SELECT traceId FROM root_scope)
   )`);
 	const predicate = plan.where ? compilePredicate(plan.where, parameters) : "1";
 	ctes.push(`candidates AS (