udata 10.4.3.dev35617__py2.py3-none-any.whl → 10.4.3.dev35659__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-10.4.3.dev35617.dist-info → udata-10.4.3.dev35659.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.4.3.dev35617
+Version: 10.4.3.dev35659
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -145,6 +145,7 @@ It is collectively taken care of by members of the
 - Add access audience to dataservices [#3334](https://github.com/opendatateam/udata/pull/3334)
 - Expose permissions to cdata [#3336](https://github.com/opendatateam/udata/pull/3336)
 - Add endpoint to get datasets followed by user [#3337](https://github.com/opendatateam/udata/pull/3337)
+- Add monthly metrics to datasets, dataservices, reuses and organizations [#3342](https://github.com/opendatateam/udata/pull/3342)
 
 ## 10.4.2 (2025-06-05)
 

{udata-10.4.3.dev35617.dist-info → udata-10.4.3.dev35659.dist-info}/RECORD

@@ -87,7 +87,7 @@ udata/core/dataservices/apiv2.py,sha256=pd4UWF6m7pQ5nmBRFmeiDyedhZSngz211to6qTsc
 udata/core/dataservices/constants.py,sha256=SxetyqvbWQlb-T9Bqn7mdfzV3vS-is7s56rzmGzTXY0,1029
 udata/core/dataservices/csv.py,sha256=pcNIeGaCzBMMna3n3YqHjsoXzfLtg_ITtDmdKb9svDc,1053
 udata/core/dataservices/factories.py,sha256=LDk8vvG0zhW8J-ZX5LoJQDU13pqeIyjQ05muuMro_eA,876
-udata/core/dataservices/models.py,sha256=WFx5_Nfu2RM9Sike_NH4LVQ76_hEBsgIea_wXVjj2ek,11329
+udata/core/dataservices/models.py,sha256=O6XnktYDFV55TaysAqhNlPcCjkZWQvBZt9atND-9ZD4,11555
 udata/core/dataservices/permissions.py,sha256=98zM_R4v2ZtRubflB7ajaVQz-DVc-pZBMgtKUYy34oI,169
 udata/core/dataservices/rdf.py,sha256=P-lSAKKy0Kbcfw_tGjl25DuqX77Sg4qZZYJtb9pzcOc,7847
 udata/core/dataservices/search.py,sha256=Wsr51jU14D9NrNP3ELTc8swwtFb-dakgc55cDrtt3No,4639
@@ -105,7 +105,7 @@ udata/core/dataset/events.py,sha256=bSM0nFEX14r4JHc-bAM-7OOuD3JAxUIpw9GgXbOsUyw,
 udata/core/dataset/exceptions.py,sha256=uKiayLSpSzsnLvClObS6hOO0qXEqvURKN7_w8eimQNU,498
 udata/core/dataset/factories.py,sha256=fRDWDlybR_ud4pDs1-ntWuYHKtV9LMHeBOBp2SmTT6M,9006
 udata/core/dataset/forms.py,sha256=7KUxuFcEGT0MUe0cZCiZtsnZhvGgvEd68pe13NgeSMI,6292
-udata/core/dataset/models.py,sha256=0tSKkuLwJ2BFyE7D6A8Hmx9BbDDtwstVp7mkCa_0lnI,41698
+udata/core/dataset/models.py,sha256=nl4nm48tFhKV_pT2AjKjvPhnjTtxjSmk_jIO-PtNcjw,42053
 udata/core/dataset/permissions.py,sha256=zXQ6kU-Ni3Pl5tDtat-ZPupug9InsNeCN7xRLc2Vcrc,1097
 udata/core/dataset/preview.py,sha256=IwCqiNTjjXbtA_SSKF52pwnzKKEz0GyYM95QNn2Dkog,2561
 udata/core/dataset/rdf.py,sha256=6aqoZajpmA2nciZsG1pGeJr0HKgdxjtuGWvk8xXjfUI,31810
@@ -154,7 +154,7 @@ udata/core/organization/csv.py,sha256=YzbdD9Y333QY2j9_sxdmRjAlHg1aGV-oW-dvZdvajV
 udata/core/organization/factories.py,sha256=g8ubBcz79xbjvpunZ02IDOakFg1KE6cXjNkE9vFyFAc,624
 udata/core/organization/forms.py,sha256=tscDb1_yOpbTx3ahl8ttA7oDkX9jIyzLc4gOf6WbN3s,3552
 udata/core/organization/metrics.py,sha256=90romzr-FhnPKh-6UHBJ1Af2loDa4-8I1iZEgztA160,1062
-udata/core/organization/models.py,sha256=QFRE8_4caiE34g5t2bNJ_GKk4WCVlobnr5_HZVf2pqw,9616
+udata/core/organization/models.py,sha256=Q_yNa4Nm4KFshRwmP13wJgYOP6Sm1-plxItotu4TXww,10908
 udata/core/organization/notifications.py,sha256=i_36-l2y7fOGmnBmr5NDWmGGmrGRaCWbU-6XS4c2wQs,917
 udata/core/organization/permissions.py,sha256=GD-9TMtRppVCPaC1ysXYrONvGJV-ArzAOXm2XMKf9yo,1256
 udata/core/organization/rdf.py,sha256=TF2c85MHAu-TRiHNLxqV_Pw5z6sCgZrNszF9SYspQpk,1936
@@ -183,7 +183,7 @@ udata/core/reuse/constants.py,sha256=JgDBrjOKSt9q0auv9rjzbGsch83H-Oi8YXAKeI5hO4o
 udata/core/reuse/csv.py,sha256=hCvKYzbL6kiUwzHkd9jrexdeACBj5k7XycKaLZesQeo,892
 udata/core/reuse/factories.py,sha256=GrQqYTIvwQrwkvJrbTr38-2faFW_PC99gn3yOVpgFec,850
 udata/core/reuse/metrics.py,sha256=sVh7BlW3OKRvFDHFyD4pPUV91jOOhj8qeWbBkLPn5Gg,176
-udata/core/reuse/models.py,sha256=0pLzXfJbh8TdKzpxDI-uNI8ZugD3Ux4_rYs9CHFcTT0,8841
+udata/core/reuse/models.py,sha256=16kKkoGX9Y0AZzmyRbl-sCuWRA7C4R8DrIFj6ByBnH8,9067
 udata/core/reuse/permissions.py,sha256=j-ancS7gvLl5vJu0TNYqpYD-2So-UzoDE4IHLxRoMGg,621
 udata/core/reuse/search.py,sha256=y1DwXYkBMBwuhn62CULkU1NNo89IYp0Ae7U01jcnjBY,3137
 udata/core/reuse/signals.py,sha256=nDrEUpYKN0AdYiEbrR0z3nzXzjaRcD8SAMutwIDsQPM,155
@@ -730,9 +730,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=ViV14tUmjSydHS0TWG_mFikKQfyUaT
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=rzAD_MVoV54TmN3w1ECz3H2Ru5pM7hWMVH03SkY28Q8,47250
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=EHX1_D-Uglj38832G7BrA0QC5IuY3p8dKqi9T0DgPmE,29169
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=3PMnbVhKVJh6Q8ABi1ZTZ8Dcf-sMjngLJZqLbonJoec,54225
-udata-10.4.3.dev35617.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.4.3.dev35617.dist-info/METADATA,sha256=Ut-zMnL9UyEL0TwkWdfvPF4vvcuqmirNR3ZfF3ZOl14,147972
-udata-10.4.3.dev35617.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-udata-10.4.3.dev35617.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
-udata-10.4.3.dev35617.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.4.3.dev35617.dist-info/RECORD,,
+udata-10.4.3.dev35659.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.4.3.dev35659.dist-info/METADATA,sha256=yzXc59Ktdc0kBK46_fJWAE0-A5_D3x0GsuMwk4TEOGc,148103
+udata-10.4.3.dev35659.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+udata-10.4.3.dev35659.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
+udata-10.4.3.dev35659.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.4.3.dev35659.dist-info/RECORD,,