udata 10.5.1.dev35928__py2.py3-none-any.whl → 10.5.1.dev35978__py2.py3-none-any.whl

udata/core/dataset/apiv2.py

@@ -488,6 +488,8 @@ class ResourceAPI(API):
             resource = get_by(dataset.resources, "id", rid)
         else:
             resource = CommunityResource.objects(id=rid).first()
+            if resource:
+                dataset = resource.dataset
         if not resource:
             apiv2.abort(404, "Resource does not exist")
 

udata/core/dataset/rdf.py

@@ -558,7 +558,7 @@ def frequency_from_rdf(term):
 
 def mime_from_rdf(resource):
     # DCAT.mediaType *should* only be used when defined as IANA
-    mime = rdf_value(resource, DCAT.mediaType)
+    mime = rdf_value(resource, DCAT.mediaType, parse_label=True)
     if not mime:
         return
     if IANAFORMAT in mime:
@@ -568,7 +568,7 @@ def mime_from_rdf(resource):
 
 
 def format_from_rdf(resource):
-    format = rdf_value(resource, DCT.format)
+    format = rdf_value(resource, DCT.format, parse_label=True)
     if not format:
         return
     if EUFORMAT in format or IANAFORMAT in format:
@@ -591,7 +591,7 @@ def title_from_rdf(rdf, url):
         last_part = url.split("/")[-1]
         if "." in last_part and "?" not in last_part:
             return last_part
-    fmt = rdf_value(rdf, DCT.format)
+    fmt = format_from_rdf(rdf)
     lang = current_app.config["DEFAULT_LANGUAGE"]
     with i18n.language(lang):
         if fmt:

udata/harvest/tests/test_dcat_backend.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import re
 import xml.etree.ElementTree as ET
 from datetime import date
 
@@ -969,9 +968,7 @@ class CswIso19139DcatBackendTest:
             == "http://atom.geo-ide.developpement-durable.gouv.fr/atomArchive/GetResource?id=fr-120066022-ldd-cab63273-b3ae-4e8a-ae1c-6192e45faa94&datasetAggregate=true"
         )
         assert resource.type == "main"
-
-        # Sadly resource format is parsed as a blank node. Format parsing should be improved.
-        assert re.match(r"n[0-9a-f]{32}", resource.format)
+        assert resource.format == "mapinfo tab"
 
         # Computed from source config `remote_url_prefix` + `dct:identifier` from `isPrimaryTopicOf`
         if remote_url_prefix:

udata/tests/dataset/test_dataset_rdf.py

@@ -5,7 +5,7 @@ import pytest
 import requests
 from flask import url_for
 from rdflib import BNode, Graph, Literal, Namespace, URIRef
-from rdflib.namespace import FOAF, RDF
+from rdflib.namespace import FOAF, RDF, RDFS
 from rdflib.resource import Resource as RdfResource
 
 from udata.core.contact_point.factories import ContactPointFactory
@@ -672,7 +672,7 @@ class RdfToDatasetTest:
 
         assert resource.title == "somefile.csv"
 
-    def test_resource_title_from_format(self):
+    def test_resource_title_from_format_value(self):
         node = BNode()
         g = Graph()
         url = "https://www.somewhere.com/no-extension/"
@@ -686,6 +686,23 @@ class RdfToDatasetTest:
 
         assert resource.title == _("{format} resource").format(format="csv")
 
+    def test_resource_title_from_format_label(self):
+        node = BNode()
+        g = Graph()
+        url = "https://www.somewhere.com/no-extension/"
+
+        g.set((node, RDF.type, DCAT.Distribution))
+        g.set((node, DCAT.downloadURL, URIRef(url)))
+        format = BNode()
+        g.add((node, DCT.format, format))
+        g.add((format, RDF.type, DCT.MediaType))
+        g.add((format, RDFS.label, Literal("CSV")))
+
+        resource = resource_from_rdf(g)
+        resource.validate()
+
+        assert resource.title == _("{format} resource").format(format="csv")
+
     def test_resource_generic_title(self):
         node = BNode()
         g = Graph()
@@ -801,6 +818,56 @@ class RdfToDatasetTest:
         assert isinstance(dataset, Dataset)
         assert len(dataset.resources) == 1
 
