@mastra/pg 1.34.0-alpha.1 → 1.34.0

package/dist/index.js

@@ -1080,42 +1080,43 @@ var PgVector = class extends MastraVector {
 			const scoreExpr = ops.scoreExpr(distanceExpr);
 			const filterClause = filterQuery.trim().replace(/^WHERE\s+/i, "");
 			const hasFilter = filterClause.length > 0;
-			const useIndexedOrder = indexInfo.type === "hnsw" && !hasFilter && minScore <= 0;
 			const namespaceParam = filterValues.length + 1;
-			const query = useIndexedOrder ? `
+			const queryValues = [...filterValues, namespace];
+			const selectColumns = `vector_id as id, ${scoreExpr} as score, metadata${includeVector ? ", embedding" : ""}`;
+			const whereClause = `WHERE namespace = $${namespaceParam}${filterClause ? ` AND (${filterClause})` : ""}`;
+			const useIndexedOrder = indexInfo.type === "hnsw" && (!hasFilter || this.supportsIterativeScan());
+			let rows;
+			if (useIndexedOrder) {
+				const indexedQuery = `
         WITH vector_scores AS (
-          SELECT
-            vector_id as id,
-            ${scoreExpr} as score,
-            metadata
-            ${includeVector ? ", embedding" : ""}
+          SELECT ${selectColumns}
           FROM ${tableName}
-          WHERE namespace = $${namespaceParam}
+          ${whereClause}
           ORDER BY ${distanceExpr}
           LIMIT $2
         )
-        SELECT *
+        SELECT *, score > $1 AS above_min_score
         FROM vector_scores
-        WHERE score > $1
-        ORDER BY score DESC` : `
+        ORDER BY score DESC`;
+				const candidates = (await client.query(indexedQuery, queryValues)).rows;
+				if (candidates.length >= topK) rows = candidates.filter((row) => row.above_min_score);
+			}
+			if (!rows) {
+				const exactQuery = `
         WITH vector_scores AS (
-          SELECT
-            vector_id as id,
-            ${scoreExpr} as score,
-            metadata
-            ${includeVector ? ", embedding" : ""}
+          SELECT ${selectColumns}
           FROM ${tableName}
-          WHERE namespace = $${namespaceParam}
-          ${filterClause ? `AND (${filterClause})` : ""}
+          ${whereClause}
         )
         SELECT *
         FROM vector_scores
         WHERE score > $1
         ORDER BY score DESC
         LIMIT $2`;
-			const result = await client.query(query, [...filterValues, namespace]);
+				rows = (await client.query(exactQuery, queryValues)).rows;
+			}
 			await client.query("COMMIT");
-			return result.rows.map(({ id, score, metadata, embedding }) => ({
+			return rows.map(({ id, score, metadata, embedding }) => ({
 				id,
 				score,
 				metadata,
@@ -1382,7 +1383,7 @@ var PgVector = class extends MastraVector {
 					indexConfig,
 					vectorType
 				}, client);
-				if (metadataIndexes?.length) await this.createMetadataIndexes(tableName, indexName, metadataIndexes);
+				if (metadataIndexes?.length) await this.createMetadataIndexes(client, tableName, indexName, metadataIndexes);
 			} catch (error) {
 				this.createdIndexes.delete(indexName);
 				this.namespaceReadyIndexes.delete(indexName);
@@ -1532,13 +1533,13 @@ var PgVector = class extends MastraVector {
 			await client.query(indexSQL);
 		});
 	}
-	async createMetadataIndexes(tableName, indexName, metadataFields) {
+	async createMetadataIndexes(client, tableName, indexName, metadataFields) {
 		const hasher = await this.hasher;
 		for (const field of metadataFields) {
 			const fieldHash = hasher.h32(field).toString(16);
 			const metadataIdxName = `"${indexName.slice(0, 55 - fieldHash.length)}_md_${fieldHash}_idx"`;
 			const escapedField = field.replace(/'/g, "''");
-			await this.pool.query(`
+			await client.query(`
         CREATE INDEX CONCURRENTLY IF NOT EXISTS ${metadataIdxName}
         ON ${tableName} ((metadata->>'${escapedField}'))
       `);