pygpt-net 2.4.39__py3-none-any.whl → 2.4.40__py3-none-any.whl

pygpt_net/tools/html_canvas/ui/dialogs.py

@@ -6,29 +6,32 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.11 23:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
 import re
 
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QAction, QIcon
-from PySide6.QtWidgets import QHBoxLayout, QVBoxLayout, QCheckBox, QMenuBar
+from PySide6.QtWidgets import QMenuBar, QVBoxLayout
 
-from pygpt_net.tools.html_canvas.ui.widgets import CanvasOutput, CanvasEdit
 from pygpt_net.ui.widget.dialog.base import BaseDialog
-from pygpt_net.ui.widget.element.labels import HelpLabel
-from pygpt_net.ui.widget.textarea.html import CustomWebEnginePage
 from pygpt_net.utils import trans
 
-class Canvas:
-    def __init__(self, window=None):
+from .widgets import ToolWidget
+
+class Tool:
+    def __init__(self, window=None, tool=None):
         """
         HTML/JS canvas dialog
 
         :param window: Window instance
+        :param tool: Tool instance
         """
         self.window = window
+        self.tool = tool  # tool instance
+        self.widget = ToolWidget(window, tool)
+        self.layout = None
         self.menu_bar = None
         self.menu = {}
         self.actions = {}  # menu actions
@@ -45,20 +48,20 @@ class Canvas:
 
         self.actions["file.open"] = QAction(QIcon(":/icons/folder.svg"), trans("tool.html_canvas.menu.file.open"))
         self.actions["file.open"].triggered.connect(
-            lambda: self.window.tools.get("html_canvas").open_file()
+            lambda: self.tool.open_file()
         )
         self.actions["file.save_as"] = QAction(QIcon(":/icons/save.svg"), trans("tool.html_canvas.menu.file.save_as"))
         self.actions["file.save_as"].triggered.connect(
-            lambda: self.window.ui.nodes['html_canvas.output'].signals.save_as.emit(
-                re.sub(r'\n{2,}', '\n\n', self.window.ui.nodes['html_canvas.output'].html_content), 'html')
+            lambda: self.widget.output.signals.save_as.emit(
+                re.sub(r'\n{2,}', '\n\n', self.widget.output.html_content), 'html')
         )
         self.actions["file.reload"] = QAction(QIcon(":/icons/reload.svg"), trans("tool.html_canvas.menu.file.reload"))
         self.actions["file.reload"].triggered.connect(
-            lambda: self.window.tools.get("html_canvas").reload_output()
+            lambda: self.tool.reload_output()
         )
         self.actions["file.clear"] = QAction(QIcon(":/icons/close.svg"), trans("tool.html_canvas.menu.file.clear"))
         self.actions["file.clear"].triggered.connect(
-            lambda: self.window.tools.get("html_canvas").clear()
+            lambda: self.tool.clear()
         )
 
         # add actions
@@ -70,61 +73,44 @@ class Canvas:
 
     def setup(self):
         """Setup canvas dialog"""
-        self.window.ui.nodes['html_canvas.output'] = CanvasOutput(self.window)
-        self.window.ui.nodes['html_canvas.output'].setPage(
-            CustomWebEnginePage(self.window, self.window.ui.nodes['html_canvas.output'])
-        )
-        self.window.ui.nodes['html_canvas.edit'] = CanvasEdit(self.window)
-        self.window.ui.nodes['html_canvas.edit'].setVisible(False)
-        self.window.ui.nodes['html_canvas.edit'].textChanged.connect(
-            lambda: self.window.tools.get("html_canvas").save_output()
-        )
-
-        # edit checkbox
-        self.window.ui.nodes['html_canvas.btn.edit'] = QCheckBox(trans("html_canvas.btn.edit"))
-        self.window.ui.nodes['html_canvas.btn.edit'].stateChanged.connect(
-            lambda: self.window.tools.get("html_canvas").toggle_edit()
-        )
-
-        path = self.window.tools.get("html_canvas").get_current_path()
-        path_label = HelpLabel(path)
-        path_label.setMaximumHeight(30)
-        path_label.setAlignment(Qt.AlignRight)
+        self.layout = self.widget.setup()
+        self.layout.setMenuBar(self.setup_menu())  # add menu bar
 
-        bottom_layout = QHBoxLayout()
-        bottom_layout.addWidget(self.window.ui.nodes['html_canvas.btn.edit'])
-        bottom_layout.addWidget(path_label)
+        id = self.tool.get_dialog_id()
+        dialog = ToolDialog(window=self.window, tool=self.tool)
+        dialog.setLayout(self.layout)
+        dialog.setWindowTitle(trans("dialog.html_canvas.title"))
+        dialog.resize(800, 500)
+        self.window.ui.dialog[id] = dialog
 
-        output_layout = QVBoxLayout()
-        output_layout.addWidget(self.window.ui.nodes['html_canvas.output'])
-        output_layout.addWidget(self.window.ui.nodes['html_canvas.edit'])
-        output_layout.setContentsMargins(0, 0, 0, 0)
+    def get_widget(self) -> ToolWidget:
+        """
+        Get widget
 
-        # connect signals
-        self.window.ui.nodes['html_canvas.output'].signals.save_as.connect(self.window.tools.get("html_canvas").handle_save_as)
-        self.window.ui.nodes['html_canvas.output'].signals.audio_read.connect(self.window.controller.chat.render.handle_audio_read)
+        :return: ToolWidget
+        """
+        return self.widget
 
-        layout = QVBoxLayout()
-        layout.setMenuBar(self.setup_menu())  # add menu bar
-        layout.addLayout(output_layout)
-        layout.addLayout(bottom_layout)
+    def get_tab(self) -> QVBoxLayout:
+        """
+        Get layout
 
-        self.window.ui.dialog['html_canvas'] = CanvasDialog(self.window)
-        self.window.ui.dialog['html_canvas'].setLayout(layout)
-        self.window.ui.dialog['html_canvas'].setWindowTitle(trans("dialog.html_canvas.title"))
-        self.window.ui.dialog['html_canvas'].resize(800, 500)
+        :return: QVBoxLayout
+        """
+        return self.layout
 
 
-class CanvasDialog(BaseDialog):
-    def __init__(self, window=None, id="html_canvas"):
+class ToolDialog(BaseDialog):
+    def __init__(self, window=None, id="html_canvas", tool=None):
         """
         HTML canvas dialog
 
         :param window: main window
         :param id: logger id
         """
-        super(CanvasDialog, self).__init__(window, id)
+        super(ToolDialog, self).__init__(window, id)
         self.window = window
+        self.tool = tool
 
     def closeEvent(self, event):
         """
@@ -133,7 +119,7 @@ class CanvasDialog(BaseDialog):
         :param event: close event
         """
         self.cleanup()
-        super(CanvasDialog, self).closeEvent(event)
+        super(ToolDialog, self).closeEvent(event)
 
     def keyPressEvent(self, event):
         """
@@ -145,14 +131,12 @@ class CanvasDialog(BaseDialog):
             self.cleanup()
             self.close()  # close dialog when the Esc key is pressed.
         else:
-            super(CanvasDialog, self).keyPressEvent(event)
+            super(ToolDialog, self).keyPressEvent(event)
 
     def cleanup(self):
-        """
-        Cleanup on close
-        """
-        if self.window is None:
+        """Cleanup on close"""
+        if self.window is None or self.tool is None:
             return
-        self.window.tools.get("html_canvas").opened = False
-        self.window.tools.get("html_canvas").close()
-        self.window.tools.get("html_canvas").update()
+        self.tool.opened = False
+        self.tool.close()
+        self.tool.update()

pygpt_net/tools/html_canvas/ui/widgets.py

@@ -6,13 +6,101 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.11 23:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
+from PySide6.QtCore import Qt, Slot, QUrl, QObject, Signal
+from PySide6.QtWidgets import QVBoxLayout, QCheckBox, QHBoxLayout
+
+from pygpt_net.ui.widget.element.labels import HelpLabel
 from pygpt_net.ui.widget.textarea.editor import BaseCodeEditor
-from pygpt_net.ui.widget.textarea.html import HtmlOutput
+from pygpt_net.ui.widget.textarea.html import HtmlOutput, CustomWebEnginePage
 
 import pygpt_net.icons_rc
+from pygpt_net.utils import trans
+
+
+class ToolWidget:
+    def __init__(self, window=None, tool=None):
+        """
+        HTML/JS canvas widget
+
+        :param window: Window instance
+        :param tool: Tool instance
+        """
+        self.window = window
+        self.tool = tool  # tool instance
+        self.output = None  # canvas output
+        self.edit = None  # canvas edit
+        self.btn_edit = None  # edit checkbox
+
+    def setup(self) -> QVBoxLayout:
+        """
+        Setup widget body
+
+        :return: QVBoxLayout
+        """
+        self.output = CanvasOutput(self.window)
+        self.output.setPage(
+            CustomWebEnginePage(self.window, self.output)
+        )
+        self.edit = CanvasEdit(self.window)
+        self.edit.setVisible(False)
+        self.edit.textChanged.connect(
+            lambda: self.tool.save_output()
+        )
+
+        # edit checkbox
+        self.btn_edit = QCheckBox(trans("html_canvas.btn.edit"))
+        self.btn_edit.stateChanged.connect(
+            lambda: self.tool.toggle_edit(self)
+        )
+
+        path = self.tool.get_current_path()
+        path_label = HelpLabel(path)
+        path_label.setMaximumHeight(30)
+        path_label.setAlignment(Qt.AlignRight)
+
+        bottom_layout = QHBoxLayout()
+        bottom_layout.addWidget(self.btn_edit)
+        bottom_layout.addWidget(path_label)
+
+        output_layout = QVBoxLayout()
+        output_layout.addWidget(self.output)
+        output_layout.addWidget(self.edit)
+        output_layout.setContentsMargins(0, 0, 0, 0)
+
+        # connect signals
+        self.output.signals.save_as.connect(
+            self.tool.handle_save_as)
+        self.output.signals.audio_read.connect(
+            self.window.controller.chat.render.handle_audio_read)
+
+        self.tool.signals.update.connect(self.set_output)
+        self.tool.signals.reload.connect(self.load_output)
+
+        layout = QVBoxLayout()
+        layout.addLayout(output_layout)
+        layout.addLayout(bottom_layout)
+        return layout
+
+    @Slot(str)
+    def set_output(self, content: str):
+        """
+        Set output content
+
+        :param content: Content
+        """
+        self.edit.setPlainText(content)
+
+    @Slot(str)
+    def load_output(self, path: str):
+        """
+        Load output content
+
+        :param path: Content
+        """
+        self.output.setUrl(QUrl().fromLocalFile(path))
 
 class CanvasOutput(HtmlOutput):
     def __init__(self, window=None):
@@ -39,4 +127,9 @@ class CanvasEdit(BaseCodeEditor):
         self.min_font_size = 8
         self.setProperty('class', 'interpreter-output')
         self.default_stylesheet = ""
-        self.setStyleSheet(self.default_stylesheet)
+        self.setStyleSheet(self.default_stylesheet)
+
+
+class ToolSignals(QObject):
+    update = Signal(str)  # data
+    reload = Signal(str)  # path

pygpt_net/ui/base/context_menu.py

@@ -6,13 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.25 10:00:00                  #
+# Updated Date: 2024.12.12 04:00:00                  #
 # ================================================== #
 
 from PySide6.QtWidgets import QMenu
 from PySide6.QtGui import QAction, QIcon
 
-from pygpt_net.core.tabs import Tab
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.utils import trans
 import pygpt_net.icons_rc
 

pygpt_net/ui/layout/ctx/ctx_list.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                  #
 # ================================================== #
 
 from PySide6 import QtCore
@@ -211,10 +211,19 @@ class CtxList:
         item.dt = dt
         item.isPinned = data.important
         item.setData(tooltip_text, QtCore.Qt.ToolTipRole)
+        is_important = False
+        is_attachment = False
+        label = data.label
         if data.important:
-            item.setData(data.label + 10, QtCore.Qt.ItemDataRole.UserRole)
-        else:
-            item.setData(data.label, QtCore.Qt.ItemDataRole.UserRole)
+            is_important = True
+        if data.additional_ctx and len(data.additional_ctx) > 0:
+            is_attachment = True
+        custom_data = {
+            "label": label,
+            "is_important": is_important,
+            "is_attachment": is_attachment,
+        }
+        item.setData(custom_data, QtCore.Qt.ItemDataRole.UserRole)
         item.setData(name)
         return item
 

pygpt_net/ui/layout/toolbox/footer.py

@@ -77,7 +77,7 @@ class Footer:
         rows.setContentsMargins(2, 0, 0, 0)
 
         self.window.ui.nodes['layout.split'] = ToggleLabel(trans('layout.split'), label_position="left",
-                                                          icon=":/icons/window.svg")
+                                                          icon=":/icons/split_screen.svg")
         self.window.ui.nodes['layout.split'].box.stateChanged.connect(
             lambda: self.window.controller.ui.tabs.toggle_split_screen(self.window.ui.nodes['layout.split'].box.isChecked())
         )

pygpt_net/ui/main.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 17:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
 import os
@@ -192,8 +192,8 @@ class MainWindow(QMainWindow, QtStyleTools):
 
     def setup(self):
         """Setup app"""
-        self.controller.setup()
         self.tools.setup()
+        self.controller.setup()
         self.controller.plugins.setup()
         self.controller.post_setup()
 

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/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:

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