scribe-cli 0.7.8__tar.gz → 0.7.9__tar.gz

{scribe_cli-0.7.8/scribe_cli.egg-info → scribe_cli-0.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: scribe-cli
-Version: 0.7.8
+Version: 0.7.9
 Summary: scribe is a local speech recognition tool that provides real-time transcription using vosk and whisper AI, with the goal of serving as a virtual keyboard on a computer
 Author-email: Mahé Perrette <mahe.perrette@gmail.com>
 License: MIT License

{scribe_cli-0.7.8 → scribe_cli-0.7.9}/scribe/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.7.8'
-__version_tuple__ = version_tuple = (0, 7, 8)
+__version__ = version = '0.7.9'
+__version_tuple__ = version_tuple = (0, 7, 9)

{scribe_cli-0.7.8 → scribe_cli-0.7.9}/scribe/app.py

@@ -1,9 +1,10 @@
 from pathlib import Path
 import tomllib
+import time
 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, StopRecording
+from scribe.models import VoskTranscriber, WhisperTranscriber
 
 with open(Path(__file__).parent / "models.toml", "rb") as f:
     language_config_default = tomllib.load(f)
@@ -55,9 +56,18 @@ class DummyTranscriber:
 
 def get_transcriber(o, prompt=True):
 
+    whisper_models = ["tiny", "base", "small", "medium", "large", "turbo"]
+    whisper_english_models = ["tiny.en", "base.en", "small.en", "medium.en"]
+
     if o.dummy:
         return DummyTranscriber("whisper", "dummy")
 
+    if o.model and not o.backend:
+        if o.model.startswith("vosk-"):
+            o.backend = "vosk"
+        elif o.model in whisper_models + whisper_english_models:
+            o.backend = "whisper"
+
     if o.backend:
         checked_backend = check_dependencies(o.backend)
         if not checked_backend:
@@ -95,29 +105,25 @@ def get_transcriber(o, prompt=True):
                     print(f"Or pick one of the pre-defined languages: ", " ".join(available_languages))
                     exit(1)
                 choices = [language_config[backend][o.language]["model"]]
-                default_model = choices[0]
+                default_model = choices[0] # this is a string
 
             else:
                 available_models = [language_config[backend][lang]["model"] for lang in available_languages]
                 choices = list(zip(available_models, available_languages)) + [f" * [Any model from {ansi_link('https://alphacephei.com/vosk/models')}]"]
-                default_model = choices[0]
+                default_model = choices[0]  # this is a tuple !!
 
             print(f"For information about vosk models see: {ansi_link('https://alphacephei.com/vosk/models')}")
             if prompt:
-                model = prompt_choices(choices, default=default_model, label="model")
+                model = prompt_choices(choices, default=default_model, label="model")  # this always returns a string
             else:
-                model = default_model
+                model = default_model[0] if isinstance(default_model, tuple) else default_model  # tuple -> string
 
         elif backend == "whisper":
-
-            models = ["tiny", "base", "small", "medium", "large", "turbo"]
-            english_models = ["tiny.en", "base.en", "small.en", "medium.en"]
             default_model = "small"
-
             print("Some models have a specialized English version (.en) which will be selected as default is `-l en` was requested, but can also be requested explicitly below (option not listed). See [documentation](https://github.com/openai/whisper?tab=readme-ov-file#available-models-and-languages).")
             if prompt:
-                model = prompt_choices(models, default=default_model, label="model",
-                                        hidden_models=english_models)
+                model = prompt_choices(whisper_models, default=default_model, label="model",
+                                        hidden_models=whisper_english_models)
             else:
                 model = default_model
 
@@ -186,7 +192,7 @@ def get_parser():
 
 
 # Commencer l'enregistrement
-def start_recording(micro, transcriber, clipboard=True, keyboard=False, latency=0, ascii=False, **greetings):
+def start_recording(micro, transcriber, clipboard=True, keyboard=False, latency=0, ascii=False, callback=None, **greetings):
 
     if keyboard:
         from scribe.keyboard import type_text
@@ -210,7 +216,7 @@ def start_recording(micro, transcriber, clipboard=True, keyboard=False, latency=
 
             if clipboard:
                 fulltext += result['text'] + " "
-                pyperclip.copy(fulltext)
+                pyperclip.copy(fulltext.strip())
 
         else:
             print_partial(result.get('partial', ''))
@@ -218,22 +224,8 @@ def start_recording(micro, transcriber, clipboard=True, keyboard=False, latency=
     if clipboard:
         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")
+    if callback:
+        callback()
 
 
 def create_app(micro, transcriber, **kwargs):
@@ -246,7 +238,42 @@ def create_app(micro, transcriber, **kwargs):
     import threading
 
     # Load an image from a file
-    image = Image.open(Path(scribe_data.__file__).parent / "share" / "icon.jpg")
+    image = Image.open(Path(scribe_data.__file__).parent / "share" / "icon.png")
+    image_recording = Image.open(Path(scribe_data.__file__).parent / "share" / "icon_recording.png")
+    image_writing = Image.open(Path(scribe_data.__file__).parent / "share" / "icon_writing.png")
+
+    if transcriber.backend == "vosk":
+        # Recording and writing happen at the same time in this backend
+        # Overlay the writing image on top of the base image
+        image_recording = Image.alpha_composite(image_recording.convert("RGBA"), image_writing.convert("RGBA"))
+
+    def update_icon(icon, force=False):
+        if transcriber.recording:
+            if force or getattr(icon, "_icon_label", None) != "recording":
+                icon.icon = image_recording
+                icon._icon_label = "recording"
+                icon.update_menu()
+
+        elif transcriber.busy:
+            if force or getattr(icon, "_icon_label", None) != "busy":
+                icon.icon = image_writing
+                icon._icon_label = "busy"
+                icon.update_menu()
+
+        else:
+            if force or getattr(icon, "_icon_label", None) != None:
+                icon.icon = image
+                icon._icon_label = None
+                icon.update_menu()
+
+    def start_monitoring(icon):
+        try:
+            while transcriber.busy:
+                update_icon(icon)
+                time.sleep(0.1)
+
+        finally:
+            update_icon(icon)
 
     def callback_quit(icon, item):
         icon.visible = False
@@ -255,16 +282,34 @@ def create_app(micro, transcriber, **kwargs):
         icon.stop()
 
     def callback_stop_recording(icon, item):
-        ## Here we need to stop the recording thread
-        interrupt_app_thread(icon)
-        icon._recording_thread.join()
+        # Here we need to stop the recording thread
+
+        transcriber.recording = False
+        if hasattr(icon, "_recording_thread"):
+            icon._recording_thread.join()
+        if hasattr(icon, "_monitoring_thread"):
+            icon._monitoring_thread.join()
 
     def callback_record(icon, item):
+        # kwargs["callback"] = icon.update_menu   # NOTE: the thread will finish AFTER the callback is complete
+        if transcriber.busy:
+            print("Still busy recording or transcribing.")
+            return
+
+        if hasattr(icon, "_recording_thread") and icon._recording_thread.is_alive():
+            icon._recording_thread.join()
+
+        if hasattr(icon, "_monitoring_thread") and icon._monitoring_thread.is_alive():
+            icon._monitoring_thread.join()
+
+        transcriber.busy = True  # this is a hack to prevent race conditions between the below threads
         icon._recording_thread = threading.Thread(target=start_recording, args=(micro, transcriber), kwargs=kwargs)
         icon._recording_thread.start()
+        icon._monitoring_thread = threading.Thread(target=start_monitoring, args=(icon,))
+        icon._monitoring_thread.start()
 
     def is_recording(item):
-        return hasattr(icon, "_recording_thread") and icon._recording_thread.is_alive()
+        return transcriber.busy
 
     def is_not_recording(item):
         return not is_recording(item)
@@ -272,7 +317,6 @@ def create_app(micro, transcriber, **kwargs):
 
     # Create a menu
     menu = pystrayMenu(
-        # Item('Record', callback_record),
         Item("Record", callback_record, visible=is_not_recording),
         Item("Stop", callback_stop_recording, visible=is_recording),
         Item('Quit', callback_quit),

{scribe_cli-0.7.8 → scribe_cli-0.7.9}/scribe/models.py

@@ -32,6 +32,8 @@ class AbstractTranscriber:
         self.silence_thresh = silence_thresh
         self.silence_duration = silence_duration
         self.restart_after_silence = restart_after_silence
+        self.recording = False
+        self.busy = False
         self.reset()
 
     def get_elapsed(self):
@@ -54,16 +56,18 @@ class AbstractTranscriber:
 
     def start_recording(self, microphone,
                         start_message="Recording... Press Ctrl+C to stop.",
-                        stop_message="Stopped recording."):
+                        stop_message="Done transcribing."):
 
         self.reset()
+        self.recording = True
+        self.busy = True
 
         try:
 
             with microphone.open_stream():
                 print(start_message)
 
-                while True:
+                while self.recording:
                     while not microphone.q.empty():
                         data = microphone.q.get()
 
@@ -78,7 +82,7 @@ class AbstractTranscriber:
                                     self.reset()
                                     yield result
                                 else:
-                                    raise KeyboardInterrupt("Silence detected: {:.2f} seconds".format(silence_duration))
+                                    raise StopRecording("Silence detected: {:.2f} seconds".format(silence_duration))
 
                         else:
                             self.last_sound_time = time.time()
@@ -86,14 +90,18 @@ class AbstractTranscriber:
                         yield self.transcribe_realtime_audio(data)
 
                         if self.is_overtime():
-                            raise KeyboardInterrupt("Overtime: {:.2f} seconds".format(self.get_elapsed()))
+                            raise StopRecording("Overtime: {:.2f} seconds".format(self.get_elapsed()))
+
+                    time.sleep(0.1) # avoid overheating
 
         except (KeyboardInterrupt, StopRecording):
             pass
 
         finally:
+            self.recording = False
             result = self.finalize()
             microphone.q.queue.clear()
+            self.busy = False
             yield result
 
         print(stop_message)

{scribe_cli-0.7.8 → scribe_cli-0.7.9/scribe_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: scribe-cli
-Version: 0.7.8
+Version: 0.7.9
 Summary: scribe is a local speech recognition tool that provides real-time transcription using vosk and whisper AI, with the goal of serving as a virtual keyboard on a computer
 Author-email: Mahé Perrette <mahe.perrette@gmail.com>
 License: MIT License

{scribe_cli-0.7.8 → scribe_cli-0.7.9}/scribe_cli.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 .gitignore
 LICENSE
 README.md
+icon.xcf
 pyproject.toml
 .github/workflows/pypi.yml
 scribe/__init__.py
@@ -21,5 +22,7 @@ scribe_cli.egg-info/entry_points.txt
 scribe_cli.egg-info/requires.txt
 scribe_cli.egg-info/top_level.txt
 scribe_data/__init__.py
-scribe_data/share/icon.jpg
+scribe_data/share/icon.png
+scribe_data/share/icon_recording.png
+scribe_data/share/icon_writing.png
 scribe_data/templates/scribe.desktop