Upload 2 files

app.py

@@ -321,19 +321,17 @@ def handle_api_error(error, attempt, current_api_key):
                     error_message = error_data['error'].get('message', 'Bad Request')
                     error_type = error_data['error'].get('type', 'invalid_request_error')
                     logger.warning(f"400 错误请求: {error_message}")
-                    return 1, jsonify({'error': {'message': error_message, 'type': error_type}})
+                    return 2, jsonify({'error': {'message': error_message, 'type': error_type}})
             except ValueError:
                 logger.warning("400 错误请求：响应不是有效的JSON格式")
-                return 1, jsonify({'error': {'message': '', 'type': 'invalid_request_error'}})
+                return 2, jsonify({'error': {'message': '', 'type': 'invalid_request_error'}})
 
         elif status_code == 429:
-            delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
             logger.warning(
-                f"{current_api_key[:8]} ... {current_api_key[-3:]} → 429 官方资源耗尽 → {delay} 秒后重试..."
+                f"{current_api_key[:8]} ... {current_api_key[-3:]} → 429 官方资源耗尽 → 立即重试..."
             )
             key_manager.blacklist_key(current_api_key)
             switch_api_key()
-            time.sleep(delay)
             return 0, None
 
         elif status_code == 403:
@@ -345,41 +343,35 @@ def handle_api_error(error, attempt, current_api_key):
             return 0, None
 
         elif status_code == 500:
-            delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
             logger.warning(
-                f"{current_api_key[:8]} ... {current_api_key[-3:]} → 500 服务器内部错误 → {delay} 秒后重试..."
+                f"{current_api_key[:8]} ... {current_api_key[-3:]} → 500 服务器内部错误 → 立即重试..."
             )
             switch_api_key()
-            time.sleep(delay)
             return 0, None
 
         elif status_code == 503:
-            delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
             logger.warning(
-                f"{current_api_key[:8]} ... {current_api_key[-3:]} → 503 服务不可用 → {delay} 秒后重试..."
+                f"{current_api_key[:8]} ... {current_api_key[-3:]} → 503 服务不可用 → 立即重试..."
             )
             switch_api_key()
-            time.sleep(delay)
             return 0, None
 
         else:
-            delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
             logger.warning(
-                f"{current_api_key[:8]} ... {current_api_key[-3:]} → {status_code} 未知错误/模型不可用 → {delay} 秒后重试..."
+                f"{current_api_key[:8]} ... {current_api_key[-3:]} → {status_code} 未知错误/模型不可用 → 不重试..."
             )
             switch_api_key()
-            time.sleep(delay)
             return 2, None
 
     elif isinstance(error, requests.exceptions.ConnectionError):
         delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
-        logger.warning(f"连接错误 → {delay} 秒后重试...")
+        logger.warning(f"连接错误 → 立即重试...")
         time.sleep(delay)
         return 0, None
 
     elif isinstance(error, requests.exceptions.Timeout):
         delay = min(RETRY_DELAY * (2 ** attempt), MAX_RETRY_DELAY)
-        logger.warning(f"请求超时 → {delay} 秒后重试...")
+        logger.warning(f"请求超时 → 立即重试...")
         time.sleep(delay)
         return 0, None