pygpt-net 2.7.3__py3-none-any.whl → 2.7.5__py3-none-any.whl

pygpt_net/ui/widget/lists/{assistant_store.py → remote_store_openai.py}

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.27 00:00:00                  #
+# Updated Date: 2026.01.02 19:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction, QIcon
@@ -18,7 +18,7 @@ from pygpt_net.utils import trans
 import pygpt_net.icons_rc
 
 
-class AssistantVectorStoreEditorList(BaseList):
+class RemoteStoreOpenAIEditorList(BaseList):
     def __init__(self, window=None, id=None):
         """
         Store select menu (in editor)
@@ -26,7 +26,7 @@ class AssistantVectorStoreEditorList(BaseList):
         :param window: main window
         :param id: parent id
         """
-        super(AssistantVectorStoreEditorList, self).__init__(window)
+        super(RemoteStoreOpenAIEditorList, self).__init__(window)
         self.window = window
         self.id = id
 
@@ -94,7 +94,7 @@ class AssistantVectorStoreEditorList(BaseList):
             self._suppress_item_click = True
             self._was_shift_click = True
             if idx.isValid():
-                super(AssistantVectorStoreEditorList, self).mousePressEvent(event)
+                super(RemoteStoreOpenAIEditorList, self).mousePressEvent(event)
             else:
                 event.accept()
             return
@@ -112,7 +112,7 @@ class AssistantVectorStoreEditorList(BaseList):
                     return
                 # continue with default single selection for clicked row
 
-            super(AssistantVectorStoreEditorList, self).mousePressEvent(event)
+            super(RemoteStoreOpenAIEditorList, self).mousePressEvent(event)
             return
 
         # Right click: prepare selection for context menu
@@ -134,14 +134,14 @@ class AssistantVectorStoreEditorList(BaseList):
             event.accept()
             return
 
-        super(AssistantVectorStoreEditorList, self).mousePressEvent(event)
+        super(RemoteStoreOpenAIEditorList, self).mousePressEvent(event)
 
     def mouseReleaseEvent(self, event):
         # If the click was a Shift-based range selection, bypass business click
         if event.button() == Qt.LeftButton and self._was_shift_click:
             self._was_shift_click = False
             self._suppress_item_click = False
-            super(AssistantVectorStoreEditorList, self).mouseReleaseEvent(event)
+            super(RemoteStoreOpenAIEditorList, self).mouseReleaseEvent(event)
             return
 
         # Finish "virtual" Ctrl toggle on same row (no business click)
@@ -163,12 +163,12 @@ class AssistantVectorStoreEditorList(BaseList):
             idx = self.indexAt(event.pos())
             if not self._has_multi_selection():
                 if idx.isValid() and not self._suppress_item_click:
-                    self.window.controller.assistant.store.select(idx.row())
+                    self.window.controller.remote_store.openai.select(idx.row())
             self._suppress_item_click = False
-            super(AssistantVectorStoreEditorList, self).mouseReleaseEvent(event)
+            super(RemoteStoreOpenAIEditorList, self).mouseReleaseEvent(event)
             return
 
-        super(AssistantVectorStoreEditorList, self).mouseReleaseEvent(event)
+        super(RemoteStoreOpenAIEditorList, self).mouseReleaseEvent(event)
 
     def click(self, val):
         # Not used; single-selection business click is handled in mouseReleaseEvent
@@ -187,18 +187,18 @@ class AssistantVectorStoreEditorList(BaseList):
         actions = {}
         actions['refresh'] = QAction(
             QIcon(":/icons/reload.svg"),
-            trans('dialog.assistant.store.menu.current.refresh_store'),
+            trans('dialog.remote_store.menu.current.refresh_store'),
             self
         )
         actions['delete'] = QAction(QIcon(":/icons/delete.svg"), trans('action.delete'), self)
         actions['clear'] = QAction(
             QIcon(":/icons/close.svg"),
-            trans('dialog.assistant.store.menu.current.clear_files'),
+            trans('dialog.remote_store.menu.current.clear_files'),
             self
         )
         actions['truncate'] = QAction(
             QIcon(":/icons/delete.svg"),
-            trans('dialog.assistant.store.menu.current.truncate_files'),
+            trans('dialog.remote_store.menu.current.truncate_files'),
             self
         )
 
