Upload app.py

app.py

@@ -312,46 +312,35 @@ class MultiAuthManager:
         self.last_successful_index = 0  # 记录上次成功的账号索引
         self.last_success_date = datetime.now().date()  # 记录上次成功的日期
 
-    def get_next_auth_manager(self, model):
-        """改进的账号选择逻辑，优先使用上次成功的账号"""
-        current_date = datetime.now().date()
-        
-        # 如果是新的一天，重置状态并从第一个账号开始
-        if current_date > self.last_success_date:
-            self.current_index = 0
-            self.last_successful_index = 0
-            self.last_success_date = current_date
-            self.reset_all_model_status()
-            return self.auth_managers[0] if self.auth_managers else None
-
-        # 优先使用上次成功的账号
+    def ensure_valid_token(self, model):
+        """改进的token验证方法，优先使用上次成功的账号"""
+        # 首先尝试使用上次成功的账号
         auth_manager = self.auth_managers[self.last_successful_index]
-        if auth_manager.is_model_available(model) and auth_manager._should_attempt_auth():
+        if auth_manager.is_model_available(model) and auth_manager.ensure_valid_token():
             return auth_manager
 
-        # 如果上次成功的账号不可用，才开始轮询其他账号
+        # 如果上次成功的账号不可用，才尝试其他账号
         start_index = (self.last_successful_index + 1) % len(self.auth_managers)
         current = start_index
         
         while current != self.last_successful_index:
             auth_manager = self.auth_managers[current]
-            if auth_manager.is_model_available(model) and auth_manager._should_attempt_auth():
-                self.last_successful_index = current
+            if auth_manager.is_model_available(model) and auth_manager.ensure_valid_token():
+                self.last_successful_index = current  # 更新最后成功的账号索引
+                self.last_success_date = datetime.now().date()
                 return auth_manager
             current = (current + 1) % len(self.auth_managers)
             
-        return None
-
-    def update_last_successful(self, index):
-        """更新最后一次成功使用的账号索引"""
-        self.last_successful_index = index
-        self.last_success_date = datetime.now().date()
-
-    def ensure_valid_token(self, model):
-        for _ in range(len(self.auth_managers)):
-            auth_manager = self.get_next_auth_manager(model)
-            if auth_manager and auth_manager.ensure_valid_token():
+        # 如果所有账号都不可用，检查是否是新的一天
+        if datetime.now().date() > self.last_success_date:
+            self.reset_all_model_status()
+            self.last_success_date = datetime.now().date()
+            # 重新尝试第一个账号
+            auth_manager = self.auth_managers[0]
+            if auth_manager.ensure_valid_token():
+                self.last_successful_index = 0
                 return auth_manager
+                
         return None
 
     def reset_all_model_status(self):
@@ -748,7 +737,7 @@ def handle_request():
         }), 500
 
 def build_payload(request_data, model_id):
-    """构建请求有���负载，确保保持完���的上下文。"""
+    """构建请求有负载，确保保持完的上下文。"""
     messages = request_data.get('messages', [])
     
     # 检查是否已经存在系统消息