@mastra/cloudflare 0.11.5 → 0.11.7-alpha.0

package/dist/index.cjs

@@ -733,6 +733,41 @@ var MemoryStorageCloudflare = class extends storage.MemoryStorage {
       return [];
     }
   }
+  async getMessagesById({
+    messageIds,
+    format
+  }) {
+    if (messageIds.length === 0) return [];
+    try {
+      const messages = (await Promise.all(messageIds.map((id) => this.findMessageInAnyThread(id)))).filter(
+        (result) => !!result
+      );
+      const prepared = messages.map(({ _index, ...message }) => ({
+        ...message,
+        ...message.type !== `v2` && { type: message.type },
+        createdAt: storage.ensureDate(message.createdAt)
+      }));
+      const list = new agent.MessageList().add(prepared, "memory");
+      if (format === `v1`) return list.get.all.v1();
+      return list.get.all.v2();
+    } catch (error$1) {
+      const mastraError = new error.MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_MESSAGES_BY_ID_FAILED",
+          domain: error.ErrorDomain.STORAGE,
+          category: error.ErrorCategory.THIRD_PARTY,
+          text: `Error retrieving messages by ID`,
+          details: {
+            messageIds: JSON.stringify(messageIds)
+          }
+        },
+        error$1
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      return [];
+    }
+  }
   async getMessagesPaginated(args) {
     try {
       const { threadId, selectBy, format = "v1" } = args;
@@ -1535,18 +1570,17 @@ var StoreOperationsCloudflare = class extends storage.StoreOperations {
   }
 };
 function transformScoreRow(row) {
-  let input = void 0;
-  if (row.input) {
-    try {
-      input = JSON.parse(row.input);
-    } catch {
-      input = row.input;
-    }
-  }
-  return {
-    ...row,
-    input
-  };
+  const deserialized = { ...row };
+  deserialized.input = storage.safelyParseJSON(row.input);
+  deserialized.output = storage.safelyParseJSON(row.output);
+  deserialized.scorer = storage.safelyParseJSON(row.scorer);
+  deserialized.preprocessStepResult = storage.safelyParseJSON(row.preprocessStepResult);
+  deserialized.analyzeStepResult = storage.safelyParseJSON(row.analyzeStepResult);
+  deserialized.metadata = storage.safelyParseJSON(row.metadata);
+  deserialized.additionalContext = storage.safelyParseJSON(row.additionalContext);
+  deserialized.runtimeContext = storage.safelyParseJSON(row.runtimeContext);
+  deserialized.entity = storage.safelyParseJSON(row.entity);
+  return deserialized;
 }
 var ScoresStorageCloudflare = class extends storage.ScoresStorage {
   operations;
@@ -1578,6 +1612,7 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
   }
   async saveScore(score) {
     try {
+      const id = crypto.randomUUID();
       const { input, ...rest } = score;
       const serializedRecord = {};
       for (const [key, value] of Object.entries(rest)) {
@@ -1591,12 +1626,12 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
           serializedRecord[key] = null;
         }
       }
-      serializedRecord.input = JSON.stringify(input);
+      serializedRecord.id = id;
       serializedRecord.createdAt = (/* @__PURE__ */ new Date()).toISOString();
       serializedRecord.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       await this.operations.putKV({
         tableName: storage.TABLE_SCORERS,
-        key: score.id,
+        key: id,
         value: serializedRecord
       });
       const scoreFromDb = await this.getScoreById({ id: score.id });
@@ -1618,6 +1653,9 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
   }
   async getScoresByScorerId({
     scorerId,
+    entityId,
+    entityType,
+    source,
     pagination
   }) {
     try {
@@ -1625,6 +1663,15 @@ var ScoresStorageCloudflare = class extends storage.ScoresStorage {
       const scores = [];
       for (const { name: key } of keys) {
         const score = await this.operations.getKV(storage.TABLE_SCORERS, key);
+        if (entityId && score.entityId !== entityId) {
+          continue;
+        }
+        if (entityType && score.entityType !== entityType) {
+          continue;
+        }
+        if (source && score.source !== source) {
+          continue;
+        }
         if (score && score.scorerId === scorerId) {
           scores.push(transformScoreRow(score));
         }
@@ -2239,6 +2286,12 @@ var CloudflareStore = class extends storage.MastraStorage {
   }) {
     return this.stores.memory.getMessages({ threadId, resourceId, selectBy, format });
   }
+  async getMessagesById({
+    messageIds,
+    format
+  }) {
+    return this.stores.memory.getMessagesById({ messageIds, format });
+  }
   async persistWorkflowSnapshot(params) {
     return this.stores.workflows.persistWorkflowSnapshot(params);
   }
@@ -2329,9 +2382,12 @@ var CloudflareStore = class extends storage.MastraStorage {
   }
   async getScoresByScorerId({
     scorerId,
+    entityId,
+    entityType,
+    source,
     pagination
   }) {
-    return this.stores.scores.getScoresByScorerId({ scorerId, pagination });
+    return this.stores.scores.getScoresByScorerId({ scorerId, entityId, entityType, source, pagination });
   }
   async getResourceById({ resourceId }) {
     return this.stores.memory.getResourceById({ resourceId });