internal 0.1.53__py3-none-any.whl → 0.1.55__py3-none-any.whl

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 issubclass(type(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 issubclass(type(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)
 
@@ -85,24 +100,25 @@ class BaseFactory(metaclass=ABCMeta):
 
         @app.exception_handler(InternalBaseException)
         async def http_exception_handler(request: Request, exc: InternalBaseException):
-            print(exc)
-            detail = exc.detail
-            print(f"Exception detail: {detail}")
-            await async_response(data=detail.data, code=detail.code, message=detail.message,
-                                 status_code=exc.status_code)
+            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: Exception):
-            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)
+            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
 

internal/http/responses.py

@@ -9,7 +9,6 @@ from beanie import Document, Link
 async def async_response(data=None, message=None, code=None, page_no=None, total_num=None, page_size=None,
                          status_code=status.HTTP_200_OK):
     def _serialize(data):
-        # if issubclass(type(data), Document):
         if isinstance(data, Document):
             link_field_list = []
             for field_name in data.__annotations__:
@@ -46,5 +45,5 @@ async def async_response(data=None, message=None, code=None, page_no=None, total
         }
     else:
         ret['data'] = data
-    print(f"Response: {ret}")
+
     return JSONResponse(status_code=status_code, content=ret)

{internal-0.1.53.dist-info → internal-0.1.55.dist-info}/METADATA

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

{internal-0.1.53.dist-info → internal-0.1.55.dist-info}/RECORD

@@ -1,6 +1,6 @@
 internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/base_config.py,sha256=GFuigDWbvG257qOc2cfdz3KgHUIKiXOU0E7pnD5zOQA,1247
-internal/base_factory.py,sha256=Py7cuVv4SRyLHOEun_zCRH58gBn8vdhfA2ihe_Rc8ZA,6456
+internal/base_factory.py,sha256=dEDljBCHSefnJlLUY2FGlem0EHbXgaCcayNGO3hhnxQ,7634
 internal/const.py,sha256=U1S9r7bjtHgad2oYQoHO19s8D4V0WDUG-L-haV4UaIw,1025
 internal/database.py,sha256=MyRLlb0W8FB8Odq0UQpN3R7OD3yUPWgJXsZRuDWQC_w,1010
 internal/exception/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,7 +12,7 @@ internal/ext/amazon/aws/__init__.py,sha256=2YFjb-rHG1JaZGZiZffYDesgTAJjDshOqQbsw
 internal/ext/amazon/aws/const.py,sha256=l4WMg5bKWujwOKABBkCO2zclNg3abnYOfbhD7DG8GsA,109
 internal/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/http/requests.py,sha256=Np0uIzHJjJ4S0yeet3dgTJEkQaDo9BkW3gLdqsahCeA,1040
-internal/http/responses.py,sha256=ECHw4Tr4WPTYRc7gZ3HnmZxZIrv929fFp4padf72gJU,1583
+internal/http/responses.py,sha256=qo5cxLaJ2RdmscqweINC-RXEJ2NzKwjyM6LjXfQjjjM,1507
 internal/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/interface/base_interface.py,sha256=R5MmO5oa5-ORPV_adkegLVCwsVio2zFOuQFGiby3khs,340
 internal/jwt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,6 +23,6 @@ internal/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/model/base_model.py,sha256=gNbixWuGiK8Tbe78wHuLneZ8p3fwMwQRKurBDrGoh6s,1874
 internal/model/operate.py,sha256=3mOs7eQ2CPnCB6i6UQBOp8VdTPmVnayaUFqUEDOKoTY,1493
 internal/utils.py,sha256=0SubS0iUhDvjSX1F4TykasA5-enYJzt2VH-f7_0BnjI,1509
-internal-0.1.53.dist-info/METADATA,sha256=rnU0hyHUnjgA_ECZyDU2JOFfvkDwtHx5qN1V21b0Nlk,625
-internal-0.1.53.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-internal-0.1.53.dist-info/RECORD,,
+internal-0.1.55.dist-info/METADATA,sha256=mH5RHlQxaJ2Ajnsf3D_R_ku24pJwX3htkho6QcCN2f0,625
+internal-0.1.55.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+internal-0.1.55.dist-info/RECORD,,