pygpt-net 2.4.37__py3-none-any.whl → 2.4.41__py3-none-any.whl

pygpt_net/ui/menu/debug.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.08 18:00:00                  #
+# Updated Date: 2024.12.13 19:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction
@@ -41,6 +41,7 @@ class Debug:
         self.window.ui.menu['debug.logger'] = QAction(trans("menu.debug.logger"), self.window, checkable=True)
         self.window.ui.menu['debug.app.log'] = QAction(trans("menu.debug.app.log"), self.window, checkable=True)
         self.window.ui.menu['debug.kernel'] = QAction(trans("menu.debug.kernel"), self.window, checkable=True)
+        self.window.ui.menu['debug.render'] = QAction(trans("menu.debug.render"), self.window, checkable=True)
 
         self.window.ui.menu['debug.config'].triggered.connect(
             lambda: self.window.controller.debug.toggle('config'))
@@ -74,9 +75,12 @@ class Debug:
             lambda: self.window.controller.debug.toggle('db'))
         self.window.ui.menu['debug.kernel'].triggered.connect(
             lambda: self.window.controller.debug.toggle('kernel'))
+        self.window.ui.menu['debug.render'].triggered.connect(
+            lambda: self.window.controller.debug.toggle_render())
 
         self.window.ui.menu['menu.debug'] = self.window.menuBar().addMenu(trans("menu.debug"))
         self.window.ui.menu['menu.debug'].addAction(self.window.ui.menu['debug.logger'])
+        self.window.ui.menu['menu.debug'].addAction(self.window.ui.menu['debug.render'])
         self.window.ui.menu['menu.debug'].addAction(self.window.ui.menu['debug.db'])
         self.window.ui.menu['menu.debug'].addAction(self.window.ui.menu['debug.app.log'])
         self.window.ui.menu['menu.debug'].addSeparator()
@@ -94,4 +98,10 @@ class Debug:
         self.window.ui.menu['menu.debug'].addAction(self.window.ui.menu['debug.tabs'])
         self.window.ui.menu['menu.debug'].addAction(self.window.ui.menu['debug.ui'])
 
+        # restore state
+        if self.window.core.config.get('debug.render'):
+            self.window.ui.menu['debug.render'].setChecked(True)
+        else:
+            self.window.ui.menu['debug.render'].setChecked(False)
+
 

pygpt_net/ui/menu/theme.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.24 02:00:00                  #
+# Updated Date: 2024.12.07 21:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction, QIcon
@@ -28,10 +28,14 @@ class Theme:
     def setup(self):
         """Setup theme menu"""
         self.window.ui.menu['theme'] = {}
+        self.window.ui.menu['theme_style'] = {}
         self.window.ui.menu['theme_syntax'] = {}
         self.window.ui.menu['theme.layout.density'] = {}
         self.window.ui.menu['menu.theme'] = QMenu(trans("menu.theme"), self.window)
 
+        # styles
+        self.window.ui.menu['theme.style'] = QMenu(trans("menu.theme.style"), self.window)
+
         # color themes
         self.window.ui.menu['theme.dark'] = QMenu(trans("menu.theme.dark"), self.window)
         self.window.ui.menu['theme.light'] = QMenu(trans("menu.theme.light"), self.window)
@@ -40,12 +44,14 @@ class Theme:
         # layout density
         self.window.ui.menu['theme.density'] = QMenu(trans("menu.theme.density"), self.window)
 
+        """
         # blocks
         self.window.ui.menu['theme.blocks'] = QAction(trans("menu.theme.blocks"), self.window, checkable=True)
         self.window.ui.menu['theme.blocks'].triggered.connect(
             lambda: self.window.controller.theme.toggle_option('render.blocks'))
         self.window.ui.menu['theme.blocks'].setCheckable(True)
         self.window.ui.menu['theme.blocks'].setChecked(self.window.core.config.get('render.blocks'))
+        """
 
         # tooltips
         self.window.ui.menu['theme.tooltips'] = QAction(trans("menu.theme.tooltips"), self.window, checkable=True)
@@ -62,10 +68,11 @@ class Theme:
         self.window.ui.menu['theme.settings'].triggered.connect(
             lambda: self.window.controller.settings.open_section('layout'))
 
+        self.window.ui.menu['menu.theme'].addMenu(self.window.ui.menu['theme.style'])
         self.window.ui.menu['menu.theme'].addMenu(self.window.ui.menu['theme.dark'])
         self.window.ui.menu['menu.theme'].addMenu(self.window.ui.menu['theme.light'])
         self.window.ui.menu['menu.theme'].addMenu(self.window.ui.menu['theme.syntax'])
         self.window.ui.menu['menu.theme'].addMenu(self.window.ui.menu['theme.density'])
-        self.window.ui.menu['menu.theme'].addAction(self.window.ui.menu['theme.blocks'])
+        # self.window.ui.menu['menu.theme'].addAction(self.window.ui.menu['theme.blocks'])
         self.window.ui.menu['menu.theme'].addAction(self.window.ui.menu['theme.tooltips'])
         self.window.ui.menu['menu.theme'].addAction(self.window.ui.menu['theme.settings'])

pygpt_net/ui/widget/filesystem/explorer.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.05 23:00:00                  #
+# Updated Date: 2024.12.12 04:00:00                  #
 # ================================================== #
 
 import datetime
@@ -17,7 +17,7 @@ from PySide6.QtGui import QAction, QIcon, QCursor, QResizeEvent
 from PySide6.QtWidgets import QTreeView, QMenu, QWidget, QVBoxLayout, QFileSystemModel, QLabel, QHBoxLayout, \
     QPushButton, QSizePolicy
 
-from pygpt_net.core.tabs import Tab
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.ui.widget.element.button import ContextMenuButton
 from pygpt_net.ui.widget.element.labels import HelpLabel
 from pygpt_net.utils import trans

pygpt_net/ui/widget/lists/context.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.08.22 17:00:00                  #
+# Updated Date: 2024.12.12 04:00:00                  #
 # ================================================== #
 
 import datetime
@@ -402,11 +402,32 @@ class ImportantItemDelegate(QtWidgets.QStyledItemDelegate):
         super(ImportantItemDelegate, self).paint(painter, option, index)
 
         # pin (>= 10)
-        if index.data(QtCore.Qt.ItemDataRole.UserRole) and index.data(QtCore.Qt.ItemDataRole.UserRole) > 0:
-            label = index.data(QtCore.Qt.ItemDataRole.UserRole)
+        if index.data(QtCore.Qt.ItemDataRole.UserRole):
+            data = index.data(QtCore.Qt.ItemDataRole.UserRole)
+            label = 0
+            is_important = False
+            is_attachment = False
+            if "label" in data:
+                label = data["label"]
+            if "is_important" in data and data["is_important"]:
+                is_important = True
+            if "is_attachment" in data and data["is_attachment"]:
+                is_attachment = True
+
             painter.save()
 
-            if label >= 10:
+            if is_attachment:
+                icon = QtGui.QIcon(":/icons/attachment.svg")
+                icon_size = option.decorationSize or QtCore.QSize(16, 16)
+                icon_rect = QtCore.QRect(
+                    option.rect.right() - icon_size.width(),
+                    option.rect.top() + (option.rect.height() - icon_size.height()) / 2,
+                    icon_size.width(),
+                    icon_size.height()
+                )
+                icon.paint(painter, icon_rect, QtCore.Qt.AlignCenter)
+
+            if is_important:
                 color = self.get_color_for_status(3)
                 square_size = 3
                 square_margin = 0
@@ -426,7 +447,7 @@ class ImportantItemDelegate(QtWidgets.QStyledItemDelegate):
                 )
                 painter.drawRect(square_rect)
 
-                label = label - 10  # remove pin status
+                #label = label - 10  # remove pin status
 
             # label (0-9)
             if label > 0:
@@ -494,3 +515,4 @@ class SectionItem(QStandardItem):
         self.setTextAlignment(QtCore.Qt.AlignRight)
         font = self.font()
         font.setBold(True)
+        self.setFont(font)

pygpt_net/ui/widget/tabs/Input.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.01.29 14:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QTabWidget, QMenu
@@ -40,7 +40,7 @@ class InputTabs(QTabWidget):
 
         :param global_pos: QPoint
         """
-        context_menu = QMenu()
+        context_menu = QMenu(self)
         actions = {}
         actions['clear'] = QAction(QIcon(":/icons/delete.svg"), trans('attachments.btn.clear'), self)
         actions['clear'].triggered.connect(

pygpt_net/ui/widget/tabs/body.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.05 23:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QTabWidget
+
 from pygpt_net.core.tabs.tab import Tab
 
 

pygpt_net/ui/widget/tabs/layout.py

@@ -0,0 +1,195 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ================================================== #
+# This file is a part of PYGPT package               #
+# Website: https://pygpt.net                         #
+# GitHub:  https://github.com/szczyglis-dev/py-gpt   #
+# MIT License                                        #
+# Created By  : Marcin Szczygliński                  #
+# Updated Date: 2024.12.09 03:00:00                  #
+# ================================================== #
+
+from PySide6.QtCore import Qt, QObject, QEvent
+from PySide6.QtWidgets import QTabWidget, QWidget, QVBoxLayout, QSplitter, QSizePolicy
+
+from pygpt_net.ui.widget.tabs.output import OutputTabs
+
+
+class OutputColumn(QWidget):
+    def __init__(self, window=None):
+        """
+        Output column
+
+        :param window: window instance
+        """
+        super(OutputColumn, self).__init__(window)
+        self.window = window
+        self.idx = -1
+        self.tabs = OutputTabs(self.window, column=self)
+        self.layout = QVBoxLayout()
+        self.layout.addWidget(self.tabs)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.setLayout(self.layout)
+        self.filter = FocusEventFilter(self, self.on_focus)
+        self.installEventFilter(self.filter)
+        self.setFocusPolicy(Qt.StrongFocus)
+
+    def on_focus(self, widget):
+        """
+        On widget clicked
+
+        :param widget: widget
+        """
+        self.window.controller.ui.tabs.on_column_focus(self.idx)
+        widget.setFocus()
+
+    def set_idx(self, idx: int):
+        """
+        Set index
+
+        :param idx: int
+        """
+        self.idx = idx
+
+    def get_idx(self) -> int:
+        """
+        Get index
+
+        :return: int
+        """
+        return self.idx
+
+    def set_tabs(self, tabs: QTabWidget):
+        """
+        Set tabs widget
+
+        :param tabs: QTabWidget
+        """
+        self.tabs = tabs
+
+    def get_tabs(self) -> OutputTabs:
+        """
+        Get tabs
+
+        :return: OutputTabs
+        """
+        return self.tabs
+
+
+class OutputLayout(QWidget):
+    def __init__(self, window=None):
+        """
+        Output layout
+
+        :param window: window instance
+        """
+        super(OutputLayout, self).__init__(window)
+        self.window = window
+        self.columns = []
+
+        column1 = OutputColumn(self.window)
+        column2 = OutputColumn(self.window)
+        self.add_column(column1)
+        self.add_column(column2)
+
+        self.splitter = QSplitter(Qt.Horizontal)
+        self.splitter.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+        for column in self.columns:
+            self.splitter.addWidget(column)
+
+        self.window.ui.splitters['columns'] = self.splitter
+
+        self.layout = QVBoxLayout()
+        self.layout.addWidget(self.splitter, stretch=1)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.setLayout(self.layout)
+
+    def get_next_idx(self) -> int:
+        """
+        Get next index
+
+        :return: int
+        """
+        return len(self.columns)
+
+    def add_column(self, column: OutputColumn):
+        """
+        Add column
+
+        :param column: OutputColumn
+        """
+        idx = self.get_next_idx()
+        column.set_idx(idx)
+        self.columns.append(column)
+
+    def get_tabs_by_idx(self, idx: int) -> OutputTabs:
+        """
+        Get tabs by column index
+
+        :param idx: int
+        :return: OutputTabs
+        """
+        for column in self.columns:
+            if column.idx == idx:
+                return column.tabs
+        return None
+
+    def get_active_tabs(self) -> OutputTabs:
+        """
+        Get active tabs
+
+        :return: OutputTabs
+        """
+        current = self.window.controller.ui.tabs.get_current_column_idx()
+        for column in self.columns:
+            if column.idx == current:
+                return column.tabs
+
+    def get_column_by_idx(self, idx: int) -> OutputColumn:
+        """
+        Get column by index
+
+        :param idx: int
+        :return: OutputColumn
+        """
+        for column in self.columns:
+            if column.idx == idx:
+                return column
+        return None
+
+    def get_active_column(self) -> OutputColumn:
+        """
+        Get active column
+
+        :return: OutputColumn
+        """
+        current = self.window.controller.ui.tabs.get_current_column_idx()
+        for column in self.columns:
+            if column.idx == current:
+                return column
+
+class FocusEventFilter(QObject):
+    def __init__(self, column, callback):
+        """
+        Column event filter
+
+        :param column: parent column
+        :param callback: callback
+        """
+        super().__init__()
+        self.column = column
+        self.callback = callback
+
+    def eventFilter(self, obj, event):
+        """
+        Click event filter
+
+        :param obj: object
+        :param event: event
+        """
+        if event.type() == QEvent.MouseButtonPress or event.type() == QEvent.FocusIn:
+            widget = obj
+            if widget is not None:
+                self.callback(widget)
+            return False
+        return False