From f47dc4b99f9093d5d48b68904fba18deb0e73a17 Mon Sep 17 00:00:00 2001 From: Artem Litvinov Date: Wed, 20 Sep 2023 10:43:29 +0100 Subject: [PATCH] fix: lint fix --- src/fastapi_app/bin/__main__.py | 3 ++- src/fastapi_app/lib/api/v1/models/mixins.py | 8 ++------ src/fastapi_app/lib/api/v1/services/token.py | 10 ++++------ src/fastapi_app/lib/app/app.py | 4 ++-- src/fastapi_app/lib/db/postgres.py | 11 ++++------- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/fastapi_app/bin/__main__.py b/src/fastapi_app/bin/__main__.py index 56f3fd8..5343917 100644 --- a/src/fastapi_app/bin/__main__.py +++ b/src/fastapi_app/bin/__main__.py @@ -1,7 +1,8 @@ import logging -import lib.app.app as app_module import uvicorn + +import lib.app.app as app_module from lib.app import settings as app_settings logger = logging.getLogger(__name__) diff --git a/src/fastapi_app/lib/api/v1/models/mixins.py b/src/fastapi_app/lib/api/v1/models/mixins.py index e33b305..3380a9f 100644 --- a/src/fastapi_app/lib/api/v1/models/mixins.py +++ b/src/fastapi_app/lib/api/v1/models/mixins.py @@ -18,12 +18,8 @@ class BaseMixin: @declared_attr def created_at(cls): - return sqlalchemy.Column( - sqlalchemy.DateTime, server_default=sqlalchemy.sql.func.now() - ) + return sqlalchemy.Column(sqlalchemy.DateTime, server_default=sqlalchemy.sql.func.now()) @declared_attr def updated_at(cls): - return sqlalchemy.Column( - sqlalchemy.DateTime, server_default=sqlalchemy.sql.func.now() - ) + return sqlalchemy.Column(sqlalchemy.DateTime, server_default=sqlalchemy.sql.func.now()) diff --git a/src/fastapi_app/lib/api/v1/services/token.py b/src/fastapi_app/lib/api/v1/services/token.py index ef2926f..d4064b9 100644 --- a/src/fastapi_app/lib/api/v1/services/token.py +++ b/src/fastapi_app/lib/api/v1/services/token.py @@ -1,9 +1,9 @@ +import fastapi from jose import JWTError, jwt -from lib.api.v1 import schemas as app_schemas -from lib.app import settings as app_settings from pydantic import ValidationError -import fastapi +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() @@ -12,9 +12,7 @@ security = fastapi.security.HTTPBearer() def get_token_data( - authorization: fastapi.security.HTTPAuthorizationCredentials = fastapi.Security( - security - ), + authorization: fastapi.security.HTTPAuthorizationCredentials = fastapi.Security(security), ) -> app_schemas.entity.Token: token = authorization.credentials try: diff --git a/src/fastapi_app/lib/app/app.py b/src/fastapi_app/lib/app/app.py index 03e1c75..e48026e 100644 --- a/src/fastapi_app/lib/app/app.py +++ b/src/fastapi_app/lib/app/app.py @@ -1,10 +1,10 @@ import logging import logging.config as logging_config -import lib.api.v1.handlers as api_handlers - import fastapi +import lib.api.v1.handlers as api_handlers + from .logger import LOGGING from .settings import get_settings diff --git a/src/fastapi_app/lib/db/postgres.py b/src/fastapi_app/lib/db/postgres.py index 9ad37d9..7715c7c 100644 --- a/src/fastapi_app/lib/db/postgres.py +++ b/src/fastapi_app/lib/db/postgres.py @@ -1,9 +1,10 @@ import typing -from lib.app import settings as app_settings from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine from sqlalchemy.orm import DeclarativeBase +from lib.app import settings as app_settings + settings = app_settings.get_settings() # Создаём базовый класс для будущих моделей @@ -21,12 +22,8 @@ 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.async_session = async_sessionmaker( - self.engine, class_=AsyncSession, expire_on_commit=False - ) + self.engine = create_async_engine(self.database_dsn, echo=settings.debug, future=True) + self.async_session = async_sessionmaker(self.engine, class_=AsyncSession, expire_on_commit=False) db = AsyncDB()