mustrd 0.1.7__tar.gz → 0.2.0__tar.gz

{mustrd-0.1.7 → mustrd-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mustrd
-Version: 0.1.7
+Version: 0.2.0
 Summary: A Spec By Example framework for RDF and SPARQL, Inspired by Cucumber.
 Home-page: https://github.com/Semantic-partners/mustrd
 License: MIT

{mustrd-0.1.7 → mustrd-0.2.0}/mustrd/README.adoc

@@ -26,6 +26,15 @@ Run `pytest` from the project root.
 
 If you have got this far then you are probably ready to create your own specifications to test your application SPARQL queries. These will be executed against the default RDFLib triplestore unless you configure one or more alternatives. The instructions for this are included in <<Configuring external triplestores>> below.
 
+=== Paths
+All paths are consired relative. That way mustrd tests can be versionned and shared easily.
+To get absolute path from relative path in a spec file, we prefix it with the first existing result in:
+1) Path where the spec is located
+2) spec_path defined in mustrd test configuration files or cmd line argument
+3) data_path defined in mustrd test configuration files or cmd line argument
+4) Mustrd folder: In case of default resources packaged with mustrd source (will be in venv when mustrd is called as library)
+We intentionally use the same method to build paths in all spec components to avoid confusion.
+
 === Givens
 These are used to specify the dataset against which the SPARQL statement will be run.
 They can be generated from external sources such as an existing graph, or a file or folder containing serialised RDF. It is also possible to specify the dataset as reified RDF directly in the test step. Currently tabular data sources such as csv files or TableDatasets are not supported.
@@ -178,16 +187,16 @@ The configuration file should be serialised RDF. An example in Turtle format is
 must:GraphDbConfig1  a must:GraphDbConfig ;
         must:url "http://localhost";
         must:port "7200";
-        must:username "test/triplestore_config/tripleStoreCredentials.toml" ;
-        must:password "test/triplestore_config/tripleStoreCredentials.toml" ;
         must:inputGraph "http://localhost:7200/test-graph" ;
         must:repository "mustrd" .
 ----
-The triplestore credentials are held in a separate TOML file so that configurations can be shared without sharing credentials.
+To avoid versioning secrets when you want to version triplestore configuration (for example in case you want to run mustrd in CI), you have to configure user/password in a different file.
+This file must be named as the triple store configuration file, but with "_secrets" just before the extension. For example triplestores.ttl -> triplestores_secrets.ttl
+Subjects in the two files must match, no need to redefine the type, for example:
 ----
-["https://mustrd.com/model/GraphDbConfig1"]
-"username"="<username>"
-"password"="<password>"
+@prefix must:      <https://mustrd.com/model/> .
+must:GraphDbConfig1  must:username 'test' ;
+              must:password 'test' .
 ----
 
 == Additional Notes for Developers

mustrd-0.2.0/mustrd/model/catalog-v001.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <uri id="User Entered Import Resolution" name="https://mustrd.com/triplestore/" uri="triplestoreOntology.ttl"/>
+    <group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base=""/>
+</catalog>

mustrd-0.2.0/mustrd/model/mustrdTestOntology.ttl

@@ -0,0 +1,51 @@
+@prefix : <https://mustrd.com/mustrdTest/> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix triplestore:      <https://mustrd.com/triplestore/> .
+@base <https://mustrd.com/mustrdTest/> .
+
+<https://mustrd.com/mustrdTest/> rdf:type owl:Ontology ;
+                                          owl:imports triplestore: ;
+                                          rdfs:comment "Model user input to generate mustrd pytests" ;
+                                          rdfs:label "Mustrd test ontology" .
+
+#################################################################
+#    Object Properties
+#################################################################
+
+###  https://mustrd.com/mustrdTest/filterOnTripleStore
+:filterOnTripleStore rdf:type owl:ObjectProperty ;
+                     rdfs:domain :MustrdTest ;
+                     rdfs:range triplestore:TripleStore .
+
+
+#################################################################
+#    Data properties
+#################################################################
+
+###  https://mustrd.com/mustrdTest/hasDataPath
+:hasDataPath rdf:type owl:DatatypeProperty ;
+             rdfs:domain :MustrdTest ;
+             rdfs:range xsd:string .
+
+
+###  https://mustrd.com/mustrdTest/hasSpecPath
+:hasSpecPath rdf:type owl:DatatypeProperty ;
+             rdfs:domain :MustrdTest ;
+             rdfs:range xsd:string .
+
+
+#################################################################
+#    Classes
+#################################################################
+
+###  https://mustrd.com/mustrdTest/MustrdTest
+:MustrdTest rdf:type owl:Class ;
+            rdfs:comment "Contains user input to parameter a mustrd pytest" ;
+            rdfs:label "Mustrd test" .
+
+
+###  Generated by the OWL API (version 4.5.26.2023-07-17T20:34:13Z) https://github.com/owlcs/owlapi

