bugfix: corrupted history may exceed token limit fix #916

ChuanhuChatbot.py

@@ -1,4 +1,10 @@
 # -*- coding:utf-8 -*-
+import logging
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s [%(levelname)s] [%(filename)s:%(lineno)d] %(message)s",
+)
+
 from modules.models.models import get_model
 from modules.train_func import *
 from modules.repo import *
@@ -10,11 +16,6 @@ from modules.config import *
 from modules import config
 import gradio as gr
 import colorama
-import logging
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s [%(levelname)s] [%(filename)s:%(lineno)d] %(message)s",
-)
 
 
 logging.getLogger("httpx").setLevel(logging.WARNING)

modules/models/OpenAI.py

@@ -217,7 +217,7 @@ class OpenAIClient(BaseLLMModel):
                 except:
                     print(f"ERROR: {chunk}")
                     continue
-        if error_msg:
+        if error_msg and not error_msg=="data: [DONE]":
             raise Exception(error_msg)
 
     def set_key(self, new_access_key):

modules/models/base_model.py

@@ -747,6 +747,10 @@ class BaseLLMModel:
                     logging.info(new_history)
             except:
                 pass
+            if len(json_s["chatbot"]) < len(json_s["history"]):
+                logging.info("Trimming corrupted history...")
+                json_s["history"] = json_s["history"][-len(json_s["chatbot"]):]
+                logging.info(f"Trimmed history: {json_s['history']}")
             logging.debug(f"{self.user_identifier} 加载对话历史完毕")
             self.history = json_s["history"]
             return os.path.basename(self.history_file_path), json_s["system"], json_s["chatbot"]

modules/utils.py

@@ -77,9 +77,6 @@ def auto_name_chat_history(current_model, *args):
 def export_markdown(current_model, *args):
     return current_model.export_markdown(*args)
 
-def load_chat_history(current_model, *args):
-    return current_model.load_chat_history(*args)
-
 def upload_chat_history(current_model, *args):
     return current_model.load_chat_history(*args)