@mastra/upstash 0.0.0-zod-v4-compat-part-2-20250820135355 → 0.0.0-zod-v4-stuff-20250825154219

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export * from './storage';
-export * from './vector';
-export { UPSTASH_PROMPT } from './vector/prompt';
+export * from './storage/index.js';
+export * from './vector/index.js';
+export { UPSTASH_PROMPT } from './vector/prompt.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -2,6 +2,7 @@ import { MastraStorage, StoreOperations, TracesStorage, TABLE_TRACES, ScoresStor
 import { Redis } from '@upstash/redis';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import { MessageList } from '@mastra/core/agent';
+import { randomUUID } from 'crypto';
 import { MastraVector } from '@mastra/core/vector';
 import { Index } from '@upstash/vector';
 import { BaseFilterTranslator } from '@mastra/core/vector/filter';
@@ -250,6 +251,8 @@ function processRecord(tableName, record) {
     });
   } else if (tableName === TABLE_EVALS) {
     key = getKey(tableName, { id: record.run_id });
+  } else if (tableName === TABLE_SCORERS) {
+    key = getKey(tableName, { runId: record.runId });
   } else {
     key = getKey(tableName, { id: record.id });
   }
@@ -619,6 +622,15 @@ var StoreMemoryUpstash = class extends MemoryStorage {
     }
     return [];
   }
+  parseStoredMessage(storedMessage) {
+    const defaultMessageContent = { format: 2, parts: [{ type: "text", text: "" }] };
+    const { _index, ...rest } = storedMessage;
+    return {
+      ...rest,
+      createdAt: new Date(rest.createdAt),
+      content: rest.content || defaultMessageContent
+    };
+  }
   async getMessages({
     threadId,
     selectBy,
@@ -694,6 +706,40 @@ var StoreMemoryUpstash = class extends MemoryStorage {
       );
     }
   }
+  async getMessagesById({
+    messageIds,
+    format
+  }) {
+    if (messageIds.length === 0) return [];
+    try {
+      const threadKeys = await this.client.keys("thread:*");
+      const result = await Promise.all(
+        threadKeys.map((threadKey) => {
+          const threadId = threadKey.split(":")[1];
+          if (!threadId) throw new Error(`Failed to parse thread ID from thread key "${threadKey}"`);
+          return this.client.mget(
+            messageIds.map((id) => getMessageKey(threadId, id))
+          );
+        })
+      );
+      const rawMessages = result.flat(1).filter((msg) => !!msg);
+      const list = new MessageList().add(rawMessages.map(this.parseStoredMessage), "memory");
+      if (format === `v1`) return list.get.all.v1();
+      return list.get.all.v2();
+    } catch (error) {
+      throw new MastraError(
+        {
+          id: "STORAGE_UPSTASH_STORAGE_GET_MESSAGES_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          details: {
+            messageIds: JSON.stringify(messageIds)
+          }
+        },
+        error
+      );
+    }
+  }
   async getMessagesPaginated(args) {
     const { threadId, selectBy, format } = args;
     const { page = 0, perPage = 40, dateRange } = selectBy?.pagination || {};
@@ -1154,7 +1200,9 @@ function transformScoreRow(row) {
   return {
     ...row,
     scorer: parseField(row.scorer),
-    extractStepResult: parseField(row.extractStepResult),
+    preprocessStepResult: parseField(row.preprocessStepResult),
+    generateScorePrompt: row.generateScorePrompt,
+    generateReasonPrompt: row.generateReasonPrompt,
     analyzeStepResult: parseField(row.analyzeStepResult),
     metadata: parseField(row.metadata),
     input: parseField(row.input),
@@ -1196,6 +1244,9 @@ var ScoresUpstash = class extends ScoresStorage {
   }
   async getScoresByScorerId({
     scorerId,
+    entityId,
+    entityType,
+    source,
     pagination = { page: 0, perPage: 20 }
   }) {
     const pattern = `${TABLE_SCORERS}:*`;
@@ -1209,7 +1260,14 @@ var ScoresUpstash = class extends ScoresStorage {
     const pipeline = this.client.pipeline();
     keys.forEach((key) => pipeline.get(key));
     const results = await pipeline.exec();
-    const filtered = results.map((row) => row).filter((row) => !!row && typeof row === "object" && row.scorerId === scorerId);
+    const filtered = results.map((row) => row).filter((row) => {
+      if (!row || typeof row !== "object") return false;
+      if (row.scorerId !== scorerId) return false;
+      if (entityId && row.entityId !== entityId) return false;
+      if (entityType && row.entityType !== entityType) return false;
+      if (source && row.source !== source) return false;
+      return true;
+    });
     const total = filtered.length;
     const { page, perPage } = pagination;
     const start = page * perPage;
@@ -1762,6 +1820,12 @@ var UpstashStore = class extends MastraStorage {
   }) {
     return this.stores.memory.getMessages({ threadId, selectBy, format });
   }
+  async getMessagesById({
+    messageIds,
+    format
+  }) {
+    return this.stores.memory.getMessagesById({ messageIds, format });
+  }
   async getMessagesPaginated(args) {
     return this.stores.memory.getMessagesPaginated(args);
   }
@@ -1833,9 +1897,12 @@ var UpstashStore = class extends MastraStorage {
   }
   async getScoresByScorerId({
     scorerId,
-    pagination
+    pagination,
+    entityId,
+    entityType,
+    source
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId, pagination });
+    return this.stores.scores.getScoresByScorerId({ scorerId, pagination, entityId, entityType, source });
   }
 };
 var UpstashFilterTranslator = class extends BaseFilterTranslator {
@@ -2058,7 +2125,7 @@ var UpstashVector = class extends MastraVector {
     ids,
     sparseVectors
   }) {
-    const generatedIds = ids || vectors.map(() => crypto.randomUUID());
+    const generatedIds = ids || vectors.map(() => randomUUID());
     const points = vectors.map((vector, index) => ({
       id: generatedIds[index],
       vector,