use pathlib not os where possible

Author: BBC-Esq

src/gui.py

@@ -44,7 +44,7 @@ def is_nvidia_gpu(self):
         return False
 
     def load_config(self):
-        script_dir = os.path.dirname(os.path.realpath(__file__))
+        script_dir = Path(__file__).resolve().parent
         config_path = os.path.join(script_dir, 'config.yaml')
         with open(config_path, 'r') as file:
             config = yaml.safe_load(file)
@@ -53,7 +53,7 @@ def load_config(self):
     def init_ui(self):
         main_splitter = QSplitter(Qt.Horizontal)
         self.setWindowTitle('LM Studio ChromaDB Plugin - www.chintellalaw.com')
-        self.setGeometry(300, 300, 1060, 1060)
+        self.setGeometry(300, 300, 1077, 1077)
         self.setMinimumSize(450, 510)
 
         # LEFT FRAME

src/gui_tabs.py

@@ -2,7 +2,7 @@
 from PySide6.QtWebEngineWidgets import QWebEngineView
 from PySide6.QtWidgets import QTextEdit, QTabWidget, QVBoxLayout, QWidget, QGroupBox, QPushButton, QHBoxLayout
 from PySide6.QtCore import QUrl
-import os
+from pathlib import Path
 from gui_tabs_settings import GuiSettingsTab
 from gui_tabs_tools import GuiSettingsTab as ToolsSettingsTab
 
@@ -17,7 +17,7 @@ def create_tabs():
     tab_font.setPointSize(13)
     tab_widget.setFont(tab_font)
 
-    user_manual_folder = os.path.join(os.path.dirname(__file__), 'User_Manual')
+    user_manual_folder = Path(__file__).parent / 'User_Manual'
 
     # SETTINGS TAB
     settings_tab = GuiSettingsTab()
@@ -43,8 +43,8 @@ def create_tabs():
 
     for button_name, html_file in buttons_dict.items():
         button = QPushButton(button_name)
-        button_url = os.path.join(user_manual_folder, html_file)
-        button.clicked.connect(partial(load_url, user_guide_view, button_url))
+        button_url = user_manual_folder / html_file
+        button.clicked.connect(partial(load_url, user_guide_view, str(button_url)))
         menu_layout.addWidget(button)
 
     menu_group.setLayout(menu_layout)

src/gui_tabs_settings_bark.py

@@ -1,6 +1,6 @@
 from PySide6.QtWidgets import QLabel, QComboBox, QWidget, QHBoxLayout, QVBoxLayout, QApplication, QCheckBox
 import yaml
-import os
+from pathlib import Path
 
 class BarkModelSettingsTab(QWidget):
 
@@ -55,9 +55,10 @@ def initialize_layout(self):
         self.setLayout(main_layout)
 
     def load_config_and_set_values(self):
-        if os.path.exists('config.yaml'):
+        config_file_path = Path('config.yaml')
+        if config_file_path.exists():
             try:
-                with open('config.yaml', 'r') as f:
+                with open(config_file_path, 'r') as f:
                     config = yaml.safe_load(f)
             except Exception as e:
                 config = None
@@ -80,8 +81,8 @@ def connect_signals(self):
         self.cpu_offload_checkbox.stateChanged.connect(self.update_config)
 
     def update_config(self):
-        config_file_path = 'config.yaml'
-        if os.path.exists(config_file_path):
+        config_file_path = Path('config.yaml')
+        if config_file_path.exists():
             try:
                 with open(config_file_path, 'r') as f:
                     config = yaml.safe_load(f)

src/gui_tabs_settings_database.py

@@ -4,7 +4,6 @@
 import yaml
 from pathlib import Path
 import shutil
-import os
 
 class DatabaseSettingsTab(QWidget):
     def __init__(self):

src/gui_tabs_settings_server.py

@@ -1,7 +1,7 @@
 from PySide6.QtWidgets import QWidget, QLabel, QLineEdit, QGridLayout, QMessageBox, QSizePolicy, QCheckBox, QComboBox
 from PySide6.QtGui import QIntValidator, QDoubleValidator
 import yaml
-import os
+from pathlib import Path
 
 class ServerSettingsTab(QWidget):
     def __init__(self):
@@ -81,6 +81,10 @@ def create_edit(self, setting, settings_dict):
         self.widgets[setting]['edit'] = edit
         return edit
 
+    def refresh_labels(self):
+        self.widgets['prefix']['label'].setText(f"Prefix: {self.config_data.get('server', {}).get('prefix', '')}")
+        self.widgets['suffix']['label'].setText(f"Suffix: {self.config_data.get('server', {}).get('suffix', '')}")
+    
     def update_prefix_suffix(self, index):
         option = self.prompt_format_combobox.currentText()
 
@@ -100,10 +104,10 @@ def update_prefix_suffix(self, index):
         self.widgets['suffix']['edit'].setText(self.config_data.get('server', {}).get(suffix_key, ''))
 
     def update_config(self):
-        config_file_path = 'config.yaml'
-        if os.path.exists(config_file_path):
+        config_file_path = Path('config.yaml')
+        if config_file_path.exists():
             try:
-                with open(config_file_path, 'r') as file:
+                with config_file_path.open('r') as file:
                     config_data = yaml.safe_load(file)
             except Exception as e:
                 config_data = {}
@@ -127,7 +131,10 @@ def update_config(self):
             config_data['server']['prompt_format_disabled'] = current_disable_state
 
         if updated:
-            with open(config_file_path, 'w') as file:
+            with config_file_path.open('w') as file:
                 yaml.safe_dump(config_data, file)
 
+            self.config_data = config_data
+            self.refresh_labels()
+
         return updated

src/gui_tabs_settings_vision.py

@@ -1,7 +1,7 @@
 from PySide6.QtWidgets import QLabel, QGridLayout, QVBoxLayout, QComboBox, QCheckBox, QSpinBox, QWidget
 from PySide6.QtCore import Qt
 import yaml
-import os
+from pathlib import Path
 
 class VisionSettingsTab(QWidget):
     def __init__(self):
@@ -94,8 +94,8 @@ def updateChosenQuant(self):
         self.updateConfigFile()
 
     def updateConfigFile(self):
-        config_file_path = 'config.yaml'
-        if os.path.exists(config_file_path):
+        config_file_path = Path('config.yaml')
+        if config_file_path.exists():
             try:
                 with open(config_file_path, 'r') as file:
                     current_config = yaml.safe_load(file)

src/gui_tabs_settings_whisper.py

@@ -3,7 +3,7 @@
 import ctranslate2
 import yaml
 from voice_recorder_module import VoiceRecorder
-import os
+from pathlib import Path
 
 class TranscriberSettingsTab(QWidget):
 
@@ -86,8 +86,8 @@ def create_layout(self):
         self.setLayout(layout)
 
     def update_config(self):
-        config_file_path = 'config.yaml'
-        if os.path.exists(config_file_path):
+        config_file_path = Path('config.yaml')
+        if config_file_path.exists():
             try:
                 with open(config_file_path, 'r') as f:
                     config_data = yaml.safe_load(f)

src/gui_tabs_tools_transcribe.py

@@ -1,9 +1,10 @@
+from functools import partial
 from PySide6.QtWidgets import (
     QLabel, QComboBox, QWidget, QHBoxLayout, QVBoxLayout, QPushButton, QApplication, QCheckBox, QFileDialog
 )
 from PySide6.QtCore import Qt
 import yaml
-import os
+from pathlib import Path
 from constants import WHISPER_MODEL_NAMES
 from transcribe_module import TranscribeFile
 import threading
@@ -129,10 +130,11 @@ def update_model_in_config(self, new_model):
         self.update_config_file()
 
     def select_audio_file(self):
-        current_dir = os.path.dirname(os.path.realpath(__file__))
-        file_name, _ = QFileDialog.getOpenFileName(self, "Select Audio File", current_dir)
+        current_dir = Path(__file__).resolve().parent
+        file_name, _ = QFileDialog.getOpenFileName(self, "Select Audio File", str(current_dir))
         if file_name:
-            short_path = "..." + os.path.join(os.path.basename(os.path.dirname(file_name)), os.path.basename(file_name))
+            file_path = Path(file_name)
+            short_path = "..." + str(Path(file_path.parent.name) / file_path.name)
             self.file_path_label.setText(short_path)
             self.selected_audio_file = file_name
 
@@ -146,7 +148,7 @@ def transcription_thread():
             transcriber.start_transcription()
 
         threading.Thread(target=transcription_thread, daemon=True).start()
-        print(f"Transcription process for {os.path.basename(self.selected_audio_file)} started.")
+        print(f"Transcription process for {Path(self.selected_audio_file).name} started.")
 
 if __name__ == "__main__":
     app = QApplication([])

src/gui_tabs_tools_vision.py

@@ -2,7 +2,6 @@
 from PySide6.QtWebEngineWidgets import QWebEngineView
 from PySide6.QtCore import Qt, QThread, QUrl
 import yaml
-import os
 import multiprocessing
 import vision_llava_module
 import vision_cogvlm_module
@@ -37,8 +36,9 @@ def __init__(self):
 
         # Initialize the WebEngineView
         self.webView = QWebEngineView()
-        html_file_path = os.path.join(os.path.dirname(__file__), 'vision_model_table.html')
-        self.webView.setUrl(QUrl.fromLocalFile(html_file_path))
+        script_dir = Path(__file__).resolve().parent
+        html_file_path = script_dir / 'vision_model_table.html'
+        self.webView.setUrl(QUrl.fromLocalFile(str(html_file_path)))
         mainVLayout.addWidget(self.webView)
 
     def confirmationBeforeProcessing(self):
@@ -52,15 +52,15 @@ def confirmationBeforeProcessing(self):
             self.startProcessing()
 
     def startProcessing(self):
-        script_dir = os.path.dirname(os.path.realpath(__file__))
-        images_dir = Path(script_dir) / "Images_for_DB"
+        script_dir = Path(__file__).resolve().parent
+        images_dir = script_dir / "Images_for_DB"
 
         with open('config.yaml', 'r') as file:
             updated_config = yaml.safe_load(file)
 
         if platform.system() == "Darwin" and any(images_dir.iterdir()):
             QMessageBox.warning(self, "Error",
-                                "Image processing has been disabled for MacOS for the time being until a fix can be implemented.  Please remove all files from the 'Images_for_DB' folder and try again.")
+                                "Image processing has been disabled for MacOS for the time being until a fix can be implemented. Please remove all files from the 'Images_for_DB' folder and try again.")
             return
 
         chosen_model = updated_config['vision']['chosen_model']
@@ -86,8 +86,8 @@ def openFolderDialog(self):
         if file_path:
             self.folderPathLabel.setText(file_path)
 
-            config_file_path = 'config.yaml'
-            if os.path.exists(config_file_path):
+            config_file_path = Path('config.yaml')
+            if config_file_path.exists():
                 try:
                     with open(config_file_path, 'r') as file:
                         config = yaml.safe_load(file)