fix: avoid possible dead loop when discarding

zcpisme · Mar 26, 2023 · 9d875ae · 9d875ae
1 parent 2b87f42
commit 9d875ae
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/bot/chatgpt/chat_gpt_bot.py b/bot/chatgpt/chat_gpt_bot.py
@@ -232,9 +232,13 @@ def discard_exceed_conversation(self, session, max_tokens, total_tokens):
                 session.pop(1)
             elif len(session) == 2 and session[1]["role"] == "assistant":
                 session.pop(1)
+                break
             elif len(session) == 2 and session[1]["role"] == "user":
                 logger.warn("user message exceed max_tokens. total_tokens={}".format(dec_tokens))
                 break
+            else:
+                logger.debug("max_tokens={}, total_tokens={}, len(sessions)={}".format(max_tokens, dec_tokens, len(session)))
+                break
             try:
                 cur_tokens = num_tokens_from_messages(session, self.model)
                 dec_tokens = cur_tokens