udata 12.0.2.dev15__py3-none-any.whl → 13.0.1.dev21__py3-none-any.whl

udata/core/reuse/mails.py

@@ -0,0 +1,21 @@
+from udata.core.dataset.models import Dataset
+from udata.core.reuse.models import Reuse
+from udata.i18n import lazy_gettext as _
+from udata.mail import LabelledContent, MailCTA, MailMessage, ParagraphWithLinks
+
+
+def new_reuse(reuse: Reuse, dataset: Dataset) -> MailMessage:
+    return MailMessage(
+        subject=_("New reuse on your dataset"),
+        paragraphs=[
+            ParagraphWithLinks(
+                _(
+                    "A new reuse has been published by %(user_or_org)s on your dataset %(dataset)s",
+                    user_or_org=reuse.organization or reuse.owner,
+                    dataset=dataset,
+                )
+            ),
+            LabelledContent(_("Reuse title:"), str(reuse.title)),
+            MailCTA(_("View the reuse"), reuse.url_for()),
+        ],
+    )

udata/core/reuse/models.py

@@ -1,5 +1,6 @@
 from blinker import Signal
 from flask import url_for
+from flask_babel import LazyString
 from mongoengine.signals import post_save, pre_save
 from werkzeug.utils import cached_property
 
@@ -22,7 +23,7 @@ from .constants import IMAGE_MAX_SIZE, IMAGE_SIZES, REUSE_TOPICS, REUSE_TYPES
 
 __all__ = ("Reuse",)
 
-BADGES: dict[str, str] = {}
+BADGES: dict[str, LazyString] = {}
 
 
 class ReuseQuerySet(OwnedQuerySet):
@@ -115,6 +116,14 @@ class Reuse(db.Datetimed, Auditable, WithMetrics, ReuseBadgeMixin, Linkable, Own
             "key": "dataset",
         },
     )
+    dataservices = field(
+        db.ListField(
+            field(db.ReferenceField("Dataservice", reverse_delete_rule=db.PULL)),
+        ),
+        filterable={
+            "key": "dataservice",
+        },
+    )
     tags = field(
         db.TagListField(),
         filterable={

udata/core/reuse/search.py

@@ -40,7 +40,7 @@ class ReuseSearch(ModelSearchAdapter):
 
     @classmethod
     def is_indexable(cls, reuse: Reuse) -> bool:
-        return reuse.deleted is None and len(reuse.datasets) > 0 and not reuse.private
+        return reuse.is_visible
 
     @classmethod
     def mongo_search(cls, args):

udata/core/reuse/tasks.py

@@ -1,10 +1,9 @@
-from udata import mail
 from udata.core import storages
 from udata.core.topic.models import TopicElement
-from udata.i18n import lazy_gettext as _
 from udata.models import Activity, Discussion, Follow, Transfer
 from udata.tasks import get_logger, job, task
 
+from . import mails
 from .models import Reuse
 
 log = get_logger(__name__)
@@ -45,4 +44,4 @@ def notify_new_reuse(reuse_id: int) -> None:
         else:
             recipients = None
         if recipients:
-            mail.send(_("New reuse"), recipients, "new_reuse", reuse=reuse, dataset=dataset)
+            mails.new_reuse(reuse, dataset).send(recipients)

udata/core/site/models.py

@@ -8,6 +8,7 @@ from udata.core.metrics.helpers import get_metrics_for_model, get_stock_metrics
 from udata.core.organization.models import Organization
 from udata.core.reuse.models import Reuse
 from udata.models import WithMetrics, db
+from udata.utils import get_udata_version
 
 __all__ = ("Site", "SiteSettings")
 
@@ -66,12 +67,7 @@ class Site(WithMetrics, db.Document):
 
     @field(description="The current version of udata")
     def version(self):
-        try:
-            from importlib.metadata import version
-
-            return version("udata")
-        except Exception:
-            return None
+        return get_udata_version()
 
     def count_users(self):
         from udata.models import User

udata/core/spatial/tests/test_api.py

@@ -1,3 +1,4 @@
+import pytest
 from flask import url_for
 
 from udata.core.dataset.factories import DatasetFactory
@@ -13,15 +14,12 @@ from udata.core.spatial.tasks import compute_geozones_metrics
 from udata.tests.api import APITestCase
 from udata.tests.api.test_datasets_api import SAMPLE_GEOM
 from udata.tests.features.territories import (
-    TerritoriesSettings,
     create_geozones_fixtures,
 )
 from udata.utils import faker
 
 
 class SpatialApiTest(APITestCase):
-    modules = []
-
     def test_zones_api_one(self):
         zone = GeoZoneFactory()
 
@@ -65,7 +63,7 @@ class SpatialApiTest(APITestCase):
         for i in range(4):
             GeoZoneFactory(name="name-test-{0}".format(i) if i % 2 else faker.word())
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "name-test", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="name-test", size=5))
         self.assert200(response)
 
         self.assertEqual(len(response.json), 2)
@@ -84,7 +82,7 @@ class SpatialApiTest(APITestCase):
         for _ in range(2):
             GeoZoneFactory()
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": zone.id})
+        response = self.get(url_for("api.suggest_zones", q=zone.id))
         self.assert200(response)
 
         self.assertEqual(response.json[0]["id"], zone["id"])
@@ -96,7 +94,7 @@ class SpatialApiTest(APITestCase):
         country_zone = GeoZoneFactory(name="name-test-country", level=country_level.id)
         region_zone = GeoZoneFactory(name="name-test-region", level=region_level.id)
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "name-test", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="name-test", size=5))
         self.assert200(response)
 
         self.assertEqual(len(response.json), 2)
@@ -108,7 +106,7 @@ class SpatialApiTest(APITestCase):
         for i in range(4):
             GeoZoneFactory(code="code-test-{0}".format(i) if i % 2 else faker.word())
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "code-test", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="code-test", size=5))
         self.assert200(response)
 
         self.assertEqual(len(response.json), 2)
@@ -126,7 +124,7 @@ class SpatialApiTest(APITestCase):
         for i in range(3):
             GeoZoneFactory(name=5 * "{0}".format(i), code=3 * "{0}".format(i))
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "xxxxxx", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="xxxxxx", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
@@ -135,7 +133,7 @@ class SpatialApiTest(APITestCase):
         for i in range(4):
             GeoZoneFactory(name="name-testé-{0}".format(i) if i % 2 else faker.word())
 
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "name-testé", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="name-testé", size=5))
         self.assert200(response)
 
         self.assertEqual(len(response.json), 2)
@@ -150,7 +148,7 @@ class SpatialApiTest(APITestCase):
 
     def test_suggest_zones_empty(self):
         """It should not provide zones suggestion if no data is present"""
-        response = self.get(url_for("api.suggest_zones"), qs={"q": "xxxxxx", "size": "5"})
+        response = self.get(url_for("api.suggest_zones", q="xxxxxx", size=5))
         self.assert200(response)
         self.assertEqual(len(response.json), 0)
 
@@ -194,7 +192,7 @@ class SpatialApiTest(APITestCase):
                 organization=organization, spatial=SpatialCoverageFactory(zones=[paca.id])
             )
 
-        response = self.get(url_for("api.zone_datasets", id=paca.id), qs={"size": 2})
+        response = self.get(url_for("api.zone_datasets", id=paca.id, size=2))
         self.assert200(response)
         self.assertEqual(len(response.json), 2)
 
@@ -206,7 +204,7 @@ class SpatialApiTest(APITestCase):
                 organization=organization, spatial=SpatialCoverageFactory(zones=[paca.id])
             )
 
-        response = self.get(url_for("api.zone_datasets", id=paca.id), qs={"dynamic": 1})
+        response = self.get(url_for("api.zone_datasets", id=paca.id, dynamic=1))
         self.assert200(response)
         # No dynamic datasets given that the setting is deactivated by default.
         self.assertEqual(len(response.json), 3)
@@ -219,7 +217,7 @@ class SpatialApiTest(APITestCase):
                 organization=organization, spatial=SpatialCoverageFactory(zones=[paca.id])
             )
 
-        response = self.get(url_for("api.zone_datasets", id=paca.id), qs={"dynamic": 1, "size": 2})
+        response = self.get(url_for("api.zone_datasets", id=paca.id, dynamic=1, size=2))
         self.assert200(response)
         # No dynamic datasets given that the setting is deactivated by default.
         self.assertEqual(len(response.json), 2)
@@ -260,10 +258,11 @@ class SpatialApiTest(APITestCase):
         self.assertEqual(response.json["features"][1]["properties"]["datasets"], 3)
 
 
+@pytest.mark.options(
+    ACTIVATE_TERRITORIES=True,
+    HANDLED_LEVELS=("fr:commune", "fr:departement", "fr:region", "country"),
+)
 class SpatialTerritoriesApiTest(APITestCase):
-    modules = []
-    settings = TerritoriesSettings
-
     def test_zone_datasets_with_dynamic_and_setting(self):
         paca, bdr, arles = create_geozones_fixtures()
         organization = OrganizationFactory()
@@ -272,7 +271,7 @@ class SpatialTerritoriesApiTest(APITestCase):
                 organization=organization, spatial=SpatialCoverageFactory(zones=[paca.id])
             )
 
-        response = self.get(url_for("api.zone_datasets", id=paca.id), qs={"dynamic": 1})
+        response = self.get(url_for("api.zone_datasets", id=paca.id, dynamic=1))
         self.assert200(response)
         # No dynamic datasets given that they are added by udata-front extension.
         self.assertEqual(len(response.json), 3)
@@ -285,15 +284,13 @@ class SpatialTerritoriesApiTest(APITestCase):
                 organization=organization, spatial=SpatialCoverageFactory(zones=[paca.id])
             )
 
-        response = self.get(url_for("api.zone_datasets", id=paca.id), qs={"dynamic": 1, "size": 2})
+        response = self.get(url_for("api.zone_datasets", id=paca.id, dynamic=1, size=2))
         self.assert200(response)
         # No dynamic datasets given that they are added by udata-front extension.
         self.assertEqual(len(response.json), 2)
 
 
 class DatasetsSpatialAPITest(APITestCase):
-    modules = []
-
     def test_create_spatial_zones(self):
         paca, _, _ = create_geozones_fixtures()
         granularity = spatial_granularities[0][0]

udata/core/spatial/tests/test_models.py

@@ -1,6 +1,6 @@
 from datetime import timedelta
 
-from udata.tests import DBTestMixin, TestCase
+from udata.tests.api import DBTestCase
 
 from ..factories import GeoZoneFactory
 from ..models import GeoZone, SpatialCoverage
@@ -8,7 +8,7 @@ from ..models import GeoZone, SpatialCoverage
 A_YEAR = timedelta(days=365)
 
 
-class SpacialCoverageTest(DBTestMixin, TestCase):
+class SpacialCoverageTest(DBTestCase):
     def test_top_label_empty(self):
         coverage = SpatialCoverage()
         self.assertIsNone(coverage.top_label)
@@ -19,7 +19,7 @@ class SpacialCoverageTest(DBTestMixin, TestCase):
         self.assertEqual(coverage.top_label, "name")
 
 
-class SpatialTemporalResolutionTest(DBTestMixin, TestCase):
+class SpatialTemporalResolutionTest(DBTestCase):
     def test_resolve_id_only(self):
         zone = GeoZoneFactory()
         for i in range(3):

udata/core/user/mails.py

@@ -0,0 +1,54 @@
+from flask import current_app
+
+from udata.i18n import lazy_gettext as _
+from udata.mail import MailCTA, MailMessage
+from udata.uris import homepage_url
+
+
+def account_deletion() -> MailMessage:
+    return MailMessage(
+        subject=_("Account deletion"),
+        paragraphs=[_("Your account has now been deleted")],
+    )
+
+
+def inactive_account_deleted() -> MailMessage:
+    return MailMessage(
+        subject=_(
+            "Deletion of your inactive %(site)s account", site=current_app.config["SITE_TITLE"]
+        ),
+        paragraphs=[
+            _(
+                "Your account on %(site)s has been deleted due to inactivity",
+                site=current_app.config["SITE_TITLE"],
+            )
+        ],
+    )
+
+
+def inactive_user(user) -> MailMessage:
+    config = current_app.config
+
+    return MailMessage(
+        subject=_("Inactivity of your {site} account").format(site=config["SITE_TITLE"]),
+        paragraphs=[
+            _(
+                "We have noticed that your account associated to (%(user_email)s) has been inactive for %(inactivity_years)d years or more on %(site)s, the open platform for public data.",
+                user_email=user.email,
+                inactivity_years=config["YEARS_OF_INACTIVITY_BEFORE_DELETION"],
+                site=config["SITE_TITLE"],
+            ),
+            MailCTA(
+                label=_("If you want to keep your account, please log in with your account."),
+                link=homepage_url(),
+            ),
+            _(
+                "Without logging in, your account will be deleted within %(notify_delay)d days.",
+                notify_delay=config["DAYS_BEFORE_ACCOUNT_INACTIVITY_NOTIFY_DELAY"],
+            ),
+            _(
+                "This account is not tied to your other administration accounts and you can always re-create an account on the %(site)s platform if necessary.",
+                site=config["SITE_TITLE"],
+            ),
+        ],
+    )

udata/core/user/models.py

@@ -12,17 +12,16 @@ from flask_security import MongoEngineUserDatastore, RoleMixin, UserMixin
 from mongoengine.signals import post_save, pre_save
 from werkzeug.utils import cached_property
 
-from udata import mail
 from udata.api_fields import field
 from udata.core import storages
 from udata.core.discussions.models import Discussion
 from udata.core.linkable import Linkable
 from udata.core.storages import avatars, default_image_basename
 from udata.frontend.markdown import mdstrip
-from udata.i18n import lazy_gettext as _
 from udata.models import Follow, WithMetrics, db
 from udata.uris import cdata_url
 
+from . import mails
 from .constants import AVATAR_SIZES
 
 __all__ = ("User", "Role", "datastore")
@@ -295,7 +294,7 @@ class User(WithMetrics, UserMixin, Linkable, db.Document):
         ContactPoint.objects(owner=self).delete()
 
         if notify:
-            mail.send(_("Account deletion"), copied_user, "account_deleted")
+            mails.account_deletion().send(copied_user)
 
     def count_datasets(self):
         from udata.models import Dataset

udata/core/user/tasks.py

@@ -4,21 +4,14 @@ from datetime import datetime, timedelta
 
 from flask import current_app
 
-from udata import mail
-from udata.i18n import lazy_gettext as _
-from udata.tasks import job, task
+from udata.tasks import job
 
-from .models import User, datastore
+from . import mails
+from .models import User
 
 log = logging.getLogger(__name__)
 
 
-@task(route="high.mail")
-def send_test_mail(email):
-    user = datastore.find_user(email=email)
-    mail.send(_("Test mail"), user, "test")
-
-
 @job("notify-inactive-users")
 def notify_inactive_users(self):
     if not current_app.config["YEARS_OF_INACTIVITY_BEFORE_DELETION"]:
@@ -41,12 +34,9 @@ def notify_inactive_users(self):
         if i >= current_app.config["MAX_NUMBER_OF_USER_INACTIVITY_NOTIFICATIONS"]:
             logging.warning("MAX_NUMBER_OF_USER_INACTIVITY_NOTIFICATIONS reached, stopping here.")
             return
-        mail.send(
-            _("Inactivity of your {site} account").format(site=current_app.config["SITE_TITLE"]),
-            user,
-            "account_inactivity",
-            user=user,
-        )
+
+        mails.inactive_user(user).send(user)
+
         logging.debug(f"Notified {user.email} of account inactivity")
         user.inactive_deletion_notified_at = datetime.utcnow()
         user.save()
@@ -84,11 +74,6 @@ def delete_inactive_users(self):
         copied_user = copy(user)
         user.mark_as_deleted(notify=False, delete_comments=False)
         logging.warning(f"Deleted user {copied_user.email} due to account inactivity")
-        mail.send(
-            _("Deletion of your inactive {site} account").format(
-                site=current_app.config["SITE_TITLE"]
-            ),
-            copied_user,
-            "inactive_account_deleted",
-        )
+        mails.inactive_account_deleted().send(copied_user)
+
     logging.info(f"Deleted {users_to_delete.count()} inactive users")

udata/core/user/tests/test_user_model.py

@@ -6,14 +6,10 @@ from udata.core.followers.models import Follow
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.user.factories import UserFactory
 from udata.core.user.models import User
+from udata.tests.api import APITestCase
 
-pytestmark = pytest.mark.usefixtures("clean_db")
-
-
-@pytest.mark.frontend
-class UserModelTest:
-    modules = []  # Required for mails
 
+class UserModelTest(APITestCase):
     def test_mark_as_deleted(self):
         user = UserFactory()
         other_user = UserFactory()

udata/entrypoints.py

@@ -4,12 +4,7 @@ import pkg_resources
 ENTRYPOINTS = {
     "udata.avatars": "Avatar rendering backends",
     "udata.harvesters": "Harvest backends",
-    "udata.metrics": "Extra metrics",
     "udata.models": "Models and migrations",
-    "udata.plugins": "Generic plugin",
-    "udata.tasks": "Tasks and jobs",
-    "udata.themes": "Themes",
-    "udata.views": "Extra views",
 }
 
 

udata/features/identicon/tests/test_backends.py

@@ -1,20 +1,10 @@
-import pytest
-
 from udata.features.identicon.backends import internal
+from udata.tests.api import PytestOnlyAPITestCase
 from udata.tests.helpers import assert200
 from udata.utils import faker
 
-pytestmark = pytest.mark.usefixtures("app")
-
-
-def assert_stream_equal(response1, response2):
-    __tracebackhide__ = True
-    stream1 = list(response1.iter_encoded())
-    stream2 = list(response2.iter_encoded())
-    assert stream1 == stream2
-
 
-class InternalBackendTest:
+class InternalBackendTest(PytestOnlyAPITestCase):
     def test_base_rendering(self):
         response = internal(faker.word(), 32)
         assert200(response)
@@ -25,4 +15,4 @@ class InternalBackendTest:
 
     def test_render_twice_the_same(self):
         identifier = faker.word()
-        assert_stream_equal(internal(identifier, 32), internal(identifier, 32))
+        self.assertStreamEqual(internal(identifier, 32), internal(identifier, 32))

udata/forms/fields.py

@@ -416,11 +416,11 @@ class TagField(Field):
         if not self.data:
             return
         for tag in self.data:
-            if not tags.MIN_TAG_LENGTH <= len(tag) <= tags.MAX_TAG_LENGTH:
+            if not tags.TAG_MIN_LENGTH <= len(tag) <= tags.TAG_MAX_LENGTH:
                 message = _(
                     'Tag "%(tag)s" must be between %(min)d and %(max)d characters long.',
-                    min=tags.MIN_TAG_LENGTH,
-                    max=tags.MAX_TAG_LENGTH,
+                    min=tags.TAG_MIN_LENGTH,
+                    max=tags.TAG_MAX_LENGTH,
                     tag=tag,
                 )
                 raise validators.ValidationError(message)

udata/forms/widgets.py

@@ -1,7 +1,7 @@
 from wtforms import widgets
 
-MIN_TAG_LENGTH = 2
-MAX_TAG_LENGTH = 50
+TAG_MIN_LENGTH = 2
+TAG_MAX_LENGTH = 50
 
 
 class WidgetHelper(object):

udata/frontend/__init__.py

@@ -1,12 +1,8 @@
-import inspect
 import logging
-from importlib import import_module
 
-import pkg_resources
 from jinja2 import pass_context
 from markupsafe import Markup
 
-from udata import entrypoints
 from udata.i18n import I18nBlueprint
 
 from .markdown import UdataCleaner
@@ -20,11 +16,6 @@ hook = I18nBlueprint("hook", __name__)
 _template_hooks = {}
 
 
-@hook.app_template_global()
-def package_version(name: str) -> str:
-    return pkg_resources.get_distribution(name).version
-
-
 @hook.app_template_filter()
 def avatar_placeholder(url):
     if url:
@@ -101,32 +92,12 @@ class SafeMarkup(Markup):
         return super().__new__(cls, cleaner.clean(base), *args, **kwargs)
 
 
-def _load_views(app, module):
-    views = module if inspect.ismodule(module) else import_module(module)
-    blueprint = getattr(views, "blueprint", None)
-    if blueprint:
-        app.register_blueprint(blueprint)
-
-
-VIEWS = ["core.storages"]
-
-
-def init_app(app, views=None):
-    views = views or VIEWS
+def init_app(app):
+    from udata.core.storages.views import blueprint as storage_blueprint
 
     init_markdown(app)
 
-    for view in views:
-        _load_views(app, "udata.{}.views".format(view))
+    app.register_blueprint(storage_blueprint)
 
     # Load hook blueprint
     app.register_blueprint(hook)
-
-    # Load all plugins views and blueprints
-    for module in entrypoints.get_enabled("udata.views", app).values():
-        _load_views(app, module)
-
-    # Load all plugins views and blueprints
-    for module in entrypoints.get_enabled("udata.front", app).values():
-        front_module = module if inspect.ismodule(module) else import_module(module)
-        front_module.init_app(app)

udata/harvest/actions.py

@@ -34,11 +34,6 @@ def get_source(ident):
     return HarvestSource.get(ident)
 
 
-def list_backends():
-    """List all available backends"""
-    return backends.get_all(current_app).values()
-
-
 def list_sources(owner=None, deleted=False):
     """List all harvest sources"""
     sources = HarvestSource.objects
@@ -177,7 +172,7 @@ def purge_jobs():
 
 def run(source: HarvestSource):
     """Launch or resume an harvesting for a given source if none is running"""
-    cls = backends.get(current_app, source.backend)
+    cls = backends.get_backend(source.backend)
     backend = cls(source)
     backend.harvest()
 
@@ -189,7 +184,7 @@ def launch(source: HarvestSource):
 
 def preview(source: HarvestSource):
     """Preview an harvesting for a given source"""
-    cls = backends.get(current_app, source.backend)
+    cls = backends.get_backend(source.backend)
     max_items = current_app.config["HARVEST_PREVIEW_MAX_ITEMS"]
     backend = cls(source, dryrun=True, max_items=max_items)
     return backend.harvest()
@@ -226,7 +221,7 @@ def preview_from_config(
         active=active,
         autoarchive=autoarchive,
     )
-    cls = backends.get(current_app, source.backend)
+    cls = backends.get_backend(source.backend)
     max_items = current_app.config["HARVEST_PREVIEW_MAX_ITEMS"]
     backend = cls(source, dryrun=True, max_items=max_items)
     return backend.harvest()
@@ -273,7 +268,7 @@ def schedule(
 def unschedule(source: HarvestSource):
     """Unschedule an harvesting on a source"""
     if not source.periodic_task:
-        msg = "Harvesting on source {0} is ot scheduled".format(source.name)
+        msg = "Harvesting on source {0} is not scheduled".format(source.name)
         raise ValueError(msg)
 
     source.periodic_task.delete()

udata/harvest/api.py

@@ -10,6 +10,7 @@ from udata.core.dataset.permissions import OwnablePermission
 from udata.core.organization.api_fields import org_ref_fields
 from udata.core.organization.permissions import EditOrganizationPermission
 from udata.core.user.api_fields import user_ref_fields
+from udata.harvest.backends import get_enabled_backends
 
 from . import actions
 from .forms import HarvestSourceForm, HarvestSourceValidationForm
@@ -25,10 +26,6 @@ from .models import (
 ns = api.namespace("harvest", "Harvest related operations")
 
 
-def backends_ids():
-    return [b.name for b in actions.list_backends()]
-
-
 error_fields = api.model(
     "HarvestError",
     {
@@ -126,7 +123,9 @@ source_fields = api.model(
         "description": fields.Markdown(description="The source description"),
         "url": fields.String(description="The source base URL", required=True),
         "backend": fields.String(
-            description="The source backend", enum=backends_ids, required=True
+            description="The source backend",
+            enum=lambda: list(get_enabled_backends().keys()),
+            required=True,
         ),
         "config": fields.Raw(description="The configuration as key-value pairs"),
         "created_at": fields.ISODateTime(
@@ -457,15 +456,7 @@ class ListBackendsAPI(API):
                     "features": [f.as_dict() for f in b.features],
                     "extra_configs": [f.as_dict() for f in b.extra_configs],
                 }
-                for b in actions.list_backends()
+                for b in get_enabled_backends().values()
             ],
             key=lambda b: b["label"],
         )
-
-
-@ns.route("/job_status/", endpoint="havest_job_status")
-class ListHarvesterAPI(API):
-    @api.doc(model=[str])
-    def get(self):
-        """List all available harvesters"""
-        return actions.list_backends()