udata 12.0.2.dev12__py3-none-any.whl → 12.0.2.dev13__py3-none-any.whl

udata/core/dataservices/api.py

@@ -238,19 +238,19 @@ class DataserviceDatasetAPI(API):
 class DataserviceRdfAPI(API):
     @api.doc("rdf_dataservice")
     def get(self, dataservice):
-        format = RDF_EXTENSIONS[negociate_content()]
-        url = url_for("api.dataservice_rdf_format", dataservice=dataservice.id, format=format)
+        _format = RDF_EXTENSIONS[negociate_content()]
+        url = url_for("api.dataservice_rdf_format", dataservice=dataservice.id, _format=_format)
         return redirect(url)
 
 
 @ns.route(
-    "/<dataservice:dataservice>/rdf.<format>", endpoint="dataservice_rdf_format", doc=common_doc
+    "/<dataservice:dataservice>/rdf.<_format>", endpoint="dataservice_rdf_format", doc=common_doc
 )
 @api.response(404, "Dataservice not found")
 @api.response(410, "Dataservice has been deleted")
 class DataserviceRdfFormatAPI(API):
     @api.doc("rdf_dataservice_format")
-    def get(self, dataservice: Dataservice, format):
+    def get(self, dataservice: Dataservice, _format):
         if not dataservice.permissions["edit"].can():
             if dataservice.private:
                 api.abort(404)
@@ -260,7 +260,7 @@ class DataserviceRdfFormatAPI(API):
         resource = dataservice_to_rdf(dataservice)
         # bypass flask-restplus make_response, since graph_response
         # is handling the content negociation directly
-        return make_response(*graph_response(resource, format))
+        return make_response(*graph_response(resource, _format))
 
 
 @ns.route("/<id>/followers/", endpoint="dataservice_followers")

udata/core/dataset/api.py

