Merge branch 'claude/memoize-readable-fingerprint' into claude/brave-hamilton-ast647

AnnexReadableFile and its tests moved to the base; take its versions.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Qn5WBSiQgoZoL4fytF6nEr

Author: claude

dandi/support/annex.py

@@ -12,8 +12,10 @@
 
 This module reads that information using only ``git`` (git-annex itself is not
 required) and exposes the content of such files as a `Readable` that streams it
-over HTTP(S) with fsspec_, so that, e.g., ``dandi validate`` can validate a
-DataLad Dandiset without downloading the (possibly terabytes of) data.
+over HTTP(S) with fsspec_, so that the files of a DataLad Dandiset can be read
+(e.g., for their metadata) without downloading the (possibly terabytes of)
+data.  Its fingerprint is the key, so that results computed from the content
+are cached under it.
 
 .. _git-annex: https://git-annex.branchable.com
 .. _DataLad: https://www.datalad.org

dandi/support/tests/test_annex.py

@@ -12,6 +12,7 @@
 import threading
 from typing import Any
 
+from fscacher import PersistentCache
 import h5py
 import pytest
 
@@ -23,6 +24,7 @@
     get_annex_readable,
     parse_url_log,
 )
+from ...pynwb_utils import get_neurodata_types, readable_fingerprint
 from ...tests.fixtures import (
     annex_key_for_file,
     create_git_annex_branch,
@@ -321,6 +323,31 @@ def range_http_server(tmp_path: Path) -> Iterator[tuple[RangeHTTPServer, str]]:
         thread.join()
 
 
+@pytest.mark.ai_generated
+def test_annex_readable_file_cached_by_key(tmp_path: Path, simple2_nwb: Path) -> None:
+    pytest.importorskip("fsspec")
+    cache = PersistentCache(path=tmp_path / "cache")
+    neurodata_types = cache.memoize_path(custom_fingerprint=readable_fingerprint)(
+        get_neurodata_types.__wrapped__
+    )
+    content = tmp_path / "content.nwb"
+    shutil.copy(simple2_nwb, content)
+    key = AnnexKey.parse(annex_key_for_file(content))
+    expected = get_neurodata_types.__wrapped__(content)
+    streamed = AnnexReadableFile(
+        filepath=tmp_path / "ds" / "sub-01.nwb", key=key, urls=[content.as_uri()]
+    )
+    assert neurodata_types(streamed) == expected
+    # A file with the same key and name elsewhere (e.g., in another clone) is
+    # served from the cache, without its content being read (it could not be)
+    twin = AnnexReadableFile(
+        filepath=tmp_path / "clone" / "sub-01.nwb", key=key, urls=[]
+    )
+    with pytest.raises(RuntimeError):
+        twin.open()
+    assert neurodata_types(twin) == expected
+
+
 @pytest.mark.ai_generated
 def test_annex_readable_file_open_http(
     range_http_server: tuple[RangeHTTPServer, str], simple2_nwb: Path, tmp_path: Path