Linting fixes

.pre-commit-config.yaml

@@ -7,3 +7,9 @@ repos:
     rev: 23.3.0
     hooks:
       - id: black
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.1.1
+    hooks:
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]

museum_map/__about__.py

@@ -1,2 +1,2 @@
 __version__ = "0.9.1"
-__tables__ = {'items', 'floors', 'rooms', 'floors_items', 'floor_topics', 'groups'}
+__tables__ = {"items", "floors", "rooms", "floors_items", "floor_topics", "groups"}

museum_map/cli/groups.py

@@ -18,8 +18,8 @@
 async def generate_groups_impl(config):
     """Generate the basic groups."""
     async with create_sessionmaker(config)() as dbsession:
-        item_stmt = select(Item).filter(Item.group_id == None)
-        count_stmt = select(func.count(Item.id)).filter(Item.group_id == None)
+        item_stmt = select(Item).filter(Item.group_id == None)  # noqa: E711
+        count_stmt = select(func.count(Item.id)).filter(Item.group_id == None)  # noqa: E711
         count = await dbsession.execute(count_stmt)
         result = await dbsession.execute(item_stmt)
         categories = []
@@ -383,9 +383,9 @@ def merge_singular_plural(ctx):
 async def add_parent_groups_impl(config):
     """Add any required parent groups."""
     async with create_sessionmaker(config)() as dbsession:
-        stmt = select(Group).filter(Group.parent_id == None).options(selectinload(Group.parent))
+        stmt = select(Group).filter(Group.parent_id == None).options(selectinload(Group.parent))  # noqa: E711
         result = await dbsession.execute(stmt)
-        stmt = select(func.count(Group.id)).filter(Group.parent_id == None)
+        stmt = select(func.count(Group.id)).filter(Group.parent_id == None)  # noqa: E711
         result_count = await dbsession.execute(stmt)
         with click.progressbar(
             result.scalars(), length=result_count.scalar_one(), label="Adding parent groups"

museum_map/models/__init__.py

@@ -2,13 +2,12 @@
 from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
 from sqlalchemy.orm import sessionmaker
 
-from museum_map.settings import settings
 from museum_map.models.base import Base  # noqa
 from museum_map.models.floor import Floor, FloorTopic  # noqa
 from museum_map.models.group import Group  # noqa
 from museum_map.models.item import Item  # noqa
 from museum_map.models.room import Room  # noqa
-
+from museum_map.settings import settings
 
 async_engine = create_async_engine(settings.db.dsn)
 async_sessionmaker = sessionmaker(

museum_map/server/__init__.py

@@ -1,10 +1,9 @@
 from fastapi import FastAPI
-from fastapi.staticfiles import StaticFiles
 from fastapi.responses import RedirectResponse
+from fastapi.staticfiles import StaticFiles
 
 from museum_map.server import api
 
-
 app = FastAPI()
 
 app.mount("/app", StaticFiles(packages=[("museum_map.server", "frontend/dist")], html=True), name="static")
@@ -14,4 +13,4 @@
 @app.get("/")
 def index() -> RedirectResponse:
     """Redirect the index to the application page."""
-    return RedirectResponse('/app')
+    return RedirectResponse("/app")

museum_map/server/api/__init__.py

@@ -1,24 +1,24 @@
 import logging
+from typing import Annotated
 
 from fastapi import APIRouter, Depends
-from sqlalchemy import select, text
+from sqlalchemy import text
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from museum_map.__about__ import __version__, __tables__
+from museum_map.__about__ import __tables__, __version__
 from museum_map.models import db_session
 
-
 router = APIRouter(prefix="/api")
 logger = logging.getLogger(__name__)
 
 
 @router.get("/")
-async def index(dbsession: AsyncSession = Depends(db_session)) -> dict():
+async def index(dbsession: Annotated[AsyncSession, Depends(db_session)]) -> dict:
     """Return the application status."""
     try:
         logger.debug("API readyness check")
         query = text(
-            "SELECT tablename FROM pg_catalog.pg_tables WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'"
+            "SELECT tablename FROM pg_catalog.pg_tables WHERE schemaname != 'pg_catalog' AND schemaname != 'information_schema'"  # noqa: E501
         )
         tables = set((await dbsession.execute(query)).scalars())
         return {"ready": tables == __tables__, "version": __version__}