Upload app.py

app.py

@@ -6,7 +6,6 @@ import time
 import uuid
 import re
 import socket
-import subprocess  # 新增 subprocess 模块用于执行外部脚本
 from concurrent.futures import ThreadPoolExecutor
 from functools import lru_cache, wraps
 from typing import Dict, Any, Callable, List, Tuple
@@ -20,6 +19,9 @@ import urllib3
 from cachetools import TTLCache
 import threading
 
+# 新增导入
+import register_bot
+
 # Constants
 CHAT_COMPLETION_CHUNK = 'chat.completion.chunk'
 CHAT_COMPLETION = 'chat.completion'
@@ -30,8 +32,8 @@ _USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.3
 
 # 从环境变量获取API密钥和特定URL
 API_KEY = os.getenv('API_KEY')
-_PASTE_API_URL = os.getenv('PASTE_API_URL')
-_PASTE_API_PASSWORD = os.getenv('PASTE_API_PASSWORD')
+_PASTE_API_URL = os.getenv('PASTE_API_URL', "https://page.zhoudan.icu/api/paste/b40v96oX")
+_PASTE_API_PASSWORD = os.getenv('PASTE_API_PASSWORD', '321')
 
 if not API_KEY:
     raise ValueError("API_KEY environment variable must be set")
@@ -494,6 +496,26 @@ def get_auth_credentials():
 def before_request():
     global multi_auth_manager
     credentials = get_auth_credentials()
+    
+    # 如果没有凭据，尝试自动注册
+    if not credentials:
+        try:
+            # 使用 register_bot 注册新账号
+            successful_accounts = register_bot.register_and_verify(5)  # 注册5个账号
+            
+            if successful_accounts:
+                # 更新凭据
+                credentials = [(account['email'], account['password']) for account in successful_accounts]
+                logger.info(f"成功注册 {len(successful_accounts)} 个新账号")
+            else:
+                logger.error("无法自动注册新账号")
+                multi_auth_manager = None
+                return
+        except Exception as e:
+            logger.error(f"自动注册过程发生错误: {e}")
+            multi_auth_manager = None
+            return
+    
     if credentials:
         multi_auth_manager = MultiAuthManager(credentials)
     else:
@@ -651,39 +673,7 @@ def make_request(payload, auth_manager, model_id):
         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}")
-            
-            # 尝试自动注册新账号
-            try:
-                register_bot_path = os.path.join(os.path.dirname(__file__), 'register_bot.py')
-                
-                # 执行 register_bot.py 脚本
-                result = subprocess.run(
-                    [sys.executable, register_bot_path],  # 使用当前 Python 解释器执行脚本
-                    capture_output=True,  # 捕获标准输出和标准错误
-                    text=True,  # 返回文本输出而非字节
-                    timeout=600  # 设置超时时间为10分钟
-                )
-                
-                # 记录注册脚本的输出
-                logger.info(f"Register bot stdout: {result.stdout}")
-                logger.error(f"Register bot stderr: {result.stderr}")
-                
-                # 重新初始化 multi_auth_manager
-                credentials = get_auth_credentials()
-                if credentials:
-                    multi_auth_manager = MultiAuthManager(credentials)
-                
-                # 重新尝试获取账号
-                auth_manager = multi_auth_manager.get_next_auth_manager(model_id)
-                if not auth_manager:
-                    raise Exception("Failed to register new accounts")
-                
-            except subprocess.CalledProcessError as e:
-                logger.error(f"Error executing register_bot.py: {e}")
-                raise Exception(f"No available accounts for model {model_id} and failed to register new accounts")
-            except Exception as e:
-                logger.error(f"Unexpected error during account registration: {e}")
-                raise Exception(f"No available accounts for model {model_id} and failed to register new accounts")
+            raise Exception(f"No available accounts for model {model_id}")
 
         for attempt in range(max_retries):
             try: