internal 1.0.52__tar.gz → 1.0.54__tar.gz

{internal-1.0.52 → internal-1.0.54}/PKG-INFO

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

{internal-1.0.52 → internal-1.0.54}/pyproject.toml

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

{internal-1.0.52 → internal-1.0.54}/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.52 → internal-1.0.54}/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.52 → internal-1.0.54}/src/internal/utils.py

@@ -47,4 +47,4 @@ def update_dict_with_cast(curr_settings: BaseConfig, new_conf: dict):
 
 
 def sanitize_plate_no(plate_no):
-    return plate_no.replace(STR_DASH, STR_EMPTY)
+    return plate_no.replace(STR_DASH, STR_EMPTY).upper()