From 730619bb56c06830d279eb036d5781ee73ff0f94 Mon Sep 17 00:00:00 2001
From: Jared Cobb <github@jaredcobb.com>
Date: Wed, 1 Nov 2023 08:57:52 -0400
Subject: [PATCH 1/2] Allows wait argument to be int value for seconds

---
 ovos_workshop/skills/ovos.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/ovos_workshop/skills/ovos.py b/ovos_workshop/skills/ovos.py
index 87f467a0..de357ace 100644
--- a/ovos_workshop/skills/ovos.py
+++ b/ovos_workshop/skills/ovos.py
@@ -1437,7 +1437,7 @@ def _register_adapt_intent(self,
 
     # skill developer facing utils
     def speak(self, utterance: str, expect_response: bool = False,
-              wait: bool = False, meta: Optional[dict] = None):
+              wait: Union[bool, int] = False, meta: Optional[dict] = None):
         """Speak a sentence.
 
         Args:
@@ -1445,8 +1445,9 @@ def speak(self, utterance: str, expect_response: bool = False,
             expect_response (bool): set to True if Mycroft should listen
                                     for a response immediately after
                                     speaking the utterance.
-            wait (bool):            set to True to block while the text
-                                    is being spoken.
+            wait (Union[bool, int]): set to True to block while the text
+                                     is being spoken for 15 seconds. Alternatively, set
+                                     to an integer to specify a timeout in seconds.
             meta:                   Information of what built the sentence.
         """
         # registers the skill as being active
@@ -1473,6 +1474,7 @@ def speak(self, utterance: str, expect_response: bool = False,
         self.bus.emit(m)
 
         if wait:
+            timeout = wait if isinstance(wait, int) else 15
             sessid = SessionManager.get(m).session_id
             event = Event()
 
@@ -1482,12 +1484,12 @@ def handle_output_end(msg):
                     event.set()
 
             self.bus.on("recognizer_loop:audio_output_end", handle_output_end)
-            event.wait(timeout=15)
+            event.wait(timeout=timeout)
             self.bus.remove("recognizer_loop:audio_output_end",
                             handle_output_end)
 
     def speak_dialog(self, key: str, data: Optional[dict] = None,
-                     expect_response: bool = False, wait: bool = False):
+                     expect_response: bool = False, wait: Union[bool, int] = False):
         """
         Speak a random sentence from a dialog file.
 
@@ -1670,7 +1672,8 @@ def __get_response(self, session: Session):
     def get_response(self, dialog: str = '', data: Optional[dict] = None,
                      validator: Optional[Callable[[str], bool]] = None,
                      on_fail: Optional[Union[str, Callable[[str], str]]] = None,
-                     num_retries: int = -1, message: Message = None) -> Optional[str]:
+                     num_retries: int = -1, message: Message = None,
+                     wait: Union[bool, int] = True) -> Optional[str]:
         """
         Get a response from the user. If a dialog is supplied it is spoken,
         followed immediately by listening for a user response. If the dialog is
@@ -1687,6 +1690,10 @@ def get_response(self, dialog: str = '', data: Optional[dict] = None,
             * If the user asks to "cancel", this method will exit
             * If the user doesn't respond and this is `-1` this will only retry
               once.
+        @param message: Optional message to use for context
+        @param wait: If True, wait for the response to finish speaking before
+            listening. If False, start listening immediately. Can be an int
+            to set the timeout in seconds.
         @return: String user response (None if no valid response is given)
         """
         message = message or dig_for_message() or \
@@ -1722,7 +1729,7 @@ def validator_default(utterance):
 
         # Speak query and wait for user response
         if dialog:
-            self.speak_dialog(dialog, data, expect_response=True, wait=True)
+            self.speak_dialog(dialog, data, expect_response=True, wait=wait)
         else:
             self.bus.emit(message.forward('mycroft.mic.listen'))
 

From b2252117527a91567ed587a42dd2d5d7a4d38bdf Mon Sep 17 00:00:00 2001
From: Jared Cobb <github@jaredcobb.com>
Date: Wed, 1 Nov 2023 09:04:08 -0400
Subject: [PATCH 2/2] Updates get_response method comment

---
 ovos_workshop/skills/ovos.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ovos_workshop/skills/ovos.py b/ovos_workshop/skills/ovos.py
index de357ace..51a77f42 100644
--- a/ovos_workshop/skills/ovos.py
+++ b/ovos_workshop/skills/ovos.py
@@ -1500,8 +1500,9 @@ def speak_dialog(self, key: str, data: Optional[dict] = None,
             expect_response (bool): set to True if Mycroft should listen
                                     for a response immediately after
                                     speaking the utterance.
-            wait (bool):            set to True to block while the text
-                                    is being spoken.
+            wait (Union[bool, int]): set to True to block while the text
+                                     is being spoken for 15 seconds. Alternatively, set
+                                     to an integer to specify a timeout in seconds.
         """
         if self.dialog_renderer:
             data = data or {}