udata 6.1.8.dev26107__py2.py3-none-any.whl → 6.1.8.dev26180__py2.py3-none-any.whl

udata/core/metrics/commands.py

@@ -4,7 +4,7 @@ import click
 
 from flask import current_app
 
-from udata.commands import cli, success, echo, white
+from udata.commands import cli, success
 from udata.models import User, Dataset, Reuse, Organization, Site
 
 log = logging.getLogger(__name__)
@@ -43,6 +43,7 @@ def update(site=False, organizations=False, users=False, datasets=False,
             site.count_reuses()
             site.count_followers()
             site.count_discussions()
+            site.count_harvesters()
             site.count_max_dataset_followers()
             site.count_max_dataset_reuses()
             site.count_max_reuse_datasets()
@@ -53,7 +54,6 @@ def update(site=False, organizations=False, users=False, datasets=False,
         except Exception as e:
             log.info(f'Error during update: {e}')
 
-
     if do_all or datasets:
         log.info('Update datasets metrics')
         all_datasets = Dataset.objects.visible().timeout(False)

udata/core/metrics/tasks.py

@@ -4,6 +4,7 @@ from udata.models import Site
 from udata.tasks import job
 from udata.core.metrics.signals import on_site_metrics_computed
 
+
 @job('compute-site-metrics')
 def compute_site_metrics(self):
     site = Site.objects(id=current_app.config['SITE_ID']).first()
@@ -14,6 +15,7 @@ def compute_site_metrics(self):
     site.count_reuses()
     site.count_followers()
     site.count_discussions()
+    site.count_harvesters()
     site.count_max_dataset_followers()
     site.count_max_dataset_reuses()
     site.count_max_reuse_datasets()

udata/core/site/models.py

@@ -43,6 +43,7 @@ class Site(WithMetrics, db.Document):
         'resources',
         'reuses',
         'users',
+        'harvesters'
     ]
 
     def __str__(self):
@@ -71,7 +72,7 @@ class Site(WithMetrics, db.Document):
     def count_resources(self):
         self.metrics['resources'] = next(Dataset.objects.visible().aggregate(
             {'$project': {'resources': 1}},
-            {'$unwind': '$resources' },
+            {'$unwind': '$resources'},
             {'$group': {'_id': 'result', 'count': {'$sum': 1}}}
         ), {}).get('count', 0)
         self.save()
@@ -90,6 +91,11 @@ class Site(WithMetrics, db.Document):
         self.metrics['discussions'] = Discussion.objects.count()
         self.save()
 
+    def count_harvesters(self):
+        from udata.harvest.models import HarvestSource
+        self.metrics['harvesters'] = HarvestSource.objects().count()
+        self.save()
+
     def count_max_dataset_followers(self):
         dataset = (Dataset.objects(metrics__followers__gt=0).visible()
                           .order_by('-metrics.followers').first())
@@ -98,7 +104,7 @@ class Site(WithMetrics, db.Document):
 
     def count_max_dataset_reuses(self):
         dataset = (Dataset.objects(metrics__reuses__gt=0).visible()
-                        .order_by('-metrics.reuses').first())
+                   .order_by('-metrics.reuses').first())
         self.metrics['max_dataset_reuses'] = dataset.metrics['reuses'] if dataset else 0
         self.save()
 

udata/core/topic/api.py

@@ -1,5 +1,4 @@
 from udata.api import api, fields, API
-from udata.auth import admin_permission
 
 
 from udata.core.dataset.api_fields import dataset_fields
@@ -63,7 +62,6 @@ class TopicsAPI(API):
                              .paginate(args['page'], args['page_size']))
 
     @api.doc('create_topic')
-    @api.secure(admin_permission)
     @api.expect(topic_fields)
     @api.marshal_with(topic_fields)
     @api.response(400, 'Validation error')
@@ -84,7 +82,6 @@ class TopicAPI(API):
         return topic
 
     @api.doc('update_topic')
-    @api.secure(admin_permission)
     @api.expect(topic_fields)
     @api.marshal_with(topic_fields)
     @api.response(400, 'Validation error')
@@ -94,7 +91,6 @@ class TopicAPI(API):
         return form.save()
 
     @api.doc('delete_topic')
-    @api.secure(admin_permission)
     @api.response(204, 'Object deleted')
     def delete(self, topic):
         '''Delete a given topic'''