+    def test_resource_format_from_mediatype_uriref(self):
+        node = BNode()
+        g = Graph()
+        url = "https://www.somewhere.com/no-extension/"
+
+        g.set((node, RDF.type, DCAT.Distribution))
+        g.set((node, DCAT.downloadURL, URIRef(url)))
+        format = URIRef("http://publications.europa.eu/resource/authority/file-type/CSV")
+        g.add((format, RDF.type, DCT.MediaType))
+        g.add((node, DCT.format, format))
+
+        resource = resource_from_rdf(g)
+        resource.validate()
+
+        assert resource.format == "csv"
+
+    def test_resource_format_from_mediatype_label(self):
+        node = BNode()
+        g = Graph()
+        url = "https://www.somewhere.com/no-extension/"
+
+        g.set((node, RDF.type, DCAT.Distribution))
+        g.set((node, DCAT.downloadURL, URIRef(url)))
+        format = BNode()
+        g.add((node, DCT.format, format))
+        g.add((format, RDF.type, DCT.MediaType))
+        g.add((format, RDFS.label, Literal("CSV")))
+
+        resource = resource_from_rdf(g)
+        resource.validate()
+
+        assert resource.format == "csv"
+
+    def test_resource_format_from_mediatype_uriref_and_label(self):
+        node = BNode()
+        g = Graph()
+        url = "https://www.somewhere.com/no-extension/"
+
+        g.set((node, RDF.type, DCAT.Distribution))
+        g.set((node, DCAT.downloadURL, URIRef(url)))
+        format = URIRef("http://publications.europa.eu/resource/authority/file-type/SHP")
+        g.add((format, RDF.type, DCT.MediaType))
+        g.add((format, RDFS.label, Literal("ESRI Shapefile")))
+        g.add((node, DCT.format, format))
+
+        resource = resource_from_rdf(g)
+        resource.validate()
+
+        assert resource.format == "esri shapefile"
+
     def test_match_license_from_license_uri(self):
         license = LicenseFactory()
         node = BNode()

