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

pygpt_net/core/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.21 20:00:00                  #
+# Updated Date: 2024.12.13 08:00:00                  #
 # ================================================== #
 
 import copy
@@ -18,6 +18,7 @@ from pygpt_net.core.types import (
     MODE_COMPLETION,
     MODE_LANGCHAIN,
     MODE_LLAMA_INDEX,
+    MODE_AUDIO,
 )
 from pygpt_net.core.events import Event
 from pygpt_net.item.ctx import CtxItem
@@ -537,6 +538,7 @@ class Command:
             MODE_LLAMA_INDEX,
             MODE_LANGCHAIN,
             MODE_COMPLETION,
+            MODE_AUDIO,
         ]
         mode = self.window.core.config.get('mode')
         if mode in disabled_modes:

pygpt_net/core/ctx/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 00:00:00                  #
+# Updated Date: 2024.12.13 08:00:00                  #
 # ================================================== #
 
 import copy
@@ -1371,10 +1371,13 @@ class Ctx:
         """
         prev_ctx = CtxItem()
         prev_ctx.urls = copy.deepcopy(ctx.urls)
+        prev_ctx.urls_before = copy.deepcopy(ctx.urls_before)
         prev_ctx.images = copy.deepcopy(ctx.images)
         prev_ctx.images_before = copy.deepcopy(ctx.images_before)
         prev_ctx.files = copy.deepcopy(ctx.files)
+        prev_ctx.files_before = copy.deepcopy(ctx.files_before)
         prev_ctx.attachments = copy.deepcopy(ctx.attachments)
+        prev_ctx.attachments_before = copy.deepcopy(ctx.attachments_before)
         prev_ctx.results = copy.deepcopy(ctx.results)
         prev_ctx.index_meta = copy.deepcopy(ctx.index_meta)
         prev_ctx.doc_ids = copy.deepcopy(ctx.doc_ids)
@@ -1382,7 +1385,8 @@ class Ctx:
         prev_ctx.output_name = copy.deepcopy(ctx.output_name)
 
         ctx.clear_reply()  # clear current reply result
-        ctx.from_previous()  # get result from previous if exists
+        if len(ctx.cmds) == 0:
+            ctx.from_previous()  # get result from previous if exists
         return prev_ctx
 
     def dump(self, ctx: CtxItem) -> str:

pygpt_net/core/ctx/container.py

@@ -6,15 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 00:00:00                  #
+# Updated Date: 2024.12.12 04:00:00                  #
 # ================================================== #
 
-from PySide6.QtWidgets import QVBoxLayout
+from PySide6.QtWidgets import QVBoxLayout, QWidget
 
-from .bag import Bag
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.ui.widget.textarea.output import ChatOutput
-from ..tabs import Tab
 
+from .bag import Bag
 
 class Container:
     def __init__(self, window=None):
@@ -27,7 +27,7 @@ class Container:
         self.bags = {}
         self.bags[0] = Bag(window)  # always create initial bag
 
-    def get(self, tab: Tab):
+    def get(self, tab: Tab) -> QWidget:
         """
         Register and return output
 

pygpt_net/core/debug/tabs.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 00:00:00                  #
+# Updated Date: 2024.12.12 01:00:00                  #
 # ================================================== #
 
 class TabsDebug:
@@ -27,6 +27,8 @@ class TabsDebug:
         self.window.core.debug.add(self.id, 'current Type', str(self.window.controller.ui.tabs.get_current_type()))
         self.window.core.debug.add(self.id, 'current Column', str(self.window.controller.ui.tabs.get_current_column_idx()))
         self.window.core.debug.add(self.id, 'last_pid', str(self.window.core.tabs.last_pid))
+        self.window.core.debug.add(self.id, 'locked', str(self.window.controller.ui.tabs.locked))
+        self.window.core.debug.add(self.id, 'col', str(self.window.controller.ui.tabs.col))
         self.window.core.debug.add(self.id, 'count(pids)', str(len(self.window.core.tabs.pids)))
         self.window.core.debug.add(self.id, 'count(ctx bags)', str(len(self.window.core.ctx.container.bags)))
         self.window.core.debug.add(self.id, '----', '')

