@mastra/dynamodb 1.0.0-beta.10 → 1.0.0-beta.12

package/dist/index.js

@@ -1,7 +1,7 @@
 import { DynamoDBClient, DescribeTableCommand } from '@aws-sdk/client-dynamodb';
 import { DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MemoryStorage, createStorageErrorId, normalizePerPage, calculatePagination, filterByDateRange, ScoresStorage, SCORERS_SCHEMA, WorkflowsStorage, MastraStorage, TABLE_SCORERS, TABLE_WORKFLOW_SNAPSHOT, TABLE_RESOURCES, TABLE_MESSAGES, TABLE_THREADS } from '@mastra/core/storage';
+import { MemoryStorage, createStorageErrorId, normalizePerPage, calculatePagination, filterByDateRange, ScoresStorage, SCORERS_SCHEMA, WorkflowsStorage, MastraCompositeStore, TABLE_SCORERS, TABLE_WORKFLOW_SNAPSHOT, TABLE_RESOURCES, TABLE_MESSAGES, TABLE_THREADS } from '@mastra/core/storage';
 import { Entity, Service } from 'electrodb';
 import { MessageList } from '@mastra/core/agent';
 import { saveScorePayloadSchema } from '@mastra/core/evals';
@@ -1504,33 +1504,57 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       );
     }
   }
-  async listThreadsByResourceId(args) {
-    const { resourceId, page = 0, perPage: perPageInput, orderBy } = args;
-    const perPage = normalizePerPage(perPageInput, 100);
-    if (page < 0) {
+  async listThreads(args) {
+    const { page = 0, perPage: perPageInput, orderBy, filter } = args;
+    try {
+      this.validatePaginationInput(page, perPageInput ?? 100);
+    } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("DYNAMODB", "LIST_THREADS_BY_RESOURCE_ID", "INVALID_PAGE"),
+          id: createStorageErrorId("DYNAMODB", "LIST_THREADS", "INVALID_PAGE"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.USER,
-          details: { page }
+          details: {
+            page,
+            ...perPageInput !== void 0 && { perPage: perPageInput }
+          }
         },
-        new Error("page must be >= 0")
+        error instanceof Error ? error : new Error("Invalid pagination parameters")
       );
     }
+    const perPage = normalizePerPage(perPageInput, 100);
     const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
     const { field, direction } = this.parseOrderBy(orderBy);
-    this.logger.debug("Getting threads by resource ID with pagination", {
-      resourceId,
+    this.logger.debug("Listing threads with filters", {
+      resourceId: filter?.resourceId,
+      metadataKeys: filter?.metadata ? Object.keys(filter.metadata) : [],
       page,
       perPage,
       field,
       direction
     });
     try {
-      const query = this.service.entities.thread.query.byResource({ entity: "thread", resourceId });
-      const results = await query.go();
-      const allThreads = this.transformAndSortThreads(results.data, field, direction);
+      const rawThreads = filter?.resourceId ? (await this.service.entities.thread.query.byResource({
+        entity: "thread",
+        resourceId: filter.resourceId
+      }).go({ pages: "all" })).data : (await this.service.entities.thread.scan.go({ pages: "all" })).data;
+      let allThreads = this.transformAndSortThreads(rawThreads, field, direction);
+      if (filter?.metadata && Object.keys(filter.metadata).length > 0) {
+        allThreads = allThreads.filter((thread) => {
+          let threadMeta = null;
+          if (typeof thread.metadata === "string") {
+            try {
+              threadMeta = JSON.parse(thread.metadata);
+            } catch {
+              return false;
+            }
+          } else if (thread.metadata && typeof thread.metadata === "object") {
+            threadMeta = thread.metadata;
+          }
+          if (!threadMeta) return false;
+          return Object.entries(filter.metadata).every(([key, value]) => threadMeta[key] === value);
+        });
+      }
       const endIndex = offset + perPage;
       const paginatedThreads = allThreads.slice(offset, endIndex);
       const total = allThreads.length;
@@ -1545,10 +1569,15 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
     } catch (error) {
       throw new MastraError(
         {
-          id: createStorageErrorId("DYNAMODB", "LIST_THREADS_BY_RESOURCE_ID", "FAILED"),
+          id: createStorageErrorId("DYNAMODB", "LIST_THREADS", "FAILED"),
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { resourceId, page, perPage }
+          details: {
+            ...filter?.resourceId && { resourceId: filter.resourceId },
+            hasMetadataFilter: !!(filter?.metadata && Object.keys(filter.metadata).length),
+            page,
+            perPage: perPageForResponse
+          }
         },
         error
       );
@@ -2426,7 +2455,7 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
 var isClientConfig = (config) => {
   return "client" in config;
 };
-var DynamoDBStore = class extends MastraStorage {
+var DynamoDBStore = class extends MastraCompositeStore {
   tableName;
   client;
   service;