Refactoring

Author: ProFastCode

.gitignore

@@ -106,4 +106,6 @@ venv.bak/
 dmypy.json
 .pyre/
 .pytype/
-cython_debug/
+cython_debug/
+.idea
+__pycache__

Makefile

@@ -6,21 +6,22 @@ help:
 	@echo "AVAILABLE COMMANDS"
 	@echo "  run		Start the app"
 	@echo "  lint		Reformat code"
-	@echo "  migrate		Alembic migrate database"
-	@echo "  generate		Alembic generate database"
+	@echo "  migrate	Alembic migrate database"
+	@echo "  generate	Alembic generate database"
 
-.PHONY: ruff
-ruff:
-	poetry run ruff check app/ --fix --respect-gitignore
+.PHONY: lint
+lint:
+	poetry run ruff ./app --fix && poetry run black ./app
 
 .PHONY: run
 run:
 	poetry run python -m app
 
+.PHONY: migrate
+migrate:
+	poetry run alembic upgrade head
+
 .PHONY: generate
 generate:
 	poetry run alembic revision --autogenerate
 
-.PHONY: migrate
-migrate:
-	poetry run alembic upgrade head

app/__init__.py

@@ -2,6 +2,6 @@
 Initial project v16
 """
 
-x = [1,2,3]
-a = 1+1
-b = 1 + 1
+x = [1, 2, 3]
+a = 1 + 1
+b = 1 + 1

app/api/depends.py

@@ -20,5 +20,7 @@ async def get_db() -> Database:
             await session.close()
 
 
-async def get_current_user(token: str = Depends(oauth2_scheme), db: Database = Depends(get_db)):
+async def get_current_user(
+    token: str = Depends(oauth2_scheme), db: Database = Depends(get_db)
+):
     return await auth.authorization(token, db)

app/api/users/endpoints.py

@@ -43,7 +43,10 @@ async def new(user: UserSchemeAdd, db: Database = Depends(depends.get_db)):
 
 
 @router.post("/token", response_model=UserTokenScheme)
-async def token(form_data: auth.OAuth2PasswordRequestForm = Depends(), db: Database = Depends(depends.get_db)):
+async def token(
+    form_data: auth.OAuth2PasswordRequestForm = Depends(),
+    db: Database = Depends(depends.get_db),
+):
     """
     Получение токена доступа для пользователя.
     """

app/core/__init__.py

@@ -2,8 +2,6 @@
 Ядро FastAPI приложения.
 """
 
-from .settings import settings
-
-__all__ = (
-    "settings",
-)
+from .settings import settings
+
+__all__ = ("settings",)

app/core/auth/__init__.py

@@ -6,9 +6,9 @@
 from .security import verify_password, get_password_hash, create_access_token
 
 __all__ = (
-    'authorization',
-    'OAuth2PasswordRequestForm',
-    'verify_password',
-    'get_password_hash',
-    'create_access_token'
+    "authorization",
+    "OAuth2PasswordRequestForm",
+    "verify_password",
+    "get_password_hash",
+    "create_access_token",
 )

app/core/auth/oauth2.py

@@ -9,14 +9,14 @@
 
 class OAuth2PasswordRequestForm:
     def __init__(
-            self,
-            *,
-            grant_type: Annotated[Union[str, None], Form(pattern="password")] = None,
-            username: Annotated[str, Form()],
-            password: Annotated[str, Form()],
-            scope: Annotated[str, Form()] = "",
-            client_id: Annotated[Union[str, None], Form()] = None,
-            client_secret: Annotated[Union[str, None], Form()] = None,
+        self,
+        *,
+        grant_type: Annotated[Union[str, None], Form(pattern="password")] = None,
+        username: Annotated[str, Form()],
+        password: Annotated[str, Form()],
+        scope: Annotated[str, Form()] = "",
+        client_id: Annotated[Union[str, None], Form()] = None,
+        client_secret: Annotated[Union[str, None], Form()] = None,
     ):
         """
         Представляет форму запроса пароля OAuth 2.0.

app/core/auth/security.py

@@ -45,9 +45,6 @@ def create_access_token(username: str):
     Returns:
         str: Закодированный JWT токен в виде строки.
     """
-    data = dict(
-        username=username,
-        exp=datetime.utcnow() + timedelta(minutes=120)
-    )
+    data = dict(username=username, exp=datetime.utcnow() + timedelta(minutes=120))
     encoded_jwt = jwt.encode(data, settings.APP_AUTH_SECRET, algorithm="HS256")
     return encoded_jwt

app/core/settings.py

@@ -19,8 +19,7 @@ class Settings(BaseSettings):
 
     @property
     def pg_dns(self):
-        return (f"postgresql+asyncpg://{self.POSTGRES_USER}:{self.POSTGRES_PASSWORD}@",
-               f"{self.POSTGRES_HOST}:{self.POSTGRES_PORT}/{self.POSTGRES_DATABASE}")
+        return f"postgresql+asyncpg://{self.POSTGRES_USER}:{self.POSTGRES_PASSWORD}@{self.POSTGRES_HOST}:{self.POSTGRES_PORT}/{self.POSTGRES_DATABASE}"
 
 
 settings = Settings()

app/database/__init__.py

@@ -6,7 +6,7 @@
 from .models import Base
 
 __all__ = (
-    'Database',
-    'engine',
-    'Base',
+    "Database",
+    "engine",
+    "Base",
 )

