mustrd 0.3.1a7__py3-none-any.whl → 0.3.1a9__py3-none-any.whl

mustrd/mustrdAnzo.py

@@ -1,27 +1,3 @@
-"""
-MIT License
-
-Copyright (c) 2023 Semantic Partners Ltd
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
 from rdflib import Graph, ConjunctiveGraph, Literal, URIRef
 from requests import ConnectTimeout, HTTPError, ConnectionError
 import logging
@@ -166,6 +142,7 @@ def upload_given(triple_store: dict, given: Graph):
         insert_query = f"INSERT DATA {{graph <{triple_store['input_graph']}>{{{serialized_given}}}}}"
         query_azg(anzo_config=triple_store, query=insert_query, is_update=True)
     except (ConnectionError, TimeoutError, HTTPError, ConnectTimeout):
+        logging.error("Exception occurred while uploading given graph", exc_info=True)
         raise
 
 
@@ -174,4 +151,5 @@ def clear_graph(triple_store: dict, graph_uri: str):
         clear_query = f"CLEAR GRAPH <{graph_uri}>"
         query_azg(anzo_config=triple_store, query=clear_query, is_update=True)
     except (ConnectionError, TimeoutError, HTTPError, ConnectTimeout):
+        logging.error(f"Failed to clear graph {graph_uri} in triple store {triple_store['name']}")
         raise

mustrd/mustrdTestPlugin.py

@@ -529,21 +529,37 @@ class MustrdItem(pytest.Item):
 
 # Function called in the test to actually run it
 def run_test_spec(test_spec):
+    logger = logging.getLogger("mustrd.test")
+    logger.info(f"Running test spec: {getattr(test_spec, 'spec_uri', test_spec)}")
     if isinstance(test_spec, SpecSkipped):
+        logger.warning(f"Test skipped: {test_spec.message}")
         pytest.skip(f"Invalid configuration, error : {test_spec.message}")
-    result = run_spec(test_spec)
-    result_type = type(result)
+    try:
+        result = run_spec(test_spec)
+        logger.info(f"Result type: {type(result)} for spec: {getattr(test_spec, 'spec_uri', test_spec)}")
+    except Exception as e:
+        logger.error(f"Exception in run_spec for {getattr(test_spec, 'spec_uri', test_spec)}: {e}")
+        logger.error(traceback.format_exc())
+        raise  # re-raise so pytest sees the error
+
     if isinstance(test_spec, SpecInvalid):
+        logger.error(f"Invalid test specification: {test_spec.message} {test_spec}")
         raise ValueError(f"Invalid test specification: {test_spec.message} {test_spec}")
-    if result_type == SpecSkipped:
-        # FIXME: Better exception management
+    if type(result) == SpecSkipped:
+        logger.warning("Test skipped due to unsupported configuration")
         pytest.skip("Unsupported configuration")
-    if result_type != SpecPassed:
+    if type(result) != SpecPassed:
         write_result_diff_to_log(result, logger.info)
         log_lines = []
         def log_to_string(message):
             log_lines.append(message)
-        write_result_diff_to_log(result, log_to_string)
+        try:
+            write_result_diff_to_log(result, log_to_string)
+        except Exception as e:
+            logger.error(f"Exception in write_result_diff_to_log: {e}")
+            logger.error(traceback.format_exc())
+        logger.error(f"Test failed: {log_lines}")
         raise AssertionError("Test failed: " + "\n".join(log_lines))
 
-    return result_type == SpecPassed
+    logger.info(f"Test PASSED: {getattr(test_spec, 'spec_uri', test_spec)}")
+    return type(result) == SpecPassed

mustrd/steprunner.py

@@ -165,20 +165,27 @@ def _multi_run_when_anzo_query_driven_update(spec_uri: URIRef, triple_store: dic
 def _spade_edn_group_source(spec_uri: URIRef, triple_store: dict, when: SpadeEdnGroupSourceWhenSpec):
     log.info(f"Running SpadeEdnGroupSource for {spec_uri} using {triple_store}")
 
-    results = []
-
+    merged_result = None
     # Iterate over the list of WhenSpec objects in `when.value`
     for step_when_spec in when.value:
         try:
             log.info(f"Dispatching run_when for step: {step_when_spec}")
             query_result = run_when_impl(spec_uri, triple_store, step_when_spec)
             log.info(f"Executed SPARQL query: {query_result}")
-            results.append(query_result)
+            # Merge results if possible (e.g., for Graphs), else just keep last non-None
+            if merged_result is None:
+                merged_result = query_result
+            else:
+                try:
+                    merged_result += query_result  # For graph-like objects
+                except Exception:
+                    # If not mergeable, just keep the last result
+                    merged_result = query_result
         except Exception as e:
             log.error(f"Failed to execute SPARQL query: {e}")
 
-    log.debug(f"Final results: {results}")
-    return results
+    log.debug(f"Final merged result: {merged_result}")
+    return merged_result
 
 
 @run_when_impl.method((TRIPLESTORE.RdfLib, MUST.SpadeEdnGroupSource))

{mustrd-0.3.1a7.dist-info → mustrd-0.3.1a9.dist-info}/METADATA

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

{mustrd-0.3.1a7.dist-info → mustrd-0.3.1a9.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=B5uwN17XBuIJu5IBE7GKZ_SuA8yLDzeKywVz3HzAWYI,7451
 mustrd/mustrdGraphDb.py,sha256=Ro_fxDPFl64r-FAM18awhZydydEY1-IXO0zdKpvZD3U,5405
 mustrd/mustrdRdfLib.py,sha256=1dYoyohjDhonKItYMNkFybySFt9lgez3zYN2kU9mW-I,2369
-mustrd/mustrdTestPlugin.py,sha256=hbYo8i1j4uFuRekXGd4Mnjt9wkSgQrS5o809xtbcLgs,19664
+mustrd/mustrdTestPlugin.py,sha256=n6xISiYP1WrntcKOhtL0XZhdZigmBBHFfwrB5CEyV70,20577
 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/steprunner.py,sha256=JnajkFay-oeSJnBH3OxFVGfz5WhKjxEH1PV4WUoRPRE,10752
 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.1a7.dist-info/LICENSE,sha256=r8nmh5fUct9h2w8_RDl13EIscvmwCLoarPr1kg35MnA,1078
-mustrd-0.3.1a7.dist-info/METADATA,sha256=uOK0RERM5PvJ_n31blof-O1xvqeF45QiKOAt-FNjFzE,4109
-mustrd-0.3.1a7.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-mustrd-0.3.1a7.dist-info/entry_points.txt,sha256=v7V7sN0_L1aB4Ug_9io5axlQSeJ1C0tNrQWwdXdV58s,50
-mustrd-0.3.1a7.dist-info/RECORD,,
+mustrd-0.3.1a9.dist-info/LICENSE,sha256=r8nmh5fUct9h2w8_RDl13EIscvmwCLoarPr1kg35MnA,1078
+mustrd-0.3.1a9.dist-info/METADATA,sha256=FEsCNbPWRPtwdNhp0D9GmiFULuCwy3on0YcAifeVzo0,4109
+mustrd-0.3.1a9.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+mustrd-0.3.1a9.dist-info/entry_points.txt,sha256=v7V7sN0_L1aB4Ug_9io5axlQSeJ1C0tNrQWwdXdV58s,50
+mustrd-0.3.1a9.dist-info/RECORD,,