Disallow Any generics for mypy

Author: dstansby

pyproject.toml

@@ -35,7 +35,7 @@ docs = [
     "mkdocstrings[python]",
     "pytest-examples",
     "pydantic==2.11",
-    "zarr>=3.1.0"
+    "zarr>=3.1.0",
 ]
 
 [tool.hatch]
@@ -167,7 +167,6 @@ plugins = "pydantic.mypy"
 enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
 strict = true
 # TODO: remove each of these and fix any errors:
-disallow_any_generics = false
 warn_return_any = false
 
 [tool.pytest.ini_options]

src/pydantic_zarr/v2.py

@@ -11,7 +11,6 @@
     Self,
     TypeAlias,
     TypeVar,
-    Union,
     cast,
     overload,
 )
@@ -39,14 +38,17 @@
 if TYPE_CHECKING:
     from zarr.abc.store import Store
 
-TBaseAttr: TypeAlias = Mapping[str, object] | BaseModel
-TBaseItem: TypeAlias = Union["GroupSpec", "ArraySpec"]
+TBaseAttr: TypeAlias = "Mapping[str, Any] | BaseModel"
+TBaseItem: TypeAlias = "GroupSpec[Any, Any] | ArraySpec[Any]"
 
+# These types are for convenience when dealing with unknown ArraySpecs and GroupSpecs
+# because type variables don't have default values
 AnyArraySpec: TypeAlias = "ArraySpec[Any]"
 AnyGroupSpec: TypeAlias = "GroupSpec[Any, Any]"
+AnyNodeSpec: TypeAlias = "AnyArraySpec | AnyGroupSpec"
 
-TAttr = TypeVar("TAttr", bound=TBaseAttr)
-TItem = TypeVar("TItem", bound=TBaseItem)
+TAttr = TypeVar("TAttr", bound="TBaseAttr")
+TItem = TypeVar("TItem", bound="TBaseItem")
 
 DtypeStr = Annotated[str, BeforeValidator(stringify_dtype)]
 
