@mastra/dsql 1.1.1 → 1.1.2

package/dist/index.js

@@ -3564,6 +3564,17 @@ function transformScoreRow(row) {
     }
   });
 }
+function applyTenancyFilters(conditions, queryParams, paramIndex, filters) {
+  if (filters?.organizationId !== void 0) {
+    conditions.push(`"organizationId" = $${paramIndex++}`);
+    queryParams.push(filters.organizationId);
+  }
+  if (filters?.projectId !== void 0) {
+    conditions.push(`"projectId" = $${paramIndex++}`);
+    queryParams.push(filters.projectId);
+  }
+  return paramIndex;
+}
 var ScoresDSQL = class _ScoresDSQL extends ScoresStorage {
   #db;
   #schema;
@@ -3581,6 +3592,11 @@ var ScoresDSQL = class _ScoresDSQL extends ScoresStorage {
   }
   async init() {
     await this.#db.createTable({ tableName: TABLE_SCORERS, schema: TABLE_SCHEMAS[TABLE_SCORERS] });
+    await this.#db.alterTable({
+      tableName: TABLE_SCORERS,
+      schema: TABLE_SCHEMAS[TABLE_SCORERS],
+      ifNotExists: ["organizationId", "projectId", "batchId", "datasetId", "datasetItemId"]
+    });
     await this.createDefaultIndexes();
     await this.createCustomIndexes();
   }
@@ -3654,7 +3670,8 @@ var ScoresDSQL = class _ScoresDSQL extends ScoresStorage {
     pagination,
     entityId,
     entityType,
-    source
+    source,
+    filters
   }) {
     try {
       const conditions = [`"scorerId" = $1`];
@@ -3672,6 +3689,7 @@ var ScoresDSQL = class _ScoresDSQL extends ScoresStorage {
         conditions.push(`"source" = $${paramIndex++}`);
         queryParams.push(source);
       }
+      paramIndex = applyTenancyFilters(conditions, queryParams, paramIndex, filters);
       const whereClause = conditions.join(" AND ");
       const total = await this.#db.client.oneOrNone(
         `SELECT COUNT(*) FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.#schema) })} WHERE ${whereClause}`,
@@ -3785,12 +3803,18 @@ var ScoresDSQL = class _ScoresDSQL extends ScoresStorage {
   }
   async listScoresByRunId({
     runId,
-    pagination
+    pagination,
+    filters
   }) {
     try {
+      const conditions = [`"runId" = $1`];
+      const queryParams = [runId];
+      let paramIndex = 2;
+      paramIndex = applyTenancyFilters(conditions, queryParams, paramIndex, filters);
+      const whereClause = conditions.join(" AND ");
       const total = await this.#db.client.oneOrNone(
-        `SELECT COUNT(*) FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.#schema) })} WHERE "runId" = $1`,
-        [runId]
+        `SELECT COUNT(*) FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.#schema) })} WHERE ${whereClause}`,
+        queryParams
       );
       const { page, perPage: perPageInput } = pagination;
       const perPage = normalizePerPage(perPageInput, 100);
@@ -3809,8 +3833,8 @@ var ScoresDSQL = class _ScoresDSQL extends ScoresStorage {
       const limitValue = perPageInput === false ? Number(total?.count) : perPage;
       const end = perPageInput === false ? Number(total?.count) : start + perPage;
       const result = await this.#db.client.manyOrNone(
-        `SELECT * FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.#schema) })} WHERE "runId" = $1 ORDER BY "createdAt" DESC LIMIT $2 OFFSET $3`,
-        [runId, limitValue, start]
+        `SELECT * FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.#schema) })} WHERE ${whereClause} ORDER BY "createdAt" DESC LIMIT $${paramIndex++} OFFSET $${paramIndex++}`,
+        [...queryParams, limitValue, start]
       );
       return {
         pagination: {
@@ -3835,12 +3859,18 @@ var ScoresDSQL = class _ScoresDSQL extends ScoresStorage {
   async listScoresByEntityId({
     entityId,
     entityType,
-    pagination
+    pagination,
+    filters
   }) {
     try {
+      const conditions = [`"entityId" = $1`, `"entityType" = $2`];
+      const queryParams = [entityId, entityType];
+      let paramIndex = 3;
+      paramIndex = applyTenancyFilters(conditions, queryParams, paramIndex, filters);
+      const whereClause = conditions.join(" AND ");
       const total = await this.#db.client.oneOrNone(
-        `SELECT COUNT(*) FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.#schema) })} WHERE "entityId" = $1 AND "entityType" = $2`,
-        [entityId, entityType]
+        `SELECT COUNT(*) FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.#schema) })} WHERE ${whereClause}`,
+        queryParams
       );
       const { page, perPage: perPageInput } = pagination;
       const perPage = normalizePerPage(perPageInput, 100);
@@ -3859,8 +3889,8 @@ var ScoresDSQL = class _ScoresDSQL extends ScoresStorage {
       const limitValue = perPageInput === false ? Number(total?.count) : perPage;
       const end = perPageInput === false ? Number(total?.count) : start + perPage;
       const result = await this.#db.client.manyOrNone(
-        `SELECT * FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.#schema) })} WHERE "entityId" = $1 AND "entityType" = $2 ORDER BY "createdAt" DESC LIMIT $3 OFFSET $4`,
-        [entityId, entityType, limitValue, start]
+        `SELECT * FROM ${getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.#schema) })} WHERE ${whereClause} ORDER BY "createdAt" DESC LIMIT $${paramIndex++} OFFSET $${paramIndex++}`,
+        [...queryParams, limitValue, start]
       );
       return {
         pagination: {
@@ -3885,13 +3915,19 @@ var ScoresDSQL = class _ScoresDSQL extends ScoresStorage {
   async listScoresBySpan({
     traceId,
     spanId,
-    pagination
+    pagination,
+    filters
   }) {
     try {
       const tableName = getTableName2({ indexName: TABLE_SCORERS, schemaName: getSchemaName2(this.#schema) });
+      const conditions = [`"traceId" = $1`, `"spanId" = $2`];
+      const queryParams = [traceId, spanId];
+      let paramIndex = 3;
+      paramIndex = applyTenancyFilters(conditions, queryParams, paramIndex, filters);
+      const whereClause = conditions.join(" AND ");
       const countSQLResult = await this.#db.client.oneOrNone(
-        `SELECT COUNT(*) as count FROM ${tableName} WHERE "traceId" = $1 AND "spanId" = $2`,
-        [traceId, spanId]
+        `SELECT COUNT(*) as count FROM ${tableName} WHERE ${whereClause}`,
+        queryParams
       );
       const total = Number(countSQLResult?.count ?? 0);
       const { page, perPage: perPageInput } = pagination;
@@ -3900,8 +3936,8 @@ var ScoresDSQL = class _ScoresDSQL extends ScoresStorage {
       const limitValue = perPageInput === false ? total : perPage;
       const end = perPageInput === false ? total : start + perPage;
       const result = await this.#db.client.manyOrNone(
-        `SELECT * FROM ${tableName} WHERE "traceId" = $1 AND "spanId" = $2 ORDER BY "createdAt" DESC LIMIT $3 OFFSET $4`,
-        [traceId, spanId, limitValue, start]
+        `SELECT * FROM ${tableName} WHERE ${whereClause} ORDER BY "createdAt" DESC LIMIT $${paramIndex++} OFFSET $${paramIndex++}`,
+        [...queryParams, limitValue, start]
       );
       const hasMore = end < total;
       const scores = result.map((row) => transformScoreRow(row)) ?? [];