udata 13.0.1.dev12__py3-none-any.whl → 14.0.0__py3-none-any.whl

udata/sentry.py

@@ -2,15 +2,13 @@ import logging
 import re
 import warnings
 
-import pkg_resources
 from werkzeug.exceptions import HTTPException
 
-from udata import entrypoints
 from udata.core.storages.api import UploadProgress
+from udata.utils import get_udata_version
 
 from .app import UDataApp
 from .auth import PermissionDenied
-from .frontend import package_version
 
 log = logging.getLogger(__name__)
 
@@ -64,7 +62,7 @@ def init_app(app: UDataApp):
             dsn=app.config["SENTRY_PUBLIC_DSN"],
             integrations=[FlaskIntegration(), CeleryIntegration()],
             ignore_errors=list(exceptions),
-            release=f"udata@{package_version('udata')}",
+            release=f"udata@{get_udata_version()}",
             environment=app.config.get("SITE_ID", None),
             # Set traces_sample_rate to 1.0 to capture 100%
             # of transactions for performance monitoring.
@@ -83,9 +81,5 @@ def init_app(app: UDataApp):
         tags = app.config["SENTRY_TAGS"]
         for tag_key in tags:
             sentry_sdk.set_tag(tag_key, tags[tag_key])
-        # Versions Management: uData and plugins versions as tags.
-        for dist in entrypoints.get_plugins_dists(app):
-            if dist.version:
-                sentry_sdk.set_tag(dist.project_name, dist.version)
-        # Do not forget udata itself
-        sentry_sdk.set_tag("udata", pkg_resources.get_distribution("udata").version)
+
+        sentry_sdk.set_tag("udata", get_udata_version())

udata/settings.py

@@ -21,7 +21,6 @@ class Defaults(object):
     DEFAULT_LANGUAGE = "en"
     SECRET_KEY = "Default uData secret key"
     CONTACT_EMAIL = "contact@example.org"
-    TERRITORIES_EMAIL = "territories@example.org"
 
     CDATA_BASE_URL = None
 
@@ -175,7 +174,7 @@ class Defaults(object):
 
     UDATA_INSTANCE_NAME = "udata"
 
-    PLUGINS = []
+    HARVESTER_BACKENDS = []
     THEME = None
 
     STATIC_DIRS = []
@@ -332,10 +331,6 @@ class Defaults(object):
     # - add inspire keyword during harvest if GEMETE INSPIRE thesaurus is used in DCAT.theme
     INSPIRE_SUPPORT = True
 
-    ACTIVATE_TERRITORIES = False
-    # The order is important to compute parents/children, smaller first.
-    HANDLED_LEVELS = tuple()
-
     # Ignore some endpoint from API tracking
     # By default ignore the 3 most called APIs
     TRACKING_BLACKLIST = [
@@ -466,19 +461,22 @@ class Defaults(object):
     # if set to anything else than `None`
     ###########################################################################
     # avatar provider used to render user avatars
-    AVATAR_PROVIDER = None
     # Number of blocks used by the internal provider
-    AVATAR_INTERNAL_SIZE = None
+    AVATAR_INTERNAL_SIZE = 7
     # List of foreground colors used by the internal provider
-    AVATAR_INTERNAL_FOREGROUND = None
+    AVATAR_INTERNAL_FOREGROUND = [
+        "rgb(45,79,255)",
+        "rgb(254,180,44)",
+        "rgb(226,121,234)",
+        "rgb(30,179,253)",
+        "rgb(232,77,65)",
+        "rgb(49,203,115)",
+        "rgb(141,69,170)",
+    ]
     # Background color used by the internal provider
-    AVATAR_INTERNAL_BACKGROUND = None
+    AVATAR_INTERNAL_BACKGROUND = "rgb(224,224,224)"
     # Padding (in percent) used by the internal provider
-    AVATAR_INTERNAL_PADDING = None
-    # Skin (set) used by the robohash provider
-    AVATAR_ROBOHASH_SKIN = None
-    # The background used by the robohash provider.
-    AVATAR_ROBOHASH_BACKGROUND = None
+    AVATAR_INTERNAL_PADDING = 10
 
     # Post settings
     ###########################################################################
@@ -530,6 +528,8 @@ class Defaults(object):
         "harvest",
     )
     EXPORT_CSV_DATASET_ID = None
+    EXPORT_CSV_ARCHIVE_S3_BUCKET = None  # If this setting is set, an archive is uploaded to the corresponding S3 bucket every first day of the month (if export-csv is scheduled to run daily)
+    EXPORT_CSV_ARCHIVE_S3_FILENAME_PREFIX = ""  # Useful to store the csv archives inside a subfolder of the bucket, ie setting 'csv-catalog-archives/'`
 
     # Autocomplete parameters
     #########################
@@ -636,7 +636,7 @@ class Testing(object):
     CELERY_TASK_ALWAYS_EAGER = True
     CELERY_TASK_EAGER_PROPAGATES = True
     TEST_WITH_PLUGINS = False
-    PLUGINS = []
+    HARVESTER_BACKENDS = ["factory"]
     TEST_WITH_THEME = False
     THEME = "testing"
     CACHE_TYPE = "flask_caching.backends.null"
@@ -644,7 +644,6 @@ class Testing(object):
     DEBUG_TOOLBAR = False
     SERVER_NAME = "local.test"
     DEFAULT_LANGUAGE = "fr"
-    ACTIVATE_TERRITORIES = False
     LOGGER_HANDLER_POLICY = "never"
     CELERYD_HIJACK_ROOT_LOGGER = False
     URLS_ALLOW_LOCAL = True  # Test server URL is local.test

udata/tasks.py

@@ -1,12 +1,11 @@
 import logging
+from importlib.metadata import entry_points
 from urllib.parse import urlparse
 
 from celery import Celery, Task
 from celery.utils.log import get_task_logger
 from celerybeatmongo.schedulers import MongoScheduler
 
-from udata import entrypoints
-
 log = logging.getLogger(__name__)
 
 
@@ -176,6 +175,7 @@ def init_app(app):
     import udata.harvest.tasks  # noqa
     import udata.db.tasks  # noqa
 
-    entrypoints.get_enabled("udata.tasks", app)
+    for ep in entry_points(group="udata.tasks"):
+        ep.load()
 
     return celery

udata/tests/__init__.py