mustrd-0.2.0/mustrd/model/mustrdTestShapes.ttl

@@ -0,0 +1,24 @@
+@prefix : <https://mustrd.com/mustrdTest/> .
+@prefix sh:        <http://www.w3.org/ns/shacl#> .
+@prefix xsd:       <http://www.w3.org/2001/XMLSchema#> .
+@prefix triplestore: <https://mustrd.com/triplestore/> .
+@base <https://mustrd.com/mustrdTest/> .
+
+
+
+
+:MustrdTestShape
+    a              sh:NodeShape ;
+    sh:targetClass :MustrdTest ;
+    sh:property    [ sh:path     :hasDataPath ;
+                     sh:datatype xsd:string ;
+                     sh:minCount 1 ;
+                     sh:maxCount 1 ],
+                    [ sh:path     :hasSpecPath ;
+                     sh:datatype xsd:string ;
+                     sh:minCount 1 ; 
+                     sh:maxCount 1 ],
+                     [ sh:path     :hasPytestPath ;
+                     sh:datatype xsd:string ;
+                     sh:maxCount 1 ] . 
+

{mustrd-0.1.7 → mustrd-0.2.0}/mustrd/model/ontology.ttl

@@ -11,7 +11,8 @@
 @base <https://mustrd.com/model/> .
 
 <https://mustrd.com/model> rdf:type owl:Ontology ;
-                            owl:imports rdf: ,
+                            owl:imports <https://mustrd.com/triplestore/> ,
+                                        rdf: ,
                                         rdfs: ;
                             rdfs:comment "" ;
                             rdfs:label "Mustrd" .

mustrd-0.2.0/mustrd/model/triplestoreOntology.ttl

