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

pygpt_net/ui/layout/chat/input.py

@@ -6,12 +6,14 @@
 # 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 functools import partial
+
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QIcon
-from PySide6.QtWidgets import QVBoxLayout, QLabel, QHBoxLayout, QPushButton, QRadioButton, QCheckBox, QWidget, \
+from PySide6.QtWidgets import QVBoxLayout, QHBoxLayout, QPushButton, QRadioButton, QCheckBox, QWidget, \
     QGridLayout
 
 from pygpt_net.ui.layout.chat.attachments import Attachments
@@ -25,7 +27,6 @@ from pygpt_net.ui.widget.element.labels import HelpLabel
 from pygpt_net.ui.widget.tabs.Input import InputTabs
 from pygpt_net.ui.widget.textarea.input import ChatInput
 from pygpt_net.utils import trans
-import pygpt_net.icons_rc
 
 
 class Input:
@@ -58,30 +59,27 @@ class Input:
         files_uploaded = self.setup_attachments_uploaded()
         files_ctx = self.setup_attachments_ctx()
 
-        # tabs
         self.window.ui.tabs['input'] = InputTabs(self.window)
-        self.window.ui.tabs['input'].setMinimumHeight(self.min_height_input_tab)
-        self.window.ui.tabs['input'].addTab(input, trans('input.tab'))
-        self.window.ui.tabs['input'].addTab(files, trans('attachments.tab'))
-        self.window.ui.tabs['input'].addTab(files_uploaded, trans('attachments_uploaded.tab'))
-        self.window.ui.tabs['input'].addTab(files_ctx, trans('attachments_uploaded.tab'))
-        self.window.ui.tabs['input'].currentChanged.connect(self.update_min_height)  # update min height on tab change
-
-        self.window.ui.tabs['input'].setTabIcon(0, QIcon(":/icons/input.svg"))
-        self.window.ui.tabs['input'].setTabIcon(1, QIcon(":/icons/attachment.svg"))
-        self.window.ui.tabs['input'].setTabIcon(2, QIcon(":/icons/upload.svg"))
-        self.window.ui.tabs['input'].setTabIcon(3, QIcon(":/icons/upload.svg"))
-
-        # layout
-        layout = QVBoxLayout()
+        tabs = self.window.ui.tabs['input']
+        tabs.setMinimumHeight(self.min_height_input_tab)
+        tabs.addTab(input, trans('input.tab'))
+        tabs.addTab(files, trans('attachments.tab'))
+        tabs.addTab(files_uploaded, trans('attachments_uploaded.tab'))
+        tabs.addTab(files_ctx, trans('attachments_uploaded.tab'))
+        tabs.currentChanged.connect(self.update_min_height)
+
+        tabs.setTabIcon(0, QIcon(":/icons/input.svg"))
+        upload_icon = QIcon(":/icons/upload.svg")
+        tabs.setTabIcon(1, QIcon(":/icons/attachment.svg"))
+        tabs.setTabIcon(2, upload_icon)
+        tabs.setTabIcon(3, upload_icon)
+
+        widget = QWidget()
+        layout = QVBoxLayout(widget)
         layout.addLayout(self.setup_header())
-        layout.addWidget(self.window.ui.tabs['input'])
+        layout.addWidget(tabs)
         layout.addLayout(self.setup_bottom())
         layout.setContentsMargins(0, 0, 0, 5)
-
-        widget = QWidget()
-        widget.setLayout(layout)
-
         return widget
 
     def setup_input(self) -> QWidget:
@@ -90,16 +88,13 @@ class Input:
 
         :return: QWidget
         """
-        # input textarea
         self.window.ui.nodes['input'] = ChatInput(self.window)
         self.window.ui.nodes['input'].setMinimumHeight(self.min_height_input)
 
-        layout = QVBoxLayout()
+        widget = QWidget()
+        layout = QVBoxLayout(widget)
         layout.addWidget(self.window.ui.nodes['input'])
         layout.setContentsMargins(0, 0, 0, 0)
-
-        widget = QWidget()
-        widget.setLayout(layout)
         return widget
 
     def setup_attachments(self) -> QWidget:
@@ -108,12 +103,10 @@ class Input:
 
         :return: QWidget
         """
