internal 1.1.5__tar.gz → 1.1.6__tar.gz

{internal-1.1.5 → internal-1.1.6}/PKG-INFO

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

{internal-1.1.5 → internal-1.1.6}/pyproject.toml

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

{internal-1.1.5 → internal-1.1.6}/src/internal/base_config.py

@@ -52,6 +52,8 @@ class BaseConfig(BaseSettings):
 
     # Exception Notify
     WEBHOOK_BASE_URL: str = ""
+    WEBHOOK_RETRY_COUNT: int = 5
+    WEBHOOK_RETRY_DELAY_INITIAL_SECONDS: int = 1
 
     # Default System Account Password
     SYSTEM_ACCOUNT: str = "cruisys"

{internal-1.1.5 → internal-1.1.6}/src/internal/http/requests.py

@@ -1,3 +1,6 @@
+import asyncio
+import random
+
 import httpx
 
 from fastapi import FastAPI
@@ -59,10 +62,63 @@ async def async_request(app: FastAPI, method, url, current_user: dict = None,
         raise BadGatewayException(str(exc))
 
 
+async def invoke_webhook_message_api(app: FastAPI, message: str):
+    payload = {"text": message}
+    response = await async_request(app, "POST", app.state.config.WEBHOOK_BASE_URL, json=payload)
+    response.raise_for_status()
+    return response
+
+
 async def send_webhook_message(app: FastAPI, message: str):
-    if app.state.config.WEBHOOK_BASE_URL:
-        payload = {"text": message}
+    if not app.state.config.WEBHOOK_BASE_URL:
+        app.state.logger.warn(f"Skip notify webhook url is null")
+        return None
+
+    retry_count = app.state.config.WEBHOOK_RETRY_COUNT
+    if retry_count <= 0:
         try:
-            await async_request(app, "POST", app.state.config.WEBHOOK_BASE_URL, json=payload)
+            response = await invoke_webhook_message_api(app, message)
+            return response
         except Exception as e:
             app.state.logger.warn(f"Notify failure, Exception:{e}")
+    else:
+        retries = 0
+        current_delay = float(app.state.config.WEBHOOK_RETRY_DELAY_INITIAL_SECONDS)
+
+        while retries <= retry_count:
+            app.state.logger.warn(f"嘗試發送訊息 (第 {retries + 1} 次嘗試)...")
+            try:
+                # 使用 await 關鍵字等待異步請求完成
+                response = await invoke_webhook_message_api(app, message)
+                return response
+            except httpx.HTTPStatusError as e:
+                if e.response.status_code == 429:
+                    app.state.logger.warn(f"收到 429 錯誤：{e.response.status_code} - {e.response.text}")
+                    if retries < 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} 秒後重試...")
+                        # 使用 asyncio.sleep 進行異步等待，不會阻塞主執行緒
+                        await asyncio.sleep(sleep_time)
+                        retries += 1
+                    else:
+                        app.state.logger.warn(
+                            f"已達到最大重試次數 ({app.state.config.WEBHOOK_RETRY_COUNT})，放棄發送訊息。")
+                        raise  # 重新拋出最後一個異常
+                else:
+                    app.state.logger.warn(f"發生其他 HTTP 錯誤：{e.response.status_code} - {e.response.text}")
+                    raise  # 對於非 429 錯誤，直接拋出
+
+            except httpx.RequestError as e:
+                # 處理網絡錯誤，例如 DNS 查找失敗、連接超時等
+                app.state.logger.warn(f"發生網絡錯誤：{e}")
+                if retries < retry_count:
+                    sleep_time = current_delay * (2 ** retries) + random.uniform(0, 0.5)
+                    app.state.logger.warn(f"等待 {sleep_time:.2f} 秒後重試...")
+                    await asyncio.sleep(sleep_time)
+                    retries += 1
+                else:
+                    app.state.logger.warn(f"已達到最大重試次數 ({retry_count})，放棄發送訊息。")
+                    raise
+
+        return None  # 如果重試次數用盡仍未成功