@@ -263,12 +263,12 @@ class AssistantVectorStoreEditorList(BaseList):
         if isinstance(item, (list, tuple)):
             if item:
                 self.restore_after_ctx_menu = False
-                self.window.controller.assistant.store.delete_by_idx(list(item))
+                self.window.controller.remote_store.openai.delete_by_idx(list(item))
             return
         idx = int(item)
         if idx >= 0:
             self.restore_after_ctx_menu = False
-            self.window.controller.assistant.store.delete_by_idx(idx)
+            self.window.controller.remote_store.openai.delete_by_idx(idx)
 
     def action_clear(self, item):
         """
@@ -279,12 +279,12 @@ class AssistantVectorStoreEditorList(BaseList):
         if isinstance(item, (list, tuple)):
             if item:
                 self.restore_after_ctx_menu = False
-                self.window.controller.assistant.batch.clear_store_files_by_idx(list(item))
+                self.window.controller.remote_store.openai.batch.clear_store_files_by_idx(list(item))
             return
         idx = int(item)
         if idx >= 0:
             self.restore_after_ctx_menu = False
-            self.window.controller.assistant.batch.clear_store_files_by_idx(idx)
+            self.window.controller.remote_store.openai.batch.clear_store_files_by_idx(idx)
 
     def action_truncate(self, item):
         """
@@ -295,12 +295,12 @@ class AssistantVectorStoreEditorList(BaseList):
         if isinstance(item, (list, tuple)):
             if item:
                 self.restore_after_ctx_menu = False
-                self.window.controller.assistant.batch.truncate_store_files_by_idx(list(item))
+                self.window.controller.remote_store.openai.batch.truncate_store_files_by_idx(list(item))
             return
         idx = int(item)
         if idx >= 0:
             self.restore_after_ctx_menu = False
-            self.window.controller.assistant.batch.truncate_store_files_by_idx(idx)
+            self.window.controller.remote_store.openai.batch.truncate_store_files_by_idx(idx)
 
     def action_refresh(self, item):
         """
@@ -309,9 +309,9 @@ class AssistantVectorStoreEditorList(BaseList):
         if isinstance(item, (list, tuple)):
             if item:
                 self.restore_after_ctx_menu = False
-                self.window.controller.assistant.store.refresh_by_idx(list(item))
+                self.window.controller.remote_store.openai.refresh_by_idx(list(item))
             return
         idx = int(item)
         if idx >= 0:
             self.restore_after_ctx_menu = False
-            self.window.controller.assistant.store.refresh_by_idx(idx)
+            self.window.controller.remote_store.openai.refresh_by_idx(idx)

pygpt_net/ui/widget/option/checkbox_list.py

@@ -6,10 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.25 20:00:00                  #
+# Updated Date: 2026.01.01 15:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QCheckBox, QWidget, QPushButton
+from PySide6.QtGui import QIcon
+from PySide6.QtCore import QSize, Qt
 
 from pygpt_net.ui.base.flow_layout import FlowLayout
 from pygpt_net.utils import trans
@@ -43,6 +45,10 @@ class OptionCheckboxList(QWidget):
         self.keys = {}
         self.boxes = {}
 
+        # overlay button config
+        self._overlay_margin = 4  # px
+        self.btn_select = None
+
         # init from option data
         if self.option is not None:
             if "label" in self.option and self.option["label"] is not None \
@@ -84,20 +90,49 @@ class OptionCheckboxList(QWidget):
         for widget in widgets:
             self.layout.addWidget(widget)
 
-        # select/unselect all button
-        btn_select = QPushButton("X", self)
-        btn_select.setToolTip(trans("action.select_unselect_all"))
-        btn_select.clicked.connect(
+        # do not add the select/unselect all button to the flow layout
+        # it will be overlaid in the top-right corner to avoid affecting layout flow
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.setLayout(self.layout)
+
+        # overlay select/unselect all button pinned to top-right corner
+        self.btn_select = QPushButton(self)
+        self.btn_select.setObjectName("btn_select_all_overlay")
+        self.btn_select.setToolTip(trans("action.select_unselect_all"))
+        self.btn_select.setIcon(QIcon(":/icons/asterisk.svg"))
+        self.btn_select.setIconSize(QSize(16, 16))
+        self.btn_select.setFixedSize(22, 22)
+        self.btn_select.setFocusPolicy(Qt.NoFocus)
+        self.btn_select.setCursor(Qt.PointingHandCursor)
+        self.btn_select.setStyleSheet("QPushButton { border: none; padding: 0; background: transparent; }")
+        self.btn_select.clicked.connect(
             lambda: self.window.controller.config.checkbox_list.on_select_all(
                 self.parent_id,
                 self.id,
                 self.option
             )
         )
-        self.layout.addWidget(btn_select)
+        self.btn_select.raise_()
+        self._place_select_button()
 
-        self.layout.setContentsMargins(0, 0, 0, 0)
-        self.setLayout(self.layout)
+    def _place_select_button(self) -> None:
+        """
+        Place the overlay select/unselect button in the top-right corner.
+        """
+        if not self.btn_select:
+            return
+        m = self._overlay_margin
+        w = self.btn_select.width()
+        x = max(0, self.width() - w - m)
+        y = m
+        self.btn_select.move(x, y)
+
+    def resizeEvent(self, event):
+        """
+        Keep the overlay button pinned to the top-right on resize.
+        """
+        super().resizeEvent(event)
+        self._place_select_button()
 
     def update_boxes_list(self, keys: dict) -> None:
         """
