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

CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## 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.

README.md

@@ -2,7 +2,7 @@
 
 [![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
 > 
@@ -785,6 +785,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:
@@ -3260,8 +3262,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`
@@ -3934,6 +3938,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.

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,18 @@
+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.

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.12.15 04:00:00                  #
+# Updated Date: 2024.12.16 02:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2024, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.4.42"
-__build__ = "2024.12.15"
+__version__ = "2.4.45"
+__build__ = "2024.12.16"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __website__ = "https://pygpt.net"

pygpt_net/controller/attachment.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 08:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
 
 import os
@@ -293,10 +293,38 @@ class Attachment:
     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'].init()
+        self.window.ui.dialog['url'].resize(800, 400)
         self.window.ui.dialog['url'].show()
-        self.window.ui.dialog['url'].input.setFocus()
+
+    def attach_url(self):
+        """Attach attachment URL"""
+        result, loader, input_params, input_config = self.window.core.idx.ui.loaders.handle_options(
+            self.window.ui.nodes["dialog.url.loader"],
+            "dialog.url.loader.option",
+            "dialog.url.loader.config",
+        )
+        extra = {
+            "loader": loader,
+            "input_params": input_params,
+            "input_config": input_config,
+        }
+        provider = self.window.core.idx.indexing.get_loader(loader)
+        if provider:
+            mode = self.window.core.config.get('mode')
+            name = provider.get_external_id(input_params)
+            attachment = self.window.core.attachments.new(
+                mode=mode,
+                name=name,
+                path=name,
+                auto_save=False,
+                type=AttachmentItem.TYPE_URL,
+                extra=extra,
+            )
+            self.window.core.attachments.save()
+            self.update()
+            self.window.ui.dialog['url'].close()
 
     def add_url(self, url: str):
         """

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.12.14 08:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
 
 import os
@@ -180,7 +180,7 @@ class Attachment(QObject):
             if tmp_path:
                 for root, dirs, files in os.walk(tmp_path):
                     for file in files:
-                        path = os.path.join(root, file)
+                        path = str(os.path.join(root, file))
                         sub_attachment = AttachmentItem()
                         sub_attachment.path = path
                         sub_attachment.name = os.path.basename(path)
@@ -197,11 +197,9 @@ class Attachment(QObject):
                                 auto_index=auto_index,
                             )
                             if item:
-                                item["path"] = os.path.basename(attachment.path) + "/" + path_relative
+                                item["path"] = os.path.basename(attachment.path) + "/" + str(path_relative)
                                 item["size"] = os.path.getsize(path)
-                                if meta.additional_ctx is None:
-                                    meta.additional_ctx = []
-                                meta.additional_ctx.append(item)
+                                self.append_to_meta(meta, item)
                                 uploaded = True
                                 sub_attachment.consumed = True
                                 attachment.consumed = True
@@ -215,14 +213,27 @@ class Attachment(QObject):
                 auto_index=auto_index,
             )
             if item:
-                if meta.additional_ctx is None:
-                    meta.additional_ctx = []
-                meta.additional_ctx.append(item)
+                self.append_to_meta(meta, item)
                 attachment.consumed = True  # allow for deletion
                 uploaded = True
-
         return uploaded
 
+    def append_to_meta(self, meta: CtxMeta, item: Dict[str, Any]):
+        """
+        Append item to meta
+
+        :param meta: CtxMeta instance
+        :param item: Attachment item
+        """
+        if meta.group:
+            if meta.group.additional_ctx is None:
+                meta.group.additional_ctx = []
+            meta.group.additional_ctx.append(item)
+            return
+        if meta.additional_ctx is None:
+            meta.additional_ctx = []
+        meta.additional_ctx.append(item)
+
     def upload_web(
             self,
             attachment: AttachmentItem,
@@ -248,9 +259,9 @@ class Attachment(QObject):
         :param meta: CtxMeta
         :return: True if has context
         """
-        if meta is None or meta.additional_ctx is None:
+        if meta is None:
             return False
-        return len(meta.additional_ctx) > 0
+        return meta.has_additional_ctx()
 
     def current_has_context(self) -> bool:
         """
@@ -306,18 +317,6 @@ class Attachment(QObject):
             return "====================================\nADDITIONAL CONTEXT FROM ATTACHMENT(s): {}".format(content)
         return ""
 
-    def get_uploaded_attachments(
-            self,
-            meta: CtxMeta
-    ) -> List[Dict[str, Any]]:
-        """
-        Get uploaded attachments for meta
-
-        :param meta: CtxMeta instance
-        :return: List of attachments
-        """
-        return meta.additional_ctx
-
     def update(self):
         """Update attachments list"""
         mode = self.window.core.config.get("mode")
@@ -334,7 +333,7 @@ class Attachment(QObject):
         :param meta: CtxMeta instance
         """
         # update list of attachments
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             items = []
         else:
             items = self.window.core.attachments.context.get_all(meta)
@@ -347,7 +346,7 @@ class Attachment(QObject):
 
         :param meta: CtxMeta instance
         """
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             num_files = 0
         else:
             num_files = self.window.core.attachments.context.count(meta)
@@ -402,13 +401,14 @@ class Attachment(QObject):
             )
             return
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
             item = items[idx]
             self.window.core.attachments.context.delete(meta, item, delete_files=remove_local)
             self.update_list(meta)
+            self.window.controller.ctx.update()
 
     def clear(
             self,
@@ -432,10 +432,11 @@ class Attachment(QObject):
             return
 
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return
         self.window.core.attachments.context.clear(meta, delete_files=remove_local)
         self.update_list(meta)
+        self.window.controller.ctx.update()
 
     def select(self, idx: int):
         """
@@ -452,7 +453,7 @@ class Attachment(QObject):
         :param idx: Index on list
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -471,7 +472,7 @@ class Attachment(QObject):
         :param idx: Index on list
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -491,7 +492,7 @@ class Attachment(QObject):
         :param idx: Index on list
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -510,7 +511,7 @@ class Attachment(QObject):
         :return: True if has file
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return False
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -529,7 +530,7 @@ class Attachment(QObject):
         :return: True if has source directory
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return False
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -549,7 +550,7 @@ class Attachment(QObject):
         :return: True if has destination directory
         """
         meta = self.window.core.ctx.get_current_meta()
-        if meta is None or meta.additional_ctx is None:
+        if meta is None or not meta.has_additional_ctx():
             return False
         items = self.window.core.attachments.context.get_all(meta)
         if idx < len(items):
@@ -570,10 +571,10 @@ class Attachment(QObject):
         meta = self.window.core.ctx.get_current_meta()
         if meta is None:
             return 0
-        if meta.additional_ctx is None:
+        if not meta.has_additional_ctx():
             return 0
         tokens = 0
-        for item in meta.additional_ctx:
+        for item in meta.get_additional_ctx():
             if "tokens" in item:
                 try:
                     tokens += int(item["tokens"])

pygpt_net/controller/config/placeholder.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 18:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, List
@@ -279,7 +279,8 @@ class Placeholder:
         modes = self.window.core.agents.legacy.get_allowed_modes()
         data = []
         for id in modes:
-            data.append({id: id})  # TODO: name
+            name = trans(f"mode.{id}")
+            data.append({id: name})
         return data
 
     def get_idx(self) -> List[Dict[str, str]]:
@@ -291,8 +292,9 @@ class Placeholder:
         indexes = self.window.core.idx.get_idx_ids()
         data = []
         data.append({'_': '---'})
-        for id in indexes:
-            data.append({id: id})
+        for item in indexes:
+            for k, v in item.items():
+                data.append({k: v})
         return data
 
     def get_syntax_styles(self) -> List[Dict[str, str]]:

pygpt_net/controller/idx/common.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 08:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
 
 from typing import List, Dict
@@ -50,13 +50,17 @@ class Common:
                     ext_str = " (" + ", ".join(loader.extensions) + ")"
                 # name = "(File) " + loader.name + ext_str  # TODO: implement option names
                 data.append({
-                    id: id
+                    id: loader.name
                 })
+                # sort by name
+                data = sorted(data, key=lambda x: list(x.values())[0])
             # web
             if "web" in loader.type:
                 id = "web_" + id
                 # name = "(Web) " + loader.name  # TODO: implement option names
                 data.append({
-                    id: id
+                    id: loader.name
                 })
+                # sort by name
+                data = sorted(data, key=lambda x: list(x.values())[0])
         return data

pygpt_net/controller/lang/mapping.py

@@ -34,42 +34,66 @@ class Mapping:
         # nodes labels
         for k in self.mapping['nodes']:
             if k in self.window.ui.nodes:
-                self.window.ui.nodes[k].setText(trans(self.mapping['nodes'][k]))
+                try:
+                    self.window.ui.nodes[k].setText(trans(self.mapping['nodes'][k]))
+                except:
+                    pass
 
         # menu title
         for k in self.mapping['menu.title']:
             if k in self.window.ui.menu:
-                self.window.ui.menu[k].setTitle(trans(self.mapping['menu.title'][k]))
+                try:
+                    self.window.ui.menu[k].setTitle(trans(self.mapping['menu.title'][k]))
+                except:
+                    pass
 
         # menu text
         for k in self.mapping['menu.text']:
             if k in self.window.ui.menu:
-                self.window.ui.menu[k].setText(trans(self.mapping['menu.text'][k]))
+                try:
+                    self.window.ui.menu[k].setText(trans(self.mapping['menu.text'][k]))
+                except:
+                    pass
 
         # menu tooltip
         for k in self.mapping['menu.tooltip']:
             if k in self.window.ui.menu:
-                self.window.ui.menu[k].setToolTip(trans(self.mapping['menu.tooltip'][k]))
+                try:
+                    self.window.ui.menu[k].setToolTip(trans(self.mapping['menu.tooltip'][k]))
+                except:
+                    pass
 
         # dialog title
         for k in self.mapping['dialog.title']:
             if k in self.window.ui.dialog:
-                self.window.ui.dialog[k].setWindowTitle(trans(self.mapping['dialog.title'][k]))
+                try:
+                    self.window.ui.dialog[k].setWindowTitle(trans(self.mapping['dialog.title'][k]))
+                except:
+                    pass
 
         # tooltip
         for k in self.mapping['tooltip']:
             if k in self.window.ui.nodes:
-                self.window.ui.nodes[k].setToolTip(trans(self.mapping['tooltip'][k]))
+                try:
+                    self.window.ui.nodes[k].setToolTip(trans(self.mapping['tooltip'][k]))
+                except:
+                    pass
 
         # placeholder
         for k in self.mapping['placeholder']:
             if k in self.window.ui.nodes:
-                self.window.ui.nodes[k].setPlaceholderText(trans(self.mapping['placeholder'][k]))
+                try:
+                    self.window.ui.nodes[k].setPlaceholderText(trans(self.mapping['placeholder'][k]))
+                except:
+                    pass
 
         # menu tab tools
         for k in self.window.controller.tools.get_tab_tools():
             if k in self.window.ui.menu:
-                self.window.ui.menu[k].setText(trans("output.tab." + self.window.controller.tools.get_tab_tools()[k][0]))
+                try:
+                    self.window.ui.menu[k].setText(trans("output.tab." + self.window.controller.tools.get_tab_tools()[k][0]))
+                except:
+                    pass
 
     def get_mapping(self) -> Dict[str, Dict[str, str]]:
         """
@@ -313,7 +337,6 @@ class Mapping:
         nodes['tool.indexer.file.options.replace'] = 'tool.indexer.option.replace'
         nodes['tool.indexer.web.loader.label'] = 'tool.indexer.tab.web.loader'
         nodes['tool.indexer.web.options.label'] = 'tool.indexer.tab.web.source'
-        nodes['tool.indexer.web.config.label'] = 'tool.indexer.tab.web.cfg'
         nodes['tool.indexer.web.options.replace'] = 'tool.indexer.option.replace'
         nodes['tool.indexer.file.header.tip'] = 'tool.indexer.tab.files.tip'
         nodes['tool.indexer.web.header.tip'] = 'tool.indexer.tab.web.tip'

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.12.14 08:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
 
 import copy
@@ -161,7 +161,7 @@ class Attachments:
         if meta is None:
             return []
         attachments = []
-        for attachment in meta.additional_ctx:
+        for attachment in meta.get_additional_ctx():
             item = AttachmentItem()
             if 'uuid' not in attachment:
                 continue
@@ -187,6 +187,7 @@ class Attachments:
             path: Optional[str] = None,
             auto_save: bool = True,
             type: str = AttachmentItem.TYPE_FILE,
+            extra: Optional[dict] = None
     ) -> AttachmentItem:
         """
         Create new attachment
@@ -196,6 +197,7 @@ class Attachments:
         :param path: path
         :param auto_save: auto_save
         :param type: type
+        :param extra: extra data
         :return: AttachmentItem
         """
         # make local copy of external attachment if enabled
@@ -209,6 +211,9 @@ class Attachments:
         attachment.path = path
         attachment.type = type
 
+        if extra is not None:
+            attachment.extra = extra
+
         if mode not in self.items:
             self.items[mode] = {}