pygpt-net 2.6.57__py3-none-any.whl → 2.6.59__py3-none-any.whl

pygpt_net/tools/code_interpreter/ui/html.py

@@ -810,7 +810,8 @@ class CustomWebEnginePage(QWebEnginePage):
         :param line_number: line number
         :param source_id: source ID
         """
-        self.signals.js_message.emit(line_number, message, source_id)  # handled in debug controller
+        pass
+        # self.signals.js_message.emit(line_number, message, source_id)  # handled in debug controller
 
     def cleanup(self):
         """Cleanup method to release resources"""

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.09.16 02:00:00                  #
+# Updated Date: 2025.09.22 18:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt, Slot, QUrl, QObject, Signal, QSize
@@ -41,7 +41,7 @@ class ToolWidget:
         self.edit = None  # canvas edit
         self.btn_edit = None  # edit checkbox
 
-        # --- Navigation bar state (added) ---
+        # --- Navigation bar state ---
         # This toolbar is shown only when opening via URL (open_url),
         # and hidden when using set_output/load_output.
         self.nav_bar = None
@@ -50,7 +50,7 @@ class ToolWidget:
         self.btn_back = None
         self.btn_next = None
         self.btn_reload = None
-        self.btn_go = None  # "Go" button (text)
+        self.btn_go = None
 
     def on_open(self):
         """On open"""
@@ -88,7 +88,7 @@ class ToolWidget:
             lambda: self.tool.save_output()
         )
 
-        # ---- Navigation bar (added) ----
+        # ---- Navigation bar ----
         # Visible only when navigating URLs via open_url or address bar.
         self.nav_bar = QWidget()
         self.nav_layout = QHBoxLayout(self.nav_bar)
@@ -101,14 +101,14 @@ class ToolWidget:
         nav_height = max(32, min(44, icon_size_px + 16))  # compact, never half-screen
         self.nav_bar.setFixedHeight(nav_height)
 
-        # Buttons (use QPushButton with icons from resources)
+        # Buttons
         self.btn_back = QPushButton()
         self.btn_back.setToolTip("Back")
         self.btn_back.setIcon(QIcon(":/icons/back.svg"))
         self.btn_back.setIconSize(QSize(icon_size_px, icon_size_px))
         self.btn_back.setFixedHeight(nav_height - 8)
         self.btn_back.setEnabled(False)
-        self.btn_back.setAutoDefault(False)  # prevent Enter from triggering this (added)
+        self.btn_back.setAutoDefault(False)  # prevent Enter from triggering this
         try:
             self.btn_back.setDefault(False)
         except Exception:
@@ -116,11 +116,11 @@ class ToolWidget:
 
         self.btn_next = QPushButton()
         self.btn_next.setToolTip("Next")
-        self.btn_next.setIcon(QIcon(":/icons/redo.svg"))  # use redo.svg as "next"
+        self.btn_next.setIcon(QIcon(":/icons/forward.svg"))
         self.btn_next.setIconSize(QSize(icon_size_px, icon_size_px))
         self.btn_next.setFixedHeight(nav_height - 8)
         self.btn_next.setEnabled(False)
-        self.btn_next.setAutoDefault(False)  # (added)
+        self.btn_next.setAutoDefault(False)
         try:
             self.btn_next.setDefault(False)
         except Exception:
@@ -131,17 +131,19 @@ class ToolWidget:
         self.btn_reload.setIcon(QIcon(":/icons/reload.svg"))
         self.btn_reload.setIconSize(QSize(icon_size_px, icon_size_px))
         self.btn_reload.setFixedHeight(nav_height - 8)
-        self.btn_reload.setAutoDefault(False)  # (added)
+        self.btn_reload.setAutoDefault(False)
         try:
             self.btn_reload.setDefault(False)
         except Exception:
             pass
 
-        # "Go" button is text-only as requested
-        self.btn_go = QPushButton("GO")
+        # "Go" button
+        self.btn_go = QPushButton()
         self.btn_go.setToolTip("Open URL")
+        self.btn_go.setIcon(QIcon(":/icons/redo.svg"))
+        self.btn_go.setIconSize(QSize(icon_size_px, icon_size_px))
         self.btn_go.setFixedHeight(nav_height - 8)
-        self.btn_go.setAutoDefault(False)  # avoid stealing Enter (added)
+        self.btn_go.setAutoDefault(False)  # avoid stealing Enter
         try:
             self.btn_go.setDefault(False)
         except Exception:
@@ -185,7 +187,7 @@ class ToolWidget:
 
         output_layout = QVBoxLayout()
         # put navigation bar above the web output
-        output_layout.addWidget(self.nav_bar)  # added
+        output_layout.addWidget(self.nav_bar)
         output_layout.addWidget(self.output)
         output_layout.addWidget(self.edit)
         output_layout.setContentsMargins(0, 0, 0, 0)
@@ -256,9 +258,9 @@ class ToolWidget:
         # Hide navigation bar when loading from local file/path
         self._show_navbar(False)
 
-    # ----------------------
-    # Navigation helpers (added)
-    # ----------------------
+    # ------------------
+    # Navigation helpers
+    # ------------------
     def _show_navbar(self, show: bool):
         """Show/hide the navigation bar."""
         if self.nav_bar:
@@ -287,7 +289,6 @@ class ToolWidget:
         text = self.address_bar.text().strip()
         if not text:
             return
-        # Use fromUserInput to accept entries like 'example.com'
         url = QUrl.fromUserInput(text)
         if url.isValid():
             self._show_navbar(True)
@@ -371,7 +372,7 @@ class CanvasEdit(BaseCodeEditor):
         return super().eventFilter(source, event)
 
 
-# --- Address bar input widget (added) ---
+# --- Address bar input widget ---
 class AddressLineEdit(QLineEdit):
     """
     Custom QLineEdit that ensures Enter triggers opening the typed URL

pygpt_net/tools/web_browser/__init__.py

@@ -0,0 +1,12 @@
+#!/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.09.22 19:00:00                  #
+# ================================================== #
+
+from .tool import *

pygpt_net/tools/web_browser/tool.py

@@ -0,0 +1,232 @@
+#!/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.09.22 19:00:00                  #
+# ================================================== #
+
+from typing import Dict
+
+from PySide6.QtCore import QTimer, Slot
+from PySide6.QtGui import QAction, QIcon
+from PySide6.QtWidgets import QWidget
+
+from pygpt_net.core.tabs.tab import Tab
+from pygpt_net.core.text.utils import output_clean_html, output_html2text
+from pygpt_net.tools.base import BaseTool, TabWidget
+from pygpt_net.utils import trans
+
+from .ui.dialogs import Tool
+from .ui.widgets import ToolSignals
+
+
+class WebBrowser(BaseTool):
+    def __init__(self, *args, **kwargs):
+        """
+        Web Browser tool
+
+        :param window: Window instance
+        """
+        super(WebBrowser, self).__init__(*args, **kwargs)
+        self.id = "web_browser"
+        self.dialog_id = "web_browser"
+        self.has_tab = True
+        self.tab_title = "menu.tools.web_browser"
+        self.tab_icon = ":/icons/web_on.svg"
+        self.opened = False
+        self.is_edit = False
+        self.auto_clear = True
+        self.dialog = None
+        self.is_edit = False
+        self.auto_opened = False
+        self.signals = ToolSignals()
+
+    def setup(self):
+        """Setup"""
+        self.update()
+
+    def on_reload(self):
+        """On app profile reload"""
+        self.setup()
+
+    def update(self):
+        """Update menu"""
+        self.update_menu()
+
+    def update_menu(self):
+        """Update menu"""
+        """
+        if self.opened:
+            self.window.ui.menu['tools.web_browser'].setChecked(True)
+        else:
+            self.window.ui.menu['tools.web_browser'].setChecked(False)
+        """
+
+    def get_dialog_id(self) -> str:
+        """
+        Get dialog ID
+
+        :return: Dialog ID
+        """
+        return self.dialog_id
+
+    def set_url(self, url: str):
+        """
+        Set output URL
+
+        :param url: URL to load
+        """
+        self.signals.url.emit(url)
+
+    def open(self, load: bool = True):
+        """
+        Open HTML canvas dialog
+
+        :param load: Load output data
+        """
+        if not self.opened:
+            self.opened = True
+            self.auto_opened = False
+            self.window.ui.dialogs.open(self.dialog_id, width=800, height=600)
+            self.dialog.widget.on_open()
+            self.update()
+
+    def auto_open(self, load: bool = True):
+        """
+        Auto open canvas dialog or tab
+
+        :param load: Load output data
+        """
+        if self.window.controller.ui.tabs.is_current_tool(self.id):
+            tool_col = self.window.controller.ui.tabs.get_tool_column(self.id)
+            current_col = self.window.controller.ui.tabs.column_idx
+            if tool_col == 1 and tool_col != current_col:
+                self.window.controller.ui.tabs.enable_split_screen(True)  # enable split screen
+            return # do not open if already opened in tab
+        elif self.window.controller.ui.tabs.is_tool(self.id):
+            tab = self.window.controller.ui.tabs.get_first_tab_by_tool(self.id)
+            if tab:
+                tool_col = tab.column_idx
+                current_col = self.window.controller.ui.tabs.column_idx
+                self.window.controller.ui.tabs.switch_tab_by_idx(tab.idx, tab.column_idx)
+                if tool_col == 1 and tool_col != current_col:
+                    self.window.controller.ui.tabs.enable_split_screen(True)  # enable split screen
+                return
+        if not self.auto_opened:
+            self.auto_opened = True
+            self.open(load=load)
+
+    def close(self):
+        """Close HTML canvas dialog"""
+        self.opened = False
+        self.signals.closed.emit()
+        self.window.ui.dialogs.close(self.dialog_id)
+        self.update()
+
+    def toggle(self):
+        """Toggle HTML canvas dialog open/close"""
+        if self.opened:
+            self.close()
+        else:
+            self.open()
+
+    @Slot(str, str)
+    def handle_save_as(self, text: str, type: str = 'txt'):
+        """
+        Handle save as signal
+
+        :param text: Data to save
+        :param type: File type
+        """
+        if type == 'html':
+            text = output_clean_html(text)
+        else:
+            text = output_html2text(text)
+        # fix: QTimer required here to prevent crash if signal emitted from WebEngine window
+        QTimer.singleShot(0, lambda: self.window.controller.chat.common.save_text(text, type))
+
+    def show_hide(self, show: bool = True):
+        """
+        Show/hide HTML canvas window
+
+        :param show: show/hide
+        """
+        if show:
+            self.open()
+        else:
+            self.close()
+
+    def get_toolbar_icon(self) -> QWidget:
+        """
+        Get toolbar icon
+
+        :return: QWidget
+        """
+        return self.window.ui.nodes['icon.web_browser']
+
+    def toggle_icon(self, state: bool):
+        """
+        Toggle canvas icon
+
+        :param state: State
+        """
+        self.get_toolbar_icon().setVisible(state)
+
+    def setup_menu(self) -> Dict[str, QAction]:
+        """
+        Setup main menu
+
+        :return dict with menu actions
+        """
+        actions = {}
+        actions["web_browser"] = QAction(
+            QIcon(":/icons/web_on.svg"),
+            trans("menu.tools.web_browser"),
+            self.window,
+            checkable=False,
+        )
+        actions["web_browser"].triggered.connect(
+            lambda: self.toggle()
+        )
+        return actions
+
+    def as_tab(self, tab: Tab) -> QWidget:
+        """
+        Spawn and return tab instance
+
+        :param tab: Parent Tab instance
+        :return: Tab widget instance
+        """
+
+        tool = Tool(window=self.window, tool=self)  # dialog
+        tool_widget = tool.as_tab()  # ToolWidget
+        widget = TabWidget()
+        widget.from_tool(tool_widget)
+        widget.setup()
+        tool.set_tab(tab)
+        return widget
+
+    def setup_dialogs(self):
+        """Setup dialogs (static)"""
+        self.dialog = Tool(window=self.window, tool=self)
+        self.dialog.setup()
+
+    def setup_theme(self):
+        """Setup theme"""
+        pass
+
+    def get_lang_mappings(self) -> Dict[str, Dict]:
+        """
+        Get language mappings
+
+        :return: dict with language mappings
+        """
+        return {
+            'menu.text': {
+                'tools.web_browser': 'menu.tools.web_browser',
+            }
+        }

pygpt_net/tools/web_browser/ui/dialogs.py

@@ -0,0 +1,123 @@
+#!/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.09.22 19:00:00                  #
+# ================================================== #
+
+import re
+
+from PySide6.QtCore import Qt
+from PySide6.QtGui import QAction, QIcon
+from PySide6.QtWidgets import QMenuBar, QVBoxLayout
+
+from pygpt_net.core.tabs.tab import Tab
+from pygpt_net.ui.widget.dialog.base import BaseDialog
+from pygpt_net.utils import trans
+
+from .widgets import ToolWidget
+
+class Tool:
+    def __init__(self, window=None, tool=None):
+        """
+        HTML/JS canvas dialog
+
+        :param window: Window instance
+        :param tool: Tool instance
+        """
+        self.window = window
+        self.tool = tool  # tool instance
+        self.widget = ToolWidget(window, tool)
+        self.layout = None
+        self.menu_bar = None
+        self.menu = {}
+        self.actions = {}  # menu actions
+
+    def as_tab(self) -> ToolWidget:
+        """
+        Return tool as tab
+
+        :return: ToolWidget
+        """
+        return self.widget
+
+    def set_tab(self, tab: Tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.widget.set_tab(tab)
+
+    def setup(self):
+        """Setup canvas dialog"""
+        self.layout = self.widget.setup()
+
+        id = self.tool.get_dialog_id()
+        dialog = ToolDialog(window=self.window, tool=self.tool)
+        dialog.setLayout(self.layout)
+        dialog.setWindowTitle(trans("menu.tools.web_browser"))
+        dialog.resize(800, 500)
+        self.window.ui.dialog[id] = dialog
+
+    def get_widget(self) -> ToolWidget:
+        """
+        Get widget
+
+        :return: ToolWidget
+        """
+        return self.widget
+
+    def get_tab(self) -> QVBoxLayout:
+        """
+        Get layout
+
+        :return: QVBoxLayout
+        """
+        return self.layout
+
+
+class ToolDialog(BaseDialog):
+    def __init__(self, window=None, id="html_canvas", tool=None):
+        """
+        HTML canvas dialog
+
+        :param window: main window
+        :param id: logger id
+        """
+        super(ToolDialog, self).__init__(window, id)
+        self.window = window
+        self.tool = tool
+
+    def closeEvent(self, event):
+        """
+        Close event
+
+        :param event: close event
+        """
+        self.cleanup()
+        super(ToolDialog, self).closeEvent(event)
+
+    def keyPressEvent(self, event):
+        """
+        Key press event
+
+        :param event: key press event
+        """
+        if event.key() == Qt.Key_Escape:
+            self.cleanup()
+            self.close()  # close dialog when the Esc key is pressed.
+        else:
+            super(ToolDialog, self).keyPressEvent(event)
+
+    def cleanup(self):
+        """Cleanup on close"""
+        if self.window is None or self.tool is None:
+            return
+        self.tool.opened = False
+        self.tool.close()
+        self.tool.update()