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

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.11.26 19:00:00                  #
+# Updated Date: 2024.12.13 08:00:00                  #
 # ================================================== #
 
 import copy
@@ -490,6 +490,16 @@ class Ctx:
         for item in self.get_items():
             if item.id == id:
                 return item
+        return self.fetch_item_by_id(id)   # if no item found, try to fetch from DB
+
+    def fetch_item_by_id(self, id: int) -> CtxItem:
+        """
+        Fetch ctx item by id
+
+        :param id: item id
+        :return: context item
+        """
+        return self.provider.get_item_by_id(id)
 
     def get_meta(self, reload: bool = False) -> dict:
         """
@@ -1361,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)
@@ -1372,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,39 +6,44 @@
 # 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.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 .bag import Bag
 
 class Container:
     def __init__(self, window=None):
         """
-        Context container
+        Context output container
+
+        :param window: Window
         """
         self.window = window
         self.bags = {}
         self.bags[0] = Bag(window)  # always create initial bag
 
-    def register_output(self, id: int = 0):
+    def get(self, tab: Tab) -> QWidget:
         """
-        Register output
+        Register and return output
 
-        :param id: ID
+        :param tab: Tab
         :return: Widget
         """
         # plain output
         output_plain = ChatOutput(self.window)
+        output_plain.set_tab(tab)
 
         # web
         if self.window.core.config.get("render.engine") == "web":
             from pygpt_net.ui.widget.textarea.web import ChatWebOutput, CustomWebEnginePage
             # build output
             output_html = ChatWebOutput(self.window)
+            output_html.set_tab(tab)
             output_html.setPage(
                 CustomWebEnginePage(self.window, output_html)
             )
@@ -48,13 +53,15 @@ class Container:
         else:
             # legacy
             output_html = ChatOutput(self.window)
+            output_html.set_tab(tab)
 
         if 'output_plain' not in self.window.ui.nodes:
             self.window.ui.nodes['output_plain'] = {}
         if 'output' not in self.window.ui.nodes:
             self.window.ui.nodes['output'] = {}
-        self.window.ui.nodes['output_plain'][id] = output_plain
-        self.window.ui.nodes['output'][id] = output_html
+
+        self.window.ui.nodes['output_plain'][tab.pid] = output_plain
+        self.window.ui.nodes['output'][tab.pid] = output_html
 
         # show/hide plain/html
         if self.window.core.config.get("render.plain") is True:
@@ -66,8 +73,8 @@ class Container:
 
         # build layout
         layout = QVBoxLayout()
-        layout.addWidget(self.window.ui.nodes['output_plain'][id])
-        layout.addWidget(self.window.ui.nodes['output'][id])
+        layout.addWidget(self.window.ui.nodes['output_plain'][tab.pid])
+        layout.addWidget(self.window.ui.nodes['output'][tab.pid])
         layout.setContentsMargins(0, 0, 0, 0)
         widget = self.window.core.tabs.from_layout(layout)
         return widget

pygpt_net/core/ctx/output.py

@@ -6,7 +6,7 @@
 # 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.09 03:00:00                  #
 # ================================================== #
 
 from pygpt_net.item.ctx import CtxItem, CtxMeta
@@ -16,11 +16,28 @@ class Output:
     def __init__(self, window=None):
         """
         Context output mapping
+
+        :param window: Window
         """
         self.window = window
-        self.mapping = {}  # pid => meta.id
+        self.mapping = {}  # [column_idx => [pid => meta.id]]
         self.last_pids = {}  # meta.id => pid
         self.last_pid = 0 # last used PID
+        self.initialized = False
+
+    def init(self, force: bool = False):
+        """
+        Initialize mappings
+
+        :param force: Force reinitialize
+        """
+        if self.initialized and not force:
+            return
+        self.clear()
+        for n in range(0, self.window.core.tabs.NUM_COLS):
+            self.mapping[n] = {}
+            self.last_pids[n] = {}
+        self.initialized = True
 
     def store(self, meta: CtxMeta) -> int:
         """
@@ -29,31 +46,20 @@ class Output:
         :param meta: Meta
         :return: PID
         """
+        self.init()
         pid = self.window.core.tabs.get_active_pid()
-        # check if allowed tab
         tab = self.window.core.tabs.get_tab_by_pid(pid)
         if tab is None or tab.type != Tab.TAB_CHAT:
             return 0
-        self.mapping[pid] = meta.id
-        self.last_pids[meta.id] = pid
+        col_idx = tab.column_idx
+        self.mapping[col_idx][pid] = meta.id
+        self.last_pids[col_idx][meta.id] = pid
         self.last_pid = pid
         tab = self.window.core.tabs.get_tab_by_pid(pid)
         if tab is not None:
             tab.data_id = meta.id  # store meta id in tab data
         return pid
 
-    def meta_id_in_tab(self, meta_id: int) -> bool:
-        """
-        Check if meta id is in tab
-
-        :param meta_id: Meta ID
-        :return: bool
-        """
-        for pid, mid in self.mapping.items():
-            if mid == meta_id:
-                return True
-        return False
-
     def is_mapped(self, meta: CtxMeta) -> bool:
         """
         Check if meta is mapped
