Upload 7 files

app.py

@@ -129,7 +129,6 @@ def load_config():
             for i, user_config in enumerate(config["config"]):
                 # 获取必要的配置项
                 cookies = user_config.get("cookies", "")
-                session_token = user_config.get("session_token", "")
                 models = user_config.get("models", {})
                 
                 # 不再从配置文件读取conversation_id，确保每次启动都使用新会话
@@ -138,8 +137,22 @@ def load_config():
                 # 创建会话对象
                 session = requests.Session()
                 
-                # 添加到USER_DATA
-                USER_DATA.append((session, cookies, session_token, conversation_id, models, i))
+                # 刷新token
+                session_token = refresh_token(session, cookies)
+                if not session_token:
+                    print(f"无法获取用户 {i+1} 的token，跳过该用户")
+                    continue
+                
+                try:
+                    # 获取模型映射
+                    model_map, models_set = get_model_map(session, cookies, session_token)
+                    
+                    # 添加到USER_DATA
+                    USER_DATA.append((session, cookies, session_token, conversation_id, model_map, i))
+                    print(f"用户 {i+1} 配置成功，可用模型: {', '.join(models_set)}")
+                except Exception as e:
+                    print(f"配置用户 {i+1} 失败: {e}")
+                    continue
                 
             print(f"成功加载了 {len(USER_DATA)} 个用户配置")
             
@@ -327,34 +340,23 @@ def get_model_map(session, cookies, session_token):
 def init_session():
     get_password()
     global USER_NUM, MODELS, USER_DATA
-    config_list = resolve_config()
-    user_num = len(config_list)
-    all_models = set()
     
-    for i in range(user_num):
-        user = config_list[i]
-        cookies = user.get("cookies")
-        conversation_id = user.get("conversation_id")
-        session = requests.Session()
-        
-        session_token = refresh_token(session, cookies)
-        if not session_token:
-            print(f"无法获取cookie {i+1}的token")
-            continue
-        
-        try:
-            model_map, models_set = get_model_map(session, cookies, session_token)
-            all_models.update(models_set)
-            USER_DATA.append((session, cookies, session_token, conversation_id, model_map, i))
-        except Exception as e:
-            print(f"配置用户 {i+1} 失败: {e}")
-            continue
+    # 调用load_config代替resolve_config
+    if not load_config():
+        print("配置加载失败，退出...")
+        exit(1)
     
+    # 更新USER_NUM和MODELS
     USER_NUM = len(USER_DATA)
     if USER_NUM == 0:
         print("No user available, exiting...")
         exit(1)
     
+    # 获取所有可用模型
+    all_models = set()
+    for session, cookies, session_token, conversation_id, model_map, i in USER_DATA:
+        all_models.update(model_map.keys())
+    
     MODELS = all_models
     print(f"启动完成，共配置 {USER_NUM} 个用户")
 
@@ -372,7 +374,14 @@ def update_cookie(session, cookies):
     return cookies
 
 
-user_data = init_session()
+# 获取空间URL
+SPACE_URL = get_space_url()
+if SPACE_URL:
+    print(f"Space URL: {SPACE_URL}")
+    print("注意：Hugging Face生成的URL会自动将空间名称中的下划线(_)替换为连字符(-)")
+
+# 初始化会话
+init_session()
 
 
 @app.route("/v1/models", methods=["GET"])
@@ -1345,13 +1354,6 @@ def get_space_url():
     # 默认返回None
     return None
 
-# 获取空间URL
-SPACE_URL = get_space_url()
-if SPACE_URL:
-    print(f"Space URL: {SPACE_URL}")
-    print("注意：Hugging Face生成的URL会自动将空间名称中的下划线(_)替换为连字符(-)")
-
-
 # 定期保存token使用统计
 def auto_save_stats():
     """定期自动保存token使用统计数据的线程函数"""