udata 11.1.2.dev6__py3-none-any.whl → 11.1.2.dev8__py3-none-any.whl

udata/commands/db.py

@@ -5,7 +5,6 @@ import os
 import sys
 import traceback
 from itertools import groupby
-from typing import Optional
 from uuid import uuid4
 
 import click
@@ -434,8 +433,8 @@ def check_integrity(models):
 def check_duplicate_resources_ids(
     skip_duplicates_inside_dataset: bool,
     skip_duplicates_outside_dataset: bool,
-    exclude_org: Optional[str],
-    only_org: Optional[str],
+    exclude_org: str | None,
+    only_org: str | None,
     fix: bool,
 ):
     resources = {}

udata/core/dataservices/api.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-from typing import List
 
 import mongoengine
 from bson import ObjectId
@@ -63,7 +62,7 @@ class DataservicesAtomFeedAPI(API):
             _("Latest APIs"), description=None, feed_url=request.url, link=request.url_root
         )
 
-        dataservices: List[Dataservice] = (
+        dataservices: list[Dataservice] = (
             Dataservice.objects.visible().order_by("-created_at").limit(current_site.feed_size)
         )
         for dataservice in dataservices:

udata/core/dataservices/models.py

@@ -144,9 +144,8 @@ def filter_by_topic(base_query, filter_value):
     else:
         return base_query.filter(
             id__in=[
-                elt.element.id
-                for elt in topic.elements
-                if elt.element.__class__.__name__ == "Dataservice"
+                element.element.id
+                for element in topic.elements.filter(__raw__={"element._cls": "Dataservice"})
             ]
         )
 

udata/core/dataset/api.py

@@ -20,7 +20,6 @@ These changes might lead to backward compatibility breakage meaning:
 import logging
 import os
 from datetime import datetime
-from typing import List
 
 import mongoengine
 from bson.objectid import ObjectId
@@ -332,7 +331,7 @@ class DatasetsAtomFeedAPI(API):
             link=request.url_root,
         )
 
