Add ruff linter/formatter for Python
- Add ruff as dev dependency - Configure ruff in pyproject.toml with strict 88-char line limit - Ignore B008 (FastAPI Depends pattern is standard) - Allow longer lines in tests for readability - Fix all lint issues in source files - Add Makefile targets: lint-backend, format-backend, fix-backend
This commit is contained in:
parent
69bc8413e0
commit
6c218130e9
31 changed files with 1234 additions and 876 deletions
|
|
@ -1,12 +1,21 @@
|
|||
"""Seed the database with roles, permissions, and dev users."""
|
||||
|
||||
import asyncio
|
||||
import os
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from database import engine, async_session, Base
|
||||
from models import User, Role, Permission, role_permissions, ROLE_DEFINITIONS, ROLE_REGULAR, ROLE_ADMIN
|
||||
from auth import get_password_hash
|
||||
from database import Base, async_session, engine
|
||||
from models import (
|
||||
ROLE_ADMIN,
|
||||
ROLE_DEFINITIONS,
|
||||
ROLE_REGULAR,
|
||||
Permission,
|
||||
Role,
|
||||
User,
|
||||
)
|
||||
|
||||
DEV_USER_EMAIL = os.environ["DEV_USER_EMAIL"]
|
||||
DEV_USER_PASSWORD = os.environ["DEV_USER_PASSWORD"]
|
||||
|
|
@ -14,11 +23,13 @@ DEV_ADMIN_EMAIL = os.environ["DEV_ADMIN_EMAIL"]
|
|||
DEV_ADMIN_PASSWORD = os.environ["DEV_ADMIN_PASSWORD"]
|
||||
|
||||
|
||||
async def upsert_role(db: AsyncSession, name: str, description: str, permissions: list[Permission]) -> Role:
|
||||
async def upsert_role(
|
||||
db: AsyncSession, name: str, description: str, permissions: list[Permission]
|
||||
) -> Role:
|
||||
"""Create or update a role with the given permissions."""
|
||||
result = await db.execute(select(Role).where(Role.name == name))
|
||||
role = result.scalar_one_or_none()
|
||||
|
||||
|
||||
if role:
|
||||
role.description = description
|
||||
print(f"Updated role: {name}")
|
||||
|
|
@ -27,19 +38,21 @@ async def upsert_role(db: AsyncSession, name: str, description: str, permissions
|
|||
db.add(role)
|
||||
await db.flush() # Get the role ID
|
||||
print(f"Created role: {name}")
|
||||
|
||||
|
||||
# Set permissions for the role
|
||||
await role.set_permissions(db, permissions)
|
||||
print(f" Permissions: {', '.join(p.value for p in permissions)}")
|
||||
|
||||
|
||||
return role
|
||||
|
||||
|
||||
async def upsert_user(db: AsyncSession, email: str, password: str, role_names: list[str]) -> User:
|
||||
async def upsert_user(
|
||||
db: AsyncSession, email: str, password: str, role_names: list[str]
|
||||
) -> User:
|
||||
"""Create or update a user with the given credentials and roles."""
|
||||
result = await db.execute(select(User).where(User.email == email))
|
||||
user = result.scalar_one_or_none()
|
||||
|
||||
|
||||
# Get roles
|
||||
roles = []
|
||||
for role_name in role_names:
|
||||
|
|
@ -48,7 +61,7 @@ async def upsert_user(db: AsyncSession, email: str, password: str, role_names: l
|
|||
if not role:
|
||||
raise ValueError(f"Role '{role_name}' not found")
|
||||
roles.append(role)
|
||||
|
||||
|
||||
if user:
|
||||
user.hashed_password = get_password_hash(password)
|
||||
user.roles = roles # type: ignore[assignment]
|
||||
|
|
@ -61,7 +74,7 @@ async def upsert_user(db: AsyncSession, email: str, password: str, role_names: l
|
|||
)
|
||||
db.add(user)
|
||||
print(f"Created user: {email} with roles: {role_names}")
|
||||
|
||||
|
||||
return user
|
||||
|
||||
|
||||
|
|
@ -78,14 +91,14 @@ async def seed() -> None:
|
|||
role_config["description"],
|
||||
role_config["permissions"],
|
||||
)
|
||||
|
||||
|
||||
print("\n=== Seeding Users ===")
|
||||
# Create regular dev user
|
||||
await upsert_user(db, DEV_USER_EMAIL, DEV_USER_PASSWORD, [ROLE_REGULAR])
|
||||
|
||||
|
||||
# Create admin dev user
|
||||
await upsert_user(db, DEV_ADMIN_EMAIL, DEV_ADMIN_PASSWORD, [ROLE_ADMIN])
|
||||
|
||||
|
||||
await db.commit()
|
||||
print("\n=== Seeding Complete ===\n")
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue