diff --git a/app/database.py b/app/database.py index 2c6698a..262a998 100644 --- a/app/database.py +++ b/app/database.py @@ -3,10 +3,9 @@ from collections.abc import AsyncGenerator from sqlalchemy.ext.asyncio import create_async_engine from sqlalchemy.ext.asyncio import async_sessionmaker -from app import config +from app.config import settings as global_settings from app.utils.logging import AppLogger -global_settings = config.get_settings() logger = AppLogger.__call__().get_logger() engine = create_async_engine( diff --git a/app/models/user.py b/app/models/user.py index c22cd9c..6a1b106 100644 --- a/app/models/user.py +++ b/app/models/user.py @@ -8,11 +8,8 @@ from sqlalchemy.dialects.postgresql import UUID from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.orm import mapped_column, Mapped -from app import config from app.models.base import Base -global_settings = config.get_settings() - pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") diff --git a/app/redis.py b/app/redis.py index a755713..f70b1ad 100644 --- a/app/redis.py +++ b/app/redis.py @@ -1,9 +1,6 @@ import redis.asyncio as redis -from app import config - - -global_settings = config.get_settings() +from app.config import settings as global_settings async def get_redis(): diff --git a/app/services/auth.py b/app/services/auth.py index 9af470b..e8cf692 100644 --- a/app/services/auth.py +++ b/app/services/auth.py @@ -1,14 +1,12 @@ import time import jwt -from app import config +from app.config import settings as global_settings from app.models.user import User from fastapi import Request, HTTPException from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials -global_settings = config.get_settings() - async def verify_jwt(request: Request, token: str) -> bool: _payload = await request.app.state.redis.get(token)