Skip to content

Commit 1db5811

Browse files
Sergei Nikiforovcaniko
Sergei Nikiforov
authored and
caniko
committed
fix(typing): fix to numpy 2.2 typing notation: use tuple[str, ..] dimension everywhere
chore(version): bump revision
1 parent 76aef06 commit 1db5811

11 files changed

+199
-176
lines changed

‎poetry.lock

+40-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pydantic_numpy/typing/type_safe/i_dimensional.py

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,97 +5,97 @@
55
from pydantic_numpy.helper.annotation import NpArrayPydanticAnnotation
66

77
Np1DArray: TypeAlias = Annotated[
8-
np.ndarray[tuple[int], np.dtype[Any]],
8+
np.ndarray[tuple[int, ...], np.dtype[Any]],
99
NpArrayPydanticAnnotation.factory(data_type=None, dimensions=1, strict_data_typing=False),
1010
]
1111

1212
Np1DArrayInt64: TypeAlias = Annotated[
13-
np.ndarray[tuple[int], np.dtype[np.int64]],
13+
np.ndarray[tuple[int, ...], np.dtype[np.int64]],
1414
NpArrayPydanticAnnotation.factory(data_type=np.int64, dimensions=1, strict_data_typing=True),
1515
]
1616

1717
Np1DArrayInt32: TypeAlias = Annotated[
18-
np.ndarray[tuple[int], np.dtype[np.int32]],
18+
np.ndarray[tuple[int, ...], np.dtype[np.int32]],
1919
NpArrayPydanticAnnotation.factory(data_type=np.int32, dimensions=1, strict_data_typing=True),
2020
]
2121

2222
Np1DArrayInt16: TypeAlias = Annotated[
23-
np.ndarray[tuple[int], np.dtype[np.int16]],
23+
np.ndarray[tuple[int, ...], np.dtype[np.int16]],
2424
NpArrayPydanticAnnotation.factory(data_type=np.int16, dimensions=1, strict_data_typing=True),
2525
]
2626

2727
Np1DArrayInt8: TypeAlias = Annotated[
28-
np.ndarray[tuple[int], np.dtype[np.int8]],
28+
np.ndarray[tuple[int, ...], np.dtype[np.int8]],
2929
NpArrayPydanticAnnotation.factory(data_type=np.int8, dimensions=1, strict_data_typing=True),
3030
]
3131

3232
Np1DArrayUint64: TypeAlias = Annotated[
33-
np.ndarray[tuple[int], np.dtype[np.uint64]],
33+
np.ndarray[tuple[int, ...], np.dtype[np.uint64]],
3434
NpArrayPydanticAnnotation.factory(data_type=np.uint64, dimensions=1, strict_data_typing=True),
3535
]
3636

3737
Np1DArrayUint32: TypeAlias = Annotated[
38-
np.ndarray[tuple[int], np.dtype[np.uint32]],
38+
np.ndarray[tuple[int, ...], np.dtype[np.uint32]],
3939
NpArrayPydanticAnnotation.factory(data_type=np.uint32, dimensions=1, strict_data_typing=True),
4040
]
4141

4242
Np1DArrayUint16: TypeAlias = Annotated[
43-
np.ndarray[tuple[int], np.dtype[np.uint16]],
43+
np.ndarray[tuple[int, ...], np.dtype[np.uint16]],
4444
NpArrayPydanticAnnotation.factory(data_type=np.uint16, dimensions=1, strict_data_typing=True),
4545
]
4646

4747
Np1DArrayUint8: TypeAlias = Annotated[
48-
np.ndarray[tuple[int], np.dtype[np.uint8]],
48+
np.ndarray[tuple[int, ...], np.dtype[np.uint8]],
4949
NpArrayPydanticAnnotation.factory(data_type=np.uint8, dimensions=1, strict_data_typing=True),
5050
]
5151

5252
Np1DArrayFpLongDouble: TypeAlias = Annotated[
53-
np.ndarray[tuple[int], np.dtype[np.longdouble]],
53+
np.ndarray[tuple[int, ...], np.dtype[np.longdouble]],
5454
NpArrayPydanticAnnotation.factory(data_type=np.longdouble, dimensions=1, strict_data_typing=True),
5555
]
5656

5757
Np1DArrayFp64: TypeAlias = Annotated[
58-
np.ndarray[tuple[int], np.dtype[np.float64]],
58+
np.ndarray[tuple[int, ...], np.dtype[np.float64]],
5959
NpArrayPydanticAnnotation.factory(data_type=np.float64, dimensions=1, strict_data_typing=True),
6060
]
6161

