@mastra/dynamodb 1.1.3 → 1.2.0-alpha.0

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 { BackgroundTasksStorage, createStorageErrorId, MemoryStorage, normalizePerPage, calculatePagination, ScoresStorage, SCORERS_SCHEMA, WorkflowsStorage, MastraCompositeStore, TABLE_BACKGROUND_TASKS, TABLE_SCORERS, TABLE_WORKFLOW_SNAPSHOT, TABLE_RESOURCES, TABLE_MESSAGES, TABLE_THREADS } from '@mastra/core/storage';
+import { BackgroundTasksStorage, createStorageErrorId, MemoryStorage, validateStorageMetadataFilter, normalizePerPage, calculatePagination, storageMessageMatchesMetadataFilter, ScoresStorage, SCORERS_SCHEMA, WorkflowsStorage, MastraCompositeStore, TABLE_BACKGROUND_TASKS, 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';
@@ -1747,6 +1747,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
   }
   async listMessages(args) {
     const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
+    const metadataFilter = validateStorageMetadataFilter(filter?.metadata);
     const threadIds = Array.isArray(threadId) ? threadId : [threadId];
     if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
       throw new MastraError(
@@ -1836,19 +1837,24 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       let paginatedMessages = [];
       let total = 0;
       const filteredMessageIds = /* @__PURE__ */ new Set();
-      if (threadIds.length > 1) {
+      if (threadIds.length > 1 || metadataFilter) {
         const threadResults = await Promise.all(
           threadIds.map(async (tid) => {
             const q = applyQueryFilters(
               this.service.entities.message.query.byThread({ entity: "message", threadId: tid })
             );
-            const countResult = await q.go({ pages: "all", attributes: ["id"] });
             const results = await q.go({ pages: "all", order });
-            return { ids: countResult.data.map((item) => item.id), messages: parseQueryMessages(results.data) };
+            let messages = parseQueryMessages(results.data);
+            if (metadataFilter) {
+              messages = messages.filter(
+                (message) => storageMessageMatchesMetadataFilter(message.content, metadataFilter)
+              );
+            }
+            return { ids: messages.map((message) => message.id), messages };
           })
         );
-        for (const r of threadResults) {
-          for (const id of r.ids) filteredMessageIds.add(id);
+        for (const result of threadResults) {
+          for (const id of result.ids) filteredMessageIds.add(id);
         }
         total = threadResults.reduce((sum, r) => sum + r.ids.length, 0);
         const merged = threadResults.flatMap((r) => r.messages);
@@ -1895,10 +1901,9 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       let finalMessages = list.get.all.db();
       finalMessages = this._sortMessages(finalMessages, field, direction);
       const returnedFilteredMessageIds = new Set(
-        finalMessages.filter((m) => filteredMessageIds.has(m.id)).map((m) => m.id)
+        finalMessages.filter((message) => filteredMessageIds.has(message.id)).map((message) => message.id)
       );
-      const allFilteredMessagesReturned = returnedFilteredMessageIds.size >= total;
-      const hasMore = perPageInput !== false && !allFilteredMessagesReturned && offset + perPage < total;
+      const hasMore = perPageInput !== false && (metadataFilter || returnedFilteredMessageIds.size < total) && offset + perPage < total;
       return {
         messages: finalMessages,
         total,