So long flask, and thanks for all the fish!

.github/copilot-instructions.md

@@ -0,0 +1,12 @@
+Rules
+==
+
+Pull request reviews MUST be done in a pirate voice.
+When small errors (e.g., typos) are called out,
+the phrase “you made an oopsie” must be included.
+
+
+Mention opportunities to use modern language features, remove legacy code or otherwise simplify.
+Legacy abstractions are fancy_property, datasources/backends.
+Focus on correctness and testability.
+We want to use pytest-snapshot and hypothesis where it makes sense.

docs/source/model.rst

@@ -36,20 +36,6 @@ User
    :noindex:
 
 
-`.fancy_property`
------------------
-
-..
-  TODO use better documentation here!
-
-
-.. automodule:: sipa.model.fancy_property
-   :member-order: bysource
-   :members:
-   :undoc-members:
-   :noindex:
-
-
 `.finance`
 ----------
 

pyproject.toml

@@ -25,17 +25,19 @@ dependencies = [
     "factory-boy ~= 3.2.1",
     "psycopg2 ~= 2.9.3",
     "Flask-QRcode ~= 3.1.0",
-    "email_validator ~= 1.2.1",
+    "email-validator~=2.3.0",
     "Werkzeug ~= 3.0.1",
     "sentry-sdk[flask] ~= 1.39.2",
     # Pin to avoid incompatibility
     "jinja2 ~= 3.1.2",
     "MarkupSafe ~= 2.1.1",
-    "recurring_ical_events ~= 1.0.2b0",
+    "recurring_ical_events ~= 3.8.0",
     "cachetools ~= 5.2.0",
     "python-dotenv ~= 0.21.0",
     "pydantic ~= 2.11.7",
     "wtforms_widgets",
+    "fastapi[standard-no-fastapi-cloud-cli]>=0.128.5",
+    "fastapi-babel>=1.0.0",
 ]
 [dependency-groups]
 prod = [
@@ -60,8 +62,16 @@ dev = [
     "types-requests>=2.31.0.6",
     "types-wtforms>=3.2.1.20250809",
     "ipython>=9.5.0",
+    "uvicorn-hmr[all]>=0.1.1.8",
+    "watchfiles>=1.1.1",
 ]
 
+[tool.hatch.build.targets.wheel]
+include = ["sipa/static/**"]
+
+[tool.hatch.build.targets.sdist]
+include = ["sipa/static/**"]
+
 [tool.uv.sources]
 wtforms-widgets = { path = "wtforms_widgets", editable = true }
 

sipa/_pkg_path.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from importlib.resources import files
+from pathlib import Path
+
+
+def get_package_path(suffix: str = "") -> str:
+    fs_path = Path(__file__).resolve().parent
+    if fs_path.is_dir():
+        return str(fs_path / suffix)
+
+    pkg_path = files("sipa")
+    if pkg_path.is_dir():
+        return str(pkg_path / suffix)
+
+    raise AssertionError
+
+

sipa/asgi.py

@@ -0,0 +1,4 @@
+from sipa.fastapi import create_app
+
+
+app = create_app()

sipa/babel.py

@@ -4,7 +4,9 @@
 import typing as t
 
 from babel import Locale, UnknownLocaleError, negotiate_locale
-from flask import request, session, Request, g
+from fastapi import Request
+from flask import Request as FlaskRequest
+from flask import g, request, session
 from werkzeug.exceptions import BadRequest
 
 logger = logging.getLogger(__name__)
@@ -15,6 +17,14 @@ def possible_locales() -> list[Locale]:
     return [Locale('de'), Locale('en')]
 
 
+def fastapi_locale_selector(request: Request) -> str | None:
+    available: list[str] = [str(p) for p in possible_locales()]
+
+    if (cookielang := request.cookies.get("lang")) in available:
+        return cookielang
+    return negotiate_locale(request.headers.values(), available, sep="-")
+
+
 def get_user_locale_setting() -> Locale | None:
     """Get a user's explicit locale setting, if available."""
     if (locale_identifier := session.get("locale")) is None:
@@ -76,7 +86,7 @@ def select_locale() -> str:
         list(map(str, possible_locales())), sep='-')
 
 
-def _iter_preferred_locales(request: Request) -> t.Iterator[str]:
+def _iter_preferred_locales(request: FlaskRequest) -> t.Iterator[str]:
     if (user_locale := str(get_user_locale_setting())) is not None:
         yield user_locale
     yield from request.accept_languages.values()

sipa/backends/datasource.py

@@ -13,6 +13,7 @@
 InitContextCallable = Callable[[Flask], None]
 
 
+# TODO remove abstraction, turn into `Pycroft` datasource and set reasonable defaults
 class DataSource:
     """A class providing a certain Backend.
 

sipa/backends/extension.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+import warnings
 
 from typing import NamedTuple, cast
 
@@ -68,6 +69,11 @@ def init_app(self, app: Flask):
 
         :param app: The flask app object to register against
         """
+        warnings.warn(
+            "Use constructor with pre-onfigured datasource instead",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         if "backends" in app.extensions:
             logger.warning("Backends extension already initialized. Skipping.")
             return
@@ -143,7 +149,9 @@ def user_from_ip(self, ip: str) -> UserLike | None:
         if not self.dormitory_from_ip(ip):
             return AnonymousUserMixin()
 
-        return self.datasource.user_class.from_ip(ip)
+        # TODO move closer to where it's actually used
+        from sipa.model.pycroft.user import fetch_by_ip
+        return fetch_by_ip(__TODO_API, ip)
 
 
 #: A namedtuple to improve readability of some return values
@@ -152,5 +160,6 @@ class _dorm_summary(NamedTuple):
     display_name: str
 
 
+# TODO deprecated: should not be used
 backends: Backends = cast(Backends,
                           LocalProxy(lambda: current_app.extensions['backends']))

sipa/base.py

@@ -33,10 +33,7 @@ class IntegerConverter(BaseIntegerConverter):
 def load_user(username):
     """Loads a User object from/into the session at every request
     """
-    logger.debug("User loader triggered (%r)", username)
-    _cleanup_session(session)
-    User = backends.datasource.user_class
-    return User.get(username)
+    raise NotImplementedError("unsupported, move to new API")
 
 
 def _cleanup_session(session):

sipa/blueprints/features.py

@@ -2,67 +2,74 @@
 Basically, this is everything that is to specific to appear in the generic.py
 and does not fit into any other blueprint such as “documents”.
 """
+import typing as t
+from fastapi import APIRouter, Request
+from fastapi.responses import HTMLResponse
+from flask import Blueprint, render_template_string
 
-from flask import Blueprint, current_app, render_template, render_template_string
-
-from sipa.utils import get_bustimes, meetingcal, support_hotline_available, support_cal
+from sipa.deps import Templates, Settings
+from sipa.utils import get_bustimes, meetingcal, support_cal, support_hotline_available, TimeTable
 
 bp_features = Blueprint('features', __name__)
+router_features = APIRouter(default_response_class=HTMLResponse)
 
 
-@bp_features.route("/bustimes")
-@bp_features.route("/bustimes/<string:stopname>")
-def bustimes(stopname=None):
+@router_features.get("/bustimes")
+@router_features.get("/bustimes/{stopname}")
+def bustimes(
+    tp: Templates,
+    r: Request,
+    s: Settings,
+    stopname: str | None = None,
+):
     """Queries the VVO-Online widget for the given stop.
     If no specific stop is given in the URL, it will query all
     stops set up in the config.
     """
-    data = {}
-
-    if stopname:
-        # Only one stop requested
-        data[stopname] = get_bustimes(stopname)
-    else:
-        # General output page
-        for stop in current_app.config['BUSSTOPS']:
-            data[stop] = get_bustimes(stop, 4)
-
-    return render_template('bustimes.html', stops=data, stopname=stopname)
+    stops: dict[str, t.Iterable[TimeTable]] = (
+        {stopname: get_bustimes(stopname)}
+        if stopname
+        else {stop: get_bustimes(stop, 4) for stop in s.busstops}
+    )
+    return tp.TemplateResponse(r, "bustimes.html", {"stops": stops})
 
 
-@bp_features.route("/meetingcal")
-def render_meetingcal():
-    meetings = meetingcal()
-    return render_template('meetingcal.html', meetings=meetings)
+@router_features.get("/meetingcal", name="features.render_meetingcal")
+def render_meetingcal(tp: Templates, r: Request, s: Settings):
+    # TODO turn into proper component
+    return tp.TemplateResponse(
+        request=r,
+        name="meetingcal.html",
+        context={"meetings": meetingcal(url=(s.meetings_ical_url))}
+    )
 
 
-@bp_features.route("/meetings-fragment")
-def meetings():
-    return render_template_string(
-        """
-            {%- from "macros/ical.html" import render_meetingcal -%}
-            {{- render_meetingcal(meetingcal) -}}
-        """,
-        meetingcal=meetingcal(),
+@router_features.get("/meetings-fragment", name="features.meetings")
+def meetings_fragment(tp: Templates, r: Request, s: Settings):
+    # TODO turn into proper component
+    # TODO think about `FragmentResponse` or some other helper which
+    # - when sent with `HX-Request: true`: only sends the fragment
+    # - otherwise: embeds it in a default “fragment” presenter
+    return tp.TemplateResponse(
+        request=r,
+        name="meetingcal-fragment.html",
+        context={"meetingcal": meetingcal(url=s.meetings_ical_url)},
     )
 
-@bp_features.route("/support-fragment")
-def support_office():
-    return render_template_string(
-        """
-        {%- from "macros/ical.html" import render_support -%}
-        {{- render_support(supports) -}}
-        """,
-        supports=support_cal(),
+
+@router_features.get("/support-fragment", name="features.support_office")
+def support_office(tp: Templates, r: Request, s: Settings):
+    return tp.TemplateResponse(
+        r,
+        "support-fragment.html",
+        context={"supports": support_cal(s)},
     )
 
 
-@bp_features.route("/hotline-fragment")
-def hotline():
-    return render_template_string(
-        """
-        {%- from "macros/support-hotline.html" import hotline_description -%}
-        {{- hotline_description(available=available) -}}
-        """,
-        available=support_hotline_available(),
+@router_features.get("/hotline-fragment", name="features.hotline")
+def hotline(tp: Templates, request: Request, s: Settings):
+    return tp.TemplateResponse(
+        request,
+        "hotline-fragment.html",
+        context={"available": support_hotline_available(uri=str(s.pbx_uri))},
     )