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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spakky-fastapi
-Version: 0.7.16
+Version: 0.7.17
 Summary: Highly abstracted Framework core to use DDD & DI/IoC & AOP & Etc...
 Author: Spakky
 Author-email: sejong418@icloud.com

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spakky-fastapi"
-version = "0.7.16"
+version = "0.7.17"
 description = "Highly abstracted Framework core to use DDD & DI/IoC & AOP & Etc..."
 authors = ["Spakky <sejong418@icloud.com>"]
 readme = "README.md"

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

@@ -1,5 +1,4 @@
-from typing import Any, TypeVar, Protocol, Awaitable, runtime_checkable
-from inspect import signature
+from typing import Any, TypeVar, Callable, Annotated, Awaitable, TypeAlias, Concatenate
 from logging import Logger
 from dataclasses import InitVar, field, dataclass
 
@@ -25,20 +24,7 @@ class AuthenticationFailedError(SpakkyAOPError):
     message = "사용자 인증에 실패했습니다."
 
 
-@runtime_checkable
-class IAuthenticatedFunction(Protocol[P, R_co]):
-    __defaults__: tuple[Any, ...] | None
-    __kwdefaults__: dict[str, Any] | None
-
-    # pylint: disable=no-self-argument
-    def __call__(
-        self_,  # type: ignore
-        self: Any,
-        token: JWT,
-        *args: P.args,
-        **kwargs: P.kwargs,
-    ) -> Awaitable[R_co]:
-        raise NotImplementedError
+IAuthenticatedFunction: TypeAlias = Callable[Concatenate[Any, JWT, P], Awaitable[R_co]]
 
 
 @dataclass
@@ -52,12 +38,10 @@ class JWTAuth(FunctionAnnotation):
     def __call__(
         self, obj: IAuthenticatedFunction[P, R_co]
     ) -> IAuthenticatedFunction[P, R_co]:
-        parameters = list(signature(obj).parameters.values())
-        if obj.__defaults__ is not None:
-            extra = obj.__defaults__
-        else:
-            extra = tuple(Depends() for x in parameters[1:] if x.name != "token")
-        obj.__defaults__ = (Depends(self.authenticator),) + extra
+        obj.__annotations__ = {
+            k: Annotated[JWT, Depends(self.authenticator)] if v == JWT else v
+            for k, v in obj.__annotations__.items()
+        }
         return super().__call__(obj)
 
 

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

@@ -26,7 +26,7 @@ class FastAPIBeanPostProcessor(IBeanPostProcessor):
             return bean
         controller = ApiController.single(bean)
         router: APIRouter = APIRouter(prefix=controller.prefix, tags=controller.tags)
-        for name, method in getmembers(bean):
+        for name, method in getmembers(bean, callable):
             route: Route | None = Route.single_or_none(method)
             websocket_route: WebSocketRoute | None = WebSocketRoute.single_or_none(method)
             if route is None and websocket_route is None: