fix linting

Author: igorbenav

crudadmin/admin_interface/admin_site.py

@@ -1,20 +1,20 @@
-from datetime import timedelta, timezone, datetime
-from typing import Optional, Any, Callable, Dict, cast, AsyncGenerator
 import logging
+from datetime import datetime, timedelta, timezone
+from typing import Any, AsyncGenerator, Callable, Dict, Optional, cast
 
-from fastcrud import FastCRUD
-from fastapi import Request, APIRouter, Depends, Response, Cookie
+from fastapi import APIRouter, Cookie, Depends, Request, Response
 from fastapi.responses import RedirectResponse
-from fastapi.templating import Jinja2Templates
 from fastapi.security import OAuth2PasswordRequestForm
+from fastapi.templating import Jinja2Templates
+from fastcrud import FastCRUD
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from .auth import AdminAuthentication
-from .typing import RouteResponse
 from ..admin_user.service import AdminUserService
 from ..core.db import DatabaseConfig
+from ..event import EventType, log_auth_action
 from ..session.manager import SessionManager
-from ..event import log_auth_action, EventType
+from .auth import AdminAuthentication
+from .typing import RouteResponse
 
 logger = logging.getLogger(__name__)
 

crudadmin/admin_interface/auth.py

@@ -1,21 +1,22 @@
-from typing import Optional
 import logging
-from fastapi import Depends, Cookie, Request
+from typing import Optional
+
+from fastapi import Cookie, Depends, Request
 from fastapi.security import OAuth2PasswordBearer
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from ..core.exceptions import UnauthorizedException, ForbiddenException
-from ..admin_user.service import AdminUserService
+from ..admin_token.schemas import AdminTokenBlacklistCreate, AdminTokenBlacklistUpdate
 from ..admin_token.service import TokenService
 from ..admin_user.schemas import (
     AdminUserCreate,
+    AdminUserRead,
     AdminUserUpdate,
     AdminUserUpdateInternal,
-    AdminUserRead,
 )
-from ..admin_token.schemas import AdminTokenBlacklistCreate, AdminTokenBlacklistUpdate
-from ..session.schemas import AdminSessionCreate, AdminSessionUpdate
+from ..admin_user.service import AdminUserService
 from ..core.db import DatabaseConfig
+from ..core.exceptions import ForbiddenException, UnauthorizedException
+from ..session.schemas import AdminSessionCreate, AdminSessionUpdate
 
 logger = logging.getLogger(__name__)
 
