udata 9.1.2.dev30754__py2.py3-none-any.whl → 9.1.3__py2.py3-none-any.whl

tasks/helpers.py

@@ -1,10 +1,11 @@
 from os.path import abspath, dirname, join
+from typing import Callable
 
 #: Project absolute root path
 ROOT = abspath(join(dirname(__file__), ".."))
 
 
-def color(code):
+def color(code: str) -> Callable:
     """A simple ANSI color wrapper factory"""
     return lambda t: "\033[{0}{1}\033[0;m".format(code, t)
 
@@ -17,25 +18,25 @@ purple = color("1;35m")
 white = color("1;39m")
 
 
-def header(text, *args, **kwargs):
+def header(text: str, *args, **kwargs) -> None:
     """Display an header"""
     text = text.format(*args, **kwargs)
     print(" ".join((blue(">>"), cyan(text))))
 
 
-def info(text, *args, **kwargs):
+def info(text: str, *args, **kwargs) -> None:
     """Display informations"""
     text = text.format(*args, **kwargs)
     print(" ".join((purple(">>>"), text)))
 
 
-def success(text, *args, **kwargs):
+def success(text: str, *args, **kwargs) -> None:
     """Display a success message"""
     text = text.format(*args, **kwargs)
     print(" ".join((green("✔"), white(text))))
 
 
-def error(text, *args, **kwargs):
+def error(text: str, *args, **kwargs) -> None:
     """Display an error message"""
     text = text.format(*args, **kwargs)
     print(red("✘ {0}".format(text)))

udata/__init__.py

@@ -4,5 +4,5 @@
 udata
 """
 
-__version__ = "9.1.2.dev"
+__version__ = "9.1.3"
 __description__ = "Open data portal"

udata/api_fields.py

@@ -335,7 +335,7 @@ def wrap_primary_key(
     field_name: str,
     foreign_field: mongoengine.fields.ReferenceField | mongoengine.fields.GenericReferenceField,
     value: str,
-    document_type: type = None,
+    document_type=None,
 ):
     """
     We need to wrap the `String` inside an `ObjectId` most of the time. If the foreign ID is a `String` we need to get

udata/assets.py

@@ -2,7 +2,7 @@ from flask import current_app, url_for
 from flask_cdn import url_for as cdn_url_for
 
 
