pygpt-net 2.6.21__py3-none-any.whl → 2.6.23__py3-none-any.whl

pygpt_net/ui/widget/textarea/editor.py

@@ -6,27 +6,32 @@
 # 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.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
-from PySide6.QtGui import QAction, QIcon, QKeySequence, QTextCursor, QFontMetrics
+from PySide6.QtGui import QAction, QIcon, QKeySequence, QFontMetrics
 from PySide6.QtWidgets import QTextEdit
 
 from pygpt_net.core.text.finder import Finder
 from pygpt_net.utils import trans
 
-import pygpt_net.icons_rc
-
 
 class BaseCodeEditor(QTextEdit):
+
+    _ICON_VOLUME = QIcon(":/icons/volume.svg")
+    _ICON_SAVE = QIcon(":/icons/save.svg")
+    _ICON_SEARCH = QIcon(":/icons/search.svg")
+    _ICON_CLOSE = QIcon(":/icons/close.svg")
+    _FIND_SEQ = QKeySequence("Ctrl+F")
+
     def __init__(self, window=None):
         """
         Base code editor
 
         :param window: main window
         """
-        super(BaseCodeEditor, self).__init__(window)
+        super().__init__(window)
         self.window = window
         self.finder = Finder(window, self)
         self.setReadOnly(True)
@@ -40,114 +45,89 @@ class BaseCodeEditor(QTextEdit):
         self.excluded_copy_to = []
         self.textChanged.connect(self.text_changed)
 
-        # tabulation
         metrics = QFontMetrics(self.font())
         space_width = metrics.horizontalAdvance(" ")
         self.setTabStopDistance(4 * space_width)
 
     def text_changed(self):
-        """On text changed"""
         self.finder.text_changed()
 
     def update_stylesheet(self, data: str):
-        """
-        Update stylesheet
-
-        :param data: stylesheet CSS
-        """
         self.setStyleSheet(self.default_stylesheet + data)
 
     def contextMenuEvent(self, event):
-        """
-        Context menu event
-
-        :param event: Event
-        """
         menu = self.createStandardContextMenu()
-        selected_text = self.textCursor().selectedText()
+        cursor = self.textCursor()
+        selected_text = cursor.selectedText()
 
         if selected_text:
-            # plain text
-            plain_text = self.textCursor().selection().toPlainText()
+            plain_text = cursor.selection().toPlainText()
 
-            # audio read
-            action = QAction(QIcon(":/icons/volume.svg"), trans('text.context_menu.audio.read'), self)
+            action = QAction(self._ICON_VOLUME, trans('text.context_menu.audio.read'), menu)
             action.triggered.connect(self.audio_read_selection)
             menu.addAction(action)
 
-            # copy to
             copy_to_menu = self.window.ui.context_menu.get_copy_to_menu(
-                self,
+                menu,
                 selected_text,
                 excluded=self.excluded_copy_to
             )
+            try:
+                copy_to_menu.setParent(menu)
+            except Exception:
+                pass
             menu.addMenu(copy_to_menu)
 
-            # save as (selected)
-            action = QAction(QIcon(":/icons/save.svg"), trans('action.save_selection_as'), self)
+            action = QAction(self._ICON_SAVE, trans('action.save_selection_as'), menu)
             action.triggered.connect(
                 lambda: self.window.controller.chat.common.save_text(plain_text))
             menu.addAction(action)
         else:
-            # save as (all)
-            action = QAction(QIcon(":/icons/save.svg"), trans('action.save_as'), self)
+            action = QAction(self._ICON_SAVE, trans('action.save_as'), menu)
             action.triggered.connect(
                 lambda: self.window.controller.chat.common.save_text(self.toPlainText()))
             menu.addAction(action)
 
-        action = QAction(QIcon(":/icons/search.svg"), trans('text.context_menu.find'), self)
+        action = QAction(self._ICON_SEARCH, trans('text.context_menu.find'), menu)
         action.triggered.connect(self.find_open)
-        action.setShortcut(QKeySequence("Ctrl+F"))
+        action.setShortcut(self._FIND_SEQ)
         menu.addAction(action)
 
-        # clear
-        action = QAction(QIcon(":/icons/close.svg"), trans('action.clear'), self)
-        action.triggered.connect(
-            lambda: self.clear_content())
+        action = QAction(self._ICON_CLOSE, trans('action.clear'), menu)
+        action.triggered.connect(self.clear_content)
         menu.addAction(action)
 
-        menu.exec_(event.globalPos())
+        menu.exec(event.globalPos())
+        menu.deleteLater()
 
     def clear_content(self):
-        """Clear content"""
-        cursor = self.textCursor()
-        cursor.select(QTextCursor.Document)
-        cursor.removeSelectedText()
+        self.clear()
 
     def audio_read_selection(self):
-        """Read selected text (audio)"""
         self.window.controller.audio.read_text(self.textCursor().selectedText())
 
     def find_open(self):
-        """Open find dialog"""
         self.window.controller.finder.open(self.finder)
 
     def on_update(self):
-        """On content update"""
-        self.finder.clear()  # clear finder
+        self.finder.clear()
 
     def on_destroy(self):
-        """On destroy"""
-        self.window.controller.finder.unset(self.finder)  # unregister finder from memory
+        try:
+            self.textChanged.disconnect(self.text_changed)
+        except Exception:
+            pass
+        self.window.controller.finder.unset(self.finder)
 
     def keyPressEvent(self, e):
-        """
-        Key press event
-
-        :param e: Event
-        """
         if e.key() == Qt.Key_F and e.modifiers() & Qt.ControlModifier:
             self.find_open()
         else:
-            super(BaseCodeEditor, self).keyPressEvent(e)
+            super().keyPressEvent(e)
 
     def wheelEvent(self, event):
-        """
-        Wheel event: set font size
-
-        :param event: Event
-        """
         if event.modifiers() & Qt.ControlModifier:
+            prev = self.value
             if event.angleDelta().y() > 0:
                 if self.value < self.max_font_size:
                     self.value += 1
@@ -155,18 +135,14 @@ class BaseCodeEditor(QTextEdit):
                 if self.value > self.min_font_size:
                     self.value -= 1
 
-            self.update_stylesheet(f"QTextEdit {{ font-size: {self.value}px }};")
+            if self.value != prev:
+                self.update_stylesheet(f"QTextEdit {{ font-size: {self.value}px }};")
             event.accept()
         else:
-            super(BaseCodeEditor, self).wheelEvent(event)
+            super().wheelEvent(event)
 
     def focusInEvent(self, e):
-        """
-        Focus in event
-
-        :param e: focus event
-        """
-        super(BaseCodeEditor, self).focusInEvent(e)
+        super().focusInEvent(e)
         self.window.controller.finder.focus_in(self.finder)
 
 
@@ -177,12 +153,4 @@ class CodeEditor(BaseCodeEditor):
 
         :param window: main window
         """
-        super(CodeEditor, self).__init__(window)
-        self.window = window
-        self.setReadOnly(True)
-        self.value = 12
-        self.max_font_size = 42
-        self.min_font_size = 8
-        self.setProperty('class', 'code-editor')
-        self.default_stylesheet = ""
-        self.setStyleSheet(self.default_stylesheet)
+        super().__init__(window)

pygpt_net/ui/widget/textarea/find.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.10 23:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from PySide6 import QtCore
@@ -21,13 +21,15 @@ class FindInput(QLineEdit):
         :param window: main window
         :param id: info window id
         """
-        super(FindInput, self).__init__(window)
+        super().__init__(window)
 
         self.window = window
         self.id = id
-        self.textChanged.connect(
-            lambda: self.window.controller.finder.search_text_changed(self.text()),
-        )
+        self.textChanged.connect(self._on_text_changed)
+
+    @QtCore.Slot(str)
+    def _on_text_changed(self, text):
+        self.window.controller.finder.search_text_changed(text)
 
     def keyPressEvent(self, event):
         """
@@ -35,10 +37,10 @@ class FindInput(QLineEdit):
 
         :param event: key event
         """
-        super(FindInput, self).keyPressEvent(event)
+        super().keyPressEvent(event)
 
         # update on Enter
-        if event.key() == QtCore.Qt.Key_Return or event.key() == QtCore.Qt.Key_Enter:
+        if event.key() in (QtCore.Qt.Key_Return, QtCore.Qt.Key_Enter):
             self.window.controller.finder.focus_input(self.text())
 
     def focusInEvent(self, e):
@@ -47,6 +49,5 @@ class FindInput(QLineEdit):
 
         :param e: focus event
         """
-        super(FindInput, self).focusInEvent(e)
-        self.window.controller.finder.focus_input(self.text())
-
+        super().focusInEvent(e)
+        self.window.controller.finder.focus_input(self.text())

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: 2025.08.19 07:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 import re
@@ -15,16 +15,13 @@ 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.QtGui import QAction, QIcon
 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.utils import trans
 
-import pygpt_net.icons_rc
-
 
 class HtmlOutput(QWebEngineView):
     def __init__(self, window=None):
@@ -142,7 +139,7 @@ class HtmlOutput(QWebEngineView):
             menu.addAction(action)
 
             # copy to
-            copy_to_menu = self.window.ui.context_menu.get_copy_to_menu(self, selected_text)
+            copy_to_menu = self.window.ui.context_menu.get_copy_to_menu(menu, selected_text)
             menu.addMenu(copy_to_menu)
 
             # save as (selected)

pygpt_net/ui/widget/textarea/input.py

@@ -6,35 +6,53 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.22 15:00:00                  #
+# Updated Date: 2025.08.25 20:00:00                  #
 # ================================================== #
 
-from PySide6 import QtCore
-from PySide6.QtCore import Qt
+from PySide6.QtCore import Qt, QSize
 from PySide6.QtGui import QAction, QIcon, QImage
-from PySide6.QtWidgets import QTextEdit, QApplication
+from PySide6.QtWidgets import QTextEdit, QApplication, QPushButton
 
 from pygpt_net.utils import trans
-import pygpt_net.icons_rc
-
 
 class ChatInput(QTextEdit):
+
+    ICON_PASTE = QIcon(":/icons/paste.svg")
+    ICON_VOLUME = QIcon(":/icons/volume.svg")
+    ICON_SAVE = QIcon(":/icons/save.svg")
+    ICON_ATTACHMENT = QIcon(":/icons/add.svg")
+
     def __init__(self, window=None):
         """
         Chat input
 
         :param window: main window
         """
-        super(ChatInput, self).__init__(window)
+        super().__init__(window)
         self.window = window
         self.setAcceptRichText(False)
         self.setFocus()
         self.value = self.window.core.config.data['font_size.input']
         self.max_font_size = 42
         self.min_font_size = 8
+        self._text_top_padding = 10
         self.textChanged.connect(self.window.controller.ui.update_tokens)
         self.setProperty('class', 'layout-input')
 
+        # Add a "+" button in the top-left corner to add attachments
+        self._init_attachment_button()
+        self._apply_text_top_padding()
+
+    def _apply_text_top_padding(self):
+        """Apply extra top padding inside the text area by using viewport margins."""
+        m = self.viewportMargins()
+        self.setViewportMargins(m.left(), self._text_top_padding, m.right(), m.bottom())
+
+    def set_text_top_padding(self, px: int):
+        """Public helper to adjust top padding at runtime."""
+        self._text_top_padding = max(0, int(px))
+        self._apply_text_top_padding()
+
     def insertFromMimeData(self, source):
         """
         Insert from mime data
@@ -63,7 +81,8 @@ class ChatInput(QTextEdit):
                     self.window.controller.attachment.from_clipboard_url(local_path)
         elif source.hasText():
             text = source.text()
-            self.window.controller.attachment.from_clipboard_text(text)
+            if text:
+                self.window.controller.attachment.from_clipboard_text(text)
 
     def contextMenuEvent(self, event):
         """
@@ -72,51 +91,45 @@ class ChatInput(QTextEdit):
         :param event: event
         """
         menu = self.createStandardContextMenu()
-
-        # paste attachment
-        if self.window.controller.attachment.clipboard_has_attachment():
-            action = QAction(QIcon(":/icons/paste.svg"), trans("action.use.attachment"), self)
-            action.triggered.connect(self.action_from_clipboard)
-            menu.addAction(action)
-
-        selected_text = self.textCursor().selectedText()
-        if selected_text:
-            # plain text
-            plain_text = self.textCursor().selection().toPlainText()
-
-            # audio read
-            action = QAction(QIcon(":/icons/volume.svg"), trans('text.context_menu.audio.read'), self)
-            action.triggered.connect(self.audio_read_selection)
-            menu.addAction(action)
-
-            # copy to
-            copy_to_menu = self.window.ui.context_menu.get_copy_to_menu(self, selected_text, excluded=["input"])
-            menu.addMenu(copy_to_menu)
-
-            # save as (selected)
-            action = QAction(QIcon(":/icons/save.svg"), trans('action.save_selection_as'), self)
-            action.triggered.connect(
-                lambda: self.window.controller.chat.common.save_text(plain_text))
-            menu.addAction(action)
-        else:
-            # save as (all)
-            action = QAction(QIcon(":/icons/save.svg"), trans('action.save_as'), self)
-            action.triggered.connect(
-                lambda: self.window.controller.chat.common.save_text(self.toPlainText()))
-            menu.addAction(action)
-
         try:
-            self.window.core.prompt.template.to_menu_options(menu, "input")
-            self.window.core.prompt.custom.to_menu_options(menu, "input")
-        except Exception as e:
-            self.window.core.debug.log(e)
-
-        # save current prompt
-        action = QAction(QIcon(":/icons/save.svg"), trans('preset.prompt.save_custom'), self)
-        action.triggered.connect(self.window.controller.presets.save_prompt)
-        menu.addAction(action)
+            if self.window.controller.attachment.clipboard_has_attachment():
+                action = QAction(self.ICON_PASTE, trans("action.use.attachment"), menu)
+                action.triggered.connect(self.action_from_clipboard)
+                menu.addAction(action)
+
+            cursor = self.textCursor()
+            selected_text = cursor.selectedText()
+            if selected_text:
+                plain_text = cursor.selection().toPlainText()
+
+                action = QAction(self.ICON_VOLUME, trans('text.context_menu.audio.read'), menu)
+                action.triggered.connect(self.audio_read_selection)
+                menu.addAction(action)
+
+                copy_to_menu = self.window.ui.context_menu.get_copy_to_menu(menu, selected_text, excluded=["input"])
+                menu.addMenu(copy_to_menu)
+
+                action = QAction(self.ICON_SAVE, trans('action.save_selection_as'), menu)
+                action.triggered.connect(lambda: self.window.controller.chat.common.save_text(plain_text))
+                menu.addAction(action)
+            else:
+                action = QAction(self.ICON_SAVE, trans('action.save_as'), menu)
+                action.triggered.connect(lambda: self.window.controller.chat.common.save_text(self.toPlainText()))
+                menu.addAction(action)
+
+            try:
+                self.window.core.prompt.template.to_menu_options(menu, "input")
+                self.window.core.prompt.custom.to_menu_options(menu, "input")
+            except Exception as e:
+                self.window.core.debug.log(e)
+
+            action = QAction(self.ICON_SAVE, trans('preset.prompt.save_custom'), menu)
+            action.triggered.connect(self.window.controller.presets.save_prompt)
+            menu.addAction(action)
 
-        menu.exec_(event.globalPos())
+            menu.exec(event.globalPos())
+        finally:
+            menu.deleteLater()
 
     def action_from_clipboard(self):
         """
@@ -137,28 +150,26 @@ class ChatInput(QTextEdit):
         :param event: key event
         """
         handled = False
-        if event.key() in (QtCore.Qt.Key_Return, QtCore.Qt.Key_Enter):
+        key = event.key()
+        if key in (Qt.Key_Return, Qt.Key_Enter):
             mode = self.window.core.config.get('send_mode')
-            if mode > 0:  # Enter or Shift + Enter
-                if mode == 2:  # Shift + Enter
-                    modifiers = QApplication.keyboardModifiers()
-                    if modifiers == QtCore.Qt.ShiftModifier or modifiers == QtCore.Qt.ControlModifier:
+            if mode > 0:
+                modifiers = event.modifiers()
+                if mode == 2:
+                    if modifiers == Qt.ShiftModifier or modifiers == Qt.ControlModifier:
                         self.window.controller.chat.input.send_input()
                         handled = True
-                else:  # Enter
-                    modifiers = QApplication.keyboardModifiers()
-                    if modifiers != QtCore.Qt.ShiftModifier and modifiers != QtCore.Qt.ControlModifier:
+                else:
+                    if modifiers != Qt.ShiftModifier and modifiers != Qt.ControlModifier:
                         self.window.controller.chat.input.send_input()
                         handled = True
                 self.setFocus()
-
-        # cancel edit
-        elif event.key() == Qt.Key_Escape and self.window.controller.ctx.extra.is_editing():
+        elif key == Qt.Key_Escape and self.window.controller.ctx.extra.is_editing():
             self.window.controller.ctx.extra.edit_cancel()
             handled = True
 
         if not handled:
-            super(ChatInput, self).keyPressEvent(event)
+            super().keyPressEvent(event)
 
     def wheelEvent(self, event):
         """
@@ -167,16 +178,70 @@ class ChatInput(QTextEdit):
         :param event: Event
         """
         if event.modifiers() & Qt.ControlModifier:
-            if event.angleDelta().y() > 0:
+            prev = self.value
+            dy = event.angleDelta().y()
+            if dy > 0:
                 if self.value < self.max_font_size:
                     self.value += 1
             else:
                 if self.value > self.min_font_size:
                     self.value -= 1
 
-            self.window.core.config.data['font_size.input'] = self.value
-            self.window.core.config.save()
-            self.window.controller.ui.update_font_size()
+            if self.value != prev:
+                self.window.core.config.data['font_size.input'] = self.value
+                self.window.core.config.save()
+                self.window.controller.ui.update_font_size()
             event.accept()
-        else:
-            super(ChatInput, self).wheelEvent(event)
+            return
+        super().wheelEvent(event)
+
+    # --- Added: attachment button (top-left) ---------------------------------
+
+    def _init_attachment_button(self):
+        """Create and place the '+' attachment button pinned in the top-left corner."""
+        self._attach_margin = 6  # inner padding around the button
+        self._attach_offset_y = -6  # shift the button 2px up
+
+        self._attach_btn = QPushButton(self)
+        self._attach_btn.setObjectName("chatInputAttachBtn")
+        self._attach_btn.setIconSize(QSize(18, 18)) # icon size (slightly larger for visibility)
+        self._attach_btn.setFixedSize(24, 24) # full button size
+        self._attach_btn.setCursor(Qt.PointingHandCursor)
+        self._attach_btn.setToolTip(trans("attachments.btn.input.add"))
+        self._attach_btn.setFocusPolicy(Qt.NoFocus)
+        self._attach_btn.setFlat(True) # flat button style
+
+        self._attach_btn.setIcon(self.ICON_ATTACHMENT)
+        self._attach_btn.clicked.connect(self.action_add_attachment)
+        self._update_viewport_margins_for_attachment()
+        self._reposition_attachment_button()
+
+    def _update_viewport_margins_for_attachment(self):
+        """Reserve space for the attachment button on the left and apply top text padding."""
+        top = self._text_top_padding
+        left = self._attach_btn.width() + self._attach_margin * 2 if hasattr(self, "_attach_btn") else self.viewportMargins().left()
+        self.setViewportMargins(left, top, 0, 0)
+
+    def _reposition_attachment_button(self):
+        """Keep the attachment button pinned to the top-left corner."""
+        if hasattr(self, "_attach_btn"):
+            fw = self.frameWidth()
+            x = fw + self._attach_margin
+            y = fw + self._attach_margin + self._attach_offset_y  # shift up by ~2px
+            if y < 0:
+                y = 0
+            self._attach_btn.move(x, y)
+            self._attach_btn.raise_()
+
+    def resizeEvent(self, event):
+        """Resize event keeps the attachment button in place."""
+        super().resizeEvent(event)
+        # Keep the attachment button pinned when resizing
+        try:
+            self._reposition_attachment_button()
+        except Exception:
+            pass
+
+    def action_add_attachment(self):
+        """Add attachment (button click)."""
+        self.window.controller.attachment.open_add()