-        layout = QVBoxLayout()
+        widget = QWidget()
+        layout = QVBoxLayout(widget)
         layout.addLayout(self.attachments.setup())
         layout.setContentsMargins(0, 0, 0, 0)
-
-        widget = QWidget()
-        widget.setLayout(layout)
         widget.setMinimumHeight(self.min_height_files_tab)
         return widget
 
@@ -123,12 +116,10 @@ class Input:
 
         :return: QWidget
         """
-        layout = QVBoxLayout()
+        widget = QWidget()
+        layout = QVBoxLayout(widget)
         layout.addLayout(self.attachments_uploaded.setup())
         layout.setContentsMargins(0, 0, 0, 0)
-
-        widget = QWidget()
-        widget.setLayout(layout)
         widget.setMinimumHeight(self.min_height_files_tab)
         return widget
 
@@ -138,12 +129,10 @@ class Input:
 
         :return: QWidget
         """
-        layout = QVBoxLayout()
+        widget = QWidget()
+        layout = QVBoxLayout(widget)
         layout.addLayout(self.attachments_ctx.setup())
         layout.setContentsMargins(0, 0, 0, 0)
-
-        widget = QWidget()
-        widget.setLayout(layout)
         widget.setMinimumHeight(self.min_height_files_tab)
         return widget
 
@@ -184,7 +173,6 @@ class Input:
         layout.addWidget(self.window.ui.plugin_addon['audio.output.bar'], alignment=Qt.AlignCenter)
         layout.addLayout(self.setup_buttons())
         layout.setContentsMargins(2, 0, 2, 0)
-
         return layout
 
     def setup_buttons(self) -> QHBoxLayout:
@@ -193,87 +181,76 @@ class Input:
 
         :return: QHBoxLayout
         """
-        # send with: enter
-        self.window.ui.nodes['input.send_enter'] = QRadioButton(trans("input.radio.enter"))
-        self.window.ui.nodes['input.send_enter'].clicked.connect(
-            lambda: self.window.controller.chat.common.toggle_send_shift(
-                1))
-
-        # send with: shift + enter
-        self.window.ui.nodes['input.send_shift_enter'] = QRadioButton(trans("input.radio.enter_shift"))
-        self.window.ui.nodes['input.send_shift_enter'].clicked.connect(
-            lambda: self.window.controller.chat.common.toggle_send_shift(
-                2))
-
-        # send with: none
-        self.window.ui.nodes['input.send_none'] = QRadioButton(trans("input.radio.none"))
-        self.window.ui.nodes['input.send_none'].clicked.connect(
-            lambda: self.window.controller.chat.common.toggle_send_shift(
-                0))
-
-        # send clear
-        self.window.ui.nodes['input.send_clear'] = QCheckBox(trans('input.send_clear'))
-        self.window.ui.nodes['input.send_clear'].stateChanged.connect(
-            lambda: self.window.controller.chat.common.toggle_send_clear(
-                self.window.ui.nodes['input.send_clear'].isChecked()))
-
-        # stream
-        self.window.ui.nodes['input.stream'] = QCheckBox(trans('input.stream'))
-        self.window.ui.nodes['input.stream'].stateChanged.connect(
-            lambda: self.window.controller.chat.common.toggle_stream(self.window.ui.nodes['input.stream'].isChecked()))
-
-        # send button
-        self.window.ui.nodes['input.send_btn'] = QPushButton(trans("input.btn.send"))
-        self.window.ui.nodes['input.send_btn'].clicked.connect(
-            lambda: self.window.controller.chat.input.send_input())
-
-        # stop button
-        self.window.ui.nodes['input.stop_btn'] = QPushButton(trans("input.btn.stop"))
-        self.window.ui.nodes['input.stop_btn'].setVisible(False)
-        self.window.ui.nodes['input.stop_btn'].clicked.connect(
-            lambda: self.window.controller.kernel.stop())
-
-        # update button
-        self.window.ui.nodes['input.update_btn'] = QPushButton(trans("input.btn.update"))
-        self.window.ui.nodes['input.update_btn'].setVisible(False)
-        self.window.ui.nodes['input.update_btn'].clicked.connect(
-            lambda: self.window.controller.ctx.extra.edit_submit())
-
-        # cancel button
-        self.window.ui.nodes['input.cancel_btn'] = QPushButton(trans("input.btn.cancel"))
-        self.window.ui.nodes['input.cancel_btn'].setVisible(False)
-        self.window.ui.nodes['input.cancel_btn'].clicked.connect(
-            lambda: self.window.controller.ctx.extra.edit_cancel())
-
-        # layout
-        self.window.ui.nodes['ui.input.buttons'] = QHBoxLayout()
-        self.window.ui.nodes['ui.input.buttons'].addWidget(self.window.ui.nodes['input.stream'])
-        self.window.ui.nodes['ui.input.buttons'].addWidget(self.window.ui.nodes['input.send_clear'])
-        self.window.ui.nodes['ui.input.buttons'].addWidget(self.window.ui.nodes['input.send_enter'])
-        self.window.ui.nodes['ui.input.buttons'].addWidget(self.window.ui.nodes['input.send_shift_enter'])
-        self.window.ui.nodes['ui.input.buttons'].addWidget(self.window.ui.nodes['input.send_none'])
-        self.window.ui.nodes['ui.input.buttons'].addWidget(self.window.ui.nodes['input.send_btn'])
-        self.window.ui.nodes['ui.input.buttons'].addWidget(self.window.ui.nodes['input.stop_btn'])
-        self.window.ui.nodes['ui.input.buttons'].addWidget(self.window.ui.nodes['input.cancel_btn'])
-        self.window.ui.nodes['ui.input.buttons'].addWidget(self.window.ui.nodes['input.update_btn'])
-        self.window.ui.nodes['ui.input.buttons'].setAlignment(Qt.AlignRight)
-
-        return self.window.ui.nodes['ui.input.buttons']
+        nodes = self.window.ui.nodes
+        controller = self.window.controller
+
+        nodes['input.send_enter'] = QRadioButton(trans("input.radio.enter"))
+        nodes['input.send_enter'].toggled.connect(partial(self._on_send_mode_toggled, 1))
+
+        nodes['input.send_shift_enter'] = QRadioButton(trans("input.radio.enter_shift"))
+        nodes['input.send_shift_enter'].toggled.connect(partial(self._on_send_mode_toggled, 2))
+
+        nodes['input.send_none'] = QRadioButton(trans("input.radio.none"))
+        nodes['input.send_none'].toggled.connect(partial(self._on_send_mode_toggled, 0))
+
+        nodes['input.send_clear'] = QCheckBox(trans('input.send_clear'))
+        nodes['input.send_clear'].toggled.connect(controller.chat.common.toggle_send_clear)
+
+        nodes['input.stream'] = QCheckBox(trans('input.stream'))
+        nodes['input.stream'].toggled.connect(controller.chat.common.toggle_stream)
+
+        nodes['input.send_btn'] = QPushButton(trans("input.btn.send"))
+        nodes['input.send_btn'].clicked.connect(controller.chat.input.send_input)
+
+        nodes['input.stop_btn'] = QPushButton(trans("input.btn.stop"))
+        nodes['input.stop_btn'].setVisible(False)
+        nodes['input.stop_btn'].clicked.connect(controller.kernel.stop)
+
+        nodes['input.update_btn'] = QPushButton(trans("input.btn.update"))
+        nodes['input.update_btn'].setVisible(False)
+        nodes['input.update_btn'].clicked.connect(controller.ctx.extra.edit_submit)
+
+        nodes['input.cancel_btn'] = QPushButton(trans("input.btn.cancel"))
+        nodes['input.cancel_btn'].setVisible(False)
+        nodes['input.cancel_btn'].clicked.connect(controller.ctx.extra.edit_cancel)
+
+        nodes['ui.input.buttons'] = QHBoxLayout()
+        nodes['ui.input.buttons'].addWidget(nodes['input.stream'])
+        nodes['ui.input.buttons'].addWidget(nodes['input.send_clear'])
+        nodes['ui.input.buttons'].addWidget(nodes['input.send_enter'])
+        nodes['ui.input.buttons'].addWidget(nodes['input.send_shift_enter'])
+        nodes['ui.input.buttons'].addWidget(nodes['input.send_none'])
+        nodes['ui.input.buttons'].addWidget(nodes['input.send_btn'])
+        nodes['ui.input.buttons'].addWidget(nodes['input.stop_btn'])
+        nodes['ui.input.buttons'].addWidget(nodes['input.cancel_btn'])
+        nodes['ui.input.buttons'].addWidget(nodes['input.update_btn'])
+        nodes['ui.input.buttons'].setAlignment(Qt.AlignRight)
+
+        return nodes['ui.input.buttons']
+
+    def _on_send_mode_toggled(self, mode: int, checked: bool):
+        if checked:
+            self.window.controller.chat.common.toggle_send_shift(mode)
 
     def update_min_height(self):
         """
         Update the minimum height of the input tab
         """
-        idx = self.window.ui.tabs['input'].currentIndex()
+        tabs = self.window.ui.tabs['input']
+        nodes = self.window.ui.nodes
+        splitters = self.window.ui.splitters
+        controller_ui = self.window.controller.ui
+
+        idx = tabs.currentIndex()
         if idx == 0:
-            self.window.ui.nodes['input'].setMinimumHeight(self.min_height_input)
-            self.window.ui.tabs['input'].setMinimumHeight(self.min_height_input_tab)
-            if (self.window.controller.ui.splitter_output_size_input
-                    and self.window.controller.ui.splitter_output_size_input != [0,0]):
-                self.window.ui.splitters['main.output'].setSizes(self.window.controller.ui.splitter_output_size_input)
+            nodes['input'].setMinimumHeight(self.min_height_input)
+            tabs.setMinimumHeight(self.min_height_input_tab)
+            sizes = controller_ui.splitter_output_size_input
+            if sizes and sizes != [0, 0]:
+                splitters['main.output'].setSizes(sizes)
         else:
-            if (self.window.controller.ui.splitter_output_size_files
-                    and self.window.controller.ui.splitter_output_size_input != [0,0]):
-                self.window.ui.splitters['main.output'].setSizes(self.window.controller.ui.splitter_output_size_files)
-            self.window.ui.nodes['input'].setMinimumHeight(self.min_height_files_tab)
-            self.window.ui.tabs['input'].setMinimumHeight(self.min_height_files_tab + 90)
+            sizes = controller_ui.splitter_output_size_files
+            if sizes and controller_ui.splitter_output_size_input != [0, 0]:
+                splitters['main.output'].setSizes(sizes)
+            nodes['input'].setMinimumHeight(self.min_height_files_tab)
+            tabs.setMinimumHeight(self.min_height_files_tab + 90)

pygpt_net/ui/layout/chat/output.py

@@ -6,28 +6,23 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.07 19:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
-from PySide6.QtWidgets import QVBoxLayout, QLabel, QHBoxLayout, QCheckBox, QWidget, QSizePolicy, QPushButton, \
-    QGridLayout, QWidgetItem, QLayout
+from PySide6.QtWidgets import QVBoxLayout, QHBoxLayout, QCheckBox, QWidget, QSizePolicy, \
+    QGridLayout
 
 from pygpt_net.ui.widget.audio.output import AudioOutput
 from pygpt_net.ui.widget.element.labels import ChatStatusLabel, IconLabel, HelpLabel
-from pygpt_net.ui.widget.anims.loader import Loading
 from pygpt_net.ui.widget.tabs.layout import OutputLayout
+from pygpt_net.utils import trans
 
 from .explorer import Explorer
 from .input import Input
 from .calendar import Calendar
 from .painter import Painter
 
-from pygpt_net.utils import trans
-import pygpt_net.icons_rc
-
-
-
 class Output:
     def __init__(self, window=None):
         """
@@ -47,10 +42,7 @@ class Output:
 
         :return: QWidget
         """
-        # prepare columns
         self.window.ui.layout = OutputLayout(self.window)
-
-        # create empty containers for chat output
         self.window.ui.nodes['output'] = {}
         self.window.ui.nodes['output_plain'] = {}
 
@@ -69,176 +61,122 @@ class Output:
 
         :return: QHBoxLayout
         """
-        # video capture icon
-        self.window.ui.nodes['icon.video.capture'] = IconLabel(":/icons/webcam.svg", window=self.window)
-        self.window.ui.nodes['icon.video.capture'].setToolTip(trans("icon.video.capture"))
-        self.window.ui.nodes['icon.video.capture'].clicked.connect(
-            lambda:self.window.controller.camera.toggle_capture()
-        )
-
-        # audio output icon
-        self.window.ui.nodes['icon.audio.output'] = IconLabel(":/icons/volume.svg", window=self.window)
-        self.window.ui.nodes['icon.audio.output'].setToolTip(trans("icon.audio.output"))
-        self.window.ui.nodes['icon.audio.output'].clicked.connect(
-            lambda: self.window.controller.plugins.toggle('audio_output')
-        )
-
-        # audio input icon
-        self.window.ui.nodes['icon.audio.input'] = IconLabel(":/icons/mic.svg", window=self.window)
-        self.window.ui.nodes['icon.audio.input'].setToolTip(trans("icon.audio.input"))
-        self.window.ui.nodes['icon.audio.input'].clicked.connect(
-            lambda: self.window.controller.plugins.toggle('audio_input')
-        )
-
-        # interpreter icon
-        self.window.ui.nodes['icon.interpreter'] = IconLabel(":/icons/code.svg", window=self.window)
-        self.window.ui.nodes['icon.interpreter'].setToolTip("Python Code Interpreter")
-        self.window.ui.nodes['icon.interpreter'].clicked.connect(
-            lambda: self.window.tools.get("interpreter").toggle()
-        )
-
-        # indexer icon
-        self.window.ui.nodes['icon.indexer'] = IconLabel(":/icons/db.svg", window=self.window)
-        self.window.ui.nodes['icon.indexer'].setToolTip("Indexer")
-        self.window.ui.nodes['icon.indexer'].clicked.connect(
-            lambda: self.window.tools.get("indexer").toggle()
-        )
-
-        # mode
-        self.window.ui.nodes['chat.label'] = ChatStatusLabel("")
-        self.window.ui.nodes['chat.label'].setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
-        self.window.ui.nodes['chat.label'].setWordWrap(False)
-
-        # model
-        self.window.ui.nodes['chat.model'] = ChatStatusLabel("")
-        self.window.ui.nodes['chat.model'].setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
-        self.window.ui.nodes['chat.model'].setWordWrap(False)
-
-        # plugins
-        self.window.ui.nodes['chat.plugins'] = ChatStatusLabel("")
-        self.window.ui.nodes['chat.plugins'].setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
-
-        # timestamp
-        self.window.ui.nodes['output.timestamp'] = QCheckBox(trans('output.timestamp'))
-        self.window.ui.nodes['output.timestamp'].stateChanged.connect(
-            lambda: self.window.controller.chat.common.toggle_timestamp(
-                self.window.ui.nodes['output.timestamp'].isChecked())
-        )
-
-        # plain text
-        self.window.ui.nodes['output.raw'] = QCheckBox(trans('output.raw'))
-        self.window.ui.nodes['output.raw'].clicked.connect(
-            lambda: self.window.controller.chat.common.toggle_raw(
-                self.window.ui.nodes['output.raw'].isChecked())
-        )
+        nodes = self.window.ui.nodes
+        plugin_addon = self.window.ui.plugin_addon
+        ctrl = self.window.controller
+        tools = self.window.tools
 
