Skip to content

datamodel not treated as @type in told in datadoc/dataset #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
francescalb wants to merge 2 commits into from
+5 −5
Closed

datamodel not treated as @type in told in datadoc/dataset #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85ad1c1
datamodel not treated as @type in told in datadoc/dataset
francescalb Mar 31, 2026
d7eded2
Updated test
francescalb Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/input/semdata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Dataset:
hasEmail: <Sigurd.Wenner@sintef.no>
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
Expand Down
8 changes: 4 additions & 4 deletions tripper/datadoc/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ def _deduplicate_types(d):
for i, spo in enumerate(descr[k])
]
add(d, k, [tuple(t) for t in lst])
elif k == "datamodel":
elif k == "@datamodel":
add(d, "@type", v)
d[k] = v
#
Expand Down Expand Up @@ -867,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
Expand Down Expand Up @@ -1455,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,
Expand Down
Loading