udata 9.1.2.dev30355__py2.py3-none-any.whl → 9.1.2.dev30382__py2.py3-none-any.whl

udata/core/topic/forms.py

@@ -1,31 +1,29 @@
-from udata.forms import ModelForm, fields, validators
 from udata.core.spatial.forms import SpatialCoverageField
+from udata.forms import ModelForm, fields, validators
 from udata.i18n import lazy_gettext as _
 
 from .models import Topic
 
-
-__all__ = ('TopicForm', )
+__all__ = ("TopicForm",)
 
 
 class TopicForm(ModelForm):
     model_class = Topic
 
     owner = fields.CurrentUserField()
-    organization = fields.PublishAsField(_('Publish as'))
+    organization = fields.PublishAsField(_("Publish as"))
 
-    name = fields.StringField(_('Name'), [validators.DataRequired()])
-    description = fields.MarkdownField(
-        _('Description'), [validators.DataRequired()])
+    name = fields.StringField(_("Name"), [validators.DataRequired()])
+    description = fields.MarkdownField(_("Description"), [validators.DataRequired()])
 
-    datasets = fields.DatasetListField(_('Associated datasets'))
-    reuses = fields.ReuseListField(_('Associated reuses'))
+    datasets = fields.DatasetListField(_("Associated datasets"))
+    reuses = fields.ReuseListField(_("Associated reuses"))
 
     spatial = SpatialCoverageField(
-        _('Spatial coverage'),
-        description=_('The geographical area covered by the data.'))
+        _("Spatial coverage"), description=_("The geographical area covered by the data.")
+    )
 
-    tags = fields.TagField(_('Tags'), [validators.DataRequired()])
-    private = fields.BooleanField(_('Private'))
-    featured = fields.BooleanField(_('Featured'))
+    tags = fields.TagField(_("Tags"), [validators.DataRequired()])
+    private = fields.BooleanField(_("Private"))
+    featured = fields.BooleanField(_("Featured"))
     extras = fields.ExtrasField()

udata/core/topic/models.py

@@ -1,27 +1,26 @@
 from flask import url_for
 from mongoengine.signals import pre_save
-from udata.models import db, SpatialCoverage
+
+from udata.core.owned import Owned, OwnedQuerySet
+from udata.models import SpatialCoverage, db
 from udata.search import reindex
 from udata.tasks import as_task_param
-from udata.core.owned import Owned, OwnedQuerySet
-
 
-__all__ = ('Topic', )
+__all__ = ("Topic",)
 
 
 class Topic(db.Document, Owned, db.Datetimed):
     name = db.StringField(required=True)
-    slug = db.SlugField(max_length=255, required=True, populate_from='name',
-                        update=True, follow=True)
+    slug = db.SlugField(
+        max_length=255, required=True, populate_from="name", update=True, follow=True
+    )
     description = db.StringField()
     tags = db.ListField(db.StringField())
     color = db.IntField()
 
     tags = db.ListField(db.StringField())
-    datasets = db.ListField(
-        db.LazyReferenceField('Dataset', reverse_delete_rule=db.PULL))
-    reuses = db.ListField(
-        db.LazyReferenceField('Reuse', reverse_delete_rule=db.PULL))
+    datasets = db.ListField(db.LazyReferenceField("Dataset", reverse_delete_rule=db.PULL))
+    reuses = db.ListField(db.LazyReferenceField("Reuse", reverse_delete_rule=db.PULL))
 
     featured = db.BooleanField()
     private = db.BooleanField()
@@ -30,14 +29,10 @@ class Topic(db.Document, Owned, db.Datetimed):
     spatial = db.EmbeddedDocumentField(SpatialCoverage)
 
     meta = {
-        'indexes': [
-            '$name',
-            'created_at',
-            'slug'
-        ] + Owned.meta['indexes'],
-        'ordering': ['-created_at'],
-        'auto_create_index_on_save': True,
-        'queryset_class': OwnedQuerySet,
+        "indexes": ["$name", "created_at", "slug"] + Owned.meta["indexes"],
+        "ordering": ["-created_at"],
+        "auto_create_index_on_save": True,
+        "queryset_class": OwnedQuerySet,
     }
 
     def __str__(self):
@@ -58,7 +53,7 @@ class Topic(db.Document, Owned, db.Datetimed):
 
     @property
     def display_url(self):
-        return url_for('topics.display', topic=self)
+        return url_for("topics.display", topic=self)
 
     def count_discussions(self):
         # There are no metrics on Topic to store discussions count

udata/core/topic/parsers.py

@@ -6,44 +6,44 @@ from udata.api.parsers import ModelApiParser
 
 class TopicApiParser(ModelApiParser):
     sorts = {
-        'name': 'name',
-        'created': 'created_at',
-        'last_modified': 'last_modified',
+        "name": "name",
+        "created": "created_at",
+        "last_modified": "last_modified",
     }
 
     def __init__(self, with_include_private=True):
         super().__init__()
         if with_include_private:
-            self.parser.add_argument('include_private', type=bool, location='args')
-        self.parser.add_argument('tag', type=str, location='args')
-        self.parser.add_argument('geozone', type=str, location='args')
-        self.parser.add_argument('granularity', type=str, location='args')
-        self.parser.add_argument('organization', type=str, location='args')
-        self.parser.add_argument('owner', type=str, location='args')
+            self.parser.add_argument("include_private", type=bool, location="args")
+        self.parser.add_argument("tag", type=str, location="args")
+        self.parser.add_argument("geozone", type=str, location="args")
+        self.parser.add_argument("granularity", type=str, location="args")
+        self.parser.add_argument("organization", type=str, location="args")
+        self.parser.add_argument("owner", type=str, location="args")
 
     @staticmethod
     def parse_filters(topics, args):
