move ruff and ty configurations to their own files

Author: VerdantFox

app/datastore/database.py

@@ -42,7 +42,7 @@ def get_engine(
     return ENGINE
 
 
-async def get_db_session() -> AsyncGenerator[AsyncSession, None]:
+async def get_db_session() -> AsyncGenerator[AsyncSession]:
     """Start a SessionLocal transaction and yield it."""
     engine = get_engine()
     async_session = async_sessionmaker(engine, expire_on_commit=False)

app/datastore/db_models.py

@@ -114,8 +114,8 @@ class BlogPost(Base):
     id: Mapped[IntPK]
     title: Mapped[StrIndexedUnique]
     slug: Mapped[StrIndexedUnique]
-    old_slugs: Mapped[list["OldBlogPostSlug"]] = relationship(back_populates="blog_post")
-    tags: Mapped[list["BlogPostTag"]] = relationship(
+    old_slugs: Mapped[list[OldBlogPostSlug]] = relationship(back_populates="blog_post")
+    tags: Mapped[list[BlogPostTag]] = relationship(
         secondary="blog_tags_associations",
         back_populates="blog_posts",
         order_by="asc(BlogPostTag.tag)",
@@ -131,20 +131,20 @@ class BlogPost(Base):
     html_content: Mapped[str]
     html_toc: Mapped[str]
 
-    media: Mapped[list["BlogPostMedia"]] = relationship(
+    media: Mapped[list[BlogPostMedia]] = relationship(
         back_populates="blog_post",
         order_by="asc(BlogPostMedia.position), asc(BlogPostMedia.created_timestamp)",
     )
     created_timestamp: Mapped[DateTimeIndexed]
     updated_timestamp: Mapped[DateTimeIndexed]
     likes: Mapped[IntIndexed]
     views: Mapped[IntIndexed]
-    comments: Mapped[list["BlogPostComment"]] = relationship(
+    comments: Mapped[list[BlogPostComment]] = relationship(
         back_populates="blog_post", order_by="asc(BlogPostComment.created_timestamp)"
     )
     series_id: Mapped[BPSeriesFK | None]
     series_position: Mapped[IntNullable]
-    series: Mapped["BlogPostSeries"] = relationship(back_populates="posts")
+    series: Mapped[BlogPostSeries] = relationship(back_populates="posts")
 
     ts_vector: Mapped[TSVector] = mapped_column(
         TSVector(),
@@ -160,7 +160,7 @@ class OldBlogPostSlug(Base):
 
     slug: Mapped[StrPK]
     blog_post_id: Mapped[BlogPostFK]
-    blog_post: Mapped["BlogPost"] = relationship(back_populates="old_slugs")
+    blog_post: Mapped[BlogPost] = relationship(back_populates="old_slugs")
 
 
 class BlogPostTag(Base):
@@ -169,7 +169,7 @@ class BlogPostTag(Base):
     __tablename__ = "blog_post_tags"
 
     tag: Mapped[StrPK]
-    blog_posts: Mapped[list["BlogPost"]] = relationship(
+    blog_posts: Mapped[list[BlogPost]] = relationship(
         secondary="blog_tags_associations", back_populates="tags"
     )
 
@@ -191,7 +191,7 @@ class BlogPostMedia(Base):
 
     id: Mapped[IntPK]
     blog_post_id: Mapped[BlogPostFK | None]
-    blog_post: Mapped["BlogPost"] = relationship(back_populates="media")
+    blog_post: Mapped[BlogPost] = relationship(back_populates="media")
     name: Mapped[str]
     locations: Mapped[str]
     media_type: Mapped[str]
@@ -210,12 +210,12 @@ class BlogPostComment(Base):
 
     id: Mapped[IntPK]
     blog_post_id: Mapped[BlogPostFK | None]
-    blog_post: Mapped["BlogPost"] = relationship(back_populates="comments")
+    blog_post: Mapped[BlogPost] = relationship(back_populates="comments")
     name: Mapped[StrNullable]  # Name of the commenter
     email: Mapped[StrNullable]  # Email of the commenter
     guest_id: Mapped[StrNullable]  # Guest ID of the commenter
     user_id: Mapped[UsersFk | None]
-    user: Mapped["User"] = relationship()
+    user: Mapped[User] = relationship()
     md_content: Mapped[str]
     html_content: Mapped[str]
     created_timestamp: Mapped[DateTimeIndexed]
@@ -262,4 +262,4 @@ class PasswordResetToken(Base):
     encrypted_query: Mapped[StrIndexedUnique]
     created_timestamp: Mapped[DateTimeIndexed]
     expires_timestamp: Mapped[DateTimeIndexed]
-    user: Mapped["User"] = relationship()
+    user: Mapped[User] = relationship()

app/permissions.py

@@ -47,7 +47,7 @@ def requires_permission(permission: Action) -> Callable:
 
     def decorator(func: Callable) -> Callable:
         @wraps(func)
-        async def wrapper(*args: Any, current_user: "AuthUserMixin", **kwargs: Any) -> Any:
+        async def wrapper(*args: Any, current_user: AuthUserMixin, **kwargs: Any) -> Any:
             if not current_user.has_permission(permission):
                 raise errors.UserPermissionsError
             return await func(*args, current_user=current_user, **kwargs)

app/web/html/templates/shared/base.html

@@ -1,6 +1,6 @@
 {% set libraries_static_version = 'e454b3c1' %}
 {% set custom_static_version = '56505df6' %}
-{% set tailwind_static_version = '254b2dde' %}
+{% set tailwind_static_version = '12fb53c3' %}
 <!doctype html>
 <html
   lang="en"

app/web/main.py

@@ -56,7 +56,7 @@ async def api_home(request: Request) -> RedirectResponse:
 
 
 @asynccontextmanager
-async def lifespan(app: FastAPI) -> AsyncGenerator[None, None]:  # noqa: ARG001 (unused-argument)
+async def lifespan(app: FastAPI) -> AsyncGenerator[None]:  # noqa: ARG001 (unused-argument)
     """Code to run before taking any requests and just before shutdown."""
     engine = get_engine()
     try:

pyproject.toml

@@ -189,144 +189,3 @@ exclude_lines = [
 ]
 include = ["app/*", "scripts/*", "tests/*"]
 skip_covered = true # Don't show fully covered files in the report
-
-
-# ----------------------- Ty: type checker ---------------------------------
-# Reference: https://docs.astral.sh/ty/reference/configuration/
-[tool.ty.environment]
-python = "./venv"
-python-version = "3.14"
-
-
-# Rules references: https://docs.astral.sh/ty/reference/rules/
-# Most rules have a default value already ("error", "warn", "ignore")
-# This overwrites some of those rules
-[tool.ty.rules]
-invalid-ignore-comment = "error"
-possibly-unbound-attribute = "error"
-possibly-unbound-import = "error"
-redundant-cast = "error"
-undefined-reveal = "error"
-unknown-rule = "error"
-unresolved-global = "error"
-unsupported-base = "error"
-division-by-zero = "error"
-possibly-unresolved-reference = "error"
-unused-ignore-comment = "error"
-
-
-# ------------------------ Ruff: linter + formatter-------------------------
-# Reference: https://docs.astral.sh/ruff/configuration/
-[tool.ruff]
-line-length = 100
-target-version = "py314"
-
-
-[tool.ruff.format]
-docstring-code-format = true
-docstring-code-line-length = "dynamic"
-
-
-[tool.ruff.lint]
-# Rules to run
-# Reference: https://docs.astral.sh/ruff/rules/
-select = [
-    "A",     # flake8-builtins
-    "ANN",   # flake8-annotations
-    "ASYNC", # flake8-async
-    "ARG",   # flake8-unused-arguments
-    "B",     # flake8-bugbear
-    "BLE",   # flake8-blind-except
-    "C4",    # flake8-comprehensions
-    "C90",   # mccabe (complexity)
-    "COM",   # flake8-commas
-    "D",     # pydocstyle
-    "DTZ",   # flake8-datetimez
-    "E",     # pycodestyle errors
-    "EM",    # flake8-errmsg
-    "ERA",   # eradicate
-    "EXE",   # flake8-executable
-    "F",     # pyflakes
-    "FBT",   # flake8-boolean-trap
-    "FLY",   # flynt
-    # "FURB",  # Refurb (In preview)
-    "G",   # flake8-logging-format
-    "I",   # isort
-    "ICN", # flake8-import-conventions
-    "INP", # flake8-no-pep420
-    "ISC", # flake8-implicit-str-concat
-    # "LOG",   # flake8-logging (In preview)
-    "N",    # pep8-naming
-    "NPY",  # NumPy-specific rules
-    "PERF", # Perflint
-    "PD",   # pandas-vet
-    "PGH",  # pygrep-hooks
-    "PIE",  # flake8-pie
-    "PL",   # pylint
-    "PLC",  # pylint-convention
-    "PLE",  # pylint-error
-    "PLR",  # pylint-refactor
-    "PLW",  # pylint-warning
-    "PT",   # flake8-pytest-style
-    "PTH",  # flake8-use-pathlib
-    "Q",    # flake8-quotes
-    "RET",  # flake8-return
-    "RSE",  # flake8-raise
-    "RUF",  # ruff-specific rules
-    "S",    # flake8-bandit
-    "SIM",  # flake8-simplify
-    "SLF",  # flake8-self
-    "T10",  # flake8-debugger
-    "T20",  # flake8-print
-    "TID",  # flake8-tidy-imports
-    "TRY",  # tryceratops
-    "UP",   # pyupgrade
-    "W",    # pycodestyle warnings
-    "YTT",  # flake8-2020
-]
-# Roles to ignore
-ignore = [
-    "A003",   # builtin-attribute-shadowing. Shadowing `id` in a model for instance.
-    "ANN401", # No dynamically typed expressions (like "Any")
-    "COM812", # Missing trailing comma (can cause ruff formatter conflicts)
-    "D105",   # Missing docstring in magic method
-    "D107",   # Missing docstring in __init__
-    "D203",   # 1 blank line required before class docstring (conflicts with D211 - No blank lines allowed before class docstring)
-    "D213",   # Multi-line docstring summary should start at the second line (conflicts with D212 - Multi-line docstring summary should start at the first line)
-    "ISC001", # Implicit string concatenation found (can cause ruff formatter conflicts)
-]
-# Don't automatically fix these errors, but still report them
-unfixable = [
-    "ERA001", # eradicate commented out code
-    "T20",    # flake8-print
-    "RUF100", # unused-noqa
-]
-
-
-[tool.ruff.lint.per-file-ignores]
-"**/__init__.py" = ["D104"] # Missing docstring in public package
-"scripts/*" = [
-    "FBT003", # boolean-positional-value-in-call (needed for typer default arg)
-    "S101",   # use of assert
-    "S311",   # random-not-for-cryptography
-    "T201",   # 'print' found
-]
-"scripts/alembic.py" = ["S603"] # subprocess-without-shell-equals-true
-"migrations/versions/*" = ["D103"] # Missing docstring in public function
-"tests/*" = [
-    "ANN002",  # Missing type annotation for *args
-    "ANN003",  # Missing type annotation for **kwargs
-    "ANN201",  # Missing return type annotation for function
-    "E501",    # line-too-long
-    "PLR2004", # Magic value comparison
-    "S101",    # assert-used
-    "S105",    # Passwords should not be hard-coded
-]
-
-
-[tool.ruff.lint.mccabe]
-max-complexity = 8
-
-
-[tool.ruff.lint.isort]
-known-first-party = ["app", "tests", "scripts"]

ruff.toml

@@ -0,0 +1,114 @@
+# ruff.toml: Ruff linter + formatter configuration
+# Reference: https://docs.astral.sh/ruff/configuration/
+line-length = 100
+target-version = "py314"
+
+
+[format]
+docstring-code-format = true
+docstring-code-line-length = "dynamic"
+
+
+[lint]
+# Rules to run
+# Reference: https://docs.astral.sh/ruff/rules/
+select = [
+    "A",     # flake8-builtins
+    "ANN",   # flake8-annotations
+    "ASYNC", # flake8-async
+    "ARG",   # flake8-unused-arguments
+    "B",     # flake8-bugbear
+    "BLE",   # flake8-blind-except
+    "C4",    # flake8-comprehensions
+    "C90",   # mccabe (complexity)
+    "COM",   # flake8-commas
+    "D",     # pydocstyle
+    "DTZ",   # flake8-datetimez
+    "E",     # pycodestyle errors
+    "EM",    # flake8-errmsg
+    "ERA",   # eradicate
+    "EXE",   # flake8-executable
+    "F",     # pyflakes
+    "FBT",   # flake8-boolean-trap
+    "FLY",   # flynt
+    # "FURB",  # Refurb (In preview)
+    "G",   # flake8-logging-format
+    "I",   # isort
+    "ICN", # flake8-import-conventions
+    "INP", # flake8-no-pep420
+    "ISC", # flake8-implicit-str-concat
+    # "LOG",   # flake8-logging (In preview)
+    "N",    # pep8-naming
+    "NPY",  # NumPy-specific rules
+    "PERF", # Perflint
+    "PD",   # pandas-vet
+    "PGH",  # pygrep-hooks
+    "PIE",  # flake8-pie
+    "PL",   # pylint
+    "PLC",  # pylint-convention
+    "PLE",  # pylint-error
+    "PLR",  # pylint-refactor
+    "PLW",  # pylint-warning
+    "PT",   # flake8-pytest-style
+    "PTH",  # flake8-use-pathlib
+    "Q",    # flake8-quotes
+    "RET",  # flake8-return
+    "RSE",  # flake8-raise
+    "RUF",  # ruff-specific rules
+    "S",    # flake8-bandit
+    "SIM",  # flake8-simplify
+    "SLF",  # flake8-self
+    "T10",  # flake8-debugger
+    "T20",  # flake8-print
+    "TID",  # flake8-tidy-imports
+    "TRY",  # tryceratops
+    "UP",   # pyupgrade
+    "W",    # pycodestyle warnings
+    "YTT",  # flake8-2020
+]
+# Rules to ignore
+ignore = [
+    "A003",   # builtin-attribute-shadowing. Shadowing `id` in a model for instance.
+    "ANN401", # No dynamically typed expressions (like "Any")
+    "COM812", # Missing trailing comma (can cause ruff formatter conflicts)
+    "D105",   # Missing docstring in magic method
+    "D107",   # Missing docstring in __init__
+    "D203",   # 1 blank line required before class docstring (conflicts with D211 - No blank lines allowed before class docstring)
+    "D213",   # Multi-line docstring summary should start at the second line (conflicts with D212 - Multi-line docstring summary should start at the first line)
+    "ISC001", # Implicit string concatenation found (can cause ruff formatter conflicts)
+]
+# Don't automatically fix these errors, but still report them
+unfixable = [
+    "ERA001", # eradicate commented out code
+    "T20",    # flake8-print
+    "RUF100", # unused-noqa
+]
+
+
+[lint.per-file-ignores]
+"**/__init__.py" = ["D104"] # Missing docstring in public package
+"scripts/*" = [
+    "FBT003", # boolean-positional-value-in-call (needed for typer default arg)
+    "S101",   # use of assert
+    "S311",   # random-not-for-cryptography
+    "T201",   # 'print' found
+]
+"scripts/alembic.py" = ["S603"] # subprocess-without-shell-equals-true
+"migrations/versions/*" = ["D103"] # Missing docstring in public function
+"tests/*" = [
+    "ANN002",  # Missing type annotation for *args
+    "ANN003",  # Missing type annotation for **kwargs
+    "ANN201",  # Missing return type annotation for function
+    "E501",    # line-too-long
+    "PLR2004", # Magic value comparison
+    "S101",    # assert-used
+    "S105",    # Passwords should not be hard-coded
+]
+
+
+[lint.mccabe]
+max-complexity = 8
+
+
+[lint.isort]
+known-first-party = ["app", "tests", "scripts"]

tests/__init__.py

@@ -23,7 +23,7 @@ class TestCase(BaseModel, arbitrary_types_allowed=True):
 
     @staticmethod
     def parametrize(
-        test_cases: Sequence["TestCase"], *, arg_name: str = "test_case"
+        test_cases: Sequence[TestCase], *, arg_name: str = "test_case"
     ) -> pytest.MarkDecorator:
         """Parametrize the test cases."""
         return pytest.mark.parametrize(