Move annex_fingerprint next to AnnexedReadableFile; trim field comments

annex_fingerprint is not specific to NWB files, and living in
dandi.support.datalad_fuse it needs no deferred import.

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

Author: claude

dandi/metadata/nwb.py

@@ -16,13 +16,13 @@
 from ..misctypes import DUMMY_DANDI_ETAG, Digest, LocalReadableFile, Readable
 from ..pynwb_utils import (
     _get_pynwb_metadata,
-    annex_fingerprint,
     get_neurodata_types,
     get_nwb_version,
     ignore_benign_pynwb_warnings,
     metadata_cache,
     nwb_has_external_links,
 )
+from ..support.datalad_fuse import annex_fingerprint
 from ..utils import find_parent_directory_containing
 
 lgr = get_logger()

dandi/pynwb_utils.py

@@ -23,7 +23,7 @@
 import warnings
 
 import dandischema
-from fscacher import PersistentCache, annex_key_fingerprint
+from fscacher import PersistentCache
 import h5py
 import hdmf
 import numpy as np
@@ -42,6 +42,7 @@
     metadata_nwb_subject_fields,
 )
 from .misctypes import Readable
+from .support.datalad_fuse import annex_fingerprint
 from .utils import get_module_version, is_url
 from .validate._types import (
     Origin,
@@ -73,25 +74,6 @@
 )
 
 
-def annex_fingerprint(source: Any) -> tuple[str, str] | None:
-    """
-    Fingerprint of ``source`` for ``PersistentCache.memoize_path``
-
-    Pass it as ``custom_fingerprint`` to cache the results of a function of a
-    local path or a `Readable` under the git-annex key of a locked annexed
-    file, paired with its path (see `fscacher.annex_key_fingerprint`), rather
-    than under ``stat()``: the content of an `AnnexedReadableFile`, which is
-    not present locally, cannot be ``stat()``-ed.  Anything else is handled as
-    without this.
-    """
-    # Avoid circular import:
-    from .support.datalad_fuse import AnnexedReadableFile
-
-    if isinstance(source, AnnexedReadableFile):
-        source = source.filepath
-    return cast("tuple[str, str] | None", annex_key_fingerprint(source))
-
-
 def _sanitize_nwb_version(
     v: Any,
     filename: str | Path | None = None,

dandi/support/datalad_fuse.py

@@ -33,6 +33,8 @@
 import subprocess
 from typing import IO, Any, cast
 
+from fscacher import annex_key_fingerprint
+
 from ..misctypes import Readable
 
 lgr = logging.getLogger("dandi.support.datalad_fuse")
@@ -74,25 +76,19 @@ def annex_initialized(directory: Path) -> bool:
 @dataclass
 class AnnexedReadableFile(Readable):
     """
-    A `Readable` for a (locked) annexed file whose content is not present
-    locally, which is streamed with datalad-fuse (see the module docstring).
+    A `Readable` for a (locked) annexed file at ``filepath`` (a broken symbolic
+    link) whose content is not present locally, which is streamed with
+    datalad-fuse (see the module docstring).  ``url`` is only the first URL
+    known for the content, for reporting: if it cannot be read, the adapter
+    tries the others.
 
     Instances are obtained by calling `get_annexed_readable()`.
     """
 
-    #: The absolute path of the (broken) symbolic link to the file's content
     filepath: Path
-
-    #: The git-annex key of the file
     key: str
-
-    #: The size of the content, as recorded in the key
     size: int
-
-    #: The first URL that the content may be streamed from (for reporting;
-    #: the adapter tries the others if it cannot be read from that one)
     url: str
-
     adapter: Any = field(repr=False, compare=False)
 
     def open(self) -> IO[bytes]:
@@ -111,6 +107,22 @@ def __str__(self) -> str:
         return str(self.filepath)
 
 
+def annex_fingerprint(source: Any) -> tuple[str, str] | None:
+    """
+    Fingerprint of ``source`` for ``PersistentCache.memoize_path``
+
+    Pass it as ``custom_fingerprint`` to cache the results of a function of a
+    local path or a `Readable` under the git-annex key of a locked annexed
+    file, paired with its path (see `fscacher.annex_key_fingerprint`), rather
+    than under ``stat()``: the content of an `AnnexedReadableFile`, which is
+    not present locally, cannot be ``stat()``-ed.  Anything else is handled as
+    without this.
+    """
+    if isinstance(source, AnnexedReadableFile):
+        source = source.filepath
+    return cast("tuple[str, str] | None", annex_key_fingerprint(source))
+
+
 def get_annexed_readable(path: str | Path) -> AnnexedReadableFile | None:
     """
     Return an `AnnexedReadableFile` for streaming the content of the annexed

dandi/support/tests/test_datalad_fuse.py

@@ -7,8 +7,8 @@
 import h5py
 import pytest
 
-from ..datalad_fuse import AnnexedReadableFile, get_annexed_readable
-from ...pynwb_utils import annex_fingerprint, get_neurodata_types
+from ..datalad_fuse import AnnexedReadableFile, annex_fingerprint, get_annexed_readable
+from ...pynwb_utils import get_neurodata_types
 from ...tests.fixtures import RangeHTTPServer, make_git_annex_dandiset
 from ...tests.skip import mark