pygpt_net/core/render/base.py

@@ -6,10 +6,10 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 00:00:00                  #
+# Updated Date: 2024.12.12 04:00:00                  #
 # ================================================== #
 
-from pygpt_net.core.tabs import Tab
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.item.ctx import CtxItem, CtxMeta
 
 

pygpt_net/core/render/web/body.py

@@ -207,7 +207,7 @@ class Body:
         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,

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.12.09 03:00:00                  #
+# Updated Date: 2024.12.13 19:00:00                  #
 # ================================================== #
 
 import json
@@ -19,7 +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 pygpt_net.core.tabs.tab import Tab
 
 from .body import Body
 from .helpers import Helpers
@@ -167,7 +167,7 @@ class Renderer(BaseRenderer):
         :param meta: context meta
         :param ctx: context item
         """
-        pass  # do nothing
+        pass
 
     def stream_end(self, meta: CtxMeta, ctx: CtxItem):
         """
@@ -182,7 +182,12 @@ class Renderer(BaseRenderer):
                 self.append_context_item(meta, self.pids[pid].item)
                 self.pids[pid].item = None
 
-    def append_context(self, meta: CtxMeta, items: list, clear: bool = True):
+    def append_context(
+            self,
+            meta: CtxMeta,
+            items: list,
+            clear: bool = True
+    ):
         """
         Append all context to output
         
@@ -203,22 +208,37 @@ class Renderer(BaseRenderer):
 
         self.pids[pid].use_buffer = True
         self.pids[pid].html = ""
+        prev_ctx = None
         for item in items:
             self.update_names(meta, item)
             item.idx = i
             if i == 0:
                 item.first = True
             next_item = items[i + 1] if i + 1 < len(items) else None   # append next item if exists
-            self.append_context_item(meta, item, next_item)  # to html buffer
+            self.append_context_item(
+                meta,
+                item,
+                prev_ctx=prev_ctx,
+                next_ctx=next_item
+            )  # to html buffer
+            prev_ctx = item
             i += 1
         self.pids[pid].use_buffer = False
 
         # flush
         if self.pids[pid].html != "":
-            self.append(pid, self.pids[pid].html,
-                        flush=True)  # flush buffer if page loaded, otherwise it will be flushed on page load
-
-    def append_input(self, meta: CtxMeta, ctx: CtxItem, flush: bool = True, append: bool = False):
+            self.append(
+                pid,
+                self.pids[pid].html,
+                flush=True
+            )  # flush buffer if page loaded, otherwise it will be flushed on page load
+
+    def append_input(
+            self, meta: CtxMeta,
+            ctx: CtxItem,
+            flush: bool = True,
+            append: bool = False
+    ):
         """
         Append text input to output
 
@@ -250,29 +270,49 @@ class Renderer(BaseRenderer):
                 text = re.sub(r'^user: ', '> ', ctx.input)
 
         if flush:  # to chunk buffer
-            content = self.prepare_node(meta, ctx, text.strip(), self.NODE_INPUT)
             if self.is_stream() and not append:
+                content = self.prepare_node(meta, ctx, text.strip(), self.NODE_INPUT)
                 self.append_chunk_input(meta, ctx, content, False)
-            else:
-                self.append_node(meta, ctx, text.strip(), self.NODE_INPUT)
-        else:
-            self.append_node(meta, ctx, text.strip(), self.NODE_INPUT)
+                return
+
+        self.append_node(meta, ctx, text.strip(), self.NODE_INPUT)
 
