udata 9.0.1.dev29667__py2.py3-none-any.whl → 9.0.1.dev29696__py2.py3-none-any.whl

udata/core/dataservices/factories.py

@@ -0,0 +1,19 @@
+import factory
+
+from udata.core.dataservices.models import Dataservice
+from udata.core.organization.factories import OrganizationFactory
+from udata.factories import ModelFactory
+
+
+class DataserviceFactory(ModelFactory):
+    class Meta:
+        model = Dataservice
+
+    title = factory.Faker('sentence')
+    description = factory.Faker('text')
+    base_api_url = factory.Faker('url')
+
+    class Params:
+        org = factory.Trait(
+            organization=factory.SubFactory(OrganizationFactory),
+        )

udata/core/dataservices/rdf.py

@@ -1,13 +1,14 @@
 
 from datetime import datetime
 from typing import List, Optional
-from rdflib import RDF, Graph, URIRef
+from rdflib import RDF, BNode, Graph, Literal, URIRef
 
 from udata.core.dataservices.models import Dataservice, HarvestMetadata as HarvestDataserviceMetadata
 from udata.core.dataset.models import Dataset, License
-from udata.core.dataset.rdf import sanitize_html
+from udata.core.dataset.rdf import dataset_to_graph_id, sanitize_html
 from udata.harvest.models import HarvestSource