-        """
-        # edit icons
-        self.window.ui.nodes['output.edit'] = QCheckBox(trans('output.edit'))
-        self.window.ui.nodes['output.edit'].clicked.connect(
-            lambda: self.window.controller.chat.common.toggle_edit_icons(
-                self.window.ui.nodes['output.edit'].isChecked())
-        )
-        """
+        nodes['icon.video.capture'] = IconLabel(":/icons/webcam.svg", window=self.window)
+        nodes['icon.video.capture'].setToolTip(trans("icon.video.capture"))
+        nodes['icon.video.capture'].clicked.connect(lambda: ctrl.camera.toggle_capture())
+
+        nodes['icon.audio.output'] = IconLabel(":/icons/volume.svg", window=self.window)
+        nodes['icon.audio.output'].setToolTip(trans("icon.audio.output"))
+        nodes['icon.audio.output'].clicked.connect(lambda: ctrl.plugins.toggle('audio_output'))
 
-        # tokens
-        self.window.ui.nodes['prompt.context'] = ChatStatusLabel("")
-        self.window.ui.nodes['prompt.context'].setToolTip(trans('tip.tokens.ctx'))
-        self.window.ui.nodes['prompt.context'].setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
+        nodes['icon.audio.input'] = IconLabel(":/icons/mic.svg", window=self.window)
+        nodes['icon.audio.input'].setToolTip(trans("icon.audio.input"))
+        nodes['icon.audio.input'].clicked.connect(lambda: ctrl.plugins.toggle('audio_input'))
 
-        self.window.ui.nodes['input.counter'] = ChatStatusLabel("")
-        self.window.ui.nodes['input.counter'].setToolTip(trans('tip.tokens.input'))
-        self.window.ui.nodes['input.counter'].setWordWrap(False)
+        nodes['icon.interpreter'] = IconLabel(":/icons/code.svg", window=self.window)
+        nodes['icon.interpreter'].setToolTip("Python Code Interpreter")
+        nodes['icon.interpreter'].clicked.connect(lambda: tools.get("interpreter").toggle())
 
-        # plugin audio output addon
-        self.window.ui.plugin_addon['audio.output'] = AudioOutput(self.window)
+        nodes['icon.indexer'] = IconLabel(":/icons/db.svg", window=self.window)
+        nodes['icon.indexer'].setToolTip("Indexer")
+        nodes['icon.indexer'].clicked.connect(lambda: tools.get("indexer").toggle())
 
-        # schedule
-        self.window.ui.plugin_addon['schedule'] = ChatStatusLabel("")
+        min_policy = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
 
-        # inline vision
-        self.window.ui.nodes['inline.vision'] = HelpLabel(trans('inline.vision'))
-        self.window.ui.nodes['inline.vision'].setVisible(False)
-        self.window.ui.nodes['inline.vision'].setContentsMargins(0, 0, 0, 0)
+        nodes['chat.label'] = ChatStatusLabel("")
+        nodes['chat.label'].setSizePolicy(min_policy)
+        nodes['chat.label'].setWordWrap(False)
+
+        nodes['chat.model'] = ChatStatusLabel("")
+        nodes['chat.model'].setSizePolicy(min_policy)
+        nodes['chat.model'].setWordWrap(False)
+
+        nodes['chat.plugins'] = ChatStatusLabel("")
+        nodes['chat.plugins'].setSizePolicy(min_policy)
+
+        nodes['output.timestamp'] = QCheckBox(trans('output.timestamp'))
+        nodes['output.timestamp'].toggled.connect(ctrl.chat.common.toggle_timestamp)
+
+        nodes['output.raw'] = QCheckBox(trans('output.raw'))
+        nodes['output.raw'].toggled.connect(ctrl.chat.common.toggle_raw)
+
+        nodes['prompt.context'] = ChatStatusLabel("")
+        nodes['prompt.context'].setToolTip(trans('tip.tokens.ctx'))
+        nodes['prompt.context'].setSizePolicy(min_policy)
+
+        nodes['input.counter'] = ChatStatusLabel("")
+        nodes['input.counter'].setToolTip(trans('tip.tokens.input'))
+        nodes['input.counter'].setWordWrap(False)
+
+        plugin_addon['audio.output'] = AudioOutput(self.window)
+        plugin_addon['schedule'] = ChatStatusLabel("")
+
+        nodes['inline.vision'] = HelpLabel(trans('inline.vision'))
+        nodes['inline.vision'].setVisible(False)
+        nodes['inline.vision'].setContentsMargins(0, 0, 0, 0)
 
         opts_layout = QHBoxLayout()