-def cdn_for(endpoint, **kwargs):
+def cdn_for(endpoint: str, **kwargs) -> str:
     """
     Get a CDN URL for a static assets.
 

udata/commands/fixtures.py

@@ -1,11 +1,22 @@
+"""Commands to download fixtures from the udata-fixtures repository, import them locally.
+
+When "downloading" (generating) the fixtures, save the json as is.
+When "importing" the fixtures, massage them so then can be loaded properly.
+"""
+
 import json
 import logging
+import pathlib
 
 import click
 import requests
 from flask import current_app
 
 from udata.commands import cli
+from udata.core.contact_point.factories import ContactPointFactory
+from udata.core.contact_point.models import ContactPoint
+from udata.core.dataservices.factories import DataserviceFactory
+from udata.core.dataservices.models import Dataservice
 from udata.core.dataset.factories import (
     CommunityResourceFactory,
     DatasetFactory,
@@ -21,21 +32,79 @@ log = logging.getLogger(__name__)
 
 
 DATASET_URL = "/api/1/datasets"
+DATASERVICES_URL = "/api/1/dataservices"
 ORG_URL = "/api/1/organizations"
 REUSE_URL = "/api/1/reuses"
 COMMUNITY_RES_URL = "/api/1/datasets/community_resources"
 DISCUSSION_URL = "/api/1/discussions"
 
 
-DEFAULT_FIXTURE_FILE = (
-    "https://raw.githubusercontent.com/opendatateam/udata-fixtures/main/results.json"  # noqa
-)
+DEFAULT_FIXTURE_FILE_TAG: str = "v2.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"
+
+UNWANTED_KEYS: dict[str, list[str]] = {
+    "dataset": [
+        "uri",
+        "page",
+        "last_update",
+        "last_modified",
+        "license",
+        "badges",
+        "spatial",
+        "quality",
+    ],
+    "resource": ["latest", "preview_url", "last_modified"],
+    "organization": ["members", "page", "uri", "logo_thumbnail"],
+    "reuse": ["datasets", "image_thumbnail", "page", "uri", "organization", "owner"],
+    "community": [
+        "dataset",
+        "organization",
+        "owner",
+        "latest",
+        "last_modified",
+        "preview_url",
+    ],
+    "discussion": ["subject", "user", "url", "class"],
+    "message": ["posted_by"],
+    "dataservice": [
+        "datasets",
+        "license",
+        "organization",
+        "owner",
+        "self_api_url",
+        "self_web_url",
+    ],
+}
+
+
+def remove_unwanted_keys(obj: dict, filter_type: str) -> dict:
+    """Remove UNWANTED_KEYS from a dict."""
+    for unwanted_key in UNWANTED_KEYS[filter_type]:
+        if unwanted_key in obj:
+            del obj[unwanted_key]
+    fix_dates(obj)
+    return obj
+
+
+def fix_dates(obj: dict) -> dict:
+    """Fix dates from the fixtures so they can be safely reloaded later on."""
+    if "internal" not in obj:
+        return obj
+    obj["created_at_internal"] = obj["internal"]["created_at_internal"]
+    obj["last_modified_internal"] = obj["internal"]["last_modified_internal"]
+    del obj["internal"]
+    del obj["created_at"]
+    return obj
 
 
 @cli.command()
 @click.argument("data-source")
-def generate_fixtures_file(data_source):
-    """Build sample fixture file based on datasets slugs list (users, datasets, reuses)."""
+@click.argument("results-filename", default=DEFAULT_FIXTURES_RESULTS_FILENAME)
+def generate_fixtures_file(data_source: str, results_filename: str) -> None:
+    """Build sample fixture file based on datasets slugs list (users, datasets, reuses, dataservices)."""
+    results_file = pathlib.Path(results_filename)
     datasets_slugs = current_app.config["FIXTURE_DATASET_SLUGS"]
     json_result = []
 
@@ -44,31 +113,13 @@ def generate_fixtures_file(data_source):
             json_fixture = {}
 
             json_dataset = requests.get(f"{data_source}{DATASET_URL}/{slug}/").json()
-            del json_dataset["uri"]
-            del json_dataset["page"]
-            del json_dataset["last_update"]
-            del json_dataset["last_modified"]
-            del json_dataset["license"]
-            del json_dataset["badges"]
-            del json_dataset["spatial"]
-            del json_dataset["quality"]
-            json_dataset["created_at_internal"] = json_dataset.pop("created_at")
             json_resources = json_dataset.pop("resources")
-            for res in json_resources:
-                del res["latest"]
-                del res["preview_url"]
-                del res["last_modified"]
-                res["created_at_internal"] = res.pop("created_at")
             if json_dataset["organization"] is None:
                 json_owner = json_dataset.pop("owner")
                 json_dataset["owner"] = json_owner["id"]
             else:
                 json_org = json_dataset.pop("organization")
                 json_org = requests.get(f"{data_source}{ORG_URL}/{json_org['id']}/").json()
-                del json_org["members"]
-                del json_org["page"]
-                del json_org["uri"]
-                del json_org["logo_thumbnail"]
                 json_fixture["organization"] = json_org
             json_fixture["resources"] = json_resources
             json_fixture["dataset"] = json_dataset
@@ -76,50 +127,34 @@ def generate_fixtures_file(data_source):
             json_reuses = requests.get(
                 f"{data_source}{REUSE_URL}/?dataset={json_dataset['id']}"
             ).json()["data"]
-            for reuse in json_reuses:
-                del reuse["datasets"]
-                del reuse["image_thumbnail"]
-                del reuse["page"]
-                del reuse["uri"]
-                del reuse["organization"]
-                del reuse["owner"]
             json_fixture["reuses"] = json_reuses
 
             json_community = requests.get(
                 f"{data_source}{COMMUNITY_RES_URL}/?dataset={json_dataset['id']}"
             ).json()["data"]
-            for com in json_community:
-                del com["dataset"]
-                del com["organization"]
-                del com["owner"]
-                del com["latest"]
-                del com["last_modified"]
-                del com["preview_url"]
-                com["created_at_internal"] = com.pop("created_at")
             json_fixture["community_resources"] = json_community
 
             json_discussion = requests.get(
                 f"{data_source}{DISCUSSION_URL}/?for={json_dataset['id']}"
             ).json()["data"]
-            for discussion in json_discussion:
-                del discussion["subject"]
-                del discussion["user"]
-                del discussion["url"]
-                del discussion["class"]
-                for message in discussion["discussion"]:
-                    del message["posted_by"]
             json_fixture["discussions"] = json_discussion
 
+            json_dataservices = requests.get(
+                f"{data_source}{DATASERVICES_URL}/?dataset={json_dataset['id']}"
+            ).json()["data"]
+            json_fixture["dataservices"] = json_dataservices
+
             json_result.append(json_fixture)
 
-    with open("results.json", "w") as f:
-        json.dump(json_result, f)
+    with results_file.open("w") as f:
+        json.dump(json_result, f, indent=2)
+        print(f"Fixtures saved to file {results_filename}")
 
 
 @cli.command()
 @click.argument("source", default=DEFAULT_FIXTURE_FILE)
-def generate_fixtures(source):
-    """Build sample fixture data (users, datasets, reuses) from local or remote file."""
+def import_fixtures(source):
+    """Build sample fixture data (users, datasets, reuses, dataservices) from local or remote file."""
     if source.startswith("http"):
         json_fixtures = requests.get(source).json()
     else:
@@ -129,24 +164,32 @@ def generate_fixtures(source):
     with click.progressbar(json_fixtures) as bar:
         for fixture in bar:
             user = UserFactory()
+            dataset = fixture["dataset"]
+            dataset = remove_unwanted_keys(dataset, "dataset")
             if not fixture["organization"]:
-                dataset = DatasetFactory(**fixture["dataset"], owner=user)
+                dataset = DatasetFactory(**dataset, owner=user)
             else:
                 org = Organization.objects(id=fixture["organization"]["id"]).first()
                 if not org:
-                    org = OrganizationFactory(
-                        **fixture["organization"], members=[Member(user=user)]
-                    )
-                dataset = DatasetFactory(**fixture["dataset"], organization=org)
+                    organization = fixture["organization"]
+                    organization = remove_unwanted_keys(organization, "organization")
+                    org = OrganizationFactory(**organization, members=[Member(user=user)])
+                dataset = DatasetFactory(**dataset, organization=org)
             for resource in fixture["resources"]:
+                resource = remove_unwanted_keys(resource, "resource")
                 res = ResourceFactory(**resource)
                 dataset.add_resource(res)
             for reuse in fixture["reuses"]:
+                reuse = remove_unwanted_keys(reuse, "reuse")
                 ReuseFactory(**reuse, datasets=[dataset], owner=user)
             for community in fixture["community_resources"]:
+                community = remove_unwanted_keys(community, "community")
                 CommunityResourceFactory(**community, dataset=dataset, owner=user)
             for discussion in fixture["discussions"]:
+                discussion = remove_unwanted_keys(discussion, "discussion")
                 messages = discussion.pop("discussion")
+                for message in messages:
+                    message = remove_unwanted_keys(message, "message")
                 DiscussionFactory(
                     **discussion,
                     subject=dataset,
@@ -155,3 +198,17 @@ def generate_fixtures(source):
                         MessageDiscussionFactory(**message, posted_by=user) for message in messages
                     ],
                 )
+            for dataservice in fixture["dataservices"]:
+                dataservice = remove_unwanted_keys(dataservice, "dataservice")
+                if not dataservice["contact_point"]:
+                    DataserviceFactory(**dataservice, datasets=[dataset])
+                else:
+                    contact_point = ContactPoint.objects(
+                        id=dataservice["contact_point"]["id"]
+                    ).first()
+                    if not contact_point:
+                        contact_point = ContactPointFactory(**dataservice["contact_point"])
+                    dataservice.pop("contact_point")
+                    DataserviceFactory(
+                        **dataservice, datasets=[dataset], contact_point=contact_point
+                    )

udata/commands/init.py

@@ -11,7 +11,7 @@ from udata.i18n import gettext as _
 from udata.search.commands import index
 
 from .db import migrate
-from .fixtures import generate_fixtures
+from .fixtures import import_fixtures
 
 log = logging.getLogger(__name__)
 
@@ -44,6 +44,6 @@ def init(ctx):
 
         text = _("Do you want to create some sample data?")
         if click.confirm(text, default=True):
-            ctx.invoke(generate_fixtures)
+            ctx.invoke(import_fixtures)
 
     success(_("Your udata instance is ready!"))

udata/commands/tests/test_fixtures.py

@@ -0,0 +1,74 @@
+import json
+from tempfile import NamedTemporaryFile
+
+import pytest
+import requests
+import werkzeug.test
+from pytest_mock import MockerFixture
+from werkzeug.wrappers.response import Response
+
+import udata.commands.fixtures
+from udata import models
+from udata.core.dataservices.factories import DataserviceFactory
+from udata.core.dataset.factories import (
+    CommunityResourceFactory,
+    DatasetFactory,
+    ResourceFactory,
+)
+from udata.core.discussions.factories import DiscussionFactory, MessageDiscussionFactory
+from udata.core.organization.factories import OrganizationFactory
+from udata.core.organization.models import Member, Organization
+from udata.core.reuse.factories import ReuseFactory
+from udata.core.user.factories import UserFactory
+
+
+@pytest.mark.usefixtures("clean_db")
+class FixturesTest:
+    @pytest.mark.frontend
+    @pytest.mark.options(FIXTURE_DATASET_SLUGS=["some-test-dataset-slug"])
+    def test_generate_fixtures_file_then_import(self, app, cli, api, monkeypatch):
+        """Test generating fixtures from the current env, then importing them back."""
+        assert models.Dataset.objects.count() == 0  # Start with a clean slate.
+        user = UserFactory()
+        org = OrganizationFactory(**{}, members=[Member(user=user)])
+        # Set the same slug we're 'exporting' from the FIXTURE_DATASET_SLUG config, see the
+        # @pytest.mark.options above.
+        dataset = DatasetFactory(**{}, slug="some-test-dataset-slug", organization=org)
+        res = ResourceFactory(**{})
+        dataset.add_resource(res)
+        ReuseFactory(**{}, datasets=[dataset], owner=user)
+        CommunityResourceFactory(**{}, dataset=dataset, owner=user)
+        DiscussionFactory(
+            **{},
+            subject=dataset,
+            user=user,
+            discussion=[MessageDiscussionFactory(**{}, posted_by=user)],
+        )
+        DataserviceFactory(**{}, datasets=[dataset])
+
+        with NamedTemporaryFile(mode="w+", delete=True) as fixtures_fd:
+            # Get the fixtures from the local instance.
+            monkeypatch.setattr(requests, "get", lambda url: api.get(url))
+            monkeypatch.setattr(Response, "json", Response.get_json)
+            result = cli("generate-fixtures-file", "", fixtures_fd.name)
+            fixtures_fd.flush()
+            assert "Fixtures saved to file " in result.output
+
+            # Then load them in the database to make sure they're correct.
+            result = cli("import-fixtures", fixtures_fd.name)
+        assert models.Organization.objects(slug=org.slug).count() > 0
+        assert models.Dataset.objects.count() > 0
+        assert models.Discussion.objects.count() > 0
+        assert models.CommunityResource.objects.count() > 0
+        assert models.User.objects.count() > 0
+        assert models.Dataservice.objects.count() > 0
+
+    def test_import_fixtures_from_default_file(self, cli):
+        """Test importing fixtures from udata.commands.fixture.DEFAULT_FIXTURE_FILE."""
+        cli("import-fixtures")
+        assert models.Organization.objects.count() > 0
+        assert models.Dataset.objects.count() > 0
+        assert models.Reuse.objects.count() > 0
+        assert models.User.objects.count() > 0
+        if udata.commands.fixtures.DEFAULT_FIXTURE_FILE_TAG > "v1.0.0":
+            assert models.Dataservice.objects.count() > 0

udata/core/dataset/actions.py

@@ -4,12 +4,12 @@ from datetime import datetime
 from flask import current_app, render_template
 
 from udata import i18n
-from udata.models import Discussion, Message
+from udata.models import Dataset, Discussion, Message
 
 log = logging.getLogger(__name__)
 
 
-def archive(dataset, comment=False):
+def archive(dataset: Dataset, comment=False) -> None:
     """Archive a dataset"""
     if dataset.archived:
         log.warning("Dataset %s already archived, bumping date", dataset)

udata/core/reports/api.py

@@ -4,6 +4,7 @@ from flask_login import current_user
 
 from udata.api import API, api, fields
 from udata.api_fields import patch
+from udata.auth import admin_permission
 
 from .constants import reports_reasons_translations
 from .models import Report
@@ -16,6 +17,7 @@ class ReportsAPI(API):
     @api.doc("list_reports")
     @api.expect(Report.__index_parser__)
     @api.marshal_with(Report.__page_fields__)
+    @api.secure(admin_permission)
     def get(self):
         query = Report.objects
 
@@ -37,6 +39,15 @@ class ReportsAPI(API):
         return report, 201
 
 
+@ns.route("/<report:report>/", endpoint="report")
+class ReportAPI(API):
+    @api.doc("get_report")
+    @api.marshal_with(Report.__read_fields__)
+    @api.secure(admin_permission)
+    def get(self, report):
+        return report
+
+
 @ns.route("/reasons/", endpoint="reports_reasons")
 class ReportsReasonsAPI(API):
     @api.doc("list_reports_reasons")

udata/core/reports/models.py

@@ -3,10 +3,11 @@ from datetime import datetime
 from bson import DBRef
 from mongoengine import DO_NOTHING, NULLIFY, signals
 
-from udata.api_fields import field, generate_fields
+from udata.api_fields import field, function_field, generate_fields
 from udata.core.user.api_fields import user_ref_fields
 from udata.core.user.models import User
 from udata.mongo import db
+from udata.uris import endpoint_for
 
 from .constants import REPORT_REASONS_CHOICES, REPORTABLE_MODELS
 
@@ -45,6 +46,10 @@ class Report(db.Document):
         readonly=True,
     )
 
+    @function_field(description="Link to the API endpoint for this report")
+    def self_api_url(self):
+        return endpoint_for("api.report", report=self, _external=True)
+
     @classmethod
     def mark_as_deleted_soft_delete(cls, sender, document, **kwargs):
         """

udata/core/reuse/metrics.py

@@ -3,5 +3,5 @@ from udata.models import Reuse
 
 @Reuse.on_create.connect
 @Reuse.on_update.connect
-def update_reuses_dataset_metric(reuse, **kwargs):
+def update_reuses_dataset_metric(reuse: Reuse, **kwargs) -> None:
     reuse.count_datasets()

udata/core/reuse/permissions.py

@@ -3,10 +3,11 @@ from udata.core.organization.permissions import (
     OrganizationAdminNeed,
     OrganizationEditorNeed,
 )
+from udata.core.reuse.models import Reuse
 
 
 class ReuseEditPermission(Permission):
-    def __init__(self, reuse):
+    def __init__(self, reuse: Reuse) -> None:
         needs = []
 
         if reuse.organization:

udata/core/reuse/search.py

@@ -38,7 +38,7 @@ class ReuseSearch(ModelSearchAdapter):
     }
 
     @classmethod
-    def is_indexable(cls, reuse):
+    def is_indexable(cls, reuse: Reuse) -> bool:
         return reuse.deleted is None and len(reuse.datasets) > 0 and not reuse.private
 
     @classmethod
@@ -55,7 +55,7 @@ class ReuseSearch(ModelSearchAdapter):
         return reuses.order_by(sort).skip(offset).limit(args["page_size"]), reuses.count()
 
     @classmethod
-    def serialize(cls, reuse):
+    def serialize(cls, reuse: Reuse) -> dict:
         organization = None
         owner = None
         if reuse.organization:

udata/core/reuse/tasks.py

@@ -10,7 +10,7 @@ log = get_logger(__name__)
 
 
 @job("purge-reuses")
-def purge_reuses(self):
+def purge_reuses(self) -> None:
     for reuse in Reuse.objects(deleted__ne=None):
         log.info(f"Purging reuse {reuse}")
         # Remove followers
@@ -32,7 +32,7 @@ def purge_reuses(self):
 
 
 @task
-def notify_new_reuse(reuse_id):
+def notify_new_reuse(reuse_id: int) -> None:
     reuse = Reuse.objects.get(pk=reuse_id)
     for dataset in reuse.datasets:
         if dataset.organization:

udata/frontend/__init__.py

@@ -23,7 +23,7 @@ _template_hooks = {}
 
 
 @hook.app_template_global()
-def package_version(name):
+def package_version(name: str) -> str:
     return pkg_resources.get_distribution(name).version
 
 

udata/models/__init__.py

@@ -22,6 +22,7 @@ from udata.core.jobs.models import *  # noqa
 from udata.core.tags.models import *  # noqa
 from udata.core.spam.models import *  # noqa
 from udata.core.reports.models import *  # noqa
+from udata.core.dataservices.models import *  # noqa
 
 from udata.features.transfer.models import *  # noqa
 from udata.features.territories.models import *  # noqa

udata/routing.py

@@ -153,6 +153,10 @@ class ContactPointConverter(ModelConverter):
     model = models.ContactPoint
 
 
+class ReportConverter(ModelConverter):
+    model = models.Report
+
+
 class TerritoryConverter(PathConverter):
     DEFAULT_PREFIX = "fr"  # TODO: make it a setting parameter
 
@@ -231,3 +235,4 @@ def init_app(app):
     app.url_map.converters["post"] = PostConverter
     app.url_map.converters["territory"] = TerritoryConverter
     app.url_map.converters["contact_point"] = ContactPointConverter
+    app.url_map.converters["report"] = ReportConverter

udata/sentry.py

@@ -8,7 +8,9 @@ from werkzeug.exceptions import HTTPException
 from udata import entrypoints
 from udata.core.storages.api import UploadProgress
 
+from .app import UDataApp
 from .auth import PermissionDenied
+from .frontend import package_version
 
 log = logging.getLogger(__name__)
 
@@ -24,7 +26,7 @@ ERROR_PARSE_DSN_MSG = "Unable to parse Sentry DSN"
 IGNORED_EXCEPTIONS = HTTPException, PermissionDenied, UploadProgress
 
 
-def public_dsn(dsn):
+def public_dsn(dsn: str) -> str | None:
     """Check if DSN is public or raise a warning and turn it into a public one"""
     m = RE_DSN.match(dsn)
     if not m:
@@ -41,7 +43,7 @@ def public_dsn(dsn):
     return public
 
 
-def init_app(app):
+def init_app(app: UDataApp):
     if app.config["SENTRY_DSN"]:
         try:
             import sentry_sdk
@@ -62,6 +64,13 @@ def init_app(app):
             dsn=app.config["SENTRY_PUBLIC_DSN"],
             integrations=[FlaskIntegration(), CeleryIntegration()],
             ignore_errors=list(exceptions),
+            release=f"udata@{package_version('udata')}",
+            environment=app.config.get("SITE_ID", None),
+            # Set traces_sample_rate to 1.0 to capture 100%
+            # of transactions for performance monitoring.
+            # Sentry recommends adjusting this value in production.
+            traces_sample_rate=app.config.get("SENTRY_SAMPLE_RATE", None),
+            profiles_sample_rate=app.config.get("SENTRY_SAMPLE_RATE", None),
         )
 
         # Set log level

udata/settings.py

@@ -113,6 +113,7 @@ class Defaults(object):
     SENTRY_USER_ATTRS = ["slug", "email", "fullname"]
     SENTRY_LOGGING = "WARNING"
     SENTRY_IGNORE_EXCEPTIONS = []
+    SENTRY_SAMPLE_RATE: float = 1.0
 
     # Flask WTF settings
     CSRF_SESSION_KEY = "Default uData csrf key"

udata/tags.py

@@ -6,11 +6,11 @@ MIN_TAG_LENGTH = LocalProxy(lambda: current_app.config["TAG_MIN_LENGTH"])
 MAX_TAG_LENGTH = LocalProxy(lambda: current_app.config["TAG_MAX_LENGTH"])
 
 
-def slug(value):
+def slug(value: str) -> str:
     return slugify(value.lower())
 
 
-def normalize(value):
+def normalize(value: str) -> str:
     value = slug(value)
     if len(value) < MIN_TAG_LENGTH:
         value = ""
@@ -19,5 +19,5 @@ def normalize(value):
     return value
 
 
-def tags_list(value):
+def tags_list(value: str) -> list:
     return list(set(slug(tag) for tag in value.split(",") if tag.strip()))

udata/tests/api/test_reports_api.py

@@ -1,5 +1,4 @@
 from flask import url_for
-from mongoengine.base.datastructures import LazyReference
 
 from udata.core.dataset.factories import DatasetFactory
 from udata.core.dataset.models import Dataset
@@ -9,8 +8,8 @@ from udata.core.reports.constants import (
     reports_reasons_translations,
 )
 from udata.core.reports.models import Report
-from udata.core.user.factories import UserFactory
-from udata.i18n import gettext as _
+from udata.core.reuse.factories import ReuseFactory
+from udata.core.user.factories import AdminFactory, UserFactory
 
 from . import APITestCase
 
@@ -100,6 +99,11 @@ class ReportsAPITest(APITestCase):
         reports[1].reload()
         self.assertIsNotNone(reports[1].subject_deleted_at)
 
+        # Should be logged as admin
+        response = self.get(url_for("api.reports"))
+        self.assert403(response)
+
+        self.login(AdminFactory())
         response = self.get(url_for("api.reports"))
         self.assert200(response)
 
@@ -119,3 +123,49 @@ class ReportsAPITest(APITestCase):
         self.assertEqual(REASON_SPAM, reports[1]["reason"])
         self.assertEqual(str(user.id), reports[1]["by"]["id"])
         self.assertIsNotNone(reports[1]["subject_deleted_at"])
+
+    def test_reports_api_list(self):
+        user = UserFactory()
+
+        spam_dataset = DatasetFactory.create(owner=user)
+        spam_reuse = ReuseFactory.create(owner=user)
+
+        Report(subject=spam_dataset, reason="spam").save()
+        Report(subject=spam_reuse, reason="spam").save()
+
+        # Should be logged as admin
+        response = self.get(url_for("api.reports"))
+        self.assert401(response)
+
+        self.login(AdminFactory())
+        response = self.get(url_for("api.reports"))
+        self.assert200(response)
+
+        payload = response.json
+        self.assertEqual(payload["total"], 2)
+        # Returned by order of creation by default
+        self.assertEqual(payload["data"][0]["subject"]["id"], str(spam_dataset.id))
+        self.assertEqual(
+            payload["data"][0]["self_api_url"],
+            url_for("api.report", report=payload["data"][0]["id"], _external=True),
+        )
+
+        self.assertEqual(payload["data"][1]["subject"]["id"], str(spam_reuse.id))
+
+    def test_reports_api_get(self):
+        user = UserFactory()
+
+        spam_dataset = DatasetFactory.create(owner=user)
+
+        report = Report(subject=spam_dataset, reason="spam").save()
+
+        # Should be logged as admin
+        response = self.get(url_for("api.report", report=report))
+        self.assert401(response)
+
+        self.login(AdminFactory())
+        response = self.get(url_for("api.report", report=report))
+        self.assert200(response)
+
+        payload = response.json
+        self.assertEqual(payload["subject"]["id"], str(spam_dataset.id))

udata/utils.py

@@ -3,6 +3,7 @@ import math
 import re
 from datetime import date, datetime
 from math import ceil
+from typing import Any
 from uuid import UUID, uuid4
 from xml.sax.saxutils import escape
 
@@ -120,7 +121,7 @@ def daterange_start(value):
         return result.replace(day=1, month=1)
 
 
-def daterange_end(value):
+def daterange_end(value: date | datetime | str | None) -> date | None:
     """Parse a date range end boundary"""
     if not value:
         return None
@@ -143,7 +144,7 @@ def daterange_end(value):
         return result.replace(month=12, day=31)
 
 
-def to_naive_datetime(given_date):
+def to_naive_datetime(given_date: Any) -> datetime:
     if isinstance(given_date, str):
         given_date = parse_dt(given_date)
     if isinstance(given_date, date) and not isinstance(given_date, datetime):
@@ -153,7 +154,7 @@ def to_naive_datetime(given_date):
     return given_date
 
 
-def to_iso(dt):
+def to_iso(dt: date | datetime) -> str | None:
     """
     Format a date or datetime into an ISO-8601 string
 
@@ -165,7 +166,7 @@ def to_iso(dt):
         return to_iso_date(dt)
 
 
-def to_iso_date(dt):
+def to_iso_date(dt: date | datetime) -> str | None:
     """
     Format a date or datetime into an ISO-8601 date string.
 
@@ -175,7 +176,7 @@ def to_iso_date(dt):
         return "{dt.year:04d}-{dt.month:02d}-{dt.day:02d}".format(dt=dt)
 
 
-def to_iso_datetime(dt):
+def to_iso_datetime(dt: date | datetime) -> str | None:
     """
     Format a date or datetime into an ISO-8601 datetime string.
 
@@ -193,7 +194,7 @@ def to_iso_datetime(dt):
         return "T".join((date_str, time_str))
 
 
-def to_bool(value):
+def to_bool(value: bool | str | int) -> bool:
     """
     Transform a value into a boolean with the following rules:
 
@@ -212,24 +213,24 @@ def to_bool(value):
         return False
 
 
-def clean_string(value):
+def clean_string(value: str):
     """
     Clean an user input string (Prevent it from containing XSS)
     """
     return escape(value)
 
 
-def not_none_dict(d):
+def not_none_dict(d: dict) -> dict:
     """Filter out None values from a dict"""
     return {k: v for k, v in d.items() if v is not None}
 
 
-def hash_url(url):
+def hash_url(url: str) -> str | None:
     """Hash an URL to make it indexable"""
     return hashlib.sha1(url.encode("utf-8")).hexdigest() if url else None
 
 
-def recursive_get(obj, key):
+def recursive_get(obj: Any, key: Any):
     """
     Get an attribute or a key recursively.
 
@@ -249,14 +250,14 @@ def recursive_get(obj, key):
     return recursive_get(value, parts) if parts else value
 
 
-def unique_string(length=UUID_LENGTH):
+def unique_string(length: int = UUID_LENGTH) -> str:
     """Generate a unique string"""
     # We need a string at least as long as length
     string = str(uuid4()) * int(math.ceil(length / float(UUID_LENGTH)))
     return string[:length] if length else string
 
 
-def is_uuid(uuid_string, version=4):
+def is_uuid(uuid_string: str, version: int = 4) -> bool:
     try:
         # If uuid_string is a valid hex code but not a valid uuid,
         # UUID() will still make a valide uuid out of it.
@@ -290,7 +291,7 @@ class UDataProvider(BaseProvider):
     Might be conributed to upstream Faker project
     """
 
-    def unique_string(self, length=UUID_LENGTH):
+    def unique_string(self, length: int = UUID_LENGTH) -> str:
         """Generate a unique string"""
         return unique_string(length)
 
@@ -302,7 +303,7 @@ class UnicodeLoremProvider(LoremProvider):
     word_list = [w + "é" for w in LoremProvider.word_list]
 
 
-def safe_unicode(string):
+def safe_unicode(string: bytes) -> str | None:
     """Safely transform any object into utf8 decoded str"""
     if string is None:
         return None

