@mastra/mongodb 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/index.js

@@ -3,7 +3,7 @@ import { MastraVector } from '@mastra/core/vector';
 import { MongoClient } from 'mongodb';
 import { v4 } from 'uuid';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
-import { MastraStorage, StoreOperations, TABLE_SCHEMAS, safelyParseJSON, MemoryStorage, TABLE_MESSAGES, normalizePerPage, calculatePagination, TABLE_THREADS, TABLE_RESOURCES, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, ObservabilityStorage, TABLE_SPANS } from '@mastra/core/storage';
+import { MastraStorage, StoreOperations, TABLE_SCHEMAS, safelyParseJSON, MemoryStorage, TABLE_MESSAGES, normalizePerPage, calculatePagination, TABLE_THREADS, TABLE_RESOURCES, ScoresStorage, TABLE_SCORERS, WorkflowsStorage, TABLE_WORKFLOW_SNAPSHOT, ObservabilityStorage, TABLE_SPANS, transformScoreRow as transformScoreRow$1 } from '@mastra/core/storage';
 import { MessageList } from '@mastra/core/agent';
 import { saveScorePayloadSchema } from '@mastra/core/evals';
 
@@ -11,7 +11,7 @@ import { saveScorePayloadSchema } from '@mastra/core/evals';
 
 // package.json
 var package_default = {
-  version: "1.0.0-beta.2"};
+  version: "1.0.0-beta.3"};
 var MongoDBFilterTranslator = class extends BaseFilterTranslator {
   getSupportedOperators() {
     return {
@@ -836,8 +836,6 @@ var MongoDBConnector = class _MongoDBConnector {
     }
   }
 };
-
-// src/storage/domains/utils.ts
 function formatDateForMongoDB(date) {
   return typeof date === "string" ? new Date(date) : date;
 }
@@ -868,18 +866,16 @@ var MemoryStorageMongoDB = class extends MemoryStorage {
     if (row.type && row.type !== "v2") result.type = row.type;
     return result;
   }
-  async _getIncludedMessages({
-    threadId,
-    include
-  }) {
-    if (!threadId.trim()) throw new Error("threadId must be a non-empty string");
-    if (!include) return null;
+  async _getIncludedMessages({ include }) {
+    if (!include || include.length === 0) return null;
     const collection = await this.operations.getCollection(TABLE_MESSAGES);
     const includedMessages = [];
     for (const inc of include) {
       const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
-      const searchThreadId = inc.threadId || threadId;
-      const allMessages = await collection.find({ thread_id: searchThreadId }).sort({ createdAt: 1 }).toArray();
+      const targetMessage = await collection.findOne({ id });
+      if (!targetMessage) continue;
+      const messageThreadId = targetMessage.thread_id;
+      const allMessages = await collection.find({ thread_id: messageThreadId }).sort({ createdAt: 1 }).toArray();
       const targetIndex = allMessages.findIndex((msg) => msg.id === id);
       if (targetIndex === -1) continue;
       const startIndex = Math.max(0, targetIndex - withPreviousMessages);
@@ -920,15 +916,16 @@ var MemoryStorageMongoDB = 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_MONGODB_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")
       );
     }
     if (page < 0) {
@@ -948,7 +945,7 @@ var MemoryStorageMongoDB = class extends MemoryStorage {
       const { field, direction } = this.parseOrderBy(orderBy, "ASC");
       const sortOrder = direction === "ASC" ? 1 : -1;
       const collection = await this.operations.getCollection(TABLE_MESSAGES);
-      const query = { thread_id: threadId };
+      const query = { thread_id: threadIds.length === 1 ? threadIds[0] : { $in: threadIds } };
       if (resourceId) {
         query.resourceId = resourceId;
       }
@@ -980,7 +977,7 @@ var MemoryStorageMongoDB = class extends MemoryStorage {
       }
       const messageIds = new Set(messages.map((m) => m.id));
       if (include && include.length > 0) {
-        const includeMessages = await this._getIncludedMessages({ threadId, include });
+        const includeMessages = await this._getIncludedMessages({ include });
         if (includeMessages) {
           for (const includeMsg of includeMessages) {
             if (!messageIds.has(includeMsg.id)) {
@@ -1001,7 +998,10 @@ var MemoryStorageMongoDB = class extends MemoryStorage {
         }
         return direction === "ASC" ? String(aValue).localeCompare(String(bValue)) : String(bValue).localeCompare(String(aValue));
       });
-      const returnedThreadMessageIds = new Set(finalMessages.filter((m) => m.threadId === threadId).map((m) => m.id));
+      const threadIdSet = new Set(threadIds);
+      const returnedThreadMessageIds = new Set(
+        finalMessages.filter((m) => m.threadId && threadIdSet.has(m.threadId)).map((m) => m.id)
+      );
       const allThreadMessagesReturned = returnedThreadMessageIds.size >= total;
       const hasMore = perPageInput !== false && !allThreadMessagesReturned && offset + perPage < total;
       return {
@@ -1018,7 +1018,7 @@ var MemoryStorageMongoDB = class extends MemoryStorage {
           domain: ErrorDomain.STORAGE,
           category: ErrorCategory.THIRD_PARTY,
           details: {
-            threadId,
+            threadId: Array.isArray(threadId) ? threadId.join(",") : threadId,
             resourceId: resourceId ?? ""
           }
         },
@@ -1898,98 +1898,9 @@ var StoreOperationsMongoDB = class extends StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  let scorerValue = null;
-  if (row.scorer) {
-    try {
-      scorerValue = typeof row.scorer === "string" ? safelyParseJSON(row.scorer) : row.scorer;
-    } catch (e) {
-      console.warn("Failed to parse scorer:", e);
-    }
-  }
-  let preprocessStepResultValue = null;
-  if (row.preprocessStepResult) {
-    try {
-      preprocessStepResultValue = typeof row.preprocessStepResult === "string" ? safelyParseJSON(row.preprocessStepResult) : row.preprocessStepResult;
-    } catch (e) {
-      console.warn("Failed to parse preprocessStepResult:", e);
-    }
-  }
-  let analyzeStepResultValue = null;
-  if (row.analyzeStepResult) {
-    try {
-      analyzeStepResultValue = typeof row.analyzeStepResult === "string" ? safelyParseJSON(row.analyzeStepResult) : row.analyzeStepResult;
-    } catch (e) {
-      console.warn("Failed to parse analyzeStepResult:", e);
-    }
-  }
-  let inputValue = null;
-  if (row.input) {
-    try {
-      inputValue = typeof row.input === "string" ? safelyParseJSON(row.input) : row.input;
-    } catch (e) {
-      console.warn("Failed to parse input:", e);
-    }
-  }
-  let outputValue = null;
-  if (row.output) {
-    try {
-      outputValue = typeof row.output === "string" ? safelyParseJSON(row.output) : row.output;
-    } catch (e) {
-      console.warn("Failed to parse output:", e);
-    }
-  }
-  let entityValue = null;
-  if (row.entity) {
-    try {
-      entityValue = typeof row.entity === "string" ? safelyParseJSON(row.entity) : row.entity;
-    } catch (e) {
-      console.warn("Failed to parse entity:", e);
-    }
-  }
-  let requestContextValue = null;
-  if (row.requestContext) {
-    try {
-      requestContextValue = typeof row.requestContext === "string" ? safelyParseJSON(row.requestContext) : row.requestContext;
-    } catch (e) {
-      console.warn("Failed to parse requestContext:", e);
-    }
-  }
-  let metadataValue = null;
-  if (row.metadata) {
-    try {
-      metadataValue = typeof row.metadata === "string" ? safelyParseJSON(row.metadata) : row.metadata;
-    } catch (e) {
-      console.warn("Failed to parse metadata:", e);
-    }
-  }
-  return {
-    id: row.id,
-    entityId: row.entityId,
-    entityType: row.entityType,
-    scorerId: row.scorerId,
-    traceId: row.traceId,
-    spanId: row.spanId,
-    runId: row.runId,
-    scorer: scorerValue,
-    preprocessStepResult: preprocessStepResultValue,
-    preprocessPrompt: row.preprocessPrompt,
-    analyzeStepResult: analyzeStepResultValue,
-    generateScorePrompt: row.generateScorePrompt,
-    score: row.score,
-    analyzePrompt: row.analyzePrompt,
-    reasonPrompt: row.reasonPrompt,
-    metadata: metadataValue,
-    input: inputValue,
-    output: outputValue,
-    additionalContext: row.additionalContext,
-    requestContext: requestContextValue,
-    entity: entityValue,
-    source: row.source,
-    resourceId: row.resourceId,
-    threadId: row.threadId,
-    createdAt: new Date(row.createdAt),
-    updatedAt: new Date(row.updatedAt)
-  };
+  return transformScoreRow$1(row, {
+    convertTimestamps: true
+  });
 }
 var ScoresStorageMongoDB = class extends ScoresStorage {
   operations;
@@ -2034,36 +1945,29 @@ var ScoresStorageMongoDB = class extends ScoresStorage {
     try {
       const now = /* @__PURE__ */ new Date();
       const scoreId = `score-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
-      const scoreData = {
-        id: scoreId,
-        entityId: validatedScore.entityId,
-        entityType: validatedScore.entityType,
-        scorerId: validatedScore.scorerId,
-        traceId: validatedScore.traceId || "",
-        spanId: validatedScore.spanId || "",
-        runId: validatedScore.runId,
-        scorer: typeof validatedScore.scorer === "string" ? safelyParseJSON(validatedScore.scorer) : validatedScore.scorer,
-        preprocessStepResult: typeof validatedScore.preprocessStepResult === "string" ? safelyParseJSON(validatedScore.preprocessStepResult) : validatedScore.preprocessStepResult,
-        analyzeStepResult: typeof validatedScore.analyzeStepResult === "string" ? safelyParseJSON(validatedScore.analyzeStepResult) : 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" ? safelyParseJSON(validatedScore.input) : validatedScore.input,
-        output: typeof validatedScore.output === "string" ? safelyParseJSON(validatedScore.output) : validatedScore.output,
-        additionalContext: validatedScore.additionalContext,
-        requestContext: typeof validatedScore.requestContext === "string" ? safelyParseJSON(validatedScore.requestContext) : validatedScore.requestContext,
-        entity: typeof validatedScore.entity === "string" ? safelyParseJSON(validatedScore.entity) : validatedScore.entity,
-        source: validatedScore.source,
-        resourceId: validatedScore.resourceId || "",
-        threadId: validatedScore.threadId || "",
-        createdAt: now,
-        updatedAt: now
+      const scorer = typeof validatedScore.scorer === "string" ? safelyParseJSON(validatedScore.scorer) : validatedScore.scorer;
+      const preprocessStepResult = typeof validatedScore.preprocessStepResult === "string" ? safelyParseJSON(validatedScore.preprocessStepResult) : validatedScore.preprocessStepResult;
+      const analyzeStepResult = typeof validatedScore.analyzeStepResult === "string" ? safelyParseJSON(validatedScore.analyzeStepResult) : validatedScore.analyzeStepResult;
+      const input = typeof validatedScore.input === "string" ? safelyParseJSON(validatedScore.input) : validatedScore.input;
+      const output = typeof validatedScore.output === "string" ? safelyParseJSON(validatedScore.output) : validatedScore.output;
+      const requestContext = typeof validatedScore.requestContext === "string" ? safelyParseJSON(validatedScore.requestContext) : validatedScore.requestContext;
+      const entity = typeof validatedScore.entity === "string" ? safelyParseJSON(validatedScore.entity) : validatedScore.entity;
+      const createdAt = now;
+      const updatedAt = now;
+      const dataToSave = {
+        ...validatedScore,
+        scorer,
+        preprocessStepResult,
+        analyzeStepResult,
+        input,
+        output,
+        requestContext,
+        entity,
+        createdAt,
+        updatedAt
       };
       const collection = await this.operations.getCollection(TABLE_SCORERS);
-      await collection.insertOne(scoreData);
+      await collection.insertOne(dataToSave);
       const savedScore = {
         ...score,
         id: scoreId,