From 52fc66cb5ff19bf0def001ae50acc1b465a0b977 Mon Sep 17 00:00:00 2001 From: Dennis Fink Date: Thu, 12 Nov 2026 23:34:46 +0100 Subject: fix(core): decouple task imports from app initialization Keep stable lazy task handles that register against the active Huey backend so modules can be imported before app creation and survive backend reinitialization. Separate package metadata and the shared blueprint from application startup to remove import-order dependencies and keep build-time version lookup lightweight. --- webmentions_ssg/views/__init__.py | 14 ++++---------- webmentions_ssg/views/admin.py | 2 +- webmentions_ssg/views/blueprint.py | 9 +++++++++ webmentions_ssg/views/endpoint.py | 2 +- webmentions_ssg/views/session.py | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 webmentions_ssg/views/blueprint.py (limited to 'webmentions_ssg/views') diff --git a/webmentions_ssg/views/__init__.py b/webmentions_ssg/views/__init__.py index 91966d4..ffe9a27 100644 --- a/webmentions_ssg/views/__init__.py +++ b/webmentions_ssg/views/__init__.py @@ -2,15 +2,9 @@ # # SPDX-License-Identifier: BSD-3-Clause -"""Register all views under the historic root Blueprint.""" +"""Collect and expose the routes for the historic root Blueprint.""" -from flask import Blueprint +from . import admin, endpoint, session +from .blueprint import root_page -root_page = Blueprint("root", __name__) - - -def register_routes() -> Blueprint: - """Import task-backed view handlers after Huey initialization and return the Blueprint.""" - from . import admin, endpoint, session # noqa: F401 - - return root_page +__all__ = ["admin", "endpoint", "root_page", "session"] diff --git a/webmentions_ssg/views/admin.py b/webmentions_ssg/views/admin.py index dadf8dd..e7c5325 100644 --- a/webmentions_ssg/views/admin.py +++ b/webmentions_ssg/views/admin.py @@ -18,7 +18,7 @@ from ..models import ReceivedWebmention, SentWebmention, Source from ..tasks.receiver import verify_webmention from ..tasks.scanner import manual_scan_sources from ..tasks.sender import send_webmention -from . import root_page +from .blueprint import root_page @root_page.route("/received") diff --git a/webmentions_ssg/views/blueprint.py b/webmentions_ssg/views/blueprint.py new file mode 100644 index 0000000..136d319 --- /dev/null +++ b/webmentions_ssg/views/blueprint.py @@ -0,0 +1,9 @@ +# SPDX-FileCopyrightText: 2026 Dennis Fink +# +# SPDX-License-Identifier: BSD-3-Clause + +"""The shared Blueprint used by all Webmention views.""" + +from flask import Blueprint + +root_page = Blueprint("root", __name__) diff --git a/webmentions_ssg/views/endpoint.py b/webmentions_ssg/views/endpoint.py index 91bb881..95e8731 100644 --- a/webmentions_ssg/views/endpoint.py +++ b/webmentions_ssg/views/endpoint.py @@ -18,7 +18,7 @@ from .. import forms from ..extensions import csrf, db, limiter from ..models import ReceivedWebmention, received_url_digest from ..tasks.receiver import verify_webmention -from . import root_page +from .blueprint import root_page def submit_received(source: str, target: str) -> tuple[uuid.UUID, bool] | None: diff --git a/webmentions_ssg/views/session.py b/webmentions_ssg/views/session.py index e4c462f..b78fd13 100644 --- a/webmentions_ssg/views/session.py +++ b/webmentions_ssg/views/session.py @@ -13,7 +13,7 @@ from .. import forms from ..auth import DUMMY_USER, is_safe_next_url, login_username_limit_key from ..extensions import db, limiter from ..models import User -from . import root_page +from .blueprint import root_page @root_page.route("/") -- cgit v1.3.1