internal 0.1.52__tar.gz → 0.1.54__tar.gz

{internal-0.1.52 → internal-0.1.54}/PKG-INFO

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

{internal-0.1.52 → internal-0.1.54}/pyproject.toml

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

{internal-0.1.52 → internal-0.1.54}/src/internal/base_factory.py

@@ -44,6 +44,21 @@ class BaseFactory(metaclass=ABCMeta):
         Each factory should define what config it wants.
         """
 
+    async def process_exception(self, app, request: Request, exc):
+        if isinstance(exc, InternalBaseException):
+            detail = exc.detail
+            await async_response(data=detail.get("data"), code=detail.get("code"), message=detail.get("message"),
+                                 status_code=exc.status_code)
+        elif isinstance(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)
+        else:
+            app.state.logger.warn(f"Exception, request:{request.__dict__}, exc:{exc}")
+            app.state.logger.warn(traceback.format_exc())
+            return await async_response(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)
 
@@ -83,24 +98,27 @@ 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):
+            await self.process_exception(app, request, exc)
+            # detail = exc.detail
+            # await async_response(data=detail.get("data"), code=detail.get("code"), message=detail.get("message"),
+            #                      status_code=exc.status_code)
+
         @app.exception_handler(RequestValidationError)
         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)
+            await self.process_exception(app, request, exc)
+            # 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: Request, exc):
-            if isinstance(exc, InternalBaseException):
-                detail = exc.detail
-                print(f"Exception detail: {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(code="error_internal_server", message="Internal server error",
-                                            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        async def http_exception_handler(request: Request, exc: Exception):
+            await self.process_exception(app, request, exc)
+            # app.state.logger.warn(f"Exception, request:{request.__dict__}, exc:{exc}")
+            # app.state.logger.warn(traceback.format_exc())
+            # return await async_response(code="error_internal_server", message="Internal server error",
+            #                             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
         return app