-        # opts_layout.setSpacing(2)  #
         opts_layout.setContentsMargins(0, 0, 0, 0)
-        opts_layout.addWidget(self.window.ui.nodes['output.raw'])
-        opts_layout.addWidget(self.window.ui.nodes['output.timestamp'])
-        # opts_layout.addWidget(self.window.ui.nodes['output.edit'])
-        
-        opts_layout.addWidget(self.window.ui.nodes['inline.vision'])
+        opts_layout.addWidget(nodes['output.raw'])
+        opts_layout.addWidget(nodes['output.timestamp'])
+        opts_layout.addWidget(nodes['inline.vision'])
         opts_layout.setAlignment(Qt.AlignLeft)
 
-        left_layout = QHBoxLayout()
-        left_layout.addLayout(opts_layout)
-        left_layout.setContentsMargins(0, 0, 0, 0)
-
-        right_layout = QHBoxLayout()
-        right_layout.addWidget(self.window.ui.nodes['icon.video.capture'])
-        right_layout.addWidget(self.window.ui.nodes['icon.audio.input'])
-        right_layout.addWidget(self.window.ui.nodes['icon.audio.output'])
-        right_layout.addWidget(self.window.ui.nodes['icon.interpreter'])
-        right_layout.addWidget(self.window.ui.nodes['icon.indexer'])
-        right_layout.addWidget(self.window.ui.plugin_addon['schedule'])
-        right_layout.addWidget(QLabel(" "))
-        right_layout.addWidget(self.window.ui.nodes['chat.plugins'])
-        right_layout.addWidget(QLabel(" "))
-        right_layout.addWidget(self.window.ui.nodes['chat.label'])
-        right_layout.addWidget(QLabel("  "))
-        right_layout.addWidget(self.window.ui.nodes['chat.model'])
-        right_layout.addWidget(QLabel("  "))
-        right_layout.addWidget(self.window.ui.nodes['prompt.context'])
-        right_layout.addWidget(QLabel("  "))
-        right_layout.addWidget(self.window.ui.nodes['input.counter'])
-        right_layout.setContentsMargins(0, 8, 20, 0)
-
-        left_widget = QWidget()
-        left_widget.setLayout(left_layout)
-        right_widget = QWidget()
-        right_widget.setLayout(right_layout)
-
-        self.window.ui.nodes['anim.loading'] = QWidget()
-        self.window.ui.nodes['anim.loading'].hide()
+        left_bar_layout = QHBoxLayout()
+        left_bar_layout.addLayout(opts_layout)
+        left_bar_layout.setContentsMargins(0, 0, 0, 0)
+
+        nodes['anim.loading'] = QWidget()
+        nodes['anim.loading'].hide()
+
+        right_bar_layout = QHBoxLayout()
+        right_bar_layout.addWidget(nodes['icon.video.capture'])
+        right_bar_layout.addWidget(nodes['icon.audio.input'])
+        right_bar_layout.addWidget(nodes['icon.audio.output'])
+        right_bar_layout.addWidget(nodes['icon.interpreter'])
+        right_bar_layout.addWidget(nodes['icon.indexer'])
+        right_bar_layout.addWidget(plugin_addon['schedule'])
+        right_bar_layout.addSpacing(6)
+        right_bar_layout.addWidget(nodes['chat.plugins'])
+        right_bar_layout.addSpacing(6)
+        right_bar_layout.addWidget(nodes['chat.label'])
+        right_bar_layout.addSpacing(12)
+        right_bar_layout.addWidget(nodes['chat.model'])
+        right_bar_layout.addSpacing(12)
+        right_bar_layout.addWidget(nodes['prompt.context'])
+        right_bar_layout.addSpacing(12)
+        right_bar_layout.addWidget(nodes['input.counter'])
+        right_bar_layout.setContentsMargins(0, 8, 20, 0)
 
         grid = QGridLayout()