-        if args.get('q'):
+        if args.get("q"):
             # Following code splits the 'q' argument by spaces to surround
             # every word in it with quotes before rebuild it.
             # This allows the search_text method to tokenise with an AND
             # between tokens whereas an OR is used without it.
-            phrase_query = ' '.join([f'"{elem}"' for elem in args['q'].split(' ')])
+            phrase_query = " ".join([f'"{elem}"' for elem in args["q"].split(" ")])
             topics = topics.search_text(phrase_query)
-        if args.get('tag'):
-            topics = topics.filter(tags=args['tag'])
-        if not args.get('include_private'):
+        if args.get("tag"):
+            topics = topics.filter(tags=args["tag"])
+        if not args.get("include_private"):
             topics = topics.filter(private=False)
-        if args.get('geozone'):
-            topics = topics.filter(spatial__zones=args['geozone'])
-        if args.get('granularity'):
-            topics = topics.filter(spatial__granularity=args['granularity'])
-        if args.get('organization'):
-            if not ObjectId.is_valid(args['organization']):
-                api.abort(400, 'Organization arg must be an identifier')
-            topics = topics.filter(organization=args['organization'])
-        if args.get('owner'):
-            if not ObjectId.is_valid(args['owner']):
-                api.abort(400, 'Owner arg must be an identifier')
-            topics = topics.filter(owner=args['owner'])
+        if args.get("geozone"):
+            topics = topics.filter(spatial__zones=args["geozone"])
+        if args.get("granularity"):
+            topics = topics.filter(spatial__granularity=args["granularity"])
+        if args.get("organization"):
+            if not ObjectId.is_valid(args["organization"]):
+                api.abort(400, "Organization arg must be an identifier")
+            topics = topics.filter(organization=args["organization"])
+        if args.get("owner"):
+            if not ObjectId.is_valid(args["owner"]):
+                api.abort(400, "Owner arg must be an identifier")
+            topics = topics.filter(owner=args["owner"])
         return topics

udata/core/user/activities.py

@@ -1,67 +1,68 @@
 from flask_security import current_user
 
-from udata.i18n import lazy_gettext as _
-from udata.models import db, User, Dataset, Reuse, Organization, Activity
-from udata.core.followers.signals import on_follow
-from udata.core.discussions.signals import (
-    on_new_discussion, on_new_discussion_comment
-)
 from udata.core.dataset.activities import DatasetRelatedActivity
-from udata.core.reuse.activities import ReuseRelatedActivity
+from udata.core.discussions.signals import on_new_discussion, on_new_discussion_comment
+from udata.core.followers.signals import on_follow
 from udata.core.organization.activities import OrgRelatedActivity
-
+from udata.core.reuse.activities import ReuseRelatedActivity
+from udata.i18n import lazy_gettext as _
+from udata.models import Activity, Dataset, Organization, Reuse, User, db
 
 __all__ = (
-    'UserFollowedDataset', 'UserFollowedReuse', 'UserFollowedOrganization',
-    'UserFollowedUser', 'UserDiscussedDataset', 'UserDiscussedReuse'
+    "UserFollowedDataset",
+    "UserFollowedReuse",
+    "UserFollowedOrganization",
+    "UserFollowedUser",
+    "UserDiscussedDataset",
+    "UserDiscussedReuse",
 )
 
 
 class FollowActivity(object):
-    icon = 'fa fa-eye'
-    badge_type = 'warning'
+    icon = "fa fa-eye"
+    badge_type = "warning"
 
 
 class DiscussActivity(object):
-    icon = 'fa fa-comments'
-    badge_type = 'warning'
+    icon = "fa fa-comments"
+    badge_type = "warning"
 
 
 class UserStarredOrganization(FollowActivity, OrgRelatedActivity, Activity):
-    key = 'organization:followed'
-    label = _('followed an organization')
+    key = "organization:followed"
+    label = _("followed an organization")
 
 
 class UserFollowedUser(FollowActivity, Activity):
-    key = 'user:followed'
-    label = _('followed a user')
+    key = "user:followed"
+    label = _("followed a user")
     related_to = db.ReferenceField(User)
-    template = 'activity/user.html'
+    template = "activity/user.html"
 
 
 class UserDiscussedDataset(DiscussActivity, DatasetRelatedActivity, Activity):
-    key = 'dataset:discussed'
-    label = _('discussed a dataset')
+    key = "dataset:discussed"
+    label = _("discussed a dataset")
 
 
 class UserDiscussedReuse(DiscussActivity, ReuseRelatedActivity, Activity):
-    key = 'reuse:discussed'
-    label = _('discussed a reuse')
+    key = "reuse:discussed"
+    label = _("discussed a reuse")
 
 
 class UserFollowedDataset(FollowActivity, DatasetRelatedActivity, Activity):
-    key = 'dataset:followed'
-    label = _('followed a dataset')
+    key = "dataset:followed"
+    label = _("followed a dataset")
 
 
 class UserFollowedReuse(FollowActivity, ReuseRelatedActivity, Activity):
-    key = 'reuse:followed'
-    label = _('followed a reuse')
+    key = "reuse:followed"
+    label = _("followed a reuse")
 
 
 class UserFollowedOrganization(FollowActivity, OrgRelatedActivity, Activity):
-    key = 'organization:followed'
-    label = _('followed an organization')
+    key = "organization:followed"
+    label = _("followed an organization")
 
 
 @on_follow.connect