@mastra/opensearch 0.10.3-alpha.0 → 0.10.4-alpha.0

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/opensearch@0.10.3-alpha.0 build /home/runner/work/mastra/mastra/stores/opensearch
+> @mastra/opensearch@0.10.4-alpha.0 build /home/runner/work/mastra/mastra/stores/opensearch
 > 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.5.0
 TSC Build start
-TSC ⚡️ Build success in 9817ms
+TSC ⚡️ Build success in 9284ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/opensearch/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/stores/opensearch/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 11523ms
+DTS ⚡️ Build success in 10960ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 21.72 KB
-ESM ⚡️ Build success in 1043ms
-CJS dist/index.cjs 21.76 KB
-CJS ⚡️ Build success in 1048ms
+ESM dist/index.js 23.60 KB
+ESM ⚡️ Build success in 784ms
+CJS dist/index.cjs 23.81 KB
+CJS ⚡️ Build success in 784ms

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # @mastra/opensearch
 
+## 0.10.4-alpha.0
+
+### Patch Changes
+
+- 0e17048: Throw mastra errors in storage packages
+- Updated dependencies [d1baedb]
+- Updated dependencies [4d21bf2]
+- Updated dependencies [2097952]
+- Updated dependencies [4fb0cc2]
+- Updated dependencies [d2a7a31]
+- Updated dependencies [0e17048]
+  - @mastra/core@0.10.7-alpha.1
+
+## 0.10.3
+
+### Patch Changes
+
+- 63f6b7d: dependencies updates:
+  - Updated dependency [`@opensearch-project/opensearch@^3.5.1` ↗︎](https://www.npmjs.com/package/@opensearch-project/opensearch/v/3.5.1) (from `^3.4.0`, in `dependencies`)
+- Updated dependencies [63f6b7d]
+- Updated dependencies [12a95fc]
+- Updated dependencies [4b0f8a6]
+- Updated dependencies [51264a5]
+- Updated dependencies [8e6f677]
+- Updated dependencies [d70c420]
+- Updated dependencies [ee9af57]
+- Updated dependencies [36f1c36]
+- Updated dependencies [2a16996]
+- Updated dependencies [10d352e]
+- Updated dependencies [9589624]
+- Updated dependencies [53d3c37]
+- Updated dependencies [751c894]
+- Updated dependencies [577ce3a]
+- Updated dependencies [9260b3a]
+  - @mastra/core@0.10.6
+
 ## 0.10.3-alpha.0
 
 ### Patch Changes

package/dist/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var error = require('@mastra/core/error');
 var vector = require('@mastra/core/vector');
 var opensearch = require('@opensearch-project/opensearch');
 var filter = require('@mastra/core/vector/filter');
@@ -383,7 +384,13 @@ var OpenSearchVector = class extends vector.MastraVector {
    */
   async createIndex({ indexName, dimension, metric = "cosine" }) {
     if (!Number.isInteger(dimension) || dimension <= 0) {
-      throw new Error("Dimension must be a positive integer");
+      throw new error.MastraError({
+        id: "STORAGE_OPENSEARCH_VECTOR_CREATE_INDEX_INVALID_ARGS",
+        domain: error.ErrorDomain.STORAGE,
+        category: error.ErrorCategory.USER,
+        text: "Dimension must be a positive integer",
+        details: { indexName, dimension }
+      });
     }
     try {
       await this.client.indices.create({
@@ -408,14 +415,21 @@ var OpenSearchVector = class extends vector.MastraVector {
           }
         }
       });
-    } catch (error) {
-      const message = error?.message || error?.toString();
+    } catch (error$1) {
+      const message = error$1?.message || error$1?.toString();
       if (message && message.toLowerCase().includes("already exists")) {
         await this.validateExistingIndex(indexName, dimension, metric);
         return;
       }
-      console.error(`Failed to create index ${indexName}:`, error);
-      throw error;
+      throw new error.MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_CREATE_INDEX_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { indexName, dimension, metric }
+        },
+        error$1
+      );
     }
   }
   /**
@@ -428,9 +442,15 @@ var OpenSearchVector = class extends vector.MastraVector {
       const response = await this.client.cat.indices({ format: "json" });
       const indexes = response.body.map((record) => record.index).filter((index) => index !== void 0);
       return indexes;
-    } catch (error) {
-      console.error("Failed to list indexes:", error);
-      throw new Error(`Failed to list indexes: ${error.message}`);
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_LIST_INDEXES_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY
+        },
+        error$1
+      );
     }
   }
   /**
@@ -460,8 +480,18 @@ var OpenSearchVector = class extends vector.MastraVector {
   async deleteIndex({ indexName }) {
     try {
       await this.client.indices.delete({ index: indexName });
-    } catch (error) {
-      console.error(`Failed to delete index ${indexName}:`, error);
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_DELETE_INDEX_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { indexName }
+        },
+        error$1
+      );
+      this.logger?.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
     }
   }
   /**
@@ -476,31 +506,38 @@ var OpenSearchVector = class extends vector.MastraVector {
   async upsert({ indexName, vectors, metadata = [], ids }) {
     const vectorIds = ids || vectors.map(() => crypto.randomUUID());
     const operations = [];
-    const indexInfo = await this.describeIndex({ indexName });
-    this.validateVectorDimensions(vectors, indexInfo.dimension);
-    for (let i = 0; i < vectors.length; i++) {
-      const operation = {
-        index: {
-          _index: indexName,
-          _id: vectorIds[i]
-        }
-      };
-      const document = {
-        id: vectorIds[i],
-        embedding: vectors[i],
-        metadata: metadata[i] || {}
-      };
-      operations.push(operation);
-      operations.push(document);
-    }
     try {
+      const indexInfo = await this.describeIndex({ indexName });
+      this.validateVectorDimensions(vectors, indexInfo.dimension);
+      for (let i = 0; i < vectors.length; i++) {
+        const operation = {
+          index: {
+            _index: indexName,
+            _id: vectorIds[i]
+          }
+        };
+        const document = {
+          id: vectorIds[i],
+          embedding: vectors[i],
+          metadata: metadata[i] || {}
+        };
+        operations.push(operation);
+        operations.push(document);
+      }
       if (operations.length > 0) {
         await this.client.bulk({ body: operations, refresh: true });
       }
       return vectorIds;
-    } catch (error) {
-      console.error("Failed to upsert vectors:", error);
-      throw error;
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_UPSERT_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { indexName, vectorCount: vectors?.length || 0 }
+        },
+        error$1
+      );
     }
   }
   /**
@@ -544,9 +581,16 @@ var OpenSearchVector = class extends vector.MastraVector {
         };
       });
       return results;
-    } catch (error) {
-      console.error("Failed to query vectors:", error);
-      throw new Error(`Failed to query vectors for index ${indexName}: ${error.message}`);
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_QUERY_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { indexName, topK }
+        },
+        error$1
+      );
     }
   }
   /**
@@ -582,44 +626,68 @@ var OpenSearchVector = class extends vector.MastraVector {
    * @throws Will throw an error if no updates are provided or if the update operation fails.
    */
   async updateVector({ indexName, id, update }) {
-    if (!update.vector && !update.metadata) {
-      throw new Error("No updates provided");
-    }
+    let existingDoc;
     try {
-      const { body: existingDoc } = await this.client.get({
+      if (!update.vector && !update.metadata) {
+        throw new Error("No updates provided");
+      }
+      const { body } = await this.client.get({
         index: indexName,
         id
       }).catch(() => {
         throw new Error(`Document with ID ${id} not found in index ${indexName}`);
       });
-      if (!existingDoc || !existingDoc._source) {
+      if (!body || !body._source) {
         throw new Error(`Document with ID ${id} has no source data in index ${indexName}`);
       }
-      const source = existingDoc._source;
-      const updatedDoc = {
-        id: source.id || id
-      };
+      existingDoc = body;
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_UPDATE_VECTOR_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.USER,
+          details: { indexName, id }
+        },
+        error$1
+      );
+    }
+    const source = existingDoc._source;
+    const updatedDoc = {
+      id: source?.id || id
+    };
+    try {
       if (update.vector) {
+        console.log(`1`);
         const indexInfo = await this.describeIndex({ indexName });
+        console.log(`2`);
         this.validateVectorDimensions([update.vector], indexInfo.dimension);
         updatedDoc.embedding = update.vector;
-      } else if (source.embedding) {
+      } else if (source?.embedding) {
         updatedDoc.embedding = source.embedding;
       }
       if (update.metadata) {
         updatedDoc.metadata = update.metadata;
       } else {
-        updatedDoc.metadata = source.metadata || {};
+        updatedDoc.metadata = source?.metadata || {};
       }
+      console.log(`3`);
       await this.client.index({
         index: indexName,
         id,
         body: updatedDoc,
         refresh: true
       });
-    } catch (error) {
-      console.error(`Failed to update document with ID ${id} in index ${indexName}:`, error);
-      throw error;
+    } catch (error$1) {
+      throw new error.MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_UPDATE_VECTOR_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { indexName, id }
+        },
+        error$1
+      );
     }
   }
   /**
@@ -636,11 +704,19 @@ var OpenSearchVector = class extends vector.MastraVector {
         id,
         refresh: true
       });
-    } catch (error) {
-      console.error(`Failed to delete document with ID ${id} from index ${indexName}:`, error);
-      if (error && typeof error === "object" && "statusCode" in error && error.statusCode !== 404) {
-        throw error;
+    } catch (error$1) {
+      if (error$1 && typeof error$1 === "object" && "statusCode" in error$1 && error$1.statusCode === 404) {
+        return;
       }
+      throw new error.MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_DELETE_VECTOR_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          details: { indexName, id }
+        },
+        error$1
+      );
     }
   }
 };

package/dist/index.js

@@ -1,3 +1,4 @@
+import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import { MastraVector } from '@mastra/core/vector';
 import { Client } from '@opensearch-project/opensearch';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
@@ -381,7 +382,13 @@ var OpenSearchVector = class extends MastraVector {
    */
   async createIndex({ indexName, dimension, metric = "cosine" }) {
     if (!Number.isInteger(dimension) || dimension <= 0) {
-      throw new Error("Dimension must be a positive integer");
+      throw new MastraError({
+        id: "STORAGE_OPENSEARCH_VECTOR_CREATE_INDEX_INVALID_ARGS",
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: "Dimension must be a positive integer",
+        details: { indexName, dimension }
+      });
     }
     try {
       await this.client.indices.create({
@@ -412,8 +419,15 @@ var OpenSearchVector = class extends MastraVector {
         await this.validateExistingIndex(indexName, dimension, metric);
         return;
       }
-      console.error(`Failed to create index ${indexName}:`, error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_CREATE_INDEX_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName, dimension, metric }
+        },
+        error
+      );
     }
   }
   /**
@@ -427,8 +441,14 @@ var OpenSearchVector = class extends MastraVector {
       const indexes = response.body.map((record) => record.index).filter((index) => index !== void 0);
       return indexes;
     } catch (error) {
-      console.error("Failed to list indexes:", error);
-      throw new Error(`Failed to list indexes: ${error.message}`);
+      throw new MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_LIST_INDEXES_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY
+        },
+        error
+      );
     }
   }
   /**
@@ -459,7 +479,17 @@ var OpenSearchVector = class extends MastraVector {
     try {
       await this.client.indices.delete({ index: indexName });
     } catch (error) {
-      console.error(`Failed to delete index ${indexName}:`, error);
+      const mastraError = new MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_DELETE_INDEX_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName }
+        },
+        error
+      );
+      this.logger?.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
     }
   }
   /**
@@ -474,31 +504,38 @@ var OpenSearchVector = class extends MastraVector {
   async upsert({ indexName, vectors, metadata = [], ids }) {
     const vectorIds = ids || vectors.map(() => crypto.randomUUID());
     const operations = [];
-    const indexInfo = await this.describeIndex({ indexName });
-    this.validateVectorDimensions(vectors, indexInfo.dimension);
-    for (let i = 0; i < vectors.length; i++) {
-      const operation = {
-        index: {
-          _index: indexName,
-          _id: vectorIds[i]
-        }
-      };
-      const document = {
-        id: vectorIds[i],
-        embedding: vectors[i],
-        metadata: metadata[i] || {}
-      };
-      operations.push(operation);
-      operations.push(document);
-    }
     try {
+      const indexInfo = await this.describeIndex({ indexName });
+      this.validateVectorDimensions(vectors, indexInfo.dimension);
+      for (let i = 0; i < vectors.length; i++) {
+        const operation = {
+          index: {
+            _index: indexName,
+            _id: vectorIds[i]
+          }
+        };
+        const document = {
+          id: vectorIds[i],
+          embedding: vectors[i],
+          metadata: metadata[i] || {}
+        };
+        operations.push(operation);
+        operations.push(document);
+      }
       if (operations.length > 0) {
         await this.client.bulk({ body: operations, refresh: true });
       }
       return vectorIds;
     } catch (error) {
-      console.error("Failed to upsert vectors:", error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_UPSERT_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName, vectorCount: vectors?.length || 0 }
+        },
+        error
+      );
     }
   }
   /**
@@ -543,8 +580,15 @@ var OpenSearchVector = class extends MastraVector {
       });
       return results;
     } catch (error) {
-      console.error("Failed to query vectors:", error);
-      throw new Error(`Failed to query vectors for index ${indexName}: ${error.message}`);
+      throw new MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_QUERY_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName, topK }
+        },
+        error
+      );
     }
   }
   /**
@@ -580,35 +624,52 @@ var OpenSearchVector = class extends MastraVector {
    * @throws Will throw an error if no updates are provided or if the update operation fails.
    */
   async updateVector({ indexName, id, update }) {
-    if (!update.vector && !update.metadata) {
-      throw new Error("No updates provided");
-    }
+    let existingDoc;
     try {
-      const { body: existingDoc } = await this.client.get({
+      if (!update.vector && !update.metadata) {
+        throw new Error("No updates provided");
+      }
+      const { body } = await this.client.get({
         index: indexName,
         id
       }).catch(() => {
         throw new Error(`Document with ID ${id} not found in index ${indexName}`);
       });
-      if (!existingDoc || !existingDoc._source) {
+      if (!body || !body._source) {
         throw new Error(`Document with ID ${id} has no source data in index ${indexName}`);
       }
-      const source = existingDoc._source;
-      const updatedDoc = {
-        id: source.id || id
-      };
+      existingDoc = body;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_UPDATE_VECTOR_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { indexName, id }
+        },
+        error
+      );
+    }
+    const source = existingDoc._source;
+    const updatedDoc = {
+      id: source?.id || id
+    };
+    try {
       if (update.vector) {
+        console.log(`1`);
         const indexInfo = await this.describeIndex({ indexName });
+        console.log(`2`);
         this.validateVectorDimensions([update.vector], indexInfo.dimension);
         updatedDoc.embedding = update.vector;
-      } else if (source.embedding) {
+      } else if (source?.embedding) {
         updatedDoc.embedding = source.embedding;
       }
       if (update.metadata) {
         updatedDoc.metadata = update.metadata;
       } else {
-        updatedDoc.metadata = source.metadata || {};
+        updatedDoc.metadata = source?.metadata || {};
       }
+      console.log(`3`);
       await this.client.index({
         index: indexName,
         id,
@@ -616,8 +677,15 @@ var OpenSearchVector = class extends MastraVector {
         refresh: true
       });
     } catch (error) {
-      console.error(`Failed to update document with ID ${id} in index ${indexName}:`, error);
-      throw error;
+      throw new MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_UPDATE_VECTOR_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName, id }
+        },
+        error
+      );
     }
   }
   /**
@@ -635,10 +703,18 @@ var OpenSearchVector = class extends MastraVector {
         refresh: true
       });
     } catch (error) {
-      console.error(`Failed to delete document with ID ${id} from index ${indexName}:`, error);
-      if (error && typeof error === "object" && "statusCode" in error && error.statusCode !== 404) {
-        throw error;
+      if (error && typeof error === "object" && "statusCode" in error && error.statusCode === 404) {
+        return;
       }
+      throw new MastraError(
+        {
+          id: "STORAGE_OPENSEARCH_VECTOR_DELETE_VECTOR_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName, id }
+        },
+        error
+      );
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/opensearch",
-  "version": "0.10.3-alpha.0",
+  "version": "0.10.4-alpha.0",
   "description": "OpenSearch vector store provider for Mastra",
   "type": "module",
   "main": "dist/index.js",
@@ -28,8 +28,8 @@
     "tsup": "^8.5.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.3",
-    "@internal/lint": "0.0.12",
-    "@mastra/core": "0.10.6-alpha.0"
+    "@internal/lint": "0.0.13",
+    "@mastra/core": "0.10.7-alpha.1"
   },
   "peerDependencies": {
     "@mastra/core": ">=0.10.4-0 <0.11.0"

package/src/vector/index.ts

@@ -9,6 +9,7 @@ import type {
   UpdateVectorParams,
   UpsertVectorParams,
 } from '@mastra/core';
+import { MastraError, ErrorDomain, ErrorCategory } from '@mastra/core/error';
 import { MastraVector } from '@mastra/core/vector';
 import type { VectorFilter } from '@mastra/core/vector/filter';
 import { Client as OpenSearchClient } from '@opensearch-project/opensearch';
@@ -49,7 +50,13 @@ export class OpenSearchVector extends MastraVector {
    */
   async createIndex({ indexName, dimension, metric = 'cosine' }: CreateIndexParams): Promise<void> {
     if (!Number.isInteger(dimension) || dimension <= 0) {
-      throw new Error('Dimension must be a positive integer');
+      throw new MastraError({
+        id: 'STORAGE_OPENSEARCH_VECTOR_CREATE_INDEX_INVALID_ARGS',
+        domain: ErrorDomain.STORAGE,
+        category: ErrorCategory.USER,
+        text: 'Dimension must be a positive integer',
+        details: { indexName, dimension },
+      });
     }
 
     try {
@@ -82,8 +89,15 @@ export class OpenSearchVector extends MastraVector {
         await this.validateExistingIndex(indexName, dimension, metric);
         return;
       }
-      console.error(`Failed to create index ${indexName}:`, error);
-      throw error;
+      throw new MastraError(
+        {
+          id: 'STORAGE_OPENSEARCH_VECTOR_CREATE_INDEX_FAILED',
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName, dimension, metric },
+        },
+        error,
+      );
     }
   }
 
