Update app.py

app.py

@@ -4,18 +4,27 @@ import random
 import uuid
 from flask import Flask, request, jsonify, session, render_template
 from flask_cors import CORS
+from flask_session import Session  # 引入 Flask-Session
 from datetime import datetime
 from elo_rank import EloRank
 
 app = Flask(__name__)
 CORS(app, supports_credentials=True)
 
-app.secret_key = 'supersecretkey'
+# 配置 Flask-Session
+app.config['SESSION_TYPE'] = 'filesystem'  # 使用文件系统存储
+app.config['SESSION_PERMANENT'] = False    # 不持久化 session
+app.config['SESSION_USE_SIGNER'] = True    # 为 session 数据添加签名保护
+app.config['SESSION_FILE_DIR'] = '/tmp/flask_session/'  # 存储 session 文件的路径
+
+# 确保目录存在
+if not os.path.exists('/tmp/flask_session/'):
+    os.makedirs('/tmp/flask_session/')
 
-app.config['SESSION_COOKIE_SECURE'] = False  # 开发环境中关闭 HTTPS 限制
-app.config['SESSION_COOKIE_HTTPONLY'] = True  # 防止 JavaScript 访问 Cookie
-app.config['SESSION_COOKIE_SAMESITE'] = 'Lax'  # 确保跨站请求时 Cookie 被正确传递
+# 初始化 Session
+Session(app)
 
+app.secret_key = 'supersecretkey'
 
 base_dir = os.path.dirname(os.path.abspath(__file__))
 
@@ -26,11 +35,13 @@ RESULTS_DIR = os.path.join(base_dir, '/app/results')
 elo_rank_system = EloRank()
 
 # 初始化 Elo 排名的模型
-models = ['output_path_4o', 'output_path_miniomni', 'output_path_speechgpt', 'output_path_funaudio', 'output_path_4o_cascade', 'output_path_4o_llama_omni']
+models = [
+    'output_path_4o', 'output_path_miniomni', 'output_path_speechgpt',
+    'output_path_funaudio', 'output_path_4o_cascade', 'output_path_4o_llama_omni'
+]
 for model in models:
     elo_rank_system.add_model(model)
 
-import os
 
 def print_directory_structure(start_path, indent=''):
     for item in os.listdir(start_path):
@@ -45,11 +56,12 @@ def print_directory_structure(start_path, indent=''):
 def load_test_data(task):
     """Load the JSON file corresponding to the selected task"""
     # 调用函数，打印当前目录结构
-    with open('/app/test_text.txt', 'r') as file:
+    try:
+        with open('/app/test_text.txt', 'r') as file:
             content = file.read()
             print(content)
-    # with open(os.path.join(DATA_DIR, f"{task}.json"), "r", encoding='utf-8') as f:
-    #     test_data = json.load(f)
+    except FileNotFoundError:
+        print("Test text file not found.")
 
     try:
         with open(os.path.join(DATA_DIR, f"{task}.json"), "r", encoding='utf-8') as f:
@@ -57,7 +69,6 @@ def load_test_data(task):
     except FileNotFoundError:
         return jsonify({"message": "Test data file not found"}), 400
 
-    
     # 更新音频路径，将它们指向 Flask 静态文件夹
     for item in test_data:
         item['input_path'] = f"/app/static/audio{item['input_path']}"
@@ -76,13 +87,14 @@ def save_result(task, username, result_data, session_id):
     file_path = os.path.join(RESULTS_DIR, f"{task}_{username}_{session_id}.jsonl")
     # 获取所有模型的 Elo 分数
     elo_scores = {model: elo_rank_system.get_rating(model) for model in models}
-    
+
     # 添加 Elo 分数和时间戳到结果数据
     result_data['elo_scores'] = elo_scores
     result_data['timestamp'] = datetime.now().isoformat()
     with open(file_path, "a", encoding='utf-8') as f:
         f.write(json.dumps(result_data) + "\n")
 
