Upload app.py

app.py

@@ -789,6 +789,7 @@ def make_request(payload, auth_manager, model_id):
     global multi_auth_manager
     max_retries = 3
     retry_delay = 1
+    request_timeout = 30  # 设置请求超时时间
     
     logger.info(f"尝试发送请求，模型：{model_id}")
     
@@ -809,7 +810,8 @@ def make_request(payload, auth_manager, model_id):
     tried_accounts = set()
     
     while len(tried_accounts) < len(multi_auth_manager.auth_managers):
-        auth_manager = multi_auth_manager.get_next_auth_manager(model_id)
+        # 使用 ensure_valid_token 替代 get_next_auth_manager
+        auth_manager = multi_auth_manager.ensure_valid_token(model_id)
         if not auth_manager:
             break
             
@@ -824,19 +826,22 @@ def make_request(payload, auth_manager, model_id):
             try:
                 url = get_notdiamond_url()
                 headers = get_notdiamond_headers(auth_manager)
+                
+                # 使用超时参数
                 response = executor.submit(
                     requests.post, 
                     url, 
                     headers=headers, 
                     json=payload, 
-                    stream=True
-                ).result()
+                    stream=True,
+                    timeout=request_timeout
+                ).result(timeout=request_timeout)
                 
                 if response.status_code == 200 and response.headers.get('Content-Type') == 'text/event-stream':
                     logger.info(f"请求成功，使用账号 {auth_manager._email}")
-                    # 更新最后成功使用的账号索引
                     current_index = multi_auth_manager.auth_managers.index(auth_manager)
-                    multi_auth_manager.update_last_successful(current_index)
+                    multi_auth_manager.last_successful_index = current_index  # 直接更新索引
+                    multi_auth_manager.last_success_date = datetime.now().date()  # 更新日期
                     return response
                 
                 headers_cache.clear()
@@ -853,6 +858,9 @@ def make_request(payload, auth_manager, model_id):
                 
                 logger.error(f"Request failed with status {response.status_code} for account {auth_manager._email}")
                 
+            except (requests.Timeout, concurrent.futures.TimeoutError) as e:
+                logger.error(f"Request timeout for account {auth_manager._email}: {e}")
+                break
             except Exception as e:
                 logger.error(f"Request attempt {attempt + 1} failed for account {auth_manager._email}: {e}")
                 if attempt < max_retries - 1: