Fixed Linux Terminal output.

Added the webuiGUI.py to the Packages.

.github/workflows/package.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest]
+        os: [windows-latest, ubuntu-latest]
     steps:
       - name: Set up Python
         uses: actions/setup-python@v2
@@ -26,11 +26,12 @@ jobs:
           pip install pyinstaller
 
       - name: Build and package
-        run: pyinstaller --noconfirm --onefile --windowed StartUI.py
+        run: |
+          pyinstaller --noconfirm --onefile --windowed StartUI.py
+          cp webuiGUI.py dist/  # Copy webuiGUI.py to the dist directory
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ matrix.os }}-binary
+          name: ${{ matrix.os }}-binary-v1.2
-          path: dist  # Assuming the packaged files are created in a 'dist' directory
+          path: dist
-

README.md

@@ -1,21 +1,26 @@
 # WebUI StartGUI
 
+## Disclaimer
+As someone who isn't a professional programmer, I enjoy experimenting and finding ways to simplify my workflow. This GUI was created to make it easier for me to adjust parameters and save them for future use, without constantly modifying the webui.py or managing multiple scripts. While I'm glad to share this script with others, please understand that my expertise in maintaining it might be limited. Nonetheless, I hope it proves helpful to you, and I appreciate your understanding.
+
 ## Description
 WebUI StartGUI is a Python graphical user interface (GUI) written with PyQT5, that allows users to configure settings and start the oobabooga web user interface (WebUI). It provides a convenient way to adjust various parameters and launch the WebUI with the desired settings.
 
 ## Current Features
-- Select a model from a dropdown menu
+- Select a model from a dropdown menu (with reload button if added while the StartUI is open)
 - Choose wbits and groupsize options
 - Select the operating mode (chat, cai-chat, notebook)
-- Enable/disable GPU usage and set GPU VRAM (Only for Nvidia Right now, will detect if multiple GPU's are Present)
+- Choose between CPU, GPU or Autodevice
+- Set CPU RAM/GPU VRAM (Only for Nvidia Right now, will automatically detect if multiple GPU's are Present)
 - Adjust pre-layer value
-- Load the model with 8-bit precision
+- Choose to run with 8bit, 16bit, trust_remote_code, Quant_attn, Autotune and no-cache flags
 - Enable authentication and choose an authentication file
 - Choose extensions for the WebUI
 - Enable local network mode and specify the listen port
 - Automatically open the browser when loading is finished
 - Save settings to a profile
 - Load profiles via Dropdown menu.
+- Run the text-generation-webui Updater
 
 ## How to Use
 1. Clone the repository or download the source code.
@@ -28,7 +33,19 @@ WebUI StartGUI is a Python graphical user interface (GUI) written with PyQT5, th
 
 
 ## Binary Download
-Binary releases of this script can be found in the [Releases](https://github.com/your-username/your-repository/releases) section of this repository.
+Binary releases of this script can be found in the [Releases](https://github.com/Pakobbix/StartUI-oobabooga-webui/releases) section of this repository.
+Just put the two files into the root Folder of oobabooga (where the folder with the webui.py and the start script is).
+On Linux, you'll need to give StartUI the executable flag (`chmod +x StartUI` or right click -> properties -> make executable).
+
+The WebuiGUI.py must also be there, to handle the flags properly
+
+## Screenshots
+V1.1 :\
+![Screenshot 2023-05-13 232040](https://github.com/Pakobbix/StartUI-oobabooga-webui/assets/6762686/565feaea-ef67-4081-9978-2aa314763da7)
+![Screenshot 2023-05-13 232054](https://github.com/Pakobbix/StartUI-oobabooga-webui/assets/6762686/1c2a9acf-b193-4dd2-abd5-08dcd719c550)
+![Screenshot 2023-05-13 232103](https://github.com/Pakobbix/StartUI-oobabooga-webui/assets/6762686/cfd11947-b11b-4ef4-be74-d5e15ab75b22)
+
+
 
 ## Credits
 StartGUI is developed and maintained by [Pakobbix](https://github.com/Pakobbix). 

StartUI.py

@@ -1,16 +1,12 @@
-import sys
+import sys, gpustat, os, json, subprocess, platform, psutil, urllib.request, re
-import gpustat
+from PyQt5.QtWidgets import QApplication, QMessageBox, QProgressBar, QMainWindow, QLabel, QVBoxLayout, QComboBox, QSlider, QCheckBox, QLineEdit, QFileDialog, QPushButton, QWidget, QListWidget, QListWidgetItem, QToolTip, QGridLayout, QRadioButton, QFrame, QDialog
-import os
-import json
-import subprocess
-import platform
-from PyQt5.QtWidgets import QApplication, QMainWindow, QLabel, QVBoxLayout, QComboBox, QSlider, QCheckBox, QLineEdit, QFileDialog, QPushButton, QWidget, QListWidget, QListWidgetItem, QToolTip
 from PyQt5.QtCore import Qt
 
 profiles_folder = "./profiles"
 os.makedirs(profiles_folder, exist_ok=True)
 model_folder = "./text-generation-webui/models"
 extensions_folder = "./text-generation-webui/extensions"
+loras_folder = "./text-generation-webui/loras"
 
 # # Get the absolute path of the script file
 script_path = os.path.abspath(__file__)
@@ -37,13 +33,32 @@ def run_cmd_with_conda(cmd, env=None):
         # Open a separate terminal window and execute the command
         subprocess.Popen(['start', 'cmd', '/k', full_cmd], shell=True, env=env)
     elif platform.system() == 'Linux':
-        # For Linux, activate the Conda environment using the conda command
+        # Define the necessary variables from the bash script
-        activate_cmd = f"conda activate {conda_env_path} && "
+        install_dir = os.path.dirname(os.path.abspath(__file__))
-        full_cmd = f"source ./installer_files/conda/etc/profile.d/conda.sh && conda run -p {conda_env_path} {cmd}"
+        conda_root_prefix = os.path.join(install_dir, "installer_files", "conda")
+        install_env_dir = os.path.join(install_dir, "installer_files", "env")
 
-        # Open a separate terminal window and execute the command
+        # For Linux, activate the Conda environment
-        process = subprocess.Popen(['gnome-terminal', '--', 'bash', '-c', full_cmd], env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        activate_cmd = f"source {os.path.join(conda_root_prefix, 'etc', 'profile.d', 'conda.sh')} && conda activate {install_env_dir}"
 
+        # Check for available terminal emulators
+        terminal_emulators = ['xdg-terminal', 'gnome-terminal', 'konsole', 'xfce4-terminal', 'mate-terminal', 'lxterminal', 'termite', 'tilix', 'xterm']
+        terminal_cmd = None
+
+        for emulator in terminal_emulators:
+            try:
+                subprocess.run([emulator, '--version'], check=True)
+                terminal_cmd = emulator
+                break
+            except FileNotFoundError:
+                continue
+
+        if terminal_cmd is None:
+            raise RuntimeError("No compatible terminal emulator found.")
+
+        # Execute the command within the Conda environment in a separate terminal
+        print(cmd)
+        subprocess.Popen([terminal_cmd, '--', 'bash', '-c', f"{activate_cmd} && {cmd}"], env=env)
 
 class MainWindow(QMainWindow):
     def __init__(self):
@@ -51,112 +66,269 @@ class MainWindow(QMainWindow):
 
         self.init_ui()
         self.load_settings()
+        self.set_ram_slider_max()
 
     def init_ui(self):
         self.setWindowTitle('StartUI for oobabooga webui')
-        layout = QVBoxLayout()
+        #layout = QVBoxLayout()
+        layout = QGridLayout()
+        layout.setColumnMinimumWidth(3, 30)
 
         # Model Dropdown
         # Get the list of model folders
         model_folders = [name for name in os.listdir(model_folder) if os.path.isdir(os.path.join(model_folder, name))]
-
         self.model_dropdown = QComboBox()
         self.model_dropdown.addItems(model_folders)
         layout.addWidget(QLabel("Choose Model:"))
         self.model_dropdown.setToolTip("Select your prefered Model")
-        layout.addWidget(self.model_dropdown)
+        layout.addWidget(self.model_dropdown, 1, 0)
+
+        self.model_type = QComboBox()
+        self.model_type.addItems(["llama", "opt", "gptj", "none"])
+        layout.addWidget(QLabel("Choose Model Type:"), 3, 0)
+        self.model_type.setToolTip("Select the Model Type")
+        layout.addWidget(self.model_type, 4, 0)
+
+        self.reload_model_button = QPushButton("Reload")
+        self.reload_model_button.setToolTip("Reloads the Names in the Models Folder")
+        self.reload_model_button.clicked.connect(self.reload_models)
+        layout.addWidget(QLabel("Reload the Model list:"),0, 1)
+        layout.addWidget(self.reload_model_button, 1, 1)
 
         # WBIT Dropdown Menu
         self.wbit_dropdown = QComboBox()
         self.wbit_dropdown.addItems(["1", "2", "3", "4","8", "none"])
-        layout.addWidget(QLabel("Choose Wbits:"))
+        layout.addWidget(QLabel("Choose Wbits:"),5, 0)
         self.wbit_dropdown.setToolTip("Select the bits quantization for this model\nExample: vicuna 7b 4bit you should choose 4.\nYou can keep it at none, the webui will determine it automatically if the wbits are mentioned in the name of the model")
-        layout.addWidget(self.wbit_dropdown)
+        layout.addWidget(self.wbit_dropdown, 6, 0)
 
         # Groupsize Dropdown Menu
         self.gsize_dropdown = QComboBox()
         self.gsize_dropdown.addItems(["32", "64", "128", "1024", "none"])
-        layout.addWidget(QLabel("Choose Groupsize:"))
+        layout.addWidget(QLabel("Choose Groupsize:"), 5, 1)
         self.gsize_dropdown.setToolTip("Select the groupsize used by the Model.\nExample: vicuna 7b 4bit-128g you should choose 128.\nYou can keep it at none, the webui will determine it automatically if the groupsize is mentioned in the name of the model")
-        layout.addWidget(self.gsize_dropdown)
+        layout.addWidget(self.gsize_dropdown, 6, 1)
 
         # Mode Dropdown
         self.mode_dropdown = QComboBox()
         self.mode_dropdown.addItems(["chat", "cai_chat", "notebook"])
-        layout.addWidget(QLabel("Choose Mode:"))
+        layout.addWidget(QLabel("Choose Mode:"), 7, 0)
         self.mode_dropdown.setToolTip("Choose what kind of UI you want to load.")
-        layout.addWidget(self.mode_dropdown)
+        layout.addWidget(self.mode_dropdown, 8, 0)
+
+        self.update_button = QPushButton("Update oobabooga")
+        self.update_button.setToolTip("Starts the Update Routine for the text-generation-webui")
+        self.update_button.clicked.connect(self.on_update_button_clicked)
+        layout.addWidget(self.update_button, 8, 1)
+        layout.addWidget(QLabel("Update the text-generation-webui:"), 7, 1)
+
+        # Add horizontal line to seperate the CPU/GPU Settings
+        line = QFrame()
+        line.setFrameShape(QFrame.HLine)
+        line.setFrameShadow(QFrame.Sunken)
+        layout.addWidget(line, 9, 0, 1, 3)
 
         # GPU Checkbox and Sliders
-        self.use_gpu_checkbox = QCheckBox("Use GPU")
+        self.gpu_radio_button = QRadioButton("Use GPU")
-        self.use_gpu_checkbox.setToolTip("Choose if you want to use your GPU\nNecessary if you set GPU VRAM Slider")
+        self.gpu_radio_button.setToolTip("Choose if you want to use your GPU")
-        layout.addWidget(self.use_gpu_checkbox)
+        self.gpu_radio_button.setChecked(True)
+        layout.addWidget(self.gpu_radio_button, 10, 0)
+    
+        self.cpu_radio_button = QRadioButton("Use CPU")
+        self.cpu_radio_button.setToolTip("Choose if you want to use your CPU")
+        self.cpu_radio_button.setChecked(False)
+        layout.addWidget(self.cpu_radio_button, 10, 1)
+
+        self.auto_radio_button = QRadioButton("Autodevice")
+        self.auto_radio_button.setToolTip("Let the webui decide whats best for you!")
+        self.auto_radio_button.setChecked(False)
+        layout.addWidget(self.auto_radio_button, 10, 2)
+    
+        self.gpu_radio_button.toggled.connect(self.on_gpu_radio_button_toggled)
+        self.cpu_radio_button.toggled.connect(self.on_cpu_radio_button_toggled)
+        self.auto_radio_button.toggled.connect(self.on_auto_radio_button_toggled)
     
         self.gpu_vram_sliders = []
         self.gpu_vram_labels = []
+        self.gpu_labels = []
     
         gpu_stats = gpustat.GPUStatCollection.new_query()
     
         for i, gpu in enumerate(gpu_stats):
-            gpu_label = QLabel(f"GPU {i} VRAM:")
+            gpu_label = QLabel(f"{gpu.name} VRAM:")
-            layout.addWidget(gpu_label)
+            gpu_label.setToolTip(f"Total VRAM: {gpu.memory_total} MiB\nUsed VRAM: {gpu.memory_used} MiB\nFree VRAM: {gpu.memory_free} MiB")
+            layout.addWidget(gpu_label, 11 + i, 0)
+            self.gpu_labels.append(gpu_label)
     
             vram_slider = QSlider(Qt.Horizontal)
             vram_slider.setMaximum(int(gpu.memory_total / 1024))
             vram_slider.valueChanged.connect(lambda value, idx=i: self.on_vram_slider_changed(value, idx))
-            layout.addWidget(vram_slider)
+            layout.addWidget(vram_slider, 11 + i, 1)
     
             vram_value_label = QLabel("0 GiB")
-            layout.addWidget(vram_value_label)
+            layout.addWidget(vram_value_label, 11 + i, 2)
             self.gpu_vram_labels.append(vram_value_label)
     
             self.gpu_vram_sliders.append(vram_slider)
 
+        # Create the "Built-in RAM" label, slider, and value label
+        self.ram_label = QLabel("Built-in RAM:")
+        ram_info = psutil.virtual_memory()
+        total_ram = ram_info.total // (1024 ** 2)  # Convert to MiB
+        used_ram = ram_info.used // (1024 ** 2)  # Convert to MiB
+        free_ram = ram_info.available // (1024 ** 2)  # Convert to MiB
+        self.ram_label.setToolTip(f"Total RAM: {total_ram} MiB\nUsed RAM: {used_ram} MiB\nFree RAM: {free_ram} MiB")
+        self.ram_label.hide()
+        layout.addWidget(self.ram_label, 11, 0)
+    
+        self.ram_slider = QSlider(Qt.Horizontal)
+        self.ram_slider.setMinimum(0)
+        self.ram_slider.setMaximum(100)
+        self.ram_slider.setTickInterval(1)
+        self.ram_slider.setSingleStep(1)
+        self.ram_slider.hide()
+        layout.addWidget(self.ram_slider, 11, 1)
+    
+        self.ram_value_label = QLabel("0 GiB")
+        self.ram_value_label.hide()
+        layout.addWidget(self.ram_value_label, 11, 2)
+
         # Pre-layer Slider
         self.pre_layer_slider = QSlider(Qt.Horizontal)
         self.pre_layer_slider.setMinimum(0)
         self.pre_layer_slider.setMaximum(100)
         self.pre_layer_slider.setTickInterval(1)
         self.pre_layer_slider.setSingleStep(1)
-        layout.addWidget(QLabel("Pre-layer:"))
+        layout.addWidget(QLabel("Pre-layer:"), 11 + len(gpu_stats), 0)
         self.pre_layer_slider.setToolTip("The number of layers to allocate to the GPU. Setting this parameter enables CPU offloading for 4-bit models.")
         layout.addWidget(self.pre_layer_slider)
+        self.pre_layer_slider.valueChanged.connect(self.on_pre_layer_slider_changed)
 
         self.pre_layer_value_label = QLabel("0")
-        layout.addWidget(self.pre_layer_value_label)
+        layout.addWidget(self.pre_layer_value_label, 11 + len(gpu_stats), 2)
 
-        # Connect the valueChanged signal of the pre-layer slider to update the value label
+        # Connect the valueChanged signal of the RAM slider to update the value label
-        self.pre_layer_slider.valueChanged.connect(self.on_pre_layer_slider_changed)
+        self.ram_slider.valueChanged.connect(self.on_ram_slider_changed)
+
+        # Add horizontal line to seperate the Checkboxes
+        line = QFrame()
+        line.setFrameShape(QFrame.HLine)
+        line.setFrameShadow(QFrame.Sunken)
+        layout.addWidget(line, 12 + len(gpu_stats), 0, 1, 3)
 
         # Load in 8 Bit Mode
         self.use_8bit_checkbox = QCheckBox("Load in 8bit")
-        self.use_8bit_checkbox.setToolTip("Load the model with 8-bit precision. Reduces the amount of VRAM running native Models")
+        self.use_8bit_checkbox.setToolTip("VRAM Reducing!\nReduces memory usage and computational complexity at the cost of lower precision compared to higher precision representations.")
-        layout.addWidget(self.use_8bit_checkbox)
+        layout.addWidget(self.use_8bit_checkbox, 13 + len(gpu_stats), 0)
+
+        # Deactivate Streaming Output
+        self.use_nostream_checkbox = QCheckBox("No Stream")
+        self.use_nostream_checkbox.setToolTip("Don't stream the text output in real time. Increases Token/s by ~ 50%")
+        layout.addWidget(self.use_nostream_checkbox, 13 + len(gpu_stats), 1)
+
+        # Load in full 16bit precision
+        self.use_16bit_checkbox = QCheckBox("Load in 16bit")
+        self.use_16bit_checkbox.setToolTip("Load the model with bfloat16 precision. Requires NVIDIA Ampere GPU.")
+        layout.addWidget(self.use_16bit_checkbox, 14 + len(gpu_stats), 0)
+
+        # Use xformers
+        self.use_xformers_checkbox = QCheckBox("xformers")
+        self.use_xformers_checkbox.setToolTip("Use xformer's memory efficient attention. This should increase your tokens/s.")
+        layout.addWidget(self.use_xformers_checkbox, 14 + len(gpu_stats), 1)
+
+        # Make use of Remote Code Execution (MPT-7B)
+        self.use_trc_checkbox = QCheckBox("trust-remote-code")
+        self.use_trc_checkbox.setToolTip("Set trust_remote_code=True while loading a model. Necessary for ChatGLM and MPT-7B.")
+        layout.addWidget(self.use_trc_checkbox, 15 + len(gpu_stats), 0)
+
+        # Load with Monkey-Patch enabled
+        self.use_monkey_checkbox = QCheckBox("Monkey Patch")
+        self.use_monkey_checkbox.setToolTip("Apply the monkey patch for using LoRAs with quantized models.")
+        layout.addWidget(self.use_monkey_checkbox, 15 + len(gpu_stats), 1)
+
+        # Use Triton Quant-ATTN
+        self.use_quant_checkbox = QCheckBox("Quant_attn")
+        self.use_quant_checkbox.setToolTip("(triton) Enable quant attention.")
+        layout.addWidget(self.use_quant_checkbox, 16 + len(gpu_stats), 0)
+
+        # Use Triton Warmup & Autotune
+        self.use_autotune_checkbox = QCheckBox("Warmup-Autotune")
+        self.use_autotune_checkbox.setToolTip("(triton) Enable warmup autotune.")
+        layout.addWidget(self.use_autotune_checkbox, 16 + len(gpu_stats), 1)
+
+        # Disable Cache for better VRAM
+        self.use_nocache_checkbox = QCheckBox("No Cache")
+        self.use_nocache_checkbox.setToolTip("VRAM Reducing!\nSet use_cache to False while generating text. This reduces the VRAM usage a bit with a performance cost.")
+        layout.addWidget(self.use_nocache_checkbox, 17 + len(gpu_stats), 1)
+
+        # Use DISK to load part of the model
+        self.use_disk_checkbox = QCheckBox("Use DISK")
+        self.use_disk_checkbox.setToolTip("If the model is too large for your GPU(s) and CPU combined, send the remaining layers to the disk.")
+        layout.addWidget(self.use_disk_checkbox, 17 + len(gpu_stats), 0)
+        self.use_disk_checkbox.stateChanged.connect(self.on_use_disk_checkbox_changed)
+
+        # Use DISK to load part of the model
+        self.change_disk_cache_checkbox = QCheckBox("Change Disk Cache")
+        self.change_disk_cache_checkbox.setVisible(False)
+        self.change_disk_cache_checkbox.setToolTip("OPTIONAL: Change the disk cache directory.")
+        layout.addWidget(self.change_disk_cache_checkbox, 18 + len(gpu_stats), 0)
+        self.change_disk_cache_checkbox.stateChanged.connect(self.on_change_disk_cache_checkbox_changed)
+
+        # Current Cache Folder
+        self.disk_cache_path = ""
+        self.current_disk_cache_label = QLabel("Current Cache Folder:")
+        self.current_disk_cache_label.setVisible(False)
+        self.current_disk_cache_label.setToolTip("The current disk cache folder.")
+        layout.addWidget(self.current_disk_cache_label, 18 + len(gpu_stats), 1)
+
+        # Choose Folder Field
+        self.choose_disk_folder_label = QLabel("Choose Folder:")
+        self.choose_disk_folder_label.setVisible(False)
+        self.choose_disk_folder_label.setToolTip("Choose a folder to use for the disk cache.")
+        layout.addWidget(self.choose_disk_folder_label, 19 + len(gpu_stats), 0)
+
+        # Choose Folder button
+        self.choose_disk_folder_button = QPushButton("Choose Folder")
+        self.choose_disk_folder_button.setVisible(False)
+        self.disk_cache_textfield = QLineEdit()
+        self.choose_disk_folder_button.setToolTip("Choose a folder to use for the disk cache.")
+        self.choose_disk_folder_button.clicked.connect(self.on_choose_disk_folder_button_clicked)
+        layout.addWidget(self.choose_disk_folder_button, 19 + len(gpu_stats), 1)
+
+        # Add horizontal line to seperate the Checkboxes
+        line = QFrame()
+        line.setFrameShape(QFrame.HLine)
+        line.setFrameShadow(QFrame.Sunken)
+        layout.addWidget(line, 21 + len(gpu_stats), 0, 1, 3)
 
         # Authentication Checkbox
         self.authentication_checkbox = QCheckBox("Authentication")
         self.authentication_checkbox.setToolTip("Enable gradio authentication")
-        layout.addWidget(self.authentication_checkbox)
+        layout.addWidget(self.authentication_checkbox, 22 + len(gpu_stats), 0)
         self.authentication_checkbox.stateChanged.connect(self.on_authentication_checkbox_changed)
 
         # Choose File Field
         self.choose_file_label = QLabel("Choose File:")
         self.choose_file_label.setVisible(False)
         self.choose_file_label.setToolTip("Choose a file to use for the authentication credentials. Credentials should be saved like:\nUSERNAME1:PASSWORD1\nUSERNAME2:PASSWORD2")
-        layout.addWidget(self.choose_file_label)
+        layout.addWidget(self.choose_file_label, 23 + len(gpu_stats), 0)
 
         self.choose_file_button = QPushButton("Browse")
         self.choose_file_button.setVisible(False)
         self.choose_file_button.setToolTip("Choose a file to use for the authentication credentials. Credentials should be saved like:\nUSERNAME1:PASSWORD1\nUSERNAME2:PASSWORD2")
         self.choose_file_button.clicked.connect(self.on_choose_file_button_clicked)
-        layout.addWidget(self.choose_file_button)
+        layout.addWidget(self.choose_file_button, 24 + len(gpu_stats), 0)
 
+        # Extensions Selection Menu
+        self.use_extensions_checkbox = QCheckBox("Use Extensions")
+        self.use_extensions_checkbox.setToolTip("Choose the extensions to be loaded.")
+        layout.addWidget(self.use_extensions_checkbox, 25 + len(gpu_stats), 0)
+        self.use_extensions_checkbox.stateChanged.connect(self.on_use_extensions_checkbox_changed)
 
-        # Extensions List
         self.extensions_list = QListWidget()
         self.extensions_list.setToolTip("Choose the extensions to be loaded.")
-        layout.addWidget(QLabel("Choose Extensions:"))
+        layout.addWidget(self.extensions_list, 25 + len(gpu_stats), 1, 1, 2)
-        layout.addWidget(self.extensions_list)
+        self.extensions_list.setVisible(False)
         extensions = [name for name in os.listdir(extensions_folder) if os.path.isdir(os.path.join(extensions_folder, name))]
 
         for extension in extensions:
@@ -165,26 +337,49 @@ class MainWindow(QMainWindow):
             item.setCheckState(Qt.Unchecked)
             self.extensions_list.addItem(item)
 
+        # Lora selection menu
+        self.use_lora_checkbox = QCheckBox("Use Loras")
+        self.use_lora_checkbox.setToolTip("Choose the loras to be loaded.")
+        layout.addWidget(self.use_lora_checkbox, 26 + len(gpu_stats), 0)
+        self.use_lora_checkbox.stateChanged.connect(self.on_use_lora_checkbox_changed)
+
+        self.lora_list = QListWidget()
+        self.lora_list.setToolTip("Choose the loras to be loaded.")
+        layout.addWidget(self.lora_list, 26 + len(gpu_stats), 1, 1, 2)
+        self.lora_list.setVisible(False)
+        
+        loras = [name for name in os.listdir(loras_folder) if os.path.isdir(os.path.join(loras_folder, name))]
+        for lora in loras:
+            item = QListWidgetItem(lora)
+            item.setFlags(item.flags() | Qt.ItemIsUserCheckable)
+            item.setCheckState(Qt.Unchecked)
+            self.lora_list.addItem(item)
+
         # Use Whole Local Network
         self.use_network_checkbox = QCheckBox("Local Network Mode")
         self.use_network_checkbox.setToolTip("By default, the WebUI will only be reachable by the PC running it.\nIf you want to use it also on other devices, check this")
-        layout.addWidget(self.use_network_checkbox)
+        layout.addWidget(self.use_network_checkbox, 30 + len(gpu_stats), 0)
     
         # Listen Port Checkbox and Text Field
         self.listen_port_checkbox = QCheckBox("Listen Port")
         self.listen_port_checkbox.setToolTip("Choose the Port to use for the WebUI.\nDefault is 7680. If you want to use Stable Diffusion at the same time,\nor got other services running on this Port, you can change it in the textfield.")
         self.listen_port_checkbox.stateChanged.connect(self.on_listen_port_checkbox_changed)
-        layout.addWidget(self.listen_port_checkbox)
+        layout.addWidget(self.listen_port_checkbox, 30 + len(gpu_stats), 1)
     
         self.listen_port_textfield = QLineEdit()
         self.listen_port_textfield.setPlaceholderText("Enter port number")
         self.listen_port_textfield.setEnabled(False)
-        layout.addWidget(self.listen_port_textfield)
+        layout.addWidget(self.listen_port_textfield, 31 + len(gpu_stats), 1)
     
-        # Use Whole Local Network
+        # Use Automatically opens the Browser when finished loading the webui
         self.use_autolaunch_checkbox = QCheckBox("Auto open Browser")
         self.use_autolaunch_checkbox.setToolTip("Automatically Opens your browser when loading is finished")
-        layout.addWidget(self.use_autolaunch_checkbox)
+        layout.addWidget(self.use_autolaunch_checkbox, 32 + len(gpu_stats), 0)
+
+        # Auto Close the GUI when pressing start.
+        self.use_autoclose_checkbox = QCheckBox("Close GUI on Start")
+        self.use_autoclose_checkbox.setToolTip("Auto Close the GUI when pressing start button.")
+        layout.addWidget(self.use_autoclose_checkbox, 32 + len(gpu_stats), 1)
     
         central_widget = QWidget()
         central_widget.setLayout(layout)
@@ -193,35 +388,77 @@ class MainWindow(QMainWindow):
         self.start_button = QPushButton("Start")
         self.start_button.setToolTip("Starts the Webui with the settings set by this GUI")
         self.start_button.clicked.connect(self.on_start_button_clicked)
-        layout.addWidget(self.start_button)
+        layout.addWidget(self.start_button, 33 + len(gpu_stats), 0)
 
         self.save_button = QPushButton("Save Settings")
         self.save_button.setToolTip("You can Save your current Settings. Neat, isn't it?")
         self.save_button.clicked.connect(self.on_save_button_clicked)
-        layout.addWidget(self.save_button)
+        layout.addWidget(self.save_button, 34 + len(gpu_stats), 0)
 
         # Textfield for the Profile Name
         self.profile_name_textfield = QLineEdit()
         self.profile_name_textfield.setPlaceholderText("Enter Name for the Profile, keep empty to overwrite default")
         self.profile_name_textfield.setToolTip("You can leave this blank, then only the default profile will be overwritten. If you want to get some organizing done, you can name it. For example:\nProfile for RP\nProfile for Chat\nProfile for coding\nProfile for Superbooga\nERROR: 404 no limits found")
-        layout.addWidget(self.profile_name_textfield)
+        layout.addWidget(self.profile_name_textfield, 35 + len(gpu_stats), 0)
-
-        # Save current Settings
-        self.destroyed.connect(self.save_settings)
 
         # Profiles Dropdown
         self.profiles_dropdown = QComboBox()
         self.populate_profiles_dropdown()
         self.profiles_dropdown.setToolTip("Here you can choose which profile you want to load. Choose, Load, Profit.")
-        layout.addWidget(QLabel("Choose Profile:"))
+        layout.addWidget(QLabel("Choose Profile:"), 33 + len(gpu_stats), 1)
-        layout.addWidget(self.profiles_dropdown)
+        layout.addWidget(self.profiles_dropdown, 35 + len(gpu_stats), 1)
     
         # Load Button
         self.load_button = QPushButton("Load")
         self.load_button.setToolTip("It's a button. That loads a selected Profile. Sometimes, I'm just create explaining things.")
         self.load_button.clicked.connect(self.on_load_button_clicked)
-        layout.addWidget(self.load_button)
+        layout.addWidget(self.load_button, 34 + len(gpu_stats), 1)
 
+    def on_use_extensions_checkbox_changed(self, state):
+        self.extensions_list.setVisible(state == Qt.Checked)
+
+    def on_use_lora_checkbox_changed(self, state):
+        self.lora_list.setVisible(state == Qt.Checked)
+
+    
+    def on_use_disk_checkbox_changed(self, state):
+        self.change_disk_cache_checkbox.setVisible(state == Qt.Checked)
+        self.current_disk_cache_label.setVisible(state == Qt.Checked)
+    
+        if state == Qt.Checked:
+            # Check if disk cache path is empty
+            if not self.disk_cache_path:
+                # Set default disk cache path
+                self.disk_cache_path = "/cache"
+                # Update the label text
+                self.current_disk_cache_label.setText(f"Current Cache Folder: {self.disk_cache_path}")
+
+    def on_change_disk_cache_checkbox_changed(self, state):
+        self.choose_disk_folder_label.setVisible(state == Qt.Checked)
+        self.choose_disk_folder_button.setVisible(state == Qt.Checked)
+
+    def on_choose_disk_folder_button_clicked(self):
+        folder = QFileDialog.getExistingDirectory(self, "Choose Disk Cache Folder")
+        if folder:
+            self.disk_cache_textfield.setText(folder)
+            self.disk_cache_path = folder
+            self.current_disk_cache_label.setText(f"Current Cache Folder: {self.disk_cache_path}")
+
+    def show_error_message(self, message):
+        QMessageBox.critical(self, "Error", message)
+
+    def reload_models(self):
+        model_folders = [name for name in os.listdir(model_folder) if os.path.isdir(os.path.join(model_folder, name))]
+        self.model_dropdown.clear()  # Clear the existing items
+        self.model_dropdown.addItems(model_folders)  # Add the updated items
+
+    def set_ram_slider_max(self):
+        ram_size = psutil.virtual_memory().available
+        ram_size_gb = ram_size // (1024 ** 3)
+        self.ram_slider.setMaximum(ram_size_gb)
+
+    def on_ram_slider_changed(self, value):
+        self.ram_value_label.setText(f"{value} GiB")
 
     def on_pre_layer_slider_changed(self, value):
         # Update the value label with the current value of the pre-layer slider
@@ -231,6 +468,57 @@ class MainWindow(QMainWindow):
         self.gpu_vram_labels[gpu_idx].setText(f"{value} GiB")
         #print(f"GPU {gpu_idx} VRAM usage: {value} GiB")
 
+    def on_gpu_radio_button_toggled(self, checked):
+        # Hide/show GPU-related widgets
+        for slider, label_vram, label_gpu in zip(self.gpu_vram_sliders, self.gpu_vram_labels, self.gpu_labels):
+            slider.setVisible(checked)
+            label_vram.setVisible(checked)
+            label_gpu.setVisible(checked)
+    
+        # Hide RAM slider and value label
+        self.ram_label.hide()
+        self.ram_slider.hide()
+        self.ram_value_label.hide()
+    
+        # Uncheck CPU and Autodevice radio buttons
+        if checked:
+            self.cpu_radio_button.setChecked(False)
+            self.auto_radio_button.setChecked(False)
+    
+    def on_cpu_radio_button_toggled(self, checked):
+        # Hide/show GPU-related widgets
+        for slider, label_vram, label_gpu in zip(self.gpu_vram_sliders, self.gpu_vram_labels, self.gpu_labels):
+            slider.hide()
+            label_vram.hide()
+            label_gpu.hide()
+    
+        # Show RAM slider and value label
+        self.ram_label.setVisible(checked)
+        self.ram_slider.setVisible(checked)
+        self.ram_value_label.setVisible(checked)
+    
+        # Uncheck GPU and Autodevice radio buttons
+        if checked:
+            self.gpu_radio_button.setChecked(False)
+            self.auto_radio_button.setChecked(False)
+    
+    def on_auto_radio_button_toggled(self, checked):
+        # Hide/show GPU-related widgets
+        for slider, label_vram, label_gpu in zip(self.gpu_vram_sliders, self.gpu_vram_labels, self.gpu_labels):
+            slider.hide()
+            label_vram.hide()
+            label_gpu.hide()
+    
+        # Hide RAM slider and value label
+        self.ram_label.hide()
+        self.ram_slider.hide()
+        self.ram_value_label.hide()
+    
+        # Uncheck GPU and CPU radio buttons
+        if checked:
+            self.gpu_radio_button.setChecked(False)
+            self.cpu_radio_button.setChecked(False)
+
     def on_listen_port_checkbox_changed(self, state):
         self.listen_port_textfield.setEnabled(state == Qt.Checked)
 
@@ -251,34 +539,60 @@ class MainWindow(QMainWindow):
 
     def on_save_button_clicked(self):
         settings = {
-            "model": self.model_dropdown.currentText(),
+            "model": self.model_dropdown.currentText(), # Saves the Current selected Model
-            "wbits": self.wbit_dropdown.currentText(),
+            "model_type": self.model_type.currentText(), # Saves the Current selected Model Type
-            "groupsize": self.gsize_dropdown.currentText(),
+            "wbits": self.wbit_dropdown.currentText(), # Saves the WBIT Setting
-            "mode": self.mode_dropdown.currentText(),
+            "groupsize": self.gsize_dropdown.currentText(), # Saves the Groupsize
-            "use_gpu": self.use_gpu_checkbox.isChecked(),
+            "mode": self.mode_dropdown.currentText(), # Saves the selected interaction mode (Chat,cai_chat,Notebook)
-            "prelayer": self.pre_layer_value_label.text(),
+            "use_gpu": self.gpu_radio_button.isChecked(),  # Save the state of the GPU radio button
-            "use_8bit": self.use_8bit_checkbox.isChecked(),
+            "use_cpu": self.cpu_radio_button.isChecked(),  # Save the state of the CPU radio button
-            "autolaunch": self.use_autolaunch_checkbox.isChecked(),
+            "use_auto": self.auto_radio_button.isChecked(),  # Save the state of the auto device radio button
-            "listen": self.use_network_checkbox.isChecked(),
+            "built_in_ram": self.ram_slider.value(),  # Save the value of the built-in RAM slider
-            "listen_port": self.listen_port_checkbox.isChecked(),
+            "prelayer": self.pre_layer_value_label.text(), # Saves the Prelayer value
-            "port_number": self.listen_port_textfield.text(),
+            "use_8bit": self.use_8bit_checkbox.isChecked(), # Saves the state of the 8bit checkbox
-            "authentication": self.authentication_checkbox.isChecked(),
+            "no_stream": self.use_nostream_checkbox.isChecked(), # Saves the state of the no_stream checkbox
+            "use_16bit": self.use_16bit_checkbox.isChecked(), # Saves the state of the use_16bit checkbox
+            "use_disk": self.use_disk_checkbox.isChecked(), # Saves the state of the use_disk checkbox
+            "disk_cache": self.disk_cache_textfield.text(), # Saves the state of the disk_cache textfield
+            "xformers": self.use_xformers_checkbox.isChecked(), # Saves the state of the xformers checkbox
+            "trust_remote_code": self.use_trc_checkbox.isChecked(), # Saves the state of the trust_remote_code checkbox
+            "monkeypatch": self.use_monkey_checkbox.isChecked(), # Saves the state of the monkeypatch checkbox
+            "quant_attn": self.use_quant_checkbox.isChecked(), # Saves the state of the quant_attn checkbox
+            "autotune": self.use_autotune_checkbox.isChecked(), # Saves the state of the autotune checkbox
+            "autolaunch": self.use_autolaunch_checkbox.isChecked(), # Saves the state of the autotune checkbox
+            "autoclose": self.use_autoclose_checkbox.isChecked(), # Saves the state of the autotune checkbox
+            "nocache": self.use_nocache_checkbox.isChecked(), # Saves the state of the autotune checkbox
+            "listen": self.use_network_checkbox.isChecked(), # Saves the state of the Local Network Checkbox
+            "listen_port": self.listen_port_checkbox.isChecked(), # Saves the state of the Listen Port Checkbox
+            "port_number": self.listen_port_textfield.text(), # Saves the Port given in the Textbox
+            "authentication": self.authentication_checkbox.isChecked(), # Saves the state of the Authentication
             "authentication_file": self.choose_file_label.text(),  # Save the authentication file path
-            "gpu_vram": [slider.value() for slider in self.gpu_vram_sliders],
+            "gpu_vram": [slider.value() for slider in self.gpu_vram_sliders], # Saves the VRAM Values
-            "extensions": [self.extensions_list.item(i).text() for i in range(self.extensions_list.count()) if self.extensions_list.item(i).checkState() == Qt.Checked]
+            "use_extension": self.use_extensions_checkbox.isChecked(), # Saves the state of the Extension Checkbox
+            "extensions": [self.extensions_list.item(i).text() for i in range(self.extensions_list.count()) if self.extensions_list.item(i).checkState() == Qt.Checked], # Saves the chosen Extensions
+            "use_lora": self.use_lora_checkbox.isChecked(), # Saves the state of the Lora Checkbox
+            "loras": [self.lora_list.item(i).text() for i in range(self.lora_list.count()) if self.lora_list.item(i).checkState() == Qt.Checked] # Saves the chosen loras
         }
 
         # Get the text entered in the text field
         profile_name = self.profile_name_textfield.text()
-    
         if not profile_name:
             profile_name = "default"
-    
         file_path = os.path.join(profiles_folder, f"{profile_name}.json")
-    
         with open(file_path, "w") as file:
             json.dump(settings, file, indent=4)
 
+    def expression_check(self, command):
+        selected_model = self.model_dropdown.currentText()
+        #print(f"Selected model: {selected_model}")
+        
+        # Use a regular expression to check if the selected model matches the pattern
+        if re.search(r".*mpt.*7b", selected_model, re.IGNORECASE):
+            # Run the additional commands
+            run_cmd_with_conda("pip install einops && exit")
+        elif re.search(r".*vicuna.*7b", selected_model, re.IGNORECASE):
+            pass
+
     def on_start_button_clicked(self):
         command = ""
 
@@ -286,32 +600,101 @@ class MainWindow(QMainWindow):
         chosen_model = self.model_dropdown.currentText()
         command += f" --model {chosen_model}"
 
+        # Add the chosen model type to the command
+        chosen_model_type = self.model_type.currentText()
+        if self.model_type.currentText() != "none":
+            command += f" --model_type {chosen_model_type}"
+
+        # Add loras to the command
+#        if self.loras_checkbox.isChecked():
+#            loras = self.lora_list.item(i).text() for i in range(self.lora_list.count()) if self.lora_list.item(i).checkState() == Qt.Checked
+#            command += f" --lora {loras}"
+        loras = [self.lora_list.item(i).text() for i in range(self.lora_list.count()) if self.lora_list.item(i).checkState() == Qt.Checked]
+        if self.use_lora_checkbox.isChecked():
+            if loras:
+                command += f" --lora {' '.join(loras)}"
+
         # Adds wbits to the command, if not "none"
         chosen_wbits = self.wbit_dropdown.currentText()
         if self.wbit_dropdown.currentText() != "none":
+            if not self.cpu_radio_button.isChecked():
                 command += f" --wbits {chosen_wbits}"
 
         # Adds Groupsize to the command, if not "none"
         chosen_gsize = self.gsize_dropdown.currentText()
         if self.gsize_dropdown.currentText() != "none":
+            if not self.cpu_radio_button.isChecked():
                 command += f" --groupsize {chosen_gsize}"
 
         # Add the chosen mode to the command (Chat, cai-chat, notebook)
         chosen_mode = self.mode_dropdown.currentText()
         command += f" --{chosen_mode}"
 
-        # Add GPU-related options if the "Use GPU" checkbox is checked
+        # Handle GPU or CPU selection
-        if self.use_gpu_checkbox.isChecked():
+        if self.gpu_radio_button.isChecked():
+            # GPU radio button is selected
+            total_vram = sum(slider.value() for slider in self.gpu_vram_sliders)
+            if total_vram == 0:
+                error_message = "Error:\nAt least one VRAM value must be greater than 0 for GPU execution."
+                self.show_error_message(error_message)
+            else:
                 command += " --gpu-memory"
-            for idx, slider in enumerate(self.gpu_vram_sliders):
+                for vram in [slider.value() for slider in self.gpu_vram_sliders]:
-                vram = slider.value()
                     if vram > 0:
                         command += f" {vram}"
+        elif self.cpu_radio_button.isChecked():
+            # CPU radio button is selected
+            command += " --cpu-memory"
+            ram_value = self.ram_slider.value()
+            if ram_value > 0:
+                command += f" {ram_value}"
+            else:
+                # Display an error message in a dialog box when RAM value is 0
+                error_message = "Error:\nRAM value cannot be 0 for CPU execution."
+                self.show_error_message(error_message)
+                return
+        elif self.auto_radio_button.isChecked():
+            command += " --auto-device"
 
         # Add 8bit loading
         if self.use_8bit_checkbox.isChecked():
             command += " --load-in-8bit"
 
+        # Add no-stream
+        if self.use_nostream_checkbox.isChecked():
+            command += " --no-stream"
+
+        # Add 16bit full precision loading
+        if self.use_16bit_checkbox.isChecked():
+            command += " --bf16"
+
+        # Add xformers loading
+        if self.use_xformers_checkbox.isChecked():
+            command += " --xformers"
+
+        # Use "Trust Remote Code=TRUE" for ex. MPT-7B
+        if self.use_trc_checkbox.isChecked():
+            command += " --trust-remote-code"
+        if re.search(r"mpt.*7b", chosen_model):
+            if not self.use_trc_checkbox.isChecked():
+                command += " --trust-remote-code"
+
+        # Use Triton Warmup & Autotune
+        if self.use_autotune_checkbox.isChecked():
+            command += " --warmup_autotune"
+
+        # Add loading with Monkey Patch 
+        if self.use_monkey_checkbox.isChecked():
+            command += " --monkey-patch"
+
+        # Enable quant attention
+        if self.use_quant_checkbox.isChecked():
+            command += " --quant_attn"
+
+        # Disable Cache
+        if self.use_nocache_checkbox.isChecked():
+            command += " --no-cache"
+
         # Add --auto-launch
         if self.use_autolaunch_checkbox.isChecked():
             command += " --auto-launch"
@@ -320,6 +703,13 @@ class MainWindow(QMainWindow):
         if self.use_network_checkbox.isChecked():
             command += " --listen"
 
+        # Use Disk to store part of the Model
+        if self.use_disk_checkbox.isChecked():
+            command += " --disk"
+            if self.change_disk_cache_checkbox.isChecked():
+                if self.disk_cache_textfield.text():
+                    command += f" --disk-cache-dir {self.disk_cache_textfield.text()}"
+
         # Add listen port if the checkbox is checked and a port number is provided
         if self.listen_port_checkbox.isChecked():
             listen_port = self.listen_port_textfield.text()
@@ -337,34 +727,22 @@ class MainWindow(QMainWindow):
 
         # Adds the chosen extensions to the list of the command.
         extensions = [self.extensions_list.item(i).text() for i in range(self.extensions_list.count()) if self.extensions_list.item(i).checkState() == Qt.Checked]
+        if self.use_extensions_checkbox.isChecked():
             if extensions:
                 command += f" --extensions {' '.join(extensions)}"
 
-        # Runs the WebuiGUI.py with the commands that were chosen by the User in the GUI.
+        # Just for debugging.
+        #print(f"Command generated: python webuiGUI.py {command}")
+
+        # Based on the Model that's chosen, we will take care of some necessary stuff.
+        # Starts the webui in the conda env with the user given Options
         run_cmd_with_conda(f"python webuiGUI.py {command}")
-        # print(f"Command generate: python webuiGUI.py {command}")
-        exit()
 
-    def save_settings(self):
+        if self.use_autoclose_checkbox.isChecked():
-        settings = {
+            sys.exit()
-            "model": self.model_dropdown.currentText(),
-            "wbits": self.wbit_dropdown.currentText(),
-            "groupsize": self.gsize_dropdown.currentText(),
-            "mode": self.mode_dropdown.currentText(),
-            "use_gpu": self.use_gpu_checkbox.isChecked(),
-            "prelayer": self.pre_layer_value_label.text(),
-            "use_8bit": self.use_8bit_checkbox.isChecked(),
-            "listen": self.use_network_checkbox.isChecked(),
-            "listen_port": self.listen_port_checkbox.isChecked(),
-            "port_number": self.listen_port_textfield.text(),
-            "authentication": self.authentication_checkbox.isChecked(),
-            "authentication_file": self.choose_file_label.text(),  # Save the authentication file path
-            "gpu_vram": [slider.value() for slider in self.gpu_vram_sliders],
-            "extensions": [self.extensions_list.item(i).text() for i in range(self.extensions_list.count()) if self.extensions_list.item(i).checkState() == Qt.Checked]
-        }
             
-        with open(settings_file, "w") as file:
+    def on_update_button_clicked(self):
-            json.dump(settings, file, indent=4)
+        run_cmd_with_conda("python webuiGUI.py --update")
 
     def load_profile(self, profile_file):
         with open(profile_file, "r") as file:
@@ -389,31 +767,44 @@ class MainWindow(QMainWindow):
         profile_name = selected_profile.replace(".json", "")
         self.profile_name_textfield.setText(profile_name)
 
-    def load_settings(self):
+    def apply_load_settings(self, settings):
-        default_profile = os.path.join(profiles_folder, "default.json")
-        if os.path.exists(default_profile):
-            with open(default_profile, "r") as file:
-                try:
-                    settings = json.load(file)
-
         self.model_dropdown.setCurrentText(settings.get("model", ""))
+        self.model_type.setCurrentText(settings.get("model_type", ""))
         self.wbit_dropdown.setCurrentText(settings.get("wbits", ""))
         self.gsize_dropdown.setCurrentText(settings.get("groupsize", ""))
         self.mode_dropdown.setCurrentText(settings.get("mode", ""))
-                    self.use_gpu_checkbox.setChecked(settings.get("use_gpu", False))
+        use_gpu = settings.get("use_gpu", False)
+        use_cpu = settings.get("use_cpu", False)
+        self.gpu_radio_button.setChecked(use_gpu)
+        self.cpu_radio_button.setChecked(use_cpu)
+        built_in_ram = settings.get("built_in_ram", 0)
+        self.ram_slider.setValue(built_in_ram)
         self.listen_port_checkbox.setChecked(settings.get("listen_port", False))
         self.listen_port_textfield.setText(settings.get("port_number", ""))
         self.use_8bit_checkbox.setChecked(settings.get("use_8bit", False))
+        self.use_nostream_checkbox.setChecked(settings.get("no_stream", False))
+        self.use_16bit_checkbox.setChecked(settings.get("use_16bit", False))
+        self.use_disk_checkbox.setChecked(settings.get("use_disk", False))
+        self.disk_cache_textfield.setText(settings.get("disk_cache", ""))
+        self.current_disk_cache_label.setText(f"Current folder: {settings.get('disk_cache', '')}")
+        self.use_xformers_checkbox.setChecked(settings.get("xformers", False))
+        self.use_trc_checkbox.setChecked(settings.get("trust_remote_code", False))
+        self.use_monkey_checkbox.setChecked(settings.get("monkeypatch", False))
+        self.use_quant_checkbox.setChecked(settings.get("quant_attn", False))
+        self.use_autotune_checkbox.setChecked(settings.get("autotune", False))
+        self.use_autolaunch_checkbox.setChecked(settings.get("autolaunch", False))
+        self.use_autoclose_checkbox.setChecked(settings.get("autoclose", False))
+        self.use_nocache_checkbox.setChecked(settings.get("nocache", False))
         self.authentication_checkbox.setChecked(settings.get("authentication", False))
         self.choose_file_label.setText(settings.get("authentication_file", ""))
         self.pre_layer_slider.setValue(int(settings.get("prelayer", 0)))
         self.use_autolaunch_checkbox.setChecked(settings.get("autolaunch", False))
         self.use_network_checkbox.setChecked(settings.get("listen", False))
-
         gpu_vram_settings = settings.get("gpu_vram", [])
         for idx, slider in enumerate(self.gpu_vram_sliders):
             if idx < len(gpu_vram_settings):
                 slider.setValue(gpu_vram_settings[idx])
+        self.use_extensions_checkbox.setChecked(settings.get("use_extension", False))
         extensions_settings = settings.get("extensions", [])
         for i in range(self.extensions_list.count()):
             extension = self.extensions_list.item(i).text()
@@ -421,7 +812,23 @@ class MainWindow(QMainWindow):
                 self.extensions_list.item(i).setCheckState(Qt.Checked)
             else:
                 self.extensions_list.item(i).setCheckState(Qt.Unchecked)
+        self.use_lora_checkbox.setChecked(settings.get("use_lora", False))
+        lora_settings = settings.get("loras", [])
+        for i in range(self.lora_list.count()):
+            lora = self.lora_list.item(i).text()
+            if lora in lora_settings:
+                self.lora_list.item(i).setCheckState(Qt.Checked)
+            else:
+                self.lora_list.item(i).setCheckState(Qt.Unchecked)
 
+
+    def load_settings(self):
+        default_profile = os.path.join(profiles_folder, "default.json")
+        if os.path.exists(default_profile):
+            with open(default_profile, "r") as file:
+                try:
+                    settings = json.load(file)
+                    self.apply_load_settings(settings)                
                 except json.JSONDecodeError:
                     # Handle the case when the file is empty or not in valid JSON format
                     pass
@@ -430,45 +837,13 @@ class MainWindow(QMainWindow):
         with open(profile_file, "r") as file:
             try:
                 settings = json.load(file)
-                
+                self.apply_load_settings(settings)
-                # Apply the loaded settings to the GUI elements
-                self.model_dropdown.setCurrentText(settings.get("model", ""))
-                self.wbit_dropdown.setCurrentText(settings.get("wbits", ""))
-                self.gsize_dropdown.setCurrentText(settings.get("groupsize", ""))
-                self.mode_dropdown.setCurrentText(settings.get("mode", ""))
-                self.use_gpu_checkbox.setChecked(settings.get("use_gpu", False))
-                self.listen_port_checkbox.setChecked(settings.get("listen_port", False))
-                self.listen_port_textfield.setText(settings.get("port_number", ""))
-                self.use_8bit_checkbox.setChecked(settings.get("use_8bit", False))
-                self.authentication_checkbox.setChecked(settings.get("authentication", False))
-                self.choose_file_label.setText(settings.get("authentication_file", ""))
-                self.pre_layer_slider.setValue(int(settings.get("prelayer", 0)))
-                self.use_autolaunch_checkbox.setChecked(settings.get("autolaunch", False))
-                self.use_network_checkbox.setChecked(settings.get("listen", False))
-    
-                gpu_vram_settings = settings.get("gpu_vram", [])
-                for idx, slider in enumerate(self.gpu_vram_sliders):
-                    if idx < len(gpu_vram_settings):
-                        slider.setValue(gpu_vram_settings[idx])
-                
-                extensions_settings = settings.get("extensions", [])
-                for i in range(self.extensions_list.count()):
-                    extension = self.extensions_list.item(i).text()
-                    if extension in extensions_settings:
-                        self.extensions_list.item(i).setCheckState(Qt.Checked)
-                    else:
-                        self.extensions_list.item(i).setCheckState(Qt.Unchecked)
-            
             except json.JSONDecodeError:
                 # Handle the case when the file is empty or not in valid JSON format
                 pass
 
-
 if __name__ == "__main__":
     app = QApplication(sys.argv)
-
     main_window = MainWindow()
     main_window.show()
-
     sys.exit(app.exec_())
-

requirements.txt

@@ -1,2 +1,3 @@
 PyQt5
 gpustat
+psutil