refactor: refactor api project with ruff

2025-06-09 12:12:48 +05:00
parent 2e4e9d1113
commit 787dc0e8f8
15 changed files with 100 additions and 112 deletions
--- a/api/api/endpoints/account.py
+++ b/api/api/endpoints/account.py
@@ -10,47 +10,51 @@ from sqlalchemy.ext.asyncio import AsyncConnection

 from api.db.connection.session import get_connection_dep

-from api.db.logic.account import get_user_by_id, update_user_by_id, create_user,get_user_by_login,get_user_accaunt_page
+from api.db.logic.account import (
+    get_user_by_id,
+    update_user_by_id,
+    create_user,
+    get_user_by_login,
+    get_user_accaunt_page,
+)

 from api.schemas.account.account import User
 from api.db.tables.account import AccountStatus
 from api.schemas.base import bearer_schema
-from api.schemas.endpoints.account import UserUpdate,AllUserResponse
+from api.schemas.endpoints.account import UserUpdate, AllUserResponse
 from api.services.auth import get_current_user

 from api.services.user_role_validation import db_user_role_validation
 from api.services.update_data_validation import update_user_data_changes


-
 api_router = APIRouter(
    prefix="/account",
    tags=["User accountModel"],
 )

-@api_router.get("",dependencies=[Depends(bearer_schema)],response_model=AllUserResponse)
+
+@api_router.get("", dependencies=[Depends(bearer_schema)], response_model=AllUserResponse)
 async def get_all_account(
-                    page: int = 1,
-                    limit: int = 10,
-                    connection: AsyncConnection = Depends(get_connection_dep),
-                    current_user = Depends(get_current_user)
-                    ):
-
-
+    page: int = 1,
+    limit: int = 10,
+    connection: AsyncConnection = Depends(get_connection_dep),
+    current_user=Depends(get_current_user),
+):
    authorize_user = await db_user_role_validation(connection, current_user)

-    user_list = await get_user_accaunt_page(connection,page,limit)
+    user_list = await get_user_accaunt_page(connection, page, limit)

    if user_list is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="Accounts not found")
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Accounts not found")

    return user_list


