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

udata/core/organization/forms.py

@@ -4,27 +4,27 @@ from udata.auth import current_user
 from udata.forms import Form, ModelForm, fields, validators
 from udata.i18n import lazy_gettext as _
 
-from .models import Organization, MembershipRequest, Member
 from .constants import DESCRIPTION_SIZE_LIMIT, LOGO_SIZES, ORG_ROLES, TITLE_SIZE_LIMIT
+from .models import Member, MembershipRequest, Organization
 
 __all__ = (
-    'OrganizationForm',
-    'MemberForm',
-    'MembershipRequestForm',
-    'MembershipRefuseForm',
+    "OrganizationForm",
+    "MemberForm",
+    "MembershipRequestForm",
+    "MembershipRefuseForm",
 )
 
 
 def org_bid_check(form, field):
     if field.data:
         # EID checks are country dependant. Following one is suitable for France.
-        if current_app.config.get('ORG_BID_FORMAT') == 'siret':
+        if current_app.config.get("ORG_BID_FORMAT") == "siret":
             siret_number = str(field.data)
             # Length control done here instead of using WTForm validator because field must remain optional.
             if len(siret_number) != 14:
-                raise validators.ValidationError(_('A siret number is made of 14 digits'))
+                raise validators.ValidationError(_("A siret number is made of 14 digits"))
             # Siret exception for the french postal service which business number id does not match the algorithm.
-            if siret_number == '35600000000048':
+            if siret_number == "35600000000048":
                 return
             # Checksum verification on only the SIREN part, the 9 first digits.
             try:
@@ -33,37 +33,40 @@ def org_bid_check(form, field):
                 chiffres = [chiffre - 9 if chiffre > 9 else chiffre for chiffre in chiffres]
                 total = sum(chiffres)
             except ValueError:
-                raise validators.ValidationError(_('A siret number is only made of digits'))
+                raise validators.ValidationError(_("A siret number is only made of digits"))
 
             if not total % 10 == 0:
-                raise validators.ValidationError(_('Invalid Siret number'))
+                raise validators.ValidationError(_("Invalid Siret number"))
 
 
 class OrganizationForm(ModelForm):
     model_class = Organization
 
-    name = fields.StringField(_('Name'), [validators.DataRequired(), validators.Length(max=TITLE_SIZE_LIMIT)])
-    acronym = fields.StringField(
-        _('Acronym'), description=_('Shorter organization name'))
+    name = fields.StringField(
+        _("Name"), [validators.DataRequired(), validators.Length(max=TITLE_SIZE_LIMIT)]
+    )
+    acronym = fields.StringField(_("Acronym"), description=_("Shorter organization name"))
     description = fields.MarkdownField(
-        _('Description'), [validators.DataRequired(), validators.Length(max=DESCRIPTION_SIZE_LIMIT)],
-        description=_('The details about your organization'))
-    url = fields.URLField(
-        _('Website'), description=_('The organization website URL'))
-    logo = fields.ImageField(_('Logo'), sizes=LOGO_SIZES)
-    business_number_id = fields.StringField(_('Business id'), [org_bid_check],
-                                            description=_('Business identification number'))
+        _("Description"),
+        [validators.DataRequired(), validators.Length(max=DESCRIPTION_SIZE_LIMIT)],
+        description=_("The details about your organization"),
+    )
+    url = fields.URLField(_("Website"), description=_("The organization website URL"))
+    logo = fields.ImageField(_("Logo"), sizes=LOGO_SIZES)
+    business_number_id = fields.StringField(
+        _("Business id"), [org_bid_check], description=_("Business identification number")
+    )
 
     deleted = fields.DateTimeField()
     extras = fields.ExtrasField()
 
     def save(self, commit=True, **kwargs):
-        '''Register the current user as admin on creation'''
+        """Register the current user as admin on creation"""
         org = super(OrganizationForm, self).save(commit=False, **kwargs)
 
         if not org.id:
             user = current_user._get_current_object()
-            member = Member(user=user, role='admin')
+            member = Member(user=user, role="admin")
             org.members.append(member)
             org.count_members()
 
