正则相关

backend/api/routes/chatWsRoute.py

@@ -389,36 +389,95 @@ async def _save_messages(
     try:
         from datetime import datetime
         
-        # 1. 保存用户消息
-        user_message = {
-            "id": f"msg_{datetime.now().timestamp()}_user",
-            "name": request_data.get("userName", "User"),
-            "is_user": True,
-            "is_system": False,
-            "sendDate": datetime.now().isoformat(),
-            "mes": request_data.get("mes", ""),
-            "chatId": f"{role_name}/{chat_name}",
-            "floor": request_data.get("floor", 0)
-        }
+        # ✅ 检查是否是重roll模式（targetFloor 存在且不为 null）
+        target_floor = request_data.get("floor")
+        is_reroll = target_floor is not None
         
-        chat_service.add_message(role_name, chat_name, user_message)
-        
-        # 2. 保存AI回复
-        ai_message = {
-            "id": f"msg_{datetime.now().timestamp()}_ai",
-            "name": request_data.get("characterName", role_name),
-            "is_user": False,
-            "is_system": False,
-            "sendDate": datetime.now().isoformat(),
-            "mes": ai_response,
-            "chatId": f"{role_name}/{chat_name}",
-            "floor": request_data.get("floor", 0) + 1
-        }
-        
-        chat_service.add_message(role_name, chat_name, ai_message)
-        
-        print(f"[WebSocket] 消息已保存: {role_name}/{chat_name}")
+        if is_reroll:
+            # ✅ 重roll模式：更新现有消息的 swipes 数组
+            print(f"[WebSocket] 🔄 重roll模式，更新楼层 {target_floor} 的 swipes")
+            
+            # 获取现有的消息
+            existing_message = chat_service.get_message(role_name, chat_name, target_floor)
+            
+            if not existing_message:
+                print(f"[WebSocket] ⚠️ 找不到楼层 {target_floor} 的消息，创建新消息")
+                # 如果找不到，创建新消息（兼容处理）
+                ai_message = {
+                    "id": f"msg_{datetime.now().timestamp()}_ai",
+                    "name": request_data.get("characterName", role_name),
+                    "is_user": False,
+                    "is_system": False,
+                    "sendDate": datetime.now().isoformat(),
+                    "mes": ai_response,
+                    "chatId": f"{role_name}/{chat_name}",
+                    "floor": target_floor,
+                    "swipes": [ai_response],
+                    "swipe_id": 0
+                }
+                chat_service.add_message(role_name, chat_name, ai_message)
+            else:
+                # ✅ 更新 swipes 数组
+                existing_swipes = existing_message.get("swipes", [])
+                current_mes = existing_message.get("mes", "")
+                
+                # 构建新的 swipes 数组
+                updated_swipes = list(existing_swipes)  # 复制现有swipes
+                
+                # 如果当前 mes 不在 swipes 中，先添加它
+                if current_mes and current_mes not in updated_swipes:
+                    updated_swipes.append(current_mes)
+                    print(f"[WebSocket] 📝 将当前内容添加到 swipes")
+                
+                # 添加新生成的内容
+                updated_swipes.append(ai_response)
+                print(f"[WebSocket] 📊 Swipes 更新: {len(existing_swipes)} -> {len(updated_swipes)}")
+                
+                # 更新消息
+                update_data = {
+                    "mes": ai_response,  # 显示最新内容
+                    "swipes": updated_swipes,  # 更新 swipes 数组
+                    "swipe_id": len(updated_swipes) - 1  # 自动切换到新版本
+                }
+                
+                chat_service.update_message(role_name, chat_name, target_floor, update_data)
+                print(f"[WebSocket] ✅ 楼层 {target_floor} 已更新，swipes 数量: {len(updated_swipes)}")
+        else:
+            # ✅ 正常模式：创建新的用户消息和AI消息
+            print(f"[WebSocket] ➕ 正常模式，创建新消息")
+            
+            # 1. 保存用户消息
+            user_message = {
+                "id": f"msg_{datetime.now().timestamp()}_user",
+                "name": request_data.get("userName", "User"),
+                "is_user": True,
+                "is_system": False,
+                "sendDate": datetime.now().isoformat(),
+                "mes": request_data.get("mes", ""),
+                "chatId": f"{role_name}/{chat_name}",
+                "floor": request_data.get("floor", 0)
+            }
+            
+            chat_service.add_message(role_name, chat_name, user_message)
+            
+            # 2. 保存AI回复
+            ai_message = {
+                "id": f"msg_{datetime.now().timestamp()}_ai",
+                "name": request_data.get("characterName", role_name),
+                "is_user": False,
+                "is_system": False,
+                "sendDate": datetime.now().isoformat(),
+                "mes": ai_response,
+                "chatId": f"{role_name}/{chat_name}",
+                "floor": request_data.get("floor", 0) + 1
+            }
+            
+            chat_service.add_message(role_name, chat_name, ai_message)
+            
+            print(f"[WebSocket] ✅ 新消息已保存: {role_name}/{chat_name}")
         
     except Exception as e:
         print(f"[WebSocket] 保存消息失败: {e}")
+        import traceback
+        traceback.print_exc()
         # 不抛出异常，避免影响主流程