6262
Np1DArrayFp32: TypeAlias = Annotated[
63-
np.ndarray[tuple[int], np.dtype[np.float32]],
63+
np.ndarray[tuple[int, ...], np.dtype[np.float32]],
6464
NpArrayPydanticAnnotation.factory(data_type=np.float32, dimensions=1, strict_data_typing=True),
6565
]
6666

6767
Np1DArrayFp16: TypeAlias = Annotated[
68-
np.ndarray[tuple[int], np.dtype[np.float16]],
68+
np.ndarray[tuple[int, ...], np.dtype[np.float16]],
6969
NpArrayPydanticAnnotation.factory(data_type=np.float16, dimensions=1, strict_data_typing=True),
7070
]
7171

7272
Np1DArrayComplexLongDouble: TypeAlias = Annotated[
73-
np.ndarray[tuple[int], np.dtype[np.clongdouble]],
73+
np.ndarray[tuple[int, ...], np.dtype[np.clongdouble]],
7474
NpArrayPydanticAnnotation.factory(data_type=np.clongdouble, dimensions=1, strict_data_typing=True),
7575
]
7676

7777
Np1DArrayComplex128: TypeAlias = Annotated[
78-
np.ndarray[tuple[int], np.dtype[np.complex128]],
78+
np.ndarray[tuple[int, ...], np.dtype[np.complex128]],
7979
NpArrayPydanticAnnotation.factory(data_type=np.complex128, dimensions=1, strict_data_typing=True),
8080
]
8181

8282
Np1DArrayComplex64: TypeAlias = Annotated[
83-
np.ndarray[tuple[int], np.dtype[np.complex64]],
83+
np.ndarray[tuple[int, ...], np.dtype[np.complex64]],
8484
NpArrayPydanticAnnotation.factory(data_type=np.complex64, dimensions=1, strict_data_typing=True),
8585
]
8686

8787
Np1DArrayBool: TypeAlias = Annotated[
88-
np.ndarray[tuple[int], np.dtype[np.bool_]],
88+
np.ndarray[tuple[int, ...], np.dtype[np.bool_]],
8989
NpArrayPydanticAnnotation.factory(data_type=np.bool_, dimensions=1, strict_data_typing=True),
9090
]
9191

9292
Np1DArrayDatetime64: TypeAlias = Annotated[
93-
np.ndarray[tuple[int], np.dtype[np.datetime64]],
93+
np.ndarray[tuple[int, ...], np.dtype[np.datetime64]],
9494
NpArrayPydanticAnnotation.factory(data_type=np.datetime64, dimensions=1, strict_data_typing=True),
9595
]
9696

9797
Np1DArrayTimedelta64: TypeAlias = Annotated[
98-
np.ndarray[tuple[int], np.dtype[np.timedelta64]],
98+
np.ndarray[tuple[int, ...], np.dtype[np.timedelta64]],
9999
NpArrayPydanticAnnotation.factory(data_type=np.timedelta64, dimensions=1, strict_data_typing=True),
100100
]
101101

‎pydantic_numpy/typing/type_safe/ii_dimensional.py

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,97 +5,97 @@
55
from pydantic_numpy.helper.annotation import NpArrayPydanticAnnotation
66

77
Np2DArray: TypeAlias = Annotated[
8-
np.ndarray[tuple[int, int], np.dtype[Any]],
8+
np.ndarray[tuple[int, ...], np.dtype[Any]],
99
NpArrayPydanticAnnotation.factory(data_type=None, dimensions=2, strict_data_typing=False),
1010
]
1111

1212
Np2DArrayInt64: TypeAlias = Annotated[
13-
np.ndarray[tuple[int, int], np.dtype[np.int64]],
13+
np.ndarray[tuple[int, ...], np.dtype[np.int64]],
1414
NpArrayPydanticAnnotation.factory(data_type=np.int64, dimensions=2, strict_data_typing=True),
1515
]
1616

1717
Np2DArrayInt32: TypeAlias = Annotated[
18-
np.ndarray[tuple[int, int], np.dtype[np.int32]],
18+
np.ndarray[tuple[int, ...], np.dtype[np.int32]],
1919
NpArrayPydanticAnnotation.factory(data_type=np.int32, dimensions=2, strict_data_typing=True),
2020
]
2121

2222
Np2DArrayInt16: TypeAlias = Annotated[
23-
np.ndarray[tuple[int, int], np.dtype[np.int16]],
23+
np.ndarray[tuple[int, ...], np.dtype[np.int16]],
2424
NpArrayPydanticAnnotation.factory(data_type=np.int16, dimensions=2, strict_data_typing=True),
2525
]
2626

2727
Np2DArrayInt8: TypeAlias = Annotated[
28-
np.ndarray[tuple[int, int], np.dtype[np.int8]],
28+
np.ndarray[tuple[int, ...], np.dtype[np.int8]],
2929
NpArrayPydanticAnnotation.factory(data_type=np.int8, dimensions=2, strict_data_typing=True),
3030
]
3131

3232
Np2DArrayUint64: TypeAlias = Annotated[
33-
np.ndarray[tuple[int, int], np.dtype[np.uint64]],
33+
np.ndarray[tuple[int, ...], np.dtype[np.uint64]],
3434
NpArrayPydanticAnnotation.factory(data_type=np.uint64, dimensions=2, strict_data_typing=True),
3535
]
3636

3737
Np2DArrayUint32: TypeAlias = Annotated[
38-
np.ndarray[tuple[int, int], np.dtype[np.uint32]],
38+
np.ndarray[tuple[int, ...], np.dtype[np.uint32]],
3939
NpArrayPydanticAnnotation.factory(data_type=np.uint32, dimensions=2, strict_data_typing=True),
4040
]
4141

4242
Np2DArrayUint16: TypeAlias = Annotated[
43-
np.ndarray[tuple[int, int], np.dtype[np.uint16]],
43+
np.ndarray[tuple[int, ...], np.dtype[np.uint16]],
4444
NpArrayPydanticAnnotation.factory(data_type=np.uint16, dimensions=2, strict_data_typing=True),
4545
]
4646

4747
Np2DArrayUint8: TypeAlias = Annotated[
48-
np.ndarray[tuple[int, int], np.dtype[np.uint8]],
48+
np.ndarray[tuple[int, ...], np.dtype[np.uint8]],
4949
NpArrayPydanticAnnotation.factory(data_type=np.uint8, dimensions=2, strict_data_typing=True),
5050
]
5151

5252
Np2DArrayFpLongDouble: TypeAlias = Annotated[
53-
np.ndarray[tuple[int, int], np.dtype[np.longdouble]],
53+
np.ndarray[tuple[int, ...], np.dtype[np.longdouble]],
5454
NpArrayPydanticAnnotation.factory(data_type=np.longdouble, dimensions=2, strict_data_typing=True),
5555
]
5656

5757
Np2DArrayFp64: TypeAlias = Annotated[
58-
np.ndarray[tuple[int, int], np.dtype[np.float64]],
58+
np.ndarray[tuple[int, ...], np.dtype[np.float64]],
5959
NpArrayPydanticAnnotation.factory(data_type=np.float64, dimensions=2, strict_data_typing=True),
6060
]
6161

6262
Np2DArrayFp32: TypeAlias = Annotated[
63-
np.ndarray[tuple[int, int], np.dtype[np.float32]],
63+
np.ndarray[tuple[int, ...], np.dtype[np.float32]],
6464
NpArrayPydanticAnnotation.factory(data_type=np.float32, dimensions=2, strict_data_typing=True),
6565
]
6666

6767
Np2DArrayFp16: TypeAlias = Annotated[
68-
np.ndarray[tuple[int, int], np.dtype[np.float16]],
68+
np.ndarray[tuple[int, ...], np.dtype[np.float16]],
6969
NpArrayPydanticAnnotation.factory(data_type=np.float16, dimensions=2, strict_data_typing=True),
7070
]
7171

7272
Np2DArrayComplexLongDouble: TypeAlias = Annotated[
73-
np.ndarray[tuple[int, int], np.dtype[np.clongdouble]],
73+
np.ndarray[tuple[int, ...], np.dtype[np.clongdouble]],
7474
NpArrayPydanticAnnotation.factory(data_type=np.clongdouble, dimensions=2, strict_data_typing=True),
7575
]
7676

7777
Np2DArrayComplex128: TypeAlias = Annotated[
78-
np.ndarray[tuple[int, int], np.dtype[np.complex128]],
78+
np.ndarray[tuple[int, ...], np.dtype[np.complex128]],
7979
NpArrayPydanticAnnotation.factory(data_type=np.complex128, dimensions=2, strict_data_typing=True),
8080
]
8181

