pygpt-net 2.6.67__py3-none-any.whl → 2.7.1__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.24 23:00:00                  #
+# Updated Date: 2025.12.27 21:00:00                  #
 # ================================================== #
 
 from functools import partial
 
-from PySide6.QtCore import Qt
+from PySide6.QtCore import Qt, QPoint, QItemSelectionModel
 from PySide6.QtGui import QAction, QIcon, QResizeEvent, QImage
-from PySide6.QtWidgets import QMenu, QApplication
+from PySide6.QtWidgets import QMenu, QApplication, QAbstractItemView
 
 from pygpt_net.item.attachment import AttachmentItem
 from pygpt_net.ui.widget.lists.base import BaseList
@@ -40,6 +40,20 @@ class AttachmentList(BaseList):
         self.setHeaderHidden(False)
         self.clicked.disconnect(self.click)
 
+        # Multi-select: rows + Ctrl/Shift gestures, but "virtual" (no business click)
+        self.setSelectionBehavior(QAbstractItemView.SelectRows)
+        self.setSelectionMode(QAbstractItemView.ExtendedSelection)
+
+        # Guards for virtual multi-select (do not trigger controller on Ctrl/Shift)
+        self._suppress_item_click = False       # one-shot suppression of business click
+        self._ctrl_multi_active = False         # Ctrl gesture in progress
+        self._ctrl_multi_index = None           # index pressed with Ctrl
+        self._was_shift_click = False           # Shift gesture flag
+
+        # Context menu selection restore
+        self._backup_selection = None
+        self.restore_after_ctx_menu = True
+
         hdr = self.header()
         hdr.setStretchLastSection(False)
 
@@ -70,19 +84,92 @@ class AttachmentList(BaseList):
             self._last_width = w
             self.adjustColumnWidths()
 
+    def _selected_rows(self) -> list[int]:
+        """Return list of selected row numbers."""
+        try:
+            return [ix.row() for ix in self.selectionModel().selectedRows()]
+        except Exception:
+            return []
+
+    def _has_multi_selection(self) -> bool:
+        """Check whether multiple rows are currently selected."""
+        try:
+            return len(self.selectionModel().selectedRows()) > 1
+        except Exception:
+            return False
+
     def mousePressEvent(self, event):
         """
         Mouse press event
 
         :param event: mouse event
         """
+        # Ctrl + Left: toggle visual selection only (virtual multi-select)
+        if event.button() == Qt.LeftButton and (event.modifiers() & Qt.ControlModifier):
+            idx = self.indexAt(event.pos())
+            self._ctrl_multi_active = True
+            self._ctrl_multi_index = idx if idx.isValid() else None
+            self._suppress_item_click = True
+            event.accept()
+            return
+
+        # Shift + Left: let Qt perform range selection; suppress business click
+        if event.button() == Qt.LeftButton and (event.modifiers() & Qt.ShiftModifier):
+            idx = self.indexAt(event.pos())
+            self._suppress_item_click = True
+            self._was_shift_click = True
+            if idx.isValid():
+                super(AttachmentList, self).mousePressEvent(event)
+            else:
+                event.accept()
+            return
+
         if event.button() == Qt.LeftButton:
             index = self.indexAt(event.pos())
-            if index.isValid():
+
+            # If multi selected: single left click anywhere clears selection
+            if self._has_multi_selection():
+                sel_model = self.selectionModel()
+                sel_model.clearSelection()
+                if not index.isValid():
+                    event.accept()
+                    return
+                # continue to select clicked row as single
+
+            # Default path: allow Qt to select row visually
+            super(AttachmentList, self).mousePressEvent(event)
+
+            # Business click only when not suppressed and not multi-selection
+            if index.isValid() and not self._suppress_item_click and not self._has_multi_selection():
                 mode = self.window.core.config.get('mode')
                 self.window.controller.attachment.select(mode, index.row())
+            return
+
         super(AttachmentList, self).mousePressEvent(event)
 
+    def mouseReleaseEvent(self, event):
+        # Finish Shift-based range selection (keep it virtual)
+        if event.button() == Qt.LeftButton and self._was_shift_click:
+            self._was_shift_click = False
+            super(AttachmentList, self).mouseReleaseEvent(event)
+            return
+
+        # Finish Ctrl-based toggle selection (virtual)
+        if event.button() == Qt.LeftButton and self._ctrl_multi_active:
+            try:
+                idx = self.indexAt(event.pos())
+                if idx.isValid() and self._ctrl_multi_index and idx == self._ctrl_multi_index:
+                    sel_model = self.selectionModel()
+                    sel_model.select(idx, QItemSelectionModel.Toggle | QItemSelectionModel.Rows)
+            finally:
+                self._ctrl_multi_active = False
+                self._ctrl_multi_index = None
+                self._suppress_item_click = False
+            event.accept()
+            return
+
+        super(AttachmentList, self).mouseReleaseEvent(event)
+
     def click(self, val):
         """
         Click event
@@ -107,61 +194,136 @@ class AttachmentList(BaseList):
         :param event: context menu event
         """
         mode = self.window.core.config.get('mode')
