reformat, organize imports

This commit is contained in:
2024-11-10 13:15:28 -06:00
parent 16b70bb0de
commit 066b3e82ff
8 changed files with 14 additions and 22 deletions

View File

@@ -59,7 +59,7 @@ def main(*args: str) -> None:
# import most useful objects, models, and functions # import most useful objects, models, and functions
lp = linkpulse # alias lp = linkpulse # alias
from linkpulse.app import app 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 from linkpulse.utilities import get_db
db = get_db() db = get_db()

View File

@@ -30,9 +30,7 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
db.connect() db.connect()
db.create_tables([models.User, models.Session]) db.create_tables([models.User, models.Session])
FastAPICache.init( FastAPICache.init(backend=InMemoryBackend(), prefix="fastapi-cache", cache_status_header="X-Cache")
backend=InMemoryBackend(), prefix="fastapi-cache", cache_status_header="X-Cache"
)
scheduler.start() scheduler.start()

View File

@@ -1,11 +1,12 @@
import os import os
from dataclasses import dataclass
import structlog import structlog
from fastapi import HTTPException, Request, Response, status 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 import parse
from limits.aio.storage import MemoryStorage
from limits.aio.strategies import MovingWindowRateLimiter
from linkpulse.models import Session from linkpulse.models import Session
from dataclasses import dataclass
storage = MemoryStorage() storage = MemoryStorage()
strategy = MovingWindowRateLimiter(storage) strategy = MovingWindowRateLimiter(storage)

View File

@@ -31,9 +31,7 @@ def drop_color_message_key(_: Any, __: Any, event_dict: EventDict) -> EventDict:
return event_dict return event_dict
def setup_logging( def setup_logging(json_logs: Optional[bool] = None, log_level: Optional[str] = None) -> None:
json_logs: Optional[bool] = None, log_level: Optional[str] = None
) -> None:
# Pull from environment variables, apply defaults if not set # Pull from environment variables, apply defaults if not set
json_logs = json_logs or os.getenv("LOG_JSON_FORMAT", "true").lower() == "true" json_logs = json_logs or os.getenv("LOG_JSON_FORMAT", "true").lower() == "true"
log_level = log_level or os.getenv("LOG_LEVEL", "INFO") 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) sys.__excepthook__(exc_type, exc_value, exc_traceback)
return return
root_logger.error( root_logger.error("Uncaught exception", exc_info=(exc_type, exc_value, exc_traceback))
"Uncaught exception", exc_info=(exc_type, exc_value, exc_traceback)
)
sys.excepthook = handle_exception sys.excepthook = handle_exception

View File

@@ -3,7 +3,7 @@ from typing import Annotated, Optional, Tuple
import structlog import structlog
from fastapi import APIRouter, Depends, Response, status 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.models import Session, User
from linkpulse.utilities import utc_now from linkpulse.utilities import utc_now
from pwdlib import PasswordHash from pwdlib import PasswordHash

View File

@@ -28,8 +28,6 @@ async def get_migration() -> dict[str, Any]:
:rtype: dict[str, Any] :rtype: dict[str, Any]
""" """
# Kind of insecure, but this is just a demo thing to show that migratehistory is available. # Kind of insecure, but this is just a demo thing to show that migratehistory is available.
cursor = db.execute_sql( cursor = db.execute_sql("SELECT name, migrated_at FROM migratehistory ORDER BY migrated_at DESC LIMIT 1")
"SELECT name, migrated_at FROM migratehistory ORDER BY migrated_at DESC LIMIT 1"
)
name, migrated_at = cursor.fetchone() name, migrated_at = cursor.fetchone()
return {"name": name, "migrated_at": migrated_at} return {"name": name, "migrated_at": migrated_at}

View File

@@ -1,14 +1,14 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
import pytest
import structlog import structlog
from fastapi import status from fastapi import status
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from linkpulse.app import app 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_user import user
from linkpulse.tests.test_session import session, expired_session
from linkpulse.utilities import utc_now from linkpulse.utilities import utc_now
import pytest
logger = structlog.get_logger() logger = structlog.get_logger()

View File

@@ -3,11 +3,10 @@ from datetime import timedelta
import pytest import pytest
import structlog import structlog
from linkpulse.models import Session from linkpulse.models import Session
from linkpulse.routers.auth import validate_session
from linkpulse.tests.random import random_string from linkpulse.tests.random import random_string
from linkpulse.tests.test_user import user from linkpulse.tests.test_user import user
from linkpulse.utilities import utc_now from linkpulse.utilities import utc_now
from linkpulse.routers.auth import validate_session
from peewee import IntegrityError from peewee import IntegrityError
logger = structlog.get_logger() logger = structlog.get_logger()