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

pygpt_net/controller/chat/render.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 03:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Optional, List
+
 from PySide6.QtCore import Slot, QTimer
 
 from pygpt_net.core.events import RenderEvent
@@ -16,6 +18,7 @@ from pygpt_net.core.render.base import BaseRenderer
 from pygpt_net.core.render.markdown.renderer import Renderer as MarkdownRenderer
 from pygpt_net.core.render.plain.renderer import Renderer as PlainTextRenderer
 from pygpt_net.core.render.web.renderer import Renderer as WebRenderer
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.core.text.utils import output_html2text, output_clean_html
 from pygpt_net.item.ctx import CtxItem, CtxMeta
 
@@ -67,6 +70,7 @@ class Render:
         append = data.get("append", False)
         footer = data.get("footer", False)
         initialized = data.get("initialized", False)
+        tab = data.get("tab")
 
         if name == RenderEvent.BEGIN:
             self.begin(meta, ctx, stream)
@@ -87,7 +91,7 @@ class Render:
             self.stream_end(meta, ctx)
 
         elif name == RenderEvent.ON_PAGE_LOAD:
-            self.on_page_loaded(meta)
+            self.on_page_loaded(meta, tab)
         elif name ==RenderEvent.ON_THEME_CHANGE:
             self.on_theme_change()
         elif name == RenderEvent.ON_LOAD:
@@ -148,7 +152,12 @@ class Render:
         """
         return self.instance().get_pid(meta)
 
-    def begin(self, meta: CtxMeta, ctx: CtxItem, stream: bool = False):
+    def begin(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            stream: bool = False
+    ):
         """
         Render begin
 
@@ -159,7 +168,12 @@ class Render:
         self.instance().begin(meta, ctx, stream)
         self.update()
 
-    def end(self, meta: CtxMeta, ctx: CtxItem, stream: bool = False):
+    def end(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            stream: bool = False
+    ):
         """
         Render end
 
@@ -170,7 +184,12 @@ class Render:
         self.instance().end(meta, ctx, stream)
         self.update()
 
-    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
         
@@ -181,7 +200,11 @@ class Render:
         self.instance().end_extra(meta, ctx, stream)
         self.update()
 
-    def stream_begin(self, meta: CtxMeta, ctx: CtxItem):
+    def stream_begin(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem
+    ):
         """
         Render stream begin
         
@@ -191,7 +214,11 @@ class Render:
         self.instance().stream_begin(meta, ctx)
         self.update()
 
-    def stream_end(self, meta: CtxMeta, ctx: CtxItem):
+    def stream_end(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem
+    ):
         """
         Render stream end
         
@@ -201,7 +228,10 @@ class Render:
         self.instance().stream_end(meta, ctx)
         self.update()
 
-    def clear_output(self, meta: CtxMeta = None):
+    def clear_output(
+            self,
+            meta: Optional[CtxMeta] = None
+    ):
         """
         Clear current active output
 
@@ -214,7 +244,10 @@ class Render:
         """Clear input"""
         self.instance().clear_input()
 
-    def on_load(self, meta: CtxMeta = None):
+    def on_load(
+            self,
+            meta: Optional[CtxMeta] = None
+    ):
         """
         On load (meta)
 
@@ -224,7 +257,10 @@ class Render:
         self.update()
         self.window.controller.ui.tabs.update_tooltip(meta.name)  # update tab tooltip
 
-    def reset(self, meta: CtxMeta = None):
+    def reset(
+            self,
+            meta: Optional[CtxMeta] = None
+    ):
         """
         Reset current meta
 
@@ -238,7 +274,12 @@ class Render:
         self.instance().reload()  # TODO: or all outputs?
         self.update()
 
-    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
 
@@ -249,7 +290,13 @@ class Render:
         self.instance().append_context(meta, items, clear)
         self.update()
 
-    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
         
@@ -261,7 +308,11 @@ class Render:
         self.instance().append_input(meta, ctx, flush=flush, append=append)
         self.update()
 
-    def append_output(self, meta: CtxMeta, ctx: CtxItem):
+    def append_output(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem
+    ):
         """
         Append text output to output
         
@@ -271,7 +322,12 @@ class Render:
         self.instance().append_output(meta, ctx)
         self.update()
 
-    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
         
@@ -282,7 +338,13 @@ class Render:
         self.instance().append_extra(meta, ctx, footer)
         self.update()
 
-    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 stream chunk to output
         
@@ -375,13 +437,18 @@ class Render:
         self.instance().on_reply_submit(ctx)
         self.update()
 
-    def on_page_loaded(self, meta: CtxMeta):
+    def on_page_loaded(
+            self,
+            meta: CtxMeta,
+            tab: Optional[Tab] = None
+    ):
         """
         On page loaded callback
 
         :param meta: context meta
+        :param tab: Tab
         """
-        self.instance().on_page_loaded(meta)  # TODO: send ID with callback
+        self.instance().on_page_loaded(meta, tab)
         self.update()
 
     def on_theme_change(self):
@@ -428,7 +495,11 @@ class Render:
         self.instance().clear_all()
         self.update()
 
-    def tool_output_append(self, meta: CtxMeta, content: str):
+    def tool_output_append(
+            self,
+            meta: CtxMeta,
+            content: str
+    ):
         """
         Add tool output (append)
 
@@ -438,7 +509,11 @@ class Render:
         self.instance().tool_output_append(meta, content)
         self.update()
 
-    def tool_output_update(self, meta: CtxMeta, content: str):
+    def tool_output_update(
+            self,
+            meta: CtxMeta,
+            content: str
+    ):
         """
         Replace tool output
 
@@ -491,7 +566,7 @@ class Render:
         if plain:
             self.window.controller.theme.markdown.clear()
             for pid in self.window.ui.nodes['output_plain']:
-                if self.window.ui.nodes['output'][pid] is not None:
+                if self.window.ui.nodes['output_plain'][pid] is not None:
                     self.window.ui.nodes['output'][pid].setVisible(False)
                     self.window.ui.nodes['output_plain'][pid].setVisible(True)
         else:
@@ -518,7 +593,11 @@ class Render:
                 return self.markdown_renderer
 
     @Slot(str, str)
-    def handle_save_as(self, text: str, type: str = 'txt'):
+    def handle_save_as(
+            self,
+            text: str,
+            type: str = 'txt'
+    ):
         """
         Handle save as signal  # TODO: move to another class
 

pygpt_net/controller/chat/response.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.21 20:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Dict, Any
+
 from pygpt_net.core.types import (
     MODE_AGENT_LLAMA,
     MODE_ASSISTANT,
@@ -29,7 +31,12 @@ class Response:
         super(Response, self).__init__()
         self.window = window
 
-    def handle(self, context: BridgeContext, extra: dict, status: bool):
+    def handle(
+            self,
+            context: BridgeContext,
+            extra: Dict[str, Any],
+            status: bool
+    ):
         """
         Handle Bridge success
 
@@ -92,7 +99,11 @@ class Response:
         self.window.controller.chat.output.post_handle(ctx, mode, stream, reply, internal)
         self.window.controller.chat.output.handle_end(ctx, mode)  # handle end.
 
-    def begin(self, context: BridgeContext, extra: dict):
+    def begin(
+            self,
+            context: BridgeContext,
+            extra: Dict[str, Any]
+    ):
         """
         Handle Bridge begin
 
@@ -104,7 +115,11 @@ class Response:
         if msg:
             self.window.update_status(msg)
 
-    def append(self, context: BridgeContext, extra: dict):
+    def append(
+            self,
+            context: BridgeContext,
+            extra: Dict[str, Any]
+    ):
         """
         Handle Bridge append (agent mode)
 
@@ -204,7 +219,11 @@ class Response:
         if ctx.extra is not None and (type(ctx.extra) == dict and "agent_finish" in ctx.extra):
             self.window.controller.agent.llama.on_finish(ctx)  # evaluate response and continue if needed
 
-    def end(self, context: BridgeContext, extra: dict):
+    def end(
+            self,
+            context: BridgeContext,
+            extra: Dict[str, Any]
+    ):
         """
         Handle Bridge end
 
@@ -223,7 +242,11 @@ class Response:
             "id": "chat",
         }))
 
-    def failed(self, context: BridgeContext, extra: dict):
+    def failed(
+            self,
+            context: BridgeContext,
+            extra: Dict[str, Any]
+    ):
         """
         Handle Bridge failed
 
@@ -240,7 +263,11 @@ class Response:
             "id": "chat",
         }))
 
-    def update_status(self, context: BridgeContext, extra: dict):
+    def update_status(
+            self,
+            context: BridgeContext,
+            extra: Dict[str, Any]
+    ):
         """
         Handle Bridge evaluate
 

pygpt_net/controller/chat/stream.py

@@ -6,9 +6,11 @@
 # 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.14 00:00:00                  #
 # ================================================== #
 
+from typing import Any
+
 from PySide6.QtWidgets import QApplication
 
 from pygpt_net.core.events import RenderEvent
@@ -175,7 +177,7 @@ class Stream:
         # log
         self.log("[chat] Stream end.")
 
-    def log(self, data: any):
+    def log(self, data: Any):
         """
         Log data to debug
 

pygpt_net/controller/chat/text.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 19:00:00                  #
+# Updated Date: 2024.12.14 00:00:00                  #
 # ================================================== #
 
+from typing import Optional
+
 from pygpt_net.core.types import (
     MODE_AGENT,
     MODE_AGENT_LLAMA,
@@ -37,9 +39,9 @@ class Text:
             text: str,
             reply: bool = False,
             internal: bool = False,
-            prev_ctx: CtxItem = None,
-            parent_id: str = None,
-            multimodal_ctx: MultimodalContext = None,
+            prev_ctx: Optional[CtxItem] = None,
+            parent_id: Optional[str] = None,
+            multimodal_ctx: Optional[MultimodalContext] = None,
     ) -> CtxItem:
         """
         Send text message

pygpt_net/controller/command.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.14 08:00:00                  #
 # ================================================== #
 
 import json
@@ -27,7 +27,10 @@ class Command:
         """
         self.window = window
         self.stop = False
-        self.flush_events = [Event.CMD_EXECUTE, Event.CMD_INLINE]
+        self.flush_events = [
+            Event.CMD_EXECUTE,
+            Event.CMD_INLINE,
+        ]
 
     def dispatch(self, event: Event, all: bool = False):
         """
@@ -88,7 +91,12 @@ class Command:
         worker.kwargs['finished_signal'] = worker.signals.finished
         self.window.threadpool.start(worker)
 
-    def worker(self, event: Event, window, finished_signal: Signal):
+    def worker(
+            self,
+            event: Event,
+            window,
+            finished_signal: Signal
+    ):
         """
         Command worker callback
 

pygpt_net/controller/config/__init__.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.26 23:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Any, Dict
+
 from .field.checkbox import Checkbox
 from .field.combo import Combo
 from .field.cmd import Cmd
@@ -36,7 +38,11 @@ class Config:
         self.slider = Slider(window)
         self.textarea = Textarea(window)
 
-    def load_options(self, parent_id: str, options: dict):
+    def load_options(
+            self,
+            parent_id: str,
+            options: Dict[str, Dict[str, Any]]
+    ):
         """
         Load options
 
@@ -47,7 +53,12 @@ class Config:
             option = options[key]
             self.apply(parent_id, key, option)
 
-    def apply(self, parent_id: str, key: str, option: dict):
+    def apply(
+            self,
+            parent_id: str,
+            key: str,
+            option: Dict[str, Any]
+    ):
         """
         Apply option to field handler based on type
 
@@ -73,7 +84,13 @@ class Config:
         elif option['type'] == 'cmd':
             self.cmd.apply(parent_id, key, option)
 
-    def apply_value(self, parent_id: str, key: str, option: dict, value):
+    def apply_value(
+            self,
+            parent_id: str,
+            key: str,
+            option: Dict[str, Any],
+            value: Any
+    ):
         """
         Apply value to option
 
@@ -85,7 +102,13 @@ class Config:
         option['value'] = value
         self.apply(parent_id, key, option)
 
-    def get_value(self, parent_id: str, key: str, option: dict, idx: bool = False) -> any:
+    def get_value(
+            self,
+            parent_id: str,
+            key: str,
+            option: Dict[str, Any],
+            idx: bool = False
+    ) -> Any:
         """
         Get value from field handler based on type
 
@@ -113,7 +136,12 @@ class Config:
         elif option['type'] == 'cmd':
             return self.cmd.get_value(parent_id, key, option)
 
-    def update_combo(self, parent_id: str, key: str, items: dict):
+    def update_combo(
+            self,
+            parent_id: str,
+            key: str,
+            items: Dict[str, str]
+    ):
         """
         Update combo items
 

pygpt_net/controller/config/field/checkbox.py

@@ -6,9 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.01.30 20:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Any, Dict
+
+
 class Checkbox:
     def __init__(self, window=None):
         """
@@ -22,7 +25,7 @@ class Checkbox:
             self,
             parent_id: str,
             key: str,
-            option: dict
+            option: Dict[str, Any]
     ):
         """
         Apply value to checkbox
@@ -42,7 +45,7 @@ class Checkbox:
             parent_id: str,
             key: str,
             option: dict,
-            value: any,
+            value: Any,
             hooks: bool = True
     ):
         """
@@ -68,7 +71,7 @@ class Checkbox:
             self,
             parent_id: str,
             key: str,
-            option: dict
+            option: Dict[str, Any]
     ) -> bool:
         """
         Get checkbox value

pygpt_net/controller/config/field/cmd.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.12 06:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Dict, Any
+
 from pygpt_net.utils import trans
 
 
@@ -25,7 +27,7 @@ class Cmd:
             self,
             parent_id: str,
             key: str,
-            option: dict
+            option: Dict[str, Any]
     ):
         """
         Apply values to command fields
@@ -57,7 +59,7 @@ class Cmd:
             self,
             parent_id: str,
             key: str,
-            values: dict,
+            values: Dict[str, Any],
             idx: int
     ):
         """
@@ -77,7 +79,7 @@ class Cmd:
             self,
             parent_id: str,
             key: str,
-            option: dict
+            option: Dict[str, Any]
     ) -> dict:
         """
         Get command values
@@ -97,7 +99,7 @@ class Cmd:
     def to_options(
             self,
             parent_id: str,
-            option: dict
+            option: Dict[str, Any]
     ) -> dict:
         """
         Convert dictionary items option to options

pygpt_net/controller/config/field/combo.py

@@ -6,9 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.26 23:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Any, Dict
+
+
 class Combo:
     def __init__(self, window=None):
         """
@@ -22,7 +25,7 @@ class Combo:
             self,
             parent_id: str,
             key: str,
-            option: dict
+            option: Dict[str, Any]
     ):
         """
         Apply value to combobox
@@ -44,8 +47,8 @@ class Combo:
             self,
             parent_id: str,
             key: str,
-            option: dict,
-            value: any,
+            option: Dict[str, Any],
+            value: Any,
             hooks: bool = True
     ):
         """
@@ -71,7 +74,7 @@ class Combo:
             self,
             parent_id: str,
             key: str,
-            option: dict,
+            option: Dict[str, Any],
             idx: bool = False
     ) -> str or int:
         """
@@ -88,7 +91,12 @@ class Combo:
         else:
             return self.window.ui.config[parent_id][key].combo.currentData()
 
-    def update_list(self, parent_id: str, key: str, items: dict):
+    def update_list(
+            self,
+            parent_id: str,
+            key: str,
+            items: Dict[str, str]
+    ):
         """
         Update combobox items