{udata-10.5.1.dev35928.dist-info → udata-10.5.1.dev35978.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.5.1.dev35928
+Version: 10.5.1.dev35978
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -142,7 +142,8 @@ It is collectively taken care of by members of the
 
 ## Current (in progress)
 
-- Nothing yet
+- Fix invalid resource format from harvested RDF records [#3354](https://github.com/opendatateam/udata/pull/3354)
+- Expose `dataset_id` for CommunityResource in /dataset/resource/id [#3258](https://github.com/opendatateam/udata/pull/3258)
 
 ## 10.5.0 (2025-07-02)
 

{udata-10.5.1.dev35928.dist-info → udata-10.5.1.dev35978.dist-info}/RECORD

@@ -97,7 +97,7 @@ udata/core/dataset/actions.py,sha256=mX6xox0PiMrbcAPZ3VZsI26rfM-ciYfEXxN6sqqImKA
 udata/core/dataset/activities.py,sha256=RtY06G6FiEMr8NY26kaYKCXwGdcGtBJv2U8kWgFTRxE,3048
 udata/core/dataset/api.py,sha256=BxfsxwQO3k3IJ6lozosT-l5_kGz2bmSpzoUVJpsBg44,35434
 udata/core/dataset/api_fields.py,sha256=scDu5BUkD0QMoQEARtk5yMjA0h_O-lgu0AjW396qV4k,18090
-udata/core/dataset/apiv2.py,sha256=UF0wjHZd2YxwzDd1QnzWmSVhwJjlsPzaOCvp8RDv5hA,20853
+udata/core/dataset/apiv2.py,sha256=2PWGDTelPQntMqmj8GtiFoTGW3bIBHMr3xQJdihVsYg,20921
 udata/core/dataset/commands.py,sha256=__hPAk_6iHtgMnEG51ux0vbNWJHxUjXhi1ukH4hF5jY,3714
 udata/core/dataset/constants.py,sha256=fKn21GzRShZv6pzKy3TvEK1cevQ9H3dOFE-xTRuE0lA,2971
 udata/core/dataset/csv.py,sha256=OmfHUX5d325XJva2lqHNEBJz3vROfEqkiu1rBfS6Reg,3612
@@ -108,7 +108,7 @@ udata/core/dataset/forms.py,sha256=7KUxuFcEGT0MUe0cZCiZtsnZhvGgvEd68pe13NgeSMI,6
 udata/core/dataset/models.py,sha256=_zsUDRl4xUt2Rp1QuIw2f85FxBNx_e2XgpiXVxVQ-tE,42889
 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=anpTfjH9dUdZZRk_X8oixtSqXwffVKwXgfy3lB5OA8A,31698
+udata/core/dataset/rdf.py,sha256=Bc83-JdY_2yuSUGnELVlhIQd7j1zIEX6d6CCw5RrOL4,31728
 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=6FzeLzJRQxzq7sBLUE8H8ZGLByix2EDOzGAsA8FteX8,10019
@@ -305,7 +305,7 @@ udata/harvest/tests/person.jsonld,sha256=I7Ynh-PQlNeD51I1LrCgYOEjhL-WBeb65xzIE_s
 udata/harvest/tests/test_actions.py,sha256=Hm5MpOEFXBvFzcNMu7hvrWIiP6fiOXLuDOyrykL-4tc,25224
 udata/harvest/tests/test_api.py,sha256=dyCXhKgOO0XmCPgH_36sob8WVhtMB2WX1johbfzJtDI,21553
 udata/harvest/tests/test_base_backend.py,sha256=ow8ecGtD836mUqyPWYjkS5nx0STyT5RMLgBdDyOhts4,19233
-udata/harvest/tests/test_dcat_backend.py,sha256=4qMRU5Ax60X90XYWHCp3Sf2bVOPfT8Leljo6OEcuuGQ,43833
+udata/harvest/tests/test_dcat_backend.py,sha256=O2SOSz34DwBxta9RrDJ2wGxxfwTKFyCHTEc1bH0oRI8,43717
 udata/harvest/tests/test_filters.py,sha256=PT2qopEIoXsqi8MsNDRuhNH7jGXiQo8r0uJrCOUd4aM,2465
 udata/harvest/tests/test_models.py,sha256=f9NRR2_S4oZFgF8qOumg0vv-lpnEBJbI5vNtcwFdSqM,831
 udata/harvest/tests/test_notifications.py,sha256=MMzTzkv-GXMNFeOwAi31rdTsAXyLCLOSna41zOtaJG0,816
@@ -663,7 +663,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=av4RhOnT-52qs-WL1NCn6R2SMa_fzDcoV-06vjccsdw,33891
-udata/tests/dataset/test_dataset_rdf.py,sha256=kFnrKzt_Gyw5zoRB2Tkhd3LN-XOpaIVzrF0oYvVS1fA,42220
+udata/tests/dataset/test_dataset_rdf.py,sha256=7SorX0e0VD3hmj8C0qXA4Vb3Q3xl2qaE4ijRfeQ12PM,44537
 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
@@ -731,9 +731,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=9sCd1MUKvtVP_sOXvK-G5v4PfWkkdA
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=-eJptz9s63rjkdm-3HJi_2t70pyv3-8EuXBn-B2qI_4,48419
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=qduXntHWe__KaUxJ4JwwyGG3eSgYb1auGdNax0lS49c,29169
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=6QCuLMCRjgyAvu9U7i0P19ae8fm_uStfmxHLqUO9EoY,55394
-udata-10.5.1.dev35928.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.5.1.dev35928.dist-info/METADATA,sha256=SqShAb88u183S-pddBOvf6q5695vnyz54TefrxpscD0,148867
-udata-10.5.1.dev35928.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-udata-10.5.1.dev35928.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
-udata-10.5.1.dev35928.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.5.1.dev35928.dist-info/RECORD,,
+udata-10.5.1.dev35978.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.5.1.dev35978.dist-info/METADATA,sha256=l3P4t1fQD1qEtuDbmqjvBeMR4L4t-U0ImI-n2jk_a10,149092
+udata-10.5.1.dev35978.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+udata-10.5.1.dev35978.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
+udata-10.5.1.dev35978.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.5.1.dev35978.dist-info/RECORD,,