v2.6.4

BBC-Esq · web-flow · commit aa7764379755 · 2023-11-13T08:39:47.000-05:00
diff --git a/src/button_module.py b/src/button_module.py
@@ -2,7 +2,7 @@
 from PySide6.QtCore import Qt
 import voice_recorder_module
 
-def create_button_row(submit_handler, style):
+def create_button_row(submit_handler):
 
     voice_recorder = voice_recorder_module.VoiceRecorder()
 
@@ -12,37 +12,18 @@ def start_recording():
     def stop_recording():
         voice_recorder.stop_recording()
 
-    # submit_button = QPushButton("Submit Question")
-    # submit_button.setStyleSheet(style)
-
     start_button = QPushButton("Start Recording")
-    start_button.setStyleSheet(style)
     start_button.clicked.connect(start_recording)
 
     stop_button = QPushButton("Stop Recording")
-    stop_button.setStyleSheet(style)
     stop_button.clicked.connect(stop_recording)
 
-    # disabled_label = QLabel("Disabled")
-    # disabled_checkbox = QCheckBox()
-
-    # def toggle_checkbox():
-    #     disabled_checkbox.setChecked(not disabled_checkbox.isChecked())
-
-    # disabled_label.mousePressEvent = lambda event: toggle_checkbox()
-
     hbox = QHBoxLayout()
-    # hbox.addWidget(submit_button)
     hbox.addWidget(start_button)
     hbox.addWidget(stop_button)
-    # hbox.addWidget(disabled_label)
-    # hbox.addWidget(disabled_checkbox)
 
-    # hbox.setStretchFactor(submit_button, 7)
     hbox.setStretchFactor(start_button, 3)
     hbox.setStretchFactor(stop_button, 3)
-    # hbox.setStretchFactor(disabled_label, 1)
-    # hbox.setStretchFactor(disabled_checkbox, 1)
 
     row_widget = QWidget()
     row_widget.setLayout(hbox)
diff --git a/src/gui.py b/src/gui.py
@@ -1,10 +1,9 @@
 from PySide6.QtWidgets import (
     QApplication, QWidget, QPushButton, QVBoxLayout, QTabWidget,
-    QTextEdit, QSplitter, QFrame, QStyleFactory, QLabel, QGridLayout
+    QTextEdit, QSplitter, QFrame, QStyleFactory, QLabel, QGridLayout, QMenuBar
 )
 from PySide6.QtCore import Qt, QThread, Signal, QUrl
 from PySide6.QtWebEngineWidgets import QWebEngineView
-import yaml
 import os
 from initialize import determine_compute_device, is_nvidia_gpu, get_os_name
 from download_model import download_embedding_model
@@ -17,25 +16,22 @@
 from gui_threads import CreateDatabaseThread, SubmitButtonThread
 from metrics_bar import MetricsBar
 from button_module import create_button_row
-
-with open('config.yaml', 'r') as config_file:
-    config = yaml.safe_load(config_file)
-
-tabs_config = config.get('tabs', [])
-styles = config.get('styles', {})
+import sys
+from utilities import list_theme_files, make_theme_changer, load_stylesheet
 
 class DocQA_GUI(QWidget):
     def __init__(self):
         super().__init__()
         self.compute_device = determine_compute_device()
         os_name = get_os_name()
         self.init_ui()
+        self.init_menu()
 
     def init_ui(self):
         main_splitter = QSplitter(Qt.Horizontal)
         self.setWindowTitle('LM Studio ChromaDB Plugin - www.chintellalaw.com')
         self.setGeometry(300, 300, 975, 975)
-        self.setMinimumSize(550, 610)
+        self.setMinimumSize(450, 510)
 
         # Left panel setup with grid layout
         self.left_frame = QFrame()
@@ -57,12 +53,10 @@ def init_ui(self):
         # Create and add buttons to the grid layout
         for position, (text, handler) in zip(button_positions, button_data):
             button = QPushButton(text)
-            button.setStyleSheet(styles.get('button', ''))
             button.clicked.connect(handler)
             grid_layout.addWidget(button, *position)
 
         self.left_frame.setLayout(grid_layout)
-        self.left_frame.setStyleSheet(styles.get('frame', ''))
         main_splitter.addWidget(self.left_frame)
 
         # Right panel setup
@@ -71,37 +65,45 @@ def init_ui(self):
 
         self.read_only_text = QTextEdit()
         self.read_only_text.setReadOnly(True)
-        self.read_only_text.setStyleSheet(styles.get('text', ''))
 
         self.text_input = QTextEdit()
-        self.text_input.setStyleSheet(styles.get('input', ''))
 
         right_vbox.addWidget(self.read_only_text, 4)
         right_vbox.addWidget(self.text_input, 1)
 
         submit_questions_button = QPushButton("Submit Questions")
-        submit_questions_button.setStyleSheet(styles.get('button', ''))
         submit_questions_button.clicked.connect(self.on_submit_button_clicked)
 
         right_vbox.addWidget(submit_questions_button)
 
         # Define widget containing buttons
-        button_row_widget = create_button_row(self.on_submit_button_clicked, styles.get('button', ''))
+        button_row_widget = create_button_row(self.on_submit_button_clicked)
 
         # Add widgets from button_module.py
         right_vbox.addWidget(button_row_widget)
 
         right_frame.setLayout(right_vbox)
-        right_frame.setStyleSheet(styles.get('frame', ''))
         main_splitter.addWidget(right_frame)
 
         self.metrics_bar = MetricsBar()
         main_layout = QVBoxLayout(self)
         main_layout.addWidget(main_splitter)
         main_layout.addWidget(self.metrics_bar)
 
+    # Create menu bar
+    def init_menu(self):
+        self.menu_bar = QMenuBar(self)
+        self.theme_menu = self.menu_bar.addMenu('Themes')
+
+        self.theme_files = list_theme_files()
+
+        for theme in self.theme_files:
+            action = self.theme_menu.addAction(theme)
+            action.triggered.connect(make_theme_changer(theme))
+
     def resizeEvent(self, event):
         self.left_frame.setMaximumWidth(self.width() * 0.5)
+        self.left_frame.setMinimumWidth(self.width() * 0.3)
         super().resizeEvent(event)
 
     def on_create_button_clicked(self):
@@ -124,9 +126,10 @@ def closeEvent(self, event):
         event.accept()
 
 if __name__ == '__main__':
-    import sys
     app = QApplication(sys.argv)
     app.setStyle(QStyleFactory.create('fusion'))
+    stylesheet = load_stylesheet('custom_stylesheet.css')
+    app.setStyleSheet(stylesheet)
     ex = DocQA_GUI()
     ex.show()
     sys.exit(app.exec())
diff --git a/src/gui_tabs_settings.py b/src/gui_tabs_settings.py
@@ -25,7 +25,7 @@ def __init__(self):
             # "Embedding Models Settings": (ModelsSettingsTab, 6),
             # "Chunk Settings": (ChunkSettingsTab, 2),
             "Transcriber Settings": (TranscriberSettingsTab, 1),
-            "Database Settings": (DatabaseSettingsTab, 5),
+            "Database Settings": (DatabaseSettingsTab, 4),
         }
 
         self.groups = {}
diff --git a/src/gui_tabs_tools_transcribe.py b/src/gui_tabs_tools_transcribe.py
@@ -1,26 +1,11 @@
 from PySide6.QtWidgets import (
-    QLabel, QComboBox, QWidget, QGridLayout, QPushButton, QFileDialog, QCheckBox, QApplication
+    QLabel, QComboBox, QWidget, QHBoxLayout, QVBoxLayout, QPushButton, QFileDialog, QCheckBox, QApplication
 )
-from PySide6.QtCore import QThread, Qt
+from PySide6.QtCore import Qt
 import ctranslate2
 import yaml
 from transcribe_module import TranscribeFile
 
-class TranscriptionThread(QThread):
-    def __init__(self, transcriber):
-        super().__init__()
-        self.transcriber = transcriber
-
-    def run(self):
-        try:
-            # Run the transcription process
-            self.transcriber.transcribe_to_file()
-            print("Transcription completed and saved in 'Docs_for_DB' directory.")
-        except FileNotFoundError as e:
-            print(f"File not found error: {e}")
-        except Exception as e:
-            print(f"An error occurred during transcription: {e}")
-
 class TranscriberToolSettingsTab(QWidget):
     
     def __init__(self):
@@ -68,55 +53,64 @@ def update_quantization(self, device_combo, quantization_combo):
         quantization_combo.addItems(quantizations)
 
     def create_layout(self):
-        layout = QGridLayout()
-
-        def add_widget(widget_class, text, row, column, colspan=1, signal_slot=None, items=None):
-            widget = widget_class()
-            if widget_class in [QLabel, QPushButton]:
-                widget.setText(text)
-            if signal_slot:
-                widget.clicked.connect(signal_slot)
-            if widget_class is QComboBox and items:
-                widget.addItems(items)
-            layout.addWidget(widget, row, column, 1, colspan)
-            return widget
-
-        # Model
-        add_widget(QLabel, "Model", 0, 0)
-        self.model_combo = add_widget(QComboBox, None, 0, 1, items=["tiny", "tiny.en", "base", "base.en", "small", "small.en", "medium", "medium.en", "large-v2"])
-
-        # Quantization
-        add_widget(QLabel, "Quant", 0, 2)
-        self.quantization_combo = add_widget(QComboBox, None, 0, 3)
-
-        # Device
-        add_widget(QLabel, "Device", 0, 4)
+        main_layout = QVBoxLayout()
+
+        # First horizontal layout
+        hbox1 = QHBoxLayout()
+        hbox1.addWidget(QLabel("Model"))
+        self.model_combo = QComboBox()
+        self.model_combo.addItems(["tiny", "tiny.en", "base", "base.en", "small", "small.en", "medium", "medium.en", "large-v2"])
+        hbox1.addWidget(self.model_combo)
+
+        hbox1.addWidget(QLabel("Quant"))
+        self.quantization_combo = QComboBox()
+        hbox1.addWidget(self.quantization_combo)
+
+        hbox1.addWidget(QLabel("Device"))
         device_options = ["cpu"] + ["cuda"] if self.has_cuda_device() else []
-        self.device_combo = add_widget(QComboBox, None, 0, 5, items=device_options)
+        self.device_combo = QComboBox()
+        self.device_combo.addItems(device_options)
+        self.device_combo.currentTextChanged.connect(lambda: self.update_quantization(self.device_combo, self.quantization_combo))
+        self.update_quantization(self.device_combo, self.quantization_combo)
+        hbox1.addWidget(self.device_combo)
 
-        # Timestamp and Translate Labels with Checkboxes
-        add_widget(QLabel, "Timestamps", 1, 0)
-        self.timestamp_checkbox = add_widget(QCheckBox, None, 1, 1)
-        add_widget(QLabel, "Translate", 1, 2)
-        self.translate_checkbox = add_widget(QCheckBox, None, 1, 3)
+        main_layout.addLayout(hbox1)
 
-        # Language Label and ComboBox
-        add_widget(QLabel, "Language", 1, 4)
-        self.language_combo = add_widget(QComboBox, None, 1, 5, items=["Option 1", "Option 2", "Option 3"])
+        # Second horizontal layout
+        hbox2 = QHBoxLayout()
+        hbox2.addWidget(QLabel("Timestamps"))
+        self.timestamp_checkbox = QCheckBox()
+        hbox2.addWidget(self.timestamp_checkbox)
 
-        # Select Audio File Button
-        self.select_file_button = add_widget(QPushButton, "Select Audio File", 2, 0, 3, signal_slot=self.select_audio_file)
+        hbox2.addWidget(QLabel("Translate"))
+        self.translate_checkbox = QCheckBox()
+        hbox2.addWidget(self.translate_checkbox)
 
-        # Transcribe/Translate Button
-        self.transcribe_translate_button = add_widget(QPushButton, "Transcribe/Translate", 2, 3, 3, signal_slot=self.start_transcription)
+        hbox2.addWidget(QLabel("Language"))
+        self.language_combo = QComboBox()
+        self.language_combo.addItems(["Option 1", "Option 2", "Option 3"])
+        hbox2.addWidget(self.language_combo)
 
-        # Update Settings Button
-        self.update_settings_button = add_widget(QPushButton, "Update Settings", 3, 0, 6, signal_slot=self.save_settings)
+        main_layout.addLayout(hbox2)
 
-        self.device_combo.currentTextChanged.connect(lambda: self.update_quantization(self.device_combo, self.quantization_combo))
-        self.update_quantization(self.device_combo, self.quantization_combo)
+        # Third horizontal layout
+        hbox3 = QHBoxLayout()
+        self.select_file_button = QPushButton("Select Audio File")
+        self.select_file_button.clicked.connect(self.select_audio_file)
+        hbox3.addWidget(self.select_file_button)
+
+        self.transcribe_translate_button = QPushButton("Transcribe/Translate")
+        self.transcribe_translate_button.clicked.connect(self.start_transcription)
+        hbox3.addWidget(self.transcribe_translate_button)
+
+        main_layout.addLayout(hbox3)
+
+        # Update settings button (without a horizontal layout)
+        self.update_settings_button = QPushButton("Update Settings")
+        self.update_settings_button.clicked.connect(self.save_settings)
+        main_layout.addWidget(self.update_settings_button)
 
-        self.setLayout(layout)
+        self.setLayout(main_layout)
     
     def select_audio_file(self):
         audio_file_filter = "Audio Files (*.mp3 *.wav *.flac *.mp4 *.wma *.mpeg *.mpga *.m4a *.webm *.ogg *.oga *.)"
@@ -153,13 +147,11 @@ def update_config(self, file_to_transcribe=None, **kwargs):
 
     def start_transcription(self):
         if self.selected_audio_file:
-            transcriber = TranscribeFile()
-            self.transcription_thread = TranscriptionThread(transcriber)
-            self.transcription_thread.start()
+            transcriber = TranscribeFile(self.selected_audio_file)
+            transcriber.start_transcription_thread()
         else:
             print("Please select an audio file first.")
 
-# Only used if ran standalone
 if __name__ == "__main__":
     app = QApplication([])
     window = TranscriberToolSettingsTab()
diff --git a/src/transcribe_module.py b/src/transcribe_module.py
@@ -3,15 +3,30 @@
 from faster_whisper import WhisperModel
 import time
 from termcolor import cprint
+from PySide6.QtCore import QThread
+
+class TranscriptionThread(QThread):
+    def __init__(self, transcriber):
+        super().__init__()
+        self.transcriber = transcriber
+
+    def run(self):
+        try:
+            self.transcriber.transcribe_to_file()
+            print("Transcription completed and saved in 'Docs_for_DB' directory.")
+        except FileNotFoundError as e:
+            print(f"File not found error: {e}")
+        except Exception as e:
+            print(f"An error occurred during transcription: {e}")
 
 class TranscribeFile:
-    def __init__(self, config_path='config.yaml'):
+    def __init__(self, audio_file, config_path='config.yaml'):
         # Read the configuration from config.yaml
         with open(config_path, 'r') as file:
             config = yaml.safe_load(file)['transcribe_file']
 
         model_name = f"ctranslate2-4you/whisper-{config['model']}-ct2-{config['quant']}"
-        self.audio_file = config['file']
+        self.audio_file = audio_file  # Use the passed audio_file
         self.include_timestamps = config['timestamps']
         self.model = WhisperModel(model_name, device=config['device'], compute_type=config['quant'])
         self.enable_print = True
@@ -23,6 +38,10 @@ def my_cprint(self, *args, **kwargs):
             modified_message = f"{filename}: {args[0]}"
             cprint(modified_message, *args[1:], **kwargs)
 
+    def start_transcription_thread(self):
+        self.transcription_thread = TranscriptionThread(self)
+        self.transcription_thread.start()
+
     @staticmethod
     def format_time(seconds):
         # Converts seconds to 'hours:minutes:seconds' format if more than 59m59s
diff --git a/src/utilities.py b/src/utilities.py

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ def __init__(self):`
`25`	`25`	`# "Embedding Models Settings": (ModelsSettingsTab, 6),`
`26`	`26`	`# "Chunk Settings": (ChunkSettingsTab, 2),`
`27`	`27`	`"Transcriber Settings": (TranscriberSettingsTab, 1),`
`28`		`- "Database Settings": (DatabaseSettingsTab, 5),`
	`28`	`+ "Database Settings": (DatabaseSettingsTab, 4),`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`self.groups = {}`