Ignore special dotfiles when validating Zarr depth

Author: jwodder

dandi/files/zarr.py

@@ -220,11 +220,7 @@ def get_validation_errors(
                     message="Zarr group is empty.",
                 )
             ]
-        try:
-            next(self.filepath.glob(f"*{os.sep}" + os.sep.join(["*"] * MAX_ZARR_DEPTH)))
-        except StopIteration:
-            pass
-        else:
+        if self._is_too_deep():
             msg = f"Zarr directory tree more than {MAX_ZARR_DEPTH} directories deep"
             if devel_debug:
                 raise ValueError(msg)
@@ -246,6 +242,12 @@ def get_validation_errors(
             schema_version=schema_version, devel_debug=devel_debug
         )
 
+    def _is_too_deep(self) -> bool:
+        for e in self.iterfiles():
+            if len(e.parts) >= MAX_ZARR_DEPTH + 1:
+                return True
+        return False
+
     def iter_upload(
         self,
         dandiset: RemoteDandiset,

dandi/tests/test_files.py

@@ -392,3 +392,21 @@ def test_upload_zarr_with_excluded_dotfiles(
         "arr_1/.zarray",
         "arr_1/0",
     ]
+
+
+def test_validate_deep_zarr(tmp_path: Path) -> None:
+    zarr_path = tmp_path / "foo.zarr"
+    zarr.save(zarr_path, np.arange(1000), np.arange(1000, 0, -1))
+    mkpaths(zarr_path, "a/b/c/d/e/f/g.txt")
+    zf = dandi_file(zarr_path)
+    assert zf.get_validation_errors() == []
+    mkpaths(zarr_path, "a/b/c/d/e/f/g/h.txt")
+    assert [e.id for e in zf.get_validation_errors()] == ["zarr.tree_depth_exceeded"]
+
+
+def test_validate_zarr_deep_via_excluded_dotfiles(tmp_path: Path) -> None:
+    zarr_path = tmp_path / "foo.zarr"
+    zarr.save(zarr_path, np.arange(1000), np.arange(1000, 0, -1))
+    mkpaths(zarr_path, ".git/a/b/c/d/e/f/g.txt")
+    zf = dandi_file(zarr_path)
+    assert zf.get_validation_errors() == []