udata 9.2.5.dev32222__py2.py3-none-any.whl → 9.2.5.dev32239__py2.py3-none-any.whl

udata/core/dataservices/rdf.py

@@ -118,6 +118,21 @@ def dataservice_to_rdf(dataservice: Dataservice, graph=None):
     if dataservice.base_api_url:
         d.set(DCAT.endpointURL, Literal(dataservice.base_api_url))
 
+    if dataservice.harvest and dataservice.harvest.remote_url:
+        d.set(DCAT.landingPage, URIRef(dataservice.harvest.remote_url))
+    elif dataservice.id:
+        d.set(
+            DCAT.landingPage,
+            URIRef(
+                endpoint_for(
+                    "dataservices.show_redirect",
+                    "api.dataservice",
+                    dataservice=dataservice.id,
+                    _external=True,
+                )
+            ),
+        )
+
     if dataservice.endpoint_description_url:
         d.set(DCAT.endpointDescription, Literal(dataservice.endpoint_description_url))
 

udata/core/dataset/api.py

@@ -430,7 +430,7 @@ class UploadNewDatasetResource(UploadMixin, API):
     @api.expect(upload_parser)
     @api.marshal_with(upload_fields, code=201)
     def post(self, dataset):
-        """Upload a new dataset resource"""
+        """Upload a file for a new dataset resource"""
         ResourceEditPermission(dataset).test()
         infos = self.handle_upload(dataset)
         resource = Resource(**infos)

udata/core/dataset/rdf.py

@@ -214,6 +214,21 @@ def dataset_to_rdf(dataset, graph=None):
     d.set(DCT.issued, Literal(dataset.created_at))
     d.set(DCT.modified, Literal(dataset.last_modified))
 
+    if dataset.harvest and dataset.harvest.remote_url:
+        d.set(DCAT.landingPage, URIRef(dataset.harvest.remote_url))
+    elif dataset.id:
+        d.set(
+            DCAT.landingPage,
+            URIRef(
+                endpoint_for(
+                    "datasets.show_redirect",
+                    "api.dataset",
+                    dataset=dataset.id,
+                    _external=True,
+                )
+            ),
+        )
+
     if dataset.acronym:
         d.set(SKOS.altLabel, Literal(dataset.acronym))
 

udata/tests/dataset/test_dataset_rdf.py

@@ -81,16 +81,19 @@ class DatasetToRdfTest:
         assert d.value(DCT.title) == Literal(dataset.title)
         assert d.value(DCT.issued) == Literal(dataset.created_at)
         assert d.value(DCT.modified) == Literal(dataset.last_modified)
+        assert d.value(DCAT.landingPage) is None
 
     def test_all_dataset_fields(self):
         resources = ResourceFactory.build_batch(3)
         org = OrganizationFactory(name="organization")
+        remote_url = "https://somewhere.org/dataset"
         dataset = DatasetFactory(
             tags=faker.tags(nb=3),
             resources=resources,
             frequency="daily",
             acronym="acro",
             organization=org,
+            harvest=HarvestDatasetMetadata(remote_url=remote_url),
         )
         d = dataset_to_rdf(dataset)
         g = d.graph
@@ -110,6 +113,7 @@ class DatasetToRdfTest:
         assert d.value(DCT.issued) == Literal(dataset.created_at)
         assert d.value(DCT.modified) == Literal(dataset.last_modified)
         assert d.value(DCT.accrualPeriodicity).identifier == FREQ.daily
+        assert d.value(DCAT.landingPage).identifier == URIRef(remote_url)
         expected_tags = set(Literal(t) for t in dataset.tags)
         assert set(d.objects(DCAT.keyword)) == expected_tags
         assert len(list(d.objects(DCAT.distribution))) == len(resources)

