Skip to content

armgit / eve

Public Imported from GitHub
0

The Open Framework for Building Agents

Revert "fix(eve): memory - normalize weak Blob ETags" (#2935)

Andrew Barbaeafe5cacc89b
diff --git a/.changeset/fix-file-memory-weak-etags.md b/.changeset/fix-file-memory-weak-etags.md
deleted file mode 100644
index 5903e98b1..000000000
--- a/.changeset/fix-file-memory-weak-etags.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"eve": patch
----
-
-Fix Vercel Blob file memory getting stuck in conflict retries after CDN compression returns a weak ETag. File memory now uses the underlying Blob object ETag for conditional writes, so documents continue saving as they grow.
diff --git a/packages/eve/src/public/memory/file/backends/vercel-blob.test.ts b/packages/eve/src/public/memory/file/backends/vercel-blob.test.ts
index f5ecd5623..e4254e982 100644
--- a/packages/eve/src/public/memory/file/backends/vercel-blob.test.ts
+++ b/packages/eve/src/public/memory/file/backends/vercel-blob.test.ts
@@ -104,31 +104,6 @@ describe("Vercel Blob file-memory backend", () => {
});
});
- it("uses the underlying Blob ETag when CDN compression weakens the response validator", async () => {
- const content = "x".repeat(1_025);
- vi.mocked(get).mockResolvedValue(getBlobResult(content, 'W/"etag-current"'));
- vi.mocked(put).mockResolvedValue(putBlobResult('"etag-next"'));
- const backend = vercelBlob();
-
- const document = await backend.read({ key: "mem_a", signal });
- expect(document).toEqual({ content, version: '"etag-current"' });
- if (document === null) throw new Error("Expected a memory document.");
-
- await expect(
- backend.write({
- content: `${content} next`,
- expectedVersion: document.version,
- key: "mem_a",
- signal,
- }),
- ).resolves.toEqual({ content: `${content} next`, version: '"etag-next"' });
- expect(put).toHaveBeenCalledWith(
- "eve/memory/file/mem_a/MEMORY.md",
- `${content} next`,
- expect.objectContaining({ ifMatch: '"etag-current"' }),
- );
- });
-
it("normalizes conditional and duplicate-create failures", async () => {
const backend = vercelBlob();
vi.mocked(put).mockRejectedValueOnce(new BlobPreconditionFailedError());
diff --git a/packages/eve/src/public/memory/file/backends/vercel-blob.ts b/packages/eve/src/public/memory/file/backends/vercel-blob.ts
index 7b0849a22..5177db75c 100644
--- a/packages/eve/src/public/memory/file/backends/vercel-blob.ts
+++ b/packages/eve/src/public/memory/file/backends/vercel-blob.ts
@@ -40,10 +40,7 @@ export function vercelBlob(options: VercelBlobBackendOptions = {}): MemoryDocume
if (result.statusCode !== 200 || result.stream === null) {
throw new Error(`Vercel Blob returned ${result.statusCode} without a memory document.`);
}
- return {
- content: await new Response(result.stream).text(),
- version: normalizeBlobEtag(result.blob.etag),
- };
+ return { content: await new Response(result.stream).text(), version: result.blob.etag };
};
return {
@@ -85,12 +82,6 @@ function normalizePrefix(value: string): string {
return prefix;
}
-function normalizeBlobEtag(etag: string): string {
- // The CDN weakens the same object ETag when it compresses a response, but
- // Blob conditional writes require the underlying strong validator.
- return etag.startsWith("W/") ? etag.slice(2) : etag;
-}
-
function pathname(prefix: string, key: string): string {
return `${prefix}/${encodeURIComponent(key)}/MEMORY.md`;
}