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

udata/core/organization/mails.py

@@ -0,0 +1,144 @@
+from udata.core.organization.models import MembershipRequest, Organization
+from udata.i18n import lazy_gettext as _
+from udata.mail import LabelledContent, MailCTA, MailMessage, ParagraphWithLinks
+from udata.uris import cdata_url
+
+
+def new_membership_request(org: Organization, request: MembershipRequest) -> MailMessage:
+    return MailMessage(
+        subject=_("New membership request"),
+        paragraphs=[
+            ParagraphWithLinks(
+                _(
+                    "You received a membership request from %(user)s for your organization %(org)s",
+                    user=request.user,
+                    org=org,
+                )
+            ),
+            LabelledContent(_("Reason for the request:"), request.comment),
+            MailCTA(_("See the request"), cdata_url(f"/admin/organizations/{org.id}/members/")),
+        ],
+    )
+
+
+def membership_refused(org: Organization) -> MailMessage:
+    return MailMessage(
+        subject=_("Membership refused"),
+        paragraphs=[
+            ParagraphWithLinks(
+                _(
+                    "Your membership for the organization %(org)s has been refused",
+                    org=org,
+                )
+            ),
+        ],
+    )
+
+
+def membership_accepted(org: Organization) -> MailMessage:
+    return MailMessage(
+        subject=_("Your invitation to join an organization has been accepted"),
+        paragraphs=[
+            ParagraphWithLinks(
+                _(
+                    "Good news! Your request to join the organization %(org)s has been approved.",
+                    org=org,
+                )
+            ),
+            MailCTA(
+                _("View the organization"), cdata_url(f"/admin/organizations/{org.id}/datasets")
+            ),
+        ],
+    )
+
+
+def new_member(org: Organization) -> MailMessage:
+    return MailMessage(
+        subject=_("You have been added as a member of an organization"),
+        paragraphs=[
+            ParagraphWithLinks(
+                _(
+                    "Good news! You are now a member of %(org)s.",
+                    org=org,
+                )
+            ),
+            MailCTA(
+                _("View the organization"), cdata_url(f"/admin/organizations/{org.id}/datasets")
+            ),
+        ],
+    )
+
+
+def badge_added_certified(org: Organization) -> MailMessage:
+    return MailMessage(
+        subject=_("Your organization has been certified"),
+        paragraphs=[
+            ParagraphWithLinks(
+                _(
+                    "Good news! Your organization %(org)s has been certified by our team. A badge is now associated with your organization.",
+                    org=org,
+                )
+            ),
+            MailCTA(_("View the organization"), org.self_web_url()),
+        ],
+    )
+
+
+def badge_added_public_service(org: Organization) -> MailMessage:
+    return MailMessage(
+        subject=_("Your organization has been identified as a public service"),
+        paragraphs=[
+            ParagraphWithLinks(
+                _(
+                    "Good news! Your organization %(org)s has been identified by our team as a public service. A badge is now associated with your organization.",
+                    org=org,
+                )
+            ),
+            MailCTA(_("View the organization"), org.self_web_url()),
+        ],
+    )
+
+
+def badge_added_local_authority(org: Organization) -> MailMessage:
+    return MailMessage(
+        subject=_("Your organization has been identified as a local authority"),
+        paragraphs=[
+            ParagraphWithLinks(
+                _(
+                    "Good news! Your organization %(org)s has been identified by our team as a local authority. A badge is now associated with your organization.",
+                    org=org,
+                )
+            ),
+            MailCTA(_("View the organization"), org.self_web_url()),
+        ],
+    )
+
+
+def badge_added_company(org: Organization) -> MailMessage:
+    return MailMessage(
+        subject=_("Your organization has been identified as a company"),
+        paragraphs=[
+            ParagraphWithLinks(
+                _(
+                    "Your organization %(org)s has been identified by our team as a company. A badge is now associated with your organization.",
+                    org=org,
+                )
+            ),
+            MailCTA(_("View the organization"), org.self_web_url()),
+        ],
+    )
+
+
+def badge_added_association(org: Organization) -> MailMessage:
+    return MailMessage(
+        subject=_("Your organization has been identified as an association"),
+        paragraphs=[
+            ParagraphWithLinks(
+                _(
+                    "Your organization %(org)s has been identified by our team as an association. A badge is now associated with your organization.",
+                    org=org,
+                )
+            ),
+            MailCTA(_("View the organization"), org.self_web_url()),
+        ],
+    )

udata/core/organization/models.py

@@ -3,6 +3,7 @@ from itertools import chain
 
 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
 
@@ -34,7 +35,7 @@ from .constants import (
 
 __all__ = ("Organization", "Team", "Member", "MembershipRequest")
 
-BADGES: dict[str, str] = {
+BADGES: dict[str, LazyString] = {
     PUBLIC_SERVICE: _("Public Service"),
     CERTIFIED: _("Certified"),
     ASSOCIATION: _("Association"),

udata/core/organization/rdf.py

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

udata/core/organization/search.py

@@ -29,7 +29,7 @@ class OrganizationSearch(search.ModelSearchAdapter):
     }
 
     @classmethod
-    def is_indexable(cls, org):
+    def is_indexable(cls, org: Organization):
         return org.deleted is None
 
     @classmethod

udata/core/organization/tasks.py

@@ -1,11 +1,10 @@
-from udata import mail
 from udata.core import storages
 from udata.core.badges.tasks import notify_new_badge
-from udata.i18n import lazy_gettext as _
 from udata.models import Activity, ContactPoint, Dataset, Follow, Transfer
 from udata.search import reindex
 from udata.tasks import get_logger, job, task
 
+from . import mails
 from .constants import ASSOCIATION, CERTIFIED, COMPANY, LOCAL_AUTHORITY, PUBLIC_SERVICE
 from .models import Organization
 
@@ -47,10 +46,11 @@ def notify_membership_request(org_id, request_id):
     org = Organization.objects.get(pk=org_id)
     request = next((r for r in org.requests if str(r.id) == request_id), None)
 
+    if request is None:
+        return
+
     recipients = [m.user for m in org.by_role("admin")]
-    mail.send(
-        _("New membership request"), recipients, "membership_request", org=org, request=request
-    )
+    mails.new_membership_request(org, request).send(recipients)
 
 
 @task(route="high.mail")
@@ -58,12 +58,13 @@ def notify_membership_response(org_id, request_id):
     org = Organization.objects.get(pk=org_id)
     request = next((r for r in org.requests if str(r.id) == request_id), None)
 
+    if request is None:
+        return
+
     if request.status == "accepted":
-        subject = _('You are now a member of the organization "%(org)s"', org=org)
-        template = "new_member"
+        mails.membership_accepted(org).send(request.user)
     else:
-        subject, template = _("Membership refused"), "membership_refused"
-    mail.send(subject, request.user, template, org=org, request=request)
+        mails.membership_refused(org).send(request.user)
 
 
 @task
@@ -71,8 +72,10 @@ def notify_new_member(org_id, email):
     org = Organization.objects.get(pk=org_id)
     member = next((m for m in org.members if m.user.email == email), None)
 
-    subject = _('You are now a member of the organization "%(org)s"', org=org)
-    mail.send(subject, member.user, "new_member", org=org)
+    if member is None:
+        return
+
+    mails.new_member(org).send(member.user)
 
 
 @notify_new_badge(Organization, CERTIFIED)
@@ -82,14 +85,8 @@ def notify_badge_certified(org_id):
     """
     org = Organization.objects.get(pk=org_id)
     recipients = [member.user for member in org.members]
-    subject = _('Your organization "%(name)s" has been certified', name=org.name)
-    mail.send(
-        subject,
-        recipients,
-        "badge_added_certified",
-        organization=org,
-        badge=org.get_badge(CERTIFIED),
-    )
+
+    mails.badge_added_certified(org).send(recipients)
 
 
 @notify_new_badge(Organization, PUBLIC_SERVICE)
@@ -99,14 +96,8 @@ def notify_badge_public_service(org_id):
     """
     org = Organization.objects.get(pk=org_id)
     recipients = [member.user for member in org.members]
-    subject = _('Your organization "%(name)s" has been identified as public service', name=org.name)
-    mail.send(
-        subject,
-        recipients,
-        "badge_added_public_service",
-        organization=org,
-        badge=org.get_badge(PUBLIC_SERVICE),
-    )
+
+    mails.badge_added_public_service(org).send(recipients)
 
 
 @notify_new_badge(Organization, COMPANY)
@@ -116,10 +107,7 @@ def notify_badge_company(org_id):
     """
     org = Organization.objects.get(pk=org_id)
     recipients = [member.user for member in org.members]
-    subject = _('Your organization "%(name)s" has been identified as a company', name=org.name)
-    mail.send(
-        subject, recipients, "badge_added_company", organization=org, badge=org.get_badge(COMPANY)
-    )
+    mails.badge_added_company(org).send(recipients)
 
 
 @notify_new_badge(Organization, ASSOCIATION)
@@ -129,14 +117,7 @@ def notify_badge_association(org_id):
     """
     org = Organization.objects.get(pk=org_id)
     recipients = [member.user for member in org.members]
-    subject = _('Your organization "%(name)s" has been identified as an association', name=org.name)
-    mail.send(
-        subject,
-        recipients,
-        "badge_added_association",
-        organization=org,
-        badge=org.get_badge(ASSOCIATION),
-    )
+    mails.badge_added_association(org).send(recipients)
 
 
 @notify_new_badge(Organization, LOCAL_AUTHORITY)
@@ -146,13 +127,4 @@ def notify_badge_local_authority(org_id):
     """
     org = Organization.objects.get(pk=org_id)
     recipients = [member.user for member in org.members]
-    subject = _(
-        'Your organization "%(name)s" has been identified as a local authority', name=org.name
-    )
-    mail.send(
-        subject,
-        recipients,
-        "badge_added_local_authority",
-        organization=org,
-        badge=org.get_badge(LOCAL_AUTHORITY),
-    )
+    mails.badge_added_local_authority(org).send(recipients)

udata/core/pages/tests/test_api.py

@@ -6,8 +6,6 @@ from udata.tests.api import APITestCase
 
 
 class PageAPITest(APITestCase):
-    modules = []
-
     def test_create_get_update(self):
         self.login()
         datasets = DatasetFactory.create_batch(3)

udata/core/reuse/api.py

@@ -12,6 +12,7 @@ from udata.api_fields import patch, patch_and_save
 from udata.auth import admin_permission
 from udata.core.badges import api as badges_api
 from udata.core.badges.fields import badge_fields
+from udata.core.dataservices.models import Dataservice
 from udata.core.dataset.api_fields import dataset_ref_fields
 from udata.core.followers.api import FollowAPI
 from udata.core.organization.models import Organization
@@ -24,7 +25,7 @@ from udata.core.storages.api import (
 from udata.frontend.markdown import md
 from udata.i18n import gettext as _
 from udata.models import Dataset
-from udata.utils import id_or_404
+from udata.utils import get_rss_feed_list, id_or_404
 
 from .api_fields import (
     reuse_suggestion_fields,
@@ -143,7 +144,7 @@ class ReusesAtomFeedAPI(API):
             link=request.url_root,
         )
 
-        reuses: list[Reuse] = Reuse.objects.visible().order_by("-created_at").limit(15)
+        reuses = get_rss_feed_list(Reuse.objects.visible(), "created_at")
         for reuse in reuses:
             author_name = None
             author_uri = None
@@ -227,7 +228,8 @@ class ReuseDatasetsAPI(API):
             dataset = Dataset.objects.get_or_404(id=id_or_404(request.json["id"]))
         except Dataset.DoesNotExist:
             msg = "Dataset {0} does not exists".format(request.json["id"])
-            api.abort(404, msg)
+            return api.abort(404, msg)
+
         if dataset in reuse.datasets:
             return reuse
         reuse.datasets.append(dataset)
@@ -235,6 +237,30 @@ class ReuseDatasetsAPI(API):
         return reuse, 201
 
 
+@ns.route("/<reuse:reuse>/dataservices/", endpoint="reuse_add_dataservice")
+class ReuseDataservicesAPI(API):
+    @api.secure
+    @api.doc("reuse_add_dataservice", **common_doc)
+    @api.expect(Dataservice.__ref_fields__)
+    @api.response(200, "The dataservice is already present", Reuse.__read_fields__)
+    @api.marshal_with(Reuse.__read_fields__, code=201)
+    def post(self, reuse):
+        """Add a dataservice to a given reuse"""
+        if "id" not in request.json:
+            api.abort(400, "Expect a dataservice identifier")
+        try:
+            dataservice = Dataservice.objects.get_or_404(id=id_or_404(request.json["id"]))
+        except Dataservice.DoesNotExist:
+            msg = "Dataservice {0} does not exists".format(request.json["id"])
+            return api.abort(404, msg)
+
+        if dataservice in reuse.dataservices:
+            return reuse
+        reuse.dataservices.append(dataservice)
+        reuse.save()
+        return reuse, 201
+
+
 @ns.route("/badges/", endpoint="available_reuse_badges")
 class AvailableDatasetBadgesAPI(API):
     @api.doc("available_reuse_badges")

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/api.py

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

udata/core/site/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/site/rdf.py

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