fix(typing): fix to numpy 2.2 typing notation: use tuple[str, ..] dim…

…ension everywhere chore(version): bump revision
caniko · Feb 22, 2025 · 1db5811 · 1db5811
1 parent 76aef06
commit 1db5811
Show file tree

Hide file tree

Showing 11 changed files with 199 additions and 176 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pydantic_numpy/typing/type_safe/i_dimensional.py b/pydantic_numpy/typing/type_safe/i_dimensional.py
@@ -5,97 +5,97 @@
 from pydantic_numpy.helper.annotation import NpArrayPydanticAnnotation
 
 Np1DArray: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[Any]],
+    np.ndarray[tuple[int, ...], np.dtype[Any]],
     NpArrayPydanticAnnotation.factory(data_type=None, dimensions=1, strict_data_typing=False),
 ]
 
 Np1DArrayInt64: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.int64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int64]],
     NpArrayPydanticAnnotation.factory(data_type=np.int64, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayInt32: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.int32]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int32]],
     NpArrayPydanticAnnotation.factory(data_type=np.int32, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayInt16: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.int16]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int16]],
     NpArrayPydanticAnnotation.factory(data_type=np.int16, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayInt8: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.int8]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int8]],
     NpArrayPydanticAnnotation.factory(data_type=np.int8, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayUint64: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.uint64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint64]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint64, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayUint32: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.uint32]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint32]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint32, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayUint16: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.uint16]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint16]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint16, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayUint8: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.uint8]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint8]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint8, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayFpLongDouble: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.longdouble]],
+    np.ndarray[tuple[int, ...], np.dtype[np.longdouble]],
     NpArrayPydanticAnnotation.factory(data_type=np.longdouble, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayFp64: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.float64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.float64]],
     NpArrayPydanticAnnotation.factory(data_type=np.float64, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayFp32: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.float32]],
+    np.ndarray[tuple[int, ...], np.dtype[np.float32]],
     NpArrayPydanticAnnotation.factory(data_type=np.float32, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayFp16: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.float16]],
+    np.ndarray[tuple[int, ...], np.dtype[np.float16]],
     NpArrayPydanticAnnotation.factory(data_type=np.float16, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayComplexLongDouble: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.clongdouble]],
+    np.ndarray[tuple[int, ...], np.dtype[np.clongdouble]],
     NpArrayPydanticAnnotation.factory(data_type=np.clongdouble, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayComplex128: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.complex128]],
+    np.ndarray[tuple[int, ...], np.dtype[np.complex128]],
     NpArrayPydanticAnnotation.factory(data_type=np.complex128, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayComplex64: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.complex64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.complex64]],
     NpArrayPydanticAnnotation.factory(data_type=np.complex64, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayBool: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.bool_]],
+    np.ndarray[tuple[int, ...], np.dtype[np.bool_]],
     NpArrayPydanticAnnotation.factory(data_type=np.bool_, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayDatetime64: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.datetime64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.datetime64]],
     NpArrayPydanticAnnotation.factory(data_type=np.datetime64, dimensions=1, strict_data_typing=True),
 ]
 
 Np1DArrayTimedelta64: TypeAlias = Annotated[
-    np.ndarray[tuple[int], np.dtype[np.timedelta64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.timedelta64]],
     NpArrayPydanticAnnotation.factory(data_type=np.timedelta64, dimensions=1, strict_data_typing=True),
 ]
 

diff --git a/pydantic_numpy/typing/type_safe/ii_dimensional.py b/pydantic_numpy/typing/type_safe/ii_dimensional.py
@@ -5,97 +5,97 @@
 from pydantic_numpy.helper.annotation import NpArrayPydanticAnnotation
 
 Np2DArray: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[Any]],
+    np.ndarray[tuple[int, ...], np.dtype[Any]],
     NpArrayPydanticAnnotation.factory(data_type=None, dimensions=2, strict_data_typing=False),
 ]
 
 Np2DArrayInt64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.int64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int64]],
     NpArrayPydanticAnnotation.factory(data_type=np.int64, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayInt32: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.int32]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int32]],
     NpArrayPydanticAnnotation.factory(data_type=np.int32, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayInt16: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.int16]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int16]],
     NpArrayPydanticAnnotation.factory(data_type=np.int16, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayInt8: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.int8]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int8]],
     NpArrayPydanticAnnotation.factory(data_type=np.int8, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayUint64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.uint64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint64]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint64, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayUint32: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.uint32]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint32]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint32, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayUint16: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.uint16]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint16]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint16, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayUint8: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.uint8]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint8]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint8, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayFpLongDouble: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.longdouble]],
+    np.ndarray[tuple[int, ...], np.dtype[np.longdouble]],
     NpArrayPydanticAnnotation.factory(data_type=np.longdouble, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayFp64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.float64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.float64]],
     NpArrayPydanticAnnotation.factory(data_type=np.float64, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayFp32: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.float32]],
+    np.ndarray[tuple[int, ...], np.dtype[np.float32]],
     NpArrayPydanticAnnotation.factory(data_type=np.float32, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayFp16: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.float16]],
+    np.ndarray[tuple[int, ...], np.dtype[np.float16]],
     NpArrayPydanticAnnotation.factory(data_type=np.float16, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayComplexLongDouble: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.clongdouble]],
+    np.ndarray[tuple[int, ...], np.dtype[np.clongdouble]],
     NpArrayPydanticAnnotation.factory(data_type=np.clongdouble, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayComplex128: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.complex128]],
+    np.ndarray[tuple[int, ...], np.dtype[np.complex128]],
     NpArrayPydanticAnnotation.factory(data_type=np.complex128, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayComplex64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.complex64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.complex64]],
     NpArrayPydanticAnnotation.factory(data_type=np.complex64, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayBool: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.bool_]],
+    np.ndarray[tuple[int, ...], np.dtype[np.bool_]],
     NpArrayPydanticAnnotation.factory(data_type=np.bool_, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayDatetime64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.datetime64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.datetime64]],
     NpArrayPydanticAnnotation.factory(data_type=np.datetime64, dimensions=2, strict_data_typing=True),
 ]
 
 Np2DArrayTimedelta64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int], np.dtype[np.timedelta64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.timedelta64]],
     NpArrayPydanticAnnotation.factory(data_type=np.timedelta64, dimensions=2, strict_data_typing=True),
 ]
 

diff --git a/pydantic_numpy/typing/type_safe/iii_dimensional.py b/pydantic_numpy/typing/type_safe/iii_dimensional.py
@@ -5,97 +5,97 @@
 from pydantic_numpy.helper.annotation import NpArrayPydanticAnnotation
 
 Np3DArray: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[Any]],
+    np.ndarray[tuple[int, ...], np.dtype[Any]],
     NpArrayPydanticAnnotation.factory(data_type=None, dimensions=3, strict_data_typing=False),
 ]
 
 Np3DArrayInt64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.int64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int64]],
     NpArrayPydanticAnnotation.factory(data_type=np.int64, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayInt32: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.int32]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int32]],
     NpArrayPydanticAnnotation.factory(data_type=np.int32, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayInt16: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.int16]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int16]],
     NpArrayPydanticAnnotation.factory(data_type=np.int16, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayInt8: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.int8]],
+    np.ndarray[tuple[int, ...], np.dtype[np.int8]],
     NpArrayPydanticAnnotation.factory(data_type=np.int8, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayUint64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.uint64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint64]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint64, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayUint32: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.uint32]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint32]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint32, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayUint16: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.uint16]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint16]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint16, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayUint8: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.uint8]],
+    np.ndarray[tuple[int, ...], np.dtype[np.uint8]],
     NpArrayPydanticAnnotation.factory(data_type=np.uint8, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayFpLongDouble: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.longdouble]],
+    np.ndarray[tuple[int, ...], np.dtype[np.longdouble]],
     NpArrayPydanticAnnotation.factory(data_type=np.longdouble, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayFp64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.float64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.float64]],
     NpArrayPydanticAnnotation.factory(data_type=np.float64, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayFp32: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.float32]],
+    np.ndarray[tuple[int, ...], np.dtype[np.float32]],
     NpArrayPydanticAnnotation.factory(data_type=np.float32, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayFp16: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.float16]],
+    np.ndarray[tuple[int, ...], np.dtype[np.float16]],
     NpArrayPydanticAnnotation.factory(data_type=np.float16, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayComplexLongDouble: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.clongdouble]],
+    np.ndarray[tuple[int, ...], np.dtype[np.clongdouble]],
     NpArrayPydanticAnnotation.factory(data_type=np.clongdouble, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayComplex128: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.complex128]],
+    np.ndarray[tuple[int, ...], np.dtype[np.complex128]],
     NpArrayPydanticAnnotation.factory(data_type=np.complex128, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayComplex64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.complex64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.complex64]],
     NpArrayPydanticAnnotation.factory(data_type=np.complex64, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayBool: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.bool_]],
+    np.ndarray[tuple[int, ...], np.dtype[np.bool_]],
     NpArrayPydanticAnnotation.factory(data_type=np.bool_, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayDatetime64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.datetime64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.datetime64]],
     NpArrayPydanticAnnotation.factory(data_type=np.datetime64, dimensions=3, strict_data_typing=True),
 ]
 
 Np3DArrayTimedelta64: TypeAlias = Annotated[
-    np.ndarray[tuple[int, int, int], np.dtype[np.timedelta64]],
+    np.ndarray[tuple[int, ...], np.dtype[np.timedelta64]],
     NpArrayPydanticAnnotation.factory(data_type=np.timedelta64, dimensions=3, strict_data_typing=True),
 ]