@mastra/clickhouse 0.0.0-zod-v4-compat-part-2-20250822105954 → 0.0.0-zod-v4-stuff-20250825154219

package/dist/index.d.ts

@@ -1,2 +1,3 @@
-export * from './storage';
+export * from './storage/index.js';
+export { TABLE_ENGINES, COLUMN_TYPES } from './storage/domains/utils.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC"}

package/dist/index.js

@@ -1,6 +1,6 @@
 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_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';
 
 // src/storage/index.ts
@@ -366,6 +366,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;
@@ -1611,7 +1667,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 +1716,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 +1727,7 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
     return {
       ...row,
       scorer,
-      extractStepResult,
+      preprocessStepResult,
       analyzeStepResult,
       metadata,
       input,
@@ -1810,12 +1866,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 +1911,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: {
@@ -2393,6 +2470,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"
@@ -2596,6 +2674,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);
   }
@@ -2639,15 +2723,18 @@ var ClickhouseStore = class extends MastraStorage {
   }
   async getScoresByScorerId({
     scorerId,
-    pagination
+    pagination,
+    entityId,
+    entityType,
+    source
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId, pagination });
+    return this.stores.scores.getScoresByScorerId({ scorerId, pagination, entityId, entityType, source });
   }
   async close() {
     await this.db.close();
   }
 };
 
-export { ClickhouseStore };
+export { COLUMN_TYPES, ClickhouseStore, TABLE_ENGINES };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map