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

pygpt_net/provider/core/index/db_sqlite/storage.py

@@ -6,13 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.06 02:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import uuid
 import time
+from typing import Dict, Optional
 
 from sqlalchemy import text
+from traitlets import Any
 
 from pygpt_net.item.index import IndexItem
 from .utils import unpack_file_item
@@ -35,7 +37,10 @@ class Storage:
         """
         self.window = window
 
-    def get_items(self, store_id: str) -> dict:
+    def get_items(
+            self,
+            store_id: str
+    ) -> Dict[str, IndexItem]:
         """
         Return idx items by store ID
 
@@ -65,7 +70,12 @@ class Storage:
 
         return indexes
 
-    def insert_file(self, store_id: str, idx: str, data: dict) -> int:
+    def insert_file(
+            self,
+            store_id: str,
+            idx: str,
+            data: Dict[str, Any]
+    ) -> int:
         """
         Insert file to index
 
@@ -114,7 +124,13 @@ class Storage:
 
         return id
 
-    def insert_ctx_meta(self, store_id: str, idx: str, meta_id: int, doc_id: str) -> int:
+    def insert_ctx_meta(
+            self,
+            store_id: str,
+            idx: str,
+            meta_id: int,
+            doc_id: str
+    ) -> int:
         """
         Insert ctx meta to index
 
@@ -162,7 +178,12 @@ class Storage:
 
         return id
 
-    def insert_external(self, store_id: str, idx: str, data: dict) -> int:
+    def insert_external(
+            self,
+            store_id: str,
+            idx: str,
+            data: Dict[str, Any]
+    ) -> int:
         """
         Insert external data to index
 
@@ -211,7 +232,12 @@ class Storage:
 
         return id
 
-    def is_meta_indexed(self, store_id: str, idx: str, meta_id: int) -> bool:
+    def is_meta_indexed(
+            self,
+            store_id: str,
+            idx: str,
+            meta_id: int
+    ) -> bool:
         """
         Check if context meta is indexed
 
@@ -238,7 +264,12 @@ class Storage:
             data = row._asdict()
             return int(data['count']) > 0
 
-    def is_file_indexed(self, store_id: str, idx: str, file_id: str) -> bool:
+    def is_file_indexed(
+            self,
+            store_id: str,
+            idx: str,
+            file_id: str
+    ) -> bool:
         """
         Check if file is indexed
 
@@ -265,7 +296,13 @@ class Storage:
             data = row._asdict()
             return int(data['count']) > 0
 
-    def is_external_indexed(self, store_id: str, idx: str, content: str, type: str) -> bool:
+    def is_external_indexed(
+            self,
+            store_id: str,
+            idx: str,
+            content: str,
+            type: str
+    ) -> bool:
         """
         Check if external is indexed
 
@@ -295,7 +332,12 @@ class Storage:
             data = row._asdict()
             return int(data['count']) > 0
 
-    def get_meta_doc_id(self, store_id: str, idx: str, meta_id: int) -> str:
+    def get_meta_doc_id(
+            self,
+            store_id: str,
+            idx: str,
+            meta_id: int
+    ) -> str:
         """
         Get indexed document id by meta id
 
@@ -322,7 +364,12 @@ class Storage:
             data = row._asdict()
             return data['doc_id']
 
-    def get_file_doc_id(self, store_id: str, idx: str, file_id: str) -> str:
+    def get_file_doc_id(
+            self,
+            store_id: str,
+            idx: str,
+            file_id: str
+    ) -> str:
         """
         Get indexed document id by file id
 
@@ -349,7 +396,13 @@ class Storage:
             data = row._asdict()
             return data['doc_id']
 
-    def get_external_doc_id(self, store_id: str, idx: str, content: str, type: str) -> str:
+    def get_external_doc_id(
+            self,
+            store_id: str,
+            idx: str,
+            content: str,
+            type: str
+    ) -> str:
         """
         Get indexed document id by external
 
@@ -379,7 +432,12 @@ class Storage:
             data = row._asdict()
             return data['doc_id']
 
-    def update_file(self, id: int, doc_id: str, ts: int) -> bool:
+    def update_file(
+            self,
+            id: int,
+            doc_id: str,
+            ts: int
+    ) -> bool:
         """
         Update timestamp of file in index
 
@@ -403,7 +461,11 @@ class Storage:
             conn.execute(stmt)
         return True
 
