udata 10.0.8.dev33678__py2.py3-none-any.whl → 10.0.8.dev33725__py2.py3-none-any.whl

udata/core/dataservices/rdf.py

@@ -181,3 +181,24 @@ def dataservice_to_rdf(dataservice: Dataservice, graph=None):
         d.set(DCAT.contactPoint, contact_point)
 
     return d
+
+
+def dataservice_as_distribution_to_rdf(
+    dataservice: Dataservice, graph: Graph = None, is_hvd: bool = True
+):
+    """
+    Create a blank distribution pointing towards a dataservice with DCAT.accessService property
+    """
+    id = BNode()
+    distribution = graph.resource(id)
+    distribution.set(RDF.type, DCAT.Distribution)
+    distribution.add(DCT.title, Literal(dataservice.title))
+    distribution.add(DCAT.accessURL, URIRef(dataservice.base_api_url))
+
+    if is_hvd:
+        # DCAT-AP HVD applicable legislation is also expected at the distribution level
+        distribution.add(DCATAP.applicableLegislation, URIRef(HVD_LEGISLATION))
+
+    distribution.add(DCAT.accessService, dataservice_to_rdf(dataservice, graph))
+
+    return distribution

udata/core/dataset/rdf.py

@@ -340,6 +340,20 @@ def dataset_to_rdf(dataset: Dataset, graph: Optional[Graph] = None) -> RdfResour
     for resource in dataset.resources:
         d.add(DCAT.distribution, resource_to_rdf(resource, dataset, graph, is_hvd))
 
+    if is_hvd:
+        from udata.core.dataservices.models import Dataservice
+        from udata.core.dataservices.rdf import dataservice_as_distribution_to_rdf
+
+        # Add a blank distribution pointing to a DataService using the distribution DCAT.accessService.
+        # Useful for HVD reporting since DataService are not currently harvested by
+        # data.europa.eu as first class entities.
+        # Should be removed once supported by data.europa.eu harvesting.
+        for service in Dataservice.objects.filter(datasets=dataset, tags="hvd"):
+            d.add(
+                DCAT.distribution,
+                dataservice_as_distribution_to_rdf(service, graph),
+            )
+
     if dataset.temporal_coverage:
         d.set(DCT.temporal, temporal_to_rdf(dataset.temporal_coverage, graph))
 

udata/tests/dataset/test_dataset_rdf.py

@@ -9,6 +9,7 @@ from rdflib.namespace import FOAF, RDF
 from rdflib.resource import Resource as RdfResource
 
 from udata.core.contact_point.factories import ContactPointFactory
+from udata.core.dataservices.factories import DataserviceFactory
 from udata.core.dataset.factories import DatasetFactory, LicenseFactory, ResourceFactory
 from udata.core.dataset.models import (
     Checksum,
@@ -46,6 +47,7 @@ from udata.rdf import (
     primary_topic_identifier_from_rdf,
 )
 from udata.tests.helpers import assert200, assert_redirects
+from udata.uris import endpoint_for
 from udata.utils import faker
 
 pytestmark = pytest.mark.usefixtures("app")
@@ -277,6 +279,38 @@ class DatasetToRdfTest:
         for distrib in d.objects(DCAT.distribution):
             assert distrib.value(DCATAP.applicableLegislation).identifier == URIRef(HVD_LEGISLATION)
 
+    def test_dataset_with_dataservice_as_distribution(self):
+        """
+        Test that a dataset tagged hvd served by an hvd dataservice has an additional distribution
+        with a DCAT.accessService and appropriate DCAT-AP HVD properties
+        """
+        dataset = DatasetFactory(
+            resources=ResourceFactory.build_batch(3), tags=["hvd", "mobilite", "test"]
+        )
+        dataservice = DataserviceFactory(datasets=[dataset], tags=["hvd"])
+        d = dataset_to_rdf(dataset)
+        g = d.graph
+
+        len(list(g.subjects(RDF.type, DCAT.Distribution))) == 4
+        len(list(g.subjects(RDF.type, DCAT.DataService))) == 1
+        dataservice_as_distribution = g.resource(next(g.subjects(DCAT.accessService)))
+        dataservice_uri = URIRef(
+            endpoint_for(
+                "dataservices.show_redirect",
+                "api.dataservice",
+                dataservice=dataservice.id,
+                _external=True,
+            )
+        )
+        assert dataservice_as_distribution.value(DCAT.accessURL).identifier == URIRef(
+            dataservice.base_api_url
+        )
+        assert dataservice_as_distribution.value(DCT.title) == Literal(dataservice.title)
+        assert dataservice_as_distribution.value(DCATAP.applicableLegislation).identifier == URIRef(
+            HVD_LEGISLATION
+        )
+        assert dataservice_as_distribution.value(DCAT.accessService).identifier == dataservice_uri
+
 
 @pytest.mark.usefixtures("clean_db")
 class RdfToDatasetTest:

udata/translations/udata.pot

@@ -1,15 +1,15 @@
 # English translations for udata.
-# Copyright (C) 2024 Open Data Team
+# Copyright (C) 2025 Open Data Team
 # This file is distributed under the same license as the udata project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2025.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: udata 10.0.5.dev0\n"
+"Project-Id-Version: udata 10.0.8.dev0\n"
 "Report-Msgid-Bugs-To: i18n@opendata.team\n"
-"POT-Creation-Date: 2024-12-04 10:03+0100\n"
-"PO-Revision-Date: 2024-12-04 10:03+0100\n"
+"POT-Creation-Date: 2025-01-31 10:00+0100\n"
+"PO-Revision-Date: 2025-01-31 10:00+0100\n"
 "Last-Translator: Open Data Team <i18n@opendata.team>\n"
 "Language: en\n"
 "Language-Team: Open Data Team <i18n@opendata.team>\n"
@@ -19,31 +19,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.12.1\n"
 
-#: udata/settings.py:101
+#: udata/settings.py:109
 msgid "Welcome"
 msgstr ""
 
-#: udata/settings.py:102
+#: udata/settings.py:110
 msgid "Please confirm your email"
 msgstr ""
 
-#: udata/settings.py:103
+#: udata/settings.py:111
 msgid "Login instructions"
 msgstr ""
 
-#: udata/settings.py:104
+#: udata/settings.py:112
 msgid "Your password has been reset"
 msgstr ""
 
-#: udata/settings.py:105
+#: udata/settings.py:113
 msgid "Your password has been changed"
 msgstr ""
 
-#: udata/settings.py:106
+#: udata/settings.py:114
 msgid "Password reset instructions"
 msgstr ""
 
-#: udata/settings.py:496
+#: udata/settings.py:504
 msgid "This dataset has been archived"
 msgstr ""
 
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Invalid URL \"{url}\": {reason}"
 msgstr ""
 
-#: udata/tests/api/test_datasets_api.py:875 udata/tests/test_model.py:367
+#: udata/tests/api/test_datasets_api.py:892 udata/tests/test_model.py:367
 #: udata/uris.py:55
 msgid "Invalid URL \"{url}\""
 msgstr ""
@@ -205,16 +205,16 @@ msgstr ""
 msgid "Your udata instance is ready!"
 msgstr ""
 
-#: udata/core/owned.py:53 udata/forms/fields.py:735
+#: udata/core/owned.py:58 udata/forms/fields.py:745
 #: udata/tests/api/test_dataservices_api.py:437
 msgid "You can only set yourself as owner"
 msgstr ""
 
-#: udata/core/owned.py:62
+#: udata/core/owned.py:67
 msgid "Unknown organization"
 msgstr ""
 
-#: udata/core/owned.py:66 udata/forms/fields.py:756
+#: udata/core/owned.py:71 udata/forms/fields.py:776
 #: udata/tests/api/test_dataservices_api.py:451
 msgid "Permission denied for this organization"
 msgstr ""
@@ -260,12 +260,12 @@ msgstr ""
 msgid "dataservice"
 msgstr ""
 
-#: udata/core/dataservices/models.py:174 udata/core/dataset/models.py:569
+#: udata/core/dataservices/models.py:172 udata/core/dataset/models.py:569
 #: udata/mongo/datetime_fields.py:60
 msgid "Creation date"
 msgstr ""
 
-#: udata/core/dataservices/models.py:180 udata/core/dataset/models.py:572
+#: udata/core/dataservices/models.py:178 udata/core/dataset/models.py:572
 #: udata/mongo/datetime_fields.py:66
 msgid "Last modification date"
 msgstr ""
@@ -488,7 +488,7 @@ msgstr ""
 msgid "Related dataset"
 msgstr ""
 
-#: udata/core/dataset/forms.py:134 udata/tests/api/test_datasets_api.py:787
+#: udata/core/dataset/forms.py:134 udata/tests/api/test_datasets_api.py:804
 msgid "Wrong contact point id or contact point ownership mismatch"
 msgstr ""
 
@@ -562,20 +562,20 @@ msgstr ""
 msgid "A schema must contains a name or an URL when a version is provided."
 msgstr ""
 
-#: udata/core/dataset/models.py:167 udata/tests/api/test_datasets_api.py:883
-#: udata/tests/api/test_datasets_api.py:894
+#: udata/core/dataset/models.py:167 udata/tests/api/test_datasets_api.py:900
+#: udata/tests/api/test_datasets_api.py:911
 msgid "Schema name \"{schema}\" is not an allowed value. Allowed values: {values}"
 msgstr ""
 
-#: udata/core/dataset/models.py:186 udata/tests/api/test_datasets_api.py:905
+#: udata/core/dataset/models.py:186 udata/tests/api/test_datasets_api.py:922
 msgid ""
 "Version \"{version}\" is not an allowed value for the schema \"{name}\". "
 "Allowed versions: {values}"
 msgstr ""
 
-#: udata/core/dataset/models.py:463 udata/core/dataset/rdf.py:546
-#: udata/tests/dataset/test_dataset_rdf.py:584
-#: udata/tests/dataset/test_dataset_rdf.py:597
+#: udata/core/dataset/models.py:463 udata/core/dataset/rdf.py:594
+#: udata/tests/dataset/test_dataset_rdf.py:629
+#: udata/tests/dataset/test_dataset_rdf.py:642
 msgid "Nameless resource"
 msgstr ""
 
@@ -587,11 +587,11 @@ msgstr ""
 msgid "dataset"
 msgstr ""
 
-#: udata/core/dataset/rdf.py:544 udata/tests/dataset/test_dataset_rdf.py:571
+#: udata/core/dataset/rdf.py:592 udata/tests/dataset/test_dataset_rdf.py:616
 msgid "{format} resource"
 msgstr ""
 
-#: udata/core/dataset/tasks.py:108
+#: udata/core/dataset/tasks.py:113
 msgid "You need to update some frequency-based datasets"
 msgstr ""
 
@@ -815,7 +815,7 @@ msgstr ""
 msgid "Specify your body type (HTML or markdown)"
 msgstr ""
 
-#: udata/core/post/models.py:49
+#: udata/core/post/models.py:54
 msgid "post"
 msgstr ""
 
@@ -883,7 +883,7 @@ msgstr ""
 msgid "Connected device"
 msgstr ""
 
-#: udata/core/reuse/constants.py:15 udata/tests/reuse/test_reuse_model.py:106
+#: udata/core/reuse/constants.py:15 udata/tests/reuse/test_reuse_model.py:108
 msgid "Health"
 msgstr ""
 
@@ -1162,7 +1162,11 @@ msgstr ""
 msgid "Unable to parse date range"
 msgstr ""
 
-#: udata/forms/fields.py:733 udata/forms/fields.py:754
+#: udata/forms/fields.py:738 udata/forms/fields.py:769
+msgid "Cannot change owner after creation. Please use transfer feature."
+msgstr ""
+
+#: udata/forms/fields.py:743 udata/forms/fields.py:774
 msgid "You must be authenticated"
 msgstr ""
 
@@ -1643,4 +1647,3 @@ msgstr ""
 #: udata/tests/search/test_adapter.py:33
 msgid "Heavily reused"
 msgstr ""
-

{udata-10.0.8.dev33678.dist-info → udata-10.0.8.dev33725.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.0.8.dev33678
+Version: 10.0.8.dev33725
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -146,6 +146,7 @@ It is collectively taken care of by members of the
 - Resource catalog: fix preview_url and add extras [#3188](https://github.com/opendatateam/udata/pull/3188)
 - Add trailing slash to security routes [#3251](https://github.com/opendatateam/udata/pull/3251)
 - Upgrade packaging dependency to 24.2 [#3252](https://github.com/opendatateam/udata/pull/3252)
+- Expose HVD dataservice as inline distribution [#3256](https://github.com/opendatateam/udata/pull/3256)
 
 ## 10.0.7 (2025-01-13)
 

{udata-10.0.8.dev33678.dist-info → udata-10.0.8.dev33725.dist-info}/RECORD

@@ -86,7 +86,7 @@ udata/core/dataservices/csv.py,sha256=pL3j8-_KZWJaX1xFyILXt9wBtXn9Cmov5FUQgd0lNh
 udata/core/dataservices/factories.py,sha256=LDk8vvG0zhW8J-ZX5LoJQDU13pqeIyjQ05muuMro_eA,876
 udata/core/dataservices/models.py,sha256=aOGgCfFnWo2hjvPZIy8juNeydymkNDAQmf7IehW_oOA,9478
 udata/core/dataservices/permissions.py,sha256=98zM_R4v2ZtRubflB7ajaVQz-DVc-pZBMgtKUYy34oI,169
-udata/core/dataservices/rdf.py,sha256=mYJc7qH2f8nb9k-mF-A1sIP9rwgUyfQn4RIAO9sxtOE,6735
+udata/core/dataservices/rdf.py,sha256=pb9ytRk31IZb9Ys6tmJMfvwQ0mBt7KXSSyEOtJkmiyA,7490
 udata/core/dataservices/search.py,sha256=htjh3sq3tDuD2qwgRgZsW6ClrHLF6hMwYO4nfBO0Hr4,4171
 udata/core/dataservices/tasks.py,sha256=d2tG1l6u8-eUKUYBOgnCsQLbLmLgJXU-DOzZWhhL6Qg,897
 udata/core/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -105,7 +105,7 @@ udata/core/dataset/forms.py,sha256=H2oeAD8XckMugnwUcyuKv7o1Xq1rEIlLz9FtxujqbIE,6
 udata/core/dataset/models.py,sha256=MVNWoRdXYnZjxvuxZgEw8FAvlZhPDfqih53UUoN6uK4,37710
 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=McINqqUaqGTCTQlWpgd09HD-hdemOnPWXocG83qsIOc,29448
+udata/core/dataset/rdf.py,sha256=bL88yYXKEmzzKegp84nmnw-hdDE71IoMPvFuO_s-r9g,30139
 udata/core/dataset/search.py,sha256=E7LqHBnq3sMefvmLwTpiw-Ovem2a3NJswHesRjctboE,5627
 udata/core/dataset/signals.py,sha256=WN4sV-lJlNsRkhcnhoy0SYJvCoYmK_5QFYZd1u-h4gs,161
 udata/core/dataset/tasks.py,sha256=jG6U7cwGywhLK-MqUrvbZ1WLl_NLApiThtxmsckGzP8,10009
@@ -644,7 +644,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=9G3pWR-dLPGawnczoBkCY6yQ5DdZBW6JWSJ6JzFVuP8,37194
+udata/tests/dataset/test_dataset_rdf.py,sha256=ULefCxiAp8UwVI5D3lVs6ikTHvrLC-mmw85KVbCMl0E,38733
 udata/tests/dataset/test_dataset_tasks.py,sha256=n1W2Pg0ez02d66zQG3N93kh7dpR2yLMRDqUI6PnPaI0,3088
 udata/tests/dataset/test_resource_preview.py,sha256=fp9mSL7unhyM66GR0gwhgX3OGQ4TJt7G9xU-CjsL3HI,3908
 udata/tests/features/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -695,7 +695,7 @@ udata/tests/workers/test_jobs_commands.py,sha256=TAfJUUPBSkwtFHZpIa6k9n-o_SUni7q
 udata/tests/workers/test_tasks_routing.py,sha256=m7Zu9X7GW3oKkSDcHM-dC20Vba3Fruui44bMBVU1dcc,2228
 udata/tests/workers/test_workers_api.py,sha256=x8EkULR9G5TKl5WwjdVwfFEttbudpiWIYN2umETrCzY,8805
 udata/tests/workers/test_workers_helpers.py,sha256=_983ChRxas3gsjykaEpXWQUbk2qTMJgeFZpIAHTuhLk,647
-udata/translations/udata.pot,sha256=HYlgKz6EoUdapTQf8-0HjDRn347pBKaa7ZAsb9T9DOo,37095
+udata/translations/udata.pot,sha256=d5x2mS62S6CEt8MIHhyiifsHTnDqg7MO-ud1Cs4Zbik,37233
 udata/translations/ar/LC_MESSAGES/udata.mo,sha256=4YxfMRxhw9dCzq6GziJ0mtSQCrTVZQgkPjYKWk2a9JA,12512
 udata/translations/ar/LC_MESSAGES/udata.po,sha256=gvS1W9ujdsIuTe0dPeGivJsityiJZjPsdEo--3nPIIA,42419
 udata/translations/de/LC_MESSAGES/udata.mo,sha256=SX1D8DORwfKZrPpasq5VKeukjTldXmcjoVq6OoofnJo,15936
@@ -710,9 +710,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=18Y5YtzVKInDejw-R-45HNzsB3OVwJ
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=6IQvFk0NTDV5Jq-kLkkzpioWfrMaLDa1oQSevKFbxKQ,44943
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=O4zKHNkiX-2GUfLLa0kwbxIA5M1jxiqkHzaMh1t2wKs,29169
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=W9C447pW0O-Q28ji8wGLgPNrnqlPYXaMD0AOWJPcpZc,51918
-udata-10.0.8.dev33678.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.0.8.dev33678.dist-info/METADATA,sha256=x4Y0ALzcZYdtW1eP2rY4cRRzgZRhE2wPARfbPiYfyjk,139627
-udata-10.0.8.dev33678.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-10.0.8.dev33678.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-10.0.8.dev33678.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.0.8.dev33678.dist-info/RECORD,,
+udata-10.0.8.dev33725.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.0.8.dev33725.dist-info/METADATA,sha256=WSXhSFEindqLfaA_Wohe3sEoAFFWjF5VJ8CgpKN9250,139732
+udata-10.0.8.dev33725.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-10.0.8.dev33725.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-10.0.8.dev33725.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.0.8.dev33725.dist-info/RECORD,,