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

package/CHANGELOG.md

@@ -1,14 +1,166 @@
 # @mastra/clickhouse
 
-## 0.0.0-zod-v4-compat-part-2-20250822105954
+## 0.0.0-zod-v4-stuff-20250825154219
 
 ### Patch Changes
 
+- Updated dependencies [[`0778757`](https://github.com/mastra-ai/mastra/commit/07787570e4addbd501522037bd2542c3d9e26822), [`bf504a8`](https://github.com/mastra-ai/mastra/commit/bf504a833051f6f321d832cc7d631f3cb86d657b), [`e6f5046`](https://github.com/mastra-ai/mastra/commit/e6f50467aff317e67e8bd74c485c3fbe2a5a6db1), [`d51eac2`](https://github.com/mastra-ai/mastra/commit/d51eac24ba0fbb33d3e22dcc310f9c0e7167598d), [`9613558`](https://github.com/mastra-ai/mastra/commit/9613558e6475f4710e05d1be7553a32ee7bddc20)]:
+  - @mastra/core@0.0.0-zod-v4-stuff-20250825154219
+
+## 0.13.2
+
+### Patch Changes
+
+- [#6928](https://github.com/mastra-ai/mastra/pull/6928) [`0228905`](https://github.com/mastra-ai/mastra/commit/0228905518545146bf2f253c6774f454a7379582) Thanks [@YujohnNattrass](https://github.com/YujohnNattrass)! - export clickhouse utils
+
+- [#6700](https://github.com/mastra-ai/mastra/pull/6700) [`a5a23d9`](https://github.com/mastra-ai/mastra/commit/a5a23d981920d458dc6078919992a5338931ef02) Thanks [@gpanakkal](https://github.com/gpanakkal)! - Add `getMessagesById` method to `MastraStorage` adapters
+
+- Updated dependencies [[`6e7e120`](https://github.com/mastra-ai/mastra/commit/6e7e1207d6e8d8b838f9024f90bd10df1181ba27), [`0f00e17`](https://github.com/mastra-ai/mastra/commit/0f00e172953ccdccadb35ed3d70f5e4d89115869), [`217cd7a`](https://github.com/mastra-ai/mastra/commit/217cd7a4ce171e9a575c41bb8c83300f4db03236), [`a5a23d9`](https://github.com/mastra-ai/mastra/commit/a5a23d981920d458dc6078919992a5338931ef02)]:
+  - @mastra/core@0.14.1
+
+## 0.13.2-alpha.0
+
+### Patch Changes
+
+- [#6928](https://github.com/mastra-ai/mastra/pull/6928) [`0228905`](https://github.com/mastra-ai/mastra/commit/0228905518545146bf2f253c6774f454a7379582) Thanks [@YujohnNattrass](https://github.com/YujohnNattrass)! - export clickhouse utils
+
+- [#6700](https://github.com/mastra-ai/mastra/pull/6700) [`a5a23d9`](https://github.com/mastra-ai/mastra/commit/a5a23d981920d458dc6078919992a5338931ef02) Thanks [@gpanakkal](https://github.com/gpanakkal)! - Add `getMessagesById` method to `MastraStorage` adapters
+
+- Updated dependencies [[`6e7e120`](https://github.com/mastra-ai/mastra/commit/6e7e1207d6e8d8b838f9024f90bd10df1181ba27), [`a5a23d9`](https://github.com/mastra-ai/mastra/commit/a5a23d981920d458dc6078919992a5338931ef02)]:
+  - @mastra/core@0.14.1-alpha.0
+
+## 0.13.1
+
+### Patch Changes
+
+- 3dd1d7b: dependencies updates:
+  - Updated dependency [`@clickhouse/client@^1.12.1` ↗︎](https://www.npmjs.com/package/@clickhouse/client/v/1.12.1) (from `^1.12.0`, in `dependencies`)
+- 03997ae: Update peerdeps
+- d6e39da: Load most recent snapshot from storage
+- Updated dependencies [227c7e6]
+- Updated dependencies [12cae67]
+- Updated dependencies [fd3a3eb]
+- Updated dependencies [6faaee5]
+- Updated dependencies [4232b14]
+- Updated dependencies [a89de7e]
+- Updated dependencies [5a37d0c]
+- Updated dependencies [4bde0cb]
+- Updated dependencies [cf4f357]
+- Updated dependencies [ad888a2]
+- Updated dependencies [481751d]
+- Updated dependencies [2454423]
+- Updated dependencies [194e395]
+- Updated dependencies [a722c0b]
+- Updated dependencies [c30bca8]
+- Updated dependencies [3b5fec7]
+- Updated dependencies [a8f129d]
+  - @mastra/core@0.14.0
+
+## 0.13.1-alpha.2
+
+### Patch Changes
+
+- 03997ae: Update peerdeps
+  - @mastra/core@0.14.0-alpha.7
+
+## 0.13.1-alpha.1
+
+### Patch Changes
+
+- 3dd1d7b: dependencies updates:
+  - Updated dependency [`@clickhouse/client@^1.12.1` ↗︎](https://www.npmjs.com/package/@clickhouse/client/v/1.12.1) (from `^1.12.0`, in `dependencies`)
+- Updated dependencies [0a7f675]
+- Updated dependencies [12cae67]
+- Updated dependencies [5a37d0c]
+- Updated dependencies [4bde0cb]
+- Updated dependencies [1a80071]
+- Updated dependencies [36a3be8]
+- Updated dependencies [361757b]
+- Updated dependencies [2bb9955]
+- Updated dependencies [2454423]
+- Updated dependencies [a44d91e]
+- Updated dependencies [dfb91e9]
+- Updated dependencies [a741dde]
+- Updated dependencies [7cb3fc0]
+- Updated dependencies [195eabb]
+- Updated dependencies [b78b95b]
+  - @mastra/core@0.14.0-alpha.4
+
+## 0.13.1-alpha.0
+
+### Patch Changes
+
+- d6e39da: Load most recent snapshot from storage
+- Updated dependencies [6faaee5]
+- Updated dependencies [4232b14]
+- Updated dependencies [a89de7e]
+- Updated dependencies [cf4f357]
+- Updated dependencies [a722c0b]
+- Updated dependencies [3b5fec7]
+  - @mastra/core@0.14.0-alpha.1
+
+## 0.13.0
+
+### Minor Changes
+
+- ea0c5f2: Add store support to new score api
+
+### Patch Changes
+
+- 3e9c2ff: dependencies updates:
+  - Updated dependency [`@clickhouse/client@^1.12.0` ↗︎](https://www.npmjs.com/package/@clickhouse/client/v/1.12.0) (from `^1.11.2`, in `dependencies`)
+- 2871020: update safelyParseJSON to check for value of param when handling parse
+- 4a406ec: fixes TypeScript declaration file imports to ensure proper ESM compatibility
+- Updated dependencies [cb36de0]
+- Updated dependencies [d0496e6]
+- Updated dependencies [a82b851]
+- Updated dependencies [ea0c5f2]
+- Updated dependencies [41a0a0e]
+- Updated dependencies [2871020]
 - Updated dependencies [94f4812]
 - Updated dependencies [e202b82]
 - Updated dependencies [e00f6a0]
+- Updated dependencies [4a406ec]
+- Updated dependencies [b0e43c1]
+- Updated dependencies [5d377e5]
+- Updated dependencies [1fb812e]
+- Updated dependencies [35c5798]
+  - @mastra/core@0.13.0
+
+## 0.13.0-alpha.2
+
+### Patch Changes
+
+- 2871020: update safelyParseJSON to check for value of param when handling parse
+- 4a406ec: fixes TypeScript declaration file imports to ensure proper ESM compatibility
+- Updated dependencies [cb36de0]
+- Updated dependencies [a82b851]
+- Updated dependencies [41a0a0e]
+- Updated dependencies [2871020]
+- Updated dependencies [4a406ec]
+- Updated dependencies [5d377e5]
+  - @mastra/core@0.13.0-alpha.2
+
+## 0.13.0-alpha.1
+
+### Patch Changes
+
+- 3e9c2ff: dependencies updates:
+  - Updated dependency [`@clickhouse/client@^1.12.0` ↗︎](https://www.npmjs.com/package/@clickhouse/client/v/1.12.0) (from `^1.11.2`, in `dependencies`)
+
+## 0.13.0-alpha.0
+
+### Minor Changes
+
+- ea0c5f2: Add store support to new score api
+
+### Patch Changes
+
+- Updated dependencies [ea0c5f2]
+- Updated dependencies [b0e43c1]
+- Updated dependencies [1fb812e]
 - Updated dependencies [35c5798]
-  - @mastra/core@0.0.0-zod-v4-compat-part-2-20250822105954
+  - @mastra/core@0.13.0-alpha.1
 
 ## 0.12.3
 

package/dist/index.cjs

@@ -368,6 +368,62 @@ var MemoryStorageClickhouse = class extends storage.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 "${storage.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 agent.MessageList().add(messages, "memory");
+      if (format === `v1`) return list.get.all.v1();
+      return list.get.all.v2();
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_GET_MESSAGES_BY_ID_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { messageIds: JSON.stringify(messageIds) }
+        },
+        error$1
+      );
+    }
+  }
   async saveMessages(args) {
     const { messages, format = "v1" } = args;
     if (messages.length === 0) return messages;
@@ -1613,7 +1669,7 @@ var StoreOperationsClickhouse = class extends storage.StoreOperations {
       const hasUpdatedAt = storage.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')
@@ -1662,7 +1718,7 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
   }
   transformScoreRow(row) {
     const scorer = storage.safelyParseJSON(row.scorer);
-    const extractStepResult = storage.safelyParseJSON(row.extractStepResult);
+    const preprocessStepResult = storage.safelyParseJSON(row.preprocessStepResult);
     const analyzeStepResult = storage.safelyParseJSON(row.analyzeStepResult);
     const metadata = storage.safelyParseJSON(row.metadata);
     const input = storage.safelyParseJSON(row.input);
@@ -1673,7 +1729,7 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
     return {
       ...row,
       scorer,
-      extractStepResult,
+      preprocessStepResult,
       analyzeStepResult,
       metadata,
       input,
@@ -1812,12 +1868,30 @@ var ScoresStorageClickhouse = class extends storage.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 ${storage.TABLE_SCORERS} WHERE scorerId = {var_scorerId:String}`,
-        query_params: { var_scorerId: scorerId },
+        query: `SELECT COUNT(*) as count FROM ${storage.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();
@@ -1839,11 +1913,14 @@ var ScoresStorageClickhouse = class extends storage.ScoresStorage {
       }
       const offset = pagination.page * pagination.perPage;
       const result = await this.client.query({
-        query: `SELECT * FROM ${storage.TABLE_SCORERS} WHERE scorerId = {var_scorerId:String} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
+        query: `SELECT * FROM ${storage.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: {
@@ -2395,6 +2472,7 @@ var WorkflowsStorageClickhouse = class extends storage.WorkflowsStorage {
                 resourceId
               FROM ${storage.TABLE_WORKFLOW_SNAPSHOT} ${TABLE_ENGINES[storage.TABLE_WORKFLOW_SNAPSHOT].startsWith("ReplacingMergeTree") ? "FINAL" : ""}
               ${whereClause}
+              ORDER BY createdAt DESC LIMIT 1
             `,
         query_params: values,
         format: "JSONEachRow"
@@ -2598,6 +2676,12 @@ var ClickhouseStore = class extends storage.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);
   }
@@ -2641,15 +2725,20 @@ var ClickhouseStore = class extends storage.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();
   }
 };
 
+exports.COLUMN_TYPES = COLUMN_TYPES;
 exports.ClickhouseStore = ClickhouseStore;
+exports.TABLE_ENGINES = TABLE_ENGINES;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map