Fixed wps errors

Author: vodkar

backend/app/api/deps.py

@@ -11,12 +11,11 @@
 from sqlmodel import Session
 
 from app import constants
-from app.core import security
-from app.core import config, db
+from app.core import config, db, security
 from app.models import TokenPayload, User
 
 reusable_oauth2 = OAuth2PasswordBearer(
-    tokenUrl=f"{config.settings.API_V1_STR}/login/access-token",
+    tokenUrl=f"{config.settings.API_V1_STR}/login/access-token",  # noqa: WPS237
 )
 
 
@@ -57,9 +56,15 @@ def get_current_user(session: SessionDep, token: TokenDep) -> User:
     token_data = _validate_token(token)
     user = session.get(User, token_data.sub)
     if not user:
-        raise HTTPException(status_code=constants.NOT_FOUND_CODE, detail="User not found")
+        raise HTTPException(
+            status_code=constants.NOT_FOUND_CODE,
+            detail="User not found",
+        )
     if not user.is_active:
-        raise HTTPException(status_code=constants.BAD_REQUEST_CODE, detail="Inactive user")
+        raise HTTPException(
+            status_code=constants.BAD_REQUEST_CODE,
+            detail="Inactive user",
+        )
     return user
 
 

backend/app/api/routes/items.py

