pygpt-net 2.4.30__py3-none-any.whl → 2.4.35__py3-none-any.whl

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,35 @@
+2.4.35 (2024-11-28)
+
+- Docker removed from dependencies in Snap version #82
+- Refactored documentation.
+- Fix: toggles real-time update hook.
+- Fix: missing edit icons.
+- Added tokens from attachments to counters if mode == Full context.
+
+2.4.34 (2024-11-26)
+
+- Added a new mode: Chat with Audio, with built-in multimodal support for audio input/output. Currently in beta, the execution of commands and tools in this mode is temporarily unavailable.
+- Added new models: gpt-4o-audio-preview, gpt-4o-2024-11-20, chatgpt-4o-latest.
+- Force disabled integration with the native system menu.
+
+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: 
+
+Tip: To use the `Query only` mode, the file must be indexed in the vector database. This occurs automatically at the time of upload if the `Auto-index on upload` option in the `Attachments` tab is enabled. When uploading large files, such indexing might take a while - therefore, if you are using the `Full context` option, which does not use the index, you can disable the `Auto-index` option to speed up the upload of the attachment. In this case, it will only be indexed when the `Query only` option is called for the first time, and until then, attachment will be available in the form of `Full context` and `Summary`.
+
+- Added context menu options in `Uploaded attachments` tab: `Open`, `Open Source directory` and `Open Storage directory`.
+
 2.4.30 (2024-11-25)
 
 - Added instruction to model about mapped data directory in both legacy and IPython code interepreter.

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.28 01:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2024, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.4.30"
-__build__ = "2024.11.25"
+__version__ = "2.4.35"
+__build__ = "2024.11.28"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __website__ = "https://pygpt.net"

pygpt_net/controller/access/__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.20 03:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.events import BaseEvent, ControlEvent, AppEvent
@@ -73,9 +73,9 @@ class Access:
             self.window.core.plugins.get("audio_input").handler_simple.stop_recording(timeout=True)
 
         # stop audio output if playing
-        if self.window.controller.audio.is_playing():
-            self.window.controller.audio.stop_output()
+        #if self.window.controller.audio.is_playing():
+        self.window.controller.audio.stop_output()
 
         # stop generating if active
-        if self.window.controller.chat.input.generating:
-            self.window.controller.kernel.stop()
+        #if self.window.controller.chat.input.generating:
+        self.window.controller.kernel.stop()

pygpt_net/controller/access/control.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 20:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 import re
@@ -22,7 +22,8 @@ from pygpt_net.core.types import (
     MODE_EXPERT,
     MODE_LANGCHAIN,
     MODE_LLAMA_INDEX,
-    MODE_VISION, MODE_IMAGE,
+    MODE_VISION, 
+    MODE_IMAGE,
 )
 from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.core.events import ControlEvent

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
@@ -51,6 +52,13 @@ class Attachment:
         else:
             self.window.ui.nodes['attachments.capture_clear'].setChecked(False)
 
+        #  auto-index
+        if self.window.core.config.has('attachments_auto_index') \
+                and self.window.core.config.get('attachments_auto_index'):
+            self.window.ui.nodes['attachments.auto_index'].setChecked(True)
+        else:
+            self.window.ui.nodes['attachments.auto_index'].setChecked(False)
+
         self.window.core.attachments.load()
         self.update()
 
@@ -224,6 +232,7 @@ class Attachment:
             mode=mode,
             remove_local=remove_local,
             auto=auto,
+            force=force,
         )
         self.window.controller.chat.vision.unavailable()  # set no content to provide
         self.update()
@@ -268,6 +277,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
@@ -321,6 +362,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
@@ -411,6 +470,14 @@ class Attachment:
         """
         self.window.core.config.set('attachments_capture_clear', value)
 
+    def toggle_auto_index(self, value: bool):
+        """
+        Toggle auto index
+
+        :param value: value of the checkbox
+        """
+        self.window.core.config.set('attachments_auto_index', value)
+
     def is_capture_clear(self) -> bool:
         """
         Return True if capture clear is enabled

pygpt_net/controller/audio/__init__.py

