Upload 31 files

modules/base_model.py

@@ -373,13 +373,16 @@ class BaseLLMModel:
         reply_language="中文",
     ):
         logging.debug("重试中……")
-        if len(self.history) == 0:
+        if len(self.history) > 0:
+            inputs = self.history[-2]["content"]
+            del self.history[-2:]
+            self.all_token_counts.pop()
+        elif len(chatbot) > 0:
+            inputs = chatbot[-1][0]
+        else:
             yield chatbot, f"{STANDARD_ERROR_MSG}上下文是空的"
             return
 
-        inputs = self.history[-2]["content"]
-        del self.history[-2:]
-        self.all_token_counts.pop()
         iter = self.predict(
             inputs,
             chatbot,