@mastra/pg 0.10.1 → 0.10.2-alpha.0

package/dist/index.js

@@ -941,6 +941,7 @@ var PostgresStore = class extends MastraStorage {
     const parsedSchemaName = this.schema ? parseSqlIdentifier(this.schema, "schema name") : void 0;
     return parsedSchemaName ? `${parsedSchemaName}."${parsedIndexName}"` : `"${parsedIndexName}"`;
   }
+  /** @deprecated use getEvals instead */
   async getEvalsByAgentName(agentName, type) {
     try {
       const baseQuery = `SELECT * FROM ${this.getTableName(TABLE_EVALS)} WHERE agent_name = $1`;
@@ -991,76 +992,72 @@ var PostgresStore = class extends MastraStorage {
       throw error;
     }
   }
-  async getTraces({
-    name,
-    scope,
-    page,
-    perPage,
-    attributes,
-    filters,
-    fromDate,
-    toDate
-  }) {
-    let idx = 1;
-    const limit = perPage;
-    const offset = page * perPage;
-    const args = [];
+  async getTraces(args) {
+    const {
+      name,
+      scope,
+      page,
+      perPage: perPageInput,
+      attributes,
+      filters,
+      fromDate,
+      toDate,
+      returnPaginationResults
+    } = args;
+    const perPage = perPageInput !== void 0 ? perPageInput : 100;
+    const currentOffset = page * perPage;
+    const queryParams = [];
     const conditions = [];
+    let paramIndex = 1;
     if (name) {
-      conditions.push(`name LIKE CONCAT($${idx++}, '%')`);
+      conditions.push(`name LIKE $${paramIndex++}`);
+      queryParams.push(`${name}%`);
     }
     if (scope) {
-      conditions.push(`scope = $${idx++}`);
+      conditions.push(`scope = $${paramIndex++}`);
+      queryParams.push(scope);
     }
     if (attributes) {
-      Object.keys(attributes).forEach((key) => {
+      Object.entries(attributes).forEach(([key, value]) => {
         const parsedKey = parseSqlIdentifier(key, "attribute key");
-        conditions.push(`attributes->>'${parsedKey}' = $${idx++}`);
+        conditions.push(`attributes->>'${parsedKey}' = $${paramIndex++}`);
+        queryParams.push(value);
       });
     }
     if (filters) {
-      Object.entries(filters).forEach(([key]) => {
+      Object.entries(filters).forEach(([key, value]) => {
         const parsedKey = parseSqlIdentifier(key, "filter key");
-        conditions.push(`${parsedKey} = $${idx++}`);
+        conditions.push(`"${parsedKey}" = $${paramIndex++}`);
+        queryParams.push(value);
       });
     }
     if (fromDate) {
-      conditions.push(`createdAt >= $${idx++}`);
+      conditions.push(`"createdAt" >= $${paramIndex++}`);
+      queryParams.push(fromDate);
     }
     if (toDate) {
-      conditions.push(`createdAt <= $${idx++}`);
+      conditions.push(`"createdAt" <= $${paramIndex++}`);
+      queryParams.push(toDate);
     }
     const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-    if (name) {
-      args.push(name);
-    }
-    if (scope) {
-      args.push(scope);
-    }
-    if (attributes) {
-      for (const [_key, value] of Object.entries(attributes)) {
-        args.push(value);
-      }
-    }
-    if (filters) {
-      for (const [, value] of Object.entries(filters)) {
-        args.push(value);
-      }
-    }
-    if (fromDate) {
-      args.push(fromDate.toISOString());
-    }
-    if (toDate) {
-      args.push(toDate.toISOString());
-    }
-    const result = await this.db.manyOrNone(
-      `SELECT * FROM ${this.getTableName(TABLE_TRACES)} ${whereClause} ORDER BY "createdAt" DESC LIMIT ${limit} OFFSET ${offset}`,
-      args
-    );
-    if (!result) {
+    const countQuery = `SELECT COUNT(*) FROM ${this.getTableName(TABLE_TRACES)} ${whereClause}`;
+    const countResult = await this.db.one(countQuery, queryParams);
+    const total = parseInt(countResult.count, 10);
+    if (total === 0 && returnPaginationResults) {
+      return {
+        traces: [],
+        total: 0,
+        page,
+        perPage,
+        hasMore: false
+      };
+    } else if (total === 0) {
       return [];
     }
-    return result.map((row) => ({
+    const dataQuery = `SELECT * FROM ${this.getTableName(TABLE_TRACES)} ${whereClause} ORDER BY "createdAt" DESC LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
+    const finalQueryParams = [...queryParams, perPage, currentOffset];
+    const rows = await this.db.manyOrNone(dataQuery, finalQueryParams);
+    const traces = rows.map((row) => ({
       id: row.id,
       parentSpanId: row.parentSpanId,
       traceId: row.traceId,
@@ -1076,6 +1073,17 @@ var PostgresStore = class extends MastraStorage {
       other: row.other,
       createdAt: row.createdAt
     }));
+    if (returnPaginationResults) {
+      return {
+        traces,
+        total,
+        page,
+        perPage,
+        hasMore: currentOffset + traces.length < total
+      };
+    } else {
+      return traces;
+    }
   }
   async setupSchema() {
     if (!this.schema || this.schemaSetupComplete) {
@@ -1229,29 +1237,58 @@ var PostgresStore = class extends MastraStorage {
       throw error;
     }
   }
-  async getThreadsByResourceId({ resourceId }) {
+  async getThreadsByResourceId(args) {
+    const { resourceId, page, perPage: perPageInput } = args;
     try {
-      const threads = await this.db.manyOrNone(
-        `SELECT 
-          id,
-          "resourceId",
-          title,
-          metadata,
-          "createdAt",
-          "updatedAt"
-        FROM ${this.getTableName(TABLE_THREADS)}
-        WHERE "resourceId" = $1`,
-        [resourceId]
-      );
-      return threads.map((thread) => ({
-        ...thread,
-        metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
-        createdAt: thread.createdAt,
-        updatedAt: thread.updatedAt
-      }));
+      const baseQuery = `FROM ${this.getTableName(TABLE_THREADS)} WHERE "resourceId" = $1`;
+      const queryParams = [resourceId];
+      if (page !== void 0) {
+        const perPage = perPageInput !== void 0 ? perPageInput : 100;
+        const currentOffset = page * perPage;
+        const countQuery = `SELECT COUNT(*) ${baseQuery}`;
+        const countResult = await this.db.one(countQuery, queryParams);
+        const total = parseInt(countResult.count, 10);
+        if (total === 0) {
+          return {
+            threads: [],
+            total: 0,
+            page,
+            perPage,
+            hasMore: false
+          };
+        }
+        const dataQuery = `SELECT id, "resourceId", title, metadata, "createdAt", "updatedAt" ${baseQuery} ORDER BY "createdAt" DESC LIMIT $2 OFFSET $3`;
+        const rows = await this.db.manyOrNone(dataQuery, [...queryParams, perPage, currentOffset]);
+        const threads = (rows || []).map((thread) => ({
+          ...thread,
+          metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
+          createdAt: thread.createdAt,
+          // Assuming already Date objects or ISO strings
+          updatedAt: thread.updatedAt
+        }));
+        return {
+          threads,
+          total,
+          page,
+          perPage,
+          hasMore: currentOffset + threads.length < total
+        };
+      } else {
+        const dataQuery = `SELECT id, "resourceId", title, metadata, "createdAt", "updatedAt" ${baseQuery} ORDER BY "createdAt" DESC`;
+        const rows = await this.db.manyOrNone(dataQuery, queryParams);
+        return (rows || []).map((thread) => ({
+          ...thread,
+          metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
+          createdAt: thread.createdAt,
+          updatedAt: thread.updatedAt
+        }));
+      }
     } catch (error) {
-      console.error(`Error getting threads for resource ${resourceId}:`, error);
-      throw error;
+      this.logger.error(`Error getting threads for resource ${resourceId}:`, error);
+      if (page !== void 0) {
+        return { threads: [], total: 0, page, perPage: perPageInput || 100, hasMore: false };
+      }
+      return [];
     }
   }
   async saveThread({ thread }) {
@@ -1331,84 +1368,143 @@ var PostgresStore = class extends MastraStorage {
       throw error;
     }
   }
-  async getMessages({ threadId, selectBy }) {
+  async getMessages(args) {
+    const { threadId, format, page, perPage: perPageInput, fromDate, toDate, selectBy } = args;
+    const selectStatement = `SELECT id, content, role, type, "createdAt", thread_id AS "threadId"`;
+    const orderByStatement = `ORDER BY "createdAt" DESC`;
     try {
-      const messages = [];
-      const limit = typeof selectBy?.last === `number` ? selectBy.last : 40;
-      const include = selectBy?.include || [];
-      if (include.length) {
-        const includeResult = await this.db.manyOrNone(
-          `
-          WITH ordered_messages AS (
-            SELECT 
-              *,
-              ROW_NUMBER() OVER (ORDER BY "createdAt" DESC) as row_num
-            FROM ${this.getTableName(TABLE_MESSAGES)}
-            WHERE thread_id = $1
-          )
-          SELECT
-            m.id, 
-            m.content, 
-            m.role, 
-            m.type,
-            m."createdAt", 
-            m.thread_id AS "threadId"
-          FROM ordered_messages m
-          WHERE m.id = ANY($2)
-          OR EXISTS (
-            SELECT 1 FROM ordered_messages target
-            WHERE target.id = ANY($2)
-            AND (
-              -- Get previous messages based on the max withPreviousMessages
-              (m.row_num <= target.row_num + $3 AND m.row_num > target.row_num)
-              OR
-              -- Get next messages based on the max withNextMessages
-              (m.row_num >= target.row_num - $4 AND m.row_num < target.row_num)
+      if (page !== void 0) {
+        const perPage = perPageInput !== void 0 ? perPageInput : 40;
+        const currentOffset = page * perPage;
+        const conditions = [`thread_id = $1`];
+        const queryParams = [threadId];
+        let paramIndex = 2;
+        if (fromDate) {
+          conditions.push(`"createdAt" >= $${paramIndex++}`);
+          queryParams.push(fromDate);
+        }
+        if (toDate) {
+          conditions.push(`"createdAt" <= $${paramIndex++}`);
+          queryParams.push(toDate);
+        }
+        const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+        const countQuery = `SELECT COUNT(*) FROM ${this.getTableName(TABLE_MESSAGES)} ${whereClause}`;
+        const countResult = await this.db.one(countQuery, queryParams);
+        const total = parseInt(countResult.count, 10);
+        if (total === 0) {
+          return {
+            messages: [],
+            total: 0,
+            page,
+            perPage,
+            hasMore: false
+          };
+        }
+        const dataQuery = `${selectStatement} FROM ${this.getTableName(TABLE_MESSAGES)} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
+        const rows = await this.db.manyOrNone(dataQuery, [...queryParams, perPage, currentOffset]);
+        const fetchedMessages = (rows || []).map((message) => {
+          if (typeof message.content === "string") {
+            try {
+              message.content = JSON.parse(message.content);
+            } catch {
+            }
+          }
+          if (message.type === "v2") delete message.type;
+          return message;
+        });
+        const messagesToReturn = format === "v2" ? fetchedMessages.map(
+          (m) => ({
+            ...m,
+            content: m.content || { format: 2, parts: [{ type: "text", text: "" }] }
+          })
+        ) : fetchedMessages;
+        return {
+          messages: messagesToReturn,
+          total,
+          page,
+          perPage,
+          hasMore: currentOffset + fetchedMessages.length < total
+        };
+      } else {
+        let rows = [];
+        const include = selectBy?.include || [];
+        if (include.length) {
+          rows = await this.db.manyOrNone(
+            `
+            WITH ordered_messages AS (
+              SELECT 
+                *,
+                ROW_NUMBER() OVER (${orderByStatement}) as row_num
+              FROM ${this.getTableName(TABLE_MESSAGES)}
+              WHERE thread_id = $1
             )
-          )
-          ORDER BY m."createdAt" DESC
-          `,
-          [
-            threadId,
-            include.map((i) => i.id),
-            Math.max(...include.map((i) => i.withPreviousMessages || 0)),
-            Math.max(...include.map((i) => i.withNextMessages || 0))
-          ]
-        );
-        messages.push(...includeResult);
-      }
-      const result = await this.db.manyOrNone(
-        `
-        SELECT 
-            id, 
-            content, 
-            role, 
-            type,
-            "createdAt", 
-            thread_id AS "threadId"
-        FROM ${this.getTableName(TABLE_MESSAGES)}
-        WHERE thread_id = $1
-        AND id != ALL($2)
-        ORDER BY "createdAt" DESC
-        LIMIT $3
-        `,
-        [threadId, messages.map((m) => m.id), limit]
-      );
-      messages.push(...result);
-      messages.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime());
-      messages.forEach((message) => {
-        if (typeof message.content === "string") {
-          try {
-            message.content = JSON.parse(message.content);
-          } catch {
+            SELECT
+              m.id, 
+              m.content, 
+              m.role, 
+              m.type,
+              m."createdAt", 
+              m.thread_id AS "threadId"
+            FROM ordered_messages m
+            WHERE m.id = ANY($2)
+            OR EXISTS (
+              SELECT 1 FROM ordered_messages target
+              WHERE target.id = ANY($2)
+              AND (
+                -- Get previous messages based on the max withPreviousMessages
+                (m.row_num <= target.row_num + $3 AND m.row_num > target.row_num)
+                OR
+                -- Get next messages based on the max withNextMessages
+                (m.row_num >= target.row_num - $4 AND m.row_num < target.row_num)
+              )
+            )
+            ORDER BY m."createdAt" ASC 
+            `,
+            // Keep ASC for final sorting after fetching context
+            [
+              threadId,
+              include.map((i) => i.id),
+              Math.max(0, ...include.map((i) => i.withPreviousMessages || 0)),
+              // Ensure non-negative
+              Math.max(0, ...include.map((i) => i.withNextMessages || 0))
+              // Ensure non-negative
+            ]
+          );
+        } else {
+          const limit = typeof selectBy?.last === `number` ? selectBy.last : 40;
+          if (limit === 0 && selectBy?.last !== false) ; else {
+            let query = `${selectStatement} FROM ${this.getTableName(TABLE_MESSAGES)} WHERE thread_id = $1 ${orderByStatement}`;
+            const queryParams = [threadId];
+            if (limit !== void 0 && selectBy?.last !== false) {
+              query += ` LIMIT $2`;
+              queryParams.push(limit);
+            }
+            rows = await this.db.manyOrNone(query, queryParams);
           }
         }
-        if (message.type === `v2`) delete message.type;
-      });
-      return messages;
+        const fetchedMessages = (rows || []).map((message) => {
+          if (typeof message.content === "string") {
+            try {
+              message.content = JSON.parse(message.content);
+            } catch {
+            }
+          }
+          if (message.type === "v2") delete message.type;
+          return message;
+        });
+        const sortedMessages = fetchedMessages.sort(
+          (a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()
+        );
+        return format === "v2" ? sortedMessages.map(
+          (m) => ({ ...m, content: m.content || { format: 2, parts: [{ type: "text", text: "" }] } })
+        ) : sortedMessages;
+      }
     } catch (error) {
-      console.error("Error getting messages:", error);
-      throw error;
+      this.logger.error("Error getting messages:", error);
+      if (page !== void 0) {
+        return { messages: [], total: 0, page, perPage: perPageInput || 40, hasMore: false };
+      }
+      return [];
     }
   }
   async saveMessages({
@@ -1621,6 +1717,73 @@ var PostgresStore = class extends MastraStorage {
   async close() {
     this.pgp.end();
   }
+  async getEvals(options) {
+    const { agentName, type, page, perPage, limit, offset, fromDate, toDate } = options || {};
+    const conditions = [];
+    const queryParams = [];
+    let paramIndex = 1;
+    if (agentName) {
+      conditions.push(`agent_name = $${paramIndex++}`);
+      queryParams.push(agentName);
+    }
+    if (type === "test") {
+      conditions.push(`(test_info IS NOT NULL AND test_info->>'testPath' IS NOT NULL)`);
+    } else if (type === "live") {
+      conditions.push(`(test_info IS NULL OR test_info->>'testPath' IS NULL)`);
+    }
+    if (fromDate) {
+      conditions.push(`created_at >= $${paramIndex++}`);
+      queryParams.push(fromDate);
+    }
+    if (toDate) {
+      conditions.push(`created_at <= $${paramIndex++}`);
+      queryParams.push(toDate);
+    }
+    const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+    const countQuery = `SELECT COUNT(*) FROM ${this.getTableName(TABLE_EVALS)} ${whereClause}`;
+    const countResult = await this.db.one(countQuery, queryParams);
+    const total = parseInt(countResult.count, 10);
+    let currentLimit;
+    let currentOffset;
+    let currentPage = page;
+    let currentPerPage = perPage;
+    let hasMore = false;
+    if (limit !== void 0 && offset !== void 0) {
+      currentLimit = limit;
+      currentOffset = offset;
+      currentPage = void 0;
+      currentPerPage = void 0;
+      hasMore = currentOffset + currentLimit < total;
+    } else if (page !== void 0 && perPage !== void 0) {
+      currentLimit = perPage;
+      currentOffset = page * perPage;
+      hasMore = currentOffset + currentLimit < total;
+    } else {
+      currentLimit = perPage || 100;
+      currentOffset = (page || 0) * currentLimit;
+      if (page === void 0) currentPage = 0;
+      if (currentPerPage === void 0) currentPerPage = currentLimit;
+      hasMore = currentOffset + currentLimit < total;
+    }
+    if (total === 0) {
+      return {
+        evals: [],
+        total: 0,
+        page: currentPage,
+        perPage: currentPerPage,
+        hasMore: false
+      };
+    }
+    const dataQuery = `SELECT * FROM ${this.getTableName(TABLE_EVALS)} ${whereClause} ORDER BY created_at DESC LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
+    const rows = await this.db.manyOrNone(dataQuery, [...queryParams, currentLimit, currentOffset]);
+    return {
+      evals: rows?.map((row) => this.transformEvalRow(row)) ?? [],
+      total,
+      page: currentPage,
+      perPage: currentPerPage,
+      hasMore
+    };
+  }
 };
 
 // src/vector/prompt.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/pg",
-  "version": "0.10.1",
+  "version": "0.10.2-alpha.0",
   "description": "Postgres provider for Mastra - includes both vector and db storage capabilities",
   "type": "module",
   "main": "dist/index.js",
@@ -21,20 +21,21 @@
   "license": "MIT",
   "dependencies": {
     "async-mutex": "^0.5.0",
-    "pg": "^8.13.3",
-    "pg-promise": "^11.11.0",
+    "pg": "^8.16.0",
+    "pg-promise": "^11.13.0",
     "xxhash-wasm": "^1.1.0"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.52.5",
-    "@types/node": "^20.17.27",
-    "@types/pg": "^8.11.11",
-    "eslint": "^9.23.0",
-    "tsup": "^8.4.0",
+    "@microsoft/api-extractor": "^7.52.8",
+    "@types/node": "^20.17.57",
+    "@types/pg": "^8.15.4",
+    "eslint": "^9.28.0",
+    "tsup": "^8.5.0",
     "typescript": "^5.8.2",
     "vitest": "^3.1.2",
-    "@internal/lint": "0.0.8",
-    "@mastra/core": "0.10.2"
+    "@internal/lint": "0.0.10",
+    "@internal/storage-test-utils": "0.0.6",
+    "@mastra/core": "0.10.4-alpha.0"
   },
   "peerDependencies": {
     "@mastra/core": "^0.10.2-alpha.0"