spakky-fastapi 1.6.2__py3-none-any.whl → 1.6.3__py3-none-any.whl

spakky_fastapi/error.py

@@ -1,45 +1,65 @@
-import traceback
+from typing import ClassVar
 
 from fastapi import status
+from fastapi.responses import ORJSONResponse
 from spakky.core.error import SpakkyCoreError
 
 
 class SpakkyFastAPIError(SpakkyCoreError):
-    status_code: int
+    status_code: ClassVar[int]
 
     def __init__(self, error: SpakkyCoreError) -> None:
         self.message = error.message
         self.args = error.args
 
+    def to_response(self) -> ORJSONResponse:
+        return ORJSONResponse(
+            content={
+                "message": self.message,
+                "args": [str(x) for x in self.args],
+            },
+            status_code=self.status_code,
+        )
+
 
 class SpakkyUnknownError(SpakkyCoreError):
     message = "알 수 없는 오류가 발생했습니다."
 
 
 class BadRequest(SpakkyFastAPIError):
-    status_code: int = status.HTTP_400_BAD_REQUEST
+    status_code: ClassVar[int] = status.HTTP_400_BAD_REQUEST
 
 
 class Unauthorized(SpakkyFastAPIError):
-    status_code: int = status.HTTP_401_UNAUTHORIZED
+    status_code: ClassVar[int] = status.HTTP_401_UNAUTHORIZED
 
 
 class Forbidden(SpakkyFastAPIError):
-    status_code: int = status.HTTP_403_FORBIDDEN
+    status_code: ClassVar[int] = status.HTTP_403_FORBIDDEN
 
 
 class NotFound(SpakkyFastAPIError):
-    status_code: int = status.HTTP_404_NOT_FOUND
+    status_code: ClassVar[int] = status.HTTP_404_NOT_FOUND
 
 
 class Conflict(SpakkyFastAPIError):
-    status_code: int = status.HTTP_409_CONFLICT
+    status_code: ClassVar[int] = status.HTTP_409_CONFLICT
 
 
 class InternalServerError(SpakkyFastAPIError):
-    status_code: int = status.HTTP_500_INTERNAL_SERVER_ERROR
-    traceback: str = ""
+    status_code: ClassVar[int] = status.HTTP_500_INTERNAL_SERVER_ERROR
+    stacktrace: str | None
 
-    def __init__(self, error: Exception) -> None:
+    def __init__(self, error: Exception, stacktrace: str | None) -> None:
         super().__init__(SpakkyUnknownError(error.args))
-        self.traceback = traceback.format_exc()
+        self.stacktrace = stacktrace
+
+    def to_response(self) -> ORJSONResponse:
+        return ORJSONResponse(
+            content={
+                "message": self.message,
+                "args": [str(x) for x in self.args],
+                "stacktrace": self.stacktrace,
+            },
+            status_code=self.status_code,
+        )

spakky_fastapi/middlewares/error_handling.py

@@ -2,8 +2,6 @@ import traceback
 from typing import Callable, Awaitable, TypeAlias
 
 from fastapi import Request
-from fastapi.responses import ORJSONResponse
-from pydantic import BaseModel
 from starlette.middleware.base import BaseHTTPMiddleware, DispatchFunction
 from starlette.responses import Response
 from starlette.types import ASGIApp
@@ -13,12 +11,6 @@ from spakky_fastapi.error import InternalServerError, SpakkyFastAPIError
 Next: TypeAlias = Callable[[Request], Awaitable[Response]]
 
 
-class ErrorResponse(BaseModel):
-    message: str
-    args: list[str]
-    traceback: str = ""
-
-
 class ErrorHandlingMiddleware(BaseHTTPMiddleware):
     __debug: bool
 
@@ -35,23 +27,11 @@ class ErrorHandlingMiddleware(BaseHTTPMiddleware):
         try:
             return await call_next(request)
         except SpakkyFastAPIError as e:
-            return ORJSONResponse(
-                content=ErrorResponse(
-                    message=e.message,
-                    args=[str(x) for x in e.args],
-                ).model_dump(),
-                status_code=e.status_code,
-            )
-        # pylint: disable=broad-exception-caught
-        except Exception as e:
+            return e.to_response()
+        except Exception as e:  # pylint: disable=broad-exception-caught
             if self.__debug:
                 traceback.print_exc()  # pragma: no cover
-            error = InternalServerError(e)
-            return ORJSONResponse(
-                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,
-            )
+            return InternalServerError(
+                error=e,
+                stacktrace=traceback.format_exc() if self.__debug else None,
+            ).to_response()

{spakky_fastapi-1.6.2.dist-info → spakky_fastapi-1.6.3.dist-info}/METADATA

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

{spakky_fastapi-1.6.2.dist-info → spakky_fastapi-1.6.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
 spakky_fastapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spakky_fastapi/aspects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spakky_fastapi/aspects/authenticate.py,sha256=Nzyh7iVJy5OmQ3x2ZCPobhPNWgvK604IHaN0pmTdjkI,3997
-spakky_fastapi/error.py,sha256=SWyNZk1kxbTCiy-tLxB8saLpX5rBxwvy7q7JRCtNQV0,1124
+spakky_fastapi/error.py,sha256=gLZObCZQpBjFmUstRWNDWy2if5DvNIY3WwY6jruwhak,1833
 spakky_fastapi/middlewares/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-spakky_fastapi/middlewares/error_handling.py,sha256=09cLArDGsN4mMIcC3qWr3SGivLfA6rUQ0PaRwQIT-YA,1816
+spakky_fastapi/middlewares/error_handling.py,sha256=_ThkgNkDjVzegxz-QDpMxp1-grG1gx5vrhF4o3Lb2hE,1211
 spakky_fastapi/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spakky_fastapi/plugins/authenticate.py,sha256=63tsHFjEzHklsmNyjPoksqiwiwo04h1dJjpzJq9pRf0,434
 spakky_fastapi/plugins/fast_api.py,sha256=K09znsenVDu7t-NNPSRtNxX7nzutDxBJqUGy20yT3oM,645
@@ -11,6 +11,6 @@ spakky_fastapi/post_processor.py,sha256=viHvWb_IWB1nnD4SHnCEwFgg8Wc25FV0q81UO5Fq
 spakky_fastapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spakky_fastapi/stereotypes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spakky_fastapi/stereotypes/api_controller.py,sha256=NM0gyTQfuHnENtvyfm5T9Y427gQdxdUcVYDzAXryF2M,19320
-spakky_fastapi-1.6.2.dist-info/METADATA,sha256=G_nhQGtaCzoatHomJYYyly4YmbIw_tRFoDnBrT-soUs,1853
-spakky_fastapi-1.6.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-spakky_fastapi-1.6.2.dist-info/RECORD,,
+spakky_fastapi-1.6.3.dist-info/METADATA,sha256=6FGe20gqns7mLrrbqEFI2lCprpFX2hIJZXlyUSSjCpA,1853
+spakky_fastapi-1.6.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+spakky_fastapi-1.6.3.dist-info/RECORD,,