fastapi-basic 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

fastapi_basic/base_factory.py

@@ -84,6 +84,7 @@ class BaseFactory(metaclass=ABCMeta):
 
         @app.exception_handler(InternalBaseException)
         async def http_exception_handler(request: Request, exc: InternalBaseException):
+            app.logger.warning(f'message: {exc.detail["message"]}')
             return JSONResponse(
                 status_code=exc.status_code,
                 content={

fastapi_basic/exception/base_exception.py

@@ -11,13 +11,3 @@ class InternalBaseException(HTTPException):
             "data": kwargs,
         }
         super().__init__(status_code=status_code, detail=detail)
-
-class LineBotException(HTTPException):
-    def __init__(self, status_code: int = status.HTTP_502_BAD_GATEWAY, code: str = "line_bot_error",
-                 message: str = "Line bot error", **kwargs):
-        detail = {
-            "code": code,
-            "message": message,
-            "data": kwargs,
-        }
-        super().__init__(status_code=status_code, detail=detail)

fastapi_basic/ext/line/__init__.py

@@ -5,7 +5,7 @@ from linebot import LineBotApi, WebhookHandler
 from linebot.exceptions import LineBotApiError
 from linebot.models import TextMessage, TextSendMessage, MessageEvent
 
-from ...exception.base_exception import LineBotException
+from .exception import LineBotException
 
 class LineBot(metaclass=ABCMeta):
     def __init__(self, channel_access_token: str, channel_secret: str, logger=None):
@@ -24,7 +24,7 @@ class LineBot(metaclass=ABCMeta):
             self.log_message(message)
 
         except LineBotApiError as err:
-            exception = LineBotException(str(err))
+            exception = LineBotException(message=str(err))
             raise exception
 
     async def push_message(self, line_uid: str, text: str):
@@ -35,7 +35,7 @@ class LineBot(metaclass=ABCMeta):
 
         except LineBotApiError as err:
             message = f"Send line message fail, line_uid: {line_uid}, text: {text}, err: {str(err)}"
-            exception = LineBotException(message)
+            exception = LineBotException(message=message)
             raise exception
 
     def log_message(self, log_message: str):

fastapi_basic/ext/line/exception.py

@@ -0,0 +1,12 @@
+from fastapi import status
+from ...exception.base_exception import InternalBaseException
+
+
+class LineBotException(InternalBaseException):
+    def __init__(self, message: str = "", **kwargs):
+        status_code: int = status.HTTP_502_BAD_GATEWAY
+        code: str = "line_bot_error"
+        log_message: str = "Line bot error"
+
+        message = f"{log_message}, {message}" if message else log_message
+        super().__init__(status_code=status_code, code=code, message=message, **kwargs)

{fastapi_basic-0.1.9.dist-info → fastapi_basic-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi_basic
-Version: 0.1.9
+Version: 0.1.11
 Summary: A short description of your module
 Home-page: https://github.com/szx21023/fastapi-base
 Author: szx21023
@@ -35,7 +35,7 @@ Requires-Dist: dotenv==0.9.9
 Requires-Dist: fastapi==0.115.12
 Requires-Dist: frozenlist==1.6.0
 Requires-Dist: future==1.0.0
-Requires-Dist: h11==0.14.0
+Requires-Dist: h11==0.16.0
 Requires-Dist: idna==3.10
 Requires-Dist: jmespath==1.0.1
 Requires-Dist: kombu==5.5.3

{fastapi_basic-0.1.9.dist-info → fastapi_basic-0.1.11.dist-info}/RECORD

@@ -1,17 +1,18 @@
 fastapi_basic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_basic/base_config.py,sha256=WtYA7nI7yTw_bmMMIH1JdKiGOl81Vjekf2OpmwtnCww,568
-fastapi_basic/base_factory.py,sha256=G2hSBB6OXNh9lO2oAxEHXaJjjK-CTeG-_lCJxkg0WPc,4319
+fastapi_basic/base_factory.py,sha256=a8AtByr7zp0OQhWzaTkh51KQ_Q_b7XZEF2hcl1rRYCk,4387
 fastapi_basic/const.py,sha256=jjNg7nutqtfzrqEKlU-zbzkDo3ndf3aDc603LbGcB_k,174
 fastapi_basic/utils.py,sha256=8ympyQIXsKkxLILTI_7ug85vmKWYKqX0mpADjgHekgU,306
 fastapi_basic/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_basic/database/mongodb.py,sha256=XW7ApqYkR1Jf7LM1HaZ6jzYgajzuu1whKw5cpsjSO-M,1017
 fastapi_basic/exception/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fastapi_basic/exception/base_exception.py,sha256=VwMqn85rBeJCF6RIOYUR1eLxbP2aSDhhtAyyhYmBI84,855
+fastapi_basic/exception/base_exception.py,sha256=xkpvAI8G96sqXqHgQC_rs2ZPL1liwKVXbXBIPF_8HPQ,473
 fastapi_basic/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fastapi_basic/ext/aws/__init__.py,sha256=N_cwnbv1N-F1SY6NenBOTZe20zGaKFu3UXAu17hFAXY,816
 fastapi_basic/ext/aws/const.py,sha256=Mmb6lo11aZZDAVy-nK-v_JxtVPPKYUo9GB4ihH7XYuM,68
-fastapi_basic/ext/line/__init__.py,sha256=sXxNgGHedRW1JCHrD-JVNXLkcrsZEUiDAAHelgeRKy8,2129
-fastapi_basic-0.1.9.dist-info/METADATA,sha256=06DmIyyl-_qdUREocRpgyLH0WvEC0r09WcRL-Wo03jQ,2752
-fastapi_basic-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fastapi_basic-0.1.9.dist-info/top_level.txt,sha256=Q9PdwWxaB4dy135MQHiroRYOqArdUSaIeEkzYinN6W0,14
-fastapi_basic-0.1.9.dist-info/RECORD,,
+fastapi_basic/ext/line/__init__.py,sha256=XkFYkV3Mx6w4TRim4ziETJrgOy9qJ_4pPrnqonBE_QU,2128
+fastapi_basic/ext/line/exception.py,sha256=AUJdg15yDUxQe7kys_NiOBqfEgmolj8-y5c2wNgfp2U,490
+fastapi_basic-0.1.11.dist-info/METADATA,sha256=DAmDHtBYTmy-rE_3JIisu_kr0CHeAhdDg_eLaGCpiRM,2753
+fastapi_basic-0.1.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fastapi_basic-0.1.11.dist-info/top_level.txt,sha256=Q9PdwWxaB4dy135MQHiroRYOqArdUSaIeEkzYinN6W0,14
+fastapi_basic-0.1.11.dist-info/RECORD,,