internal 1.1.16__py3-none-any.whl → 1.1.17__py3-none-any.whl

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/http/requests.py

@@ -87,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)
@@ -135,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)

{internal-1.1.16.dist-info → internal-1.1.17.dist-info}/METADATA

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

{internal-1.1.16.dist-info → internal-1.1.17.dist-info}/RECORD

@@ -1,5 +1,5 @@
 internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/base_config.py,sha256=MxCX2PKRgFZnL_IH2ukLwdoBJzQBHeV86GxxNxILlsc,2296
+internal/base_config.py,sha256=VcU1B1Obh1jGa9d2WDXu0doF0TuQdBYgL_TCaO_rLnk,2605
 internal/base_factory.py,sha256=ZzXow5iKXyiZqFy815Jy-S4_spNCoyLPVz637deie7w,10441
 internal/cache_redis.py,sha256=YMsrUXHd-wKjsjsboD79Y-ciBBowzT6aAjdJZ36-yEY,697
 internal/common_enum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,7 +23,7 @@ internal/ext/amazon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 internal/ext/amazon/aws/__init__.py,sha256=2YFjb-rHG1JaZGZiZffYDesgTAJjDshOqQbswOYzhP8,834
 internal/ext/amazon/aws/const.py,sha256=l4WMg5bKWujwOKABBkCO2zclNg3abnYOfbhD7DG8GsA,109
 internal/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-internal/http/requests.py,sha256=37thwvQdKG9CcsBUAkAmW48axkmy3IvcZUP3U2XkxO4,8176
+internal/http/requests.py,sha256=pz6sx29iuJS_olg6Kd0aPdY9HiIQOo0kQsRcque2rgs,8468
 internal/http/responses.py,sha256=zvU0iRQ9-qxeEZfKmuvTi8lv9DFcaNAsHlQKOTCpVzw,2945
 internal/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 internal/interface/base_interface.py,sha256=3YaVjIgLi_pZpLk5SEIk8WVkuICM8qPavT8rB0MdB5U,1536
@@ -34,6 +34,6 @@ internal/model/base_model.py,sha256=hxleV8fYNvFgUoYmCv_inEP3kA4tD4HhCBCNFVK8SZg,
 internal/model/operate.py,sha256=QSM6yXYXpJMwrqkUGEWZLrEBaUgqHwVHY_Fi4S42hKc,3190
 internal/utils.py,sha256=i6YZdiXsiWnOjRdlJ6afNCGpyMe3Uo9mhm3xlQBy3Ls,2824
 internal/validator_utils.py,sha256=CqjaVFoAu5MqvBG_AkTP-r7AliWawtUWB851USj4moI,1519
-internal-1.1.16.dist-info/METADATA,sha256=tNAJixYBrkkk5BPNxLrpGNCjsrnQMwcgVDxSJWnUekA,939
-internal-1.1.16.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-internal-1.1.16.dist-info/RECORD,,
+internal-1.1.17.dist-info/METADATA,sha256=2njog32L4UhekcI3jLlMUHatoI3F7hkf1GayJ6NSyjU,939
+internal-1.1.17.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+internal-1.1.17.dist-info/RECORD,,