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

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.12.12 04:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
 
 from PySide6 import QtCore
@@ -81,9 +81,11 @@ class CtxList:
         self.window.ui.models[id].removeRows(0, self.window.ui.models[id].rowCount())
 
         if self.window.core.config.get("ctx.records.folders.top"):
+            self.update_items_pinned(id, data)
             self.update_groups(id, data)
             self.update_items(id, data)
         else:
+            self.update_items_pinned(id, data)
             self.update_items(id, data)
             self.update_groups(id, data)
 
@@ -96,13 +98,43 @@ class CtxList:
         """
         i = 0
         last_dt_str = None
+        separators = self.window.core.config.get("ctx.records.separators")
+        pinned_separators = self.window.core.config.get("ctx.records.pinned.separators")
         for meta_id in data:
             if data[meta_id].group_id is None or data[meta_id].group_id == 0:
+                if data[meta_id].important:
+                    continue
                 item = self.build_item(meta_id, data[meta_id], is_group=False)
-                if self.window.core.config.get("ctx.records.separators"):
-                    if not item.isPinned or self.window.core.config.get("ctx.records.pinned.separators"):
+                if separators:
+                    if not item.isPinned or pinned_separators:
                         if i == 0 or last_dt_str != item.dt:
-                            section = self.build_date_section(item.dt)
+                            section = self.build_date_section(item.dt, group=False)
+                            if section:
+                                self.window.ui.models[id].appendRow(section)
+                        last_dt_str = item.dt
+                self.window.ui.models[id].appendRow(item)
+                i += 1
+
+    def update_items_pinned(self, id, data):
+        """
+        Update items pinned
+
+        :param id: ID of the list
+        :param data: Data to update
+        """
+        i = 0
+        last_dt_str = None
+        separators = self.window.core.config.get("ctx.records.separators")
+        pinned_separators = self.window.core.config.get("ctx.records.pinned.separators")
+        for meta_id in data:
+            if data[meta_id].group_id is None or data[meta_id].group_id == 0:
+                if not data[meta_id].important:
+                    continue
+                item = self.build_item(meta_id, data[meta_id], is_group=False)
+                if separators:
+                    if pinned_separators:
+                        if i == 0 or last_dt_str != item.dt:
+                            section = self.build_date_section(item.dt, group=False)
                             if section:
                                 self.window.ui.models[id].appendRow(section)
                         last_dt_str = item.dt
@@ -116,21 +148,37 @@ class CtxList:
         :param id: ID of the list
         :param data: Data to update
         """
-        # get groups
-        groups = self.window.core.ctx.get_groups()
-
+        groups = self.window.core.ctx.get_groups()  # get groups
         for group_id in groups:
             last_dt_str = None
             group = groups[group_id]
             c = self.count_in_group(group.id, data)
-            if c == 0 and self.window.core.ctx.get_search_string() is not None and self.window.core.ctx.get_search_string() != "":
+            if (c == 0 and self.window.core.ctx.get_search_string() is not None
+                    and self.window.core.ctx.get_search_string() != ""):
                 continue  # skip empty groups when searching
 
             suffix = ""
             if c > 0:
                 suffix = " (" + str(c) + ")"
+            is_attachment = group.has_additional_ctx()
             group_name = group.name + suffix
             group_item = GroupItem(QIcon(":/icons/folder_filled.svg"), group_name, group.id)
+            group_item.hasAttachments = group.has_additional_ctx()
+            custom_data = {
+                "is_group": True,
+                "is_attachment": is_attachment,
+            }
+            if is_attachment:
+                files = group.get_attachment_names()
+                num = len(files)
+                files_str = ", ".join(files)
+                if len(files_str) > 40:
+                    files_str = files_str[:40] + '...'
+                tooltip_str = trans("attachments.ctx.tooltip.list").format(num=num) + ": " + files_str
+                group_item.setToolTip(tooltip_str)
+
+            group_item.setData(custom_data, QtCore.Qt.ItemDataRole.UserRole)
+
             i = 0
             for meta_id in data:
                 if data[meta_id].group_id != group.id:
@@ -139,7 +187,7 @@ class CtxList:
                 if self.window.core.config.get("ctx.records.groups.separators"):
                     if not item.isPinned or self.window.core.config.get("ctx.records.pinned.separators"):
                         if i == 0 or last_dt_str != item.dt:
-                            section = self.build_date_section(item.dt)
+                            section = self.build_date_section(item.dt, group=True)
                             if section:
                                 group_item.appendRow(section)
                         last_dt_str = item.dt
@@ -178,6 +226,17 @@ class CtxList:
         :return: Item
         """
         append_dt = True
+        is_important = False
+        is_attachment = False
+        in_group = False
+        label = data.label
+        if data.important:
+            is_important = True
+        if data.has_additional_ctx():
+            is_attachment = True
+        if data.group:
+            in_group = True
+
         if is_group:
             if self.window.core.config.get("ctx.records.groups.separators"):
                 append_dt = False
@@ -206,35 +265,44 @@ class CtxList:
             mode_str,
             id,
         )
+
+        # append attachments to tooltip
+        if is_attachment:
+            files = data.get_attachment_names()
+            num = len(files)
+            files_str = ", ".join(files)
+            if len(files_str) > 40:
+                files_str = files_str[:40] + '...'
+            tooltip_str = trans("attachments.ctx.tooltip.list").format(num=num) + ": " + files_str
+            tooltip_text += "\n" + tooltip_str
+
         item = Item(name, id)
         item.id = id
         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:
-            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,
+            "in_group": in_group,
         }
         item.setData(custom_data, QtCore.Qt.ItemDataRole.UserRole)
         item.setData(name)
         return item
 
-    def build_date_section(self, dt: str) -> SectionItem:
+    def build_date_section(self, dt: str, group: bool = False) -> SectionItem:
         """
         Build date section
 
         :param dt: date section string
+        :param group: is group
         :return: SectionItem
         """
-        return SectionItem(dt)
+        item = SectionItem(dt, group=group)
+        # item.setToolTip(dt)
+        return item
 
     def convert_date(self, timestamp: int) -> str:
         """

pygpt_net/ui/menu/audio.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.05.05 12:00:00                  #
+# Updated Date: 2024.12.14 18:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QAction, QIcon
@@ -52,6 +52,13 @@ class Audio:
             checkable=False,
         )
 
+        self.window.ui.menu['audio.stop'] = QAction(
+            QIcon(":/icons/mute.svg"),
+            trans("menu.audio.stop"),
+            self.window,
+            checkable=False,
+        )
+
         self.window.ui.menu['audio.output'].triggered.connect(
             lambda: self.window.controller.plugins.toggle('audio_output')
         )
@@ -67,6 +74,9 @@ class Audio:
         self.window.ui.menu['audio.cache.clear'].triggered.connect(
             lambda: self.window.controller.audio.clear_cache()
         )
+        self.window.ui.menu['audio.stop'].triggered.connect(
+            lambda: self.window.controller.audio.stop_audio()
+        )
 
         self.window.ui.menu['menu.audio'] = self.window.menuBar().addMenu(trans("menu.audio"))
         self.window.ui.menu['menu.audio'].addAction(self.window.ui.menu['audio.input'])
@@ -76,3 +86,4 @@ class Audio:
         self.window.ui.menu['menu.audio'].addAction(self.window.ui.menu['audio.control.global'])
         self.window.ui.menu['menu.audio'].addSeparator()
         self.window.ui.menu['menu.audio'].addAction(self.window.ui.menu['audio.cache.clear'])
+        self.window.ui.menu['menu.audio'].addAction(self.window.ui.menu['audio.stop'])

pygpt_net/ui/widget/dialog/url.py

@@ -6,12 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 02:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
 
-from PySide6.QtWidgets import QDialog, QLabel, QHBoxLayout, QVBoxLayout, QPushButton
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QDialog, QLabel, QHBoxLayout, QVBoxLayout, QPushButton, QScrollArea, QWidget, QSizePolicy
 
-from pygpt_net.ui.widget.element.labels import HelpLabel
+from pygpt_net.ui.widget.element.group import QHLine
+from pygpt_net.ui.widget.element.labels import HelpLabel, UrlLabel
+from pygpt_net.ui.widget.option.combo import OptionCombo
 from pygpt_net.utils import trans
 from pygpt_net.ui.widget.textarea.url import UrlInput
 
@@ -28,15 +31,19 @@ class UrlDialog(QDialog):
         self.window = window
         self.id = id
         self.current = None
-        self.input = UrlInput(window, id)
-        self.input.setMinimumWidth(400)
+        #self.input = UrlInput(window, id)
+        #self.input.setMinimumWidth(400)
+        self.initialized = False
+        self.params_scroll = None
+
+    def init(self):
+        """Initialize dialog"""
+        if self.initialized:
+            return
 
         self.window.ui.nodes['dialog.url.btn.update'] = QPushButton(trans('dialog.url.update'))
         self.window.ui.nodes['dialog.url.btn.update'].clicked.connect(
-            lambda: self.window.controller.dialogs.confirm.accept_url(
-                self.id,
-                self.window.ui.dialog['url'].current,
-                self.input.text()),
+            lambda: self.window.controller.attachment.attach_url()
         )
 
         self.window.ui.nodes['dialog.url.btn.dismiss'] = QPushButton(trans('dialog.url.dismiss'))
@@ -47,13 +54,143 @@ class UrlDialog(QDialog):
         bottom.addWidget(self.window.ui.nodes['dialog.url.btn.dismiss'])
         bottom.addWidget(self.window.ui.nodes['dialog.url.btn.update'])
 
-        self.window.ui.nodes['dialog.url.label'] = QLabel(trans("dialog.url.title"))
-        self.window.ui.nodes['dialog.url.tip'] = HelpLabel(trans("dialog.url.tip"))
+        #self.window.ui.nodes['dialog.url.label'] = QLabel(trans("dialog.url.title"))
+        #self.window.ui.nodes['dialog.url.tip'] = HelpLabel(trans("dialog.url.tip"))
+
+        # -----------------
+
+        loaders = self.window.controller.config.placeholder.apply_by_id("llama_index_loaders_web")
+        loaders_list = []
+        for loader in loaders:
+            k = list(loader.keys())[0]
+            key = k.replace("web_", "")
+            value = loader[k]
+            loaders_list.append({
+                key: value,
+            })
+
+        self.window.ui.nodes["dialog.url.loader"] = OptionCombo(
+            self.window,
+            "dialog.url",
+            "web.loader",
+            {
+                "label": trans("tool.indexer.tab.web.loader"),
+                "keys": loaders_list,
+                "value": "webpage",
+            }
+        )
+
+        self.window.ui.nodes["dialog.url.loader"].layout.setContentsMargins(0, 0, 0, 0)
+        self.window.ui.nodes["dialog.url.loader.label"] = HelpLabel(trans("tool.indexer.tab.web.loader"))
+        self.window.ui.add_hook("update.dialog.url.web.loader", self.hook_loader_change)
+
+        self.window.ui.nodes["dialog.url.options.label"] = HelpLabel(trans("tool.indexer.tab.web.source"))
+        self.window.ui.nodes["dialog.url.config.label"] = HelpLabel(trans("tool.indexer.tab.web.cfg"))
+        self.window.ui.nodes["dialog.url.config.help"] = UrlLabel(
+            trans("tool.indexer.tab.web.help"),
+            "https://pygpt.readthedocs.io/en/latest/configuration.html#data-loaders")
+
+        params_layout = QVBoxLayout()
+        params_layout.setContentsMargins(0, 0, 0, 0)
+
+        self.params_scroll = QScrollArea()
+        self.params_scroll.setWidgetResizable(True)
+        self.window.ui.nodes["dialog.url.loader.option"] = {}
+        self.window.ui.nodes["dialog.url.loader.option_group"] = {}
+        self.window.ui.nodes["dialog.url.loader.config"] = {}
+        self.window.ui.nodes["dialog.url.loader.config_group"] = {}
+
+        # params
+        params_layout.addWidget(self.window.ui.nodes["dialog.url.options.label"])
+        inputs, groups = self.window.core.idx.ui.loaders.setup_loader_options()
+
+        for loader in inputs:
+            for k in inputs[loader]:
+                self.window.ui.nodes["dialog.url.loader.option." + loader + "." + k] = inputs[loader][k]
+        for loader in groups:
+            self.window.ui.nodes["dialog.url.loader.option_group"][loader] = groups[loader]
+            params_layout.addWidget(self.window.ui.nodes["dialog.url.loader.option_group"][loader])
+            self.window.ui.nodes["dialog.url.loader.option_group"][loader].hide()  # hide on start
+
+        # separator
+        params_layout.addWidget(QHLine())
+
+        # config
+        params_layout.addWidget(self.window.ui.nodes["dialog.url.config.label"])
+        self.window.ui.nodes["dialog.url.config.label"].setAlignment(Qt.AlignCenter)
+        inputs, groups = self.window.core.idx.ui.loaders.setup_loader_config()
+
+        for loader in inputs:
+            for k in inputs[loader]:
+                self.window.ui.nodes["dialog.url.loader.config." + loader + "." + k] = inputs[loader][k]
+        for loader in groups:
+            self.window.ui.nodes["dialog.url.loader.config_group"][loader] = groups[loader]
+            params_layout.addWidget(self.window.ui.nodes["dialog.url.loader.config_group"][loader])
+            self.window.ui.nodes["dialog.url.loader.config_group"][loader].hide()  # hide on start
+        params_layout.addWidget(self.window.ui.nodes["dialog.url.config.help"], alignment=Qt.AlignCenter)
+
+        # stretch
+        params_layout.addStretch(1)
+
+        self.params_widget = QWidget()
+        self.params_widget.setLayout(params_layout)
+        self.params_scroll.setWidget(self.params_widget)
+
+        # resize
+        self.params_scroll.setWidgetResizable(True)
+        self.params_scroll.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Expanding)
+
+        # -----------------
 
         layout = QVBoxLayout()
-        layout.addWidget(self.window.ui.nodes['dialog.url.label'])
-        layout.addWidget(self.input)
-        layout.addWidget(self.window.ui.nodes['dialog.url.tip'])
+        #layout.addWidget(self.window.ui.nodes['dialog.url.label'])
+        #layout.addWidget(self.input)
+        #layout.addWidget(self.window.ui.nodes['dialog.url.tip'])
+        layout.addWidget(self.window.ui.nodes['dialog.url.loader.label'])
+        layout.addWidget(self.window.ui.nodes['dialog.url.loader'])
+        layout.addWidget(self.params_scroll)
         layout.addLayout(bottom)
 
+        # defaults
+        self.window.ui.nodes["dialog.url.loader"].set_value("webpage")
+
         self.setLayout(layout)
+
+        self.initialized = True
+
+    def hook_loader_change(self, key, value, caller, *args, **kwargs):
+        """
+        Hook: on loader change
+
+        :param key: Option key
+        :param value: Option value
+        :param caller: Caller
+        :param args: Args
+        :param kwargs: Kwargs
+        """
+        # hide/show options
+        for loader in self.window.ui.nodes["dialog.url.loader.option_group"]:
+            self.window.ui.nodes["dialog.url.loader.option_group"][loader].hide()
+        if value in self.window.ui.nodes["dialog.url.loader.option_group"]:
+            self.window.ui.nodes["dialog.url.loader.option_group"][value].show()
+
+        # show/hide label if options are available
+        self.window.ui.nodes["dialog.url.options.label"].hide()
+        if value in self.window.ui.nodes["dialog.url.loader.option_group"]:
+            self.window.ui.nodes["dialog.url.options.label"].show()
+
+        # hide/show config
+        for loader in self.window.ui.nodes["dialog.url.loader.config_group"]:
+            self.window.ui.nodes["dialog.url.loader.config_group"][loader].hide()
+        if value in self.window.ui.nodes["dialog.url.loader.config_group"]:
+            self.window.ui.nodes["dialog.url.loader.config_group"][value].show()
+
+        # show/hide label if config are available
+        self.window.ui.nodes["dialog.url.config.label"].hide()
+        self.window.ui.nodes["dialog.url.config.help"].hide()
+        if value in self.window.ui.nodes["dialog.url.loader.config_group"]:
+            self.window.ui.nodes["dialog.url.config.label"].show()
+            self.window.ui.nodes["dialog.url.config.help"].show()
+
+        self.params_widget.adjustSize()
+        self.params_scroll.update()

pygpt_net/ui/widget/element/group.py

@@ -6,11 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.24 22:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
+
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QIcon
-from PySide6.QtWidgets import QCheckBox, QWidget, QVBoxLayout
+from PySide6.QtWidgets import QCheckBox, QWidget, QVBoxLayout, QFrame
 
 import pygpt_net.icons_rc
 