@@ -0,0 +1,174 @@
+@base <https://mustrd.com/triplestore/> .
+@prefix : <https://mustrd.com/triplestore/> .
+@prefix dc: <http://purl.org/dc/elements/1.1/> .
+@prefix sh: <http://www.w3.org/ns/shacl#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix xml: <http://www.w3.org/XML/1998/namespace> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix foaf: <http://xmlns.com/foaf/spec/> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix skos: <http://www.w3.org/2004/02/skos/core#> .
+# 
+# 
+# #################################################################
+# #
+# #    Data properties
+# #
+# #################################################################
+# 
+# 
+# https://mustrd.com/triplestore/gqeURI
+# 
+# https://mustrd.com/triplestore/inputGraph
+# 
+# https://mustrd.com/triplestore/outputGraph
+# 
+# https://mustrd.com/triplestore/password
+# 
+# https://mustrd.com/triplestore/port
+# 
+# https://mustrd.com/triplestore/repository
+# 
+# https://mustrd.com/triplestore/url
+# 
+# https://mustrd.com/triplestore/username
+# 
+# 
+# 
+# #################################################################
+# #
+# #    Classes
+# #
+# #################################################################
+# 
+# 
+# https://mustrd.com/triplestore/Anzo
+# 
+# https://mustrd.com/triplestore/ExternalTripleStore
+# 
+# https://mustrd.com/triplestore/GraphDb
+# 
+# https://mustrd.com/triplestore/InternalTripleStore
+# 
+# https://mustrd.com/triplestore/RdfLib
+# 
+# https://mustrd.com/triplestore/TripleStore
+# 
+# Generated by the OWL API (version 4.5.26.2023-07-17T20:34:13Z) https://github.com/owlcs/owlapi
+
+<> a owl:Ontology;
+  rdfs:label "triple store ontology" .
+
+:gqeURI a owl:DatatypeProperty;
+  rdfs:domain :Anzo;
+  rdfs:range xsd:string;
+  rdfs:label "gqeURI" .
+
+:inputGraph a owl:DatatypeProperty;
+  rdfs:domain :TripleStore;
+  rdfs:range xsd:string;
+  rdfs:label "inputGraph" .
+
+:outputGraph a owl:DatatypeProperty;
+  rdfs:domain :TripleStore;
+  rdfs:range xsd:string;
+  rdfs:comment """Uri of the graph where to insert/delete the triples
+
+In some triple stores there is a default insert graph like in graphDB: 
+In graphDB the default insert graph is called: <http://www.openrdf.org/schema/sesame#nil>
+or
+<http://rdf4j.org/schema/rdf4j#nil>
+
+Other triple stores do not define default insert graph like anzograph.
+For those triple stores, this property must be mandatory""";
+  rdfs:label "outputGraph" .
+
+:password a owl:DatatypeProperty;
+  rdfs:domain :ExternalTripleStore;
+  rdfs:range xsd:string;
+  rdfs:label "password" .
+
+:port a owl:DatatypeProperty;
+  rdfs:domain :ExternalTripleStore;
+  rdfs:range xsd:string;
+  rdfs:comment "Triple store port";
+  rdfs:label "port" .
+
+:repository a owl:DatatypeProperty;
+  rdfs:domain :GraphDb;
+  rdfs:range xsd:string;
+  rdfs:label "repository" .
+
+:url a owl:DatatypeProperty;
+  rdfs:domain :ExternalTripleStore;
+  rdfs:range xsd:string;
+  rdfs:comment "triple store URL";
+  rdfs:label "url" .
+
+:username a owl:DatatypeProperty;
+  rdfs:domain :ExternalTripleStore;
+  rdfs:range xsd:string;
+  rdfs:label "username" .
+
+:Anzo a owl:Class;
+  rdfs:subClassOf :ExternalTripleStore;
+  rdfs:comment """TODO: model this:
+
+definition of RDF dataset:
+
+default graph=
+RDF merge of default-graph-uri if exists
+else RDF merge of FROM if exists
+else all graphs in anzo graph (if you query a graphmart, default-graph-uri will be automatically set to the layers of the graphmart), if you are not sysadmin and you do not define the default graph, then the query will fail since you don't have permissions on all graphs
+if default-graph-uri is defined then FROM clauses are ignored
+
+default named graph = 
+RDF merge of named-graph-uri if exists
+else RDF merge of FROM NAMED if exists
+else default graph if exists
+all graphs in anzo graph (if you query a graphmart, default-graph-uri will be automatically set to the layers of the graphmart), if you are not sysadmin and you do not define the default graph, then the query will fail since you don't have permissions on all graphs
+if named-graph-uri is defined then FROM NAMED clauses are ignored
+
+There is no default insert graph. If you try to insert/delete without graph clause, your query will fail.""";
+  rdfs:label "Anzo" .
+
+:ExternalTripleStore a owl:Class;
+  rdfs:subClassOf :TripleStore .
+
+:GraphDb a owl:Class;
+  rdfs:subClassOf :ExternalTripleStore;
+  rdfs:comment """TODO: model this:
+
+Definition of RDF dataset in graphDB:
+
+default graph (in the sense of W3C, called default dataset in graphDB) = 
+Virtual graph that exist only for a query and represent all triples accessible outside of a graph clause in a sparql query =
+RDF merge of default-graph-uri if exists
+else RDF merge of FROM if exists
+else all graphs in the repository, including default insert graph
+you can query default insert graph by including it (<http://www.openrdf.org/schema/sesame#nil> or <http://rdf4j.org/schema/rdf4j#nil>) in a default-graph-uri parameter or a FROM clause
+If default-graph-uri is defined, then FROM clause is ignored
+
+default named graph = 
+All triples accessible inside a graph clause:
+RDF merge of named-graph-uri if exists
+else RDF merge of FROM NAMED if exist
+else all graphs in the repository, EXCLUDING default insert graph
+(To be exact you can query the default insert graph only if you name it GRAPH <http://www.openrdf.org/schema/sesame#nil> or GRAPH <http://rdf4j.org/schema/rdf4j#nil>, but you won't query it with GRAPH ?graph)
+default insert graph can be added to named-graph-uri or FROM NAMED
+If a default-graph-uri is defined but no named-graph-uri, then default named graph = void
+
+default insert graph (called \"The default graph\" in graphDB) =
+Graph where triples are inserted / deleted when no graph clause is given in an INSERT or DELETE clause""";
+  rdfs:label "GraphDb" .
+
+:InternalTripleStore a owl:Class;
+  rdfs:subClassOf :TripleStore .
+
+:RdfLib a owl:Class;
+  rdfs:subClassOf :InternalTripleStore;
+  rdfs:label "RdfLib" .
+
+:TripleStore a owl:Class;
+  rdfs:label "TripleStore" .

