pygpt-net 2.4.37__py3-none-any.whl → 2.4.41__py3-none-any.whl

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.14 07: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,128 @@ 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.active = True
+        self.column = column
         self.setMinimumHeight(1)
         self.owner = None
         self.setMovable(True)
+        self.init()
+
+    def set_active(self, active: bool):
+        """Set the active state of the tab bar."""
+        self.active = active
+        if self.active:
+            self.setStyleSheet("QTabBar::tab { border-bottom-width: 2px; }")
+        else:
+            self.setStyleSheet("QTabBar::tab { border-bottom-width: 0px; }")
+
+    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 +153,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)
         )
-        return actions
+        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)
+        )
+
+        # 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'])
 
-    def show_notepad_menu(self, index, global_pos):
+        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,
+        )

pygpt_net/ui/widget/textarea/html.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 import re
@@ -42,6 +42,15 @@ class HtmlOutput(QWebEngineView):
         self.plain = ""
         self.html_content = ""
         self.meta = None
+        self.tab = None
+
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def set_meta(self, meta: CtxMeta):
         """
@@ -163,6 +172,7 @@ class HtmlOutput(QWebEngineView):
         if success:
             event = RenderEvent(RenderEvent.ON_PAGE_LOAD, {
                 "meta": self.meta,
+                "tab": self.tab,
             })
             self.window.dispatch(event)
 

pygpt_net/ui/widget/textarea/output.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.24 01:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -38,6 +38,15 @@ class ChatOutput(QTextBrowser):
         self.setOpenLinks(False)
         self.anchorClicked.connect(self.open_external_link)
         self.setWordWrapMode(QTextOption.WordWrap)
+        self.tab = None
+
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def open_external_link(self, url):
         """

pygpt_net/ui/widget/textarea/search_input.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.12 10:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction, QIcon
@@ -32,6 +32,9 @@ class CtxSearchInput(QLineEdit):
         self.clear_action.triggered.connect(self.clear_search_string)
         self.addAction(self.clear_action, QLineEdit.TrailingPosition)
         self.clear_action.setVisible(False)
+        action = QAction(self)
+        action.setIcon(QIcon(":/icons/search.svg"))
+        self.addAction(action, QLineEdit.LeadingPosition)
 
         self.textChanged.connect(self.on_text_changed)
 

pygpt_net/ui/widget/textarea/web.py

@@ -6,21 +6,24 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 import re
 
-from PySide6.QtCore import Qt, QObject, Signal, Slot
+from PySide6.QtCore import Qt, QObject, Signal, Slot, QEvent
 from PySide6.QtWebChannel import QWebChannel
 from PySide6.QtWebEngineCore import QWebEngineSettings, QWebEnginePage
 from PySide6.QtWebEngineWidgets import QWebEngineView
 from PySide6.QtGui import QAction, QIcon, QKeySequence
+from PySide6.QtWidgets import QMenu
 
 from pygpt_net.core.events import RenderEvent
 from pygpt_net.item.ctx import CtxMeta
 from pygpt_net.core.text.web_finder import WebFinder
+from pygpt_net.ui.widget.tabs.layout import FocusEventFilter
 from pygpt_net.utils import trans
+
 import pygpt_net.icons_rc
 
 
@@ -38,9 +41,46 @@ class ChatWebOutput(QWebEngineView):
         self.customContextMenuRequested.connect(self.on_context_menu)
         self.signals = WebEngineSignals()
         self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.filter = FocusEventFilter(self, self.on_focus)
+        self.installEventFilter(self)
         self.plain = ""
         self.html_content = ""
         self.meta = None
+        self.tab = None
+
+    def eventFilter(self, source, event):
+        """
+        Focus event filter
+
+        :param source: source
+        :param event: event
+        """
+        if (event.type() == QEvent.ChildAdded and
+                source is self and
+                event.child().isWidgetType()):
+            self._glwidget = event.child()
+            self._glwidget.installEventFilter(self)
+        elif (event.type() == event.Type.MouseButtonPress):
+            col_idx = self.tab.column_idx
+            self.window.controller.ui.tabs.on_column_focus(col_idx)
+        return super().eventFilter(source, event)
+
+    def on_focus(self, widget):
+        """
+        On widget clicked
+
+        :param widget: widget
+        """
+        self.window.controller.ui.tabs.on_column_focus(self.tab.column_idx)
+        self.setFocus()
+
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def set_meta(self, meta: CtxMeta):
         """
@@ -72,12 +112,7 @@ class ChatWebOutput(QWebEngineView):
 
         :param position: position
         """
-        menu = self.createStandardContextMenu()
-
-        # remove defaults
-        for action in menu.actions()[::-1]:
-            menu.removeAction(action)
-
+        menu = QMenu(self)
         selected_text = ""
         is_selection = self.page().hasSelection()
         if is_selection:
@@ -138,6 +173,10 @@ class ChatWebOutput(QWebEngineView):
         if self.window.core.config.has("zoom"):
             self.page().setZoomFactor(self.window.core.config.get("zoom"))
 
+    def on_focus_js(self):
+        """Focus JavaScript"""
+        self.window.controller.ui.tabs.on_column_focus(self.tab.column_idx)
+
     def get_zoom_value(self) -> float:
         """
         Get zoom value
@@ -165,6 +204,7 @@ class ChatWebOutput(QWebEngineView):
         if success:
             event = RenderEvent(RenderEvent.ON_PAGE_LOAD, {
                 "meta": self.meta,
+                "tab": self.tab,
             })
             self.window.dispatch(event)
 
@@ -318,4 +358,4 @@ class WebEngineSignals(QObject):
 
 
 class WebEnginePageSignals(QObject):
-    js_message = Signal(int, str, str)  # on Javascript message
+    js_message = Signal(int, str, str)  # on Javascript message