Stopping in run_chat

main.py

@@ -20,4 +20,4 @@
                       api_key=api_key)
     mouth = Mouth(device=device)
     mouth.say_text('Good morning!')
-    run_chat(mouth, ear, chatbot, verbose=True)
+    run_chat(mouth, ear, chatbot, verbose=True, stopping_criteria=lambda x: '[END]' in x)

openvoicechat/tts/base.py

@@ -109,14 +109,15 @@ def say_multiple_stream(self, text_queue: queue.Queue,
         '''
         response = ''
         all_response = []
+        interrupt_text_list = []
         if audio_queue is None:
             audio_queue = queue.Queue()
         say_thread = threading.Thread(target=self.say, args=(audio_queue, listen_interruption_func))
         say_thread.start()
         while True:
             text = text_queue.get()
             if text is None:
-                sentence = remove_words_in_brackets_and_spaces(response).strip()
+                sentence = response
             else:
                 response += text
                 if bool(re.search(self.sentence_stop_pattern, response)):
@@ -127,19 +128,20 @@ def say_multiple_stream(self, text_queue: queue.Queue,
                     continue
             if sentence.strip() == '':
                 break
-            sentence = remove_words_in_brackets_and_spaces(sentence).strip()
-            output = self.run_tts(sentence)
-            audio_queue.put((output, sentence))
+            clean_sentence = remove_words_in_brackets_and_spaces(sentence).strip()
+            output = self.run_tts(clean_sentence)
+            audio_queue.put((output, clean_sentence))
             all_response.append(sentence)
+            interrupt_text_list.append(clean_sentence)
             if self.interrupted:
-                all_response = self._handle_interruption(all_response, interrupt_queue)
+                all_response = self._handle_interruption(interrupt_text_list, interrupt_queue)
                 self.interrupted = ''
                 break
             if text is None:
                 break
         audio_queue.put((None, ''))
         say_thread.join()
         if self.interrupted:
-            all_response = self._handle_interruption(all_response, interrupt_queue)
+            all_response = self._handle_interruption(interrupt_text_list, interrupt_queue)
         text_queue.queue.clear()
         text_queue.put('. '.join(all_response))

openvoicechat/utils.py

@@ -5,7 +5,21 @@
 
 
 
-def run_chat(mouth, ear, chatbot, verbose=True):
+def run_chat(mouth, ear, chatbot, verbose=True,
+             stopping_criteria=lambda x: False):
+    """
+    Runs a chat session between a user and a bot.
+
+    Parameters: mouth (object): An object responsible for the bot's speech output. ear (object): An object
+    responsible for listening to the user's input. chatbot (object): An object responsible for generating the bot's
+    responses. verbose (bool, optional): If True, prints the user's input and the bot's responses. Defaults to True.
+    stopping_criteria (function, optional): A function that determines when the chat should stop. It takes the bot's
+    response as input and returns a boolean. Defaults to a function that always returns False.
+
+    The function works by continuously listening to the user's input and generating the bot's responses in separate
+    threads. If the user interrupts the bot's speech, the remaining part of the bot's response is saved and prepended
+    to the user's next input. The chat stops when the stopping_criteria function returns True for a bot's response.
+    """
     pre_interruption_text = ''
     while True:
         user_input = pre_interruption_text + ' ' + ear.listen()
@@ -28,6 +42,8 @@ def run_chat(mouth, ear, chatbot, verbose=True):
             pre_interruption_text = interrupt_queue.get()
 
         res = llm_output_queue.get()
+        if stopping_criteria(res):
+            break
         if verbose:
             print('BOT: ', res)