lint

Author: d-v-b

src/zarr/core/dtype/npy/structured.py

@@ -1,18 +1,17 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Mapping, Sequence
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, ClassVar, Literal, Self, TypeGuard, cast, overload
 
 import numpy as np
 
-from zarr.core.common import NamedConfig
+from zarr.core.common import NamedRequiredConfig, StructuredName_V2
 from zarr.core.dtype.common import (
     DataTypeValidationError,
     DTypeConfig_V2,
     DTypeJSON,
     HasItemSize,
-    StructuredName_V2,
     v3_unstable_dtype_warning,
 )
 from zarr.core.dtype.npy.common import (
@@ -57,7 +56,7 @@ class StructuredJSON_V2(DTypeConfig_V2[StructuredName_V2, None]):
 
 
 class StructuredJSON_V3(
-    NamedConfig[Literal["structured"], dict[str, Sequence[Sequence[str | DTypeJSON]]]]
+    NamedRequiredConfig[Literal["structured"], Mapping[str, Sequence[Sequence[str | DTypeJSON]]]]
 ):
     """
     A JSON representation of a structured data type in Zarr V3.
@@ -229,13 +228,7 @@ def _check_json_v3(cls, data: DTypeJSON) -> TypeGuard[StructuredJSON_V3]:
             False otherwise.
         """
 
-        return (
-            isinstance(data, dict)
-            and set(data.keys()) == {"name", "configuration"}
-            and data["name"] == cls._zarr_v3_name
-            and isinstance(data["configuration"], dict)
-            and set(data["configuration"].keys()) == {"fields"}
-        )
+        return guard_type(data, StructuredJSON_V3)
 
     @classmethod
     def _from_json_v2(cls, data: DTypeJSON) -> Self:

src/zarr/core/dtype/wrapper.py

@@ -39,8 +39,8 @@
 import numpy as np
 
 if TYPE_CHECKING:
-    from zarr.core.common import JSON, ZarrFormat
-    from zarr.core.dtype.common import DTypeJSON, DTypeSpec_V2, DTypeSpec_V3
+    from zarr.core.common import JSON, DTypeSpec_V3, ZarrFormat
+    from zarr.core.dtype.common import DTypeJSON, DTypeSpec_V2
 
 # This the upper bound for the scalar types we support. It's numpy scalars + str,
 # because the new variable-length string dtype in numpy does not have a corresponding scalar type

src/zarr/core/type_check.py

@@ -117,7 +117,7 @@ def _resolve_type(
     _seen: set[Any] | None = None,
 ) -> Any:
     """
-    Resolve type hints and ForwardRef.
+    Resolve type hints and ForwardRef. Maintains a cache of resolved types to avoid infinite recursion.
     """
     if _seen is None:
         _seen = set()
@@ -126,14 +126,12 @@ def _resolve_type(
     type_repr = repr(tp)
     if type_repr in _seen:
         # Return Any for recursive types to break the cycle
-        result = Any
-        return result
+        return Any
 
     _seen.add(type_repr)
 
     try:
-        result = _resolve_type_impl(tp, type_map, globalns, localns, _seen)
-        return result
+        return _resolve_type_impl(tp, type_map, globalns, localns, _seen)
     finally:
         _seen.discard(type_repr)
 
@@ -301,8 +299,10 @@ def check_typeddict(
 
     if type_map is None and len(get_args(td_type)) > 0:
         base_origin, base_args = _find_generic_typeddict_base(td_cls)
-        if base_origin is not None and len(getattr(base_origin, "__parameters__", ())) != len(
-            base_args
+        if (
+            base_origin is not None
+            and base_args is not None
+            and len(getattr(base_origin, "__parameters__", ())) != len(base_args)
         ):
             return TypeCheckResult(False, [f"{path} type parameter count mismatch in generic base"])
 
@@ -462,7 +462,7 @@ def _get_typeddict_metadata(
         base_origin, base_args = _find_generic_typeddict_base(td_cls)
         if base_origin is not None:
             tvars = getattr(base_origin, "__parameters__", ())
-            type_map = dict(zip(tvars, base_args, strict=False))
+            type_map = dict(zip(tvars, base_args, strict=False))  # type: ignore[arg-type]
 
             mod = sys.modules.get(base_origin.__module__)
             globalns = vars(mod) if mod else {}

src/zarr/registry.py

@@ -5,7 +5,6 @@
 from importlib.metadata import entry_points as get_entry_points
 from typing import TYPE_CHECKING, Any, Generic, TypeVar
 
-from zarr.core.common import CodecJSON_V2
 from zarr.core.config import BadConfigError, config
 from zarr.core.dtype import data_type_registry
 from zarr.errors import ZarrUserWarning
@@ -22,7 +21,7 @@
     )
     from zarr.abc.numcodec import Numcodec
     from zarr.core.buffer import Buffer, NDBuffer
-    from zarr.core.common import JSON
+    from zarr.core.common import JSON, CodecJSON_V2
 
 __all__ = [
     "Registry",

tests/test_type_check.py

@@ -7,8 +7,8 @@
 from typing_extensions import ReadOnly, TypedDict
 
 from src.zarr.core.type_check import check_type
-from zarr.core.common import ArrayMetadataJSON_V3, NamedConfig
-from zarr.core.dtype.common import DTypeConfig_V2, DTypeSpec_V2, DTypeSpec_V3, StructuredName_V2
+from zarr.core.common import ArrayMetadataJSON_V3, DTypeSpec_V3, NamedConfig, StructuredName_V2
+from zarr.core.dtype.common import DTypeConfig_V2, DTypeSpec_V2
 from zarr.core.dtype.npy.structured import StructuredJSON_V2
 from zarr.core.dtype.npy.time import TimeConfig
 
@@ -269,7 +269,7 @@ def test_zarr_v2_metadata(optionals: dict[str, object]) -> None:
         "codecs": ("bytes",),
         "attributes": {"a": 1, "b": 2},
         "data_type": "uint8",
-    } | optionals
+    } | optionals  # type: ignore[assignment]
     result = check_type(meta, ArrayMetadataJSON_V3)
     assert result.success
 
@@ -287,15 +287,15 @@ def test_typeddict_extra_keys_allowed() -> None:
     class X(TypedDict):
         a: int
 
-    b: X = {"a": 1, "b": 2}
+    b: X = {"a": 1, "b": 2}  # type: ignore[typeddict-unknown-key]
     result = check_type(b, X)
     assert result.success
 
 
 def test_typeddict_readonly_notrequired() -> None:
     class X(TypedDict):
         a: ReadOnly[NotRequired[int]]
-        b: NotRequired[ReadOnly[int]]  # type: ignore[typeddict-unknown-key]
+        b: NotRequired[ReadOnly[int]]
         c: Annotated[ReadOnly[NotRequired[int]], 10]
         d: int