Fixes parsing of relative file:// URLs

Also fixes random mypy issues to get passt pre-commit hooks

Author: Tomaz-Vieira

src/zarr/_cli/cli.py

@@ -35,7 +35,7 @@ class CLIZarrFormatV3(StrEnum):
     v3 = "v3"
 
 
-@app.command()  # type: ignore[untyped-decorator]
+@app.command()
 def migrate(
     zarr_format: Annotated[
         CLIZarrFormatV3,
@@ -120,7 +120,7 @@ def migrate(
         sync(migrate_metadata.remove_metadata(write_store, 2, force=False, dry_run=dry_run))
 
 
-@app.command()  # type: ignore[untyped-decorator]
+@app.command()
 def remove_metadata(
     zarr_format: Annotated[
         CLIZarrFormat,
@@ -168,7 +168,7 @@ def remove_metadata(
     )
 
 
-@app.callback()  # type: ignore[untyped-decorator]
+@app.callback()
 def main(
     verbose: Annotated[
         bool,

src/zarr/codecs/cast_value.py

@@ -345,7 +345,7 @@ def _do_cast(
             to_src = int if np.issubdtype(src_dtype, np.integer) else float
             to_tgt = int if np.issubdtype(target_dtype, np.integer) else float
             scalar_map_entries = {to_src(k): to_tgt(v) for k, v in scalar_map.items()}
-        return cast_array_rs(  # type: ignore[no-any-return]
+        return cast_array_rs(
             arr,
             target_dtype=target_dtype,
             rounding_mode=self.rounding,

src/zarr/storage/_utils.py

@@ -90,16 +90,16 @@ def parse_store_url(url: str) -> ParsedStoreUrl:
 
     parsed = urlparse(url)
 
-    # netloc is the "host" part (store name for memory://, bucket for s3://, etc.)
-    name = parsed.netloc or None
+    if parsed.scheme in ("file", ""):
+        name = None
+        path = url.removeprefix("file://")
+    else:
+        # netloc is the "host" part (store name for memory://, bucket for s3://, etc.)
+        name = parsed.netloc or None
 
-    # For URLs with a scheme and netloc (like memory://store/path or s3://bucket/key),
-    # strip the leading slash from the path component.
-    # For local paths (no scheme), preserve the path as-is.
-    if parsed.scheme and parsed.netloc:
+        # For URLs with a non-file scheme and netloc (like memory://store/path or s3://bucket/key),
+        # strip the leading slash from the path component.
         path = parsed.path.lstrip("/")
-    else:
-        path = parsed.path
 
     return ParsedStoreUrl(scheme=parsed.scheme, name=name, path=path, raw=url)
 

tests/test_store/test_utils.py

@@ -39,9 +39,19 @@ def test_s3_url(self) -> None:
             scheme="s3", name="bucket", path="key", raw="s3://bucket/key"
         )
 
-    def test_file_url(self) -> None:
-        result = parse_store_url("file:///tmp/test")
-        assert result.scheme == "file"
+    def test_absolute_file_url(self) -> None:
+        url = "file:///something/absolute"
+        result = parse_store_url(url)
+        assert result == ParsedStoreUrl(
+            scheme="file", name=None, path="/something/absolute", raw=url
+        )
+
+    def test_relative_file_url(self) -> None:
+        url = "file://something/relative"
+        result = parse_store_url(url)
+        assert result == ParsedStoreUrl(
+            scheme="file", name=None, path="something/relative", raw=url
+        )
 
     def test_local_absolute_path(self) -> None:
         result = parse_store_url("/local/path")