pygpt-net 2.6.20__py3-none-any.whl → 2.6.22__py3-none-any.whl

pygpt_net/ui/widget/dialog/base.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.01 03:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QApplication
@@ -58,42 +58,45 @@ class BaseDialog(QDialog):
         if self.window is None or self.id is None:
             return False
 
-        if not self.window.core.config.has("layout.dialog.geometry.store") \
-                or not self.window.core.config.get("layout.dialog.geometry.store"):
+        config = self.window.core.config
+        if not config.has("layout.dialog.geometry.store") \
+                or not config.get("layout.dialog.geometry.store"):
             return False
 
         return True
 
     def save_geometry(self):
         """Save dialog geometry"""
+        config = self.window.core.config
         item = {
             "size": [self.size().width(), self.size().height()],
             "pos": [self.pos().x(), self.pos().y()]
         }
         if self.store_geometry_enabled():
-            data = self.window.core.config.get("layout.dialog.geometry", {})
+            data = config.get("layout.dialog.geometry", {})
         else:
-            data = self.window.core.config.get_session("layout.dialog.geometry", {})
+            data = config.get_session("layout.dialog.geometry", {})
 
         if not isinstance(data, dict):
             data = {}
         data[self.id] = item
 
         if self.store_geometry_enabled():
-            self.window.core.config.set("layout.dialog.geometry", data)
+            config.set("layout.dialog.geometry", data)
         else:
-            self.window.core.config.set_session("layout.dialog.geometry", data)
+            config.set_session("layout.dialog.geometry", data)
 
     def restore_geometry(self):
         """Restore dialog geometry"""
         # get available screen geometry
         screen = QApplication.primaryScreen()
         available_geometry = screen.availableGeometry()
+        config = self.window.core.config
 
         if self.store_geometry_enabled():
-            data = self.window.core.config.get("layout.dialog.geometry", {})
+            data = config.get("layout.dialog.geometry", {})
         else:
-            data = self.window.core.config.get_session("layout.dialog.geometry", {})
+            data = config.get_session("layout.dialog.geometry", {})
 
         if not isinstance(data, dict):
             data = {}

pygpt_net/ui/widget/dialog/editor_file.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.14 18:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 import datetime
@@ -19,8 +19,6 @@ from PySide6.QtWidgets import QMenuBar
 from pygpt_net.utils import trans
 from .base import BaseDialog
 
-import pygpt_net.icons_rc
-
 class EditorFileDialog(BaseDialog):
     def __init__(self, window=None, id="editor_file"):
         """
@@ -47,17 +45,16 @@ class EditorFileDialog(BaseDialog):
 
         :param force: force update
         """
-        title = trans("untitled")
-        if self.file:
-            title = os.path.basename(self.file)
-        if self.is_changed():
+        file = self.file
+        changed = self.is_changed()
+        title = os.path.basename(file) if file else trans("untitled")
+        if changed:
             title += "*"
-        if self.file and os.path.exists(self.file):
-            file_size = self.window.core.filesystem.sizeof_fmt(os.path.getsize(self.file))
-            title += " - {}".format(file_size)
-        if self.is_changed() or force:
-            time = datetime.datetime.now().strftime("%H:%M")
-            title += " (" + time + ")"
+        if file and os.path.exists(file):
+            file_size = self.window.core.filesystem.sizeof_fmt(os.path.getsize(file))
+            title += f" - {file_size}"
+        if changed or force:
+            title += f" ({datetime.datetime.now().strftime('%H:%M')})"
         self.setWindowTitle(title)
 
     def is_changed(self) -> bool:
@@ -66,7 +63,7 @@ class EditorFileDialog(BaseDialog):
 
         :return: True if file was changed
         """
-        return str(self.window.ui.editor[self.id].toPlainText()) != str(self.base_content)
+        return self.window.ui.editor[self.id].toPlainText() != self.base_content
 
     def setup_menu(self) -> QMenuBar:
         """
