udata 9.2.5.dev32275__py2.py3-none-any.whl → 9.2.5.dev32301__py2.py3-none-any.whl

udata/commands/fixtures.py

@@ -39,7 +39,7 @@ COMMUNITY_RES_URL = "/api/1/datasets/community_resources"
 DISCUSSION_URL = "/api/1/discussions"
 
 
-DEFAULT_FIXTURE_FILE_TAG: str = "v2.0.0"
+DEFAULT_FIXTURE_FILE_TAG: str = "v3.0.0"
 DEFAULT_FIXTURE_FILE: str = f"https://raw.githubusercontent.com/opendatateam/udata-fixtures/{DEFAULT_FIXTURE_FILE_TAG}/results.json"  # noqa
 
 DEFAULT_FIXTURES_RESULTS_FILENAME: str = "results.json"

udata/core/contact_point/factories.py

@@ -10,4 +10,5 @@ class ContactPointFactory(ModelFactory):
         model = ContactPoint
 
     name = factory.Faker("name")
+    contact_form = factory.Faker("url")
     email = factory.Sequence(lambda n: "contact_point{}@example.com".format(n))

udata/core/dataservices/rdf.py

@@ -8,6 +8,7 @@ from udata.rdf import (
     DCAT,
     DCT,
     contact_point_from_rdf,
+    contact_point_to_rdf,
     namespace_manager,
     rdf_value,
     remote_url_from_rdf,
@@ -116,7 +117,7 @@ def dataservice_to_rdf(dataservice: Dataservice, graph=None):
     d.set(DCT.issued, Literal(dataservice.created_at))
 
     if dataservice.base_api_url:
-        d.set(DCAT.endpointURL, Literal(dataservice.base_api_url))
+        d.set(DCAT.endpointURL, URIRef(dataservice.base_api_url))
 
     if dataservice.harvest and dataservice.harvest.remote_url:
         d.set(DCAT.landingPage, URIRef(dataservice.harvest.remote_url))
@@ -134,7 +135,7 @@ def dataservice_to_rdf(dataservice: Dataservice, graph=None):
         )
 
     if dataservice.endpoint_description_url:
-        d.set(DCAT.endpointDescription, Literal(dataservice.endpoint_description_url))
+        d.set(DCAT.endpointDescription, URIRef(dataservice.endpoint_description_url))
 
     for tag in dataservice.tags:
         d.add(DCAT.keyword, Literal(tag))
@@ -147,4 +148,8 @@ def dataservice_to_rdf(dataservice: Dataservice, graph=None):
     for dataset in dataservice.datasets:
         d.add(DCAT.servesDataset, dataset_to_graph_id(dataset))
 
+    contact_point = contact_point_to_rdf(dataservice.contact_point, graph)
+    if contact_point:
+        d.set(DCAT.contactPoint, contact_point)
+
     return d

udata/core/dataset/rdf.py

