pygpt-net 2.4.54__py3-none-any.whl → 2.4.56__py3-none-any.whl

pygpt_net/data/locale/locale.zh.ini

@@ -878,6 +878,9 @@ settings.audio.input.rate = 采样率
 settings.audio.input.rate.desc = 采样率，默认: 44100
 settings.audio.input.stop_interval = 连续录音自动转录间隔
 settings.audio.input.stop_interval.desc = 自动转录音频片段的间隔（以秒为单位），默认：10
+settings.audio.input.timeout = 录音超时
+settings.audio.input.timeout.desc = 自动停止录音的超时时间（秒），0为禁用，默认：120
+settings.audio.input.timeout.continuous = 在连续模式下启用超时
 settings.check_updates = 啟動時檢查更新
 settings.check_updates.bg = 在後台檢查更新
 settings.cmd.field.desc = 启用 `{cmd}` 工具。

pygpt_net/launcher.py

@@ -6,8 +6,9 @@
 # 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: 2025.01.19 02:00:00                  #
 # ================================================== #
+
 import os
 import sys
 import argparse
@@ -266,5 +267,5 @@ class Launcher:
         self.window.ui.tray.setup(self.app)
         self.window.controller.after_setup()
         self.window.dispatch(AppEvent(AppEvent.APP_STARTED))  # app event
-        self.window.installEventFilter(self.shortcut_filter)
+        self.window.setup_global_shortcuts()
         sys.exit(self.app.exec())

pygpt_net/plugin/audio_input/simple.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 02:00:00                  #
+# Updated Date: 2025.01.18 23:00:00                  #
 # ================================================== #
 
 import os
@@ -20,7 +20,6 @@ from pygpt_net.utils import trans
 
 class Simple:
 
-    TIMEOUT_SECONDS = 120  # 2 minutes, max recording time before timeout
     MIN_FRAMES = 25  # minimum frames to start transcription
 
     def __init__(self, plugin=None):
@@ -92,10 +91,14 @@ class Simple:
             )
 
             # start timeout timer to prevent infinite recording
-            if self.timer is None:
-                self.timer = QTimer()
-                self.timer.timeout.connect(self.stop_timeout)
-                self.timer.start(self.TIMEOUT_SECONDS * 1000)
+            # disable in continuous mode
+            timeout = int(self.plugin.window.core.config.get('audio.input.timeout', 120) or 0) # get timeout
+            timeout_continuous = self.plugin.window.core.config.get('audio.input.timeout.continuous', False) # enable continuous timeout
+            if timeout > 0:
+                if self.timer is None and (not continuous_enabled or timeout_continuous):
+                    self.timer = QTimer()
+                    self.timer.timeout.connect(self.stop_timeout)
+                    self.timer.start(timeout * 1000)
 
             if not force:
                 if not self.plugin.window.core.audio.capture.check_audio_input():
@@ -141,7 +144,7 @@ class Simple:
             self.plugin.window.core.audio.capture.stop()  # stop recording
             # abort if timeout
             if timeout:
-                self.plugin.window.update_status("Aborted.".format(self.TIMEOUT_SECONDS))
+                self.plugin.window.update_status("Aborted.".format(timeout))
                 return
 
             if self.plugin.window.core.audio.capture.has_frames():

pygpt_net/plugin/audio_input/worker.py

@@ -16,7 +16,7 @@ import audioop
 
 from PySide6.QtCore import Slot, Signal
 
-from pygpt_net.core.tabs import Tab
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.utils import trans
 from pygpt_net.plugin.base.worker import BaseWorker, BaseSignals
 

pygpt_net/provider/core/config/patch.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 02:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 import copy
@@ -1811,6 +1811,26 @@ class Patch:
                 if 'audio.input.continuous' not in data:
                     data["audio.input.continuous"] = False
 
+            # < 2.4.55
+            if old < parse_version("2.4.55"):
+                print("Migrating config from < 2.4.55...")
+                if 'audio.input.timeout' not in data:
+                    data["audio.input.timeout"] = 120
+                if 'audio.input.timeout.continuous' not in data:
+                    data["audio.input.timeout.continuous"] = False
+
+            # < 2.4.56
+            if old < parse_version("2.4.56"):
+                print("Migrating config from < 2.4.56...")
+                remove_modifiers = ["Meta", "Keypad", "GroupSwitch"]
+                if 'access.shortcuts' in data:
+                    for item in data['access.shortcuts']:
+                        if 'key_modifier' in item and item['key_modifier'] == 'Control':
+                            item['key_modifier'] = 'Ctrl'
+                        elif 'key_modifier' in item and item['key_modifier'] in remove_modifiers:
+                            item['key_modifier'] = ''
+                updated = True
+
         # update file
         migrated = False
         if updated:

pygpt_net/tools/code_interpreter/__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
@@ -539,6 +539,7 @@ class CodeInterpreter(BaseTool):
         widget.setLayout(layout)
         self.load_history()
         self.load_output()
+        tool.set_tab(tab)
         return widget
 
     def setup_dialogs(self):

pygpt_net/tools/code_interpreter/ui/dialogs.py

@@ -6,13 +6,14 @@
 # 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.QtCore import Qt
 from PySide6.QtGui import QAction, QIcon
 from PySide6.QtWidgets import QMenuBar
 
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.tools.code_interpreter.ui.widgets import ToolWidget
 from pygpt_net.ui.widget.dialog.base import BaseDialog
 from pygpt_net.utils import trans
@@ -33,6 +34,14 @@ class Tool:
         self.menu = {}
         self.actions = {}  # menu actions
 
+    def set_tab(self, tab: Tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.widget.set_tab(tab)
+
     def setup_menu(self) -> QMenuBar:
         """
         Setup dialog menu

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,58 @@ 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:
+            print(shortcut_conf)
+            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):
         """