pygpt-net 2.4.31__py3-none-any.whl → 2.4.33__py3-none-any.whl

pygpt_net/tools/image_viewer/ui/dialogs.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.26 15:00:00                  #
+# Updated Date: 2024.11.26 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -17,6 +17,8 @@ from pygpt_net.ui.widget.dialog.base import BaseDialog
 from pygpt_net.ui.widget.image.display import ImageLabel
 from pygpt_net.utils import trans
 
+import pygpt_net.icons_rc
+
 class DialogSpawner:
     def __init__(self, window=None):
         """

pygpt_net/ui/dialog/url.py

@@ -0,0 +1,29 @@
+#!/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.11.26 02:00:00                  #
+# ================================================== #
+
+from pygpt_net.ui.widget.dialog.url import UrlDialog
+from pygpt_net.utils import trans
+
+
+class Url:
+    def __init__(self, window=None):
+        """
+        URL dialog
+
+        :param window: Window instance
+        """
+        self.window = window
+
+    def setup(self):
+        """Setup URL dialog"""
+        id = 'url'
+        self.window.ui.dialog[id] = UrlDialog(self.window, id)
+        self.window.ui.dialog[id].setWindowTitle(trans("dialog.url.title"))

pygpt_net/ui/dialogs.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.14 01:00:00                  #
+# Updated Date: 2024.11.26 02:00:00                  #
 # ================================================== #
 
 import threading
@@ -35,6 +35,7 @@ from pygpt_net.ui.dialog.settings import Settings
 from pygpt_net.ui.dialog.snap import Snap
 from pygpt_net.ui.dialog.start import Start
 from pygpt_net.ui.dialog.update import Update
+from pygpt_net.ui.dialog.url import Url
 from pygpt_net.ui.dialog.workdir import Workdir
 from pygpt_net.ui.widget.dialog.alert import AlertDialog
 from pygpt_net.ui.widget.dialog.confirm import ConfirmDialog
@@ -66,6 +67,7 @@ class Dialogs:
         self.snap = Snap(self.window)
         self.start = Start(self.window)
         self.update = Update(self.window)
+        self.url = Url(self.window)
         self.workdir = Workdir(self.window)
 
     def setup(self):
@@ -85,6 +87,8 @@ class Dialogs:
         self.snap.setup()
         self.start.setup()
         self.update.setup()
+        self.url.setup()
+
         self.image.setup()
         self.license.setup()
         self.logger.setup()

pygpt_net/ui/layout/chat/attachments.py

@@ -6,18 +6,20 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.11.26 02:00:00                  #
 # ================================================== #
 
 import os
 
-from PySide6.QtGui import QStandardItemModel, Qt
+from PySide6.QtGui import QStandardItemModel, Qt, QIcon
 from PySide6.QtWidgets import QVBoxLayout, QPushButton, QHBoxLayout, QCheckBox, QWidget
 
+from pygpt_net.item.attachment import AttachmentItem
 from pygpt_net.ui.widget.element.labels import HelpLabel
 from pygpt_net.ui.widget.lists.attachment import AttachmentList
 from pygpt_net.utils import trans
 
+import pygpt_net.icons_rc
 
 class Attachments:
     def __init__(self, window=None):
@@ -38,13 +40,21 @@ class Attachments:
         self.setup_attachments()
         self.setup_buttons()
 
+        empty_widget = QWidget()
+        self.window.ui.nodes['input.attachments.options.label'] = HelpLabel(trans("attachments.options.label"))
+
         # buttons layout
         buttons = QHBoxLayout()
         buttons.addWidget(self.window.ui.nodes['attachments.btn.add'])
+        buttons.addWidget(self.window.ui.nodes['attachments.btn.add_url'])
         buttons.addWidget(self.window.ui.nodes['attachments.btn.clear'])
+        buttons.addWidget(empty_widget)
+        buttons.addWidget(self.window.ui.nodes['input.attachments.options.label'])
+
         buttons.addWidget(self.setup_auto_index())
         buttons.addWidget(self.setup_send_clear())
         buttons.addWidget(self.setup_capture_clear())
+        buttons.addStretch()
 
         self.window.ui.nodes['tip.input.attachments'] = HelpLabel(trans('tip.input.attachments'), self.window)
 
@@ -109,11 +119,14 @@ class Attachments:
         """
         Setup buttons
         """
-        self.window.ui.nodes['attachments.btn.add'] = QPushButton(trans('attachments.btn.add'))
-        self.window.ui.nodes['attachments.btn.clear'] = QPushButton(trans('attachments.btn.clear'))
+        self.window.ui.nodes['attachments.btn.add'] = QPushButton(QIcon(":/icons/add.svg"), trans('attachments.btn.add'))
+        self.window.ui.nodes['attachments.btn.add_url'] = QPushButton(QIcon(":/icons/add.svg"), trans('attachments.btn.add_url'))
+        self.window.ui.nodes['attachments.btn.clear'] = QPushButton(QIcon(":/icons/close.svg"), trans('attachments.btn.clear'))
 
         self.window.ui.nodes['attachments.btn.add'].clicked.connect(
             lambda: self.window.controller.attachment.open_add())
+        self.window.ui.nodes['attachments.btn.add_url'].clicked.connect(
+            lambda: self.window.controller.attachment.open_add_url())
         self.window.ui.nodes['attachments.btn.clear'].clicked.connect(
             lambda: self.window.controller.attachment.clear(remove_local=True))
 
@@ -166,8 +179,9 @@ class Attachments:
         for id in data:
             path = data[id].path
             size = ""
-            if path and os.path.exists(path):
-                size = self.window.core.filesystem.sizeof_fmt(os.path.getsize(path))
+            if data[id].type == AttachmentItem.TYPE_FILE:
+                if path and os.path.exists(path):
+                    size = self.window.core.filesystem.sizeof_fmt(os.path.getsize(path))
             ctx_str = ""
             if data[id].ctx:
                 ctx_str = "YES"

pygpt_net/ui/layout/chat/attachments_ctx.py

@@ -6,19 +6,20 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.11.26 02:00:00                  #
 # ================================================== #
 
 import os
 
 from PySide6 import QtCore
-from PySide6.QtGui import QStandardItemModel, Qt
+from PySide6.QtGui import QStandardItemModel, Qt, QIcon
 from PySide6.QtWidgets import QVBoxLayout, QPushButton, QHBoxLayout, QWidget, QRadioButton
 
 from pygpt_net.ui.widget.element.labels import HelpLabel
 from pygpt_net.ui.widget.lists.attachment_ctx import AttachmentCtxList
 from pygpt_net.utils import trans
 
+import pygpt_net.icons_rc
 
 class AttachmentsCtx:
     def __init__(self, window=None):
@@ -90,7 +91,7 @@ class AttachmentsCtx:
         self.window.ui.nodes[self.id] = AttachmentCtxList(self.window)
 
         # buttons
-        self.window.ui.nodes['attachments_ctx.btn.clear'] = QPushButton(trans('attachments_uploaded.btn.clear'))
+        self.window.ui.nodes['attachments_ctx.btn.clear'] = QPushButton(QIcon(":/icons/close.svg"), trans('attachments_uploaded.btn.clear'))
         self.window.ui.nodes['attachments_ctx.btn.clear'].clicked.connect(
             lambda: self.window.controller.chat.attachment.clear()
         )

pygpt_net/ui/layout/chat/attachments_uploaded.py

@@ -12,7 +12,7 @@
 import os
 
 from PySide6 import QtCore
-from PySide6.QtGui import QStandardItemModel, Qt
+from PySide6.QtGui import QStandardItemModel, Qt, QIcon
 from PySide6.QtWidgets import QVBoxLayout, QPushButton, QHBoxLayout, QCheckBox, QLabel, QWidget
 
 from pygpt_net.ui.widget.element.button import SyncButton
@@ -20,6 +20,7 @@ from pygpt_net.ui.widget.element.labels import HelpLabel
 from pygpt_net.ui.widget.lists.uploaded import UploadedFileList
 from pygpt_net.utils import trans
 
+import pygpt_net.icons_rc
 
 class AttachmentsUploaded:
     def __init__(self, window=None):
@@ -38,10 +39,11 @@ class AttachmentsUploaded:
         :return: QVBoxLayout
         """
         self.setup_attachments()