app/database/database.py

@@ -1,29 +1,29 @@
 from typing import Optional
 
-from sqlalchemy.engine.url import URL
-from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession
-from sqlalchemy.ext.asyncio import create_async_engine as _create_async_engine
-
-from app.core import settings
-from .repositories import UserRepo
-
-
-def create_async_engine(url: URL | str) -> AsyncEngine:
-    return _create_async_engine(url=url, echo=False, pool_pre_ping=True)
-
-
-engine = create_async_engine(settings.pg_dns)
-
-
-class Database:
-    session: AsyncSession
-
-    user: UserRepo
-
-    def __init__(
-            self,
-            session: AsyncSession,
-            user: Optional[UserRepo] = None,
-    ):
-        self.session = session
-        self.user = user or UserRepo(session=session)
+from sqlalchemy.engine.url import URL
+from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession
+from sqlalchemy.ext.asyncio import create_async_engine as _create_async_engine
+
+from app.core import settings
+from .repositories import UserRepo
+
+
+def create_async_engine(url: URL | str) -> AsyncEngine:
+    return _create_async_engine(url=url, echo=False, pool_pre_ping=True)
+
+
+engine = create_async_engine(settings.pg_dns)
+
+
+class Database:
+    session: AsyncSession
+
+    user: UserRepo
+
+    def __init__(
+        self,
+        session: AsyncSession,
+        user: Optional[UserRepo] = None,
+    ):
+        self.session = session
+        self.user = user or UserRepo(session=session)

app/database/models/__init__.py

@@ -6,6 +6,6 @@
 from .user import User
 
 __all__ = (
-    'Base',
-    'User',
+    "Base",
+    "User",
 )

app/database/models/base.py

@@ -8,11 +8,11 @@
 
 metadata = MetaData(
     naming_convention={
-        'ix': 'ix_%(column_0_label)s',
-        'uq': 'uq_%(table_name)s_%(column_0_name)s',
-        'ck': 'ck_%(table_name)s_%(constraint_name)s',
-        'fk': 'fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s',
-        'pk': 'pk_%(table_name)s',
+        "ix": "ix_%(column_0_label)s",
+        "uq": "uq_%(table_name)s_%(column_0_name)s",
+        "ck": "ck_%(table_name)s_%(constraint_name)s",
+        "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
+        "pk": "pk_%(table_name)s",
     }
 )
 
@@ -26,6 +26,4 @@ def __tablename__(cls):
 
     __allow_unmapped__ = False
 
-    id: Mapped[int] = mapped_column(
-        Integer, autoincrement=True, primary_key=True
-    )
+    id: Mapped[int] = mapped_column(Integer, autoincrement=True, primary_key=True)

app/database/repositories/__init__.py

@@ -4,6 +4,4 @@
 
 from .user import UserRepo
 
-__all__ = (
-    'UserRepo',
-)
+__all__ = ("UserRepo",)

app/database/repositories/abstract.py

@@ -10,7 +10,7 @@
 
 from ..models import Base
 
-AbstractModel = TypeVar('AbstractModel')
+AbstractModel = TypeVar("AbstractModel")
 
 
 class Repository(Generic[AbstractModel]):
@@ -29,7 +29,10 @@ async def get_by_where(self, whereclause) -> AbstractModel | None:
         return (await self.session.execute(statement)).unique().scalar_one_or_none()
 
     async def get_many(
-            self, whereclause: Optional [List[Any]] = None, limit: Optional[int] = None, order_by=None
+        self,
+        whereclause: Optional[List[Any]] = None,
+        limit: Optional[int] = None,
+        order_by=None,
     ):
         statement = sa.select(self.type_model).limit(limit).order_by(order_by)
         if whereclause:
@@ -41,7 +44,11 @@ async def delete(self, whereclause) -> None:
         await self.session.execute(statement)
 
     async def update(self, ident: int, **values):
-        statement = sa.update(self.type_model).values(**values).where(self.type_model.id == ident)
+        statement = (
+            sa.update(self.type_model)
+            .values(**values)
+            .where(self.type_model.id == ident)
+        )
         await self.session.execute(statement)
 
     @abc.abstractmethod

app/database/repositories/user.py

@@ -16,13 +16,13 @@ async def new(
         self,
         username: str | None = None,
         password: str | None = None,
-    ) -> User:
-        new_user = User()
-        new_user.username = username
-        new_user.password = password
-        
+    ) -> User:
+        new_user = User()
+        new_user.username = username
+        new_user.password = password
+
         new_user = await self.session.merge(new_user)
-        await self.session.flush()
+        await self.session.flush()
         return new_user
 
     async def get_by_username(self, username: str) -> User | None:

app/schemas/users.py

@@ -9,6 +9,7 @@ class UserScheme(BaseModel):
     """
     Схема, которую возвращает бэк.
     """
+
     id: int = 0
     username: str = "username"
 
@@ -20,6 +21,7 @@ class UserSchemeAdd(BaseModel):
     """
     Схема создания пользователя.
     """
+
     username: str = "username"
     password: str = "password"
 
@@ -28,6 +30,7 @@ class UserTokenScheme(BaseModel):
     """
     Схема токена пользователя.
     """
+
     access_token: str
     token_type: str = "Bearer"