{udata-9.2.5.dev32222.dist-info → udata-9.2.5.dev32239.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.2.5.dev32222
+Version: 9.2.5.dev32239
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -149,6 +149,7 @@ It is collectively taken care of by members of the
 - Add a "filter by organization badge" for datasets, dataservices, reuses and organizations [#3155](https://github.com/opendatateam/udata/pull/3155]
 - Add dataservices search with search-service [#3171](https://github.com/opendatateam/udata/pull/3171)
     * 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)
 
 ## 9.2.4 (2024-10-22)
 

{udata-9.2.5.dev32222.dist-info → udata-9.2.5.dev32239.dist-info}/RECORD

@@ -85,13 +85,13 @@ udata/core/dataservices/apiv2.py,sha256=XIqJq58uLtxtt52iKYo7Fl0ZXv9Sz72uA7JIGwP8
 udata/core/dataservices/factories.py,sha256=LDk8vvG0zhW8J-ZX5LoJQDU13pqeIyjQ05muuMro_eA,876
 udata/core/dataservices/models.py,sha256=p9tn-YTrd01WHHke49EMx3msH9Fu49XtdQsII9sAJXE,8488
 udata/core/dataservices/permissions.py,sha256=98zM_R4v2ZtRubflB7ajaVQz-DVc-pZBMgtKUYy34oI,169
-udata/core/dataservices/rdf.py,sha256=6uSFxA8odiSq2wutAOioKhXSCA-7HtD6u6hEtcF2vEs,4786
+udata/core/dataservices/rdf.py,sha256=Uld0jKuI6qmbKT9AUVcixaYLqf7xDuMGXbBixuyA1uo,5258
 udata/core/dataservices/search.py,sha256=htjh3sq3tDuD2qwgRgZsW6ClrHLF6hMwYO4nfBO0Hr4,4171
 udata/core/dataservices/tasks.py,sha256=a43x1oKNF-EYmzM3O-8GQPJvZsgJmQiXOZx8Qti3M4E,960
 udata/core/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataset/actions.py,sha256=mX6xox0PiMrbcAPZ3VZsI26rfM-ciYfEXxN6sqqImKA,1222
 udata/core/dataset/activities.py,sha256=v8k1jwhdx62Z2ARZq8Q-x86OWSsBK99hRloPl74OCgA,1502
-udata/core/dataset/api.py,sha256=yjlW2dzDy6QTsYf-r_uc_-IAGgQcA2n9dqOrSh2CDHQ,29776
+udata/core/dataset/api.py,sha256=cfJU-Py0-4rNU5kpbA90htlCMoiYv_-SPczottDCEfs,29787
 udata/core/dataset/api_fields.py,sha256=ZF24FhKYe5jlV8jXG6YR0Hko9WOuV0446FAlLkEgAWE,17295
 udata/core/dataset/apiv2.py,sha256=VTE4eYx5udzOdHDUkD7TYpuCtppZMKp1okTSEE1fcgI,16925
 udata/core/dataset/commands.py,sha256=__hPAk_6iHtgMnEG51ux0vbNWJHxUjXhi1ukH4hF5jY,3714
@@ -104,7 +104,7 @@ udata/core/dataset/forms.py,sha256=H2oeAD8XckMugnwUcyuKv7o1Xq1rEIlLz9FtxujqbIE,6
 udata/core/dataset/models.py,sha256=ax4zO4N04DGUeAEz2Ee2AQo7L4ULjKUSmgpoM4GrCh8,36749
 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=-ZgGmtMJ2ofD_mCvRHP6mZ-Xwa2opXHgLw-r7YByXx0,25299
+udata/core/dataset/rdf.py,sha256=AExA1E3KAq1soXWtiRsrg0cNAND_wZctBG1y07XVnfk,25739
 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
@@ -637,7 +637,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=oaqm7q3DwZa4GLCyv7rj3rvtBIKxdCf4wUQdYo1pOiU,29745
-udata/tests/dataset/test_dataset_rdf.py,sha256=XtlzEB86-ZnX0wEzE0Z0rhO_gooBPZIL3yNM3PW1Bio,34075
+udata/tests/dataset/test_dataset_rdf.py,sha256=ApOUVq1Vs1DywFYqfm1fI6lInjjBrVIXjRftSEKO5BE,34318
 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
@@ -703,9 +703,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-9.2.5.dev32222.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.2.5.dev32222.dist-info/METADATA,sha256=tQm-WXBWktBOX9whOEG-BDk84FfH4aEz_AYLmPJV0AA,133375
-udata-9.2.5.dev32222.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.2.5.dev32222.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.2.5.dev32222.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.2.5.dev32222.dist-info/RECORD,,
+udata-9.2.5.dev32239.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-9.2.5.dev32239.dist-info/METADATA,sha256=8woHLfzk3iUE7oKjgAqHiV5FLwJJkRrvN-SvxvqqL1Y,133471
+udata-9.2.5.dev32239.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-9.2.5.dev32239.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-9.2.5.dev32239.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-9.2.5.dev32239.dist-info/RECORD,,