@@ -77,16 +80,19 @@ class MembershipRequestForm(ModelForm):
     model_class = MembershipRequest
 
     user = fields.CurrentUserField()
-    comment = fields.StringField(_('Comment'), [validators.DataRequired()])
+    comment = fields.StringField(_("Comment"), [validators.DataRequired()])
 
 
 class MembershipRefuseForm(Form):
-    comment = fields.StringField(_('Comment'), [validators.DataRequired()])
+    comment = fields.StringField(_("Comment"), [validators.DataRequired()])
 
 
 class MemberForm(ModelForm):
     model_class = Member
 
     role = fields.SelectField(
-        _('Role'), default='editor', choices=list(ORG_ROLES.items()),
-        validators=[validators.DataRequired()])
+        _("Role"),
+        default="editor",
+        choices=list(ORG_ROLES.items()),
+        validators=[validators.DataRequired()],
+    )

udata/core/organization/metrics.py

@@ -1,5 +1,6 @@
-from udata.models import Dataset, Reuse, Organization
 from udata.core.owned import Owned
+from udata.models import Dataset, Organization, Reuse
+
 
 @Dataset.on_create.connect
 @Dataset.on_update.connect

udata/core/organization/models.py

@@ -2,33 +2,46 @@ from datetime import datetime
 from itertools import chain
 
 from blinker import Signal
-from mongoengine.signals import pre_save, post_save
+from mongoengine.signals import post_save, pre_save
 from werkzeug.utils import cached_property
 
 from udata.core.badges.models import BadgeMixin
 from udata.core.metrics.models import WithMetrics
 from udata.core.storages import avatars, default_image_basename
 from udata.frontend.markdown import mdstrip
-from udata.mongo import db
 from udata.i18n import lazy_gettext as _
+from udata.mongo import db
 from udata.uris import endpoint_for
-from .constants import ASSOCIATION, CERTIFIED, COMPANY, LOCAL_AUTHORITY, LOGO_SIZES, ORG_BID_SIZE_LIMIT, ORG_ROLES, DEFAULT_ROLE, MEMBERSHIP_STATUS, LOGO_MAX_SIZE, PUBLIC_SERVICE
 
+from .constants import (
+    ASSOCIATION,
+    CERTIFIED,
+    COMPANY,
+    DEFAULT_ROLE,
+    LOCAL_AUTHORITY,
+    LOGO_MAX_SIZE,
+    LOGO_SIZES,
+    MEMBERSHIP_STATUS,
+    ORG_BID_SIZE_LIMIT,
+    ORG_ROLES,
+    PUBLIC_SERVICE,
+)
+
+__all__ = ("Organization", "Team", "Member", "MembershipRequest")
 
-__all__ = ('Organization', 'Team', 'Member', 'MembershipRequest')
 
 class Team(db.EmbeddedDocument):
     name = db.StringField(required=True)
     slug = db.SlugField(
-        max_length=255, required=True, populate_from='name', update=True,
-        unique=False)
+        max_length=255, required=True, populate_from="name", update=True, unique=False
+    )
     description = db.StringField()
 
-    members = db.ListField(db.ReferenceField('User'))
+    members = db.ListField(db.ReferenceField("User"))
 
 
 class Member(db.EmbeddedDocument):
-    user = db.ReferenceField('User')
+    user = db.ReferenceField("User")
     role = db.StringField(choices=list(ORG_ROLES), default=DEFAULT_ROLE)
     since = db.DateTimeField(default=datetime.utcnow, required=True)
 
@@ -38,18 +51,18 @@ class Member(db.EmbeddedDocument):
 
 
 class MembershipRequest(db.EmbeddedDocument):
