Archival

.github/workflows/docker-image.yml

@@ -45,7 +45,7 @@ jobs:
       - name: set up `uv`
         uses: astral-sh/setup-uv@v5
         with:
-          version: "0.8.18"
+          version: "0.9.28"
           enable-cache: true
           cache-dependency-glob: "uv.lock"
       - name: install pip dependencies with uv

.pre-commit-config.yaml

@@ -4,7 +4,6 @@ repos:
     rev: 1.7.0
     hooks:
     -   id: darker
-        args: ["--diff", "--check"]
 -   repo: https://github.com/asottile/pyupgrade
     rev: v3.17.0
     hooks:
@@ -16,7 +15,7 @@ repos:
   hooks:
     - id: ruff
 - repo: https://github.com/astral-sh/uv-pre-commit
-  rev: '0.8.18'
+  rev: '0.9.28'
   hooks:
     - id: uv-lock
 - repo: https://github.com/semgrep/pre-commit

docker/base.Dockerfile

@@ -9,7 +9,7 @@ ARG GID=1000
 ENV LANG=C.UTF-8 DEBIAN_FRONTEND=noninteractive
 
 COPY etc/apt /etc/apt
-COPY --from=ghcr.io/astral-sh/uv:0.6.2 /uv /uvx /usr/local/bin/
+COPY --from=ghcr.io/astral-sh/uv:0.9.28 /uv /uvx /usr/local/bin/
 
 # Install Debian packages
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \

pycroft/helpers/functional.py

@@ -19,3 +19,7 @@ def map_collecting_errors[
         except error_type as e:
             errors.append(e)
     return results, errors
+
+
+def identity[T](x: T) -> T:
+    return x

pycroft/helpers/i18n/deferred.py

@@ -11,7 +11,7 @@
 from .message import SimpleMessage, NumericalMessage
 
 
-def deferred_gettext(message) -> SimpleMessage:
+def deferred_gettext(message: str) -> SimpleMessage:
     return SimpleMessage(message)
 
 

pycroft/helpers/i18n/message.py

@@ -66,7 +66,7 @@ def from_json(cls, json_string: str) -> Message:
         return m
 
     def __init__(self, domain: str | None = None):
-        self.domain = domain
+        self.domain: str | None = domain
         self.args: typing.Iterable[Serializable] = ()
         self.kwargs: dict[str, Serializable] = {}
 
@@ -131,9 +131,9 @@ def _gettext(self):
 class SimpleMessage(Message):
     __slots__ = ("message",)
 
-    def __init__(self, message, domain=None):
+    def __init__(self, message: str, domain: str | None = None):
         super().__init__(domain)
-        self.message = message
+        self.message: str = message
 
     @t.override
     def _base_dict(self):

pycroft/helpers/i18n/serde.py

@@ -12,14 +12,11 @@
 from datetime import date, datetime, time, timedelta
 from decimal import Decimal
 
+from ..functional import identity
 from .types import Interval, NegativeInfinity, PositiveInfinity, Bound, Money
 from .utils import qualified_typename
 
 
-def identity(x):
-    return x
-
-
 def deserialize_money(v):
     try:
         return Money(Decimal(v[0]), v[1])

pycroft/lib/logging.py

@@ -19,7 +19,7 @@
 def _create_log_entry[
     TLogEntry: LogEntry
 ](
-    class_: t.Type[TLogEntry],
+    class_: type[TLogEntry],
     message: str,
     author: User,
     created_at: datetime | None = None,

pycroft/lib/membership.py

@@ -9,12 +9,16 @@
 management.
 
 """
+from __future__ import annotations
 import typing as t
 
-from sqlalchemy import and_, func, distinct, Result
+from sqlalchemy import and_, func, distinct, Result, nulls_last
 from sqlalchemy.future import select
 from sqlalchemy.orm import aliased, Session
+from sqlalchemy.sql import Select
+from sqlalchemy.sql._typing import _TypedColumnClauseArgument, _ByArgument
 
+from pycroft import Config
 from pycroft.helpers import utc
 from pycroft.helpers.i18n import deferred_gettext
 from pycroft.helpers.interval import UnboundedInterval, IntervalSet, Interval, closedopen
@@ -239,3 +243,46 @@ def change_membership_active_during(
         .to_json()
     )
     log_user_event(message, processor, membership.user)
+
+
+def select_user_and_last_mem() -> Select[tuple[int, int, DateTimeTz]]:
+    """Select users with their last membership of a user in the ``member`` group.
+
+    :returns: a select statement with columns ``user_id``, ``mem_id``, ``mem_end``.
+    """
+    mem_ends_at = func.upper(Membership.active_during)
+    # see FunctionElement.over for documentation on `partition_by`, `order_by`
+    # ideally, sqlalchemy would support named windows;
+    # instead, we have to re-use the arguments.
+    window_args: _WindowArgs = {
+        "partition_by": User.id,
+        "order_by": nulls_last(mem_ends_at),
+    }
+    return (
+        select()
+        .select_from(User)
+        .distinct()
+        .join(Membership)
+        .join(Config, Config.member_group_id == Membership.group_id)
+        .with_only_columns(
+            User.id.label("user_id"),
+            t.cast(
+                _TypedColumnClauseArgument[int],
+                func.last_value(Membership.id)
+                .over(**window_args, rows=(None, None))
+                .label("mem_id"),
+            ),
+            t.cast(
+                _TypedColumnClauseArgument[str],
+                func.last_value(mem_ends_at)
+                .over(**window_args, rows=(None, None))
+                .label("mem_end"),
+            ),
+        )
+    )
+
+
+class _WindowArgs(t.TypedDict):
+    partition_by: _ByArgument
+    order_by: _ByArgument
+