diff --git a/requirements.txt b/requirements.txt index de6aab6..79c28ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -PyQt6~=6.7.1 psutil~=5.9.8 requests~=2.32.3 numpy<2.0.0 torch~=1.13.1 sentencepiece~=0.2.0 PyYAML~=6.0.2 -pynvml~=11.5.3 \ No newline at end of file +pynvml~=11.5.3 +PySide6~=6.7.2 \ No newline at end of file diff --git a/src/AutoGGUF.py b/src/AutoGGUF.py index f30d1b9..04f2b47 100644 --- a/src/AutoGGUF.py +++ b/src/AutoGGUF.py @@ -6,9 +6,9 @@ import psutil import requests -from PyQt6.QtCore import * -from PyQt6.QtGui import * -from PyQt6.QtWidgets import * +from PySide6.QtCore import * +from PySide6.QtGui import * +from PySide6.QtWidgets import * from DownloadThread import DownloadThread diff --git a/src/DownloadThread.py b/src/DownloadThread.py index 5c576dc..d27403a 100644 --- a/src/DownloadThread.py +++ b/src/DownloadThread.py @@ -2,13 +2,13 @@ import zipfile import requests -from PyQt6.QtCore import * +from PySide6.QtCore import * class DownloadThread(QThread): - progress_signal = pyqtSignal(int) - finished_signal = pyqtSignal(str) - error_signal = pyqtSignal(str) + progress_signal = Signal(int) + finished_signal = Signal(str) + error_signal = Signal(str) def __init__(self, url, save_path): super().__init__() diff --git a/src/GPUMonitor.py b/src/GPUMonitor.py index cb4a3e4..4f460c9 100644 --- a/src/GPUMonitor.py +++ b/src/GPUMonitor.py @@ -1,7 +1,7 @@ import pynvml -from PyQt6.QtCore import QTimer -from PyQt6.QtGui import QPainter, QPen, QColor -from PyQt6.QtWidgets import ( +from PySide6.QtCore import QTimer +from PySide6.QtGui import QPainter, QPen, QColor +from PySide6.QtWidgets import ( QWidget, QHBoxLayout, QVBoxLayout, diff --git a/src/KVOverrideEntry.py b/src/KVOverrideEntry.py index 6d73c85..2c4b42c 100644 --- a/src/KVOverrideEntry.py +++ b/src/KVOverrideEntry.py @@ -1,6 +1,6 @@ -from PyQt6.QtWidgets import QWidget, QHBoxLayout, QLineEdit, QComboBox, QPushButton -from PyQt6.QtCore import pyqtSignal, QRegularExpression -from PyQt6.QtGui import QDoubleValidator, QIntValidator, QRegularExpressionValidator +from PySide6.QtWidgets import QWidget, QHBoxLayout, QLineEdit, QComboBox, QPushButton +from PySide6.QtCore import Signal, QRegularExpression +from PySide6.QtGui import QDoubleValidator, QIntValidator, QRegularExpressionValidator from datetime import datetime import time import os @@ -9,7 +9,7 @@ class KVOverrideEntry(QWidget): - deleted = pyqtSignal(QWidget) + deleted = Signal(QWidget) def __init__(self, parent=None): super().__init__(parent) diff --git a/src/Logger.py b/src/Logger.py index 4e77c80..30b8d75 100644 --- a/src/Logger.py +++ b/src/Logger.py @@ -1,7 +1,6 @@ import logging from logging.handlers import RotatingFileHandler import os -import sys from datetime import datetime diff --git a/src/ModelInfoDialog.py b/src/ModelInfoDialog.py index cb7d12c..161c1d5 100644 --- a/src/ModelInfoDialog.py +++ b/src/ModelInfoDialog.py @@ -1,4 +1,4 @@ -from PyQt6.QtWidgets import * +from PySide6.QtWidgets import * class ModelInfoDialog(QDialog): diff --git a/src/QuantizationThread.py b/src/QuantizationThread.py index e7c12c3..a7d6bbf 100644 --- a/src/QuantizationThread.py +++ b/src/QuantizationThread.py @@ -1,29 +1,19 @@ -from PyQt6.QtWidgets import * -from PyQt6.QtCore import * -from PyQt6.QtGui import * -import os -import sys -import psutil -import subprocess -import time import signal -import json -import platform -import requests -import zipfile -import traceback -from datetime import datetime +import subprocess + +from PySide6.QtCore import * + from imports_and_globals import open_file_safe from localizations import * class QuantizationThread(QThread): # Define custom signals for communication with the main thread - output_signal = pyqtSignal(str) - status_signal = pyqtSignal(str) - finished_signal = pyqtSignal() - error_signal = pyqtSignal(str) - model_info_signal = pyqtSignal(dict) + output_signal = Signal(str) + status_signal = Signal(str) + finished_signal = Signal() + error_signal = Signal(str) + model_info_signal = Signal(dict) def __init__(self, command, cwd, log_file): super().__init__() diff --git a/src/TaskListItem.py b/src/TaskListItem.py index f97f08b..dfe5aaa 100644 --- a/src/TaskListItem.py +++ b/src/TaskListItem.py @@ -1,17 +1,5 @@ -from PyQt6.QtWidgets import * -from PyQt6.QtCore import * -from PyQt6.QtGui import * -import os -import sys -import psutil -import subprocess -import time -import signal -import json -import platform -import requests -import zipfile -from datetime import datetime +from PySide6.QtCore import * +from PySide6.QtWidgets import * class TaskListItem(QWidget): diff --git a/src/error_handling.py b/src/error_handling.py index 46588f4..98534d8 100644 --- a/src/error_handling.py +++ b/src/error_handling.py @@ -1,4 +1,4 @@ -from PyQt6.QtWidgets import QMessageBox +from PySide6.QtWidgets import QMessageBox from localizations import * diff --git a/src/imports_and_globals.py b/src/imports_and_globals.py index 246d1bf..d09b0c2 100644 --- a/src/imports_and_globals.py +++ b/src/imports_and_globals.py @@ -9,7 +9,7 @@ import requests import zipfile from datetime import datetime -from PyQt6.QtWidgets import ( +from PySide6.QtWidgets import ( QApplication, QMainWindow, QVBoxLayout, @@ -35,8 +35,8 @@ QPlainTextEdit, QMenu, ) -from PyQt6.QtCore import QTimer, QThread, pyqtSignal, Qt, QSize -from PyQt6.QtGui import QCloseEvent, QAction +from PySide6.QtCore import QTimer, Signal, QThread, Qt, QSize +from PySide6.QtGui import QCloseEvent, QAction def ensure_directory(path): diff --git a/src/main.py b/src/main.py index d466fc6..65d07ae 100644 --- a/src/main.py +++ b/src/main.py @@ -1,5 +1,5 @@ import sys -from PyQt6.QtWidgets import QApplication +from PySide6.QtWidgets import QApplication from AutoGGUF import AutoGGUF if __name__ == "__main__":