udata 10.7.1.dev36555__py2.py3-none-any.whl → 10.8.1__py2.py3-none-any.whl

udata/__init__.py

@@ -4,5 +4,5 @@
 udata
 """
 
-__version__ = "10.7.1.dev"
+__version__ = "10.8.1"
 __description__ = "Open data portal"

udata/core/dataservices/models.py

@@ -288,6 +288,7 @@ class Dataservice(Auditable, WithMetrics, Linkable, Owned, db.Document):
 
     __metrics_keys__ = [
         "discussions",
+        "discussions_open",
         "followers",
         "followers_by_months",
         "views",
@@ -310,7 +311,8 @@ class Dataservice(Auditable, WithMetrics, Linkable, Owned, db.Document):
         }
 
     def count_discussions(self):
-        self.metrics["discussions"] = Discussion.objects(subject=self, closed=None).count()
+        self.metrics["discussions"] = Discussion.objects(subject=self).count()
+        self.metrics["discussions_open"] = Discussion.objects(subject=self, closed=None).count()
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
     def count_followers(self):

udata/core/dataset/models.py

@@ -611,6 +611,7 @@ class Dataset(Auditable, WithMetrics, DatasetBadgeMixin, Owned, Linkable, db.Doc
 
     __metrics_keys__ = [
         "discussions",
+        "discussions_open",
         "reuses",
         "reuses_by_months",
         "followers",
@@ -1086,7 +1087,8 @@ class Dataset(Auditable, WithMetrics, DatasetBadgeMixin, Owned, Linkable, db.Doc
     def count_discussions(self):
         from udata.models import Discussion
 
-        self.metrics["discussions"] = Discussion.objects(subject=self, closed=None).count()
+        self.metrics["discussions"] = Discussion.objects(subject=self).count()
+        self.metrics["discussions_open"] = Discussion.objects(subject=self, closed=None).count()
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
     def count_reuses(self):

udata/core/discussions/api.py

@@ -130,6 +130,7 @@ discussion_page_fields = api.model("DiscussionPage", fields.pager(discussion_fie
 parser = api.parser()
 sorting_keys: list[str] = ["created", "title", "closed", "discussion.posted_on"]
 sorting_choices: list[str] = sorting_keys + ["-" + k for k in sorting_keys]
+parser.add_argument("q", type=str, location="args", help="The search query")
 parser.add_argument(
     "sort",
     type=str,
@@ -331,6 +332,11 @@ class DiscussionsAPI(API):
             discussions = discussions(closed=None)
         elif args["closed"] is True:
             discussions = discussions(closed__ne=None)
+
+        if args["q"]:
+            phrase_query = " ".join([f'"{elem}"' for elem in args["q"].split(" ")])
+            discussions = discussions.search_text(phrase_query).order_by("$text_score")
+
         discussions = discussions.order_by(args["sort"])
         return discussions.paginate(args["page"], args["page_size"])
 

udata/core/discussions/models.py

@@ -82,8 +82,18 @@ class Discussion(SpamMixin, Linkable, db.Document):
     extras = db.ExtrasField()
 
     meta = {
-        "indexes": ["user", "subject", "-created"],
+        "indexes": [
+            {
+                "fields": ["$title", "$discussion.content"],
+                "default_language": "french",
+                "weights": {"title": 10, "discussion.content": 5},
+            },
+            "user",
+            "subject",
+            "-created",
+        ],
         "ordering": ["-created"],
+        "auto_create_index_on_save": True,
     }
 
     @property

udata/core/reuse/models.py

@@ -151,6 +151,7 @@ class Reuse(db.Datetimed, Auditable, WithMetrics, ReuseBadgeMixin, Linkable, Own
 
     __metrics_keys__ = [
         "discussions",
+        "discussions_open",
         "datasets",
         "followers",
         "followers_by_months",
@@ -287,7 +288,8 @@ class Reuse(db.Datetimed, Auditable, WithMetrics, ReuseBadgeMixin, Linkable, Own
     def count_discussions(self):
         from udata.models import Discussion
 
-        self.metrics["discussions"] = Discussion.objects(subject=self, closed=None).count()
+        self.metrics["discussions"] = Discussion.objects(subject=self).count()
+        self.metrics["discussions_open"] = Discussion.objects(subject=self, closed=None).count()
         self.save(signal_kwargs={"ignores": ["post_save"]})
 
     def count_followers(self):

udata/migrations/2025-07-18-redo-count-discussion.py

@@ -0,0 +1,26 @@
+"""
+This migration does a `count_discussions` on all objets with discussions.
+It follows the change of `metrics.discussions` to track all discussions and not onyl the opened ones.
+"""
+
+import logging
+
+import click
+
+from udata.core.discussions.models import Discussion
+from udata.mongo import db as udata_db
+
+log = logging.getLogger(__name__)
+
+
+def migrate(db):
+    objects_with_discussions = Discussion.objects.aggregate(
+        [{"$group": {"_id": "$subject._ref", "_cls": {"$first": "$subject._cls"}}}]
+    )
+    with click.progressbar(objects_with_discussions) as objects_with_discussions:
+        for object in objects_with_discussions:
+            related_to = udata_db.resolve_model(object["_cls"]).objects.get(pk=object["_id"].id)
+            try:
+                related_to.count_discussions()
+            except Exception as err:
+                log.error(f"Cannot count discussions for {object['_cls']} {object['_id'].id} {err}")

udata/mongo/slug_fields.py

@@ -172,21 +172,38 @@ def populate_slug(instance, field):
     # Ensure uniqueness
     if field.unique:
         base_slug = slug
-        index = 1
         qs = instance.__class__.objects
         if previous:
             qs = qs(id__ne=previous.id)
 
-        def exists(s):
-            return qs(**{field.db_field: s}).clear_cls_query().limit(1).count(True) > 0
+        def exists(slug):
+            return qs(**{field.db_field: slug}).clear_cls_query().limit(1).count(True) > 0
 
-        while exists(slug):
-            # keep space for index suffix, trim slug if needed
+        def get_existing_slug_suffixes(slug):
+            qs_suffix = qs(slug__regex=f"^{slug}-\d*$").clear_cls_query().only(field.db_field)
+            return [getattr(obj, field.db_field) for obj in qs_suffix]
+
+        def trim_base_slug(base_slug, index):
             slug_overflow = len("{0}-{1}".format(base_slug, index)) - field.max_length
             if slug_overflow >= 1:
                 base_slug = base_slug[:-slug_overflow]
-            slug = "{0}-{1}".format(base_slug, index)
-            index += 1
+            return base_slug
+
+        if exists(base_slug):
+            # We'll iterate to get the first free slug suffix
+            index = 1
+            existing_slugs = None
+            while True:
+                # Keep space for index suffix, trim slug if needed
+                trimmed_slug = trim_base_slug(base_slug, index)
+                # Find all existing slugs with suffixes
+                if existing_slugs is None or trimmed_slug != base_slug:
+                    base_slug = trimmed_slug
+                    existing_slugs = set(sorted(get_existing_slug_suffixes(base_slug)))
+                slug = "{0}-{1}".format(base_slug, index)
+                if slug not in existing_slugs:
+                    break
+                index += 1
 
         if is_uuid(slug):
             slug = "{0}-uuid".format(slug)