fix: mypy errors

Author: iRingil

.github/workflows/mypy.yml

@@ -26,4 +26,4 @@ jobs:
           if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
       - name: Test with Mypy
         run: |
-          mypy .
+          mypy --config-file backend/pyproject.toml backend/src

pyproject.toml backend/pyproject.tomlpyproject.toml renamed to backend/pyproject.toml

@@ -1,6 +1,6 @@
 """Module for dependency injection."""
 
-from typing import Annotated, Type
+from typing import Annotated
 from uuid import UUID
 
 import jwt
@@ -17,7 +17,7 @@
 from app.crud.user import UserCRUD
 from app.models import User
 
-__all__: tuple[str, ...] = ("CurrentUser", "CurrentSuperuser", "ItemCRUDDep", "OptionalCurrentUser", "UserCRUDDep")
+__all__: tuple[str, ...] = ("CurrentUser", "CurrentSuperuser", "ItemCrudDep", "OptionalCurrentUser", "UserCrudDep")
 
 # Basic settings
 settings: Settings = get_settings()
@@ -31,11 +31,11 @@
 reusable_oauth2_optional: OAuth2PasswordBearer = OAuth2PasswordBearer(tokenUrl=token_url, auto_error=False)
 
 # Basic dependencies
-SessionDep: Type[AsyncSession] = Annotated[AsyncSession, Depends(db_manager.get_session)]
-SecurityManagerDep: Type[SecurityManager] = Annotated[SecurityManager, Depends(get_security_manager)]
+SessionDep = Annotated[AsyncSession, Depends(db_manager.get_session)]
+SecurityManagerDep = Annotated[SecurityManager, Depends(get_security_manager)]
 # Creating two versions of token dependency
-StrictTokenDep: Type[str] = Annotated[str, Depends(reusable_oauth2_strict)]
-OptionalTokenDep: Type[str | None] = Annotated[str | None, Depends(reusable_oauth2_optional)]
+StrictTokenDep = Annotated[str, Depends(reusable_oauth2_strict)]
+OptionalTokenDep = Annotated[str | None, Depends(reusable_oauth2_optional)]
 
 
 # Class dependencies for CRUD
@@ -64,16 +64,16 @@ def __call__(self, session: SessionDep) -> ItemCRUD:
         return ItemCRUD(session=session)
 
 
-UserCRUDDep: Type[UserCRUD] = Annotated[UserCRUD, Depends(UserCRUDProvider())]
-ItemCRUDDep: Type[ItemCRUD] = Annotated[ItemCRUD, Depends(ItemCRUDProvider())]
+UserCrudDep = Annotated[UserCRUD, Depends(UserCRUDProvider())]
+ItemCrudDep = Annotated[ItemCRUD, Depends(ItemCRUDProvider())]
 
 
 # Class dependencies for authentication
 class CurrentUserProvider:
     """Class dependency for obtaining the current user (strict)."""
 
     async def __call__(
-        self, token: StrictTokenDep, user_crud: UserCRUDDep, security_manager: SecurityManagerDep
+        self, token: StrictTokenDep, user_crud: UserCrudDep, security_manager: SecurityManagerDep
     ) -> User:
         """
         Retrieve the current user based on the provided JWT token.
@@ -101,7 +101,7 @@ class OptionalCurrentUserProvider:
     """Class dependency for optionally obtaining the current user."""
 
     async def __call__(
-        self, token: OptionalTokenDep, user_crud: UserCRUDDep, security_manager: SecurityManagerDep
+        self, token: OptionalTokenDep, user_crud: UserCrudDep, security_manager: SecurityManagerDep
     ) -> User | None:
         """
         Retrieve the current user based on the provided JWT token.
