Fix: numpy_model.model_json_schema() error, removed the use of the ha…

…ndler

Testing: Format check in CI
Chore: Version bump, PATCH

.github/workflows/test.yaml

@@ -58,11 +58,37 @@ jobs:
 
       - name: Install dependencies
         run: |
-          poetry install --all-extras --with dev --with ci
+          poetry install --all-extras --with dev,typecheck
 
       - name: Validate type-hints with MyPy
         run: |
           poetry run mypy --ignore-missing-imports \
           --follow-imports=skip \
           --strict-optional \
           -p pydantic_numpy
+
+  format:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: [ "3.11" ]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup the Python Environment ${{ matrix.python-version }}
+        uses: Qwerty-133/python-setup@v1
+        with:
+          python-version: ${{ matrix.python-version }}
+          skip-pre-commit: true
+
+      - name: Install dependencies
+        run: |
+          poetry install --all-extras --with format
+
+      - name: Check code formatting
+        run: |
+          poetry run black . --check --diff
+          poetry run isort . --check --diff
+          poetry run ruff check .

Justfile

@@ -1,13 +1,13 @@
 
 
 format:
-	black .
-	isort .
-	ruff check . --fix
+	poetry run black .
+	poetry run isort .
+	poetry run ruff check . --fix
 	@echo "Formatting complete 🎉"
 
 mypy:
-	mypy --ignore-missing-imports \
+	poetry run mypy --ignore-missing-imports \
 	--follow-imports=skip \
 	--strict-optional \
 	-p pydantic_numpy

pydantic_numpy/helper/annotation.py

@@ -77,16 +77,14 @@ def __get_pydantic_core_schema__(
 
     @classmethod
     def __get_pydantic_json_schema__(
-        cls, _core_schema: core_schema.CoreSchema, handler: GetJsonSchemaHandler
+        cls, _core_schema: core_schema.CoreSchema, _handler: GetJsonSchemaHandler
     ) -> JsonSchemaValue:
-        return handler(
-            dict(
-                type=(
-                    f"np.ndarray[{_int_to_dim_type[cls.dimensions] if cls.dimensions else 'Any'}, "
-                    f"{np.dtype[cls.data_type.__name__] if _data_type_resolver(cls.data_type) else cls.data_type}]"  # type: ignore[name-defined]
-                ),
-                strict_data_typing=cls.strict_data_typing,
-            )
+        return dict(
+            type=(
+                f"np.ndarray[{_int_to_dim_type[cls.dimensions] if cls.dimensions else 'Any'}, "
+                f"np.dtype[{cls.data_type.__name__ if _data_type_resolver(cls.data_type) else 'Any'}]"
+            ),
+            strict_data_typing=cls.strict_data_typing,
         )
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydantic_numpy"
-version = "3.1.4"
+version = "3.1.5"
 description = "Pydantic Model integration of the NumPy array"
 authors = ["Can H. Tartanoglu", "Christoph Heindl"]
 maintainers = ["Can H. Tartanoglu <[email protected]>"]
@@ -32,9 +32,13 @@ parameterized = "^0.9.0"
 hypothesis = "^6.82.0"
 setuptools = "^68.0.0"
 
+[tool.poetry.group.format.dependencies]
+black = "^23.7.0"
+isort = "^5.12.0"
+ruff = "^0.0.285"
 
-[tool.poetry.group.ci.dependencies]
-mypy = "^1.4.1"
+[tool.poetry.group.typecheck.dependencies]
+mypy = "*"
 
 [tool.black]
 line-length = 120
@@ -46,6 +50,7 @@ profile = "black"
 [tool.ruff]
 line-length = 120
 ignore-init-module-imports = true
+ignore = ["F401", "F403", "F405"]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

tests/helper/cache.py

@@ -1,9 +1,7 @@
 from functools import cache
 from typing import Optional
 
-import numpy as np
 import numpy.typing as npt
-from hypothesis import strategies as st
 from hypothesis.extra.numpy import arrays
 from pydantic import BaseModel
 

tests/test_np_model.py

@@ -4,7 +4,6 @@
 
 import numpy as np
 import pytest
-from hypothesis.extra.numpy import arrays
 
 from pydantic_numpy.model import NumpyModel
 from pydantic_numpy.model.np_model import model_agnostic_load

tests/test_pydantic.py

@@ -0,0 +1,10 @@
+from pydantic_numpy.model import NumpyModel
+from pydantic_numpy.typing import NpNDArray
+
+
+class TestModel(NumpyModel):
+    array: NpNDArray
+
+
+def test_model_json_schema():
+    assert TestModel.model_json_schema()

tests/test_typing.py

@@ -6,9 +6,6 @@
 import numpy as np
 import numpy.typing as npt
 import pytest
-from hypothesis.extra import numpy
-from hypothesis.extra.numpy import arrays
-from hypothesis import strategies as st, given
 from pydantic import ValidationError
 
 from pydantic_numpy.helper.validation import PydanticNumpyMultiArrayNumpyFileOnFilePath