Ruff 0.11.8 (#697)

### Description

Bump Ruff. Enable new rules

Author: armanddidierjean

app/core/auth/endpoints_auth.py

@@ -442,7 +442,7 @@ async def token(
             request_id=request_id,
         )
 
-    elif tokenreq.grant_type == "refresh_token":
+    if tokenreq.grant_type == "refresh_token":
         return await refresh_token_grant(
             db=db,
             settings=settings,
@@ -451,15 +451,14 @@ async def token(
             request_id=request_id,
         )
 
-    else:
-        hyperion_access_logger.warning(
-            f"Token: Unsupported grant_type, received {tokenreq.grant_type} ({request_id})",
-        )
-        raise AuthHTTPException(
-            status_code=400,
-            error="unsupported_grant_type",
-            error_description=f"{tokenreq.grant_type} is not supported",
-        )
+    hyperion_access_logger.warning(
+        f"Token: Unsupported grant_type, received {tokenreq.grant_type} ({request_id})",
+    )
+    raise AuthHTTPException(
+        status_code=400,
+        error="unsupported_grant_type",
+        error_description=f"{tokenreq.grant_type} is not supported",
+    )
 
 
 async def authorization_code_grant(
@@ -708,7 +707,7 @@ async def refresh_token_grant(
             error="invalid_request",
             error_description="Invalid refresh token",
         )
-    elif db_refresh_token.revoked_on is not None:
+    if db_refresh_token.revoked_on is not None:
         # If the client tries to use a revoked refresh_token, we want to revoke all other refresh tokens from this client and user
         await cruds_auth.revoke_refresh_token_by_client_and_user_id(
             db=db,
@@ -762,7 +761,7 @@ async def refresh_token_grant(
         )
 
     # If the auth provider expects to use a client secret, we don't use PKCE
-    elif auth_client.secret is not None:
+    if auth_client.secret is not None:
         # We need to check the correct client_secret was provided
         if auth_client.secret != tokenreq.client_secret:
             hyperion_access_logger.warning(
@@ -919,16 +918,14 @@ async def create_response_body(
     access_token = create_access_token(data=access_token_data, settings=settings)
 
     # We create an OAuth response, with oidc specific elements if required
-    response_body = schemas_auth.TokenResponse(
+    return schemas_auth.TokenResponse(
         access_token=access_token,
         expires_in=settings.ACCESS_TOKEN_EXPIRE_MINUTES * 60,  # in seconds
         scope=granted_scopes,
         refresh_token=refresh_token,
         id_token=id_token,
     )
 
-    return response_body
-
 
 @router.post(
     "/auth/introspect",

app/core/auth/schemas_auth.py

@@ -1,6 +1,7 @@
 """Schemas file for endpoint /auth"""
 
 from datetime import datetime
+from typing import Literal
 
 from fastapi import Form
 from pydantic import BaseModel, field_validator
@@ -145,7 +146,7 @@ class config:
 
 class TokenResponse(BaseModel):
     access_token: str
-    token_type: str = "bearer"
+    token_type: Literal["bearer"] = "bearer"  # noqa: S105
     expires_in: int = 1800
     scope: str = ""
     refresh_token: str

app/core/core_endpoints/endpoints_core.py

@@ -251,26 +251,22 @@ async def add_module_visibility(
             root=module_visibility.root,
             allowed_group_id=module_visibility.allowed_group_id,
         )
-        try:
-            return await cruds_core.create_module_group_visibility(
-                module_visibility=module_group_visibility_db,
-                db=db,
-            )
-        except ValueError as error:
-            raise HTTPException(status_code=400, detail=str(error))
+
+        await cruds_core.create_module_group_visibility(
+            module_visibility=module_group_visibility_db,
+            db=db,
+        )
 
     if module_visibility.allowed_account_type is not None:
         module_account_visibility_db = models_core.ModuleAccountTypeVisibility(
             root=module_visibility.root,
             allowed_account_type=module_visibility.allowed_account_type,
         )
-        try:
-            return await cruds_core.create_module_account_type_visibility(
-                module_visibility=module_account_visibility_db,
-                db=db,
-            )
-        except ValueError as error:
-            raise HTTPException(status_code=400, detail=str(error))
+
+        await cruds_core.create_module_account_type_visibility(
+            module_visibility=module_account_visibility_db,
+            db=db,
+        )
 
 
 @router.delete("/module-visibility/{root}/groups/{group_id}", status_code=204)

app/core/google_api/google_api.py

@@ -56,14 +56,12 @@ def _get_flow(self, settings: Settings) -> Flow:
                 # "redirect_uris": [""],
             },
         }
-        flow = Flow.from_client_config(
+        return Flow.from_client_config(
             client_config,
             GoogleAPI.SCOPES,
             redirect_uri=settings.CLIENT_URL + "google-api/oauth2callback",
         )
 
-        return flow
-
     async def _start_authentication(
         self,
         db: AsyncSession,

app/core/groups/endpoints_groups.py

@@ -45,8 +45,7 @@ async def read_groups(
     Return all groups from database as a list of dictionaries
     """
 
-    groups = await cruds_groups.get_groups(db)
-    return groups
+    return await cruds_groups.get_groups(db)
 
 
 @router.get(

app/core/groups/schemas_groups.py

@@ -70,6 +70,6 @@ class CoreMembershipDelete(BaseModel):
 
 
 # Importing here to avoid circular imports
-from app.core.users.schemas_users import CoreUserSimple  # noqa: E402, TCH001
+from app.core.users.schemas_users import CoreUserSimple  # noqa: E402, TC001
 
 CoreGroup.model_rebuild()

app/core/memberships/endpoints_memberships.py

@@ -41,8 +41,7 @@ async def read_associations_memberships(
     Return all memberships from database as a list of dictionaries
     """
 
-    memberships = await cruds_memberships.get_association_memberships(db)
-    return memberships
+    return await cruds_memberships.get_association_memberships(db)
 
 
 @router.get(
@@ -82,19 +81,15 @@ async def read_association_membership(
             detail="User is not allowed to access this membership",
         )
 
-    db_user_memberships = (
-        await cruds_memberships.get_user_memberships_by_association_membership_id(
-            db=db,
-            association_membership_id=association_membership_id,
-            minimal_start_date=minimalStartDate,
-            maximal_start_date=maximalStartDate,
-            minimal_end_date=minimalEndDate,
-            maximal_end_date=maximalEndDate,
-        )
+    return await cruds_memberships.get_user_memberships_by_association_membership_id(
+        db=db,
+        association_membership_id=association_membership_id,
+        minimal_start_date=minimalStartDate,
+        maximal_start_date=maximalStartDate,
+        minimal_end_date=minimalEndDate,
+        maximal_end_date=maximalEndDate,
     )
 
-    return db_user_memberships
-
 
 @router.post(
     "/memberships/",
@@ -256,11 +251,10 @@ async def read_user_memberships(
             detail="User is not allowed to access other users' memberships",
         )
 
-    memberships = await cruds_memberships.get_user_memberships_by_user_id(
+    return await cruds_memberships.get_user_memberships_by_user_id(
         db,
         user_id,
     )
-    return memberships
 
 
 @router.get(
@@ -280,12 +274,11 @@ async def read_user_association_membership_history(
     **This endpoint is only usable by administrators**
     """
 
-    memberships = await cruds_memberships.get_user_memberships_by_user_id_and_association_membership_id(
+    return await cruds_memberships.get_user_memberships_by_user_id_and_association_membership_id(
         db,
         user_id,
         association_membership_id,
     )
-    return memberships
 
 
 @router.post(

app/core/myeclpay/endpoints_myeclpay.py

@@ -94,12 +94,10 @@ async def get_structures(
     """
     Get all structures.
     """
-    structures = await cruds_myeclpay.get_structures(
+    return await cruds_myeclpay.get_structures(
         db=db,
     )
 
-    return structures
-
 
 @router.post(
     "/myeclpay/structures",
@@ -848,13 +846,11 @@ async def get_store_sellers(
             detail="User does not have the permission to manage sellers",
         )
 
-    sellers = await cruds_myeclpay.get_sellers_by_store_id(
+    return await cruds_myeclpay.get_sellers_by_store_id(
         store_id=store_id,
         db=db,
     )
 
-    return sellers
-
 
 @router.patch(
     "/myeclpay/stores/{store_id}/sellers/{seller_user_id}",
@@ -1190,13 +1186,11 @@ async def get_user_devices(
             detail="User is not registered for MyECL Pay",
         )
 
-    wallet_devices = await cruds_myeclpay.get_wallet_devices_by_wallet_id(
+    return await cruds_myeclpay.get_wallet_devices_by_wallet_id(
         wallet_id=user_payment.wallet_id,
         db=db,
     )
 
-    return wallet_devices
-
 
 @router.get(
     "/myeclpay/users/me/wallet/devices/{wallet_device_id}",
@@ -1707,7 +1701,7 @@ async def add_transfer_by_admin(
 
     message = Message(
         title="💳 Paiement - transfert",
-        content=f"Votre compte a été crédité de {transfer_info.amount/100} €",
+        content=f"Votre compte a été crédité de {transfer_info.amount / 100} €",
         action_module="MyECLPay",
     )
     await notification_tool.send_notification_to_user(
@@ -2189,7 +2183,7 @@ async def store_scan_qrcode(
 
     message = Message(
         title=f"💳 Paiement - {store.name}",
-        content=f"Une transaction de {scan_info.tot/100} € a été effectuée",
+        content=f"Une transaction de {scan_info.tot / 100} € a été effectuée",
         action_module="MyECLPay",
     )
     await notification_tool.send_notification_to_user(
@@ -2364,7 +2358,7 @@ async def refund_transaction(
     if wallet_previously_debited.user is not None:
         message = Message(
             title="💳 Remboursement",
-            content=f"La transaction pour {wallet_previously_credited_name} ({transaction.total/100} €) a été remboursée de {refund_amount/100} €",
+            content=f"La transaction pour {wallet_previously_credited_name} ({transaction.total / 100} €) a été remboursée de {refund_amount / 100} €",
             action_module="MyECLPay",
         )
         await notification_tool.send_notification_to_user(
@@ -2379,7 +2373,7 @@ async def refund_transaction(
             wallet_previously_debited_name = wallet_previously_debited.store.name
         message = Message(
             title="💳 Remboursement",
-            content=f"Vous avez remboursé la transaction de {wallet_previously_debited_name} ({transaction.total/100} €) de {refund_amount/100} €",
+            content=f"Vous avez remboursé la transaction de {wallet_previously_debited_name} ({transaction.total / 100} €) de {refund_amount / 100} €",
             action_module="MyECLPay",
         )
         await notification_tool.send_notification_to_user(
@@ -2510,7 +2504,7 @@ async def cancel_transaction(
     if debited_wallet.user is not None:
         message = Message(
             title="💳 Paiement annulé",
-            content=f"La transaction de {transaction.total/100} € a été annulée",
+            content=f"La transaction de {transaction.total / 100} € a été annulée",
             action_module="MyECLPay",
         )
         await notification_tool.send_notification_to_user(

app/core/notification/notification_types.py

@@ -26,8 +26,7 @@ def __init__(self, topic: Topic, topic_identifier: str = ""):
     def to_str(self) -> str:
         if self.topic_identifier:
             return f"{self.topic.value}_{self.topic_identifier}"
-        else:
-            return self.topic.value
+        return self.topic.value
 
     @classmethod
     def from_str(cls, topic_str: str):

app/core/payment/schemas_payment.py

@@ -24,7 +24,7 @@ class CheckoutComplete(BaseModel):
 
     payments: list[CheckoutPayment]
 
-    @computed_field  # type: ignore
+    @computed_field  # type: ignore[misc] # Current issue with mypy, see https://docs.pydantic.dev/2.0/usage/computed_fields/ and https://github.com/python/mypy/issues/1362
     @property
     def payment_completed(self) -> bool:
         total_paid = sum([payment.paid_amount for payment in self.payments])