-    def append_output(self, meta: CtxMeta, ctx: CtxItem, flush: bool = True, next_ctx: CtxItem = None):
+    def append_output(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            flush: bool = True,
+            prev_ctx: CtxItem = None,
+            next_ctx: CtxItem = None
+    ):
         """
         Append text output to output
         
         :param meta: context meta
         :param ctx: context item
         :param flush: flush HTML
+        :param prev_ctx: previous context
         :param next_ctx: next context
         """
         self.tool_output_end()  # reset tools
         if ctx.output is None or ctx.output == "":
             return
-        self.append_node(meta, ctx, ctx.output.strip(), self.NODE_OUTPUT, next_ctx)
+        self.append_node(
+            meta=meta,
+            ctx=ctx,
+            html=ctx.output.strip(),
+            type=self.NODE_OUTPUT,
+            prev_ctx=prev_ctx,
+            next_ctx=next_ctx
+        )
 
-    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
         
@@ -291,6 +331,12 @@ class Renderer(BaseRenderer):
         self.update_names(meta, ctx)
         raw_chunk = str(text_chunk)
         if begin:
+            # debug
+            debug = ""
+            if self.is_debug():
+                debug = self.append_debug(ctx, pid, "stream")
+            if debug:
+                raw_chunk = debug + raw_chunk
             self.pids[pid].buffer = ""  # reset buffer
             self.pids[pid].is_cmd = False  # reset command flag
             self.clear_chunks_output(pid)
@@ -318,7 +364,13 @@ class Renderer(BaseRenderer):
         except Exception as e:
             pass
 
-    def append_chunk_input(self, meta: CtxMeta, ctx: CtxItem, text_chunk: str, begin: bool = False):
+    def append_chunk_input(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            text_chunk: str,
+            begin: bool = False
+    ):
         """
         Append output chunk to output
 
@@ -341,7 +393,15 @@ class Renderer(BaseRenderer):
         except Exception as e:
             pass
 
-    def append_node(self, meta: CtxMeta, ctx: CtxItem, html: str, type: int = 1, next_ctx: CtxItem = None):
+    def append_node(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            html: str,
+            type: int = 1,
+            prev_ctx: CtxItem = None,
+            next_ctx: CtxItem = None
+    ):
         """
         Append and format raw text to output
 
@@ -349,15 +409,31 @@ class Renderer(BaseRenderer):
         :param html: text to append
         :param type: type of message
         :param ctx: CtxItem instance
+        :param prev_ctx: previous context item
         :param next_ctx: next context item
         """
         if ctx.hidden:
             return
 
         pid = self.get_or_create_pid(meta)
-        self.append(pid, self.prepare_node(meta, ctx, html, type, next_ctx))
+        self.append(
+            pid,
+            self.prepare_node(
+                meta=meta,
+                ctx=ctx,
+                html=html,
+                type=type,
+                prev_ctx=prev_ctx,
+                next_ctx=next_ctx
+            )
+        )
 
-    def append(self, pid, html: str, flush: bool = False):
+    def append(
+            self,
+            pid,
+            html: str,
+            flush: bool = False
+    ):
         """
         Append text to output
         
@@ -373,18 +449,41 @@ class Renderer(BaseRenderer):
             if not flush:
                 self.pids[pid].html += html  # to buffer
 
-    def append_context_item(self, meta: CtxMeta, ctx: CtxItem, next_ctx: CtxItem = None):
+    def append_context_item(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            prev_ctx: CtxItem = None,
+            next_ctx: CtxItem = None
+    ):
         """
         Append context item to output
 
         :param meta: context meta
         :param ctx: context item
+        :param prev_ctx: previous context item
         :param next_ctx: next context item
         """
-        self.append_input(meta, ctx, flush=False)
-        self.append_output(meta, ctx, flush=False, next_ctx=next_ctx)  # + extra
+        self.append_input(
+            meta,
+            ctx,
+            flush=False
+        )
+        self.append_output(
+            meta,
+            ctx,
+            flush=False,
+            prev_ctx=prev_ctx,
+            next_ctx=next_ctx
+        )  # + extra
 
-    def append_extra(self, meta: CtxMeta, ctx: CtxItem, footer: bool = False, render: bool = True) -> str:
+    def append_extra(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            footer: bool = False,
+            render: bool = True
+    ) -> str:
         """
         Append extra data (images, files, etc.) to output
         
@@ -407,8 +506,8 @@ class Renderer(BaseRenderer):
                 if image is None:
                     continue
                 # don't append if it is an external url
-                if image.startswith("http"):
-                    continue
+                # if image.startswith("http"):
+                    # continue
                 if image in appended or image in self.pids[pid].images_appended:
                     continue
                 try:
@@ -475,7 +574,12 @@ class Renderer(BaseRenderer):
 
         return html
 
-    def append_timestamp(self, ctx: CtxItem, text: str, type: int = None) -> str:
+    def append_timestamp(
+            self,
+            ctx: CtxItem,
+            text: str,
+            type: int = None
+    ) -> str:
         """
         Append timestamp to text
 
@@ -496,7 +600,10 @@ class Renderer(BaseRenderer):
                 text = '<span class="ts">{}: </span>{}'.format(hour, text)
         return text
 
-    def reset(self, meta: CtxMeta = None):
+    def reset(
+            self,
+            meta: CtxMeta = None
+    ):
         """
         Reset
 
@@ -558,6 +665,8 @@ class Renderer(BaseRenderer):
 
         :pid: context PID
         """
+        if pid is None:
+            return
         if not self.pids[pid].loaded:
             js = "var element = document.getElementById('_append_input_');"
             js += "if (element) { element.innerHTML = ''; }"
@@ -600,7 +709,15 @@ class Renderer(BaseRenderer):
         except Exception as e:
             pass
 
-    def prepare_node(self, meta: CtxMeta, ctx: CtxItem, html: str, type: int = 1, next_ctx: CtxItem = None) -> str:
+    def prepare_node(
+            self,
+            meta: CtxMeta,
+            ctx: CtxItem,
+            html: str,
+            type: int = 1,
+            prev_ctx: CtxItem = None,
+            next_ctx: CtxItem = None
+    ) -> str:
         """
         Prepare node HTML
         
@@ -608,20 +725,35 @@ class Renderer(BaseRenderer):
         :param ctx: CtxItem instance
         :param html: html text
         :param type: type of message
+        :param prev_ctx: previous context item
         :param next_ctx: next context item
         :return: prepared HTML
         """
         pid = self.get_or_create_pid(meta)
         if type == self.NODE_OUTPUT:
-            return self.prepare_node_output(meta, ctx, html, next_ctx)
+            return self.prepare_node_output(
+                meta=meta,
+                ctx=ctx,
+                html=html,
+                prev_ctx=prev_ctx,
+                next_ctx=next_ctx
+            )
         elif type == self.NODE_INPUT:
-            return self.prepare_node_input(pid, ctx, html)
+            return self.prepare_node_input(
+                pid=pid,
+                ctx=ctx,
+                html=html,
+                prev_ctx=prev_ctx,
+                next_ctx=next_ctx
+            )
 
     def prepare_node_input(
             self,
             pid,
             ctx: CtxItem,
-            html: str
+            html: str,
+            prev_ctx: CtxItem = None,
+            next_ctx: CtxItem = None
     ) -> str:
         """
         Prepare input node
@@ -629,6 +761,8 @@ class Renderer(BaseRenderer):
         :param pid: context PID
         :param ctx: CtxItem instance
         :param html: html text
+        :param prev_ctx: previous context item
+        :param next_ctx: next context item
         :return: prepared HTML
         """
         msg_id = "msg-user-" + str(ctx.id) if ctx is not None else ""
@@ -646,6 +780,11 @@ class Renderer(BaseRenderer):
         if type(ctx.extra) is dict and "agent_evaluate" in ctx.extra:
             name = trans("msg.name.evaluation")
 
+        # debug
+        debug = ""
+        if self.is_debug():
+            debug = self.append_debug(ctx, pid, "input")
+
         extra = ""
         if ctx.extra is not None and "footer" in ctx.extra:
             extra = ctx.extra["footer"]
@@ -655,6 +794,7 @@ class Renderer(BaseRenderer):
             '<div class="msg">'
             '{html}'
             '<div class="msg-extra">{extra}</div>'
+            '{debug}'
             '</div>'
             '</div>'
         ).format(
@@ -662,6 +802,7 @@ class Renderer(BaseRenderer):
             name=name,
             html=html,
             extra=extra,
+            debug=debug,
         )
 
         return html
@@ -671,6 +812,7 @@ class Renderer(BaseRenderer):
             meta: CtxMeta,
             ctx: CtxItem,
             html: str,
+            prev_ctx: CtxItem = None,
             next_ctx: CtxItem = None
     ) -> str:
         """
@@ -679,7 +821,8 @@ class Renderer(BaseRenderer):
         :param meta: context meta
         :param ctx: CtxItem instance
         :param html: html text
-        :param next_ctx: previous context item
+        :param prev_ctx: previous context item
+        :param next_ctx: next context item
         :return: prepared HTML
         """
         is_cmd = False
@@ -691,8 +834,8 @@ class Renderer(BaseRenderer):
             is_cmd = True
         pid = self.get_or_create_pid(meta)
         msg_id = "msg-bot-" + str(ctx.id) if ctx is not None else ""
-        #if is_cmd:
-            #html = self.helpers.format_cmd_text(html)
+        # if is_cmd:
+        # html = self.helpers.format_cmd_text(html)
         html = self.helpers.pre_format_text(html)
         html = self.append_timestamp(ctx, html, type=self.NODE_OUTPUT)
         html = self.parser.parse(html)
@@ -732,7 +875,7 @@ class Renderer(BaseRenderer):
 
         # check if agent step and results in current ctx
         elif ctx.results is not None and len(ctx.results) > 0 \
-            and isinstance(ctx.extra, dict) and "agent_step" in ctx.extra:
+                and isinstance(ctx.extra, dict) and "agent_step" in ctx.extra:
             tool_output = self.helpers.format_cmd_text(str(ctx.input))
         else:
             # loading spinner
@@ -768,16 +911,21 @@ class Renderer(BaseRenderer):
         )
         tool_extra = self.body.prepare_tool_extra(ctx)
 
+        # debug
+        debug = ""
+        if self.is_debug():
+            debug = self.append_debug(ctx, pid, "output")
+
         html = (
             '<div class="msg-box msg-bot" id="{msg_id}">'
             '<div class="name-header name-bot">{name_bot}</div>'
             '<div class="msg">'
             '{html}'
-            
             '<div class="msg-tool-extra">{tool_extra}</div>'
             '{html_tools}'
             '<div class="msg-extra">{extra}</div>'
             '{footer}'
+            '{debug}'
             '</div>'
             '</div>'
         ).format(
@@ -788,6 +936,7 @@ class Renderer(BaseRenderer):
             extra=extra,
             footer=footer,
             tool_extra=tool_extra,
+            debug=debug,
         )
 
         return html
@@ -1106,3 +1255,24 @@ class Renderer(BaseRenderer):
             self.get_output_node().page().runJavaScript(f"endToolOutput();")
         except Exception as e:
             pass
+
+    def append_debug(self, ctx: CtxItem, pid, title: str = None) -> str:
+        """
+        Append debug info
+
+        :param ctx: context item
+        :param pid: context PID
+        :param title: debug title
+        """
+        if title is None:
+            title = "debug"
+        debug = "<b>" +title+ ":</b> pid: "+str(pid)+", ctx: " + str(ctx.to_dict())
+        return "<div class='debug'>" + debug + "</div>"
+
+    def is_debug(self) -> bool:
+        """
+        Check if debug mode is enabled
+
+        :return: True if debug mode is enabled
+        """
+        return self.window.core.config.get("debug.render", False)