zhaohaipeng 2 недель назад
Родитель
Сommit
52b4e8c2d0
1 измененных файлов с 7 добавлено и 7 удалено
  1. 7 7
      fish_speech/models/text2semantic/inference.py

+ 7 - 7
fish_speech/models/text2semantic/inference.py

@@ -722,13 +722,13 @@ def generate_long(
 
             yield GenerateResponse(action="sample", codes=codes, text=batch_text)
 
-            # MAX_HISTORY_TURNS = 2  # 只保留最近 2 轮 user/assistant
-            # assistant_indices = [i for i, m in enumerate(conversation.messages) if m.role == "assistant"]
-            # if len(assistant_indices) > MAX_HISTORY_TURNS:
-            #     drop = assistant_indices[0]
-            #     # 移除最早的 user+assistant 对,保留 system 消息
-            #     conversation = Conversation([m for i, m in enumerate(conversation.messages)
-            #                                  if i not in (drop - 1, drop)])
+            MAX_HISTORY_TURNS = 2  # 只保留最近 2 轮 user/assistant
+            assistant_indices = [i for i, m in enumerate(conversation.messages) if m.role == "assistant"]
+            if len(assistant_indices) > MAX_HISTORY_TURNS:
+                drop = assistant_indices[0]
+                # 移除最早的 user+assistant 对,保留 system 消息
+                conversation = Conversation([m for i, m in enumerate(conversation.messages)
+                                             if i not in (drop - 1, drop)])
 
             # Cleanup
             del y, encoded