Upgrade pyshacl and replace Validator with validate function (#338)

kgforge/specializations/models/rdf/directory_service.py

@@ -15,7 +15,7 @@
 from pathlib import Path
 from typing import Dict, Tuple
 
-from pyshacl import Validator
+from pyshacl import validate
 from rdflib import Graph, URIRef
 from rdflib.util import guess_format
 
@@ -44,8 +44,7 @@ def materialize(self, iri: URIRef) -> NodeProperties:
         return NodeProperties(**attrs)
 
     def _validate(self, iri: str, data_graph: Graph) -> Tuple[bool, Graph, str]:
-        validator = Validator(data_graph, shacl_graph=self._graph)
-        return validator.run()
+        return validate(data_graph, shacl_graph=self._graph)
 
     def resolve_context(self, iri: str) -> Dict:
         if iri in self._context_cache:

kgforge/specializations/models/rdf/store_service.py

@@ -15,7 +15,7 @@
 
 import json
 
-from pyshacl import Validator
+from pyshacl import validate
 
 from kgforge.core import Resource
 from kgforge.core.commons.exceptions import RetrievalError
@@ -60,8 +60,7 @@ def materialize(self, iri: URIRef) -> NodeProperties:
     def _validate(self, iri: str, data_graph: Graph) -> Tuple[bool, Graph, str]:
         # _type_shape will make sure all the shapes for this type are in the graph
         self._type_shape(iri)
-        validator = Validator(data_graph, shacl_graph=self._graph)
-        return validator.run()
+        return validate(data_graph, shacl_graph=self._graph)
 
     def resolve_context(self, iri: str) -> Dict:
         if iri in self._context_cache:

setup.py

@@ -45,9 +45,9 @@
         "pandas",
         "nexus-sdk",
         "aiohttp",
-        "rdflib==6.2.0",
+        "rdflib==6.3.2",
         "pyLD",
-        "pyshacl==v0.17.2",
+        "pyshacl==v0.23.0",
         "nest-asyncio>=1.5.1",
         "pyparsing>=2.0.2",
         "owlrl>=5.2.3",