@@ -61,19 +67,46 @@ class Output:
         :param meta: Meta
         :return: bool
         """
-        return meta.id in self.mapping.values()
+        self.init()
+        for col_idx in self.mapping:
+            if meta.id in self.mapping[col_idx].values():
+                return True
+        return False
 
-    def get_meta(self, pid: int) -> CtxMeta or None:
+    def get_meta(self, pid: int) -> int or None:
         """
         Get meta by PID
 
         :param pid: PID
-        :return: Meta or None
+        :return: meta ID or None
         """
-        if pid in self.mapping:
-            return self.mapping[pid]
+        self.init()
+        for col_idx in self.mapping:
+            if pid in self.mapping[col_idx]:
+                return self.mapping[col_idx][pid]
         return
 
+    def prepare_meta(self, tab: Tab) -> int or None:
+        """
+        Get meta ID by PID
+
+        :param tab: Tab
+        :return: Meta ID or None
+        """
+        self.init()
+        pid = tab.pid
+        col_idx = tab.column_idx
+        meta_id = None
+        if pid in self.mapping[col_idx]:
+            return self.mapping[col_idx][pid]
+        if meta_id is None:
+            meta_id = tab.data_id
+            if meta_id is not None:
+                self.mapping[col_idx][pid] = meta_id
+                self.last_pids[col_idx][meta_id] = pid
+                self.last_pid = pid
+        return meta_id
+
     def get_mapped(self, meta: CtxMeta) -> int or None:
         """
         Get PID by meta
@@ -81,75 +114,59 @@ class Output:
         :param meta: Meta
         :return: PID or None
         """
+        self.init()
         all = []
         pid = None
         active_pid = self.window.core.tabs.get_active_pid()
-        for pid, meta_id in self.mapping.items():
+        tab = self.window.core.tabs.get_tab_by_pid(active_pid)
+        if tab is None:
+            return None
+        col_idx = tab.column_idx
+        for pid, meta_id in self.mapping[col_idx].items():
             if meta_id == meta.id:
                 all.append(pid)
         for pid in all:
-            if pid == active_pid:  # at first check if active
+            if pid == active_pid:  # at first check for current tab
                 return pid
         return pid
 
-    def get_mapped_last(self, meta: CtxMeta) -> int or None:
-        """
-        Get last PID by meta
-
-        :param meta: Meta
-        :return: PID or None
-        """
-        active_pid = self.window.core.tabs.get_active_pid()
-        if self.mapping[active_pid] == meta.id:
-            return active_pid  # return active PID at first
-        if meta.id in self.last_pids:
-            return self.last_pids[meta.id]
-        return
-
-    def prepare(self, meta: CtxMeta):
-        """
-        Clear mapping
-
-        :param meta: meta to prepare
-        """
-        active_pid = self.window.core.tabs.get_active_pid()
-        if active_pid in self.mapping:
-            del self.mapping[active_pid]  # remove from mapping
-
-    def clear(self):
-        """
-        Clear mapping
-        """
-        self.mapping = {}
-        self.last_pids = {}
-        self.last_pid = 0
-
     def is_empty(self) -> bool:
         """
         Check if mapping is empty
 
         :return: bool
         """
+        self.init()
         active_pid = self.window.core.tabs.get_active_pid()
-        if active_pid in self.mapping:
-            return False
+        for col_idx in list(self.mapping.keys()):
+            if active_pid in self.mapping[col_idx]:
+                return False
         return True
 
-    def get_pid(self, meta: CtxMeta = None) -> int:
+    def get_pid(self, meta: CtxMeta = None) -> int or None:
         """
         Get PID by meta
 
         :param meta: Meta
         :return: PID
         """
+        self.init()
+        active_pid = self.window.core.tabs.get_active_pid()
         if meta is None:
-            return self.window.core.tabs.get_active_pid()
+            return None
         if self.is_mapped(meta):
-            if self.window.core.tabs.get_active_pid() != self.get_mapped(meta):  # if loaded in another tab
-                return self.store(meta)  # update to current
-            return self.get_mapped_last(meta)
-        else:
-            return self.store(meta)
+            if active_pid == self.get_mapped(meta):  # if loaded in current tab
+                return active_pid  # return current
+        return self.store(meta)
+
+    def clear(self):
+        """
+        Clear mapping
+        """
+        self.mapping = {}
+        self.last_pids = {}
+        self.last_pid = 0
+        self.initialized = False
 
     def get_current(self, meta: CtxMeta = None):
         """
