internal 0.1.47__py3-none-any.whl → 0.1.49__py3-none-any.whl

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
 

internal/http/responses.py

@@ -1,4 +1,5 @@
 import json
+import httpx
 
 from fastapi import status
 from fastapi.responses import JSONResponse
@@ -23,7 +24,7 @@ async def async_response(data=None, message=None, code=None, page_no=None, total
                         data[field_name] = data[field_name]["id"]
         return data
 
-    if isinstance(data, JSONResponse):
+    if isinstance(data, httpx.Response):
         return data
 
     ret = {}

{internal-0.1.47.dist-info → internal-0.1.49.dist-info}/METADATA

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

{internal-0.1.47.dist-info → internal-0.1.49.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=KDKyPytJO5kBrYW2kv7D-1ds55rL2g7szdPN7JOlbjM,6426
+internal/base_factory.py,sha256=W9YmFnXdWYlqeqA9CpJXK3EHEpXEX9r8iXF-sXvLu5c,6384
 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=G6IPte-DCJPG-zWVffANFIhu0m_mTIrI3AOOnDHEk_k,1539
+internal/http/responses.py,sha256=Sbi1IhvrjuW5kdBl5tsJU8wzLlBkSZCp5WlrxVO41F8,1554
 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.47.dist-info/METADATA,sha256=nUN7VNseLGr1kA3uEsFWGCTcH_IkCt-qtgL3YDa5q94,625
-internal-0.1.47.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-internal-0.1.47.dist-info/RECORD,,
+internal-0.1.49.dist-info/METADATA,sha256=G8rsCzjIZj7SukZevKKqTkvqvNSw98NjMBjRMD-lfzY,625
+internal-0.1.49.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+internal-0.1.49.dist-info/RECORD,,