@@ -100,9 +114,15 @@ export class OpenSearchVector extends MastraVector {
         .filter((index: string | undefined) => index !== undefined);
 
       return indexes;
-    } catch (error: any) {
-      console.error('Failed to list indexes:', error);
-      throw new Error(`Failed to list indexes: ${error.message}`);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: 'STORAGE_OPENSEARCH_VECTOR_LIST_INDEXES_FAILED',
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+        },
+        error,
+      );
     }
   }
 
@@ -137,7 +157,17 @@ export class OpenSearchVector extends MastraVector {
     try {
       await this.client.indices.delete({ index: indexName });
     } catch (error) {
-      console.error(`Failed to delete index ${indexName}:`, error);
+      const mastraError = new MastraError(
+        {
+          id: 'STORAGE_OPENSEARCH_VECTOR_DELETE_INDEX_FAILED',
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName },
+        },
+        error,
+      );
+      this.logger?.error(mastraError.toString());
+      this.logger?.trackException(mastraError);
     }
   }
 
@@ -154,39 +184,46 @@ export class OpenSearchVector extends MastraVector {
     const vectorIds = ids || vectors.map(() => crypto.randomUUID());
     const operations = [];
 
-    // Get index stats to check dimension
-    const indexInfo = await this.describeIndex({ indexName });
+    try {
+      // Get index stats to check dimension
+      const indexInfo = await this.describeIndex({ indexName });
 
-    // Validate vector dimensions
-    this.validateVectorDimensions(vectors, indexInfo.dimension);
+      // Validate vector dimensions
+      this.validateVectorDimensions(vectors, indexInfo.dimension);
 
-    for (let i = 0; i < vectors.length; i++) {
-      const operation = {
-        index: {
-          _index: indexName,
-          _id: vectorIds[i],
-        },
-      };
+      for (let i = 0; i < vectors.length; i++) {
+        const operation = {
+          index: {
+            _index: indexName,
+            _id: vectorIds[i],
+          },
+        };
 
-      const document = {
-        id: vectorIds[i],
-        embedding: vectors[i],
-        metadata: metadata[i] || {},
-      };
+        const document = {
+          id: vectorIds[i],
+          embedding: vectors[i],
+          metadata: metadata[i] || {},
+        };
 
-      operations.push(operation);
-      operations.push(document);
-    }
+        operations.push(operation);
+        operations.push(document);
+      }
 
-    try {
       if (operations.length > 0) {
         await this.client.bulk({ body: operations, refresh: true });
       }
 
       return vectorIds;
     } catch (error) {
-      console.error('Failed to upsert vectors:', error);
-      throw error;
+      throw new MastraError(
+        {
+          id: 'STORAGE_OPENSEARCH_VECTOR_UPSERT_FAILED',
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName, vectorCount: vectors?.length || 0 },
+        },
+        error,
+      );
     }
   }
 
