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

udata/core/jobs/commands.py

@@ -2,38 +2,37 @@ import logging
 
 import click
 
-from udata.commands import cli, exit_with_error, echo, white
-from udata.tasks import schedulables, celery
+from udata.commands import cli, echo, exit_with_error, white
+from udata.tasks import celery, schedulables
 
 from .models import PeriodicTask
 
 log = logging.getLogger(__name__)
 
-SCHEDULE_LINE = '{name}: {label} ↦ {schedule}'
+SCHEDULE_LINE = "{name}: {label} ↦ {schedule}"
 
 
 def job_label(name, args, kwargs):
     label = name
     params = args[:]
-    params += ['='.join((k, v)) for k, v in sorted(kwargs.items())]
+    params += ["=".join((k, v)) for k, v in sorted(kwargs.items())]
     if params:
-        label += '(' + ', '.join(params) + ')'
+        label += "(" + ", ".join(params) + ")"
     return label
 
 
-@cli.group('job')
+@cli.group("job")
 def grp():
-    '''Jobs related operations'''
+    """Jobs related operations"""
     pass
 
 
 @grp.command()
-@click.argument('name', metavar='<name>')
-@click.argument('params', nargs=-1,  metavar='<arg key=value ...>')
-@click.option('-d', '--delay', is_flag=True,
-              help='Run the job asynchronously on a worker')
+@click.argument("name", metavar="<name>")
+@click.argument("params", nargs=-1, metavar="<arg key=value ...>")
+@click.option("-d", "--delay", is_flag=True, help="Run the job asynchronously on a worker")
 def run(name, params, delay):
-    '''
+    """
     Run the job <name>
 
     Jobs args and kwargs are given as parameters without dashes.
@@ -41,50 +40,50 @@ def run(name, params, delay):
     Ex:
         udata job run my-job arg1 arg2 key1=value key2=value
         udata job run my-job -- arg1 arg2 key1=value key2=value
-    '''
-    args = [p for p in params if '=' not in p]
-    kwargs = dict(p.split('=') for p in params if '=' in p)
+    """
+    args = [p for p in params if "=" not in p]
+    kwargs = dict(p.split("=") for p in params if "=" in p)
 
     if name not in celery.tasks:
-        exit_with_error('Job %s not found', name)
+        exit_with_error("Job %s not found", name)
     job = celery.tasks[name]
     label = job_label(name, args, kwargs)
     if delay:
-        log.info('Sending job %s', label)
+        log.info("Sending job %s", label)
         job.delay(*args, **kwargs)
-        log.info('Job sended to workers')
+        log.info("Job sended to workers")
     else:
-        log.info('Running job %s', label)
+        log.info("Running job %s", label)
         job.run(*args, **kwargs)
-        log.info('Job %s done', name)
+        log.info("Job %s done", name)
 
 
 @grp.command()
 def list():
-    '''List all availables jobs'''
+    """List all availables jobs"""
     for job in sorted([s.name for s in schedulables()]):
         echo(job)
 
 
 @grp.command()
-@click.argument('cron', metavar='<cron>')
-@click.argument('name', metavar='<name>')
-@click.argument('params', nargs=-1,  metavar='<arg key=value ...>')
+@click.argument("cron", metavar="<cron>")
+@click.argument("name", metavar="<name>")
+@click.argument("params", nargs=-1, metavar="<arg key=value ...>")
 def schedule(cron, name, params):
-    '''
+    """
     Schedule the job <name> to run periodically given the <cron> expression.
 
     Jobs args and kwargs are given as parameters without dashes.
 
     Ex:
         udata job schedule "* * 0 * *" my-job arg1 arg2 key1=value key2=value
