@mastra/dynamodb 1.0.0-beta.8 → 1.0.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 { MemoryStorage, createStorageErrorId, normalizePerPage, calculatePagination, 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';
@@ -58,6 +58,25 @@ var baseAttributes = {
       }
       return value;
     }
+  },
+  /**
+   * TTL attribute for DynamoDB automatic item expiration.
+   * This is a Unix timestamp (epoch seconds) that indicates when the item should be deleted.
+   *
+   * Note: For TTL to work, you must enable TTL on your DynamoDB table
+   * specifying this attribute name (default: 'ttl').
+   */
+  ttl: {
+    type: "number",
+    required: false
+  },
+  /**
+   * Alternative TTL attribute with configurable name.
+   * Use this if you've configured TTL on your DynamoDB table with 'expiresAt' as the attribute name.
+   */
+  expiresAt: {
+    type: "number",
+    required: false
   }
 };
 
@@ -566,6 +585,28 @@ var scoreEntity = new Entity({
         return value;
       }
     },
+    metadata: {
+      type: "string",
+      required: false,
+      set: (value) => {
+        if (value && typeof value !== "string") {
+          return JSON.stringify(value);
+        }
+        return value;
+      },
+      get: (value) => {
+        if (value && typeof value === "string") {
+          try {
+            if (value.startsWith("{") || value.startsWith("[")) {
+              return JSON.parse(value);
+            }
+          } catch {
+            return value;
+          }
+        }
+        return value;
+      }
+    },
     requestContext: {
       type: "string",
       required: false,
@@ -939,7 +980,7 @@ function getElectroDbService(client, tableName) {
 }
 function resolveDynamoDBConfig(config) {
   if ("service" in config) {
-    return config.service;
+    return { service: config.service, ttl: config.ttl };
   }
   const dynamoClient = new DynamoDBClient({
     region: config.region || "us-east-1",
@@ -947,7 +988,36 @@ function resolveDynamoDBConfig(config) {
     credentials: config.credentials
   });
   const client = DynamoDBDocumentClient.from(dynamoClient);
-  return getElectroDbService(client, config.tableName);
+  return {
+    service: getElectroDbService(client, config.tableName),
+    ttl: config.ttl
+  };
+}
+
+// src/storage/ttl.ts
+function calculateTtl(entityName, ttlConfig, customTtlSeconds) {
+  const entityConfig = ttlConfig?.[entityName];
+  if (!entityConfig?.enabled) {
+    return void 0;
+  }
+  const ttlSeconds = customTtlSeconds ?? entityConfig.defaultTtlSeconds;
+  if (ttlSeconds === void 0 || ttlSeconds <= 0) {
+    return void 0;
+  }
+  return Math.floor(Date.now() / 1e3) + ttlSeconds;
+}
+function getTtlAttributeName(entityName, ttlConfig) {
+  const entityConfig = ttlConfig?.[entityName];
+  return entityConfig?.attributeName ?? "ttl";
+}
+function isTtlEnabled(entityName, ttlConfig) {
+  return ttlConfig?.[entityName]?.enabled === true;
+}
+function getTtlProps(entityName, ttlConfig, customTtlSeconds) {
+  const ttlValue = calculateTtl(entityName, ttlConfig, customTtlSeconds);
+  if (ttlValue === void 0) return {};
+  const attributeName = getTtlAttributeName(entityName, ttlConfig);
+  return { [attributeName]: ttlValue };
 }
 var ENTITY_MAP = {
   [TABLE_THREADS]: "thread",
@@ -995,9 +1065,12 @@ async function deleteTableData(service, tableName) {
 // src/storage/domains/memory/index.ts
 var MemoryStorageDynamoDB = class extends MemoryStorage {
   service;
+  ttlConfig;
   constructor(config) {
     super();
-    this.service = resolveDynamoDBConfig(config);
+    const resolved = resolveDynamoDBConfig(config);
+    this.service = resolved.service;
+    this.ttlConfig = resolved.ttl;
   }
   async dangerouslyClearAll() {
     await deleteTableData(this.service, TABLE_THREADS);
@@ -1108,7 +1181,8 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       title: thread.title || `Thread ${thread.id}`,
       createdAt: thread.createdAt?.toISOString() || now.toISOString(),
       updatedAt: thread.updatedAt?.toISOString() || now.toISOString(),
-      metadata: thread.metadata ? JSON.stringify(thread.metadata) : void 0
+      metadata: thread.metadata ? JSON.stringify(thread.metadata) : void 0,
+      ...getTtlProps("thread", this.ttlConfig)
     };
     try {
       await this.service.entities.thread.upsert(threadData).go();
@@ -1277,21 +1351,11 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       if (resourceId) {
         allThreadMessages = allThreadMessages.filter((msg) => msg.resourceId === resourceId);
       }
-      if (filter?.dateRange) {
-        const dateRange = filter.dateRange;
-        allThreadMessages = allThreadMessages.filter((msg) => {
-          const createdAt = new Date(msg.createdAt).getTime();
-          if (dateRange.start) {
-            const startTime = dateRange.start instanceof Date ? dateRange.start.getTime() : new Date(dateRange.start).getTime();
-            if (createdAt < startTime) return false;
-          }
-          if (dateRange.end) {
-            const endTime = dateRange.end instanceof Date ? dateRange.end.getTime() : new Date(dateRange.end).getTime();
-            if (createdAt > endTime) return false;
-          }
-          return true;
-        });
-      }
+      allThreadMessages = filterByDateRange(
+        allThreadMessages,
+        (msg) => new Date(msg.createdAt),
+        filter?.dateRange
+      );
       allThreadMessages.sort((a, b) => {
         const aValue = field === "createdAt" ? new Date(a.createdAt).getTime() : a[field];
         const bValue = field === "createdAt" ? new Date(b.createdAt).getTime() : b[field];
@@ -1385,20 +1449,18 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       const now = (/* @__PURE__ */ new Date()).toISOString();
       return {
         entity: "message",
-        // Add entity type
         id: msg.id,
         threadId: msg.threadId,
         role: msg.role,
         type: msg.type,
         resourceId: msg.resourceId,
-        // Ensure complex fields are stringified if not handled by attribute setters
         content: typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content),
         toolCallArgs: `toolCallArgs` in msg && msg.toolCallArgs ? JSON.stringify(msg.toolCallArgs) : void 0,
         toolCallIds: `toolCallIds` in msg && msg.toolCallIds ? JSON.stringify(msg.toolCallIds) : void 0,
         toolNames: `toolNames` in msg && msg.toolNames ? JSON.stringify(msg.toolNames) : void 0,
         createdAt: msg.createdAt instanceof Date ? msg.createdAt.toISOString() : msg.createdAt || now,
-        updatedAt: now
-        // Add updatedAt
+        updatedAt: now,
+        ...getTtlProps("message", this.ttlConfig)
       };
     });
     try {
@@ -1442,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;
@@ -1483,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
       );
@@ -1664,7 +1755,8 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       workingMemory: resource.workingMemory,
       metadata: resource.metadata ? JSON.stringify(resource.metadata) : void 0,
       createdAt: resource.createdAt?.toISOString() || now.toISOString(),
-      updatedAt: now.toISOString()
+      updatedAt: now.toISOString(),
+      ...getTtlProps("resource", this.ttlConfig)
     };
     try {
       await this.service.entities.resource.upsert(resourceData).go();
@@ -1739,9 +1831,12 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
 };
 var ScoresStorageDynamoDB = class extends ScoresStorage {
   service;
+  ttlConfig;
   constructor(config) {
     super();
-    this.service = resolveDynamoDBConfig(config);
+    const resolved = resolveDynamoDBConfig(config);
+    this.service = resolved.service;
+    this.ttlConfig = resolved.ttl;
   }
   async dangerouslyClearAll() {
     await deleteTableData(this.service, TABLE_SCORERS);
@@ -1820,6 +1915,8 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
     const output = typeof validatedScore.output === "string" ? validatedScore.output : JSON.stringify(validatedScore.output);
     const requestContext = typeof validatedScore.requestContext === "string" ? validatedScore.requestContext : JSON.stringify(validatedScore.requestContext);
     const entity = typeof validatedScore.entity === "string" ? validatedScore.entity : JSON.stringify(validatedScore.entity);
+    const metadata = typeof validatedScore.metadata === "string" ? validatedScore.metadata : validatedScore.metadata ? JSON.stringify(validatedScore.metadata) : void 0;
+    const additionalContext = typeof validatedScore.additionalContext === "string" ? validatedScore.additionalContext : validatedScore.additionalContext ? JSON.stringify(validatedScore.additionalContext) : void 0;
     const scoreData = Object.fromEntries(
       Object.entries({
         ...validatedScore,
@@ -1831,13 +1928,16 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
         input,
         output,
         requestContext,
+        metadata,
+        additionalContext,
         entityData: entity,
         traceId: validatedScore.traceId || "",
         resourceId: validatedScore.resourceId || "",
         threadId: validatedScore.threadId || "",
         spanId: validatedScore.spanId || "",
         createdAt: now.toISOString(),
-        updatedAt: now.toISOString()
+        updatedAt: now.toISOString(),
+        ...getTtlProps("score", this.ttlConfig)
       }).filter(([_, value]) => value !== void 0 && value !== null)
     );
     try {
@@ -2044,9 +2144,12 @@ function formatWorkflowRun(snapshotData) {
 }
 var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
   service;
+  ttlConfig;
   constructor(config) {
     super();
-    this.service = resolveDynamoDBConfig(config);
+    const resolved = resolveDynamoDBConfig(config);
+    this.service = resolved.service;
+    this.ttlConfig = resolved.ttl;
   }
   async dangerouslyClearAll() {
     await deleteTableData(this.service, TABLE_WORKFLOW_SNAPSHOT);
@@ -2136,13 +2239,13 @@ var WorkflowStorageDynamoDB = class extends WorkflowsStorage {
       const now = /* @__PURE__ */ new Date();
       const data = {
         entity: "workflow_snapshot",
-        // Add entity type
         workflow_name: workflowName,
         run_id: runId,
         snapshot: JSON.stringify(snapshot),
         createdAt: (createdAt ?? now).toISOString(),
         updatedAt: (updatedAt ?? now).toISOString(),
-        resourceId
+        resourceId,
+        ...getTtlProps("workflow_snapshot", this.ttlConfig)
       };
       await this.service.entities.workflow_snapshot.upsert(data).go();
     } catch (error) {
@@ -2352,10 +2455,11 @@ 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;
+  ttlConfig;
   hasInitialized = null;
   stores;
   constructor({ name, config }) {
@@ -2370,6 +2474,7 @@ var DynamoDBStore = class extends MastraStorage {
         );
       }
       this.tableName = config.tableName;
+      this.ttlConfig = config.ttl;
       if (isClientConfig(config)) {
         this.client = config.client;
       } else {
@@ -2381,7 +2486,7 @@ var DynamoDBStore = class extends MastraStorage {
         this.client = DynamoDBDocumentClient.from(dynamoClient);
       }
       this.service = getElectroDbService(this.client, this.tableName);
-      const domainConfig = { service: this.service };
+      const domainConfig = { service: this.service, ttl: this.ttlConfig };
       const workflows = new WorkflowStorageDynamoDB(domainConfig);
       const memory = new MemoryStorageDynamoDB(domainConfig);
       const scores = new ScoresStorageDynamoDB(domainConfig);
@@ -2491,6 +2596,6 @@ var DynamoDBStore = class extends MastraStorage {
   }
 };
 
-export { DynamoDBStore, MemoryStorageDynamoDB, ScoresStorageDynamoDB, WorkflowStorageDynamoDB };
+export { DynamoDBStore, MemoryStorageDynamoDB, ScoresStorageDynamoDB, WorkflowStorageDynamoDB, calculateTtl, getTtlAttributeName, getTtlProps, isTtlEnabled };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map