aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Fink2026-10-27 23:49:24 +0100
committerDennis Fink2026-10-27 23:49:24 +0100
commitc6a40d741c41cdc0af38eef89247c2120dcb6270 (patch)
tree414df73642a42f4e24b3a0b4bb2bf914d678583d
parent17ab56a3c7d3dbb3d66edf380ab637a61cefe50c (diff)
downloadwebmentions-ssg-c6a40d741c41cdc0af38eef89247c2120dcb6270.tar.gz
webmentions-ssg-c6a40d741c41cdc0af38eef89247c2120dcb6270.zip
fix(core): resolve static type checking issues
-rw-r--r--tests/cli/test_database.py11
-rw-r--r--tests/cli/test_users.py3
-rw-r--r--tests/test_views.py3
-rw-r--r--webmentions_ssg/__init__.py2
-rw-r--r--webmentions_ssg/auth.py4
-rw-r--r--webmentions_ssg/cli/__init__.py2
-rw-r--r--webmentions_ssg/cli/mail.py2
-rw-r--r--webmentions_ssg/cli/users.py5
-rw-r--r--webmentions_ssg/config.py2
-rw-r--r--webmentions_ssg/forms/__init__.py2
-rw-r--r--webmentions_ssg/forms/validators.py2
-rw-r--r--webmentions_ssg/models.py2
-rw-r--r--webmentions_ssg/tasks/__init__.py2
-rw-r--r--webmentions_ssg/tasks/consumer.py2
-rw-r--r--webmentions_ssg/tasks/extension.py2
-rw-r--r--webmentions_ssg/tasks/notifications.py2
-rw-r--r--webmentions_ssg/tasks/receiver.py2
-rw-r--r--webmentions_ssg/tasks/scanner.py2
-rw-r--r--webmentions_ssg/tasks/sender.py2
-rw-r--r--webmentions_ssg/url_security.py2
-rw-r--r--webmentions_ssg/views.py5
21 files changed, 54 insertions, 7 deletions
diff --git a/tests/cli/test_database.py b/tests/cli/test_database.py
index 385e1e6..51b79ac 100644
--- a/tests/cli/test_database.py
+++ b/tests/cli/test_database.py
@@ -35,9 +35,16 @@ def database_app(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> Iterator[Fl
DATABASE.engine.dispose()
+def _script_directory() -> ScriptDirectory:
+ """Open the migration scripts configured for this application."""
+ return ScriptDirectory(str(MIGRATE.directory))
+
+
def _head_revision(app: Flask) -> str:
with app.app_context():
- return ScriptDirectory.from_config(MIGRATE.get_config()).get_current_head()
+ revision = _script_directory().get_current_head()
+ assert revision is not None, "Expected a migration head"
+ return revision
def _database_revision(app: Flask) -> str:
@@ -128,7 +135,7 @@ def test_upgrade_applies_pending_migrations_and_preserves_data(
) -> None:
# Start with the first migration, as if this were an older deployment.
with database_app.app_context():
- base_revision = ScriptDirectory.from_config(MIGRATE.get_config()).get_base()
+ base_revision = _script_directory().get_base()
assert base_revision is not None
assert base_revision != _head_revision(database_app)
migrate_upgrade(revision=base_revision)
diff --git a/tests/cli/test_users.py b/tests/cli/test_users.py
index 24bab0a..6538b27 100644
--- a/tests/cli/test_users.py
+++ b/tests/cli/test_users.py
@@ -7,6 +7,7 @@ from unittest.mock import patch
import pytest
import sqlalchemy as sa
from flask import Flask
+from sqlalchemy.exc import IntegrityError
from webmentions_ssg import DATABASE
from webmentions_ssg.models import User
@@ -221,7 +222,7 @@ def test_users_cli_can_manage_legacy_whitespace_username(app: Flask) -> None:
def test_users_cli_create_rolls_back_on_duplicate_race(app: Flask) -> None:
- database_error = sa.exc.IntegrityError("INSERT", {}, Exception("duplicate"))
+ database_error = IntegrityError("INSERT", {}, Exception("duplicate"))
with app.app_context():
with (
diff --git a/tests/test_views.py b/tests/test_views.py
index 51b94b9..2048594 100644
--- a/tests/test_views.py
+++ b/tests/test_views.py
@@ -11,6 +11,7 @@ import pytest
import sqlalchemy as sa
from flask import Flask
from flask.testing import FlaskClient
+from sqlalchemy.exc import IntegrityError
from webmentions_ssg import DATABASE as db
from webmentions_ssg.models import (
@@ -741,7 +742,7 @@ def test_endpoint_recovers_from_concurrent_insert(
rollback = Mock()
commit = Mock(
side_effect=[
- sa.exc.IntegrityError(
+ IntegrityError(
"INSERT INTO received_webmention ...",
{},
Exception("duplicate source/target"),
diff --git a/webmentions_ssg/__init__.py b/webmentions_ssg/__init__.py
index 7eb8b98..626bba2 100644
--- a/webmentions_ssg/__init__.py
+++ b/webmentions_ssg/__init__.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Initialize the Flask application and its shared extensions."""
+
import logging
import logging.handlers
import os
diff --git a/webmentions_ssg/auth.py b/webmentions_ssg/auth.py
index de5b297..48a95b7 100644
--- a/webmentions_ssg/auth.py
+++ b/webmentions_ssg/auth.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Configure user authentication and session loading."""
+
from flask_login import LoginManager
from . import DATABASE as db
@@ -9,7 +11,7 @@ from .models import User
AUTH = LoginManager()
-AUTH.login_view = "root.login"
+AUTH.login_view = "root.login" # pyright: ignore[reportAttributeAccessIssue]
@AUTH.user_loader
diff --git a/webmentions_ssg/cli/__init__.py b/webmentions_ssg/cli/__init__.py
index 25d78d5..accaaa3 100644
--- a/webmentions_ssg/cli/__init__.py
+++ b/webmentions_ssg/cli/__init__.py
@@ -1,3 +1,5 @@
# SPDX-FileCopyrightText: 2026 Dennis Fink <me+coding@dennisfink.me>
#
# SPDX-License-Identifier: BSD-3-Clause
+
+"""Group the application command-line management modules."""
diff --git a/webmentions_ssg/cli/mail.py b/webmentions_ssg/cli/mail.py
index 3ea903e..47687e2 100644
--- a/webmentions_ssg/cli/mail.py
+++ b/webmentions_ssg/cli/mail.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Provide a command for testing outgoing email configuration."""
+
import click
from flask import current_app
from flask.cli import AppGroup
diff --git a/webmentions_ssg/cli/users.py b/webmentions_ssg/cli/users.py
index 4ece2f4..7c6afde 100644
--- a/webmentions_ssg/cli/users.py
+++ b/webmentions_ssg/cli/users.py
@@ -2,9 +2,12 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Provide commands for managing application user accounts."""
+
import click
import sqlalchemy as sa
from flask.cli import AppGroup
+from sqlalchemy.exc import IntegrityError
from .. import DATABASE
@@ -47,7 +50,7 @@ def create_user(username: str, password: str) -> None:
DATABASE.session.add(User(username=username, password=password))
try:
DATABASE.session.commit()
- except sa.exc.IntegrityError as exc:
+ except IntegrityError as exc:
DATABASE.session.rollback()
raise click.ClickException(f"User {username!r} already exists.") from exc
diff --git a/webmentions_ssg/config.py b/webmentions_ssg/config.py
index ef959c6..6cadbab 100644
--- a/webmentions_ssg/config.py
+++ b/webmentions_ssg/config.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Define application settings for production, development, and testing."""
+
import logging
import secrets
diff --git a/webmentions_ssg/forms/__init__.py b/webmentions_ssg/forms/__init__.py
index 5d2f827..2e3c72c 100644
--- a/webmentions_ssg/forms/__init__.py
+++ b/webmentions_ssg/forms/__init__.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Define forms for login, Webmention submission, and administration."""
+
import re
from flask_wtf import FlaskForm
diff --git a/webmentions_ssg/forms/validators.py b/webmentions_ssg/forms/validators.py
index 990d91a..67ab9c0 100644
--- a/webmentions_ssg/forms/validators.py
+++ b/webmentions_ssg/forms/validators.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Provide validators for URL safety and form field constraints."""
+
from urllib.parse import urlsplit
from flask import current_app
diff --git a/webmentions_ssg/models.py b/webmentions_ssg/models.py
index 73805de..688da67 100644
--- a/webmentions_ssg/models.py
+++ b/webmentions_ssg/models.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Define database models for users and incoming and outgoing Webmentions."""
+
from __future__ import annotations
import uuid
diff --git a/webmentions_ssg/tasks/__init__.py b/webmentions_ssg/tasks/__init__.py
index 62249ca..c744b49 100644
--- a/webmentions_ssg/tasks/__init__.py
+++ b/webmentions_ssg/tasks/__init__.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Expose the background task queue integration."""
+
from .extension import Huey
__all__ = ["Huey"]
diff --git a/webmentions_ssg/tasks/consumer.py b/webmentions_ssg/tasks/consumer.py
index 3ba2638..4dd10c7 100644
--- a/webmentions_ssg/tasks/consumer.py
+++ b/webmentions_ssg/tasks/consumer.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Configure the Huey worker and its scheduled background tasks."""
+
from huey import Huey, crontab
from .. import HUEY, create_app
diff --git a/webmentions_ssg/tasks/extension.py b/webmentions_ssg/tasks/extension.py
index 25f8e47..79d7df9 100644
--- a/webmentions_ssg/tasks/extension.py
+++ b/webmentions_ssg/tasks/extension.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Integrate Huey tasks with Flask application contexts."""
+
from collections.abc import Callable
from functools import wraps
from typing import Any, ParamSpec, TypeVar
diff --git a/webmentions_ssg/tasks/notifications.py b/webmentions_ssg/tasks/notifications.py
index 04c968a..d2195b0 100644
--- a/webmentions_ssg/tasks/notifications.py
+++ b/webmentions_ssg/tasks/notifications.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Send email notifications for verified incoming Webmentions."""
+
import uuid
from flask import current_app
diff --git a/webmentions_ssg/tasks/receiver.py b/webmentions_ssg/tasks/receiver.py
index 8c9c05a..0b7743d 100644
--- a/webmentions_ssg/tasks/receiver.py
+++ b/webmentions_ssg/tasks/receiver.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Fetch and verify incoming Webmentions against their source pages."""
+
import uuid
from urllib.parse import urljoin
diff --git a/webmentions_ssg/tasks/scanner.py b/webmentions_ssg/tasks/scanner.py
index 1980abb..5ab2521 100644
--- a/webmentions_ssg/tasks/scanner.py
+++ b/webmentions_ssg/tasks/scanner.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Scan generated site pages to track outgoing Webmention targets."""
+
from collections.abc import Iterator
from dataclasses import dataclass
from datetime import UTC, datetime
diff --git a/webmentions_ssg/tasks/sender.py b/webmentions_ssg/tasks/sender.py
index 3b79448..cceefcd 100644
--- a/webmentions_ssg/tasks/sender.py
+++ b/webmentions_ssg/tasks/sender.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Discover endpoints and deliver outgoing Webmentions."""
+
import re
import uuid
from datetime import UTC, datetime
diff --git a/webmentions_ssg/url_security.py b/webmentions_ssg/url_security.py
index 716591c..a963635 100644
--- a/webmentions_ssg/url_security.py
+++ b/webmentions_ssg/url_security.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Validate URL schemes and publicly routable network destinations."""
+
import ipaddress
from urllib.parse import urlsplit
diff --git a/webmentions_ssg/views.py b/webmentions_ssg/views.py
index b2f7e7e..23e8406 100644
--- a/webmentions_ssg/views.py
+++ b/webmentions_ssg/views.py
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: BSD-3-Clause
+"""Provide routes for authentication and Webmention administration."""
+
import uuid
from typing import cast
from urllib.parse import urlsplit
@@ -63,7 +65,8 @@ def login() -> ResponseReturnValue:
sa.select(User).where(User.username == form.username.data)
)
- if user is None or not user.check_password(form.password.data):
+ password = form.password.data
+ if user is None or (password is not None and not user.check_password(password)):
flash("Invalid username or password", "danger")
return redirect(url_for("root.login"))