pygpt-net 2.4.39__py3-none-any.whl → 2.4.40__py3-none-any.whl

CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 2.4.40 (2024-12-13)
+
+- Enhanced Split Screen mode, now promoted from beta to stable.
+- Python Code Interpreter tool added to the Tabs.
+- HTML/JS Canvas tool added to the Tabs.
+- Added attachment icon to the context list if context has attachments.
+- Improved audio playback.
+- Improved web search.
+- Added a thumbnail image to web search results.
+- Added a new commands to web search: "extract_images" and "extract_links".
+- Added the option "Use raw content (without summarization)" to the web search plugin, which provides a more detailed result to the main model.
+- Extended the default maximum result characters to 50,000 in the web search plugin.
+
 ## 2.4.39 (2024-12-09)
 
 - Added "Split Screen" mode (accessible via the switch in the bottom-right corner of the screen), which allows you to work in two windows simultaneously. It is currently experimental (beta). Future updates will include Code Interpreter and Canvas running in tabs.

README.md

@@ -2,7 +2,7 @@
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.4.39** | build: **2024.12.09** | Python: **>=3.10, <3.12**
+Release: **2.4.40** | build: **2024.12.13** | Python: **>=3.10, <3.12**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -1984,6 +1984,10 @@ Per-page content chunk size (max characters per chunk). *Default:* `20000`
 
 Disables SSL verification when crawling web pages. *Default:* `False`
 
+- `Use raw content (without summarization)` *raw*
+
+Return raw content from web search instead of summarized content. Provides more data but consumes more tokens. *Default:* `True`
+
 - `Timeout` *timeout*
 
 Connection timeout (seconds). *Default:* `5`
@@ -1994,7 +1998,7 @@ User agent to use when making requests. *Default:* `Mozilla/5.0`.
 
 - `Max result length` *max_result_length*
 
-Max length of summarized result (characters). *Default:* `1500`
+Max length of the summarized or raw result (characters). *Default:* `50000`
 
 - `Max summary tokens` *summary_max_tokens*
 
@@ -3873,6 +3877,19 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.4.40 (2024-12-13)**
+
+- Enhanced Split Screen mode, now promoted from beta to stable.
+- Python Code Interpreter tool added to the Tabs.
+- HTML/JS Canvas tool added to the Tabs.
+- Added attachment icon to the context list if context has attachments.
+- Improved audio playback.
+- Improved web search.
+- Added a thumbnail image to web search results.
+- Added a new commands to web search: "extract_images" and "extract_links".
+- Added the option "Use raw content (without summarization)" to the web search plugin, which provides a more detailed result to the main model.
+- Extended the default maximum result characters to 50,000 in the web search plugin.
+
 **2.4.39 (2024-12-09)**
 
 - Added "Split Screen" mode (accessible via the switch in the bottom-right corner of the screen), which allows you to work in two windows simultaneously. It is currently experimental (beta). Future updates will include Code Interpreter and Canvas running in tabs.

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,16 @@
+2.4.40 (2024-12-13)
+
+- Enhanced Split Screen mode, now promoted from beta to stable.
+- Python Code Interpreter tool added to the Tabs.
+- HTML/JS Canvas tool added to the Tabs.
+- Added attachment icon to the context list if context has attachments.
+- Improved audio playback.
+- Improved web search.
+- Added a thumbnail image to web search results.
+- Added a new commands to web search: "extract_images" and "extract_links".
+- Added the option "Use raw content (without summarization)" to the web search plugin, which provides a more detailed result to the main model.
+- Extended the default maximum result characters to 50,000 in the web search plugin.
+
 2.4.39 (2024-12-09)
 
 - Added "Split Screen" mode (accessible via the switch in the bottom-right corner of the screen), which allows you to work in two windows simultaneously. It is currently experimental (beta). Future updates will include Code Interpreter and Canvas running in tabs.

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.08 01:00:00                  #
+# Updated Date: 2024.12.13 21:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2024, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.4.39"
-__build__ = "2024.12.09"
+__version__ = "2.4.40"
+__build__ = "2024.12.13"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __website__ = "https://pygpt.net"

pygpt_net/controller/__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.09 00:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
 from pygpt_net.controller.access import Access
