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

pygpt_net/controller/chat/__init__.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 Any
+
 from pygpt_net.core.events import AppEvent
 from pygpt_net.item.ctx import CtxItem
 
@@ -64,7 +66,7 @@ class Chat:
         self.render.reload()
         self.attachment.reload()
 
-    def handle_error(self, err: any):
+    def handle_error(self, err: Any):
         """
         Handle error
 
@@ -93,7 +95,7 @@ class Chat:
         else:
             self.log("[ctx] {}.".format(mode.upper()))
 
-    def log(self, data: any):
+    def log(self, data: Any):
         """
         Log data to debug
 

pygpt_net/controller/chat/attachment.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.29 23:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import os
+from typing import List, Dict, Any
 
 from PySide6.QtCore import Slot, QObject
 
@@ -74,7 +75,11 @@ class Attachment(QObject):
         """Reload attachments"""
         self.setup()
 
-    def handle(self, mode: str, text: str):
+    def handle(
+            self,
+            mode: str,
+            text: str
+    ):
         """
         Handle attachment upload
 
@@ -104,7 +109,12 @@ class Attachment(QObject):
                 return True
         return False
 
-    def upload(self, meta: CtxMeta, mode: str, prompt: str) -> bool:
+    def upload(
+            self,
+            meta: CtxMeta,
+            mode: str,
+            prompt: str
+    ) -> bool:
         """
         Upload attachments for meta
 
@@ -261,7 +271,11 @@ class Attachment(QObject):
         """
         return self.mode
 
-    def get_context(self, ctx: CtxItem, history: list) -> str:
+    def get_context(
+            self,
+            ctx: CtxItem,
+            history: List[CtxItem]
+    ) -> str:
         """
         Get additional context for attachment
 
@@ -292,7 +306,10 @@ class Attachment(QObject):
             return "====================================\nADDITIONAL CONTEXT FROM ATTACHMENT(s): {}".format(content)
         return ""
 
-    def get_uploaded_attachments(self, meta: CtxMeta) -> list:
+    def get_uploaded_attachments(
+            self,
+            meta: CtxMeta
+    ) -> List[Dict[str, Any]]:
         """
         Get uploaded attachments for meta
 
@@ -364,7 +381,12 @@ class Attachment(QObject):
         """Hide uploaded attachments"""
         self.window.ui.tabs['input'].setTabVisible(self.uploaded_tab_idx, False)
 
-    def delete_by_idx(self, idx: int, force: bool = False, remove_local=True):
+    def delete_by_idx(
+            self,
+            idx: int,
+            force: bool = False,
+            remove_local: bool = True
+    ):
         """
         Delete attachment by index
 
@@ -388,7 +410,12 @@ class Attachment(QObject):
             self.window.core.attachments.context.delete(meta, item, delete_files=remove_local)
             self.update_list(meta)
 
-    def clear(self, force: bool = False, remove_local=False, auto: bool = False):
+    def clear(
+            self,
+            force: bool = False,
+            remove_local: bool = False,
+            auto: bool = False
+    ):
         """
         Clear attachments list
 

pygpt_net/controller/chat/audio.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 19:00:00                  #
+# Updated Date: 2024.12.14 18:00:00                  #
 # ================================================== #
 
 import base64
@@ -63,7 +63,7 @@ class Audio:
         :param ctx: Context item
         """
         wav_path = os.path.join(self.window.core.config.get_user_path(), self.audio_file)
-        if ctx.is_audio and ctx.audio_output:
+        if ctx.is_audio and ctx.audio_output and ctx.audio_read_allowed():
             wav_bytes = base64.b64decode(ctx.audio_output)
             with open(wav_path, "wb") as f:
                 f.write(wav_bytes)

pygpt_net/controller/chat/command.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 00:00:00                  #
 # ================================================== #
 
+from typing import Any
+
 from pygpt_net.core.types import (
     MODE_AGENT,
 )
@@ -79,7 +81,7 @@ class Command:
             })
             self.window.dispatch(event)
 
-    def log(self, data: any):
+    def log(self, data: Any):
         """
         Log data to debug
 

pygpt_net/controller/chat/common.py

@@ -6,7 +6,7 @@
 # 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                  #
 # ================================================== #
 
 import os
@@ -113,7 +113,11 @@ class Common:
         self.window.ui.nodes['input'].setFocus()
         self.initialized = True
 
-    def append_to_input(self, text: str, separator: str = "\n"):
+    def append_to_input(
+            self,
+            text: str,
+            separator: str = "\n"
+    ):
         """
         Append text to input
 
@@ -223,7 +227,6 @@ class Common:
             unlock = False
         return unlock
 
-
     def stop(self, exit: bool = False):
         """
         Stop all
@@ -358,7 +361,11 @@ class Common:
         else:
             self.img_enable_raw()
 
-    def save_text(self, text: str, type: str = "txt"):
+    def save_text(
+            self,
+            text: str,
+            type: str = "txt"
+    ):
         """
         Save text to file
 

pygpt_net/controller/chat/files.py

@@ -6,9 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.23 00:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Dict
+
+from pygpt_net.item.attachment import AttachmentItem
 from pygpt_net.item.ctx import CtxItem
 from pygpt_net.utils import trans
 
@@ -22,7 +25,11 @@ class Files:
         """
         self.window = window
 
-    def send(self, mode: str, ctx: CtxItem):
+    def send(
+            self,
+            mode: str,
+            ctx: CtxItem
+    ):
         """
         Send attachments
 
@@ -37,7 +44,7 @@ class Files:
             self.window.controller.chat.log("Uploaded attachments (Assistant): {}".format(len(attachments)))
         return attachments
 
-    def upload(self, mode: str) -> dict:
+    def upload(self, mode: str) -> Dict[str, AttachmentItem]:
         """
         Upload attachments
 

pygpt_net/controller/chat/image.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 08:00:00                  #
 # ================================================== #
 
+from typing import Optional, List
+
 from PySide6.QtCore import Slot
 
 from pygpt_net.core.bridge.context import BridgeContext
@@ -30,8 +32,8 @@ class Image:
     def send(
             self,
             text: str,
-            prev_ctx: CtxItem = None,
-            parent_id: int = None,
+            prev_ctx: Optional[CtxItem] = None,
+            parent_id: Optional[int] = None,
     ) -> CtxItem:
         """
         Send prompt for image generate
@@ -116,7 +118,12 @@ class Image:
         return ctx
 
     @Slot(object, list, str)
-    def handle_response(self, ctx: CtxItem, paths: list, prompt: str):
+    def handle_response(
+            self,
+            ctx: CtxItem,
+            paths: List[str],
+            prompt: str
+    ):
         """
         Handle response
 
@@ -161,7 +168,12 @@ class Image:
         self.window.controller.chat.common.unlock_input()  # unlock input
 
     @Slot(object, list, str)
-    def handle_response_inline(self, ctx: CtxItem, paths: list, prompt: str):
+    def handle_response_inline(
+            self,
+            ctx: CtxItem,
+            paths: List[str],
+            prompt: str
+    ):
         """
         Handle inline response
 

pygpt_net/controller/chat/input.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 08:00:00                  #
 # ================================================== #
 
+from typing import Optional, Any, Dict
+
 from pygpt_net.core.bridge import BridgeContext
 from pygpt_net.core.bridge.context import MultimodalContext
 from pygpt_net.core.events import Event, AppEvent, KernelEvent, RenderEvent
@@ -52,6 +54,7 @@ class Input:
         """
         self.window.controller.agent.experts.unlock()  # unlock experts
         self.window.controller.agent.llama.reset_eval_step()  # reset evaluation steps
+        self.window.controller.ui.tabs.switch_to_first_chat()  # switch to first active chat tab
 
         # get text from input
         text = self.window.ui.nodes['input'].toPlainText().strip()
@@ -121,7 +124,7 @@ class Input:
     def send(
             self,
             context: BridgeContext,
-            extra: dict,
+            extra: Dict[str, Any],
     ):
         """
         Send input wrapper
@@ -148,13 +151,13 @@ class Input:
 
     def execute(
             self,
-            text: str = None,
+            text: str,
             force: bool = False,
             reply: bool = False,
             internal: bool = False,
-            prev_ctx: CtxItem = None,
-            parent_id: int = None,
-            multimodal_ctx: MultimodalContext = None,
+            prev_ctx: Optional[CtxItem] = None,
+            parent_id: Optional[int] = None,
+            multimodal_ctx: Optional[MultimodalContext] = None,
     ):
         """
         Execute send input text to API
@@ -265,7 +268,7 @@ class Input:
                 multimodal_ctx=multimodal_ctx,
             )  # text mode: OpenAI, Langchain, Llama, etc.
 
-    def log(self, data: any):
+    def log(self, data: Any):
         """
         Log data to debug
 

pygpt_net/controller/chat/output.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 Any
+
 from pygpt_net.core.types import (
     MODE_AGENT,
     MODE_ASSISTANT,
@@ -26,9 +28,17 @@ class Output:
         :param window: Window instance
         """
         self.window = window
-        self.not_stream_modes = [MODE_ASSISTANT, MODE_IMAGE]
+        self.not_stream_modes = [
+            MODE_ASSISTANT,
+            MODE_IMAGE,
+        ]
 
-    def handle(self, ctx: CtxItem, mode: str, stream_mode: bool = False):
+    def handle(
+            self,
+            ctx: CtxItem,
+            mode: str,
+            stream_mode: bool = False
+    ):
         """
         Handle response from LLM
 
@@ -133,7 +143,8 @@ class Output:
             mode: str,
             stream: bool = False,
             reply: bool = False,
-            internal: bool = False):
+            internal: bool = False
+    ):
         """
         Post handle results
 
@@ -178,7 +189,11 @@ class Output:
                 self.log("Calling for prepare context name...")
                 self.window.controller.ctx.prepare_name(ctx)  # async
 
-    def handle_end(self, ctx: CtxItem, mode: str):
+    def handle_end(
+            self,
+            ctx: CtxItem,
+            mode: str
+    ):
         """
         Handle context end (finish output)
 
@@ -231,7 +246,7 @@ class Output:
             event = RenderEvent(RenderEvent.RELOAD)
             self.window.dispatch(event)  # reload chat window
 
-    def log(self, data: any):
+    def log(self, data: Any):
         """
         Log data to debug
 

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