-
-        left_layout = QHBoxLayout()
-        left_layout.addWidget(left_widget)
-        #left_layout.addStretch(1)
-        left_layout.setContentsMargins(0, 0, 0, 0)
-
-        center_layout = QHBoxLayout()
-        #center_layout.addStretch()
-        center_layout.addWidget(self.window.ui.nodes['anim.loading'])
-        center_layout.addStretch()
-        center_layout.setContentsMargins(20, 0, 0, 0)
-
-        right_layout = QHBoxLayout()
-        right_layout.addStretch(1)
-        right_layout.addWidget(right_widget)
-        right_layout.setContentsMargins(0, 0, 0, 0)
-
-        grid.addLayout(left_layout, 0, 0)
-        grid.addLayout(center_layout, 0, 1, alignment=Qt.AlignCenter)
-        grid.addLayout(right_layout, 0, 2, alignment=Qt.AlignRight)
+        grid.addLayout(left_bar_layout, 0, 0)
+        grid.addWidget(nodes['anim.loading'], 0, 1, alignment=Qt.AlignCenter)
+        grid.addLayout(right_bar_layout, 0, 2, alignment=Qt.AlignRight)
+        grid.setColumnStretch(0, 0)
+        grid.setColumnStretch(1, 1)
+        grid.setColumnStretch(2, 0)
         grid.setContentsMargins(0, 0, 0, 0)
 
-        self.window.ui.nodes['chat.footer'] = QWidget()
-        self.window.ui.nodes['chat.footer'].setLayout(grid)
+        nodes['chat.footer'] = QWidget()
+        nodes['chat.footer'].setLayout(grid)
 
         bottom_layout = QVBoxLayout()
-        bottom_layout.addWidget(self.window.ui.nodes['chat.footer'])
+        bottom_layout.addWidget(nodes['chat.footer'])
         bottom_layout.setContentsMargins(2, 0, 2, 0)
         return bottom_layout
 
     def set_fixed_size_policy(self, layout):
         for i in range(layout.count()):
             item = layout.itemAt(i)
-            if isinstance(item, QWidgetItem):
-                widget = item.widget()
-                if widget:
-                    widget.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
-            elif isinstance(item, QLayout):
-                self.set_fixed_size_policy(item)
+            w = item.widget()
+            if w is not None:
+                w.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+            else:
+                l = item.layout()
+                if l is not None:
+                    self.set_fixed_size_policy(l)