-    '''
+    """
     Pending organization membership requests
-    '''
+    """
+
     id = db.AutoUUIDField()
-    user = db.ReferenceField('User')
-    status = db.StringField(
-        choices=list(MEMBERSHIP_STATUS), default='pending')
+    user = db.ReferenceField("User")
+    status = db.StringField(choices=list(MEMBERSHIP_STATUS), default="pending")
 
     created = db.DateTimeField(default=datetime.utcnow, required=True)
 
     handled_on = db.DateTimeField()
-    handled_by = db.ReferenceField('User')
+    handled_by = db.ReferenceField("User")
 
     comment = db.StringField()
     refusal_comment = db.StringField()
@@ -73,13 +86,15 @@ class OrganizationQuerySet(db.BaseQuerySet):
 class Organization(WithMetrics, BadgeMixin, db.Datetimed, db.Document):
     name = db.StringField(required=True)
     acronym = db.StringField(max_length=128)
-    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(required=True)
     url = db.StringField()
     image_url = db.StringField()
-    logo = db.ImageField(fs=avatars, basename=default_image_basename,
-                         max_size=LOGO_MAX_SIZE, thumbnails=LOGO_SIZES)
+    logo = db.ImageField(
+        fs=avatars, basename=default_image_basename, max_size=LOGO_MAX_SIZE, thumbnails=LOGO_SIZES
+    )
     business_number_id = db.StringField(max_length=ORG_BID_SIZE_LIMIT)
 
     members = db.ListField(db.EmbeddedDocumentField(Member))
@@ -93,38 +108,38 @@ class Organization(WithMetrics, BadgeMixin, db.Datetimed, db.Document):
     deleted = db.DateTimeField()
 
     meta = {
-        'indexes': [
-            '$name',
-            'created_at',
-            'slug',
-            'metrics.reuses',
-            'metrics.datasets',
-            'metrics.followers',
-            'metrics.views',
-            'last_modified'
+        "indexes": [
+            "$name",
+            "created_at",
+            "slug",
+            "metrics.reuses",
+            "metrics.datasets",
+            "metrics.followers",
+            "metrics.views",
+            "last_modified",
         ],
-        'ordering': ['-created_at'],
-        'queryset_class': OrganizationQuerySet,
-        'auto_create_index_on_save': True
+        "ordering": ["-created_at"],
+        "queryset_class": OrganizationQuerySet,
+        "auto_create_index_on_save": True,
     }
 
     def __str__(self):
-        return self.name or ''
+        return self.name or ""
 
     __badges__ = {
-        PUBLIC_SERVICE: _('Public Service'),
-        CERTIFIED: _('Certified'),
-        ASSOCIATION: _('Association'),
-        COMPANY: _('Company'),
-        LOCAL_AUTHORITY: _('Local authority'),
+        PUBLIC_SERVICE: _("Public Service"),
+        CERTIFIED: _("Certified"),
+        ASSOCIATION: _("Association"),
+        COMPANY: _("Company"),
+        LOCAL_AUTHORITY: _("Local authority"),
     }
 
     __metrics_keys__ = [
-        'datasets',
-        'members',
-        'reuses',
-        'followers',
-        'views',
+        "datasets",
+        "members",
+        "reuses",
+        "followers",
+        "views",
     ]
 
     before_save = Signal()
@@ -141,13 +156,13 @@ class Organization(WithMetrics, BadgeMixin, db.Datetimed, db.Document):
     @classmethod
     def post_save(cls, sender, document, **kwargs):
         cls.after_save.send(document)
-        if kwargs.get('created'):
+        if kwargs.get("created"):
             cls.on_create.send(document)
         else:
             cls.on_update.send(document)
 
     def url_for(self, *args, **kwargs):
-        return endpoint_for('organizations.show', 'api.organization', org=self, *args, **kwargs)
+        return endpoint_for("organizations.show", "api.organization", org=self, *args, **kwargs)
 
     display_url = property(url_for)
 
@@ -157,15 +172,15 @@ class Organization(WithMetrics, BadgeMixin, db.Datetimed, db.Document):
 
     @property
     def pending_requests(self):
-        return [r for r in self.requests if r.status == 'pending']
+        return [r for r in self.requests if r.status == "pending"]
 
     @property
     def refused_requests(self):
-        return [r for r in self.requests if r.status == 'refused']
+        return [r for r in self.requests if r.status == "refused"]
 
     @property
     def accepted_requests(self):
-        return [r for r in self.requests if r.status == 'accepted']
+        return [r for r in self.requests if r.status == "accepted"]
 
     @property
     def certified(self):
@@ -199,11 +214,11 @@ class Organization(WithMetrics, BadgeMixin, db.Datetimed, db.Document):
 
     def is_admin(self, user):
         member = self.member(user)
-        return member is not None and member.role == 'admin'
+        return member is not None and member.role == "admin"
 
     def pending_request(self, user):
         for request in self.requests:
-            if request.user == user and request.status == 'pending':
+            if request.user == user and request.status == "pending":
                 return request
         return None
 
@@ -217,58 +232,63 @@ class Organization(WithMetrics, BadgeMixin, db.Datetimed, db.Document):
 
     def check_availability(self):
         from udata.models import Dataset  # Circular imports.
+
         # Performances: only check the first 20 datasets for now.
         return chain(
-            *[dataset.check_availability()
-              for dataset in Dataset.objects(organization=self).visible()[:20]]
+            *[
+                dataset.check_availability()
+                for dataset in Dataset.objects(organization=self).visible()[:20]
+            ]
         )
 
     @cached_property
     def json_ld(self):
-        type_ = 'GovernmentOrganization' if self.public_service \
-                else 'Organization'
+        type_ = "GovernmentOrganization" if self.public_service else "Organization"
 
         result = {
-            '@context': 'http://schema.org',
-            '@type': type_,
-            '@id': str(self.id),
-            'alternateName': self.slug,
-            'url': endpoint_for('organizations.show', 'api.organization', org=self, _external=True),
-            'name': self.name,
-            'dateCreated': self.created_at.isoformat(),
-            'dateModified': self.last_modified.isoformat()
+            "@context": "http://schema.org",
+            "@type": type_,
+            "@id": str(self.id),
+            "alternateName": self.slug,
+            "url": endpoint_for("organizations.show", "api.organization", org=self, _external=True),
+            "name": self.name,
+            "dateCreated": self.created_at.isoformat(),
+            "dateModified": self.last_modified.isoformat(),
         }
 
         if self.description:
-            result['description'] = mdstrip(self.description)
+            result["description"] = mdstrip(self.description)
 
         logo = self.logo(external=True)
         if logo:
-            result['logo'] = logo
+            result["logo"] = logo
 
         return result
 
     @property
     def views_count(self):
-        return self.metrics.get('views', 0)
+        return self.metrics.get("views", 0)
 
     def count_members(self):
-        self.metrics['members'] = len(self.members)
+        self.metrics["members"] = len(self.members)
         self.save()
 
     def count_datasets(self):
         from udata.models import Dataset
-        self.metrics['datasets'] = Dataset.objects(organization=self).visible().count()
+
+        self.metrics["datasets"] = Dataset.objects(organization=self).visible().count()
         self.save()
 
     def count_reuses(self):
         from udata.models import Reuse
-        self.metrics['reuses'] = Reuse.objects(organization=self).visible().count()
+
+        self.metrics["reuses"] = Reuse.objects(organization=self).visible().count()
         self.save()
 
     def count_followers(self):
         from udata.models import Follow
-        self.metrics['followers'] = Follow.objects(until=None).followers(self).count()
+
+        self.metrics["followers"] = Follow.objects(until=None).followers(self).count()
         self.save()
 
 

udata/core/organization/notifications.py

@@ -1,27 +1,31 @@
-from udata.features.notifications.actions import notifier
-
-
 import logging
 
+from udata.features.notifications.actions import notifier
+
 log = logging.getLogger(__name__)
 
 
-@notifier('membership_request')
+@notifier("membership_request")
 def membership_request_notifications(user):
-    '''Notify user about pending membership requests'''
+    """Notify user about pending membership requests"""
     orgs = [o for o in user.organizations if o.is_admin(user)]
     notifications = []
 
     for org in orgs:
         for request in org.pending_requests:
-            notifications.append((request.created, {
-                'id': request.id,
-                'organization': org.id,
-                'user': {
-                    'id': request.user.id,
-                    'fullname': request.user.fullname,
-                    'avatar': str(request.user.avatar)
-                }
-            }))
+            notifications.append(
+                (
+                    request.created,
+                    {
+                        "id": request.id,
+                        "organization": org.id,
+                        "user": {
+                            "id": request.user.id,
+                            "fullname": request.user.fullname,
+                            "avatar": str(request.user.avatar),
+                        },
+                    },
+                )
+            )
 
     return notifications

udata/core/organization/permissions.py

@@ -1,29 +1,29 @@
 from collections import namedtuple
 from functools import partial
 
-from udata.auth import current_user, identity_loaded, Permission
+from udata.auth import Permission, current_user, identity_loaded
 from udata.models import Organization
 from udata.utils import get_by
 
-
-OrganizationNeed = namedtuple('organization', ('role', 'value'))
-OrganizationAdminNeed = partial(OrganizationNeed, 'admin')
-OrganizationEditorNeed = partial(OrganizationNeed, 'editor')
+OrganizationNeed = namedtuple("organization", ("role", "value"))
+OrganizationAdminNeed = partial(OrganizationNeed, "admin")
+OrganizationEditorNeed = partial(OrganizationNeed, "editor")
 
 
 class EditOrganizationPermission(Permission):
-    '''Permissions to edit organization assets'''
+    """Permissions to edit organization assets"""
+
     def __init__(self, org):
         need = OrganizationAdminNeed(org.id)
         super(EditOrganizationPermission, self).__init__(need)
 
 
 class OrganizationPrivatePermission(Permission):
-    '''Permission to see organization private assets'''
+    """Permission to see organization private assets"""
+
     def __init__(self, org):
         super(OrganizationPrivatePermission, self).__init__(
-            OrganizationAdminNeed(org.id),
-            OrganizationEditorNeed(org.id)
+            OrganizationAdminNeed(org.id), OrganizationEditorNeed(org.id)
         )
 
 
@@ -31,6 +31,5 @@ class OrganizationPrivatePermission(Permission):
 def inject_organization_needs(sender, identity):
     if current_user.is_authenticated:
         for org in Organization.objects(members__user=current_user.id):
-            membership = get_by(org.members, 'user',
-                                current_user._get_current_object())
+            membership = get_by(org.members, "user", current_user._get_current_object())
             identity.provides.add(OrganizationNeed(membership.role, org.id))

udata/core/organization/rdf.py

@@ -1,27 +1,27 @@
-'''
+"""
 This module centralize organization helpers
 for RDF/DCAT serialization and parsing
