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

pygpt_net/ui/widget/textarea/html.py

@@ -6,7 +6,7 @@
 # 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.09 00:00:00                  #
 # ================================================== #
 
 import re
@@ -42,6 +42,15 @@ class HtmlOutput(QWebEngineView):
         self.plain = ""
         self.html_content = ""
         self.meta = None
+        self.tab = None
+
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def set_meta(self, meta: CtxMeta):
         """
@@ -163,6 +172,7 @@ class HtmlOutput(QWebEngineView):
         if success:
             event = RenderEvent(RenderEvent.ON_PAGE_LOAD, {
                 "meta": self.meta,
+                "tab": self.tab,
             })
             self.window.dispatch(event)
 

pygpt_net/ui/widget/textarea/output.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.24 01:00:00                  #
+# Updated Date: 2024.12.09 00:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -38,6 +38,15 @@ class ChatOutput(QTextBrowser):
         self.setOpenLinks(False)
         self.anchorClicked.connect(self.open_external_link)
         self.setWordWrapMode(QTextOption.WordWrap)
+        self.tab = None
+
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def open_external_link(self, url):
         """

pygpt_net/ui/widget/textarea/web.py

@@ -6,21 +6,24 @@
 # 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.09 00:00:00                  #
 # ================================================== #
 
 import re
 
-from PySide6.QtCore import Qt, QObject, Signal, Slot
+from PySide6.QtCore import Qt, QObject, Signal, Slot, QEvent
 from PySide6.QtWebChannel import QWebChannel
 from PySide6.QtWebEngineCore import QWebEngineSettings, QWebEnginePage
 from PySide6.QtWebEngineWidgets import QWebEngineView
 from PySide6.QtGui import QAction, QIcon, QKeySequence
+from PySide6.QtWidgets import QMenu
 
 from pygpt_net.core.events import RenderEvent
 from pygpt_net.item.ctx import CtxMeta
 from pygpt_net.core.text.web_finder import WebFinder
+from pygpt_net.ui.widget.tabs.layout import FocusEventFilter
 from pygpt_net.utils import trans
+
 import pygpt_net.icons_rc
 
 
@@ -38,9 +41,46 @@ class ChatWebOutput(QWebEngineView):
         self.customContextMenuRequested.connect(self.on_context_menu)
         self.signals = WebEngineSignals()
         self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.filter = FocusEventFilter(self, self.on_focus)
+        self.installEventFilter(self)
         self.plain = ""
         self.html_content = ""
         self.meta = None
+        self.tab = None
+
+    def eventFilter(self, source, event):
+        """
+        Focus event filter
+
+        :param source: source
+        :param event: event
+        """
+        if (event.type() == QEvent.ChildAdded and
+                source is self and
+                event.child().isWidgetType()):
+            self._glwidget = event.child()
+            self._glwidget.installEventFilter(self)
+        elif (event.type() == event.Type.MouseButtonPress):
+            col_idx = self.tab.column_idx
+            self.window.controller.ui.tabs.on_column_focus(col_idx)
+        return super().eventFilter(source, event)
+
+    def on_focus(self, widget):
+        """
+        On widget clicked
+
+        :param widget: widget
+        """
+        self.window.controller.ui.tabs.on_column_focus(self.tab.column_idx)
+        self.setFocus()
+
+    def set_tab(self, tab):
+        """
+        Set tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def set_meta(self, meta: CtxMeta):
         """
@@ -72,12 +112,7 @@ class ChatWebOutput(QWebEngineView):
 
         :param position: position
         """
-        menu = self.createStandardContextMenu()
-
-        # remove defaults
-        for action in menu.actions()[::-1]:
-            menu.removeAction(action)
-
+        menu = QMenu(self)
         selected_text = ""
         is_selection = self.page().hasSelection()
         if is_selection:
@@ -138,6 +173,10 @@ class ChatWebOutput(QWebEngineView):
         if self.window.core.config.has("zoom"):
             self.page().setZoomFactor(self.window.core.config.get("zoom"))
 
+    def on_focus_js(self):
+        """Focus JavaScript"""
+        self.window.controller.ui.tabs.on_column_focus(self.tab.column_idx)
+
     def get_zoom_value(self) -> float:
         """
         Get zoom value
@@ -165,6 +204,7 @@ class ChatWebOutput(QWebEngineView):
         if success:
             event = RenderEvent(RenderEvent.ON_PAGE_LOAD, {
                 "meta": self.meta,
+                "tab": self.tab,
             })
             self.window.dispatch(event)
 
@@ -318,4 +358,4 @@ class WebEngineSignals(QObject):
 
 
 class WebEnginePageSignals(QObject):
-    js_message = Signal(int, str, str)  # on Javascript message
+    js_message = Signal(int, str, str)  # on Javascript message

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygpt-net
-Version: 2.4.38
+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.38** | build: **2024.12.08** | 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,25 @@ 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.
+
+- Fixed: Language switch.
+
 **2.4.38 (2024-12-08)**
 
 - Added the ability to select a style for chat display between: Blocks, ChatGPT-like, and ChatGPT-like Wide. New option in the menu: Config -> Theme -> Style...