From 85ad1c13891459f1c269b931de8074e53212ad95 Mon Sep 17 00:00:00 2001 From: "Francesca.L.Bleken@sintef.no" Date: Tue, 31 Mar 2026 15:44:12 +0200 Subject: [PATCH 1/2] datamodel not treated as @type in told in datadoc/dataset --- tripper/datadoc/dataset.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tripper/datadoc/dataset.py b/tripper/datadoc/dataset.py index d63986ff..3755c26d 100644 --- a/tripper/datadoc/dataset.py +++ b/tripper/datadoc/dataset.py @@ -360,9 +360,6 @@ def _deduplicate_types(d): for i, spo in enumerate(descr[k]) ] add(d, k, [tuple(t) for t in lst]) - elif k == "datamodel": - add(d, "@type", v) - d[k] = v # # The below works fine. It is commented out since it is doubtable # whether it is a good idea to invent new shortcuts for json-ld. From d7eded250541b63565b513bcd51696940efb6965 Mon Sep 17 00:00:00 2001 From: "Francesca.L.Bleken@sintef.no" Date: Wed, 1 Apr 2026 09:19:52 +0200 Subject: [PATCH 2/2] Updated test --- tests/input/semdata.yaml | 2 +- tripper/datadoc/dataset.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/input/semdata.yaml b/tests/input/semdata.yaml index 48f76e54..33b7cc59 100644 --- a/tests/input/semdata.yaml +++ b/tests/input/semdata.yaml @@ -26,7 +26,7 @@ Dataset: hasEmail: inSeries: semdata:SEM_cement_batch2/77600-23-001 - datamodel: http://onto-ns.com/meta/matchmaker/0.2/SEMImage + "@datamodel": http://onto-ns.com/meta/matchmaker/0.2/SEMImage #datamodel: http://onto-ns.com/meta/characterisation/0.2/SEMImage datamodelStorage: https://github.com/HEU-MatCHMaker/DataDocumentation/blob/master/SEM/datamodels/SEMImage.yaml #mappingURL: https://raw.githubusercontent.com/HEU-MatCHMaker/DataDocumentation/refs/heads/master/SEM/datamodels/SEMImage.ttl diff --git a/tripper/datadoc/dataset.py b/tripper/datadoc/dataset.py index 3755c26d..6a4f22ce 100644 --- a/tripper/datadoc/dataset.py +++ b/tripper/datadoc/dataset.py @@ -360,6 +360,9 @@ def _deduplicate_types(d): for i, spo in enumerate(descr[k]) ] add(d, k, [tuple(t) for t in lst]) + elif k == "@datamodel": + add(d, "@type", v) + d[k] = v # # The below works fine. It is commented out since it is doubtable # whether it is a good idea to invent new shortcuts for json-ld. @@ -864,9 +867,9 @@ def save_extra_content(ts: Triplestore, source: dict) -> None: # Save data models datamodels = { - d["@id"]: d["datamodel"] + d["@id"]: d["@datamodel"] for d in source.get("Dataset", ()) - if "datamodel" in d + if "@datamodel" in d } try: # pylint: disable=import-outside-toplevel @@ -1452,7 +1455,7 @@ def get_partial_pipeline( conf = gen.get("configuration") if gen.generatorType == "application/vnd.dlite-generate": - conf.setdefault("datamodel", dct.get("datamodel")) + conf.setdefault("@datamodel", dct.get("@datamodel")) function = client.create_function( functionType=gen.generatorType,