@@ -234,9 +271,16 @@ export class OpenSearchVector extends MastraVector {
       });
 
       return results;
-    } catch (error: any) {
-      console.error('Failed to query vectors:', error);
-      throw new Error(`Failed to query vectors for index ${indexName}: ${error.message}`);
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: 'STORAGE_OPENSEARCH_VECTOR_QUERY_FAILED',
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName, topK },
+        },
+        error,
+      );
     }
   }
 
@@ -275,13 +319,15 @@ export class OpenSearchVector extends MastraVector {
    * @throws Will throw an error if no updates are provided or if the update operation fails.
    */
   async updateVector({ indexName, id, update }: UpdateVectorParams): Promise<void> {
-    if (!update.vector && !update.metadata) {
-      throw new Error('No updates provided');
-    }
-
+    let existingDoc;
     try {
+      if (!update.vector && !update.metadata) {
+        throw new Error('No updates provided');
+      }
+
       // First get the current document to merge with updates
-      const { body: existingDoc } = await this.client
+      const { body } = await this.client
+
         .get({
           index: indexName,
           id: id,
@@ -290,25 +336,40 @@ export class OpenSearchVector extends MastraVector {
           throw new Error(`Document with ID ${id} not found in index ${indexName}`);
         });
 
-      if (!existingDoc || !existingDoc._source) {
+      if (!body || !body._source) {
         throw new Error(`Document with ID ${id} has no source data in index ${indexName}`);
       }
+      existingDoc = body;
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: 'STORAGE_OPENSEARCH_VECTOR_UPDATE_VECTOR_FAILED',
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.USER,
+          details: { indexName, id },
+        },
+        error,
+      );
+    }
 
-      const source = existingDoc._source;
-      const updatedDoc: Record<string, any> = {
-        id: source.id || id,
-      };
+    const source = existingDoc._source;
+    const updatedDoc: Record<string, any> = {
+      id: source?.id || id,
+    };
 
+    try {
       // Update vector if provided
       if (update.vector) {
         // Get index stats to check dimension
+        console.log(`1`);
         const indexInfo = await this.describeIndex({ indexName });
 
         // Validate vector dimensions
+        console.log(`2`);
         this.validateVectorDimensions([update.vector], indexInfo.dimension);
 
         updatedDoc.embedding = update.vector;
-      } else if (source.embedding) {
+      } else if (source?.embedding) {
         updatedDoc.embedding = source.embedding;
       }
 
@@ -316,10 +377,11 @@ export class OpenSearchVector extends MastraVector {
       if (update.metadata) {
         updatedDoc.metadata = update.metadata;
       } else {
-        updatedDoc.metadata = source.metadata || {};
+        updatedDoc.metadata = source?.metadata || {};
       }
 
       // Update the document
+      console.log(`3`);
       await this.client.index({
         index: indexName,
         id: id,
@@ -327,8 +389,15 @@ export class OpenSearchVector extends MastraVector {
         refresh: true,
       });
     } catch (error) {
-      console.error(`Failed to update document with ID ${id} in index ${indexName}:`, error);
-      throw error;
+      throw new MastraError(
+        {
+          id: 'STORAGE_OPENSEARCH_VECTOR_UPDATE_VECTOR_FAILED',
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName, id },
+        },
+        error,
+      );
     }
   }
 
@@ -347,11 +416,19 @@ export class OpenSearchVector extends MastraVector {
         refresh: true,
       });
     } catch (error: unknown) {
-      console.error(`Failed to delete document with ID ${id} from index ${indexName}:`, error);
-      // Don't throw error if document doesn't exist, just log it
-      if (error && typeof error === 'object' && 'statusCode' in error && error.statusCode !== 404) {
-        throw error;
+      // Don't throw error if document doesn't exist (404)
+      if (error && typeof error === 'object' && 'statusCode' in error && error.statusCode === 404) {
+        return;
       }
+      throw new MastraError(
+        {
+          id: 'STORAGE_OPENSEARCH_VECTOR_DELETE_VECTOR_FAILED',
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: { indexName, id },
+        },
+        error,
+      );
     }
   }
 }