@@ -35,6 +35,7 @@ from udata.rdf import (
     SPDX,
     TAG_TO_EU_HVD_CATEGORIES,
     contact_point_from_rdf,
+    contact_point_to_rdf,
     namespace_manager,
     rdf_unique_values,
     rdf_value,
@@ -258,6 +259,10 @@ def dataset_to_rdf(dataset, graph=None):
     if publisher:
         d.set(DCT.publisher, publisher)
 
+    contact_point = contact_point_to_rdf(dataset.contact_point, graph)
+    if contact_point:
+        d.set(DCAT.contactPoint, contact_point)
+
     return d
 
 

udata/core/organization/constants.py

@@ -19,9 +19,9 @@ BIGGEST_LOGO_SIZE = LOGO_SIZES[0]
 
 PUBLIC_SERVICE = "public-service"
 CERTIFIED = "certified"
-ASSOCIATION = "Association"
-COMPANY = "Company"
-LOCAL_AUTHORITY = "Local authority"
+ASSOCIATION = "association"
+COMPANY = "company"
+LOCAL_AUTHORITY = "local-authority"
 
 TITLE_SIZE_LIMIT = 350
 DESCRIPTION_SIZE_LIMIT = 100000

udata/harvest/tests/dcat/catalog.xml

@@ -115,6 +115,7 @@
   <vcard:Organization rdf:about="http://data.test.org/contacts/1">
     <vcard:fn>Organization contact</vcard:fn>
     <vcard:hasEmail>mailto: hello@its.me</vcard:hasEmail>
+    <vcard:hasUrl>https://data.support.com</vcard:hasUrl>
   </vcard:Organization>
   <dcterms:PeriodOfTime rdf:about="file:///base/data/home/apps/s%7Erdf-translator/2.408516547054015808/temporal-1">
     <schema:startDate rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2016-12-05T00:00:00</schema:startDate>

udata/harvest/tests/test_dcat_backend.py

@@ -517,8 +517,9 @@ class DcatBackendTest:
         assert dataset.temporal_coverage is not None
         assert dataset.temporal_coverage.start == date(2016, 1, 1)
         assert dataset.temporal_coverage.end == date(2016, 12, 5)
-        assert dataset.contact_point["email"] == "hello@its.me"
-        assert dataset.contact_point["name"] == "Organization contact"
+        assert dataset.contact_point.email == "hello@its.me"
+        assert dataset.contact_point.name == "Organization contact"
+        assert dataset.contact_point.contact_form == "https://data.support.com"
         assert dataset.frequency is None
         # test dct:license nested in distribution
         assert dataset.license.id == "lov1"

udata/migrations/2024-10-30-rename-organization-badges.py

@@ -0,0 +1,27 @@
+"""
+This migration renames the organization badges for coherent cases
+"""
+
+import logging
+
+from udata.core.organization.constants import ASSOCIATION, COMPANY, LOCAL_AUTHORITY
+from udata.models import Organization
+
+log = logging.getLogger(__name__)
+
+
+mapping_legacy_to_actual = {
+    "Association": ASSOCIATION,
+    "Company": COMPANY,
+    "Local authority": LOCAL_AUTHORITY,
+}
+
+
+def migrate(db):
+    log.info("Processing Organizations...")
+
+    for legacy, actual in mapping_legacy_to_actual.items():
+        count = Organization.objects(badges__kind=legacy).update(set__badges__S__kind=actual)
+        log.info(f"Renamed badge {actual} for {count} Organization objects.")
+
+    log.info("Done")

udata/rdf.py

@@ -7,7 +7,7 @@ import re
 from html.parser import HTMLParser
 
 from flask import abort, current_app, request, url_for
-from rdflib import Graph, Literal, URIRef
+from rdflib import BNode, Graph, Literal, URIRef
 from rdflib.namespace import (
     DCTERMS,
     FOAF,
@@ -28,6 +28,7 @@ from udata.frontend.markdown import parse_html
 from udata.models import Schema
 from udata.mongo.errors import FieldValidationError
 from udata.tags import slug as slugify_tag
+from udata.uris import endpoint_for
 
 log = logging.getLogger(__name__)
 
@@ -301,22 +302,52 @@ def contact_point_from_rdf(rdf, dataset):
             or rdf_value(contact_point, VCARD.email)
             or rdf_value(contact_point, DCAT.email)
         )
-        if not email:
+        email = email.replace("mailto:", "").strip() if email else None
+        contact_form = rdf_value(contact_point, VCARD.hasUrl)
+        if not email and not contact_form:
             return
-        email = email.replace("mailto:", "").strip()
         if dataset.organization:
-            contact_point = ContactPoint.objects(
-                name=name, email=email, organization=dataset.organization
-            ).first()
-            return (
-                contact_point
-                or ContactPoint(name=name, email=email, organization=dataset.organization).save()
+            contact, _ = ContactPoint.objects.get_or_create(
+                name=name, email=email, contact_form=contact_form, organization=dataset.organization
             )
         elif dataset.owner:
-            contact_point = ContactPoint.objects(
-                name=name, email=email, owner=dataset.owner
-            ).first()
-            return contact_point or ContactPoint(name=name, email=email, owner=dataset.owner).save()
+            contact, _ = ContactPoint.objects.get_or_create(
+                name=name, email=email, contact_form=contact_form, owner=dataset.owner
+            )
+        else:
+            contact = None
+        return contact
+
+
+def contact_point_to_rdf(contact, graph=None):
+    """
+    Map a contact point to a DCAT/RDF graph
+    """
+    if not contact:
+        return None
+
+    graph = graph or Graph(namespace_manager=namespace_manager)
+
+    if contact.id:
+        id = URIRef(
+            endpoint_for(
+                "api.contact_point",
+                contact_point=contact.id,
+                _external=True,
+            )
+        )
+    else:
+        id = BNode()
+
+    node = graph.resource(id)
+    node.set(RDF.type, VCARD.Kind)
+    if contact.name:
+        node.set(VCARD.fn, Literal(contact.name))
+    if contact.email:
+        node.set(VCARD.hasEmail, URIRef(f"mailto:{contact.email}"))
+    if contact.contact_form:
+        node.set(VCARD.hasUrl, URIRef(contact.contact_form))
+    return node
 
 
 def primary_topic_identifier_from_rdf(graph: Graph, resource: RdfResource):