pygpt-net 2.7.3__py3-none-any.whl → 2.7.5__py3-none-any.whl

pygpt_net/provider/core/{assistant_file → remote_file}/db_sqlite/storage.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 22:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #
 
 import time
@@ -14,7 +14,7 @@ from typing import Dict
 
 from sqlalchemy import text
 
-from pygpt_net.item.assistant import AssistantFileItem
+from pygpt_net.item.store import RemoteFileItem
 from .utils import pack_item_value, unpack_file
 
 
@@ -35,36 +35,37 @@ class Storage:
         """
         self.window = window
 
-    def get_all(self) -> Dict[str, AssistantFileItem]:
+    def get_all(self, provider: str) -> Dict[str, RemoteFileItem]:
         """
-        Return dict with AssistantFileItem objects, indexed by ID
+        Return dict with RemoteFileItem objects, indexed by ID
 
-        :return: dict of AssistantFileItem objects
+        :param provider: provider ID
+        :return: dict of RemoteFileItem objects
         """
         stmt = text("""
-            SELECT * FROM remote_file
-        """)
+            SELECT * FROM remote_file WHERE provider = :provider
+        """).bindparams(provider=provider)
         items = {}
         db = self.window.core.db.get_db()
         with db.connect() as conn:
             result = conn.execute(stmt)
             for row in result:
-                file = AssistantFileItem()
+                file = RemoteFileItem()
                 unpack_file(file, row._asdict())
                 items[file.id] = file  # index by ID
         return items
 
-    def get_by_id(self, id: int) -> AssistantFileItem:
+    def get_by_id(self, id: int) -> RemoteFileItem:
         """
-        Return AssistantFileItem by ID
+        Return RemoteFileItem by ID
 
         :param id: file item ID
-        :return: AssistantFileItem
+        :return: RemoteFileItem
         """
         stmt = text("""
             SELECT * FROM remote_file WHERE id = :id LIMIT 1
         """).bindparams(idx=id)
-        file = AssistantFileItem()
+        file = RemoteFileItem()
         db = self.window.core.db.get_db()
         with db.connect() as conn:
             result = conn.execute(stmt)
@@ -74,9 +75,9 @@ class Storage:
 
     def get_by_store_or_thread(self, store_id: str, thread_id: str) -> dict:
         """
-        Return dict with AssistantFileItem objects, indexed by ID
+        Return dict with RemoteFileItem objects, indexed by ID
 
-        :return: dict of AssistantFileItem objects
+        :return: dict of RemoteFileItem objects
         """
         if (store_id is None or store_id == "") and (thread_id is None or thread_id == ""):
             return {}
@@ -105,14 +106,14 @@ class Storage:
         with db.connect() as conn:
             result = conn.execute(stmt)
             for row in result:
-                file = AssistantFileItem()
+                file = RemoteFileItem()
                 unpack_file(file, row._asdict())
                 items[file.id] = file  # index by record ID
         return items
 
     def count_by_store_or_thread(self, store_id: str, thread_id: str) -> int:
         """
-        Count AssistantFileItem objects
+        Count RemoteFileItem objects
 
         :return: num of files
         """
@@ -161,21 +162,22 @@ class Storage:
         with db.connect() as conn:
             result = conn.execute(stmt)
             for row in result:
-                file = AssistantFileItem()
+                file = RemoteFileItem()
                 unpack_file(file, row._asdict())
                 items[file.id] = file
         return items
 
-    def truncate_all(self) -> bool:
+    def truncate_all(self, provider: str) -> bool:
         """
         Truncate all files items
 
+        :param provider: provider ID
         :return: True if truncated
         """
         db = self.window.core.db.get_db()
         with db.begin() as conn:
-            conn.execute(text("DELETE FROM remote_file"))
-            conn.execute(text("DELETE FROM sqlite_sequence WHERE name='remote_file'"))
+            conn.execute(text("DELETE FROM remote_file WHERE provider = :provider").bindparams(provider=provider))
+            # conn.execute(text("DELETE FROM sqlite_sequence WHERE name='remote_file'"))
         return True
 
     def truncate_by_store(self, store_id: str) -> bool:
@@ -238,15 +240,16 @@ class Storage:
             conn.execute(stmt)
             return True
 
-    def clear_all_stores_from_files(self) -> bool:
+    def clear_all_stores_from_files(self, provider: str) -> bool:
         """
         Clear all stores from files
 
+        :param provider: provider ID
         :return: True if cleared
         """
         stmt = text("""
-            DELETE FROM remote_file WHERE store_id IS NOT NULL
-        """)
+            DELETE FROM remote_file WHERE store_id IS NOT NULL AND provider = :provider
+        """).bindparams(provider=provider)
         db = self.window.core.db.get_db()
         with db.begin() as conn:
             conn.execute(stmt)
@@ -271,11 +274,11 @@ class Storage:
             conn.execute(stmt)
             return True
 
-    def save(self, file: AssistantFileItem):
+    def save(self, file: RemoteFileItem):
         """
         Insert or update file item
 
-        :param file: AssistantFileItem object
+        :param file: RemoteFileItem object
         """
         db = self.window.core.db.get_db()
         with db.begin() as conn:
@@ -284,6 +287,7 @@ class Storage:
                 UPDATE remote_file
                 SET
                     name = :name,
+                    provider = :provider,
                     path = :path,
                     file_id = :file_id,
                     store_id = :store_id,
@@ -293,6 +297,7 @@ class Storage:
                 """).bindparams(
                 id=file.record_id,
                 name=file.name,
+                provider=file.provider,
                 path=file.path,
                 file_id=file.file_id,
                 store_id=file.store_id,
@@ -301,11 +306,11 @@ class Storage:
             )
             conn.execute(stmt)
 
-    def insert(self, file: AssistantFileItem) -> int:
+    def insert(self, file: RemoteFileItem) -> int:
         """
         Insert file item
 
-        :param file: AssistantFileItem object
+        :param file: RemoteFileItem object
         :return: file item ID
         """
         db = self.window.core.db.get_db()
