Ensure that instance uuid and uri are literals in the rdf representat…

…ion of dataset. (#928)

* Ensure that instance uuid and uri are literals in the rdf
representation of dataset.

* Updated requirements on tripper

* Reverted dependency of tripper 0.3.1

* Updated requirements

bindings/python/dataset.py

@@ -513,12 +513,13 @@ def add_data(
     triples = []
     triples.extend([
         (iri, RDF.type, metairi),
-        (iri, OTEIO.hasUUID, inst.uuid),
+        (iri, OTEIO.hasUUID, Literal(inst.uuid, datatype=XSD.string)),
         (iri, RDF.value, Literal(inst.asjson(), datatype=RDF.JSON)),
     ])
     if inst.uri:
-        triples.append((iri, OTEIO.hasURI, inst.uri))
-
+        triples.append(
+            (iri, OTEIO.hasURI, Literal(inst.uri, datatype=XSD.string))
+        )
     ts.add_triples(triples)
 
     used_namespaces = {"oteio": OTEIO}

examples/TEM_data/requirements.txt

@@ -1,6 +1,5 @@
 dlite-python>=0.4.1,<1
-#tripper>=0.2.16,<1
-tripper @ git+https://github.com/EMMC-ASBL/tripper.git@fix-for-rdflib-literals
+tripper>=0.3.1,<0.3.2
 rdflib>=6,<8
 #oteapi-dlite>=0.1.5,<1
 -e git+https://github.com/EMMC-ASBL/oteapi-dlite.git@fa1b820383eb54a1c37f32f7b8ac9406b556dace#egg=oteapi_dlite

requirements_dev.txt

@@ -1,7 +1,5 @@
-# Requirements building wheel and testing
+# Requirements building
 cmake>=1.21.6
-mongomock>=4.1.2,<5
-openpyxl>=3.0.9,<3.2
 
-# Requirements for building wheel
-cmake>=1.21.6
+# Requirements for running tests
+mongomock>=4.1.2,<5

requirements_full.txt

@@ -1,23 +1,28 @@
 # Optional requirements - used by various plugins or additional features like mappings
-fortran-language-server>=1.12.0,<1.13
+
+# RDF
+rdflib>=4.2.1,<8
+#tripper>=0.2.16,<0.3.1
+tripper @ git+https://github.com/EMMC-ASBL/tripper.git@master
+pint>=0.15,<1
+
+# Plugins
 PyYAML>=5.4.1,<7
-#psycopg2>=2,<3
 pandas>=1.2,<2.3
 pyarrow>=14.0,<18.0
 tables>=3.8,<5.0
-rdflib>=4.2.1,<8
-pint>=0.15,<1
+openpyxl>=3.0.9,<3.2
+jinja2>=3.0,<4
+requests>=2.10,<3
+redis>=5.0,<6
+minio>=6.0,<8
 pymongo>=4.4.0,<5
+#psycopg2>=2,<3
 
-#tripper>=0.2.16,<0.3.1
-tripper @ git+https://github.com/EMMC-ASBL/tripper.git@master
-
-requests>=2.10,<3
-jinja2>=3.0,<4
+# Utilities
 pydantic>=1.10.0,<3
 typing_extensions>=4.1,<5
-redis>=5.0,<6
-minio>=6.0,<8
+fortran-language-server>=1.12.0,<1.13
 
 # For TEM demo
 matplotlib>=3,<4

requirements_mappings.txt

@@ -1,15 +1,18 @@
 # Requirements for property mappings
-#tripper>=0.2.16,<0.3.1
+rdflib>=4.2.1,<8
+#tripper>=0.3.1,<0.3.2
 tripper @ git+https://github.com/EMMC-ASBL/tripper.git@master
 pint>=0.15,<1
 
 
-# oteexample.py in the mappings example also require OTEAPI (including oteapi-dlite).
-# We don't include that requirement here, since it depends on the DLite-Python
-# PyPI package, which can interfere with installation from source.
+# oteexample.py in the mappings example also require OTEAPI (including
+# oteapi-dlite).  We don't include that requirement here, since it
+# depends on the DLite-Python PyPI package, which can interfere with
+# installation from source.
 #
-# If you uncomment the lines below and want to use DLite built from source, please
-# `pip uninstall DLite-Python` before installing DLite from source.
+# If you uncomment the lines below and want to use DLite built from
+# source, please `pip uninstall DLite-Python` before installing DLite
+# from source.
 #
 #oteapi-core>=0.6.1,<1
 ##oteapi-dlite>0.1.6,<1  # update once after migrating to pydantic v2