-    '''
+    """
     if name not in celery.tasks:
-        exit_with_error('Job %s not found', name)
+        exit_with_error("Job %s not found", name)
 
-    args = [p for p in params if '=' not in p]
-    kwargs = dict(p.split('=') for p in params if '=' in p)
-    label = 'Job {0}'.format(job_label(name, args, kwargs))
+    args = [p for p in params if "=" not in p]
+    kwargs = dict(p.split("=") for p in params if "=" in p)
+    label = "Job {0}".format(job_label(name, args, kwargs))
 
     try:
         task = PeriodicTask.objects.get(task=name, args=args, kwargs=kwargs)
@@ -93,56 +92,56 @@ def schedule(cron, name, params):
         task = PeriodicTask.objects.create(
             task=name,
             name=label,
-            description='Periodic {0} job'.format(name),
+            description="Periodic {0} job".format(name),
             enabled=True,
             args=args,
             kwargs=kwargs,
             crontab=PeriodicTask.Crontab.parse(cron),
         )
 
-    msg = 'Scheduled {label} with the following crontab: {cron}'
+    msg = "Scheduled {label} with the following crontab: {cron}"
     log.info(msg.format(label=label, cron=task.schedule_display))
 
 
 @grp.command()
-@click.argument('name', metavar='<name>')
-@click.argument('params', nargs=-1,  metavar='<arg key=value ...>')
+@click.argument("name", metavar="<name>")
+@click.argument("params", nargs=-1, metavar="<arg key=value ...>")
 def unschedule(name, params):
-    '''
+    """
     Unschedule the job <name> with the given parameters.
 
     Jobs args and kwargs are given as parameters without dashes.
 
     Ex:
         udata job unschedule my-job arg1 arg2 key1=value key2=value
-    '''
+    """
     if name not in celery.tasks:
-        exit_with_error('Job %s not found', name)
+        exit_with_error("Job %s not found", name)
 
-    args = [p for p in params if '=' not in p]
-    kwargs = dict(p.split('=') for p in params if '=' in p)
-    label = 'Job {0}'.format(job_label(name, args, kwargs))
+    args = [p for p in params if "=" not in p]
+    kwargs = dict(p.split("=") for p in params if "=" in p)
+    label = "Job {0}".format(job_label(name, args, kwargs))
 
     try:
         task = PeriodicTask.objects.get(task=name, args=args, kwargs=kwargs)
     except PeriodicTask.DoesNotExist:
-        exit_with_error('No scheduled job match {0}'.format(label))
+        exit_with_error("No scheduled job match {0}".format(label))
 
     task.delete()
-    msg = 'Unscheduled {label} with the following crontab: {cron}'
+    msg = "Unscheduled {label} with the following crontab: {cron}"
     log.info(msg.format(label=label, cron=task.schedule_display))
 
 
 @grp.command()
 def scheduled():
-    '''
+    """
     List scheduled jobs.
-    '''
+    """
     for job in sorted(schedulables(), key=lambda s: s.name):
         for task in PeriodicTask.objects(task=job.name):
             label = job_label(task.task, task.args, task.kwargs)
-            echo(SCHEDULE_LINE.format(
-                name=white(task.name),
-                label=label,
-                schedule=task.schedule_display
-            ))
+            echo(
+                SCHEDULE_LINE.format(
+                    name=white(task.name), label=label, schedule=task.schedule_display
+                )
+            )

udata/core/jobs/forms.py

@@ -7,11 +7,11 @@ from .models import PeriodicTask
 class CrontabForm(ModelForm):
     model_class = PeriodicTask.Crontab
 
-    minute = fields.StringField(default='*')
-    hour = fields.StringField(default='*')
-    day_of_week = fields.StringField(default='*')
-    day_of_month = fields.StringField(default='*')
-    month_of_year = fields.StringField(default='*')
+    minute = fields.StringField(default="*")
+    hour = fields.StringField(default="*")
+    day_of_week = fields.StringField(default="*")
+    day_of_month = fields.StringField(default="*")
+    month_of_year = fields.StringField(default="*")
 
 
 class IntervalForm(ModelForm):
@@ -24,16 +24,16 @@ class IntervalForm(ModelForm):
 class PeriodicTaskForm(ModelForm):
     model_class = PeriodicTask
 
-    name = fields.StringField(_('Name'), [validators.DataRequired()])
-    description = fields.StringField(_('Description'))
-    task = fields.StringField(_('Tasks'))
-    enabled = fields.BooleanField(_('Enabled'))
+    name = fields.StringField(_("Name"), [validators.DataRequired()])
+    description = fields.StringField(_("Description"))
+    task = fields.StringField(_("Tasks"))
+    enabled = fields.BooleanField(_("Enabled"))
 
     def save(self, commit=True, **kwargs):
-        '''
+        """
         PeriodicTask is dynamic and save behavior changed
         See: https://github.com/zakird/celerybeat-mongo/commit/dfbbd20edde91134b57f5406d0ce4eac59d6899b
