udata 12.0.2.dev10__py3-none-any.whl → 13.0.1.dev21__py3-none-any.whl

udata/utils.py

@@ -3,7 +3,8 @@ import itertools
 import math
 import re
 from collections import Counter
-from datetime import date, datetime
+from datetime import date, datetime, timedelta
+from importlib.metadata import version
 from math import ceil
 from typing import Any, Hashable
 from uuid import UUID, uuid4
@@ -18,11 +19,16 @@ from faker import Faker
 from faker.config import PROVIDERS
 from faker.providers import BaseProvider
 from faker.providers.lorem.la import Provider as LoremProvider
-from flask import abort, request
+from flask import abort, current_app, request
+from mongoengine.fields import BaseQuerySet
 
 from udata import tags
 
 
+def get_udata_version() -> str:
+    return version("udata")
+
+
 def get_by(lst, field, value):
     """Find an object in a list given a field value"""
     for row in lst:
@@ -65,7 +71,14 @@ def filter_changed_fields(document, previous, changed_fields: list[str]):
     document.reload()
     filtered_changed_fields = []
     for field in changed_fields:
-        previous_value = previous[field]
+        # Sometimes, we nullify a field in the clean method (for exemple the `license` when we change
+        # the `access_type` of a dataset). This field is then not present in `previous`. Returning `None`
+        # is a little bit wrong because we should return the previous value of the `license`. Right now
+        # we don't notice license change because `None (not present) == None (removed)` is equal.
+        if field not in previous:
+            continue
+
+        previous_value = previous.get(field, None)
         current_value = get_field_value_from_path(document, field)
         # Filter out special case of list reordering, does not support unhashable types
         if (
@@ -332,7 +345,7 @@ def generate_tags(nb=3) -> [str]:
 
 def generate_tag() -> str:
     fake_tag: str = faker.word()
-    while len(fake_tag) < tags.MIN_TAG_LENGTH:
+    while len(fake_tag) < tags.TAG_MIN_LENGTH:
         fake_tag = faker.word()
     return fake_tag
 
@@ -382,6 +395,55 @@ def id_or_404(object_id):
         abort(404)
 
 
+def get_rss_feed_list(queryset: BaseQuerySet, created_at_field: str) -> list[Any]:
+    """
+    Return a list of recent elements for a RSS field.
+
+    We add a delay before a new element appears in feed in order to allow for post-publication moderation.
+    The delay is not taken into account if the element is published by a certified organization.
+    """
+    from udata.core.organization.constants import CERTIFIED
+    from udata.core.site.models import current_site
+    from udata.models import Organization
+
+    certifed_orgs = Organization.objects(badges__kind=CERTIFIED).only("id")
+
+    created_delay = datetime.utcnow() - timedelta(
+        hours=current_app.config["DELAY_BEFORE_APPEARING_IN_RSS_FEED"]
+    )
+    elements_with_delay = list(
+        queryset.filter(
+            **{
+                f"{created_at_field}__lte": created_delay,
+                "organization__nin": certifed_orgs,
+            }
+        )
+        .order_by(f"-{created_at_field}")
+        .limit(current_site.feed_size)
+    )
+    elements_without_delay = list(
+        queryset.filter(organization__in=certifed_orgs)
+        .order_by(f"-{created_at_field}")
+        .limit(current_site.feed_size)
+    )
+
+    # We need to merge the two lists manually, compensating for the delay, else elements with delay may not show
+    # if new elements have been published by certified organization in the meantime
+    def get_sort_key(element):
+        has_delay = not element.organization or not element.organization.certified
+        if has_delay:
+            return getattr(element, created_at_field) + timedelta(
+                hours=current_app.config["DELAY_BEFORE_APPEARING_IN_RSS_FEED"]
+            )
+        return getattr(element, created_at_field)
+
+    elements = sorted(
+        [*elements_with_delay, *elements_without_delay], reverse=True, key=get_sort_key
+    )[: current_site.feed_size]
+
+    return elements
+
+
 def wants_json() -> bool:
     if request.is_json:
         return True

{udata-12.0.2.dev10.dist-info → udata-13.0.1.dev21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: udata
-Version: 12.0.2.dev10
+Version: 13.0.1.dev21
 Summary: Open data portal
 Author-email: Opendata Team <opendatateam@data.gouv.fr>
 Maintainer-email: Opendata Team <opendatateam@data.gouv.fr>
@@ -47,7 +47,6 @@ Requires-Dist: flask-cdn==1.5.3
 Requires-Dist: flask-gravatar==0.5.0
 Requires-Dist: flask-login==0.6.3
 Requires-Dist: flask-mail==0.10.0
-Requires-Dist: flask-navigation-temp-python-311==0.2.1
 Requires-Dist: flask-principal==0.4.0
 Requires-Dist: flask-restx==1.3.0
 Requires-Dist: flask-security-too==5.1.2
@@ -96,8 +95,6 @@ Requires-Dist: invoke<3.0,>=2.2.0; extra == "dev"
 Requires-Dist: pip-tools<8.0,>=7.4.1; extra == "dev"
 Requires-Dist: pre-commit<5.0,>=4.2.0; extra == "dev"
 Requires-Dist: ruff<1.0,>=0.11.0; extra == "dev"
-Requires-Dist: twine<7.0,>=6.1.0; extra == "dev"
-Requires-Dist: wheel<1.0,>=0.45.1; extra == "dev"
 Provides-Extra: test
 Requires-Dist: faker<38.0,>=37.0.2; extra == "test"
 Requires-Dist: feedparser<7.0,>=6.0.11; extra == "test"