internal 1.0.51__tar.gz → 1.0.53__tar.gz

{internal-1.0.51 → internal-1.0.53}/PKG-INFO

@@ -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 → internal-1.0.53}/pyproject.toml

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

{internal-1.0.51 → internal-1.0.53}/src/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-1.0.51 → internal-1.0.53}/src/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-1.0.51 → internal-1.0.53}/src/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