+        empty_widget = QWidget()
 
-        self.window.ui.nodes['attachments_uploaded.sync.tip'] = QLabel(trans('attachments_uploaded.sync.tip'))
+        self.window.ui.nodes['attachments_uploaded.sync.tip'] = HelpLabel(trans('attachments_uploaded.sync.tip'))
+        self.window.ui.nodes['attachments_uploaded.sync.tip'].setWordWrap(False)
         self.window.ui.nodes['attachments_uploaded.sync.tip'].setAlignment(Qt.AlignCenter)
-        empty_widget = QWidget()
 
         self.window.ui.nodes['tip.input.attachments.uploaded'] = HelpLabel(trans('tip.input.attachments.uploaded'),
                                                                            self.window)
@@ -52,6 +54,8 @@ class AttachmentsUploaded:
         buttons_layout.addWidget(self.window.ui.nodes['attachments_uploaded.btn.clear'])
         buttons_layout.addWidget(empty_widget)
         buttons_layout.addWidget(self.window.ui.nodes['attachments_uploaded.sync.tip'])
+        buttons_layout.addStretch()
+
 
         # layout
         layout = QVBoxLayout()
@@ -70,7 +74,7 @@ class AttachmentsUploaded:
 
         # buttons
         self.window.ui.nodes['attachments_uploaded.btn.sync'] = SyncButton(trans('attachments_uploaded.btn.sync'), self.window)
