mustrd 0.3.1a5__py3-none-any.whl → 0.3.1a6__py3-none-any.whl

mustrd/mustrdAnzo.py

@@ -122,8 +122,11 @@ def get_query_from_step(triple_store: dict, query_step_uri: URIRef) -> str:
             ?stepUri a <http://cambridgesemantics.com/ontologies/Graphmarts#Step>;
                      <http://cambridgesemantics.com/ontologies/Graphmarts#transformQuery> ?query
     }}"""
-    return json_to_dictlist(query_configuration(anzo_config=triple_store, query=query))[0]['query']
-
+    result = json_to_dictlist(query_configuration(anzo_config=triple_store, query=query))
+    if len(result) == 0:
+        raise FileNotFoundError(
+            f"Querynot found for step {query_step_uri}")
+    return result[0].get("query")
 
 def get_queries_from_templated_step(triple_store: dict, query_step_uri: URIRef) -> dict:
     query = f"""SELECT ?param_query ?query_template WHERE {{
@@ -133,8 +136,11 @@ def get_queries_from_templated_step(triple_store: dict, query_step_uri: URIRef)
                         <http://cambridgesemantics.com/ontologies/Graphmarts#template> ?query_template .
     }}
     """
-    return json_to_dictlist(query_configuration(anzo_config=triple_store, query=query))[0]
-
+    result = json_to_dictlist(query_configuration(anzo_config=triple_store, query=query))
+    if len(result) == 0:
+        raise FileNotFoundError(
+            f"Templated query not found for {query_step_uri}")
+    return result[0]
 
 def get_queries_for_layer(triple_store: dict, graphmart_layer_uri: URIRef):
     query = f"""PREFIX graphmarts: <http://cambridgesemantics.com/ontologies/Graphmarts#>
