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

pygpt_net/ui/layout/toolbox/model.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.17 03:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QVBoxLayout, QWidget
@@ -17,6 +17,7 @@ from pygpt_net.utils import trans
 
 
 class Model:
+
     def __init__(self, window=None):
         """
         Toolbox UI
@@ -25,6 +26,7 @@ class Model:
         """
         self.window = window
         self.id = 'prompt.model'
+        self.label_key = f'{self.id}.label'
 
     def setup(self) -> QWidget:
         """
@@ -42,19 +44,19 @@ class Model:
 
         :return: QVBoxLayout
         """
-        label_key = self.id + '.label'
+        nodes = self.window.ui.nodes
 
-        self.window.ui.nodes[label_key] = TitleLabel(trans("toolbox.model.label"))
-        self.window.ui.nodes[self.id] = ModelCombo(self.window, self.id)
+        label = TitleLabel(trans("toolbox.model.label"))
+        label.setContentsMargins(5, 0, 0, 0)
+        nodes[self.label_key] = label
 
-        header_layout = QVBoxLayout()
-        header_layout.addWidget(self.window.ui.nodes[label_key])
-        header_layout.setContentsMargins(5, 0, 0, 0)
+        combo = ModelCombo(self.window, self.id)
+        nodes[self.id] = combo
 
         layout = QVBoxLayout()
-        layout.addLayout(header_layout)
-        layout.addWidget(self.window.ui.nodes[self.id])
+        layout.addWidget(label)
+        layout.addWidget(combo)
         layout.addStretch()
         layout.setContentsMargins(2, 5, 5, 5)
 
-        return layout
+        return layout

pygpt_net/ui/layout/toolbox/presets.py

@@ -6,12 +6,12 @@
 # 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 PySide6 import QtCore
 from PySide6.QtGui import QStandardItemModel, Qt, QIcon
-from PySide6.QtWidgets import QVBoxLayout, QHBoxLayout, QPushButton, QSplitter, QWidget, QSizePolicy
+from PySide6.QtWidgets import QVBoxLayout, QHBoxLayout, QPushButton, QWidget, QSizePolicy
 
 from pygpt_net.core.types import (
     MODE_AGENT,
@@ -19,9 +19,9 @@ from pygpt_net.core.types import (
 )
 from pygpt_net.ui.widget.element.labels import HelpLabel, TitleLabel
 from pygpt_net.ui.widget.lists.preset import PresetList
+
 from pygpt_net.ui.layout.toolbox.footer import Footer
 from pygpt_net.utils import trans
-import pygpt_net.icons_rc
 
 class Presets:
     def __init__(self, window=None):
@@ -34,11 +34,11 @@ class Presets:
         self.footer = Footer(window)
         self.id = 'preset.presets'
 
-    def setup(self) -> QSplitter:
+    def setup(self) -> QWidget:
         """
         Setup presets
 
-        :return: QSplitter
+        :return: QWidget
         """
         presets = self.setup_presets()
 
@@ -55,41 +55,43 @@ class Presets:
 
         :return: QVBoxLayout
         """
-        self.window.ui.nodes['preset.presets.new'] = QPushButton(QIcon(":/icons/add.svg"), "")
-        self.window.ui.nodes['preset.presets.new'].clicked.connect(
-            lambda: self.window.controller.presets.editor.edit()
+        nodes = self.window.ui.nodes
+
+        nodes['preset.presets.new'] = QPushButton(QIcon(":/icons/add.svg"), "")
+        nodes['preset.presets.new'].clicked.connect(
+            lambda _=False: self.window.controller.presets.editor.edit()
         )
 
-        self.window.ui.nodes['preset.presets.label'] = TitleLabel(trans("toolbox.presets.label"))
-        self.window.ui.nodes['preset.agents.label'] = TitleLabel(trans("toolbox.agents.label"))
-        self.window.ui.nodes['preset.experts.label'] = TitleLabel(trans("toolbox.experts.label"))
-        self.window.ui.nodes['preset.presets.label'].setVisible(False)
-        self.window.ui.nodes['preset.agents.label'].setVisible(False)
-        self.window.ui.nodes['preset.experts.label'].setVisible(False)
+        nodes['preset.presets.label'] = TitleLabel(trans("toolbox.presets.label"))
+        nodes['preset.agents.label'] = TitleLabel(trans("toolbox.agents.label"))
+        nodes['preset.experts.label'] = TitleLabel(trans("toolbox.experts.label"))
+        nodes['preset.presets.label'].setVisible(False)
+        nodes['preset.agents.label'].setVisible(False)
+        nodes['preset.experts.label'].setVisible(False)
 
         header = QHBoxLayout()
-        header.addWidget(self.window.ui.nodes['preset.presets.label'])
-        header.addWidget(self.window.ui.nodes['preset.agents.label'])
-        header.addWidget(self.window.ui.nodes['preset.experts.label'])
-        header.addWidget(self.window.ui.nodes['preset.presets.new'], alignment=Qt.AlignRight)
+        header.addWidget(nodes['preset.presets.label'])
+        header.addWidget(nodes['preset.agents.label'])
+        header.addWidget(nodes['preset.experts.label'])
+        header.addWidget(nodes['preset.presets.new'], alignment=Qt.AlignRight)
         header.setContentsMargins(5, 0, 0, 0)
 
-        self.window.ui.nodes[self.id] = PresetList(self.window, self.id)
-        self.window.ui.nodes[self.id].selection_locked = self.window.controller.presets.preset_change_locked
-        self.window.ui.nodes[self.id].setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        nodes[self.id] = PresetList(self.window, self.id)
+        nodes[self.id].selection_locked = self.window.controller.presets.preset_change_locked
+        nodes[self.id].setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
-        self.window.ui.nodes['tip.toolbox.presets'] = HelpLabel(trans('tip.toolbox.presets'), self.window)
-        self.window.ui.nodes['tip.toolbox.presets'].setAlignment(Qt.AlignCenter)
+        nodes['tip.toolbox.presets'] = HelpLabel(trans('tip.toolbox.presets'), self.window)
+        nodes['tip.toolbox.presets'].setAlignment(Qt.AlignCenter)
 
         layout = QVBoxLayout()
         layout.addStretch()
         layout.addLayout(header)
-        layout.addWidget(self.window.ui.nodes[self.id], 1)
-        layout.addWidget(self.window.ui.nodes['tip.toolbox.presets'])
+        layout.addWidget(nodes[self.id], 1)
+        layout.addWidget(nodes['tip.toolbox.presets'])
         layout.setContentsMargins(2, 5, 5, 5)
 
         self.window.ui.models[self.id] = self.create_model(self.window)
-        self.window.ui.nodes[self.id].setModel(self.window.ui.models[self.id])
+        nodes[self.id].setModel(self.window.ui.models[self.id])
 
         return layout
 
@@ -108,38 +110,52 @@ class Presets:
         :param data: Data to update
         """
         mode = self.window.core.config.get('mode')
-        view = self.window.ui.nodes[self.id]
-        model = self.window.ui.models[self.id]
+        nodes = self.window.ui.nodes
+        models = self.window.ui.models
+
+        view = nodes[self.id]
+        model = models.get(self.id)
 
         view.backup_selection()
 
         if model is None:
             model = self.create_model(self.window)
-            self.window.ui.models[self.id] = model
+            models[self.id] = model
             view.setModel(model)
 
-        rc = model.rowCount()
-        if rc:
-            model.removeRows(0, rc)
-
-        count = len(data)
-        if count:
-            model.setRowCount(count)
-            count_experts = self.window.core.experts.count_experts
-            for i, (key, item) in enumerate(data.items()):
-                name = item.name
-                if mode == MODE_EXPERT and not key.startswith("current.") and item.enabled:
-                    name = "[x] " + name
-                elif mode == MODE_AGENT:
-                    num_experts = count_experts(key)
-                    if num_experts > 0:
-                        name = f"{name} ({num_experts} experts)"
-
-                prompt = str(item.prompt)
-                tooltip = prompt if len(prompt) <= 80 else prompt[:80] + '...'
-
-                index = model.index(i, 0)
-                model.setData(index, name, QtCore.Qt.DisplayRole)
-                model.setData(index, tooltip, QtCore.Qt.ToolTipRole)
+        view.setUpdatesEnabled(False)
+        try:
+            if not data:
+                model.setRowCount(0)
+            else:
+                count = len(data)
+                model.setRowCount(count)
+
+                is_expert_mode = (mode == MODE_EXPERT)
+                is_agent_mode = (mode == MODE_AGENT)
+                count_experts = self.window.core.experts.count_experts if is_agent_mode else None
+                startswith_current = "current."
+
+                index_fn = model.index
+                set_item_data = model.setItemData
+                display_role = QtCore.Qt.DisplayRole
+                tooltip_role = QtCore.Qt.ToolTipRole
+
+                for i, (key, item) in enumerate(data.items()):
+                    name = item.name
+                    if is_expert_mode and item.enabled and not key.startswith(startswith_current):
+                        name = "[x] " + name
+                    elif is_agent_mode:
+                        num_experts = count_experts(key)
+                        if num_experts > 0:
+                            name = f"{name} ({num_experts} experts)"
+
+                    prompt = str(item.prompt)
+                    tooltip = prompt if len(prompt) <= 80 else f"{prompt[:80]}..."
+
+                    idx = index_fn(i, 0)
+                    set_item_data(idx, {display_role: name, tooltip_role: tooltip})
+        finally:
+            view.setUpdatesEnabled(True)
 
         view.restore_selection()

pygpt_net/ui/layout/toolbox/prompt.py

@@ -6,18 +6,16 @@
 # 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.QtGui import Qt, QIcon
-from PySide6.QtWidgets import QVBoxLayout, QHBoxLayout, QPushButton, QWidget, QCheckBox, QSizePolicy
+from PySide6.QtWidgets import QVBoxLayout, QHBoxLayout, QWidget, QSizePolicy
 
-from pygpt_net.ui.widget.anims.toggles import AnimToggle
 from pygpt_net.ui.widget.element.labels import HelpLabel, TitleLabel
 from pygpt_net.ui.widget.option.prompt import PromptTextarea
 from pygpt_net.ui.widget.option.toggle_label import ToggleLabel
 from pygpt_net.utils import trans
-import pygpt_net.icons_rc
 
 class Prompt:
     def __init__(self, window=None):
@@ -34,67 +32,42 @@ class Prompt:
 
         :return: QWidget
         """
-        # cmd enable/disable
-        self.window.ui.nodes['cmd.enabled'] = ToggleLabel(trans('cmd.enabled'), 
-            label_position="left", 
-            icon = ":/icons/build.svg", 
-            parent=self.window
-        )
-        self.window.ui.nodes['cmd.enabled'].box.stateChanged.connect(
-            lambda: self.window.controller.chat.common.toggle_cmd(self.window.ui.nodes['cmd.enabled'].box.isChecked())
-        )
-        self.window.ui.nodes['cmd.enabled'].box.setToolTip(trans('cmd.tip'))
-        self.window.ui.nodes['cmd.enabled'].box.setIcon(QIcon(":/icons/add.svg"))
+        w = self.window
+        nodes = w.ui.nodes
 
-        # label
-        self.window.ui.nodes['toolbox.prompt.label'] = TitleLabel(trans("toolbox.prompt"))
+        nodes['toolbox.prompt.label'] = TitleLabel(trans("toolbox.prompt"))
 
-        header_layout = QHBoxLayout()
-        header_layout.addWidget(self.window.ui.nodes['toolbox.prompt.label'])
-        header_layout.addStretch(1)
-        header_layout.addWidget(self.window.ui.nodes['cmd.enabled'])
-        header_layout.setContentsMargins(5, 0, 10, 0)
+        nodes['cmd.enabled'] = ToggleLabel(
+            trans('cmd.enabled'),
+            label_position="left",
+            icon=":/icons/build.svg",
+            parent=w
+        )
+        box = nodes['cmd.enabled'].box
+        box.toggled.connect(w.controller.chat.common.toggle_cmd)
+        box.setToolTip(trans('cmd.tip'))
+        box.setIcon(QIcon(":/icons/add.svg"))
 
         header_widget = QWidget()
-        header_widget.setLayout(header_layout)
-
-        # clear
-        """
-        self.window.ui.nodes['preset.clear'] = QPushButton(QIcon(":/icons/close.svg"),"")
-        self.window.ui.nodes['preset.clear'].clicked.connect(
-            lambda: self.window.controller.presets.clear())
-
-        # use
-        self.window.ui.nodes['preset.use'] = QPushButton(trans('preset.use'))
-        self.window.ui.nodes['preset.use'].clicked.connect(
-            lambda: self.window.controller.presets.use())
-        self.window.ui.nodes['preset.use'].setVisible(False)
-        
+        header_layout = QHBoxLayout(header_widget)
+        header_layout.addWidget(nodes['toolbox.prompt.label'])
+        header_layout.addStretch(1)
+        header_layout.addWidget(nodes['cmd.enabled'])
+        header_layout.setContentsMargins(5, 0, 10, 0)
 
-        # cols
-        header = QHBoxLayout()
-        header.addWidget(header_widget)
-        #header.addStretch(1)
-        #header.addWidget(self.window.ui.nodes['preset.use'], alignment=Qt.AlignRight)
-        #header.addWidget(self.window.ui.nodes['preset.clear'], alignment=Qt.AlignRight)
-        """
+        option = w.controller.presets.editor.get_option('prompt')
+        nodes['preset.prompt'] = PromptTextarea(w, 'preset', 'prompt', option)
+        nodes['preset.prompt'].setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
-        # prompt
-        option = self.window.controller.presets.editor.get_option('prompt')
-        self.window.ui.nodes['preset.prompt'] = PromptTextarea(self.window, 'preset', 'prompt', option)
-        self.window.ui.nodes['preset.prompt'].setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-        self.window.ui.nodes['tip.toolbox.prompt'] = HelpLabel(trans('tip.toolbox.prompt'), self.window)
-        self.window.ui.nodes['tip.toolbox.prompt'].setAlignment(Qt.AlignCenter)
+        nodes['tip.toolbox.prompt'] = HelpLabel(trans('tip.toolbox.prompt'), w)
+        nodes['tip.toolbox.prompt'].setAlignment(Qt.AlignCenter)
 
-        # rows
-        layout = QVBoxLayout()
+        layout_widget = QWidget()
+        layout = QVBoxLayout(layout_widget)
         layout.addWidget(header_widget)
-        layout.addWidget(self.window.ui.nodes['preset.prompt'])
-        layout.addWidget(self.window.ui.nodes['tip.toolbox.prompt'])
+        layout.addWidget(nodes['preset.prompt'])
+        layout.addWidget(nodes['tip.toolbox.prompt'])
         layout.setContentsMargins(2, 5, 5, 5)
 
-        widget = QWidget()
-        widget.setLayout(layout)
-        widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
-
-        return widget
+        layout_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        return layout_widget

pygpt_net/ui/layout/toolbox/toolbox.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.17 03:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import Qt
@@ -46,34 +46,38 @@ class ToolboxMain:
         :return: QSplitter
         :rtype: QSplitter
         """
+        ui = self.window.ui
+        nodes = ui.nodes
+
         # mode / model
-        self.window.ui.nodes['tip.toolbox.mode'] = HelpLabel(trans('tip.toolbox.mode'), self.window)
-        self.window.ui.nodes['tip.toolbox.mode'].setAlignment(Qt.AlignCenter)
+        tip = HelpLabel(trans('tip.toolbox.mode'), self.window)
+        tip.setAlignment(Qt.AlignCenter)
+        nodes['tip.toolbox.mode'] = tip
 
         # presets / assistants
-        self.window.ui.nodes['toolbox.mode.layout'] = QVBoxLayout()
-        self.window.ui.nodes['toolbox.mode.layout'].addWidget(self.mode.setup())  # modes
-        self.window.ui.nodes['toolbox.mode.layout'].addWidget(self.model.setup())  # models
-        self.window.ui.nodes['toolbox.mode.layout'].addWidget(self.window.ui.nodes['tip.toolbox.mode'])
-        self.window.ui.nodes['toolbox.mode.layout'].addWidget(self.presets.setup(), 1)  # presets / agents
-        self.window.ui.nodes['toolbox.mode.layout'].addWidget(self.assistants.setup(), 1)  # assistants
-        self.window.ui.nodes['toolbox.mode.layout'].setContentsMargins(0, 0, 0, 0)
+        toolbox_mode = QWidget(self.window)
+        layout = QVBoxLayout(toolbox_mode)
+        layout.addWidget(self.mode.setup())  # modes
+        layout.addWidget(self.model.setup())  # models
+        layout.addWidget(tip)
+        layout.addWidget(self.presets.setup(), 1)  # presets / agents
+        layout.addWidget(self.assistants.setup(), 1)  # assistants
+        layout.setContentsMargins(0, 0, 0, 0)
 
-        self.window.ui.nodes['toolbox.mode'] = QWidget()
-        self.window.ui.nodes['toolbox.mode'].setLayout(self.window.ui.nodes['toolbox.mode.layout'])
-        self.window.ui.nodes['toolbox.mode'].setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        toolbox_mode.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        nodes['toolbox.mode'] = toolbox_mode
+        nodes['toolbox.mode.layout'] = layout
 
-        bottom = QVBoxLayout()
+        bottom_widget = QWidget(self.window)
+        bottom = QVBoxLayout(bottom_widget)
         bottom.addWidget(self.prompt.setup())
         bottom.addWidget(self.footer.setup())
         bottom.setContentsMargins(0, 0, 0, 0)
 
-        bottom_widget = QWidget()
-        bottom_widget.setLayout(bottom)
-
         # rows
-        self.window.ui.splitters['toolbox'] = QSplitter(Qt.Vertical)
-        self.window.ui.splitters['toolbox'].addWidget(self.window.ui.nodes['toolbox.mode'])  # mode/model
-        self.window.ui.splitters['toolbox'].addWidget(bottom_widget)  # system prompt, footer (names, temp, logo, etc.)
+        splitter = QSplitter(Qt.Vertical, self.window)
+        splitter.addWidget(toolbox_mode)  # mode/model
+        splitter.addWidget(bottom_widget)  # system prompt, footer (names, temp, logo, etc.)
+        ui.splitters['toolbox'] = splitter
 
-        return self.window.ui.splitters['toolbox']
+        return splitter

pygpt_net/ui/layout/toolbox/vision.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2023.12.25 21:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QVBoxLayout, QLabel, QHBoxLayout, QWidget, QCheckBox
@@ -29,33 +29,31 @@ class Vision:
 
         :return: QWidget
         """
-        # enable/disable
-        self.window.ui.nodes['vision.capture.enable'] = QCheckBox(trans("vision.capture.enable"))
-        self.window.ui.nodes['vision.capture.enable'].stateChanged.connect(
-            lambda: self.window.controller.camera.toggle(self.window.ui.nodes['vision.capture.enable'].isChecked()))
-        self.window.ui.nodes['vision.capture.enable'].setToolTip(trans('vision.capture.enable.tooltip'))
+        nodes = self.window.ui.nodes
+        camera = self.window.controller.camera
 
-        # auto
-        self.window.ui.nodes['vision.capture.auto'] = QCheckBox(trans("vision.capture.auto"))
-        self.window.ui.nodes['vision.capture.auto'].stateChanged.connect(
-            lambda: self.window.controller.camera.toggle_auto(self.window.ui.nodes['vision.capture.auto'].isChecked()))
-        self.window.ui.nodes['vision.capture.auto'].setToolTip(trans('vision.capture.auto.tooltip'))
+        nodes['vision.capture.options'] = QWidget()
+        options = nodes['vision.capture.options']
 
-        self.window.ui.nodes['vision.capture.label'] = QLabel(trans('vision.capture.options.title'))
+        nodes['vision.capture.enable'] = QCheckBox(trans("vision.capture.enable"), parent=options)
+        nodes['vision.capture.enable'].toggled.connect(camera.toggle)
+        nodes['vision.capture.enable'].setToolTip(trans('vision.capture.enable.tooltip'))
+
+        nodes['vision.capture.auto'] = QCheckBox(trans("vision.capture.auto"), parent=options)
+        nodes['vision.capture.auto'].toggled.connect(camera.toggle_auto)
+        nodes['vision.capture.auto'].setToolTip(trans('vision.capture.auto.tooltip'))
+
+        nodes['vision.capture.label'] = QLabel(trans('vision.capture.options.title'), parent=options)
 
-        # checkbox options
         cols = QHBoxLayout()
-        cols.addWidget(self.window.ui.nodes['vision.capture.enable'])
-        cols.addWidget(self.window.ui.nodes['vision.capture.auto'])
+        cols.addWidget(nodes['vision.capture.enable'])
+        cols.addWidget(nodes['vision.capture.auto'])
 
-        # rows
         rows = QVBoxLayout()
-        rows.addWidget(self.window.ui.nodes['vision.capture.label'])
+        rows.addWidget(nodes['vision.capture.label'])
         rows.addLayout(cols)
 
-        # widget
-        self.window.ui.nodes['vision.capture.options'] = QWidget()
-        self.window.ui.nodes['vision.capture.options'].setLayout(rows)
-        self.window.ui.nodes['vision.capture.options'].setContentsMargins(0, 0, 0, 0)
+        options.setLayout(rows)
+        options.setContentsMargins(0, 0, 0, 0)
 
-        return self.window.ui.nodes['vision.capture.options']
+        return options

pygpt_net/ui/main.py

@@ -6,15 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.20 20:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 import os
 
 from PySide6.QtCore import QTimer, Signal, Slot, QThreadPool, QEvent, Qt, QLoggingCategory, QEventLoop
 from PySide6.QtGui import QShortcut, QKeySequence
-from qasync import QApplication
-from PySide6.QtWidgets import QMainWindow
+from PySide6.QtWidgets import QMainWindow, QApplication
 from qt_material import QtStyleTools
 
 from pygpt_net.core.events import BaseEvent, KernelEvent, ControlEvent
@@ -25,7 +24,6 @@ from pygpt_net.ui import UI
 from pygpt_net.ui.widget.textarea.web import ChatWebOutput
 from pygpt_net.utils import get_app_meta
 
-
 class MainWindow(QMainWindow, QtStyleTools):
 
     # states