pygpt-net 2.6.1__py3-none-any.whl → 2.6.6__py3-none-any.whl

pygpt_net/ui/widget/lists/attachment.py

@@ -6,14 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.06 19:00:00                  #
+# Updated Date: 2025.08.15 03:00:00                  #
 # ================================================== #
 
 from functools import partial
 
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QAction, QIcon, QResizeEvent, QImage
-from PySide6.QtWidgets import QMenu, QApplication, QHeaderView
+from PySide6.QtWidgets import QMenu, QApplication
 
 from pygpt_net.item.attachment import AttachmentItem
 from pygpt_net.ui.widget.lists.base import BaseList
@@ -22,6 +22,11 @@ import pygpt_net.icons_rc
 
 
 class AttachmentList(BaseList):
+    _ICON_VIEW = QIcon(":/icons/view.svg")
+    _ICON_FOLDER = QIcon(":/icons/folder_filled.svg")
+    _ICON_EDIT = QIcon(":/icons/edit.svg")
+    _ICON_DELETE = QIcon(":/icons/delete.svg")
+
     def __init__(self, window=None, id=None):
         """
         Attachments menu
@@ -36,22 +41,35 @@ class AttachmentList(BaseList):
         self.setHeaderHidden(False)
         self.clicked.disconnect(self.click)
 
-        self.header = self.header()
-        self.header.setStretchLastSection(False)
+        hdr = self.header()
+        hdr.setStretchLastSection(False)
 
         self.column_proportion = 0.3
+        self._last_width = -1
         self.adjustColumnWidths()
 
     def adjustColumnWidths(self):
-        total_width = self.width()
+        hdr = self.header()
+        cols = hdr.count()
+        if cols <= 0:
+            return
+        total_width = self.viewport().width() or self.width()
         first_column_width = int(total_width * self.column_proportion)
-        self.setColumnWidth(0, first_column_width)
-        for column in range(1, 4):
-            self.setColumnWidth(column, (total_width - first_column_width) // (4 - 1))
+        remaining = max(total_width - first_column_width, 0)
+        if self.columnWidth(0) != first_column_width:
+            self.setColumnWidth(0, first_column_width)
+        if cols > 1:
+            other = remaining // (cols - 1)
+            for column in range(1, cols):
+                if self.columnWidth(column) != other:
+                    self.setColumnWidth(column, other)
 
     def resizeEvent(self, event: QResizeEvent):
         super().resizeEvent(event)
-        self.adjustColumnWidths()
+        w = event.size().width()
+        if w != self._last_width:
+            self._last_width = w
+            self.adjustColumnWidths()
 
     def mousePressEvent(self, event):
         """
@@ -59,7 +77,7 @@ class AttachmentList(BaseList):
 
         :param event: mouse event
         """
-        if event.buttons() == Qt.LeftButton:
+        if event.button() == Qt.LeftButton:
             index = self.indexAt(event.pos())
             if index.isValid():
                 mode = self.window.core.config.get('mode')
@@ -89,58 +107,61 @@ class AttachmentList(BaseList):
 
         :param event: context menu event
         """
-
-        def ignore_trigger(func, arg, *args, **kwargs):
-            func(arg)
-
         mode = self.window.core.config.get('mode')
         item = self.indexAt(event.pos())
         idx = item.row()
-        preview_actions = []
-        path = None
-        attachment = None
+        if idx < 0:
+            return
 
-        if idx >= 0:
-            attachment = self.window.controller.attachment.get_by_idx(mode, idx)
-            if attachment:
-                path = attachment.path
-            if self.window.core.filesystem.actions.has_preview(path):
-                preview_actions = self.window.core.filesystem.actions.get_preview(self, path)
+        attachment = self.window.controller.attachment.get_by_idx(mode, idx)
+        path = attachment.path if attachment else None
+
+        menu = QMenu(self)
 
         actions = {}
-        actions['open'] = QAction(QIcon(":/icons/view.svg"), trans('action.open'), self)
-        actions['open'].triggered.connect(partial(ignore_trigger, self.action_open, event))
+        actions['open'] = QAction(self._ICON_VIEW, trans('action.open'), menu)
+        actions['open'].triggered.connect(partial(self._action_open_idx, idx))
 
-        actions['open_dir'] = QAction(QIcon(":/icons/folder_filled.svg"), trans('action.open_dir'), self)
-        actions['open_dir'].triggered.connect(partial(ignore_trigger, self.action_open_dir, event))
+        actions['open_dir'] = QAction(self._ICON_FOLDER, trans('action.open_dir'), menu)
+        actions['open_dir'].triggered.connect(partial(self._action_open_dir_idx, idx))
 
-        actions['rename'] = QAction(QIcon(":/icons/edit.svg"), trans('action.rename'), self)
-        actions['rename'].triggered.connect(partial(ignore_trigger, self.action_rename, event))
+        actions['rename'] = QAction(self._ICON_EDIT, trans('action.rename'), menu)
+        actions['rename'].triggered.connect(partial(self._action_rename_idx, idx))
 
-        actions['delete'] = QAction(QIcon(":/icons/delete.svg"), trans('action.delete'), self)
-        actions['delete'].triggered.connect(partial(ignore_trigger, self.action_delete, event))
+        actions['delete'] = QAction(self._ICON_DELETE, trans('action.delete'), menu)
+        actions['delete'].triggered.connect(partial(self._action_delete_idx, idx))
 
-        menu = QMenu(self)
         if attachment and attachment.type == AttachmentItem.TYPE_FILE:
-            if idx >= 0 and preview_actions:
-                for preview_action in preview_actions:
+            fs_actions = self.window.core.filesystem.actions
+            if fs_actions.has_preview(path):
+                preview_actions = fs_actions.get_preview(self, path)
+                for preview_action in preview_actions or []:
+                    try:
+                        preview_action.setParent(menu)
+                    except Exception:
+                        pass
                     menu.addAction(preview_action)
 
             menu.addAction(actions['open'])
             menu.addAction(actions['open_dir'])
-            if idx >= 0 and self.window.core.filesystem.actions.has_use(path):
-                use_actions = self.window.core.filesystem.actions.get_use(self, path)
-                use_menu = QMenu(trans('action.use'), self)
-                for use_action in use_actions:
+
+            if fs_actions.has_use(path):
+                use_actions = fs_actions.get_use(self, path)
+                use_menu = QMenu(trans('action.use'), menu)
+                for use_action in use_actions or []:
+                    try:
+                        use_action.setParent(use_menu)
+                    except Exception:
+                        pass
                     use_menu.addAction(use_action)
                 menu.addMenu(use_menu)
 
             menu.addAction(actions['rename'])
+
         menu.addAction(actions['delete'])
 
-        if idx >= 0:
-            self.window.controller.attachment.select(mode, item.row())
-            menu.exec_(event.globalPos())
+        self.window.controller.attachment.select(mode, item.row())
+        menu.exec_(event.globalPos())
 
     def keyPressEvent(self, event):
         """
@@ -148,7 +169,7 @@ class AttachmentList(BaseList):
 
         :param event: Event
         """
-        if event.key() == Qt.Key_V and QApplication.keyboardModifiers() == Qt.ControlModifier:
+        if event.key() == Qt.Key_V and (event.modifiers() & Qt.ControlModifier):
             self.handle_paste()
 
     def handle_paste(self):
@@ -159,13 +180,15 @@ class AttachmentList(BaseList):
             image = source.imageData()
             if isinstance(image, QImage):
                 self.window.controller.attachment.from_clipboard_image(image)
-        elif source.hasUrls():
+            return
+        if source.hasUrls():
             urls = source.urls()
             for url in urls:
                 if url.isLocalFile():
                     local_path = url.toLocalFile()
                     self.window.controller.attachment.from_clipboard_url(local_path, all=True)
-        elif source.hasText():
+            return
+        if source.hasText():
             text = source.text()
             self.window.controller.attachment.from_clipboard_text(text, all=True)
 
@@ -215,3 +238,22 @@ class AttachmentList(BaseList):
         idx = item.row()
         if idx >= 0:
             self.window.controller.attachment.delete(idx)
+
+    def _action_open_idx(self, idx, checked=False):
+        if idx >= 0:
+            mode = self.window.core.config.get('mode')
+            self.window.controller.attachment.open(mode, idx)
+
+    def _action_open_dir_idx(self, idx, checked=False):
+        if idx >= 0:
+            mode = self.window.core.config.get('mode')
+            self.window.controller.attachment.open_dir(mode, idx)
+
+    def _action_rename_idx(self, idx, checked=False):
+        if idx >= 0:
+            mode = self.window.core.config.get('mode')
+            self.window.controller.attachment.rename(mode, idx)
+
+    def _action_delete_idx(self, idx, checked=False):
+        if idx >= 0:
+            self.window.controller.attachment.delete(idx)

pygpt_net/ui/widget/lists/base_list_combo.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.02 20:00:00                  #
+# Updated Date: 2025.08.15 03:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QHBoxLayout, QWidget, QComboBox
+from PySide6.QtCore import QSignalBlocker
 
 from pygpt_net.ui.widget.option.combo import SeparatorComboBox, NoScrollCombo
 
@@ -32,8 +33,10 @@ class BaseListCombo(QWidget):
         self.combo.currentIndexChanged.connect(self.on_combo_change)
         self.initialized = False
         self.locked = False
+        self._data_index_map = {}
+        self._keys_cache = None
+        self._keys_cache_id = 0
 
-        # add items
         self.update()
 
         self.layout = QHBoxLayout()
@@ -45,20 +48,53 @@ class BaseListCombo(QWidget):
 
     def update(self):
         """Prepare items"""
-        self.combo.clear()  # Clear combo before updating with new items
-        if isinstance(self.keys, list):
-            for item in self.keys:
-                if isinstance(item, dict):
-                    for key, value in item.items():
-                        self.combo.addItem(value, key)
-                else:
-                    self.combo.addItem(item, item)
-        elif isinstance(self.keys, dict):
-            for key, value in self.keys.items():
-                if key.startswith("separator::"):
-                    self.combo.addSeparator(value)
-                else:
-                    self.combo.addItem(value, key)
+        combo = self.combo
+        blocker = QSignalBlocker(combo)
+        combo.setUpdatesEnabled(False)
+        try:
+            combo.clear()
+            self._data_index_map = {}
+            idx = 0
+            keys = self.keys
+            add_item = combo.addItem
+            if isinstance(keys, list):
+                for item in keys:
+                    if isinstance(item, dict):
+                        for key, value in item.items():
+                            add_item(value, key)
+                            if key not in self._data_index_map:
+                                self._data_index_map[key] = idx
+                            idx += 1
+                    else:
+                        add_item(item, item)
+                        if item not in self._data_index_map:
+                            self._data_index_map[item] = idx
+                        idx += 1
+            elif isinstance(keys, dict):
+                add_sep = combo.addSeparator
+                for key, value in keys.items():
+                    if isinstance(key, str) and key.startswith("separator::"):
+                        add_sep(value)
+                        idx += 1
+                    else:
+                        add_item(value, key)
+                        if key not in self._data_index_map:
+                            self._data_index_map[key] = idx
+                        idx += 1
+            cache = set()
+            if isinstance(keys, list):
+                for item in keys:
+                    if isinstance(item, dict):
+                        cache.update(item.keys())
+                    else:
+                        cache.add(item)
+            elif isinstance(keys, dict):
+                cache.update(keys.keys())
+            self._keys_cache = cache
+            self._keys_cache_id = id(keys)
+        finally:
+            combo.setUpdatesEnabled(True)
+            del blocker
 
     def set_value(self, value):
         """
@@ -67,10 +103,21 @@ class BaseListCombo(QWidget):
         :param value: value
         """
         self.locked = True
-        index = self.combo.findData(value)
-        if index != -1:
-            self.combo.setCurrentIndex(index)
-        self.locked = False
+        combo = self.combo
+        blocker = QSignalBlocker(combo)
+        try:
+            index = self._data_index_map.get(value, -1)
+            if index == -1:
+                index = combo.findData(value)
+                if index != -1 and value not in self._data_index_map:
+                    self._data_index_map[value] = index
+            if index != -1:
+                if index != combo.currentIndex():
+                    combo.setCurrentIndex(index)
+                self.current_id = value
+        finally:
+            del blocker
+            self.locked = False
 
     def get_value(self):
         """
@@ -87,17 +134,20 @@ class BaseListCombo(QWidget):
         :param name: key name
         :return:
         """
-        if isinstance(self.keys, list):
-            for key in self.keys:
-                if isinstance(key, dict):
-                    if name in key:
-                        return True
-                elif name == key:
-                    return True
-        elif isinstance(self.keys, dict):
-            if name in self.keys:
-                return True
-        return False
+        keys = self.keys
+        if self._keys_cache is None or self._keys_cache_id != id(keys):
+            cache = set()
+            if isinstance(keys, list):
+                for item in keys:
+                    if isinstance(item, dict):
+                        cache.update(item.keys())
+                    else:
+                        cache.add(item)
+            elif isinstance(keys, dict):
+                cache.update(keys.keys())
+            self._keys_cache = cache
+            self._keys_cache_id = id(keys)
+        return name in self._keys_cache
 
     def set_keys(self, keys):
         """
@@ -107,7 +157,9 @@ class BaseListCombo(QWidget):
         """
         self.locked = True
         self.keys = keys
-        self.update()  # Auto-clear handled in update
+        self._keys_cache = None
+        self._keys_cache_id = 0
+        self.update()
         self.locked = False
 
     def on_combo_change(self, index):
@@ -118,7 +170,7 @@ class BaseListCombo(QWidget):
         """
         if not self.initialized or self.locked:
             return
-        self.current_id = self.combo.itemData(index)
+        self.current_id = self.combo.itemData(index) if index >= 0 else None
 
     def fit_to_content(self):
         """Fit to content"""