mustrd-0.2.0/mustrd/model/triplestoreshapes.ttl

@@ -0,0 +1,42 @@
+@prefix rdf:       <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix sh:        <http://www.w3.org/ns/shacl#> .
+@prefix xsd:       <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdfs:      <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix ex:        <http://www.example.org/#> .
+@prefix owl:       <http://www.w3.org/2002/07/owl#> .
+@prefix triplestore:      <https://mustrd.com/triplestore/> .
+
+triplestore:ExternalTripleStoreShape
+    a              sh:NodeShape ;
+    sh:targetClass triplestore:ExternalTripleStore ;
+    sh:property    [ sh:path     triplestore:url ;
+                     sh:minCount 1 ;
+                     sh:maxCount 1 ],
+                    [ sh:path     triplestore:port ;
+                     sh:minCount 1 ; 
+                     sh:maxCount 1 ],
+                    [ sh:path     triplestore:username ;
+                     sh:maxCount 1 ],
+                    [ sh:path     triplestore:password ;
+                     sh:maxCount 1 ] .
+
+triplestore:AnzoShape
+    a              sh:NodeShape ;
+    sh:targetClass triplestore:Anzo ;
+    sh:property    [ sh:path     triplestore:gqeURI ;
+                     sh:minCount 1 ;
+                     sh:maxCount 1 ], 
+                   [ sh:path     triplestore:outputGraph ;
+                     sh:minCount 1 ;
+                     sh:maxCount 1 ], 
+# For anzo the input graph is not really necessary if the user is sysadmin
+# but querying all graphs in AZG is usually not a good idea, so for the moment this is forbidden
+                   [ sh:path     triplestore:inputGraph ;
+                     sh:minCount 1 ]  .
+
+triplestore:GraphDbShape
+    a              sh:NodeShape ;
+    sh:targetClass triplestore:GraphDb ;
+    sh:property    [ sh:path     triplestore:repository ;
+                     sh:minCount 1 ;
+                     sh:maxCount 1 ] .

{mustrd-0.1.7 → mustrd-0.2.0}/mustrd/mustrd.py

@@ -40,13 +40,13 @@ from rdflib import Graph, URIRef, RDF, XSD, SH, Literal
 from rdflib.compare import isomorphic, graph_diff
 import pandas
 
-from .namespace import MUST
+from .namespace import MUST, TRIPLESTORE
 import requests
 import json
 from pandas import DataFrame
 
 from .spec_component import TableThenSpec, parse_spec_component, WhenSpec, ThenSpec
-from .utils import  is_json
+from .utils import  is_json,get_mustrd_root
 from colorama import Fore, Style
 from tabulate import tabulate
 from collections import defaultdict
@@ -93,6 +93,7 @@ class Specification:
     given: Graph
     when: WhenSpec
     then: ThenSpec
