internal 1.1.15__tar.gz → 1.1.17__tar.gz

{internal-1.1.15 → internal-1.1.17}/PKG-INFO

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

{internal-1.1.15 → internal-1.1.17}/pyproject.toml

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

{internal-1.1.15 → internal-1.1.17}/src/internal/base_config.py

@@ -15,10 +15,13 @@ class BaseConfig(BaseSettings):
     REQUEST_PROXY: str = ''
     REQUEST_RETRY_COUNT: int = 2
     REQUEST_RETRY_DELAY_INITIAL_SECONDS: float = 1.0
+    REQUEST_RETRY_DELAY_FACTOR: float = 1.5
+    REQUEST_RETRY_DELAY_RANDOM_JITTER_MIN: float = 0.0
+    REQUEST_RETRY_DELAY_RANDOM_JITTER_MAX: float = 0.5
     REQUEST_CONN_POOL_TIMEOUT: float = 5.0
     REQUEST_CONN_TIMEOUT: float = 5.0
     REQUEST_WRITE_TIMEOUT: float = 5.0
-    RESPONSE_READ_TIMEOUT: float = 5.0
+    RESPONSE_READ_TIMEOUT: float = 10.0
 
     # AWS
     AWS_ACCESS_KEY_ID: str = ""
@@ -55,6 +58,9 @@ class BaseConfig(BaseSettings):
     WEBHOOK_BASE_URL: str = ""
     WEBHOOK_RETRY_COUNT: int = 5
     WEBHOOK_RETRY_DELAY_INITIAL_SECONDS: float = 1.0
+    WEBHOOK_RETRY_DELAY_FACTOR: float = 2.0
+    WEBHOOK_RETRY_DELAY_RANDOM_JITTER_MIN: float = 0.0
+    WEBHOOK_RETRY_DELAY_RANDOM_JITTER_MAX: float = 0.5
 
     # Default System Account Password
     SYSTEM_ACCOUNT: str = "cruisys"

{internal-1.1.15 → internal-1.1.17}/src/internal/http/requests.py

@@ -77,9 +77,7 @@ async def async_request(app: FastAPI, method, url, current_user: dict = None,
         current_delay = request_retry_delay_initial_seconds
 
         while retries <= request_retry_count:
-            if retries == 0:
-                app.state.logger.warn(f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \n重新嘗試送請求 (第 1 次嘗試)...")
-            else:
+            if retries > 0:
                 app.state.logger.warn(f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \n重新嘗試送請求 (第 {retries} 次嘗試)...")
 
             try:
@@ -89,7 +87,7 @@ async def async_request(app: FastAPI, method, url, current_user: dict = None,
             except GatewayTimeoutException as e:
                 if retries < request_retry_count:
                     # 計算下一次的延遲時間：current_delay * 2^retries + 隨機抖動
-                    sleep_time = current_delay * (2 ** retries) + random.uniform(0, 0.5)
+                    sleep_time = current_delay * (app.state.config.REQUEST_RETRY_DELAY_FACTOR ** retries) + random.uniform(app.state.config.REQUEST_RETRY_DELAY_RANDOM_JITTER_MIN, app.state.config.REQUEST_RETRY_DELAY_RANDOM_JITTER_MAX)
                     app.state.logger.warn(f"【{app.title}】 \nURL: {method} {url} \nkwargs: {kwargs} \n等待 {sleep_time:.2f} 秒後重試...")
                     # 使用 asyncio.sleep 進行異步等待，不會阻塞主執行緒
                     await asyncio.sleep(sleep_time)
@@ -125,9 +123,7 @@ async def send_webhook_message(app: FastAPI, message: str):
         current_delay = app.state.config.WEBHOOK_RETRY_DELAY_INITIAL_SECONDS
 
         while retries <= retry_count:
-            if retries == 0:
-                app.state.logger.warn(f"嘗試發送訊息 (第 1 次嘗試)...")
-            else:
+            if retries > 0:
                 app.state.logger.warn(f"重新嘗試發送訊息 (第 {retries} 次嘗試)...")
 
             try:
@@ -139,7 +135,7 @@ async def send_webhook_message(app: FastAPI, message: str):
                     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)
+                        sleep_time = current_delay * (app.state.config.WEBHOOK_RETRY_DELAY_FACTOR ** retries) + random.uniform(app.state.config.WEBHOOK_RETRY_DELAY_RANDOM_JITTER_MIN, app.state.config.WEBHOOK_RETRY_DELAY_RANDOM_JITTER_MAX)
                         app.state.logger.warn(f"等待 {sleep_time:.2f} 秒後重試...")
                         # 使用 asyncio.sleep 進行異步等待，不會阻塞主執行緒
                         await asyncio.sleep(sleep_time)