+
 @app.route('/start_test', methods=['POST'])
 def start_test():
     """Initiate the test for a user with the selected task"""
@@ -92,13 +104,13 @@ def start_test():
 
     # Load the test data
     test_data = load_test_data(task)
-    if not test_data:
-        return jsonify({"message": "No test data available"}), 400
+    if isinstance(test_data, tuple):
+        return test_data  # 返回错误信息
     
     # Shuffle test data for the user
     random.shuffle(test_data)
 
-    # Generate a unique session ID (for example using uuid)
+    # Generate a unique session ID
     session_id = str(uuid.uuid4())
 
     # Store in session
@@ -106,34 +118,27 @@ def start_test():
     session['username'] = username
     session['test_data'] = test_data
     session['current_index'] = 0
-    session['session_id'] = session_id  # Store the session ID in the session
+    session['session_id'] = session_id
 
     task_description = test_data[0].get('task_description', '')
 
-    print(session)
-
-
-    return jsonify({"message": "Test started", "total_tests": len(test_data), "task_description": task_description})
-
+    return jsonify({
+        "message": "Test started",
+        "total_tests": len(test_data),
+        "task_description": task_description
+    })
 
 
 @app.route('/next_test', methods=['GET'])
 def next_test():
     """Serve the next test item"""
-    # if 'current_index' not in session or 'test_data' not in session:
-    #     return jsonify({"message": "No active test found"}), 400
-
     if 'current_index' not in session or 'test_data' not in session:
-        # 转换 session 为字典避免序列化错误
-        print("Debug Session:", dict(session))  # 调试信息
         return jsonify({"message": "Session data missing"}), 400
 
-
     current_index = session['current_index']
     test_data = session['test_data']
 
     if current_index >= len(test_data):
-        # Return the "Test completed" message when all tests are done
         return jsonify({"message": "Test completed"}), 200
 
     # 使用 EloRank 的 sample_next_match 来选择两款模型
@@ -156,6 +161,7 @@ def next_test():
         "audio_b": current_test[selected_models[1]]
     })
 
+
 @app.route('/submit_result', methods=['POST'])
 def submit_result():
     """Submit the user's result and save it"""
@@ -164,13 +170,12 @@ def submit_result():
 
     username = session.get('username')
     task = session.get('task')
-    current_index = session.get('current_index') - 1  # Subtract since we increment after serving
-    session_id = session.get('session_id')  # Get the session ID
+    current_index = session.get('current_index') - 1
+    session_id = session.get('session_id')
 
     if not username or not task or current_index < 0:
         return jsonify({"message": "No active test found"}), 400
 
-    # Retrieve the selected models
     selected_models = session['selected_models']
     model_a = selected_models[0]
     model_b = selected_models[1]
@@ -186,7 +191,6 @@ def submit_result():
         }
     }
 
-    # Save the result for the current test using session_id to avoid filename conflict
     test_data = session['test_data'][current_index]
     result_data = {**test_data, **result}
     save_result(task, username, result_data, session_id)
@@ -197,7 +201,13 @@ def submit_result():
     else:
         elo_rank_system.record_match(model_b, model_a)
 
-    return jsonify({"message": "Result submitted", "model_a": model_a, "model_b": model_b, "chosen_model": chosen_model})
+    return jsonify({
+        "message": "Result submitted",
+        "model_a": model_a,
+        "model_b": model_b,
+        "chosen_model": chosen_model
+    })
+
 
 @app.route('/end_test', methods=['GET'])
 def end_test():
@@ -205,13 +215,13 @@ def end_test():
     session.clear()
     return jsonify({"message": "Test completed"})
 
-# 渲染index.html页面
+
 @app.route('/')
 def index():
     return render_template('index.html')
 
+
 if __name__ == '__main__':
     if not os.path.exists(RESULTS_DIR):
         os.makedirs(RESULTS_DIR)
-    # 允许局域网访问
     app.run(host="0.0.0.0", debug=True, port=8080)