-from udata.rdf import DCAT, DCT, contact_point_from_rdf, rdf_value, remote_url_from_rdf, theme_labels_from_rdf, themes_from_rdf, url_from_rdf
+from udata.rdf import DCATAP, TAG_TO_EU_HVD_CATEGORIES, namespace_manager, DCAT, DCT, contact_point_from_rdf, rdf_value, remote_url_from_rdf, themes_from_rdf, url_from_rdf
+from udata.uris import endpoint_for
 
 def dataservice_from_rdf(graph: Graph, dataservice: Dataservice, node, all_datasets: List[Dataset]) -> Dataservice :
     '''
@@ -55,4 +56,54 @@ def dataservice_from_rdf(graph: Graph, dataservice: Dataservice, node, all_datas
 
     dataservice.tags = themes_from_rdf(d)
 
-    return dataservice
+    return dataservice
+
+
+def dataservice_to_rdf(dataservice, graph=None):
+    '''
+    Map a dataservice domain model to a DCAT/RDF graph
+    '''
+    # Use the unlocalized permalink to the dataset as URI when available
+    # unless there is already an upstream URI
+    if dataservice.harvest and dataservice.harvest.rdf_node_id_as_url:
+        id = URIRef(dataservice.harvest.rdf_node_id_as_url)
+    elif dataservice.id:
+        id = URIRef(endpoint_for('dataservices.show_redirect', 'api.dataservice',
+                    dataservice=dataservice.id, _external=True))
+    else:
+        # Should not happen in production. Some test only
+        # `build()` a dataset without saving it to the DB.
+        id = BNode()
+
+    # Expose upstream identifier if present
+    if dataservice.harvest and dataservice.harvest.dct_identifier:
+        identifier = dataservice.harvest.dct_identifier
+    else:
+        identifier = dataservice.id
+    graph = graph or Graph(namespace_manager=namespace_manager)
+
+    d = graph.resource(id)
+    d.set(RDF.type, DCAT.DataService)
+    d.set(DCT.identifier, Literal(identifier))
+    d.set(DCT.title, Literal(dataservice.title))
+    d.set(DCT.description, Literal(dataservice.description))
+    d.set(DCT.issued, Literal(dataservice.created_at))
+    
+    if dataservice.base_api_url:
+        d.set(DCAT.endpointURL, Literal(dataservice.base_api_url))
+    
+    if dataservice.endpoint_description_url:
+        d.set(DCAT.endpointDescription, Literal(dataservice.endpoint_description_url))
+
+    for tag in dataservice.tags:
+        d.add(DCAT.keyword, Literal(tag))
+
+    # `dataset_to_graph_id(dataset)` URIRef may not exist in the current page
+    # but should exists in the catalog somewhere. Maybe we should create a Node 
+    # with some basic information about this dataset (but this will return a page 
+    # with more datasets than the page size… and could be problematic when processing the
+    # correct Node with all the information in a future page)
+    for dataset in dataservice.datasets:
+        d.add(DCAT.servesDataset, dataset_to_graph_id(dataset))
+
+    return d

udata/core/dataset/rdf.py

@@ -6,7 +6,7 @@ import json
 import logging
 
 from datetime import date
-from typing import Optional
+from typing import Optional, Union
 from dateutil.parser import parse as parse_dt
 from flask import current_app
 from geomet import wkt
@@ -149,19 +149,25 @@ def resource_to_rdf(resource, dataset=None, graph=None, is_hvd=False):
     return r
 
 
+def dataset_to_graph_id(dataset: Dataset) -> Union[URIRef, BNode]: 
+    if dataset.harvest and dataset.harvest.uri:
+        return URIRef(dataset.harvest.uri)
+    elif dataset.id:
+        return URIRef(endpoint_for('datasets.show_redirect', 'api.dataset',
+            dataset=dataset.id, _external=True))
+    else:
+        # Should not happen in production. Some test only
+        # `build()` a dataset without saving it to the DB.
+        return BNode()
+
 def dataset_to_rdf(dataset, graph=None):
     '''
     Map a dataset domain model to a DCAT/RDF graph
     '''
     # Use the unlocalized permalink to the dataset as URI when available
     # unless there is already an upstream URI
-    if dataset.harvest and dataset.harvest.uri:
-        id = URIRef(dataset.harvest.uri)
-    elif dataset.id:
-        id = URIRef(endpoint_for('datasets.show_redirect', 'api.dataset',
-                    dataset=dataset.id, _external=True))
-    else:
-        id = BNode()
+    id = dataset_to_graph_id(dataset)
+
     # Expose upstream identifier if present
     if dataset.harvest and dataset.harvest.dct_identifier:
         identifier = dataset.harvest.dct_identifier

udata/core/discussions/models.py

@@ -1,6 +1,8 @@
 import logging
 from datetime import datetime
 
+from flask_login import current_user
+
 from udata.mongo import db
 from udata.core.spam.models import SpamMixin, spam_protected
 from .signals import (on_new_discussion, on_discussion_closed, on_new_discussion_comment)
@@ -67,6 +69,24 @@ class Discussion(SpamMixin, db.Document):
     def embeds_to_check_for_spam(self):
         return self.discussion[1:]
 
+    def spam_is_whitelisted(self) -> bool:
+        from udata.core.dataset.permissions import OwnablePermission
+        from udata.core.owned import Owned
+
+        if not current_user.is_authenticated:
+            return False
+
+        if not isinstance(self.subject, Owned):
+            return False
+
+        # When creating a new Discussion the `subject` is an empty model
+        # with only `id`. We need to fetch it from the database to have
+        # all the required information
+        if not self.subject.owner or not self.subject.organization:
+            self.subject.reload()
+
+        return OwnablePermission(self.subject).can()
+
     @property
     def external_url(self):
         return self.subject.url_for(

udata/core/site/api.py

@@ -1,9 +1,11 @@
 from bson import ObjectId
 
 from flask import request, redirect, url_for, json, make_response
+from mongoengine import Q
 
 from udata.api import api, API, fields
 from udata.auth import admin_permission
+from udata.core.dataservices.models import Dataservice
 from udata.models import Dataset, Reuse
 from udata.utils import multi_to_dict
 from udata.rdf import (
@@ -109,7 +111,33 @@ class SiteRdfCatalogFormat(API):
         if 'tag' in params:
             datasets = datasets.filter(tags=params.get('tag', ''))
         datasets = datasets.paginate(page, page_size)
-        catalog = build_catalog(current_site, datasets, format=format)
+
+        # We need to add Dataservice to the catalog.
+        # In the best world, we want:
+        # - Keep the correct number of datasets on the page (if the requested page size is 100, we should have 100 datasets)
+        # - Have simple MongoDB queries
+        # - Do not duplicate the datasets (each dataset is present once in the catalog)
+        # - Do not duplicate the dataservices (each dataservice is present once in the catalog)
+        # - Every referenced dataset for one dataservices present on the page (hard to do)
+        # 
+        # Multiple solutions are possible but none check all the constraints.
+        # The selected one is to put all the dataservices referencing at least one of the dataset on
+        # the page at the end of it. It means dataservices could be duplicated (present on multiple pages)
+        # and these dataservices may referenced some datasets not present in the current page. It's working
+        # if somebody is doing the same thing as us (keeping the list of all the datasets IDs for the entire catalog then
+        # listing all dataservices in a second pass)
+        # Another option is to do some tricky Mongo requests to order/group datasets by their presence in some dataservices but 
+        # it could be really hard to do with a n..n relation.
+        # Let's keep this solution simple right now and iterate on it in the future.
+        dataservices_filter = Q(datasets__in=[d.id for d in datasets])
+
+        # On the first page, add all dataservices without datasets
+        if page == 1:
+            dataservices_filter = dataservices_filter | Q(datasets__size=0)
+
+        dataservices = Dataservice.objects.visible().filter(dataservices_filter)
+
+        catalog = build_catalog(current_site, datasets, dataservices=dataservices, format=format)
         # bypass flask-restplus make_response, since graph_response
         # is handling the content negociation directly
         return make_response(*graph_response(catalog, format))

udata/core/site/rdf.py

@@ -5,6 +5,7 @@ from flask import url_for, current_app
 from rdflib import Graph, URIRef, Literal, BNode
 from rdflib.namespace import RDF, FOAF
 
+from udata.core.dataservices.rdf import dataservice_to_rdf
 from udata.core.dataset.rdf import dataset_to_rdf
 from udata.core.organization.rdf import organization_to_rdf
 from udata.core.user.rdf import user_to_rdf
@@ -13,7 +14,7 @@ from udata.utils import Paginable
 from udata.uris import endpoint_for
 
 
-def build_catalog(site, datasets, format=None):
+def build_catalog(site, datasets, dataservices = [], format=None):
     '''Build the DCAT catalog for this site'''
     site_url = endpoint_for('site.home_redirect', 'api.site', _external=True)
     catalog_url = url_for('api.site_rdf_catalog', _external=True)
@@ -40,6 +41,10 @@ def build_catalog(site, datasets, format=None):
             rdf_dataset.add(DCT.publisher, organization_to_rdf(dataset.organization, graph))
         catalog.add(DCAT.dataset, rdf_dataset)
 
+    for dataservice in dataservices:
+        rdf_dataservice = dataservice_to_rdf(dataservice, graph)
+        catalog.add(DCAT.DataService, rdf_dataservice)
+
     if isinstance(datasets, Paginable):
         paginate_catalog(catalog, graph, datasets, format, 'api.site_rdf_catalog_format')
 

udata/core/spam/models.py

@@ -67,6 +67,9 @@ class SpamMixin(object):
         if not self.spam:
             self.spam = SpamInfo(status=NOT_CHECKED, callbacks={})
 
+        if self.spam_is_whitelisted():
+            return
+
         # The breadcrumb is useful during reporting to know where we came from
         # in case of a potential spam inside an embed.
         if breadcrumb is None:
@@ -139,6 +142,9 @@ class SpamMixin(object):
     def embeds_to_check_for_spam(self):
         return []
 
+    def spam_is_whitelisted(self) -> bool :
+        return False
+
     def spam_report_message(self):
         return f"Spam potentiel sur {type(self).__name__}"
 

udata/tests/plugin.py

@@ -8,6 +8,7 @@ from flask import json, template_rendered, url_for, current_app
 from flask.testing import FlaskClient
 from lxml import etree
 from werkzeug.urls import url_encode
+from flask_principal import Identity, identity_changed
 
 from udata import settings
 from udata.app import create_app
@@ -49,6 +50,7 @@ class TestClient(FlaskClient):
             session['_fresh'] = True
             session['_id'] = current_app.login_manager._session_identifier_generator()
             current_app.login_manager._update_request_context_with_user(user)
+            identity_changed.send(current_app._get_current_object(), identity=Identity(user.id))
         return user
 
     def logout(self):

udata/tests/site/test_site_rdf.py

@@ -6,6 +6,7 @@ from rdflib import URIRef, Literal, Graph
 from rdflib.namespace import RDF, FOAF
 from rdflib.resource import Resource
 
+from udata.core.dataservices.factories import DataserviceFactory
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.dataset.models import Dataset
 from udata.core.organization.factories import OrganizationFactory
@@ -244,3 +245,52 @@ class SiteRdfViewsTest:
 
         for dat in datasets:
             assert graph.value(dat, DCAT.keyword) == Literal('my-tag')
+
+    def test_catalog_rdf_dataservices(self, client):
+        dataset_a = DatasetFactory.create()
+        dataset_b = DatasetFactory.create()
+        dataset_c = DatasetFactory.create()
+
+        dataservice_a = DataserviceFactory.create(datasets=[dataset_a.id])
+        dataservice_b = DataserviceFactory.create(datasets=[dataset_b.id])
+        dataservice_x = DataserviceFactory.create(datasets=[dataset_a.id, dataset_c.id])
+        dataservice_y = DataserviceFactory.create(datasets=[])
+
+        response = client.get(url_for('api.site_rdf_catalog_format', format='xml'), 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) == 3
+
+        dataservices = list(graph.subjects(RDF.type, DCAT.DataService))
+        assert len(dataservices) == 4
+
+        # Test first page contains the dataservice without dataset
+        response = client.get(url_for('api.site_rdf_catalog_format', format='xml', page_size=1), 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) == 1
+        assert str(graph.value(datasets[0], DCT.identifier)) == str(dataset_c.id)
+
+        dataservices = list(graph.subjects(RDF.type, DCAT.DataService))
+        assert len(dataservices) == 2
+        assert sorted([str(d.id) for d in [dataservice_x, dataservice_y]]) == sorted([str(graph.value(d, DCT.identifier)) for d in dataservices])
+
+        # 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), 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) == 1
+        assert str(graph.value(datasets[0], DCT.identifier)) == str(dataset_b.id)
+
+        dataservices = list(graph.subjects(RDF.type, DCAT.DataService))
+        assert len(dataservices) == 1
+        assert str(graph.value(dataservices[0], DCT.identifier)) == str(dataservice_b.id)

udata/tests/test_discussions.py

@@ -76,7 +76,7 @@ class DiscussionsTest(APITestCase):
             discussion_id = None
             def check_signal(args):
                 self.assertIsNotNone(discussion_id)
-                self.assertIn(f'http://local.test/api/1/datasets/{dataset.id}/#discussion-{discussion_id}', args[1]['message'])
+                self.assertIn(f'http://local.test/api/1/datasets/{dataset.slug}/#discussion-{discussion_id}', args[1]['message'])
 
             with assert_emit(on_new_potential_spam, assertions_callback=check_signal):
                 response = self.post(url_for('api.discussions'), {
@@ -122,6 +122,29 @@ class DiscussionsTest(APITestCase):
         self.assertStatus(response, 200)
         self.assertFalse(discussion.reload().is_spam())
 
+
+    @pytest.mark.options(SPAM_WORDS=['spam'])
+    def test_spam_by_owner(self):
+        user = self.login()
+        dataset = Dataset.objects.create(title='Test dataset', owner=user)
+
+        with assert_not_emit(on_new_potential_spam):
+            response = self.post(url_for('api.discussions'), {
+                'title': 'spam and blah',
+                'comment': 'bla bla',
+                'subject': {
+                    'class': 'Dataset',
+                    'id': dataset.id,
+                }
+            })
+            self.assertStatus(response, 201)
+            
+        with assert_not_emit(on_new_potential_spam):
+            response = self.post(url_for('api.discussion', id=response.json['id']), {
+                'comment': 'A comment with spam by owner'
+            })
+            self.assertStatus(response, 200)
+
     @pytest.mark.options(SPAM_WORDS=['spam'])
     def test_spam_in_new_discussion_comment(self):
         self.login()
@@ -495,39 +518,6 @@ class DiscussionsTest(APITestCase):
                              {'comment': "can't comment"})
         self.assert403(response)
 
-    @pytest.mark.options(SPAM_WORDS=['spam'], SPAM_ALLOWED_LANGS=['fr'])
-    def test_close_discussion_with_spam(self):
-        owner = self.login()
-        dataset = Dataset.objects.create(title='Test dataset', owner=owner)
-        user = UserFactory()
-        message = Message(content='Premier message', posted_by=user)
-        discussion = Discussion.objects.create(
-            subject=dataset,
-            user=user,
-            title='test discussion',
-            discussion=[message]
-        )
-        on_new_discussion.send(discussion)  # Updating metrics.
-
-        with assert_not_emit(on_discussion_closed):
-            with assert_emit(on_new_potential_spam):
-                response = self.post(url_for('api.discussion', id=discussion.id), {
-                    'comment': 'This is a suspicious, real suspicious message in english.',
-                    'close': True,
-                })
-                self.assert200(response)
-
-        discussion.reload()
-        self.assertFalse(discussion.is_spam())
-        self.assertTrue(discussion.discussion[1].is_spam())
-        self.assertTrue('signal_close' in discussion.discussion[1].spam.callbacks)
-
-        with assert_emit(on_discussion_closed):
-            admin = self.login(AdminFactory())
-            response = self.delete(url_for('api.discussion_comment_spam', id=discussion.id, cidx=1))
-            self.assertStatus(response, 200)
-            self.assertFalse(discussion.reload().discussion[1].is_spam())
-
     def test_close_discussion_permissions(self):
         dataset = Dataset.objects.create(title='Test dataset')
         user = UserFactory()

{udata-9.0.1.dev29667.dist-info → udata-9.0.1.dev29696.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.0.1.dev29667
+Version: 9.0.1.dev29696
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -147,7 +147,9 @@ It is collectively taken care of by members of the
 - Improve URL validation errors [#3063](https://github.com/opendatateam/udata/pull/3063) [#2768](https://github.com/opendatateam/udata/pull/2768)
 - Do not return full dataset objects on dataservices endpoints [#3068](https://github.com/opendatateam/udata/pull/3068)
 - Update markdown base settings [#3067](https://github.com/opendatateam/udata/pull/3067)
+- Prevent tagging as spam owners' messages [#3071](https://github.com/opendatateam/udata/pull/3071)
 - Add api endpoint /me/org_topics/ [#3070](https://github.com/opendatateam/udata/pull/3070)
+- Expose dataservices in RDF catalog [#3058](https://github.com/opendatateam/udata/pull/3058)
 
 ## 9.0.0 (2024-06-07)
 

{udata-9.0.1.dev29667.dist-info → udata-9.0.1.dev29696.dist-info}/RECORD

@@ -80,9 +80,10 @@ udata/core/contact_point/forms.py,sha256=ggLhSJ1IRn5MclrhydckjAxwr4fFZxgAD4huSSu
 udata/core/contact_point/models.py,sha256=NlNKureCpzgTLJuGviZPjNx-ABYRp4j2L-ur9Gmixao,324
 udata/core/dataservices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataservices/api.py,sha256=rjCU55NNGgCDRlurfhJUT2byBGJWN5coM8b7AApzEew,3090
+udata/core/dataservices/factories.py,sha256=_6Rp1qGB7z3BbPcIshj8LNsxUpublq0sf4KVTjBziPI,506
 udata/core/dataservices/models.py,sha256=zMhzjnXm1p5GHZU1lYgMqft5u7iFyX0BIvNB1hM4D6Q,5868
 udata/core/dataservices/permissions.py,sha256=X9Bh8e0pnx6OgeEf6NowXZUiwyreUa6UY479B16cCqs,175
-udata/core/dataservices/rdf.py,sha256=TV02R2ZV_aDboSyl-4LJN1qG-5ibgrUYQZYmpl6Jqr4,2469
+udata/core/dataservices/rdf.py,sha256=YfHI60f0uJq0kSUKxSvFJzskbRH7c9yOj1ugcH6iLpA,4654
 udata/core/dataservices/tasks.py,sha256=NOWcTPoLasMrrvq9EkwQMGlUbQQmi_l3s815K-mtZTM,971
 udata/core/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/dataset/actions.py,sha256=3pzBg_qOR-w7fwPpTOKUHXWC9lkjALbOn1UQFmmT-s0,1199
@@ -100,7 +101,7 @@ udata/core/dataset/forms.py,sha256=VJCsGtgzhQgLW-M-J4ObpQ8o6c_saC3TTc1Js33m3sQ,6
 udata/core/dataset/models.py,sha256=q6AknSHYNjeUyVKoFgxEA0r9lSvMa_a4tJ3fLOzL03M,36053
 udata/core/dataset/permissions.py,sha256=3F2J7le3_rEYNhh88o3hSRWHAAt01_yHJM6RPmvCrRo,1090
 udata/core/dataset/preview.py,sha256=puPKT3fBD7ezAcT6owh0JK1_rGNDFZOqgT223qGn3LY,2597
-udata/core/dataset/rdf.py,sha256=d76N8NovOOKhzyxMe3J7906GP-HV4Q8PEfiK3_wQip8,22465
+udata/core/dataset/rdf.py,sha256=BujVPk510wLQzWPKZhZ1rGruQZSCr0hTDz9b1pmupxI,22695
 udata/core/dataset/search.py,sha256=Ca23ljX7TZiKZKiAZQIH5xwS2tjXQcTDzieAJd-E22c,5314
 udata/core/dataset/signals.py,sha256=TK6dfrOUitZZkGGOh6XmhYqYvIjzZpI70JTLV4k-JRM,161
 udata/core/dataset/tasks.py,sha256=UYdm_O9hA0yo7cCNQFvZE9pGzUshkc3Wr4Gpel2aupU,8434
@@ -111,7 +112,7 @@ udata/core/discussions/constants.py,sha256=nbZgXESpg0TykIGPxW8xUtHtk7TwQoyOL0Ky4
 udata/core/discussions/factories.py,sha256=NQd_tD0Izrm67uO5HuuClmluteACrRd9PHrb2IkQ0P0,350
 udata/core/discussions/forms.py,sha256=daDc8vPDhaXjiEyniugiRC6pyv6OsflgIyO-KoAn6i8,828
 udata/core/discussions/metrics.py,sha256=qtgyDhM1aPgh8bGU-h-962EKR3J44imC155JVi6jvJI,362
-udata/core/discussions/models.py,sha256=9DQ9pYyYdc1VVilaY44TKL_OMJP9_FgYwuo0w9ZZw5s,3360
+udata/core/discussions/models.py,sha256=B9tgaN6rqR4DLfHR6_jiZnaadVNZn0n08zmJRh7TPm8,4041
 udata/core/discussions/notifications.py,sha256=1lsu8WyyOL4bdt0lx6IW5wTxmQ5gS_7FoncN53g3ToQ,927
 udata/core/discussions/permissions.py,sha256=q3tXNuNmuXCvZhKyudROcwXF53l-IeDR3pfKSh_hIL0,636
 udata/core/discussions/signals.py,sha256=zjuF-TiFwu9U_RcgZtHB2Z3W4oBx5hVZy6CCAl5Ekug,543
@@ -176,16 +177,16 @@ udata/core/reuse/search.py,sha256=I3FX-9YP_cEqw5GFwFv2iqLZExeaQXsak13RMSCN7t8,28
 udata/core/reuse/signals.py,sha256=2vv668u8miJ9t6H-FwRgXcWwsYMQem3oLNXp36rKtno,155
 udata/core/reuse/tasks.py,sha256=FgkUN6s1uTDFQgiImiOEfIMYYW984bxxDtlGK0uZ0yY,1530
 udata/core/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/site/api.py,sha256=UXsMV8klzP5wQJazk_HfQGpckvkYddbuF8UJ5u0OBc0,4383
+udata/core/site/api.py,sha256=nsHTfjFQMp2gdWQk2Y-CY8HDdpoDlClYcJxJcc-xa9E,6199
 udata/core/site/factories.py,sha256=8-RwP6QRCxXqWF4UHIkm2NfWRP2p8Ktc5RSY-4jgnfk,378
 udata/core/site/forms.py,sha256=lPnxm0MDhK7_ORzPgJLcCAPMj59hDrJ80gwRSW-jtIo,469
 udata/core/site/models.py,sha256=96IZHtPaMio7VMNCdP1Km_SL1GlMErwBuDqgUXfzKVY,5981
-udata/core/site/rdf.py,sha256=ONKksnuZTFH9Hdd6BE42a1769zJynna68rG-M30PAZQ,1858
+udata/core/site/rdf.py,sha256=2yP3oUxTZBuP96TFMnh_68lO2Xuzpgn1Zwehg0POK5Y,2094
 udata/core/spam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/spam/api.py,sha256=8tVRPorw56kxgN64kme5nLkUfh8Gai9QyqT8aNQn9Xo,1674
 udata/core/spam/constants.py,sha256=M-wvYlcFnpUDortccIKFHWZ45vbNuMPWSvqKm2itn4w,143
 udata/core/spam/fields.py,sha256=ppazY9bGnz7mujmDndbxG3pPG_1HDUJCbIufxyD1UNQ,310
-udata/core/spam/models.py,sha256=4ylTXJ0EbjvwlPUTCwTMDERe26fCqLjAstuvt2EwGN0,7968
+udata/core/spam/models.py,sha256=sGA4TMXpKbyEbwW8Gk6JpPIiV91JQ4SxWjdVtpPIyls,8093
 udata/core/spam/signals.py,sha256=4VVLyC2I39LFAot4P56nHzY0xumjMBDz_N0Ff_kgBd0,159
 udata/core/spam/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/spam/tests/test_spam.py,sha256=W1Ck_rsnURhFi0fy5xOO0CPpW9MuUFbr-NmPZdk5R4Q,676
@@ -571,10 +572,10 @@ udata/tests/__init__.py,sha256=BezijRRI6dPPiEWWjLsJFLrhhfsTZgcctcxhVfp4j70,2332
 udata/tests/es-fake-result.json,sha256=z0CX9Gs-NRj49dmtdFvw8ZKsAbMhDt97Na6JX3ucX34,3155
 udata/tests/helpers.py,sha256=aaifyevJ1Z8CZ8htRrl8OCG5hGcaHfj0lL8iMEKds9w,6022
 udata/tests/models.py,sha256=_V0smMb1Z6p3aZv6PorzNN-HiNt_B46Ox1fqXrTJEqk,238
-udata/tests/plugin.py,sha256=DXP0H1Sm2fc-okGSKKBOgH8D8x4fl4_1OVhakgQLz4w,11278
+udata/tests/plugin.py,sha256=p8TZcFvlywaLeMXLQOBjZ0wgJM8d11pLYmMtLmXjtxg,11430
 udata/tests/schemas.json,sha256=szM1jDpkogfOG4xWbjIGjLgG8l9-ZyE3JKQtecJyD1E,4990
 udata/tests/test_activity.py,sha256=spWfhueuLze0kD-pAnegiL3_Kv5io155jQuFI4sjN7I,3258
-udata/tests/test_discussions.py,sha256=zPvKOdcTNGXrvHFp9zqjhKE2fqgUkhb_1F98egXYCL0,31036
+udata/tests/test_discussions.py,sha256=mNRA9PkAkUNLQRmbLjvjF2878yY5jsIuA0_wwiLCGHk,30395
 udata/tests/test_i18n.py,sha256=BU9E7OoIkJw5tv5JYGLjDGBDsti2HuQ_3OWDKnBxnaM,3191
 udata/tests/test_linkchecker.py,sha256=KxV1-PuuuqogkHf3jP6JhRsc2QG2dFmFB-vSHOiHkuU,10374
 udata/tests/test_mail.py,sha256=LK_fOBbFoqbwdaIEXO9XyGPzxY9nrT9FjyD_dlglUdQ,1643
@@ -667,7 +668,7 @@ udata/tests/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 udata/tests/site/test_site_api.py,sha256=XIjRH-iiwKdwmX145bQflxOatfIChi5RLikIMwJSbjQ,2276
 udata/tests/site/test_site_metrics.py,sha256=Sn9dQORwe-fvoyA7ZAnF63Cq5CwUGq1myH8Xe0EtfDA,2263
 udata/tests/site/test_site_model.py,sha256=nAx9JjEKdfjdw1Kj5Rs7P5FEePoATtCuOYPiSXEnVD0,1313
-udata/tests/site/test_site_rdf.py,sha256=NR09qJo8vmyAmtn0qQb-_nat7OyNV2fvwZTqW12BvQA,10283
+udata/tests/site/test_site_rdf.py,sha256=UeGzBkV2JW75lm7g4zMqFNHMj7QBFVI2xg0cmK25Elg,12695
 udata/tests/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/user/test_user_rdf.py,sha256=HrKirMURUXS9N3If_NMb8qnfJ4kE9IZymR1SPcNvlF0,1851
 udata/tests/workers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -690,9 +691,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=iAUNwbI8ESi8MHkE3ZCYCSIXfFC27z
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=uTmbHfzyFWrVXUkKSuNFzbGpX7EkUuBdD8fE04d3v5g,44572
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=1MbQHvKKNUwzMBWLNsH1qqBehO3aILhQiMhi5u1bY8E,28553
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=AAryt27Gbkhk7FntCCU8_e7HSXATfsAQhwFOFC8CAj0,51152
-udata-9.0.1.dev29667.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.0.1.dev29667.dist-info/METADATA,sha256=jRGiYzGgQ4kjdR658hbqRitIq0Fl3XwiPfcKbR_eXmI,125149
-udata-9.0.1.dev29667.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.0.1.dev29667.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.0.1.dev29667.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.0.1.dev29667.dist-info/RECORD,,
+udata-9.0.1.dev29696.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-9.0.1.dev29696.dist-info/METADATA,sha256=7FzsYbr-nRy6TOozV0-1HW9Hm3WF03byQS1SSR4tfow,125343
+udata-9.0.1.dev29696.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-9.0.1.dev29696.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-9.0.1.dev29696.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-9.0.1.dev29696.dist-info/RECORD,,