@@ -290,6 +290,12 @@ community_parser.add_argument(
 
 common_doc = {"params": {"dataset": "The dataset ID or slug"}}
 
+# Build catalog_parser from DatasetApiParser parser with a default page_size of 100
+catalog_parser = DatasetApiParser().parser
+catalog_parser.replace_argument(
+    "page_size", type=int, location="args", default=100, help="The page size"
+)
+
 
 @ns.route("/", endpoint="datasets")
 class DatasetListAPI(API):
@@ -431,17 +437,17 @@ class DatasetFeaturedAPI(API):
 class DatasetRdfAPI(API):
     @api.doc("rdf_dataset")
     def get(self, dataset):
-        format = RDF_EXTENSIONS[negociate_content()]
-        url = url_for("api.dataset_rdf_format", dataset=dataset.id, format=format)
+        _format = RDF_EXTENSIONS[negociate_content()]
+        url = url_for("api.dataset_rdf_format", dataset=dataset.id, _format=_format)
         return redirect(url)
 
 
-@ns.route("/<dataset:dataset>/rdf.<format>", endpoint="dataset_rdf_format", doc=common_doc)
+@ns.route("/<dataset:dataset>/rdf.<_format>", endpoint="dataset_rdf_format", doc=common_doc)
 @api.response(404, "Dataset not found")
 @api.response(410, "Dataset has been deleted")
 class DatasetRdfFormatAPI(API):
     @api.doc("rdf_dataset_format")
-    def get(self, dataset, format):
+    def get(self, dataset, _format):
         if not dataset.permissions["edit"].can():
             if dataset.private:
                 api.abort(404)
@@ -451,7 +457,7 @@ class DatasetRdfFormatAPI(API):
         resource = dataset_to_rdf(dataset)
         # bypass flask-restplus make_response, since graph_response
         # is handling the content negociation directly
-        return make_response(*graph_response(resource, format))
+        return make_response(*graph_response(resource, _format))
 
 
 @ns.route("/badges/", endpoint="available_dataset_badges")

udata/core/organization/api.py

@@ -13,7 +13,7 @@ from udata.core.contact_point.api import ContactPointApiParser
 from udata.core.contact_point.api_fields import contact_point_fields, contact_point_page_fields
 from udata.core.dataservices.csv import DataserviceCsvAdapter
 from udata.core.dataservices.models import Dataservice
-from udata.core.dataset.api import DatasetApiParser
+from udata.core.dataset.api import DatasetApiParser, catalog_parser
 from udata.core.dataset.api_fields import dataset_page_fields
 from udata.core.dataset.csv import DatasetCsvAdapter, ResourcesCsvAdapter
 from udata.core.dataset.models import Dataset
@@ -29,7 +29,6 @@ from udata.core.storages.api import (
 )
 from udata.models import ContactPoint
 from udata.rdf import RDF_EXTENSIONS, graph_response, negociate_content
-from udata.utils import multi_to_dict
 
 from .api_fields import (
     member_fields,
@@ -234,32 +233,37 @@ class DatasetsResourcesCsvAPI(API):
 class OrganizationRdfAPI(API):
     @api.doc("rdf_organization")
     def get(self, org):
-        format = RDF_EXTENSIONS[negociate_content()]
-        url = url_for("api.organization_rdf_format", org=org.id, format=format)
+        _format = RDF_EXTENSIONS[negociate_content()]
+        # We sanitize the args used as kwargs in url_for
+        params = catalog_parser.parse_args()
+        url = url_for("api.organization_rdf_format", org=org.id, _format=_format, **params)
         return redirect(url)
 
 
-@ns.route("/<org:org>/catalog.<format>", endpoint="organization_rdf_format", doc=common_doc)
+@ns.route("/<org:org>/catalog.<_format>", endpoint="organization_rdf_format", doc=common_doc)
 @api.response(404, "Organization not found")
 @api.response(410, "Organization has been deleted")
 class OrganizationRdfFormatAPI(API):
     @api.doc("rdf_organization_format")
-    def get(self, org, format):
+    @api.expect(catalog_parser)
+    def get(self, org, _format):
         if org.deleted:
             api.abort(410)
-        params = multi_to_dict(request.args)
-        page = int(params.get("page", 1))
-        page_size = int(params.get("page_size", 100))
-        datasets = Dataset.objects(organization=org).visible().paginate(page, page_size)
+        params = catalog_parser.parse_args()
+        datasets = DatasetApiParser.parse_filters(
+            Dataset.objects(organization=org).visible(), params
+        )
+        datasets = datasets.paginate(params["page"], params["page_size"])
+
         dataservices = (
             Dataservice.objects(organization=org)
             .visible()
-            .filter_by_dataset_pagination(datasets, page)
+            .filter_by_dataset_pagination(datasets, params["page"])
         )
-        catalog = build_org_catalog(org, datasets, dataservices, format=format)
+        catalog = build_org_catalog(org, datasets, dataservices, _format=_format, **params)
         # bypass flask-restplus make_response, since graph_response
         # is handling the content negociation directly
-        return make_response(*graph_response(catalog, format))
+        return make_response(*graph_response(catalog, _format))
 
 
 @ns.route("/badges/", endpoint="available_organization_badges")

udata/core/organization/rdf.py

@@ -32,7 +32,7 @@ def organization_to_rdf(org, graph=None):
     return o
 
 
-def build_org_catalog(org, datasets, dataservices, format=None):
+def build_org_catalog(org, datasets, dataservices, _format=None, **kwargs):
     graph = Graph(namespace_manager=namespace_manager)
     org_catalog_url = url_for("api.organization_rdf", org=org.id, _external=True)
 
@@ -47,9 +47,9 @@ def build_org_catalog(org, datasets, dataservices, format=None):
     for dataservice in dataservices:
         catalog.add(DCAT.service, dataservice_to_rdf(dataservice, graph))
 
-    values = {"org": org.id}
+    values = {**kwargs, "org": org.id}
 
     if isinstance(datasets, Paginable):
-        paginate_catalog(catalog, graph, datasets, format, "api.organization_rdf_format", **values)
+        paginate_catalog(catalog, graph, datasets, _format, "api.organization_rdf_format", **values)
 
     return catalog

udata/core/site/api.py

@@ -6,7 +6,7 @@ from udata.auth import admin_permission
 from udata.core import csv
 from udata.core.dataservices.csv import DataserviceCsvAdapter
 from udata.core.dataservices.models import Dataservice
-from udata.core.dataset.api import DatasetApiParser
+from udata.core.dataset.api import DatasetApiParser, catalog_parser
 from udata.core.dataset.csv import ResourcesCsvAdapter
 from udata.core.dataset.search import DatasetSearch
 from udata.core.dataset.tasks import get_queryset as get_csv_queryset
@@ -47,39 +47,47 @@ class SiteAPI(API):
         return current_site
 
 
-@api.route("/site/data.<format>", endpoint="site_dataportal")
+@api.route("/site/data.<_format>", endpoint="site_dataportal")
 class SiteDataPortal(API):
-    def get(self, format):
+    def get(self, _format):
         """Root RDF endpoint with content negociation handling"""
-        url = url_for("api.site_rdf_catalog_format", format=format)
+        url = url_for("api.site_rdf_catalog_format", _format=_format)
         return redirect(url)
 
 
 @api.route("/site/catalog", endpoint="site_rdf_catalog")
 class SiteRdfCatalog(API):
+    @api.expect(catalog_parser)
     def get(self):
         """Root RDF endpoint with content negociation handling"""
-        format = RDF_EXTENSIONS[negociate_content()]
-        url = url_for("api.site_rdf_catalog_format", format=format)
+        _format = RDF_EXTENSIONS[negociate_content()]
+        # We sanitize the args used as kwargs in url_for
+        params = catalog_parser.parse_args()
+        url = url_for("api.site_rdf_catalog_format", _format=_format, **params)
         return redirect(url)
 
 
-@api.route("/site/catalog.<format>", endpoint="site_rdf_catalog_format")
+@api.route("/site/catalog.<_format>", endpoint="site_rdf_catalog_format")
 class SiteRdfCatalogFormat(API):
-    def get(self, format):
-        params = multi_to_dict(request.args)
-        page = int(params.get("page", 1))
-        page_size = int(params.get("page_size", 100))
-        datasets = Dataset.objects.visible()
-        if "tag" in params:
-            datasets = datasets.filter(tags=params.get("tag", ""))
-        datasets = datasets.paginate(page, page_size)
-        dataservices = Dataservice.objects.visible().filter_by_dataset_pagination(datasets, page)
-
-        catalog = build_catalog(current_site, datasets, dataservices=dataservices, format=format)
+    @api.expect(catalog_parser)
+    def get(self, _format):
+        """
+        Return the RDF catalog in the requested format.
+        Filtering, sorting and paginating abilities apply to the datasets elements.
+        """
+        params = catalog_parser.parse_args()
+        datasets = DatasetApiParser.parse_filters(Dataset.objects.visible(), params)
+        datasets = datasets.paginate(params["page"], params["page_size"])
+        dataservices = Dataservice.objects.visible().filter_by_dataset_pagination(
+            datasets, params["page"]
+        )
+
+        catalog = build_catalog(
+            current_site, datasets, dataservices=dataservices, _format=_format, **params
+        )
         # bypass flask-restplus make_response, since graph_response
         # is handling the content negociation directly
-        return make_response(*graph_response(catalog, format))
+        return make_response(*graph_response(catalog, _format))
 
 
 @api.route("/site/datasets.csv", endpoint="site_datasets_csv")

udata/core/site/rdf.py

@@ -15,7 +15,7 @@ from udata.uris import homepage_url
 from udata.utils import Paginable
 
 
-def build_catalog(site, datasets, dataservices=[], format=None):
+def build_catalog(site, datasets, dataservices=[], _format=None, **kwargs):
     """Build the DCAT catalog for this site"""
     catalog_url = url_for("api.site_rdf_catalog", _external=True)
     graph = Graph(namespace_manager=namespace_manager)
@@ -45,6 +45,6 @@ def build_catalog(site, datasets, dataservices=[], format=None):
         catalog.add(DCAT.service, rdf_dataservice)
 
     if isinstance(datasets, Paginable):
-        paginate_catalog(catalog, graph, datasets, format, "api.site_rdf_catalog_format")
+        paginate_catalog(catalog, graph, datasets, _format, "api.site_rdf_catalog_format", **kwargs)
 
     return catalog

udata/rdf.py

@@ -490,17 +490,18 @@ def escape_xml_illegal_chars(val, replacement="?"):
     return illegal_xml_chars_RE.sub(replacement, val)
 
 
-def paginate_catalog(catalog, graph, datasets, format, rdf_catalog_endpoint, **values):
+def paginate_catalog(catalog, graph, datasets, _format, rdf_catalog_endpoint, **values):
     if not format:
         raise ValueError("Pagination requires format")
     catalog.add(RDF.type, HYDRA.Collection)
     catalog.set(HYDRA.totalItems, Literal(datasets.total))
     kwargs = {
-        "format": format,
+        "_format": _format,
         "page_size": datasets.page_size,
         "_external": True,
     }
-
+    values.pop("page", None)
+    values.pop("page_size", None)
     kwargs.update(values)
 
     first_url = url_for(rdf_catalog_endpoint, page=1, **kwargs)

udata/tests/api/test_dataservices_api.py

@@ -1,8 +1,6 @@
 from datetime import datetime, timedelta
-from xml.etree.ElementTree import XML
 
 import feedparser
-import pytest
 from flask import url_for
 from werkzeug.test import TestResponse
 
@@ -24,7 +22,7 @@ from udata.core.organization.models import Member
 from udata.core.topic.factories import TopicElementFactory, TopicFactory
 from udata.core.user.factories import AdminFactory, UserFactory
 from udata.i18n import gettext as _
-from udata.tests.helpers import assert200, assert400, assert410, assert_redirects
+from udata.tests.helpers import assert200, assert400, assert410
 
 from . import APITestCase
 
@@ -664,60 +662,6 @@ class DataserviceAPITest(APITestCase):
         self.assertEqual(Dataservice.objects.first().organization.id, new_org.id)
 
 
-@pytest.mark.frontend
-class DataserviceRdfViewsTest:
-    def test_rdf_default_to_jsonld(self, client):
-        dataservice = DataserviceFactory()
-        expected = url_for("api.dataservice_rdf_format", dataservice=dataservice.id, format="json")
-        response = client.get(url_for("api.dataservice_rdf", dataservice=dataservice))
-        assert_redirects(response, expected)
-
-    def test_rdf_perform_content_negociation(self, client):
-        dataservice = DataserviceFactory()
-        expected = url_for("api.dataservice_rdf_format", dataservice=dataservice.id, format="xml")
-        url = url_for("api.dataservice_rdf", dataservice=dataservice)
-        headers = {"accept": "application/xml"}
-        response = client.get(url, headers=headers)
-        assert_redirects(response, expected)
-
-    def test_rdf_perform_content_negociation_response(self, client):
-        """Check we have valid XML as output"""
-        dataservice = DataserviceFactory()
-        url = url_for("api.dataservice_rdf", dataservice=dataservice)
-        headers = {"accept": "application/xml"}
-        response = client.get(url, headers=headers, follow_redirects=True)
-        element = XML(response.data)
-        assert element.tag == "{http://www.w3.org/1999/02/22-rdf-syntax-ns#}RDF"
-
-    def test_dataservice_rdf_json_ld(self, client):
-        dataservice = DataserviceFactory()
-        for fmt in "json", "jsonld":
-            url = url_for("api.dataservice_rdf_format", dataservice=dataservice, format=fmt)
-            response = client.get(url, headers={"Accept": "application/ld+json"})
-            assert200(response)
-            assert response.content_type == "application/ld+json"
-            assert response.json["@context"]["@vocab"] == "http://www.w3.org/ns/dcat#"
-
-    @pytest.mark.parametrize(
-        "fmt,mime",
-        [
-            ("n3", "text/n3"),
-            ("nt", "application/n-triples"),
-            ("ttl", "application/x-turtle"),
-            ("xml", "application/rdf+xml"),
-            ("rdf", "application/rdf+xml"),
-            ("owl", "application/rdf+xml"),
-            ("trig", "application/trig"),
-        ],
-    )
-    def test_dataservice_rdf_formats(self, client, fmt, mime):
-        dataservice = DataserviceFactory()
-        url = url_for("api.dataservice_rdf_format", dataservice=dataservice, format=fmt)
-        response = client.get(url, headers={"Accept": mime})
-        assert200(response)
-        assert response.content_type == mime
-
-
 class DataservicesFeedAPItest(APITestCase):
     def test_recent_feed(self):
         DataserviceFactory(title="A", created_at=datetime.utcnow())

udata/tests/dataservice/test_dataservice_rdf.py

@@ -1,4 +1,7 @@
+from xml.etree.ElementTree import XML
+
 import pytest
+from flask import url_for
 from rdflib import BNode, Literal, URIRef
 from rdflib.namespace import RDF
 from rdflib.resource import Resource as RdfResource
@@ -13,6 +16,7 @@ from udata.rdf import (
     HVD_LEGISLATION,
     TAG_TO_EU_HVD_CATEGORIES,
 )
+from udata.tests.helpers import assert200, assert_redirects
 
 pytestmark = pytest.mark.usefixtures("app")
 
@@ -77,3 +81,57 @@ class DataserviceToRdfTest:
         assert URIRef(TAG_TO_EU_HVD_CATEGORIES["meteorologiques"]) not in hvd_categories
         for distrib in d.objects(DCAT.distribution):
             assert distrib.value(DCATAP.applicableLegislation).identifier == URIRef(HVD_LEGISLATION)
+
+
+@pytest.mark.frontend
+class DataserviceRdfViewsTest:
+    def test_rdf_default_to_jsonld(self, client):
+        dataservice = DataserviceFactory()
+        expected = url_for("api.dataservice_rdf_format", dataservice=dataservice.id, _format="json")
+        response = client.get(url_for("api.dataservice_rdf", dataservice=dataservice))
+        assert_redirects(response, expected)
+
+    def test_rdf_perform_content_negociation(self, client):
+        dataservice = DataserviceFactory()
+        expected = url_for("api.dataservice_rdf_format", dataservice=dataservice.id, _format="xml")
+        url = url_for("api.dataservice_rdf", dataservice=dataservice)
+        headers = {"accept": "application/xml"}
+        response = client.get(url, headers=headers)
+        assert_redirects(response, expected)
+
+    def test_rdf_perform_content_negociation_response(self, client):
+        """Check we have valid XML as output"""
+        dataservice = DataserviceFactory()
+        url = url_for("api.dataservice_rdf", dataservice=dataservice)
+        headers = {"accept": "application/xml"}
+        response = client.get(url, headers=headers, follow_redirects=True)
+        element = XML(response.data)
+        assert element.tag == "{http://www.w3.org/1999/02/22-rdf-syntax-ns#}RDF"
+
+    def test_dataservice_rdf_json_ld(self, client):
+        dataservice = DataserviceFactory()
+        for fmt in "json", "jsonld":
+            url = url_for("api.dataservice_rdf_format", dataservice=dataservice, _format=fmt)
+            response = client.get(url, headers={"Accept": "application/ld+json"})
+            assert200(response)
+            assert response.content_type == "application/ld+json"
+            assert response.json["@context"]["@vocab"] == "http://www.w3.org/ns/dcat#"
+
+    @pytest.mark.parametrize(
+        "fmt,mime",
+        [
+            ("n3", "text/n3"),
+            ("nt", "application/n-triples"),
+            ("ttl", "application/x-turtle"),
+            ("xml", "application/rdf+xml"),
+            ("rdf", "application/rdf+xml"),
+            ("owl", "application/rdf+xml"),
+            ("trig", "application/trig"),
+        ],
+    )
+    def test_dataservice_rdf_formats(self, client, fmt, mime):
+        dataservice = DataserviceFactory()
+        url = url_for("api.dataservice_rdf_format", dataservice=dataservice, _format=fmt)
+        response = client.get(url, headers={"Accept": mime})
+        assert200(response)
+        assert response.content_type == mime

udata/tests/dataset/test_dataset_rdf.py

@@ -1126,13 +1126,13 @@ class RdfToDatasetTest:
 class DatasetRdfViewsTest:
     def test_rdf_default_to_jsonld(self, client):
         dataset = DatasetFactory()
-        expected = url_for("api.dataset_rdf_format", dataset=dataset.id, format="json")
+        expected = url_for("api.dataset_rdf_format", dataset=dataset.id, _format="json")
         response = client.get(url_for("api.dataset_rdf", dataset=dataset))
         assert_redirects(response, expected)
 
     def test_rdf_perform_content_negociation(self, client):
         dataset = DatasetFactory()
-        expected = url_for("api.dataset_rdf_format", dataset=dataset.id, format="xml")
+        expected = url_for("api.dataset_rdf_format", dataset=dataset.id, _format="xml")
         url = url_for("api.dataset_rdf", dataset=dataset)
         headers = {"accept": "application/xml"}
         response = client.get(url, headers=headers)
@@ -1150,7 +1150,7 @@ class DatasetRdfViewsTest:
     def test_dataset_rdf_json_ld(self, client):
         dataset = DatasetFactory()
         for fmt in "json", "jsonld":
-            url = url_for("api.dataset_rdf_format", dataset=dataset, format=fmt)
+            url = url_for("api.dataset_rdf_format", dataset=dataset, _format=fmt)
             response = client.get(url, headers={"Accept": "application/ld+json"})
             assert200(response)
             assert response.content_type == "application/ld+json"
@@ -1170,7 +1170,7 @@ class DatasetRdfViewsTest:
     )
     def test_dataset_rdf_formats(self, client, fmt, mime):
         dataset = DatasetFactory()
-        url = url_for("api.dataset_rdf_format", dataset=dataset, format=fmt)
+        url = url_for("api.dataset_rdf_format", dataset=dataset, _format=fmt)
         response = client.get(url, headers={"Accept": mime})
         assert200(response)
         assert response.content_type == mime

udata/tests/organization/test_organization_rdf.py

@@ -95,7 +95,7 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         uri_first = url_for(
             "api.organization_rdf_format",
             org=origin_org.id,
-            format="json",
+            _format="json",
             page=1,
             page_size=page_size,
             _external=True,
@@ -103,7 +103,7 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         uri_last = url_for(
             "api.organization_rdf_format",
             org=origin_org.id,
-            format="json",
+            _format="json",
             page=2,
             page_size=page_size,
             _external=True,
@@ -124,7 +124,7 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         # First page
         datasets = Dataset.objects.paginate(1, page_size)
         dataservices = Dataservice.objects.filter_by_dataset_pagination(datasets, 1)
-        catalog = build_org_catalog(origin_org, datasets, dataservices, format="json")
+        catalog = build_org_catalog(origin_org, datasets, dataservices, _format="json")
         graph = catalog.graph
 
         self.assertIsInstance(catalog, RdfResource)
@@ -152,7 +152,7 @@ class OrganizationToRdfTest(DBTestMixin, TestCase):
         # Second page
         datasets = Dataset.objects.paginate(2, page_size)
         dataservices = Dataservice.objects.filter_by_dataset_pagination(datasets, 2)
-        catalog = build_org_catalog(origin_org, datasets, dataservices, format="json")
+        catalog = build_org_catalog(origin_org, datasets, dataservices, _format="json")
         graph = catalog.graph
 
         self.assertIsInstance(catalog, RdfResource)

udata/tests/site/test_site_rdf.py

@@ -3,8 +3,10 @@ from flask import url_for
 from rdflib import Graph, Literal, URIRef
 from rdflib.namespace import FOAF, RDF
 from rdflib.resource import Resource
+from werkzeug.datastructures import ImmutableMultiDict
 
 from udata.core.dataservices.factories import DataserviceFactory, HarvestMetadataFactory
+from udata.core.dataset.constants import HVD
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.dataset.models import Dataset
 from udata.core.organization.factories import OrganizationFactory
@@ -77,14 +79,14 @@ class CatalogTest:
         uri = url_for("api.site_rdf_catalog", _external=True)
         uri_first = url_for(
             "api.site_rdf_catalog_format",
-            format="json",
+            _format="json",
             page=1,
             page_size=page_size,
             _external=True,
         )
         uri_last = url_for(
             "api.site_rdf_catalog_format",
-            format="json",
+            _format="json",
             page=2,
             page_size=page_size,
             _external=True,
@@ -93,7 +95,7 @@ class CatalogTest:
 
         # First page
         datasets = Dataset.objects.paginate(1, page_size)
-        catalog = build_catalog(site, datasets, format="json")
+        catalog = build_catalog(site, datasets, _format="json")
         graph = catalog.graph
 
         assert isinstance(catalog, Resource)
@@ -117,7 +119,7 @@ class CatalogTest:
 
         # Second page
         datasets = Dataset.objects.paginate(2, page_size)
-        catalog = build_catalog(site, datasets, format="json")
+        catalog = build_catalog(site, datasets, _format="json")
         graph = catalog.graph
 
         assert isinstance(catalog, Resource)
@@ -152,12 +154,39 @@ class SiteRdfViewsTest:
         assert response.json == CONTEXT
 
     def test_catalog_default_to_jsonld(self, client):
-        expected = url_for("api.site_rdf_catalog_format", format="json")
+        expected = url_for("api.site_rdf_catalog_format", _format="json", page=1, page_size=100)
         response = client.get(url_for("api.site_rdf_catalog"))
         assert_redirects(response, expected)
 
+    def test_catalog_redirect_with_filters_sanitizing(self, client):
+        """
+        It should filter out unknown params (including url_for keywords).
+        Repeated keywords should be kept as expected.
+        """
+        expected_params = ImmutableMultiDict(
+            [("page", 3), ("tag", "hvd"), ("tag", "other"), ("page_size", 100)]
+        )
+        expected = url_for(
+            "api.site_rdf_catalog_format", _format="xml", **expected_params.to_dict(flat=False)
+        )
+        params = [
+            ("page", 3),
+            ("tag", "hvd"),
+            ("tag", "other"),
+            ("unknown_param", 5),
+            ("_external", True),
+        ]
+        url = (
+            url_for("api.site_rdf_catalog")
+            + "?"
+            + "&".join(f"{arg}={value}" for arg, value in params)
+        )
+        headers = {"accept": "application/xml"}
+        response = client.get(url, headers=headers)
+        assert_redirects(response, expected)
+
     def test_rdf_perform_content_negociation(self, client):
-        expected = url_for("api.site_rdf_catalog_format", format="xml")
+        expected = url_for("api.site_rdf_catalog_format", _format="xml", page=1, page_size=100)
         url = url_for("api.site_rdf_catalog")
         headers = {"accept": "application/xml"}
         response = client.get(url, headers=headers)
@@ -165,57 +194,65 @@ class SiteRdfViewsTest:
 
     @pytest.mark.parametrize("fmt", ("json", "jsonld"))
     def test_catalog_rdf_json_ld(self, fmt, client):
-        url = url_for("api.site_rdf_catalog_format", format=fmt)
+        url = url_for("api.site_rdf_catalog_format", _format=fmt)
         response = client.get(url, headers={"Accept": "application/ld+json"})
         assert200(response)
         assert response.content_type == "application/ld+json"
         assert response.json["@context"]["@vocab"] == "http://www.w3.org/ns/dcat#"
 
     def test_catalog_rdf_n3(self, client):
-        url = url_for("api.site_rdf_catalog_format", format="n3")
+        url = url_for("api.site_rdf_catalog_format", _format="n3")
         response = client.get(url, headers={"Accept": "text/n3"})
         assert200(response)
         assert response.content_type == "text/n3"
 
     def test_catalog_rdf_turtle(self, client):
-        url = url_for("api.site_rdf_catalog_format", format="ttl")
+        url = url_for("api.site_rdf_catalog_format", _format="ttl")
         response = client.get(url, headers={"Accept": "application/x-turtle"})
         assert200(response)
         assert response.content_type == "application/x-turtle"
 
     @pytest.mark.parametrize("fmt", ("xml", "rdf", "owl"))
     def test_catalog_rdf_rdfxml(self, fmt, client):
-        url = url_for("api.site_rdf_catalog_format", format=fmt)
+        url = url_for("api.site_rdf_catalog_format", _format=fmt)
         response = client.get(url, headers={"Accept": "application/rdf+xml"})
         assert200(response)
         assert response.content_type == "application/rdf+xml"
 
     def test_catalog_rdf_n_triples(self, client):
-        url = url_for("api.site_rdf_catalog_format", format="nt")
+        url = url_for("api.site_rdf_catalog_format", _format="nt")
         response = client.get(url, headers={"Accept": "application/n-triples"})
         assert200(response)
         assert response.content_type == "application/n-triples"
 
     def test_catalog_rdf_trig(self, client):
-        url = url_for("api.site_rdf_catalog_format", format="trig")
+        url = url_for("api.site_rdf_catalog_format", _format="trig")
         response = client.get(url, headers={"Accept": "application/trig"})
         assert200(response)
         assert response.content_type == "application/trig"
 
     @pytest.mark.parametrize("fmt", ("json", "xml", "ttl"))
     def test_dataportal_compliance(self, fmt, client):
-        url = url_for("api.site_dataportal", format=fmt)
+        url = url_for("api.site_dataportal", _format=fmt)
         assert url == "/api/1/site/data.{0}".format(fmt)
-        expected_url = url_for("api.site_rdf_catalog_format", format=fmt)
+        expected_url = url_for("api.site_rdf_catalog_format", _format=fmt)
 
         response = client.get(url)
         assert_redirects(response, expected_url)
 
     def test_catalog_rdf_paginate(self, client):
-        DatasetFactory.create_batch(4)
-        url = url_for("api.site_rdf_catalog_format", format="n3", page_size=3)
+        DatasetFactory.create_batch(4, tags=["my-tag"])
+        DatasetFactory.create_batch(
+            3, tags=["other-tag"]
+        )  # Shouldn't be returned because of the filter on tag="my-tag"
+        url = url_for("api.site_rdf_catalog_format", _format="n3", page_size=3, tag="my-tag")
         next_url = url_for(
-            "api.site_rdf_catalog_format", format="n3", page=2, page_size=3, _external=True
+            "api.site_rdf_catalog_format",
+            _format="n3",
+            page=2,
+            page_size=3,
+            _external=True,
+            tag="my-tag",
         )
 
         response = client.get(url, headers={"Accept": "text/n3"})
@@ -227,16 +264,27 @@ class SiteRdfViewsTest:
         pagination = graph.resource(pagination)
         assert not pagination.value(HYDRA.previous)
         assert pagination.value(HYDRA.next).identifier == URIRef(next_url)
+        assert pagination.value(HYDRA.last).identifier == URIRef(next_url)
+        catalog = graph.value(predicate=RDF.type, object=HYDRA.Collection)
+        assert catalog is not None
+        catalog = graph.resource(catalog)
+        assert catalog.value(HYDRA.totalItems) == Literal(4)
 
     def test_catalog_format_unknown(self, client):
-        url = url_for("api.site_rdf_catalog_format", format="unknown")
+        url = url_for("api.site_rdf_catalog_format", _format="unknown")
         response = client.get(url)
         assert404(response)
 
-    def test_catalog_rdf_filter_tag(self, client):
+    def test_catalog_rdf_filter(self, client):
+        """
+        Test catalog RDF filter on tags and badges
+        """
         DatasetFactory.create_batch(4, tags=["my-tag"])
+        [dat.add_badge(HVD) for dat in DatasetFactory.create_batch(5)]
         DatasetFactory.create_batch(3)
-        url = url_for("api.site_rdf_catalog_format", format="xml", tag="my-tag")
+
+        # Filter on tags
+        url = url_for("api.site_rdf_catalog_format", _format="xml", tag="my-tag")
 
         response = client.get(url, headers={"Accept": "application/xml"})
         assert200(response)
@@ -249,6 +297,17 @@ class SiteRdfViewsTest:
         for dat in datasets:
             assert graph.value(dat, DCAT.keyword) == Literal("my-tag")
 
+        # Filter on badge
+        url = url_for("api.site_rdf_catalog_format", _format="xml", badge=HVD)
+
+        response = client.get(url, headers={"Accept": "application/xml"})
+        assert200(response)
+
+        graph = Graph().parse(data=response.data, format="xml")
+
+        datasets = list(graph.subjects(RDF.type, DCAT.Dataset))
+        assert len(datasets) == 5
+
     def test_catalog_rdf_dataservices(self, client):
         dataset_a = DatasetFactory.create()
         dataset_b = DatasetFactory.create()
@@ -260,7 +319,7 @@ class SiteRdfViewsTest:
         dataservice_y = DataserviceFactory.create(datasets=[])
 
         response = client.get(
-            url_for("api.site_rdf_catalog_format", format="xml"),
+            url_for("api.site_rdf_catalog_format", _format="xml"),
             headers={"Accept": "application/xml"},
         )
         assert200(response)
@@ -280,7 +339,7 @@ class SiteRdfViewsTest:
 
         # Test first page contains the dataservice without dataset
         response = client.get(
-            url_for("api.site_rdf_catalog_format", format="xml", page_size=1),
+            url_for("api.site_rdf_catalog_format", _format="xml", page_size=1),
             headers={"Accept": "application/xml"},
         )
         assert200(response)
@@ -299,7 +358,7 @@ class SiteRdfViewsTest:
 
         # Test second page doesn't contains the dataservice without dataset
         response = client.get(
-            url_for("api.site_rdf_catalog_format", format="xml", page_size=1, page=2),
+            url_for("api.site_rdf_catalog_format", _format="xml", page_size=1, page=2),
             headers={"Accept": "application/xml"},
         )
         assert200(response)

{udata-12.0.2.dev12.dist-info → udata-12.0.2.dev13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: udata
-Version: 12.0.2.dev12
+Version: 12.0.2.dev13
 Summary: Open data portal
 Author-email: Opendata Team <opendatateam@data.gouv.fr>
 Maintainer-email: Opendata Team <opendatateam@data.gouv.fr>

{udata-12.0.2.dev12.dist-info → udata-12.0.2.dev13.dist-info}/RECORD

@@ -7,7 +7,7 @@ udata/errors.py,sha256=E8W7b4PH7c5B85g_nsUMt8fHqMVpDFOZFkO6wMPl6bA,117
 udata/factories.py,sha256=MoklZnU8iwNL25dm3JsoXhoQs1PQWSVYL1WvcUBtJqM,492
 udata/i18n.py,sha256=bC9ajf66YgcYoJffvresLZLa32rb6NsY-JGMtFiVsG4,8163
 udata/mail.py,sha256=Huhx_1QthJkLvuRUuP6jqb5Qq5R4iSmqeEpLVO9ZkQ4,2671
-udata/rdf.py,sha256=aJKmnE1r6YyMKXLo-VRlUvOXoZSJuvNeNbMCqEl0kdY,19370
+udata/rdf.py,sha256=4SruNYSJzqwureb8no6ghh0ZXypG7wCahqSpSrBo8K0,19435
 udata/routing.py,sha256=Hnc1ktmKVS-RUHNKw2zYTft2HJ903FhjtlcenQ9igwI,8044
 udata/sentry.py,sha256=ekcxqUSqxfM98TtvCsPaOoX5i2l6PEcYt7kb4l3od-Q,3223
 udata/settings.py,sha256=1gDu1fnorsgzRzkMIEzFjWiVZ_7UPe1kRW-GQulb7O0,21686
@@ -79,7 +79,7 @@ udata/core/contact_point/forms.py,sha256=oBe1agSJFyx2QRgYzPRg2A7qVscaBTaKG4V-AyI
 udata/core/contact_point/models.py,sha256=Xqmqg7S13gcaKxiQT52WHeQEHTaUDDGIXInXyqNh4Po,854
 udata/core/dataservices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataservices/activities.py,sha256=wcYQCyYpKciCz99VqQqKti72a5Fyhc-AvDZBWdF0KUc,1763
-udata/core/dataservices/api.py,sha256=MUMOANkmkpQHF5gepdbhEZqjipVHSczK-2-t7jEc1Io,10052
+udata/core/dataservices/api.py,sha256=_-ShQz9ijnFwy5xM7nJffA0YpHyXyXknFnsEuV1YvRY,10058
 udata/core/dataservices/apiv2.py,sha256=pd4UWF6m7pQ5nmBRFmeiDyedhZSngz211to6qTscVsA,1205
 udata/core/dataservices/constants.py,sha256=SxetyqvbWQlb-T9Bqn7mdfzV3vS-is7s56rzmGzTXY0,1029
 udata/core/dataservices/csv.py,sha256=HWI2JrN_Vuw0te9FHlJ6eyqcRcKHOKXuzg45D4Ti6F0,1106
@@ -92,7 +92,7 @@ udata/core/dataservices/tasks.py,sha256=fHG1r5ymfJRXJ_Lug6je3VKZoK30XKXE2rQ8x0R-
 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=eGxMUnC47YHxTgcls6igQ3qP7cYgwFtPfj0asCylGsI,3315
-udata/core/dataset/api.py,sha256=JBdYH2RXac1WVOF67ZzBSvImVxixMfN0rxEknnfthRU,35338
+udata/core/dataset/api.py,sha256=ct3GNQjoAxZSYqb98rQkx85o-pj2qO5E5DMzCDGauN8,35585
 udata/core/dataset/api_fields.py,sha256=p7ZnmGNImZ4sgZTpoyHpI0CgOukpEIx8QdGnxlmgl2I,18032
 udata/core/dataset/apiv2.py,sha256=1H4557ZMi6rwEyrwB1Ha20m0bf3Avhg_vDLiDQt5Fi0,21030
 udata/core/dataset/commands.py,sha256=3mKSdJ-M7ggdG29AVn77C4ouZanbYoqkTaGQoBKOp3s,3471
@@ -145,7 +145,7 @@ udata/core/metrics/signals.py,sha256=9mdJW__gR2GJT3huBr6HN2SDhKYJRgNbW9dnh48cAnU
 udata/core/metrics/tasks.py,sha256=5hVSvBFF2-k_MZGn1XrzEWLgRp3TlrZJtPjX1Y_niS4,4963
 udata/core/organization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/organization/activities.py,sha256=Mw4-R8Q6G745IZnCDgrj7h2ax2crGYRhZtcewSK6_Ok,1213
-udata/core/organization/api.py,sha256=rfEGVsr64cfUEEN8zFA6xvDod8Chh-GOqRbuJ8cbaIM,22139
+udata/core/organization/api.py,sha256=mjfo19OeLijo_0HyPElyYcxIiz_OqNYzjcREsUgheg4,22304
 udata/core/organization/api_fields.py,sha256=UlDYS62Wt1capSO0rYf6-m_rza3lCmpTuA93R-sV9w8,7776
 udata/core/organization/apiv2.py,sha256=fLMN5T7s8yF4u7c1WWHXMqQAlyH2OCSyAfmleiFlf7M,3037
 udata/core/organization/commands.py,sha256=DsRAtFDZvTciYNsUWumQWdn0jnNmKW-PwfIHUUZoBb8,1591
@@ -157,7 +157,7 @@ udata/core/organization/metrics.py,sha256=CEhkZLUufDyWi2XyizMoXkuddz7xDJvmdkPTwe
 udata/core/organization/models.py,sha256=QYneMUDA99NsMHn4_pGn1dnnDK4dESVUy5ogo8Tm7ZI,10962
 udata/core/organization/notifications.py,sha256=i_36-l2y7fOGmnBmr5NDWmGGmrGRaCWbU-6XS4c2wQs,917
 udata/core/organization/permissions.py,sha256=GD-9TMtRppVCPaC1ysXYrONvGJV-ArzAOXm2XMKf9yo,1256
-udata/core/organization/rdf.py,sha256=fFyxN0szeiQjQyVJbSN_4VqHxOE0PdSLg9A-K66Gdng,1785
+udata/core/organization/rdf.py,sha256=KYJXTE5Yxhp3Cb7GZsRT1BY3Bd7rcRfwFSK9dWG2xQ4,1807
 udata/core/organization/search.py,sha256=5XMZn7xehkTV4X9NvGys_1WyHDGlUVpCQ_uJ3oyWdsE,2227
 udata/core/organization/signals.py,sha256=Ft1MBU9S41uxFN-rUrKHhiwedR1OYGv-ncuroKg8orY,488
 udata/core/organization/tasks.py,sha256=2Pd9ixeKNd7BGxBHrHYbR9AelhqkflX3ocnGgtoa8Uc,5641
@@ -194,11 +194,11 @@ udata/core/reuse/search.py,sha256=y1DwXYkBMBwuhn62CULkU1NNo89IYp0Ae7U01jcnjBY,31
 udata/core/reuse/signals.py,sha256=nDrEUpYKN0AdYiEbrR0z3nzXzjaRcD8SAMutwIDsQPM,155
 udata/core/reuse/tasks.py,sha256=cc6f06HMFCDHRsdgsG09FBYsITNQ8xzdZjE-pMY61a0,1688
 udata/core/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/site/api.py,sha256=ekZmQs5U3ywPy4vqpgd0mB28O__HZXnrmg5AXaGApnI,7838
+udata/core/site/api.py,sha256=GhSZfdv0rQgtmqG3h0uGcXrzbX9Zx3GuypgaxcAClsg,8139
 udata/core/site/factories.py,sha256=O0nLFmjrFyemzcs-YwNukq5nqd383KBGrgL5bOQsGbA,378
 udata/core/site/forms.py,sha256=avEZ4rJhibF7sKexqMlKt1qMFiUHNrmJGKjZqcAyjrc,459
 udata/core/site/models.py,sha256=mlSsnXUoMmIZ26-mvotWpICaoL1ScbYMsc85Dt-28cI,8322
-udata/core/site/rdf.py,sha256=Dk1lnszASh_2v9tcI4uoN5yQ2DxCxUt4r4YY3pkWqEc,2015
+udata/core/site/rdf.py,sha256=CT4TIu9DMiYHaNugW873UAJsQLBtzqQIr_a24CMyEJ8,2037
 udata/core/spam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/spam/api.py,sha256=eqmDB4_VF5EM92675FqFmk4Be5TAnu87dmSVtgXKF4A,1740
 udata/core/spam/constants.py,sha256=dTj0GyPH2zdxhurxva2CGnL-3WwqZETyt5vYQhmVpow,144
@@ -516,7 +516,7 @@ udata/tests/api/test_activities_api.py,sha256=GzyznB1rHrWfPH-te5RKmA3Ezlo5jlP3z7
 udata/tests/api/test_auth_api.py,sha256=Mue5EneRp3MbD-ahcXI3YaRNYPcxzHMw-hYpY0RtGVU,25569
 udata/tests/api/test_base_api.py,sha256=2w_vz0eEuq3P3aN-ByvxGc3VZAo7XtgatFfcrzf2uEU,2244
 udata/tests/api/test_contact_points.py,sha256=Sbb486RTN7HVycna_XB60OnURPSNc7xUity26XsYA4k,8766
-udata/tests/api/test_dataservices_api.py,sha256=vQZc8gey1zTckaWuqodXHJ95jp0O5ksVLllE1n3iqoE,31496
+udata/tests/api/test_dataservices_api.py,sha256=scju3nQVO51NyNxeCagi0znjMQozPBbp5BQKP-BuhyY,28961
 udata/tests/api/test_datasets_api.py,sha256=EkMJndRMNHpVVC7ar-F8i_PXdGyvd-bCoVbnsaatH3s,104911
 udata/tests/api/test_fields.py,sha256=OW85Z5MES5HeWOpapeem8OvR1cIcrqW-xMWpdZO4LZ8,1033
 udata/tests/api/test_follow_api.py,sha256=4nFXG5pZ_Hf2PJ4KEdHJX_uggjc9RpB8v0fidkAcw9I,5792
@@ -540,7 +540,7 @@ udata/tests/contact_point/test_contact_point_models.py,sha256=b8vraZPPrs9LeQMWLn
 udata/tests/data/image.jpg,sha256=hdmpaCjOhmAAfNGuTqWKEjv7IC4GXJx-nP_rT274hc8,337049
 udata/tests/data/image.png,sha256=GAqXz7w_u7CapODIUF45UpVddmqelnGQkcrwKZq3448,266488
 udata/tests/dataservice/test_csv_adapter.py,sha256=UyDPiqKIDwe0AdXLKLpSsBqe4ZJsfkzcZ6SxMns2WnY,1984
-udata/tests/dataservice/test_dataservice_rdf.py,sha256=qN-vzaVK8d-Hq-NKBl9teGnnyWFyO3cVqVnC2f-EOqY,3623
+udata/tests/dataservice/test_dataservice_rdf.py,sha256=a2ptzGaNUYOYCwC-uUAmg6bdYJeGeI7zPohJY0QEHl0,6217
 udata/tests/dataservice/test_dataservice_tasks.py,sha256=9XUoYLb_p3dzmgLfswaXjMG2civP0i1kzzP4VdJWE0k,1614
 udata/tests/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/dataset/test_csv_adapter.py,sha256=Qy3dKg7OVz7paEOrRzHe-plBGsZgkalfW30SJK1JB0g,3905
@@ -548,7 +548,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=plzvIaEqvxQpcYS8YlDBltjuTgtT7xgNVEzkmlPZBC0,33766
-udata/tests/dataset/test_dataset_rdf.py,sha256=8Gv_v1nRIvopfKJ2R7KAwv63GnzGXr_yFR-qQ1_Kwx8,45945
+udata/tests/dataset/test_dataset_rdf.py,sha256=aug8GJLvIjiutVVklQY8Oej6le5o_n8r6GVV05pLWv8,45949
 udata/tests/dataset/test_dataset_recommendations.py,sha256=K52HXGXi9DuUSiSRQWpqTrsFCkYbv7K3upNp0fFp5v8,7068
 udata/tests/dataset/test_dataset_tasks.py,sha256=SwSv-hDSXgs1xXtvtaePQ6fa6_d4ZpHo-oahDRinvPg,3271
 udata/tests/dataset/test_resource_preview.py,sha256=AxSF8cnG6bhy2pz9Fi3PfEzdLlNhZ0xrp9dr6yrt31A,2051
@@ -586,7 +586,7 @@ udata/tests/organization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 udata/tests/organization/test_csv_adapter.py,sha256=61XIVDYdZxnWUyysN_wApWwghM7nT_Id-74IMtFd3Zg,1263
 udata/tests/organization/test_notifications.py,sha256=PGmME5BbYVtcPffeSE1sx47J6iAfm4RDAZIRv_MXDFE,1366
 udata/tests/organization/test_organization_model.py,sha256=ZEUHX7lvGMYMlHDpPiVUPeZeJeDDTp5owLEpFDSihjc,4311
-udata/tests/organization/test_organization_rdf.py,sha256=Uf-OgXV615wLUHfcBTmp9QFuV8VCFmjI4wgvShve-mc,8074
+udata/tests/organization/test_organization_rdf.py,sha256=mAaMQHofgJ_sCPuE2v_3qDc3IO2EPiYSVu8HrP6E1Zk,8078
 udata/tests/organization/test_organization_tasks.py,sha256=9Ta-f4R3RoKdARYUFWHO4pE1nijceTHzyEvI34lYBJo,2876
 udata/tests/reuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/reuse/test_reuse_model.py,sha256=PtdC39JrDCtF9iSfYSH98115309Q-E8aKn4s6rZCqCY,4662
@@ -600,7 +600,7 @@ udata/tests/site/test_site_api.py,sha256=pGisx3jtxTWNL9-R-tcCPBPYoQZM8oz8BJ4-seK
 udata/tests/site/test_site_csv_exports.py,sha256=hrUthkJw8yoSpEZNDHfzZIMEoXSBFosjhNVd5OxQDOE,17487
 udata/tests/site/test_site_metrics.py,sha256=KxlilOUeAbBta7HwD4mB4ybDWBmRB-3UVrLunvRGoGg,2362
 udata/tests/site/test_site_model.py,sha256=CNE-jP48guJpRlh4D3rQGruu2hSRliQaLOnBmzkHMnI,2181
-udata/tests/site/test_site_rdf.py,sha256=zlw7leYc7azfrC6JwDjKiy3wixQzTpo-lDOm-Dg_kXw,13092
+udata/tests/site/test_site_rdf.py,sha256=8xGGd68WgjNj9mw52E8XTx1Byh3zDq2OgM2xg9RyMAU,15308
 udata/tests/topic/test_topic_tasks.py,sha256=6rotG7ZtRffpfaO-KFu4i5MRqHitbwvMwqXg1jFT6XU,1199
 udata/tests/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/user/test_user_rdf.py,sha256=BRdv9ivLLUQoImFOuIohDoZAQXMXCruaNJ37siKul5o,1771
@@ -625,9 +625,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=nv80xZLfIfUsSOMBcr29L268FDc_Gt
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=bUp-7Ray8t8ALgJk3Icw1jmiGIc9_pEJQHiGw_2EU2o,50989
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=Y_XpUxD074wXc63oJTnoVOyOQ2lmBxl-MrgluZ0Qdw4,27961
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=qh8mrz9AFuVQtXYSSP4QWsXLM_Lv3EHVifHT1NflWXY,57529
-udata-12.0.2.dev12.dist-info/licenses/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-12.0.2.dev12.dist-info/METADATA,sha256=Q5Wk0TmHufgkuNdrCwlb4ROur_K-z2warRq0MeXgAgk,5174
-udata-12.0.2.dev12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-udata-12.0.2.dev12.dist-info/entry_points.txt,sha256=v2u12qO11i2lyLNIp136WmLJ-NHT-Kew3Duu8J-AXPM,614
-udata-12.0.2.dev12.dist-info/top_level.txt,sha256=EF6CE6YSHd_og-8LCEA4q25ALUpWVe8D0okOLdMAE3A,6
-udata-12.0.2.dev12.dist-info/RECORD,,
+udata-12.0.2.dev13.dist-info/licenses/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-12.0.2.dev13.dist-info/METADATA,sha256=0p4YaygMwNbbY_fnRD4PmOzXTqOb40rc6-mwEAzrgls,5174
+udata-12.0.2.dev13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+udata-12.0.2.dev13.dist-info/entry_points.txt,sha256=v2u12qO11i2lyLNIp136WmLJ-NHT-Kew3Duu8J-AXPM,614
+udata-12.0.2.dev13.dist-info/top_level.txt,sha256=EF6CE6YSHd_og-8LCEA4q25ALUpWVe8D0okOLdMAE3A,6
+udata-12.0.2.dev13.dist-info/RECORD,,