pygpt-net 2.6.21__py3-none-any.whl → 2.6.23__py3-none-any.whl

pygpt_net/ui/menu/tools.py

@@ -6,13 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.24 22:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction, QIcon
 
 from pygpt_net.utils import trans
-import pygpt_net.icons_rc
 
 class Tools:
     def __init__(self, window=None):
@@ -23,70 +22,67 @@ class Tools:
         """
         self.window = window
 
+    def _open_tab_action(self, checked=False):
+        action = self.window.sender()
+        self.window.controller.tools.open_tab(action.data())
+
+    def _toggle_assistant_store(self, checked=False):
+        self.window.controller.assistant.store.toggle_editor()
+
+    def _rebuild_ipython(self, checked=False):
+        self.window.core.plugins.get("cmd_code_interpreter").builder.build_and_restart()
+
+    def _rebuild_python_legacy(self, checked=False):
+        self.window.core.plugins.get("cmd_code_interpreter").docker.build_and_restart()
+
+    def _rebuild_system(self, checked=False):
+        self.window.core.plugins.get("cmd_system").docker.build_and_restart()
+
     def setup(self):
         """Setup tools menu"""
-        # tab tools
-        tab_tools = self.window.controller.tools.get_tab_tools()
-        for key in tab_tools:
-            self.window.ui.menu[key] = QAction(QIcon(":/icons/" + tab_tools[key][1] + ".svg"),
-                                               trans("output.tab." + tab_tools[key][0]), self.window)
-            self.window.ui.menu[key].triggered.connect(
-                lambda checked=False, type=tab_tools[key][2] : self.window.controller.tools.open_tab(type)
-            )
-            self.window.ui.menu[key].setCheckable(False)
-
-        # add menu
-        self.window.ui.menu['menu.tools'] = self.window.menuBar().addMenu(trans("menu.tools"))
-
-        # add tab tools
-        for key in tab_tools:
-            self.window.ui.menu['menu.tools'].addAction(self.window.ui.menu[key])
-
-        # add custom tools
-        actions = self.window.tools.setup_menu_actions()
+        window = self.window
+        ui_menu = window.ui.menu
+
+        tab_tools = window.controller.tools.get_tab_tools()
+        ui_menu['menu.tools'] = window.menuBar().addMenu(trans("menu.tools"))
+        menu_tools = ui_menu['menu.tools']
+
+        for key, val in tab_tools.items():
+            label_key, icon_name, type_ = val[0], val[1], val[2]
+            action = QAction(QIcon(f":/icons/{icon_name}.svg"), trans(f"output.tab.{label_key}"), window)
+            action.setCheckable(False)
+            action.triggered.connect(lambda checked=False, t=type_: window.controller.tools.open_tab(t))
+            ui_menu[key] = action
+            menu_tools.addAction(action)
+
+        actions = window.tools.setup_menu_actions()
         if len(actions) == 0:
             return
 
-        # add separator
-        self.window.ui.menu['menu.tools'].addSeparator()
+        menu_tools.addSeparator()
 
-        # build custom tools menu
-        for key in actions:
-            self.window.ui.menu[key] = actions[key]
-            self.window.ui.menu['menu.tools'].addAction(self.window.ui.menu[key])
+        for key, action in actions.items():
+            ui_menu[key] = action
+            menu_tools.addAction(action)
 
         # ------------------------------------------------- #
 
-        # OpenAI vector stores
-        self.window.ui.menu['menu.tools'].addSeparator()
-        self.window.ui.menu['menu.tools.openai.stores'] = QAction(QIcon(":/icons/db.svg"),
-                                                                    trans("dialog.assistant.store"), self.window)
-        self.window.ui.menu['menu.tools'].addAction(self.window.ui.menu['menu.tools.openai.stores'])
-        self.window.ui.menu['menu.tools.openai.stores'].triggered.connect(
-            lambda: self.window.controller.assistant.store.toggle_editor()
-        )
-
-        # Docker images rebuild:
-
-        # IPython container
-        self.window.ui.menu['menu.tools'].addSeparator()
-        self.window.ui.menu['menu.tools.ipython.rebuild'] = QAction(QIcon(":/icons/reload.svg"),
-                                                                    "Rebuild IPython Docker Image", self.window)
-        self.window.ui.menu['menu.tools'].addAction(self.window.ui.menu['menu.tools.ipython.rebuild'])
-        self.window.ui.menu['menu.tools.ipython.rebuild'].triggered.connect(
-            lambda: self.window.core.plugins.get("cmd_code_interpreter").builder.build_and_restart()
-        )
-        # Python Legacy container
-        self.window.ui.menu['menu.tools.python_legacy.rebuild'] = QAction(QIcon(":/icons/reload.svg"),
-                                                                          "Rebuild Python (Legacy) Docker Image", self.window)
-        self.window.ui.menu['menu.tools'].addAction(self.window.ui.menu['menu.tools.python_legacy.rebuild'])
-        self.window.ui.menu['menu.tools.python_legacy.rebuild'].triggered.connect(
-            lambda: self.window.core.plugins.get("cmd_code_interpreter").docker.build_and_restart()
-        )
-        # System container
-        self.window.ui.menu['menu.tools.system.rebuild'] = QAction(QIcon(":/icons/reload.svg"),
-                                                                   "Rebuild System Sandbox Docker Image", self.window)
-        self.window.ui.menu['menu.tools'].addAction(self.window.ui.menu['menu.tools.system.rebuild'])
-        self.window.ui.menu['menu.tools.system.rebuild'].triggered.connect(
-            lambda: self.window.core.plugins.get("cmd_system").docker.build_and_restart()
-        )
+        menu_tools.addSeparator()
+        db_icon = QIcon(":/icons/db.svg")
+        ui_menu['menu.tools.openai.stores'] = QAction(db_icon, trans("dialog.assistant.store"), window)
+        menu_tools.addAction(ui_menu['menu.tools.openai.stores'])
+        ui_menu['menu.tools.openai.stores'].triggered.connect(self._toggle_assistant_store)
+
+        menu_tools.addSeparator()
+        reload_icon = QIcon(":/icons/reload.svg")
+        ui_menu['menu.tools.ipython.rebuild'] = QAction(reload_icon, "Rebuild IPython Docker Image", window)
+        menu_tools.addAction(ui_menu['menu.tools.ipython.rebuild'])
+        ui_menu['menu.tools.ipython.rebuild'].triggered.connect(self._rebuild_ipython)
+
+        ui_menu['menu.tools.python_legacy.rebuild'] = QAction(reload_icon, "Rebuild Python (Legacy) Docker Image", window)
+        menu_tools.addAction(ui_menu['menu.tools.python_legacy.rebuild'])
+        ui_menu['menu.tools.python_legacy.rebuild'].triggered.connect(self._rebuild_python_legacy)
+
+        ui_menu['menu.tools.system.rebuild'] = QAction(reload_icon, "Rebuild System Sandbox Docker Image", window)
+        menu_tools.addAction(ui_menu['menu.tools.system.rebuild'])
+        ui_menu['menu.tools.system.rebuild'].triggered.connect(self._rebuild_system)

pygpt_net/ui/menu/video.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.20 06:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction
@@ -25,27 +25,22 @@ class Video:
 
     def setup(self):
         """Setup video menu"""
-        self.window.ui.menu['video.capture'] = QAction(
-            trans("menu.video.capture"),
-            self.window,
-            checkable=True,
-        )
-        self.window.ui.menu['video.capture'].setToolTip(trans('vision.capture.enable.tooltip'))
-        self.window.ui.menu['video.capture'].triggered.connect(
-            lambda: self.window.controller.camera.toggle(self.window.ui.menu['video.capture'].isChecked())
-        )
-
-        self.window.ui.menu['video.capture.auto'] = QAction(
-            trans("menu.video.capture.auto"),
-            self.window,
-            checkable=True,
-        )
-        self.window.ui.menu['video.capture.auto'].setToolTip(trans('vision.capture.auto.tooltip'))
-        self.window.ui.menu['video.capture.auto'].triggered.connect(
-            lambda: self.window.controller.camera.toggle_auto(self.window.ui.menu['video.capture.auto'].isChecked())
-        )
-
-        self.window.ui.menu['menu.video'] = self.window.menuBar().addMenu(trans("menu.video"))
-        self.window.ui.menu['menu.video'].addAction(self.window.ui.menu['video.capture'])
-        self.window.ui.menu['menu.video'].addAction(self.window.ui.menu['video.capture.auto'])
-        self.window.ui.menu['menu.video'].setToolTipsVisible(True)
+        w = self.window
+        ui_menu = w.ui.menu
+        cam = w.controller.camera
+
+        capture = QAction(trans("menu.video.capture"), w, checkable=True)
+        capture.setToolTip(trans('vision.capture.enable.tooltip'))
+        capture.triggered.connect(cam.toggle)
+
+        capture_auto = QAction(trans("menu.video.capture.auto"), w, checkable=True)
+        capture_auto.setToolTip(trans('vision.capture.auto.tooltip'))
+        capture_auto.triggered.connect(cam.toggle_auto)
+
+        menu_video = w.menuBar().addMenu(trans("menu.video"))
+        menu_video.addActions([capture, capture_auto])
+        menu_video.setToolTipsVisible(True)
+
+        ui_menu['video.capture'] = capture
+        ui_menu['video.capture.auto'] = capture_auto
+        ui_menu['menu.video'] = menu_video

pygpt_net/ui/tray.py

@@ -6,14 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.16 00:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction, QIcon
 from PySide6.QtWidgets import QSystemTrayIcon, QMenu
 
 from pygpt_net.utils import trans
-import pygpt_net.icons_rc
 
 
 class Tray:

pygpt_net/ui/widget/audio/bar.py

@@ -6,15 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.18 03:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QPainter, QPalette
 from PySide6.QtWidgets import QWidget
 
-import pygpt_net.icons_rc
-
 class InputBar(QWidget):
     def __init__(self, parent=None):
         super().__init__(parent)

pygpt_net/ui/widget/audio/input_button.py

@@ -6,19 +6,18 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.22 15:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
-from PySide6.QtGui import QPainter, QIcon
+from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QLabel, QHBoxLayout, QWidget, QPushButton, QVBoxLayout
 
 from pygpt_net.core.events import Event, AppEvent
 from pygpt_net.ui.widget.option.toggle_label import ToggleLabel
 from pygpt_net.utils import trans
-from .bar import InputBar
 
-import pygpt_net.icons_rc
+from .bar import InputBar
 
 class VoiceControlButton(QWidget):
     def __init__(self, window=None):

pygpt_net/ui/widget/calendar/select.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 03:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from typing import Tuple
@@ -17,7 +17,6 @@ from PySide6.QtWidgets import QCalendarWidget, QMenu
 
 from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.utils import trans
-import pygpt_net.icons_rc
 
 
 class CalendarSelect(QCalendarWidget):

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)