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

pygpt_net/core/render/plain/renderer.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.05 23:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 from datetime import datetime
@@ -128,7 +128,7 @@ class Renderer(BaseRenderer):
         :param clear: True if clear all output before append
         """
         if clear:
-            self.clear_output()
+            self.clear_output(meta)
 
         i = 0
         for item in items:
@@ -399,7 +399,7 @@ class Renderer(BaseRenderer):
         :param meta: context meta
         """
         self.reset()
-        self.get_output_node().clear()
+        self.get_output_node(meta).clear()
 
     def clear_input(self):
         """Clear input"""

pygpt_net/core/render/web/body.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 04:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 import os
@@ -46,21 +46,35 @@ class Body:
 
         :return: CSS styles
         """
-        dark_styles = ["dracula", "fruity", "github-dark", "gruvbox-dark", "inkpot", "material", "monokai",
-                       "native", "nord", "nord-darker", "one-dark", "paraiso-dark", "rrt", "solarized-dark",
-                       "stata-dark", "vim", "zenburn"]
-        style = self.window.core.config.get("render.code_syntax")
-        if style is None or style == "":
-            style = "default"
+        syntax_dark = [
+            "dracula",
+            "fruity",
+            "github-dark",
+            "gruvbox-dark",
+            "inkpot",
+            "material",
+            "monokai",
+            "native",
+            "nord",
+            "nord-darker",
+            "one-dark",
+            "paraiso-dark",
+            "rrt",
+            "solarized-dark",
+            "stata-dark",
+            "vim",
+            "zenburn",
+        ]
+        syntax_style = self.window.core.config.get("render.code_syntax")
+        if syntax_style is None or syntax_style == "":
+            syntax_style = "default"
         fonts_path = os.path.join(self.window.core.config.get_app_path(), "data", "fonts").replace("\\", "/")
         stylesheet = self.window.controller.theme.markdown.get_web_css().replace('%fonts%', fonts_path)
-        if style in dark_styles:
+        if syntax_style in syntax_dark:
             stylesheet += "pre { color: #fff; }"
         else:
             stylesheet += "pre { color: #000; }"
-        content = stylesheet + """
-        """ + self.highlight.get_style_defs()
-        return content
+        return stylesheet + " " + self.highlight.get_style_defs()
 
     def prepare_action_icons(self, ctx: CtxItem) -> str:
         """
@@ -187,9 +201,9 @@ class Body:
         """
         icon_path = os.path.join(
             self.window.core.config.get_app_path(),
-            "data", "icons", "public_filled.svg"
+            "data", "icons", "language.svg"
         )
-        icon = '<img src="file://{}" width="25" height="25" valign="middle" class="extra-src-icon">'.format(icon_path)
+        icon = '<img src="file://{}" class="extra-src-icon">'.format(icon_path)
         num_str = ""
         if num is not None and num_all is not None and num_all > 1:
             num_str = " [{}]".format(num)
@@ -235,7 +249,7 @@ class Body:
             self.window.core.config.get_app_path(),
             "data", "icons", "db.svg"
         )
-        icon = '<img src="file://{}" width="25" height="25" valign="middle" class="extra-src-icon">'.format(icon_path)
+        icon = '<img src="file://{}" class="extra-src-icon">'.format(icon_path)
         if html_sources != "":
             html += "<p>{icon}<small><b>{prefix}:</b></small></p>".format(
                 prefix=trans('chat.prefix.doc'),
@@ -259,7 +273,7 @@ class Body:
             self.window.core.config.get_app_path(),
             "data", "icons", "attachments.svg"
         )
-        icon = '<img src="file://{}" width="25" height="25" valign="middle" class="extra-src-icon">'.format(icon_path)
+        icon = '<img src="file://{}" class="extra-src-icon">'.format(icon_path)
         num_str = ""
         if num is not None and num_all is not None and num_all > 1:
             num_str = " [{}]".format(num)
@@ -311,7 +325,7 @@ class Body:
             html += "</div>"
         return html
 
-    def get_html(self) -> str:
+    def get_html(self, pid: int) -> str:
         """
         Build webview HTML code
 
@@ -319,12 +333,14 @@ class Body:
         """
         classes = []
         classes_str = ""
+        style = self.window.core.config.get("theme.style", "blocks")
         if self.window.core.config.get('render.blocks'):
             classes.append("display-blocks")
         if self.window.core.config.get('ctx.edit_icons'):
             classes.append("display-edit-icons")
         if self.is_timestamp_enabled():
             classes.append("display-timestamp")
+        classes.append("theme-" + style)
         if classes:
             classes_str = ' class="' + " ".join(classes) + '"'
 
@@ -354,13 +370,14 @@ class Body:
         let scrollTimeout = null;
         let prevScroll = 0;
         let bridge;
+        let pid = """ + str(pid) + """
         new QWebChannel(qt.webChannelTransport, function (channel) {
             bridge = channel.objects.bridge;
         });
         history.scrollRestoration = "manual";
         document.addEventListener('keydown', function(event) {
             if (event.ctrlKey && event.key === 'f') {
-                window.location.href = 'bridge://open_find'; // send to bridge
+                window.location.href = 'bridge://open_find:' + pid; // send to bridge
                 event.preventDefault();
             }
             if (event.key === 'Escape') {
@@ -368,6 +385,11 @@ class Body:
                 event.preventDefault();
             }
         });
+        document.addEventListener('click', function(event) {
+            if (event.target.tagName !== 'A' && !event.target.closest('a')) {
+                window.location.href = 'bridge://focus';
+            }
+        });
         function highlightCode() {
             document.querySelectorAll('pre code').forEach(el => {
                 if (!el.classList.contains('hljs')) hljs.highlightElement(el);

pygpt_net/core/render/web/renderer.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 04:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 import json
@@ -19,6 +19,7 @@ from pygpt_net.core.text.utils import has_unclosed_code_tag
 from pygpt_net.item.ctx import CtxItem, CtxMeta
 from pygpt_net.ui.widget.textarea.input import ChatInput
 from pygpt_net.utils import trans
+from pygpt_net.core.tabs import Tab
 
 from .body import Body
 from .helpers import Helpers
@@ -59,16 +60,17 @@ class Renderer(BaseRenderer):
         node.set_meta(meta)
         self.reset(meta)
 
-    def on_page_loaded(self, meta: CtxMeta = None):
+    def on_page_loaded(self, meta: CtxMeta = None, tab: Tab = None):
         """
         On page loaded callback from WebEngine widget
 
         :param meta: context meta
+        :param tab: Tab
         """
         if meta is None:
             return
-        pid = self.get_or_create_pid(meta)
-        if pid is None:
+        pid = tab.pid
+        if pid is None or pid not in self.pids:
             return
         self.pids[pid].loaded = True
         if self.pids[pid].html != "" and not self.pids[pid].use_buffer:
@@ -818,7 +820,7 @@ class Renderer(BaseRenderer):
         if self.pids[pid].loaded:
             return  # wait for page load
 
-        html = self.body.get_html()
+        html = self.body.get_html(pid)
         self.pids[pid].document = html
         self.get_output_node_by_pid(pid).setHtml(html, baseUrl="file://")