@mastra/pg 0.2.6-alpha.3 → 0.2.6-alpha.4

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/pg@0.2.6-alpha.3 build /home/runner/work/mastra/mastra/stores/pg
+> @mastra/pg@0.2.6-alpha.4 build /home/runner/work/mastra/mastra/stores/pg
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.4.0
 TSC Build start
-TSC ⚡️ Build success in 10734ms
+TSC ⚡️ Build success in 10085ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.2
 Writing package typings: /home/runner/work/mastra/mastra/stores/pg/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.2
 Writing package typings: /home/runner/work/mastra/mastra/stores/pg/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 11829ms
+DTS ⚡️ Build success in 10753ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-CJS dist/index.cjs 36.78 KB
-CJS ⚡️ Build success in 1386ms
-ESM dist/index.js 36.37 KB
-ESM ⚡️ Build success in 1387ms
+ESM dist/index.js 36.43 KB
+ESM ⚡️ Build success in 1230ms
+CJS dist/index.cjs 36.85 KB
+CJS ⚡️ Build success in 1230ms

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @mastra/pg
 
+## 0.2.6-alpha.4
+
+### Patch Changes
+
+- e91bee7: Added helper method for both createindex and buildIndex
+
 ## 0.2.6-alpha.3
 
 ### Patch Changes

package/dist/_tsup-dts-rollup.d.cts

