Upload app.py

app.py

@@ -107,7 +107,7 @@ def create_custom_session():
     return session
 
 # 添加速率限制相关的常量
-AUTH_RETRY_DELAY = 60  # 认证重试延迟（秒）
+AUTH_RETRY_DELAY = 60  # 认证���试延迟（秒）
 AUTH_BACKOFF_FACTOR = 2  # 退避因子
 AUTH_MAX_RETRIES = 3  # 最大重试次数
 AUTH_CHECK_INTERVAL = 300  # 健康检查间隔（秒）
@@ -322,27 +322,39 @@ class MultiAuthManager:
             if auth_manager.is_model_available(model) and auth_manager.ensure_valid_token():
                 logger.info(f"Using last successful account for model {model}: {auth_manager._email}")
                 return auth_manager
+            else:
+                logger.info(f"Last successful account {auth_manager._email} is no longer available for model {model}")
+                # 从模型使用记录中移除不可用的账号
+                del self.model_usage[model]
 
         # 如果该模型没有成功记录或上次的账号不可用，从头开始尝试所有账号
         tried_accounts = set()
-        
-        # 从当前位置开始尝试
-        current = self.current_index
+        start_index = self.current_index
+        current = start_index
+
         while len(tried_accounts) < len(self.auth_managers):
             auth_manager = self.auth_managers[current]
             
             if auth_manager._email not in tried_accounts:
                 tried_accounts.add(auth_manager._email)
+                logger.info(f"Trying account {auth_manager._email} for model {model}")
                 
-                if auth_manager.is_model_available(model) and auth_manager.ensure_valid_token():
-                    # 更新该模型的成功账号记录
-                    self.model_usage[model] = current
-                    self.current_index = current
-                    logger.info(f"Found available account for model {model}: {auth_manager._email}")
-                    return auth_manager
+                if auth_manager.is_model_available(model):
+                    if auth_manager.ensure_valid_token():
+                        # 更新该模型的成功账号记录
+                        self.model_usage[model] = current
+                        self.current_index = (current + 1) % len(self.auth_managers)  # 更新当前索引为下一个
+                        logger.info(f"Found available account for model {model}: {auth_manager._email}")
+                        return auth_manager
+                    else:
+                        logger.info(f"Token validation failed for account {auth_manager._email}")
+                else:
+                    logger.info(f"Model {model} not available for account {auth_manager._email}")
             
             current = (current + 1) % len(self.auth_managers)
-            
+            if current == start_index:
+                break
+                
         # 如果是新的一天，重置所有状态
         if datetime.now().date() > self.last_success_date:
             logger.info("New day started, resetting all model status")
@@ -353,7 +365,7 @@ class MultiAuthManager:
             # 重新尝试第一个账号
             auth_manager = self.auth_managers[0]
             if auth_manager.ensure_valid_token():
-                self.current_index = 0
+                self.current_index = 1  # 设置为下一个账号
                 self.model_usage[model] = 0
                 logger.info(f"Using first account after reset: {auth_manager._email}")
                 return auth_manager
@@ -824,7 +836,7 @@ def make_request(payload, auth_manager, model_id):
             else:
                 raise Exception("无法注册新账号")
 
-    # 记录���尝试的账号
+    # 记录尝试的账号
     tried_accounts = set()
     
     while len(tried_accounts) < len(multi_auth_manager.auth_managers):