spakky-fastapi 1.6.2__tar.gz → 1.6.3__tar.gz

{spakky_fastapi-1.6.2 → spakky_fastapi-1.6.3}/PKG-INFO

@@ -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 → spakky_fastapi-1.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spakky-fastapi"
-version = "1.6.2"
+version = "1.6.3"
 description = "Highly abstracted Framework core to use DDD & DI/IoC & AOP & Etc..."
 authors = ["Spakky <sejong418@icloud.com>"]
 readme = "README.md"
@@ -24,8 +24,8 @@ pytest = "^7.4.3"
 pytest-cov = "^4.1.0"
 pytest-asyncio = "^0.21.1"
 httpx = "^0.26.0"
-
 toml = "^0.10.2"
+
 [tool.poetry.group.ci.dependencies]
 pylint = "^3.0.2"
 pytest = "^7.4.3"

spakky_fastapi-1.6.3/spakky_fastapi/error.py

@@ -0,0 +1,65 @@
+from typing import ClassVar
+
+from fastapi import status
+from fastapi.responses import ORJSONResponse
+from spakky.core.error import SpakkyCoreError
+
+
+class SpakkyFastAPIError(SpakkyCoreError):
+    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: ClassVar[int] = status.HTTP_400_BAD_REQUEST
+
+
+class Unauthorized(SpakkyFastAPIError):
+    status_code: ClassVar[int] = status.HTTP_401_UNAUTHORIZED
+
+
+class Forbidden(SpakkyFastAPIError):
+    status_code: ClassVar[int] = status.HTTP_403_FORBIDDEN
+
+
+class NotFound(SpakkyFastAPIError):
+    status_code: ClassVar[int] = status.HTTP_404_NOT_FOUND
+
+
+class Conflict(SpakkyFastAPIError):
+    status_code: ClassVar[int] = status.HTTP_409_CONFLICT
+
+
+class InternalServerError(SpakkyFastAPIError):
+    status_code: ClassVar[int] = status.HTTP_500_INTERNAL_SERVER_ERROR
+    stacktrace: str | None
+
+    def __init__(self, error: Exception, stacktrace: str | None) -> None:
+        super().__init__(SpakkyUnknownError(error.args))
+        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-1.6.2 → spakky_fastapi-1.6.3}/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/spakky_fastapi/error.py

@@ -1,45 +0,0 @@
-import traceback
-
-from fastapi import status
-from spakky.core.error import SpakkyCoreError
-
-
-class SpakkyFastAPIError(SpakkyCoreError):
-    status_code: int
-
-    def __init__(self, error: SpakkyCoreError) -> None:
-        self.message = error.message
-        self.args = error.args
-
-
-class SpakkyUnknownError(SpakkyCoreError):
-    message = "알 수 없는 오류가 발생했습니다."
-
-
-class BadRequest(SpakkyFastAPIError):
-    status_code: int = status.HTTP_400_BAD_REQUEST
-
-
-class Unauthorized(SpakkyFastAPIError):
-    status_code: int = status.HTTP_401_UNAUTHORIZED
-
-
-class Forbidden(SpakkyFastAPIError):
-    status_code: int = status.HTTP_403_FORBIDDEN
-
-
-class NotFound(SpakkyFastAPIError):
-    status_code: int = status.HTTP_404_NOT_FOUND
-
-
-class Conflict(SpakkyFastAPIError):
-    status_code: int = status.HTTP_409_CONFLICT
-
-
-class InternalServerError(SpakkyFastAPIError):
-    status_code: int = status.HTTP_500_INTERNAL_SERVER_ERROR
-    traceback: str = ""
-
-    def __init__(self, error: Exception) -> None:
-        super().__init__(SpakkyUnknownError(error.args))
-        self.traceback = traceback.format_exc()