@@ -105,3 +106,15 @@ class CollapsedGroup(QWidget):
         :param option: option widget
         """
         self.options.addWidget(option)
+
+class QHLine(QFrame):
+    def __init__(self):
+        super(QHLine, self).__init__()
+        self.setFrameShape(QFrame.HLine)
+        self.setFrameShadow(QFrame.Sunken)
+
+class QVLine(QFrame):
+    def __init__(self):
+        super(QVLine, self).__init__()
+        self.setFrameShape(QFrame.VLine)
+        self.setFrameShadow(QFrame.Sunken)

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.12.12 04:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
 
 import datetime
@@ -14,6 +14,7 @@ import datetime
 from PySide6 import QtWidgets, QtCore, QtGui
 from PySide6.QtGui import QAction, QIcon, QColor, QPixmap, QStandardItem
 from PySide6.QtWidgets import QMenu
+from overrides import overrides
 
 from pygpt_net.ui.widget.lists.base import BaseList
 from pygpt_net.utils import trans
@@ -31,13 +32,13 @@ class ContextList(BaseList):
         super(ContextList, self).__init__(window)
         self.window = window
         self.id = id
-        self.clicked.connect(self.click)
         self.expanded_items = set()
         self.setItemDelegate(ImportantItemDelegate())
 
+
     def click(self, index):
         """
-        Click event
+        Click event (override, connected in BaseList class)
 
         :param index: index
         """
@@ -49,8 +50,10 @@ class ContextList(BaseList):
                 self.window.controller.ctx.set_group(item.id)
                 if self.window.ui.nodes['ctx.list'].isExpanded(index):
                     self.expanded_items.discard(item.id)
+                    self.window.ui.nodes['ctx.list'].collapse(index)
                 else:
                     self.expanded_items.add(item.id)
+                    self.window.ui.nodes['ctx.list'].expand(index)
             else:
                 self.window.controller.ctx.select_by_id(item.id)
         else:
@@ -76,7 +79,7 @@ class ContextList(BaseList):
 
         :param index: index
         """
-        pass
+        print("dblclick")
 
     def mousePressEvent(self, event):
         """
@@ -407,20 +410,28 @@ class ImportantItemDelegate(QtWidgets.QStyledItemDelegate):
             label = 0
             is_important = False
             is_attachment = False
+            is_group = False
+            in_group = 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
+            if "is_group" in data and data["is_group"]:
+                is_group = True
+            if "in_group" in data and data["in_group"]:
+                in_group = True
 
             painter.save()
 
             if is_attachment:
                 icon = QtGui.QIcon(":/icons/attachment.svg")
                 icon_size = option.decorationSize or QtCore.QSize(16, 16)
+                icon_pos = option.rect.right() - icon_size.width()
                 icon_rect = QtCore.QRect(
-                    option.rect.right() - icon_size.width(),
+                    icon_pos,
                     option.rect.top() + (option.rect.height() - icon_size.height()) / 2,
                     icon_size.width(),
                     icon_size.height()
@@ -447,8 +458,6 @@ class ImportantItemDelegate(QtWidgets.QStyledItemDelegate):
                 )
                 painter.drawRect(square_rect)
 
-                #label = label - 10  # remove pin status
-
             # label (0-9)
             if label > 0:
                 color = self.get_color_for_status(label)
@@ -495,6 +504,7 @@ class GroupItem(QStandardItem):
         self.name = name
         self.isFolder = True
         self.isPinned = False
+        self.hasAttachments = False
         self.dt = None
 
 class Item(QStandardItem):
@@ -507,12 +517,16 @@ class Item(QStandardItem):
         self.dt = None
 
 class SectionItem(QStandardItem):
-    def __init__(self, title):
+    def __init__(self, title, group: bool = False):
         super().__init__(title)
         self.title = title
+        self.group = group
         self.setSelectable(False)
         self.setEnabled(False)
-        self.setTextAlignment(QtCore.Qt.AlignRight)
+        if self.group:
+            self.setTextAlignment(QtCore.Qt.AlignLeft)
+        else:
+            self.setTextAlignment(QtCore.Qt.AlignRight)
         font = self.font()
         font.setBold(True)
         self.setFont(font)

pygpt_net/utils.py

@@ -139,7 +139,7 @@ def parse_args(data: list) -> dict:
         elif type == 'dict':
             try:
                 args[key] = json.loads(value)
-            except json.JSONDecodeError:
+            except:
                 args[key] = {}
         elif type == 'list':
             args[key] = [x.strip() for x in value.split(',')]