@@ -74,48 +71,48 @@ class EditorFileDialog(BaseDialog):
 
         :return: menu bar
         """
-        self.menu_bar = QMenuBar()
+        self.menu_bar = QMenuBar(self)
         self.file_menu = self.menu_bar.addMenu(trans("menu.file"))
         self.actions = {}
 
         # new
-        self.actions["new"] = QAction(QIcon(":/icons/add.svg"), trans("action.new"))
+        self.actions["new"] = QAction(QIcon(":/icons/add.svg"), trans("action.new"), self)
         self.actions["new"].triggered.connect(
             lambda: self.window.tools.get("editor").new()
         )
 
         # open
-        self.actions["open"] = QAction(QIcon(":/icons/folder.svg"), trans("action.open"))
+        self.actions["open"] = QAction(QIcon(":/icons/folder.svg"), trans("action.open"), self)
         self.actions["open"].triggered.connect(
             lambda: self.window.tools.get("editor").open_file(self.id, auto_close=True)
         )
 
         # open (new window)
-        self.actions["open_new"] = QAction(QIcon(":/icons/folder.svg"), trans("action.open_new_window"))
+        self.actions["open_new"] = QAction(QIcon(":/icons/folder.svg"), trans("action.open_new_window"), self)
         self.actions["open_new"].triggered.connect(
             lambda: self.window.tools.get("editor").open_file(self.id, auto_close=False)
         )
 
         # save
-        self.actions["save"] = QAction(QIcon(":/icons/save.svg"), trans("action.save"))
+        self.actions["save"] = QAction(QIcon(":/icons/save.svg"), trans("action.save"), self)
         self.actions["save"].triggered.connect(
             lambda: self.window.tools.get("editor").save(self.id)
         )
 
         # save as
-        self.actions["save_as"] = QAction(QIcon(":/icons/save.svg"), trans("action.save_as"))
+        self.actions["save_as"] = QAction(QIcon(":/icons/save.svg"), trans("action.save_as"), self)
         self.actions["save_as"].triggered.connect(
             lambda: self.window.tools.get("editor").save_as_file(self.id)
         )
 
         # clear
-        self.actions["clear"] = QAction(QIcon(":/icons/close.svg"), trans("action.clear"))
+        self.actions["clear"] = QAction(QIcon(":/icons/close.svg"), trans("action.clear"), self)
         self.actions["clear"].triggered.connect(
             lambda: self.window.tools.get("editor").clear(self.id)
         )
 
         # close
-        self.actions["exit"] = QAction(QIcon(":/icons/logout.svg"), trans("menu.file.exit"))
+        self.actions["exit"] = QAction(QIcon(":/icons/logout.svg"), trans("menu.file.exit"), self)
         self.actions["exit"].triggered.connect(
             lambda: self.window.tools.get("editor").close(self.id)
         )
@@ -182,4 +179,4 @@ class EditorFileDialog(BaseDialog):
         if self.id == "editor_file":
             self.window.core.settings.active['editor'] = False
             self.window.controller.settings.close('editor')
-            self.window.controller.settings.update()
+            self.window.controller.settings.update()

pygpt_net/ui/widget/dialog/find.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.10 23:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -25,7 +25,7 @@ class FindDialog(QDialog):
         :param window: main window
         :param id: info window id
         """
-        super(FindDialog, self).__init__(window)
+        super().__init__(window)
         self.window = window
         self.id = id
         self.current = None
@@ -34,29 +34,29 @@ class FindDialog(QDialog):
         self.input.setMinimumWidth(400)
         self.counter = HelpLabel('0/0')
         self.counter.setAlignment(Qt.AlignCenter)