-        item = self.indexAt(event.pos())
-        idx = item.row()
-        if idx < 0:
+        pos = event.pos()
+        index = self.indexAt(pos)
+        idx = index.row() if index.isValid() else -1
+
+        # Read current selection
+        sel_model = self.selectionModel()
+        selected_indexes = list(sel_model.selectedRows()) if sel_model else []
+        selected_rows = [ix.row() for ix in selected_indexes]
+        multi = len(selected_rows) > 1
+
+        # Allow menu on empty area only when multi-selection is active
+        if not index.isValid() and not multi:
             return
 
-        attachment = self.window.controller.attachment.get_by_idx(mode, idx)
-        path = attachment.path if attachment else None
+        # If right-click on a row outside current multi-selection, temporarily select that row
+        backup_selection = None
+        if index.isValid():
+            if multi and idx in selected_rows:
+                backup_selection = None  # keep multi-selection
+            else:
+                backup_selection = list(sel_model.selectedIndexes())
+                sel_model.clearSelection()
+                sel_model.select(index, QItemSelectionModel.Select | QItemSelectionModel.Rows)
+                selected_rows = [idx]
+                multi = False
+
+        # Resolve attachment(s)
+        selected_attachments = []
+        try:
+            for r in selected_rows:
+                a = self.window.controller.attachment.get_by_idx(mode, r)
+                if a:
+                    selected_attachments.append(a)
+        except Exception:
+            pass
+
+        attachment = None
+        if idx >= 0:
+            attachment = self.window.controller.attachment.get_by_idx(mode, idx)
 
-        menu = QMenu(self)
+        # Compute flags for file-based actions when multi
+        all_files = all(a and a.type == AttachmentItem.TYPE_FILE for a in selected_attachments) if selected_attachments else False
 
+        menu = QMenu(self)
         actions = {}
-        actions['open'] = QAction(self._ICON_VIEW, trans('action.open'), menu)
-        actions['open'].triggered.connect(partial(self._action_open_idx, idx))
 
+        # Open / Open dir
+        actions['open'] = QAction(self._ICON_VIEW, trans('action.open'), menu)
         actions['open_dir'] = QAction(self._ICON_FOLDER, trans('action.open_dir'), menu)
-        actions['open_dir'].triggered.connect(partial(self._action_open_dir_idx, idx))
 
+        # Rename (single only)
         actions['rename'] = QAction(self._ICON_EDIT, trans('action.rename'), menu)
-        actions['rename'].triggered.connect(partial(self._action_rename_idx, idx))
 
+        # Delete (single or multi)
         actions['delete'] = QAction(self._ICON_DELETE, trans('action.delete'), menu)
-        actions['delete'].triggered.connect(partial(self._action_delete_idx, idx))
-
-        if attachment and attachment.type == AttachmentItem.TYPE_FILE:
-            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 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'])
-
-        self.window.controller.attachment.select(mode, item.row())
+
+        fs_actions = None
+        path = None
+
+        # Single selection path (preserve previous behavior)
+        if not multi and attachment:
+            path = attachment.path
+            if attachment.type == AttachmentItem.TYPE_FILE:
+                fs_actions = self.window.core.filesystem.actions
+
+                # Preview actions (single only)
+                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)
+
+                # Open / Open dir
+                actions['open'].triggered.connect(partial(self._action_open_idx, idx))
+                actions['open_dir'].triggered.connect(partial(self._action_open_dir_idx, idx))
+                menu.addAction(actions['open'])
+                menu.addAction(actions['open_dir'])
+
+                # Use submenu (single only)
+                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)
+
+                # Rename (single only)
+                actions['rename'].triggered.connect(partial(self._action_rename_idx, idx))
+                menu.addAction(actions['rename'])
+
+            # Delete
+            actions['delete'].triggered.connect(partial(self._action_delete_idx, idx))
+            menu.addAction(actions['delete'])
+
+        else:
+            # Multi-selection aggregated actions
+            rows = list(selected_rows)
+
+            # Open / Open dir only when all selected are files
+            if all_files:
+                actions['open'].triggered.connect(partial(self._action_open_multi, rows))
+                menu.addAction(actions['open'])
+
+                actions['open_dir'].triggered.connect(partial(self._action_open_dir_multi, rows))
+                menu.addAction(actions['open_dir'])
+
+            # Rename disabled for multi; do not add
+
+            # Delete for multi (pass list)
+            actions['delete'].triggered.connect(partial(self._action_delete_multi, rows))
+            menu.addAction(actions['delete'])
+
+        # Do not trigger controller selection here; keep it virtual
         menu.exec_(event.globalPos())
 
+        # Restore original selection after context menu if it was temporarily changed
+        if backup_selection is not None and self.restore_after_ctx_menu:
+            sel_model.clearSelection()
+            for i in backup_selection:
+                sel_model.select(i, QItemSelectionModel.Select | QItemSelectionModel.Rows)
+        self._backup_selection = None
+        self.restore_after_ctx_menu = True
+
     def keyPressEvent(self, event):
         """
         Key press event to handle undo action
@@ -238,6 +400,8 @@ class AttachmentList(BaseList):
         if idx >= 0:
             self.window.controller.attachment.delete(idx)
 
+    # Single-index context actions (backward compatible)
+
     def _action_open_idx(self, idx, checked=False):
         if idx >= 0:
             mode = self.window.core.config.get('mode')
@@ -255,4 +419,23 @@ class AttachmentList(BaseList):
 
     def _action_delete_idx(self, idx, checked=False):
         if idx >= 0:
-            self.window.controller.attachment.delete(idx)
+            self.window.controller.attachment.delete(idx)
+
+    # Multi-index context actions (aggregated)
+
+    def _action_open_multi(self, rows: list[int], checked=False):
+        """Open multiple attachments: pass list of row indexes."""
+        if rows:
+            mode = self.window.core.config.get('mode')
+            self.window.controller.attachment.open(mode, list(rows))
+
+    def _action_open_dir_multi(self, rows: list[int], checked=False):
+        """Open directories for multiple attachments: pass list of row indexes."""
+        if rows:
+            mode = self.window.core.config.get('mode')
+            self.window.controller.attachment.open_dir(mode, list(rows))
+
+    def _action_delete_multi(self, rows: list[int], checked=False):
+        """Delete multiple attachments: pass list of row indexes."""
+        if rows:
+            self.window.controller.attachment.delete(list(rows))

pygpt_net/ui/widget/lists/attachment_ctx.py

@@ -6,13 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.24 23:00:00                  #
+# Updated Date: 2025.12.27 21:00:00                  #
 # ================================================== #
 
 from functools import partial
 
-from PySide6.QtGui import QAction, QIcon, QResizeEvent, Qt
-from PySide6.QtWidgets import QMenu
+from PySide6.QtCore import Qt, QItemSelectionModel
+from PySide6.QtGui import QAction, QIcon, QResizeEvent
+from PySide6.QtWidgets import QMenu, QAbstractItemView
 
 from pygpt_net.ui.widget.lists.base import BaseList
 from pygpt_net.utils import trans
@@ -33,6 +34,18 @@ class AttachmentCtxList(BaseList):
         self.setHeaderHidden(False)
         self.clicked.disconnect(self.click)
 
+        # Flat rows + virtual multi-select (Ctrl/Shift)
+        self.setSelectionBehavior(QAbstractItemView.SelectRows)
+        self.setSelectionMode(QAbstractItemView.ExtendedSelection)
+
+        # Virtual multi-select guards
+        self._suppress_item_click = False
+        self._was_shift_click = False
+
+        # Context menu selection restore
+        self._backup_selection = None
+        self.restore_after_ctx_menu = True
+
         self.header = self.header()
         self.header.setStretchLastSection(False)
 
@@ -50,18 +63,84 @@ class AttachmentCtxList(BaseList):
         super().resizeEvent(event)
         self.adjustColumnWidths()
 
+    def _selected_rows(self) -> list[int]:
+        """Return list of selected row numbers."""
+        try:
+            return [ix.row() for ix in self.selectionModel().selectedRows()]
+        except Exception:
+            return []
+
+    def _has_multi_selection(self) -> bool:
+        """Check whether multiple rows are currently selected."""
+        try:
+            return len(self.selectionModel().selectedRows()) > 1
+        except Exception:
+            return False
+
     def mousePressEvent(self, event):
         """
         Mouse press event
 
         :param event: mouse event
         """
-        if event.buttons() == Qt.LeftButton:
+        # Ctrl + Left: let Qt toggle selection; block business click afterwards
+        if event.button() == Qt.LeftButton and (event.modifiers() & Qt.ControlModifier):
+            idx = self.indexAt(event.pos())
+            self._suppress_item_click = True
+            if idx.isValid():
+                super(AttachmentCtxList, self).mousePressEvent(event)  # native toggle
+            else:
+                event.accept()
+            return
+
+        # Shift + Left: let Qt perform range selection; suppress business click
+        if event.button() == Qt.LeftButton and (event.modifiers() & Qt.ShiftModifier):
+            idx = self.indexAt(event.pos())
+            self._suppress_item_click = True
+            self._was_shift_click = True
+            if idx.isValid():
+                super(AttachmentCtxList, self).mousePressEvent(event)
+            else:
+                event.accept()
+            return
+
+        if event.button() == Qt.LeftButton:
             index = self.indexAt(event.pos())
-            if index.isValid():
+
+            # When multiple are selected, a single left click anywhere clears selection
+            if self._has_multi_selection():
+                sel_model = self.selectionModel()
+                sel_model.clearSelection()
+                if not index.isValid():
+                    event.accept()
+                    return
+                # continue to select clicked row as single
+
+            # Default visual selection
+            super(AttachmentCtxList, self).mousePressEvent(event)
+
+            # Business click only when not suppressed and not multi-selection
+            if index.isValid() and not self._suppress_item_click and not self._has_multi_selection():
                 self.window.controller.assistant.files.select(index.row())
+            return
+
         super(AttachmentCtxList, self).mousePressEvent(event)
 
+    def mouseReleaseEvent(self, event):
+        # Finish Shift-based range selection (virtual)
+        if event.button() == Qt.LeftButton and self._was_shift_click:
+            self._was_shift_click = False
+            super(AttachmentCtxList, self).mouseReleaseEvent(event)
+            return
+
+        # Clear Ctrl suppression flag on release (selection was already toggled by Qt on press)
+        if event.button() == Qt.LeftButton and self._suppress_item_click:
+            self._suppress_item_click = False
+            super(AttachmentCtxList, self).mouseReleaseEvent(event)
+            return
+
+        super(AttachmentCtxList, self).mouseReleaseEvent(event)
+
     def click(self, val):
         """
         Click event
