udata 10.0.3.dev32628__py2.py3-none-any.whl → 10.0.3.dev32655__py2.py3-none-any.whl

udata/core/dataset/constants.py

@@ -72,6 +72,8 @@ RESOURCE_FILETYPES = OrderedDict(
     ]
 )
 
+OGC_SERVICE_FORMATS = ["ogc:wms", "ogc:wfs", "wms", "wfs"]
+
 CHECKSUM_TYPES = ("sha1", "sha2", "sha256", "md5", "crc")
 DEFAULT_CHECKSUM_TYPE = "sha1"
 

udata/core/dataset/rdf.py

@@ -49,7 +49,7 @@ from udata.rdf import (
 from udata.uris import endpoint_for
 from udata.utils import get_by, safe_unicode
 
-from .constants import UPDATE_FREQUENCIES
+from .constants import OGC_SERVICE_FORMATS, UPDATE_FREQUENCIES
 from .models import Checksum, Dataset, License, Resource
 
 log = logging.getLogger(__name__)
@@ -126,6 +126,44 @@ def owner_to_rdf(dataset, graph=None):
     return
 
 
+def ogc_service_to_rdf(dataset, resource, graph=None, is_hvd=False):
+    """
+    Build a dataservice on the fly for OGC services distributions
+    Inspired from https://github.com/SEMICeu/iso-19139-to-dcat-ap/blob/f61b2921dd398b90b2dd2db14085e75687f7616b/iso-19139-to-dcat-ap.xsl#L1419
+    """
+    graph = graph or Graph(namespace_manager=namespace_manager)
+    service = graph.resource(BNode())
+    service.set(RDF.type, DCAT.DataService)
+    service.set(DCT.title, Literal(resource.title))
+    service.set(DCAT.endpointURL, URIRef(resource.url.split("?")[0]))
+    if "request=getcapabilities" in resource.url.lower():
+        service.set(DCAT.endpointDescription, URIRef(resource.url))
+    service.set(
+        DCT.conformsTo,
+        URIRef("http://www.opengeospatial.org/standards/" + resource.format.split(":")[-1]),
+    )
+
+    if dataset and dataset.license:
+        service.add(DCT.rights, Literal(dataset.license.title))
+        if dataset.license.url:
+            service.add(DCT.license, URIRef(dataset.license.url))
+
+    if dataset and dataset.contact_point:
+        contact_point = contact_point_to_rdf(dataset.contact_point, graph)
+        if contact_point:
+            service.set(DCAT.contactPoint, contact_point)
+
+    if is_hvd:
+        # DCAT-AP HVD applicable legislation is also expected at the distribution > accessService level
+        service.add(DCATAP.applicableLegislation, URIRef(HVD_LEGISLATION))
+        for tag in dataset.tags:
+            # Add HVD category if this dataset is tagged HVD
+            if tag in TAG_TO_EU_HVD_CATEGORIES:
+                service.add(DCATAP.hvdCategory, URIRef(TAG_TO_EU_HVD_CATEGORIES[tag]))
+
+    return service
+
+
 def resource_to_rdf(resource, dataset=None, graph=None, is_hvd=False):
     """
     Map a Resource domain model to a DCAT/RDF graph
@@ -175,6 +213,11 @@ def resource_to_rdf(resource, dataset=None, graph=None, is_hvd=False):
     if is_hvd:
         # DCAT-AP HVD applicable legislation is also expected at the distribution level
         r.add(DCATAP.applicableLegislation, URIRef(HVD_LEGISLATION))
+
+    # Add access service for known OGC service formats
+    if resource.format in OGC_SERVICE_FORMATS:
+        r.add(DCAT.accessService, ogc_service_to_rdf(dataset, resource, graph, is_hvd))
+
     return r
 
 

udata/tests/dataset/test_dataset_rdf.py

@@ -197,6 +197,34 @@ class DatasetToRdfTest:
         assert r.graph.value(checksum.identifier, SPDX.algorithm) == SPDX.checksumAlgorithm_sha1
         assert checksum.value(SPDX.checksumValue) == Literal(resource.checksum.value)
 
+    def test_ogc_resource_access_service(self):
+        license = LicenseFactory()
+        resource = ResourceFactory(
+            format="ogc:wms",
+            url="https://services.data.shom.fr/INSPIRE/wms/r?service=WMS&request=GetCapabilities&version=1.3.0",
+        )
+        contact = ContactPointFactory()
+        dataset = DatasetFactory(resources=[resource], license=license, contact_point=contact)
+
+        r = resource_to_rdf(resource, dataset)
+
+        service = r.value(DCAT.accessService)
+        assert service.value(RDF.type).identifier == DCAT.DataService
+        assert service.value(DCT.title) == Literal(resource.title)
+        assert service.value(DCAT.endpointDescription).identifier == URIRef(
+            "https://services.data.shom.fr/INSPIRE/wms/r?service=WMS&request=GetCapabilities&version=1.3.0"
+        )
+        assert service.value(DCAT.endpointURL).identifier == URIRef(
+            "https://services.data.shom.fr/INSPIRE/wms/r"
+        )
+        assert service.value(DCT.conformsTo).identifier == URIRef(
+            "http://www.opengeospatial.org/standards/wms"
+        )
+        assert service.value(DCT.license).identifier == URIRef(license.url)
+
+        contact_rdf = service.value(DCAT.contactPoint)
+        assert contact_rdf.value(RDF.type).identifier == VCARD.Kind
+
     def test_temporal_coverage(self):
         start = faker.past_date(start_date="-30d")
         end = faker.future_date(end_date="+30d")

{udata-10.0.3.dev32628.dist-info → udata-10.0.3.dev32655.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.0.3.dev32628
+Version: 10.0.3.dev32655
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -140,6 +140,7 @@ It is collectively taken care of by members of the
 
 ## Current (in progress)
 
+- Expose OGC services distributions as dataservice [#3203](https://github.com/opendatateam/udata/pull/3203)
 - Add a matomo "campaign" parameter on links in emails if `MAIL_CAMPAIGN` is configured [#3190](https://github.com/opendatateam/udata/pull/3190)
 - Add DCAT-AP HVD properties in RDF output if the dataservice or its datasets are tagged hvd [#3187](https://github.com/opendatateam/udata/pull/3187)
 

{udata-10.0.3.dev32628.dist-info → udata-10.0.3.dev32655.dist-info}/RECORD

@@ -95,7 +95,7 @@ udata/core/dataset/api.py,sha256=cfJU-Py0-4rNU5kpbA90htlCMoiYv_-SPczottDCEfs,297
 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
-udata/core/dataset/constants.py,sha256=pkOvrdNBq3k1ojJcv6oSg7kK1IUtb3PqLni-YJ3rKSY,2880
+udata/core/dataset/constants.py,sha256=dlhmg36JnZHw8ib5y875JHjUSa2uaTI-ER0DtQtdLCA,2940
 udata/core/dataset/csv.py,sha256=y2ySneEwFL24isy7HCvkt3xbdDnKr8qoZrBThpnxBCI,3560
 udata/core/dataset/events.py,sha256=bSM0nFEX14r4JHc-bAM-7OOuD3JAxUIpw9GgXbOsUyw,4078
 udata/core/dataset/exceptions.py,sha256=uKiayLSpSzsnLvClObS6hOO0qXEqvURKN7_w8eimQNU,498
@@ -104,7 +104,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=YqsRPrrcwWaV13hflpcEOaN3VXpWW3X8VRtUT2qJH60,26383
+udata/core/dataset/rdf.py,sha256=TGpwjsFF9hpiC3fxcF7Rej97bJjlzRy2vXbisn-a90A,28271
 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
@@ -640,7 +640,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=BKaspmNYHQ5vrf_UCXteWjis4nq1iz6V5YCVxoUbTQw,35443
+udata/tests/dataset/test_dataset_rdf.py,sha256=TuKomK0SWqO8R1hQkV8iA3w4YvReO0vVHPfBqKP_oaU,36750
 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
@@ -706,9 +706,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=nGPoTSbeRlpCQGuxoJ7Oa650flpeeh
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=f-tilnngNNBEIQdXmm3GbdaLlvbwG9YLLwhqyRD5Lh4,44871
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=8RL_aEe-0QJdgY-TNMy7bS4z8X9IOK8-C076dxcp3As,28163
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=Cp0bKPeIbuAqvFeoey_9ItQbAHIeiFZPnZLa6A6JNbI,51363
-udata-10.0.3.dev32628.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.0.3.dev32628.dist-info/METADATA,sha256=kz5VPyJ8gQwr8YYN-CCPM1Kc5clSUlQKWeqCfnygwQ8,135300
-udata-10.0.3.dev32628.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-10.0.3.dev32628.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-10.0.3.dev32628.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.0.3.dev32628.dist-info/RECORD,,
+udata-10.0.3.dev32655.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.0.3.dev32655.dist-info/METADATA,sha256=cBqSe6YkwinrY6RtX31Nri1BwRmEn4lWwegggpqzRA0,135408
+udata-10.0.3.dev32655.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-10.0.3.dev32655.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-10.0.3.dev32655.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.0.3.dev32655.dist-info/RECORD,,