-        '''
+        """
         if not self.instance:
             self.instance = self.model_class()  # Force populate_obj in super()
         return super(PeriodicTaskForm, self).save(commit, **kwargs)

udata/core/jobs/models.py

@@ -1,12 +1,12 @@
-from celerybeatmongo.models import PeriodicTask as BasePeriodicTask, PERIODS
+from celerybeatmongo.models import PERIODS
+from celerybeatmongo.models import PeriodicTask as BasePeriodicTask
 
 from udata.i18n import lazy_gettext as _
 from udata.mongo import db
 
+__all__ = ("PeriodicTask", "PERIODS")
 
-__all__ = ('PeriodicTask', 'PERIODS')
-
-CRON = '{minute} {hour} {day_of_month} {month_of_year} {day_of_week}'
+CRON = "{minute} {hour} {day_of_month} {month_of_year} {day_of_week}"
 
 
 class PeriodicTask(BasePeriodicTask):
@@ -15,8 +15,8 @@ class PeriodicTask(BasePeriodicTask):
     class Interval(BasePeriodicTask.Interval):
         def __str__(self):
             if self.every == 1:
-                return _('every {0.period_singular}').format(self)
-            return _('every {0.every} {0.period}').format(self)
+                return _("every {0.period_singular}").format(self)
+            return _("every {0.every} {0.period}").format(self)
 
     class Crontab(BasePeriodicTask.Crontab):
         def __str__(self):

udata/core/metrics/__init__.py

@@ -6,8 +6,8 @@ def init_app(app):
     import udata.core.user.metrics  # noqa
     import udata.core.organization.metrics  # noqa
     import udata.core.discussions.metrics  # noqa
-    import udata.core.reuse.metrics # noqa
+    import udata.core.reuse.metrics  # noqa
     import udata.core.followers.metrics  # noqa
 
     # Load metrics from plugins
-    entrypoints.get_enabled('udata.metrics', app)
+    entrypoints.get_enabled("udata.metrics", app)

udata/core/metrics/commands.py

@@ -1,40 +1,44 @@
 import logging
 
 import click
-
 from flask import current_app
 
 from udata.commands import cli, success
-from udata.models import User, Dataset, Reuse, Organization, Site, GeoZone
+from udata.models import Dataset, GeoZone, Organization, Reuse, Site, User
 
 log = logging.getLogger(__name__)
 
 
-@cli.group('metrics')
+@cli.group("metrics")
 def grp():
-    '''Metrics related operations'''
+    """Metrics related operations"""
     pass
 
 
 @grp.command()
-@click.option('-s', '--site', is_flag=True, help='Update site metrics')
-@click.option('-o', '--organizations', is_flag=True,
-              help='Compute organizations metrics')
-@click.option('-d', '--datasets', is_flag=True,
-              help='Compute datasets metrics')
-@click.option('-r', '--reuses', is_flag=True, help='Compute reuses metrics')
-@click.option('-u', '--users', is_flag=True, help='Compute users metrics')
-@click.option('-g', '--geozones', is_flag=True, help='Compute geo levels metrics')
-@click.option('--drop', is_flag=True, help='Clear old metrics before computing new ones')
-def update(site=False, organizations=False, users=False, datasets=False,
-           reuses=False, geozones = False, drop=False):
-    '''Update all metrics for the current date'''
+@click.option("-s", "--site", is_flag=True, help="Update site metrics")
+@click.option("-o", "--organizations", is_flag=True, help="Compute organizations metrics")
+@click.option("-d", "--datasets", is_flag=True, help="Compute datasets metrics")
+@click.option("-r", "--reuses", is_flag=True, help="Compute reuses metrics")
+@click.option("-u", "--users", is_flag=True, help="Compute users metrics")
+@click.option("-g", "--geozones", is_flag=True, help="Compute geo levels metrics")
+@click.option("--drop", is_flag=True, help="Clear old metrics before computing new ones")
+def update(
+    site=False,
+    organizations=False,
+    users=False,
+    datasets=False,
+    reuses=False,
+    geozones=False,
+    drop=False,
+):
+    """Update all metrics for the current date"""
     do_all = not any((site, organizations, users, datasets, reuses, geozones))
 
     if do_all or site:
-        log.info('Update site metrics')
+        log.info("Update site metrics")
         try:
-            site = Site.objects(id=current_app.config['SITE_ID']).first()
+            site = Site.objects(id=current_app.config["SITE_ID"]).first()
             if drop:
                 site.metrics.clear()
             site.count_users()
@@ -53,10 +57,10 @@ def update(site=False, organizations=False, users=False, datasets=False,
             site.count_max_org_reuses()
             site.count_max_org_datasets()
         except Exception as e:
-            log.info(f'Error during update: {e}')
+            log.info(f"Error during update: {e}")
 
     if do_all or datasets:
-        log.info('Update datasets metrics')
+        log.info("Update datasets metrics")
         all_datasets = Dataset.objects.visible().timeout(False)
         with click.progressbar(all_datasets, length=Dataset.objects.count()) as dataset_bar:
             for dataset in dataset_bar:
@@ -67,11 +71,11 @@ def update(site=False, organizations=False, users=False, datasets=False,
                     dataset.count_reuses()
                     dataset.count_followers()
                 except Exception as e:
-                    log.info(f'Error during update: {e}')
+                    log.info(f"Error during update: {e}")
                     continue
 
     if do_all or reuses:
-        log.info('Update reuses metrics')
+        log.info("Update reuses metrics")
         all_reuses = Reuse.objects.visible().timeout(False)
         with click.progressbar(all_reuses, length=Reuse.objects.visible().count()) as reuses_bar:
             for reuse in reuses_bar:
@@ -81,11 +85,11 @@ def update(site=False, organizations=False, users=False, datasets=False,
                     reuse.count_discussions()
                     reuse.count_followers()
                 except Exception as e:
-                    log.info(f'Error during update: {e}')
+                    log.info(f"Error during update: {e}")
                     continue
 
     if do_all or organizations:
-        log.info('Update organizations metrics')
+        log.info("Update organizations metrics")
         all_org = Organization.objects.visible().timeout(False)
         with click.progressbar(all_org, length=Organization.objects.visible().count()) as org_bar:
             for organization in org_bar:
@@ -97,11 +101,11 @@ def update(site=False, organizations=False, users=False, datasets=False,
                     organization.count_followers()
                     organization.count_members()
                 except Exception as e:
-                    log.info(f'Error during update: {e}')
+                    log.info(f"Error during update: {e}")
                     continue
 
     if do_all or users:
-        log.info('Update user metrics')
+        log.info("Update user metrics")
         all_users = User.objects.timeout(False)
         with click.progressbar(all_users, length=User.objects.count()) as users_bar:
             for user in users_bar:
@@ -113,11 +117,11 @@ def update(site=False, organizations=False, users=False, datasets=False,
                     user.count_followers()
                     user.count_following()
                 except Exception as e:
-                    log.info(f'Error during update: {e}')
+                    log.info(f"Error during update: {e}")
                     continue
 
     if do_all or geozones:
-        log.info('Update GeoZone metrics')
+        log.info("Update GeoZone metrics")
         all_geozones = GeoZone.objects.timeout(False)
         with click.progressbar(all_geozones, length=GeoZone.objects.count()) as geozones_bar:
             for geozone in geozones_bar:
@@ -126,7 +130,7 @@ def update(site=False, organizations=False, users=False, datasets=False,
                         geozone.metrics.clear()
                     geozone.count_datasets()
                 except Exception as e:
-                    log.info(f'Error during update: {e}')
+                    log.info(f"Error during update: {e}")
                     continue
 
-    success('All metrics have been updated')
+    success("All metrics have been updated")

udata/core/metrics/models.py

@@ -1,8 +1,7 @@
 from udata.api_fields import field
 from udata.mongo import db
 
-
-__all__ = ('WithMetrics',)
+__all__ = ("WithMetrics",)
 
 
 class WithMetrics(object):
@@ -11,5 +10,4 @@ class WithMetrics(object):
     __metrics_keys__ = []
 
     def get_metrics(self):
-        return {key:self.metrics.get(key, 0) for key in self.__metrics_keys__}
-
+        return {key: self.metrics.get(key, 0) for key in self.__metrics_keys__}

udata/core/metrics/signals.py

@@ -3,4 +3,4 @@ from blinker import Namespace
 namespace = Namespace()
 
 #: Trigerred when a site's metrics job is done.
-on_site_metrics_computed = namespace.signal('on-site-metrics-computed')
+on_site_metrics_computed = namespace.signal("on-site-metrics-computed")

udata/core/metrics/tasks.py

@@ -1,13 +1,13 @@
 from flask import current_app
 
+from udata.core.metrics.signals import on_site_metrics_computed
 from udata.models import Site
 from udata.tasks import job
-from udata.core.metrics.signals import on_site_metrics_computed
 
 
-@job('compute-site-metrics')
+@job("compute-site-metrics")
 def compute_site_metrics(self):
-    site = Site.objects(id=current_app.config['SITE_ID']).first()
+    site = Site.objects(id=current_app.config["SITE_ID"]).first()
     site.count_users()
     site.count_org()
     site.count_datasets()

udata/core/organization/activities.py

@@ -1,31 +1,28 @@
 from flask_security import current_user
 
 from udata.i18n import lazy_gettext as _
-from udata.models import db, Organization, Activity
+from udata.models import Activity, Organization, db
 
-
-__all__ = (
-    'UserCreatedOrganization', 'UserUpdatedOrganization', 'OrgRelatedActivity'
-)
+__all__ = ("UserCreatedOrganization", "UserUpdatedOrganization", "OrgRelatedActivity")
 
 
 class OrgRelatedActivity(object):
-    related_to = db.ReferenceField('Organization')
-    template = 'activity/organization.html'
+    related_to = db.ReferenceField("Organization")
+    template = "activity/organization.html"
 
 
 class UserCreatedOrganization(OrgRelatedActivity, Activity):
-    key = 'organization:created'
-    icon = 'fa fa-plus'
-    badge_type = 'success'
-    label = _('created an organization')
+    key = "organization:created"
+    icon = "fa fa-plus"
+    badge_type = "success"
+    label = _("created an organization")
 
 
 class UserUpdatedOrganization(OrgRelatedActivity, Activity):
-    key = 'organization:updated'
-    icon = 'fa fa-pencil'
-    badge_type = 'error'
-    label = _('updated an organization')
+    key = "organization:updated"
+    icon = "fa fa-pencil"
+    badge_type = "error"
+    label = _("updated an organization")
 
 
 @Organization.on_create.connect