@mastra/pg 1.9.1-alpha.0 → 1.9.1

package/dist/index.js

@@ -709,6 +709,25 @@ var PgVector = class extends MastraVector {
       return null;
     }
   }
+  /**
+   * Sets search_path on the client connection so that vector operators (e.g. <=>, vector_cosine_ops)
+   * are resolvable when the pgvector extension is installed in a non-default schema.
+   *
+   * PostgreSQL's default search_path is ("$user", public). If the extension lives in a custom schema
+   * (e.g. "myapp"), operator classes and distance operators won't resolve without this.
+   */
+  async ensureSearchPath(client) {
+    if (!this.vectorExtensionSchema) {
+      await this.detectVectorExtensionSchema(client);
+    }
+    if (this.vectorExtensionSchema && this.vectorExtensionSchema !== "public" && this.vectorExtensionSchema !== "pg_catalog") {
+      const schemas = /* @__PURE__ */ new Set();
+      schemas.add(this.vectorExtensionSchema);
+      if (this.schema) schemas.add(this.schema);
+      schemas.add("public");
+      await client.query(`SET search_path TO ${[...schemas].map((s) => `"${s}"`).join(", ")}`);
+    }
+  }
   /**
    * Checks if the installed pgvector version supports halfvec type.
    * halfvec was introduced in pgvector 0.7.0.
@@ -922,6 +941,7 @@ var PgVector = class extends MastraVector {
     }
     const client = await this.pool.connect();
     try {
+      await this.ensureSearchPath(client);
       await client.query("BEGIN");
       const translatedFilter = this.transformFilter(filter);
       const { sql: filterQuery, values: filterValues } = buildFilterQuery(translatedFilter, minScore, topK);
@@ -941,7 +961,23 @@ var PgVector = class extends MastraVector {
       const qualifiedVectorType = this.getVectorTypeName(indexInfo.vectorType, indexInfo.dimension);
       const distanceExpr = `embedding ${ops.distanceOperator} '${vectorStr}'::${qualifiedVectorType}`;
       const scoreExpr = ops.scoreExpr(distanceExpr);
-      const query = `
+      const hasFilter = filterQuery.trim().length > 0;
+      const useIndexedOrder = indexInfo.type === "hnsw" && !hasFilter && minScore <= 0;
+      const query = useIndexedOrder ? `
+        WITH vector_scores AS (
+          SELECT
+            vector_id as id,
+            ${scoreExpr} as score,
+            metadata
+            ${includeVector ? ", embedding" : ""}
+          FROM ${tableName}
+          ORDER BY ${distanceExpr}
+          LIMIT $2
+        )
+        SELECT *
+        FROM vector_scores
+        WHERE score > $1
+        ORDER BY score DESC` : `
         WITH vector_scores AS (
           SELECT
             vector_id as id,
@@ -994,6 +1030,7 @@ var PgVector = class extends MastraVector {
     const { tableName } = this.getTableName(indexName);
     const client = await this.pool.connect();
     try {
+      await this.ensureSearchPath(client);
       await client.query("BEGIN");
       if (deleteFilter) {
         this.logger?.debug(`Deleting vectors matching filter before upsert`, { indexName, deleteFilter });
@@ -1244,9 +1281,6 @@ var PgVector = class extends MastraVector {
             }
           });
         }
-        if (this.schema && this.vectorExtensionSchema && this.schema !== this.vectorExtensionSchema && this.vectorExtensionSchema !== "pg_catalog") {
-          await client.query(`SET search_path TO ${this.getSchemaName()}, "${this.vectorExtensionSchema}"`);
-        }
         const qualifiedVectorType = this.getVectorTypeName(vectorType);
         await client.query(`
           CREATE TABLE IF NOT EXISTS ${tableName} (
@@ -1389,6 +1423,7 @@ var PgVector = class extends MastraVector {
         this.describeIndexCache.delete(indexName);
         return;
       }
+      await this.ensureSearchPath(client);
       const effectiveVectorType = existingIndexInfo?.vectorType ?? vectorType;
       const metricOp = this.getVectorOps(effectiveVectorType, metric).operatorClass;
       let indexSQL;
@@ -1739,6 +1774,7 @@ var PgVector = class extends MastraVector {
         });
       }
       client = await this.pool.connect();
+      await this.ensureSearchPath(client);
       const { tableName } = this.getTableName(indexName);
       const indexInfo = await this.getIndexInfo({ indexName });
       const qualifiedVectorType = this.getVectorTypeName(indexInfo.vectorType, indexInfo.dimension);
@@ -1977,6 +2013,7 @@ var PoolAdapter = class {
   constructor($pool) {
     this.$pool = $pool;
   }
+  $pool;
   connect() {
     return this.$pool.connect();
   }
@@ -2045,6 +2082,7 @@ var TransactionClient = class {
   constructor(client) {
     this.client = client;
   }
+  client;
   async none(query, values) {
     await this.client.query(query, values);
     return null;
@@ -5540,6 +5578,22 @@ var ExperimentsPG = class _ExperimentsPG extends ExperimentsStorage {
         conditions.push(`"datasetId" = $${paramIndex++}`);
         queryParams.push(args.datasetId);
       }
+      if (args.targetType) {
+        conditions.push(`"targetType" = $${paramIndex++}`);
+        queryParams.push(args.targetType);
+      }
+      if (args.targetId) {
+        conditions.push(`"targetId" = $${paramIndex++}`);
+        queryParams.push(args.targetId);
+      }
+      if (args.agentVersion) {
+        conditions.push(`"agentVersion" = $${paramIndex++}`);
+        queryParams.push(args.agentVersion);
+      }
+      if (args.status) {
+        conditions.push(`"status" = $${paramIndex++}`);
+        queryParams.push(args.status);
+      }
       const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
       const countResult = await this.#db.client.one(
         `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`,
@@ -5728,9 +5782,21 @@ var ExperimentsPG = class _ExperimentsPG extends ExperimentsStorage {
     try {
       const { page, perPage: perPageInput } = args.pagination;
       const tableName = getTableName2({ indexName: TABLE_EXPERIMENT_RESULTS, schemaName: getSchemaName2(this.#schema) });
+      const conditions = ['"experimentId" = $1'];
+      const queryParams = [args.experimentId];
+      let paramIndex = 2;
+      if (args.traceId) {
+        conditions.push(`"traceId" = $${paramIndex++}`);
+        queryParams.push(args.traceId);
+      }
+      if (args.status) {
+        conditions.push(`"status" = $${paramIndex++}`);
+        queryParams.push(args.status);
+      }
+      const whereClause = `WHERE ${conditions.join(" AND ")}`;
       const countResult = await this.#db.client.one(
-        `SELECT COUNT(*) as count FROM ${tableName} WHERE "experimentId" = $1`,
-        [args.experimentId]
+        `SELECT COUNT(*) as count FROM ${tableName} ${whereClause}`,
+        queryParams
       );
       const total = parseInt(countResult.count, 10);
       if (total === 0) {
@@ -5740,8 +5806,8 @@ var ExperimentsPG = class _ExperimentsPG extends ExperimentsStorage {
       const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
       const limitValue = perPageInput === false ? total : perPage;
       const rows = await this.#db.client.manyOrNone(
-        `SELECT * FROM ${tableName} WHERE "experimentId" = $1 ORDER BY "startedAt" ASC LIMIT $2 OFFSET $3`,
-        [args.experimentId, limitValue, offset]
+        `SELECT * FROM ${tableName} ${whereClause} ORDER BY "startedAt" ASC LIMIT $${paramIndex} OFFSET $${paramIndex + 1}`,
+        [...queryParams, limitValue, offset]
       );
       return {
         results: (rows || []).map((row) => this.transformExperimentResultRow(row)),