-@api_router.get("/{user_id}",dependencies=[Depends(bearer_schema)], response_model=User)
-async def get_account(user_id: int, connection: AsyncConnection = Depends(get_connection_dep), current_user = Depends(get_current_user)):
+@api_router.get("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=User)
+async def get_account(
+    user_id: int, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
+):
    authorize_user = await db_user_role_validation(connection, current_user)

    user = await get_user_by_id(connection, user_id)
@@ -61,22 +65,16 @@ async def get_account(user_id: int, connection: AsyncConnection = Depends(get_co
    return user


-
-@api_router.post("", dependencies=[Depends(bearer_schema)],response_model=User)
+@api_router.post("", dependencies=[Depends(bearer_schema)], response_model=User)
 async def create_account(
-                        user: UserUpdate,
-                        connection: AsyncConnection = Depends(get_connection_dep),
-    current_user = Depends(get_current_user)
-                    ):
-
-
+    user: UserUpdate, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
+):
    authorize_user = await db_user_role_validation(connection, current_user)

    user_validation = await get_user_by_login(connection, user.login)

    if user_validation is None:
-
-        await create_user(connection,user,authorize_user.id)
+        await create_user(connection, user, authorize_user.id)
        user_new = await get_user_by_login(connection, user.login)
        return user_new

@@ -86,11 +84,13 @@ async def create_account(
        )


-@api_router.put("/{user_id}",dependencies=[Depends(bearer_schema)], response_model=User)
+@api_router.put("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=User)
 async def update_account(
-    user_id: int, user_update: UserUpdate, connection: AsyncConnection = Depends(get_connection_dep), current_user = Depends(get_current_user)
+    user_id: int,
+    user_update: UserUpdate,
+    connection: AsyncConnection = Depends(get_connection_dep),
+    current_user=Depends(get_current_user),
 ):
-
    authorize_user = await db_user_role_validation(connection, current_user)

    user = await get_user_by_id(connection, user_id)
@@ -106,20 +106,15 @@ async def update_account(

    await update_user_by_id(connection, update_values, user)

-
    user = await get_user_by_id(connection, user_id)

    return user

-@api_router.delete("/{user_id}", dependencies=[Depends(bearer_schema)],response_model=User)
+
+@api_router.delete("/{user_id}", dependencies=[Depends(bearer_schema)], response_model=User)
 async def delete_account(
-                        user_id: int,
-                        connection: AsyncConnection = Depends(get_connection_dep),
-    current_user = Depends(get_current_user)
-                    ):
-
-
-
+    user_id: int, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
+):
    authorize_user = await db_user_role_validation(connection, current_user)

    user = await get_user_by_id(connection, user_id)
@@ -133,10 +128,8 @@ async def delete_account(
    if update_values is None:
        return user

-
    await update_user_by_id(connection, update_values, user)

-
    user = await get_user_by_id(connection, user_id)

    return user
--- a/api/api/endpoints/auth.py
+++ b/api/api/endpoints/auth.py
@@ -86,8 +86,7 @@ async def login_for_access_token(
    return Access(access_token=access_token)


-
-@api_router.post("/refresh",response_model=Access)
+@api_router.post("/refresh", response_model=Access)
 async def refresh(
    request: Request, connection: AsyncConnection = Depends(get_connection_dep), Authorize: AuthJWT = Depends()
 ):
--- a/api/api/endpoints/keyring.py
+++ b/api/api/endpoints/keyring.py
@@ -13,8 +13,7 @@ from sqlalchemy.ext.asyncio import AsyncConnection

 from api.db.connection.session import get_connection_dep

-from api.db.logic.keyring import get_key_by_id,create_key,update_key_by_id
-
+from api.db.logic.keyring import get_key_by_id, create_key, update_key_by_id


 from api.db.tables.account import KeyStatus
@@ -34,14 +33,10 @@ api_router = APIRouter(
 )


-@api_router.get("/{user_id}/{key_id}",dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
+@api_router.get("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
 async def get_keyring(
-                    key_id: str,
-                    connection: AsyncConnection = Depends(get_connection_dep),
-    current_user = Depends(get_current_user)
-                    ):
-
-
+    key_id: str, connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
+):
    authorize_user = await db_user_role_validation(connection, current_user)

    keyring = await get_key_by_id(connection, key_id)
@@ -58,15 +53,18 @@ async def create_keyring(
    key_id: str,
    key: AccountKeyringUpdate,
    connection: AsyncConnection = Depends(get_connection_dep),
-    current_user = Depends(get_current_user)
+    current_user=Depends(get_current_user),
 ):
-
    authorize_user = await db_user_role_validation(connection, current_user)

    keyring = await get_key_by_id(connection, key_id)

    if keyring is None:
-        keyring_new = await create_key(connection,key, key_id, )
+        keyring_new = await create_key(
+            connection,
+            key,
+            key_id,
+        )
        return keyring_new

    else:
@@ -75,15 +73,14 @@ async def create_keyring(
        )


-@api_router.put("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)],response_model=AccountKeyring)
+@api_router.put("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
 async def update_keyring(
    user_id: int,
    key_id: str,
    keyring_update: AccountKeyringUpdate,
    connection: AsyncConnection = Depends(get_connection_dep),
-    current_user = Depends(get_current_user)
+    current_user=Depends(get_current_user),
 ):
-
    authorize_user = await db_user_role_validation(connection, current_user)

    keyring = await get_key_by_id(connection, key_id)
@@ -99,16 +96,18 @@ async def update_keyring(

    await update_key_by_id(connection, update_values, keyring)

-
    keyring = await get_key_by_id(connection, key_id)

    return keyring

-@api_router.delete("/{user_id}/{key_id}",dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
-async def delete_keyring(
-    user_id: int, key_id: str,  connection: AsyncConnection = Depends(get_connection_dep), current_user = Depends(get_current_user)
-):

+@api_router.delete("/{user_id}/{key_id}", dependencies=[Depends(bearer_schema)], response_model=AccountKeyring)
+async def delete_keyring(
+    user_id: int,
+    key_id: str,
+    connection: AsyncConnection = Depends(get_connection_dep),
+    current_user=Depends(get_current_user),
+):
    authorize_user = await db_user_role_validation(connection, current_user)

    keyring = await get_key_by_id(connection, key_id)
@@ -124,7 +123,6 @@ async def delete_keyring(

    await update_key_by_id(connection, update_values, keyring)

-
    keyring = await get_key_by_id(connection, key_id)

    return keyring
--- a/api/api/endpoints/profile.py
+++ b/api/api/endpoints/profile.py
@@ -13,7 +13,7 @@ from fastapi import (
 from sqlalchemy.ext.asyncio import AsyncConnection

 from api.db.connection.session import get_connection_dep
-from api.db.logic.account import get_user_by_id, update_user_by_id,get_user_by_login
+from api.db.logic.account import get_user_by_id, update_user_by_id, get_user_by_login
 from api.schemas.base import bearer_schema
 from api.services.auth import get_current_user
 from api.services.update_data_validation import update_user_data_changes
@@ -28,12 +28,10 @@ api_router = APIRouter(
 )


-@api_router.get("",dependencies=[Depends(bearer_schema)],response_model=User)
+@api_router.get("", dependencies=[Depends(bearer_schema)], response_model=User)
 async def get_profile(
-    connection: AsyncConnection = Depends(get_connection_dep),
-    current_user = Depends(get_current_user)
+    connection: AsyncConnection = Depends(get_connection_dep), current_user=Depends(get_current_user)
 ):
-
    user = await get_user_by_login(connection, current_user)

    if user is None:
@@ -42,13 +40,12 @@ async def get_profile(
    return user


-@api_router.put("", dependencies=[Depends(bearer_schema)],response_model=User)
+@api_router.put("", dependencies=[Depends(bearer_schema)], response_model=User)
 async def update_profile(
    user_updata: UserUpdate,
    connection: AsyncConnection = Depends(get_connection_dep),
-    current_user = Depends(get_current_user)
+    current_user=Depends(get_current_user),
 ):
-
    user = await get_user_by_login(connection, current_user)
    if user is None:
        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Account not found")