@@ -176,7 +193,8 @@ class Output:
         if pid in self.window.ui.nodes['output_plain']:
             return self.window.ui.nodes['output_plain'][pid]
         else:
-            return self.window.ui.nodes['output_plain'][0]
+            for pid in self.window.ui.nodes['output_plain']:
+                return self.window.ui.nodes['output_plain'][pid]
 
     def get_by_pid(self, pid = None):
         """
@@ -201,7 +219,8 @@ class Output:
         if pid in self.window.ui.nodes['output_plain']:
             return self.window.ui.nodes['output_plain'][pid]
         else:
-            return self.window.ui.nodes['output_plain'][0]
+            for pid in self.window.ui.nodes['output_plain']:
+                return self.window.ui.nodes['output_plain'][pid]
 
     def get_all(self) -> list:
         """

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.11.07 23:00:00                  #
+# Updated Date: 2024.12.12 01:00:00                  #
 # ================================================== #
 
 class TabsDebug:
@@ -25,7 +25,10 @@ class TabsDebug:
         self.window.core.debug.add(self.id, 'current PID', str(self.window.controller.ui.tabs.get_current_pid()))
         self.window.core.debug.add(self.id, 'current IDX', str(self.window.controller.ui.tabs.get_current_idx()))
         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, '----', '')
@@ -38,6 +41,6 @@ class TabsDebug:
 
         # mapping PID => meta.id
         self.window.core.debug.add(self.id, 'PID => meta.id', str(self.window.core.ctx.output.mapping))
-        self.window.core.debug.add(self.id, '(last) PID => meta.id', str(self.window.core.ctx.output.last_pids))
+        self.window.core.debug.add(self.id, '(last) meta.id => PID', str(self.window.core.ctx.output.last_pids))
         self.window.core.debug.add(self.id, '(last) PID', str(self.window.core.ctx.output.last_pid))
         self.window.core.debug.end(self.id)

pygpt_net/core/filesystem/url.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.08 06:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import QUrl
@@ -38,14 +38,18 @@ class Url:
         ]
 
         # JS bridge
-        if url.toString() == 'bridge://open_find':
-            pid = self.window.controller.ui.tabs.get_current_pid()
+        if url.toString().startswith('bridge://open_find'):
+            pid = int(url.toString().split(':')[2])
             if pid in self.window.ui.nodes['output']:
                 self.window.ui.nodes['output'][pid].find_open()
             return
         elif url.toString() == 'bridge://escape':
             self.window.controller.access.on_escape()
             return
+        elif url.toString() == 'bridge://focus':
+            pid = self.window.controller.ui.tabs.get_current_pid()
+            if pid in self.window.ui.nodes['output']:
+                self.window.ui.nodes['output'][pid].on_focus_js()
 
         # -------------
 

pygpt_net/core/render/base.py

@@ -6,9 +6,10 @@
 # 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.12 04:00:00                  #
 # ================================================== #
 
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.item.ctx import CtxItem, CtxMeta
 
 
@@ -20,6 +21,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):
         """
@@ -218,13 +228,14 @@ class BaseRenderer:
         """
         pass
 
-    def on_page_loaded(self, meta: CtxMeta = None):
+    def on_page_loaded(self, meta: CtxMeta = None, tab: 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):
         """

pygpt_net/core/render/markdown/renderer.py

@@ -6,7 +6,7 @@
 # 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.09 00:00:00                  #
 # ================================================== #
 
 import re
@@ -50,6 +50,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):

pygpt_net/core/render/plain/renderer.py

@@ -6,7 +6,7 @@
 # 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.09 03:00:00                  #
 # ================================================== #
 
 from datetime import datetime
@@ -128,7 +128,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:
@@ -399,7 +399,7 @@ class Renderer(BaseRenderer):
         :param meta: context meta
         """
         self.reset()
-        self.get_output_node().clear()
+        self.get_output_node(meta).clear()
 
     def clear_input(self):
         """Clear input"""

pygpt_net/core/render/web/body.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.07 21:00:00                  #
+# Updated Date: 2024.12.09 03:00:00                  #
 # ================================================== #
 
 import os
@@ -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,
@@ -325,7 +325,7 @@ class Body:
             html += "</div>"
         return html
 
-    def get_html(self) -> str:
+    def get_html(self, pid: int) -> str:
         """
         Build webview HTML code
 
@@ -370,13 +370,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') {
@@ -384,6 +385,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);