From 2df147a86c65ec455daec555b9ea4f397a617b14 Mon Sep 17 00:00:00 2001 From: kchason Date: Mon, 24 Jul 2023 20:36:21 -0400 Subject: [PATCH 01/18] Add validate() function for programmatic access --- case_utils/case_validate/__init__.py | 246 ++++++++++++++++++--------- 1 file changed, 167 insertions(+), 79 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 5ef2952..1b0a249 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -36,11 +36,12 @@ import logging import os import sys -import typing import warnings +from typing import Optional, Set, Union, Dict, Tuple import pyshacl # type: ignore import rdflib +from rdflib import Graph import case_utils.ontology from case_utils.ontology.version_info import ( @@ -64,13 +65,168 @@ class NonExistentCDOConceptWarning(UserWarning): pass +class ValidationResult: + conforms: bool + graph: Graph + text: str + undefined_concepts: Set[rdflib.URIRef] + + def concept_is_cdo_concept(n_concept: rdflib.URIRef) -> bool: + """ + Determine if a concept is part of the CDO ontology. + + :param n_concept: The concept to check. + :return: whether the concept is part of the CDO ontology. + """ concept_iri = str(n_concept) return concept_iri.startswith( "https://ontology.unifiedcyberontology.org/" ) or concept_iri.startswith("https://ontology.caseontology.org/") +def get_ontology_graph(case_version: Optional[str] = None, + supplemental_graphs: Optional[list[str]] = None) -> rdflib.Graph: + """ + Get the ontology graph for the given case_version and any supplemental graphs. + + :param case_version: the version of the CASE ontology to use. If None, the most recent version will be used. + :param supplemental_graphs: a list of supplemental graphs to use. If None, no supplemental graphs will be used. + :return: the ontology graph against which to validate the data graph. + """ + ontology_graph = rdflib.Graph() + if case_version and case_version != "none": + ttl_filename = case_version + ".ttl" + _logger.debug("ttl_filename = %r.", ttl_filename) + ttl_data = importlib.resources.read_text(case_utils.ontology, ttl_filename) + ontology_graph.parse(data=ttl_data, format="turtle") + if supplemental_graphs: + for arg_ontology_graph in supplemental_graphs: + _logger.debug("arg_ontology_graph = %r.", arg_ontology_graph) + ontology_graph.parse(arg_ontology_graph) + return ontology_graph + + +def get_invalid_cdo_concepts(data_graph: Graph, ontology_graph: Graph) -> Set[rdflib.URIRef]: + """ + Get the set of concepts in the data graph that are not part of the CDO ontology. + + :param data_graph: The data graph to validate. + :param ontology_graph: The ontology graph to use for validation. + :return: The list of concepts in the data graph that are not part of the CDO ontology. + """ + # Construct set of CDO concepts for data graph concept-existence review. + cdo_concepts: Set[rdflib.URIRef] = set() + + for n_structural_class in [ + NS_OWL.Class, + NS_OWL.AnnotationProperty, + NS_OWL.DatatypeProperty, + NS_OWL.ObjectProperty, + NS_RDFS.Datatype, + NS_SH.NodeShape, + NS_SH.PropertyShape, + NS_SH.Shape, + ]: + for ontology_triple in ontology_graph.triples( + (None, NS_RDF.type, n_structural_class) + ): + if not isinstance(ontology_triple[0], rdflib.URIRef): + continue + if concept_is_cdo_concept(ontology_triple[0]): + cdo_concepts.add(ontology_triple[0]) + for n_ontology_predicate in [ + NS_OWL.backwardCompatibleWith, + NS_OWL.imports, + NS_OWL.incompatibleWith, + NS_OWL.priorVersion, + NS_OWL.versionIRI, + ]: + for ontology_triple in ontology_graph.triples( + (None, n_ontology_predicate, None) + ): + assert isinstance(ontology_triple[0], rdflib.URIRef) + assert isinstance(ontology_triple[2], rdflib.URIRef) + cdo_concepts.add(ontology_triple[0]) + cdo_concepts.add(ontology_triple[2]) + for ontology_triple in ontology_graph.triples((None, NS_RDF.type, NS_OWL.Ontology)): + if not isinstance(ontology_triple[0], rdflib.URIRef): + continue + cdo_concepts.add(ontology_triple[0]) + + # Also load historical ontology and version IRIs. + ontology_and_version_iris_data = importlib.resources.read_text( + case_utils.ontology, "ontology_and_version_iris.txt" + ) + for line in ontology_and_version_iris_data.split("\n"): + cleaned_line = line.strip() + if cleaned_line == "": + continue + cdo_concepts.add(rdflib.URIRef(cleaned_line)) + + data_cdo_concepts: Set[rdflib.URIRef] = set() + for data_triple in data_graph.triples((None, None, None)): + for data_triple_member in data_triple: + if isinstance(data_triple_member, rdflib.URIRef): + if concept_is_cdo_concept(data_triple_member): + data_cdo_concepts.add(data_triple_member) + elif isinstance(data_triple_member, rdflib.Literal): + if isinstance(data_triple_member.datatype, rdflib.URIRef): + if concept_is_cdo_concept(data_triple_member.datatype): + data_cdo_concepts.add(data_triple_member.datatype) + + return data_cdo_concepts - cdo_concepts + + +def validate(input_file: str, case_version: Optional[str] = None, supplemental_graphs: Optional[list[str]] = None, + abort_on_first: bool = False) -> ValidationResult: + """ + Validate the given data graph against the given CASE ontology version and supplemental graphs. + + :param input_file: The path to the file containing the data graph to validate. + :param case_version: The version of the CASE ontology to use. If None, the most recent version will be used. + :param supplemental_graphs: The supplemental graphs to use. If None, no supplemental graphs will be used. + :param abort_on_first: Whether to abort on the first validation error. + :return: The validation result object containing the defined properties. + """ + # Convert the data graph string to a rdflib.Graph object. + data_graph = rdflib.Graph() + data_graph.parse(input_file) + + # Get the ontology graph from the case_version and supplemental_graphs arguments + ontology_graph: Graph = get_ontology_graph(case_version, supplemental_graphs) + + # Get the undefined CDO concepts + undefined_cdo_concepts = get_invalid_cdo_concepts(data_graph, ontology_graph) + + # Validate data graph against ontology graph. + validate_result: Tuple[ + bool, Union[Exception, bytes, str, rdflib.Graph], str + ] = pyshacl.validate( + data_graph, + shacl_graph=ontology_graph, + ont_graph=ontology_graph, + inference="none", + meta_shacl=False, + abort_on_first=abort_on_first, + allow_infos=False, + allow_warnings=False, + debug=False, + do_owl_imports=False, + ) + + # Relieve RAM of the data graph after validation has run. + del data_graph + + result = ValidationResult() + result.conforms = validate_result[0] + result.graph = validate_result[1] + result.text = validate_result[2] + result.undefined_cdo_concepts = undefined_cdo_concepts + + return result + + def main() -> None: parser = argparse.ArgumentParser( description="CASE wrapper to pySHACL command line tool." @@ -170,83 +326,16 @@ def main() -> None: _logger.debug("in_graph = %r.", in_graph) data_graph.parse(in_graph) - ontology_graph = rdflib.Graph() - if args.built_version != "none": - ttl_filename = args.built_version + ".ttl" - _logger.debug("ttl_filename = %r.", ttl_filename) - ttl_data = importlib.resources.read_text(case_utils.ontology, ttl_filename) - ontology_graph.parse(data=ttl_data, format="turtle") - if args.ontology_graph: - for arg_ontology_graph in args.ontology_graph: - _logger.debug("arg_ontology_graph = %r.", arg_ontology_graph) - ontology_graph.parse(arg_ontology_graph) - - # Construct set of CDO concepts for data graph concept-existence review. - cdo_concepts: typing.Set[rdflib.URIRef] = set() - - for n_structural_class in [ - NS_OWL.Class, - NS_OWL.AnnotationProperty, - NS_OWL.DatatypeProperty, - NS_OWL.ObjectProperty, - NS_RDFS.Datatype, - NS_SH.NodeShape, - NS_SH.PropertyShape, - NS_SH.Shape, - ]: - for ontology_triple in ontology_graph.triples( - (None, NS_RDF.type, n_structural_class) - ): - if not isinstance(ontology_triple[0], rdflib.URIRef): - continue - if concept_is_cdo_concept(ontology_triple[0]): - cdo_concepts.add(ontology_triple[0]) - for n_ontology_predicate in [ - NS_OWL.backwardCompatibleWith, - NS_OWL.imports, - NS_OWL.incompatibleWith, - NS_OWL.priorVersion, - NS_OWL.versionIRI, - ]: - for ontology_triple in ontology_graph.triples( - (None, n_ontology_predicate, None) - ): - assert isinstance(ontology_triple[0], rdflib.URIRef) - assert isinstance(ontology_triple[2], rdflib.URIRef) - cdo_concepts.add(ontology_triple[0]) - cdo_concepts.add(ontology_triple[2]) - for ontology_triple in ontology_graph.triples((None, NS_RDF.type, NS_OWL.Ontology)): - if not isinstance(ontology_triple[0], rdflib.URIRef): - continue - cdo_concepts.add(ontology_triple[0]) - - # Also load historical ontology and version IRIs. - ontology_and_version_iris_data = importlib.resources.read_text( - case_utils.ontology, "ontology_and_version_iris.txt" - ) - for line in ontology_and_version_iris_data.split("\n"): - cleaned_line = line.strip() - if cleaned_line == "": - continue - cdo_concepts.add(rdflib.URIRef(cleaned_line)) - - data_cdo_concepts: typing.Set[rdflib.URIRef] = set() - for data_triple in data_graph.triples((None, None, None)): - for data_triple_member in data_triple: - if isinstance(data_triple_member, rdflib.URIRef): - if concept_is_cdo_concept(data_triple_member): - data_cdo_concepts.add(data_triple_member) - elif isinstance(data_triple_member, rdflib.Literal): - if isinstance(data_triple_member.datatype, rdflib.URIRef): - if concept_is_cdo_concept(data_triple_member.datatype): - data_cdo_concepts.add(data_triple_member.datatype) + # Get the ontology graph based on the CASE version and supplemental graphs specified by the CLI + ontology_graph = get_ontology_graph(case_version=args.built_version, supplemental_graphs=args.ontology_graph) - undefined_cdo_concepts = data_cdo_concepts - cdo_concepts + # Get the list of undefined CDO concepts in the graph + undefined_cdo_concepts = get_invalid_cdo_concepts(data_graph, ontology_graph) for undefined_cdo_concept in sorted(undefined_cdo_concepts): warnings.warn(undefined_cdo_concept, NonExistentCDOConceptWarning) undefined_cdo_concepts_message = ( - "There were %d concepts with CDO IRIs in the data graph that are not in the ontology graph." - % len(undefined_cdo_concepts) + "There were %d concepts with CDO IRIs in the data graph that are not in the ontology graph." + % len(undefined_cdo_concepts) ) # Determine output format. @@ -255,14 +344,13 @@ def main() -> None: # determination by output file extension. case_validate will defer # to pySHACL behavior, as other CASE tools don't (at the time of # this writing) have the value "human" as an output format. - validator_kwargs: typing.Dict[str, str] = dict() + validator_kwargs: Dict[str, str] = dict() if args.format != "human": validator_kwargs["serialize_report_graph"] = args.format - validate_result: typing.Tuple[ - bool, typing.Union[Exception, bytes, str, rdflib.Graph], str - ] - validate_result = pyshacl.validate( + validate_result: Tuple[ + bool, Union[Exception, bytes, str, rdflib.Graph], str + ] = pyshacl.validate( data_graph, shacl_graph=ontology_graph, ont_graph=ontology_graph, From f485161889d27cd5fbdb0100ad412ba749b7fcc1 Mon Sep 17 00:00:00 2001 From: kchason Date: Mon, 24 Jul 2023 20:40:04 -0400 Subject: [PATCH 02/18] Fix pre-commit formatting --- case_utils/case_validate/__init__.py | 31 ++++++++++++++++++---------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 1b0a249..e3e816a 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -37,7 +37,7 @@ import os import sys import warnings -from typing import Optional, Set, Union, Dict, Tuple +from typing import Dict, Optional, Set, Tuple, Union import pyshacl # type: ignore import rdflib @@ -85,8 +85,9 @@ def concept_is_cdo_concept(n_concept: rdflib.URIRef) -> bool: ) or concept_iri.startswith("https://ontology.caseontology.org/") -def get_ontology_graph(case_version: Optional[str] = None, - supplemental_graphs: Optional[list[str]] = None) -> rdflib.Graph: +def get_ontology_graph( + case_version: Optional[str] = None, supplemental_graphs: Optional[list[str]] = None +) -> rdflib.Graph: """ Get the ontology graph for the given case_version and any supplemental graphs. @@ -107,7 +108,9 @@ def get_ontology_graph(case_version: Optional[str] = None, return ontology_graph -def get_invalid_cdo_concepts(data_graph: Graph, ontology_graph: Graph) -> Set[rdflib.URIRef]: +def get_invalid_cdo_concepts( + data_graph: Graph, ontology_graph: Graph +) -> Set[rdflib.URIRef]: """ Get the set of concepts in the data graph that are not part of the CDO ontology. @@ -129,7 +132,7 @@ def get_invalid_cdo_concepts(data_graph: Graph, ontology_graph: Graph) -> Set[rd NS_SH.Shape, ]: for ontology_triple in ontology_graph.triples( - (None, NS_RDF.type, n_structural_class) + (None, NS_RDF.type, n_structural_class) ): if not isinstance(ontology_triple[0], rdflib.URIRef): continue @@ -143,7 +146,7 @@ def get_invalid_cdo_concepts(data_graph: Graph, ontology_graph: Graph) -> Set[rd NS_OWL.versionIRI, ]: for ontology_triple in ontology_graph.triples( - (None, n_ontology_predicate, None) + (None, n_ontology_predicate, None) ): assert isinstance(ontology_triple[0], rdflib.URIRef) assert isinstance(ontology_triple[2], rdflib.URIRef) @@ -178,8 +181,12 @@ def get_invalid_cdo_concepts(data_graph: Graph, ontology_graph: Graph) -> Set[rd return data_cdo_concepts - cdo_concepts -def validate(input_file: str, case_version: Optional[str] = None, supplemental_graphs: Optional[list[str]] = None, - abort_on_first: bool = False) -> ValidationResult: +def validate( + input_file: str, + case_version: Optional[str] = None, + supplemental_graphs: Optional[list[str]] = None, + abort_on_first: bool = False, +) -> ValidationResult: """ Validate the given data graph against the given CASE ontology version and supplemental graphs. @@ -327,15 +334,17 @@ def main() -> None: data_graph.parse(in_graph) # Get the ontology graph based on the CASE version and supplemental graphs specified by the CLI - ontology_graph = get_ontology_graph(case_version=args.built_version, supplemental_graphs=args.ontology_graph) + ontology_graph = get_ontology_graph( + case_version=args.built_version, supplemental_graphs=args.ontology_graph + ) # Get the list of undefined CDO concepts in the graph undefined_cdo_concepts = get_invalid_cdo_concepts(data_graph, ontology_graph) for undefined_cdo_concept in sorted(undefined_cdo_concepts): warnings.warn(undefined_cdo_concept, NonExistentCDOConceptWarning) undefined_cdo_concepts_message = ( - "There were %d concepts with CDO IRIs in the data graph that are not in the ontology graph." - % len(undefined_cdo_concepts) + "There were %d concepts with CDO IRIs in the data graph that are not in the ontology graph." + % len(undefined_cdo_concepts) ) # Determine output format. From b509dc503913296f47fc399ab70aa87952ac126d Mon Sep 17 00:00:00 2001 From: kchason Date: Mon, 24 Jul 2023 21:23:46 -0400 Subject: [PATCH 03/18] Fix property reference --- case_utils/case_validate/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index e3e816a..765801e 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -229,7 +229,7 @@ def validate( result.conforms = validate_result[0] result.graph = validate_result[1] result.text = validate_result[2] - result.undefined_cdo_concepts = undefined_cdo_concepts + result.undefined_concepts = undefined_cdo_concepts return result From 8c40df118dc0fbc2621bc5e9589bd365f59a0d77 Mon Sep 17 00:00:00 2001 From: kchason Date: Mon, 24 Jul 2023 21:51:54 -0400 Subject: [PATCH 04/18] Make type generic to account for multiple return types --- case_utils/case_validate/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 765801e..b5f4402 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -37,7 +37,7 @@ import os import sys import warnings -from typing import Dict, Optional, Set, Tuple, Union +from typing import Any, Dict, Optional, Set, Tuple, Union import pyshacl # type: ignore import rdflib @@ -67,7 +67,7 @@ class NonExistentCDOConceptWarning(UserWarning): class ValidationResult: conforms: bool - graph: Graph + graph: Any text: str undefined_concepts: Set[rdflib.URIRef] From f6d48e288449a7ccabfa077285a9709503e303cb Mon Sep 17 00:00:00 2001 From: kchason Date: Mon, 24 Jul 2023 22:01:47 -0400 Subject: [PATCH 05/18] Fix List vs list for casting --- case_utils/case_validate/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index b5f4402..815293e 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -37,7 +37,7 @@ import os import sys import warnings -from typing import Any, Dict, Optional, Set, Tuple, Union +from typing import Any, Dict, List, Optional, Set, Tuple, Union import pyshacl # type: ignore import rdflib @@ -86,7 +86,7 @@ def concept_is_cdo_concept(n_concept: rdflib.URIRef) -> bool: def get_ontology_graph( - case_version: Optional[str] = None, supplemental_graphs: Optional[list[str]] = None + case_version: Optional[str] = None, supplemental_graphs: Optional[List[str]] = None ) -> rdflib.Graph: """ Get the ontology graph for the given case_version and any supplemental graphs. @@ -184,7 +184,7 @@ def get_invalid_cdo_concepts( def validate( input_file: str, case_version: Optional[str] = None, - supplemental_graphs: Optional[list[str]] = None, + supplemental_graphs: Optional[List[str]] = None, abort_on_first: bool = False, ) -> ValidationResult: """ From 2d3a65b901b118354a8943157cc314d648d2e950 Mon Sep 17 00:00:00 2001 From: kchason Date: Tue, 25 Jul 2023 20:59:28 -0400 Subject: [PATCH 06/18] Feedback from PR --- case_utils/case_validate/__init__.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 815293e..df02047 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -77,7 +77,7 @@ def concept_is_cdo_concept(n_concept: rdflib.URIRef) -> bool: Determine if a concept is part of the CDO ontology. :param n_concept: The concept to check. - :return: whether the concept is part of the CDO ontology. + :return: whether the concept is part of the CDO ontologies. """ concept_iri = str(n_concept) return concept_iri.startswith( @@ -95,12 +95,14 @@ def get_ontology_graph( :param supplemental_graphs: a list of supplemental graphs to use. If None, no supplemental graphs will be used. :return: the ontology graph against which to validate the data graph. """ + if not case_version or case_version == "none": + case_version = CURRENT_CASE_VERSION + ontology_graph = rdflib.Graph() - if case_version and case_version != "none": - ttl_filename = case_version + ".ttl" - _logger.debug("ttl_filename = %r.", ttl_filename) - ttl_data = importlib.resources.read_text(case_utils.ontology, ttl_filename) - ontology_graph.parse(data=ttl_data, format="turtle") + ttl_filename = case_version + ".ttl" + _logger.debug("ttl_filename = %r.", ttl_filename) + ttl_data = importlib.resources.read_text(case_utils.ontology, ttl_filename) + ontology_graph.parse(data=ttl_data, format="turtle") if supplemental_graphs: for arg_ontology_graph in supplemental_graphs: _logger.debug("arg_ontology_graph = %r.", arg_ontology_graph) @@ -112,11 +114,11 @@ def get_invalid_cdo_concepts( data_graph: Graph, ontology_graph: Graph ) -> Set[rdflib.URIRef]: """ - Get the set of concepts in the data graph that are not part of the CDO ontology. + Get the set of concepts in the data graph that are not part of the CDO ontologies. :param data_graph: The data graph to validate. :param ontology_graph: The ontology graph to use for validation. - :return: The list of concepts in the data graph that are not part of the CDO ontology. + :return: The set of concepts in the data graph that are not part of the CDO ontologies. """ # Construct set of CDO concepts for data graph concept-existence review. cdo_concepts: Set[rdflib.URIRef] = set() @@ -186,6 +188,7 @@ def validate( case_version: Optional[str] = None, supplemental_graphs: Optional[List[str]] = None, abort_on_first: bool = False, + inference: Optional[str] = "none", ) -> ValidationResult: """ Validate the given data graph against the given CASE ontology version and supplemental graphs. @@ -194,6 +197,7 @@ def validate( :param case_version: The version of the CASE ontology to use. If None, the most recent version will be used. :param supplemental_graphs: The supplemental graphs to use. If None, no supplemental graphs will be used. :param abort_on_first: Whether to abort on the first validation error. + :param inference: The type of inference to use. If "none", no inference will be used. :return: The validation result object containing the defined properties. """ # Convert the data graph string to a rdflib.Graph object. @@ -213,7 +217,7 @@ def validate( data_graph, shacl_graph=ontology_graph, ont_graph=ontology_graph, - inference="none", + inference=inference, meta_shacl=False, abort_on_first=abort_on_first, allow_infos=False, From 86ed417729d2f139c5290aef07a1bf486923e619 Mon Sep 17 00:00:00 2001 From: kchason Date: Tue, 25 Jul 2023 21:13:11 -0400 Subject: [PATCH 07/18] Instantiate properties as instance variables instead of class --- case_utils/case_validate/__init__.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index df02047..52369a7 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -66,10 +66,17 @@ class NonExistentCDOConceptWarning(UserWarning): class ValidationResult: - conforms: bool - graph: Any - text: str - undefined_concepts: Set[rdflib.URIRef] + def __init__( + self, + conforms: bool, + graph: Any, + text: str, + undefined_concepts: Set[rdflib.URIRef], + ): + self.conforms = conforms + self.graph = graph + self.text = text + self.undefined_concepts = undefined_concepts def concept_is_cdo_concept(n_concept: rdflib.URIRef) -> bool: @@ -229,13 +236,12 @@ def validate( # Relieve RAM of the data graph after validation has run. del data_graph - result = ValidationResult() - result.conforms = validate_result[0] - result.graph = validate_result[1] - result.text = validate_result[2] - result.undefined_concepts = undefined_cdo_concepts - - return result + return ValidationResult( + validate_result[0], + validate_result[1], + validate_result[2], + undefined_cdo_concepts, + ) def main() -> None: From 40be3114493446a772b563534f7938e6073385cf Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 15 Aug 2023 11:13:34 -0400 Subject: [PATCH 08/18] Fix None vs "none" ontology version specification No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- case_utils/case_validate/__init__.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 52369a7..b3c062c 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -98,22 +98,26 @@ def get_ontology_graph( """ Get the ontology graph for the given case_version and any supplemental graphs. - :param case_version: the version of the CASE ontology to use. If None, the most recent version will be used. + :param case_version: the version of the CASE ontology to use. If None (i.e. null), the most recent version will be used. If "none" (the string), no pre-built version of CASE will be used. :param supplemental_graphs: a list of supplemental graphs to use. If None, no supplemental graphs will be used. :return: the ontology graph against which to validate the data graph. """ - if not case_version or case_version == "none": - case_version = CURRENT_CASE_VERSION - ontology_graph = rdflib.Graph() - ttl_filename = case_version + ".ttl" - _logger.debug("ttl_filename = %r.", ttl_filename) - ttl_data = importlib.resources.read_text(case_utils.ontology, ttl_filename) - ontology_graph.parse(data=ttl_data, format="turtle") + + if case_version != "none": + # Load bundled CASE ontology at requested version. + if case_version is None: + case_version = CURRENT_CASE_VERSION + ttl_filename = case_version + ".ttl" + _logger.debug("ttl_filename = %r.", ttl_filename) + ttl_data = importlib.resources.read_text(case_utils.ontology, ttl_filename) + ontology_graph.parse(data=ttl_data, format="turtle") + if supplemental_graphs: for arg_ontology_graph in supplemental_graphs: _logger.debug("arg_ontology_graph = %r.", arg_ontology_graph) ontology_graph.parse(arg_ontology_graph) + return ontology_graph From ae5f0771ed84f4600688869ec2f48beedbcf3c30 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 21 Aug 2023 11:31:07 -0400 Subject: [PATCH 09/18] Add explicit `-> None` on `__init__` It seems to me like `--disallow-untyped-defs`, enabled in `mypy --strict`, should have flagged this as an error. However, from documentation on `no-untyped-def`, `mypy` only requires `__init__(...) -> None` when there is any argument aside from the first `self`. This patch follows the parenthetical recommendation from PEP 484 that `-> None` be given anyways. References: * https://mypy.readthedocs.io/en/stable/command_line.html#cmdoption-mypy-disallow-untyped-defs * https://mypy.readthedocs.io/en/stable/error_code_list2.html#check-that-every-function-has-an-annotation-no-untyped-def * https://peps.python.org/pep-0484/#the-meaning-of-annotations Signed-off-by: Alex Nelson --- case_utils/case_validate/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index b3c062c..1c29d6a 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -72,7 +72,7 @@ def __init__( graph: Any, text: str, undefined_concepts: Set[rdflib.URIRef], - ): + ) -> None: self.conforms = conforms self.graph = graph self.text = text From 97d7fbbe4af2f5693af0150d415232ae5e98f898 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 21 Aug 2023 11:34:52 -0400 Subject: [PATCH 10/18] Constrain `ValidationResult.graph` type to `pyshacl.validate(...)[1]` type Signed-off-by: Alex Nelson --- case_utils/case_validate/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 1c29d6a..b1283c3 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -37,7 +37,7 @@ import os import sys import warnings -from typing import Any, Dict, List, Optional, Set, Tuple, Union +from typing import Dict, List, Optional, Set, Tuple, Union import pyshacl # type: ignore import rdflib @@ -69,7 +69,7 @@ class ValidationResult: def __init__( self, conforms: bool, - graph: Any, + graph: Union[Exception, bytes, str, rdflib.Graph], text: str, undefined_concepts: Set[rdflib.URIRef], ) -> None: From 4208a99eab30330d20d1037bab0f52f086944da6 Mon Sep 17 00:00:00 2001 From: kchason Date: Tue, 22 Aug 2023 13:50:50 +0200 Subject: [PATCH 11/18] Wrap errors and positional arg signature support --- case_utils/case_validate/__init__.py | 35 ++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 1886583..108b515 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -37,7 +37,7 @@ import os import sys import warnings -from typing import Dict, List, Optional, Set, Tuple, Union +from typing import Any, Dict, List, Optional, Set, Tuple, Union import pyshacl # type: ignore import rdflib @@ -65,6 +65,14 @@ class NonExistentCDOConceptWarning(UserWarning): pass +class NonExistentCASEVersionError(Exception): + """ + This class is used when an invalid CASE version is requested that is not supported by the library. + """ + + pass + + class ValidationResult: def __init__( self, @@ -204,10 +212,21 @@ def get_ontology_graph( if case_version != "none": # Load bundled CASE ontology at requested version. - if case_version is None: + if case_version is None or case_version == "": case_version = CURRENT_CASE_VERSION + # If the first character case_version is numeric, prepend case- to it. This allows for the version to be passed + # by the library as both case-1.2.0 and 1.2.0 + if case_version[0].isdigit(): + case_version = "case-" + case_version ttl_filename = case_version + ".ttl" _logger.debug("ttl_filename = %r.", ttl_filename) + # Ensure the requested version of the CASE ontology is available and if not, throw an appropriate exception + # that can be returned in a user-friendly message. + if not importlib.resources.is_resource(case_utils.ontology, ttl_filename): + raise NonExistentCASEVersionError( + f"The requested version ({case_version}) of the CASE ontology is not available. Please choose a " + f"different version. The latest supported version is: {CURRENT_CASE_VERSION}" + ) ttl_data = importlib.resources.read_text(case_utils.ontology, ttl_filename) ontology_graph.parse(data=ttl_data, format="turtle") @@ -221,19 +240,23 @@ def get_ontology_graph( def validate( input_file: str, + *args: Any, case_version: Optional[str] = None, supplemental_graphs: Optional[List[str]] = None, abort_on_first: bool = False, inference: Optional[str] = "none", + **kwargs: Any, ) -> ValidationResult: """ Validate the given data graph against the given CASE ontology version and supplemental graphs. - + :param *args: The positional arguments to pass to the underlying pyshacl.validate function. :param input_file: The path to the file containing the data graph to validate. - :param case_version: The version of the CASE ontology to use. If None, the most recent version will be used. + :param case_version: The version of the CASE ontology to use (e.g. 1.2.0). If None, the most recent version will + be used. :param supplemental_graphs: The supplemental graphs to use. If None, no supplemental graphs will be used. :param abort_on_first: Whether to abort on the first validation error. :param inference: The type of inference to use. If "none", no inference will be used. + :param **kwargs: The keyword arguments to pass to the underlying pyshacl.validate function. :return: The validation result object containing the defined properties. """ # Convert the data graph string to a rdflib.Graph object. @@ -260,6 +283,8 @@ def validate( allow_warnings=False, debug=False, do_owl_imports=False, + args=args, + kwargs=kwargs, ) # Relieve RAM of the data graph after validation has run. @@ -409,7 +434,7 @@ def main() -> None: allow_warnings=True if args.allow_warnings else False, debug=True if args.debug else False, do_owl_imports=True if args.imports else False, - **validator_kwargs + **validator_kwargs, ) # Relieve RAM of the data graph after validation has run. From 73e468366f83b7dd72400d50e2d3d774d4f0b146 Mon Sep 17 00:00:00 2001 From: kchason Date: Tue, 22 Aug 2023 14:00:59 +0200 Subject: [PATCH 12/18] Separate types and utils into discrete files --- case_utils/case_validate/__init__.py | 198 +-------------------- case_utils/case_validate/validate_types.py | 33 ++++ case_utils/case_validate/validate_utils.py | 168 +++++++++++++++++ 3 files changed, 210 insertions(+), 189 deletions(-) create mode 100644 case_utils/case_validate/validate_types.py create mode 100644 case_utils/case_validate/validate_utils.py diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 108b515..48ad26e 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -32,212 +32,32 @@ __version__ = "0.3.0" import argparse -import importlib.resources import logging import os import sys import warnings -from typing import Any, Dict, List, Optional, Set, Tuple, Union +from typing import Any, Dict, List, Optional, Tuple, Union import pyshacl # type: ignore import rdflib from rdflib import Graph -import case_utils.ontology +from case_utils.case_validate.validate_types import ( + NonExistentCDOConceptWarning, + ValidationResult, +) +from case_utils.case_validate.validate_utils import ( + get_invalid_cdo_concepts, + get_ontology_graph, +) from case_utils.ontology.version_info import ( CURRENT_CASE_VERSION, built_version_choices_list, ) -NS_OWL = rdflib.OWL -NS_RDF = rdflib.RDF -NS_RDFS = rdflib.RDFS -NS_SH = rdflib.SH - _logger = logging.getLogger(os.path.basename(__file__)) -class NonExistentCDOConceptWarning(UserWarning): - """ - This class is used when a concept is encountered in the data graph that is not part of CDO ontologies, according to the --built-version flags and --ontology-graph flags. - """ - - pass - - -class NonExistentCASEVersionError(Exception): - """ - This class is used when an invalid CASE version is requested that is not supported by the library. - """ - - pass - - -class ValidationResult: - def __init__( - self, - conforms: bool, - graph: Union[Exception, bytes, str, rdflib.Graph], - text: str, - undefined_concepts: Set[rdflib.URIRef], - ) -> None: - self.conforms = conforms - self.graph = graph - self.text = text - self.undefined_concepts = undefined_concepts - - -def concept_is_cdo_concept(n_concept: rdflib.URIRef) -> bool: - """ - Determine if a concept is part of the CDO ontology. - - :param n_concept: The concept to check. - :return: whether the concept is part of the CDO ontologies. - """ - concept_iri = str(n_concept) - return concept_iri.startswith( - "https://ontology.unifiedcyberontology.org/" - ) or concept_iri.startswith("https://ontology.caseontology.org/") - - -def get_invalid_cdo_concepts( - data_graph: rdflib.Graph, ontology_graph: rdflib.Graph -) -> Set[rdflib.URIRef]: - """ - Get the set of concepts in the data graph that are not part of the CDO ontologies as specified with the ontology_graph argument. - - :param data_graph: The data graph to validate. - :param ontology_graph: The ontology graph to use for validation. - :return: The list of concepts in the data graph that are not part of the CDO ontology. - - >>> from case_utils.namespace import NS_RDF, NS_OWL, NS_UCO_CORE - >>> from rdflib import Graph, Literal, Namespace, URIRef - >>> # Define a namespace for a knowledge base, and a namespace for custom extensions. - >>> ns_kb = Namespace("http://example.org/kb/") - >>> ns_ex = Namespace("http://example.org/ontology/") - >>> dg = Graph() - >>> og = Graph() - >>> # Use an ontology graph in review that includes only a single class and a single property excerpted from UCO, but also a single custom property. - >>> _ = og.add((NS_UCO_CORE.UcoObject, NS_RDF.type, NS_OWL.Class)) - >>> _ = og.add((NS_UCO_CORE.name, NS_RDF.type, NS_OWL.DatatypeProperty)) - >>> _ = og.add((ns_ex.ourCustomProperty, NS_RDF.type, NS_OWL.DatatypeProperty)) - >>> # Define an individual. - >>> n_uco_object = ns_kb["UcoObject-f494d239-d9fd-48da-bc07-461ba86d8c6c"] - >>> n_uco_object - rdflib.term.URIRef('http://example.org/kb/UcoObject-f494d239-d9fd-48da-bc07-461ba86d8c6c') - >>> # Review a data graph that includes only the single individual, class typo'd (capitalized incorrectly), but property OK. - >>> _ = dg.add((n_uco_object, NS_RDF.type, NS_UCO_CORE.UCOObject)) - >>> _ = dg.add((n_uco_object, NS_UCO_CORE.name, Literal("Test"))) - >>> _ = dg.add((n_uco_object, ns_ex.customProperty, Literal("Custom Value"))) - >>> invalid_cdo_concepts = get_invalid_cdo_concepts(dg, og) - >>> invalid_cdo_concepts - {rdflib.term.URIRef('https://ontology.unifiedcyberontology.org/uco/core/UCOObject')} - >>> # Note that the property "ourCustomProperty" was typo'd in the data graph, but this was not reported. - >>> assert ns_ex.ourCustomProperty not in invalid_cdo_concepts - """ - # Construct set of CDO concepts for data graph concept-existence review. - cdo_concepts: Set[rdflib.URIRef] = set() - - for n_structural_class in [ - NS_OWL.Class, - NS_OWL.AnnotationProperty, - NS_OWL.DatatypeProperty, - NS_OWL.ObjectProperty, - NS_RDFS.Datatype, - NS_SH.NodeShape, - NS_SH.PropertyShape, - NS_SH.Shape, - ]: - for ontology_triple in ontology_graph.triples( - (None, NS_RDF.type, n_structural_class) - ): - if not isinstance(ontology_triple[0], rdflib.URIRef): - continue - if concept_is_cdo_concept(ontology_triple[0]): - cdo_concepts.add(ontology_triple[0]) - for n_ontology_predicate in [ - NS_OWL.backwardCompatibleWith, - NS_OWL.imports, - NS_OWL.incompatibleWith, - NS_OWL.priorVersion, - NS_OWL.versionIRI, - ]: - for ontology_triple in ontology_graph.triples( - (None, n_ontology_predicate, None) - ): - assert isinstance(ontology_triple[0], rdflib.URIRef) - assert isinstance(ontology_triple[2], rdflib.URIRef) - cdo_concepts.add(ontology_triple[0]) - cdo_concepts.add(ontology_triple[2]) - for ontology_triple in ontology_graph.triples((None, NS_RDF.type, NS_OWL.Ontology)): - if not isinstance(ontology_triple[0], rdflib.URIRef): - continue - cdo_concepts.add(ontology_triple[0]) - - # Also load historical ontology and version IRIs. - ontology_and_version_iris_data = importlib.resources.read_text( - case_utils.ontology, "ontology_and_version_iris.txt" - ) - for line in ontology_and_version_iris_data.split("\n"): - cleaned_line = line.strip() - if cleaned_line == "": - continue - cdo_concepts.add(rdflib.URIRef(cleaned_line)) - - data_cdo_concepts: Set[rdflib.URIRef] = set() - for data_triple in data_graph.triples((None, None, None)): - for data_triple_member in data_triple: - if isinstance(data_triple_member, rdflib.URIRef): - if concept_is_cdo_concept(data_triple_member): - data_cdo_concepts.add(data_triple_member) - elif isinstance(data_triple_member, rdflib.Literal): - if isinstance(data_triple_member.datatype, rdflib.URIRef): - if concept_is_cdo_concept(data_triple_member.datatype): - data_cdo_concepts.add(data_triple_member.datatype) - - return data_cdo_concepts - cdo_concepts - - -def get_ontology_graph( - case_version: Optional[str] = None, supplemental_graphs: Optional[List[str]] = None -) -> rdflib.Graph: - """ - Get the ontology graph for the given case_version and any supplemental graphs. - - :param case_version: the version of the CASE ontology to use. If None (i.e. null), the most recent version will be used. If "none" (the string), no pre-built version of CASE will be used. - :param supplemental_graphs: a list of supplemental graphs to use. If None, no supplemental graphs will be used. - :return: the ontology graph against which to validate the data graph. - """ - ontology_graph = rdflib.Graph() - - if case_version != "none": - # Load bundled CASE ontology at requested version. - if case_version is None or case_version == "": - case_version = CURRENT_CASE_VERSION - # If the first character case_version is numeric, prepend case- to it. This allows for the version to be passed - # by the library as both case-1.2.0 and 1.2.0 - if case_version[0].isdigit(): - case_version = "case-" + case_version - ttl_filename = case_version + ".ttl" - _logger.debug("ttl_filename = %r.", ttl_filename) - # Ensure the requested version of the CASE ontology is available and if not, throw an appropriate exception - # that can be returned in a user-friendly message. - if not importlib.resources.is_resource(case_utils.ontology, ttl_filename): - raise NonExistentCASEVersionError( - f"The requested version ({case_version}) of the CASE ontology is not available. Please choose a " - f"different version. The latest supported version is: {CURRENT_CASE_VERSION}" - ) - ttl_data = importlib.resources.read_text(case_utils.ontology, ttl_filename) - ontology_graph.parse(data=ttl_data, format="turtle") - - if supplemental_graphs: - for arg_ontology_graph in supplemental_graphs: - _logger.debug("arg_ontology_graph = %r.", arg_ontology_graph) - ontology_graph.parse(arg_ontology_graph) - - return ontology_graph - - def validate( input_file: str, *args: Any, diff --git a/case_utils/case_validate/validate_types.py b/case_utils/case_validate/validate_types.py new file mode 100644 index 0000000..b1911aa --- /dev/null +++ b/case_utils/case_validate/validate_types.py @@ -0,0 +1,33 @@ +from typing import Set, Union + +import rdflib + + +class ValidationResult: + def __init__( + self, + conforms: bool, + graph: Union[Exception, bytes, str, rdflib.Graph], + text: str, + undefined_concepts: Set[rdflib.URIRef], + ) -> None: + self.conforms = conforms + self.graph = graph + self.text = text + self.undefined_concepts = undefined_concepts + + +class NonExistentCDOConceptWarning(UserWarning): + """ + This class is used when a concept is encountered in the data graph that is not part of CDO ontologies, according to the --built-version flags and --ontology-graph flags. + """ + + pass + + +class NonExistentCASEVersionError(Exception): + """ + This class is used when an invalid CASE version is requested that is not supported by the library. + """ + + pass diff --git a/case_utils/case_validate/validate_utils.py b/case_utils/case_validate/validate_utils.py new file mode 100644 index 0000000..a53e92c --- /dev/null +++ b/case_utils/case_validate/validate_utils.py @@ -0,0 +1,168 @@ +import importlib +import logging +import os +from typing import List, Optional, Set + +import rdflib + +import case_utils +from case_utils.case_validate.validate_types import NonExistentCASEVersionError +from case_utils.ontology import CURRENT_CASE_VERSION + +NS_OWL = rdflib.OWL +NS_RDF = rdflib.RDF +NS_RDFS = rdflib.RDFS +NS_SH = rdflib.SH + +_logger = logging.getLogger(os.path.basename(__file__)) + + +def concept_is_cdo_concept(n_concept: rdflib.URIRef) -> bool: + """ + Determine if a concept is part of the CDO ontology. + + :param n_concept: The concept to check. + :return: whether the concept is part of the CDO ontologies. + """ + concept_iri = str(n_concept) + return concept_iri.startswith( + "https://ontology.unifiedcyberontology.org/" + ) or concept_iri.startswith("https://ontology.caseontology.org/") + + +def get_invalid_cdo_concepts( + data_graph: rdflib.Graph, ontology_graph: rdflib.Graph +) -> Set[rdflib.URIRef]: + """ + Get the set of concepts in the data graph that are not part of the CDO ontologies as specified with the ontology_graph argument. + + :param data_graph: The data graph to validate. + :param ontology_graph: The ontology graph to use for validation. + :return: The list of concepts in the data graph that are not part of the CDO ontology. + + >>> from case_utils.namespace import NS_RDF, NS_OWL, NS_UCO_CORE + >>> from rdflib import Graph, Literal, Namespace, URIRef + >>> # Define a namespace for a knowledge base, and a namespace for custom extensions. + >>> ns_kb = Namespace("http://example.org/kb/") + >>> ns_ex = Namespace("http://example.org/ontology/") + >>> dg = Graph() + >>> og = Graph() + >>> # Use an ontology graph in review that includes only a single class and a single property excerpted from UCO, but also a single custom property. + >>> _ = og.add((NS_UCO_CORE.UcoObject, NS_RDF.type, NS_OWL.Class)) + >>> _ = og.add((NS_UCO_CORE.name, NS_RDF.type, NS_OWL.DatatypeProperty)) + >>> _ = og.add((ns_ex.ourCustomProperty, NS_RDF.type, NS_OWL.DatatypeProperty)) + >>> # Define an individual. + >>> n_uco_object = ns_kb["UcoObject-f494d239-d9fd-48da-bc07-461ba86d8c6c"] + >>> n_uco_object + rdflib.term.URIRef('http://example.org/kb/UcoObject-f494d239-d9fd-48da-bc07-461ba86d8c6c') + >>> # Review a data graph that includes only the single individual, class typo'd (capitalized incorrectly), but property OK. + >>> _ = dg.add((n_uco_object, NS_RDF.type, NS_UCO_CORE.UCOObject)) + >>> _ = dg.add((n_uco_object, NS_UCO_CORE.name, Literal("Test"))) + >>> _ = dg.add((n_uco_object, ns_ex.customProperty, Literal("Custom Value"))) + >>> invalid_cdo_concepts = get_invalid_cdo_concepts(dg, og) + >>> invalid_cdo_concepts + {rdflib.term.URIRef('https://ontology.unifiedcyberontology.org/uco/core/UCOObject')} + >>> # Note that the property "ourCustomProperty" was typo'd in the data graph, but this was not reported. + >>> assert ns_ex.ourCustomProperty not in invalid_cdo_concepts + """ + # Construct set of CDO concepts for data graph concept-existence review. + cdo_concepts: Set[rdflib.URIRef] = set() + + for n_structural_class in [ + NS_OWL.Class, + NS_OWL.AnnotationProperty, + NS_OWL.DatatypeProperty, + NS_OWL.ObjectProperty, + NS_RDFS.Datatype, + NS_SH.NodeShape, + NS_SH.PropertyShape, + NS_SH.Shape, + ]: + for ontology_triple in ontology_graph.triples( + (None, NS_RDF.type, n_structural_class) + ): + if not isinstance(ontology_triple[0], rdflib.URIRef): + continue + if concept_is_cdo_concept(ontology_triple[0]): + cdo_concepts.add(ontology_triple[0]) + for n_ontology_predicate in [ + NS_OWL.backwardCompatibleWith, + NS_OWL.imports, + NS_OWL.incompatibleWith, + NS_OWL.priorVersion, + NS_OWL.versionIRI, + ]: + for ontology_triple in ontology_graph.triples( + (None, n_ontology_predicate, None) + ): + assert isinstance(ontology_triple[0], rdflib.URIRef) + assert isinstance(ontology_triple[2], rdflib.URIRef) + cdo_concepts.add(ontology_triple[0]) + cdo_concepts.add(ontology_triple[2]) + for ontology_triple in ontology_graph.triples((None, NS_RDF.type, NS_OWL.Ontology)): + if not isinstance(ontology_triple[0], rdflib.URIRef): + continue + cdo_concepts.add(ontology_triple[0]) + + # Also load historical ontology and version IRIs. + ontology_and_version_iris_data = importlib.resources.read_text( + case_utils.ontology, "ontology_and_version_iris.txt" + ) + for line in ontology_and_version_iris_data.split("\n"): + cleaned_line = line.strip() + if cleaned_line == "": + continue + cdo_concepts.add(rdflib.URIRef(cleaned_line)) + + data_cdo_concepts: Set[rdflib.URIRef] = set() + for data_triple in data_graph.triples((None, None, None)): + for data_triple_member in data_triple: + if isinstance(data_triple_member, rdflib.URIRef): + if concept_is_cdo_concept(data_triple_member): + data_cdo_concepts.add(data_triple_member) + elif isinstance(data_triple_member, rdflib.Literal): + if isinstance(data_triple_member.datatype, rdflib.URIRef): + if concept_is_cdo_concept(data_triple_member.datatype): + data_cdo_concepts.add(data_triple_member.datatype) + + return data_cdo_concepts - cdo_concepts + + +def get_ontology_graph( + case_version: Optional[str] = None, supplemental_graphs: Optional[List[str]] = None +) -> rdflib.Graph: + """ + Get the ontology graph for the given case_version and any supplemental graphs. + + :param case_version: the version of the CASE ontology to use. If None (i.e. null), the most recent version will be used. If "none" (the string), no pre-built version of CASE will be used. + :param supplemental_graphs: a list of supplemental graphs to use. If None, no supplemental graphs will be used. + :return: the ontology graph against which to validate the data graph. + """ + ontology_graph = rdflib.Graph() + + if case_version != "none": + # Load bundled CASE ontology at requested version. + if case_version is None or case_version == "": + case_version = CURRENT_CASE_VERSION + # If the first character case_version is numeric, prepend case- to it. This allows for the version to be passed + # by the library as both case-1.2.0 and 1.2.0 + if case_version[0].isdigit(): + case_version = "case-" + case_version + ttl_filename = case_version + ".ttl" + _logger.debug("ttl_filename = %r.", ttl_filename) + # Ensure the requested version of the CASE ontology is available and if not, throw an appropriate exception + # that can be returned in a user-friendly message. + if not importlib.resources.is_resource(case_utils.ontology, ttl_filename): + raise NonExistentCASEVersionError( + f"The requested version ({case_version}) of the CASE ontology is not available. Please choose a " + f"different version. The latest supported version is: {CURRENT_CASE_VERSION}" + ) + ttl_data = importlib.resources.read_text(case_utils.ontology, ttl_filename) + ontology_graph.parse(data=ttl_data, format="turtle") + + if supplemental_graphs: + for arg_ontology_graph in supplemental_graphs: + _logger.debug("arg_ontology_graph = %r.", arg_ontology_graph) + ontology_graph.parse(arg_ontology_graph) + + return ontology_graph From d41a418a50560cc9fa6142bf1c14e3b3987afacf Mon Sep 17 00:00:00 2001 From: kchason Date: Tue, 22 Aug 2023 14:12:14 +0200 Subject: [PATCH 13/18] Fix import reference --- case_utils/case_validate/validate_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/case_utils/case_validate/validate_utils.py b/case_utils/case_validate/validate_utils.py index a53e92c..e658e05 100644 --- a/case_utils/case_validate/validate_utils.py +++ b/case_utils/case_validate/validate_utils.py @@ -7,7 +7,7 @@ import case_utils from case_utils.case_validate.validate_types import NonExistentCASEVersionError -from case_utils.ontology import CURRENT_CASE_VERSION +from case_utils.ontology.version_info import CURRENT_CASE_VERSION NS_OWL = rdflib.OWL NS_RDF = rdflib.RDF From 8f957dc029c78b1ca31404a2b97d2c0872a9d647 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 23 Aug 2023 10:20:36 -0400 Subject: [PATCH 14/18] Forward arguments with unpacking syntax Signed-off-by: Alex Nelson --- case_utils/case_validate/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 48ad26e..838ff17 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -94,6 +94,7 @@ def validate( bool, Union[Exception, bytes, str, rdflib.Graph], str ] = pyshacl.validate( data_graph, + *args, shacl_graph=ontology_graph, ont_graph=ontology_graph, inference=inference, @@ -103,8 +104,7 @@ def validate( allow_warnings=False, debug=False, do_owl_imports=False, - args=args, - kwargs=kwargs, + **kwargs, ) # Relieve RAM of the data graph after validation has run. From 00f1360906f8bb533d3ef0c886a43fd0371150b3 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 23 Aug 2023 10:39:53 -0400 Subject: [PATCH 15/18] Default case_validate.validate inference parameter to None rather than "none" This is a continuation of PR 123. References: * https://github.com/casework/CASE-Utilities-Python/pull/123 Signed-off-by: Alex Nelson --- case_utils/case_validate/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index addf460..8bd32c7 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -64,7 +64,7 @@ def validate( case_version: Optional[str] = None, supplemental_graphs: Optional[List[str]] = None, abort_on_first: bool = False, - inference: Optional[str] = "none", + inference: Optional[str] = None, **kwargs: Any, ) -> ValidationResult: """ @@ -75,7 +75,7 @@ def validate( be used. :param supplemental_graphs: The supplemental graphs to use. If None, no supplemental graphs will be used. :param abort_on_first: Whether to abort on the first validation error. - :param inference: The type of inference to use. If "none", no inference will be used. + :param inference: The type of inference to use. If "none" (type str), no inference will be used. If None (type NoneType), pyshacl defaults will be used. Note that at the time of this writing (pySHACL 0.23.0), pyshacl defaults are no inferencing for the data graph, and RDFS inferencing for the SHACL graph, which for case_utils.validate includes the SHACL and OWL graphs. :param **kwargs: The keyword arguments to pass to the underlying pyshacl.validate function. :return: The validation result object containing the defined properties. """ From 15f00c9cb6711b72fdc35a2ef39788f2981efef9 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 23 Aug 2023 17:41:47 -0400 Subject: [PATCH 16/18] Consolidate case_validate CLI validation logic into case_validate.validate This patch separates implementation points between functionality distinct to `case_utils.validate` and `pyshacl.validate`. The `allow_warnings` and `inference` parameters provide CASE-specific documentation as an augmentation to `pyshacl.validate`'s documentation, but otherwise other documentation on `pyshacl.validate`'s keyword arguments is delegated to their upstream function. This patch removes some hardcoded parameter values in `pyshacl.validate`, letting the `case_validate` CLI or caller provide any runtime-requested values. Also, without functional impact, this patch sorts keyword parameters alphabetically. Signed-off-by: Alex Nelson --- case_utils/case_validate/__init__.py | 102 +++++++++++---------------- 1 file changed, 43 insertions(+), 59 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 8bd32c7..d1fc70b 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -59,59 +59,74 @@ def validate( - input_file: str, + input_file: Union[List[str], str], *args: Any, case_version: Optional[str] = None, supplemental_graphs: Optional[List[str]] = None, - abort_on_first: bool = False, - inference: Optional[str] = None, **kwargs: Any, ) -> ValidationResult: """ Validate the given data graph against the given CASE ontology version and supplemental graphs. + :param *args: The positional arguments to pass to the underlying pyshacl.validate function. - :param input_file: The path to the file containing the data graph to validate. - :param case_version: The version of the CASE ontology to use (e.g. 1.2.0). If None, the most recent version will - be used. - :param supplemental_graphs: The supplemental graphs to use. If None, no supplemental graphs will be used. - :param abort_on_first: Whether to abort on the first validation error. + :param input_file: The path to the file containing the data graph to validate. This can also be a list of paths to files containing data graphs to pool together. + :param case_version: The version of the CASE ontology to use (e.g. 1.2.0). If None, the most recent version will be used. + :param supplemental_graphs: File paths to supplemental graphs to use. If None, no supplemental graphs will be used. + :param allow_warnings: In addition to affecting the conformance of SHACL validation, this will affect conformance based on unrecognized CDO concepts (likely, misspelled or miscapitalized) in the data graph. If allow_warnings is not True, any unrecognized concept using a CDO IRI prefix will cause conformance to be False. :param inference: The type of inference to use. If "none" (type str), no inference will be used. If None (type NoneType), pyshacl defaults will be used. Note that at the time of this writing (pySHACL 0.23.0), pyshacl defaults are no inferencing for the data graph, and RDFS inferencing for the SHACL graph, which for case_utils.validate includes the SHACL and OWL graphs. :param **kwargs: The keyword arguments to pass to the underlying pyshacl.validate function. :return: The validation result object containing the defined properties. """ # Convert the data graph string to a rdflib.Graph object. data_graph = rdflib.Graph() - data_graph.parse(input_file) + if isinstance(input_file, str): + data_graph.parse(input_file) + elif isinstance(input_file, list): + for _data_graph_file in input_file: + _logger.debug("_data_graph_file = %r.", _data_graph_file) + if not isinstance(_data_graph_file, str): + raise TypeError("Expected str, received %s." % type(_data_graph_file)) + data_graph.parse(_data_graph_file) # Get the ontology graph from the case_version and supplemental_graphs arguments ontology_graph: Graph = get_ontology_graph(case_version, supplemental_graphs) - # Get the undefined CDO concepts + # Get the undefined CDO concepts. undefined_cdo_concepts = get_invalid_cdo_concepts(data_graph, ontology_graph) + # Warn about typo'd concepts before performing SHACL review. + for undefined_cdo_concept in sorted(undefined_cdo_concepts): + warnings.warn(undefined_cdo_concept, NonExistentCDOConceptWarning) + undefined_cdo_concepts_message = ( + "There were %d concepts with CDO IRIs in the data graph that are not in the ontology graph." + % len(undefined_cdo_concepts) + ) + # Validate data graph against ontology graph. validate_result: Tuple[ bool, Union[Exception, bytes, str, rdflib.Graph], str ] = pyshacl.validate( data_graph, *args, - shacl_graph=ontology_graph, ont_graph=ontology_graph, - inference=inference, - meta_shacl=False, - abort_on_first=abort_on_first, - allow_infos=False, - allow_warnings=False, - debug=False, - do_owl_imports=False, + shacl_graph=ontology_graph, **kwargs, ) # Relieve RAM of the data graph after validation has run. del data_graph + conforms = validate_result[0] + + if len(undefined_cdo_concepts) > 0: + warnings.warn(undefined_cdo_concepts_message) + if not kwargs.get("allow_warnings"): + undefined_cdo_concepts_alleviation_message = "The data graph is SHACL-conformant with the CDO ontologies, but nonexistent-concept references raise Warnings with this tool. Please either correct the concept names in the data graph; use the --ontology-graph flag to pass a corrected CDO ontology file, also using --built-version none; or, use the --allow-warnings flag." + warnings.warn(undefined_cdo_concepts_alleviation_message) + conforms = False + return ValidationResult( - validate_result[0], + conforms, validate_result[1], validate_result[2], undefined_cdo_concepts, @@ -212,25 +227,6 @@ def main() -> None: args = parser.parse_args() - data_graph = rdflib.Graph() - for in_graph in args.in_graph: - _logger.debug("in_graph = %r.", in_graph) - data_graph.parse(in_graph) - - # Get the ontology graph based on the CASE version and supplemental graphs specified by the CLI - ontology_graph = get_ontology_graph( - case_version=args.built_version, supplemental_graphs=args.ontology_graph - ) - - # Get the list of undefined CDO concepts in the graph - undefined_cdo_concepts = get_invalid_cdo_concepts(data_graph, ontology_graph) - for undefined_cdo_concept in sorted(undefined_cdo_concepts): - warnings.warn(undefined_cdo_concept, NonExistentCDOConceptWarning) - undefined_cdo_concepts_message = ( - "There were %d concepts with CDO IRIs in the data graph that are not in the ontology graph." - % len(undefined_cdo_concepts) - ) - # Determine output format. # pySHACL's determination of output formatting is handled solely # through the -f flag. Other CASE CLI tools handle format @@ -241,28 +237,23 @@ def main() -> None: if args.format != "human": validator_kwargs["serialize_report_graph"] = args.format - validate_result: Tuple[ - bool, Union[Exception, bytes, str, rdflib.Graph], str - ] = pyshacl.validate( - data_graph, - shacl_graph=ontology_graph, - ont_graph=ontology_graph, - inference=args.inference, - meta_shacl=args.metashacl, + validation_result: ValidationResult = validate( + args.in_graph, abort_on_first=args.abort, allow_infos=True if args.allow_infos else False, allow_warnings=True if args.allow_warnings else False, + case_version=args.built_version, debug=True if args.debug else False, do_owl_imports=True if args.imports else False, + inference=args.inference, + meta_shacl=args.metashacl, + supplemental_graphs=args.ontology_graph, **validator_kwargs, ) - # Relieve RAM of the data graph after validation has run. - del data_graph - - conforms = validate_result[0] - validation_graph = validate_result[1] - validation_text = validate_result[2] + conforms = validation_result.conforms + validation_graph = validation_result.graph + validation_text = validation_result.text # NOTE: The output logistics code is adapted from pySHACL's file # pyshacl/cli.py. This section should be monitored for code drift. @@ -284,13 +275,6 @@ def main() -> None: % type(validation_graph) ) - if len(undefined_cdo_concepts) > 0: - warnings.warn(undefined_cdo_concepts_message) - if not args.allow_warnings: - undefined_cdo_concepts_alleviation_message = "The data graph is SHACL-conformant with the CDO ontologies, but nonexistent-concept references raise Warnings with this tool. Please either correct the concept names in the data graph; use the --ontology-graph flag to pass a corrected CDO ontology file, also using --built-version none; or, use the --allow-warnings flag." - warnings.warn(undefined_cdo_concepts_alleviation_message) - conforms = False - sys.exit(0 if conforms else 1) From eccaad42a89ef309de3cc993cef988e7a38c14d4 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 23 Aug 2023 17:54:04 -0400 Subject: [PATCH 17/18] Add new case_validate source files to Make dependencies Signed-off-by: Alex Nelson --- tests/case_utils/case_file/Makefile | 3 ++ .../case_validate/case_test_examples/Makefile | 2 ++ tests/case_utils/case_validate/cli/Makefile | 35 +++++++++++-------- .../case_validate/shape_disabling/Makefile | 6 ++++ .../case_validate/uco_test_examples/Makefile | 2 ++ 5 files changed, 33 insertions(+), 15 deletions(-) diff --git a/tests/case_utils/case_file/Makefile b/tests/case_utils/case_file/Makefile index 91bf6d6..e2014ec 100644 --- a/tests/case_utils/case_file/Makefile +++ b/tests/case_utils/case_file/Makefile @@ -82,6 +82,9 @@ kb.ttl: \ #TODO - kb.json has a conversion error with context dictionary construction and custom datatypes. kb_validation.ttl: \ + $(top_srcdir)/case_utils/case_validate/__init__.py \ + $(top_srcdir)/case_utils/case_validate/validate_types.py \ + $(top_srcdir)/case_utils/case_validate/validate_utils.py \ kb.ttl source $(tests_srcdir)/venv/bin/activate \ && case_validate \ diff --git a/tests/case_utils/case_validate/case_test_examples/Makefile b/tests/case_utils/case_validate/case_test_examples/Makefile index 089c840..ff33917 100644 --- a/tests/case_utils/case_validate/case_test_examples/Makefile +++ b/tests/case_utils/case_validate/case_test_examples/Makefile @@ -44,6 +44,8 @@ all: \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ $(top_srcdir)/case_utils/case_validate/__init__.py \ + $(top_srcdir)/case_utils/case_validate/validate_types.py \ + $(top_srcdir)/case_utils/case_validate/validate_utils.py \ $(top_srcdir)/case_utils/ontology/__init__.py rm -f __$@ _$@ source $(tests_srcdir)/venv/bin/activate \ diff --git a/tests/case_utils/case_validate/cli/Makefile b/tests/case_utils/case_validate/cli/Makefile index dc78c50..5795ad4 100644 --- a/tests/case_utils/case_validate/cli/Makefile +++ b/tests/case_utils/case_validate/cli/Makefile @@ -23,6 +23,11 @@ tests_srcdir := $(top_srcdir)/tests RDF_TOOLKIT_JAR := $(case_srcdir)/lib/rdf-toolkit.jar +case_validate_sources := \ + $(top_srcdir)/case_utils/case_validate/__init__.py \ + $(top_srcdir)/case_utils/case_validate/validate_types.py \ + $(top_srcdir)/case_utils/case_validate/validate_utils.py + files_to_generate := \ errant_cdo_concept_PASS.txt \ errant_cdo_concept_XFAIL.txt \ @@ -62,9 +67,9 @@ clean: $(files_to_generate) errant_cdo_concept_PASS.txt: \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py \ errant_cdo_concept.ttl rm -f _$@ @@ -77,9 +82,9 @@ errant_cdo_concept_PASS.txt: \ mv _$@ $@ errant_cdo_concept_XFAIL.txt: \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py \ errant_cdo_concept.ttl rm -f _$@ @@ -94,9 +99,9 @@ errant_cdo_concept_XFAIL.txt: \ format_human_output_%: \ $(examples_srcdir)/investigative_action_PASS_validation.ttl \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py rm -f _$@ source $(tests_srcdir)/venv/bin/activate \ @@ -109,9 +114,9 @@ format_human_output_%: \ format_human_output_unspecified.txt: \ $(examples_srcdir)/investigative_action_PASS_validation.ttl \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py rm -f _$@ source $(tests_srcdir)/venv/bin/activate \ @@ -126,9 +131,9 @@ format_human_output_unspecified.txt: \ # blank node ID that does not serve to inform the example. format_jsonld_output_%: \ $(examples_srcdir)/investigative_action_PASS_validation.ttl \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py rm -f __$@ _$@ source $(tests_srcdir)/venv/bin/activate \ @@ -146,9 +151,9 @@ format_jsonld_output_%: \ format_jsonld_output_unspecified.jsonld: \ $(examples_srcdir)/investigative_action_PASS_validation.ttl \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py rm -f __$@ _$@ source $(tests_srcdir)/venv/bin/activate \ @@ -166,9 +171,9 @@ format_jsonld_output_unspecified.jsonld: \ format_turtle_output_%: \ $(examples_srcdir)/investigative_action_PASS_validation.ttl \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py rm -f _$@ source $(tests_srcdir)/venv/bin/activate \ @@ -181,9 +186,9 @@ format_turtle_output_%: \ format_turtle_output_unspecified.ttl: \ $(examples_srcdir)/investigative_action_PASS_validation.ttl \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py rm -f _$@ source $(tests_srcdir)/venv/bin/activate \ @@ -196,9 +201,9 @@ format_turtle_output_unspecified.ttl: \ format_unspecified_output_%: \ $(examples_srcdir)/investigative_action_PASS_validation.ttl \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py rm -f _$@ source $(tests_srcdir)/venv/bin/activate \ @@ -210,9 +215,9 @@ format_unspecified_output_%: \ format_unspecified_output_unspecified.txt: \ $(examples_srcdir)/investigative_action_PASS_validation.ttl \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py rm -f _$@ source $(tests_srcdir)/venv/bin/activate \ @@ -223,9 +228,9 @@ format_unspecified_output_unspecified.txt: \ mv _$@ $@ past_version_reference_PASS.txt: \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py \ $(top_srcdir)/case_utils/ontology/ontology_and_version_iris.txt \ past_version_reference_PASS.ttl @@ -237,9 +242,9 @@ past_version_reference_PASS.txt: \ mv _$@ $@ past_version_reference_XFAIL.txt: \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py \ $(top_srcdir)/case_utils/ontology/ontology_and_version_iris.txt \ past_version_reference_XFAIL.ttl @@ -253,9 +258,9 @@ past_version_reference_XFAIL.txt: \ mv _$@ $@ split_data_graph_PASS.txt: \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py \ split_data_graph_1.json \ split_data_graph_2.json @@ -269,9 +274,9 @@ split_data_graph_PASS.txt: \ mv _$@ $@ split_data_graph_XFAIL.txt: \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py \ split_data_graph_1.json rm -f _$@ @@ -285,9 +290,9 @@ split_data_graph_XFAIL.txt: \ mv _$@ $@ thing_metashacl_PASS.txt: \ + $(case_validate_sources) \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ - $(top_srcdir)/case_utils/case_validate/__init__.py \ $(top_srcdir)/case_utils/ontology/__init__.py \ thing.ttl rm -f _$@ diff --git a/tests/case_utils/case_validate/shape_disabling/Makefile b/tests/case_utils/case_validate/shape_disabling/Makefile index b9603ac..db3437b 100644 --- a/tests/case_utils/case_validate/shape_disabling/Makefile +++ b/tests/case_utils/case_validate/shape_disabling/Makefile @@ -32,6 +32,9 @@ clean: validation_with_uuid_shape_disabled.txt: \ $(tests_srcdir)/.venv.done.log \ + $(top_srcdir)/case_utils/case_validate/__init__.py \ + $(top_srcdir)/case_utils/case_validate/validate_types.py \ + $(top_srcdir)/case_utils/case_validate/validate_utils.py \ disable_shape.ttl \ example.ttl source $(tests_srcdir)/venv/bin/activate \ @@ -43,6 +46,9 @@ validation_with_uuid_shape_disabled.txt: \ validation_with_uuid_shape_enabled.txt: \ $(tests_srcdir)/.venv.done.log \ + $(top_srcdir)/case_utils/case_validate/__init__.py \ + $(top_srcdir)/case_utils/case_validate/validate_types.py \ + $(top_srcdir)/case_utils/case_validate/validate_utils.py \ example.ttl source $(tests_srcdir)/venv/bin/activate \ && case_validate \ diff --git a/tests/case_utils/case_validate/uco_test_examples/Makefile b/tests/case_utils/case_validate/uco_test_examples/Makefile index 2d4550b..921b683 100644 --- a/tests/case_utils/case_validate/uco_test_examples/Makefile +++ b/tests/case_utils/case_validate/uco_test_examples/Makefile @@ -76,6 +76,8 @@ all: \ $(tests_srcdir)/.venv.done.log \ $(top_srcdir)/.ontology.done.log \ $(top_srcdir)/case_utils/case_validate/__init__.py \ + $(top_srcdir)/case_utils/case_validate/validate_types.py \ + $(top_srcdir)/case_utils/case_validate/validate_utils.py \ $(top_srcdir)/case_utils/ontology/__init__.py source $(tests_srcdir)/venv/bin/activate \ && case_validate \ From 90f5c8c23e83328527baa91594fe717dc73fd109 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 23 Aug 2023 17:57:24 -0400 Subject: [PATCH 18/18] case_validate: Update NIST inlined license text Signed-off-by: Alex Nelson --- case_utils/case_validate/__init__.py | 15 +++++++++------ case_utils/case_validate/validate_types.py | 16 ++++++++++++++++ case_utils/case_validate/validate_utils.py | 16 ++++++++++++++++ 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index d1fc70b..4132c01 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -1,13 +1,16 @@ #!/usr/bin/env python3 +# Portions of this file contributed by NIST are governed by the following +# statement: +# # This software was developed at the National Institute of Standards # and Technology by employees of the Federal Government in the course -# of their official duties. Pursuant to title 17 Section 105 of the -# United States Code this software is not subject to copyright -# protection and is in the public domain. NIST assumes no -# responsibility whatsoever for its use by other parties, and makes -# no guarantees, expressed or implied, about its quality, -# reliability, or any other characteristic. +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. # # We would appreciate acknowledgement if the software is used. diff --git a/case_utils/case_validate/validate_types.py b/case_utils/case_validate/validate_types.py index b1911aa..1625963 100644 --- a/case_utils/case_validate/validate_types.py +++ b/case_utils/case_validate/validate_types.py @@ -1,3 +1,19 @@ +#!/usr/bin/env python3 + +# Portions of this file contributed by NIST are governed by the following +# statement: +# +# This software was developed at the National Institute of Standards +# and Technology by employees of the Federal Government in the course +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. +# +# We would appreciate acknowledgement if the software is used. + from typing import Set, Union import rdflib diff --git a/case_utils/case_validate/validate_utils.py b/case_utils/case_validate/validate_utils.py index e658e05..b7ed317 100644 --- a/case_utils/case_validate/validate_utils.py +++ b/case_utils/case_validate/validate_utils.py @@ -1,3 +1,19 @@ +#!/usr/bin/env python3 + +# Portions of this file contributed by NIST are governed by the following +# statement: +# +# This software was developed at the National Institute of Standards +# and Technology by employees of the Federal Government in the course +# of their official duties. Pursuant to Title 17 Section 105 of the +# United States Code, this software is not subject to copyright +# protection within the United States. NIST assumes no responsibility +# whatsoever for its use by other parties, and makes no guarantees, +# expressed or implied, about its quality, reliability, or any other +# characteristic. +# +# We would appreciate acknowledgement if the software is used. + import importlib import logging import os