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

pygpt_net/ui/widget/tabs/output.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.QtWidgets import QTabWidget, QMenu, QPushButton
@@ -18,6 +18,73 @@ from pygpt_net.utils import trans
 import pygpt_net.icons_rc
 
 
+class AddButton(QPushButton):
+    def __init__(self, window=None, column=None, tabs=None):
+        super(AddButton, self).__init__(QIcon(":/icons/add.svg"), "", window)
+        self.window = window
+        self.column = column
+        self.tabs = tabs
+        self.setFixedSize(30, 25)
+        self.setFlat(True)
+        self.clicked.connect(
+            lambda: self.window.controller.ui.tabs.new_tab(self.column.get_idx())
+        )
+        self.setObjectName('tab-add')
+        self.setProperty('tabAdd', True)
+        self.setToolTip(trans('action.tab.add.chat'))
+
+    def mousePressEvent(self, event):
+        """
+        Mouse press event
+
+        :param event: event
+        """
+        if event.button() == Qt.RightButton:
+            idx = 0
+            column_idx = self.column.get_idx()
+            self.show_menu(idx, column_idx, event.globalPos())
+        super(AddButton, self).mousePressEvent(event)
+
+    def show_menu(self, index: int, column_idx: int, global_pos):
+        """
+        Show context menu
+
+        :param index: index
+        :param column_idx: column index
+        :param global_pos: global position
+        """
+        context_menu = self.prepare_menu(index, column_idx)
+        context_menu.exec(global_pos)
+
+    def prepare_menu(self, index: int, column_idx: int) -> QMenu:
+        """
+        Prepare and return context menu
+
+        :param index: index
+        :param column_idx: column index
+        :return: menu
+        """
+        menu = QMenu(self)
+
+        actions = {}
+        actions['add_chat'] = QAction(QIcon(":/icons/add.svg"), trans('action.tab.add.chat'), self)
+        actions['add_chat'].triggered.connect(
+            lambda: self.tabs.add_tab(index, column_idx, Tab.TAB_CHAT)
+        )
+        actions['add_notepad'] = QAction(QIcon(":/icons/add.svg"), trans('action.tab.add.notepad'), self)
+        actions['add_notepad'].triggered.connect(
+            lambda: self.tabs.add_tab(index, column_idx, Tab.TAB_NOTEPAD)
+        )
+
+        # add chat, add notepad
+        menu.addAction(actions['add_chat'])
+        menu.addAction(actions['add_notepad'])
+
+        # add tools submenu
+        self.window.controller.tools.append_tab_menu(self, menu, index, column_idx)
+
+        return menu
+
 class OutputTabs(QTabWidget):
     def __init__(self, window=None, column=None):
         super(OutputTabs, self).__init__(window)
@@ -31,15 +98,7 @@ class OutputTabs(QTabWidget):
     def init(self):
         """Initialize"""
         # create the [+] button
-        add_button = QPushButton(QIcon(":/icons/add.svg"), "")
-        add_button.setFixedSize(30, 25)
-        add_button.setFlat(True)
-        add_button.clicked.connect(
-            lambda: self.window.controller.ui.tabs.new_tab(self.column.get_idx())
-        )
-        add_button.setObjectName('tab-add')
-        add_button.setProperty('tabAdd', True)
-        add_button.setToolTip(trans('action.tab.add.chat'))
+        add_button = AddButton(self.window, self.column, self)
 
         # add the button to the top right corner of the tab bar
         self.setCornerWidget(add_button, corner=Qt.TopRightCorner)
@@ -94,18 +153,22 @@ class OutputTabs(QTabWidget):
                     self.show_chat_menu(idx, column_idx, event.globalPos())  # chat
                 elif tab.type == Tab.TAB_FILES:
                     self.show_files_menu(idx, column_idx, event.globalPos())  # files
+                elif tab.type == Tab.TAB_TOOL:
+                    self.show_tool_menu(idx, column_idx, event.globalPos())  # tool
                 else:
                     self.show_default_menu(idx, column_idx, event.globalPos()) # default
         super(OutputTabs, self).mousePressEvent(event)
 
-    def get_common_actions(self, index: int, column_idx: int):
+    def prepare_menu(self, index: int, column_idx: int) -> QMenu:
         """
-        Get common actions
+        Prepare and return context menu
 
         :param index: index
         :param column_idx: column index
-        :return: dict
+        :return: menu
         """
+        menu = QMenu(self)
+
         actions = {}
         actions['add_chat'] = QAction(QIcon(":/icons/add.svg"), trans('action.tab.add.chat'), self)
         actions['add_chat'].triggered.connect(
@@ -127,7 +190,24 @@ class OutputTabs(QTabWidget):
         actions['move_left'].triggered.connect(
             lambda: self.window.controller.ui.tabs.move_tab(index, column_idx, 0)
         )
-        return actions
+
+        # add chat, add notepad
+        menu.addAction(actions['add_chat'])
+        menu.addAction(actions['add_notepad'])
+
+        # add tools submenu
+        self.window.controller.tools.append_tab_menu(self, menu, index, column_idx)
+
+        # rename tab
+        menu.addAction(actions['edit'])
+
+        # move tab left, move tab right
+        if column_idx != 0:
+            menu.addAction(actions['move_left'])
+        if column_idx != 1:
+            menu.addAction(actions['move_right'])
+
+        return menu
 
     def show_notepad_menu(self, index: int, column_idx: int, global_pos):
         """
@@ -137,8 +217,8 @@ class OutputTabs(QTabWidget):
         :param column_idx: column index
         :param global_pos: global position
         """
-        context_menu = QMenu()
-        actions = self.get_common_actions(index, column_idx)
+        context_menu = self.prepare_menu(index, column_idx)
+        actions = {}
         actions['close'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close'), self)
         actions['close'].triggered.connect(
             lambda: self.close_tab(index, column_idx)
@@ -147,20 +227,11 @@ class OutputTabs(QTabWidget):
         actions['close_all'].triggered.connect(
             lambda: self.close_all(Tab.TAB_NOTEPAD, column_idx)
         )
-        context_menu.addAction(actions['add_chat'])
-        context_menu.addAction(actions['add_notepad'])
-        context_menu.addAction(actions['edit'])
         context_menu.addAction(actions['close'])
 
         if self.window.core.tabs.count_by_type(Tab.TAB_NOTEPAD) > 1:
             context_menu.addAction(actions['close_all'])
 
-        # move
-        if column_idx != 0:
-            context_menu.addAction(actions['move_left'])
-        if column_idx != 1:
-            context_menu.addAction(actions['move_right'])
-
         context_menu.exec(global_pos)
 
     def show_chat_menu(self, index: int, column_idx: int, global_pos):
@@ -171,8 +242,8 @@ class OutputTabs(QTabWidget):
         :param column_idx: column index
         :param global_pos: global position
         """
-        context_menu = QMenu()
-        actions = self.get_common_actions(index, column_idx)
+        context_menu = self.prepare_menu(index, column_idx)
+        actions = {}
         actions['close'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close'), self)
         actions['close'].triggered.connect(
             lambda: self.close_tab(index, column_idx)
@@ -181,21 +252,12 @@ class OutputTabs(QTabWidget):
         actions['close_all'].triggered.connect(
             lambda: self.close_all(Tab.TAB_CHAT, column_idx)
         )
-        context_menu.addAction(actions['add_chat'])
-        context_menu.addAction(actions['add_notepad'])
-        context_menu.addAction(actions['edit'])
 
         # at least one chat tab must be open
         if self.window.core.tabs.count_by_type(Tab.TAB_CHAT) > 1:
             context_menu.addAction(actions['close'])
             context_menu.addAction(actions['close_all'])
 
-        # move
-        if column_idx != 0:
-            context_menu.addAction(actions['move_left'])
-        if column_idx != 1:
-            context_menu.addAction(actions['move_right'])
-
         context_menu.exec(global_pos)
 
     def show_files_menu(self, index: int, column_idx: int, global_pos):
@@ -206,23 +268,30 @@ class OutputTabs(QTabWidget):
         :param column_idx: column index
         :param global_pos: global position
         """
-        context_menu = QMenu()
-        actions = self.get_common_actions(index, column_idx)
+        context_menu = self.prepare_menu(index, column_idx)
+        actions = {}
         actions['refresh'] = QAction(QIcon(":/icons/reload.svg"), trans('action.refresh'), self)
         actions['refresh'].triggered.connect(
             lambda: self.window.controller.files.update_explorer()
         )
-        context_menu.addAction(actions['add_chat'])
-        context_menu.addAction(actions['add_notepad'])
         context_menu.addAction(actions['refresh'])
-        context_menu.addAction(actions['edit'])
+        context_menu.exec(global_pos)
 
-        # move
-        if column_idx != 0:
-            context_menu.addAction(actions['move_left'])
-        if column_idx != 1:
-            context_menu.addAction(actions['move_right'])
+    def show_tool_menu(self, index: int, column_idx: int, global_pos):
+        """
+        Show tool menu
 
+        :param index: index
+        :param column_idx: column index
+        :param global_pos: global position
+        """
+        context_menu = self.prepare_menu(index, column_idx)
+        actions = {}
+        actions['close'] = QAction(QIcon(":/icons/close.svg"), trans('action.tab.close'), self)
+        actions['close'].triggered.connect(
+            lambda: self.close_tab(index, column_idx)
+        )
+        context_menu.addAction(actions['close'])
         context_menu.exec(global_pos)
 
     def show_default_menu(self, index: int, column_idx: int, global_pos):
@@ -233,18 +302,7 @@ class OutputTabs(QTabWidget):
         :param column_idx: column index
         :param global_pos: global position
         """
-        context_menu = QMenu()
-        actions = self.get_common_actions(index, column_idx)
-        context_menu.addAction(actions['add_chat'])
-        context_menu.addAction(actions['add_notepad'])
-        context_menu.addAction(actions['edit'])
-
-        # move
-        if column_idx != 0:
-            context_menu.addAction(actions['move_left'])
-        if column_idx != 1:
-            context_menu.addAction(actions['move_right'])
-
+        context_menu = self.prepare_menu(index, column_idx)
         context_menu.exec(global_pos)
 
     @Slot()
@@ -278,11 +336,18 @@ class OutputTabs(QTabWidget):
         self.window.controller.ui.tabs.close_all(type, column_idx)
 
     @Slot()
-    def add_tab(self, index: int, column_idx: int, type):
+    def add_tab(self, index: int, column_idx: int, type: int, tool_id: str = None):
         """
-        Add tab
+        Add a new tab
+
         :param index: index
         :param column_idx: column index
         :param type: type
+        :param tool_id: tool id
         """
-        self.window.controller.ui.tabs.append(type, index, column_idx)
+        self.window.controller.ui.tabs.append(
+            type=type,
+            tool_id=tool_id,
+            idx=index,
+            column_idx=column_idx,
+        )

{pygpt_net-2.4.39.dist-info → pygpt_net-2.4.40.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygpt-net
-Version: 2.4.39
+Version: 2.4.40
 Summary: Desktop AI Assistant powered by models: OpenAI o1, GPT-4o, GPT-4, GPT-4 Vision, GPT-3.5, DALL-E 3, Llama 3, Mistral, Gemini, Claude, Bielik, and other models supported by Langchain, Llama Index, and Ollama. Features include chatbot, text completion, image generation, vision analysis, speech-to-text, internet access, file handling, command execution and more.
 Home-page: https://pygpt.net
 License: MIT
@@ -92,7 +92,7 @@ Description-Content-Type: text/markdown
 
 [![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
 > 
@@ -2074,6 +2074,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`
@@ -2084,7 +2088,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*
 
@@ -3963,6 +3967,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.