pygpt-net 2.4.38__py3-none-any.whl → 2.4.40__py3-none-any.whl

pygpt_net/ui/widget/lists/context.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.08.22 17:00:00                  #
+# Updated Date: 2024.12.12 04:00:00                  #
 # ================================================== #
 
 import datetime
@@ -402,11 +402,32 @@ class ImportantItemDelegate(QtWidgets.QStyledItemDelegate):
         super(ImportantItemDelegate, self).paint(painter, option, index)
 
         # pin (>= 10)
-        if index.data(QtCore.Qt.ItemDataRole.UserRole) and index.data(QtCore.Qt.ItemDataRole.UserRole) > 0:
-            label = index.data(QtCore.Qt.ItemDataRole.UserRole)
+        if index.data(QtCore.Qt.ItemDataRole.UserRole):
+            data = index.data(QtCore.Qt.ItemDataRole.UserRole)
+            label = 0
+            is_important = False
+            is_attachment = False
+            if "label" in data:
+                label = data["label"]
+            if "is_important" in data and data["is_important"]:
+                is_important = True
+            if "is_attachment" in data and data["is_attachment"]:
+                is_attachment = True
+
             painter.save()
 
-            if label >= 10:
+            if is_attachment:
+                icon = QtGui.QIcon(":/icons/attachment.svg")
+                icon_size = option.decorationSize or QtCore.QSize(16, 16)
+                icon_rect = QtCore.QRect(
+                    option.rect.right() - icon_size.width(),
+                    option.rect.top() + (option.rect.height() - icon_size.height()) / 2,
+                    icon_size.width(),
+                    icon_size.height()
+                )
+                icon.paint(painter, icon_rect, QtCore.Qt.AlignCenter)
+
+            if is_important:
                 color = self.get_color_for_status(3)
                 square_size = 3
                 square_margin = 0
@@ -426,7 +447,7 @@ class ImportantItemDelegate(QtWidgets.QStyledItemDelegate):
                 )
                 painter.drawRect(square_rect)
 
-                label = label - 10  # remove pin status
+                #label = label - 10  # remove pin status
 
             # label (0-9)
             if label > 0:

pygpt_net/ui/widget/tabs/Input.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.01.29 14:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QTabWidget, QMenu
@@ -40,7 +40,7 @@ class InputTabs(QTabWidget):
 
         :param global_pos: QPoint
         """
-        context_menu = QMenu()
+        context_menu = QMenu(self)
         actions = {}
         actions['clear'] = QAction(QIcon(":/icons/delete.svg"), trans('attachments.btn.clear'), self)
         actions['clear'].triggered.connect(

pygpt_net/ui/widget/tabs/body.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.05 23:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QTabWidget
+
 from pygpt_net.core.tabs.tab import Tab
 
 

pygpt_net/ui/widget/tabs/layout.py

@@ -0,0 +1,195 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ================================================== #
+# This file is a part of PYGPT package               #
+# Website: https://pygpt.net                         #
+# GitHub:  https://github.com/szczyglis-dev/py-gpt   #
+# MIT License                                        #
+# Created By  : Marcin Szczygliński                  #
+# Updated Date: 2024.12.09 03:00:00                  #
+# ================================================== #
+
+from PySide6.QtCore import Qt, QObject, QEvent
+from PySide6.QtWidgets import QTabWidget, QWidget, QVBoxLayout, QSplitter, QSizePolicy
+
+from pygpt_net.ui.widget.tabs.output import OutputTabs
+
+
+class OutputColumn(QWidget):
+    def __init__(self, window=None):
+        """
+        Output column
+
+        :param window: window instance
+        """
+        super(OutputColumn, self).__init__(window)
+        self.window = window
+        self.idx = -1
+        self.tabs = OutputTabs(self.window, column=self)
+        self.layout = QVBoxLayout()
+        self.layout.addWidget(self.tabs)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.setLayout(self.layout)
+        self.filter = FocusEventFilter(self, self.on_focus)
+        self.installEventFilter(self.filter)
+        self.setFocusPolicy(Qt.StrongFocus)
+
+    def on_focus(self, widget):
+        """
+        On widget clicked
+
+        :param widget: widget
+        """
+        self.window.controller.ui.tabs.on_column_focus(self.idx)
+        widget.setFocus()
+
+    def set_idx(self, idx: int):
+        """
+        Set index
+
+        :param idx: int
+        """
+        self.idx = idx
+
+    def get_idx(self) -> int:
+        """
+        Get index
+
+        :return: int
+        """
+        return self.idx
+
+    def set_tabs(self, tabs: QTabWidget):
+        """
+        Set tabs widget
+
+        :param tabs: QTabWidget
+        """
+        self.tabs = tabs
+
+    def get_tabs(self) -> OutputTabs:
+        """
+        Get tabs
+
+        :return: OutputTabs
+        """
+        return self.tabs
+
+
+class OutputLayout(QWidget):
+    def __init__(self, window=None):
+        """
+        Output layout
+
+        :param window: window instance
+        """
+        super(OutputLayout, self).__init__(window)
+        self.window = window
+        self.columns = []
+
+        column1 = OutputColumn(self.window)
+        column2 = OutputColumn(self.window)
+        self.add_column(column1)
+        self.add_column(column2)
+
+        self.splitter = QSplitter(Qt.Horizontal)
+        self.splitter.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        for column in self.columns:
+            self.splitter.addWidget(column)
+
+        self.window.ui.splitters['columns'] = self.splitter
+
+        self.layout = QVBoxLayout()
+        self.layout.addWidget(self.splitter, stretch=1)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.setLayout(self.layout)
+
+    def get_next_idx(self) -> int:
+        """
+        Get next index
+
+        :return: int
+        """
+        return len(self.columns)
+
+    def add_column(self, column: OutputColumn):
+        """
+        Add column
+
+        :param column: OutputColumn
+        """
+        idx = self.get_next_idx()
+        column.set_idx(idx)
+        self.columns.append(column)
+
+    def get_tabs_by_idx(self, idx: int) -> OutputTabs:
+        """
+        Get tabs by column index
+
+        :param idx: int
+        :return: OutputTabs
+        """
+        for column in self.columns:
+            if column.idx == idx:
+                return column.tabs
+        return None
+
+    def get_active_tabs(self) -> OutputTabs:
+        """
+        Get active tabs
+
+        :return: OutputTabs
+        """
+        current = self.window.controller.ui.tabs.get_current_column_idx()
+        for column in self.columns:
+            if column.idx == current:
+                return column.tabs
+
+    def get_column_by_idx(self, idx: int) -> OutputColumn:
+        """
+        Get column by index
+
+        :param idx: int
+        :return: OutputColumn
+        """
+        for column in self.columns:
+            if column.idx == idx:
+                return column
+        return None
+
+    def get_active_column(self) -> OutputColumn:
+        """
+        Get active column
+
+        :return: OutputColumn
+        """
+        current = self.window.controller.ui.tabs.get_current_column_idx()
+        for column in self.columns:
+            if column.idx == current:
+                return column
+
+class FocusEventFilter(QObject):
+    def __init__(self, column, callback):
+        """
+        Column event filter
+
+        :param column: parent column
+        :param callback: callback
+        """
+        super().__init__()
+        self.column = column
+        self.callback = callback
+
+    def eventFilter(self, obj, event):
+        """
+        Click event filter
+
+        :param obj: object
+        :param event: event
+        """
+        if event.type() == QEvent.MouseButtonPress or event.type() == QEvent.FocusIn:
+            widget = obj
+            if widget is not None:
+                self.callback(widget)
+            return False
+        return False

pygpt_net/ui/widget/tabs/output.py

@@ -6,10 +6,10 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.05 23:00:00                  #
+# Updated Date: 2024.12.12 01:00:00                  #
 # ================================================== #
 
-from PySide6.QtWidgets import QTabWidget, QMenu
+from PySide6.QtWidgets import QTabWidget, QMenu, QPushButton
 from PySide6.QtCore import Qt, Slot
 from PySide6.QtGui import QAction, QIcon
 
@@ -18,17 +18,119 @@ from pygpt_net.utils import trans
 import pygpt_net.icons_rc
 
 
+class AddButton(QPushButton):
+    def __init__(self, window=None, column=None, tabs=None):
+        super(AddButton, self).__init__(QIcon(":/icons/add.svg"), "", window)
+        self.window = window
+        self.column = column
+        self.tabs = tabs
+        self.setFixedSize(30, 25)
+        self.setFlat(True)
+        self.clicked.connect(
+            lambda: self.window.controller.ui.tabs.new_tab(self.column.get_idx())
+        )
+        self.setObjectName('tab-add')
+        self.setProperty('tabAdd', True)
+        self.setToolTip(trans('action.tab.add.chat'))
+
+    def mousePressEvent(self, event):
+        """
+        Mouse press event
+
+        :param event: event
+        """
+        if event.button() == Qt.RightButton:
+            idx = 0
+            column_idx = self.column.get_idx()
+            self.show_menu(idx, column_idx, event.globalPos())
+        super(AddButton, self).mousePressEvent(event)
+
+    def show_menu(self, index: int, column_idx: int, global_pos):
+        """
+        Show context menu
+
+        :param index: index
+        :param column_idx: column index
+        :param global_pos: global position
+        """
+        context_menu = self.prepare_menu(index, column_idx)
+        context_menu.exec(global_pos)
+
+    def prepare_menu(self, index: int, column_idx: int) -> QMenu:
+        """
+        Prepare and return context menu
+
+        :param index: index
+        :param column_idx: column index
+        :return: menu
+        """
+        menu = QMenu(self)
+
+        actions = {}
+        actions['add_chat'] = QAction(QIcon(":/icons/add.svg"), trans('action.tab.add.chat'), self)
+        actions['add_chat'].triggered.connect(
+            lambda: self.tabs.add_tab(index, column_idx, Tab.TAB_CHAT)
+        )
+        actions['add_notepad'] = QAction(QIcon(":/icons/add.svg"), trans('action.tab.add.notepad'), self)
+        actions['add_notepad'].triggered.connect(
+            lambda: self.tabs.add_tab(index, column_idx, Tab.TAB_NOTEPAD)
+        )
+
+        # add chat, add notepad
+        menu.addAction(actions['add_chat'])
+        menu.addAction(actions['add_notepad'])
+
+        # add tools submenu
+        self.window.controller.tools.append_tab_menu(self, menu, index, column_idx)
+
+        return menu
+
 class OutputTabs(QTabWidget):
-    def __init__(self, window=None):
+    def __init__(self, window=None, column=None):
         super(OutputTabs, self).__init__(window)
         self.window = window
+        self.column = column
         self.setMinimumHeight(1)
         self.owner = None
         self.setMovable(True)
+        self.init()
+
+    def init(self):
+        """Initialize"""
+        # create the [+] button
+        add_button = AddButton(self.window, self.column, self)
+
+        # add the button to the top right corner of the tab bar
+        self.setCornerWidget(add_button, corner=Qt.TopRightCorner)
+
+        # connect signals
+        self.currentChanged.connect(
+            lambda: self.window.controller.ui.tabs.on_tab_changed(self.currentIndex(), self.column.get_idx())
+        )
+        self.tabBarClicked.connect(
+            lambda: self.window.controller.ui.tabs.on_tab_clicked(self.currentIndex(), self.column.get_idx())
+        )
+        self.tabBarDoubleClicked.connect(
+            lambda: self.window.controller.ui.tabs.on_tab_dbl_clicked(self.currentIndex(), self.column.get_idx())
+        )
+        self.tabCloseRequested.connect(
+            lambda: self.window.controller.ui.tabs.on_tab_closed(self.currentIndex(), self.column.get_idx())
+        )
+        self.tabBar().tabMoved.connect(
+            lambda: self.window.controller.ui.tabs.on_tab_moved(self.currentIndex(), self.column.get_idx())
+        )
+
+    def get_column(self):
+        """
+        Get column
+
+        :return: OutputColumn
+        """
+        return self.column
 
     def setOwner(self, owner: Tab):
         """