@@ -398,7 +400,7 @@ def to_zarr(
 
     def like(
         self,
-        other: ArraySpec | zarr.Array,
+        other: AnyArraySpec | zarr.Array,
         *,
         include: IncEx = None,
         exclude: IncEx = None,
@@ -447,7 +449,7 @@ def like(
         True
         """
 
-        other_parsed: ArraySpec
+        other_parsed: AnyArraySpec
         if isinstance(other, zarr.Array):
             other_parsed = ArraySpec.from_zarr(other)
         else:
@@ -601,7 +603,7 @@ def to_zarr(
 
     def like(
         self,
-        other: GroupSpec | zarr.Group,
+        other: AnyGroupSpec | zarr.Group,
         include: IncEx = None,
         exclude: IncEx = None,
     ) -> bool:
@@ -652,15 +654,15 @@ def like(
         True
         """
 
-        other_parsed: GroupSpec
+        other_parsed: AnyGroupSpec
         if isinstance(other, zarr.Group):
             other_parsed = GroupSpec.from_zarr(other)
         else:
             other_parsed = other
 
         return model_like(self, other_parsed, include=include, exclude=exclude)
 
-    def to_flat(self, root_path: str = "") -> dict[str, AnyArraySpec | AnyGroupSpec]:
+    def to_flat(self, root_path: str = "") -> dict[str, AnyNodeSpec]:
         """
         Flatten this `GroupSpec`.
         This method returns a `dict` with string keys and values that are `GroupSpec` or
@@ -878,7 +880,7 @@ def to_flat(
     return dict(sorted(result.items(), key=lambda v: len(v[0])))
 
 
-def from_flat(data: dict[str, ArraySpec | GroupSpec]) -> ArraySpec | GroupSpec:
+def from_flat(data: dict[str, AnyNodeSpec]) -> AnyNodeSpec:
     """
     Wraps `from_flat_group`, handling the special case where a Zarr array is defined at the root of
     a hierarchy and thus is not contained by a Zarr group.

src/pydantic_zarr/v3.py

@@ -13,7 +13,6 @@
     Self,
     TypeAlias,
     TypeVar,
-    Union,
     cast,
     overload,
 )
@@ -45,12 +44,13 @@
 
 
 TBaseAttr: TypeAlias = Mapping[str, object] | BaseModel
-TBaseItem: TypeAlias = Union["GroupSpec", "ArraySpec"]
+TBaseItem: TypeAlias = "GroupSpec[Any, Any] | ArraySpec[Any]"
 
 # These types are for convenience when dealing with unknown ArraySpecs and GroupSpecs
 # because type variables don't have default values
-AnyArraySpec: TypeAlias = "ArraySpec[TBaseAttr]"
-AnyGroupSpec: TypeAlias = "GroupSpec[TBaseAttr, TBaseItem]"
+AnyArraySpec: TypeAlias = "ArraySpec[Any]"
+AnyGroupSpec: TypeAlias = "GroupSpec[Any, Any]"
+AnyNodeSpec: TypeAlias = "AnyArraySpec | AnyGroupSpec"
 
 TAttr = TypeVar("TAttr", bound=TBaseAttr)
 TItem = TypeVar("TItem", bound=TBaseItem)
@@ -438,7 +438,7 @@ class GroupSpec(NodeSpec, Generic[TAttr, TItem]):
     members: Annotated[Mapping[str, TItem] | None, AfterValidator(ensure_key_no_path)] = {}
 
     @classmethod
-    def from_flat(cls, data: Mapping[str, AnyArraySpec | AnyGroupSpec]) -> Self:
+    def from_flat(cls, data: Mapping[str, AnyNodeSpec]) -> Self:
         """
         Create a `GroupSpec` from a flat hierarchy representation.
 
@@ -490,7 +490,7 @@ def from_flat(cls, data: Mapping[str, AnyArraySpec | AnyGroupSpec]) -> Self:
         from_flated = from_flat_group(data)
         return cls(**from_flated.model_dump())
 
-    def to_flat(self, root_path: str = "") -> dict[str, AnyArraySpec | AnyGroupSpec]:
+    def to_flat(self, root_path: str = "") -> dict[str, AnyNodeSpec]:
         """
         Flatten this `GroupSpec`.
         This method returns a `dict` with string keys and values that are `GroupSpec` or
@@ -527,7 +527,7 @@ def to_flat(self, root_path: str = "") -> dict[str, AnyArraySpec | AnyGroupSpec]
         return to_flat(self, root_path=root_path)
 
     @classmethod
-    def from_zarr(cls, group: zarr.Group, *, depth: int = -1) -> GroupSpec[TAttr, TItem]:
+    def from_zarr(cls, group: zarr.Group, *, depth: int = -1) -> AnyGroupSpec:
         """
         Create a GroupSpec from a zarr group. Subgroups and arrays contained in the zarr
         group will be converted to instances of GroupSpec and ArraySpec, respectively,
@@ -712,7 +712,7 @@ def from_zarr(element: zarr.Array, *, depth: int = ...) -> AnyArraySpec: ...
 def from_zarr(element: zarr.Group, *, depth: int = ...) -> AnyGroupSpec: ...
 
 
-def from_zarr(element: zarr.Array | zarr.Group, *, depth: int = -1) -> AnyArraySpec | AnyGroupSpec:
+def from_zarr(element: zarr.Array | zarr.Group, *, depth: int = -1) -> AnyNodeSpec:
     """
     Recursively parse a Zarr group or Zarr array into an ArraySpec or GroupSpec.
 
@@ -755,7 +755,7 @@ def to_zarr(
 
 
 def to_zarr(
-    spec: AnyArraySpec | AnyGroupSpec,
+    spec: AnyNodeSpec,
     store: Store,
     path: str,
     overwrite: bool = False,
@@ -787,7 +787,7 @@ def to_zarr(
 
 
 def from_flat(
-    data: Mapping[str, AnyArraySpec | AnyGroupSpec],
+    data: Mapping[str, AnyNodeSpec],
 ) -> AnyArraySpec | AnyGroupSpec:
     """
     Wraps `from_flat_group`, handling the special case where a Zarr array is defined at the root of
@@ -830,7 +830,7 @@ def from_flat(
 
 
 def from_flat_group(
-    data: Mapping[str, AnyArraySpec | AnyGroupSpec],
+    data: Mapping[str, AnyNodeSpec],
 ) -> AnyGroupSpec:
     """
     Generate a `GroupSpec` from a flat representation of a hierarchy, i.e. a `dict` with
@@ -962,7 +962,7 @@ def auto_dimension_names(data: object) -> tuple[str | None, ...] | None:
     return None
 
 
-def to_flat(node: ArraySpec | GroupSpec, root_path: str = "") -> dict[str, ArraySpec | GroupSpec]:
+def to_flat(node: AnyNodeSpec, root_path: str = "") -> dict[str, AnyNodeSpec]:
     """
     Flatten a `GroupSpec` or `ArraySpec`.
     Converts a `GroupSpec` or `ArraySpec` and a string, into a `dict` with string keys and
@@ -1002,7 +1002,7 @@ def to_flat(node: ArraySpec | GroupSpec, root_path: str = "") -> dict[str, Array
     {'/g1': GroupSpec(zarr_format=3, attributes={'foo': 'bar'}, members=None), '': GroupSpec(zarr_format=2, attributes={'foo': 'bar'}, members=None)}
     """
     result = {}
-    model_copy: AnyArraySpec | AnyGroupSpec
+    model_copy: AnyNodeSpec
     if isinstance(node, ArraySpec):
         model_copy = node.model_copy(deep=True)
     else: