udata 9.2.1.dev31556__py2.py3-none-any.whl → 9.2.2__py2.py3-none-any.whl

udata/__init__.py

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

udata/core/contact_point/api.py

@@ -1,3 +1,5 @@
+import mongoengine
+
 from udata.api import API, api
 from udata.api.parsers import ModelApiParser
 
@@ -29,7 +31,10 @@ class ContactPointsListAPI(API):
     def post(self):
         """Creates a contact point"""
         form = api.validate(ContactPointForm)
-        contact_point = form.save()
+        try:
+            contact_point = form.save()
+        except mongoengine.errors.ValidationError as e:
+            api.abort(400, e.message)
         return contact_point, 201
 
 

udata/core/contact_point/forms.py

@@ -12,6 +12,9 @@ class ContactPointForm(ModelForm):
         _("Name"),
         [validators.DataRequired(), validators.NoURLs(_("URLs not allowed in this field"))],
     )
-    email = fields.StringField(_("Email"), [validators.DataRequired(), validators.Email()])
+    email = fields.StringField(_("Email"), [validators.optional(), validators.Email()])
+    contact_form = fields.URLField(
+        _("Contact form"), description=_("The organization web contact form")
+    )
     owner = fields.CurrentUserField()
     organization = fields.PublishAsField(_("Publish as"))

udata/core/contact_point/models.py

@@ -1,11 +1,20 @@
 from udata.core.owned import Owned, OwnedQuerySet
+from udata.i18n import lazy_gettext as _
 from udata.mongo import db
 
 __all__ = ("ContactPoint",)
 
 
 class ContactPoint(db.Document, Owned):
-    email = db.StringField(max_length=255, required=True)
     name = db.StringField(max_length=255, required=True)
+    email = db.StringField(max_length=255)
+    contact_form = db.URLField()
 
     meta = {"queryset_class": OwnedQuerySet}
+
+    def validate(self, clean=True):
+        if not self.email and not self.contact_form:
+            raise db.ValidationError(
+                _("At least an email or a contact form is required for a contact point")
+            )
+        return super().validate(clean=clean)

udata/core/dataservices/models.py

@@ -122,10 +122,7 @@ class Dataservice(WithMetrics, Owned, db.Document):
         readonly=True,
     )
     description = field(db.StringField(default=""), description="In markdown")
-    base_api_url = field(
-        db.URLField(required=True),
-        sortable=True,
-    )
+    base_api_url = field(db.URLField(), sortable=True)
     endpoint_description_url = field(db.URLField())
     authorization_request_url = field(db.URLField())
     availability = field(db.FloatField(min=0, max=100), example="99.99")

udata/core/dataset/csv.py

@@ -1,4 +1,5 @@
-from udata.core.discussions.models import Discussion
+# for backwards compatibility (see https://github.com/opendatateam/udata/pull/3152)
+from udata.core.discussions.csv import DiscussionCsvAdapter  # noqa: F401
 from udata.frontend import csv
 
 from .models import Dataset, Resource
@@ -36,11 +37,13 @@ class DatasetCsvAdapter(csv.Adapter):
         ("archived", lambda o: o.archived or False),
         ("resources_count", lambda o: len(o.resources)),
         ("main_resources_count", lambda o: len([r for r in o.resources if r.type == "main"])),
+        ("resources_formats", lambda o: ",".join(set(r.format for r in o.resources if r.format))),
         "downloads",
         ("harvest.backend", lambda r: r.harvest and r.harvest.backend),
         ("harvest.domain", lambda r: r.harvest and r.harvest.domain),
         ("harvest.created_at", lambda r: r.harvest and r.harvest.created_at),
         ("harvest.modified_at", lambda r: r.harvest and r.harvest.modified_at),
+        ("harvest.remote_url", lambda r: r.harvest and r.harvest.remote_url),
         ("quality_score", lambda o: format(o.quality["score"], ".2f")),
         # schema? what is the schema of a dataset?
     )
@@ -90,18 +93,3 @@ class ResourcesCsvAdapter(csv.NestedAdapter):
         ("preview_url", lambda o: o.preview_url or False),
     )
     attribute = "resources"
-
-
-@csv.adapter(Discussion)
-class DiscussionCsvAdapter(csv.Adapter):
-    fields = (
-        "id",
-        "user",
-        "subject",
-        "title",
-        ("size", lambda o: len(o.discussion)),
-        ("messages", lambda o: "\n".join(msg.content for msg in o.discussion)),
-        "created",
-        "closed",
-        "closed_by",
-    )

udata/core/discussions/api.py

@@ -6,6 +6,10 @@ from flask_security import current_user
 
 from udata.api import API, api, fields
 from udata.auth import admin_permission
+from udata.core.dataservices.models import Dataservice
+from udata.core.dataset.models import Dataset
+from udata.core.organization.models import Organization
+from udata.core.reuse.models import Reuse
 from udata.core.spam.api import SpamAPIMixin
 from udata.core.spam.fields import spam_fields
 from udata.core.user.api_fields import user_ref_fields
@@ -73,8 +77,15 @@ comment_discussion_fields = api.model(
 discussion_page_fields = api.model("DiscussionPage", fields.pager(discussion_fields))
 
 parser = api.parser()
+sorting_keys: list[str] = ["created", "title", "closed"]
+sorting_choices: list[str] = sorting_keys + ["-" + k for k in sorting_keys]
 parser.add_argument(
-    "sort", type=str, default="-created", location="args", help="The sorting attribute"
+    "sort",
+    type=str,
+    default="-created",
+    choices=sorting_choices,
+    location="args",
+    help="The field (and direction) on which sorting apply",
 )
 parser.add_argument(
     "closed",
@@ -85,6 +96,9 @@ parser.add_argument(
 parser.add_argument(
     "for", type=str, location="args", action="append", help="Filter discussions for a given subject"
 )
+parser.add_argument(
+    "org", type=str, location="args", help="Filter discussions for a given organization"
+)
 parser.add_argument("user", type=str, location="args", help="Filter discussions created by a user")
 parser.add_argument("page", type=int, default=1, location="args", help="The page to fetch")
 parser.add_argument(
@@ -198,6 +212,15 @@ class DiscussionsAPI(API):
         discussions = Discussion.objects
         if args["for"]:
             discussions = discussions.generic_in(subject=args["for"])
+        if args["org"]:
+            org = Organization.objects.get_or_404(id=id_or_404(args["org"]))
+            if not org:
+                api.abort(404, "Organization does not exist")
+            reuses = Reuse.objects(organization=org).only("id")
+            datasets = Dataset.objects(organization=org).only("id")
+            dataservices = Dataservice.objects(organization=org).only("id")
+            subjects = list(reuses) + list(datasets) + list(dataservices)
+            discussions = discussions(subject__in=subjects)
         if args["user"]:
             discussions = discussions(discussion__posted_by=ObjectId(args["user"]))
         if args["closed"] is False:

udata/core/discussions/csv.py

@@ -0,0 +1,22 @@
+from udata.frontend import csv
+
+from .models import Discussion
+
+
+@csv.adapter(Discussion)
+class DiscussionCsvAdapter(csv.Adapter):
+    fields = (
+        "id",
+        "user",
+        "subject",
+        ("subject_class", "subject._class_name"),
+        ("subject_id", "subject.id"),
+        "title",
+        ("size", lambda o: len(o.discussion)),
+        ("participants", lambda o: ",".join(set(str(msg.posted_by.id) for msg in o.discussion))),
+        ("messages", lambda o: "\n".join(msg.content.replace("\n", " ") for msg in o.discussion)),
+        "created",
+        "closed",
+        "closed_by",
+        ("closed_by_id", "closed_by.id"),
+    )