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

mustrd/spec_component.py

@@ -848,7 +848,9 @@ def _get_spec_component_spade_edn_group_source_when(spec_component_details: Spec
 
         if step_type == Keyword("sparql-file"):
             try:
-                with open(step_file, 'r') as sparql_file:
+                # 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:
                     sparql_query = sparql_file.read()
 
                 # Assume the individuals are ConstructSparql queries
@@ -860,7 +862,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: {step_file}")
+                raise ValueError(f"SPARQL file not found: {resolved_step_file}")
 
     spec_component.file = str(absolute_file_path)
     spec_component.groupId = group_id

mustrd/steprunner.py

@@ -185,12 +185,17 @@ 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.1a3.dist-info → mustrd-0.3.1a5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mustrd
-Version: 0.3.1a3
+Version: 0.3.1a5
 Summary: A Spec By Example framework for RDF and SPARQL, Inspired by Cucumber.
 License: MIT
 Author: John Placek

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

@@ -19,14 +19,14 @@ 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=FQPLX5W0wGOLUOJgPxf-9YpyNhMYnV3xU2nJch99NOI,38452
-mustrd/steprunner.py,sha256=BHY4UhN7oqHVoXYPk4ROnv0nCqy4-NXfbzFzOyb3G4k,10032
+mustrd/spec_component.py,sha256=515XqP4Wc_TVaCOSswxTJM5i00bnuXvJZyEYa0N9_-o,38627
+mustrd/steprunner.py,sha256=dRdh9EaGhrEmIw9k52eJk-5hcQDjZTpr_A__oIkR-1E,10332
 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.1a3.dist-info/LICENSE,sha256=r8nmh5fUct9h2w8_RDl13EIscvmwCLoarPr1kg35MnA,1078
-mustrd-0.3.1a3.dist-info/METADATA,sha256=wM19EcjD8Pf6S0q6opNR7tnr0NtRdz2b9UWtdlX76s0,4109
-mustrd-0.3.1a3.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-mustrd-0.3.1a3.dist-info/entry_points.txt,sha256=v7V7sN0_L1aB4Ug_9io5axlQSeJ1C0tNrQWwdXdV58s,50
-mustrd-0.3.1a3.dist-info/RECORD,,
+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,,