diff --git a/backend/linkpulse/__main__.py b/backend/linkpulse/__main__.py index 45a6b38..5e9ad0a 100644 --- a/backend/linkpulse/__main__.py +++ b/backend/linkpulse/__main__.py @@ -59,7 +59,7 @@ def main(*args: str) -> None: # import most useful objects, models, and functions lp = linkpulse # alias from linkpulse.app import app - from linkpulse.models import BaseModel, User, Session + from linkpulse.models import BaseModel, Session, User from linkpulse.utilities import get_db db = get_db() diff --git a/backend/linkpulse/app.py b/backend/linkpulse/app.py index bde4770..1713d0a 100644 --- a/backend/linkpulse/app.py +++ b/backend/linkpulse/app.py @@ -30,9 +30,7 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]: db.connect() db.create_tables([models.User, models.Session]) - FastAPICache.init( - backend=InMemoryBackend(), prefix="fastapi-cache", cache_status_header="X-Cache" - ) + FastAPICache.init(backend=InMemoryBackend(), prefix="fastapi-cache", cache_status_header="X-Cache") scheduler.start() diff --git a/backend/linkpulse/dependencies.py b/backend/linkpulse/dependencies.py index 41f721e..cedd093 100644 --- a/backend/linkpulse/dependencies.py +++ b/backend/linkpulse/dependencies.py @@ -1,11 +1,12 @@ import os +from dataclasses import dataclass + import structlog from fastapi import HTTPException, Request, Response, status -from limits.aio.strategies import MovingWindowRateLimiter -from limits.aio.storage import MemoryStorage from limits import parse +from limits.aio.storage import MemoryStorage +from limits.aio.strategies import MovingWindowRateLimiter from linkpulse.models import Session -from dataclasses import dataclass storage = MemoryStorage() strategy = MovingWindowRateLimiter(storage) diff --git a/backend/linkpulse/logging.py b/backend/linkpulse/logging.py index b10f7f1..4ee6f68 100644 --- a/backend/linkpulse/logging.py +++ b/backend/linkpulse/logging.py @@ -31,9 +31,7 @@ def drop_color_message_key(_: Any, __: Any, event_dict: EventDict) -> EventDict: return event_dict -def setup_logging( - json_logs: Optional[bool] = None, log_level: Optional[str] = None -) -> None: +def setup_logging(json_logs: Optional[bool] = None, log_level: Optional[str] = None) -> None: # Pull from environment variables, apply defaults if not set json_logs = json_logs or os.getenv("LOG_JSON_FORMAT", "true").lower() == "true" log_level = log_level or os.getenv("LOG_LEVEL", "INFO") @@ -158,8 +156,6 @@ def setup_logging( sys.__excepthook__(exc_type, exc_value, exc_traceback) return - root_logger.error( - "Uncaught exception", exc_info=(exc_type, exc_value, exc_traceback) - ) + root_logger.error("Uncaught exception", exc_info=(exc_type, exc_value, exc_traceback)) sys.excepthook = handle_exception diff --git a/backend/linkpulse/routers/auth.py b/backend/linkpulse/routers/auth.py index 275b878..7039cd8 100644 --- a/backend/linkpulse/routers/auth.py +++ b/backend/linkpulse/routers/auth.py @@ -3,7 +3,7 @@ from typing import Annotated, Optional, Tuple import structlog from fastapi import APIRouter, Depends, Response, status -from linkpulse.dependencies import SessionDependency, RateLimiter, SessionModel +from linkpulse.dependencies import RateLimiter, SessionDependency, SessionModel from linkpulse.models import Session, User from linkpulse.utilities import utc_now from pwdlib import PasswordHash diff --git a/backend/linkpulse/routers/misc.py b/backend/linkpulse/routers/misc.py index e91c41e..57b1877 100644 --- a/backend/linkpulse/routers/misc.py +++ b/backend/linkpulse/routers/misc.py @@ -28,8 +28,6 @@ async def get_migration() -> dict[str, Any]: :rtype: dict[str, Any] """ # Kind of insecure, but this is just a demo thing to show that migratehistory is available. - cursor = db.execute_sql( - "SELECT name, migrated_at FROM migratehistory ORDER BY migrated_at DESC LIMIT 1" - ) + cursor = db.execute_sql("SELECT name, migrated_at FROM migratehistory ORDER BY migrated_at DESC LIMIT 1") name, migrated_at = cursor.fetchone() return {"name": name, "migrated_at": migrated_at} diff --git a/backend/linkpulse/tests/test_auth.py b/backend/linkpulse/tests/test_auth.py index f65dbb1..cede613 100644 --- a/backend/linkpulse/tests/test_auth.py +++ b/backend/linkpulse/tests/test_auth.py @@ -1,14 +1,14 @@ from datetime import datetime, timedelta + +import pytest import structlog from fastapi import status from fastapi.testclient import TestClient from linkpulse.app import app +from linkpulse.tests.test_session import expired_session, session from linkpulse.tests.test_user import user -from linkpulse.tests.test_session import session, expired_session from linkpulse.utilities import utc_now -import pytest - logger = structlog.get_logger() diff --git a/backend/linkpulse/tests/test_session.py b/backend/linkpulse/tests/test_session.py index fdcc9e1..ad38ec9 100644 --- a/backend/linkpulse/tests/test_session.py +++ b/backend/linkpulse/tests/test_session.py @@ -3,11 +3,10 @@ from datetime import timedelta import pytest import structlog from linkpulse.models import Session +from linkpulse.routers.auth import validate_session from linkpulse.tests.random import random_string from linkpulse.tests.test_user import user from linkpulse.utilities import utc_now -from linkpulse.routers.auth import validate_session - from peewee import IntegrityError logger = structlog.get_logger()