-        self.counter.setMinimumWidth(70)
-        self.counter.setMaximumWidth(70)
-        self.setWindowFlags(self.windowFlags() | Qt.WindowStaysOnTopHint)  # always on top
-
-        self.window.ui.nodes['dialog.find.input'] = self.input
-        self.window.ui.nodes['dialog.find.counter'] = self.counter
-        self.window.ui.nodes['dialog.find.btn.clear'] = QPushButton(trans('dialog.find.btn.clear'))
-        self.window.ui.nodes['dialog.find.btn.clear'].clicked.connect(
-            lambda: self.window.controller.finder.clear_input(),
-        )
-        self.window.ui.nodes['dialog.find.btn.find_prev'] = QPushButton(trans('dialog.find.btn.find_prev'))
-        self.window.ui.nodes['dialog.find.btn.find_prev'].clicked.connect(
-            lambda: self.window.controller.finder.prev(),
-        )
-        self.window.ui.nodes['dialog.find.btn.find_next'] = QPushButton(trans('dialog.find.btn.find_next'))
-        self.window.ui.nodes['dialog.find.btn.find_next'].clicked.connect(
-            lambda: self.window.controller.finder.next(),
-        )
+        self.counter.setFixedWidth(70)
+        self.setWindowFlag(Qt.WindowStaysOnTopHint, True)
+
+        nodes = self.window.ui.nodes
+        nodes['dialog.find.input'] = self.input
+        nodes['dialog.find.counter'] = self.counter
+
+        btn_clear = QPushButton(trans('dialog.find.btn.clear'))
+        btn_clear.clicked.connect(self.window.controller.finder.clear_input)
+        nodes['dialog.find.btn.clear'] = btn_clear
+
+        btn_prev = QPushButton(trans('dialog.find.btn.find_prev'))
+        btn_prev.clicked.connect(self.window.controller.finder.prev)
+        nodes['dialog.find.btn.find_prev'] = btn_prev
+
+        btn_next = QPushButton(trans('dialog.find.btn.find_next'))
+        btn_next.clicked.connect(self.window.controller.finder.next)
+        nodes['dialog.find.btn.find_next'] = btn_next
 
         bottom = QHBoxLayout()
-        bottom.addWidget(self.window.ui.nodes['dialog.find.btn.clear'])
-        bottom.addWidget(self.window.ui.nodes['dialog.find.btn.find_prev'])
-        bottom.addWidget(self.window.ui.nodes['dialog.find.btn.find_next'])
+        bottom.addWidget(btn_clear)
+        bottom.addWidget(btn_prev)
+        bottom.addWidget(btn_next)
 
         input_layout = QHBoxLayout()
         input_layout.addWidget(self.input)
@@ -84,5 +84,6 @@ class FindDialog(QDialog):
         :param event: key press event
         """
         if event.key() == Qt.Key_Escape:
-            self.window.controller.finder.close(reset=False)
             self.close()
+            return
+        super().keyPressEvent(event)

pygpt_net/ui/widget/dialog/profile.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.19 01:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6 import QtCore
@@ -15,7 +15,6 @@ from PySide6.QtWidgets import QDialog, QPushButton, QHBoxLayout, QLabel, QVBoxLa
 
 from pygpt_net.utils import trans
 from .base import BaseDialog
-from ..element.labels import HelpLabel
 from ..option.input import DirectoryInput
 
 
@@ -27,7 +26,7 @@ class ProfileDialog(BaseDialog):
         :param window: main window
         :param id: settings id
         """
-        super(ProfileDialog, self).__init__(window, id)
+        super().__init__(window, id)
         self.window = window
         self.id = id
 
@@ -39,7 +38,7 @@ class ProfileDialog(BaseDialog):
         """
         self.window.controller.settings.profile.dialog = False
         self.window.controller.settings.profile.update_menu()
-        super(ProfileDialog, self).closeEvent(event)
+        super().closeEvent(event)
 
     def keyPressEvent(self, event):
         """
@@ -48,10 +47,9 @@ class ProfileDialog(BaseDialog):
         :param event: key press event
         """
         if event.key() == Qt.Key_Escape:
-            self.cleanup()
-            self.close()  # close dialog when the Esc key is pressed.
+            self.close()
         else:
-            super(ProfileDialog, self).keyPressEvent(event)
+            super().keyPressEvent(event)
 
     def cleanup(self):
         """
@@ -61,7 +59,6 @@ class ProfileDialog(BaseDialog):
         self.window.controller.settings.profile.update_menu()
 
 
