spakky-fastapi 0.17.0__tar.gz → 1.1.2__tar.gz

{spakky_fastapi-0.17.0 → spakky_fastapi-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spakky-fastapi
-Version: 0.17.0
+Version: 1.1.2
 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.15,<0.16)
+Requires-Dist: spakky-core (>=1.1.2,<2.0.0)
 Requires-Dist: websockets (>=12.0,<13.0)
 Description-Content-Type: text/markdown
 

{spakky_fastapi-0.17.0 → spakky_fastapi-1.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spakky-fastapi"
-version = "0.17.0"
+version = "1.1.2"
 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.15"
+spakky-core = "^1.1.2"
 websockets = "^12.0"
 orjson = "^3.9.15"
 

{spakky_fastapi-0.17.0/spakky_fastapi/extensions → spakky_fastapi-1.1.2/spakky_fastapi/aspects}/authenticate.py

@@ -6,15 +6,14 @@ from dataclasses import InitVar, field, dataclass
 from fastapi import Depends
 from fastapi.security import OAuth2PasswordBearer
 from spakky.aop.advice import Around
-from spakky.aop.advisor import IAdvisor, IAsyncAdvisor
-from spakky.aop.aspect import Aspect, AsyncAspect
+from spakky.aop.aspect import Aspect, AsyncAspect, IAspect, IAsyncAspect
 from spakky.aop.error import SpakkyAOPError
-from spakky.aop.order import Order
 from spakky.core.annotation import FunctionAnnotation
 from spakky.core.types import AsyncFunc, Func, P
-from spakky.cryptography.error import InvalidJWTFormatError, JWTDecodingError
-from spakky.cryptography.jwt import JWT
-from spakky.cryptography.key import Key
+from spakky.pod.order import Order
+from spakky.security.error import InvalidJWTFormatError, JWTDecodingError
+from spakky.security.jwt import JWT
+from spakky.security.key import Key
 
 from spakky_fastapi.error import Unauthorized
 
@@ -52,7 +51,7 @@ class Authenticate(FunctionAnnotation):
 
 @Order(1)
 @Aspect()
-class AuthenticationAdvisor(IAdvisor):
+class AuthenticationAspect(IAspect):
     __logger: Logger
     __key: Key
 
@@ -61,9 +60,9 @@ class AuthenticationAdvisor(IAdvisor):
         self.__logger = logger
         self.__key = key
 
-    @Around(lambda x: Authenticate.contains(x) and not iscoroutinefunction(x))
+    @Around(lambda x: Authenticate.exists(x) and not iscoroutinefunction(x))
     def around(self, joinpoint: Func, *args: Any, **kwargs: Any) -> Any:
-        annotation: Authenticate = Authenticate.single(joinpoint)
+        annotation: Authenticate = Authenticate.get(joinpoint)
         for keyword in annotation.token_keywords:
             token: str = kwargs[keyword]
             try:
@@ -81,7 +80,7 @@ class AuthenticationAdvisor(IAdvisor):
 
 @Order(1)
 @AsyncAspect()
-class AsyncAuthenticationAdvisor(IAsyncAdvisor):
+class AsyncAuthenticationAspect(IAsyncAspect):
     __logger: Logger
     __key: Key
 
@@ -90,9 +89,9 @@ class AsyncAuthenticationAdvisor(IAsyncAdvisor):
         self.__logger = logger
         self.__key = key
 
-    @Around(lambda x: Authenticate.contains(x) and iscoroutinefunction(x))
+    @Around(lambda x: Authenticate.exists(x) and iscoroutinefunction(x))
     async def around_async(self, joinpoint: AsyncFunc, *args: Any, **kwargs: Any) -> Any:
-        annotation: Authenticate = Authenticate.single(joinpoint)
+        annotation: Authenticate = Authenticate.get(joinpoint)
         for keyword in annotation.token_keywords:
             token: str = kwargs[keyword]
             try:

{spakky_fastapi-0.17.0 → spakky_fastapi-1.1.2}/spakky_fastapi/middlewares/error_handling.py

@@ -1,3 +1,4 @@
+import traceback
 from typing import Callable, Awaitable, TypeAlias
 
 from fastapi import Request
@@ -43,6 +44,8 @@ class ErrorHandlingMiddleware(BaseHTTPMiddleware):
             )
         # pylint: disable=broad-exception-caught
         except Exception as e:
+            if self.__debug:
+                traceback.print_exc()  # pragma: no cover
             error = InternalServerError(e)
             return ORJSONResponse(
                 content=ErrorResponse(

spakky_fastapi-1.1.2/spakky_fastapi/plugins/authenticate.py

@@ -0,0 +1,13 @@
+from spakky.application.interfaces.pluggable import IPluggable
+from spakky.application.interfaces.registry import IPodRegistry
+
+from spakky_fastapi.aspects.authenticate import (
+    AsyncAuthenticationAspect,
+    AuthenticationAspect,
+)
+
+
+class AuthenticatePlugin(IPluggable):
+    def register(self, registry: IPodRegistry) -> None:
+        registry.register(AuthenticationAspect)
+        registry.register(AsyncAuthenticationAspect)

{spakky_fastapi-0.17.0 → spakky_fastapi-1.1.2}/spakky_fastapi/plugins/fast_api.py

@@ -2,7 +2,7 @@ from logging import Logger
 
 from fastapi import FastAPI
 from spakky.application.interfaces.pluggable import IPluggable
-from spakky.application.interfaces.registry import IRegistry
+from spakky.application.interfaces.registry import IPodRegistry
 
 from spakky_fastapi.post_processor import FastAPIBeanPostProcessor
 
@@ -15,8 +15,8 @@ class FastAPIPlugin(IPluggable):
         self.app = app
         self.logger = logger
 
-    def register(self, registry: IRegistry) -> None:
-        registry.register_bean_post_processor(
+    def register(self, registry: IPodRegistry) -> None:
+        registry.register_post_processor(
             FastAPIBeanPostProcessor(
                 self.app,
                 self.logger,

{spakky_fastapi-0.17.0 → spakky_fastapi-1.1.2}/spakky_fastapi/post_processor.py

@@ -1,4 +1,3 @@
-from typing import Any
 from inspect import signature, getmembers
 from logging import Logger
 from dataclasses import asdict
@@ -6,8 +5,9 @@ from dataclasses import asdict
 from fastapi import APIRouter, FastAPI
 from fastapi.exceptions import FastAPIError
 from fastapi.utils import create_response_field  # type: ignore
-from spakky.application.interfaces.bean_container import IBeanContainer
-from spakky.application.interfaces.bean_processor import IBeanPostProcessor
+from spakky.application.interfaces.container import IPodContainer
+from spakky.application.interfaces.post_processor import IPodPostProcessor
+from spakky.pod.order import Order
 
 from spakky_fastapi.stereotypes.api_controller import (
     ApiController,
@@ -16,7 +16,8 @@ from spakky_fastapi.stereotypes.api_controller import (
 )
 
 
-class FastAPIBeanPostProcessor(IBeanPostProcessor):
+@Order(1)
+class FastAPIBeanPostProcessor(IPodPostProcessor):
     __app: FastAPI
     __logger: Logger
 
@@ -25,14 +26,15 @@ class FastAPIBeanPostProcessor(IBeanPostProcessor):
         self.__app = app
         self.__logger = logger
 
-    def post_process_bean(self, container: IBeanContainer, bean: Any) -> Any:
-        if not ApiController.contains(bean):
-            return bean
-        controller = ApiController.single(bean)
+    def post_process(self, container: IPodContainer, pod: object) -> object:
+        if not ApiController.exists(pod):
+            return pod
+        controller = ApiController.get(pod)
         router: APIRouter = APIRouter(prefix=controller.prefix, tags=controller.tags)
-        for name, method in getmembers(bean, callable):
-            route: Route | None = Route.single_or_none(method)
-            websocket_route: WebSocketRoute | None = WebSocketRoute.single_or_none(method)
+        print(f"CONTROLLER {type(pod).__name__}")
+        for name, method in getmembers(pod, callable):
+            route: Route | None = Route.get_or_none(method)
+            websocket_route: WebSocketRoute | None = WebSocketRoute.get_or_none(method)
             if route is None and websocket_route is None:
                 continue
             if route is not None:
@@ -56,13 +58,13 @@ class FastAPIBeanPostProcessor(IBeanPostProcessor):
                 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__}"
-                )
+                # self.__logger.info(
+                #     f"[{type(self).__name__}] [WebSocket] {controller.prefix}{websocket_route.path} -> {method.__qualname__}"
+                # )
                 if websocket_route.name is None:
                     websocket_route.name = " ".join(
                         [x.capitalize() for x in name.split("_")]
                     )
                 router.add_api_websocket_route(endpoint=method, **asdict(websocket_route))
         self.__app.include_router(router)
-        return bean
+        return pod

spakky_fastapi-0.17.0/spakky_fastapi/plugins/authenticate.py

@@ -1,13 +0,0 @@
-from spakky.application.interfaces.pluggable import IPluggable
-from spakky.application.interfaces.registry import IRegistry
-
-from spakky_fastapi.extensions.authenticate import (
-    AsyncAuthenticationAdvisor,
-    AuthenticationAdvisor,
-)
-
-
-class AuthenticatePlugin(IPluggable):
-    def register(self, registry: IRegistry) -> None:
-        registry.register_bean(AuthenticationAdvisor)
-        registry.register_bean(AsyncAuthenticationAdvisor)