pygpt-net 2.6.21__py3-none-any.whl → 2.6.23__py3-none-any.whl

pygpt_net/core/filesystem/opener.py

@@ -0,0 +1,261 @@
+#!/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: 2025.08.25 18:00:00                  #
+# ================================================== #
+
+import os
+import sys
+import shutil
+import subprocess
+
+from PySide6.QtCore import QUrl
+from PySide6.QtGui import QDesktopServices
+
+# QtDBus is optional and may not be available on all systems
+try:
+    from PySide6.QtDBus import QDBusInterface, QDBusConnection, QDBusMessage
+    HAS_QT_DBUS = True
+except Exception:
+    HAS_QT_DBUS = False
+
+IS_WINDOWS = sys.platform.startswith("win")
+IS_MAC = sys.platform == "darwin"
+IS_LINUX = sys.platform.startswith("linux")
+
+class Opener:
+    # ===== public API =====
+    @staticmethod
+    def open_path(path: str, reveal: bool = False) -> bool:
+        """
+        Open file or directory in the system file manager or default application.
+
+        :param path: Path to file or directory
+        :param reveal: If True and path is a file, reveal it in the file manager
+        :return: True if successful, False otherwise
+        """
+        p = os.path.abspath(path)
+
+        if IS_WINDOWS:
+            if reveal and os.path.isfile(p):
+                return Opener._reveal_windows(p)
+            if os.path.isdir(p):
+                return Opener._open_dir_windows(p)
+            return Opener._open_file_windows(p)
+
+        if IS_MAC:
+            if reveal and os.path.isfile(p):
+                return Opener._reveal_mac(p)
+            if os.path.isdir(p):
+                return Opener._open_dir_mac(p)
+            return Opener._open_file_mac(p)
+
+        # Linux
+        if reveal and os.path.isfile(p):
+            if Opener._reveal_linux(p):
+                return True
+            # fallback:
+            return Opener._open_dir_linux(os.path.dirname(p) or "/")
+        if os.path.isdir(p):
+            return Opener._open_dir_linux(p)
+        return Opener._open_file_linux(p)
+
+    # ===== Windows =====
+    @staticmethod
+    def _open_dir_windows(path: str) -> bool:
+        """
+        Open directory in Windows Explorer
+
+        :param path: Path to directory
+        :return: True if successful, False otherwise
+        """
+        try:
+            os.startfile(path)
+            return True
+        except Exception:
+            try:
+                subprocess.Popen(["explorer", path])
+                return True
+            except Exception:
+                return False
+
+    @staticmethod
+    def _reveal_windows(path: str) -> bool:
+        """
+        Reveal file in Windows Explorer
+
+        :param path: Path to file
+        :return: True if successful, False otherwise
+        """
+        try:
+            subprocess.Popen(["explorer", "/select,", os.path.normpath(path)])
+            return True
+        except Exception:
+            return Opener._open_dir_windows(os.path.dirname(path) or "C:\\")
+
+    @staticmethod
+    def _open_file_windows(path: str) -> bool:
+        """
+        Open file with default application
+
+        :param path: Path to file
+        :return: True if successful, False otherwise
+        """
+        try:
+            os.startfile(path)
+            return True
+        except Exception:
+            # Qt
+            return QDesktopServices.openUrl(QUrl.fromLocalFile(path))
+
+    # ===== macOS =====
+    @staticmethod
+    def _open_dir_mac(path: str) -> bool:
+        """
+        Open directory in Finder
+
+        :param path: Path to directory
+        :return: True if successful, False otherwise
+        """
+        try:
+            subprocess.Popen(["open", path])
+            return True
+        except Exception:
+            return QDesktopServices.openUrl(QUrl.fromLocalFile(path))
+
+    @staticmethod
+    def _reveal_mac(path: str) -> bool:
+        """
+        Reveal file in Finder
+
+        :param path: Path to file
+        :return: True if successful, False otherwise
+        """
+        try:
+            subprocess.Popen(["open", "-R", path])
+            return True
+        except Exception:
+            return Opener._open_dir_mac(os.path.dirname(path) or "/")
+
+    @staticmethod
+    def _open_file_mac(path: str) -> bool:
+        """
+        Open file with default application
+
+        :param path: Path to file
+        :return: True if successful, False otherwise
+        """
+        try:
+            subprocess.Popen(["open", path])
+            return True
+        except Exception:
+            return QDesktopServices.openUrl(QUrl.fromLocalFile(path))
+
+    # ===== Linux =====
+    @staticmethod
+    def _fm_iface():
+        """
+        Get FileManager1 D-Bus interface if available
+
+        :return: QDBusInterface or None
+        """
+        if not (IS_LINUX and HAS_QT_DBUS):
+            return None
+        bus = QDBusConnection.sessionBus()
+        iface = QDBusInterface(
+            "org.freedesktop.FileManager1",
+            "/org/freedesktop/FileManager1",
+            "org.freedesktop.FileManager1",
+            bus,
+        )
+        return iface if iface.isValid() else None
+
+    @staticmethod
+    def _show_folders_dbus(paths):
+        """
+        Show folders using D-Bus FileManager1 interface
+
+        :param paths: List of folder paths
+        :return: True if successful, False otherwise
+        """
+        iface = Opener._fm_iface()
+        if not iface:
+            return False
+        uris = [QUrl.fromLocalFile(p).toString() for p in paths]
+        reply = iface.call("ShowFolders", uris, "")
+        return reply.type() != QDBusMessage.ErrorMessage
+
+    @staticmethod
+    def _show_items_dbus(paths):
+        """
+        Show items using D-Bus FileManager1 interface
+
+        :param paths: List of item paths
+        :return: True if successful, False otherwise
+        """
+        iface = Opener._fm_iface()
+        if not iface:
+            return False
+        uris = [QUrl.fromLocalFile(p).toString() for p in paths]
+        reply = iface.call("ShowItems", uris, "")
+        return reply.type() != QDBusMessage.ErrorMessage
+
+    @staticmethod
+    def _open_with_cli_linux(path):
+        """
+        Open path using common CLI tools (xdg-open, gio)
+
+        :param path: Path to file or directory
+        :return: True if successful, False otherwise
+        """
+        for cmd in (["xdg-open", path], ["gio", "open", path]):
+            if shutil.which(cmd[0]):
+                try:
+                    subprocess.Popen(cmd)
+                    return True
+                except Exception:
+                    pass
+        return False
+
+    @staticmethod
+    def _open_dir_linux(path: str) -> bool:
+        """
+        Open directory in default file manager
+
+        :param path: Path to directory
+        :return: True if successful, False otherwise
+        """
+        if Opener._show_folders_dbus([path]):
+            return True
+        if QDesktopServices.openUrl(QUrl.fromLocalFile(path)):
+            return True
+        return Opener._open_with_cli_linux(path)
+
+    @staticmethod
+    def _reveal_linux(path: str) -> bool:
+        """
+        Reveal file in default file manager
+
+        :param path: Path to file
+        :return: True if successful, False otherwise
+        """
+        if Opener._show_items_dbus([path]):
+            return True
+        return False
+
+    @staticmethod
+    def _open_file_linux(path: str) -> bool:
+        """
+        Open file with default application
+
+        :param path: Path to file
+        :return: True if successful, False otherwise
+        """
+        if QDesktopServices.openUrl(QUrl.fromLocalFile(path)):
+            return True
+        return Opener._open_with_cli_linux(path)

pygpt_net/core/filesystem/url.py

@@ -23,19 +23,12 @@ class Url:
 
     def handle(self,  url: QUrl):
         """
-        Handle URL
+        Handle URL, bridge action or local file
 
         :param url: url
         """
-        extra_schemes = [
-            'extra-audio-read',
-            'extra-code-copy',
-            'extra-copy',
-            'extra-delete',
-            'extra-edit',
-            'extra-join',
-            'extra-replay',
-        ]
+        if not url.toString().strip():
+            return
 
         # JS bridge
         if url.toString().startswith('bridge://open_find'):
@@ -50,8 +43,18 @@ class Url:
             pid = self.window.controller.ui.tabs.get_current_pid()
             if pid in self.window.ui.nodes['output']:
                 self.window.ui.nodes['output'][pid].on_focus_js()
+            return
 
         # -------------
+        extra_schemes = (
+            'extra-audio-read',
+            'extra-code-copy',
+            'extra-copy',
+            'extra-delete',
+            'extra-edit',
+            'extra-join',
+            'extra-replay'
+        )
 
         # local file
         if not url.scheme().startswith('http') and url.scheme() not in extra_schemes:

pygpt_net/core/platforms/platforms.py

@@ -6,11 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.18 17:00:00                  #
+# Updated Date: 2025.08.25 18:00:00                  #
 # ================================================== #
 
 import platform
 import os
