diff --git a/src/fastapi_app/bin/__main__.py b/src/fastapi_app/bin/__main__.py index 4463373..f7e51e9 100644 --- a/src/fastapi_app/bin/__main__.py +++ b/src/fastapi_app/bin/__main__.py @@ -3,7 +3,7 @@ import logging import uvicorn import lib.app.app as app_module -from lib.app import settings as app_settings +import lib.app.settings as app_settings logger = logging.getLogger(__name__) diff --git a/src/fastapi_app/lib/api/v1/services/token.py b/src/fastapi_app/lib/api/v1/services/token.py index d4064b9..c18b5f2 100644 --- a/src/fastapi_app/lib/api/v1/services/token.py +++ b/src/fastapi_app/lib/api/v1/services/token.py @@ -2,11 +2,11 @@ import fastapi from jose import JWTError, jwt from pydantic import ValidationError +import lib.app.settings as app_settings from lib.api.v1 import schemas as app_schemas -from lib.app import settings as app_settings app = fastapi.FastAPI() -settings = app_settings.get_settings() +settings = app_settings.settings security = fastapi.security.HTTPBearer() @@ -16,7 +16,7 @@ def get_token_data( ) -> app_schemas.entity.Token: token = authorization.credentials try: - secret_key = settings.jwt_secret_key + secret_key = settings.project.jwt_secret_key payload = jwt.decode(token, secret_key, algorithms=["HS256"]) return app_schemas.entity.Token(**payload) except (JWTError, ValidationError): diff --git a/src/fastapi_app/lib/db/postgres.py b/src/fastapi_app/lib/db/postgres.py index 7715c7c..ecefe41 100644 --- a/src/fastapi_app/lib/db/postgres.py +++ b/src/fastapi_app/lib/db/postgres.py @@ -3,9 +3,9 @@ import typing from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine from sqlalchemy.orm import DeclarativeBase -from lib.app import settings as app_settings +import lib.app.settings as app_settings -settings = app_settings.get_settings() +settings = app_settings.settings # Создаём базовый класс для будущих моделей @@ -22,7 +22,7 @@ class AsyncDB: f"postgresql+asyncpg://{settings.db.user}:{settings.db.password}" f"@{settings.db.host}:{settings.db.port}/{settings.db.name}" ) - self.engine = create_async_engine(self.database_dsn, echo=settings.debug, future=True) + self.engine = create_async_engine(self.database_dsn, echo=settings.project.debug, future=True) self.async_session = async_sessionmaker(self.engine, class_=AsyncSession, expire_on_commit=False)