8282
Np2DArrayComplex64: TypeAlias = Annotated[
83-
np.ndarray[tuple[int, int], np.dtype[np.complex64]],
83+
np.ndarray[tuple[int, ...], np.dtype[np.complex64]],
8484
NpArrayPydanticAnnotation.factory(data_type=np.complex64, dimensions=2, strict_data_typing=True),
8585
]
8686

8787
Np2DArrayBool: TypeAlias = Annotated[
88-
np.ndarray[tuple[int, int], np.dtype[np.bool_]],
88+
np.ndarray[tuple[int, ...], np.dtype[np.bool_]],
8989
NpArrayPydanticAnnotation.factory(data_type=np.bool_, dimensions=2, strict_data_typing=True),
9090
]
9191

9292
Np2DArrayDatetime64: TypeAlias = Annotated[
93-
np.ndarray[tuple[int, int], np.dtype[np.datetime64]],
93+
np.ndarray[tuple[int, ...], np.dtype[np.datetime64]],
9494
NpArrayPydanticAnnotation.factory(data_type=np.datetime64, dimensions=2, strict_data_typing=True),
9595
]
9696

9797
Np2DArrayTimedelta64: TypeAlias = Annotated[
98-
np.ndarray[tuple[int, int], np.dtype[np.timedelta64]],
98+
np.ndarray[tuple[int, ...], np.dtype[np.timedelta64]],
9999
NpArrayPydanticAnnotation.factory(data_type=np.timedelta64, dimensions=2, strict_data_typing=True),
100100
]
101101

‎pydantic_numpy/typing/type_safe/iii_dimensional.py

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,97 +5,97 @@
55
from pydantic_numpy.helper.annotation import NpArrayPydanticAnnotation
66

77
Np3DArray: TypeAlias = Annotated[
8-
np.ndarray[tuple[int, int, int], np.dtype[Any]],
8+
np.ndarray[tuple[int, ...], np.dtype[Any]],
99
NpArrayPydanticAnnotation.factory(data_type=None, dimensions=3, strict_data_typing=False),
1010
]
1111

1212
Np3DArrayInt64: TypeAlias = Annotated[
13-
np.ndarray[tuple[int, int, int], np.dtype[np.int64]],
13+
np.ndarray[tuple[int, ...], np.dtype[np.int64]],
1414
NpArrayPydanticAnnotation.factory(data_type=np.int64, dimensions=3, strict_data_typing=True),
1515
]
1616

1717
Np3DArrayInt32: TypeAlias = Annotated[
18-
np.ndarray[tuple[int, int, int], np.dtype[np.int32]],
18+
np.ndarray[tuple[int, ...], np.dtype[np.int32]],
1919
NpArrayPydanticAnnotation.factory(data_type=np.int32, dimensions=3, strict_data_typing=True),
2020
]
2121

2222
Np3DArrayInt16: TypeAlias = Annotated[
23-
np.ndarray[tuple[int, int, int], np.dtype[np.int16]],
23+
np.ndarray[tuple[int, ...], np.dtype[np.int16]],
2424
NpArrayPydanticAnnotation.factory(data_type=np.int16, dimensions=3, strict_data_typing=True),
2525
]
2626

2727
Np3DArrayInt8: TypeAlias = Annotated[
28-
np.ndarray[tuple[int, int, int], np.dtype[np.int8]],
28+
np.ndarray[tuple[int, ...], np.dtype[np.int8]],
2929
NpArrayPydanticAnnotation.factory(data_type=np.int8, dimensions=3, strict_data_typing=True),
3030
]
3131

3232
Np3DArrayUint64: TypeAlias = Annotated[
33-
np.ndarray[tuple[int, int, int], np.dtype[np.uint64]],
33+
np.ndarray[tuple[int, ...], np.dtype[np.uint64]],
3434
NpArrayPydanticAnnotation.factory(data_type=np.uint64, dimensions=3, strict_data_typing=True),
3535
]
3636

3737
Np3DArrayUint32: TypeAlias = Annotated[
38-
np.ndarray[tuple[int, int, int], np.dtype[np.uint32]],
38+
np.ndarray[tuple[int, ...], np.dtype[np.uint32]],
3939
NpArrayPydanticAnnotation.factory(data_type=np.uint32, dimensions=3, strict_data_typing=True),
4040
]
4141