@@ -211,6 +211,7 @@ declare class PgVector extends MastraVector {
      */
     defineIndex(indexName: string, metric: "cosine" | "euclidean" | "dotproduct" | undefined, indexConfig: IndexConfig): Promise<void>;
     buildIndex(...args: ParamsToArgs<PgDefineIndexParams> | PgDefineIndexArgs): Promise<void>;
+    private setupIndex;
     listIndexes(): Promise<string[]>;
     describeIndex(indexName: string): Promise<PGIndexStats>;
     deleteIndex(indexName: string): Promise<void>;

package/dist/_tsup-dts-rollup.d.ts

@@ -211,6 +211,7 @@ declare class PgVector extends MastraVector {
      */
     defineIndex(indexName: string, metric: "cosine" | "euclidean" | "dotproduct" | undefined, indexConfig: IndexConfig): Promise<void>;
     buildIndex(...args: ParamsToArgs<PgDefineIndexParams> | PgDefineIndexArgs): Promise<void>;
+    private setupIndex;
     listIndexes(): Promise<string[]>;
     describeIndex(indexName: string): Promise<PGIndexStats>;
     deleteIndex(indexName: string): Promise<void>;

package/dist/index.cjs

@@ -454,7 +454,7 @@ var PgVector = class extends vector.MastraVector {
         await client.query("SELECT pg_advisory_unlock($1)", [lockId]);
       }
       if (buildIndex) {
-        await this.buildIndex({ indexName, metric, indexConfig });
+        await this.setupIndex({ indexName, metric, indexConfig }, client);
       }
     } catch (error) {
       console.error("Failed to create vector table:", error);
@@ -477,38 +477,44 @@ var PgVector = class extends vector.MastraVector {
     const { indexName, metric = "cosine", indexConfig } = params;
     const client = await this.pool.connect();
     try {
-      const hash = crypto$1.createHash("sha256").update("build:" + indexName).digest("hex");
-      const lockId = BigInt("0x" + hash.slice(0, 8)) % BigInt(2 ** 31);
-      const acquired = await client.query("SELECT pg_try_advisory_lock($1)", [lockId]);
-      if (!acquired.rows[0].pg_try_advisory_lock) {
-        const exists = await client.query(
-          `
+      await this.setupIndex({ indexName, metric, indexConfig }, client);
+    } finally {
+      client.release();
+    }
+  }
+  async setupIndex({ indexName, metric, indexConfig }, client) {
+    const hash = crypto$1.createHash("sha256").update("build:" + indexName).digest("hex");
+    const lockId = BigInt("0x" + hash.slice(0, 8)) % BigInt(2 ** 31);
+    const acquired = await client.query("SELECT pg_try_advisory_lock($1)", [lockId]);
+    if (!acquired.rows[0].pg_try_advisory_lock) {
+      const exists = await client.query(
+        `
             SELECT 1 FROM pg_class c 
             JOIN pg_namespace n ON n.oid = c.relnamespace
             WHERE c.relname = $1 
             AND n.nspname = 'public'
           `,
-          [`${indexName}_vector_idx`]
-        );
-        if (exists.rows.length > 0) {
-          console.log(`Index ${indexName}_vector_idx already exists, skipping creation`);
-          this.indexCache.delete(indexName);
-          return;
-        }
-        await client.query("SELECT pg_advisory_lock($1)", [lockId]);
+        [`${indexName}_vector_idx`]
+      );
+      if (exists.rows.length > 0) {
+        console.log(`Index ${indexName}_vector_idx already exists, skipping creation`);
+        this.indexCache.delete(indexName);
+        return;
       }
-      try {
-        await client.query(`DROP INDEX IF EXISTS ${indexName}_vector_idx`);
-        if (indexConfig.type === "flat") {
-          this.indexCache.delete(indexName);
-          return;
-        }
-        const metricOp = metric === "cosine" ? "vector_cosine_ops" : metric === "euclidean" ? "vector_l2_ops" : "vector_ip_ops";
-        let indexSQL;
-        if (indexConfig.type === "hnsw") {
-          const m = indexConfig.hnsw?.m ?? 8;
-          const efConstruction = indexConfig.hnsw?.efConstruction ?? 32;
-          indexSQL = `
+      await client.query("SELECT pg_advisory_lock($1)", [lockId]);
+    }
+    try {
+      await client.query(`DROP INDEX IF EXISTS ${indexName}_vector_idx`);
+      if (indexConfig.type === "flat") {
+        this.indexCache.delete(indexName);
+        return;
+      }
+      const metricOp = metric === "cosine" ? "vector_cosine_ops" : metric === "euclidean" ? "vector_l2_ops" : "vector_ip_ops";
+      let indexSQL;
+      if (indexConfig.type === "hnsw") {
+        const m = indexConfig.hnsw?.m ?? 8;
+        const efConstruction = indexConfig.hnsw?.efConstruction ?? 32;
+        indexSQL = `
           CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx 
           ON ${indexName} 
           USING hnsw (embedding ${metricOp})
@@ -517,28 +523,25 @@ var PgVector = class extends vector.MastraVector {
             ef_construction = ${efConstruction}
           )
         `;
+      } else {
+        let lists;
+        if (indexConfig.ivf?.lists) {
+          lists = indexConfig.ivf.lists;
         } else {
-          let lists;
-          if (indexConfig.ivf?.lists) {
-            lists = indexConfig.ivf.lists;
-          } else {
-            const size = (await client.query(`SELECT COUNT(*) FROM ${indexName}`)).rows[0].count;
-            lists = Math.max(100, Math.min(4e3, Math.floor(Math.sqrt(size) * 2)));
-          }
-          indexSQL = `
+          const size = (await client.query(`SELECT COUNT(*) FROM ${indexName}`)).rows[0].count;
+          lists = Math.max(100, Math.min(4e3, Math.floor(Math.sqrt(size) * 2)));
+        }
+        indexSQL = `
           CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx
           ON ${indexName}
           USING ivfflat (embedding ${metricOp})
           WITH (lists = ${lists});
         `;
-        }
-        await client.query(indexSQL);
-        this.indexCache.delete(indexName);
-      } finally {
-        await client.query("SELECT pg_advisory_unlock($1)", [lockId]);
       }
+      await client.query(indexSQL);
+      this.indexCache.delete(indexName);
     } finally {
-      client.release();
+      await client.query("SELECT pg_advisory_unlock($1)", [lockId]);
     }
   }
   async listIndexes() {

package/dist/index.js

@@ -447,7 +447,7 @@ var PgVector = class extends MastraVector {
         await client.query("SELECT pg_advisory_unlock($1)", [lockId]);
       }
       if (buildIndex) {
-        await this.buildIndex({ indexName, metric, indexConfig });
+        await this.setupIndex({ indexName, metric, indexConfig }, client);
       }
     } catch (error) {
       console.error("Failed to create vector table:", error);
@@ -470,38 +470,44 @@ var PgVector = class extends MastraVector {
     const { indexName, metric = "cosine", indexConfig } = params;
     const client = await this.pool.connect();
     try {
-      const hash = createHash("sha256").update("build:" + indexName).digest("hex");
-      const lockId = BigInt("0x" + hash.slice(0, 8)) % BigInt(2 ** 31);
-      const acquired = await client.query("SELECT pg_try_advisory_lock($1)", [lockId]);
-      if (!acquired.rows[0].pg_try_advisory_lock) {
-        const exists = await client.query(
-          `
+      await this.setupIndex({ indexName, metric, indexConfig }, client);
+    } finally {
+      client.release();
+    }
+  }
+  async setupIndex({ indexName, metric, indexConfig }, client) {
+    const hash = createHash("sha256").update("build:" + indexName).digest("hex");
+    const lockId = BigInt("0x" + hash.slice(0, 8)) % BigInt(2 ** 31);
+    const acquired = await client.query("SELECT pg_try_advisory_lock($1)", [lockId]);
+    if (!acquired.rows[0].pg_try_advisory_lock) {
+      const exists = await client.query(
+        `
             SELECT 1 FROM pg_class c 
             JOIN pg_namespace n ON n.oid = c.relnamespace
             WHERE c.relname = $1 
             AND n.nspname = 'public'
           `,
-          [`${indexName}_vector_idx`]
-        );
-        if (exists.rows.length > 0) {
-          console.log(`Index ${indexName}_vector_idx already exists, skipping creation`);
-          this.indexCache.delete(indexName);
-          return;
-        }
-        await client.query("SELECT pg_advisory_lock($1)", [lockId]);
+        [`${indexName}_vector_idx`]
+      );
+      if (exists.rows.length > 0) {
+        console.log(`Index ${indexName}_vector_idx already exists, skipping creation`);
+        this.indexCache.delete(indexName);
+        return;
       }
-      try {
-        await client.query(`DROP INDEX IF EXISTS ${indexName}_vector_idx`);
-        if (indexConfig.type === "flat") {
-          this.indexCache.delete(indexName);
-          return;
-        }
-        const metricOp = metric === "cosine" ? "vector_cosine_ops" : metric === "euclidean" ? "vector_l2_ops" : "vector_ip_ops";
-        let indexSQL;
-        if (indexConfig.type === "hnsw") {
-          const m = indexConfig.hnsw?.m ?? 8;
-          const efConstruction = indexConfig.hnsw?.efConstruction ?? 32;
-          indexSQL = `
+      await client.query("SELECT pg_advisory_lock($1)", [lockId]);
+    }
+    try {
+      await client.query(`DROP INDEX IF EXISTS ${indexName}_vector_idx`);
+      if (indexConfig.type === "flat") {
+        this.indexCache.delete(indexName);
+        return;
+      }
+      const metricOp = metric === "cosine" ? "vector_cosine_ops" : metric === "euclidean" ? "vector_l2_ops" : "vector_ip_ops";
+      let indexSQL;
+      if (indexConfig.type === "hnsw") {
+        const m = indexConfig.hnsw?.m ?? 8;
+        const efConstruction = indexConfig.hnsw?.efConstruction ?? 32;
+        indexSQL = `
           CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx 
           ON ${indexName} 
           USING hnsw (embedding ${metricOp})
@@ -510,28 +516,25 @@ var PgVector = class extends MastraVector {
             ef_construction = ${efConstruction}
           )
         `;
+      } else {
+        let lists;
+        if (indexConfig.ivf?.lists) {
+          lists = indexConfig.ivf.lists;
         } else {
-          let lists;
-          if (indexConfig.ivf?.lists) {
-            lists = indexConfig.ivf.lists;
-          } else {
-            const size = (await client.query(`SELECT COUNT(*) FROM ${indexName}`)).rows[0].count;
-            lists = Math.max(100, Math.min(4e3, Math.floor(Math.sqrt(size) * 2)));
-          }
-          indexSQL = `
+          const size = (await client.query(`SELECT COUNT(*) FROM ${indexName}`)).rows[0].count;
+          lists = Math.max(100, Math.min(4e3, Math.floor(Math.sqrt(size) * 2)));
+        }
+        indexSQL = `
           CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx
           ON ${indexName}
           USING ivfflat (embedding ${metricOp})
           WITH (lists = ${lists});
         `;
-        }
-        await client.query(indexSQL);
-        this.indexCache.delete(indexName);
-      } finally {
-        await client.query("SELECT pg_advisory_unlock($1)", [lockId]);
       }
+      await client.query(indexSQL);
+      this.indexCache.delete(indexName);
     } finally {
-      client.release();
+      await client.query("SELECT pg_advisory_unlock($1)", [lockId]);
     }
   }
   async listIndexes() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/pg",
-  "version": "0.2.6-alpha.3",
+  "version": "0.2.6-alpha.4",
   "description": "Postgres provider for Mastra - includes both vector and db storage capabilities",
   "type": "module",
   "main": "dist/index.js",

package/src/vector/index.ts

@@ -262,7 +262,7 @@ export class PgVector extends MastraVector {
       }
 
       if (buildIndex) {
-        await this.buildIndex({ indexName, metric, indexConfig });
+        await this.setupIndex({ indexName, metric, indexConfig }, client);
       }
     } catch (error: any) {
       console.error('Failed to create vector table:', error);
@@ -293,52 +293,59 @@ export class PgVector extends MastraVector {
 
     const client = await this.pool.connect();
     try {
-      // Use a different hash prefix for buildIndex locks to avoid conflicts with createIndex
-      const hash = createHash('sha256')
-        .update('build:' + indexName)
-        .digest('hex');
-      const lockId = BigInt('0x' + hash.slice(0, 8)) % BigInt(2 ** 31);
-      const acquired = await client.query('SELECT pg_try_advisory_lock($1)', [lockId]);
+      await this.setupIndex({ indexName, metric, indexConfig }, client);
+    } finally {
+      client.release();
+    }
+  }
 
-      if (!acquired.rows[0].pg_try_advisory_lock) {
-        // Check if index already exists
-        const exists = await client.query(
-          `
+  private async setupIndex({ indexName, metric, indexConfig }: PgDefineIndexParams, client: pg.PoolClient) {
+    // Use a different hash prefix for buildIndex locks to avoid conflicts with createIndex
+    const hash = createHash('sha256')
+      .update('build:' + indexName)
+      .digest('hex');
+    const lockId = BigInt('0x' + hash.slice(0, 8)) % BigInt(2 ** 31);
+    const acquired = await client.query('SELECT pg_try_advisory_lock($1)', [lockId]);
+
+    if (!acquired.rows[0].pg_try_advisory_lock) {
+      // Check if index already exists
+      const exists = await client.query(
+        `
             SELECT 1 FROM pg_class c 
             JOIN pg_namespace n ON n.oid = c.relnamespace
             WHERE c.relname = $1 
             AND n.nspname = 'public'
           `,
-          [`${indexName}_vector_idx`],
-        );
-
-        if (exists.rows.length > 0) {
-          console.log(`Index ${indexName}_vector_idx already exists, skipping creation`);
-          this.indexCache.delete(indexName); // Still clear cache since we checked
-          return;
-        }
+        [`${indexName}_vector_idx`],
+      );
 
-        // Index doesn't exist, wait for lock
-        await client.query('SELECT pg_advisory_lock($1)', [lockId]);
+      if (exists.rows.length > 0) {
+        console.log(`Index ${indexName}_vector_idx already exists, skipping creation`);
+        this.indexCache.delete(indexName); // Still clear cache since we checked
+        return;
       }
 
-      try {
-        await client.query(`DROP INDEX IF EXISTS ${indexName}_vector_idx`);
+      // Index doesn't exist, wait for lock
+      await client.query('SELECT pg_advisory_lock($1)', [lockId]);
+    }
 
-        if (indexConfig.type === 'flat') {
-          this.indexCache.delete(indexName);
-          return;
-        }
+    try {
+      await client.query(`DROP INDEX IF EXISTS ${indexName}_vector_idx`);
+
+      if (indexConfig.type === 'flat') {
+        this.indexCache.delete(indexName);
+        return;
+      }
 
-        const metricOp =
-          metric === 'cosine' ? 'vector_cosine_ops' : metric === 'euclidean' ? 'vector_l2_ops' : 'vector_ip_ops';
+      const metricOp =
+        metric === 'cosine' ? 'vector_cosine_ops' : metric === 'euclidean' ? 'vector_l2_ops' : 'vector_ip_ops';
 
-        let indexSQL: string;
-        if (indexConfig.type === 'hnsw') {
-          const m = indexConfig.hnsw?.m ?? 8;
-          const efConstruction = indexConfig.hnsw?.efConstruction ?? 32;
+      let indexSQL: string;
+      if (indexConfig.type === 'hnsw') {
+        const m = indexConfig.hnsw?.m ?? 8;
+        const efConstruction = indexConfig.hnsw?.efConstruction ?? 32;
 
-          indexSQL = `
+        indexSQL = `
           CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx 
           ON ${indexName} 
           USING hnsw (embedding ${metricOp})
@@ -347,29 +354,26 @@ export class PgVector extends MastraVector {
             ef_construction = ${efConstruction}
           )
         `;
+      } else {
+        let lists: number;
+        if (indexConfig.ivf?.lists) {
+          lists = indexConfig.ivf.lists;
         } else {
-          let lists: number;
-          if (indexConfig.ivf?.lists) {
-            lists = indexConfig.ivf.lists;
-          } else {
-            const size = (await client.query(`SELECT COUNT(*) FROM ${indexName}`)).rows[0].count;
-            lists = Math.max(100, Math.min(4000, Math.floor(Math.sqrt(size) * 2)));
-          }
-          indexSQL = `
+          const size = (await client.query(`SELECT COUNT(*) FROM ${indexName}`)).rows[0].count;
+          lists = Math.max(100, Math.min(4000, Math.floor(Math.sqrt(size) * 2)));
+        }
+        indexSQL = `
           CREATE INDEX IF NOT EXISTS ${indexName}_vector_idx
           ON ${indexName}
           USING ivfflat (embedding ${metricOp})
           WITH (lists = ${lists});
         `;
-        }
-
-        await client.query(indexSQL);
-        this.indexCache.delete(indexName);
-      } finally {
-        await client.query('SELECT pg_advisory_unlock($1)', [lockId]);
       }
+
+      await client.query(indexSQL);
+      this.indexCache.delete(indexName);
     } finally {
-      client.release();
+      await client.query('SELECT pg_advisory_unlock($1)', [lockId]);
     }
   }