@@ -315,6 +320,7 @@ class Storage:
                 (
                     uuid,
                     name,
+                    provider,
                     path,
                     size,
                     file_id,
@@ -327,6 +333,7 @@ class Storage:
                 (
                     :uuid,
                     :name,
+                    :provider,
                     :path,
                     :size,
                     :file_id,
@@ -338,6 +345,7 @@ class Storage:
             """).bindparams(
             uuid=file.uuid,
             name=file.name,
+            provider=file.provider,
             path=file.path,
             size=int(file.size or 0),
             file_id=file.file_id,

pygpt_net/provider/core/{assistant_file → remote_file}/db_sqlite/utils.py

@@ -6,20 +6,20 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.26 23:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #
 
 import json
 
 from pygpt_net.utils import unpack_var
-from pygpt_net.item.assistant import AssistantFileItem
+from pygpt_net.item.store import RemoteFileItem
 
 
-def unpack_file(file: AssistantFileItem, row: dict) -> AssistantFileItem:
+def unpack_file(file: RemoteFileItem, row: dict) -> RemoteFileItem:
     """
     Unpack file item from DB row
 
-    :param file: file item (AssistantStoreItem)
+    :param file: file item (RemoteStoreItem)
     :param row: DB row
     :return: store item
     """
@@ -30,6 +30,7 @@ def unpack_file(file: AssistantFileItem, row: dict) -> AssistantFileItem:
     file.updated = unpack_var(row['updated_ts'], "int")
     file.size = unpack_var(row['size'], "int")
     file.name = row['name']
+    file.provider = row['provider']
     file.path = row['path']
     file.file_id = row['file_id']
     file.store_id = row['store_id']

pygpt_net/provider/core/{assistant_store → remote_store}/__init__.py

@@ -6,5 +6,5 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.26 23:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #

pygpt_net/provider/core/{assistant_store → remote_store}/base.py

@@ -6,21 +6,21 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 22:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #
 
 from typing import Dict
 
 from packaging.version import Version
 
-from pygpt_net.item.assistant import AssistantStoreItem
+from pygpt_net.item.store import RemoteStoreItem
 
 
 class BaseProvider:
     def __init__(self, window=None):
         self.window = window
         self.id = ""
-        self.type = "assistant_store"
+        self.type = "remote_store"
 
     def attach(self, window):
         self.window = window
@@ -31,26 +31,26 @@ class BaseProvider:
     def patch(self, version: Version) -> bool:
         pass
 
-    def create(self, store: AssistantStoreItem) -> str:
+    def create(self, store: RemoteStoreItem) -> str:
         pass
 
-    def load(self, id) -> AssistantStoreItem:
+    def load(self, id) -> RemoteStoreItem:
         pass
 
-    def load_all(self) -> Dict[str, AssistantStoreItem]:
+    def load_all(self, provider: str) -> Dict[str, RemoteStoreItem]:
         pass
 
-    def save(self, file:  AssistantStoreItem):
+    def save(self, file:  RemoteStoreItem):
         pass
 
-    def save_all(self, items: Dict[str, AssistantStoreItem]):
+    def save_all(self, items: Dict[str, RemoteStoreItem]):
         pass
 
     def remove(self, id: str):
         pass
 
-    def truncate(self):
+    def truncate(self, provider: str):
         pass
 
-    def dump(self, store: AssistantStoreItem) -> str:
+    def dump(self, store: RemoteStoreItem) -> str:
         pass

pygpt_net/provider/core/{assistant_store → remote_store}/db_sqlite/__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.14 22:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #
 
 from .provider import *

pygpt_net/provider/core/{assistant_store → remote_store}/db_sqlite/patch.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.26 23:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #
 
 from packaging.version import parse as parse_version, Version

pygpt_net/provider/core/{assistant_store → remote_store}/db_sqlite/provider.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 22:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #
 
 import uuid
@@ -14,8 +14,8 @@ from typing import Dict
 
 from packaging.version import Version
 
-from pygpt_net.item.assistant import AssistantStoreItem
-from pygpt_net.provider.core.assistant_store.base import BaseProvider
+from pygpt_net.item.store import RemoteStoreItem
+from pygpt_net.provider.core.remote_store.base import BaseProvider
 
 from .patch import Patch
 from .storage import Storage
@@ -28,7 +28,7 @@ class DbSqliteProvider(BaseProvider):
         self.patcher = Patch(window, self)
         self.storage = Storage(window)
         self.id = "db_sqlite"
-        self.type = "assistant_store"
+        self.type = "remote_store"
 
     def attach(self, window):
         self.window = window
@@ -51,11 +51,11 @@ class DbSqliteProvider(BaseProvider):
         """
         return str(uuid.uuid4())
 
-    def create(self, store: AssistantStoreItem) -> int:
+    def create(self, store: RemoteStoreItem) -> int:
         """
         Create new and return its ID
 
-        :param store: AssistantStoreItem
+        :param store: RemoteStoreItem
         :return: store ID
         """
         if store.record_id is None or store.record_id == "":
@@ -63,15 +63,16 @@ class DbSqliteProvider(BaseProvider):
             store.record_id = self.storage.insert(store)
         return store.record_id
 
-    def load_all(self) -> Dict[str, AssistantStoreItem]:
+    def load_all(self, provider: str) -> Dict[str, RemoteStoreItem]:
         """
         Load stores from DB
 
+        :param provider: provider ID
         :return: stores dict
         """
-        return self.storage.get_all()
+        return self.storage.get_all(provider)
 
-    def load(self, id: int) -> AssistantStoreItem:
+    def load(self, id: int) -> RemoteStoreItem:
         """
         Load store from DB
 
@@ -80,11 +81,11 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.get_by_id(id)
 
-    def save(self, store: AssistantStoreItem):
+    def save(self, store: RemoteStoreItem):
         """
         Save store to DB
 
-        :param store: AssistantStoreItem
+        :param store: RemoteStoreItem
         """
         try:
             self.storage.save(store)
@@ -92,11 +93,11 @@ class DbSqliteProvider(BaseProvider):
             self.window.core.debug.log(e)
             print("Error while saving stored: {}".format(str(e)))
 
-    def save_all(self, items: Dict[str, AssistantStoreItem]):
+    def save_all(self, items: Dict[str, RemoteStoreItem]):
         """
         Save all stores to DB
 
-        :param items: dict of AssistantStoreItem objects
+        :param items: dict of RemoteStoreItem objects
         """
         try:
             for id in items:
@@ -124,12 +125,12 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.delete_by_store_id(id)
 
-    def truncate(self) -> bool:
+    def truncate(self, provider: str) -> bool:
         """
         Truncate all stores
 
         :return: True if truncated
         """
-        return self.storage.truncate_all()
+        return self.storage.truncate_all(provider)
 
 

pygpt_net/provider/core/{assistant_store → remote_store}/db_sqlite/storage.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 22:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #
 
 import time
@@ -14,7 +14,7 @@ from typing import Dict
 
 from sqlalchemy import text
 
-from pygpt_net.item.assistant import AssistantStoreItem
+from pygpt_net.item.store import RemoteStoreItem
 
 from .utils import pack_item_value, unpack_store
 
@@ -35,36 +35,37 @@ class Storage:
         """
         self.window = window
 
-    def get_all(self) -> Dict[str, AssistantStoreItem]:
+    def get_all(self, provider: str) -> Dict[str, RemoteStoreItem]:
         """
-        Return dict with AssistantStoreItem objects, indexed by ID
+        Return dict with RemoteStoreItem objects, indexed by ID
 
-        :return: dict of AssistantStoreItem objects
+        :param provider: provider ID
+        :return: dict of RemoteStoreItem objects
         """
         stmt = text("""
-            SELECT * FROM remote_store
-        """)
+            SELECT * FROM remote_store WHERE provider = :provider
+        """).bindparams(provider=provider)
         items = {}
         db = self.window.core.db.get_db()
         with db.connect() as conn:
             result = conn.execute(stmt)
             for row in result:
-                store = AssistantStoreItem()
+                store = RemoteStoreItem()
                 unpack_store(store, row._asdict())
                 items[store.id] = store  # index by store ID
         return items
 
-    def get_by_id(self, id: int) -> AssistantStoreItem:
+    def get_by_id(self, id: int) -> RemoteStoreItem:
         """
-        Return AssistantStoreItem by ID
+        Return RemoteStoreItem by ID
 
         :param id: store item ID
-        :return: AssistantStoreItem
+        :return: RemoteStoreItem
         """
         stmt = text("""
             SELECT * FROM remote_store WHERE id = :id LIMIT 1
         """).bindparams(id=id)
-        store = AssistantStoreItem()
+        store = RemoteStoreItem()
         db = self.window.core.db.get_db()
         with db.connect() as conn:
             result = conn.execute(stmt)
@@ -72,17 +73,17 @@ class Storage:
                 unpack_store(store, row._asdict())
         return store
 
-    def get_by_store_id(self, id: str) -> AssistantStoreItem:
+    def get_by_store_id(self, id: str) -> RemoteStoreItem:
         """
-        Return AssistantStoreItem by ID
+        Return RemoteStoreItem by ID
 
         :param id: store_id
-        :return: AssistantStoreItem
+        :return: RemoteStoreItem
         """
         stmt = text("""
             SELECT * FROM remote_store WHERE store_id = :id LIMIT 1
         """).bindparams(id=id)
-        store = AssistantStoreItem()
+        store = RemoteStoreItem()
         db = self.window.core.db.get_db()
         with db.connect() as conn:
             result = conn.execute(stmt)
@@ -90,16 +91,17 @@ class Storage:
                 unpack_store(store, row._asdict())
         return store
 
-    def truncate_all(self) -> bool:
+    def truncate_all(self, provider: str) -> bool:
         """
         Truncate all stores items
 
+        :param provider: provider ID
         :return: True if truncated
         """
         db = self.window.core.db.get_db()
         with db.begin() as conn:
-            conn.execute(text("DELETE FROM remote_store"))
-            conn.execute(text("DELETE FROM sqlite_sequence WHERE name='remote_store'"))
+            conn.execute(text("DELETE FROM remote_store WHERE provider = :provider").bindparams(provider=provider))
+            # conn.execute(text("DELETE FROM sqlite_sequence WHERE name='remote_store'"))
         return True
 
     def delete_by_id(self, id: int) -> bool:
@@ -132,11 +134,11 @@ class Storage:
             conn.execute(stmt)
             return True
 
-    def save(self, store: AssistantStoreItem):
+    def save(self, store: RemoteStoreItem):
         """
         Insert or update store item
 
-        :param store: AssistantStoreItem object
+        :param store: RemoteStoreItem object
         """
         db = self.window.core.db.get_db()
         with db.begin() as conn:
@@ -145,6 +147,7 @@ class Storage:
                 UPDATE remote_store
                 SET
                     name = :name,
+                    provider = :provider,
                     description = :description,
                     expire_days = :expire_days,
                     usage_bytes = :usage_bytes,
@@ -160,6 +163,7 @@ class Storage:
                 """).bindparams(
                 id=store.record_id,
                 name=store.name,
+                provider=store.provider,
                 description=store.description,
                 expire_days=store.expire_days,
                 usage_bytes=store.usage_bytes,
@@ -174,11 +178,11 @@ class Storage:
             )
             conn.execute(stmt)
 
-    def insert(self, store: AssistantStoreItem) -> int:
+    def insert(self, store: RemoteStoreItem) -> int:
         """
         Insert store item
 
-        :param store: AssistantStoreItem object
+        :param store: RemoteStoreItem object
         :return: store item ID
         """
         db = self.window.core.db.get_db()
@@ -189,6 +193,7 @@ class Storage:
                 store_id,
                 uuid,
                 name,
+                provider,
                 description,
                 expire_days,
                 usage_bytes,
@@ -206,6 +211,7 @@ class Storage:
                 :store_id,
                 :uuid,
                 :name,
+                :provider,
                 :description,
                 :expire_days,
                 :usage_bytes,
@@ -222,6 +228,7 @@ class Storage:
             store_id=store.id,
             uuid=store.uuid,
             name=store.name,
+            provider=store.provider,
             description=store.description,
             expire_days=int(store.expire_days or 0),
             usage_bytes=int(store.usage_bytes or 0),

pygpt_net/provider/core/{assistant_store → remote_store}/db_sqlite/utils.py

@@ -6,20 +6,20 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.26 23:00:00                  #
+# Updated Date: 2026.01.02 20:00:00                  #
 # ================================================== #
 
 import json
 
 from pygpt_net.utils import unpack_var
-from pygpt_net.item.assistant import AssistantStoreItem
+from pygpt_net.item.store import RemoteStoreItem
 
 
-def unpack_store(store: AssistantStoreItem, row: dict) -> AssistantStoreItem:
+def unpack_store(store: RemoteStoreItem, row: dict) -> RemoteStoreItem:
     """
     Unpack store item from DB row
 
-    :param store: store item (AssistantStoreItem)
+    :param store: store item (RemoteStoreItem)
     :param row: DB row
     :return: store item
     """
@@ -31,6 +31,7 @@ def unpack_store(store: AssistantStoreItem, row: dict) -> AssistantStoreItem:
     store.last_active = unpack_var(row['last_active_ts'], "int")
     store.last_sync = unpack_var(row['last_sync_ts'], "int")
     store.name = row['name']
+    store.provider = row['provider']
     store.description = row['description']
     store.expire_days = unpack_var(row['expire_days'], "int")
     store.usage_bytes = unpack_var(row['usage_bytes'], "int")