4242
Np3DArrayUint16: TypeAlias = Annotated[
43-
np.ndarray[tuple[int, int, int], np.dtype[np.uint16]],
43+
np.ndarray[tuple[int, ...], np.dtype[np.uint16]],
4444
NpArrayPydanticAnnotation.factory(data_type=np.uint16, dimensions=3, strict_data_typing=True),
4545
]
4646

4747
Np3DArrayUint8: TypeAlias = Annotated[
48-
np.ndarray[tuple[int, int, int], np.dtype[np.uint8]],
48+
np.ndarray[tuple[int, ...], np.dtype[np.uint8]],
4949
NpArrayPydanticAnnotation.factory(data_type=np.uint8, dimensions=3, strict_data_typing=True),
5050
]
5151

5252
Np3DArrayFpLongDouble: TypeAlias = Annotated[
53-
np.ndarray[tuple[int, int, int], np.dtype[np.longdouble]],
53+
np.ndarray[tuple[int, ...], np.dtype[np.longdouble]],
5454
NpArrayPydanticAnnotation.factory(data_type=np.longdouble, dimensions=3, strict_data_typing=True),
5555
]
5656

5757
Np3DArrayFp64: TypeAlias = Annotated[
58-
np.ndarray[tuple[int, int, int], np.dtype[np.float64]],
58+
np.ndarray[tuple[int, ...], np.dtype[np.float64]],
5959
NpArrayPydanticAnnotation.factory(data_type=np.float64, dimensions=3, strict_data_typing=True),
6060
]
6161

6262
Np3DArrayFp32: TypeAlias = Annotated[
63-
np.ndarray[tuple[int, int, int], np.dtype[np.float32]],
63+
np.ndarray[tuple[int, ...], np.dtype[np.float32]],
6464
NpArrayPydanticAnnotation.factory(data_type=np.float32, dimensions=3, strict_data_typing=True),
6565
]
6666

6767
Np3DArrayFp16: TypeAlias = Annotated[
68-
np.ndarray[tuple[int, int, int], np.dtype[np.float16]],
68+
np.ndarray[tuple[int, ...], np.dtype[np.float16]],
6969
NpArrayPydanticAnnotation.factory(data_type=np.float16, dimensions=3, strict_data_typing=True),
7070
]
7171

7272
Np3DArrayComplexLongDouble: TypeAlias = Annotated[
73-
np.ndarray[tuple[int, int, int], np.dtype[np.clongdouble]],
73+
np.ndarray[tuple[int, ...], np.dtype[np.clongdouble]],
7474
NpArrayPydanticAnnotation.factory(data_type=np.clongdouble, dimensions=3, strict_data_typing=True),
7575
]
7676

7777
Np3DArrayComplex128: TypeAlias = Annotated[
78-
np.ndarray[tuple[int, int, int], np.dtype[np.complex128]],
78+
np.ndarray[tuple[int, ...], np.dtype[np.complex128]],
7979
NpArrayPydanticAnnotation.factory(data_type=np.complex128, dimensions=3, strict_data_typing=True),
8080
]
8181

8282
Np3DArrayComplex64: TypeAlias = Annotated[
83-
np.ndarray[tuple[int, int, int], np.dtype[np.complex64]],
83+
np.ndarray[tuple[int, ...], np.dtype[np.complex64]],
8484
NpArrayPydanticAnnotation.factory(data_type=np.complex64, dimensions=3, strict_data_typing=True),
8585
]
8686

8787
Np3DArrayBool: TypeAlias = Annotated[
88-
np.ndarray[tuple[int, int, int], np.dtype[np.bool_]],
88+
np.ndarray[tuple[int, ...], np.dtype[np.bool_]],
8989
NpArrayPydanticAnnotation.factory(data_type=np.bool_, dimensions=3, strict_data_typing=True),
9090
]
9191

9292
Np3DArrayDatetime64: TypeAlias = Annotated[
93-
np.ndarray[tuple[int, int, int], np.dtype[np.datetime64]],
93+
np.ndarray[tuple[int, ...], np.dtype[np.datetime64]],
9494
NpArrayPydanticAnnotation.factory(data_type=np.datetime64, dimensions=3, strict_data_typing=True),
9595
]
9696

9797
Np3DArrayTimedelta64: TypeAlias = Annotated[
98-
np.ndarray[tuple[int, int, int], np.dtype[np.timedelta64]],
98+
np.ndarray[tuple[int, ...], np.dtype[np.timedelta64]],
9999
NpArrayPydanticAnnotation.factory(data_type=np.timedelta64, dimensions=3, strict_data_typing=True),
100100
]
101101

0 commit comments

Comments
 (0)