@@ -153,8 +159,11 @@ SELECT ?query ?param_query ?query_template
       . }}
   }}
   ORDER BY ?index"""
-    return json_to_dictlist(query_configuration(anzo_config=triple_store, query=query))
-
+    result = json_to_dictlist(query_configuration(anzo_config=triple_store, query=query))
+    if len(result) == 0:
+        raise FileNotFoundError(
+            f"Queries not found for graphmart layer {graphmart_layer_uri}")
+    return result
 
 def upload_given(triple_store: dict, given: Graph):
     logging.debug(f"upload_given {triple_store} {given}")

mustrd/spec_component.py

@@ -848,9 +848,7 @@ def _get_spec_component_spade_edn_group_source_when(spec_component_details: Spec
 
         if step_type == Keyword("sparql-file"):
             try:
-                # Resolve the file path relative to the EDN file's location
-                resolved_step_file = Path(absolute_file_path).parent / step_file
-                with open(resolved_step_file, 'r') as sparql_file:
+                with open(step_file, 'r') as sparql_file:
                     sparql_query = sparql_file.read()
 
                 # Assume the individuals are ConstructSparql queries
@@ -862,7 +860,7 @@ def _get_spec_component_spade_edn_group_source_when(spec_component_details: Spec
                 )
                 when_specs.append(when_spec)
             except FileNotFoundError:
-                raise ValueError(f"SPARQL file not found: {resolved_step_file}")
+                raise ValueError(f"SPARQL file not found: {step_file}")
 
     spec_component.file = str(absolute_file_path)
     spec_component.groupId = group_id

mustrd/steprunner.py

@@ -185,17 +185,12 @@ def _spade_edn_group_source(spec_uri: URIRef, triple_store: dict, when: SpadeEdn
 def _spade_edn_group_source(spec_uri: URIRef, triple_store: dict, when: SpadeEdnGroupSourceWhenSpec):
     log.info(f"Running SpadeEdnGroupSource for {spec_uri} using {triple_store}")
 
-    edn_file_dir = os.path.dirname(when.file)  # Get the directory of the EDN file
     merged_graph = Graph()
 
     # Iterate over the list of WhenSpec objects in `when.value`
     for step_when_spec in when.value:
         try:
             if step_when_spec.queryType == MUST.UpdateSparql:
-                # Resolve file paths relative to the EDN file
-                if hasattr(step_when_spec, 'filepath'):
-                    step_when_spec.filepath = os.path.join(edn_file_dir, step_when_spec.filepath)
-
                 log.info(f"Dispatching run_when for UpdateSparql step: {step_when_spec}")
                 query_result = run_when_impl(spec_uri, triple_store, step_when_spec)
                 log.info(f"Executed SPARQL query: {query_result}")

{mustrd-0.3.1a5.dist-info → mustrd-0.3.1a6.dist-info}/METADATA

@@ -1,14 +1,19 @@
 Metadata-Version: 2.3
 Name: mustrd
-Version: 0.3.1a5
+Version: 0.3.1a6
 Summary: A Spec By Example framework for RDF and SPARQL, Inspired by Cucumber.
 License: MIT
 Author: John Placek
 Author-email: john.placek@semanticpartners.com
-Requires-Python: >=3.10,<4.0
-Classifier: Programming Language :: Python
+Requires-Python: >=3.11,<4.0
 Classifier: Framework :: Pytest
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: Utilities
@@ -34,13 +39,13 @@ Requires-Dist: urllib3 (==1.26.19)
 Project-URL: Repository, https://github.com/Semantic-partners/mustrd
 Description-Content-Type: text/markdown
 
-# mustrd
+# MustRD
 
 **"MustRD: Validate your SPARQL queries and transformations with precision and confidence, using BDD and Given-When-Then principles."**
 
-[<img src="https://github.com/Semantic-partners/mustrd/raw/python-coverage-comment-action-data/badge.svg?sanitize=true" alt="coverage badge">](https://github.com/Semantic-partners/mustrd/tree/python-coverage-comment-action-data)
+[![Coverage Badge](https://github.com/Semantic-partners/mustrd/raw/python-coverage-comment-action-data/badge.svg?sanitize=true)](https://github.com/Semantic-partners/mustrd/tree/python-coverage-comment-action-data)
 
-### Why?
+## Why?
 
 SPARQL is a powerful query language for RDF data, but how can you ensure your queries and transformations are doing what you intend? Whether you're working on a pipeline or a standalone query, certainty is key.
 
@@ -48,11 +53,11 @@ While RDF and SPARQL offer great flexibility, we noticed a gap in tooling to val
 
 With MustRD, you can:
 
-* Define data scenarios and verify that queries produce the expected results.
-* Test edge cases to ensure your queries remain reliable.
-* Isolate small SPARQL enrichment or transformation steps and confirm you're only inserting what you intend.
+- Define data scenarios and verify that queries produce the expected results.
+- Test edge cases to ensure your queries remain reliable.
+- Isolate small SPARQL enrichment or transformation steps and confirm you're only inserting what you intend.
 
-### What?
+## What?
 
 MustRD is a Spec-By-Example ontology with a reference Python implementation, inspired by tools like Cucumber. It uses the Given-When-Then approach to define and validate SPARQL queries and transformations.
 
@@ -62,23 +67,85 @@ MustRD is designed to be triplestore/SPARQL engine agnostic, leveraging open sta
 
 MustRD is not an alternative to SHACL. While SHACL validates data structures, MustRD focuses on validating data transformations and query results.
 
-### How?
+## How?
 
 You define your specs in Turtle (`.ttl`) or TriG (`.trig`) files using the Given-When-Then approach:
 
-* **Given**: Define the starting dataset.
-* **When**: Specify the action (e.g., a SPARQL query).
-* **Then**: Outline the expected results.
+- **Given**: Define the starting dataset.
+- **When**: Specify the action (e.g., a SPARQL query).
+- **Then**: Outline the expected results.
 
 Depending on the type of SPARQL query (CONSTRUCT, SELECT, INSERT/DELETE), MustRD runs the query and compares the results against the expectations defined in the spec.
 
 Expectations can also be defined as:
 
-* INSERT queries.
-* SELECT queries.
-* Higher-order expectation languages, similar to those used in various platforms.
+- INSERT queries.
+- SELECT queries.
+- Higher-order expectation languages, similar to those used in various platforms.
+
+## Example
+
+### Configuration File
+
+You'll have a configuration `.ttl` file, which acts as a suite of tests. It tells MustRD where to look for test specifications and any triplestore configurations you might have:
+
+```ttl
+:test_example a :MustrdTest;
+              :hasSpecPath "test/specs/";
+              :hasDataPath "test/data/";
+              :hasPytestPath "example";
+              :triplestoreSpecPath "test/triplestore_config/triplestores.ttl";
+              :filterOnTripleStore triplestore:example_test .
+```
+
+### Test Specification
+
+In the directory specified by `:hasSpecPath`, you'll have one or more `.mustrd.ttl` files. These can be organized in a directory structure. MustRD collects them and reports results to your test runner.
+
+```ttl
+:test_example :given [ a :FileDataset ;
+                       :file "test/data/given.ttl" ] ;
+              :when [ a :TextSparqlSource ;
+                     :queryText "SELECT ?s ?p ?o WHERE { ?s ?p ?o }" ;
+                     :queryType :SelectSparql ] ;
+              :then [ a :OrderedTableDataset ;
+                     :hasRow [ :variable "s" ; :boundValue "example:subject" ;
+                               :variable "p" ; :boundValue "example:predicate" ;
+                               :variable "o" ; :boundValue "example:object" ] ].
+```
 
-### When?
+And you will have a `'test/data/given.ttl'` which contains the given ttl. 
+
+```ttl
+example:subject example:predicate example:object .
+```
+
+### Running Tests
+
+Run the test using the MustRD Pytest plugin:
+
+```bash
+poetry run pytest --mustrd --config=test/mustrd_configuration.ttl --md=render/github_job_summary.md
+```
+
+This will validate your SPARQL queries against the defined dataset and expected results, ensuring your transformations behave as intended.
+
+You can refer to SPARQL inline, in files, or in Anzo Graphmarts, Steps, or Layers. See `GETSTARTED.adoc` for more details.
+
+#### Integrating with Visual Studio Code (vscode)
+We have a pytest plugin.
+1. Choose a python interpreter (probably a venv)
+2. `pip install mustrd ` in it.
+3. add to your settings.json
+```json
+    "python.testing.pytestArgs": [
+        "--mustrd", "--md=junit/github_job_summary.md", "--config=test/test_config_local.ttl"
+    ],
+```
+4. VS Code should auto discover your tests and they'll show up in the flask icon 'tab'.
+![alt text](image.png)
+
+## When?
 
 MustRD is a work in progress, built to meet the needs of our projects across multiple clients and vendor stacks. While we find it useful, it may not meet your needs out of the box.
 
@@ -89,3 +156,4 @@ We invite you to try it, raise issues, or contribute via pull requests. If you n
 Semantic Partners is a specialist consultancy in Semantic Technology. If you need more support, contact us at info@semanticpartners.com or mustrd@semanticpartners.com.
 
 
+

{mustrd-0.3.1a5.dist-info → mustrd-0.3.1a6.dist-info}/RECORD

@@ -13,20 +13,20 @@ mustrd/model/test-resources/resources.ttl,sha256=1Dsp1nuNxauj9bxeX-HShQsiO-CVy5I
 mustrd/model/triplestoreOntology.ttl,sha256=9K5gj0hDOolRYjHc58UT4igex8cUnq9h7SUe4ToYbdw,5834
 mustrd/model/triplestoreshapes.ttl,sha256=G1kdgASdPa8s5JVGXL4KM2ewp-F5Vmbdist0f77VTBc,1706
 mustrd/mustrd.py,sha256=Ac42FUVY_6u1rt8uQmmIRo6-lV1vmOTy5fNu1CqPEIQ,41021
-mustrd/mustrdAnzo.py,sha256=0XhLkfagW_HManfZ3iGAf_K2_d-pLVTAOT-0pX8hhM4,8352
+mustrd/mustrdAnzo.py,sha256=Ick0phX4B0bSWw5LrsEFfn7X203RQJW8sPRr62fZTxU,8783
 mustrd/mustrdGraphDb.py,sha256=Ro_fxDPFl64r-FAM18awhZydydEY1-IXO0zdKpvZD3U,5405
 mustrd/mustrdRdfLib.py,sha256=1dYoyohjDhonKItYMNkFybySFt9lgez3zYN2kU9mW-I,2369
 mustrd/mustrdTestPlugin.py,sha256=hbYo8i1j4uFuRekXGd4Mnjt9wkSgQrS5o809xtbcLgs,19664
 mustrd/namespace.py,sha256=1l8RJDFI7rYkWvmRokaTvSvqrDJEdRNIkq3lmPb0xpI,3854
 mustrd/run.py,sha256=5xZUgKPMBQ-03cWROAnwtbOs2Nb0Vat6n8Fi6EyfS-k,4257
-mustrd/spec_component.py,sha256=515XqP4Wc_TVaCOSswxTJM5i00bnuXvJZyEYa0N9_-o,38627
-mustrd/steprunner.py,sha256=dRdh9EaGhrEmIw9k52eJk-5hcQDjZTpr_A__oIkR-1E,10332
+mustrd/spec_component.py,sha256=FQPLX5W0wGOLUOJgPxf-9YpyNhMYnV3xU2nJch99NOI,38452
+mustrd/steprunner.py,sha256=BHY4UhN7oqHVoXYPk4ROnv0nCqy4-NXfbzFzOyb3G4k,10032
 mustrd/templates/md_ResultList_leaf_template.jinja,sha256=IzwZjliCx7-viipATDQK6MQg_5q1kLMKdeNSZg1sXXY,508
 mustrd/templates/md_ResultList_template.jinja,sha256=_8joJ7vtw_qoqxv3HhUtBgRfhOeqmgfaRFwEo4MROvQ,203
 mustrd/templates/md_stats_template.jinja,sha256=96W62cMWu9UGLNv65ZQ8RYLjkxKHhJy-FlUtXgud6XY,155
 mustrd/utils.py,sha256=OGdLvw7GvjrFgTJo0J97Xwdh-_ZgSmapmOistrEchO0,1387
-mustrd-0.3.1a5.dist-info/LICENSE,sha256=r8nmh5fUct9h2w8_RDl13EIscvmwCLoarPr1kg35MnA,1078
-mustrd-0.3.1a5.dist-info/METADATA,sha256=r1qxmsW3h3r_cZPl0uYzmoaY897NNkZYjPe1LSVev4E,4109
-mustrd-0.3.1a5.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-mustrd-0.3.1a5.dist-info/entry_points.txt,sha256=v7V7sN0_L1aB4Ug_9io5axlQSeJ1C0tNrQWwdXdV58s,50
-mustrd-0.3.1a5.dist-info/RECORD,,
+mustrd-0.3.1a6.dist-info/LICENSE,sha256=r8nmh5fUct9h2w8_RDl13EIscvmwCLoarPr1kg35MnA,1078
+mustrd-0.3.1a6.dist-info/METADATA,sha256=H2Bu5MUHmU4srpHpcm6xGHch30h2G9QX45lvIWyhUPI,6677
+mustrd-0.3.1a6.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+mustrd-0.3.1a6.dist-info/entry_points.txt,sha256=v7V7sN0_L1aB4Ug_9io5axlQSeJ1C0tNrQWwdXdV58s,50
+mustrd-0.3.1a6.dist-info/RECORD,,