-        datasets: List[Dataset] = (
+        datasets: list[Dataset] = (
             Dataset.objects.visible().order_by("-created_at_internal").limit(current_site.feed_size)
         )
         for dataset in datasets:

udata/core/dataset/preview.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 from flask import current_app
 
@@ -12,12 +12,12 @@ if TYPE_CHECKING:
 # Define an abstract class
 class Preview(ABC):
     @abstractmethod
-    def preview_url(self, resource: Resource) -> Optional[str]:
+    def preview_url(self, resource: Resource) -> str | None:
         return None
 
 
 class TabularAPIPreview(Preview):
-    def preview_url(self, resource: Resource) -> Optional[str]:
+    def preview_url(self, resource: Resource) -> str | None:
         preview_base_url = current_app.config["TABULAR_EXPLORE_URL"]
         if not preview_base_url:
             return None

udata/core/dataset/rdf.py

@@ -6,7 +6,6 @@ import calendar
 import json
 import logging
 from datetime import date, datetime
-from typing import Optional
 
 from dateutil.parser import parse as parse_dt
 from flask import current_app
@@ -102,9 +101,7 @@ EU_RDF_REQUENCIES = {
 }
 
 
-def temporal_to_rdf(
-    daterange: db.DateRange, graph: Optional[Graph] = None
-) -> Optional[RdfResource]:
+def temporal_to_rdf(daterange: db.DateRange, graph: Graph | None = None) -> RdfResource | None:
     if not daterange:
         return
     graph = graph or Graph(namespace_manager=namespace_manager)
@@ -117,13 +114,13 @@ def temporal_to_rdf(
     return pot
 
 
-def frequency_to_rdf(frequency: str, graph: Optional[Graph] = None) -> Optional[str]:
+def frequency_to_rdf(frequency: str, graph: Graph | None = None) -> str | None:
     if not frequency:
         return
     return RDF_FREQUENCIES.get(frequency, getattr(FREQ, frequency))
 
 
-def owner_to_rdf(dataset: Dataset, graph: Optional[Graph] = None) -> Optional[RdfResource]:
+def owner_to_rdf(dataset: Dataset, graph: Graph | None = None) -> RdfResource | None:
     from udata.core.organization.rdf import organization_to_rdf
     from udata.core.user.rdf import user_to_rdf
 
@@ -134,7 +131,7 @@ def owner_to_rdf(dataset: Dataset, graph: Optional[Graph] = None) -> Optional[Rd
     return
 
 
-def detect_ogc_service(resource: Resource) -> Optional[str]:
+def detect_ogc_service(resource: Resource) -> str | None:
     """
     Detect if the resource points towards an OGC Service based on either
     * a known OGC Service format
@@ -153,8 +150,8 @@ def detect_ogc_service(resource: Resource) -> Optional[str]:
 def ogc_service_to_rdf(
     dataset: Dataset,
     resource: Resource,
-    ogc_service_type: Optional[str] = None,
-    graph: Optional[Graph] = None,
+    ogc_service_type: str | None = None,
+    graph: Graph | None = None,
     is_hvd: bool = False,
 ) -> RdfResource:
     """
@@ -196,8 +193,8 @@ def ogc_service_to_rdf(
 
 def resource_to_rdf(
     resource: Resource,
-    dataset: Optional[Dataset] = None,
-    graph: Optional[Graph] = None,
+    dataset: Dataset | None = None,
+    graph: Graph | None = None,
     is_hvd: bool = False,
 ) -> RdfResource:
     """
@@ -261,7 +258,7 @@ def dataset_to_graph_id(dataset: Dataset) -> URIRef | BNode:
         return BNode()
 
 
-def dataset_to_rdf(dataset: Dataset, graph: Optional[Graph] = None) -> RdfResource:
+def dataset_to_rdf(dataset: Dataset, graph: Graph | None = None) -> RdfResource:
     """
     Map a dataset domain model to a DCAT/RDF graph
     """

udata/core/metrics/helpers.py

@@ -1,7 +1,6 @@
 import logging
 from collections import OrderedDict
 from datetime import datetime, timedelta
-from typing import Dict, List, Union
 from urllib.parse import urlencode
 
 import requests
@@ -14,13 +13,13 @@ from pymongo.command_cursor import CommandCursor
 log = logging.getLogger(__name__)
 
 
-def get_last_13_months() -> List[str]:
+def get_last_13_months() -> list[str]:
     dstart = datetime.today().replace(day=1) - timedelta(days=365)
     months = rrule(freq=MONTHLY, count=13, dtstart=dstart)
     return [month.strftime("%Y-%m") for month in months]
 
 
-def compute_monthly_metrics(metrics_data: List[Dict], metrics_labels: List[str]) -> OrderedDict:
+def compute_monthly_metrics(metrics_data: list[dict], metrics_labels: list[str]) -> OrderedDict:
     # Initialize default monthly_metrics
     monthly_metrics = OrderedDict(
         (month, {label: 0 for label in metrics_labels}) for month in get_last_13_months()
@@ -35,7 +34,7 @@ def compute_monthly_metrics(metrics_data: List[Dict], metrics_labels: List[str])
     return monthly_metrics
 
 
-def metrics_by_label(monthly_metrics: Dict, metrics_labels: List[str]) -> List[OrderedDict]:
+def metrics_by_label(monthly_metrics: dict, metrics_labels: list[str]) -> list[OrderedDict]:
     metrics_by_label = []
     for label in metrics_labels:
         metrics_by_label.append(
@@ -45,8 +44,8 @@ def metrics_by_label(monthly_metrics: Dict, metrics_labels: List[str]) -> List[O
 
 
 def get_metrics_for_model(
-    model: str, id: Union[str, ObjectId, None], metrics_labels: List[str]
-) -> List[OrderedDict]:
+    model: str, id: str | ObjectId | None, metrics_labels: list[str]
+) -> list[OrderedDict]:
     """
     Get distant metrics for a particular model object
     """
@@ -69,7 +68,7 @@ def get_metrics_for_model(
         return [{} for _ in range(len(metrics_labels))]
 
 
-def get_download_url(model: str, id: Union[str, ObjectId, None]) -> str:
+def get_download_url(model: str, id: str | ObjectId | None) -> str:
     api_namespace = model + "s" if model != "site" else model
     base_url = f"{current_app.config['METRICS_API']}/{api_namespace}/data/csv/"
     args = {"metric_month__sort": "asc"}

udata/core/metrics/tasks.py

@@ -1,7 +1,6 @@
 import logging
 import time
 from functools import wraps
-from typing import Dict, List
 
 import requests
 from flask import current_app
@@ -17,9 +16,7 @@ log = logging.getLogger(__name__)
 def log_timing(func):
     @wraps(func)
     def timeit_wrapper(*args, **kwargs):
-        # Better log if we're using Python 3.9
-        name = func.__name__
-        model = name.removeprefix("update_") if hasattr(name, "removeprefix") else name
+        model = func.__name__.removeprefix("update_")
 
         log.info(f"Processing {model}…")
         start_time = time.perf_counter()
@@ -31,7 +28,7 @@ def log_timing(func):
     return timeit_wrapper
 
 
-def save_model(model: db.Document, model_id: str, metrics: Dict[str, int]) -> None:
+def save_model(model: db.Document, model_id: str, metrics: dict[str, int]) -> None:
     try:
         result = model.objects(id=model_id).update(
             **{f"set__metrics__{key}": value for key, value in metrics.items()}
@@ -43,7 +40,7 @@ def save_model(model: db.Document, model_id: str, metrics: Dict[str, int]) -> No
         log.exception(e)
 
 
-def iterate_on_metrics(target: str, value_keys: List[str], page_size: int = 50) -> dict:
+def iterate_on_metrics(target: str, value_keys: list[str], page_size: int = 50) -> dict:
     """
     Yield all elements with not zero values for the keys inside `value_keys`.
     If you pass ['visit', 'download_resource'], it will do a `OR` and get

udata/core/post/api.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-from typing import List
 
 from feedgenerator.django.utils.feedgenerator import Atom1Feed
 from flask import make_response, request
@@ -122,7 +121,7 @@ class PostsAtomFeedAPI(API):
             link=request.url_root,
         )
 
-        posts: List[Post] = Post.objects().published().order_by("-published").limit(15)
+        posts: list[Post] = Post.objects().published().order_by("-published").limit(15)
         for post in posts:
             feed.add_item(
                 post.name,

udata/core/reuse/api.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-from typing import List
 
 import mongoengine
 from bson.objectid import ObjectId
@@ -144,7 +143,7 @@ class ReusesAtomFeedAPI(API):
             link=request.url_root,
         )
 
-        reuses: List[Reuse] = Reuse.objects.visible().order_by("-created_at").limit(15)
+        reuses: list[Reuse] = Reuse.objects.visible().order_by("-created_at").limit(15)
         for reuse in reuses:
             author_name = None
             author_uri = None

udata/core/user/api.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from flask_security import current_user, logout_user
 from slugify import slugify
 
@@ -370,7 +368,7 @@ suggest_parser.add_argument(
 )
 
 
-def suggest_size(value: str) -> Optional[int]:
+def suggest_size(value: str) -> int | None:
     """Parse an integer that must be between 1 and 20."""
     help_message = "The size must be an integer between 1 and 20."
     try:

udata/migrations/2025-01-05-dataservices-fields-changes.py

@@ -3,7 +3,6 @@ This migration keeps only the "Local authority" badge if the organization also h
 """
 
 import logging
-from typing import List
 
 from mongoengine.connection import get_db
 
@@ -84,7 +83,7 @@ def migrate(db):
     )
     log.info(f"\t{count.modified_count} open dataservices to DATASERVICE_ACCESS_TYPE_OPEN")
 
-    dataservices: List[Dataservice] = get_db().dataservice.find()
+    dataservices: list[Dataservice] = get_db().dataservice.find()
     for dataservice in dataservices:
         if (
             "endpoint_description_url" not in dataservice