move the JSON schema to the scisave library

Author: otvam

.github/envs/env_conda.txt

@@ -6,7 +6,6 @@
 # logging and serialization
 scilogger>=1.2.4
 scisave>=1.4.5
-jsonschema>=4.23.0
 
 # numerical libraries
 numpy>=1.24.0

.github/envs/env_pypi.txt

@@ -6,7 +6,6 @@
 # logging and serialization
 scilogger>=1.2.4
 scisave>=1.4.5
-jsonschema>=4.23.0
 
 # numerical libraries
 numpy>=1.24.0

.github/envs/requirements.txt

@@ -6,7 +6,6 @@
 # logging and serialization
 scilogger==1.2.4
 scisave==1.4.5
-jsonschema==4.23.0
 
 # numerical libraries
 numpy==2.1.3

Dockerfile

@@ -22,7 +22,6 @@ LABEL org.opencontainers.image.licenses="MPL-2.0 and others"
 RUN mamba install --yes --channel conda-forge \
     scilogger==1.2.4=pyhd8ed1ab_0 \
     scisave==1.4.5=pyhd8ed1ab_0 \
-    jsonschema==4.23.0=pyhd8ed1ab_0 \
     numpy==2.1.3=py312h58c1407_0 \
     scipy==1.14.1=py312h62794b6_1 \
     joblib==1.4.2=pyhd8ed1ab_0 \

conda.yaml

@@ -36,7 +36,6 @@ dependencies:
   # logging and serialization
   - scilogger=1.2.4
   - scisave=1.4.5
-  - jsonschema=4.23.0
   # numerical libraries
   - numpy=2.1.3
   - scipy=1.14.1

docs/content/technical.rst

@@ -6,7 +6,7 @@ Dependencies and Platforms
 
 **PyPEEC** is entirely programmed in **Python 3** and has the following **dependencies**:
 
-* SciLogger, SciSave, and jsonschema (logging and serialization)
+* SciLogger and SciSave (logging and serialization)
 * NumPy, SciPy, and Joblib (basic numerical computing libraries)
 * Shapely and Rasterio (only used for the mesher, 2D shape manipulation)
 * Pillow (only used for the mesher, 2D image manipulation)

pypeec/lib_check/check_data_format.py

@@ -17,8 +17,6 @@
 __license__ = "Mozilla Public License Version 2.0"
 
 import importlib.resources
-import numpy as np
-import jsonschema
 import scisave
 
 # static data folder
@@ -32,87 +30,41 @@
 SCHEMA_PLOTTER = scisave.load_config(folder.joinpath("schema_list_plotter.yaml"))
 
 
-def _get_strict_validator():
-    """
-    Create a strict validator for numerics (integer and floating).
-    Cast NumPy arrays as lists for the type check.
-    """
-
-    def get_int(_, instance):
-        return np.issubdtype(type(instance), np.integer)
-
-    def get_float(_, instance):
-        return np.issubdtype(type(instance), np.floating)
-
-    def get_array(_, instance):
-        if isinstance(instance, np.ndarray):
-            return jsonschema.Draft202012Validator.TYPE_CHECKER.is_type(instance.tolist(), "array")
-        else:
-            return jsonschema.Draft202012Validator.TYPE_CHECKER.is_type(instance, "array")
-
-    # custom type checker
-    type_checker = jsonschema.Draft202012Validator.TYPE_CHECKER
-    type_checker = type_checker.redefine("number", get_float)
-    type_checker = type_checker.redefine("integer", get_int)
-    type_checker = type_checker.redefine("array", get_array)
-
-    # custom validator
-    StrictValidator = jsonschema.validators.extend(
-        jsonschema.Draft202012Validator,
-        type_checker=type_checker,
-    )
-
-    return StrictValidator
-
-
-def _get_validate_schema(data, schema):
-    """
-    Validate data with strict validator for numerics.
-    """
-
-    # get type checker
-    StrictValidator = _get_strict_validator()
-
-    # validate schema
-    validator = StrictValidator(schema=schema)
-    validator.validate(data)
-
-
 def check_data_geometry(data_geometry):
     """
     Check the mesher geometry data.
     """
 
-    _get_validate_schema(data_geometry, SCHEMA_GEOMETRY)
+    scisave.validate_schema(data_geometry, SCHEMA_GEOMETRY)
 
 
 def check_data_problem(data_problem):
     """
     Check the solver problem data.
     """
 
-    _get_validate_schema(data_problem, SCHEMA_PROBLEM)
+    scisave.validate_schema(data_problem, SCHEMA_PROBLEM)
 
 
 def check_data_tolerance(data_tolerance):
     """
     Check the solver tolerance data.
     """
 
-    _get_validate_schema(data_tolerance, SCHEMA_TOLERANCE)
+    scisave.validate_schema(data_tolerance, SCHEMA_TOLERANCE)
 
 
 def check_data_viewer(data_viewer):
     """
     Check the viewer data.
     """
 
-    _get_validate_schema(data_viewer, SCHEMA_VIEWER)
+    scisave.validate_schema(data_viewer, SCHEMA_VIEWER)
 
 
 def check_data_plotter(data_tolerance):
     """
     Check the plotter data.
     """
 
-    _get_validate_schema(data_tolerance, SCHEMA_PLOTTER)
+    scisave.validate_schema(data_tolerance, SCHEMA_PLOTTER)

pypeec/lib_check/check_data_options.py

@@ -9,7 +9,7 @@
 __copyright__ = "Thomas Guillod - Dartmouth College"
 __license__ = "Mozilla Public License Version 2.0"
 
-import jsonschema
+import scisave
 
 
 def check_tag_list(data_check, tag_list):
@@ -29,7 +29,7 @@ def check_tag_list(data_check, tag_list):
     }
 
     # validate base schema
-    jsonschema.validate(instance=tag_list, schema=schema)
+    scisave.validate_schema(tag_list, schema)
 
     # check tag
     if tag_list is not None:
@@ -48,15 +48,15 @@ def check_plot_options(plot_mode, folder, name):
         "type": ["null", "string"],
         "enum": [None, "qt", "nb_int", "nb_std", "save", "debug"],
     }
-    jsonschema.validate(instance=plot_mode, schema=schema)
+    scisave.validate_schema(plot_mode, schema)
 
     # check folder and name
     schema = {
         "type": ["null", "string"],
         "minLength": 1,
     }
-    jsonschema.validate(instance=folder, schema=schema)
-    jsonschema.validate(instance=name, schema=schema)
+    scisave.validate_schema(folder, schema)
+    scisave.validate_schema(name, schema)
 
 
 def check_data_voxel(data_voxel):
@@ -77,7 +77,7 @@ def check_data_voxel(data_voxel):
     }
 
     # validate base schema
-    jsonschema.validate(instance=data_voxel, schema=schema)
+    scisave.validate_schema(data_voxel, schema)
 
     # extract fields
     status = data_voxel["status"]
@@ -105,7 +105,7 @@ def check_data_solution(data_solution):
     }
 
     # validate base schema
-    jsonschema.validate(instance=data_solution, schema=schema)
+    scisave.validate_schema(data_solution, schema)
 
     # extract fields
     status = data_solution["status"]

pyproject.toml

@@ -53,7 +53,6 @@ classifiers = [
 dependencies = [
     "scilogger >= 1.2.4",
     "scisave >= 1.4.5",
-    "jsonschema >= 4.23.0",
     "joblib >= 1.3.0",
     "numpy >= 1.24.0",
     "scipy >= 1.12.0",