@@ -100,13 +101,13 @@ async def get_current_user_inner(
                 if isinstance(user, dict):
                     try:
                         user = AdminUserRead(**user)
-                    except Exception:
-                        raise UnauthorizedException("Invalid user data")
+                    except Exception as e:
+                        raise UnauthorizedException("Invalid user data") from e
                 elif not isinstance(user, AdminUserRead):
                     try:
                         user = AdminUserRead.from_orm(user)
-                    except Exception:
-                        raise UnauthorizedException("Invalid user data")
+                    except Exception as e:
+                        raise UnauthorizedException("Invalid user data") from e
                 return user
 
             logger.debug("User not found")

crudadmin/admin_interface/crud_admin.py

@@ -1,43 +1,43 @@
+import logging
 import os
 import time
-import logging
+from datetime import datetime, timedelta, timezone
 from typing import (
-    TypeVar,
-    Type,
-    Dict,
     Any,
-    Union,
-    Optional,
-    List,
-    Callable,
     Awaitable,
-    cast,
+    Callable,
+    Dict,
+    List,
+    Optional,
+    Type,
     TypedDict,
+    TypeVar,
+    Union,
+    cast,
 )
-from datetime import datetime, timezone, timedelta
 
-from fastapi import APIRouter, FastAPI, Depends, Request
-from fastapi.templating import Jinja2Templates
+from fastapi import APIRouter, Depends, FastAPI, Request
 from fastapi.security import OAuth2PasswordBearer
 from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
 from fastcrud import FastCRUD
 from pydantic import BaseModel
 from sqlalchemy import text
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import DeclarativeBase
 from typing_extensions import TypeAlias
 
-from .model_view import ModelView
-from .admin_site import AdminSite
-from .typing import RouteResponse
 from ..admin_interface.auth import AdminAuthentication
 from ..admin_interface.middleware.auth import AdminAuthMiddleware
 from ..admin_interface.middleware.ip_restriction import IPRestrictionMiddleware
-from ..session import create_admin_session_model, SessionManager
 from ..admin_token.service import TokenService
-from ..admin_user.service import AdminUserService
-from ..core.db import DatabaseConfig, AdminBase
 from ..admin_user.schemas import AdminUserCreate, AdminUserCreateInternal
+from ..admin_user.service import AdminUserService
+from ..core.db import AdminBase, DatabaseConfig
+from ..session import SessionManager, create_admin_session_model
+from .admin_site import AdminSite
+from .model_view import ModelView
+from .typing import RouteResponse
 
 logger = logging.getLogger("crudadmin")
 
@@ -326,7 +326,7 @@ def __init__(
 
         self.app.add_middleware(AdminAuthMiddleware, admin_instance=self)
 
-        from ..event import create_admin_event_log, create_admin_audit_log
+        from ..event import create_admin_audit_log, create_admin_event_log
 
         event_log_model: Optional[Type[DeclarativeBase]] = None
         audit_log_model: Optional[Type[DeclarativeBase]] = None
@@ -514,7 +514,7 @@ async def event_log_page_inner(
             admin_db: AsyncSession = Depends(admin_db_db_dependency),
             app_db: AsyncSession = Depends(app_db_dependency),
         ) -> RouteResponse:
-            from ..event import EventType, EventStatus
+            from ..event import EventStatus, EventType
 
             users = await self.db_config.crud_users.get_multi(db=app_db)
 

crudadmin/admin_interface/helper.py

@@ -1,9 +1,9 @@
-from typing import get_origin, Dict, Any, Type, List, TypeVar, cast
 from datetime import date, datetime, time
 from decimal import Decimal
 from enum import Enum
+from typing import Any, Dict, List, Type, TypeVar, cast, get_origin
 
-from pydantic import BaseModel, EmailStr, HttpUrl, AnyHttpUrl
+from pydantic import AnyHttpUrl, BaseModel, EmailStr, HttpUrl
 
 T = TypeVar("T")
 HTMLInputType = tuple[str, Dict[str, Any]]

crudadmin/admin_interface/middleware/auth.py

@@ -1,5 +1,5 @@
-from typing import TYPE_CHECKING
 import logging
+from typing import TYPE_CHECKING
 
 from fastapi import FastAPI, Request
 from fastapi.responses import RedirectResponse

crudadmin/admin_interface/middleware/https.py

@@ -1,6 +1,6 @@
 from fastapi import Request
-from starlette.middleware.base import BaseHTTPMiddleware
 from fastapi.responses import RedirectResponse
+from starlette.middleware.base import BaseHTTPMiddleware
 
 
 class HTTPSRedirectMiddleware(BaseHTTPMiddleware):

crudadmin/admin_interface/middleware/ip_restriction.py

@@ -1,10 +1,11 @@
-from typing import List, Optional
+import logging
 from ipaddress import ip_address, ip_network
+from typing import List, Optional
+
 from fastapi import Request
+from fastapi.responses import JSONResponse
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.types import ASGIApp
-from fastapi.responses import JSONResponse
-import logging
 
 logger = logging.getLogger(__name__)
 

crudadmin/admin_interface/model_view.py

@@ -1,31 +1,31 @@
+import datetime
+from datetime import timezone
 from typing import (
-    TypeVar,
-    Type,
-    List,
-    Optional,
     Any,
+    AsyncGenerator,
     Callable,
+    Coroutine,
     Dict,
+    List,
+    Optional,
     Set,
-    cast,
-    Coroutine,
-    AsyncGenerator,
+    Type,
+    TypeVar,
     Union,
+    cast,
 )
-import datetime
-from datetime import timezone
 
-from fastapi import APIRouter, Request, Depends, UploadFile
+from fastapi import APIRouter, Depends, Request, UploadFile
+from fastapi.responses import JSONResponse, RedirectResponse, Response
 from fastapi.templating import Jinja2Templates
-from fastapi.responses import RedirectResponse, JSONResponse, Response
+from fastcrud import EndpointCreator, FastCRUD
 from pydantic import BaseModel, ValidationError
+from sqlalchemy import inspect
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.orm import DeclarativeBase
-from sqlalchemy import inspect
-from fastcrud import FastCRUD, EndpointCreator
 
 from ..core.db import DatabaseConfig
-from ..event import log_admin_action, EventType
+from ..event import EventType, log_admin_action
 from .helper import _get_form_fields_from_schema
 
 EndpointCallable = Callable[..., Coroutine[Any, Any, Response]]
@@ -45,7 +45,7 @@ class BulkDeleteRequest(BaseModel):
 
 
 class ModelView:
-    """
+    r"""
     View class for managing CRUD operations and UI for database models in FastAPI admin interface.
 
     Features:

crudadmin/admin_interface/typing.py

@@ -1,8 +1,7 @@
 from typing import Union
 
-from starlette.templating import _TemplateResponse
 from fastapi import Response
 from fastapi.responses import RedirectResponse
-
+from starlette.templating import _TemplateResponse
 
 RouteResponse = Union[Response, RedirectResponse, _TemplateResponse]

crudadmin/admin_token/__init__.py

@@ -1,10 +1,10 @@
 from .models import create_admin_token_blacklist
 from .schemas import (
     AdminToken,
-    AdminTokenData,
     AdminTokenBlacklistBase,
     AdminTokenBlacklistCreate,
     AdminTokenBlacklistUpdate,
+    AdminTokenData,
 )
 from .service import TokenService