@@ -53,7 +53,9 @@ def read_item(
     if not db_item:
         raise HTTPException(status_code=NOT_FOUND_CODE, detail="Item not found")
     if not current_user.is_superuser and (db_item.owner_id != current_user.id):
-        raise HTTPException(status_code=BAD_REQUEST_CODE, detail="Not enough permissions")
+        raise HTTPException(
+            status_code=BAD_REQUEST_CODE, detail="Not enough permissions",
+        )
     return ItemPublic.model_validate(db_item)
 
 
@@ -85,7 +87,9 @@ def update_item(
     if not db_item:
         raise HTTPException(status_code=NOT_FOUND_CODE, detail="Item not found")
     if not current_user.is_superuser and (db_item.owner_id != current_user.id):
-        raise HTTPException(status_code=BAD_REQUEST_CODE, detail="Not enough permissions")
+        raise HTTPException(
+            status_code=BAD_REQUEST_CODE, detail="Not enough permissions",
+        )
     update_dict = item_in.model_dump(exclude_unset=True)
     db_item.sqlmodel_update(update_dict)
     session.add(db_item)
@@ -105,7 +109,9 @@ def delete_item(
     if not db_item:
         raise HTTPException(status_code=NOT_FOUND_CODE, detail="Item not found")
     if not current_user.is_superuser and (db_item.owner_id != current_user.id):
-        raise HTTPException(status_code=BAD_REQUEST_CODE, detail="Not enough permissions")
+        raise HTTPException(
+            status_code=BAD_REQUEST_CODE, detail="Not enough permissions",
+        )
     session.delete(db_item)
     session.commit()
     return Message(message="Item deleted successfully")

backend/app/api/routes/login.py

@@ -12,13 +12,13 @@
 from app.constants import BAD_REQUEST_CODE, NOT_FOUND_CODE
 from app.core import security
 from app.core.config import settings
-from app.models import Message, NewPassword, Token, UserPublic
 from app.email_utils import (
     generate_password_reset_token,
     generate_reset_password_email,
     send_email,
     verify_password_reset_token,
 )
+from app.models import Message, NewPassword, Token, UserPublic
 
 router = APIRouter(tags=["login"])
 
@@ -35,7 +35,9 @@ def login_access_token(
         password=form_data.password,
     )
     if not user:
-        raise HTTPException(status_code=BAD_REQUEST_CODE, detail="Incorrect email or password")
+        raise HTTPException(
+            status_code=BAD_REQUEST_CODE, detail="Incorrect email or password",
+        )
     if not user.is_active:
         raise HTTPException(status_code=BAD_REQUEST_CODE, detail="Inactive user")
     access_token_expires = timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)

backend/app/api/routes/misc.py

@@ -5,8 +5,8 @@
 
 from app.api.deps import get_current_active_superuser
 from app.constants import CREATED_CODE
-from app.models import Message
 from app.email_utils import generate_test_email, send_email
+from app.models import Message
 
 router = APIRouter(prefix="/utils", tags=["utils"])
 

backend/app/api/routes/users.py

@@ -2,20 +2,22 @@
 
 import uuid
 
-# Removed unused Any import
 from fastapi import APIRouter, Depends, HTTPException
 from sqlmodel import col, delete, func, select
 
-from app import crud
+from app import crud, models
 from app.api.deps import (
-    Currentmodels.User,
     SessionDep,
     get_current_active_superuser,
 )
-from app.constants import BAD_REQUEST_CODE, CONFLICT_CODE, FORBIDDEN_CODE, NOT_FOUND_CODE
+from app.constants import (
+    BAD_REQUEST_CODE,
+    CONFLICT_CODE,
+    FORBIDDEN_CODE,
+    NOT_FOUND_CODE,
+)
 from app.core.config import settings
 from app.core.security import get_password_hash, verify_password
-from app import models
 from app.email_utils import generate_new_account_email, send_email
 
 router = APIRouter(prefix="/users", tags=["users"])
@@ -25,22 +27,30 @@
     "/",
     dependencies=[Depends(get_current_active_superuser)],
 )
-def read_users(session: SessionDep, skip: int = 0, limit: int = 100) -> models.models.UsersPublic:
+def read_users(
+    session: SessionDep,
+    skip: int = 0,
+    limit: int = 100,
+) -> models.UsersPublic:
     """Retrieve users."""
     count_statement = select(func.count()).select_from(models.User)
     count = session.exec(count_statement).one()
 
     statement = select(models.User).offset(skip).limit(limit)
     users = session.exec(statement).all()
 
-    return models.models.UsersPublic(data=users, count=count)
+    return models.UsersPublic(user_data=users, count=count)
 
 
 @router.post(
     "/",
     dependencies=[Depends(get_current_active_superuser)],
 )
-def create_user(*, session: SessionDep, user_in: models.models.UserCreate) -> models.models.UserPublic:
+def create_user(
+    *,
+    session: SessionDep,
+    user_in: models.UserCreate,
+) -> models.UserPublic:
     """Create new user."""
     user = crud.get_user_by_email(session=session, email=user_in.email)
     if user:
@@ -50,7 +60,7 @@ def create_user(*, session: SessionDep, user_in: models.models.UserCreate) -> mo
         )
 
     user = crud.create_user(session=session, user_create=user_in)
-    if settings.emails_enabled and user_in.email:
+    if not settings.emails_enabled and user_in.email:
         email_data = generate_new_account_email(
             email_to=user_in.email,
             username=user_in.email,
@@ -61,16 +71,16 @@ def create_user(*, session: SessionDep, user_in: models.models.UserCreate) -> mo
             subject=email_data.subject,
             html_content=email_data.html_content,
         )
-    return models.models.UserPublic.model_validate(user)
+    return models.UserPublic.model_validate(user)
 
 
 @router.patch("/me")
 def update_user_me(
     *,
     session: SessionDep,
-    user_in: models.models.models.UserUpdateMe,
-    current_user: Currentmodels.User,
-) -> models.models.UserPublic:
+    user_in: models.UserUpdateMe,
+    current_user: models.User,
+) -> models.UserPublic:
     """Update own user."""
     if user_in.email:
         existing_user = crud.get_user_by_email(session=session, email=user_in.email)
@@ -84,15 +94,15 @@ def update_user_me(
     session.add(current_user)
     session.commit()
     session.refresh(current_user)
-    return models.models.UserPublic.model_validate(current_user)
+    return models.UserPublic.model_validate(current_user)
 
 
 @router.patch("/me/password")
 def update_password_me(
     *,
     session: SessionDep,
     body: models.UpdatePassword,
-    current_user: Currentmodels.User,
+    current_user: models.User,
 ) -> models.Message:
     """Update own password."""
     if not verify_password(body.current_password, current_user.hashed_password):
@@ -110,13 +120,16 @@ def update_password_me(
 
 
 @router.get("/me")
-def read_user_me(current_user: Currentmodels.User) -> models.models.UserPublic:
+def read_user_me(current_user: models.User) -> models.UserPublic:
     """Get current user."""
-    return models.models.UserPublic.model_validate(current_user)
+    return models.UserPublic.model_validate(current_user)
 
 
 @router.delete("/me")
-def delete_user_me(session: SessionDep, current_user: Currentmodels.User) -> models.Message:
+def delete_user_me(
+    session: SessionDep,
+    current_user: models.User,
+) -> models.Message:
     """Delete own user."""
     if current_user.is_superuser:
         raise HTTPException(
@@ -129,37 +142,40 @@ def delete_user_me(session: SessionDep, current_user: Currentmodels.User) -> mod
 
 
 @router.post("/signup")
-def register_user(session: SessionDep, user_in: models.models.UserRegister) -> models.models.UserPublic:
+def register_user(
+    session: SessionDep,
+    user_in: models.UserRegister,
+) -> models.UserPublic:
     """Create new user without the need to be logged in."""
     user = crud.get_user_by_email(session=session, email=user_in.email)
     if user:
         raise HTTPException(
             status_code=BAD_REQUEST_CODE,
             detail="The user with this email already exists in the system",
         )
-    user_create = models.models.UserCreate.model_validate(user_in)
+    user_create = models.UserCreate.model_validate(user_in)
     user = crud.create_user(session=session, user_create=user_create)
-    return models.models.UserPublic.model_validate(user)
+    return models.UserPublic.model_validate(user)
 
 
 @router.get("/{user_id}")
 def read_user_by_id(
     user_id: uuid.UUID,
     session: SessionDep,
-    current_user: Currentmodels.User,
-) -> models.models.UserPublic:
+    current_user: models.User,
+) -> models.UserPublic:
     """Get a specific user by id."""
     user = session.get(models.User, user_id)
     if not user:
         raise HTTPException(status_code=NOT_FOUND_CODE, detail="models.User not found")
     if user == current_user:
-        return models.models.UserPublic.model_validate(user)
+        return models.UserPublic.model_validate(user)
     if not current_user.is_superuser:
         raise HTTPException(
             status_code=FORBIDDEN_CODE,
             detail="The user doesn't have enough privileges",
         )
-    return models.models.UserPublic.model_validate(user)
+    return models.UserPublic.model_validate(user)
 
 
 @router.patch(
@@ -170,8 +186,8 @@ def update_user(
     *,
     session: SessionDep,
     user_id: uuid.UUID,
-    user_in: models.models.UserUpdate,
-) -> models.models.UserPublic:
+    user_in: models.UserUpdate,
+) -> models.UserPublic:
     """Update a user."""
     db_user = session.get(models.User, user_id)
     if not db_user:
@@ -188,13 +204,13 @@ def update_user(
             )
 
     db_user = crud.update_user(session=session, db_user=db_user, user_in=user_in)
-    return models.models.UserPublic.model_validate(db_user)
+    return models.UserPublic.model_validate(db_user)
 
 
 @router.delete("/{user_id}", dependencies=[Depends(get_current_active_superuser)])
 def delete_user(
     session: SessionDep,
-    current_user: Currentmodels.User,
+    current_user: models.User,
     user_id: uuid.UUID,
 ) -> models.Message:
     """Delete a user."""
@@ -206,7 +222,7 @@ def delete_user(
             status_code=FORBIDDEN_CODE,
             detail="Super users are not allowed to delete themselves",
         )
-    statement = delete(models.Item).where(col(models.Item.owner_id) == user_id)
+    statement = delete(models.Item).where(col(models.Item.owner_id) == user_id)  # noqa: WPS221
     session.execute(statement)  # type: ignore[deprecated]
     session.delete(user)
     session.commit()

backend/app/constants.py

@@ -24,4 +24,4 @@
 MIN_VARIABLE_NAME_LENGTH = 2
 MAX_JONES_COMPLEXITY = 14
 MAX_STRING_LITERAL_USAGE = 3
-MAX_EXPRESSION_USAGE = 7
+MAX_EXPRESSION_USAGE = 7

backend/app/core/config.py

@@ -37,11 +37,13 @@ class Settings(BaseSettings):  # type: ignore[explicit-any]
         env_ignore_empty=True,
         extra="ignore",
     )
-    
+
     # API Settings
     API_V1_STR: str = "/api/v1"
     SECRET_KEY: str = secrets.token_urlsafe(TOKEN_LENGTH)
-    ACCESS_TOKEN_EXPIRE_MINUTES: int = 60 * 24 * 8  # 60 minutes * 24 hours * 8 days = 8 days
+    ACCESS_TOKEN_EXPIRE_MINUTES: int = (
+        60 * 24 * 8
+    )  # 60 minutes * 24 hours * 8 days = 8 days
     FRONTEND_HOST: str = "http://localhost:5173"
     ENVIRONMENT: Literal["local", "staging", "production"] = "local"
 
@@ -54,14 +56,14 @@ class Settings(BaseSettings):  # type: ignore[explicit-any]
     # Project Settings
     PROJECT_NAME: str
     SENTRY_DSN: HttpUrl | None = None
-    
+
     # Database Settings
     POSTGRES_SERVER: str
     POSTGRES_PORT: int = 5432
     POSTGRES_USER: str
     POSTGRES_PASSWORD: str = ""
     POSTGRES_DB: str = ""
-    
+
     # Email Settings
     SMTP_TLS: bool = True
     SMTP_SSL: bool = False
@@ -72,22 +74,22 @@ class Settings(BaseSettings):  # type: ignore[explicit-any]
     EMAILS_FROM_EMAIL: EmailStr | None = None
     EMAILS_FROM_NAME: EmailStr | None = None
     EMAIL_RESET_TOKEN_EXPIRE_HOURS: int = 48
-    
+
     # Test Settings
     EMAIL_TEST_USER: EmailStr = "[email protected]"
     FIRST_SUPERUSER: EmailStr
     FIRST_SUPERUSER_PASSWORD: str
 
     @property
-    @computed_field  # type: ignore[prop-decorator]
+    @computed_field
     def all_cors_origins(self) -> list[str]:
         """Get all CORS origins."""
         return [str(origin).rstrip("/") for origin in self.BACKEND_CORS_ORIGINS] + [
             self.FRONTEND_HOST,
         ]
 
     @property
-    @computed_field  # type: ignore[prop-decorator]
+    @computed_field
     def SQLALCHEMY_DATABASE_URI(self) -> PostgresDsn:  # noqa: N802
         """Build database URI from configuration."""
         return PostgresDsn.build(
@@ -100,13 +102,13 @@ def SQLALCHEMY_DATABASE_URI(self) -> PostgresDsn:  # noqa: N802
         )
 
     @property
-    @computed_field  # type: ignore[prop-decorator]
+    @computed_field
     def emails_enabled(self) -> bool:
         """Check if email configuration is enabled."""
         return bool(self.SMTP_HOST and self.EMAILS_FROM_EMAIL)
 
     def _check_default_secret(self, var_name: str, secret_value: str | None) -> None:
-        if secret_value == "changethis":
+        if secret_value == "changethis":  # noqa: S105
             message = (
                 f'The value of {var_name} is "changethis", '
                 "for security, please change it, at least for deployments."