internal 0.1.48__tar.gz → 0.1.49__tar.gz

{internal-0.1.48 → internal-0.1.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: internal
-Version: 0.1.48
+Version: 0.1.49
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-0.1.48 → internal-0.1.49}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "internal"
-version = "0.1.48"
+version = "0.1.49"
 description = ""
 authors = ["Ray <ray@cruisys.com>"]
 readme = "README.md"

{internal-0.1.48 → internal-0.1.49}/src/internal/base_factory.py

@@ -9,7 +9,7 @@ from functools import lru_cache
 import dotenv
 import watchtower
 from beanie import init_beanie
-from fastapi import FastAPI, status
+from fastapi import FastAPI, status, Request
 from fastapi.exceptions import RequestValidationError
 from fastapi.middleware.cors import CORSMiddleware
 
@@ -44,18 +44,6 @@ class BaseFactory(metaclass=ABCMeta):
         Each factory should define what config it wants.
         """
 
-    async def process_exception(self, app, request, exc):
-        if isinstance(exc, InternalBaseException):
-            detail = exc.detail
-            return await async_response(data=detail.data, code=detail.code, message=detail.message,
-                                        status_code=exc.status_code)
-        else:
-            app.state.logger.warn(f"Exception, request:{request.__dict__}, exc:{exc}")
-            app.state.logger.warn(traceback.format_exc())
-            return await async_response(data={}, code="error_internal_server",
-                                        message="Internal server error",
-                                        status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)
-
     def create_app(self, title=DEFAULT_APP_NAME) -> FastAPI:
         app = FastAPI(title=title, debug=self.get_app_config().DEBUG, version=self.API_VERSION)
 
@@ -95,15 +83,24 @@ class BaseFactory(metaclass=ABCMeta):
         self.__init_modules(app)
         self.__init_builtin_api(app)
 
+        @app.exception_handler(InternalBaseException)
+        async def http_exception_handler(request: Request, exc: InternalBaseException):
+            detail = exc.detail
+            return await async_response(data=detail.data, code=detail.code, message=detail.message,
+                                        status_code=exc.status_code)
+
         @app.exception_handler(RequestValidationError)
-        async def validation_exception_handler(request, exc):
+        async def validation_exception_handler(request: Request, exc: RequestValidationError):
             return await async_response(data={"detail": exc.errors(), "body": exc.body},
                                         code="error_unprocessable_entity", message="Validation failed",
                                         status_code=status.HTTP_422_UNPROCESSABLE_ENTITY)
 
         @app.exception_handler(Exception)
-        async def http_exception_handler(request, exc):
-            await self.process_exception(app, request, exc)
+        async def http_exception_handler(request: Request, exc: Exception):
+            app.state.logger.warn(f"Exception, request:{request.__dict__}, exc:{exc}")
+            app.state.logger.warn(traceback.format_exc())
+            await async_response(code="error_internal_server", message="Internal server error",
+                                 status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
         return app