@@ -89,42 +168,101 @@ class AttachmentCtxList(BaseList):
 
         actions = {}
 
-        item = self.indexAt(event.pos())
-        idx = item.row()
-
-        has_file = False
-        has_src = False
-        has_dest = False
-
-        if idx >= 0:
-            has_file = self.window.controller.chat.attachment.has_file_by_idx(idx)
-            has_src = self.window.controller.chat.attachment.has_src_by_idx(idx)
-            has_dest = self.window.controller.chat.attachment.has_dest_by_idx(idx)
+        index = self.indexAt(event.pos())
+        idx = index.row() if index.isValid() else -1
+
+        # Selection state
+        sel_model = self.selectionModel()
+        selected_indexes = list(sel_model.selectedRows()) if sel_model else []
+        selected_rows = [ix.row() for ix in selected_indexes]
+        multi = len(selected_rows) > 1
+
+        # Allow menu on empty area only when multi-selection is active
+        if not index.isValid() and not multi:
+            return
+
+        # Use class-level selection flags (PySide6) for compatibility and clarity
+        SelectionFlag = getattr(QItemSelectionModel, "SelectionFlag", QItemSelectionModel)
+
+        # Temporarily adjust selection if right-clicked outside current multi-selection
+        backup_selection = None
+        if index.isValid():
+            if multi and idx in selected_rows:
+                backup_selection = None  # keep multi-selection
+            else:
+                backup_selection = list(sel_model.selectedIndexes())
+                sel_model.clearSelection()
+                sel_model.select(index, SelectionFlag.Select | SelectionFlag.Rows)
+                selected_rows = [idx]
+                multi = False
+
+        # Aggregate capabilities across selection (union)
+        has_file_any = False
+        has_src_any = False
+        has_dest_any = False
+
+        rows_for_flags = selected_rows if selected_rows else ([idx] if idx >= 0 else [])
+
+        for r in rows_for_flags:
+            try:
+                if self.window.controller.chat.attachment.has_file_by_idx(r):
+                    has_file_any = True
+                if self.window.controller.chat.attachment.has_src_by_idx(r):
+                    has_src_any = True
+                if self.window.controller.chat.attachment.has_dest_by_idx(r):
+                    has_dest_any = True
+            except Exception:
+                pass
 
         actions['open'] = QAction(QIcon(":/icons/view.svg"), trans('action.open'), self)
-        actions['open'].triggered.connect(partial(ignore_trigger, self.action_open, event))
-
         actions['open_dir_src'] = QAction(QIcon(":/icons/folder.svg"), trans('action.open_dir_src'), self)
