@mastra/cloudflare 0.11.5 → 0.11.7-alpha.0

package/dist/index.js

@@ -1,5 +1,5 @@
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
-import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_EVALS, TABLE_SCORERS, TABLE_TRACES, StoreOperations, serializeDate, ensureDate, LegacyEvalsStorage, WorkflowsStorage, TracesStorage, MemoryStorage, resolveMessageLimit, TABLE_RESOURCES, ScoresStorage } from '@mastra/core/storage';
+import { MastraStorage, TABLE_THREADS, TABLE_MESSAGES, TABLE_WORKFLOW_SNAPSHOT, TABLE_EVALS, TABLE_SCORERS, TABLE_TRACES, StoreOperations, serializeDate, ensureDate, LegacyEvalsStorage, WorkflowsStorage, TracesStorage, MemoryStorage, resolveMessageLimit, TABLE_RESOURCES, ScoresStorage, safelyParseJSON } from '@mastra/core/storage';
 import Cloudflare from 'cloudflare';
 import { MessageList } from '@mastra/core/agent';
 
@@ -727,6 +727,41 @@ var MemoryStorageCloudflare = class extends 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: ensureDate(message.createdAt)
+      }));
+      const list = new MessageList().add(prepared, "memory");
+      if (format === `v1`) return list.get.all.v1();
+      return list.get.all.v2();
+    } catch (error) {
+      const mastraError = new MastraError(
+        {
+          id: "CLOUDFLARE_STORAGE_GET_MESSAGES_BY_ID_FAILED",
+          domain: ErrorDomain.STORAGE,
+          category: ErrorCategory.THIRD_PARTY,
+          text: `Error retrieving messages by ID`,
+          details: {
+            messageIds: JSON.stringify(messageIds)
+          }
+        },
+        error
+      );
+      this.logger?.trackException(mastraError);
+      this.logger?.error(mastraError.toString());
+      return [];
+    }
+  }
   async getMessagesPaginated(args) {
     try {
       const { threadId, selectBy, format = "v1" } = args;
@@ -1529,18 +1564,17 @@ var StoreOperationsCloudflare = class extends 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 = safelyParseJSON(row.input);
+  deserialized.output = safelyParseJSON(row.output);
+  deserialized.scorer = safelyParseJSON(row.scorer);
+  deserialized.preprocessStepResult = safelyParseJSON(row.preprocessStepResult);
+  deserialized.analyzeStepResult = safelyParseJSON(row.analyzeStepResult);
+  deserialized.metadata = safelyParseJSON(row.metadata);
+  deserialized.additionalContext = safelyParseJSON(row.additionalContext);
+  deserialized.runtimeContext = safelyParseJSON(row.runtimeContext);
+  deserialized.entity = safelyParseJSON(row.entity);
+  return deserialized;
 }
 var ScoresStorageCloudflare = class extends ScoresStorage {
   operations;
@@ -1572,6 +1606,7 @@ var ScoresStorageCloudflare = class extends ScoresStorage {
   }
   async saveScore(score) {
     try {
+      const id = crypto.randomUUID();
       const { input, ...rest } = score;
       const serializedRecord = {};
       for (const [key, value] of Object.entries(rest)) {
@@ -1585,12 +1620,12 @@ var ScoresStorageCloudflare = class extends 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: TABLE_SCORERS,
-        key: score.id,
+        key: id,
         value: serializedRecord
       });
       const scoreFromDb = await this.getScoreById({ id: score.id });
@@ -1612,6 +1647,9 @@ var ScoresStorageCloudflare = class extends ScoresStorage {
   }
   async getScoresByScorerId({
     scorerId,
+    entityId,
+    entityType,
+    source,
     pagination
   }) {
     try {
@@ -1619,6 +1657,15 @@ var ScoresStorageCloudflare = class extends ScoresStorage {
       const scores = [];
       for (const { name: key } of keys) {
         const score = await this.operations.getKV(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));
         }
@@ -2233,6 +2280,12 @@ var CloudflareStore = class extends 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);
   }
@@ -2323,9 +2376,12 @@ var CloudflareStore = class extends 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 });