pygpt-net 2.4.42__py3-none-any.whl → 2.4.45__py3-none-any.whl

pygpt_net/ui/widget/dialog/url.py

@@ -6,12 +6,16 @@
 # 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.QtGui import QIcon
+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, IconLabel
+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 +32,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 +55,153 @@ 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"))
+
+        config_label = HelpLabel(trans("tool.indexer.tab.web.cfg"))
+        config_label.setWordWrap(False)
+
+        config_label_layout = QHBoxLayout()
+        config_label_layout.addWidget(IconLabel(QIcon(":/icons/settings_filled.svg")))
+        config_label_layout.addWidget(config_label)
+        config_label_layout.setAlignment(Qt.AlignLeft)
+
+        self.window.ui.nodes["dialog.url.config.label"] = QWidget()
+        self.window.ui.nodes["dialog.url.config.label"].setLayout(config_label_layout)
+
+        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"])
+        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(',')]

{pygpt_net-2.4.42.dist-info → pygpt_net-2.4.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygpt-net
-Version: 2.4.42
+Version: 2.4.45
 Summary: Desktop AI Assistant powered by models: OpenAI o1, GPT-4o, GPT-4, GPT-4 Vision, GPT-3.5, DALL-E 3, Llama 3, Mistral, Gemini, Claude, Bielik, and other models supported by Langchain, Llama Index, and Ollama. Features include chatbot, text completion, image generation, vision analysis, speech-to-text, internet access, file handling, command execution and more.
 Home-page: https://pygpt.net
 License: MIT
@@ -92,7 +92,7 @@ Description-Content-Type: text/markdown
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.4.42** | build: **2024.12.15** | Python: **>=3.10, <3.12**
+Release: **2.4.45** | build: **2024.12.16** | Python: **>=3.10, <3.12**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -875,6 +875,8 @@ You can use your own files (for example, to analyze them) during any conversatio
 
 **PyGPT** makes it simple for users to upload files and send them to the model for tasks like analysis, similar to attaching files in `ChatGPT`. There's a separate `Attachments` tab next to the text input area specifically for managing file uploads. 
 
+**Tip: Attachments uploaded in group are available in all contexts in group**.
+
 ![v2_file_input](https://github.com/user-attachments/assets/db8467b6-2d07-4e20-a795-430fc09443a7)
 
 You can use attachments to provide additional context to the conversation. Uploaded files will be converted into text using loaders from LlamaIndex, and then embedded into the vector store. You can upload any file format supported by the application through LlamaIndex. Supported formats include:
@@ -3350,8 +3352,10 @@ Allowed additional keyword arguments for built-in data loaders (Web and external
 
 **SQL Database**  (web_database)
 
-- `engine` - str, default: `None`
 - `uri` - str, default: `None`
+
+You can provide a single URI in the form of: `{scheme}://{user}:{password}@{host}:{port}/{dbname}`, or you can provide each field manually:
+
 - `scheme` - str, default: `None`
 - `host` - str, default: `None`
 - `port` - str, default: `None`
@@ -4024,6 +4028,21 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.4.45 (2024-12-16)**
+
+- Enhanced web data loaders UI.
+
+**2.4.44 (2024-12-16)**
+
+- Enhanced web data loaders.
+- Web loaders have been added to attachments, allowing external web content to be attached to context via the "+Web" button in the Attachments tab.
+- Improved handling of attachments in groups and added an attachment icon when a group contains attachments.
+
+**2.4.43 (2024-12-15)**
+
+- Fix: Bug on attachment upload.
+- Added: Attachments uploaded in groups are now available for all contexts in the group (beta).
+
 **2.4.42 (2024-12-15)**
 
 - Added Mailer plugin, which allows sending and retrieving emails from the server, and reading them. It currently supports only SMTP.