@mastra/clickhouse 1.11.0 → 1.11.1

package/dist/index.js

@@ -8105,6 +8105,19 @@ var ObservabilityStorageClickhouseVNext = class extends ObservabilityStorage {
     }
   }
 };
+function buildTenancyFilter(filters) {
+  const clauses = [];
+  const params = {};
+  if (filters?.organizationId !== void 0) {
+    clauses.push("organizationId = {var_organizationId:String}");
+    params.var_organizationId = filters.organizationId;
+  }
+  if (filters?.projectId !== void 0) {
+    clauses.push("projectId = {var_projectId:String}");
+    params.var_projectId = filters.projectId;
+  }
+  return { sql: clauses.length > 0 ? ` AND ${clauses.join(" AND ")}` : "", params };
+}
 var ScoresStorageClickhouse = class extends ScoresStorage {
   client;
   #db;
@@ -8225,12 +8238,14 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
   }
   async listScoresByRunId({
     runId,
-    pagination
+    pagination,
+    filters
   }) {
+    const tenancy = buildTenancyFilter(filters);
     try {
       const countResult = await this.client.query({
-        query: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE runId = {var_runId:String}`,
-        query_params: { var_runId: runId },
+        query: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE runId = {var_runId:String}${tenancy.sql}`,
+        query_params: { var_runId: runId, ...tenancy.params },
         format: "JSONEachRow"
       });
       const countRows = await countResult.json();
@@ -8256,11 +8271,12 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
       const limitValue = perPageInput === false ? total : perPage;
       const end = perPageInput === false ? total : start + perPage;
       const result = await this.client.query({
-        query: `SELECT * FROM ${TABLE_SCORERS} WHERE runId = {var_runId:String} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
+        query: `SELECT * FROM ${TABLE_SCORERS} WHERE runId = {var_runId:String}${tenancy.sql} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
         query_params: {
           var_runId: runId,
           var_limit: limitValue,
-          var_offset: start
+          var_offset: start,
+          ...tenancy.params
         },
         format: "JSONEachRow",
         clickhouse_settings: {
@@ -8298,8 +8314,10 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
     entityId,
     entityType,
     source,
-    pagination
+    pagination,
+    filters
   }) {
+    const tenancy = buildTenancyFilter(filters);
     let whereClause = `scorerId = {var_scorerId:String}`;
     if (entityId) {
       whereClause += ` AND entityId = {var_entityId:String}`;
@@ -8310,6 +8328,7 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
     if (source) {
       whereClause += ` AND source = {var_source:String}`;
     }
+    whereClause += tenancy.sql;
     try {
       const countResult = await this.client.query({
         query: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE ${whereClause}`,
@@ -8317,7 +8336,8 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
           var_scorerId: scorerId,
           var_entityId: entityId,
           var_entityType: entityType,
-          var_source: source
+          var_source: source,
+          ...tenancy.params
         },
         format: "JSONEachRow"
       });
@@ -8351,7 +8371,8 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
           var_offset: start,
           var_entityId: entityId,
           var_entityType: entityType,
-          var_source: source
+          var_source: source,
+          ...tenancy.params
         },
         format: "JSONEachRow",
         clickhouse_settings: {
@@ -8387,12 +8408,14 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
   async listScoresByEntityId({
     entityId,
     entityType,
-    pagination
+    pagination,
+    filters
   }) {
+    const tenancy = buildTenancyFilter(filters);
     try {
       const countResult = await this.client.query({
-        query: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE entityId = {var_entityId:String} AND entityType = {var_entityType:String}`,
-        query_params: { var_entityId: entityId, var_entityType: entityType },
+        query: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE entityId = {var_entityId:String} AND entityType = {var_entityType:String}${tenancy.sql}`,
+        query_params: { var_entityId: entityId, var_entityType: entityType, ...tenancy.params },
         format: "JSONEachRow"
       });
       const countRows = await countResult.json();
@@ -8418,12 +8441,13 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
       const limitValue = perPageInput === false ? total : perPage;
       const end = perPageInput === false ? total : start + perPage;
       const result = await this.client.query({
-        query: `SELECT * FROM ${TABLE_SCORERS} WHERE entityId = {var_entityId:String} AND entityType = {var_entityType:String} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
+        query: `SELECT * FROM ${TABLE_SCORERS} WHERE entityId = {var_entityId:String} AND entityType = {var_entityType:String}${tenancy.sql} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
         query_params: {
           var_entityId: entityId,
           var_entityType: entityType,
           var_limit: limitValue,
-          var_offset: start
+          var_offset: start,
+          ...tenancy.params
         },
         format: "JSONEachRow",
         clickhouse_settings: {
@@ -8459,14 +8483,17 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
   async listScoresBySpan({
     traceId,
     spanId,
-    pagination
+    pagination,
+    filters
   }) {
+    const tenancy = buildTenancyFilter(filters);
     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: `SELECT COUNT(*) as count FROM ${TABLE_SCORERS} WHERE traceId = {var_traceId:String} AND spanId = {var_spanId:String}${tenancy.sql}`,
         query_params: {
           var_traceId: traceId,
-          var_spanId: spanId
+          var_spanId: spanId,
+          ...tenancy.params
         },
         format: "JSONEachRow"
       });
@@ -8493,12 +8520,13 @@ var ScoresStorageClickhouse = class extends ScoresStorage {
       const limitValue = perPageInput === false ? total : perPage;
       const end = perPageInput === false ? total : start + 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: `SELECT * FROM ${TABLE_SCORERS} WHERE traceId = {var_traceId:String} AND spanId = {var_spanId:String}${tenancy.sql} ORDER BY createdAt DESC LIMIT {var_limit:Int64} OFFSET {var_offset:Int64}`,
         query_params: {
           var_traceId: traceId,
           var_spanId: spanId,
           var_limit: limitValue,
-          var_offset: start
+          var_offset: start,
+          ...tenancy.params
         },
         format: "JSONEachRow",
         clickhouse_settings: {