@mastra/pg 0.13.3 → 0.14.0

package/dist/index.js

@@ -2288,6 +2288,7 @@ var StoreOperationsPG = class extends StoreOperations {
   }
 };
 function transformScoreRow(row) {
+  console.log(`row is`, JSON.stringify(row, null, 2));
   return {
     ...row,
     input: safelyParseJSON(row.input),
@@ -2323,7 +2324,7 @@ var ScoresPG = class extends ScoresStorage {
         `SELECT * FROM ${getTableName({ indexName: TABLE_SCORERS, schemaName: this.schema })} WHERE id = $1`,
         [id]
       );
-      return transformScoreRow(result);
+      return result ? transformScoreRow(result) : null;
     } catch (error) {
       throw new MastraError(
         {
@@ -2337,12 +2338,31 @@ var ScoresPG = class extends ScoresStorage {
   }
   async getScoresByScorerId({
     scorerId,
-    pagination
+    pagination,
+    entityId,
+    entityType,
+    source
   }) {
     try {
+      const conditions = [`"scorerId" = $1`];
+      const queryParams = [scorerId];
+      let paramIndex = 2;
+      if (entityId) {
+        conditions.push(`"entityId" = $${paramIndex++}`);
+        queryParams.push(entityId);
+      }
+      if (entityType) {
+        conditions.push(`"entityType" = $${paramIndex++}`);
+        queryParams.push(entityType);
+      }
+      if (source) {
+        conditions.push(`"source" = $${paramIndex++}`);
+        queryParams.push(source);
+      }
+      const whereClause = conditions.join(" AND ");
       const total = await this.client.oneOrNone(
-        `SELECT COUNT(*) FROM ${getTableName({ indexName: TABLE_SCORERS, schemaName: this.schema })} WHERE "scorerId" = $1`,
-        [scorerId]
+        `SELECT COUNT(*) FROM ${getTableName({ indexName: TABLE_SCORERS, schemaName: this.schema })} WHERE ${whereClause}`,
+        queryParams
       );
       if (total?.count === "0" || !total?.count) {
         return {
@@ -2356,8 +2376,8 @@ var ScoresPG = class extends ScoresStorage {
         };
       }
       const result = await this.client.manyOrNone(
-        `SELECT * FROM ${getTableName({ indexName: TABLE_SCORERS, schemaName: this.schema })} WHERE "scorerId" = $1 LIMIT $2 OFFSET $3`,
-        [scorerId, pagination.perPage, pagination.page * pagination.perPage]
+        `SELECT * FROM ${getTableName({ indexName: TABLE_SCORERS, schemaName: this.schema })} WHERE ${whereClause} ORDER BY "createdAt" DESC LIMIT $${paramIndex++} OFFSET $${paramIndex++}`,
+        [...queryParams, pagination.perPage, pagination.page * pagination.perPage]
       );
       return {
         pagination: {
@@ -2381,7 +2401,7 @@ var ScoresPG = class extends ScoresStorage {
   }
   async saveScore(score) {
     try {
-      const scoreId = crypto.randomUUID();
+      const id = crypto.randomUUID();
       const {
         scorer,
         preprocessStepResult,
@@ -2394,10 +2414,11 @@ var ScoresPG = class extends ScoresStorage {
         entity,
         ...rest
       } = score;
+      console.log(`saving score with id: ${id}`);
       await this.operations.insert({
         tableName: TABLE_SCORERS,
         record: {
-          id: scoreId,
+          id,
           ...rest,
           input: JSON.stringify(input) || "",
           output: JSON.stringify(output) || "",
@@ -2412,7 +2433,7 @@ var ScoresPG = class extends ScoresStorage {
           updatedAt: (/* @__PURE__ */ new Date()).toISOString()
         }
       });
-      const scoreFromDb = await this.getScoreById({ id: scoreId });
+      const scoreFromDb = await this.getScoreById({ id });
       return { score: scoreFromDb };
     } catch (error) {
       throw new MastraError(
@@ -2848,10 +2869,11 @@ var WorkflowsPG = class extends WorkflowsStorage {
 
 // src/storage/index.ts
 var PostgresStore = class extends MastraStorage {
-  db;
-  pgp;
-  client;
+  #db;
+  #pgp;
+  #config;
   schema;
+  isConnected = false;
   stores;
   constructor(config) {
     try {
@@ -2872,10 +2894,11 @@ var PostgresStore = class extends MastraStorage {
         }
       }
       super({ name: "PostgresStore" });
-      this.pgp = pgPromise();
       this.schema = config.schemaName || "public";
-      this.db = this.pgp(
-        `connectionString` in config ? { connectionString: config.connectionString } : {
+      this.#config = {
+        max: config.max,
+        idleTimeoutMillis: config.idleTimeoutMillis,
+        ...`connectionString` in config ? { connectionString: config.connectionString } : {
           host: config.host,
           port: config.port,
           database: config.database,
@@ -2883,14 +2906,33 @@ var PostgresStore = class extends MastraStorage {
           password: config.password,
           ssl: config.ssl
         }
+      };
+      this.stores = {};
+    } catch (e) {
+      throw new MastraError(
+        {
+          id: "MASTRA_STORAGE_PG_STORE_INITIALIZATION_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER
+        },
+        e
       );
-      this.client = this.db;
-      const operations = new StoreOperationsPG({ client: this.client, schemaName: this.schema });
-      const scores = new ScoresPG({ client: this.client, operations, schema: this.schema });
-      const traces = new TracesPG({ client: this.client, operations, schema: this.schema });
-      const workflows = new WorkflowsPG({ client: this.client, operations, schema: this.schema });
-      const legacyEvals = new LegacyEvalsPG({ client: this.client, schema: this.schema });
-      const memory = new MemoryPG({ client: this.client, schema: this.schema, operations });
+    }
+  }
+  async init() {
+    if (this.isConnected) {
+      return;
+    }
+    try {
+      this.isConnected = true;
+      this.#pgp = pgPromise();
+      this.#db = this.#pgp(this.#config);
+      const operations = new StoreOperationsPG({ client: this.#db, schemaName: this.schema });
+      const scores = new ScoresPG({ client: this.#db, operations, schema: this.schema });
+      const traces = new TracesPG({ client: this.#db, operations, schema: this.schema });
+      const workflows = new WorkflowsPG({ client: this.#db, operations, schema: this.schema });
+      const legacyEvals = new LegacyEvalsPG({ client: this.#db, schema: this.schema });
+      const memory = new MemoryPG({ client: this.#db, schema: this.schema, operations });
       this.stores = {
         operations,
         scores,
@@ -2899,17 +2941,31 @@ var PostgresStore = class extends MastraStorage {
         legacyEvals,
         memory
       };
-    } catch (e) {
+      await super.init();
+    } catch (error) {
+      this.isConnected = false;
       throw new MastraError(
         {
-          id: "MASTRA_STORAGE_PG_STORE_INITIALIZATION_FAILED",
+          id: "MASTRA_STORAGE_POSTGRES_STORE_INIT_FAILED",
           domain: ErrorDomain.STORAGE,
-          category: ErrorCategory.USER
+          category: ErrorCategory.THIRD_PARTY
         },
-        e
+        error
       );
     }
   }
+  get db() {
+    if (!this.#db) {
+      throw new Error(`PostgresStore: Store is not initialized, please call "init()" first.`);
+    }
+    return this.#db;
+  }
+  get pgp() {
+    if (!this.#pgp) {
+      throw new Error(`PostgresStore: Store is not initialized, please call "init()" first.`);
+    }
+    return this.#pgp;
+  }
   get supports() {
     return {
       selectByIncludeResourceScope: true,
@@ -3066,10 +3122,13 @@ var PostgresStore = class extends MastraStorage {
     return this.stores.scores.getScoreById({ id: _id });
   }
   async getScoresByScorerId({
-    scorerId: _scorerId,
-    pagination: _pagination
+    scorerId,
+    pagination,
+    entityId,
+    entityType,
+    source
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId: _scorerId, pagination: _pagination });
+    return this.stores.scores.getScoresByScorerId({ scorerId, pagination, entityId, entityType, source });
   }
   async saveScore(_score) {
     return this.stores.scores.saveScore(_score);