pygpt-net 2.4.55__py3-none-any.whl → 2.4.57__py3-none-any.whl

pygpt_net/tools/code_interpreter/ui/widgets.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.12 01:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 from PySide6 import QtCore
@@ -42,6 +42,15 @@ class ToolWidget:
         self.label_output = None  # output label
         self.label_history = None  # history label
 
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.output.set_tab(tab)
+        self.input.set_tab(tab)
+
     def setup(self, all: bool = True) -> QVBoxLayout:
         """
         Setup widget body
@@ -297,6 +306,29 @@ class PythonInput(QTextEdit):
             lambda: self.tool.update_input()
         )
         self.setFocus()
+        self.tab = None
+        self.installEventFilter(self)
+
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
+
+    def eventFilter(self, source, event):
+        """
+        Focus event filter
+
+        :param source: source
+        :param event: event
+        """
+        if event.type() == event.Type.FocusIn:
+            if self.tab is not None:
+                col_idx = self.tab.column_idx
+                self.window.controller.ui.tabs.on_column_focus(col_idx)
+        return super().eventFilter(source, event)
 
     def update_stylesheet(self, data: str):
         """
@@ -364,6 +396,29 @@ class PythonOutput(BaseCodeEditor):
         self.setProperty('class', 'interpreter-output')
         self.default_stylesheet = ""
         self.setStyleSheet(self.default_stylesheet)
+        self.tab = None
+        self.installEventFilter(self)
+
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
+
+    def eventFilter(self, source, event):
+        """
+        Focus event filter
+
+        :param source: source
+        :param event: event
+        """
+        if event.type() == event.Type.FocusIn:
+            if self.tab is not None:
+                col_idx = self.tab.column_idx
+                self.window.controller.ui.tabs.on_column_focus(col_idx)
+        return super().eventFilter(source, event)
 
     def clear_content(self):
         """Clear content"""

pygpt_net/tools/html_canvas/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 22:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 import os
@@ -295,6 +295,7 @@ class HtmlCanvas(BaseTool):
         layout = canvas.widget.setup()
         widget = QWidget()
         widget.setLayout(layout)
+        canvas.set_tab(tab)
         self.load_output()
         return widget
 

pygpt_net/tools/html_canvas/ui/dialogs.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 23:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 import re
@@ -15,6 +15,7 @@ from PySide6.QtCore import Qt
 from PySide6.QtGui import QAction, QIcon
 from PySide6.QtWidgets import QMenuBar, QVBoxLayout
 
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.ui.widget.dialog.base import BaseDialog
 from pygpt_net.utils import trans
 
@@ -71,6 +72,14 @@ class Tool:
         self.menu["file"].addAction(self.actions["file.clear"])
         return self.menu_bar
 
+    def set_tab(self, tab: Tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.widget.set_tab(tab)
+
     def setup(self):
         """Setup canvas dialog"""
         self.layout = self.widget.setup()

pygpt_net/tools/html_canvas/ui/widgets.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 23:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt, Slot, QUrl, QObject, Signal
@@ -34,6 +34,15 @@ class ToolWidget:
         self.edit = None  # canvas edit
         self.btn_edit = None  # edit checkbox
 
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.output.set_tab(tab)
+        self.edit.set_tab(tab)
+
     def setup(self) -> QVBoxLayout:
         """
         Setup widget body
@@ -128,6 +137,29 @@ class CanvasEdit(BaseCodeEditor):
         self.setProperty('class', 'interpreter-output')
         self.default_stylesheet = ""
         self.setStyleSheet(self.default_stylesheet)
+        self.tab = None
+        self.installEventFilter(self)
+
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
+
+    def eventFilter(self, source, event):
+        """
+        Focus event filter
+
+        :param source: source
+        :param event: event
+        """
+        if event.type() == event.Type.FocusIn:
+            if self.tab is not None:
+                col_idx = self.tab.column_idx
+                self.window.controller.ui.tabs.on_column_focus(col_idx)
+        return super().eventFilter(source, event)
 
 
 class ToolSignals(QObject):

pygpt_net/ui/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.17 13:00:00                  #
+# Updated Date: 2025.01.19 03:00:00                  #
 # ================================================== #
 
 import os

pygpt_net/ui/layout/chat/calendar.py

@@ -6,7 +6,7 @@
 # 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: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -44,7 +44,10 @@ class Calendar:
         :return: QWidget
         """
         self.init()
-        return self.window.core.tabs.from_widget(self.setup_calendar())
+        body = self.window.core.tabs.from_widget(self.setup_calendar())
+        body.append(self.window.ui.calendar['note'])
+        body.append(self.window.ui.calendar['select'])
+        return body
 
     def setup_filters(self) -> QWidget:
         """

pygpt_net/ui/layout/chat/explorer.py

@@ -6,7 +6,7 @@
 # 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: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 from pygpt_net.ui.widget.tabs.body import TabBody
@@ -36,4 +36,6 @@ class Explorer:
         self.window.ui.nodes['output_files'] = FileExplorer(self.window, path, index_data)
 
         # build tab body
-        return self.window.core.tabs.from_widget(self.window.ui.nodes['output_files'])
+        body = self.window.core.tabs.from_widget(self.window.ui.nodes['output_files'])
+        body.append(self.window.ui.nodes['output_files'])
+        return body

pygpt_net/ui/layout/chat/painter.py

@@ -6,7 +6,7 @@
 # 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: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QPixmap, QIcon
@@ -83,7 +83,9 @@ class Painter:
         """
         # build tab body
         self.init()
-        return self.window.core.tabs.from_layout(self.setup_painter())
+        body = self.window.core.tabs.from_layout(self.setup_painter())
+        body.append(self.window.ui.painter)
+        return body
 
     def setup_painter(self) -> QVBoxLayout:
         """

pygpt_net/ui/main.py

@@ -6,16 +6,19 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 23:00:00                  #
+# Updated Date: 2025.01.19 03:00:00                  #
 # ================================================== #
 
+import copy
 import os
 
+from PySide6 import QtWidgets
 from PySide6.QtCore import QTimer, Signal, Slot, QThreadPool, QEvent, Qt, QLoggingCategory
+from PySide6.QtGui import QShortcut, QKeySequence
 from PySide6.QtWidgets import QApplication, QMainWindow
 from qt_material import QtStyleTools
 
-from pygpt_net.core.events import BaseEvent, KernelEvent
+from pygpt_net.core.events import BaseEvent, KernelEvent, ControlEvent
 from pygpt_net.container import Container
 from pygpt_net.controller import Controller
 from pygpt_net.tools import Tools
@@ -85,6 +88,9 @@ class MainWindow(QMainWindow, QtStyleTools):
         self.ui = UI(self)
         self.ui.init()
 
+        # global shortcuts
+        self.shortcuts = []
+
         # setup signals
         self.statusChanged.connect(self.update_status)
         self.stateChanged.connect(self.update_state)
@@ -338,3 +344,57 @@ class MainWindow(QMainWindow, QtStyleTools):
             self.showNormal()
         self.activateWindow()
         self.ui.tray_menu['restore'].setVisible(False)
+
+    def setup_global_shortcuts(self):
+        """Setup global shortcuts"""
+        if not hasattr(self, 'core') or not hasattr(self.core, 'config'):
+            return
+
+        # unregister existing shortcuts
+        if hasattr(self, 'shortcuts'):
+            for shortcut in self.shortcuts:
+                # disconnect signals
+                shortcut.activated.disconnect()
+                # disable the shortcut to prevent it from handling events
+                shortcut.setEnabled(False)
+                # remove the parent to break the QObject tree
+                shortcut.setParent(None)
+                # schedule the shortcut for deletion
+                shortcut.deleteLater()
+            # clear the list of shortcuts
+            self.shortcuts.clear()
+            # process events to delete shortcuts immediately
+            QtWidgets.QApplication.processEvents()
+        else:
+            self.shortcuts = []
+
+        # Handle the Escape key
+        escape_shortcut = QShortcut(QKeySequence(Qt.Key_Escape), self)
+        escape_shortcut.setContext(Qt.ApplicationShortcut)
+        escape_shortcut.activated.connect(self.controller.access.on_escape)
+        self.shortcuts.append(escape_shortcut)
+
+        config = copy.deepcopy(self.core.config.get("access.shortcuts"))
+        for shortcut_conf in config:
+            key = shortcut_conf.get('key', '')
+            key_modifier = shortcut_conf.get('key_modifier', '')
+            action_name = shortcut_conf.get('action')
+
+            if not key or not action_name:
+                continue
+
+            key_sequence_parts = []
+            if key_modifier and key_modifier != '---':
+                if key_modifier == "Control":
+                    key_modifier = "Ctrl"
+                key_sequence_parts.append(key_modifier)
+            key_sequence_parts.append(key)
+            key_sequence_str = '+'.join(key_sequence_parts)
+            key_sequence = QKeySequence(key_sequence_str)
+
+            shortcut = QShortcut(key_sequence, self)
+            shortcut.setContext(Qt.ApplicationShortcut)
+            shortcut.activated.connect(
+                lambda checked=False, action=action_name: self.dispatch(ControlEvent(action))
+            )
+            self.shortcuts.append(shortcut)

pygpt_net/ui/widget/calendar/select.py

@@ -6,13 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.08.29 04:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import QRect, QDate
 from PySide6.QtGui import QColor, QBrush, QFont, Qt, QAction, QContextMenuEvent, QIcon, QPixmap, QPen
 from PySide6.QtWidgets import QCalendarWidget, QMenu
 
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.utils import trans
 import pygpt_net.icons_rc
 
@@ -44,6 +45,29 @@ class CalendarSelect(QCalendarWidget):
         self.setContextMenuPolicy(Qt.CustomContextMenu)
         self.customContextMenuRequested.connect(self.open_context_menu)
         self.setProperty('class', 'calendar')
+        self.tab = None
+        self.installEventFilter(self)
+
+    def set_tab(self, tab: Tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
+
+    def eventFilter(self, source, event):
+        """
+        Focus event filter
+
+        :param source: source
+        :param event: event
+        """
+        if event.type() == event.Type.FocusIn:
+            if self.tab is not None:
+                col_idx = self.tab.column_idx
+                self.window.controller.ui.tabs.on_column_focus(col_idx)
+        return super().eventFilter(source, event)
 
     def page_changed(self, year, month):
         """
@@ -172,6 +196,10 @@ class CalendarSelect(QCalendarWidget):
         # if date in self.counters['ctx']:
         self.window.controller.calendar.on_ctx_select(year, month, day)
 
+        if self.tab is not None:
+            col_idx = self.tab.column_idx
+            self.window.controller.ui.tabs.on_column_focus(col_idx)
+
     def add_ctx(self, date: QDate, num: int):
         """
         Add ctx counter to counter list

pygpt_net/ui/widget/draw/painter.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 08:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 import datetime
@@ -15,6 +15,7 @@ from PySide6.QtCore import Qt, QPoint
 from PySide6.QtGui import QImage, QPainter, QPen, QAction, QIcon, QKeySequence
 from PySide6.QtWidgets import QMenu, QWidget, QFileDialog, QMessageBox, QApplication
 
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.utils import trans
 import pygpt_net.icons_rc
 
@@ -35,6 +36,16 @@ class PainterWidget(QWidget):
         self.undoLimit = 10
         self.setFocusPolicy(Qt.StrongFocus)
         self.setFocus()
+        self.installEventFilter(self)
+        self.tab = None
+
+    def set_tab(self, tab: Tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def handle_paste(self):
         """Handle clipboard paste"""
@@ -353,3 +364,16 @@ class PainterWidget(QWidget):
             painter = QPainter(new)
             painter.drawImage(QPoint(0, 0), self.image)
             self.image = new
+
+    def eventFilter(self, source, event):
+        """
+        Focus event filter
+
+        :param source: source
+        :param event: event
+        """
+        if event.type() == event.Type.FocusIn:
+            if self.tab is not None:
+                col_idx = self.tab.column_idx
+                self.window.controller.ui.tabs.on_column_focus(col_idx)
+        return super().eventFilter(source, event)

pygpt_net/ui/widget/filesystem/explorer.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.12 04:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 import datetime
@@ -118,6 +118,29 @@ class FileExplorer(QWidget):
                vertical-align: middle;
            }
        """)
