internal 1.0.51__py3-none-any.whl → 1.0.53__py3-none-any.whl

internal/base_factory.py

@@ -16,6 +16,7 @@ from fastapi.middleware.cors import CORSMiddleware
 from . import database
 from .const import LOG_FMT, LOG_FMT_NO_DT, LOG_DT_FMT, DEFAULT_LOGGER_NAME
 from .exception.base_exception import InternalBaseException
+from .exception.internal_exception import BadGatewayException, GatewayTimeoutException
 from .ext.amazon import aws
 from .http.requests import async_request
 from .http.responses import async_response
@@ -125,6 +126,24 @@ class BaseFactory(metaclass=ABCMeta):
         @app.exception_handler(InternalBaseException)
         async def http_exception_handler(request: Request, exc: InternalBaseException):
             detail = exc.detail
+
+            if isinstance(exc, BadGatewayException):
+                if self.get_app_config().WEBHOOK_BASE_URL:
+                    message = f"【{self.DEFAULT_APP_NAME}】Bad gateway, request:{request.__dict__}, exc:{exc}"
+                    payload = {"text": message}
+                    try:
+                        await async_request(app, "POST", self.get_app_config().WEBHOOK_BASE_URL, json=payload)
+                    except Exception as e:
+                        app.state.logger.warn(f"Notify failure, Exception:{e}")
+            elif isinstance(exc, GatewayTimeoutException):
+                if self.get_app_config().WEBHOOK_BASE_URL:
+                    message = f"【{self.DEFAULT_APP_NAME}】Gateway timeout, request:{request.__dict__}, exc:{exc}"
+                    payload = {"text": message}
+                    try:
+                        await async_request(app, "POST", self.get_app_config().WEBHOOK_BASE_URL, json=payload)
+                    except Exception as e:
+                        app.state.logger.warn(f"Notify failure, Exception:{e}")
+
             return await async_response(data=detail.get("data"), code=detail.get("code"), message=detail.get("message"),
                                         status_code=exc.status_code)
 

internal/http/requests.py

@@ -36,3 +36,12 @@ async def async_request(app: FastAPI, method, url, current_user: dict = None, **
         app.state.logger.warn(
             f"async_request(), Exception, exc: {exc}, url: {url}, method: {method}, kwargs: {kwargs}")
         raise BadGatewayException(str(exc))
+
+
+async def send_webhook_message(app: FastAPI, message: str):
+    if app.state.config.WEBHOOK_BASE_URL:
+        payload = {"text": message}
+        try:
+            await async_request(app, "POST", app.state.config.WEBHOOK_BASE_URL, json=payload)
+        except Exception as e:
+            app.state.logger.warn(f"Notify failure, Exception:{e}")

internal/model/operate.py

@@ -1,3 +1,5 @@
+import arrow
+from datetime import datetime
 from typing import Optional
 
 import dictdiffer
@@ -13,11 +15,13 @@ class Operate(BaseModel):
     async def generate_operate(cls, original: dict = None, compare: dict = None):
         if original:
             original = await cls.remove_ignore_field(original)
+            await cls.convert_datetime_timezone_utc_field(original)
         else:
             original = {}
 
         if compare:
             compare = await cls.remove_ignore_field(compare)
+            await cls.convert_datetime_timezone_utc_field(compare)
         else:
             compare = {}
 
@@ -43,3 +47,10 @@ class Operate(BaseModel):
     @classmethod
     async def remove_ignore_field(cls, model_dict: dict):
         return {k: v for k, v in model_dict.items() if k not in ['create_time', 'update_time']}
+
+    @classmethod
+    async def convert_datetime_timezone_utc_field(cls, model_dict: dict):
+        # 統一使用arrow.get取代datetime，使其包含tzinfo，避免diff因時區有無判斷錯誤
+        for k, v in model_dict.items():
+            if isinstance(v, datetime):
+                model_dict[k] = arrow.get(v).datetime

{internal-1.0.51.dist-info → internal-1.0.53.dist-info}/METADATA

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

{internal-1.0.51.dist-info → internal-1.0.53.dist-info}/RECORD

@@ -1,6 +1,6 @@
 internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/base_config.py,sha256=ZdqvHlPsF6ozELgmV0ZiSpYehSscasIclLp8eAjVE24,1870
-internal/base_factory.py,sha256=0MQNsJrGwYIdibkg1iqptxA7hyYc-S2Pj4IjGuIA2rM,8962
+internal/base_factory.py,sha256=7UUiolLWYSodc9PxqLHaZ6KqDYUU3kC4g07iVggSymU,10125
 internal/common_enum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/common_enum/contact_type.py,sha256=7QkTQ71UxpaT1YHI40FpjmLz3r-UbRU-sd0m5ajH1as,142
 internal/common_enum/description_type.py,sha256=kGwkFQh6dMnjDl6ipWYpA-qbNRrhEpnPq3NleTsNwwk,118
@@ -18,7 +18,7 @@ internal/ext/amazon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 internal/ext/amazon/aws/__init__.py,sha256=2YFjb-rHG1JaZGZiZffYDesgTAJjDshOqQbswOYzhP8,834
 internal/ext/amazon/aws/const.py,sha256=l4WMg5bKWujwOKABBkCO2zclNg3abnYOfbhD7DG8GsA,109
 internal/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/http/requests.py,sha256=4Mdu_HIGDEgpgey8IPusqBn9s-3-oYGU0S49NK-khc4,1821
+internal/http/requests.py,sha256=PA3Z9Yqb-TWO-bP1xVvRAw8LptZTJPPt1MrfukpVJqk,2167
 internal/http/responses.py,sha256=_xhp52Y4T8tGQ4g6U8gh71WADLECibOAV42jKSvtvtw,2923
 internal/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/interface/base_interface.py,sha256=3YaVjIgLi_pZpLk5SEIk8WVkuICM8qPavT8rB0MdB5U,1536
@@ -26,8 +26,8 @@ internal/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 internal/middleware/log_request.py,sha256=bXAxmvvsYDhObXzfUw4ZNreKAWOo8ee_vpb6Xin5ztc,854
 internal/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/model/base_model.py,sha256=NS_GZvw_IqU1aZPHPpyQs6A741O34ybmzVzBPm9nGWU,3014
-internal/model/operate.py,sha256=luEoP_Asvso_11qz1SAE1Kn5KxAnDRptM0VylC5tNik,1493
+internal/model/operate.py,sha256=kufXKxDknAneXTL_ycb7THBVvOmXFftYLx18bvdSARI,2004
 internal/utils.py,sha256=0SubS0iUhDvjSX1F4TykasA5-enYJzt2VH-f7_0BnjI,1509
-internal-1.0.51.dist-info/METADATA,sha256=l4kSVSOlNM3_5_WkdSETvOm_awse9Q6bIGS-kC4kL90,625
-internal-1.0.51.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-internal-1.0.51.dist-info/RECORD,,
+internal-1.0.53.dist-info/METADATA,sha256=UbiigwU-ytVxLi4gz2jDidCQvha-zH3LewXzd8OxgRY,625
+internal-1.0.53.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+internal-1.0.53.dist-info/RECORD,,