@@ -6,13 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2024.11.26 19:00:00                  #
 # ================================================== #
 
 import os
 
 from pygpt_net.core.events import Event, BaseEvent
-from pygpt_net.plugin.audio_output.worker import PlayWorker
 from pygpt_net.item.ctx import CtxItem
 from pygpt_net.utils import trans
 
@@ -64,6 +63,12 @@ class Audio:
         self.window.core.config.save()
         self.update()
 
+    def enable_input(self):
+        """Enable audio input"""
+        self.window.controller.plugins.enable('audio_input')
+        self.window.core.config.save()
+        self.update()
+
     def disable_input(self, update: bool = True):
         """
         Disable audio input
@@ -104,6 +109,16 @@ class Audio:
             return True
         return False
 
+    def is_input_enabled(self) -> bool:
+        """
+        Check if any audio input is enabled
+
+        :return: True if enabled
+        """
+        if self.window.controller.plugins.is_enabled('audio_input'):
+            return True
+        return False
+
     def update_listeners(self):
         """Update audio listeners"""
         is_output = False
@@ -161,16 +176,29 @@ class Audio:
         }
         self.window.dispatch(event, all=all)
 
+    def play_chat_audio(self, path: str):
+        """
+        Play audio file (chat multimodal response)
+
+        :param path: audio file path
+        """
+        if not self.is_output_enabled():
+            return
+        self.play_audio(path)
+
     def play_audio(self, path: str):
         """
         Play audio file
 
         :param path: audio file path
         """
-        worker = PlayWorker()
-        worker.window = self.window
-        worker.path = path
-        self.window.threadpool.start(worker)
+        ctx = CtxItem()
+        event = Event(Event.AUDIO_PLAYBACK)
+        event.ctx = ctx
+        event.data = {
+            'audio_file': path,
+        }
+        self.window.dispatch(event, all=True)
 
     def play_sound(self, filename: str):
         """

pygpt_net/controller/chat/__init__.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 19:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.events import AppEvent
 from pygpt_net.item.ctx import CtxItem
 
 from .attachment import Attachment
+from .audio import Audio
 from .command import Command
 from .common import Common
 from .files import Files
@@ -35,6 +36,7 @@ class Chat:
         """
         self.window = window
         self.attachment = Attachment(window)
+        self.audio = Audio(window)
         self.command = Command(window)
         self.common = Common(window)
         self.files = Files(window)

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
@@ -114,52 +114,123 @@ class Attachment(QObject):
         :return: True if uploaded
         """
         self.uploaded = False
+        auto_index = self.window.core.config.get("attachments_auto_index", False)
         attachments = self.window.core.attachments.get_all(mode, only_files=True)
+
         if self.is_verbose() and len(attachments) > 0:
             print("\nUploading attachments...\nWork Mode: {}".format(mode))
+
         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, sub_attachment, prompt)
-                                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(meta, attachment, prompt)
-                if item:
-                    if meta.additional_ctx is None:
-                        meta.additional_ctx = []
-                    meta.additional_ctx.append(item)
-                    attachment.consumed = True  # allow for deletion
+            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,
+                    auto_index=auto_index,
+                )
+                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
@@ -203,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:
@@ -210,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))
@@ -362,6 +442,150 @@ class Attachment(QObject):
         self.window.core.attachments.context.clear(meta, delete_files=remove_local)
         self.update_list(meta)
 
+    def select(self, idx: int):
+        """
+        Select uploaded file
+
+        :param idx: index of file
+        """
+        pass
+
+    def open_by_idx(self, idx: int):
+        """
+        Open attachment by index
+
+        :param idx: Index on list
+        """
+        meta = self.window.core.ctx.get_current_meta()
+        if meta is None or meta.additional_ctx is None:
+            return
+        items = self.window.core.attachments.context.get_all(meta)
+        if idx < len(items):
+            item = items[idx]
+            path = item["path"]
+            if "real_path" in item:
+                path = item["real_path"]
+            if os.path.exists(path) and os.path.isfile(path):
+                print("Opening attachment: {}".format(path))
+                self.window.controller.files.open(path)
+
+    def open_dir_src_by_idx(self, idx: int):
+        """
+        Open source directory by index
+
+        :param idx: Index on list
+        """
+        meta = self.window.core.ctx.get_current_meta()
+        if meta is None or meta.additional_ctx is None:
+            return
+        items = self.window.core.attachments.context.get_all(meta)
+        if idx < len(items):
+            item = items[idx]
+            path = item["path"]
+            if "real_path" in item:
+                path = item["real_path"]
+            dir = os.path.dirname(path)
+            if os.path.exists(dir) and os.path.isdir(dir):
+                print("Opening source directory: {}".format(dir))
+                self.window.controller.files.open(dir)
+
+    def open_dir_dest_by_idx(self, idx: int):
+        """
+        Open destination directory by index
+
+        :param idx: Index on list
+        """
+        meta = self.window.core.ctx.get_current_meta()
+        if meta is None or meta.additional_ctx is None:
+            return
+        items = self.window.core.attachments.context.get_all(meta)
+        if idx < len(items):
+            item = items[idx]
+            root_dir = self.window.core.attachments.context.get_dir(meta)
+            dir = os.path.join(root_dir, item["uuid"])
+            if os.path.exists(dir) and os.path.isdir(dir):
+                self.window.controller.files.open(dir)
+                print("Opening destination directory: {}".format(dir))
+
+    def has_file_by_idx(self, idx: int) -> bool:
+        """
+        Check if has file by index
+
+        :param idx: Index on list
+        :return: True if has file
+        """
+        meta = self.window.core.ctx.get_current_meta()
+        if meta is None or meta.additional_ctx is None:
+            return False
+        items = self.window.core.attachments.context.get_all(meta)
+        if idx < len(items):
+            item = items[idx]
+            path = item["path"]
+            if "real_path" in item:
+                path = item["real_path"]
+            return os.path.exists(path) and os.path.isfile(path)
+        return False
+
+    def has_src_by_idx(self, idx: int) -> bool:
+        """
+        Check if has source directory by index
+
+        :param idx: Index on list
+        :return: True if has source directory
+        """
+        meta = self.window.core.ctx.get_current_meta()
+        if meta is None or meta.additional_ctx is None:
+            return False
+        items = self.window.core.attachments.context.get_all(meta)
+        if idx < len(items):
+            item = items[idx]
+            path = item["path"]
+            if "real_path" in item:
+                path = item["real_path"]
+            dir = os.path.dirname(path)
+            return os.path.exists(dir) and os.path.isdir(dir)
+        return False
+
+    def has_dest_by_idx(self, idx: int) -> bool:
+        """
+        Check if has destination directory by index
+
+        :param idx: Index on list
+        :return: True if has destination directory
+        """
+        meta = self.window.core.ctx.get_current_meta()
+        if meta is None or meta.additional_ctx is None:
+            return False
+        items = self.window.core.attachments.context.get_all(meta)
+        if idx < len(items):
+            item = items[idx]
+            root_dir = self.window.core.attachments.context.get_dir(meta)
+            dir = os.path.join(root_dir, item["uuid"])
+            return os.path.exists(dir) and os.path.isdir(dir)
+        return False
+
+    def get_current_tokens(self) -> int:
+        """
+        Get current tokens
+
+        :return: Current attachments tokens
+        """
+        if self.mode != self.MODE_FULL_CONTEXT:
+            return 0
+        meta = self.window.core.ctx.get_current_meta()
+        if meta is None:
+            return 0
+        if meta.additional_ctx is None:
+            return 0
+        tokens = 0
+        for item in meta.additional_ctx:
+            if "tokens" in item:
+                try:
+                    tokens += int(item["tokens"])
+                except Exception as e:
+                    pass
+        return tokens
+
     @Slot(object)
     def handle_upload_error(self, error: Exception):
         """
@@ -397,4 +621,5 @@ class Attachment(QObject):
         """
         self.mode = mode
         self.window.core.config.set("ctx.attachment.mode", mode)
-        self.window.core.config.save()
+        self.window.core.config.save()
+        self.window.controller.ui.update_tokens()