udata 10.4.3.dev35617__py2.py3-none-any.whl → 10.4.3.dev35680__py2.py3-none-any.whl

udata/core/dataservices/models.py

@@ -17,6 +17,7 @@ from udata.core.dataservices.constants import (
     DATASERVICE_FORMATS,
 )
 from udata.core.dataset.models import Dataset
+from udata.core.metrics.helpers import get_stock_metrics
 from udata.core.metrics.models import WithMetrics
 from udata.core.owned import Owned, OwnedQuerySet
 from udata.i18n import lazy_gettext as _
@@ -288,6 +289,7 @@ class Dataservice(Auditable, WithMetrics, Owned, db.Document):
     __metrics_keys__ = [
         "discussions",
         "followers",
+        "followers_by_months",
         "views",
     ]
 
@@ -313,6 +315,9 @@ class Dataservice(Auditable, WithMetrics, Owned, db.Document):
 
     def count_followers(self):
         self.metrics["followers"] = Follow.objects(until=None).followers(self).count()
+        self.metrics["followers_by_months"] = get_stock_metrics(
+            Follow.objects(following=self), date_label="since"
+        )
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
 

udata/core/dataset/models.py

@@ -20,6 +20,7 @@ from udata.api_fields import field
 from udata.app import cache
 from udata.core import storages
 from udata.core.activity.models import Auditable
+from udata.core.metrics.helpers import get_stock_metrics
 from udata.core.owned import Owned, OwnedQuerySet
 from udata.frontend.markdown import mdstrip
 from udata.i18n import lazy_gettext as _
@@ -599,7 +600,9 @@ class Dataset(Auditable, WithMetrics, DatasetBadgeMixin, Owned, db.Document):
     __metrics_keys__ = [
         "discussions",
         "reuses",
+        "reuses_by_months",
         "followers",
+        "followers_by_months",
         "views",
         "resources_downloads",
     ]
@@ -1063,12 +1066,16 @@ class Dataset(Auditable, WithMetrics, DatasetBadgeMixin, Owned, db.Document):
         from udata.models import Reuse
 
         self.metrics["reuses"] = Reuse.objects(datasets=self).visible().count()
+        self.metrics["reuses_by_months"] = get_stock_metrics(Reuse.objects(datasets=self).visible())
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
     def count_followers(self):
         from udata.models import Follow
 
         self.metrics["followers"] = Follow.objects(until=None).followers(self).count()
+        self.metrics["followers_by_months"] = get_stock_metrics(
+            Follow.objects(following=self), date_label="since"
+        )
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
 

udata/core/organization/models.py

@@ -8,6 +8,7 @@ from werkzeug.utils import cached_property
 from udata.api_fields import field
 from udata.core.activity.models import Auditable
 from udata.core.badges.models import Badge, BadgeMixin, BadgesList
+from udata.core.metrics.helpers import get_stock_metrics
 from udata.core.metrics.models import WithMetrics
 from udata.core.storages import avatars, default_image_basename
 from udata.frontend.markdown import mdstrip
@@ -161,9 +162,16 @@ class Organization(Auditable, WithMetrics, OrganizationBadgeMixin, db.Datetimed,
         return self.name or ""
 
     __metrics_keys__ = [
+        "dataservices",
+        "dataservices_by_months",
         "datasets",
+        "datasets_by_months",
+        "datasets_followers_by_months",
+        "datasets_reuses_by_months",
         "members",
         "reuses",
+        "reuses_by_months",
+        "reuses_followers_by_months",
         "dataservices",
         "followers",
         "views",
@@ -299,21 +307,40 @@ class Organization(Auditable, WithMetrics, OrganizationBadgeMixin, db.Datetimed,
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
     def count_datasets(self):
-        from udata.models import Dataset
+        from udata.models import Dataset, Follow, Reuse
 
         self.metrics["datasets"] = Dataset.objects(organization=self).visible().count()
+        self.metrics["datasets_by_months"] = get_stock_metrics(
+            Dataset.objects(organization=self).visible(), date_label="created_at_internal"
+        )
+        self.metrics["datasets_followers_by_months"] = get_stock_metrics(
+            Follow.objects(following__in=Dataset.objects(organization=self)), date_label="since"
+        )
+        self.metrics["datasets_reuses_by_months"] = get_stock_metrics(
+            Reuse.objects(datasets__in=Dataset.objects(organization=self)).visible()
+        )
+
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
     def count_reuses(self):
-        from udata.models import Reuse
+        from udata.models import Follow, Reuse
 
         self.metrics["reuses"] = Reuse.objects(organization=self).visible().count()
+        self.metrics["reuses_by_months"] = get_stock_metrics(
+            Reuse.objects(organization=self).visible()
+        )
+        self.metrics["reuses_followers_by_months"] = get_stock_metrics(
+            Follow.objects(following__in=Reuse.objects(organization=self)), date_label="since"
+        )
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
     def count_dataservices(self):
         from udata.models import Dataservice
 
         self.metrics["dataservices"] = Dataservice.objects(organization=self).visible().count()
+        self.metrics["dataservices_by_months"] = get_stock_metrics(
+            Dataservice.objects(organization=self).visible(), date_label="created_at"
+        )
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
     def count_followers(self):

udata/core/reuse/models.py

@@ -5,6 +5,7 @@ from werkzeug.utils import cached_property
 from udata.api_fields import field, function_field, generate_fields
 from udata.core.activity.models import Auditable
 from udata.core.dataset.api_fields import dataset_fields
+from udata.core.metrics.helpers import get_stock_metrics
 from udata.core.owned import Owned, OwnedQuerySet
 from udata.core.reuse.api_fields import BIGGEST_IMAGE_SIZE, reuse_permissions_fields
 from udata.core.storages import default_image_basename, images
@@ -151,6 +152,7 @@ class Reuse(db.Datetimed, Auditable, WithMetrics, ReuseBadgeMixin, Owned, db.Doc
         "discussions",
         "datasets",
         "followers",
+        "followers_by_months",
         "views",
     ]
 
@@ -299,6 +301,9 @@ class Reuse(db.Datetimed, Auditable, WithMetrics, ReuseBadgeMixin, Owned, db.Doc
         from udata.models import Follow
 
         self.metrics["followers"] = Follow.objects(until=None).followers(self).count()
+        self.metrics["followers_by_months"] = get_stock_metrics(
+            Follow.objects(following=self), date_label="since"
+        )
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
 

udata/harvest/api.py

@@ -1,4 +1,5 @@
 from flask import current_app, request
+from flask_login import current_user
 from werkzeug.exceptions import BadRequest
 
 from udata.api import API, api, fields
@@ -345,7 +346,7 @@ class RunSourceAPI(API):
     @api.marshal_with(source_fields)
     def post(self, ident):
         enabled = current_app.config.get("HARVEST_ENABLE_MANUAL_RUN")
-        if not enabled:
+        if not enabled and not current_user.sysadmin:
             api.abort(
                 400,
                 "Cannot run source manually. Please contact the platform if you need to reschedule the harvester.",