@mastra/clickhouse 0.15.8-alpha.0 → 0.15.9-alpha.0

package/dist/index.js

@@ -1,6 +1,6 @@
 import { createClient } from '@clickhouse/client';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-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 { 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, SCORERS_SCHEMA, LegacyEvalsStorage, TracesStorage, MemoryStorage, resolveMessageLimit } from '@mastra/core/storage';
 import { MessageList } from '@mastra/core/agent';
 import { saveScorePayloadSchema } from '@mastra/core/scores';
 
@@ -1002,11 +1002,11 @@ var MemoryStorageClickhouse = class extends MemoryStorage {
       const rows = await result.json();
       const paginatedMessages = transformRows(rows.data);
       messages.push(...paginatedMessages);
-      if (selectBy?.last) {
-        messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
-      }
+      const list = new MessageList().add(messages, "memory");
+      let finalMessages = format === "v2" ? list.get.all.v2() : list.get.all.v1();
+      finalMessages = finalMessages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
       return {
-        messages: format === "v2" ? messages : messages,
+        messages: finalMessages,
         total,
         page,
         perPage,
@@ -1731,18 +1731,16 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
     const scorer = safelyParseJSON(row.scorer);
     const preprocessStepResult = safelyParseJSON(row.preprocessStepResult);
     const analyzeStepResult = safelyParseJSON(row.analyzeStepResult);
-    const metadata = safelyParseJSON(row.metadata);
     const input = safelyParseJSON(row.input);
     const output = safelyParseJSON(row.output);
     const additionalContext = safelyParseJSON(row.additionalContext);
     const runtimeContext = safelyParseJSON(row.runtimeContext);
     const entity = safelyParseJSON(row.entity);
-    return {
+    const data = {
       ...row,
       scorer,
       preprocessStepResult,
       analyzeStepResult,
-      metadata,
       input,
       output,
       additionalContext,
@@ -1751,6 +1749,14 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
       createdAt: new Date(row.createdAt),
       updatedAt: new Date(row.updatedAt)
     };
+    const result = {};
+    for (const [key, value] of Object.entries(data)) {
+      if (value === "_null_") {
+        continue;
+      }
+      result[key] = value;
+    }
+    return result;
   }
   async getScoreById({ id }) {
     try {
@@ -1799,9 +1805,15 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
       );
     }
     try {
-      const record = {
-        ...parsedScore
-      };
+      const record = {};
+      for (const key of Object.keys(SCORERS_SCHEMA)) {
+        const value = parsedScore[key];
+        if (key === "createdAt" || key === "updatedAt") {
+          record[key] = (/* @__PURE__ */ new Date()).toISOString();
+          continue;
+        }
+        record[key] = value === void 0 || value === null ? "_null_" : value;
+      }
       await this.client.insert({
         table: TABLE_SCORERS,
         values: [record],