-        Set parent
+        Set internal tab instance
 
         :param owner: parent tab instance
         """
@@ -42,158 +144,210 @@ class OutputTabs(QTabWidget):
         """
         if event.button() == Qt.RightButton:
             idx = self.tabBar().tabAt(event.pos())
-            tab = self.window.core.tabs.get_tab_by_index(idx)
+            column_idx = self.column.get_idx()
+            tab = self.window.core.tabs.get_tab_by_index(idx, column_idx)
             if tab is not None:
                 if tab.type == Tab.TAB_NOTEPAD:
-                    self.show_notepad_menu(idx, event.globalPos())  # notepad
+                    self.show_notepad_menu(idx, column_idx, event.globalPos())  # notepad
                 elif tab.type == Tab.TAB_CHAT:
-                    self.show_chat_menu(idx, event.globalPos())  # chat
+                    self.show_chat_menu(idx, column_idx, event.globalPos())  # chat
                 elif tab.type == Tab.TAB_FILES:
-                    self.show_files_menu(idx, event.globalPos())  # files
+                    self.show_files_menu(idx, column_idx, event.globalPos())  # files
+                elif tab.type == Tab.TAB_TOOL:
+                    self.show_tool_menu(idx, column_idx, event.globalPos())  # tool
                 else:
-                    self.show_default_menu(idx, event.globalPos()) # default
+                    self.show_default_menu(idx, column_idx, event.globalPos()) # default
         super(OutputTabs, self).mousePressEvent(event)
 
-    def get_common_actions(self, index):
+    def prepare_menu(self, index: int, column_idx: int) -> QMenu:
         """
-        Get common actions
+        Prepare and return context menu
 
         :param index: index
-        :return: dict
+        :param column_idx: column index
+        :return: menu
         """
+        menu = QMenu(self)
+
         actions = {}
         actions['add_chat'] = QAction(QIcon(":/icons/add.svg"), trans('action.tab.add.chat'), self)
         actions['add_chat'].triggered.connect(
-            lambda: self.add_tab(index, Tab.TAB_CHAT)
+            lambda: self.add_tab(index, column_idx, Tab.TAB_CHAT)
         )
         actions['add_notepad'] = QAction(QIcon(":/icons/add.svg"), trans('action.tab.add.notepad'), self)
         actions['add_notepad'].triggered.connect(
-            lambda: self.add_tab(index, Tab.TAB_NOTEPAD)
+            lambda: self.add_tab(index, column_idx, Tab.TAB_NOTEPAD)
         )
         actions['edit'] = QAction(QIcon(":/icons/edit.svg"), trans('action.rename'), self)
         actions['edit'].triggered.connect(
-            lambda: self.rename_tab(index)
+            lambda: self.rename_tab(index, column_idx)
+        )
+        actions['move_right'] = QAction(QIcon(":/icons/forward"), trans('action.tab.move.right'), self)
+        actions['move_right'].triggered.connect(
+            lambda: self.window.controller.ui.tabs.move_tab(index, column_idx, 1)
+        )
+        actions['move_left'] = QAction(QIcon(":/icons/back"), trans('action.tab.move.left'), self)
+        actions['move_left'].triggered.connect(
+            lambda: self.window.controller.ui.tabs.move_tab(index, column_idx, 0)
         )
-        return actions
 
-    def show_notepad_menu(self, index, global_pos):
+        # add chat, add notepad
+        menu.addAction(actions['add_chat'])
+        menu.addAction(actions['add_notepad'])
+
+        # add tools submenu
+        self.window.controller.tools.append_tab_menu(self, menu, index, column_idx)
+
+        # rename tab
+        menu.addAction(actions['edit'])
+
+        # move tab left, move tab right
+        if column_idx != 0:
+            menu.addAction(actions['move_left'])
+        if column_idx != 1:
+            menu.addAction(actions['move_right'])
+
+        return menu
+
+    def show_notepad_menu(self, index: int, column_idx: int, global_pos):
         """
         Show notepad menu
 
         :param index: index
+        :param column_idx: column index
         :param global_pos: global position
         """