@@ -27,16 +27,7 @@ class TestCaseMixin:
         Not sure if the plugin situation is still relevant now that plugins are integrated
         into udata.
         """
-        _settings = settings.Testing
-        # apply the options(plugins) marker from pytest_flask as soon as app is created
-        # https://github.com/pytest-dev/pytest-flask/blob/a62ea18cb0fe89e3f3911192ab9ea4f9b12f8a16/pytest_flask/plugin.py#L126
-        # this lets us have default settings for plugins applied while testing
-        plugins = getattr(_settings, "PLUGINS", [])
-        for options in request.node.iter_markers("options"):
-            option = options.kwargs.get("plugins", []) or options.kwargs.get("PLUGINS", [])
-            plugins += option
-        setattr(_settings, "PLUGINS", plugins)
-        return _settings
+        return settings.Testing
 
     @pytest.fixture(autouse=True, name="app")
     def _app(self, request):

udata/tests/api/test_dataservices_api.py

@@ -16,7 +16,7 @@ from udata.core.dataservices.models import Dataservice
 from udata.core.dataset.factories import DatasetFactory, LicenseFactory
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.organization.models import Member
-from udata.core.topic.factories import TopicElementFactory, TopicFactory
+from udata.core.topic.factories import ReuseFactory, TopicElementFactory, TopicFactory
 from udata.core.user.factories import AdminFactory, UserFactory
 from udata.i18n import gettext as _
 from udata.tests.helpers import assert200, assert400, assert410
@@ -99,6 +99,34 @@ class DataserviceAPITest(APITestCase):
         assert len(response.json["data"]) == 1
         assert response.json["data"][0]["id"] == str(topic_dataservice.id)
 
+        # filter on reuse
+        reuse_dataservice = DataserviceFactory()
+        reuse = ReuseFactory(dataservices=[reuse_dataservice])
+        response = self.get(url_for("api.dataservices", reuse=reuse.id))
+        assert200(response)
+        assert len(response.json["data"]) == 1
+        assert response.json["data"][0]["id"] == str(reuse_dataservice.id)
+
+    def test_dataservices_topic_filter_errors(self):
+        # non-existing
+        response = self.get(url_for("api.dataservices", topic="690c7f48ec85adaa376c1e93"))
+        assert200(response)
+
+        # not an object ID
+        response = self.get(url_for("api.dataservices", topic="xxx"))
+        assert400(response)
+        assert "`topic` must be an identifier" in response.json["message"]
+
+    def test_dataservices_reuse_filter_errors(self):
+        # non-existing
+        response = self.get(url_for("api.dataservices", reuse="690c7f48ec85adaa376c1e93"))
+        assert200(response)
+
+        # not an object ID
+        response = self.get(url_for("api.dataservices", reuse="xxx"))
+        assert400(response)
+        assert "`reuse` must be an identifier" in response.json["message"]
+
     def test_dataservice_api_create(self):
         user = self.login()
         datasets = DatasetFactory.create_batch(3)

udata/tests/api/test_datasets_api.py

@@ -49,8 +49,7 @@ from udata.core.user.factories import AdminFactory, UserFactory
 from udata.i18n import gettext as _
 from udata.models import CommunityResource, Dataset, Follow, Member, db
 from udata.tags import TAG_MAX_LENGTH, TAG_MIN_LENGTH
-from udata.tests.features.territories import create_geozones_fixtures
-from udata.tests.helpers import assert200, assert404
+from udata.tests.helpers import assert200, assert404, create_geozones_fixtures
 from udata.utils import faker, unique_string
 
 from . import APITestCase, PytestOnlyAPITestCase

udata/tests/api/test_user_api.py

@@ -175,6 +175,18 @@ class UserAPITest(APITestCase):
 
         self.assertEqual(len(response.json["data"]), 2)
 
+    def test_user_api_full_text_search_email(self):
+        """It should find users based on last name"""
+        self.login(AdminFactory())
+
+        UserFactory(email="john@example.org")
+        UserFactory(email="jane@example.org")
+
+        response = self.get(url_for("api.users", q="jane"))
+        self.assert200(response)
+
+        self.assertEqual(len(response.json["data"]), 1)
+
     def test_user_api_full_text_search_unicode(self):
         """It should find user with special characters"""
         self.login(AdminFactory())

udata/tests/apiv2/test_topics.py

@@ -23,7 +23,7 @@ from udata.core.user.factories import UserFactory
 from udata.i18n import _
 from udata.tests.api import APITestCase
 from udata.tests.api.test_datasets_api import SAMPLE_GEOM
-from udata.tests.features.territories import create_geozones_fixtures
+from udata.tests.helpers import create_geozones_fixtures
 
 
 class TopicsListAPITest(APITestCase):

udata/tests/dataset/test_resource_preview.py

@@ -10,7 +10,6 @@ DUMMY_EXTRAS = {
 MAX_SIZE = 50000
 
 
-@pytest.mark.options(PLUGINS=["tabular"])
 class ResourcePreviewTest(PytestOnlyAPITestCase):
     def expected_url(self, rid):
         return "http://preview.me/resources/{0}".format(rid)

udata/tests/helpers.py

@@ -9,6 +9,7 @@ from flask import current_app, json
 from flask_security.babel import FsDomain
 from PIL import Image
 
+from udata.core.spatial.factories import GeoZoneFactory
 from udata.mail import mail_sent
 
 
@@ -221,5 +222,16 @@ def create_test_image():
     return file
 
 
+def create_geozones_fixtures():
+    paca = GeoZoneFactory(
+        id="fr:region:93", level="fr:region", name="Provence Alpes Côtes dAzur", code="93"
+    )
+    bdr = GeoZoneFactory(
+        id="fr:departement:13", level="fr:departement", name="Bouches-du-Rhône", code="13"
+    )
+    arles = GeoZoneFactory(id="fr:commune:13004", level="fr:commune", name="Arles", code="13004")
+    return paca, bdr, arles
+
+
 def security_gettext(string):
     return FsDomain(current_app).gettext(string)

udata/tests/test_cors.py

@@ -27,7 +27,7 @@ class CorsTest(APITestCase):
         assert "Access-Control-Allow-Origin" in response.headers
 
         # Resource permalink
-        response = self.get(f"/fr/datasets/r/{dataset.resources[0].id}", headers=cors_headers)
+        response = self.get(f"/datasets/r/{dataset.resources[0].id}", headers=cors_headers)
         assert_status(response, 404)  # The route is defined in udata-front
         assert "Access-Control-Allow-Origin" in response.headers