-        self.window.ui.nodes['attachments_uploaded.btn.clear'] = QPushButton(trans('attachments_uploaded.btn.clear'))
+        self.window.ui.nodes['attachments_uploaded.btn.clear'] = QPushButton(QIcon(":/icons/close.svg"), trans('attachments_uploaded.btn.clear'))
         self.window.ui.nodes['attachments_uploaded.btn.clear'].clicked.connect(
             lambda: self.window.controller.assistant.files.clear()
         )

pygpt_net/ui/widget/dialog/url.py

@@ -0,0 +1,59 @@
+#!/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.11.26 02:00:00                  #
+# ================================================== #
+
+from PySide6.QtWidgets import QDialog, QLabel, QHBoxLayout, QVBoxLayout, QPushButton
+
+from pygpt_net.ui.widget.element.labels import HelpLabel
+from pygpt_net.utils import trans
+from pygpt_net.ui.widget.textarea.url import UrlInput
+
+
+class UrlDialog(QDialog):
+    def __init__(self, window=None, id=None):
+        """
+        Url dialog
+
+        :param window: main window
+        :param id: info window id
+        """
+        super(UrlDialog, self).__init__(window)
+        self.window = window
+        self.id = id
+        self.current = None
+        self.input = UrlInput(window, id)
+        self.input.setMinimumWidth(400)
+
+        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()),
+        )
+
+        self.window.ui.nodes['dialog.url.btn.dismiss'] = QPushButton(trans('dialog.url.dismiss'))
+        self.window.ui.nodes['dialog.url.btn.dismiss'].clicked.connect(
+            lambda: self.window.controller.dialogs.confirm.dismiss_url())
+
+        bottom = QHBoxLayout()
+        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"))
+
+        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.addLayout(bottom)
+
+        self.setLayout(layout)

pygpt_net/ui/widget/lists/attachment.py

@@ -6,13 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.11.26 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
 from PySide6.QtGui import QAction, QIcon, QResizeEvent, QImage
 from PySide6.QtWidgets import QMenu, QApplication, QHeaderView
 
+from pygpt_net.item.attachment import AttachmentItem
 from pygpt_net.ui.widget.lists.base import BaseList
 from pygpt_net.utils import trans
 import pygpt_net.icons_rc
@@ -91,9 +92,12 @@ class AttachmentList(BaseList):
         idx = item.row()
         preview_actions = []
         path = None
+        attachment = None
 
         if idx >= 0:
-            path = self.window.controller.attachment.get_path_by_idx(mode, idx)
+            attachment = self.window.controller.attachment.get_by_idx(mode, idx)
+            if attachment:
+                path = attachment.path
             preview_actions = []
             if self.window.core.filesystem.actions.has_preview(path):
                 preview_actions = self.window.core.filesystem.actions.get_preview(self, path)
@@ -116,21 +120,22 @@ class AttachmentList(BaseList):
             lambda: self.action_delete(event))
 
         menu = QMenu(self)
-        if idx >= 0 and preview_actions:
-            for action in preview_actions:
-                menu.addAction(action)
-        menu.addAction(actions['open'])
-        menu.addAction(actions['open_dir'])
-
-        if idx >= 0:
-            if self.window.core.filesystem.actions.has_use(path):
-                use_actions = self.window.core.filesystem.actions.get_use(self, path)
-                use_menu = QMenu(trans('action.use'), self)
-                for action in use_actions:
-                    use_menu.addAction(action)
-                menu.addMenu(use_menu)
-
-        menu.addAction(actions['rename'])
+        if attachment and attachment.type == AttachmentItem.TYPE_FILE:
+            if idx >= 0 and preview_actions:
+                for action in preview_actions:
+                    menu.addAction(action)
+
+            menu.addAction(actions['open'])
+            menu.addAction(actions['open_dir'])
+            if idx >= 0:
+                if self.window.core.filesystem.actions.has_use(path):
+                    use_actions = self.window.core.filesystem.actions.get_use(self, path)
+                    use_menu = QMenu(trans('action.use'), self)
+                    for action in use_actions:
+                        use_menu.addAction(action)
+                    menu.addMenu(use_menu)
+
+            menu.addAction(actions['rename'])
         menu.addAction(actions['delete'])
 
         if idx >= 0:

pygpt_net/ui/widget/textarea/url.py

@@ -0,0 +1,43 @@
+#!/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.11.26 02:00:00                  #
+# ================================================== #
+
+from PySide6 import QtCore
+from PySide6.QtWidgets import QLineEdit
+
+
+class UrlInput(QLineEdit):
+    def __init__(self, window=None, id=None):
+        """
+        Url dialog input
+
+        :param window: main window
+        :param id: info window id
+        """
+        super(UrlInput, self).__init__(window)
+
+        self.window = window
+        self.id = id
+
+    def keyPressEvent(self, event):
+        """
+        Key press event
+
+        :param event: key event
+        """
+        super(UrlInput, self).keyPressEvent(event)
+
+        # save on Enter
+        if event.key() == QtCore.Qt.Key_Return or event.key() == QtCore.Qt.Key_Enter:
+            self.window.controller.dialogs.confirm.accept_url(
+                self.window.ui.dialog['url'].id,
+                self.window.ui.dialog['url'].current,
+                self.text(),
+            )

{pygpt_net-2.4.31.dist-info → pygpt_net-2.4.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygpt-net
-Version: 2.4.31
+Version: 2.4.33
 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.31** | build: **2024.11.25** | Python: **>=3.10, <3.12**
+Release: **2.4.33** | build: **2024.11.26** | Python: **>=3.10, <3.12**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -245,11 +245,11 @@ pip install pygpt-net
 pygpt
 ```
 
-## Source Code
+## Running from GitHub source code
 
 An alternative method is to download the source code from `GitHub` and execute the application using the Python interpreter (>=3.10, <3.12). 
 
-### Running from GitHub source code
+### Install with pip
 
 1. Clone git repository or download .zip file:
 
@@ -277,7 +277,7 @@ pip install -r requirements.txt
 python3 run.py
 ```
 
-**Install with Poetry**
+### Install with Poetry
 
 1. Clone git repository or download .zip file:
 
@@ -3746,6 +3746,16 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.4.33 (2024-11-26)**
+
+- Improved CSS and rendering of file and image lists.
+- Added displaying of used attachments in the chat window.
+
+**2.4.32 (2024-11-26)**
+
+- The "Add URL" option added to the "Attachments" tab allows users to include content from a given website as additional context. Currently, it only supports standard web pages and video transcription for YouTube links. More "web" options will be added in the future.
+- Added UTF-8 as default in attachments content text read/write.
+
 **2.4.31 (2024-11-25)**
 
 - Added an option checkbox `Auto-index on upload` in the `Attachments` tab: