update ruff and ty rules

Author: VerdantFox

app/services/blog/blog_handler.py

@@ -8,6 +8,7 @@
 from typing import Self
 
 import sqlalchemy
+import sqlalchemy.exc
 from fastapi import UploadFile
 from pydantic import BaseModel, Field, model_validator
 from sqlalchemy import Select, delete, select
@@ -277,7 +278,7 @@ async def get_bp_from_slug(db: AsyncSession, slug: str) -> db_models.BlogPost:
         result = await db.execute(stmt)
         return result.scalars().one()
     except sqlalchemy.exc.NoResultFound:
-        # FIXME: This maybe should raise an error that redirects to the new slug
+        # TODO: This maybe should raise an error that redirects to the new slug
         return await _get_bp_from_slug_history(db=db, slug=slug)
 
 
@@ -471,7 +472,7 @@ async def _create_bp_save_sqlalchemy_error_response(
     - Rollback the database session
     - Update the field_errors dict
     """
-    logger.exception(ERROR_SAVING_BP)
+    logger.exception(ERROR_SAVING_BP)  # noqa: LOG004 (called from exception handlers)
     await db.rollback()
     err = repr(e)
     msg = ERROR_SAVING_BP

app/services/blog/blog_utils.py

@@ -9,7 +9,7 @@ def get_slug(title: str) -> str:
 
     Remove problematic characters.
     """
-    title = re.sub("[!@#$%^&*()+=`~<>/:;.,]", "", title)
+    title = re.sub(r"[!@#$%^&*()+=`~<>/:;.,]", "", title)
     return re.sub(r"[^\w]+", "-", title.lower()).strip(" -")
 
 

app/services/general/transforms.py

@@ -12,7 +12,7 @@ def to_bool(value: Any) -> bool:
     if isinstance(value, bool):
         return value
     if isinstance(value, str):
-        return value.casefold() in ("true", "t", "yes", "y", "1")
+        return value.casefold() in {"true", "t", "yes", "y", "1"}
     if isinstance(value, int):
         return value == 1
     return False

app/services/media/media_handler.py

@@ -105,7 +105,7 @@ def save_image(name: str, image_file: MediaFileProtocol) -> str:
 
     # GIF and SVG don't save properly with pillow
     # Webp is already compressed
-    if og_image_path.suffix.casefold() in (".gif", ".svg", ".webp"):
+    if og_image_path.suffix.casefold() in {".gif", ".svg", ".webp"}:
         og_image_path.write_bytes(image_file.read())
         return get_path_str_from_static(og_image_path)
 

app/services/users/user_handler.py

@@ -6,7 +6,8 @@
 from logging import getLogger
 from uuid import uuid4
 
-import sqlalchemy
+import sqlalchemy.exc
+import sqlalchemy.orm.exc
 from fastapi import BackgroundTasks, UploadFile
 from pydantic import BaseModel, EmailStr
 from sqlalchemy import delete, select

app/web/api/routes/users.py

@@ -2,7 +2,7 @@
 
 from typing import cast
 
-import sqlalchemy
+import sqlalchemy.exc
 from fastapi import APIRouter, status
 from sqlalchemy import select
 

app/web/html/routes/blog.py

@@ -2,7 +2,7 @@
 
 from logging import getLogger
 
-import sqlalchemy
+import sqlalchemy.exc
 from fastapi import APIRouter, BackgroundTasks, Request, UploadFile, status
 from fastapi.responses import HTMLResponse, RedirectResponse
 from pydantic import ValidationError
@@ -944,9 +944,16 @@ class BlogPostMediaForm(Form):
         "Upload media file",
         validators=[
             validators.DataRequired(),
-            custom_validators.is_allowed_extension(
-                ["jpg", "jpeg", "png", "gif", "webp", "svg", "mp4", "webm"]
-            ),
+            custom_validators.is_allowed_extension([
+                "jpg",
+                "jpeg",
+                "png",
+                "gif",
+                "webp",
+                "svg",
+                "mp4",
+                "webm",
+            ]),
         ],
     )
 
@@ -958,20 +965,18 @@ async def edit_bp_get(
 ) -> _TemplateResponse:
     """Return page to edit a blog post."""
     bp = await blog_handler.get_bp_from_id(db=db, bp_id=bp_id)
-    form = BlogPostForm.load(
-        {
-            "is_new": False,
-            "title": bp.title,
-            "tags": ", ".join([tag.tag for tag in bp.tags]),
-            "can_comment": bp.can_comment,
-            "is_published": bp.is_published,
-            "description": bp.markdown_description,
-            "content": bp.markdown_content,
-            "thumbnail_url": bp.thumbnail_location or "",
-            "series_id": bp.series_id or "",
-            "series_position": bp.series_position or "",
-        }
-    )
+    form = BlogPostForm.load({
+        "is_new": False,
+        "title": bp.title,
+        "tags": ", ".join([tag.tag for tag in bp.tags]),
+        "can_comment": bp.can_comment,
+        "is_published": bp.is_published,
+        "description": bp.markdown_description,
+        "content": bp.markdown_content,
+        "thumbnail_url": bp.thumbnail_location or "",
+        "series_id": bp.series_id or "",
+        "series_position": bp.series_position or "",
+    })
 
     return templates.TemplateResponse(
         request,

app/web/html/routes/sitemap.py

@@ -68,12 +68,10 @@ async def get_blog_urls_xml(*, request: Request, db: DBSession) -> str:
         results_per_page=1_000_000,
         page=1,
     )
-    return "".join(
-        [
-            produce_blog_url_xml(request=request, blog_post=blog_post)
-            for blog_post in paginator.blog_posts
-        ]
-    )
+    return "".join([
+        produce_blog_url_xml(request=request, blog_post=blog_post)
+        for blog_post in paginator.blog_posts
+    ])
 
 
 def produce_blog_url_xml(*, request: Request, blog_post: db_models.BlogPost) -> str:

app/web/main.py

@@ -6,7 +6,7 @@
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 
-import sqlalchemy
+import sqlalchemy.exc
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import RedirectResponse

migrations/versions/de229330a488_initial_migration.py

@@ -10,7 +10,7 @@
 import sqlalchemy as sa
 from alembic import op
 
-import app
+import app.datastore.db_models
 
 # revision identifiers, used by Alembic.
 revision: str = "de229330a488"