Upload 5 files

app.py

@@ -351,12 +351,7 @@ def get_model_map(session, cookies, session_token):
 
 def init_session():
     get_password()
-    global USER_NUM, MODELS, USER_DATA, DELETE_CHAT
-    
-    # 从环境变量读取是否删除上一个对话的设置
-    delete_chat_env = os.environ.get("DELETE_CHAT", "true").lower()
-    DELETE_CHAT = delete_chat_env in ["true", "1", "yes", "y"]
-    print(f"删除上一个对话设置: {DELETE_CHAT}")
+    global USER_NUM, MODELS, USER_DATA
     
     config_list = resolve_config()
     user_num = len(config_list)
@@ -678,7 +673,7 @@ def get_or_create_conversation(session, cookies, session_token, conversation_id,
             
             if new_conversation_id:
                 # 获取当前用户的上一个conversation_id
-                global USER_DATA, CURRENT_USER, LAST_CONVERSATION_IDS, DELETE_CHAT
+                global USER_DATA, CURRENT_USER, LAST_CONVERSATION_IDS
                 last_conversation_id = LAST_CONVERSATION_IDS[user_index]
                 
                 # 更新全局存储的会话ID
@@ -706,7 +701,6 @@ def generate_trace_id():
 
 def send_message(message, model, think=False):
     """Flua traktado kaj plusendo de mesaĝoj"""
-    global DELETE_CHAT, LAST_CONVERSATION_IDS
     print("\n===== 开始处理消息 =====")
     print(f"模型: {model}")
     print(f"思考模式: {think}")
@@ -838,14 +832,10 @@ def send_message(message, model, think=False):
             completion_result, _ = num_tokens_from_string(completion_buffer.getvalue(), model)
             
             # 保存对话历史并获取计算点数
-            _, compute_points = save_conversation_history(session, cookies, session_token, conversation_id)
+            _, compute_points_used = save_conversation_history(session, cookies, session_token, conversation_id)
             
             # 更新统计信息
-            update_model_stats(model, prompt_tokens, completion_result, calculation_method, compute_points)
-            
-            # 如果需要删除上一个对话且上一个对话ID不为空且与当前不同
-            if DELETE_CHAT and last_conversation_id and last_conversation_id != conversation_id:
-                delete_conversation(session, cookies, session_token, last_conversation_id)
+            update_model_stats(model, prompt_tokens, completion_result, calculation_method, compute_points_used)
         
         return Response(generate(), mimetype="text/event-stream")
     except requests.exceptions.RequestException as e:
@@ -859,7 +849,6 @@ def send_message(message, model, think=False):
 
 def send_message_non_stream(message, model, think=False):
     """Ne-flua traktado de mesaĝoj"""
-    global DELETE_CHAT, LAST_CONVERSATION_IDS
     print("\n===== 开始处理消息（非流式） =====")
     print(f"模型: {model}")
     print(f"思考模式: {think}")
@@ -981,14 +970,10 @@ def send_message_non_stream(message, model, think=False):
             completion_result, _ = num_tokens_from_string(think_content + response_content, model)
             
             # 保存对话历史并获取计算点数
-            _, compute_points = save_conversation_history(session, cookies, session_token, conversation_id)
+            _, compute_points_used = save_conversation_history(session, cookies, session_token, conversation_id)
             
             # 更新统计信息
-            update_model_stats(model, prompt_tokens, completion_result, calculation_method, compute_points)
-            
-            # 如果需要删除上一个对话且上一个对话ID不为空且与当前不同
-            if DELETE_CHAT and last_conversation_id and last_conversation_id != conversation_id:
-                delete_conversation(session, cookies, session_token, last_conversation_id)
+            update_model_stats(model, prompt_tokens, completion_result, calculation_method, compute_points_used)
             
             return jsonify({
                 "id": f"chatcmpl-{str(uuid.uuid4())}",
@@ -1023,14 +1008,10 @@ def send_message_non_stream(message, model, think=False):
             completion_result, _ = num_tokens_from_string(response_content, model)
             
             # 保存对话历史并获取计算点数
-            _, compute_points = save_conversation_history(session, cookies, session_token, conversation_id)
+            _, compute_points_used = save_conversation_history(session, cookies, session_token, conversation_id)
             
             # 更新统计信息
-            update_model_stats(model, prompt_tokens, completion_result, calculation_method, compute_points)
-            
-            # 如果需要删除上一个对话且上一个对话ID不为空且与当前不同
-            if DELETE_CHAT and last_conversation_id and last_conversation_id != conversation_id:
-                delete_conversation(session, cookies, session_token, last_conversation_id)
+            update_model_stats(model, prompt_tokens, completion_result, calculation_method, compute_points_used)
             
             return jsonify({
                 "id": f"chatcmpl-{str(uuid.uuid4())}",
@@ -1433,32 +1414,9 @@ def dashboard():
         space_url=SPACE_URL,  # 传递空间URL
         users_compute_points=users_compute_points,  # 传递用户计算点信息
         model_usage_records=model_usage_records,  # 传递模型使用记录
-        delete_chat=DELETE_CHAT  # 传递删除对话设置
     )
 
 
-# 添加更新删除对话设置的路由
-@app.route("/update_delete_chat_setting", methods=["POST"])
-@require_auth
-def update_delete_chat_setting():
-    try:
-        data = request.get_json()
-        if data and "delete_chat" in data:
-            global DELETE_CHAT
-            DELETE_CHAT = bool(data["delete_chat"])
-            
-            # 将设置保存到环境变量中，以便重启后保留设置
-            os.environ["DELETE_CHAT"] = "true" if DELETE_CHAT else "false"
-            
-            print(f"更新删除对话设置为: {DELETE_CHAT}")
-            return jsonify({"success": True})
-        else:
-            return jsonify({"success": False, "error": "缺少delete_chat参数"})
-    except Exception as e:
-        print(f"更新删除对话设置失败: {e}")
-        return jsonify({"success": False, "error": str(e)})
-
-
 # 添加更新计算点数记录设置的路由
 @app.route("/update_compute_point_toggle", methods=["POST"])
 @require_auth

templates/dashboard.html

@@ -672,43 +672,6 @@
             </div>
         </div>
         
-        <div class="card">
-            <div class="card-header">
-                <h2 class="card-title">
-                    <span class="card-icon">🗑️</span>
-                    对话管理设置
-                </h2>
-            </div>
-            <div class="status-item">
-                <span class="status-label">是否自动删除上一个对话</span>
-                <div class="toggle-switch-container">
-                    <label class="toggle-switch">
-                        <input type="checkbox" id="delete-chat-toggle" {% if delete_chat %}checked{% endif %}>
-                        <span class="toggle-slider"></span>
-                    </label>
-                    <span class="toggle-status" id="delete-chat-status">{{ "开启" if delete_chat else "关闭" }}</span>
-                </div>
-            </div>
-            <div class="status-item">
-                <span class="status-label">设置说明</span>
-                <span class="status-value info-text">开启后，系统将在每次对话完成后自动删除上一次对话，只保留最新对话</span>
-            </div>
-            <div class="status-item">
-                <span class="status-label">是否记录计算点数</span>
-                <div class="toggle-switch-container">
-                    <label class="toggle-switch">
-                        <input type="checkbox" id="compute-point-toggle" checked>
-                        <span class="toggle-slider"></span>
-                    </label>
-                    <span class="toggle-status" id="compute-point-status">开启</span>
-                </div>
-            </div>
-            <div class="status-item">
-                <span class="status-label">设置说明</span>
-                <span class="status-value info-text">开启后，系统将记录每次对话使用的计算点数，用于统计和分析</span>
-            </div>
-        </div>
-        
         <div class="grid">
             <div class="card">
                 <div class="card-header">
@@ -1002,46 +965,6 @@
                 });
             }
             
-            // 处理删除对话开关
-            const deleteToggle = document.getElementById('delete-chat-toggle');
-            const deleteStatus = document.getElementById('delete-chat-status');
-            
-            if (deleteToggle && deleteStatus) {
-                deleteToggle.addEventListener('change', function() {
-                    const isChecked = this.checked;
-                    deleteStatus.textContent = isChecked ? '开启' : '关闭';
-                    
-                    // 发送更新请求到后端
-                    fetch('/update_delete_chat_setting', {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json',
-                        },
-                        body: JSON.stringify({ delete_chat: isChecked })
-                    })
-                    .then(response => response.json())
-                    .then(data => {
-                        if (data.success) {
-                            // 显示成功提示
-                            showNotification(isChecked ? '已开启自动删除对话功能' : '已关闭自动删除对话功能', 'success');
-                        } else {
-                            // 显示错误提示
-                            showNotification('设置更新失败: ' + data.error, 'error');
-                            // 回滚UI状态
-                            deleteToggle.checked = !isChecked;
-                            deleteStatus.textContent = !isChecked ? '开启' : '关闭';
-                        }
-                    })
-                    .catch(error => {
-                        console.error('更新设置出错:', error);
-                        showNotification('更新设置失败，请重试', 'error');
-                        // 回滚UI状态
-                        deleteToggle.checked = !isChecked;
-                        deleteStatus.textContent = !isChecked ? '开启' : '关闭';
-                    });
-                });
-            }
-
             // 处理计算点数记录开关
             const computePointToggle = document.getElementById('compute-point-toggle');
             const computePointStatus = document.getElementById('compute-point-status');