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

pygpt_net/core/render/base.py

@@ -6,9 +6,12 @@
 # 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.14 08:00:00                  #
 # ================================================== #
 
+from typing import Optional, List
+
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.item.ctx import CtxItem, CtxMeta
 
 
@@ -20,6 +23,15 @@ class BaseRenderer:
         :param window: Window instance
         """
         self.window = window
+        self.tab = None
+
+    def set_tab(self, tab: Tab):
+        """
+        Append tab
+
+        :param tab: Tab
+        """
+        self.tab = tab
 
     def prepare(self):
         """
@@ -43,7 +55,12 @@ class BaseRenderer:
         """
         return self.window.core.config.get("stream")
 
-    def begin(self, meta: CtxMeta, ctx: CtxItem, stream: bool = False):
+    def begin(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            stream: bool = False
+    ):
         """
         Render begin
         
@@ -53,7 +70,12 @@ class BaseRenderer:
         """
         pass
 
-    def end(self, meta: CtxMeta, ctx: CtxItem, stream: bool = False):
+    def end(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            stream: bool = False
+    ):
         """
         Render end
         
@@ -63,7 +85,12 @@ class BaseRenderer:
         """
         pass
 
-    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
         
@@ -73,7 +100,11 @@ class BaseRenderer:
         """
         pass
 
-    def stream_begin(self, meta: CtxMeta, ctx: CtxItem):
+    def stream_begin(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem
+    ):
         """
         Render stream begin
         
@@ -82,7 +113,11 @@ class BaseRenderer:
         """
         pass  # do nothing
 
-    def stream_end(self, meta: CtxMeta, ctx: CtxItem):
+    def stream_end(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem
+    ):
         """
         Render stream end
         
@@ -91,7 +126,10 @@ class BaseRenderer:
         """
         pass  # do nothing    
 
-    def clear_output(self, meta: CtxMeta = None):
+    def clear_output(
+            self,
+            meta: Optional[CtxMeta] = None
+    ):
         """
         Clear output
 
@@ -115,7 +153,12 @@ class BaseRenderer:
         """Reload all outputs, called externally only on theme change to redraw content"""
         pass
 
-    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
         
@@ -125,7 +168,13 @@ class BaseRenderer:
         """
         pass
 
-    def append_input(self, meta: CtxMeta, ctx: CtxItem, flush: bool = True, append: bool = False):
+    def append_input(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            flush: bool = True,
+            append: bool = False
+    ):
         """
         Append text input to output
         
@@ -136,7 +185,11 @@ class BaseRenderer:
         """
         pass
 
-    def append_output(self, meta: CtxMeta, ctx: CtxItem):
+    def append_output(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem
+    ):
         """
         Append text output to output
         
@@ -145,7 +198,12 @@ class BaseRenderer:
         """
         pass
 
-    def append_extra(self, meta: CtxMeta, ctx: CtxItem, footer: bool = False):
+    def append_extra(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            footer: bool = False
+    ):
         """
         Append extra data (images, files, etc.) to output
         
@@ -155,7 +213,13 @@ class BaseRenderer:
         """
         pass
 
-    def append_chunk(self, meta: CtxMeta, ctx: CtxItem, text_chunk: str, begin: bool = False):
+    def append_chunk(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            text_chunk: str,
+            begin: bool = False
+    ):
         """
         Append output chunk to output
         
@@ -218,15 +282,22 @@ class BaseRenderer:
         """
         pass
 
-    def on_page_loaded(self, meta: CtxMeta = None):
+    def on_page_loaded(
+            self,
+            meta: Optional[CtxMeta] = None,
+            tab: Optional[Tab] = None):
         """
         On page loaded callback
 
         :param meta: context meta
+        :param tab: Tab
         """
-        pass
+        self.tab = tab
 
-    def on_enable_edit(self, live: bool = True):
+    def on_enable_edit(
+            self,
+            live: bool = True
+    ):
         """
         On enable edit icons
 
@@ -235,7 +306,10 @@ class BaseRenderer:
         if live:  # default behavior
             self.window.controller.ctx.refresh()
 
-    def on_disable_edit(self, live: bool = True):
+    def on_disable_edit(
+            self,
+            live: bool = True
+    ):
         """
         On disable edit icons
 
@@ -244,7 +318,10 @@ class BaseRenderer:
         if live:  # default behavior
             self.window.controller.ctx.refresh()
 
-    def on_enable_timestamp(self, live: bool = True):
+    def on_enable_timestamp(
+            self,
+            live: bool = True
+    ):
         """
         On enable timestamp
 
@@ -253,7 +330,10 @@ class BaseRenderer:
         if live:  # default behavior
             self.window.controller.ctx.refresh()
 
-    def on_disable_timestamp(self, live: bool = True):
+    def on_disable_timestamp(
+            self,
+            live: bool = True
+    ):
         """
         On disable timestamp
 
@@ -282,7 +362,12 @@ class BaseRenderer:
         """
         pass
 
-    def tool_output_append(self, meta: CtxMeta, content: str):
+    def tool_output_append(
+            self,
+            meta:
+            CtxMeta,
+            content: str
+    ):
         """
         Add tool output (append)
 
@@ -291,7 +376,11 @@ class BaseRenderer:
         """
         pass
 
-    def tool_output_update(self, meta: CtxMeta, content: str):
+    def tool_output_update(
+            self,
+            meta: CtxMeta,
+            content: str
+    ):
         """
         Replace tool output
 
@@ -300,7 +389,10 @@ class BaseRenderer:
         """
         pass
 
-    def tool_output_clear(self, meta: CtxMeta):
+    def tool_output_clear(
+            self,
+            meta: CtxMeta
+    ):
         """
         Clear tool output
 
@@ -308,7 +400,10 @@ class BaseRenderer:
         """
         pass
 
-    def tool_output_begin(self, meta: CtxMeta):
+    def tool_output_begin(
+            self,
+            meta: CtxMeta
+    ):
         """
         Begin tool output
 

pygpt_net/core/render/markdown/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.05 23:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import os
+from typing import Optional, List, Dict
 
 from pygpt_net.item.ctx import CtxItem
 from pygpt_net.utils import trans
@@ -26,7 +27,12 @@ class Body:
         self.window = window
         self.img_width = 400
 
-    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
 
@@ -47,7 +53,12 @@ class Body:
                    img_width=self.img_width,
                    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
 
@@ -64,7 +75,7 @@ class Body:
                    url=url,
                    num=num_str)
 
-    def get_docs_html(self, docs: list) -> str:
+    def get_docs_html(self, docs: List[Dict]) -> str:
         """
         Get Llama-index doc metadata HTML
 
@@ -100,7 +111,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
 
@@ -119,7 +135,11 @@ class Body:
                    path=path,
                    num=num_str)
 
-    def get_action_icons(self, ctx: CtxItem, all: bool = False) -> list:
+    def get_action_icons(
+            self,
+            ctx: CtxItem,
+            all: bool = False
+    ) -> list:
         """
         Get action icons for context item
 
@@ -177,7 +197,7 @@ class Body:
                     )
         return icons
 
-    def get_icon(self, icon: str, title: str = None) -> str:
+    def get_icon(self, icon: str, title: Optional[str] = None) -> str:
         """
         Get icon
 

pygpt_net/core/render/markdown/renderer.py

@@ -6,11 +6,13 @@
 # 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                  #
 # ================================================== #
 
 import re
 from datetime import datetime
+from typing import Optional, List
+
 from PySide6.QtGui import QTextCursor, QTextBlockFormat, QTextCharFormat
 
 from pygpt_net.core.render.base import BaseRenderer
@@ -50,6 +52,8 @@ class Renderer(BaseRenderer):
         
         :param meta: context PID
         """
+        if self.tab is not None:
+            return self.tab.pid  # get PID from tab if exists
         return self.window.core.ctx.output.get_pid(meta)
 
     def get_or_create_pid(self, meta: CtxMeta):
@@ -74,7 +78,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
         
@@ -84,7 +93,12 @@ class Renderer(BaseRenderer):
         """
         self.parser.reset()
 
-    def end(self, meta: CtxMeta, ctx: CtxItem, stream: bool = False):
+    def end(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            stream: bool = False
+    ):
         """
         Render end
             
@@ -95,7 +109,12 @@ class Renderer(BaseRenderer):
         if stream:
             self.reload()  # reload ctx items only if stream
 
-    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
         
@@ -105,7 +124,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
 
@@ -114,7 +137,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
         
@@ -123,7 +150,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
         
@@ -142,7 +174,13 @@ class Renderer(BaseRenderer):
             self.append_context_item(meta, ctx)
             i += 1
 
-    def append_input(self, meta: CtxMeta, ctx: CtxItem, flush: bool = True, append: bool = False):
+    def append_input(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            flush: bool = True,
+            append: bool = False
+    ):
         """
         Append text input to output
         
@@ -184,7 +222,11 @@ class Renderer(BaseRenderer):
 
         self.append_raw(meta, ctx, text.strip(), "msg-user")
 
-    def append_output(self, meta: CtxMeta, ctx: CtxItem):
+    def append_output(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem
+    ):
         """
         Append text output to output
         
@@ -205,7 +247,12 @@ class Renderer(BaseRenderer):
             text = "{}".format(ctx.output)
         self.append_raw(meta, ctx, text.strip(), "msg-bot")
 
-    def append_extra(self, meta: CtxMeta, ctx: CtxItem, footer: bool = False):
+    def append_extra(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            footer: bool = False
+    ):
         """
         Append extra data (images, files, etc.) to output
         
@@ -292,7 +339,13 @@ class Renderer(BaseRenderer):
         if len(appended) > 0:
             self.to_end(meta)
 
-    def append_chunk(self, meta: CtxMeta, ctx: CtxItem, text_chunk: str, begin: bool = False):
+    def append_chunk(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            text_chunk: str,
+            begin: bool = False
+    ):
         """
         Append output chunk to output
 
@@ -351,7 +404,12 @@ class Renderer(BaseRenderer):
         cursor.insertBlock(block_format)
         node.setTextCursor(cursor)
 
-    def append_html_chunk(self, meta: CtxMeta, ctx: CtxItem, html: str):
+    def append_html_chunk(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            html: str
+    ):
         """
         Append HTML chunk to output
         
@@ -375,7 +433,13 @@ class Renderer(BaseRenderer):
         node.setTextCursor(cursor)
         node.append(html.replace("\n", "<br>"))
 
-    def append_raw(self, meta: CtxMeta, ctx: CtxItem, text: str, type: str = "msg-bot"):
+    def append_raw(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            text: str,
+            type: str = "msg-bot"
+    ):
         """
         Append and format raw text to output
         
@@ -400,7 +464,11 @@ class Renderer(BaseRenderer):
         self.get_output_node(meta).append(text)
         self.to_end(meta)
 
-    def append_chunk_start(self, meta: CtxMeta, ctx: CtxItem):
+    def append_chunk_start(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem
+    ):
         """
         Append start of chunk to output
         
@@ -412,7 +480,11 @@ class Renderer(BaseRenderer):
         cursor.movePosition(QTextCursor.End)
         node.setTextCursor(cursor)
 
-    def append_context_item(self, meta: CtxMeta, ctx: CtxItem):
+    def append_context_item(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem
+    ):
         """
         Append context item to output
     
@@ -423,7 +495,13 @@ class Renderer(BaseRenderer):
         self.append_output(meta, ctx)
         self.append_extra(meta, ctx, footer=True)
 
-    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
         
@@ -443,7 +521,12 @@ class Renderer(BaseRenderer):
                 cur.insertHtml("<br>")
         node.setTextCursor(cur)  # Update visible cursor
 
-    def append_timestamp(self, ctx: CtxItem, text: str, type: str = None) -> str:
+    def append_timestamp(
+            self,
+            ctx: CtxItem,
+            text: str,
+            type: Optional[str] = None
+    ) -> str:
         """
         Append timestamp to text
         
@@ -465,8 +548,15 @@ class Renderer(BaseRenderer):
                 text = '<span class="ts">{}:</span> {}'.format(hour, text)
         return text
 
-    def reset(self, meta: CtxMeta = None):
-        """Reset"""
+    def reset(
+            self,
+            meta: Optional[CtxMeta] = None
+    ):
+        """
+        Reset
+
+        :param meta: context meta
+        """
         pid = self.get_or_create_pid(meta)
         if pid is not None:
             self.pids[pid].images_appended = []
@@ -478,8 +568,15 @@ class Renderer(BaseRenderer):
         """
         self.window.controller.ctx.refresh_output()  # if clear all and appends all items again
 
-    def clear_output(self, meta: CtxMeta = None):
-        """Clear output"""
+    def clear_output(
+            self,
+            meta: Optional[CtxMeta] = None
+    ):
+        """
+        Clear output
+
+        :param meta: context meta
+        """
         self.reset(meta)
         self.get_output_node(meta).clear()
 
@@ -510,7 +607,7 @@ class Renderer(BaseRenderer):
         """
         Get output node
         
-       :param meta: context meta
+        :param meta: context meta
         :return: output node
         """
         return self.window.core.ctx.output.get_current(meta)

pygpt_net/core/render/plain/body.py

@@ -6,9 +6,11 @@
 # 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 typing import Optional, List, Dict
+
 from pygpt_net.utils import trans
 
 
@@ -22,7 +24,12 @@ class Body:
         """
         self.window = window
 
-    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
 
@@ -40,7 +47,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
 
@@ -57,7 +69,7 @@ class Body:
                    url=url,
                    num=num_str)
 
-    def get_docs_html(self, docs: list) -> str:
+    def get_docs_html(self, docs: List[Dict]) -> str:
         """
         Get Llama-index doc metadata HTML
 
@@ -94,7 +106,12 @@ class Body:
             html += html_sources
         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