add mypy

Makefile

@@ -97,6 +97,10 @@ lint:
 	cd backend/app && \
 	poetry run ruff app && poetry run black --check app
 
+mypy:
+	cd backend/app && \
+	poetry run mypy .
+
 lint-watch:
 	cd backend/app && \
 	poetry run ruff app --watch

backend/app/app/api/deps.py

@@ -1,4 +1,5 @@
 from collections.abc import AsyncGenerator
+from typing import Callable
 from fastapi import Depends, HTTPException, status
 from app.utils.token import get_valid_tokens
 from app.utils.minio_client import MinioClient
@@ -46,7 +47,7 @@ async def get_general_meta() -> IMetaGeneral:
     return IMetaGeneral(roles=current_roles)
 
 
-def get_current_user(required_roles: list[str] = None) -> User:
+def get_current_user(required_roles: list[str] = None) -> Callable[[], User]:
     async def current_user(
         token: str = Depends(reusable_oauth2),
         redis_client: Redis = Depends(get_redis_client),

backend/app/app/api/v1/endpoints/login.py

@@ -163,7 +163,7 @@ async def get_new_access_token(
 
         access_token_expires = timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
         user = await crud.user.get(id=user_id)
-        if user.is_active:
+        if getattr(user, "is_active"):
             access_token = security.create_access_token(
                 payload["sub"], expires_delta=access_token_expires
             )
@@ -218,7 +218,4 @@ async def login_access_token(
             TokenType.ACCESS,
             settings.ACCESS_TOKEN_EXPIRE_MINUTES,
         )
-    return {
-        "access_token": access_token,
-        "token_type": "bearer",
-    }
+    return TokenRead(access_token=access_token, token_type="bearer")

backend/app/app/core/config.py

@@ -14,7 +14,6 @@ class ModeEnum(str, Enum):
 class Settings(BaseSettings):
     MODE: ModeEnum = ModeEnum.development
     API_VERSION: str = "v1"
-    API_VERSION: str = "v1"
     API_V1_STR: str = f"/api/{API_VERSION}"
     PROJECT_NAME: str
     ACCESS_TOKEN_EXPIRE_MINUTES: int = 60 * 1  # 1 hour

backend/app/app/crud/base_crud.py

@@ -6,7 +6,6 @@
 from fastapi_async_sqlalchemy import db
 from fastapi_async_sqlalchemy.middleware import DBSessionMeta
 from fastapi_pagination import Params, Page
-from fastapi.encoders import jsonable_encoder
 from pydantic import BaseModel
 from sqlmodel import SQLModel, select, func
 from sqlmodel.ext.asyncio.session import AsyncSession

backend/app/app/main.py

@@ -64,7 +64,8 @@ async def user_id_identifier(request: Request):
     if forwarded:
         return forwarded.split(",")[0]
 
-    ip = request.client.host
+    client = request.client
+    ip = getattr(client, "host", "0.0.0.0")    
     return ip + ":" + request.scope["path"]
 
 
@@ -133,8 +134,8 @@ class CustomException(Exception):
     code: str
     message: str
 
-    def __init__(self, http_code: int = None, code: str = None, message: str = None):
-        self.http_code = http_code if http_code else 500
+    def __init__(self, http_code: int = 500, code: str | None = None, message: str = 'This is an error message'):
+        self.http_code = http_code
         self.code = code if code else str(self.http_code)
         self.message = message
 

backend/app/app/schemas/response_schema.py

@@ -72,10 +72,17 @@ class IDeleteResponseBase(IResponseBase[DataType], Generic[DataType]):
 
 
 def create_response(
-    data: DataType | None,
+    data: DataType,
     message: str | None = None,
     meta: dict | Any | None = {},
-) -> dict[str, DataType] | DataType:
+) -> (
+    IResponseBase[DataType]
+    | IGetResponsePaginated[DataType]
+    | IGetResponseBase[DataType]
+    | IPutResponseBase[DataType]
+    | IDeleteResponseBase[DataType]
+    | IPostResponseBase[DataType]
+):
     if isinstance(data, IGetResponsePaginated):
         data.message = "Data paginated correctly" if message is None else message
         data.meta = meta

backend/app/pyproject.toml

@@ -31,6 +31,13 @@ ignore = [
 [tool.ruff.per-file-ignores]
 "__init__.py" = ["F401"]
 
+[tool.mypy]
+warn_return_any = true
+warn_unused_configs = true
+ignore_missing_imports = true
+exclude = ["alembic", "__pycache__"]
+
+
 [tool.poetry.dependencies]
 python = ">3.9,<3.12"
 alembic = "^1.10.2"
@@ -65,16 +72,16 @@ torch = [
 requests = "^2.29.0"
 wheel = "^0.40.0"
 setuptools = "^67.7.2"
-langchain = "^0.0.151"
+langchain = "^0.0.262"
 openai = "^0.27.5"
 fastapi-limiter = "^0.1.5"
-pexpect = "^4.8.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "^23.1.0"
 ruff = "^0.0.256"
 pytest = "^7.4.0"
 pytest-asyncio = "^0.21.1"
+mypy = "^1.5.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

backend/app/test/api/test_login.py

@@ -1,12 +1,13 @@
 import pytest
 from httpx import AsyncClient
+from typing import AsyncGenerator
 from app.main import app
 from app.core.config import settings
 
 url = "http://fastapi.localhost/api/v1"
 
 @pytest.fixture(scope='function')
-async def test_client() -> AsyncClient:
+async def test_client() -> AsyncGenerator[AsyncClient, None]:
     async with AsyncClient(app=app, base_url=url) as client:
         yield client
 

backend/app/test/api/test_user.py

@@ -1,12 +1,13 @@
 import pytest
 from httpx import AsyncClient
 from app.main import app
+from typing import AsyncGenerator
 from app.core.config import settings
 
 url = "http://fastapi.localhost/api/v1"
 
 @pytest.fixture(scope='function')
-async def test_client() -> AsyncClient:
+async def test_client() -> AsyncGenerator[AsyncClient, None]:
     async with AsyncClient(app=app, base_url=url) as client:
         yield client
 

backend/app/test/test_main.py

@@ -1,12 +1,13 @@
 import pytest
-from httpx import AsyncClient, Response
+from httpx import AsyncClient
+from typing import AsyncGenerator
 from app.main import app
 client = AsyncClient(app=app)
 
 url = "http://fastapi.localhost"
 
 @pytest.fixture(scope='function')
-async def test_client() -> AsyncClient:
+async def test_client() -> AsyncGenerator[AsyncClient, None]:
     async with AsyncClient(app=app, base_url=url) as client:
         yield client