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

pygpt_net/core/ctx/container.py

@@ -6,39 +6,48 @@
 # 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 PySide6.QtWidgets import QVBoxLayout
+from typing import List
 
-from .bag import Bag
+from PySide6.QtWidgets import QVBoxLayout, QWidget
+
+from pygpt_net.core.tabs.tab import Tab
 from pygpt_net.ui.widget.textarea.output import ChatOutput
 
+from .bag import Bag
+from ...item.ctx import CtxItem
+
 
 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 +57,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 +77,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
@@ -102,29 +113,29 @@ class Container:
             self.bags[tab_id] = Bag(self.window)  # crate new empty bag if not exists
         return self.bags[tab_id]
 
-    def get_items(self) -> list:
+    def get_items(self) -> List[CtxItem]:
         """
-        Get items
+        Get ctx items
 
         :return: Items
         """
         return self.get_active_bag().get_items()
 
-    def set_items(self, items: list):
+    def set_items(self, items: List[CtxItem]):
         """
-        Set items
+        Set ctx items
 
         :param items: Items
         """
         self.get_active_bag().set_items(items)
 
     def clear_items(self):
-        """Clear items"""
+        """Clear ctx items"""
         self.get_active_bag().clear_items()
 
     def count_items(self) -> int:
         """
-        Count items
+        Count ctx items
 
         :return: Items count
         """

pygpt_net/core/ctx/idx.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.02.27 04:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
 import time
+from typing import Optional
 
 from pygpt_net.item.ctx import CtxMeta
 from pygpt_net.provider.core.ctx.base import BaseProvider
@@ -32,7 +33,12 @@ class Idx:
         """
         return self.window.core.ctx.get_provider()
 
-    def set_meta_indexed_by_id(self, id: int, doc_id: str, ts: int) -> bool:
+    def set_meta_indexed_by_id(
+            self,
+            id: int,
+            doc_id: str,
+            ts: int
+    ) -> bool:
         """
         Update ctx meta indexed timestamp
 
@@ -43,7 +49,11 @@ class Idx:
         """
         return self.get_provider().set_meta_indexed_by_id(id, ts)
 
-    def update_meta_indexed_by_id(self, id: int, doc_id: str) -> bool:
+    def update_meta_indexed_by_id(
+            self,
+            id: int,
+            doc_id: str
+    ) -> bool:
         """
         Update ctx meta indexed timestamp
 
@@ -79,7 +89,13 @@ class Idx:
         """
         return self.get_provider().clear_meta_indexed_all()
 
-    def remove_meta_from_indexed(self, store: str, id: int, idx: str, doc_id: str = None) -> bool:
+    def remove_meta_from_indexed(
+            self,
+            store: str,
+            id: int,
+            idx: str,
+            doc_id: Optional[str] = None
+    ) -> bool:
         """
         Remove ctx meta from indexed
 
@@ -114,7 +130,12 @@ class Idx:
             self.clear_meta_indexed_by_id(id)
         return True
 
-    def set_meta_as_indexed(self, id: int, idx: str, doc_id: str) -> bool:
+    def set_meta_as_indexed(
+            self,
+            id: int,
+            idx: str,
+            doc_id: str
+    ) -> bool:
         """
         Set ctx meta as indexed
 
@@ -157,7 +178,13 @@ class Idx:
         self.get_provider().update_meta_indexes_by_id(id, meta)
         return True
 
-    def store_idx_data_in_meta(self, ctx: CtxMeta, store_id: str, idx: str, doc_id: str):
+    def store_idx_data_in_meta(
+            self,
+            ctx: CtxMeta,
+            store_id: str,
+            idx: str,
+            doc_id: str
+    ):
         """
         Append index data to ctx meta object
 
@@ -176,7 +203,13 @@ class Idx:
         current[store_id][idx][doc_id] = int(time.time())  # key = doc_id, value = last indexed timestamp
         ctx.indexes = current  # update ctx meta object
 
-    def remove_idx_data_from_meta(self, ctx: CtxMeta, store_id: str, idx: str, doc_id: str = None):
+    def remove_idx_data_from_meta(
+            self,
+            ctx: CtxMeta,
+            store_id: str,
+            idx: str,
+            doc_id: Optional[str] = None
+    ):
         """
         Remove index data from ctx meta object
 
@@ -209,7 +242,11 @@ class Idx:
 
         ctx.indexes = current  # update ctx meta object
 
-    def truncate_indexed(self, store_id: str = None, idx: str = None) -> bool:
+    def truncate_indexed(
+            self,
+            store_id: Optional[str] = None,
+            idx: Optional[str] = None
+    ) -> bool:
         """
         Truncate ctx meta indexed timestamps and statuses
 

pygpt_net/core/ctx/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.05 23:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Optional, List
+
 from pygpt_net.item.ctx import CtxItem, CtxMeta
 from pygpt_net.core.tabs.tab import Tab
 
@@ -16,11 +18,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 +48,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,97 +69,108 @@ 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) -> Optional[int]:
         """
         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 get_mapped(self, meta: CtxMeta) -> int or None:
+    def prepare_meta(self, tab: Tab) -> Optional[int]:
+        """
+        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) -> Optional[int]:
         """
         Get PID by meta
 
         :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: Optional[CtxMeta] = None) -> Optional[int]:
         """
         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):
+    def get_current(self, meta: Optional[CtxMeta] = None):
         """
         Get current output node by meta
 
@@ -165,7 +184,7 @@ class Output:
             for pid in self.window.ui.nodes['output']:
                 return self.window.ui.nodes['output'][pid]  # get first available
 
-    def get_current_plain(self, meta: CtxMeta = None):
+    def get_current_plain(self, meta: Optional[CtxMeta] = None):
         """
         Get current output plain node by meta
 
@@ -176,9 +195,10 @@ 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):
+    def get_by_pid(self, pid: Optional[int] = None):
         """
         Get output node by PID
 
@@ -191,7 +211,7 @@ class Output:
             for pid in self.window.ui.nodes['output']:
                 return self.window.ui.nodes['output'][pid]  # get first available
 
-    def get_by_pid_plain(self, pid = None):
+    def get_by_pid_plain(self, pid: Optional[int] = None):
         """
         Get output plain node by PID
 
@@ -201,9 +221,10 @@ 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:
+    def get_all(self) -> List:
         """
         Get all output nodes
 
@@ -214,7 +235,7 @@ class Output:
             nodes.append(node)
         return nodes
 
-    def get_all_plain(self) -> list:
+    def get_all_plain(self) -> List:
         """
         Get all output plain nodes
 

pygpt_net/core/ctx/reply.py

@@ -6,9 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.08.28 20:00:00                  #
+# Updated Date: 2024.12.14 08:00:00                  #
 # ================================================== #
 
+from typing import Dict, Any
+
+
 class ReplyContext:
 
     AGENT_CONTINUE = "agent.continue"
@@ -27,7 +30,7 @@ class ReplyContext:
         self.input = ""
         self.cmds = []
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> Dict[str, Any]:
         """
         Dump to dictionary
 

pygpt_net/core/db/__init__.py

@@ -6,12 +6,13 @@
 # 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                  #
 # ================================================== #
 
 import os
 import shutil
 import time
+from typing import Optional, Any, Dict
 
 from sqlalchemy import create_engine, text
 
@@ -320,7 +321,7 @@ class Database:
             self.db_path = os.path.join(self.window.core.config.path, self.db_name)
             self.prepare()
 
-    def get_tables(self) -> dict:
+    def get_tables(self) -> Dict[str, Dict[str, Any]]:
         """
         Get tables configuration
 
@@ -402,7 +403,7 @@ class Database:
             self.set_param_exec("db_version", migration_version, conn)
             print("[DB] Executed DB migration: {}".format(migration.__class__.__name__).replace('Version', ''))
 
-    def has_migrations_to_apply(self, migrations) -> bool:
+    def has_migrations_to_apply(self, migrations: list) -> bool:
         """
         Check if there are any migrations to apply
         
@@ -417,7 +418,7 @@ class Database:
                 break
         return has_migrations
 
-    def make_backup(self) -> str or None:
+    def make_backup(self) -> Optional[str]:
         """
         Make backup of database before migration
 
@@ -446,7 +447,7 @@ class Database:
                 for migration in sorted_migrations:
                     self.apply_migration(migration, conn, db_version)
 
-    def get_param(self, key: str) -> str or None:
+    def get_param(self, key: str) -> Optional[str]:
         """
         Get parameter from database
 
@@ -460,7 +461,7 @@ class Database:
             result = conn.execute(sel_stmt).fetchone()
             return result[0] if result else None
 
-    def set_param(self, key: str, value: any):
+    def set_param(self, key: str, value: Any):
         """
         Insert or update parameter in database
 
@@ -471,7 +472,7 @@ class Database:
         with self.engine.begin() as conn:
             self.set_param_exec(key, value, conn)
 
-    def set_param_exec(self, key: str, value: any, conn):
+    def set_param_exec(self, key: str, value: Any, conn):
         """
         Insert or update parameter in database
 

pygpt_net/core/db/viewer.py

@@ -6,16 +6,22 @@
 # 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
+from typing import Optional, List, Dict, Any
 
 from sqlalchemy import text
 
 
 class Viewer:
     def __init__(self, database):
+        """
+        Database viewer.
+
+        :param database: Database instance
+        """
         self.database = database
         self.tables = {}
         self.auto_backup = True
@@ -23,14 +29,14 @@ class Viewer:
     def fetch_data(
             self,
             table: str,
-            columns: list,
+            columns: List[str],
             sort_by: str,
             order: str,
-            search_query: str = None,
-            search_column: str = None,
+            search_query: Optional[str] = None,
+            search_column: Optional[str] = None,
             offset: int = 0,
             limit: int = 100,
-            filters: dict = None
+            filters: Optional[dict] = None
     ) -> list:
         """
         Fetch data from the database with the given parameters.
@@ -87,9 +93,9 @@ class Viewer:
     def count_rows(
             self,
             table: str,
-            search_query: str = None,
-            search_column: str = None,
-            filters: dict = None
+            search_query: Optional[str] = None,
+            search_column: Optional[str] = None,
+            filters: Optional[Dict[str, Any]] = None
     ) -> int:
         """
         Count the number of rows in the table with an optional search query.
@@ -142,7 +148,7 @@ class Viewer:
         """
         return self.database.window.ui.debug["db"].browser.is_auto_backup()
 
-    def delete_row(self, data: dict):
+    def delete_row(self, data: Dict[str, Any]):
         """
         Delete row from the database.
 
@@ -165,7 +171,7 @@ class Viewer:
             self.log(msg)
         self.database.window.ui.debug["db"].browser.update_table_view()
 
-    def update_row(self, data: dict):
+    def update_row(self, data: Dict[str, Any]):
         """
         Update row in the database.
 
@@ -216,7 +222,7 @@ class Viewer:
             self.log(msg)
         self.database.window.ui.debug["db"].browser.update_table_view()
 
-    def truncate_table(self, data: dict, reset: bool = False):
+    def truncate_table(self, data: Dict[str, Any], reset: bool = False):
         """
         Truncate table in the database.