internal 1.1.10__tar.gz → 1.1.12__tar.gz

{internal-1.1.10 → internal-1.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: internal
-Version: 1.1.10
+Version: 1.1.12
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-1.1.10 → internal-1.1.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "internal"
-version = "1.1.10"
+version = "1.1.12"
 description = ""
 authors = [{ name = "Ray", email = "ray@cruisys.com" }]
 readme = "README.md"

{internal-1.1.10 → internal-1.1.12}/src/internal/base_factory.py

@@ -19,7 +19,7 @@ from .const import LOG_FMT, LOG_FMT_NO_DT, LOG_DT_FMT, DEFAULT_LOGGER_NAME, CORR
 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.requests import send_webhook_message
 from .http.responses import async_response
 from .middleware.log_request import LogRequestMiddleware
 from .utils import update_dict_with_cast
@@ -157,19 +157,11 @@ class BaseFactory(metaclass=ABCMeta):
             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}")
+                    await send_webhook_message(app, message)
             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}")
+                    await send_webhook_message(app, message)
 
             return await async_response(data=detail.get("data"), code=detail.get("code"), message=detail.get("message"),
                                         status_code=exc.status_code)
@@ -187,13 +179,8 @@ class BaseFactory(metaclass=ABCMeta):
         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())
-            if self.get_app_config().WEBHOOK_BASE_URL:
-                message = f"【{self.DEFAULT_APP_NAME}】Unprocessed Exception, 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}")
+            message = f"【{self.DEFAULT_APP_NAME}】Unprocessed Exception, request:{request.__dict__}, exc:{exc}"
+            await send_webhook_message(app, message)
 
             return await async_response(code="error_internal_server", message="Internal server error",
                                         status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)

{internal-1.1.10 → internal-1.1.12}/src/internal/http/requests.py

@@ -24,11 +24,13 @@ async def invoke_request(timeout: httpx.Timeout, method: str, url: str, app: Fas
             )
             return response
     except httpx.TimeoutException as exc:
-        app.state.logger.warn(f"invoke_request(), TimeoutException, exc: {exc}, url: {url}, method: {method}, kwargs: {kwargs}")
+        message = f"invoke_request(), TimeoutException, exc: {exc}, url: {url}, method: {method}, kwargs: {kwargs}"
+        app.state.logger.warn(message)
         raise GatewayTimeoutException(str(exc)) from exc
     except Exception as exc:
-        app.state.logger.warn(
-            f"invoke_request(), Exception, exc: {exc}, url: {url}, method: {method}, kwargs: {kwargs}")
+        message = f"invoke_request(), Exception, exc: {exc}, url: {url}, method: {method}, kwargs: {kwargs}"
+        app.state.logger.warn(message)
+        await send_webhook_message(app, message)
         raise BadGatewayException(str(exc))
 
 
@@ -76,7 +78,7 @@ async def async_request(app: FastAPI, method, url, current_user: dict = None,
         current_delay = float(request_retry_delay)
 
         while retries <= request_retry_count:
-            app.state.logger.warn(f"嘗試送請求 (第 {retries + 1} 次嘗試)...")
+            app.state.logger.warn(f"url: {url}, method: {method}, kwargs: {kwargs}, 嘗試送請求 (第 {retries + 1} 次嘗試)...")
             try:
                 # 使用 await 關鍵字等待異步請求完成
                 response = await invoke_request(timeout, method, url, app, **kwargs)
@@ -85,12 +87,13 @@ async def async_request(app: FastAPI, method, url, current_user: dict = None,
                 if retries < request_retry_count:
                     # 計算下一次的延遲時間：current_delay * 2^retries + 隨機抖動
                     sleep_time = current_delay * (2 ** retries) + random.uniform(0, 0.5)
-                    app.state.logger.warn(f"等待 {sleep_time:.2f} 秒後重試...")
+                    app.state.logger.warn(f"url: {url}, method: {method}, kwargs: {kwargs}, 等待 {sleep_time:.2f} 秒後重試...")
                     # 使用 asyncio.sleep 進行異步等待，不會阻塞主執行緒
                     await asyncio.sleep(sleep_time)
                     retries += 1
                 else:
-                    app.state.logger.warn(f"已達到最大重試次數 ({request_retry_count})，放棄發送請求。")
+                    message = f"url: {url}, method: {method}, kwargs: {kwargs}, 已達到最大重試次數 ({request_retry_count})，放棄發送請求。"
+                    app.state.logger.warn(message)
                     raise  # 重新拋出最後一個異常