+    spec_file_name: str = "default.mustrd.ttl"
 
 
 @dataclass
@@ -152,6 +153,7 @@ class TripleStoreConnectionError(SpecResult):
 @dataclass
 class SpecSkipped(SpecResult):
     message: str
+    spec_file_name: str = "default.mustrd.ttl"
 
 
 @dataclass
@@ -176,16 +178,15 @@ class UpdateSparqlQuery(SparqlAction):
 
 # https://github.com/Semantic-partners/mustrd/issues/19
 
-def validate_specs(run_config: dict, triple_stores: List, shacl_graph: Graph, ont_graph: Graph)\
+def validate_specs(run_config: dict, triple_stores: List, shacl_graph: Graph, ont_graph: Graph, file_name: str = "*")\
         -> Tuple[List, Graph, List]:
     spec_graph = Graph()
     subject_uris = set()
     focus_uris = set()
     invalid_specs = []
-  #  ttl_files = list(spec_path.glob('**/*.mustrd.ttl'))
-    ttl_files = list(run_config['spec_path'].glob('**/*.mustrd.ttl'))
+    ttl_files = list(run_config['spec_path'].glob(f'**/{file_name}.mustrd.ttl'))
     ttl_files.sort()
-    log.info(f"Found {len(ttl_files)} mustrd.ttl files in {run_config['spec_path']}")
+    log.info(f"Found {len(ttl_files)} {file_name}.mustrd.ttl files in {run_config['spec_path']}")
 
     for file in ttl_files:
         error_messages = []