-        context_menu = QMenu()
-        actions = self.get_common_actions(index)
+        context_menu = self.prepare_menu(index, column_idx)
+        actions = {}
         actions['close'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close'), self)
         actions['close'].triggered.connect(
-            lambda: self.close_tab(index)
+            lambda: self.close_tab(index, column_idx)
         )
         actions['close_all'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close_all.notepad'), self)
         actions['close_all'].triggered.connect(
-            lambda: self.close_all(Tab.TAB_NOTEPAD)
+            lambda: self.close_all(Tab.TAB_NOTEPAD, column_idx)
         )
-        context_menu.addAction(actions['add_chat'])
-        context_menu.addAction(actions['add_notepad'])
-        context_menu.addAction(actions['edit'])
         context_menu.addAction(actions['close'])
 
         if self.window.core.tabs.count_by_type(Tab.TAB_NOTEPAD) > 1:
             context_menu.addAction(actions['close_all'])
+
         context_menu.exec(global_pos)
 
-    def show_chat_menu(self, index, global_pos):
+    def show_chat_menu(self, index: int, column_idx: int, global_pos):
         """
         Show chat menu
 
         :param index: index
+        :param column_idx: column index
         :param global_pos: global position
         """
-        context_menu = QMenu()
-        actions = self.get_common_actions(index)
+        context_menu = self.prepare_menu(index, column_idx)
+        actions = {}
         actions['close'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close'), self)
         actions['close'].triggered.connect(
-            lambda: self.close_tab(index)
+            lambda: self.close_tab(index, column_idx)
         )
         actions['close_all'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close_all.chat'), self)
         actions['close_all'].triggered.connect(
-            lambda: self.close_all(Tab.TAB_CHAT)
+            lambda: self.close_all(Tab.TAB_CHAT, column_idx)
         )
-        context_menu.addAction(actions['add_chat'])
-        context_menu.addAction(actions['add_notepad'])
-        context_menu.addAction(actions['edit'])
 
         # at least one chat tab must be open
         if self.window.core.tabs.count_by_type(Tab.TAB_CHAT) > 1:
             context_menu.addAction(actions['close'])
-
-        if self.window.core.tabs.count_by_type(Tab.TAB_CHAT) > 1:
             context_menu.addAction(actions['close_all'])
 
         context_menu.exec(global_pos)
 
-    def show_files_menu(self, index, global_pos):
+    def show_files_menu(self, index: int, column_idx: int, global_pos):
         """
         Show files menu
 
         :param index: index
+        :param column_idx: column index
         :param global_pos: global position
         """
-        context_menu = QMenu()
-        actions = self.get_common_actions(index)
+        context_menu = self.prepare_menu(index, column_idx)
+        actions = {}
         actions['refresh'] = QAction(QIcon(":/icons/reload.svg"), trans('action.refresh'), self)
         actions['refresh'].triggered.connect(
             lambda: self.window.controller.files.update_explorer()
         )
-        context_menu.addAction(actions['add_chat'])
-        context_menu.addAction(actions['add_notepad'])
         context_menu.addAction(actions['refresh'])
-        context_menu.addAction(actions['edit'])
         context_menu.exec(global_pos)
 
-    def show_default_menu(self, index, global_pos):
+    def show_tool_menu(self, index: int, column_idx: int, global_pos):
+        """
+        Show tool menu
+
+        :param index: index
+        :param column_idx: column index
+        :param global_pos: global position
+        """
+        context_menu = self.prepare_menu(index, column_idx)
+        actions = {}
+        actions['close'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close'), self)
+        actions['close'].triggered.connect(
+            lambda: self.close_tab(index, column_idx)
+        )
+        context_menu.addAction(actions['close'])
+        context_menu.exec(global_pos)
+
+    def show_default_menu(self, index: int, column_idx: int, global_pos):
         """
         Show default menu
 
         :param index: index
+        :param column_idx: column index
         :param global_pos: global position
         """
-        context_menu = QMenu()
-        actions = self.get_common_actions(index)
-        context_menu.addAction(actions['add_chat'])
-        context_menu.addAction(actions['add_notepad'])
-        context_menu.addAction(actions['edit'])
+        context_menu = self.prepare_menu(index, column_idx)
         context_menu.exec(global_pos)
 
     @Slot()
-    def rename_tab(self, index):
+    def rename_tab(self, index: int, column_idx: int):
         """
         Rename tab
+
         :param index: index
+        :param column_idx: column index
         """
-        self.window.controller.ui.tabs.rename(index)
+        self.window.controller.ui.tabs.rename(index, column_idx)
 
     @Slot()
-    def close_tab(self, index):
+    def close_tab(self, index: int, column_idx: int):
         """
         Close tab
+
         :param index: index
+        :param column_idx: column index
         """
-        self.window.controller.ui.tabs.close(index)
+        self.window.controller.ui.tabs.close(index, column_idx)
 
     @Slot()
-    def close_all(self, type):
+    def close_all(self, type, column_idx: int):
         """
         Close all tabs
+
         :param type: type
+        :param column_idx: column index
         """
-        self.window.controller.ui.tabs.close_all(type)
+        self.window.controller.ui.tabs.close_all(type, column_idx)
 
     @Slot()
-    def add_tab(self, index, type):
+    def add_tab(self, index: int, column_idx: int, type: int, tool_id: str = None):
         """
-        Add tab
+        Add a new tab
+
         :param index: index
+        :param column_idx: column index
         :param type: type
+        :param tool_id: tool id
         """
-        self.window.controller.ui.tabs.append(type, index)
+        self.window.controller.ui.tabs.append(
+            type=type,
+            tool_id=tool_id,
+            idx=index,
+            column_idx=column_idx,
+        )