@@ -87,15 +87,16 @@ class Controller:
         self.chat.init()
 
         # setup layout
-        self.ui.pre_setup()
         self.layout.setup()
         self.ui.setup()
+        self.ui.tabs.setup()
 
         # setup controllers
         self.lang.setup()
         self.assistant.setup()
         self.chat.setup()
         self.agent.setup()
+        self.tools.setup()
         self.ctx.setup()
         self.presets.setup()
         self.idx.setup()
@@ -105,7 +106,8 @@ class Controller:
         self.attachment.setup()
         self.camera.setup_ui()
         self.access.setup()
-        self.tools.setup()
+
+
 
     def post_setup(self):
         """Post-setup, after plugins are loaded"""

pygpt_net/controller/audio/__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.26 19:00:00                  #
+# Updated Date: 2024.12.13 08:00:00                  #
 # ================================================== #
 
 import os
@@ -200,6 +200,14 @@ class Audio:
         }
         self.window.dispatch(event, all=True)
 
+    def stop_audio(self):
+        """Stop audio playback"""
+        ctx = CtxItem()
+        event = Event(Event.AUDIO_OUTPUT_STOP)
+        event.ctx = ctx
+        event.data = {}
+        self.window.dispatch(event, all=True)
+
     def play_sound(self, filename: str):
         """
         Play sound

pygpt_net/controller/chat/input.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 19:00:00                  #
+# Updated Date: 2024.12.12 04:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.bridge import BridgeContext
@@ -52,6 +52,7 @@ class Input:
         """
         self.window.controller.agent.experts.unlock()  # unlock experts
         self.window.controller.agent.llama.reset_eval_step()  # reset evaluation steps
+        self.window.controller.ui.tabs.switch_to_first_chat()  # switch to first active chat tab
 
         # get text from input
         text = self.window.ui.nodes['input'].toPlainText().strip()

pygpt_net/controller/chat/render.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 03:00:00                  #
+# Updated Date: 2024.12.12 04:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Slot, QTimer
@@ -16,7 +16,7 @@ from pygpt_net.core.render.base import BaseRenderer
 from pygpt_net.core.render.markdown.renderer import Renderer as MarkdownRenderer
 from pygpt_net.core.render.plain.renderer import Renderer as PlainTextRenderer
 from pygpt_net.core.render.web.renderer import Renderer as WebRenderer
-from pygpt_net.core.tabs import Tab
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.core.text.utils import output_html2text, output_clean_html
 from pygpt_net.item.ctx import CtxItem, CtxMeta
 

pygpt_net/controller/ctx/__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.09 00:00:00                  #
+# Updated Date: 2024.12.12 04:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import QModelIndex
@@ -19,7 +19,7 @@ from .summarizer import Summarizer
 from .extra import Extra
 
 from pygpt_net.utils import trans
-from pygpt_net.core.tabs import Tab
+from pygpt_net.core.tabs.tab import Tab
 
 
 class Ctx:

pygpt_net/controller/debug/__init__.py

@@ -15,6 +15,8 @@ from logging import ERROR, WARNING, INFO, DEBUG
 from PySide6.QtCore import Slot, QObject
 from PySide6.QtGui import QTextCursor
 
+from pygpt_net.core.events import RenderEvent
+
 
 class Debug(QObject):
     def __init__(self, window=None):
@@ -53,8 +55,17 @@ class Debug(QObject):
 
     def toggle_menu(self):
         """Toggle debug menu"""
-        stage = self.window.core.config.get('debug')
-        self.window.ui.menu['menu.debug'].menuAction().setVisible(stage)
+        state = self.window.core.config.get('debug')
+        self.window.ui.menu['menu.debug'].menuAction().setVisible(state)
+
+    def toggle_render(self):
+        """Toggle render debug"""
+        value = self.window.ui.menu['debug.render'].isChecked()
+        self.window.core.config.set('debug.render', value)
+        self.window.core.config.save()
+        event = RenderEvent(RenderEvent.ON_THEME_CHANGE)
+        self.window.dispatch(event)
+        self.window.controller.ctx.refresh()
 
     def set_log_level(self, level: str = 'error'):
         """

pygpt_net/controller/kernel/__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.21 20:00:00                  #
+# Updated Date: 2024.12.13 08:00:00                  #
 # ================================================== #
 
 import time
@@ -251,6 +251,7 @@ class Kernel(QObject):
         """
         self.halt = True
         self.window.controller.chat.common.stop(exit=exit)  # it stops legacy agent also
+        self.window.controller.audio.stop_audio()
         if not exit:
             self.window.dispatch(KernelEvent(KernelEvent.STOP))
             self.set_state(KernelEvent(KernelEvent.STATE_IDLE, {"msg": trans("status.stopped")}))

pygpt_net/controller/notepad.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 00:00:00                  #
+# Updated Date: 2024.12.12 01:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QTextCursor
@@ -38,13 +38,14 @@ class Notepad:
         """
         if idx is None:
             idx = self.window.core.tabs.count_by_type(Tab.TAB_NOTEPAD) + 1
-        self.window.ui.notepad[idx] = NotepadWidget(self.window)
-        self.window.ui.notepad[idx].id = idx
-        self.window.ui.notepad[idx].textarea.id = idx
+        data_id = idx
+        self.window.ui.notepad[data_id] = NotepadWidget(self.window)
+        self.window.ui.notepad[data_id].id = idx
+        self.window.ui.notepad[data_id].textarea.id = idx
         title = trans('output.tab.notepad')
         title += " " + str(idx)
-        children = self.window.core.tabs.from_widget(self.window.ui.notepad[idx])
-        return children, idx
+        children = self.window.core.tabs.from_widget(self.window.ui.notepad[data_id])
+        return children, idx, data_id
 
     def load(self):
         """Load all notepads contents"""

pygpt_net/controller/theme/nodes.py

@@ -6,9 +6,9 @@
 # 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.12.12 01:00:00                  #
 # ================================================== #
-# 
+
 from pygpt_net.core.events import RenderEvent
 
 
@@ -93,9 +93,6 @@ class Nodes:
                     continue
                 self.apply(key, type)
 
-        # self.window.interpreter.update_stylesheet(self.window.controller.theme.style('font.chat.output'))
-        # self.window.ui.nodes['interpreter.input'].update_stylesheet(self.window.controller.theme.style('font.chat.input'))
-
         # apply to notepads
         num_notepads = self.window.controller.notepad.get_num_notepads()
         if num_notepads > 0:

pygpt_net/controller/tools/__init__.py

@@ -6,10 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.07 23:00:00                  #
+# Updated Date: 2024.12.12 01:00:00                  #
 # ================================================== #
 
+from PySide6.QtGui import QAction, QIcon
+from PySide6.QtWidgets import QTabWidget, QMenu
+
 from pygpt_net.core.tabs.tab import Tab
+from pygpt_net.utils import trans
+
 
 class Tools:
     def __init__(self, window=None):
@@ -44,6 +49,37 @@ class Tools:
         if idx is not None:
             self.window.controller.ui.tabs.switch_tab_by_idx(idx)
 
+    def append_tab_menu(
+            self,
+            parent: QTabWidget,
+            menu: QMenu,
+            idx: int,
+            column_idx: int
+    ) -> QMenu:
+        """
+        Append tab menu
+
+        :param parent: parent widget
+        :param menu: menu
+        :param idx: tab index
+        :param column_idx: column index
+        :return: tab add submenu
+        """
+        submenu = menu.addMenu(QIcon(":/icons/add.svg"), trans("action.tab.add.tool"))
+        tools = self.window.tools.get_all()
+        for id in tools:
+            tool = tools[id]
+            if not tool.has_tab:
+                continue
+            icon = tool.tab_icon
+            title = trans(tool.tab_title)
+            action = QAction(QIcon(icon), title, parent)
+            action.triggered.connect(
+                lambda idx=idx, column_idx=column_idx, id=id: parent.add_tab(idx, column_idx, Tab.TAB_TOOL, id)
+            )
+            submenu.addAction(action)
+        return submenu
+
     def get_tab_tools(self) -> dict:
         """
         Get tab tools

pygpt_net/controller/ui/__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.21 20:00:00                  #
+# Updated Date: 2024.12.09 23:00:00                  #
 # ================================================== #
 
 from PySide6.QtGui import QColor
@@ -47,10 +47,6 @@ class UI:
         self.update()
         self.init_toolbox()
 
-    def pre_setup(self):
-        """Post setup UI"""
-        self.tabs.setup()
-
     def update(self):
         """Update all elements"""
 

pygpt_net/controller/ui/tabs.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 03:00:00                  #
+# Updated Date: 2024.12.12 01:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import QTimer
@@ -32,6 +32,7 @@ class Tabs:
         self.column_idx = 0
         self.tmp_column_idx = 0
         self.locked = False
+        self.col = {}
 
     def setup(self):
         """Setup tabs"""
@@ -53,7 +54,8 @@ class Tabs:
             title: str,
             icon=None,
             child=None,
-            data_id=None
+            data_id=None,
+            tool_id=None,
     ):
         """
         Add a new tab
@@ -63,37 +65,55 @@ class Tabs:
         :param icon: Tab icon
         :param child: Tab child (child widget)
         :param data_id: Tab data ID (child data ID)
+        :param tool_id: Tool ID
         """
         self.window.core.tabs.add(
             type=type,
             title=title,
             icon=icon,
             child=child,
-            data_id=data_id
+            data_id=data_id,
+            tool_id=tool_id
         )
 
     def append(
             self,
             type: int,
-            idx: int,
+            tool_id: str = None,
+            idx: int = 0,
             column_idx: int = 0
     ):
         """
         Append tab at tab index
 
         :param type: Tab type
+        :param tool_id: Tool ID
         :param idx: Tab index
         :param column_idx: Column index
         """
         self.appended = True  # lock reload in previous tab
         self.column_idx = column_idx  # switch to column
-        self.window.core.tabs.append(type, idx, column_idx)
-        self.switch_tab_by_idx(idx + 1, column_idx)  # switch to new tab
+        tab = self.window.core.tabs.append(
+            type=type,
+            idx=idx,
+            column_idx=column_idx,
+            tool_id=tool_id
+        )
+        self.switch_tab_by_idx(tab.idx, column_idx)  # switch to new tab
 
     def reload_titles(self):
         """Reload tab titles"""
         self.window.core.tabs.reload_titles()
 
+    def update_current(self):
+        """Update current tab"""
+        curr_tab = self.get_current_tab()
+        curr_column = self.get_current_column_idx()
+        if curr_column not in self.col:
+            self.col[curr_column] = -1
+        if curr_tab is not None:
+            self.col[curr_column] = curr_tab.pid
+
     def reload(self):
         """Reload tabs"""
         self.window.core.tabs.reload()
@@ -131,7 +151,6 @@ class Tabs:
                 if meta is not None:
                     self.window.controller.ctx.load(meta.id)  # reload
 
-
         prev_tab = self.current
         prev_column = self.column_idx
         self.current = idx
@@ -156,6 +175,9 @@ class Tabs:
         if prev_tab != idx or prev_column != column_idx:
             self.window.dispatch(AppEvent(AppEvent.TAB_SELECTED))  # app event
 
+        self.window.controller.ui.update()
+        self.update_current()
+
     def get_current_idx(self, column_idx: int = 0) -> int:
         """
         Get current tab index
@@ -234,6 +256,8 @@ class Tabs:
         current_ctx = self.window.core.ctx.get_current()
         if current_ctx is not None and current_ctx != tab.data_id:
             self.window.controller.ctx.select_on_list_only(tab.data_id)
+        self.window.controller.ui.update()
+        self.update_current()
 
     def on_tab_clicked(self, idx: int, column_idx: int = 0):
         """
@@ -245,6 +269,7 @@ class Tabs:
         self.current = idx
         self.column_idx = column_idx
         self.on_column_changed()
+        self.update_current()
 
     def on_column_focus(self, idx: int):
         """
@@ -254,6 +279,7 @@ class Tabs:
         """
         self.column_idx = idx
         self.on_column_changed()
+        self.update_current()
 
     def on_tab_dbl_clicked(self, idx: int, column_idx: int = 0):
         """
@@ -264,6 +290,7 @@ class Tabs:
         """
         self.column_idx = column_idx
         self.on_tab_changed(idx, column_idx)
+        self.update_current()
 
     def on_tab_closed(self, idx: int, column_idx: int = 0):
         """
@@ -272,7 +299,10 @@ class Tabs:
         :param idx: tab index
         :param column_idx: column index
         """
+        if self.locked:
+            return
         self.window.core.tabs.remove_tab_by_idx(idx, column_idx)
+        self.update_current()
 
     def on_tab_moved(self, idx: int, column_idx: int = 0):
         """
@@ -281,7 +311,10 @@ class Tabs:
         :param idx: tab index
         :param column_idx: column index
         """
+        if self.locked:
+            return
         self.window.core.tabs.update()
+        self.update_current()
 
     def close(self, idx: int, column_idx: int = 0):
         """
@@ -291,6 +324,7 @@ class Tabs:
         :param column_idx: column index
         """
         self.on_tab_closed(idx, column_idx)
+        self.update_current()
 
     def close_all(
             self,
@@ -315,6 +349,7 @@ class Tabs:
             return
         column_idx = self.tmp_column_idx
         self.window.core.tabs.remove_all_by_type(type, column_idx)
+        self.update_current()
 
     def next_tab(self):
         """Switch to next tab"""
@@ -487,7 +522,12 @@ class Tabs:
         :param column_idx: column index
         """
         idx = self.get_current_idx(column_idx)
-        self.append(Tab.TAB_CHAT, idx, column_idx)
+        self.append(
+            type=Tab.TAB_CHAT,
+            tool_id=None,
+            idx=idx,
+            column_idx=column_idx
+        )
 
     def restore_data(self):
         """Restore tab data"""
@@ -495,6 +535,9 @@ class Tabs:
         if not data:
             self.switch_tab_by_idx(0, 0)
             return
+
+        # reverse order, second column is first
+        data = dict(reversed(list(data.items())))
         for col_idx in data:
             tab_idx = data[col_idx]
             self.switch_tab_by_idx(int(tab_idx), int(col_idx))
@@ -515,18 +558,67 @@ class Tabs:
         tab = self.window.core.tabs.get_tab_by_index(idx, column_idx)
         self.window.core.tabs.move_tab(tab, new_column_idx)
         self.locked = False
+        # switch to new column
+        self.column_idx = new_column_idx
+        self.on_column_changed()
+        # switch to new tab
+        self.switch_tab_by_idx(tab.idx, new_column_idx)
 
     def toggle_split_screen(self, state):
         """
-        Toggle split screen
+        Toggle split screen mode
 
-        :param state: state
+        :param state: True if split screen is enabled
         """
         if state:
-            #self.rightWidget.show()
+            # self.rightWidget.show()
             self.window.ui.splitters['columns'].setSizes([1, 1])
         else:
-            #self.rightWidget.hide()
+            # self.rightWidget.hide()
             self.window.ui.splitters['columns'].setSizes([1, 0])
+            # set to first column
+            self.column_idx = 0
+            self.on_column_changed()
         self.window.core.config.set("layout.split", state)
         self.window.core.config.save()
+
+    def is_current_by_type(self, type: int) -> bool:
+        """
+        Check if one of current tabs is of given type
+
+        :param type: tab type
+        :return: True if one of tab is of given type
+        """
+        for col in self.col:
+            pid = self.col[col]
+            tab = self.window.core.tabs.get_tab_by_pid(pid)
+            if tab is not None and tab.type == type:
+                return True
+
+    def is_current_tool(self, tool_id: str) -> bool:
+        """
+        Check if one of current tabs is of given tool ID
+
+        :param tool_id: tool ID
+        :return: True if one of tab is of given tool ID
+        """
+        for col in self.col:
+            pid = self.col[col]
+            tab = self.window.core.tabs.get_tab_by_pid(pid)
+            if tab is not None and tab.tool_id == tool_id:
+                return True
+
+    def switch_to_first_chat(self):
+        """Switch to first chat tab"""
+        if self.is_current_by_type(Tab.TAB_CHAT):
+            return
+        # abort if active tab is chat
+        if self.get_current_type() == Tab.TAB_CHAT:
+            return
+        # find first chat tab
+        for col in self.col:
+            pid = self.col[col]
+            tab = self.window.core.tabs.get_tab_by_pid(pid)
+            if tab is not None and tab.type == Tab.TAB_CHAT:
+                self.switch_tab_by_idx(tab.idx, col)
+                return