@@ -142,6 +142,6 @@ def __call__(self, current_user: Annotated[User, Depends(CurrentUserProvider())]
 
 
 # Final pseudonyms
-CurrentUser: Type[User] = Annotated[User, Depends(CurrentUserProvider())]
-CurrentSuperuser: Type[User] = Annotated[User, Depends(ActiveSuperuserProvider())]
-OptionalCurrentUser: Type[User | None] = Annotated[User | None, Depends(OptionalCurrentUserProvider())]
+CurrentUser = Annotated[User, Depends(CurrentUserProvider())]
+CurrentSuperuser = Annotated[User, Depends(ActiveSuperuserProvider())]
+OptionalCurrentUser = Annotated[User | None, Depends(OptionalCurrentUserProvider())]

backend/src/app/api/deps.py

@@ -1,18 +1,18 @@
 """Module for items endpoints."""
 
-from typing import Annotated, Any, Type
+from typing import Annotated, Any
 from uuid import UUID
 
 from fastapi import APIRouter, HTTPException, Path, status
 from fastapi_utils.cbv import cbv
 
-from app.api.deps import CurrentUser, ItemCRUDDep, OptionalCurrentUser
+from app.api.deps import CurrentUser, ItemCrudDep, OptionalCurrentUser
 from app.models import Item, ItemCreate, ItemPublic, ItemsPublic, ItemUpdate, Message
 
 __all__: tuple[str] = ("items_router",)
 
 
-ItemIDDep: Type[UUID] = Annotated[UUID, Path(alias="id", description="ID элемента")]
+ItemIdDep = Annotated[UUID, Path(alias="id", description="Item ID")]
 
 items_router: APIRouter = APIRouter()
 
@@ -21,14 +21,14 @@
 class ItemsRouter:
     """Class-based view for item endpoints."""
 
-    def __init__(self, item_crud: ItemCRUDDep, current_user: OptionalCurrentUser) -> None:
+    def __init__(self, item_crud: ItemCrudDep, current_user: OptionalCurrentUser) -> None:
         """
         Initializes the ItemsRouter class with the necessary dependencies.
 
         :param item_crud: Dependency for item CRUD operations.
         :param current_user: Dependency for the current authorized user.
         """
-        self._item_crud: ItemCRUDDep = item_crud
+        self._item_crud: ItemCrudDep = item_crud
         self._current_user: CurrentUser = current_user
 
     async def _get_and_validate_item(self, item_id: UUID) -> Item:
@@ -95,7 +95,7 @@ async def create_item(self, *, item_in: ItemCreate) -> Item:
     @items_router.get(
         path="/{id}", response_model=ItemPublic, summary="Read Item by ID", description="Getting an item by ID."
     )
-    async def read_item(self, item_id: ItemIDDep) -> Any:
+    async def read_item(self, item_id: ItemIdDep) -> Any:
         """
         Endpoint for retrieving an item by its ID.
 
@@ -105,7 +105,7 @@ async def read_item(self, item_id: ItemIDDep) -> Any:
         return await self._get_and_validate_item(item_id=item_id)
 
     @items_router.put(path="/{id}", response_model=ItemPublic, summary="Update Item", description="Item update.")
-    async def update_item(self, *, item_id: ItemIDDep, item_in: ItemUpdate) -> Item:
+    async def update_item(self, *, item_id: ItemIdDep, item_in: ItemUpdate) -> Item:
         """
         Endpoint for updating an existing item.
 
@@ -117,7 +117,7 @@ async def update_item(self, *, item_id: ItemIDDep, item_in: ItemUpdate) -> Item:
         return await self._item_crud.update(db_item=db_item, item_in=item_in)
 
     @items_router.delete(path="/{id}", response_model=Message, summary="Delete Item", description="Deleting an Item.")
-    async def delete_item(self, item_id: ItemIDDep) -> Message:
+    async def delete_item(self, item_id: ItemIdDep) -> Message:
         """
         Endpoint for deleting an item.
 

backend/src/app/api/routes/items.py

@@ -1,14 +1,14 @@
 """Module for login and authentication endpoints."""
 
 from datetime import timedelta
-from typing import Annotated, Any, Type
+from typing import Annotated, Any
 
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException
 from fastapi.responses import HTMLResponse
 from fastapi.security import OAuth2PasswordRequestForm
 from fastapi_utils.cbv import cbv
 
-from app.api.deps import CurrentUser, CurrentSuperuser, UserCRUDDep
+from app.api.deps import CurrentUser, CurrentSuperuser, UserCrudDep
 from app.core.config import get_settings, Settings
 from app.core.emails import EmailManager, get_email_manager
 from app.core.security import get_security_manager, SecurityManager
@@ -17,10 +17,10 @@
 __all__: tuple[str] = ("login_router",)
 
 
-SettingsDep: Type[Settings] = Annotated[Settings, Depends(get_settings)]
-EmailManagerDep: Type[EmailManager] = Annotated[EmailManager, Depends(get_email_manager)]
-SecurityManagerDep: Type[SecurityManager] = Annotated[SecurityManager, Depends(get_security_manager)]
-OAuthFormDep: Type[OAuth2PasswordRequestForm] = Annotated[OAuth2PasswordRequestForm, Depends()]
+SettingsDep = Annotated[Settings, Depends(get_settings)]
+EmailManagerDep = Annotated[EmailManager, Depends(get_email_manager)]
+SecurityManagerDep = Annotated[SecurityManager, Depends(get_security_manager)]
+OAuthFormDep = Annotated[OAuth2PasswordRequestForm, Depends()]
 
 login_router: APIRouter = APIRouter()
 
@@ -38,7 +38,7 @@ class LoginRouter:
     async def login_access_token(
         self,
         form_data: OAuthFormDep,
-        user_crud: UserCRUDDep,
+        user_crud: UserCrudDep,
         security_manager: SecurityManagerDep,
         settings: SettingsDep,
     ) -> Token:
@@ -84,7 +84,7 @@ async def test_token(self, current_user: CurrentUser) -> Any:
         description="Send a password recovery email.",
     )
     async def recover_password(
-        self, email: str, user_crud: UserCRUDDep, email_manager: EmailManagerDep, background_tasks: BackgroundTasks
+        self, email: str, user_crud: UserCrudDep, email_manager: EmailManagerDep, background_tasks: BackgroundTasks
     ) -> Message:
         """
         Endpoint to initiate password recovery for a user.
@@ -109,7 +109,7 @@ async def recover_password(
         description="Reset user password using a recovery token.",
     )
     async def reset_password(
-        self, body: NewPassword, user_crud: UserCRUDDep, email_manager: EmailManagerDep
+        self, body: NewPassword, user_crud: UserCrudDep, email_manager: EmailManagerDep
     ) -> Message:
         """
         Endpoint to reset a user's password using a valid token.

backend/src/app/api/routes/login.py

@@ -1,20 +1,20 @@
 """Module for private endpoints."""
 
-from typing import Annotated, Type
+from typing import Annotated
 
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, status
 from fastapi_utils.cbv import cbv
 
-from app.api.deps import UserCRUDDep
+from app.api.deps import UserCrudDep
 from app.core.config import get_settings, Settings
 from app.core.emails import EmailManager, get_email_manager
 from app.models import UserCreate, UserPublic, User
 
 __all__: tuple[str] = ("private_router",)
 
 
-EmailManagerDep: Type[EmailManager] = Annotated[EmailManager, Depends(get_email_manager)]
-SettingsDep: Type[Settings] = Annotated[Settings, Depends(get_settings)]
+EmailManagerDep = Annotated[EmailManager, Depends(get_email_manager)]
+SettingsDep = Annotated[Settings, Depends(get_settings)]
 
 private_router: APIRouter = APIRouter()
 
@@ -23,15 +23,15 @@
 class PrivateRouter:
     """Class-based view for private endpoints."""
 
-    def __init__(self, user_crud: UserCRUDDep, email_manager: EmailManagerDep, settings: SettingsDep) -> None:
+    def __init__(self, user_crud: UserCrudDep, email_manager: EmailManagerDep, settings: SettingsDep) -> None:
         """
         Initializes the PrivateRouter class with the necessary dependencies.
 
         :param user_crud: Dependency for user CRUD operations.
         :param email_manager: Dependency for email management operations.
         :param settings: Dependency for application settings.
         """
-        self._user_crud: UserCRUDDep = user_crud
+        self._user_crud: UserCrudDep = user_crud
         self._email_manager: EmailManagerDep = email_manager
         self._settings: SettingsDep = settings
 

backend/src/app/api/routes/private.py

@@ -1,12 +1,12 @@
 """Module for users endpoints."""
 
-from typing import Annotated, Any, Type
+from typing import Annotated, Any
 from uuid import UUID
 
 from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Path, status
 from fastapi_utils.cbv import cbv
 
-from app.api.deps import CurrentUser, CurrentSuperuser, ItemCRUDDep, UserCRUDDep
+from app.api.deps import CurrentUser, CurrentSuperuser, ItemCrudDep, UserCrudDep
 from app.core.config import get_settings, Settings
 from app.core.emails import EmailManager, get_email_manager
 from app.core.security import get_security_manager, SecurityManager
@@ -24,10 +24,10 @@
 
 __all__: tuple[str] = ("users_router",)
 
-EmailManagerDep: Type[EmailManager] = Annotated[EmailManager, Depends(get_email_manager)]
-SettingsDep: Type[Settings] = Annotated[Settings, Depends(get_settings)]
-SecurityManagerDep: Type[SecurityManager] = Annotated[SecurityManager, Depends(get_security_manager)]
-UserIDDep: Type[UUID] = Annotated[UUID, Path(alias="id", description="User ID")]
+EmailManagerDep = Annotated[EmailManager, Depends(get_email_manager)]
+SettingsDep = Annotated[Settings, Depends(get_settings)]
+SecurityManagerDep = Annotated[SecurityManager, Depends(get_security_manager)]
+UserIdDep = Annotated[UUID, Path(alias="id", description="User ID")]
 
 users_router: APIRouter = APIRouter()
 
@@ -36,13 +36,13 @@
 class UsersRouter:
     """Class-based view for user endpoints."""
 
-    def __init__(self, user_crud: UserCRUDDep) -> None:
+    def __init__(self, user_crud: UserCrudDep) -> None:
         """
         Initializes the UsersRouter class with the necessary dependencies.
 
         :param user_crud: Dependency for user CRUD operations.
         """
-        self._user_crud: UserCRUDDep = user_crud
+        self._user_crud: UserCrudDep = user_crud
 
     @users_router.get(
         path="/",
@@ -209,7 +209,7 @@ async def register_user(self, user_in: UserRegister) -> User:
     @users_router.get(
         path="/{id}", response_model=UserPublic, summary="Read User by ID", description="Retrieving user data by ID."
     )
-    async def read_user_by_id(self, user_id: UserIDDep, current_user: CurrentUser) -> User:
+    async def read_user_by_id(self, user_id: UserIdDep, current_user: CurrentUser) -> User:
         """
         Endpoint to retrieve a user's data by their ID.
 
@@ -233,7 +233,7 @@ async def read_user_by_id(self, user_id: UserIDDep, current_user: CurrentUser) -
         summary="Update User by ID",
         description="Update user by ID (for superusers only).",
     )
-    async def update_user(self, user_id: UserIDDep, user_in: UserUpdate, _: CurrentSuperuser) -> User:
+    async def update_user(self, user_id: UserIdDep, user_in: UserUpdate, _: CurrentSuperuser) -> User:
         """
         Endpoint to update a user by their ID. Requires superuser privileges.
 
@@ -262,7 +262,7 @@ async def update_user(self, user_id: UserIDDep, user_in: UserUpdate, _: CurrentS
         description="Delete a user by their ID (superusers only).",
     )
     async def delete_user(
-        self, user_id: UserIDDep, item_crud: ItemCRUDDep, current_superuser: CurrentSuperuser
+        self, user_id: UserIdDep, item_crud: ItemCrudDep, current_superuser: CurrentSuperuser
     ) -> Message:
         """
         Endpoint to delete a user by their ID. Requires superuser privileges.

backend/src/app/api/routes/users.py

@@ -1,6 +1,6 @@
 """Module for utility endpoints."""
 
-from typing import Annotated, Type
+from typing import Annotated
 
 from fastapi import APIRouter, BackgroundTasks, Depends
 from fastapi_utils.cbv import cbv
@@ -13,7 +13,7 @@
 __all__: tuple[str] = ("utils_router",)
 
 
-EmailManagerDep: Type[EmailManager] = Annotated[EmailManager, Depends(get_email_manager)]
+EmailManagerDep = Annotated[EmailManager, Depends(get_email_manager)]
 
 utils_router: APIRouter = APIRouter()
 

backend/src/app/api/routes/utils.py

@@ -6,7 +6,7 @@
 from urllib.parse import quote_plus
 from warnings import warn
 
-from pydantic import AnyUrl, BeforeValidator, EmailStr, computed_field, model_validator
+from pydantic import AnyUrl, BeforeValidator, EmailStr, computed_field, model_validator, SecretStr
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from typing_extensions import Self
 
@@ -46,7 +46,7 @@ def _parse_cors(v: list[str] | str) -> list[str] | str:
             return v
         raise ValueError(v)
 
-    @computed_field
+    @computed_field  # type: ignore[prop-decorator]
     @property
     def all_cors_origins(self) -> list[str]:
         """
@@ -68,7 +68,7 @@ def all_cors_origins(self) -> list[str]:
     POSTGRES_PASSWORD: str = ""
     POSTGRES_DB: str = ""
 
-    @computed_field
+    @computed_field  # type: ignore[prop-decorator]
     @property
     def sqlalchemy_database_uri(self) -> str:
         """
@@ -100,7 +100,7 @@ def sqlalchemy_database_uri(self) -> str:
     SMTP_PORT: int = 587
     SMTP_HOST: str | None = None
     SMTP_USER: str | None = None
-    SMTP_PASSWORD: str | None = None
+    SMTP_PASSWORD: SecretStr | None = None
     EMAILS_FROM_EMAIL: EmailStr | None = None
     EMAILS_FROM_NAME: EmailStr | None = None
     EMAIL_RESET_TOKEN_EXPIRE_HOURS: int = 48
@@ -114,10 +114,10 @@ def _set_default_emails_from(self) -> Self:
         :return: The instance of the model.
         """
         if not self.EMAILS_FROM_NAME:
-            self.EMAILS_FROM_NAME = self.PROJECT_NAME
+            self.EMAILS_FROM_NAME = self.PROJECT_NAME  # pylint: disable=invalid-name
         return self
 
-    @computed_field
+    @computed_field  # type: ignore[prop-decorator]
     @property
     def emails_enabled(self) -> bool:
         """
@@ -164,4 +164,4 @@ def get_settings() -> Settings:
 
     :return: Settings object.
     """
-    return Settings()
+    return Settings()  # type: ignore[call-arg]