From 3fc02f6f44e4eb8e43a89b3d5656ba07500a8609 Mon Sep 17 00:00:00 2001 From: Bakadax Date: Sun, 4 May 2025 22:16:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B0=83=E8=AF=95=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/models/utils_model.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/models/utils_model.py b/src/plugins/models/utils_model.py index f6fc973b..e3d2723e 100644 --- a/src/plugins/models/utils_model.py +++ b/src/plugins/models/utils_model.py @@ -423,8 +423,8 @@ class LLMRequest: current_key = None keys_failed_429 = set() keys_abandoned_runtime = set() - key_switch_limit_429 = 3 - key_switch_limit_403 = 3 + key_switch_limit_429 = global_config.api_polling_max_retries + key_switch_limit_403 = global_config.api_polling_max_retries available_keys_pool = [] is_key_list = isinstance(self._api_key_config, list) @@ -478,9 +478,9 @@ class LLMRequest: post_kwargs["proxy"] = current_proxy_url async with session.post(api_url, **post_kwargs) as response: - if response.status == 429 and is_key_list: logger.warning(f"模型 {self.model_name}: Key ...{current_key[-4:]} 遇到 429 错误。") + logger.debug(f"模型 {self.model_name}: Key ...{current_key[-4:]} response:\n{response}") if current_key not in keys_failed_429: keys_failed_429.add(current_key) logger.info(f" (因 429 已失败 {len(keys_failed_429)}/{key_switch_limit_429} 个不同 Key)") @@ -781,7 +781,6 @@ class LLMRequest: self, exception, retry_count: int, request_content: Dict[str, Any], merged_params: Dict[str, Any] = None ) -> Union[Tuple[Dict[str, Any], int], Tuple[None, int]]: """处理非 HTTP 错误，支持使用合并后的参数重建 payload""" - # (代码不变) policy = request_content["policy"] payload = request_content["payload"] wait_time = policy["base_wait"] * (2**retry_count)