spakky-fastapi 0.7.17__tar.gz → 0.8.0__tar.gz

{spakky_fastapi-0.7.17 → spakky_fastapi-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spakky-fastapi
-Version: 0.7.17
+Version: 0.8.0
 Summary: Highly abstracted Framework core to use DDD & DI/IoC & AOP & Etc...
 Author: Spakky
 Author-email: sejong418@icloud.com
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: fastapi (>=0.109.2,<0.110.0)
 Requires-Dist: orjson (>=3.9.15,<4.0.0)
-Requires-Dist: spakky-core (>=0.7.13)
+Requires-Dist: spakky-core (>=0.10.1)
 Requires-Dist: websockets (>=12.0,<13.0)
 Description-Content-Type: text/markdown
 

{spakky_fastapi-0.7.17 → spakky_fastapi-0.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spakky-fastapi"
-version = "0.7.17"
+version = "0.8.0"
 description = "Highly abstracted Framework core to use DDD & DI/IoC & AOP & Etc..."
 authors = ["Spakky <sejong418@icloud.com>"]
 readme = "README.md"
@@ -12,7 +12,7 @@ build-backend = "poetry.core.masonry.api"
 [tool.poetry.dependencies]
 python = ">=3.10"
 fastapi = "^0.109.2"
-spakky-core = ">=0.7.13"
+spakky-core = ">=0.10.1"
 websockets = "^12.0"
 orjson = "^3.9.15"
 

{spakky_fastapi-0.7.17 → spakky_fastapi-0.8.0}/spakky_fastapi/jwt_auth.py

@@ -31,6 +31,7 @@ IAuthenticatedFunction: TypeAlias = Callable[Concatenate[Any, JWT, P], Awaitable
 class JWTAuth(FunctionAnnotation):
     token_url: InitVar[str]
     authenticator: OAuth2PasswordBearer = field(init=False)
+    token_keywords: list[str] = field(init=False, default_factory=list)
 
     def __post_init__(self, token_url: str) -> None:
         self.authenticator = OAuth2PasswordBearer(tokenUrl=token_url)
@@ -38,10 +39,10 @@ class JWTAuth(FunctionAnnotation):
     def __call__(
         self, obj: IAuthenticatedFunction[P, R_co]
     ) -> IAuthenticatedFunction[P, R_co]:
-        obj.__annotations__ = {
-            k: Annotated[JWT, Depends(self.authenticator)] if v == JWT else v
-            for k, v in obj.__annotations__.items()
-        }
+        for key, value in obj.__annotations__.items():
+            if value == JWT:
+                obj.__annotations__[key] = Annotated[JWT, Depends(self.authenticator)]
+                self.token_keywords.append(key)
         return super().__call__(obj)
 
 
@@ -59,15 +60,17 @@ class AsyncJWTAuthAdvisor(IAsyncAdvisor):
 
     @Around(JWTAuth.contains)
     async def around_async(self, joinpoint: AsyncFunc, *args: Any, **kwargs: Any) -> Any:
-        token: str = kwargs["token"]
-        try:
-            jwt: JWT = JWT(token=token)
-        except (InvalidJWTFormatError, JWTDecodingError) as e:
-            raise Unauthorized(AuthenticationFailedError()) from e
-        if jwt.is_expired:
-            raise Unauthorized(AuthenticationFailedError())
-        if jwt.verify(self.__key) is False:
-            raise Unauthorized(AuthenticationFailedError())
-        self.__logger.info(f"[{type(self).__name__}] {jwt.payload!r}")
-        kwargs["token"] = jwt
+        annotation: JWTAuth = JWTAuth.single(joinpoint)
+        for keyword in annotation.token_keywords:
+            token: str = kwargs[keyword]
+            try:
+                jwt: JWT = JWT(token=token)
+            except (InvalidJWTFormatError, JWTDecodingError) as e:
+                raise Unauthorized(AuthenticationFailedError()) from e
+            if jwt.is_expired:
+                raise Unauthorized(AuthenticationFailedError())
+            if jwt.verify(self.__key) is False:
+                raise Unauthorized(AuthenticationFailedError())
+            self.__logger.info(f"[{type(self).__name__}] {jwt.payload!r}")
+            kwargs[keyword] = jwt
         return await joinpoint(*args, **kwargs)

{spakky_fastapi-0.7.17 → spakky_fastapi-0.8.0}/spakky_fastapi/middlewares/error_handling.py

@@ -3,9 +3,10 @@ from typing import Callable, Awaitable, TypeAlias
 from fastapi import Request
 from fastapi.responses import ORJSONResponse
 from pydantic import BaseModel
-from spakky_fastapi.error import InternalServerError, SpakkyFastAPIError
-from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.middleware.base import BaseHTTPMiddleware, DispatchFunction
 from starlette.responses import Response
+from starlette.types import ASGIApp
+from spakky_fastapi.error import InternalServerError, SpakkyFastAPIError
 
 Next: TypeAlias = Callable[[Request], Awaitable[Response]]
 
@@ -13,9 +14,21 @@ Next: TypeAlias = Callable[[Request], Awaitable[Response]]
 class ErrorResponse(BaseModel):
     message: str
     args: list[str]
+    traceback: str = ""
 
 
 class ErrorHandlingMiddleware(BaseHTTPMiddleware):
+    __debug: bool
+
+    def __init__(
+        self,
+        app: ASGIApp,
+        dispatch: DispatchFunction | None = None,
+        debug: bool = False,
+    ) -> None:
+        super().__init__(app, dispatch)
+        self.__debug = debug
+
     async def dispatch(self, request: Request, call_next: Next) -> Response:
         try:
             return await call_next(request)
@@ -34,6 +47,7 @@ class ErrorHandlingMiddleware(BaseHTTPMiddleware):
                 content=ErrorResponse(
                     message=error.message,
                     args=[str(x) for x in error.args],
+                    traceback=error.traceback if self.__debug else "",
                 ).model_dump(),
                 status_code=error.status_code,
             )

{spakky_fastapi-0.7.17 → spakky_fastapi-0.8.0}/spakky_fastapi/post_processor.py

@@ -8,8 +8,11 @@ from fastapi.exceptions import FastAPIError
 from fastapi.utils import create_response_field  # type: ignore
 from spakky.bean.interfaces.bean_container import IBeanContainer
 from spakky.bean.interfaces.bean_processor import IBeanPostProcessor
-from spakky_fastapi.routing import Route, WebSocketRoute
-from spakky_fastapi.stereotypes.api_controller import ApiController
+from spakky_fastapi.stereotypes.api_controller import (
+    ApiController,
+    Route,
+    WebSocketRoute,
+)
 
 
 class FastAPIBeanPostProcessor(IBeanPostProcessor):
@@ -32,6 +35,7 @@ class FastAPIBeanPostProcessor(IBeanPostProcessor):
             if route is None and websocket_route is None:
                 continue
             if route is not None:
+                # pylint: disable=line-too-long
                 self.__logger.info(
                     f"[{type(self).__name__}] {route.methods!r} {controller.prefix}{route.path} -> {method.__qualname__}"
                 )
@@ -50,6 +54,7 @@ class FastAPIBeanPostProcessor(IBeanPostProcessor):
                             route.response_model = return_annotation
                 router.add_api_route(endpoint=method, **asdict(route))
             if websocket_route is not None:
+                # pylint: disable=line-too-long
                 self.__logger.info(
                     f"[{type(self).__name__}] [WebSocket] {controller.prefix}{websocket_route.path} -> {method.__qualname__}"
                 )

spakky_fastapi-0.7.17/spakky_fastapi/routing.py → spakky_fastapi-0.8.0/spakky_fastapi/stereotypes/api_controller.py

@@ -7,6 +7,7 @@ from fastapi.responses import JSONResponse
 from fastapi.routing import APIRoute
 from spakky.core.annotation import FunctionAnnotation
 from spakky.core.types import FuncT
+from spakky.stereotype.controller import Controller
 from starlette.routing import Route as StarletteRoute
 
 SetIntStr: TypeAlias = set[int | str]
@@ -500,3 +501,8 @@ def websocket(
         name=name,
         dependencies=dependencies,
     )
+
+
+@dataclass
+class ApiController(Controller):
+    tags: list[str | Enum] | None = None

spakky_fastapi-0.7.17/spakky_fastapi/stereotypes/api_controller.py

@@ -1,9 +0,0 @@
-from enum import Enum
-from dataclasses import dataclass
-
-from spakky.stereotype.controller import Controller
-
-
-@dataclass
-class ApiController(Controller):
-    tags: list[str | Enum] | None = None