@mastra/clickhouse 0.0.0-update-stores-peerDeps-20250723031338 → 0.0.0-usechat-duplicate-20251016110554

package/dist/index.js

@@ -1,7 +1,8 @@
 import { createClient } from '@clickhouse/client';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MastraStorage, StoreOperations, TABLE_SCHEMAS, TABLE_WORKFLOW_SNAPSHOT, WorkflowsStorage, ScoresStorage, safelyParseJSON, TABLE_SCORERS, LegacyEvalsStorage, TABLE_EVALS, TracesStorage, TABLE_TRACES, MemoryStorage, resolveMessageLimit, TABLE_MESSAGES, TABLE_THREADS, TABLE_RESOURCES } from '@mastra/core/storage';
+import { TABLE_AI_SPANS, TABLE_RESOURCES, TABLE_SCORERS, TABLE_EVALS, TABLE_THREADS, TABLE_TRACES, TABLE_WORKFLOW_SNAPSHOT, TABLE_MESSAGES, MastraStorage, StoreOperations, TABLE_SCHEMAS, WorkflowsStorage, ScoresStorage, safelyParseJSON, LegacyEvalsStorage, TracesStorage, MemoryStorage, resolveMessageLimit } from '@mastra/core/storage';
 import { MessageList } from '@mastra/core/agent';
+import { saveScorePayloadSchema } from '@mastra/core/scores';
 
 // src/storage/index.ts
 var TABLE_ENGINES = {
@@ -11,7 +12,9 @@ var TABLE_ENGINES = {
   [TABLE_THREADS]: `ReplacingMergeTree()`,
   [TABLE_EVALS]: `MergeTree()`,
   [TABLE_SCORERS]: `MergeTree()`,
-  [TABLE_RESOURCES]: `ReplacingMergeTree()`
+  [TABLE_RESOURCES]: `ReplacingMergeTree()`,
+  // TODO: verify this is the correct engine for ai spans when implementing clickhouse storage
+  [TABLE_AI_SPANS]: `ReplacingMergeTree()`
 };
 var COLUMN_TYPES = {
   text: "String",
@@ -20,7 +23,8 @@ var COLUMN_TYPES = {
   jsonb: "String",
   integer: "Int64",
   float: "Float64",
-  bigint: "Int64"
+  bigint: "Int64",
+  boolean: "Bool"
 };
 function transformRow(row) {
   if (!row) {
@@ -252,6 +256,7 @@ var MemoryStorageClickhouse = class extends MemoryStorage {
     format
   }) {
     try {
+      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
       const messages = [];
       const limit = resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
       const include = selectBy?.include || [];
@@ -366,6 +371,62 @@ var MemoryStorageClickhouse = class extends MemoryStorage {
       );
     }
   }
+  async getMessagesById({
+    messageIds,
+    format
+  }) {
+    if (messageIds.length === 0) return [];
+    try {
+      const result = await this.client.query({
+        query: `
+        SELECT 
+          id, 
+          content, 
+          role, 
+          type,
+          toDateTime64(createdAt, 3) as createdAt,
+          thread_id AS "threadId",
+          "resourceId"
+        FROM "${TABLE_MESSAGES}"
+        WHERE id IN {messageIds:Array(String)}
+        ORDER BY "createdAt" DESC
+        `,
+        query_params: {
+          messageIds
+        },
+        clickhouse_settings: {
+          // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
+          date_time_input_format: "best_effort",
+          date_time_output_format: "iso",
+          use_client_time_zone: 1,
+          output_format_json_quote_64bit_integers: 0
+        }
+      });
+      const rows = await result.json();
+      const messages = transformRows(rows.data);
+      messages.forEach((message) => {
+        if (typeof message.content === "string") {
+          try {
+            message.content = JSON.parse(message.content);
+          } catch {
+          }
+        }
+      });
+      const list = new MessageList().add(messages, "memory");
+      if (format === `v1`) return list.get.all.v1();
+      return list.get.all.v2();
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_GET_MESSAGES_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { messageIds: JSON.stringify(messageIds) }
+        },
+        error
+      );
+    }
+  }
   async saveMessages(args) {
     const { messages, format = "v1" } = args;
     if (messages.length === 0) return messages;
@@ -788,11 +849,12 @@ var MemoryStorageClickhouse = class extends MemoryStorage {
     }
   }
   async getMessagesPaginated(args) {
+    const { threadId, resourceId, selectBy, format = "v1" } = args;
+    const page = selectBy?.pagination?.page || 0;
+    const perPageInput = selectBy?.pagination?.perPage;
+    const perPage = perPageInput !== void 0 ? perPageInput : resolveMessageLimit({ last: selectBy?.last, defaultLimit: 20 });
     try {
-      const { threadId, selectBy, format = "v1" } = args;
-      const page = selectBy?.pagination?.page || 0;
-      const perPageInput = selectBy?.pagination?.perPage;
-      const perPage = perPageInput !== void 0 ? perPageInput : resolveMessageLimit({ last: selectBy?.last, defaultLimit: 20 });
+      if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
       const offset = page * perPage;
       const dateRange = selectBy?.pagination?.dateRange;
       const fromDate = dateRange?.start;
@@ -951,14 +1013,21 @@ var MemoryStorageClickhouse = class extends MemoryStorage {
         hasMore: offset + perPage < total
       };
     } catch (error) {
-      throw new MastraError(
+      const mastraError = new MastraError(
         {
           id: "CLICKHOUSE_STORAGE_GET_MESSAGES_PAGINATED_FAILED",
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.THIRD_PARTY
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            threadId,
+            resourceId: resourceId ?? ""
+          }
         },
         error
       );
+      this.logger?.trackException?.(mastraError);
+      this.logger?.error?.(mastraError.toString());
+      return { messages: [], total: 0, page, perPage: perPageInput || 40, hasMore: false };
     }
   }
   async updateMessages(args) {
@@ -1041,7 +1110,7 @@ var MemoryStorageClickhouse = class extends MemoryStorage {
                 UPDATE ${setClauses.join(", ")}
                 WHERE id = {var_id_${paramIdx}:String}
               `;
-          console.log("Updating message:", id, "with query:", updateQuery, "values:", values);
+          console.info("Updating message:", id, "with query:", updateQuery, "values:", values);
           updatePromises.push(
             this.client.command({
               query: updateQuery,
@@ -1100,7 +1169,7 @@ var MemoryStorageClickhouse = class extends MemoryStorage {
               }
             }
             if (needsRetry) {
-              console.log("Update not applied correctly, retrying with DELETE + INSERT for message:", id);
+              console.info("Update not applied correctly, retrying with DELETE + INSERT for message:", id);
               await this.client.command({
                 query: `DELETE FROM ${TABLE_MESSAGES} WHERE id = {messageId:String}`,
                 query_params: { messageId: id },
@@ -1552,7 +1621,7 @@ var StoreOperationsClickhouse = class extends StoreOperations {
           use_client_time_zone: 1
         }
       });
-      console.log("INSERT RESULT", result);
+      console.info("INSERT RESULT", result);
     } catch (error) {
       throw new MastraError(
         {
@@ -1611,7 +1680,7 @@ var StoreOperationsClickhouse = class extends StoreOperations {
       const hasUpdatedAt = TABLE_SCHEMAS[tableName]?.updatedAt;
       const selectClause = `SELECT *, toDateTime64(createdAt, 3) as createdAt${hasUpdatedAt ? ", toDateTime64(updatedAt, 3) as updatedAt" : ""}`;
       const result = await this.client.query({
-        query: `${selectClause} FROM ${tableName} ${engine.startsWith("ReplacingMergeTree") ? "FINAL" : ""} WHERE ${conditions}`,
+        query: `${selectClause} FROM ${tableName} ${engine.startsWith("ReplacingMergeTree") ? "FINAL" : ""} WHERE ${conditions} ORDER BY createdAt DESC LIMIT 1`,
         query_params: values,
         clickhouse_settings: {
           // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
@@ -1660,7 +1729,7 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
   }
   transformScoreRow(row) {
     const scorer = safelyParseJSON(row.scorer);
-    const extractStepResult = safelyParseJSON(row.extractStepResult);
+    const preprocessStepResult = safelyParseJSON(row.preprocessStepResult);
     const analyzeStepResult = safelyParseJSON(row.analyzeStepResult);
     const metadata = safelyParseJSON(row.metadata);
     const input = safelyParseJSON(row.input);
@@ -1671,7 +1740,7 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
     return {
       ...row,
       scorer,
-      extractStepResult,
+      preprocessStepResult,
       analyzeStepResult,
       metadata,
       input,
@@ -1715,9 +1784,23 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
     }
   }
   async saveScore(score) {
+    let parsedScore;
+    try {
+      parsedScore = saveScorePayloadSchema.parse(score);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_SAVE_SCORE_FAILED_INVALID_SCORE_PAYLOAD",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { scoreId: score.id }
+        },
+        error
+      );
+    }
     try {
       const record = {
-        ...score
+        ...parsedScore
       };
       await this.client.insert({
         table: TABLE_SCORERS,
@@ -1810,12 +1893,30 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
   }
   async getScoresByScorerId({
     scorerId,
+    entityId,
+    entityType,
+    source,
     pagination
   }) {
+    let whereClause = `scorerId = {var_scorerId:String}`;
+    if (entityId) {
+      whereClause += ` AND entityId = {var_entityId:String}`;
+    }
+    if (entityType) {
+      whereClause += ` AND entityType = {var_entityType:String}`;
+    }
+    if (source) {
+      whereClause += ` AND source = {var_source:String}`;
+    }
     try {
       const countResult = await this.client.query({
-        query: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE scorerId = {var_scorerId:String}`,
-        query_params: { var_scorerId: scorerId },
+        query: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE ${whereClause}`,
+        query_params: {
+          var_scorerId: scorerId,
+          var_entityId: entityId,
+          var_entityType: entityType,
+          var_source: source
+        },
         format: "JSONEachRow"
       });
       const countRows = await countResult.json();
@@ -1837,11 +1938,14 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
       }
       const offset = pagination.page * pagination.perPage;
       const result = await this.client.query({
-        query: `SELECT * FROM ${TABLE_SCORERS} WHERE scorerId = {var_scorerId:String} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
+        query: `SELECT * FROM ${TABLE_SCORERS} WHERE ${whereClause} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
         query_params: {
           var_scorerId: scorerId,
           var_limit: pagination.perPage,
-          var_offset: offset
+          var_offset: offset,
+          var_entityId: entityId,
+          var_entityType: entityType,
+          var_source: source
         },
         format: "JSONEachRow",
         clickhouse_settings: {
@@ -1942,6 +2046,80 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
       );
     }
   }
+  async getScoresBySpan({
+    traceId,
+    spanId,
+    pagination
+  }) {
+    try {
+      const countResult = await this.client.query({
+        query: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE traceId = {var_traceId:String} AND spanId = {var_spanId:String}`,
+        query_params: {
+          var_traceId: traceId,
+          var_spanId: spanId
+        },
+        format: "JSONEachRow"
+      });
+      const countRows = await countResult.json();
+      let total = 0;
+      if (Array.isArray(countRows) && countRows.length > 0 && countRows[0]) {
+        const countObj = countRows[0];
+        total = Number(countObj.count);
+      }
+      if (!total) {
+        return {
+          pagination: {
+            total: 0,
+            page: pagination.page,
+            perPage: pagination.perPage,
+            hasMore: false
+          },
+          scores: []
+        };
+      }
+      const limit = pagination.perPage + 1;
+      const offset = pagination.page * pagination.perPage;
+      const result = await this.client.query({
+        query: `SELECT * FROM ${TABLE_SCORERS} WHERE traceId = {var_traceId:String} AND spanId = {var_spanId:String} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
+        query_params: {
+          var_traceId: traceId,
+          var_spanId: spanId,
+          var_limit: limit,
+          var_offset: offset
+        },
+        format: "JSONEachRow",
+        clickhouse_settings: {
+          date_time_input_format: "best_effort",
+          date_time_output_format: "iso",
+          use_client_time_zone: 1,
+          output_format_json_quote_64bit_integers: 0
+        }
+      });
+      const rows = await result.json();
+      const transformedRows = Array.isArray(rows) ? rows.map((row) => this.transformScoreRow(row)) : [];
+      const hasMore = transformedRows.length > pagination.perPage;
+      const scores = hasMore ? transformedRows.slice(0, pagination.perPage) : transformedRows;
+      return {
+        pagination: {
+          total,
+          page: pagination.page,
+          perPage: pagination.perPage,
+          hasMore
+        },
+        scores
+      };
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_GET_SCORES_BY_SPAN_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { traceId, spanId }
+        },
+        error
+      );
+    }
+  }
 };
 var TracesStorageClickhouse = class extends TracesStorage {
   client;
@@ -2194,9 +2372,26 @@ var WorkflowsStorageClickhouse = class extends WorkflowsStorage {
     this.operations = operations;
     this.client = client;
   }
+  updateWorkflowResults({
+    // workflowName,
+    // runId,
+    // stepId,
+    // result,
+    // runtimeContext,
+  }) {
+    throw new Error("Method not implemented.");
+  }
+  updateWorkflowState({
+    // workflowName,
+    // runId,
+    // opts,
+  }) {
+    throw new Error("Method not implemented.");
+  }
   async persistWorkflowSnapshot({
     workflowName,
     runId,
+    resourceId,
     snapshot
   }) {
     try {
@@ -2207,11 +2402,13 @@ var WorkflowsStorageClickhouse = class extends WorkflowsStorage {
       const now = /* @__PURE__ */ new Date();
       const persisting = currentSnapshot ? {
         ...currentSnapshot,
+        resourceId,
         snapshot: JSON.stringify(snapshot),
         updatedAt: now.toISOString()
       } : {
         workflow_name: workflowName,
         run_id: runId,
+        resourceId,
         snapshot: JSON.stringify(snapshot),
         createdAt: now.toISOString(),
         updatedAt: now.toISOString()
@@ -2393,6 +2590,7 @@ var WorkflowsStorageClickhouse = class extends WorkflowsStorage {
                 resourceId
               FROM ${TABLE_WORKFLOW_SNAPSHOT} ${TABLE_ENGINES[TABLE_WORKFLOW_SNAPSHOT].startsWith("ReplacingMergeTree") ? "FINAL" : ""}
               ${whereClause}
+              ORDER BY createdAt DESC LIMIT 1
             `,
         query_params: values,
         format: "JSONEachRow"
@@ -2456,7 +2654,9 @@ var ClickhouseStore = class extends MastraStorage {
       selectByIncludeResourceScope: true,
       resourceWorkingMemory: true,
       hasColumn: true,
-      createTable: true
+      createTable: true,
+      deleteMessages: false,
+      getScoresBySpan: true
     };
   }
   async getEvalsByAgentName(agentName, type) {
@@ -2527,12 +2727,29 @@ var ClickhouseStore = class extends MastraStorage {
   async load({ tableName, keys }) {
     return this.stores.operations.load({ tableName, keys });
   }
+  async updateWorkflowResults({
+    workflowName,
+    runId,
+    stepId,
+    result,
+    runtimeContext
+  }) {
+    return this.stores.workflows.updateWorkflowResults({ workflowName, runId, stepId, result, runtimeContext });
+  }
+  async updateWorkflowState({
+    workflowName,
+    runId,
+    opts
+  }) {
+    return this.stores.workflows.updateWorkflowState({ workflowName, runId, opts });
+  }
   async persistWorkflowSnapshot({
     workflowName,
     runId,
+    resourceId,
     snapshot
   }) {
-    return this.stores.workflows.persistWorkflowSnapshot({ workflowName, runId, snapshot });
+    return this.stores.workflows.persistWorkflowSnapshot({ workflowName, runId, resourceId, snapshot });
   }
   async loadWorkflowSnapshot({
     workflowName,
@@ -2595,6 +2812,12 @@ var ClickhouseStore = class extends MastraStorage {
   }) {
     return this.stores.memory.getMessages({ threadId, resourceId, selectBy, format });
   }
+  async getMessagesById({
+    messageIds,
+    format
+  }) {
+    return this.stores.memory.getMessagesById({ messageIds, format });
+  }
   async saveMessages(args) {
     return this.stores.memory.saveMessages(args);
   }
@@ -2638,13 +2861,25 @@ var ClickhouseStore = class extends MastraStorage {
   }
   async getScoresByScorerId({
     scorerId,
+    pagination,
+    entityId,
+    entityType,
+    source
+  }) {
+    return this.stores.scores.getScoresByScorerId({ scorerId, pagination, entityId, entityType, source });
+  }
+  async getScoresBySpan({
+    traceId,
+    spanId,
     pagination
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId, pagination });
+    return this.stores.scores.getScoresBySpan({ traceId, spanId, pagination });
   }
   async close() {
     await this.db.close();
   }
 };
 
-export { ClickhouseStore };
+export { COLUMN_TYPES, ClickhouseStore, TABLE_ENGINES };
+//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map