-
 class ProfileEditDialog(QDialog):
     def __init__(self, window=None, id=None):
         """
@@ -69,7 +66,7 @@ class ProfileEditDialog(QDialog):
 
         :param window: main window
         """
-        super(ProfileEditDialog, self).__init__(window)
+        super().__init__(window)
         self.window = window
         self.id = id
         self.uuid = None
@@ -77,29 +74,25 @@ class ProfileEditDialog(QDialog):
         self.name = ""
         self.mode = "create"  # create | update
         self.input = ProfileNameInput(window, id)
+        self.input.setParent(self)
         self.input.setMinimumWidth(400)
 
-        self.window.ui.nodes['dialog.profile.item.btn.update'] = QPushButton(trans('dialog.profile.item.btn.update'))
-        self.window.ui.nodes['dialog.profile.item.btn.update'].clicked.connect(
-            lambda: self.window.controller.settings.profile.handle_update(
-                self.mode,
-                self.input.text(),
-                self.workdir.text(),
-                self.uuid,
-            )
-        )
+        nodes = self.window.ui.nodes
 
-        self.window.ui.nodes['dialog.profile.item.btn.dismiss'] = QPushButton(trans('dialog.profile.item.btn.dismiss'))
-        self.window.ui.nodes['dialog.profile.item.btn.dismiss'].clicked.connect(
-            lambda: self.window.controller.settings.profile.dismiss_update()
-        )
+        self.btn_update = QPushButton(trans('dialog.profile.item.btn.update'), self)
+        self.btn_update.clicked.connect(self._on_update_clicked)
+        nodes['dialog.profile.item.btn.update'] = self.btn_update
+
+        self.btn_dismiss = QPushButton(trans('dialog.profile.item.btn.dismiss'), self)
+        self.btn_dismiss.clicked.connect(self._on_dismiss_clicked)
+        nodes['dialog.profile.item.btn.dismiss'] = self.btn_dismiss
 
         bottom = QHBoxLayout()
-        bottom.addWidget(self.window.ui.nodes['dialog.profile.item.btn.dismiss'])
-        bottom.addWidget(self.window.ui.nodes['dialog.profile.item.btn.update'])
+        bottom.addWidget(nodes['dialog.profile.item.btn.dismiss'])
+        bottom.addWidget(nodes['dialog.profile.item.btn.update'])
 
-        self.window.ui.nodes['dialog.profile.name.label'] = QLabel(trans("dialog.profile.name.label"))
-        self.window.ui.nodes['dialog.profile.workdir.label'] = QLabel(trans("dialog.profile.workdir.label"))
+        nodes['dialog.profile.name.label'] = QLabel(trans("dialog.profile.name.label"), self)
+        nodes['dialog.profile.workdir.label'] = QLabel(trans("dialog.profile.workdir.label"), self)
 
         option = {
             'type': 'text',
@@ -107,42 +100,56 @@ class ProfileEditDialog(QDialog):
             'value': "",
         }
         self.workdir = DirectoryInput(self.window, 'profile', 'item', option)
+        self.workdir.setParent(self)
 
-        self.window.ui.nodes['dialog.profile.checkbox.switch'] = QCheckBox(trans("dialog.profile.checkbox.switch"))
-        self.window.ui.nodes['dialog.profile.checkbox.switch'].setChecked(True)
-        self.window.ui.nodes['dialog.profile.checkbox.db'] = QCheckBox(trans("dialog.profile.checkbox.include_db"))
-        self.window.ui.nodes['dialog.profile.checkbox.db'].setChecked(True)
-        self.window.ui.nodes['dialog.profile.checkbox.data'] = QCheckBox(trans("dialog.profile.checkbox.include_datadir"))
-        self.window.ui.nodes['dialog.profile.checkbox.data'].setChecked(True)
+        nodes['dialog.profile.checkbox.switch'] = QCheckBox(trans("dialog.profile.checkbox.switch"), self)
+        nodes['dialog.profile.checkbox.switch'].setChecked(True)
 
-        # checkboxes layout
+        self.checkboxes = QWidget(self)
         checkboxes_layout = QHBoxLayout()
         checkboxes_layout.setContentsMargins(0, 0, 0, 0)