-'''
+"""
 
 from flask import url_for
-from rdflib import Graph, URIRef, Literal, BNode
-from rdflib.namespace import RDF, RDFS, FOAF
-
-from udata.rdf import DCAT, DCT, namespace_manager, paginate_catalog
+from rdflib import BNode, Graph, Literal, URIRef
+from rdflib.namespace import FOAF, RDF, RDFS
 
 from udata.core.dataset.rdf import dataset_to_rdf
-from udata.utils import Paginable
+from udata.rdf import DCAT, DCT, namespace_manager, paginate_catalog
 from udata.uris import endpoint_for
+from udata.utils import Paginable
 
 
 def organization_to_rdf(org, graph=None):
-    '''
+    """
     Map a Resource domain model to a DCAT/RDF graph
-    '''
+    """
     graph = graph or Graph(namespace_manager=namespace_manager)
     if org.id:
-        org_url = endpoint_for('organizations.show_redirect', 'api.organization',
-                               org=org.id, _external=True)
+        org_url = endpoint_for(
+            "organizations.show_redirect", "api.organization", org=org.id, _external=True
+        )
         id = URIRef(org_url)
     else:
         id = BNode()
@@ -37,7 +37,7 @@ def organization_to_rdf(org, graph=None):
 
 def build_org_catalog(org, datasets, format=None):
     graph = Graph(namespace_manager=namespace_manager)
-    org_catalog_url = url_for('api.organization_rdf', org=org.id, _external=True)
+    org_catalog_url = url_for("api.organization_rdf", org=org.id, _external=True)
 
     catalog = graph.resource(URIRef(org_catalog_url))
     catalog.set(RDF.type, DCAT.Catalog)
@@ -48,9 +48,9 @@ def build_org_catalog(org, datasets, format=None):
     for dataset in datasets:
         catalog.add(DCAT.dataset, dataset_to_rdf(dataset, graph))
 
-    values = {'org': org.id}
+    values = {"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

@@ -1,30 +1,28 @@
 import datetime
+
 from udata import search
+from udata.core.organization.api import DEFAULT_SORTING, OrgApiParser
 from udata.models import Organization
 from udata.search.fields import Filter
-from udata.core.organization.api import OrgApiParser, DEFAULT_SORTING
 from udata.utils import to_iso_datetime
 
-
-__all__ = ('OrganizationSearch', )
+__all__ = ("OrganizationSearch",)
 
 
 @search.register
 class OrganizationSearch(search.ModelSearchAdapter):
     model = Organization
-    search_url = 'organizations/'
+    search_url = "organizations/"
 
     sorts = {
-        'reuses': 'metrics.reuses',
-        'datasets': 'metrics.datasets',
-        'followers': 'metrics.followers',
-        'views': 'metrics.views',
-        'created': 'created_at'
+        "reuses": "metrics.reuses",
+        "datasets": "metrics.datasets",
+        "followers": "metrics.followers",
+        "views": "metrics.views",
+        "created": "created_at",
     }
 
-    filters = {
-        'badge': Filter()
-    }
+    filters = {"badge": Filter()}
 
     @classmethod
     def is_indexable(cls, org):
@@ -35,9 +33,13 @@ class OrganizationSearch(search.ModelSearchAdapter):
         orgs = Organization.objects(deleted=None)
         orgs = OrgApiParser.parse_filters(orgs, args)
 
-        sort = cls.parse_sort(args['sort']) or ('$text_score' if args['q'] else None) or DEFAULT_SORTING
-        offset = (args['page'] - 1) * args['page_size']
-        return orgs.order_by(sort).skip(offset).limit(args['page_size']), orgs.count()
+        sort = (
+            cls.parse_sort(args["sort"])
+            or ("$text_score" if args["q"] else None)
+            or DEFAULT_SORTING
+        )
+        offset = (args["page"] - 1) * args["page_size"]
+        return orgs.order_by(sort).skip(offset).limit(args["page_size"]), orgs.count()
 
     @classmethod
     def serialize(cls, organization):
@@ -45,17 +47,17 @@ class OrganizationSearch(search.ModelSearchAdapter):
         for key, value in organization.extras.items():
             extras[key] = to_iso_datetime(value) if isinstance(value, datetime.datetime) else value
         return {
-            'id': str(organization.id),
-            'name': organization.name,
-            'acronym': organization.acronym if organization.acronym else None,
-            'description': organization.description,
-            'url': organization.url,
-            'badges': [badge.kind for badge in organization.badges],
-            'created_at': to_iso_datetime(organization.created_at),
-            'orga_sp': 1 if organization.public_service else 0,
-            'followers': organization.metrics.get('followers', 0),
-            'datasets': organization.metrics.get('datasets', 0),
-            'reuses': organization.metrics.get('reuses', 0),
-            'views': organization.metrics.get('views', 0),
-            'extras': extras
+            "id": str(organization.id),
+            "name": organization.name,
+            "acronym": organization.acronym if organization.acronym else None,
+            "description": organization.description,
+            "url": organization.url,
+            "badges": [badge.kind for badge in organization.badges],
+            "created_at": to_iso_datetime(organization.created_at),
+            "orga_sp": 1 if organization.public_service else 0,
+            "followers": organization.metrics.get("followers", 0),
+            "datasets": organization.metrics.get("datasets", 0),
+            "reuses": organization.metrics.get("reuses", 0),
+            "views": organization.metrics.get("views", 0),
+            "extras": extras,
         }