-    def update_ctx_meta(self, meta_id: int, doc_id: str) -> bool:
+    def update_ctx_meta(
+            self,
+            meta_id: int,
+            doc_id: str
+    ) -> bool:
         """
         Update timestamp of ctx meta in index
 
@@ -427,7 +489,13 @@ class Storage:
             conn.execute(stmt)
         return True
 
-    def update_external(self, content: str, type: str, doc_id: str, ts: int) -> bool:
+    def update_external(
+            self,
+            content: str,
+            type: str,
+            doc_id: str,
+            ts: int
+    ) -> bool:
         """
         Update timestamp of external data in index
 
@@ -454,7 +522,12 @@ class Storage:
             conn.execute(stmt)
         return True
 
-    def remove_file(self, store_id: str, idx: str, doc_id: str):
+    def remove_file(
+            self,
+            store_id: str,
+            idx: str,
+            doc_id: str
+    ):
         """
         Remove file from index
 
@@ -471,7 +544,12 @@ class Storage:
                     doc_id=doc_id,
                 ))
 
-    def remove_ctx_meta(self, store_id: str, idx: str, meta_id: str):
+    def remove_ctx_meta(
+            self,
+            store_id: str,
+            idx: str,
+            meta_id: str
+    ):
         """
         Remove file from index
 
@@ -488,7 +566,12 @@ class Storage:
                     meta_id=meta_id,
                 ))
 
-    def remove_external(self, store_id: str, idx: str, doc_id: str):
+    def remove_external(
+            self,
+            store_id: str,
+            idx: str,
+            doc_id: str
+    ):
         """
         Remove file from index
 
@@ -505,7 +588,11 @@ class Storage:
                     doc_id=doc_id,
                 ))
 
-    def truncate_all(self, store_id: str = None, idx: str = None) -> bool:
+    def truncate_all(
+            self,
+            store_id: Optional[str] = None,
+            idx: Optional[str] = None
+    ) -> bool:
         """
         Truncate all idx tables in database (all stores)
 
@@ -518,7 +605,11 @@ class Storage:
         self.truncate_external(store_id, idx)
         return True
 
-    def truncate_files(self, store_id: str = None, idx: str = None) -> bool:
+    def truncate_files(
+            self,
+            store_id: Optional[str] = None,
+            idx: Optional[str] = None
+    ) -> bool:
         """
         Truncate files table in database
 
@@ -528,7 +619,11 @@ class Storage:
         """
         return self.truncate_by_db_table("idx_file", store_id, idx)
 
-    def truncate_ctx(self, store_id: str = None, idx: str = None) -> bool:
+    def truncate_ctx(
+            self,
+            store_id: Optional[str] = None,
+            idx: Optional[str] = None
+    ) -> bool:
         """
         Truncate context table in database
 
@@ -538,7 +633,11 @@ class Storage:
         """
         return self.truncate_by_db_table("idx_ctx", store_id, idx)
 
-    def truncate_external(self, store_id: str = None, idx: str = None) -> bool:
+    def truncate_external(
+            self,
+            store_id: Optional[str] = None,
+            idx: Optional[str] = None
+    ) -> bool:
         """
         Truncate external table in database
 
@@ -548,7 +647,12 @@ class Storage:
         """
         return self.truncate_by_db_table("idx_external", store_id, idx)
 
-    def truncate_by_db_table(self, tbl: str, store_id: str = None, idx: str = None) -> bool:
+    def truncate_by_db_table(
+            self,
+            tbl: str,
+            store_id: Optional[str] = None,
+            idx: Optional[str] = None
+    ) -> bool:
         """
         Truncate external table in database
 
@@ -574,7 +678,10 @@ class Storage:
                 text(query).bindparams(**params))
         return True
 
-    def get_counters(self, type: str) -> dict:
+    def get_counters(
+            self,
+            type: str
+    ) -> Dict[str, Dict[str, int]]:
         """
         Get counters (stats, count items by type [file, ctx, external])
 

pygpt_net/provider/core/index/db_sqlite/utils.py

@@ -6,13 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.06 02:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import Tuple, Dict, Any
+
 from pygpt_net.utils import unpack_var
 
 
-def unpack_file_item(row: dict) -> (str, dict):
+def unpack_file_item(row: Dict[str, Any]) -> Tuple[str, dict]:
     """
     Unpack item from DB row
 

pygpt_net/provider/core/mode/base.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2023.12.31 04:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import Dict
+
 from pygpt_net.item.mode import ModeItem
 
 
@@ -24,10 +26,10 @@ class BaseProvider:
     def create(self, mode: ModeItem) -> str:
         pass
 
-    def load(self) -> dict:
+    def load(self) -> Dict[str, str]:
         pass
 
-    def save(self, items: dict):
+    def save(self, items: Dict[str, str]):
         pass
 
     def remove(self, id: str):

pygpt_net/provider/core/mode/json_file.py

@@ -6,11 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.01.12 04:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import json
 import os
+from typing import Optional, Dict
 
 from pygpt_net.provider.core.mode.base import BaseProvider
 from pygpt_net.item.mode import ModeItem
@@ -26,7 +27,7 @@ class JsonFileProvider(BaseProvider):
         self.type = "mode"
         self.config_file = 'modes.json'
 
-    def get_version(self) -> str | None:
+    def get_version(self) -> Optional[str]:
         """
         Get data version
 
@@ -40,7 +41,7 @@ class JsonFileProvider(BaseProvider):
             if '__meta__' in data and 'version' in data['__meta__']:
                 return data['__meta__']['version']
 
-    def load(self) -> dict | None:
+    def load(self) -> Optional[Dict[str, ModeItem]]:
         """
         Load modes config from JSON file
 
@@ -69,7 +70,7 @@ class JsonFileProvider(BaseProvider):
 
         return items
 
-    def save(self, items: dict):
+    def save(self, items: Dict[str, ModeItem]):
         """
         Save modes config to JSON file
 
@@ -101,7 +102,7 @@ class JsonFileProvider(BaseProvider):
         pass
 
     @staticmethod
-    def serialize(item: ModeItem) -> dict:
+    def serialize(item: ModeItem) -> Dict[str, str]:
         """
         Serialize item to dict
 
@@ -116,7 +117,7 @@ class JsonFileProvider(BaseProvider):
         }
 
     @staticmethod
-    def deserialize(data: dict, item: ModeItem):
+    def deserialize(data: Dict[str, str], item: ModeItem):
         """
         Deserialize item from dict
 

pygpt_net/provider/core/model/base.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2023.12.31 04:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import Dict
+
 from packaging.version import Version
 
 from pygpt_net.item.model import ModelItem
@@ -32,13 +34,13 @@ class BaseProvider:
     def create(self, model: ModelItem) -> str:
         pass
 
-    def load(self) -> dict:
+    def load(self) -> Dict[str, ModelItem]:
         pass
 
-    def load_base(self) -> dict:
+    def load_base(self) -> Dict[str, ModelItem]:
         pass
 
-    def save(self, items: dict):
+    def save(self, items: Dict[str, ModelItem]):
         pass
 
     def remove(self, id: str):

pygpt_net/provider/core/model/json_file.py

@@ -6,12 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.15 00:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import json
 import os
 import shutil
+from typing import Optional, Dict, Any
+
 from packaging.version import Version
 
 from pygpt_net.provider.core.model.base import BaseProvider
@@ -38,7 +40,7 @@ class JsonFileProvider(BaseProvider):
             src = os.path.join(self.window.core.config.get_app_path(), 'data', 'config', self.config_file)
             shutil.copyfile(src, dst)
 
-    def get_version(self) -> str | None:
+    def get_version(self) -> Optional[str]:
         """
         Get data version
 
@@ -52,7 +54,7 @@ class JsonFileProvider(BaseProvider):
             if '__meta__' in data and 'version' in data['__meta__']:
                 return data['__meta__']['version']
 
-    def load_base(self) -> dict | None:
+    def load_base(self) -> Optional[Dict[str, ModelItem]]:
         """
         Load base models config from base JSON file
 
@@ -61,7 +63,7 @@ class JsonFileProvider(BaseProvider):
         path = os.path.join(self.window.core.config.get_app_path(), 'data', 'config', self.config_file)
         return self.load(path)
 
-    def load(self, path: str = None) -> dict | None:
+    def load(self, path: Optional[str] = None) -> Optional[Dict[str, ModelItem]]:
         """
         Load models config from JSON file
         """
@@ -106,7 +108,7 @@ class JsonFileProvider(BaseProvider):
 
         return items
 
-    def save(self, items: dict):
+    def save(self, items: Dict[str, ModelItem]):
         """
         Save models config to JSON file
 
@@ -147,7 +149,7 @@ class JsonFileProvider(BaseProvider):
         return self.patcher.execute(version)
 
     @staticmethod
-    def serialize(item: ModelItem) -> dict:
+    def serialize(item: ModelItem) -> Dict[str, Any]:
         """
         Serialize item to dict
 
@@ -167,7 +169,7 @@ class JsonFileProvider(BaseProvider):
         }
 
     @staticmethod
-    def deserialize(data: dict, item: ModelItem):
+    def deserialize(data: Dict[str, Any], item: ModelItem):
         """
         Deserialize item from dict
 

pygpt_net/provider/core/notepad/base.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2023.12.31 04:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import Dict
+
 from packaging.version import Version
 
 from pygpt_net.item.notepad import NotepadItem
@@ -35,13 +37,13 @@ class BaseProvider:
     def load(self, id) -> NotepadItem:
         pass
 
-    def load_all(self) -> dict:
+    def load_all(self) -> Dict[int, NotepadItem]:
         pass
 
     def save(self, notepad: NotepadItem):
         pass
 
-    def save_all(self, items: dict):
+    def save_all(self, items: Dict[int, NotepadItem]):
         pass
 
     def remove(self, id):

pygpt_net/provider/core/notepad/db_sqlite/__init__.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.01.12 04:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import uuid
+from typing import Dict
 
 from packaging.version import Version
 
@@ -49,7 +50,7 @@ class DbSqliteProvider(BaseProvider):
         """
         return str(uuid.uuid4())
 
-    def create(self, notepad: NotepadItem) -> str:
+    def create(self, notepad: NotepadItem) -> int:
         """
         Create new and return its ID
 
@@ -60,7 +61,7 @@ class DbSqliteProvider(BaseProvider):
             notepad.id = self.storage.insert(notepad)
         return notepad.id
 
-    def load_all(self) -> dict:
+    def load_all(self) -> Dict[int, NotepadItem]:
         """
         Load notepads from DB
 
@@ -89,7 +90,7 @@ class DbSqliteProvider(BaseProvider):
             self.window.core.debug.log(e)
             print("Error while saving notepad: {}".format(str(e)))
 
-    def save_all(self, items: dict):
+    def save_all(self, items: Dict[int, NotepadItem]):
         """
         Save all notepads to DB
 

pygpt_net/provider/core/notepad/db_sqlite/storage.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2023.12.31 04:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import time
+from typing import Dict, Any
 
 from sqlalchemy import text
 
@@ -33,7 +34,7 @@ class Storage:
         """
         self.window = window
 
-    def get_all(self) -> dict:
+    def get_all(self) -> Dict[int, NotepadItem]:
         """
         Return dict with NotepadItem objects, indexed by ID
 
@@ -207,7 +208,7 @@ class Storage:
             notepad.id = result.lastrowid
             return notepad.id
 
-    def unpack(self, notepad: NotepadItem, row: dict) -> NotepadItem:
+    def unpack(self, notepad: NotepadItem, row: Dict[str, Any]) -> NotepadItem:
         """
         Unpack notepad item from DB row
 

pygpt_net/provider/core/plugin_preset/base.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.06 22:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import Optional
+
 from packaging.version import Version
 
 
@@ -27,7 +29,7 @@ class BaseProvider:
     def patch(self, version: Version) -> bool:
         pass
 
-    def load(self, all: bool = False) -> dict:
+    def load(self, all: bool = False) -> Optional[dict]:
         pass
 
     def save(self, items: dict):

pygpt_net/provider/core/plugin_preset/json_file.py

@@ -6,11 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.03.06 22:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import json
 import os
+from typing import Optional
+
 from packaging.version import Version
 
 from pygpt_net.provider.core.plugin_preset.base import BaseProvider
@@ -35,7 +37,7 @@ class JsonFileProvider(BaseProvider):
             self.save({})
             print("Installed: {}".format(dst))
 
-    def get_version(self) -> str | None:
+    def get_version(self) -> Optional[str]:
         """
         Get config file version
 
@@ -50,7 +52,7 @@ class JsonFileProvider(BaseProvider):
                 if '__meta__' in data and 'version' in data['__meta__']:
                     return data['__meta__']['version']
 
-    def load(self, all: bool = False) -> dict | None:
+    def load(self, all: bool = False) -> Optional[dict]:
         """
         Load config from JSON file