-        checkboxes_layout.addWidget(self.window.ui.nodes['dialog.profile.checkbox.db'])
-        checkboxes_layout.addWidget(self.window.ui.nodes['dialog.profile.checkbox.data'])
-        self.checkboxes = QWidget()
+
+        nodes['dialog.profile.checkbox.db'] = QCheckBox(trans("dialog.profile.checkbox.include_db"), self.checkboxes)
+        nodes['dialog.profile.checkbox.db'].setChecked(True)
+        nodes['dialog.profile.checkbox.data'] = QCheckBox(trans("dialog.profile.checkbox.include_datadir"), self.checkboxes)
+        nodes['dialog.profile.checkbox.data'].setChecked(True)
+
+        checkboxes_layout.addWidget(nodes['dialog.profile.checkbox.db'])
+        checkboxes_layout.addWidget(nodes['dialog.profile.checkbox.data'])
         self.checkboxes.setLayout(checkboxes_layout)
 
         layout = QVBoxLayout()
-        layout.addWidget(self.window.ui.nodes['dialog.profile.name.label'])
+        layout.addWidget(nodes['dialog.profile.name.label'])
         layout.addWidget(self.input)
-        layout.addWidget(self.window.ui.nodes['dialog.profile.workdir.label'])
+        layout.addWidget(nodes['dialog.profile.workdir.label'])
         layout.addWidget(self.workdir)
         layout.addWidget(self.checkboxes)
-        layout.addWidget(self.window.ui.nodes['dialog.profile.checkbox.switch'])
+        layout.addWidget(nodes['dialog.profile.checkbox.switch'])
         layout.addLayout(bottom)
 
         self.setLayout(layout)
 
+    def _on_update_clicked(self):
+        self.window.controller.settings.profile.handle_update(
+            self.mode,
+            self.input.text(),
+            self.workdir.text(),
+            self.uuid,
+        )
+
+    def _on_dismiss_clicked(self):
+        self.window.controller.settings.profile.dismiss_update()
+
     def prepare(self):
         """Prepare dialog before show"""
-        if self.mode == 'create':
-            self.window.ui.nodes['dialog.profile.item.btn.update'].setText(trans('dialog.profile.item.btn.create'))
-        elif self.mode == 'edit':
-            self.window.ui.nodes['dialog.profile.item.btn.update'].setText(trans("dialog.profile.item.btn.update"))
-        elif self.mode == 'duplicate':
-            self.window.ui.nodes['dialog.profile.item.btn.update'].setText(trans("dialog.profile.item.btn.duplicate"))
-
+        mapping = {
+            'create': 'dialog.profile.item.btn.create',
+            'edit': 'dialog.profile.item.btn.update',
+            'duplicate': 'dialog.profile.item.btn.duplicate',
+        }
+        key = mapping.get(self.mode)
+        if key:
+            self.window.ui.nodes['dialog.profile.item.btn.update'].setText(trans(key))
         self.workdir.setText(self.path)
 
 
@@ -154,8 +161,7 @@ class ProfileNameInput(QLineEdit):
         :param window: main window
         :param id: info window id
         """
-        super(ProfileNameInput, self).__init__(window)
-
+        super().__init__(window)
         self.window = window
         self.id = id
 
@@ -165,13 +171,11 @@ class ProfileNameInput(QLineEdit):
 
         :param event: key event
         """
-        super(ProfileNameInput, self).keyPressEvent(event)
-
-        # save on Enter
-        if event.key() == QtCore.Qt.Key_Return or event.key() == QtCore.Qt.Key_Enter:
+        super().keyPressEvent(event)
+        if event.key() in (Qt.Key_Return, Qt.Key_Enter):
             self.window.controller.settings.profile.handle_update(
                 self.window.ui.dialog['profile.item'].mode,
                 self.window.ui.dialog['profile.item'].input.text(),
                 self.window.ui.dialog['profile.item'].workdir.text(),
                 self.window.ui.dialog['profile.item'].uuid,
-            )
+            )