udata 10.0.1.dev32350__py2.py3-none-any.whl → 10.0.1.dev32359__py2.py3-none-any.whl

udata/core/dataset/rdf.py

@@ -21,6 +21,7 @@ from udata.core.spatial.models import SpatialCoverage
 from udata.harvest.exceptions import HarvestSkipException
 from udata.models import db
 from udata.rdf import (
+    ADMS,
     DCAT,
     DCATAP,
     DCT,
@@ -200,16 +201,30 @@ def dataset_to_rdf(dataset, graph=None):
     # unless there is already an upstream URI
     id = dataset_to_graph_id(dataset)
 
+    graph = graph or Graph(namespace_manager=namespace_manager)
+    d = graph.resource(id)
+
     # Expose upstream identifier if present
     if dataset.harvest and dataset.harvest.dct_identifier:
-        identifier = dataset.harvest.dct_identifier
+        d.set(DCT.identifier, Literal(dataset.harvest.dct_identifier))
+
+        alt = graph.resource(BNode())
+        alternate_identifier = Literal(
+            endpoint_for(
+                "datasets.show_redirect",
+                "api.dataset",
+                dataset=dataset.id,
+                _external=True,
+            )
+        )
+        alt.set(RDF.type, ADMS.Identifier)
+        alt.set(DCT.creator, Literal(current_app.config["SITE_TITLE"]))
+        alt.set(SKOS.notation, alternate_identifier)
+        d.set(ADMS.identifier, alt)
     else:
-        identifier = dataset.id
-    graph = graph or Graph(namespace_manager=namespace_manager)
+        d.set(DCT.identifier, Literal(dataset.id))
 
-    d = graph.resource(id)
     d.set(RDF.type, DCAT.Dataset)
-    d.set(DCT.identifier, Literal(identifier))
     d.set(DCT.title, Literal(dataset.title))
     d.set(DCT.description, Literal(dataset.description))
     d.set(DCT.issued, Literal(dataset.created_at))

udata/rdf.py

@@ -49,6 +49,7 @@ DCT = DCTERMS  # More common usage
 VCARD = Namespace("http://www.w3.org/2006/vcard/ns#")
 
 namespace_manager = NamespaceManager(Graph())
+namespace_manager.bind("adms", ADMS)
 namespace_manager.bind("dcat", DCAT)
 namespace_manager.bind("dcatap", DCATAP)
 namespace_manager.bind("dct", DCT)

udata/tests/dataset/test_dataset_rdf.py

@@ -32,6 +32,7 @@ from udata.core.organization.factories import OrganizationFactory
 from udata.i18n import gettext as _
 from udata.mongo import db
 from udata.rdf import (
+    ADMS,
     DCAT,
     DCATAP,
     DCT,
@@ -85,7 +86,7 @@ class DatasetToRdfTest:
         assert d.value(DCT.modified) == Literal(dataset.last_modified)
         assert d.value(DCAT.landingPage) is None
 
-    def test_all_dataset_fields(self):
+    def test_all_dataset_fields(self, app):
         resources = ResourceFactory.build_batch(3)
         org = OrganizationFactory(name="organization")
         contact = ContactPointFactory(
@@ -101,8 +102,11 @@ class DatasetToRdfTest:
             acronym="acro",
             organization=org,
             contact_point=contact,
-            harvest=HarvestDatasetMetadata(remote_url=remote_url),
+            harvest=HarvestDatasetMetadata(
+                remote_url=remote_url, dct_identifier="foobar-identifier"
+            ),
         )
+        app.config["SITE_TITLE"] = "Test site title"
         d = dataset_to_rdf(dataset)
         g = d.graph
 
@@ -114,7 +118,11 @@ class DatasetToRdfTest:
         assert isinstance(d.identifier, URIRef)
         uri = url_for("api.dataset", dataset=dataset.id, _external=True)
         assert str(d.identifier) == uri
-        assert d.value(DCT.identifier) == Literal(dataset.id)
+        assert d.value(DCT.identifier) == Literal("foobar-identifier")
+        alternate_identifier = d.value(ADMS.identifier)
+        assert alternate_identifier.value(RDF.type).identifier == ADMS.Identifier
+        assert f"datasets/{dataset.id}" in alternate_identifier.value(SKOS.notation)
+        assert alternate_identifier.value(DCT.creator) == Literal("Test site title")
         assert d.value(DCT.title) == Literal(dataset.title)
         assert d.value(SKOS.altLabel) == Literal(dataset.acronym)
         assert d.value(DCT.description) == Literal(dataset.description)

{udata-10.0.1.dev32350.dist-info → udata-10.0.1.dev32359.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.0.1.dev32350
+Version: 10.0.1.dev32359
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -159,6 +159,7 @@ It is collectively taken care of by members of the
     * you will need https://github.com/opendatateam/udata-search-service/pull/48
 - Expose the "landingPage" in DCAT RDF [#3183](https://github.com/opendatateam/udata/pull/3183)
 - Licence.guess: extract first URL for better matching [#3185](https://github.com/opendatateam/udata/pull/3185)
+- Expose the dataset's alternate identifier in RDF [#3186](https://github.com/opendatateam/udata/pull/3186)
 
 ## 9.2.4 (2024-10-22)
 

{udata-10.0.1.dev32350.dist-info → udata-10.0.1.dev32359.dist-info}/RECORD

@@ -10,7 +10,7 @@ udata/errors.py,sha256=E8W7b4PH7c5B85g_nsUMt8fHqMVpDFOZFkO6wMPl6bA,117
 udata/factories.py,sha256=MoklZnU8iwNL25dm3JsoXhoQs1PQWSVYL1WvcUBtJqM,492
 udata/i18n.py,sha256=Q7UELAhKOW7DmUX8BjEMnqqhQxcR6d3ioSmj90A62cg,8992
 udata/mail.py,sha256=MShopArrtXyn8SnXtNbWUR0C4mTj1gI3a3Lf_1We-j4,2167
-udata/rdf.py,sha256=3C2Bh7usViGrCIipaW0B3-XZOQ8ezLyo35qPmbJIzXU,16740
+udata/rdf.py,sha256=iK86sKDjLEt76XLBTThxX7ESm0l--QwcIQuYzFaOnKI,16777
 udata/routing.py,sha256=x9WcpYikR45j3C_0Bi2Zoa2treSCW_oDYWMHwbdLAmE,7242
 udata/sentry.py,sha256=ekcxqUSqxfM98TtvCsPaOoX5i2l6PEcYt7kb4l3od-Q,3223
 udata/settings.py,sha256=RBrjxz6l6wPqwJULIUlpym320Cd9em7A7xz7_gmnjpc,18043
@@ -104,7 +104,7 @@ udata/core/dataset/forms.py,sha256=H2oeAD8XckMugnwUcyuKv7o1Xq1rEIlLz9FtxujqbIE,6
 udata/core/dataset/models.py,sha256=1x5zfKQAHBTCxhxz4sl-EK9BEVYsUVyBORULOg55FTU,37382
 udata/core/dataset/permissions.py,sha256=zXQ6kU-Ni3Pl5tDtat-ZPupug9InsNeCN7xRLc2Vcrc,1097
 udata/core/dataset/preview.py,sha256=IwCqiNTjjXbtA_SSKF52pwnzKKEz0GyYM95QNn2Dkog,2561
-udata/core/dataset/rdf.py,sha256=CMrrPPJh8cMPwvTokFpDI2PP91bouwdC9HRxYkNN0Yc,25907
+udata/core/dataset/rdf.py,sha256=YqsRPrrcwWaV13hflpcEOaN3VXpWW3X8VRtUT2qJH60,26383
 udata/core/dataset/search.py,sha256=NXPdBsKeLMeC0tsHSP7xFYilU58xCm4gdU0Yk5XHInM,5607
 udata/core/dataset/signals.py,sha256=WN4sV-lJlNsRkhcnhoy0SYJvCoYmK_5QFYZd1u-h4gs,161
 udata/core/dataset/tasks.py,sha256=F31TDKaawtOx6oxmWh9Vu24m0R4KVMouxFyAbaXVG6E,9609
@@ -639,7 +639,7 @@ udata/tests/dataset/test_dataset_actions.py,sha256=bgDjVYjOvu3sX_FCTCzf2snZYSprs
 udata/tests/dataset/test_dataset_commands.py,sha256=zMPJG2wYwKBee2zI65kmboxf59Zqa84DDjT8V5wj9uo,801
 udata/tests/dataset/test_dataset_events.py,sha256=hlrpoOiBbnX_COUI9Pzdqlp45GZZDqu5piwupbnPiTI,3601
 udata/tests/dataset/test_dataset_model.py,sha256=VPF17L5sMpKcFo7JNKmgXnKGAgzy1Ejo470avn3bdcQ,30874
-udata/tests/dataset/test_dataset_rdf.py,sha256=kjLyS4pvhLaey6Ve231V9qQqZ-BK5K0-Geao5Rd4hSs,34992
+udata/tests/dataset/test_dataset_rdf.py,sha256=BKaspmNYHQ5vrf_UCXteWjis4nq1iz6V5YCVxoUbTQw,35443
 udata/tests/dataset/test_dataset_tasks.py,sha256=rSafDjCiOyEb2_tVUDN4wqGylF6Yf9VNB769SLmxlwI,2283
 udata/tests/dataset/test_resource_preview.py,sha256=fp9mSL7unhyM66GR0gwhgX3OGQ4TJt7G9xU-CjsL3HI,3908
 udata/tests/features/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -705,9 +705,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=TpMlhwj07t7CPkzXn-qmHG4aTq6ZT7
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=vRqSEt9Jds--Wic-hYMkdjYaWzeHFnUn3wD5XvQL-qE,44877
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=bc-BmgT91ZJJB9DKc5YDsHqyxBhOjDJdbOy-UPo-NjA,28163
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=BKVmr4M88pfgZMU4sHIyDObV5M9E8ezZ9m7jviy2PE4,51369
-udata-10.0.1.dev32350.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.0.1.dev32350.dist-info/METADATA,sha256=GCpVTvUetj2TSV5zyJhW6J39bdSk18651TcM-_W4I4M,134145
-udata-10.0.1.dev32350.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-10.0.1.dev32350.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-10.0.1.dev32350.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.0.1.dev32350.dist-info/RECORD,,
+udata-10.0.1.dev32359.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.0.1.dev32359.dist-info/METADATA,sha256=hPcO_cGu0iLmqjkyWoUmvQcqLk1CSeJp4NxsYsACGho,134253
+udata-10.0.1.dev32359.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-10.0.1.dev32359.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-10.0.1.dev32359.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.0.1.dev32359.dist-info/RECORD,,