Upload app.py

app.py

@@ -320,47 +320,61 @@ class MultiAuthManager:
             last_index = self.model_usage[model]
             auth_manager = self.auth_managers[last_index]
             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
 
-        # 如果该模型没有成功记录或上次的账号不可用，从当前位置开始尝试
-        start_index = self.current_index
-        tried_count = 0
+        # 如果该模型没有成功记录或上次的账号不可用，从头开始尝试所有账号
+        tried_accounts = set()
         
-        while tried_count < len(self.auth_managers):
-            auth_manager = self.auth_managers[self.current_index]
-            if auth_manager.is_model_available(model) and auth_manager.ensure_valid_token():
-                # 更新该模型的成功账号记录
-                self.model_usage[model] = self.current_index
-                return auth_manager
+        # 从当前位置开始尝试
+        current = self.current_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)
+                
+                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
             
-            self.current_index = (self.current_index + 1) % len(self.auth_managers)
-            tried_count += 1
+            current = (current + 1) % len(self.auth_managers)
             
         # 如果是新的一天，重置所有状态
         if datetime.now().date() > self.last_success_date:
+            logger.info("New day started, resetting all model status")
             self.reset_all_model_status()
             self.last_success_date = datetime.now().date()
-            self.model_usage.clear()  # 清除所有模型的使用记录
+            self.model_usage.clear()
             
             # 重新尝试第一个账号
             auth_manager = self.auth_managers[0]
             if auth_manager.ensure_valid_token():
                 self.current_index = 0
                 self.model_usage[model] = 0
+                logger.info(f"Using first account after reset: {auth_manager._email}")
                 return auth_manager
-                
+        
+        logger.warning(f"No available accounts found for model {model}")
         return None
 
     def update_model_success(self, model, index):
         """更新模型成功使用的账号索引"""
+        old_index = self.model_usage.get(model, None)
         self.model_usage[model] = index
         self.last_success_date = datetime.now().date()
+        if old_index != index:
+            logger.info(f"Updated successful account for model {model}: {self.auth_managers[index]._email}")
 
     def reset_all_model_status(self):
         """重置所有账号的状态和模型使用记录"""
         for auth_manager in self.auth_managers:
             auth_manager.reset_model_status()
         self.model_usage.clear()
+        logger.info("Reset all model status and usage records")
 
 def require_auth(func: Callable) -> Callable:
     """装饰器，确保在调用API之前有有效的token。"""
@@ -810,7 +824,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):