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

CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 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: 

README.md

@@ -2,7 +2,7 @@
 
 [![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
 > 
@@ -155,11 +155,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:
 
@@ -187,7 +187,7 @@ pip install -r requirements.txt
 python3 run.py
 ```
 
-**Install with Poetry**
+### Install with Poetry
 
 1. Clone git repository or download .zip file:
 
@@ -3656,6 +3656,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: 

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,13 @@
+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: 

pygpt_net/__init__.py

@@ -6,15 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.25 01:00:00                  #
+# Updated Date: 2024.11.26 05:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2024, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.4.31"
-__build__ = "2024.11.25"
+__version__ = "2.4.33"
+__build__ = "2024.11.26"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __website__ = "https://pygpt.net"

pygpt_net/controller/attachment.py

@@ -6,11 +6,12 @@
 # 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 datetime import datetime
+from urllib.parse import urlparse
 
 from PySide6.QtGui import QImage
 from PySide6.QtWidgets import QFileDialog, QApplication
@@ -275,6 +276,38 @@ class Attachment:
             self.window.core.attachments.save()
             self.update()
 
+    def open_add_url(self):
+        """Open add attachment URL dialog"""
+        self.window.ui.dialog['url'].id = "attachment"
+        self.window.ui.dialog['url'].input.setText("")
+        self.window.ui.dialog['url'].current = ""
+        self.window.ui.dialog['url'].show()
+        self.window.ui.dialog['url'].input.setFocus()
+
+    def add_url(self, url: str):
+        """
+        Add URL
+
+        :param url: URL
+        """
+        if not url:
+            return
+        mode = self.window.core.config.get('mode')
+        try:
+            domain = urlparse(url).netloc
+        except Exception as e:
+            domain = os.path.basename(url)
+        attachment = self.window.core.attachments.new(
+            mode=mode,
+            name=domain,
+            path=url,
+            auto_save=False,
+            type=AttachmentItem.TYPE_URL,
+        )
+        self.window.core.attachments.save()
+        self.update()
+        self.window.ui.dialog['url'].close()
+
     def open_dir(self, mode: str, idx: int):
         """
         Open in directory
@@ -328,6 +361,24 @@ class Attachment:
             return ''
         return data.path
 
+    def get_by_idx(self, mode: str, idx: int) -> str:
+        """
+        Get attachment by index
+
+        :param mode: mode
+        :param idx: index
+        :return: path
+        """
+        file_id = self.window.core.attachments.get_id_by_idx(
+            mode=mode,
+            idx=idx,
+        )
+        data = self.window.core.attachments.get_by_id(
+            mode=mode,
+            id=file_id,
+        )
+        return data
+
     def has(self, mode: str) -> bool:
         """
         Return True if current mode has attachments

pygpt_net/controller/chat/attachment.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 21:00:00                  #
+# Updated Date: 2024.11.26 04:00:00                  #
 # ================================================== #
 
 import os
@@ -122,59 +122,115 @@ class Attachment(QObject):
 
         for uuid in attachments:
             attachment = attachments[uuid]
-            if not self.is_allowed(attachment.path):
-                continue  # skip not allowed files
-            if self.window.core.filesystem.packer.is_archive(attachment.path):
-                if self.is_verbose():
-                    print("Unpacking archive: {}".format(attachment.path))
-                tmp_path = self.window.core.filesystem.packer.unpack(attachment.path)
-                if tmp_path:
-                    for root, dirs, files in os.walk(tmp_path):
-                        for file in files:
-                            path = os.path.join(root, file)
-                            sub_attachment = AttachmentItem()
-                            sub_attachment.path = path
-                            sub_attachment.name = os.path.basename(path)
-                            sub_attachment.consumed = False
-                            path_relative = os.path.relpath(path, tmp_path)
-                            if self.is_allowed(str(path)):
-                                if self.is_verbose():
-                                    print("Uploading unpacked from archive: {}".format(path_relative))
-                                item = self.window.core.attachments.context.upload(
-                                    meta=meta,
-                                    attachment=sub_attachment,
-                                    prompt=prompt,
-                                    real_path=attachment.path,
-                                    auto_index=auto_index,
-                                )
-                                if item:
-                                    item["path"] = os.path.basename(attachment.path) + "/" + path_relative
-                                    item["size"] = os.path.getsize(path)
-                                    if meta.additional_ctx is None:
-                                        meta.additional_ctx = []
-                                    meta.additional_ctx.append(item)
-                                    self.uploaded = True
-                                    sub_attachment.consumed = True
-                                    attachment.consumed = True
-                    self.window.core.filesystem.packer.remove_tmp(tmp_path)  # clean
-            else:
-                item = self.window.core.attachments.context.upload(
+            if attachment.type == AttachmentItem.TYPE_FILE:
+                result = self.upload_file(
+                    attachment=attachment,
                     meta=meta,
+                    prompt=prompt,
+                    auto_index=auto_index,
+                )
+                if result:
+                    self.uploaded = True
+            elif attachment.type == AttachmentItem.TYPE_URL:
+                result = self.upload_web(
                     attachment=attachment,
+                    meta=meta,
                     prompt=prompt,
-                    real_path=attachment.path,
                     auto_index=auto_index,
                 )
-                if item:
-                    if meta.additional_ctx is None:
-                        meta.additional_ctx = []
-                    meta.additional_ctx.append(item)
-                    attachment.consumed = True  # allow for deletion
+                if result:
                     self.uploaded = True
         if self.uploaded:
             self.window.core.ctx.save(meta.id)  # save meta
         return self.uploaded
 
+    def upload_file(
+            self,
+            attachment: AttachmentItem,
+            meta: CtxMeta,
+            prompt: str,
+            auto_index: bool
+    ) -> bool:
+        """
+        Upload file attachment
+
+        :param attachment: AttachmentItem
+        :param meta: CtxMeta
+        :param prompt: User input prompt
+        :param auto_index: Auto index
+        :return: True if uploaded
+        """
+        uploaded = False
+        if not self.is_allowed(attachment.path):
+            return False
+        if self.window.core.filesystem.packer.is_archive(attachment.path):
+            if self.is_verbose():
+                print("Unpacking archive: {}".format(attachment.path))
+            tmp_path = self.window.core.filesystem.packer.unpack(attachment.path)
+            if tmp_path:
+                for root, dirs, files in os.walk(tmp_path):
+                    for file in files:
+                        path = os.path.join(root, file)
+                        sub_attachment = AttachmentItem()
+                        sub_attachment.path = path
+                        sub_attachment.name = os.path.basename(path)
+                        sub_attachment.consumed = False
+                        path_relative = os.path.relpath(path, tmp_path)
+                        if self.is_allowed(str(path)):
+                            if self.is_verbose():
+                                print("Uploading unpacked from archive: {}".format(path_relative))
+                            item = self.window.core.attachments.context.upload(
+                                meta=meta,
+                                attachment=sub_attachment,
+                                prompt=prompt,
+                                real_path=attachment.path,
+                                auto_index=auto_index,
+                            )
+                            if item:
+                                item["path"] = os.path.basename(attachment.path) + "/" + path_relative
+                                item["size"] = os.path.getsize(path)
+                                if meta.additional_ctx is None:
+                                    meta.additional_ctx = []
+                                meta.additional_ctx.append(item)
+                                uploaded = True
+                                sub_attachment.consumed = True
+                                attachment.consumed = True
+                self.window.core.filesystem.packer.remove_tmp(tmp_path)  # clean
+        else:
+            item = self.window.core.attachments.context.upload(
+                meta=meta,
+                attachment=attachment,
+                prompt=prompt,
+                real_path=attachment.path,
+                auto_index=auto_index,
+            )
+            if item:
+                if meta.additional_ctx is None:
+                    meta.additional_ctx = []
+                meta.additional_ctx.append(item)
+                attachment.consumed = True  # allow for deletion
+                uploaded = True
+
+        return uploaded
+
+    def upload_web(
+            self,
+            attachment: AttachmentItem,
+            meta: CtxMeta,
+            prompt: str,
+            auto_index: bool
+    ) -> bool:
+        """
+        Upload web attachment
+
+        :param attachment: AttachmentItem
+        :param meta: CtxMeta
+        :param prompt: User input prompt
+        :param auto_index: Auto index
+        :return: True if uploaded
+        """
+        return self.upload_file(attachment, meta, prompt, auto_index)
+
     def has_context(self, meta: CtxMeta) -> bool:
         """
         Check if has additional context for attachment
@@ -218,6 +274,7 @@ class Attachment(QObject):
             if self.is_verbose():
                 print("\nPreparing additional context...\nContext Mode: {}".format(self.mode))
 
+        self.window.core.attachments.context.reset()
         if self.mode == self.MODE_FULL_CONTEXT:
             content = self.get_full_context(ctx)
         elif self.mode == self.MODE_QUERY_CONTEXT:
@@ -225,6 +282,14 @@ class Attachment(QObject):
         elif self.mode == self.MODE_QUERY_CONTEXT_SUMMARY:
             content = self.get_context_summary(ctx)
 
+        # append used files and urls to context
+        files = self.window.core.attachments.context.get_used_files()
+        urls = self.window.core.attachments.context.get_used_urls()
+        if files:
+            ctx.files = files
+        if urls:
+            ctx.urls = urls
+
         if content:
             if self.is_verbose():
                 print("\n--- Using additional context ---\n\n{}".format(content))

pygpt_net/controller/dialogs/confirm.py

@@ -6,7 +6,7 @@
 # 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                  #
 # ================================================== #
 
 class Confirm:
@@ -349,6 +349,18 @@ class Confirm:
         elif type == 'ctx.group':
             self.window.controller.ctx.create_group(name, id)
 
+    def accept_url(self, type: str, id: any, url: str):
+        """
+        Update URL provided
+
+        :param type: dialog type
+        :param id: dialog object id
+        :param url: URL
+        """
+        # add attachment
+        if type == 'attachment':
+            self.window.controller.attachment.add_url(url)
+
     def dismiss_rename(self):
         """Dismiss rename dialog"""
         self.window.ui.dialog['rename'].close()
@@ -356,3 +368,7 @@ class Confirm:
     def dismiss_create(self):
         """Dismiss create dialog"""
         self.window.ui.dialog['create'].close()
+
+    def dismiss_url(self):
+        """Dismiss url dialog"""
+        self.window.ui.dialog['url'].close()

pygpt_net/core/attachments/__init__.py

@@ -6,7 +6,7 @@
 # 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 copy
@@ -176,7 +176,8 @@ class Attachments:
             mode: str,
             name: str = None,
             path: str = None,
-            auto_save: bool = True
+            auto_save: bool = True,
+            type: str = AttachmentItem.TYPE_FILE,
     ) -> AttachmentItem:
         """
         Create new attachment
@@ -185,16 +186,19 @@ class Attachments:
         :param name: name
         :param path: path
         :param auto_save: auto_save
+        :param type: type
         :return: AttachmentItem
         """
         # make local copy of external attachment if enabled
-        if self.window.core.config.get("upload.store"):
-            if not self.window.core.filesystem.in_work_dir(path):
-                path = self.window.core.filesystem.store_upload(path)
+        if type == AttachmentItem.TYPE_FILE and path is not None:
+            if self.window.core.config.get("upload.store"):
+                if not self.window.core.filesystem.in_work_dir(path):
+                    path = self.window.core.filesystem.store_upload(path)
 
         attachment = self.create()
         attachment.name = name
         attachment.path = path
+        attachment.type = type
 
         if mode not in self.items:
             self.items[mode] = {}
@@ -410,7 +414,7 @@ class Attachments:
         for mode in self.items:
             for id in self.items[mode]:
                 attachment = self.items[mode][id]
-                if attachment.path is not None:
+                if attachment.path is not None and attachment.type == AttachmentItem.TYPE_FILE:
                     attachment.path = self.window.core.filesystem.to_workdir(
                         attachment.path,
                     )
@@ -422,7 +426,7 @@ class Attachments:
         for mode in data:
             for id in data[mode]:
                 attachment = data[mode][id]
-                if attachment.path is not None:
+                if attachment.path is not None and attachment.type == AttachmentItem.TYPE_FILE:
                     attachment.path = self.window.core.filesystem.make_local(
                         attachment.path,
                     )