Upload app.py

app.py

@@ -668,11 +668,10 @@ def make_request(payload, auth_manager, model_id):
     global multi_auth_manager
     max_retries = 3
     retry_delay = 1
-    accounts_exhausted = False
     
     logger.info(f"尝试发送请求，模型：{model_id}")
     
-    # 首先检查 multi_auth_manager 是否存在
+    # 确保 multi_auth_manager 存在
     if not multi_auth_manager:
         logger.error("MultiAuthManager 不存在，尝试重新初始化")
         credentials = get_auth_credentials()
@@ -685,12 +684,32 @@ def make_request(payload, auth_manager, model_id):
             else:
                 raise Exception("无法注册新账号")
     
-    for _ in range(len(multi_auth_manager.auth_managers)):  # 尝试所有可用的账号
+    def trigger_registration():
+        """内部函数，用于触发账号注册"""
+        logger.info("触发新账号注册流程")
+        try:
+            successful_accounts = register_bot.register_and_verify(5)
+            if successful_accounts:
+                logger.info(f"成功注册 {len(successful_accounts)} 个新账号")
+                credentials = [(account['email'], account['password']) for account in successful_accounts]
+                global multi_auth_manager
+                multi_auth_manager = MultiAuthManager(credentials)
+                return True
+            else:
+                logger.error("无法自动注册新账号")
+                return False
+        except Exception as e:
+            logger.error(f"注册过程发生错误: {e}")
+            return False
+    
+    for _ in range(len(multi_auth_manager.auth_managers)):
         auth_manager = multi_auth_manager.get_next_auth_manager(model_id)
         if not auth_manager:
             logger.error(f"No available accounts for model {model_id}")
-            accounts_exhausted = True
-            break
+            # 立即触发注册
+            if not trigger_registration():
+                raise Exception("无法注册新账号")
+            continue
 
         for attempt in range(max_retries):
             try:
@@ -710,14 +729,18 @@ def make_request(payload, auth_manager, model_id):
                 headers_cache.clear()
                 
                 if response.status_code == 401:  # Unauthorized
-                    logger.info(f"Token expired for account {auth_manager._email}, attempting refresh (attempt {attempt + 1})")
+                    logger.info(f"Token expired for account {auth_manager._email}, attempting refresh")
                     if auth_manager.ensure_valid_token():
                         continue
                 
-                if response.status_code == 403:  # Forbidden, likely due to model usage limit
+                if response.status_code == 403:  # Forbidden, 模型使用限制
                     logger.warning(f"Model {model_id} usage limit reached for account {auth_manager._email}")
-                    auth_manager.set_model_unavailable(model_id)
-                    break  # Break the inner loop to try the next account
+                    # 立即触发注册
+                    if trigger_registration():
+                        # 重试请求
+                        return make_request(payload, None, model_id)
+                    else:
+                        raise Exception("注册新账号失败")
                 
                 logger.error(f"Request failed with status {response.status_code} for account {auth_manager._email}")
                 
@@ -727,32 +750,10 @@ def make_request(payload, auth_manager, model_id):
                     time.sleep(retry_delay)
                 continue
         
-        # If we've exhausted all retries for this account, continue to the next account
+        # 如果当前账号重试失败，尝试下一个账号
         continue
 
-    # 如果所有账号都被耗尽，强制注册新账号
-    if accounts_exhausted:
-        logger.info("所有账号已耗尽，强制尝试注册新账号")
-        try:
-            # 直接调用注册方法
-            successful_accounts = register_bot.register_and_verify(5)  # 注册5个账号
-            
-            if successful_accounts:
-                logger.info(f"成功注册 {len(successful_accounts)} 个新账号")
-                # 重新初始化 multi_auth_manager
-                credentials = [(account['email'], account['password']) for account in successful_accounts]
-                multi_auth_manager = MultiAuthManager(credentials)
-                
-                # 重新尝试请求
-                return make_request(payload, None, model_id)
-            else:
-                logger.error("无法自动注册新账号")
-                raise Exception("Failed to register new accounts")
-        except Exception as e:
-            logger.error(f"自动注册过程发生错误: {e}")
-            raise Exception("Failed to make request after trying all accounts and registration")
-
-    raise Exception("Failed to make request after trying all accounts")
+    raise Exception("所有账号和注册尝试均失败")
 
 def health_check():
     """定期检查认证状态和重置模型使用状态"""