WIP

rudof-project · Nov 13, 2024 · cd64b11 · cd64b11
1 parent 3193851
commit cd64b11
Show file tree

Hide file tree

Showing 88 changed files with 854 additions and 572 deletions.
diff --git a/rudof_cli/src/main.rs b/rudof_cli/src/main.rs
@@ -35,7 +35,7 @@ use shapes_converter::{ImageFormat, ShEx2Html, ShEx2Uml, Shacl2ShEx, Tap2ShEx, U
 use shex_ast::object_value::ObjectValue;
 use shex_ast::{ShapeExprLabel, SimpleReprSchema};
 use sparql_service::{QueryConfig, RdfData, ServiceDescription};
-use srdf::srdf_graph::SRDFGraph;
+use srdf::srdf_graph::GenericGraph;
 use srdf::{
     QuerySolution, RDFFormat, RdfDataConfig, ReaderMode, SRDFBuilder, SRDFSparql, VarName, SRDF,
 };
@@ -1509,8 +1509,8 @@ fn parse_data(
     data_format: &DataFormat,
     reader_mode: &RDFReaderMode,
     config: &RdfDataConfig,
-) -> Result<SRDFGraph> {
-    let mut graph = SRDFGraph::new();
+) -> Result<GenericGraph> {
+    let mut graph = GenericGraph::new();
     let rdf_format = data_format2rdf_format(data_format);
     for d in data {
         let reader = d.open_read(Some(data_format.mime_type().as_str()))?;

diff --git a/rudof_lib/src/rudof.rs b/rudof_lib/src/rudof.rs
@@ -9,7 +9,7 @@ use shex_ast::compiled::compiled_schema::CompiledSchema;
 use shex_compact::ShExParser;
 use shex_validation::{ResolveMethod, SchemaWithoutImports};
 use sparql_service::RdfData;
-use srdf::{FocusRDF, SRDFGraph};
+use srdf::{FocusRDF, GenericGraph};
 use std::fmt::Debug;
 use std::path::Path;
 use std::str::FromStr;
@@ -247,7 +247,7 @@ impl Rudof {
                 }
                 _ => {
                     let data_format = shacl_format2rdf_format(format)?;
-                    let mut shacl_writer: ShaclWriter<SRDFGraph> = ShaclWriter::new();
+                    let mut shacl_writer: ShaclWriter<GenericGraph> = ShaclWriter::new();
                     shacl_writer
                         .write(shacl)
                         .map_err(|e| RudofError::WritingSHACL {
@@ -305,7 +305,7 @@ impl Rudof {
         }?;
 
         let rdf_graph =
-            SRDFGraph::from_reader(reader, &format, base, reader_mode).map_err(|e| {
+            GenericGraph::from_reader(reader, &format, base, reader_mode).map_err(|e| {
                 RudofError::ReadError {
                     error: format!("{e}"),
                 }

diff --git a/shacl_ast/Cargo.toml b/shacl_ast/Cargo.toml
@@ -10,14 +10,16 @@ homepage.workspace = true
 repository.workspace = true
 
 [features]
-rdf-star = ["oxrdf/rdf-star", "srdf/rdf-star"]
+# rdf-star = ["oxrdf/rdf-star", "srdf/rdf-star"]
+rdf-star = []
 
 [dependencies]
 api = { workspace = true }
-srdf = { workspace = true }
+# srdf = { workspace = true }
 iri_s = { workspace = true }
 rbe = { workspace = true }
 prefixmap = { workspace = true }
+
 serde = "1"
 serde_derive = "1"
 void = "1"

diff --git a/shacl_ast/src/ast/component.rs b/shacl_ast/src/ast/component.rs
@@ -11,7 +11,6 @@ use iri_s::{iri, IriS};
 use itertools::Itertools;
 use oxrdf::{Literal as OxLiteral, NamedNode, Term as OxTerm};
 use prefixmap::IriRef;
-use srdf::{lang::Lang, literal::Literal, RDFNode, SRDFBuilder, XSD_INTEGER_STR};
 use std::fmt::Display;
 
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]

diff --git a/shacl_ast/src/ast/message_map.rs b/shacl_ast/src/ast/message_map.rs
@@ -1,5 +1,4 @@
 use oxrdf::{Literal as OxLiteral, Term as OxTerm};
-use srdf::lang::Lang;
 use std::collections::HashMap;
 use std::str::FromStr;
 

diff --git a/shacl_ast/src/ast/node_shape.rs b/shacl_ast/src/ast/node_shape.rs
@@ -5,7 +5,6 @@ use crate::{
 };
 use iri_s::iri;
 use oxrdf::{Literal as OxLiteral, Term as OxTerm};
-use srdf::{RDFNode, SRDFBuilder};
 use std::fmt::Display;
 
 #[derive(Debug, Clone)]

diff --git a/shacl_ast/src/ast/property_shape.rs b/shacl_ast/src/ast/property_shape.rs
@@ -1,9 +1,5 @@
 use iri_s::{iri, IriS};
 use oxrdf::{BlankNode, Literal as OxLiteral, NamedNode, Subject, Term as OxTerm};
-use srdf::{
-    numeric_literal::NumericLiteral, RDFNode, SHACLPath, SRDFBuilder, SRDFGraph, SRDF,
-    XSD_DECIMAL_STR,
-};
 use std::{collections::HashSet, fmt::Display};
 
 use crate::{

diff --git a/shacl_ast/src/ast/schema.rs b/shacl_ast/src/ast/schema.rs
@@ -3,7 +3,6 @@ use std::{collections::HashMap, fmt::Display};
 use crate::shape::Shape;
 use iri_s::IriS;
 use prefixmap::PrefixMap;
-use srdf::RDFNode;
 
 #[derive(Debug, Clone, Default)]
 pub struct Schema {

diff --git a/shacl_ast/src/ast/shacl_error.rs b/shacl_ast/src/ast/shacl_error.rs
@@ -1,4 +1,3 @@
-use srdf::RDFNode;
 use thiserror::Error;
 
 #[derive(Debug, Error)]

diff --git a/shacl_ast/src/ast/shape.rs b/shacl_ast/src/ast/shape.rs
@@ -1,4 +1,3 @@
-use srdf::SRDFBuilder;
 use std::fmt::Display;
 
 use crate::{node_shape::NodeShape, property_shape::PropertyShape};

diff --git a/shacl_ast/src/ast/target.rs b/shacl_ast/src/ast/target.rs
@@ -3,7 +3,6 @@ use std::fmt::Display;
 
 use crate::{SH_TARGET_CLASS_STR, SH_TARGET_NODE_STR};
 use prefixmap::IriRef;
-use srdf::{RDFNode, SRDFBuilder};
 
 #[derive(Debug, Clone)]
 pub enum Target {

diff --git a/shacl_ast/src/ast/value.rs b/shacl_ast/src/ast/value.rs
@@ -2,7 +2,6 @@ use std::fmt::Display;
 
 use iri_s::IriS;
 use prefixmap::IriRef;
-use srdf::literal::Literal;
 
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
 pub enum Value {

diff --git a/shacl_ast/src/compiled/component.rs b/shacl_ast/src/compiled/component.rs
@@ -12,8 +12,6 @@ use super::shape::CompiledShape;
 use iri_s::iri;
 use iri_s::IriS;
 use node_kind::NodeKind;
-use srdf::RDFNode;
-use srdf::SRDFBasic;
 
 #[derive(Debug)]
 pub enum CompiledComponent<S: SRDFBasic> {

diff --git a/shacl_ast/src/compiled/mod.rs b/shacl_ast/src/compiled/mod.rs
@@ -1,11 +1,6 @@
 use compiled_shacl_error::CompiledShaclError;
 use prefixmap::IriRef;
 use shape::CompiledShape;
-use srdf::lang::Lang;
-use srdf::literal::Literal;
-use srdf::Object;
-use srdf::RDFNode;
-use srdf::SRDFBasic;
 
 use crate::value::Value;
 use crate::Schema;

diff --git a/shacl_ast/src/compiled/node_shape.rs b/shacl_ast/src/compiled/node_shape.rs
@@ -1,7 +1,5 @@
 use std::collections::HashSet;
 
-use srdf::SRDFBasic;
-
 use crate::node_shape::NodeShape;
 use crate::Schema;
 

diff --git a/shacl_ast/src/compiled/property_shape.rs b/shacl_ast/src/compiled/property_shape.rs
@@ -1,8 +1,5 @@
 use std::collections::HashSet;
 
-use srdf::SHACLPath;
-use srdf::SRDFBasic;
-
 use crate::property_shape::PropertyShape;
 use crate::Schema;
 

diff --git a/shacl_ast/src/compiled/schema.rs b/shacl_ast/src/compiled/schema.rs
@@ -5,7 +5,6 @@ use api::model::rdf::Predicate;
 use api::model::rdf::Rdf;
 use api::model::Subject;
 use prefixmap::PrefixMap;
-use srdf::SRDFBasic;
 
 use crate::Schema;
 

diff --git a/shacl_ast/src/compiled/severity.rs b/shacl_ast/src/compiled/severity.rs
@@ -1,6 +1,5 @@
 use iri_s::iri;
 use iri_s::IriS;
-use srdf::SRDFBasic;
 
 use crate::severity::Severity;
 use crate::*;

diff --git a/shacl_ast/src/compiled/shape.rs b/shacl_ast/src/compiled/shape.rs
@@ -1,5 +1,3 @@
-use srdf::SRDFBasic;
-
 use crate::shape::Shape;
 use crate::Schema;
 

diff --git a/shacl_ast/src/compiled/target.rs b/shacl_ast/src/compiled/target.rs
@@ -1,5 +1,3 @@
-use srdf::SRDFBasic;
-
 use crate::target::Target;
 
 use super::compiled_shacl_error::CompiledShaclError;

diff --git a/shacl_ast/src/converter/rdf_to_shacl/shacl_parser_error.rs b/shacl_ast/src/converter/rdf_to_shacl/shacl_parser_error.rs
@@ -1,15 +1,8 @@
 use crate::ShaclError;
-use srdf::RDFParseError;
 use thiserror::Error;
 
 #[derive(Debug, Error)]
 pub enum ShaclParserError {
-    #[error("RDF parse error: {err}")]
-    RDFParseError {
-        #[from]
-        err: RDFParseError,
-    },
-
     #[error("Expected RDFNode parsing node shape, found: {term}")]
     ExpectedRDFNodeNodeShape { term: String },
 

diff --git a/shacl_validation/Cargo.toml b/shacl_validation/Cargo.toml
@@ -12,12 +12,13 @@ categories.workspace = true
 edition.workspace = true
 
 [features]
-rdf-star = ["srdf/rdf-star"]
+rdf-star = [] # TODO: API with the rdf-star feature
 
 [dependencies]
 api = { workspace = true }
-iri_s = { workspace = true }
-prefixmap = { workspace = true }
+shacl_ast = { workspace = true }
+iri_s = { workspace = true }     # TODO: is this necessary?
+prefixmap = { workspace = true } # TODO: is this necessary?
 
 serde = { version = "1.0", features = ["derive"] } # needed for the config thing
 thiserror = { workspace = true }                   # needed for the definition of errors
@@ -28,6 +29,6 @@ clap = { workspace = true }                        # needed for creating the Val
 serde_yml = { workspace = true }                   # needed for the config thing
 colored = { workspace = true }
 
-[dev-dependencies]
+[dev-dependencies] # necessary for the tests
 sparql_service = { workspace = true }
 oxrdf = { workspace = true }
diff --git a/shacl_validation/src/constraints/core/cardinality/max_count.rs b/shacl_validation/src/constraints/core/cardinality/max_count.rs
@@ -31,26 +31,25 @@ impl<T: Triple> Validator<T> for MaxCount {
         value_nodes: &ValueNodes<S>,
         subsetting: &Subsetting,
     ) -> Result<Vec<ValidationResult>, ConstraintError> {
-        let max_count = |targets: &FocusNodes<S>| targets.len() > self.max_count();
         validate_native_with_strategy(
             component,
             shape,
             value_nodes,
             FocusNodeIteration,
-            max_count,
+            |targets: &FocusNodes<S>| targets.len() > self.max_count(),
             subsetting,
         )
     }
 }
 
 // TODO: is it necessary having a 'static?
-impl<S: SRDF + Debug + 'static> NativeValidator<S> for MaxCount {
+impl<R: Rdf> NativeValidator<R> for MaxCount {
     fn validate_native(
         &self,
-        component: &CompiledComponent<S>,
-        shape: &CompiledShape<S>,
-        store: &Store<S>,
-        value_nodes: &ValueNodes<S>,
+        component: &CompiledComponent<R>,
+        shape: &CompiledShape<R>,
+        store: &Store<R>,
+        value_nodes: &ValueNodes<R>,
         subsetting: &Subsetting,
     ) -> Result<Vec<ValidationResult>, ConstraintError> {
         self.validate(

diff --git a/shacl_validation/src/constraints/core/cardinality/min_count.rs b/shacl_validation/src/constraints/core/cardinality/min_count.rs
@@ -52,10 +52,10 @@ impl<T: Triple> Validator<T> for MinCount {
 impl<R: Rdf> NativeValidator<R> for MinCount {
     fn validate_native(
         &self,
-        component: &CompiledComponent<S>,
-        shape: &CompiledShape<S>,
-        store: &Store<S>,
-        value_nodes: &ValueNodes<S>,
+        component: &CompiledComponent<R>,
+        shape: &CompiledShape<R>,
+        store: &Store<R>,
+        value_nodes: &ValueNodes<R>,
         subsetting: &Subsetting,
     ) -> Result<Vec<ValidationResult>, ConstraintError> {
         self.validate(

diff --git a/shacl_validation/src/constraints/core/logical/and.rs b/shacl_validation/src/constraints/core/logical/and.rs
@@ -61,10 +61,10 @@ impl<T: Triple> Validator<T> for And<R> {
 impl<R: Rdf> NativeValidator<R> for And<S> {
     fn validate_native(
         &self,
-        component: &CompiledComponent<S>,
-        shape: &CompiledShape<S>,
-        store: &Store<S>,
-        value_nodes: &ValueNodes<S>,
+        component: &CompiledComponent<R>,
+        shape: &CompiledShape<R>,
+        store: &Store<R>,
+        value_nodes: &ValueNodes<R>,
         subsetting: &Subsetting,
     ) -> Result<Vec<ValidationResult>, ConstraintError> {
         self.validate(

diff --git a/shacl_validation/src/constraints/core/logical/not.rs b/shacl_validation/src/constraints/core/logical/not.rs
@@ -55,10 +55,10 @@ impl<T: Triple> Validator<T> for Not<S> {
 impl<R: Rdf> NativeValidator<R> for Not<S> {
     fn validate_native(
         &self,
-        component: &CompiledComponent<S>,
-        shape: &CompiledShape<S>,
-        store: &Store<S>,
-        value_nodes: &ValueNodes<S>,
+        component: &CompiledComponent<R>,
+        shape: &CompiledShape<R>,
+        store: &Store<R>,
+        value_nodes: &ValueNodes<R>,
         subsetting: &Subsetting,
     ) -> Result<Vec<ValidationResult>, ConstraintError> {
         self.validate(

diff --git a/shacl_validation/src/constraints/core/logical/or.rs b/shacl_validation/src/constraints/core/logical/or.rs
@@ -65,10 +65,10 @@ impl<T: Triple> Validator<T> for Or<S> {
 impl<R: Rdf> NativeValidator<R> for Or<S> {
     fn validate_native(
         &self,
-        component: &CompiledComponent<S>,
-        shape: &CompiledShape<S>,
-        store: &Store<S>,
-        value_nodes: &ValueNodes<S>,
+        component: &CompiledComponent<R>,
+        shape: &CompiledShape<R>,
+        store: &Store<R>,
+        value_nodes: &ValueNodes<R>,
         subsetting: &Subsetting,
     ) -> Result<Vec<ValidationResult>, ConstraintError> {
         self.validate(

diff --git a/shacl_validation/src/constraints/core/logical/xone.rs b/shacl_validation/src/constraints/core/logical/xone.rs
@@ -61,10 +61,10 @@ impl<T: Triple> Validator<T> for Xone<S> {
 impl<R: Rdf> NativeValidator<R> for Xone<S> {
     fn validate_native(
         &self,
-        component: &CompiledComponent<S>,
-        shape: &CompiledShape<S>,
-        store: &Store<S>,
-        value_nodes: &ValueNodes<S>,
+        component: &CompiledComponent<R>,
+        shape: &CompiledShape<R>,
+        store: &Store<R>,
+        value_nodes: &ValueNodes<R>,
         subsetting: &Subsetting,
     ) -> Result<Vec<ValidationResult>, ConstraintError> {
         self.validate(

diff --git a/shacl_validation/src/constraints/core/other/closed.rs b/shacl_validation/src/constraints/core/other/closed.rs
@@ -36,10 +36,10 @@ impl<T: Triple> Validator<T> for Closed<S> {
 impl<R: Rdf> NativeValidator<R> for Closed<S> {
     fn validate_native(
         &self,
-        component: &CompiledComponent<S>,
-        shape: &CompiledShape<S>,
-        store: &Store<S>,
-        value_nodes: &ValueNodes<S>,
+        component: &CompiledComponent<R>,
+        shape: &CompiledShape<R>,
+        store: &Store<R>,
+        value_nodes: &ValueNodes<R>,
         subsetting: &Subsetting,
     ) -> Result<Vec<ValidationResult>, ConstraintError> {
         self.validate(

diff --git a/shacl_validation/src/constraints/core/other/has_value.rs b/shacl_validation/src/constraints/core/other/has_value.rs
@@ -48,10 +48,10 @@ impl<T: Triple> Validator<T> for HasValue<S> {
 impl<R: Rdf> NativeValidator<R> for HasValue<S> {
     fn validate_native(
         &self,
-        component: &CompiledComponent<S>,
-        shape: &CompiledShape<S>,
-        store: &Store<S>,
-        value_nodes: &ValueNodes<S>,
+        component: &CompiledComponent<R>,
+        shape: &CompiledShape<R>,
+        store: &Store<R>,
+        value_nodes: &ValueNodes<R>,
         subsetting: &Subsetting,
     ) -> Result<Vec<ValidationResult>, ConstraintError> {
         self.validate(

diff --git a/shacl_validation/src/constraints/core/other/in.rs b/shacl_validation/src/constraints/core/other/in.rs
@@ -45,10 +45,10 @@ impl<T: Triple> Validator<T> for In<S> {
 impl<R: Rdf> NativeValidator<R> for In<S> {
     fn validate_native(
         &self,
-        component: &CompiledComponent<S>,
-        shape: &CompiledShape<S>,
-        store: &Store<S>,
-        value_nodes: &ValueNodes<S>,
+        component: &CompiledComponent<R>,
+        shape: &CompiledShape<R>,
+        store: &Store<R>,
+        value_nodes: &ValueNodes<R>,
         subsetting: &Subsetting,
     ) -> Result<Vec<ValidationResult>, ConstraintError> {
         self.validate(