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

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 2.4.57 (2025-01-19)
+
+- Logging fix.
+
+## 2.4.56 (2025-01-19)
+
+- Improved tab switching and focus change.
+- Improved global keyboard shortcuts handling.
+
 ## 2.4.55 (2025-01-18)
 
 - Added a new option in settings: Audio -> Recording timeout.

README.md

@@ -2,7 +2,7 @@
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.4.55** | build: **2025.01.18** | Python: **>=3.10, <3.13**
+Release: **2.4.57** | build: **2025.01.19** | Python: **>=3.10, <3.13**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -3960,6 +3960,15 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.4.57 (2025-01-19)**
+
+- Logging fix.
+
+**2.4.56 (2025-01-19)**
+
+- Improved tab switching and focus change.
+- Improved global keyboard shortcuts handling.
+
 **2.4.55 (2025-01-18)**
 
 - Added a new option in settings: Audio -> Recording timeout.

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,12 @@
+2.4.57 (2025-01-19)
+
+- Logging fix.
+
+2.4.56 (2025-01-19)
+
+- Improved tab switching and focus change.
+- Improved global keyboard shortcuts handling.
+
 2.4.55 (2025-01-18)
 
 - Added a new option in settings: Audio -> Recording timeout.

pygpt_net/__init__.py

@@ -6,15 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.18 16:00:00                  #
+# Updated Date: 2025.01.19 16:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.4.55"
-__build__ = "2025.01.18"
+__version__ = "2.4.57"
+__build__ = "2025.01.19"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __report__ = "https://github.com/szczyglis-dev/py-gpt/issues"

pygpt_net/controller/access/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 19:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.events import BaseEvent, ControlEvent, AppEvent
@@ -73,9 +73,7 @@ class Access:
             self.window.core.plugins.get("audio_input").handler_simple.stop_recording(timeout=True)
 
         # stop audio output if playing
-        #if self.window.controller.audio.is_playing():
         self.window.controller.audio.stop_output()
 
         # stop generating if active
-        #if self.window.controller.chat.input.generating:
         self.window.controller.kernel.stop()

pygpt_net/controller/access/voice.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.16 17:00:00                  #
+# Updated Date: 2025.01.18 23:00:00                  #
 # ================================================== #
 
 from typing import Optional, List, Dict, Any
@@ -24,7 +24,6 @@ from pygpt_net.utils import trans
 
 class Voice:
 
-    TIMEOUT_SECONDS = 120  # 2 minutes, max recording time before timeout
     MIN_FRAMES = 25  # minimum frames to start transcription
     PLAY_DELAY = 500  # ms, delay before playing audio event
 
@@ -213,6 +212,18 @@ class Voice:
 
     def start_recording(self):
         """Start recording"""
+        # display snap warning if not displayed yet
+        if (not self.window.core.config.get("audio.input.snap", False)
+                or not self.window.core.config.has("audio.input.snap")):
+            if self.window.core.platforms.is_snap():
+                self.window.ui.dialogs.open(
+                    'snap_audio_input',
+                    width=400,
+                    height=200
+                )
+                self.window.core.config.set("audio.input.snap", True)
+                self.window.core.config.save()
+                return
         try:
             self.is_recording = True
             self.switch_btn_stop()
@@ -227,10 +238,12 @@ class Voice:
             )
 
             # 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)
+            timeout = int(self.window.core.config.get('audio.input.timeout', 120) or 0)  # get timeout
+            if timeout > 0:
+                if self.timer is None:
+                    self.timer = QTimer()
+                    self.timer.timeout.connect(self.stop_timeout)
+                    self.timer.start(timeout * 1000)
 
             if not self.window.core.audio.capture.check_audio_input():
                 raise Exception("Audio input not working.")
@@ -273,7 +286,7 @@ class Voice:
             # abort if timeout
             if timeout:
                 self.window.dispatch(AppEvent(AppEvent.VOICE_CONTROL_STOPPED))  # app event
-                self.window.update_status("Aborted.".format(self.TIMEOUT_SECONDS))
+                self.window.update_status("Aborted.".format(timeout))
                 return
 
             if self.window.core.audio.capture.has_frames():

pygpt_net/controller/{camera.py → camera/__init__.py}

@@ -227,7 +227,7 @@ class Camera(QObject):
 
     def capture_frame_save(self) -> str:
         """
-        Capture frame and save 
+        Capture frame and save
 
         :return: Path to saved frame
         """

pygpt_net/controller/settings/editor.py

@@ -199,6 +199,10 @@ class Editor:
         if self.config_changed('ctx.sources') or self.config_changed('ctx.audio'):
             self.window.controller.ctx.refresh()
 
+        # update global shortcuts
+        if self.config_changed('access.shortcuts'):
+            self.window.setup_global_shortcuts()
+
         self.before_config = copy.deepcopy(self.window.core.config.all())
         self.window.controller.settings.close_window(id)
 

pygpt_net/core/access/shortcuts.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 08:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 import copy
@@ -52,11 +52,52 @@ class Shortcuts:
         """
         # SHIFT not working properly
         modifiers_names = [
-            '---', 'Control', 'Alt', 'Meta', 'Keypad', 'GroupSwitch',
+            '---', 'Ctrl', 'Alt', 'Shift',
         ]
         modifiers = [{name: name} for name in modifiers_names]
         return modifiers
 
+    def handle_global_shortcuts(self, event: QEvent):
+        """
+        Handle global shortcuts
+
+        :param event: event
+        """
+        # esc key
+        if event.type() == QEvent.KeyPress and event.key() == QtCore.Qt.Key_Escape:
+            self.window.controller.access.on_escape()
+            return True
+
+        if not hasattr(self.window, 'core') or not hasattr(self.window.core, 'config'):
+            return False
+
+        if event.type() == QEvent.KeyPress:
+            # shortcuts
+            config = copy.deepcopy(self.window.core.config.get("access.shortcuts"))
+            for shortcut in config:
+                if shortcut['key'] == "" or shortcut['key'] is None:
+                    continue
+                key_name = 'Key_' + str(shortcut['key'])
+                if hasattr(QtCore.Qt, key_name):
+                    shortcut['key'] = getattr(QtCore.Qt, 'Key_' + str(shortcut['key']))
+                else:
+                    continue
+                modifier_name = str(shortcut['key_modifier']) + 'Modifier'
+                if shortcut['key_modifier'] == "" or shortcut['key_modifier'] is None or shortcut[
+                    'key_modifier'] == "---":
+                    shortcut['key_modifier'] = QtCore.Qt.NoModifier
+                elif hasattr(QtCore.Qt, modifier_name):
+                    shortcut['key_modifier'] = getattr(QtCore.Qt, modifier_name, QtCore.Qt.NoModifier)
+
+            for shortcut in config:
+                if (event.key() == shortcut['key'] and
+                        (shortcut['key_modifier'] == QtCore.Qt.NoModifier or event.modifiers() == shortcut[
+                            'key_modifier'])
+                ):
+                    self.window.dispatch(ControlEvent(shortcut['action']))
+                    return True
+        return False
+
 
 class GlobalShortcutFilter(QObject):
     def __init__(self, window=None):
@@ -72,33 +113,11 @@ class GlobalShortcutFilter(QObject):
         :return: True if event was handled
         """
         try:
-            # esc key
-            if event.type() == QEvent.KeyPress and event.key() == QtCore.Qt.Key_Escape:
-                self.window.controller.access.on_escape()
-
-            if event.type() == QEvent.KeyPress:
-                # shortcuts
-                config = copy.deepcopy(self.window.core.config.get("access.shortcuts"))
-                for shortcut in config:
-                    if shortcut['key'] == "" or shortcut['key'] is None:
-                        continue
-                    key_name = 'Key_' + str(shortcut['key'])
-                    if hasattr(QtCore.Qt, key_name):
-                        shortcut['key'] = getattr(QtCore.Qt, 'Key_' + str(shortcut['key']))
-                    else:
-                        continue
-                    modifier_name = str(shortcut['key_modifier']) + 'Modifier'
-                    if shortcut['key_modifier'] == "" or shortcut['key_modifier'] is None or shortcut['key_modifier'] == "---":
-                        shortcut['key_modifier'] = QtCore.Qt.NoModifier
-                    elif hasattr(QtCore.Qt, modifier_name):
-                        shortcut['key_modifier'] = getattr(QtCore.Qt, modifier_name, QtCore.Qt.NoModifier)
-
-                for shortcut in config:
-                    if (event.key() == shortcut['key'] and
-                        (shortcut['key_modifier'] == QtCore.Qt.NoModifier or event.modifiers() == shortcut['key_modifier'])
-                    ):
-                        self.window.dispatch(ControlEvent(shortcut['action']))
-                        return True
+            if event.type() != QEvent.KeyPress:
+                return False
+            if not self.window or not hasattr(self.window, 'controller'):
+                return False
+            return self.window.core.access.shortcuts.handle_global_shortcuts(event)
         except Exception as e:
             print(e)
         return False

pygpt_net/core/{camera.py → camera/__init__.py}

@@ -68,9 +68,10 @@ class CaptureWorker(QRunnable):
             self.capture.set(cv2.CAP_PROP_FRAME_WIDTH, self.window.core.config.get('vision.capture.width'))
             self.capture.set(cv2.CAP_PROP_FRAME_HEIGHT, self.window.core.config.get('vision.capture.height'))
         except Exception as e:
-            self.signals.error.emit(e)
-            print("Camera thread setup exception", e)
-            self.signals.finished.emit(e)
+            self.window.core.debug.log(e)
+            if self.signals is not None:
+                self.signals.error.emit(e)
+                self.signals.finished.emit(e)
 
     @Slot()
     def run(self):
@@ -99,9 +100,9 @@ class CaptureWorker(QRunnable):
                     self.signals.capture.emit(frame)
                     last_frame_time = now
         except Exception as e:
+            self.window.core.debug.log(e)
             if self.signals is not None:
                 self.signals.error.emit(e)
-            print("Camera thread capture exception", e)
 
         # release camera
         self.release()

pygpt_net/core/{command.py → command/__init__.py}

@@ -104,7 +104,8 @@ class Command:
 
                                     # remove description and move to help
                                     if "description" in data[cmd_name]["params"][key]:
-                                        data[cmd_name]["params"][key]["help"] = data[cmd_name]["params"][key]["description"]
+                                        data[cmd_name]["params"][key]["help"] = data[cmd_name]["params"][key][
+                                            "description"]
                                         del data[cmd_name]["params"][key]["description"]
 
                         except Exception as e:
@@ -397,7 +398,7 @@ class Command:
     ) -> List[Dict[str, Any]]:
         """
         Convert internal functions to native API format
-        
+
         :param: all True to include all
         :param: parent_id: parent context ID
         :return: native functions list
@@ -406,7 +407,7 @@ class Command:
         # Native API format (example):
         # https://platform.openai.com/docs/guides/function-calling
         # At this moment it must be converted to format:
-        
+
         functions = [
         {
             "name": "get_delivery_date",

pygpt_net/core/{history.py → history/__init__.py}

@@ -92,5 +92,3 @@ class History:
                     f.write(content.strip() + "\n")
         except Exception as e:
             print(e)
-
-

pygpt_net/core/tabs/__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 08:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 import uuid
@@ -448,7 +448,7 @@ class Tabs:
         column = self.window.ui.layout.get_column_by_idx(tab.column_idx)
         tabs = column.get_tabs()
         tab.parent = column
-        tab.child = self.window.core.ctx.container.get(tab)
+        tab.child = self.window.core.ctx.container.get(tab)  # tab is already appended here
         if tab.new_idx is not None:
             tab.idx = tabs.insertTab(tab.new_idx, tab.child, tab.title)
         else:
@@ -508,6 +508,7 @@ class Tabs:
         tabs = column.get_tabs()
         tab.parent = column
         tab.child = self.window.ui.chat.output.painter.setup()
+        tab.child.append(self.window.ui.painter)
         tab.idx = tabs.addTab(tab.child, tab.title)
         tab.child.setOwner(tab)
         tabs.setTabIcon(tab.idx, QIcon(tab.icon))
@@ -805,9 +806,10 @@ class Tabs:
         layout = QVBoxLayout()
         layout.addWidget(widget)
         layout.setContentsMargins(0, 0, 0, 0)
-        widget = TabBody()
-        widget.setLayout(layout)
-        return widget
+        tab_widget = TabBody(self.window)
+        tab_widget.append(widget)
+        tab_widget.setLayout(layout)
+        return tab_widget
 
     def from_layout(self, layout: QLayout) -> TabBody:
         """
@@ -817,6 +819,6 @@ class Tabs:
         :return: TabBody
         """
         layout.setContentsMargins(0, 0, 0, 0)
-        widget = TabBody()
+        widget = TabBody(self.window)
         widget.setLayout(layout)
         return widget

pygpt_net/data/config/config.json

@@ -1,8 +1,8 @@
 {
   "__meta__": {
-    "version": "2.4.55",
-    "app.version": "2.4.55",
-    "updated_at": "2025-01-18T00:00:00"
+    "version": "2.4.57",
+    "app.version": "2.4.57",
+    "updated_at": "2025-01-19T00:00:00"
   },
   "access.audio.event.speech": false,
   "access.audio.event.speech.disabled": [],
@@ -13,32 +13,32 @@
       {
           "action": "voice_cmd.toggle",
           "key": "Space",
-          "key_modifier": "Control"
+          "key_modifier": "Ctrl"
       },
       {
           "action": "tab.chat",
           "key": "1",
-          "key_modifier": "Control"
+          "key_modifier": "Ctrl"
       },
       {
           "action": "tab.files",
           "key": "2",
-          "key_modifier": "Control"
+          "key_modifier": "Ctrl"
       },
       {
           "action": "tab.calendar",
           "key": "3",
-          "key_modifier": "Control"
+          "key_modifier": "Ctrl"
       },
       {
           "action": "tab.draw",
           "key": "4",
-          "key_modifier": "Control"
+          "key_modifier": "Ctrl"
       },
       {
           "action": "tab.notepad",
           "key": "5",
-          "key_modifier": "Control"
+          "key_modifier": "Ctrl"
       }        
   ],
   "access.voice_control": false,

pygpt_net/data/config/models.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.4.55",
-        "app.version": "2.4.55",
-        "updated_at": "2025-01-18T00:00:00"
+        "version": "2.4.57",
+        "app.version": "2.4.57",
+        "updated_at": "2025-01-19T00:00:00"
     },
     "items": {
         "claude-3-5-sonnet-20240620": {

pygpt_net/data/config/modes.json

@@ -1,8 +1,8 @@
 {
     "__meta__": {
-        "version": "2.4.55",
-        "app.version": "2.4.55",
-        "updated_at": "2025-01-18T00:00:00"
+        "version": "2.4.57",
+        "app.version": "2.4.57",
+        "updated_at": "2025-01-19T00:00:00"
     },
     "items": {
         "chat": {

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.18 16: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):
@@ -145,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.18 16:00:00                  #
+# Updated Date: 2025.01.19 02:00:00                  #
 # ================================================== #
 
 import copy
@@ -1819,6 +1819,18 @@ class Patch:
                 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