{udata-9.1.2.dev30754.dist-info → udata-9.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 9.1.2.dev30754
+Version: 9.1.3
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -39,7 +39,7 @@ Requires-Dist: celery ==5.3.1
 Requires-Dist: celerybeat-mongo ==0.2.0
 Requires-Dist: certifi ==2024.7.4
 Requires-Dist: cffi ==1.16.0
-Requires-Dist: chardet ==3.0.4
+Requires-Dist: charset-normalizer ==3.3.2
 Requires-Dist: click ==8.1.2
 Requires-Dist: click-didyoumean ==0.3.1
 Requires-Dist: click-plugins ==1.1.1
@@ -96,9 +96,10 @@ Requires-Dist: rdflib ==6.0.0
 Requires-Dist: redis ==4.5.2
 Requires-Dist: referencing ==0.35.1
 Requires-Dist: regex ==2024.5.15
-Requires-Dist: requests ==2.24.0
+Requires-Dist: requests ==2.32.3
 Requires-Dist: rpds-py ==0.19.0
 Requires-Dist: s3transfer ==0.6.2
+Requires-Dist: sentry-sdk[flask] ==2.9.0
 Requires-Dist: six ==1.16.0
 Requires-Dist: speaklater ==1.3
 Requires-Dist: stringdist ==1.0.9
@@ -108,7 +109,7 @@ Requires-Dist: tzdata ==2024.1
 Requires-Dist: unidecode ==0.4.21
 Requires-Dist: uritools ==4.0.3
 Requires-Dist: urlextract ==0.14.0
-Requires-Dist: urllib3 ==1.25.11
+Requires-Dist: urllib3 ==1.26.19
 Requires-Dist: vine ==5.1.0
 Requires-Dist: voluptuous ==0.11.7
 Requires-Dist: wcwidth ==0.2.13
@@ -137,7 +138,16 @@ It is collectively taken care of by members of the
 
 # Changelog
 
-## Current (in progress)
+## 9.1.3 (2024-08-01)
+
+- Adds latest `sentry-sdk[flask]` as an install dependency, and update Sentry logic to be able to send environment, app version and profiling/performance info [#3086](https://github.com/opendatateam/udata/pull/3086)
+- Add report get endpoint and make report get and list admin only [#3115](https://github.com/opendatateam/udata/pull/3115)
+- Fix the version of udata-fixtures used by `udata import-fixtures` [#3114](https://github.com/opendatateam/udata/pull/3114)
+- Update to the version v2.0.0 of udata-fixtures (with the dataservices)
+- Add type hints [#3111](https://github.com/opendatateam/udata/pull/3111)
+- Make sure requests v2.32.3 is used everywhere consistently [#3116](https://github.com/opendatateam/udata/pull/3116)
+
+## 9.1.2 (2024-07-29)
 
 - Add a `archived` field for reuses [#3088](https://github.com/opendatateam/udata/pull/3088)
 - Add linter and formatter with `pyproject.toml` config, add lint and formatting step in CI, add pre-commit hook to lint and format, update docs and lint and format the code [#3085](https://github.com/opendatateam/udata/pull/3085)
@@ -149,6 +159,8 @@ It is collectively taken care of by members of the
 - Add a warning on harvest source deletion [#3098](https://github.com/opendatateam/udata/pull/3098)
 - Fix license in dataservices API (now returns ID instead of title) [#3097](https://github.com/opendatateam/udata/pull/3097)
 - Fix missing title on new dataset preview [#3100](https://github.com/opendatateam/udata/pull/3100)
+- Fix the fixtures tests which was not running, and then was failing [#3105](https://github.com/opendatateam/udata/pull/3105)
+- Refactoring of the fixtures, the `generate-fixtures` command has been renamed to `import-fixtures` [#3106](https://github.com/opendatateam/udata/pull/3106)
 
 ## 9.1.1 (2024-07-16)
 

{udata-9.1.2.dev30754.dist-info → udata-9.1.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
 tasks/__init__.py,sha256=oZ9yTY3eyOXRbN18_83l1b4BpqjIBVqw-FqD1LFWGxo,8122
-tasks/helpers.py,sha256=0a9iXzVe2GC2f6ouFoXDfMGN2s1eu4urTUuM9CCTZP8,994
-udata/__init__.py,sha256=y6WWIlMmNt4ADXtwHIWm-Dzb-txi6Y8hxw0fqe5TJwU,101
-udata/api_fields.py,sha256=y9ZWNbIbG4HYIsfSypzE_QNGiHuTgnIBzONR5N45tm4,15437
+tasks/helpers.py,sha256=70fS9tI_m0DTWmKx9Zl5-LG-nxdz_ZaPyvvsFkN2r48,1091
+udata/__init__.py,sha256=kyLhL9038A_1or1SR2iGdVbubW4x0ZVhRxnaGE3Kq_U,97
+udata/api_fields.py,sha256=P51s1QnBLQvtvfK3PI2hOhWaobP6Ok_MqAz5PhJayzk,15429
 udata/app.py,sha256=lMxCLveZyMmaimkryDjD-VpHBC5OMEgd95VszM84y-8,7284
-udata/assets.py,sha256=jGxFWVu6JvDLK1SXBZC-rY-DGkGxguF3LFikOklyzdE,645
+udata/assets.py,sha256=H5Hrc2vnKM0IFLyWfLXmJ2Kj35w1i8W1D8Cgy8_cUj4,657
 udata/cors.py,sha256=QyhlcnkLo9SmJhgK3FRjLcD5YC-03bU514UVMAHfbSc,2995
 udata/entrypoints.py,sha256=mbAAUVT8ZenzSYdang2PbAwZcK1pENtA3axBmPRiWCw,2717
 udata/errors.py,sha256=E8W7b4PH7c5B85g_nsUMt8fHqMVpDFOZFkO6wMPl6bA,117
@@ -11,16 +11,16 @@ udata/factories.py,sha256=MoklZnU8iwNL25dm3JsoXhoQs1PQWSVYL1WvcUBtJqM,492
 udata/i18n.py,sha256=Q7UELAhKOW7DmUX8BjEMnqqhQxcR6d3ioSmj90A62cg,8992
 udata/mail.py,sha256=MShopArrtXyn8SnXtNbWUR0C4mTj1gI3a3Lf_1We-j4,2167
 udata/rdf.py,sha256=GDqnBuJd2KryJDpJjPuH0WpkZIPoOEa2uOACr5mNCik,13835
-udata/routing.py,sha256=fwtnA7mbV535Jpblm2urhUs2UBgsevYGNE711V8T5oI,7120
-udata/sentry.py,sha256=sLkVw-BF_ad4hOveDpnk6oFjLijGTAFS2STMbcg1w84,2678
-udata/settings.py,sha256=EUPPsPi3pKxnXSLxmKWhKtdBmtWfJl7torWpSWU9kbA,17817
+udata/routing.py,sha256=x9WcpYikR45j3C_0Bi2Zoa2treSCW_oDYWMHwbdLAmE,7242
+udata/sentry.py,sha256=ekcxqUSqxfM98TtvCsPaOoX5i2l6PEcYt7kb4l3od-Q,3223
+udata/settings.py,sha256=ZcLUXKv-nRPjDSmb-vS1gVAT2xqChjdi2GMx1d5zpcw,17853
 udata/sitemap.py,sha256=oRRWoPI7ZsFFnUAOqGT1YuXFFKHBe8EcRnUCNHD7xjM,979
-udata/tags.py,sha256=a4o4LtddJR_nxmz9cFxkdtXPs8-_Uiz2T79aWE0Jhy8,594
+udata/tags.py,sha256=ydq4uokd6bzdeGVSpEXASVtGvDfO2LfQs9mptvvKJCM,631
 udata/tasks.py,sha256=hLdmHV7ozeq803BRjU6X3DT3oVsZrV1beQILpbjsfQI,4978
 udata/terms.md,sha256=nFx978tUQ3vTEv6POykXaZvcQ5e_gcvmO4ZgcfbSWXo,187
 udata/tracking.py,sha256=WOcqA1RlHN8EPFuEc2kNau54mec4-pvi-wUFrMXevzg,345
 udata/uris.py,sha256=Nxy-kvj46FhRDNW7sebFI-X7nFJEP5ViwgGQvAHmBW0,3561
-udata/utils.py,sha256=PWpwUYwkbOL2_RsiYwEQf0Um3WTgBkJgYvn4Z92Or9Q,8340
+udata/utils.py,sha256=AbPqkgtdjuQScOCoTcZl3eDiEmU0p-agr1lqvEJwaS0,8661
 udata/worker.py,sha256=K-Wafye5-uXP4kQlffRKws2J9YbJ6m6n2QjcVsY8Nsg,118
 udata/wsgi.py,sha256=MY8en9K9eDluvJYUxTdzqSDoYaDgCVZ69ZcUvxAvgqA,77
 udata/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -42,17 +42,17 @@ udata/commands/__init__.py,sha256=Won_rW_hIU9TA3o4oNe6kI46l1fnDBM_oW0Hc1XS9F8,77
 udata/commands/cache.py,sha256=bLdrf_fCWFYX9ULlL2ADsZRwijkI4pArsJxfx24OivM,341
 udata/commands/db.py,sha256=64x0614tCUl2f-c6b9K_TcRMyydZCnmCWrz5WI6tUkg,14701
 udata/commands/dcat.py,sha256=L1BTywlHFBOkddZnKfWr8P4QjRMZksYCwhUNfJv5tkc,3409
-udata/commands/fixtures.py,sha256=qEBYuHQ-1nhhFhxsxHKAIEwWgJ0EO0zewOKijJwrR5Q,6122
+udata/commands/fixtures.py,sha256=exRyCLhPZLtI6SQf7oXp_tIcz84MJ1soi0jdwODQXMc,8369
 udata/commands/images.py,sha256=0rVojLik5DYgJ6W4uNEfMP2g2QUU2V761tj3z6lo8no,2050
 udata/commands/info.py,sha256=A5WMo3_N_rlt3cySVJrZqKWrbIowX97ZLKMIFQE5178,1545
-udata/commands/init.py,sha256=rJcfAhGghl9FL1m8TO54w__Q1pjRwexlSBm04_xIvYM,1524
+udata/commands/init.py,sha256=8CpH8MklzPkpxczs43lFM5ZNrHCJRbUtzHapgYNHs7M,1520
 udata/commands/purge.py,sha256=78kwiQV0Y63ulbAEkZCLNq1V1wCIekIEMdmW2HRREhU,1202
 udata/commands/serve.py,sha256=0-Uy_fRCYABsmJ8MFxpLZJyAl61TGCk7KsT8WiiexBc,2512
 udata/commands/static.py,sha256=OUYPAR1giaPk52DK-v-nQYUSx-YQ4cF7YXLt1t5wtBU,2199
 udata/commands/test.py,sha256=0snHTDolowQK-DmAKnhF_mBuDOBMApAbEc35GEiwH0M,893
 udata/commands/worker.py,sha256=bjXQGCwkbZxkcxLMPA2Lr0nkNjXLpGNDMkkQXjwBLPI,3976
 udata/commands/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/commands/tests/fixtures.py,sha256=87Oycmn68CfOzmDKMmnvzmYfD_iF_Q2yAgSjf30bfPk,1728
+udata/commands/tests/test_fixtures.py,sha256=7gZSyiqrn6G84tZ1koPkgnYwnrskmZaqjRTXEPmnA9s,3326
 udata/core/__init__.py,sha256=O7C9WWCXiLWnWPnPbFRszWhOmvRQiI4gD-5qkWvPGRo,385
 udata/core/owned.py,sha256=xcIg9fNndowuLs7BEkuxAsEdf6JApomU_Gl6L-SgTJI,4515
 udata/core/activity/__init__.py,sha256=OaiFyq7HB4xL4SuMPD1N8IFNpntwx9ZayVzelciOieI,298
@@ -87,7 +87,7 @@ udata/core/dataservices/permissions.py,sha256=98zM_R4v2ZtRubflB7ajaVQz-DVc-pZBMg
 udata/core/dataservices/rdf.py,sha256=l1vItR7jhaTxs5f6kU6MAR32uvRR233GDbp1hIUbP3k,4673
 udata/core/dataservices/tasks.py,sha256=3NEnsLssZANE97pc3hGnjGtXD2Z5VFguSyfBKE2UJ0g,970
 udata/core/dataset/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/dataset/actions.py,sha256=6earjeEZmckcao0kzA7i27KyqyWUSmyBiCbttwS-GYw,1196
+udata/core/dataset/actions.py,sha256=mX6xox0PiMrbcAPZ3VZsI26rfM-ciYfEXxN6sqqImKA,1222
 udata/core/dataset/activities.py,sha256=v8k1jwhdx62Z2ARZq8Q-x86OWSsBK99hRloPl74OCgA,1502
 udata/core/dataset/api.py,sha256=zmchWUnGPV-7iQ4QXta1nCvhtYAAijdRz9FuZst1BM0,28781
 udata/core/dataset/api_fields.py,sha256=ZF24FhKYe5jlV8jXG6YR0Hko9WOuV0446FAlLkEgAWE,17295
@@ -163,9 +163,9 @@ udata/core/post/permissions.py,sha256=uofU0TehhOGYyUoRXf3wuy816_D3xwMmaJbDvV336s
 udata/core/post/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/post/tests/test_api.py,sha256=y4fXgjC0y9tqR4iOWHin9rADSPdo1BJjXJGilnqL23c,3946
 udata/core/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-udata/core/reports/api.py,sha256=wrHJempfYupq0etLWM-RPq6-f3LqXWw3hulnoPHb5v4,1376
+udata/core/reports/api.py,sha256=RzmsU3IWD0u8oVKSEDvxE2yO2vRXxVx_gJBwFN0DyJY,1680
 udata/core/reports/constants.py,sha256=LRZSX3unyqZeB4yQjK3ws_hGbJcXYk4bu1Rhnhi5DEs,1235
-udata/core/reports/models.py,sha256=qgWXjiwMJ5w5uDdjM9K-f-h4mb-dJ8Che83MmIJ7pNg,2474
+udata/core/reports/models.py,sha256=AsW5p2ZIdR4c6vNzglEN7MX03It-t9u7ktOsVZqvzSs,2702
 udata/core/reuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/reuse/activities.py,sha256=mAdHhqqpUF5zSh4e5AEo0J7alc3RflTbudDaKOzyTQw,1406
 udata/core/reuse/api.py,sha256=KjxcP1RdARFgRRJotp4pAwClmdLdH4JhhyjYmRzJ_y4,10232
@@ -175,12 +175,12 @@ udata/core/reuse/constants.py,sha256=JgDBrjOKSt9q0auv9rjzbGsch83H-Oi8YXAKeI5hO4o
 udata/core/reuse/csv.py,sha256=4TcQbk4kWN_HbnpEUfgfW9_x7ZqNDk5s4YuJ839p3EE,896
 udata/core/reuse/factories.py,sha256=GrQqYTIvwQrwkvJrbTr38-2faFW_PC99gn3yOVpgFec,850
 udata/core/reuse/forms.py,sha256=Fv2XfHt-zP7WpC8Z8qTlXFRlx8HHEd8nU28lUEA5MXk,1836
-udata/core/reuse/metrics.py,sha256=uh0CxErJ8OxrQvajCSfKvQRbhB9rXKzTZ1AhyEMQvP0,161
+udata/core/reuse/metrics.py,sha256=sVh7BlW3OKRvFDHFyD4pPUV91jOOhj8qeWbBkLPn5Gg,176
 udata/core/reuse/models.py,sha256=3KSmNSOPuFRSJclBCxoXo9hg7DXIZTqZLRy5DepHA9Y,5861
-udata/core/reuse/permissions.py,sha256=V6C-JwVQcFA9AiRJtPt9yHxBv2Y5SpFxcYW_vRK0tHU,564
-udata/core/reuse/search.py,sha256=n17ihaxqRop-EnFPJkHflOySz6SDNCscgXOKdW3s9-s,3026
+udata/core/reuse/permissions.py,sha256=j-ancS7gvLl5vJu0TNYqpYD-2So-UzoDE4IHLxRoMGg,621
+udata/core/reuse/search.py,sha256=NkCRE8mGBdmlau0S9SsNPG0_zvB7MMNws64HGsq4yWM,3056
 udata/core/reuse/signals.py,sha256=nDrEUpYKN0AdYiEbrR0z3nzXzjaRcD8SAMutwIDsQPM,155
-udata/core/reuse/tasks.py,sha256=LJ_CQi_IhEkq_C3nQDXCRZkI72p5wOGmvImwyZvfbHY,1508
+udata/core/reuse/tasks.py,sha256=oyi6SGNfCKRLLuS-tLUCs_jcfa43jOn4Wuzq65Vnj8A,1529
 udata/core/site/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/site/api.py,sha256=GH8NPEoiScbaUBoSlF-SuZea60c8jfCcQ3782lJOIVI,6213
 udata/core/site/factories.py,sha256=O0nLFmjrFyemzcs-YwNukq5nqd383KBGrgL5bOQsGbA,378
@@ -272,7 +272,7 @@ udata/forms/__init__.py,sha256=OXNShgt05tADLYQ-cXPdB16qQtj2i48GxSsCVdR6cfI,843
 udata/forms/fields.py,sha256=9s8ywCD2LCtHnD5Z2fx9cxH6XI2nbHEj73kz17qZGHk,28576
 udata/forms/validators.py,sha256=CRgmB6oow5O8LDR45LajlJJ9HX3RBCI08fapoWMH1vo,2727
 udata/forms/widgets.py,sha256=XMVxBlQMGfb0nQvqwLMsAVcEdsBdaZGQZ82F81FdmlM,1332
-udata/frontend/__init__.py,sha256=nzXjOFmzbpseU476gYt0jkHCjkpvmHi42qESi1dJEr8,3555
+udata/frontend/__init__.py,sha256=Aa5BX19jTAcjGiGKszPabbOju5thvA7XFz4aYvxwXQw,3567
 udata/frontend/csv.py,sha256=FAlIAfcuigo01D_hSRTnvZ7B-HMHXqn5TXeCm6sO230,8520
 udata/frontend/markdown.py,sha256=ppaiy_Mv6iNRjNqPjVquc9Wx7breY1mcsN41b4fM18w,4353
 udata/harvest/__init__.py,sha256=C4y5w4vGb_F9Opy62lzV3eHo4DkNyRgPCq-wsarPXiQ,28
@@ -348,7 +348,7 @@ udata/migrations/2024-01-29-fix-reuse-and-dataset-with-private-None.py,sha256=9L
 udata/migrations/2024-03-22-migrate-activity-kwargs-to-extras.py,sha256=ucoXSqZlGToMCNiba0pRw_WoYb-lSBKvnbBLe-YVVrs,402
 udata/migrations/2024-06-11-fix-reuse-datasets-references.py,sha256=4xL5_YFfUsbWFuSqXVzhkbzns20m5AclFfu0cdXhyk4,787
 udata/migrations/__init__.py,sha256=RBCBDaTlLjuMs_Qzwji6Z6T4r7FCGXhESKoxQbT5qAA,11221
-udata/models/__init__.py,sha256=4a93jdfy9mkZlbZQLbwaUo53bc_pGGkleczbafmOpwk,1360
+udata/models/__init__.py,sha256=txbZwa-lRG3mq99eQ9E5YcFWiNUdjDVSyJJvlqUMFfs,1413
 udata/mongo/__init__.py,sha256=y4Rv-kq3o_kcEulcNpePLzocXPBNpx3Jd82G-VZPaMc,1421
 udata/mongo/badges_field.py,sha256=UmSaQkiOFtIb116GAT2B0OE6ypOrq8Jx7GdULEr05LU,985
 udata/mongo/datetime_fields.py,sha256=ZIyyl7ltMMY9yQkEK3YsCGO3ZzSF0ixWPj12RE6Rmas,1894
@@ -607,7 +607,7 @@ udata/tests/api/test_fields.py,sha256=OW85Z5MES5HeWOpapeem8OvR1cIcrqW-xMWpdZO4LZ
 udata/tests/api/test_follow_api.py,sha256=fccgVNfcqET221PPS3p7qzb9hpvbBBUGhV-l4UeOpyk,3352
 udata/tests/api/test_me_api.py,sha256=ZJKGH9fFv-4cSGcYAGd6IJA_PwPjVGIqWNy_DhFA8ms,13827
 udata/tests/api/test_organizations_api.py,sha256=5hBs7-gsMfy4IFsrLYyUMGyxhtCs71K4QvPFAXyDsz4,35049
-udata/tests/api/test_reports_api.py,sha256=4BHpCxDOkmbxe2xd2qCd0xXUjdAqgom7PP9117V8Bds,4515
+udata/tests/api/test_reports_api.py,sha256=fCSz9NwMXBs6cxdXBVVI6y564AtovmZYw3xkgxQ9KE8,6217
 udata/tests/api/test_reuses_api.py,sha256=v9RJcJ_fdR8dgnq6H7j58_7n83BhoFJJ9YOd7CJwsyw,16769
 udata/tests/api/test_swagger.py,sha256=eE6La9qdTYTIUFevRVPJgtj17Jq_8uOlsDwzCNR0LL8,760
 udata/tests/api/test_tags_api.py,sha256=MgSmKZeQ8L-fO-LwOGlDm_YN7lmEyvTpkDgaPiENHw8,2429
@@ -636,7 +636,6 @@ udata/tests/dataset/test_dataset_tasks.py,sha256=rSafDjCiOyEb2_tVUDN4wqGylF6Yf9V
 udata/tests/dataset/test_resource_preview.py,sha256=fp9mSL7unhyM66GR0gwhgX3OGQ4TJt7G9xU-CjsL3HI,3908
 udata/tests/features/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/features/territories/__init__.py,sha256=gMD73RL-ymcWvGPDPM0aPxz7WAfd1VEDL8YHRI7HT0Q,956
-udata/tests/features/territories/commands.py,sha256=LMestg7oCC52GSHmrpD4l10MRgquLnS_TsjPzy72enQ,240
 udata/tests/features/territories/test_territories_api.py,sha256=vhZ1HK-booNbRGpUww4pN9XPp39rgaaI_4sbtJgHApk,7576
 udata/tests/forms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/tests/forms/test_basic_fields.py,sha256=RPVdW3fQF6hhxpqF6FPr6GEpDoFO7-hAptDNXvajA_Q,2096
@@ -698,9 +697,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=WpPzAqVd2Onv_kz45ULUySKPLrpjcc
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=18Op9RUITewoDRewlOdYzzq6gjsf1lsvepACV1d7zxs,44976
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=NIYRNhVoETZUvIvWm3cCW7DtMBAnS2vXzZjMF5ZzD_c,28500
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=rQB-4V4WJ7bURj6g2j653vItr5TMHadcLQxec7_fDmg,51545
-udata-9.1.2.dev30754.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-9.1.2.dev30754.dist-info/METADATA,sha256=D06WZQsv3VzIZVH3HWE59CpCc_YKL-_bcq6nJ1OeISw,127267
-udata-9.1.2.dev30754.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-9.1.2.dev30754.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-9.1.2.dev30754.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-9.1.2.dev30754.dist-info/RECORD,,
+udata-9.1.3.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-9.1.3.dist-info/METADATA,sha256=wwlRJ68jI7NpUJ5YtwXgXrHXj_B8DfG1_kJbWxymrs4,128344
+udata-9.1.3.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-9.1.3.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-9.1.3.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-9.1.3.dist-info/RECORD,,

udata/commands/tests/fixtures.py

@@ -1,44 +0,0 @@
-import json
-from tempfile import NamedTemporaryFile
-
-from udata import models
-from udata.commands.fixtures import generate_fixtures
-from udata.tests import DBTestMixin, TestCase
-
-
-class FixturesTest(DBTestMixin, TestCase):
-    def test_generate_fixtures(self):
-        with NamedTemporaryFile(delete=True) as fixtures_fd:
-            json_fixtures = [
-                {
-                    "resources": [
-                        {
-                            "description": "test description",
-                            "filetype": "remote",
-                            "title": "test",
-                            "url": "https://dev.local",
-                        }
-                    ],
-                    "dataset": {
-                        "description": "### Le Test",
-                        "frequency": "punctual",
-                        "tags": ["action-publique"],
-                        "title": "test",
-                    },
-                    "organization": {"description": "test description", "name": "Test"},
-                    "reuses": [
-                        {
-                            "description": "test description",
-                            "title": "test",
-                            "url": "https://dev.local",
-                        }
-                    ],
-                }
-            ]
-            with open(fixtures_fd, "w") as f:
-                json.dump(json_fixtures, f)
-            generate_fixtures(fixtures_fd)
-            self.assertEqual(models.Organization.objects.count(), 1)
-            self.assertEqual(models.Dataset.objects.count(), 1)
-            self.assertEqual(models.Reuse.objects.count(), 1)
-            self.assertEqual(models.User.objects.count(), 1)

udata/tests/features/territories/commands.py

@@ -1,9 +0,0 @@
-from udata.tests import TestCase
-
-
-class CommandsTest(TestCase):
-    def test_import_commands(self):
-        try:
-            from udata.features.territories import commands  # noqa
-        except ImportError as e:
-            self.fail(e)