udata 10.1.3.dev34219__py2.py3-none-any.whl → 10.1.3.dev34251__py2.py3-none-any.whl

udata/core/dataservices/models.py

@@ -100,11 +100,17 @@ class HarvestMetadata(db.EmbeddedDocument):
 @generate_fields(
     searchable=True,
     additional_filters={"organization_badge": "organization.badges"},
+    additional_sorts=[
+        {"key": "followers", "value": "metrics.followers"},
+        {"key": "views", "value": "metrics.views"},
+    ],
 )
 class Dataservice(WithMetrics, Owned, db.Document):
     meta = {
         "indexes": [
             "$title",
+            "metrics.followers",
+            "metrics.views",
         ]
         + Owned.meta["indexes"],
         "queryset_class": DataserviceQuerySet,
@@ -223,11 +229,11 @@ class Dataservice(WithMetrics, Owned, db.Document):
     def self_web_url(self):
         return endpoint_for("dataservices.show", dataservice=self, _external=True)
 
-    # TODO
-    # frequency = db.StringField(choices=list(UPDATE_FREQUENCIES.keys()))
-    # temporal_coverage = db.EmbeddedDocumentField(db.DateRange)
-    # spatial = db.EmbeddedDocumentField(SpatialCoverage)
-    # harvest = db.EmbeddedDocumentField(HarvestDatasetMetadata)
+    __metrics_keys__ = [
+        "discussions",
+        "followers",
+        "views",
+    ]
 
     @property
     def is_hidden(self):

udata/core/dataservices/search.py

@@ -56,9 +56,7 @@ class DataserviceSearch(ModelSearchAdapter):
     model = Dataservice
     search_url = "dataservices/"
 
-    sorts = {
-        "created": "created_at",
-    }
+    sorts = {"created": "created_at", "views": "views", "followers": "followers"}
 
     filters = {
         "tag": Filter(),
@@ -114,5 +112,6 @@ class DataserviceSearch(ModelSearchAdapter):
             "tags": dataservice.tags,
             "extras": extras,
             "followers": dataservice.metrics.get("followers", 0),
+            "views": dataservice.metrics.get("views", 0),
             "is_restricted": dataservice.is_restricted or False,
         }

udata/core/metrics/commands.py

@@ -4,6 +4,7 @@ import click
 from flask import current_app
 
 from udata.commands import cli, success
+from udata.core.dataservices.models import Dataservice
 from udata.models import Dataset, GeoZone, Organization, Reuse, Site, User
 
 log = logging.getLogger(__name__)
@@ -19,6 +20,7 @@ def grp():
 @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("--dataservices", is_flag=True, help="Compute dataservices 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")
@@ -28,12 +30,13 @@ def update(
     organizations=False,
     users=False,
     datasets=False,
+    dataservices=False,
     reuses=False,
     geozones=False,
     drop=False,
 ):
     """Update all metrics for the current date"""
-    do_all = not any((site, organizations, users, datasets, reuses, geozones))
+    do_all = not any((site, organizations, users, datasets, dataservices, reuses, geozones))
 
     if do_all or site:
         log.info("Update site metrics")
@@ -75,6 +78,22 @@ def update(
                     log.info(f"Error during update: {e}")
                     continue
 
+    if do_all or dataservices:
+        log.info("Update dataservices metrics")
+        all_dataservices = Dataservice.objects.visible().timeout(False)
+        with click.progressbar(
+            all_dataservices, length=Dataservice.objects.count()
+        ) as dataservice_bar:
+            for dataservice in dataservice_bar:
+                try:
+                    if drop:
+                        dataservice.metrics.clear()
+                    dataservice.count_discussions()
+                    dataservice.count_followers()
+                except Exception as e:
+                    log.info(f"Error during update: {e}")
+                    continue
+
     if do_all or reuses:
         log.info("Update reuses metrics")
         all_reuses = Reuse.objects.visible().timeout(False)