+import sys
 
 from PySide6 import QtCore, QtWidgets
 from PySide6.QtSvg import QSvgRenderer
@@ -87,7 +88,7 @@ class Platforms:
 
         :return: True if OS is Linux
         """
-        return self.get_os() == 'Linux'
+        return self.get_os() == 'Linux' or sys.platform.startswith("linux")
 
     def is_mac(self) -> bool:
         """
@@ -95,7 +96,7 @@ class Platforms:
 
         :return: True if OS is MacOS
         """
-        return self.get_os() == 'Darwin'
+        return self.get_os() == 'Darwin' or sys.platform == "darwin"
 
     def is_windows(self) -> bool:
         """
@@ -103,7 +104,7 @@ class Platforms:
 
         :return: True if OS is Windows
         """
-        return self.get_os() == 'Windows'
+        return self.get_os() == 'Windows' or sys.platform.startswith("win")
 
     def is_snap(self) -> bool:
         """

pygpt_net/core/render/plain/helpers.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.14 00:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 
@@ -27,10 +27,7 @@ class Helpers:
         :param text: text to format
         :return: formatted text
         """
-        text = text.strip()
-        #text = text.replace("#~###~", "~###~")  # fix for #~###~ in text (previous versions)
-        #text = text.replace("# ~###~", "~###~")  # fix for # ~###~ in text (previous versions)
-        return text
+        return text.strip()
 
     def post_format_text(self, text: str) -> str:
         """

pygpt_net/core/render/plain/renderer.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.21 00:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from datetime import datetime
@@ -178,11 +178,9 @@ class Renderer(BaseRenderer):
         if clear:
             self.clear_output(meta)
 
-        i = 0
-        for item in items:
+        for i, item in enumerate(items):
             item.idx = i
             self.append_context_item(meta, item)
-            i += 1
 
     def append_input(
             self,
@@ -251,20 +249,23 @@ class Renderer(BaseRenderer):
         :param item: context item
         :param footer: True if it is a footer
         """
-        appended = []
+        appended = set()
         pid = self.get_or_create_pid(meta)
 
         # images
         c = len(item.images)
         if c > 0:
             n = 1
+            pd = self.pids[pid]
+            already = set(pd.images_appended)
             for image in item.images:
-                if image in appended or image in self.pids[pid].images_appended:
+                if image in appended or image in already:
                     continue
                 try:
-                    appended.append(image)
+                    appended.add(image)
                     self.append_raw(meta, item, self.body.get_image_html(image, n, c))
-                    self.pids[pid].images_appended.append(image)
+                    pd.images_appended.append(image)
+                    already.add(image)
                     n += 1
                 except Exception as e:
                     pass
@@ -277,7 +278,7 @@ class Renderer(BaseRenderer):
                 if file in appended:
                     continue
                 try:
-                    appended.append(file)
+                    appended.add(file)
                     self.append_raw(meta, item, self.body.get_file_html(file, n, c))
                     n += 1
                 except Exception as e:
@@ -288,13 +289,16 @@ class Renderer(BaseRenderer):
         if c > 0:
             urls_str = []
             n = 1
+            pd = self.pids[pid]
+            already = set(pd.urls_appended)
             for url in item.urls:
-                if url in appended or url in self.pids[pid].urls_appended:
+                if url in appended or url in already:
                     continue
                 try:
-                    appended.append(url)
+                    appended.add(url)
                     urls_str.append(self.body.get_url_html(url, n, c))
-                    self.pids[pid].urls_appended.append(url)
+                    pd.urls_appended.append(url)
+                    already.add(url)
                     n += 1
                 except Exception as e:
                     pass
@@ -337,8 +341,9 @@ class Renderer(BaseRenderer):
         raw_chunk = str(text_chunk)
 
         if begin:
-            self.pids[pid].buffer = ""  # reset buffer
-            self.pids[pid].is_cmd = False  # reset command flag
+            pd = self.pids[pid]
+            pd.buffer = ""
+            pd.is_cmd = False
 
             if self.is_timestamp_enabled() and item.output_timestamp is not None:
                 name = ""
@@ -386,13 +391,12 @@ class Renderer(BaseRenderer):
         :param text: text to append
         """
         node = self.get_output_node(meta)
-        prev_text = node.toPlainText()
-        if prev_text != "":
-            prev_text += "\n\n"
-        new_text = f"{prev_text}{text.strip()}"
-        node.setPlainText(new_text)
-        cur = node.textCursor()  # Move cursor to end of text
+        cur = node.textCursor()
         cur.movePosition(QTextCursor.End)
+        if not node.document().isEmpty():
+            cur.insertText("\n\n")
+        cur.insertText(text.strip())
+        node.setTextCursor(cur)
 
     def append_chunk_start(self, meta: CtxMeta, ctx: CtxItem):
         """
@@ -437,14 +441,9 @@ class Renderer(BaseRenderer):
         :param end: end of the line character
         """
         node = self.get_output_node(meta)
-        cur = node.textCursor()  # Move cursor to end of text
+        cur = node.textCursor()
         cur.movePosition(QTextCursor.End)
-        s = f"{str(text)}{end}"
-        while s:
-            head, sep, s = s.partition("\n")  # Split line at LF
-            cur.insertText(head)
-            if sep:
-                cur.insertText("\n")
+        cur.insertText(f"{str(text)}{end}")
         node.setTextCursor(cur)
 
     def append_timestamp(
@@ -549,9 +548,6 @@ class Renderer(BaseRenderer):
         for node in self.get_all_nodes():
             try:
                 node.clear()
-                node.document().setMarkdown("")
-                node.document().setHtml("")
-                node.setPlainText("")
             except Exception as e:
                 pass
 

pygpt_net/core/render/web/body.py

@@ -881,7 +881,7 @@ class Body:
                         }
                     });
                 });
-                setTimeout(cycleTips, 60000);  // after 60 seconds
+                setTimeout(cycleTips, 10000);  // after 10 seconds
                 </script>
             </head>
             <body """

pygpt_net/core/settings/settings.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 22:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 import copy
@@ -15,7 +15,10 @@ import os
 import shutil
 from typing import Optional, Dict, Any, List
 
+from PySide6.QtWidgets import QApplication
+
 from pygpt_net.core.events import RenderEvent
+from pygpt_net.utils import trans
 
 
 class Settings:
@@ -116,7 +119,7 @@ class Settings:
         """Load defaults from file"""
         file = self.window.ui.dialog['config.editor'].file
         self.load_editor(file)
-        self.window.update_status("Restored from user file: {}".format(file))
+        self.window.update_status(f"Restored from user file: {file}")
 
     def load_default_editor_app(self):
         """Load defaults from file (app)"""
@@ -125,11 +128,11 @@ class Settings:
         if basename.endswith(".css"):
             path = str(os.path.join(self.window.core.config.get_app_path(), "data", "css", basename))
             self.load_editor(file, path)
-            self.window.update_status("Restored from app defaults: {}".format(basename))
+            self.window.update_status(f"Restored from app defaults: {basename}")
         elif basename.endswith(".json"):
             path = str(os.path.join(self.window.core.config.get_app_path(), "data", "config", basename))
             self.load_editor(file, path)
-            self.window.update_status("Restored from app defaults: {}".format(basename))
+            self.window.update_status(f"Restored from app defaults: {basename}")
 
     def load_editor(
             self,
@@ -151,13 +154,14 @@ class Settings:
             self.window.ui.paths['config'].setText(path)
 
         self.window.ui.dialog['config.editor'].file = file
+
         try:
             with open(path, 'r', encoding="utf-8") as f:
                 txt = f.read()
                 self.window.ui.editor['config'].setPlainText(txt)
         except Exception as e:
             self.window.core.debug.log(e)
-            self.window.update_status("Error loading file: {}".format(e))
+            self.window.update_status(f"Error loading file: {e}")
 
     def save_editor(self):
         """Save file to disk"""
@@ -170,8 +174,8 @@ class Settings:
             try:
                 json.loads(data)
             except Exception as e:
-                self.window.update_status("This is not a valid JSON: {}".format(e))
-                self.window.ui.dialogs.alert("This is not a valid JSON: {}".format(e))
+                self.window.update_status(f"This is not a valid JSON: {e}")
+                self.window.ui.dialogs.alert(f"This is not a valid JSON: {e}")
                 return
             path = os.path.join(self.window.core.config.get_user_path(), file)
         elif file.endswith('.css'):
@@ -189,22 +193,48 @@ class Settings:
             backup_path = os.path.join(self.window.core.config.get_user_path(), backup_file)
         if os.path.isfile(path):
             shutil.copyfile(path, backup_path)
-            self.window.update_status("Created backup file: {}".format(backup_file))
+            self.window.update_status(f"Created backup file: {backup_file}")
+
+        prev_content = None
+        if os.path.isfile(path):
+            try:
+                with open(path, 'r', encoding="utf-8") as f:
+                    prev_content = f.read()
+            except Exception as e:
+                pass
 
         # save changes to current file
         try:
             with open(path, 'w', encoding="utf-8") as f:
                 f.write(data)
-            self.window.update_status("Saved file: {}".format(path))
-            self.window.ui.dialogs.alert("Saved file: {}".format(path))
+            self.window.update_status(f"Saved file: {path}")
+        except Exception as e:
+            self.window.core.debug.log(e)
+            self.window.update_status(f"Error saving file: {path}")
+            return  # abort if error
+
+        if prev_content == data:
+            self.window.update_status(f"Saved file: {path}")
+            self.window.ui.dialogs.alert(f"Saved file: {path}")
+            return  # no changes made, no need to reload
+
+        if file in ("config.json", "models.json") or file.endswith('.css'):
+            self.window.update_status(trans("status.reloading"))
+
+        QApplication.processEvents() # process events to update UI
+
+        try:
             if file == "config.json":
                 self.window.core.config.load_config()  # reload config
             elif file == "models.json":
                 self.window.core.models.load()  # reload models
             elif file.endswith('.css'):
-                event = RenderEvent(RenderEvent.ON_THEME_CHANGE)
-                self.window.dispatch(event)
+                self.window.dispatch(RenderEvent(RenderEvent.ON_THEME_CHANGE))
                 self.window.controller.theme.reload(force=True)  # reload theme
+            self.window.update_status(f"Saved file: {path}")
+            self.window.ui.dialogs.alert(f"Saved file: {path}")
         except Exception as e:
             self.window.core.debug.log(e)
-            self.window.update_status("Error saving file: {}".format(path))
+            self.window.update_status(f"Error reloading saved file: {path}")
+
+