art-dag/celery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add COMPOUND node handling and fix cache lookups by code-addressed hash

Browse Source 
- Add COMPOUND node handling in execute_recipe for collapsed effect chains
- Index cache entries by node_id (cache_id) when different from IPFS CID
- Fix test_cache_manager.py to unpack put() tuple returns

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
gilesb
2026-01-13 01:47:20 +00:00
parent d08fbfc0bd
commit 6c4b850487
3 changed files with 105 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/test_cache_manager.py
View File

@@ -134,7 +134,7 @@ class TestL1CacheManagerStorage:
"""Can store and retrieve by content hash."""
test_file = create_test_file(temp_dir / "input.txt", "hello world")
cached = manager.put(test_file, node_type="test")
cached, cid = manager.put(test_file, node_type="test")
retrieved_path = manager.get_by_cid(cached.cid)
assert retrieved_path is not None
@@ -144,7 +144,7 @@ class TestL1CacheManagerStorage:
"""Can store with custom node_id."""
test_file = create_test_file(temp_dir / "input.txt", "content")
cached = manager.put(test_file, node_id="custom-node-123", node_type="test")
cached, cid = manager.put(test_file, node_id="custom-node-123", node_type="test")
assert cached.node_id == "custom-node-123"
assert manager.get_by_node_id("custom-node-123") is not None
@@ -153,7 +153,7 @@ class TestL1CacheManagerStorage:
"""has_content checks existence."""
test_file = create_test_file(temp_dir / "input.txt", "data")
cached = manager.put(test_file, node_type="test")
cached, cid = manager.put(test_file, node_type="test")
assert manager.has_content(cached.cid) is True
assert manager.has_content("nonexistent") is False
@@ -174,8 +174,8 @@ class TestL1CacheManagerStorage:
f1 = create_test_file(temp_dir / "f1.txt", "identical")
f2 = create_test_file(temp_dir / "f2.txt", "identical")
cached1 = manager.put(f1, node_type="test")
cached2 = manager.put(f2, node_type="test")
cached1, cid1 = manager.put(f1, node_type="test")
cached2, cid2 = manager.put(f2, node_type="test")
assert cached1.cid == cached2.cid
assert len(manager.list_all()) == 1
@@ -189,8 +189,8 @@ class TestL1CacheManagerActivities:
input_file = create_test_file(temp_dir / "input.txt", "input")
output_file = create_test_file(temp_dir / "output.txt", "output")
input_cached = manager.put(input_file, node_type="source")
output_cached = manager.put(output_file, node_type="effect")
input_cached, _ = manager.put(input_file, node_type="source")
output_cached, _ = manager.put(output_file, node_type="effect")
activity = manager.record_simple_activity(
input_hashes=[input_cached.cid],
@@ -207,8 +207,8 @@ class TestL1CacheManagerActivities:
for i in range(3):
inp = create_test_file(temp_dir / f"in{i}.txt", f"input{i}")
out = create_test_file(temp_dir / f"out{i}.txt", f"output{i}")
inp_c = manager.put(inp, node_type="source")
out_c = manager.put(out, node_type="effect")
inp_c, _ = manager.put(inp, node_type="source")
out_c, _ = manager.put(out, node_type="effect")
manager.record_simple_activity([inp_c.cid], out_c.cid)
activities = manager.list_activities()
@@ -217,13 +217,13 @@ class TestL1CacheManagerActivities:
def test_find_activities_by_inputs(self, manager, temp_dir):
"""Can find activities with same inputs."""
input_file = create_test_file(temp_dir / "shared_input.txt", "shared")
input_cached = manager.put(input_file, node_type="source")
input_cached, _ = manager.put(input_file, node_type="source")
# Two activities with same input
out1 = create_test_file(temp_dir / "out1.txt", "output1")
out2 = create_test_file(temp_dir / "out2.txt", "output2")
out1_c = manager.put(out1, node_type="effect")
out2_c = manager.put(out2, node_type="effect")
out1_c, _ = manager.put(out1, node_type="effect")
out2_c, _ = manager.put(out2, node_type="effect")
manager.record_simple_activity([input_cached.cid], out1_c.cid, "run1")
manager.record_simple_activity([input_cached.cid], out2_c.cid, "run2")
@@ -238,7 +238,7 @@ class TestL1CacheManagerDeletionRules:
def test_can_delete_orphaned_item(self, manager, temp_dir):
"""Orphaned items can be deleted."""
test_file = create_test_file(temp_dir / "orphan.txt", "orphan")
cached = manager.put(test_file, node_type="test")
cached, _ = manager.put(test_file, node_type="test")
can_delete, reason = manager.can_delete(cached.cid)
assert can_delete is True
@@ -248,8 +248,8 @@ class TestL1CacheManagerDeletionRules:
input_file = create_test_file(temp_dir / "input.txt", "input")
output_file = create_test_file(temp_dir / "output.txt", "output")
input_cached = manager.put(input_file, node_type="source")
output_cached = manager.put(output_file, node_type="effect")
input_cached, _ = manager.put(input_file, node_type="source")
output_cached, _ = manager.put(output_file, node_type="effect")
manager.record_simple_activity(
[input_cached.cid],
@@ -265,8 +265,8 @@ class TestL1CacheManagerDeletionRules:
input_file = create_test_file(temp_dir / "input.txt", "input")
output_file = create_test_file(temp_dir / "output.txt", "output")
input_cached = manager.put(input_file, node_type="source")
output_cached = manager.put(output_file, node_type="effect")
input_cached, _ = manager.put(input_file, node_type="source")
output_cached, _ = manager.put(output_file, node_type="effect")
manager.record_simple_activity(
[input_cached.cid],
@@ -280,7 +280,7 @@ class TestL1CacheManagerDeletionRules:
def test_cannot_delete_pinned_item(self, manager, temp_dir):
"""Pinned items cannot be deleted."""
test_file = create_test_file(temp_dir / "shared.txt", "shared")
cached = manager.put(test_file, node_type="test")
cached, _ = manager.put(test_file, node_type="test")
# Mark as pinned (published)
manager.pin(cached.cid, reason="published")
@@ -292,7 +292,7 @@ class TestL1CacheManagerDeletionRules:
def test_delete_orphaned_item(self, manager, temp_dir):
"""Can delete orphaned items."""
test_file = create_test_file(temp_dir / "orphan.txt", "orphan")
cached = manager.put(test_file, node_type="test")
cached, _ = manager.put(test_file, node_type="test")
success, msg = manager.delete_by_cid(cached.cid)
@@ -304,8 +304,8 @@ class TestL1CacheManagerDeletionRules:
input_file = create_test_file(temp_dir / "input.txt", "input")
output_file = create_test_file(temp_dir / "output.txt", "output")
input_cached = manager.put(input_file, node_type="source")
output_cached = manager.put(output_file, node_type="effect")
input_cached, _ = manager.put(input_file, node_type="source")
output_cached, _ = manager.put(output_file, node_type="effect")
manager.record_simple_activity(
[input_cached.cid],
@@ -326,8 +326,8 @@ class TestL1CacheManagerActivityDiscard:
input_file = create_test_file(temp_dir / "input.txt", "input")
output_file = create_test_file(temp_dir / "output.txt", "output")
input_cached = manager.put(input_file, node_type="source")
output_cached = manager.put(output_file, node_type="effect")
input_cached, _ = manager.put(input_file, node_type="source")
output_cached, _ = manager.put(output_file, node_type="effect")
activity = manager.record_simple_activity(
[input_cached.cid],
@@ -343,8 +343,8 @@ class TestL1CacheManagerActivityDiscard:
input_file = create_test_file(temp_dir / "input.txt", "input")
output_file = create_test_file(temp_dir / "output.txt", "output")
input_cached = manager.put(input_file, node_type="source")
output_cached = manager.put(output_file, node_type="effect")
input_cached, _ = manager.put(input_file, node_type="source")
output_cached, _ = manager.put(output_file, node_type="effect")
manager.record_simple_activity(
[input_cached.cid],
@@ -364,8 +364,8 @@ class TestL1CacheManagerActivityDiscard:
input_file = create_test_file(temp_dir / "input.txt", "input")
output_file = create_test_file(temp_dir / "output.txt", "output")
input_cached = manager.put(input_file, node_type="source")
output_cached = manager.put(output_file, node_type="effect")
input_cached, _ = manager.put(input_file, node_type="source")
output_cached, _ = manager.put(output_file, node_type="effect")
manager.record_simple_activity(
[input_cached.cid],