@mastra/dynamodb 1.0.0-beta.1 → 1.0.0-beta.2

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 { MastraStorage, StoreOperations, WorkflowsStorage, normalizePerPage, MemoryStorage, calculatePagination, ScoresStorage, TABLE_SPANS, TABLE_RESOURCES, TABLE_TRACES, TABLE_SCORERS, TABLE_WORKFLOW_SNAPSHOT, TABLE_MESSAGES, TABLE_THREADS } from '@mastra/core/storage';
+import { MastraStorage, StoreOperations, WorkflowsStorage, normalizePerPage, MemoryStorage, calculatePagination, ScoresStorage, SCORERS_SCHEMA, TABLE_SPANS, TABLE_RESOURCES, TABLE_TRACES, TABLE_SCORERS, TABLE_WORKFLOW_SNAPSHOT, 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';
@@ -423,6 +423,10 @@ var scoreEntity = new Entity({
         return value;
       }
     },
+    preprocessPrompt: {
+      type: "string",
+      required: false
+    },
     preprocessStepResult: {
       type: "string",
       required: false,
@@ -1128,15 +1132,16 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
   }
   async listMessages(args) {
     const { threadId, resourceId, include, filter, perPage: perPageInput, page = 0, orderBy } = args;
-    if (!threadId.trim()) {
+    const threadIds = Array.isArray(threadId) ? threadId : [threadId];
+    if (threadIds.length === 0 || threadIds.some((id) => !id.trim())) {
       throw new MastraError(
         {
           id: "STORAGE_DYNAMODB_LIST_MESSAGES_INVALID_THREAD_ID",
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
-          details: { threadId }
+          details: { threadId: Array.isArray(threadId) ? threadId.join(",") : threadId }
         },
-        new Error("threadId must be a non-empty string")
+        new Error("threadId must be a non-empty string or array of non-empty strings")
       );
     }
     const perPage = normalizePerPage(perPageInput, 40);
@@ -1209,7 +1214,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
       let includeMessages = [];
       if (include && include.length > 0) {
         const selectBy = { include };
-        includeMessages = await this._getIncludedMessages(threadId, selectBy);
+        includeMessages = await this._getIncludedMessages(selectBy);
         for (const includeMsg of includeMessages) {
           if (!messageIds.has(includeMsg.id)) {
             paginatedMessages.push(includeMsg);
@@ -1247,7 +1252,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
             resourceId: resourceId ?? ""
           }
         },
@@ -1386,19 +1391,23 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
     }
   }
   // Helper method to get included messages with context
-  async _getIncludedMessages(threadId, selectBy) {
-    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
+  async _getIncludedMessages(selectBy) {
     if (!selectBy?.include?.length) {
       return [];
     }
     const includeMessages = [];
     for (const includeItem of selectBy.include) {
       try {
-        const { id, threadId: targetThreadId, withPreviousMessages = 0, withNextMessages = 0 } = includeItem;
-        const searchThreadId = targetThreadId || threadId;
+        const { id, withPreviousMessages = 0, withNextMessages = 0 } = includeItem;
+        const targetResult = await this.service.entities.message.get({ entity: "message", id }).go();
+        if (!targetResult.data) {
+          this.logger.warn("Target message not found", { id });
+          continue;
+        }
+        const targetMessageData = targetResult.data;
+        const searchThreadId = targetMessageData.threadId;
         this.logger.debug("Getting included messages for", {
           id,
-          targetThreadId,
           searchThreadId,
           withPreviousMessages,
           withNextMessages
@@ -1421,7 +1430,7 @@ var MemoryStorageDynamoDB = class extends MemoryStorage {
         });
         const targetIndex = allMessages.findIndex((msg) => msg.id === id);
         if (targetIndex === -1) {
-          this.logger.warn("Target message not found", { id, threadId: searchThreadId });
+          this.logger.warn("Target message not found in thread", { id, threadId: searchThreadId });
           continue;
         }
         this.logger.debug("Found target message at index", { id, targetIndex, totalMessages: allMessages.length });
@@ -1954,14 +1963,28 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
     super();
     this.service = service;
   }
-  // Helper function to parse score data (handle JSON fields)
+  /**
+   * DynamoDB-specific score row transformation.
+   *
+   * Note: This implementation does NOT use coreTransformScoreRow because:
+   * 1. ElectroDB already parses JSON fields via its entity getters
+   * 2. DynamoDB stores empty strings for null values (which need special handling)
+   * 3. 'entity' is a reserved ElectroDB key, so we use 'entityData' column
+   */
   parseScoreData(data) {
+    const result = {};
+    for (const key of Object.keys(SCORERS_SCHEMA)) {
+      if (["traceId", "resourceId", "threadId", "spanId"].includes(key)) {
+        result[key] = data[key] === "" ? null : data[key];
+        continue;
+      }
+      result[key] = data[key];
+    }
+    result.entity = data.entityData ?? null;
     return {
-      ...data,
-      // Convert date strings back to Date objects for consistency
+      ...result,
       createdAt: data.createdAt ? new Date(data.createdAt) : /* @__PURE__ */ new Date(),
       updatedAt: data.updatedAt ? new Date(data.updatedAt) : /* @__PURE__ */ new Date()
-      // JSON fields are already transformed by the entity's getters
     };
   }
   async getScoreById({ id }) {
@@ -2000,35 +2023,33 @@ var ScoresStorageDynamoDB = class extends ScoresStorage {
     }
     const now = /* @__PURE__ */ new Date();
     const scoreId = `score-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-    const scoreData = {
-      entity: "score",
-      id: scoreId,
-      scorerId: validatedScore.scorerId,
-      traceId: validatedScore.traceId || "",
-      spanId: validatedScore.spanId || "",
-      runId: validatedScore.runId,
-      scorer: typeof validatedScore.scorer === "string" ? validatedScore.scorer : JSON.stringify(validatedScore.scorer),
-      preprocessStepResult: typeof validatedScore.preprocessStepResult === "string" ? validatedScore.preprocessStepResult : JSON.stringify(validatedScore.preprocessStepResult),
-      analyzeStepResult: typeof validatedScore.analyzeStepResult === "string" ? validatedScore.analyzeStepResult : JSON.stringify(validatedScore.analyzeStepResult),
-      score: validatedScore.score,
-      reason: validatedScore.reason,
-      preprocessPrompt: validatedScore.preprocessPrompt,
-      generateScorePrompt: validatedScore.generateScorePrompt,
-      generateReasonPrompt: validatedScore.generateReasonPrompt,
-      analyzePrompt: validatedScore.analyzePrompt,
-      input: typeof validatedScore.input === "string" ? validatedScore.input : JSON.stringify(validatedScore.input),
-      output: typeof validatedScore.output === "string" ? validatedScore.output : JSON.stringify(validatedScore.output),
-      additionalContext: typeof validatedScore.additionalContext === "string" ? validatedScore.additionalContext : JSON.stringify(validatedScore.additionalContext),
-      requestContext: typeof validatedScore.requestContext === "string" ? validatedScore.requestContext : JSON.stringify(validatedScore.requestContext),
-      entityType: validatedScore.entityType,
-      entityData: typeof validatedScore.entity === "string" ? validatedScore.entity : JSON.stringify(validatedScore.entity),
-      entityId: validatedScore.entityId,
-      source: validatedScore.source,
-      resourceId: validatedScore.resourceId || "",
-      threadId: validatedScore.threadId || "",
-      createdAt: now.toISOString(),
-      updatedAt: now.toISOString()
-    };
+    const scorer = typeof validatedScore.scorer === "string" ? validatedScore.scorer : JSON.stringify(validatedScore.scorer);
+    const preprocessStepResult = typeof validatedScore.preprocessStepResult === "string" ? validatedScore.preprocessStepResult : JSON.stringify(validatedScore.preprocessStepResult);
+    const analyzeStepResult = typeof validatedScore.analyzeStepResult === "string" ? validatedScore.analyzeStepResult : JSON.stringify(validatedScore.analyzeStepResult);
+    const input = typeof validatedScore.input === "string" ? validatedScore.input : JSON.stringify(validatedScore.input);
+    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 scoreData = Object.fromEntries(
+      Object.entries({
+        ...validatedScore,
+        entity: "score",
+        id: scoreId,
+        scorer,
+        preprocessStepResult,
+        analyzeStepResult,
+        input,
+        output,
+        requestContext,
+        entityData: entity,
+        traceId: validatedScore.traceId || "",
+        resourceId: validatedScore.resourceId || "",
+        threadId: validatedScore.threadId || "",
+        spanId: validatedScore.spanId || "",
+        createdAt: now.toISOString(),
+        updatedAt: now.toISOString()
+      }).filter(([_, value]) => value !== void 0 && value !== null)
+    );
     try {
       await this.service.entities.score.upsert(scoreData).go();
       const savedScore = {