-        actions['open_dir_src'].triggered.connect(partial(ignore_trigger, self.action_open_dir_src, event))
-
         actions['open_dir_dest'] = QAction(QIcon(":/icons/folder.svg"), trans('action.open_dir_storage'), self)
-        actions['open_dir_dest'].triggered.connect(partial(ignore_trigger, self.action_open_dir_dest, event))
-
         actions['delete'] = QAction(QIcon(":/icons/delete.svg"), trans('action.delete'), self)
-        actions['delete'].triggered.connect(partial(ignore_trigger, self.action_delete, event))
 
         menu = QMenu(self)
-        if has_file:
-            menu.addAction(actions['open'])
-        if has_src:
-            menu.addAction(actions['open_dir_src'])
-        if has_dest:
-            menu.addAction(actions['open_dir_dest'])
-        menu.addAction(actions['delete'])
 
-        if idx >= 0:
-            self.window.controller.chat.attachment.select(item.row())
-            menu.exec_(event.globalPos())
+        if not multi:
+            # Single selection: keep legacy path and event-based handlers
+            if idx >= 0:
+                if has_file_any:
+                    actions['open'].triggered.connect(partial(ignore_trigger, self.action_open, event))
+                    menu.addAction(actions['open'])
+                if has_src_any:
+                    actions['open_dir_src'].triggered.connect(partial(ignore_trigger, self.action_open_dir_src, event))
+                    menu.addAction(actions['open_dir_src'])
+                if has_dest_any:
+                    actions['open_dir_dest'].triggered.connect(partial(ignore_trigger, self.action_open_dir_dest, event))
+                    menu.addAction(actions['open_dir_dest'])
+
+                actions['delete'].triggered.connect(partial(ignore_trigger, self.action_delete, event))
+                menu.addAction(actions['delete'])
+        else:
+            # Multi selection: show union of available actions and pass list of rows
+            rows = list(selected_rows)
+
+            if has_file_any:
+                actions['open'].triggered.connect(partial(self._action_open_multi, rows))
+                menu.addAction(actions['open'])
+            if has_src_any:
+                actions['open_dir_src'].triggered.connect(partial(self._action_open_dir_src_multi, rows))
+                menu.addAction(actions['open_dir_src'])
+            if has_dest_any:
+                actions['open_dir_dest'].triggered.connect(partial(self._action_open_dir_dest_multi, rows))
+                menu.addAction(actions['open_dir_dest'])
+
+            actions['delete'].triggered.connect(partial(self._action_delete_multi, rows))
+            menu.addAction(actions['delete'])
+
+        # Do not perform business selection here; keep selection virtual
+        menu.exec_(event.globalPos())
+
+        # Restore original selection after context menu if it was temporarily changed
+        if backup_selection is not None and self.restore_after_ctx_menu:
+            sel_model.clearSelection()
+            for i in backup_selection:
+                sel_model.select(i, SelectionFlag.Select | SelectionFlag.Rows)
+        self._backup_selection = None
+        self.restore_after_ctx_menu = True
 
     def action_delete(self, event):
         """
@@ -169,3 +307,21 @@ class AttachmentCtxList(BaseList):
         idx = item.row()
         if idx >= 0:
             self.window.controller.chat.attachment.open_dir_dest_by_idx(idx)
+
+    # ---- Multi-index context actions (aggregated; pass list[int]) ----
+
+    def _action_delete_multi(self, rows: list[int], checked=False):
+        if rows:
+            self.window.controller.chat.attachment.delete_by_idx(list(rows))
+
+    def _action_open_multi(self, rows: list[int], checked=False):
+        if rows:
+            self.window.controller.chat.attachment.open_by_idx(list(rows))
+
+    def _action_open_dir_src_multi(self, rows: list[int], checked=False):
+        if rows:
+            self.window.controller.chat.attachment.open_dir_src_by_idx(list(rows))
+
+    def _action_open_dir_dest_multi(self, rows: list[int], checked=False):
+        if rows:
+            self.window.controller.chat.attachment.open_dir_dest_by_idx(list(rows))

pygpt_net/ui/widget/lists/base_list_combo.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 03:00:00                  #
+# Updated Date: 2025.12.27 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QHBoxLayout, QWidget, QComboBox
@@ -29,7 +29,7 @@ class BaseListCombo(QWidget):
         self.current_id = None
         self.keys = []
         self.real_time = False
-        self.combo = NoScrollCombo()
+        self.combo = NoScrollCombo(parent=self.window)
         self.combo.currentIndexChanged.connect(self.on_combo_change)
         self.initialized = False
         self.locked = False