@@ -141,6 +176,9 @@ class OptionCheckboxList(QWidget):
                     self.boxes[key] = checkbox
                     self.layout.addWidget(checkbox)
 
+        # keep the overlay button in place after list update
+        self._place_select_button()
+
     def setIcon(self, icon: str):
         """
         Set icon
@@ -185,4 +223,4 @@ class OptionCheckboxList(QWidget):
         """
         if key in self.boxes:
             return self.boxes[key].isChecked()
-        return False
+        return False

pygpt_net/ui/widget/option/combo.py

@@ -6,8 +6,9 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.12.28 00:00:00                  #
+# Updated Date: 2026.01.01 15:00:00                  #
 # ================================================== #
+import sys
 
 from PySide6.QtCore import Qt, QEvent, QTimer, QRect, Property
 from PySide6.QtWidgets import (
@@ -21,12 +22,13 @@ from PySide6.QtWidgets import (
     QListView,
     QStyledItemDelegate,
     QStyleOptionViewItem,
+    QApplication,
 )
 from PySide6.QtGui import (
     QFontMetrics,
     QStandardItem,
     QStandardItemModel,
-    QIcon,  # keep existing imports, extend with items
+    QIcon,
     QColor,
     QPainter,
     QPen,
@@ -399,6 +401,9 @@ class SearchableCombo(SeparatorComboBox):
         self._swallow_release_once: bool = False  # kept for compatibility; not used in the new flow
         self._open_on_release: bool = False       # open popup on mouse release (non-arrow path)
 
+        # One-shot guard to ignore replayed click when user closes popup by clicking this same combo
+        self._prevent_reopen_once: bool = False
+
         # Popup fitting helpers
         self._fit_in_progress: bool = False
         self._popup_parent_window = None
@@ -508,6 +513,11 @@ class SearchableCombo(SeparatorComboBox):
         QTimer.singleShot(0, self._fit_popup_to_window)
         self._refresh_popup_view()
 
+        # Minimal robustness: re-ensure header after popup is fully shown (helps on Windows when switching combos)
+        QTimer.singleShot(0, self._ensure_header_after_show)
+        QTimer.singleShot(15, self._ensure_header_after_show)
+        QTimer.singleShot(60, self._ensure_header_after_show)
+
     def hidePopup(self):
         """Close popup and restore normal display text; remove header/margins."""
         super().hidePopup()
@@ -673,6 +683,12 @@ class SearchableCombo(SeparatorComboBox):
         Use release-to-open on the non-arrow area to avoid immediate close when the popup opens upward.
         Keep the arrow area with the default toggle behaviour from the base class.
         """
+        # One-shot guard: if popup was closed by clicking this same combo, ignore the replayed click
+        if event.button() == Qt.LeftButton and self._prevent_reopen_once:
+            self._prevent_reopen_once = False
+            event.accept()
+            return
+
         if event.button() == Qt.LeftButton and self.isEnabled():
             arrow_rect = self._arrow_rect()
             if arrow_rect.contains(event.pos()):
@@ -722,6 +738,13 @@ class SearchableCombo(SeparatorComboBox):
                 event.accept()
                 return
             if event.key() == Qt.Key_Escape:
+                # Explicitly close so the next click opens immediately
+                self.hidePopup()
+                event.accept()
+                return
+            if event.key() == Qt.Key_Right:
+                # Inject highlighted item's text into the search header
+                self._apply_highlighted_to_search_input()
                 event.accept()
                 return
         super().keyPressEvent(event)
@@ -737,6 +760,53 @@ class SearchableCombo(SeparatorComboBox):
         - Keep popup horizontally inside the parent window while resizing/moving.
         """
         if obj is self._popup_container and self._popup_container is not None:
+            # Open target combo immediately when user clicks outside current popup
+            if event.type() == QEvent.MouseButtonPress:
+                try:
+                    # Detect left-click outside popup window
+                    left_btn = (getattr(event, "button", lambda: None)() == Qt.LeftButton)
+                    pos_local = getattr(event, "position", lambda: None)()
+                    inside = self._popup_container.rect().contains(pos_local.toPoint()) if pos_local is not None else True
+                    if left_btn and not inside:
+                        # Find widget under cursor and see if it's a different combo
+                        gp = getattr(event, "globalPosition", None)
+                        gp_pt = gp().toPoint() if callable(gp) else getattr(event, "globalPos", lambda: None)()
+                        if gp_pt is None:
+                            gp_pt = QApplication.instance().cursor().pos() if QApplication.instance() else None
+                        target = QApplication.widgetAt(gp_pt) if gp_pt is not None else None
+                        target_combo = self._ascend_to_combo(target)
+                        if target_combo is self:
+                            # Clicked back on the owner combo: arm one-shot guard to suppress reopen
+                            self._prevent_reopen_once = True
+                        elif isinstance(target_combo, SearchableCombo) and target_combo.isEnabled():
+                            def _open_other():
+                                if target_combo and target_combo.isEnabled():
+                                    try:
+                                        target_combo.setFocus(Qt.MouseFocusReason)
+                                    except Exception:
+                                        pass
+                                    target_combo.showPopup()
+                            if sys.platform != "win32":
+                                QTimer.singleShot(0, _open_other)
+                            else:
+                                container = self._popup_container
+                                opened_on_destroy = False
+                                try:
+                                    if container is not None:
+                                        container.destroyed.connect(lambda *_: QTimer.singleShot(0, _open_other))
+                                        opened_on_destroy = True
+                                except Exception:
+                                    pass
+                                if not opened_on_destroy:
+                                    QTimer.singleShot(50, _open_other)
+                                try:
+                                    self.hidePopup()
+                                except Exception:
+                                    pass
+                except Exception:
+                    pass
+                return False
+
             if event.type() in (QEvent.Resize, QEvent.Show):
                 self._place_popup_header()
                 # Also ensure fitting after container geometry changes
@@ -753,6 +823,12 @@ class SearchableCombo(SeparatorComboBox):
             if event.type() == QEvent.KeyPress:
                 key = event.key()
                 if key == Qt.Key_Escape:
+                    # Explicitly close popup from header
+                    self.hidePopup()
+                    return True
+                if key == Qt.Key_Right:
+                    # Insert highlighted item's value into the search input
+                    self._apply_highlighted_to_search_input()
                     return True
                 if key in (Qt.Key_Up, Qt.Key_Down, Qt.Key_PageUp, Qt.Key_PageDown, Qt.Key_Home, Qt.Key_End):
                     self._handle_navigation_key(key)
@@ -765,15 +841,33 @@ class SearchableCombo(SeparatorComboBox):
         view = self.view()
         if view is not None and (obj is view or obj is getattr(view, "viewport", lambda: None)()):
             if event.type() == QEvent.KeyPress:
-                if event.key() in (Qt.Key_Return, Qt.Key_Enter):
+                key = event.key()
+                if key in (Qt.Key_Return, Qt.Key_Enter):
                     self._commit_view_current()
                     return True
-                if event.key() == Qt.Key_Escape:
+                if key == Qt.Key_Escape:
+                    # Close from view/viewport ESC and keep control flow consistent
+                    self.hidePopup()
+                    return True
+                if key == Qt.Key_Right:
+                    # Insert highlighted item's value into the search input
+                    self._apply_highlighted_to_search_input()
                     return True
             return False
 
         return super().eventFilter(obj, event)
 
+    # Helpers to walk up to owning combo under a point
+    def _ascend_to_combo(self, widget):
+        """Ascend from a widget to the nearest SearchableCombo owner if present."""
+        w = widget
+        while w is not None and not isinstance(w, SearchableCombo):
+            try:
+                w = w.parentWidget()
+            except Exception:
+                return None
+        return w
+
     # ----- Magnifier helpers -----
 
     def _ensure_magnifier_on(self, line_edit: QLineEdit | None):
@@ -938,6 +1032,44 @@ class SearchableCombo(SeparatorComboBox):
         self._popup_header.setCursorPosition(len(self._popup_header.text()))
         self._ensure_clear_button_visible(self._popup_header)
 
+    # ----- Minimal ensure after show (mainly for Windows combo-to-combo switch) -----
+
+    def _ensure_header_after_show(self):
+        """
+        Re-apply critical bits after the popup is up:
+        - header exists and is parented to the popup container,
+        - viewport top margin equals header height,
+        - header is placed and focused.
+        """
+        if not self._popup_open or not self.search:
+            return
+        view = self.view()
+        if view is None:
+            return
+        container = self._popup_container or view.window()
+        if container is None:
+            return
+
+        if self._popup_header is None:
+            self._prepare_popup_header()
+            return
+
+        try:
+            if self._popup_header.parent() is not container:
+                self._popup_header.setParent(container)
+        except Exception:
+            pass
+
+        try:
+            view.setViewportMargins(0, self._popup_header_h, 0, 0)
+        except Exception:
+            pass
+
+        self._place_popup_header()
+        self._ensure_magnifier_on(self._popup_header)
+        self._ensure_clear_button_visible(self._popup_header)
+        self._focus_header_async()
+
     # ----- Search behaviour -----
 
     def _on_search_text_changed(self, text: str):
@@ -1288,6 +1420,28 @@ class SearchableCombo(SeparatorComboBox):
             except Exception:
                 pass
 
+    # ----- Convenience: inject highlighted row text into the search header -----
+
+    def _apply_highlighted_to_search_input(self):
+        """
+        Put the currently highlighted row's display text into the popup search input.
+        Does nothing if the popup or header is not available. The normal textChanged
+        handler will update scrolling and internal state.
+        """
+        if not self._popup_open or self._popup_header is None:
+            return
+        view = self.view()
+        if view is None:
+            return
+        idx = view.currentIndex()
+        row = self._sanitize_index(idx.row() if idx.isValid() else -1)
+        if row == -1:
+            return
+        text = self.itemText(row) or ""
+        self._popup_header.setText(text)
+        self._ensure_clear_button_visible(self._popup_header)
+        self._popup_header.setCursorPosition(len(text))
+
 
 class NoScrollCombo(SearchableCombo):
     """A combo box that disables mouse wheel scrolling, extended with optional search support."""