@mastra/clickhouse 0.11.1-alpha.0 → 0.11.1-alpha.2

package/dist/index.js

@@ -1,5 +1,6 @@
 import { createClient } from '@clickhouse/client';
 import { MessageList } from '@mastra/core/agent';
+import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import { TABLE_EVALS, TABLE_THREADS, TABLE_TRACES, TABLE_WORKFLOW_SNAPSHOT, TABLE_MESSAGES, MastraStorage, TABLE_SCHEMAS } from '@mastra/core/storage';
 
 // src/storage/index.ts
@@ -64,7 +65,12 @@ var ClickhouseStore = class extends MastraStorage {
     const resultValue = JSON.parse(row.result);
     const testInfoValue = row.test_info ? JSON.parse(row.test_info) : void 0;
     if (!resultValue || typeof resultValue !== "object" || !("score" in resultValue)) {
-      throw new Error(`Invalid MetricResult format: ${JSON.stringify(resultValue)}`);
+      throw new MastraError({
+        id: "CLICKHOUSE_STORAGE_INVALID_METRIC_FORMAT",
+        text: `Invalid MetricResult format: ${JSON.stringify(resultValue)}`,
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER
+      });
     }
     return {
       input: row.input,
@@ -79,6 +85,18 @@ var ClickhouseStore = class extends MastraStorage {
       createdAt: row.created_at
     };
   }
+  escape(value) {
+    if (typeof value === "string") {
+      return `'${value.replace(/'/g, "''")}'`;
+    }
+    if (value instanceof Date) {
+      return `'${value.toISOString()}'`;
+    }
+    if (value === null || value === void 0) {
+      return "NULL";
+    }
+    return value.toString();
+  }
   async getEvalsByAgentName(agentName, type) {
     try {
       const baseQuery = `SELECT *, toDateTime64(createdAt, 3) as createdAt FROM ${TABLE_EVALS} WHERE agent_name = {var_agent_name:String}`;
@@ -99,11 +117,18 @@ var ClickhouseStore = class extends MastraStorage {
       const rows = await result.json();
       return rows.data.map((row) => this.transformEvalRow(row));
     } catch (error) {
-      if (error instanceof Error && error.message.includes("no such table")) {
+      if (error?.message?.includes("no such table") || error?.message?.includes("does not exist")) {
         return [];
       }
-      this.logger.error("Failed to get evals for the specified agent: " + error?.message);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_GET_EVALS_BY_AGENT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { agentName, type: type ?? null }
+        },
+        error
+      );
     }
   }
   async batchInsert({ tableName, records }) {
@@ -127,8 +152,15 @@ var ClickhouseStore = class extends MastraStorage {
         }
       });
     } catch (error) {
-      console.error(`Error inserting into ${tableName}:`, error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_BATCH_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   async getTraces({
@@ -176,48 +208,96 @@ var ClickhouseStore = class extends MastraStorage {
       args.var_to_date = toDate.getTime() / 1e3;
     }
     const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-    const result = await this.db.query({
-      query: `SELECT *, toDateTime64(createdAt, 3) as createdAt FROM ${TABLE_TRACES} ${whereClause} ORDER BY "createdAt" DESC LIMIT ${limit} OFFSET ${offset}`,
-      query_params: args,
-      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
+    try {
+      const result = await this.db.query({
+        query: `SELECT *, toDateTime64(createdAt, 3) as createdAt FROM ${TABLE_TRACES} ${whereClause} ORDER BY "createdAt" DESC LIMIT ${limit} OFFSET ${offset}`,
+        query_params: args,
+        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
+        }
+      });
+      if (!result) {
+        return [];
       }
-    });
-    if (!result) {
-      return [];
-    }
-    const resp = await result.json();
-    const rows = resp.data;
-    return rows.map((row) => ({
-      id: row.id,
-      parentSpanId: row.parentSpanId,
-      traceId: row.traceId,
-      name: row.name,
-      scope: row.scope,
-      kind: row.kind,
-      status: safelyParseJSON(row.status),
-      events: safelyParseJSON(row.events),
-      links: safelyParseJSON(row.links),
-      attributes: safelyParseJSON(row.attributes),
-      startTime: row.startTime,
-      endTime: row.endTime,
-      other: safelyParseJSON(row.other),
-      createdAt: row.createdAt
-    }));
+      const resp = await result.json();
+      const rows = resp.data;
+      return rows.map((row) => ({
+        id: row.id,
+        parentSpanId: row.parentSpanId,
+        traceId: row.traceId,
+        name: row.name,
+        scope: row.scope,
+        kind: row.kind,
+        status: safelyParseJSON(row.status),
+        events: safelyParseJSON(row.events),
+        links: safelyParseJSON(row.links),
+        attributes: safelyParseJSON(row.attributes),
+        startTime: row.startTime,
+        endTime: row.endTime,
+        other: safelyParseJSON(row.other),
+        createdAt: row.createdAt
+      }));
+    } catch (error) {
+      if (error?.message?.includes("no such table") || error?.message?.includes("does not exist")) {
+        return [];
+      }
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_GET_TRACES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            name: name ?? null,
+            scope: scope ?? null,
+            page,
+            perPage,
+            attributes: attributes ? JSON.stringify(attributes) : null,
+            filters: filters ? JSON.stringify(filters) : null,
+            fromDate: fromDate?.toISOString() ?? null,
+            toDate: toDate?.toISOString() ?? null
+          }
+        },
+        error
+      );
+    }
   }
   async optimizeTable({ tableName }) {
-    await this.db.command({
-      query: `OPTIMIZE TABLE ${tableName} FINAL`
-    });
+    try {
+      await this.db.command({
+        query: `OPTIMIZE TABLE ${tableName} FINAL`
+      });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_OPTIMIZE_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
+    }
   }
   async materializeTtl({ tableName }) {
-    await this.db.command({
-      query: `ALTER TABLE ${tableName} MATERIALIZE TTL;`
-    });
+    try {
+      await this.db.command({
+        query: `ALTER TABLE ${tableName} MATERIALIZE TTL;`
+      });
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_MATERIALIZE_TTL_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
+    }
   }
   async createTable({
     tableName,
@@ -261,8 +341,15 @@ var ClickhouseStore = class extends MastraStorage {
         }
       });
     } catch (error) {
-      console.error(`Error creating table ${tableName}:`, error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_CREATE_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   getSqlType(type) {
@@ -314,10 +401,15 @@ var ClickhouseStore = class extends MastraStorage {
         }
       }
     } catch (error) {
-      this.logger?.error?.(
-        `Error altering table ${tableName}: ${error instanceof Error ? error.message : String(error)}`
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_ALTER_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
       );
-      throw new Error(`Failed to alter table ${tableName}: ${error}`);
     }
   }
   async clearTable({ tableName }) {
@@ -333,8 +425,15 @@ var ClickhouseStore = class extends MastraStorage {
         }
       });
     } catch (error) {
-      console.error(`Error clearing table ${tableName}:`, error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_CLEAR_TABLE_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   async insert({ tableName, record }) {
@@ -357,11 +456,21 @@ var ClickhouseStore = class extends MastraStorage {
         }
       });
     } catch (error) {
-      console.error(`Error inserting into ${tableName}:`, error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_INSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
-  async load({ tableName, keys }) {
+  async load({
+    tableName,
+    keys
+  }) {
     try {
       const keyEntries = Object.entries(keys);
       const conditions = keyEntries.map(
@@ -398,8 +507,15 @@ var ClickhouseStore = class extends MastraStorage {
       const data = transformRow(rows.data[0]);
       return data;
     } catch (error) {
-      console.error(`Error loading from ${tableName}:`, error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_LOAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { tableName }
+        },
+        error
+      );
     }
   }
   async getThreadById({ threadId }) {
@@ -436,8 +552,15 @@ var ClickhouseStore = class extends MastraStorage {
         updatedAt: thread.updatedAt
       };
     } catch (error) {
-      console.error(`Error getting thread ${threadId}:`, error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_GET_THREAD_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId }
+        },
+        error
+      );
     }
   }
   async getThreadsByResourceId({ resourceId }) {
@@ -470,8 +593,15 @@ var ClickhouseStore = class extends MastraStorage {
         updatedAt: thread.updatedAt
       }));
     } catch (error) {
-      console.error(`Error getting threads for resource ${resourceId}:`, error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_GET_THREADS_BY_RESOURCE_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { resourceId }
+        },
+        error
+      );
     }
   }
   async saveThread({ thread }) {
@@ -495,8 +625,15 @@ var ClickhouseStore = class extends MastraStorage {
       });
       return thread;
     } catch (error) {
-      console.error("Error saving thread:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_SAVE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId: thread.id }
+        },
+        error
+      );
     }
   }
   async updateThread({
@@ -540,8 +677,15 @@ var ClickhouseStore = class extends MastraStorage {
       });
       return updatedThread;
     } catch (error) {
-      console.error("Error updating thread:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_UPDATE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId: id, title }
+        },
+        error
+      );
     }
   }
   async deleteThread({ threadId }) {
@@ -561,8 +705,15 @@ var ClickhouseStore = class extends MastraStorage {
         }
       });
     } catch (error) {
-      console.error("Error deleting thread:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_DELETE_THREAD_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId }
+        },
+        error
+      );
     }
   }
   async getMessages({
@@ -573,7 +724,7 @@ var ClickhouseStore = class extends MastraStorage {
   }) {
     try {
       const messages = [];
-      const limit = typeof selectBy?.last === `number` ? selectBy.last : 40;
+      const limit = this.resolveMessageLimit({ last: selectBy?.last, defaultLimit: 40 });
       const include = selectBy?.include || [];
       if (include.length) {
         const includeResult = await this.db.query({
@@ -670,8 +821,15 @@ var ClickhouseStore = class extends MastraStorage {
       if (format === `v2`) return list.get.all.v2();
       return list.get.all.v1();
     } catch (error) {
-      console.error("Error getting messages:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_GET_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { threadId, resourceId: resourceId ?? "" }
+        },
+        error
+      );
     }
   }
   async saveMessages(args) {
@@ -687,12 +845,52 @@ var ClickhouseStore = class extends MastraStorage {
       if (!thread) {
         throw new Error(`Thread ${threadId} not found`);
       }
+      const existingResult = await this.db.query({
+        query: `SELECT id, thread_id FROM ${TABLE_MESSAGES} WHERE id IN ({ids:Array(String)})`,
+        query_params: {
+          ids: messages.map((m) => m.id)
+        },
+        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
+        },
+        format: "JSONEachRow"
+      });
+      const existingRows = await existingResult.json();
+      const existingSet = new Set(existingRows.map((row) => `${row.id}::${row.thread_id}`));
+      const toInsert = messages.filter((m) => !existingSet.has(`${m.id}::${threadId}`));
+      const toUpdate = messages.filter((m) => existingSet.has(`${m.id}::${threadId}`));
+      const updatePromises = toUpdate.map(
+        (message) => this.db.command({
+          query: `
+      ALTER TABLE ${TABLE_MESSAGES}
+      UPDATE content = {var_content:String}, role = {var_role:String}, type = {var_type:String}
+      WHERE id = {var_id:String} AND thread_id = {var_thread_id:String}
+    `,
+          query_params: {
+            var_content: typeof message.content === "string" ? message.content : JSON.stringify(message.content),
+            var_role: message.role,
+            var_type: message.type || "v2",
+            var_id: message.id,
+            var_thread_id: threadId
+          },
+          clickhouse_settings: {
+            // Allows to insert serialized JS Dates (such as '2023-12-06T10:54:48.000Z')
+            date_time_input_format: "best_effort",
+            use_client_time_zone: 1,
+            output_format_json_quote_64bit_integers: 0
+          }
+        })
+      );
       await Promise.all([
         // Insert messages
         this.db.insert({
           table: TABLE_MESSAGES,
           format: "JSONEachRow",
-          values: messages.map((message) => ({
+          values: toInsert.map((message) => ({
             id: message.id,
             thread_id: threadId,
             content: typeof message.content === "string" ? message.content : JSON.stringify(message.content),
@@ -707,6 +905,7 @@ var ClickhouseStore = class extends MastraStorage {
             output_format_json_quote_64bit_integers: 0
           }
         }),
+        ...updatePromises,
         // Update thread's updatedAt timestamp
         this.db.insert({
           table: TABLE_THREADS,
@@ -732,8 +931,14 @@ var ClickhouseStore = class extends MastraStorage {
       if (format === `v2`) return list.get.all.v2();
       return list.get.all.v1();
     } catch (error) {
-      console.error("Error saving messages:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_SAVE_MESSAGES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
     }
   }
   async persistWorkflowSnapshot({
@@ -770,8 +975,15 @@ var ClickhouseStore = class extends MastraStorage {
         }
       });
     } catch (error) {
-      console.error("Error persisting workflow snapshot:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_PERSIST_WORKFLOW_SNAPSHOT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { workflowName, runId }
+        },
+        error
+      );
     }
   }
   async loadWorkflowSnapshot({
@@ -791,8 +1003,15 @@ var ClickhouseStore = class extends MastraStorage {
       }
       return result.snapshot;
     } catch (error) {
-      console.error("Error loading workflow snapshot:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_LOAD_WORKFLOW_SNAPSHOT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { workflowName, runId }
+        },
+        error
+      );
     }
   }
   parseWorkflowRun(row) {
@@ -883,8 +1102,15 @@ var ClickhouseStore = class extends MastraStorage {
       });
       return { runs, total: total || runs.length };
     } catch (error) {
-      console.error("Error getting workflow runs:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_GET_WORKFLOW_RUNS_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { workflowName: workflowName ?? "", resourceId: resourceId ?? "" }
+        },
+        error
+      );
     }
   }
   async getWorkflowRunById({
@@ -924,8 +1150,15 @@ var ClickhouseStore = class extends MastraStorage {
       }
       return this.parseWorkflowRun(resultJson[0]);
     } catch (error) {
-      console.error("Error getting workflow run by ID:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "CLICKHOUSE_STORAGE_GET_WORKFLOW_RUN_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { runId: runId ?? "", workflowName: workflowName ?? "" }
+        },
+        error
+      );
     }
   }
   async hasColumn(table, column) {
@@ -937,13 +1170,28 @@ var ClickhouseStore = class extends MastraStorage {
     return columns.some((c) => c.name === column);
   }
   async getTracesPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new MastraError({
+      id: "CLICKHOUSE_STORAGE_GET_TRACES_PAGINATED_FAILED",
+      domain: ErrorDomain.STORAGE,
+      category: ErrorCategory.USER,
+      text: "Method not implemented."
+    });
   }
   async getThreadsByResourceIdPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new MastraError({
+      id: "CLICKHOUSE_STORAGE_GET_THREADS_BY_RESOURCE_ID_PAGINATED_FAILED",
+      domain: ErrorDomain.STORAGE,
+      category: ErrorCategory.USER,
+      text: "Method not implemented."
+    });
   }
   async getMessagesPaginated(_args) {
-    throw new Error("Method not implemented.");
+    throw new MastraError({
+      id: "CLICKHOUSE_STORAGE_GET_MESSAGES_PAGINATED_FAILED",
+      domain: ErrorDomain.STORAGE,
+      category: ErrorCategory.USER,
+      text: "Method not implemented."
+    });
   }
   async close() {
     await this.db.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/clickhouse",
-  "version": "0.11.1-alpha.0",
+  "version": "0.11.1-alpha.2",
   "description": "Clickhouse provider for Mastra - includes db storage capabilities",
   "type": "module",
   "main": "dist/index.js",
@@ -25,13 +25,13 @@
   "devDependencies": {
     "@microsoft/api-extractor": "^7.52.8",
     "@types/node": "^20.19.0",
-    "eslint": "^9.28.0",
+    "eslint": "^9.29.0",
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.3",
     "@internal/lint": "0.0.13",
     "@internal/storage-test-utils": "0.0.9",
-    "@mastra/core": "0.10.7-alpha.0"
+    "@mastra/core": "0.10.7-alpha.2"
   },
   "peerDependencies": {
     "@mastra/core": ">=0.10.4-0 <0.11.0"