+        self.tab = None
+        self.installEventFilter(self)
+
+    def eventFilter(self, source, event):
+        """
+        Focus event filter
+
+        :param source: source
+        :param event: event
+        """
+        if event.type() == event.Type.FocusIn:
+            if self.tab is not None:
+                col_idx = self.tab.column_idx
+                self.window.controller.ui.tabs.on_column_focus(col_idx)
+        return super().eventFilter(source, event)
+
+    def set_tab(self, tab: Tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def setOwner(self, owner: Tab):
         """

pygpt_net/ui/widget/tabs/body.py

@@ -6,18 +6,48 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 23:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
-from PySide6.QtWidgets import QTabWidget
+from PySide6.QtCore import QEvent
+from PySide6.QtWidgets import QTabWidget, QWidget
 
 from pygpt_net.core.tabs.tab import Tab
 
 
 class TabBody(QTabWidget):
-    def __init__(self):
+    def __init__(self, window=None):
         super(TabBody, self).__init__()
+        self.window = window
         self.owner = None
+        self.body = []
+        self.installEventFilter(self)
+
+    def append(self, body: QWidget):
+        """
+        Append tab body (parent widget)
+
+        :param body: tab body widget
+        """
+        self.body.append(body)
+
+    def get_body(self):
+        """
+        Get tab body (parent widget)
+
+        :return: tab body widget
+        """
+        return self.body
+
+    def attach_tab(self, tab: Tab):
+        """
+        Attach tab to body
+
+        :param tab: tab instance
+        """
+        for body in self.body:
+            if hasattr(body, 'set_tab'):
+                body.set_tab(tab)
 
     def setOwner(self, owner: Tab):
         """
@@ -26,6 +56,7 @@ class TabBody(QTabWidget):
         :param owner: parent tab instance
         """
         self.owner = owner
+        self.attach_tab(owner)
 
     def getOwner(self) -> Tab:
         """
@@ -33,4 +64,23 @@ class TabBody(QTabWidget):
 
         :return: parent tab instance
         """
-        return self.owner
+        return self.owner
+
+    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):
+            # handle column focus
+            if self.owner is not None:
+                col_idx = self.owner.column_idx
+                self.window.controller.ui.tabs.on_column_focus(col_idx)
+        return super().eventFilter(source, event)

pygpt_net/ui/widget/textarea/calendar_note.py

@@ -6,13 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.11 16:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QAction, QIcon, QKeySequence
 from PySide6.QtWidgets import QTextEdit
 
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.core.text.finder import Finder
 from pygpt_net.utils import trans
 import pygpt_net.icons_rc
@@ -21,7 +22,7 @@ import pygpt_net.icons_rc
 class CalendarNote(QTextEdit):
     def __init__(self, window=None):
         """
-        Notepad
+        Calendar note widget
 
         :param window: main window
         """
@@ -34,6 +35,29 @@ class CalendarNote(QTextEdit):
         self.textChanged.connect(self.text_changed)
         self.max_font_size = 42
         self.min_font_size = 8
+        self.tab = None
+        self.installEventFilter(self)
+
+    def eventFilter(self, source, event):
+        """
+        Focus event filter
+
+        :param source: source
+        :param event: event
+        """
+        if event.type() == event.Type.FocusIn:
+            if self.tab is not None:
+                col_idx = self.tab.column_idx
+                self.window.controller.ui.tabs.on_column_focus(col_idx)
+        return super().eventFilter(source, event)
+
+    def set_tab(self, tab: Tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def text_changed(self):
         """On parent textarea text changed"""

pygpt_net/ui/widget/textarea/html.py

@@ -6,12 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 00:00:00                  #
+# Updated Date: 2025.01.19 02: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
@@ -43,6 +43,7 @@ class HtmlOutput(QWebEngineView):
         self.html_content = ""
         self.meta = None
         self.tab = None
+        self.installEventFilter(self)
 
     def set_tab(self, tab):
         """
@@ -213,6 +214,24 @@ class HtmlOutput(QWebEngineView):
         super(HtmlOutput, self).focusInEvent(e)
         self.window.controller.finder.focus_in(self.finder)
 
+    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):
+            if self.tab:
+                col_idx = self.tab.column_idx
+                self.window.controller.ui.tabs.on_column_focus(col_idx)
+        return super().eventFilter(source, event)
+
 
 class CustomWebEnginePage(QWebEnginePage):
     """Custom WebEnginePage to handle web events"""