pygpt-net 2.6.48__py3-none-any.whl → 2.6.50__py3-none-any.whl

pygpt_net/tools/code_interpreter/ui/html.py

@@ -6,16 +6,16 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.24 23:00:00                  #
+# Updated Date: 2025.09.16 02:00:00                  #
 # ================================================== #
 
 import json
 import re
 from typing import Optional
 
-from PySide6.QtCore import Qt, QObject, Signal, Slot, QEvent, QTimer
+from PySide6.QtCore import Qt, QObject, Signal, Slot, QEvent, QTimer, QUrl, QCoreApplication, QEventLoop
 from PySide6.QtWebChannel import QWebChannel
-from PySide6.QtWebEngineCore import QWebEngineSettings, QWebEnginePage
+from PySide6.QtWebEngineCore import QWebEngineSettings, QWebEnginePage, QWebEngineProfile
 from PySide6.QtWebEngineWidgets import QWebEngineView
 from PySide6.QtGui import QAction, QIcon, QKeySequence
 from PySide6.QtWidgets import QMenu
@@ -25,6 +25,7 @@ from pygpt_net.core.text.web_finder import WebFinder
 from pygpt_net.tools.code_interpreter.body import Body
 from pygpt_net.utils import trans
 
+
 class CodeBlock:
     def __init__(
             self,
@@ -109,32 +110,119 @@ class HtmlOutput(QWebEngineView):
         self.is_dialog = False
         self.nodes = []  # code blocks
 
+        # OpenGL widgets
+        self._glwidget = None
+        self._glwidget_filter_installed = False
+        self._unloaded = False  # flag to check if unloaded
+        self._destroyed = False
+
+        # self._profile = self._make_profile(self)
+        self.setPage(CustomWebEnginePage(self.window, self, profile=None))
+
+    def _make_profile(self, parent=None) -> QWebEngineProfile:
+        """Make profile"""
+        profile = QWebEngineProfile()
+        profile.setPersistentCookiesPolicy(QWebEngineProfile.NoPersistentCookies)
+        profile.setSpellCheckEnabled(False)
+        return profile
+
+    def _detach_gl_event_filter(self):
+        """Detach OpenGL widget event filter if installed"""
+        if self._glwidget and self._glwidget_filter_installed:
+            try:
+                self._glwidget.removeEventFilter(self)
+            except Exception as e:
+                self._on_delete_failed(e)
+        self._glwidget = None
+        self._glwidget_filter_installed = False
+
+    def _on_delete_failed(self, e):
+        """
+        Handle delete failure
+
+        :param e: Exception instance
+        """
+        pass
+        # self.window.core.debug.log(e)
+
+    def unload(self):
+        """Unload the current page and free resources"""
+        try:
+            self.hide()
+            p = self.page()
+            p.triggerAction(QWebEnginePage.Stop)
+            p.setUrl(QUrl("about:blank"))
+            p.history().clear()
+            p.setLifecycleState(QWebEnginePage.LifecycleState.Discarded)
+        except Exception as e:
+            self._on_delete_failed(e)
+        finally:
+            self._unloaded = True
+
     def on_delete(self):
         """Clean up on delete"""
+        if self._destroyed:
+            return
+        if not self._unloaded:
+            self.unload()
+
+        self.hide()
+        self._detach_gl_event_filter()
+
         if self.finder:
-            self.finder.disconnect()  # disconnect finder
-            self.finder = None  # delete finder
+            try:
+                self.finder.disconnect()
+            except Exception as e:
+                self._on_delete_failed(e)
+            finally:
+                self.finder = None
 
-        self.tab = None  # clear tab reference
+        self.tab = None
+        self.meta = None
 
-        # delete page
         page = self.page()
-        if page:
-            if hasattr(page, 'bridge'):
-                page.bridge.deleteLater()
-            if hasattr(page, 'channel'):
-                page.channel.deleteLater()
-            if hasattr(page, 'signals') and page.signals:
-                page.signals.deleteLater()
-            page.deleteLater()  # delete page
+        prof = page.profile()
 
         # disconnect signals
-        self.loadFinished.disconnect(self.on_page_loaded)
-        self.customContextMenuRequested.disconnect(self.on_context_menu)
-        self.signals.save_as.disconnect(self.window.controller.chat.render.handle_save_as)
-        self.signals.audio_read.disconnect(self.window.controller.chat.render.handle_audio_read)
+        try:
+            self.loadFinished.disconnect()
+            self.customContextMenuRequested.disconnect()
+            self.signals.save_as.disconnect()
+            self.signals.audio_read.disconnect()
+        except Exception as e:
+            self._on_delete_failed(e)
+
+        try:
+            if hasattr(page, "setWebChannel"):
+                page.setWebChannel(None)
+        except Exception as e:
+            self._on_delete_failed(e)
+
+        try:
+            page.cleanup()
+        except Exception as e:
+            self._on_delete_failed(e)
+
+        """
+        if prof is not None:
+            try:
+                prof.deleteLater()
+            except Exception as e:
+                self._on_delete_failed(e)
+        """
+
+        try:
+            self.deleteLater()
+        except Exception as e:
+            self._on_delete_failed(e)
+
+        try:
+            QCoreApplication.sendPostedEvents(None, QEvent.DeferredDelete)
+            QCoreApplication.processEvents(QEventLoop.AllEvents, 50)
+        except Exception as e:
+            self._on_delete_failed(e)
 
-        self.deleteLater()  # delete widget
+        self._destroyed = True
 
     def init(self, force: bool = False):
         """
@@ -164,7 +252,7 @@ class HtmlOutput(QWebEngineView):
 
     def reload(self):
         """Reload HTML output"""
-        #return
+        # return
         self.reload_css()
 
     def get_nodes(self) -> list:
@@ -203,7 +291,7 @@ class HtmlOutput(QWebEngineView):
 
         :param text: text
         """
-        self.plain+= str(text)
+        self.plain += str(text)
 
     def set_plaintext(self, text: str):
         """
@@ -267,7 +355,7 @@ class HtmlOutput(QWebEngineView):
             if node.content != "":
                 self.nodes.append(node)
                 if self.loaded:
-                        self.insert_output(node)
+                    self.insert_output(node)
         self.update_current_content()
         QTimer.singleShot(100, self.scroll_to_bottom)  # wait for rendering to complete
 
@@ -508,7 +596,7 @@ class HtmlOutput(QWebEngineView):
         menu.addSeparator()
         action = QAction(QIcon(":/icons/search.svg"), trans('text.context_menu.find'), self)
         action.triggered.connect(self.find_open)
-        #action.setShortcut(QKeySequence("Ctrl+F"))
+        # action.setShortcut(QKeySequence("Ctrl+F"))
         menu.addAction(action)
 
         menu.exec_(self.mapToGlobal(position))
@@ -615,14 +703,20 @@ class HtmlOutput(QWebEngineView):
         if (event.type() == QEvent.ChildAdded and
                 source is self and
                 event.child().isWidgetType()):
+            self._detach_gl_event_filter()
             self._glwidget = event.child()
-            self._glwidget.installEventFilter(self)
+            try:
+                self._glwidget.installEventFilter(self)
+                self._glwidget_filter_installed = True
+            except Exception:
+                self._glwidget = None
+                self._glwidget_filter_installed = False
         elif event.type() == event.Type.MouseButtonPress:
             if self.tab:
                 col_idx = self.tab.column_idx
                 self.window.controller.ui.tabs.on_column_focus(col_idx)
         elif event.type() == event.Type.FocusIn:
-            if self.tab is not None:
+            if self.tab:
                 col_idx = self.tab.column_idx
                 self.window.controller.ui.tabs.on_column_focus(col_idx)
         elif event.type() == QEvent.KeyPress:
@@ -633,10 +727,17 @@ class HtmlOutput(QWebEngineView):
 
 class CustomWebEnginePage(QWebEnginePage):
     """Custom WebEnginePage to handle web events"""
-    def __init__(self, window, parent):
-        super(CustomWebEnginePage, self).__init__(window)
+
+    def __init__(self, window, view, profile: QWebEngineProfile = None):
+
+        # use the profile if provided, otherwise the default
+        if profile is not None:
+            super(CustomWebEnginePage, self).__init__(profile, view)
+        else:
+            super(CustomWebEnginePage, self).__init__(view)
+
         self.window = window
-        self.parent = parent
+        self.parent = view
         self.signals = WebEnginePageSignals()
         self.findTextFinished.connect(self.on_find_finished)
         self.zoomFactorChanged.connect(self.on_view_changed)
@@ -687,7 +788,7 @@ class CustomWebEnginePage(QWebEnginePage):
         """On selection changed"""
         pass
 
-    def acceptNavigationRequest(self, url,  _type, isMainFrame):
+    def acceptNavigationRequest(self, url, _type, isMainFrame):
         """
         On navigation (link click) event
 
@@ -698,7 +799,7 @@ class CustomWebEnginePage(QWebEnginePage):
         if _type == QWebEnginePage.NavigationTypeLinkClicked:
             self.window.core.filesystem.url.handle(url)
             return False
-        return super().acceptNavigationRequest(url,  _type, isMainFrame)
+        return super().acceptNavigationRequest(url, _type, isMainFrame)
 
     def javaScriptConsoleMessage(self, level, message, line_number, source_id):
         """
@@ -711,9 +812,40 @@ class CustomWebEnginePage(QWebEnginePage):
         """
         self.signals.js_message.emit(line_number, message, source_id)  # handled in debug controller
 
+    def cleanup(self):
+        """Cleanup method to release resources"""
+        try:
+            self.findTextFinished.disconnect()
+            self.zoomFactorChanged.disconnect()
+            self.selectionChanged.disconnect()
+        except Exception:
+            pass
+
+        if self.bridge:
+            try:
+                self.bridge.cleanup()
+            except Exception:
+                pass
+            self.bridge = None
+
+        if self.channel:
+            try:
+                self.channel.unregisterObject("bridge")
+            except Exception:
+                pass
+            self.channel = None
+
+        if self.signals:
+            try:
+                self.signals.deleteLater()
+            except Exception:
+                pass
+            self.signals = None
+
 
 class Bridge(QObject):
     """Bridge between Python and JavaScript"""
+
     def __init__(self, window):
         super(Bridge, self).__init__(window)
         self.window = window
@@ -754,10 +886,23 @@ class Bridge(QObject):
         """
         self.window.controller.chat.render.scroll = pos
 
+    def cleanup(self):
+        """Cleanup method to release resources"""
+        if self.window:
+            try:
+                self.window = None
+            except Exception:
+                pass
+
+        # delete the bridge object
+        self.deleteLater()
+
+
 class WebEngineSignals(QObject):
     save_as = Signal(str, str)
     audio_read = Signal(str)
 
+
 class WebEnginePageSignals(QObject):
     js_message = Signal(int, str, str)  # on Javascript message
 

pygpt_net/tools/code_interpreter/ui/widgets.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.24 23:00:00                  #
+# Updated Date: 2025.09.16 02:00:00                  #
 # ================================================== #
 
 from PySide6 import QtCore
@@ -100,9 +100,6 @@ class ToolWidget:
         :return: QVBoxLayout
         """
         self.output = HtmlOutput(self.window, self.tool)
-        self.output.setPage(
-            CustomWebEnginePage(self.window, self.output)
-        )
         self.output.signals.save_as.connect(self.window.controller.chat.render.handle_save_as)
         self.output.signals.audio_read.connect(self.window.controller.chat.render.handle_audio_read)
 

pygpt_net/tools/html_canvas/ui/widgets.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.24 23:00:00                  #
+# Updated Date: 2025.09.16 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt, Slot, QUrl, QObject, Signal
@@ -14,7 +14,7 @@ from PySide6.QtWidgets import QVBoxLayout, QCheckBox, QHBoxLayout
 
 from pygpt_net.ui.widget.element.labels import HelpLabel
 from pygpt_net.ui.widget.textarea.editor import BaseCodeEditor
-from pygpt_net.ui.widget.textarea.html import HtmlOutput, CustomWebEnginePage
+from pygpt_net.ui.widget.textarea.html import HtmlOutput
 from pygpt_net.utils import trans
 
 
@@ -61,9 +61,6 @@ class ToolWidget:
         :return: QVBoxLayout
         """
         self.output = CanvasOutput(self.window)
-        self.output.setPage(
-            CustomWebEnginePage(self.window, self.output)
-        )
         self.edit = CanvasEdit(self.window)
         self.edit.setVisible(False)
         self.edit.textChanged.connect(

pygpt_net/ui/widget/tabs/body.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.14 20:00:00                  #
+# Updated Date: 2025.09.16 02:00:00                  #
 # ================================================== #
 
 from typing import Any
@@ -35,6 +35,28 @@ class TabBody(QTabWidget):
             self.on_delete(self)
         self.delete_refs()
 
+    def remove_widget(self, widget: QWidget) -> None:
+        """
+        Remove widget from tab body
+
+        :param widget: widget to remove
+        """
+        layout = self.layout()
+        if layout is not None:
+            layout.removeWidget(widget)
+        self.delete_ref(widget)
+
+    def remove_all_widgets(self) -> None:
+        """
+        Remove all widgets from tab body
+        """
+        layout = self.layout()
+        if layout is not None:
+            while layout.count():
+                item = layout.takeAt(0)
+                widget = item.widget()
+                layout.removeWidget(widget)
+
     def add_ref(self, ref: Any) -> None:
         """
         Add reference to widget in this tab

pygpt_net/ui/widget/textarea/web.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.11 08:00:00                  #
+# Updated Date: 2025.09.16 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt, QObject, Signal, Slot, QEvent, QUrl, QCoreApplication, QEventLoop
@@ -22,6 +22,7 @@ from pygpt_net.core.text.web_finder import WebFinder
 from pygpt_net.ui.widget.tabs.layout import FocusEventFilter
 from pygpt_net.utils import trans
 
+
 class ChatWebOutput(QWebEngineView):
     def __init__(self, window=None):
         """
@@ -47,113 +48,153 @@ class ChatWebOutput(QWebEngineView):
         # OpenGL widgets
         self._glwidget = None
         self._glwidget_filter_installed = False
+        self._unloaded = False
+        self._destroyed = False
 
         # set the page with a shared profile
         self.setUpdatesEnabled(False)  # disable updates until the page is set, re-enable in `on_page_loaded`
 
-        self._profile = QWebEngineProfile(self)
+        # self._profile = self._make_profile(self)
+        self.setPage(CustomWebEnginePage(self.window, self, profile=None))
+
+    def _make_profile(self, parent=None) -> QWebEngineProfile:
+        """Make profile"""
+        profile = QWebEngineProfile(parent)
         # self._profile.setHttpCacheType(QWebEngineProfile.MemoryHttpCache)
         # self._profile.setHttpCacheMaximumSize(32 * 1024 * 1024)  # 32MB
-        self._profile.setPersistentCookiesPolicy(QWebEngineProfile.NoPersistentCookies)
+        profile.setPersistentCookiesPolicy(QWebEngineProfile.NoPersistentCookies)
         # self._profile.setHttpCacheType(QWebEngineProfile.NoCache)
-        self._profile.setSpellCheckEnabled(False)
-        # self._profile.setOffTheRecord(True)
-        self.setPage(CustomWebEnginePage(self.window, self, profile=self._profile))
+        profile.setSpellCheckEnabled(False)
+        return profile
+
 
     def _detach_gl_event_filter(self):
         """Detach OpenGL widget event filter if installed"""
         if self._glwidget and self._glwidget_filter_installed:
             try:
                 self._glwidget.removeEventFilter(self)
-            except Exception:
-                pass
+            except Exception as e:
+                self._on_delete_failed(e)
         self._glwidget = None
         self._glwidget_filter_installed = False
 
+    def _on_delete_failed(self, e):
+        """
+        Handle delete failure
+
+        :param e: Exception instance
+        """
+        pass
+        # self.window.core.debug.log(e)
+
+    def unload(self):
+        """Unload the current page and free resources"""
+        try:
+            self.hide()
+            p = self.page()
+            p.triggerAction(QWebEnginePage.Stop)
+            p.setUrl(QUrl("about:blank"))
+            p.history().clear()
+            p.setLifecycleState(QWebEnginePage.LifecycleState.Discarded)
+        except Exception as e:
+            self._on_delete_failed(e)
+        finally:
+            self._unloaded = True
+
     def on_delete(self):
         """Clean up on delete"""
+        if self._destroyed:
+            return
+        if not self._unloaded:
+            self.unload()
+
         self.hide()
         self._detach_gl_event_filter()
-        
+
         if self.finder:
             try:
                 self.finder.disconnect()
-            except Exception:
-                pass
-            self.finder = None
+            except Exception as e:
+                self._on_delete_failed(e)
+            finally:
+                self.finder = None
 
         self.tab = None
         self.meta = None
 
         # safely unhook signals (may not have been hooked)
         for sig, slot in (
-            (self.loadFinished, self.on_page_loaded),
-            (self.customContextMenuRequested, self.on_context_menu),
-            (self.signals.save_as, getattr(self.window.controller.chat.render, "handle_save_as", None)),
-            (self.signals.audio_read, getattr(self.window.controller.chat.render, "handle_audio_read", None)),
+                (self.loadFinished, self.on_page_loaded),
+                (self.customContextMenuRequested, self.on_context_menu),
+                (self.signals.save_as, getattr(self.window.controller.chat.render, "handle_save_as", None)),
+                (self.signals.audio_read, getattr(self.window.controller.chat.render, "handle_audio_read", None)),
         ):
             if slot:
                 try:
                     sig.disconnect(slot)
-                except Exception:
-                    pass
+                except Exception as e:
+                    self._on_delete_failed(e)
 
         page = self.page()
         page.set_loaded(False)
 
         try:
             page.triggerAction(QWebEnginePage.Stop)
-        except Exception:
-            pass
+        except Exception as e:
+            self._on_delete_failed(e)
+
         try:
             page.setUrl(QUrl("about:blank"))
-        except Exception:
-            pass
+        except Exception as e:
+            self._on_delete_failed(e)
+
         try:
             page.history().clear()
-        except Exception:
-            pass
+        except Exception as e:
+            self._on_delete_failed(e)
+
         try:
             page.setLifecycleState(QWebEnginePage.LifecycleState.Discarded)
-        except Exception:
-            pass
+        except Exception as e:
+            self._on_delete_failed(e)
+
         try:
             if hasattr(page, "setWebChannel"):
                 page.setWebChannel(None)
-        except Exception:
-            pass
-        try:
-            self.disconnect()
-        except Exception:
-            pass
+        except Exception as e:
+            self._on_delete_failed(e)
 
         prof = None
         try:
             prof = page.profile()
-        except Exception:
-            pass
+        except Exception as e:
+            self._on_delete_failed(e)
 
         try:
             page.cleanup()
-        except Exception:
-            pass
+        except Exception as e:
+            self._on_delete_failed(e)
 
+        """
         if prof is not None:
             try:
                 prof.deleteLater()
-            except Exception:
-                pass
+            except Exception as e:
+                self._on_delete_failed(e)
+        """
 
         try:
             self.deleteLater()
-        except Exception:
-            pass
+        except Exception as e:
+            self._on_delete_failed(e)
 
         try:
             QCoreApplication.sendPostedEvents(None, QEvent.DeferredDelete)
             QCoreApplication.processEvents(QEventLoop.AllEvents, 50)
-        except Exception:
-            pass
+        except Exception as e:
+            self._on_delete_failed(e)
+
+        self._destroyed = True
 
     def eventFilter(self, source, event):
         """
@@ -390,6 +431,7 @@ class ChatWebOutput(QWebEngineView):
 
 class CustomWebEnginePage(QWebEnginePage):
     """Custom WebEnginePage to handle web events"""
+
     def __init__(self, window, view, profile: QWebEngineProfile = None):
 
         # use the profile if provided, otherwise the default
@@ -495,12 +537,10 @@ class CustomWebEnginePage(QWebEnginePage):
                 pass
             self.signals = None
 
-        # delete the page object
-        self.deleteLater()
-
 
 class Bridge(QObject):
     """Bridge between Python and JavaScript"""
+
     def __init__(self, window, parent=None):
         super(Bridge, self).__init__(parent)
         self.window = window

{pygpt_net-2.6.48.dist-info → pygpt_net-2.6.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pygpt-net
-Version: 2.6.48
+Version: 2.6.50
 Summary: Desktop AI Assistant powered by: OpenAI GPT-5, GPT-4, o1, o3, Gemini, Claude, Grok, DeepSeek, and other models supported by Llama Index, and Ollama. Chatbot, agents, completion, image generation, vision analysis, speech-to-text, plugins, internet access, file handling, command execution and more.
 License: MIT
 Keywords: ai,api,api key,app,assistant,bielik,chat,chatbot,chatgpt,claude,dall-e,deepseek,desktop,gemini,gpt,gpt-3.5,gpt-4,gpt-4-vision,gpt-4o,gpt-5,gpt-oss,gpt3.5,gpt4,grok,langchain,llama-index,llama3,mistral,o1,o3,ollama,openai,presets,py-gpt,py_gpt,pygpt,pyside,qt,text completion,tts,ui,vision,whisper
@@ -118,7 +118,7 @@ Description-Content-Type: text/markdown
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.6.48** | build: **2025-09-15** | Python: **>=3.10, <3.14**
+Release: **2.6.50** | build: **2025-09-16** | Python: **>=3.10, <3.14**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -3612,6 +3612,16 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.6.50 (2025-09-16)**
+
+- Optimized: Improved memory cleanup when switching profiles and unloading tabs.
+- Fix: Resolved missing PID data in text output.
+- Fix: Enhanced real-time parsing of execute tags.
+
+**2.6.49 (2025-09-16)**
+
+- Fixed: Occasional crashes when focusing on an output container unloaded from memory in the second column.
+
 **2.6.48 (2025-09-15)**
 
 - Added: auto-loading of next items to the list of contexts when scrolling to the end of the list.