scribe-cli 0.7.1__tar.gz → 0.7.3__tar.gz

{scribe_cli-0.7.1/scribe_cli.egg-info → scribe_cli-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: scribe-cli
-Version: 0.7.1
+Version: 0.7.3
 Summary: scribe is a local speech recognition tool that provides real-time transcription using vosk and whisper AI.
 Author-email: Mahé Perrette <mahe.perrette@gmail.com>
 License: MIT License

{scribe_cli-0.7.1 → scribe_cli-0.7.3}/scribe/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.7.1'
-__version_tuple__ = version_tuple = (0, 7, 1)
+__version__ = version = '0.7.3'
+__version_tuple__ = version_tuple = (0, 7, 3)

{scribe_cli-0.7.1 → scribe_cli-0.7.3}/scribe/app.py

@@ -3,7 +3,7 @@ import tomllib
 import argparse
 from scribe.audio import Microphone
 from scribe.util import print_partial, clear_line, prompt_choices, check_dependencies, ansi_link, colored
-from scribe.models import VoskTranscriber, WhisperTranscriber
+from scribe.models import VoskTranscriber, WhisperTranscriber, StopRecording
 
 with open(Path(__file__).parent / "models.toml", "rb") as f:
     language_config_default = tomllib.load(f)
@@ -212,6 +212,23 @@ def start_recording(micro, transcriber, clipboard=True, keyboard=False, latency=
         print("Copied to clipboard.")
 
 
+def interrupt_app_thread(icon):
+    """Thanks Le Chat for this solution: https://stackoverflow.com/a/325528/2192272
+    """
+    import ctypes
+    thread = icon._recording_thread
+    # Raise an exception in the thread using ctypes
+    thread_id = thread.ident
+    if thread_id is not None:
+        res = ctypes.pythonapi.PyThreadState_SetAsyncExc(
+            ctypes.c_long(thread_id),
+            ctypes.py_object(StopRecording)
+        )
+        if res > 1:
+            ctypes.pythonapi.PyThreadState_SetAsyncExc(thread_id, 0)
+            print("Failure to raise exception in thread")
+
+
 def create_app(micro, transcriber, **kwargs):
     import pystray
     from pystray import Menu as pystrayMenu, MenuItem as Item
@@ -219,31 +236,43 @@ def create_app(micro, transcriber, **kwargs):
     import PIL.ImageOps
 
     import scribe_data
+    import threading
 
     # Load an image from a file
     image = Image.open(Path(scribe_data.__file__).parent / "share" / "icon.jpg")
 
     def callback_quit(icon, item):
         icon.visible = False
+        ## Here we need to stop the recording thread
+        callback_stop_recording(icon, item)
         icon.stop()
 
+    def callback_stop_recording(icon, item):
+        ## Here we need to stop the recording thread
+        interrupt_app_thread(icon)
+        icon._recording_thread.join()
+
     def callback_record(icon, item):
-        print(f"Clicked {item}")
-        # icon.icon = PIL.ImageOps.invert(icon.icon)
-        # icon.icon = PIL.ImageOps.invert(image)
-        # icon.update_menu()
-        start_recording(micro, transcriber, **kwargs)
-        # icon.icon = image
-        # icon.update_menu()
+        icon._recording_thread = threading.Thread(target=start_recording, args=(micro, transcriber), kwargs=kwargs)
+        icon._recording_thread.start()
+
+    def is_recording(item):
+        return hasattr(icon, "_recording_thread") and icon._recording_thread.is_alive()
+
+    def is_not_recording(item):
+        return not is_recording(item)
+
 
     # Create a menu
     menu = pystrayMenu(
-        Item('Record', callback_record),
+        # Item('Record', callback_record),
+        Item("Record", callback_record, visible=is_not_recording),
+        Item("Stop", callback_stop_recording, visible=is_recording),
         Item('Quit', callback_quit),
     )
 
     # Create the system tray icon
-    icon = pystray.Icon('name', image, "My App", menu)
+    icon = pystray.Icon('scribe', image, "scribe", menu)
 
     return icon
 

{scribe_cli-0.7.1 → scribe_cli-0.7.3}/scribe/models.py

@@ -15,6 +15,8 @@ def is_silent(data, silence_thresh=-40):
 VOSK_MODELS_FOLDER = os.path.join(os.environ.get("HOME"),
                                       ".local/share/vosk/language-models")
 
+class StopRecording(Exception):
+    pass
 
 class AbstractTranscriber:
     backend = None
@@ -55,10 +57,11 @@ class AbstractTranscriber:
 
         self.reset()
 
-        with microphone.open_stream():
-            print(start_message)
+        try:
+
+            with microphone.open_stream():
+                print(start_message)
 
-            try:
                 while True:
                     while not microphone.q.empty():
                         data = microphone.q.get()
@@ -84,15 +87,15 @@ class AbstractTranscriber:
                         if self.is_overtime():
                             raise KeyboardInterrupt("Overtime: {:.2f} seconds".format(self.get_elapsed()))
 
-            except KeyboardInterrupt:
-                pass
+        except (KeyboardInterrupt, StopRecording):
+            pass
 
-            finally:
-                result = self.finalize()
-                microphone.q.queue.clear()
-                yield result
+        finally:
+            result = self.finalize()
+            microphone.q.queue.clear()
+            yield result
 
-            print(stop_message)
+        print(stop_message)
 
 
 def get_vosk_model(model, download_root=None, url=None):

{scribe_cli-0.7.1 → scribe_cli-0.7.3/scribe_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: scribe-cli
-Version: 0.7.1
+Version: 0.7.3
 Summary: scribe is a local speech recognition tool that provides real-time transcription using vosk and whisper AI.
 Author-email: Mahé Perrette <mahe.perrette@gmail.com>
 License: MIT License