@@ -233,7 +234,7 @@ def validate_specs(run_config: dict, triple_stores: List, shacl_graph: Graph, on
             if len(error_messages) > 0:
                 error_messages.sort()
                 error_message = "\n".join(msg for msg in error_messages)
-                invalid_specs += [SpecSkipped(subject_uri, triple_store["type"], error_message) for triple_store in
+                invalid_specs += [SpecSkipped(subject_uri, triple_store["type"], error_message, file.name) for triple_store in
                                 triple_stores]
             else:
                 subject_uris.add(subject_uri)
@@ -241,13 +242,12 @@ def validate_specs(run_config: dict, triple_stores: List, shacl_graph: Graph, on
                 this_spec_graph.parse(file)
                 spec_uris_in_this_file = list(this_spec_graph.subjects(RDF.type, MUST.TestSpec))
                 for spec in spec_uris_in_this_file:
-                    tripleToAdd = [spec, MUST.specSourceFile, Literal(file)]
                     # print(f"adding {tripleToAdd}")
-                    this_spec_graph.add(tripleToAdd)
+                    this_spec_graph.add([spec, MUST.specSourceFile, Literal(file)])
+                    this_spec_graph.add([spec, MUST.specFileName, Literal(file.name)])
                 # print(f"beforeadd: {spec_graph}" )
                 # print(f"beforeadd: {str(this_spec_graph.serialize())}" )
                 spec_graph += this_spec_graph
-                # print(f"afteradd: {str(spec_graph.serialize())}" )
 
 
     sourceFiles = list(spec_graph.subject_objects(MUST.specSourceFile))
@@ -276,14 +276,14 @@ def get_specs(spec_uris: List[URIRef], spec_graph: Graph, triple_stores: List[di
         for triple_store in triple_stores:
             if "error" in triple_store:
                 log.error(f"{triple_store['error']}. No specs run for this triple store.")
-                skipped_results += [SpecSkipped(spec_uri, triple_store['type'], triple_store['error']) for spec_uri in
+                skipped_results += [SpecSkipped(spec_uri, triple_store['type'], triple_store['error'], get_spec_file(spec_uri, spec_graph)) for spec_uri in
                                     spec_uris]
             else:
                 for spec_uri in spec_uris:
                     try:
                         specs += [get_spec(spec_uri, spec_graph, run_config, triple_store)]
                     except (ValueError, FileNotFoundError, ConnectionError) as e:
-                        skipped_results += [SpecSkipped(spec_uri, triple_store['type'], e)]
+                        skipped_results += [SpecSkipped(spec_uri, triple_store['type'], e, get_spec_file(spec_uri, spec_graph))]
 
     except (BadSyntax, FileNotFoundError) as e:
         template = "An exception of type {0} occurred when trying to parse the triple store configuration file. " \
@@ -303,11 +303,13 @@ def run_specs(specs) -> List[SpecResult]:
         results.append(run_spec(specification))
     return results
 
+def get_spec_file(spec_uri: URIRef, spec_graph: Graph):
+    return str(spec_graph.value(subject = spec_uri, predicate = MUST.specFileName, default = "default.mustrd.ttl"))
 
 def get_spec(spec_uri: URIRef, spec_graph: Graph, run_config: dict, mustrd_triple_store: dict = None) -> Specification:
     try:
         if mustrd_triple_store is None:
-            mustrd_triple_store = {"type": MUST.RdfLib}
+            mustrd_triple_store = {"type": TRIPLESTORE.RdfLib}
         components = []
         for predicate in MUST.given, MUST.when, MUST.then:
             components.append(parse_spec_component(subject=spec_uri,
@@ -316,9 +318,9 @@ def get_spec(spec_uri: URIRef, spec_graph: Graph, run_config: dict, mustrd_tripl
                                                 run_config=run_config,
                                                 mustrd_triple_store=mustrd_triple_store))
 
-
+        spec_file_name = get_spec_file(spec_uri, spec_graph)
         # https://github.com/Semantic-partners/mustrd/issues/92
-        return Specification(spec_uri, mustrd_triple_store, components[0].value, components[1], components[2])
+        return Specification(spec_uri, mustrd_triple_store, components[0].value, components[1], components[2], spec_file_name)
     
     except (ValueError, FileNotFoundError) as e:
         template = "An exception of type {0} occurred. Arguments:\n{1!r}"
@@ -354,7 +356,7 @@ def run_spec(spec: Specification) -> SpecResult:
         log.debug(f"{given_as_turtle}")
         upload_given(triple_store, spec.given)
     else:
-        if triple_store['type'] == MUST.RdfLib:
+        if triple_store['type'] == TRIPLESTORE.RdfLib:
             return SpecSkipped(spec_uri, triple_store['type'], "Unable to run Inherited State tests on Rdflib")
     try:
         for when in spec.when:
@@ -386,57 +388,64 @@ def get_triple_store_graph(triple_store_graph_path: Path, secrets: str):
         return Graph().parse(triple_store_graph_path).parse(data = secrets)
     else:
         secret_path = triple_store_graph_path.parent / Path(triple_store_graph_path.stem + "_secrets" + triple_store_graph_path.suffix)
-        return Graph().parse(triple_store_graph_path).parse(source = secret_path)
+        return Graph().parse(triple_store_graph_path).parse(secret_path)
     
 
 def get_triple_stores(triple_store_graph: Graph) -> list[dict]:
     triple_stores = []
+    shacl_graph = Graph().parse(Path(os.path.join(get_mustrd_root(), "model/triplestoreshapes.ttl")))
+    ont_graph = Graph().parse(Path(os.path.join(get_mustrd_root(), "model/triplestoreOntology.ttl")))
+    conforms, results_graph, results_text = validate(
+            data_graph= triple_store_graph,
+            shacl_graph = shacl_graph,
+            ont_graph  = ont_graph,
+            advanced= True,
+            inference= 'none'
+        )
+    if not conforms:
+        raise ValueError(f"Triple store configuration not conform to the shapes. SHACL report: {results_text}", results_graph)
     for triple_store_config, rdf_type, triple_store_type in triple_store_graph.triples((None, RDF.type, None)):
         triple_store = {}
-        # Local rdf lib triple store
-        if triple_store_type == MUST.RdfLibConfig:
-            triple_store["type"] = MUST.RdfLib
+        triple_store["type"] = triple_store_type
+        triple_store["uri"] = triple_store_config
         # Anzo graph via anzo
-        elif triple_store_type == MUST.AnzoConfig:
-            triple_store["type"] = MUST.Anzo
-            triple_store["url"] = triple_store_graph.value(subject=triple_store_config, predicate=MUST.url)
-            triple_store["port"] = triple_store_graph.value(subject=triple_store_config, predicate=MUST.port)
+        if triple_store_type == TRIPLESTORE.Anzo:
+            triple_store["url"] = triple_store_graph.value(subject=triple_store_config, predicate=TRIPLESTORE.url)
+            triple_store["port"] = triple_store_graph.value(subject=triple_store_config, predicate=TRIPLESTORE.port)
             try:
-                triple_store["username"] = str(triple_store_graph.value(subject=triple_store_config, predicate=MUST.username))
-                triple_store["password"] = str(triple_store_graph.value(subject=triple_store_config, predicate=MUST.password))
+                triple_store["username"] = str(triple_store_graph.value(subject=triple_store_config, predicate=TRIPLESTORE.username))
+                triple_store["password"] = str(triple_store_graph.value(subject=triple_store_config, predicate=TRIPLESTORE.password))
             except (FileNotFoundError, ValueError) as e:
                 triple_store["error"] = e
-            triple_store["gqe_uri"] = triple_store_graph.value(subject=triple_store_config, predicate=MUST.gqeURI)
+            triple_store["gqe_uri"] = triple_store_graph.value(subject=triple_store_config, predicate=TRIPLESTORE.gqeURI)
             triple_store["input_graph"] = triple_store_graph.value(subject=triple_store_config,
-                                                                   predicate=MUST.inputGraph)
+                                                                   predicate=TRIPLESTORE.inputGraph)
             triple_store["output_graph"] = triple_store_graph.value(subject=triple_store_config,
-                                                                   predicate=MUST.outputGraph)
+                                                                   predicate=TRIPLESTORE.outputGraph)
             try:
                 check_triple_store_params(triple_store, ["url", "port", "username", "password", "input_graph"])
             except ValueError as e:
                 triple_store["error"] = e
         # GraphDB
-        elif triple_store_type == MUST.GraphDbConfig:
-            triple_store["type"] = MUST.GraphDb
-            triple_store["url"] = triple_store_graph.value(subject=triple_store_config, predicate=MUST.url)
-            triple_store["port"] = triple_store_graph.value(subject=triple_store_config, predicate=MUST.port)
+        elif triple_store_type == TRIPLESTORE.GraphDb:
+            triple_store["url"] = triple_store_graph.value(subject=triple_store_config, predicate=TRIPLESTORE.url)
+            triple_store["port"] = triple_store_graph.value(subject=triple_store_config, predicate=TRIPLESTORE.port)
             try:
-                triple_store["username"] = str(triple_store_graph.value(subject=triple_store_config, predicate=MUST.username))
-                triple_store["password"] = str(triple_store_graph.value(subject=triple_store_config, predicate=MUST.password))
+                triple_store["username"] = str(triple_store_graph.value(subject=triple_store_config, predicate=TRIPLESTORE.username))
+                triple_store["password"] = str(triple_store_graph.value(subject=triple_store_config, predicate=TRIPLESTORE.password))
             except (FileNotFoundError, ValueError) as e:
                 log.error(f"Credential retrieval failed {e}")
                 triple_store["error"] = e
             triple_store["repository"] = triple_store_graph.value(subject=triple_store_config,
-                                                                  predicate=MUST.repository)
+                                                                  predicate=TRIPLESTORE.repository)
             triple_store["input_graph"] = triple_store_graph.value(subject=triple_store_config,
-                                                                   predicate=MUST.inputGraph)
+                                                                   predicate=TRIPLESTORE.inputGraph)
 
             try:
                 check_triple_store_params(triple_store, ["url", "port", "repository"])
             except ValueError as e:
                 triple_store["error"] = e
-        else:
-            triple_store["type"] = triple_store_type
+        elif triple_store_type != TRIPLESTORE.RdfLib:
             triple_store["error"] = f"Triple store not implemented: {triple_store_type}"
 
         triple_stores.append(triple_store)