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

pygpt_net/core/render/plain/renderer.py

@@ -6,10 +6,12 @@
 # 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.14 08:00:00                  #
 # ================================================== #
 
 from datetime import datetime
+from typing import Optional, List
+
 from PySide6.QtGui import QTextCursor, QTextBlockFormat
 
 from pygpt_net.core.render.base import BaseRenderer
@@ -71,7 +73,12 @@ class Renderer(BaseRenderer):
         if pid is not None:
             self.pids[pid] = PidData(pid, meta)
 
-    def begin(self, meta: CtxMeta, ctx: CtxItem, stream: bool = False):
+    def begin(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            stream: bool = False
+    ):
         """
         Render begin
         
@@ -81,7 +88,12 @@ class Renderer(BaseRenderer):
         """
         self.to_end(meta)
 
-    def end(self, meta: CtxMeta, ctx: CtxItem, stream: bool = False):
+    def end(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            stream: bool = False
+    ):
         """
         Render end
             
@@ -91,7 +103,12 @@ class Renderer(BaseRenderer):
         """
         self.to_end(meta)
 
-    def end_extra(self, meta: CtxMeta, ctx: CtxItem, stream: bool = False):
+    def end_extra(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            stream: bool = False
+    ):
         """
         Render end extra
         
@@ -101,7 +118,11 @@ class Renderer(BaseRenderer):
         """
         self.to_end(meta)
 
-    def stream_begin(self, meta: CtxMeta, ctx: CtxItem):
+    def stream_begin(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem
+    ):
         """
         Render stream begin
 
@@ -110,7 +131,11 @@ class Renderer(BaseRenderer):
         """
         pass  # do nothing
 
-    def stream_end(self, meta: CtxMeta, ctx: CtxItem):
+    def stream_end(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem
+    ):
         """
         Render stream end
 
@@ -119,7 +144,12 @@ class Renderer(BaseRenderer):
         """
         pass  # do nothing
 
-    def append_context(self, meta: CtxMeta, items: list, clear: bool = True):
+    def append_context(
+            self,
+            meta: CtxMeta,
+            items: List[CtxItem],
+            clear: bool = True
+    ):
         """
         Append all context to output
 
@@ -128,7 +158,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:
@@ -136,7 +166,13 @@ class Renderer(BaseRenderer):
             self.append_context_item(meta, item)
             i += 1
 
-    def append_input(self, meta: CtxMeta, item: CtxItem, flush: bool = True, append: bool = False):
+    def append_input(
+            self,
+            meta: CtxMeta,
+            item: CtxItem,
+            flush: bool = True,
+            append: bool = False
+    ):
         """
         Append text input to output
 
@@ -159,7 +195,11 @@ class Renderer(BaseRenderer):
         self.append_raw(meta, item, text.strip())
         self.to_end(meta)
 
-    def append_output(self, meta: CtxMeta, item: CtxItem):
+    def append_output(
+            self,
+            meta: CtxMeta,
+            item: CtxItem
+    ):
         """
         Append text output to output
 
@@ -180,7 +220,12 @@ class Renderer(BaseRenderer):
         self.append_raw(meta, item, text.strip())
         self.to_end(meta)
 
-    def append_extra(self, meta: CtxMeta, item: CtxItem, footer: bool = False):
+    def append_extra(
+            self,
+            meta: CtxMeta,
+            item: CtxItem,
+            footer: bool = False
+    ):
         """
         Append extra data (images, files, etc.) to output
 
@@ -252,7 +297,13 @@ class Renderer(BaseRenderer):
         if len(appended) > 0:
             self.to_end(meta)
 
-    def append_chunk(self, meta: CtxMeta, item: CtxItem, text_chunk: str, begin: bool = False):
+    def append_chunk(
+            self,
+            meta: CtxMeta,
+            item: CtxItem,
+            text_chunk: str,
+            begin: bool = False
+    ):
         """
         Append output chunk to output
 
@@ -286,7 +337,10 @@ class Renderer(BaseRenderer):
         self.pids[pid].buffer += raw_chunk
         self.append(meta, item, self.helpers.format_chunk(text_chunk), "")
 
-    def append_block(self, meta: CtxMeta):
+    def append_block(
+            self,
+            meta: CtxMeta
+    ):
         """
         Append block to output
 
@@ -301,7 +355,12 @@ class Renderer(BaseRenderer):
         cursor.insertBlock(block_format)
         node.setTextCursor(cursor)
 
-    def append_raw(self, meta: CtxMeta, ctx: CtxItem, text: str):
+    def append_raw(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            text: str
+    ):
         """
         Append and format raw text to output
         
@@ -330,7 +389,11 @@ class Renderer(BaseRenderer):
         cursor.movePosition(QTextCursor.End)
         node.setTextCursor(cursor)
 
-    def append_context_item(self, meta: CtxMeta, item: CtxItem):
+    def append_context_item(
+            self,
+            meta: CtxMeta,
+            item: CtxItem
+    ):
         """
         Append context item to output
         
@@ -341,7 +404,13 @@ class Renderer(BaseRenderer):
         self.append_output(meta, item)
         self.append_extra(meta, item)
 
-    def append(self, meta: CtxMeta, ctx: CtxItem, text: str, end: str = "\n"):
+    def append(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            text: str,
+            end: str = "\n"
+    ):
         """
         Append text to output
 
@@ -361,7 +430,11 @@ class Renderer(BaseRenderer):
                 cur.insertText("\n")
         node.setTextCursor(cur)  # Update visible cursor
 
-    def append_timestamp(self, item: CtxItem, text: str) -> str:
+    def append_timestamp(
+            self,
+            item: CtxItem,
+            text: str
+    ) -> str:
         """
         Append timestamp to text
         
@@ -377,7 +450,7 @@ class Renderer(BaseRenderer):
             text = '{}: {}'.format(hour, text)
         return text
 
-    def reset(self, meta: CtxMeta = None):
+    def reset(self, meta: Optional[CtxMeta] = None):
         """
         Reset
 
@@ -392,14 +465,14 @@ class Renderer(BaseRenderer):
         """Reload output, called externally only on theme change to redraw content"""
         self.window.controller.ctx.refresh_output()  # if clear all and appends all items again
 
-    def clear_output(self, meta: CtxMeta = None):
+    def clear_output(self, meta: Optional[CtxMeta] = None):
         """
         Clear output
 
         :param meta: context meta
         """
         self.reset()
-        self.get_output_node().clear()
+        self.get_output_node(meta).clear()
 
     def clear_input(self):
         """Clear input"""
@@ -424,7 +497,10 @@ class Renderer(BaseRenderer):
         """
         return self.window.core.config.get('output_timestamp')
 
-    def get_output_node(self, meta: CtxMeta = None) -> ChatOutput:
+    def get_output_node(
+            self,
+            meta: Optional[CtxMeta] = None
+    ) -> ChatOutput:
         """
         Get output node for current context
         

pygpt_net/core/render/web/body.py

@@ -6,10 +6,11 @@
 # 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.14 08:00:00                  #
 # ================================================== #
 
 import os
+from typing import Optional, List, Dict
 
 from pygpt_net.core.events import Event
 from pygpt_net.item.ctx import CtxItem
@@ -46,23 +47,40 @@ 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:
+    def prepare_action_icons(
+            self,
+            ctx: CtxItem
+    ) -> str:
         """
         Append action icons
 
@@ -78,7 +96,11 @@ class Body:
             html += extra
         return html
 
-    def get_action_icons(self, ctx: CtxItem, all: bool = False) -> list:
+    def get_action_icons(
+            self,
+            ctx: CtxItem,
+            all: bool = False
+    ) -> List[str]:
         """
         Get action icons for context item
 
@@ -141,7 +163,12 @@ class Body:
                 )
         return icons
 
-    def get_icon(self, icon: str, title: str = None, item: CtxItem = None) -> str:
+    def get_icon(
+            self,
+            icon: str,
+            title: Optional[str] = None,
+            item: Optional[CtxItem] = None
+    ) -> str:
         """
         Get icon
 
@@ -154,7 +181,12 @@ class Body:
         return '<img src="file://{}" class="action-img" title="{}" alt="{}" data-id="{}">'.format(
             icon, title, title, item.id)
 
-    def get_image_html(self, url: str, num: int = None, num_all: int = None) -> str:
+    def get_image_html(
+            self,
+            url: str,
+            num: Optional[int] = None,
+            num_all: Optional[int] = None
+    ) -> str:
         """
         Get image HTML
 
@@ -176,7 +208,12 @@ class Body:
                    path=path,
                    num=num_str)
 
-    def get_url_html(self, url: str, num: int = None, num_all: int = None) -> str:
+    def get_url_html(
+            self,
+            url: str,
+            num: Optional[int] = None,
+            num_all: Optional[int] = None
+    ) -> str:
         """
         Get URL HTML
 
@@ -187,19 +224,19 @@ 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)
-        return """{icon}<b>{num}</b> <a href="{url}" title="{url}">{url}</a>""". \
+        return """{icon}<a href="{url}" title="{url}">{url}</a> <small>{num}</small>""". \
             format(url=url,
                    num=num_str,
                    icon=icon,
             )
 
-    def get_docs_html(self, docs: list) -> str:
+    def get_docs_html(self, docs: List[Dict]) -> str:
         """
         Get Llama-index doc metadata HTML
 
@@ -235,7 +272,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'),
@@ -246,7 +283,12 @@ class Body:
             html += "</div> "
         return html
 
-    def get_file_html(self, url: str, num: int = None, num_all: int = None) -> str:
+    def get_file_html(
+            self,
+            url: str,
+            num: Optional[int] = None,
+            num_all: Optional[int] = None
+    ) -> str:
         """
         Get file HTML
 
@@ -259,7 +301,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 +353,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 +361,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 +398,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 +413,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);