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

pygpt_net/provider/core/assistant_file/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.04.29 16:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import uuid
+from typing import Dict
 
 from packaging.version import Version
 
@@ -67,7 +68,7 @@ class DbSqliteProvider(BaseProvider):
             file.record_id = self.storage.insert(file)
         return file.record_id
 
-    def load_all(self) -> dict:
+    def load_all(self) -> Dict[str, AssistantFileItem]:
         """
         Load files from DB
 
@@ -96,7 +97,7 @@ class DbSqliteProvider(BaseProvider):
             self.window.core.debug.log(e)
             print("Error while saving filed: {}".format(str(e)))
 
-    def save_all(self, items: dict):
+    def save_all(self, items: Dict[str, AssistantFileItem]):
         """
         Save all files to DB
 

pygpt_net/provider/core/assistant_file/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: 2024.04.29 16:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import time
+from typing import Dict
 
 from sqlalchemy import text
 
@@ -34,7 +35,7 @@ class Storage:
         """
         self.window = window
 
-    def get_all(self) -> dict:
+    def get_all(self) -> Dict[str, AssistantFileItem]:
         """
         Return dict with AssistantFileItem objects, indexed by ID
 

pygpt_net/provider/core/assistant_store/base.py

@@ -6,9 +6,11 @@
 # 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: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import Dict
+
 from packaging.version import Version
 
 from pygpt_net.item.assistant import AssistantStoreItem
@@ -32,16 +34,16 @@ class BaseProvider:
     def create(self, store: AssistantStoreItem) -> str:
         pass
 
-    def load(self, id) -> dict:
+    def load(self, id) -> AssistantStoreItem:
         pass
 
-    def load_all(self) -> dict:
+    def load_all(self) -> Dict[str, AssistantStoreItem]:
         pass
 
     def save(self, file:  AssistantStoreItem):
         pass
 
-    def save_all(self, items: dict):
+    def save_all(self, items: Dict[str, AssistantStoreItem]):
         pass
 
     def remove(self, id: str):

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

@@ -1,15 +1,16 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ================================================== #
-# This store is a part of PYGPT package               #
+# This store is a part of PYGPT package              #
 # Website: https://pygpt.net                         #
 # 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: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import uuid
+from typing import Dict
 
 from packaging.version import Version
 
@@ -62,7 +63,7 @@ class DbSqliteProvider(BaseProvider):
             store.record_id = self.storage.insert(store)
         return store.record_id
 
-    def load_all(self) -> dict:
+    def load_all(self) -> Dict[str, AssistantStoreItem]:
         """
         Load stores from DB
 
@@ -91,7 +92,7 @@ class DbSqliteProvider(BaseProvider):
             self.window.core.debug.log(e)
             print("Error while saving stored: {}".format(str(e)))
 
-    def save_all(self, items: dict):
+    def save_all(self, items: Dict[str, AssistantStoreItem]):
         """
         Save all stores to DB
 

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

@@ -1,19 +1,21 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ================================================== #
-# This store is a part of PYGPT package               #
+# This store is a part of PYGPT package              #
 # Website: https://pygpt.net                         #
 # 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: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import time
+from typing import Dict
 
 from sqlalchemy import text
 
 from pygpt_net.item.assistant import AssistantStoreItem
+
 from .utils import pack_item_value, unpack_store
 
 class Storage:
@@ -33,7 +35,7 @@ class Storage:
         """
         self.window = window
 
-    def get_all(self) -> dict:
+    def get_all(self) -> Dict[str, AssistantStoreItem]:
         """
         Return dict with AssistantStoreItem objects, indexed by ID
 

pygpt_net/provider/core/attachment/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.attachment import AttachmentItem
@@ -32,10 +34,10 @@ class BaseProvider:
     def create(self, attachment: AttachmentItem) -> str:
         pass
 
-    def load(self) -> dict:
+    def load(self) -> Dict[str, Dict[str, AttachmentItem]]:
         pass
 
-    def save(self, items: dict):
+    def save(self, items: Dict[str, Dict[str, AttachmentItem]]):
         pass
 
     def remove(self, id: str):

pygpt_net/provider/core/attachment/json_file.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 02:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import json
 import os
 import uuid
+from typing import Dict
 
 from packaging.version import Version
 
@@ -46,7 +47,7 @@ class JsonFileProvider(BaseProvider):
             attachment.id = self.create_id()
         return attachment.id
 
-    def load(self) -> dict:
+    def load(self) -> Dict[str, Dict[str, AttachmentItem]]:
         """
         Load attachments from file
 
@@ -74,7 +75,7 @@ class JsonFileProvider(BaseProvider):
 
         return items
 
-    def save(self, items: dict):
+    def save(self, items: Dict[str, Dict[str, AttachmentItem]]):
         """
         Save attachments to file
         """

pygpt_net/provider/core/calendar/base.py

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

pygpt_net/provider/core/calendar/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.03.07 23:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import uuid
+from typing import Dict
 
 from packaging.version import Version
 
@@ -65,7 +66,7 @@ class DbSqliteProvider(BaseProvider):
             note.id = self.storage.insert(note)
         return note.id
 
-    def load_all(self) -> dict:
+    def load_all(self) -> Dict[str, CalendarNoteItem]:
         """
         Load notes from DB
 
@@ -73,7 +74,7 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.get_all()
 
-    def load_by_month(self, year: int, month: int) -> dict:
+    def load_by_month(self, year: int, month: int) -> Dict[str, CalendarNoteItem]:
         """
         Load notes from DB
 
@@ -92,7 +93,7 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.get_by_date(year, month, day)
 
-    def get_notes_existence_by_day(self, year, month) -> dict:
+    def get_notes_existence_by_day(self, year, month) -> Dict[str, Dict[int, int]]:
         """
         Get notes existence by day
 
@@ -114,7 +115,7 @@ class DbSqliteProvider(BaseProvider):
             self.window.core.debug.log(e)
             print("Error while saving note: {}".format(str(e)))
 
-    def save_all(self, items: dict):
+    def save_all(self, items: Dict[str, CalendarNoteItem]):
         """
         Save all notes to DB
 

pygpt_net/provider/core/calendar/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: 2024.03.06 04:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import time
+from typing import Dict
 
 from sqlalchemy import text
 
@@ -34,7 +35,7 @@ class Storage:
         """
         self.window = window
 
-    def get_all(self) -> dict:
+    def get_all(self) -> Dict[str, CalendarNoteItem]:
         """
         Return dict with CalendarNoteItem objects, indexed by YYYY-MM-DD
 
@@ -54,7 +55,7 @@ class Storage:
                 items[dt] = note
         return items
 
-    def get_by_month(self, year: int, month: int) -> dict:
+    def get_by_month(self, year: int, month: int) -> Dict[str, CalendarNoteItem]:
         """
         Return dict with CalendarNoteItem objects, indexed by YYYY-MM-DD
 
@@ -96,7 +97,7 @@ class Storage:
                 self.unpack(notepad, row._asdict())
         return notepad
 
-    def get_notes_existence_by_day(self, year: int, month: int) -> dict:
+    def get_notes_existence_by_day(self, year: int, month: int) -> Dict[str, Dict[int, int]]:
         """
         Return a dict of days with the count of notes for the given year and month.
 

pygpt_net/provider/core/config/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, Any, Optional
+
 from packaging.version import Version
 
 
@@ -30,19 +32,19 @@ class BaseProvider:
     def patch(self, version: Version) -> bool:
         pass
 
-    def load(self, all: bool = False) -> dict:
+    def load(self, all: bool = False) -> Optional[Dict[str, Any]]:
         pass
 
-    def load_base(self) -> dict:
+    def load_base(self) -> Optional[Dict[str, Any]]:
         pass
 
-    def save(self, items: dict, filename: str = 'config.json'):
+    def save(self, items: Dict[str, Any], filename: str = 'config.json'):
         pass
 
-    def get_options(self) -> dict:
+    def get_options(self) -> Optional[Dict[str, Any]]:
         pass
 
-    def get_sections(self) -> dict:
+    def get_sections(self) -> Optional[Dict[str, Any]]:
         pass
 
     def get_version(self) -> str:

pygpt_net/provider/core/config/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.01.12 04: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.config.base import BaseProvider
@@ -38,7 +40,7 @@ class JsonFileProvider(BaseProvider):
             src = os.path.join(self.path_app, 'data', 'config', self.config_file)
             shutil.copyfile(src, dst)
 
-    def get_version(self) -> str | None:
+    def get_version(self) -> Optional[str]:
         """
         Get config file version
 
@@ -52,7 +54,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[str, Any]]:
         """
         Load config from JSON file
 
@@ -72,7 +74,7 @@ class JsonFileProvider(BaseProvider):
             print("FATAL ERROR: {}".format(e))
         return data
 
-    def load_base(self) -> dict | None:
+    def load_base(self) -> Optional[Dict[str, Any]]:
         """
         Load config from JSON file
 
@@ -90,7 +92,7 @@ class JsonFileProvider(BaseProvider):
             print("FATAL ERROR: {}".format(e))
         return data
 
-    def save(self, data: dict, filename: str = 'config.json'):
+    def save(self, data: Dict[str, Any], filename: str = 'config.json'):
         """
         Save config to JSON file
 
@@ -106,7 +108,7 @@ class JsonFileProvider(BaseProvider):
         except Exception as e:
             print("FATAL ERROR: {}".format(e))
 
-    def get_options(self) -> dict | None:
+    def get_options(self) -> Optional[Dict[str, Any]]:
         """
         Load config settings options from JSON file
 
@@ -124,7 +126,7 @@ class JsonFileProvider(BaseProvider):
             print("FATAL ERROR: {}".format(e))
         return data
 
-    def get_sections(self) -> dict | None:
+    def get_sections(self) -> Optional[Dict[str, Any]]:
         """
         Load config sections from JSON file
 

pygpt_net/provider/core/config/patch.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.29 23:00:00                  #
+# Updated Date: 2024.12.13 19:00:00                  #
 # ================================================== #
 
 import copy
@@ -1734,6 +1734,48 @@ class Patch:
                         'ctx.attachment.rag.history.max_items')
                 updated = True
 
+            # < 2.4.38
+            if old < parse_version("2.4.38"):
+                print("Migrating config from < 2.4.38...")
+                if 'theme.style' not in data:
+                    data["theme.style"] = "blocks"
+                if 'audio.input.device' not in data:
+                    data["audio.input.device"] = "0"
+                if 'audio.input.channels' not in data:
+                    data["audio.input.channels"] = 1
+                if 'audio.input.rate' not in data:
+                    data["audio.input.rate"] = 44100
+                self.window.core.updater.patch_css('style.light.css', True)  # force update
+                updated = True
+
+            # < 2.4.39
+            if old < parse_version("2.4.39"):
+                print("Migrating config from < 2.4.39...")
+                if 'layout.split' not in data:
+                    data["layout.split"] = False
+                updated = True
+
+            # < 2.4.40
+            if old < parse_version("2.4.40"):
+                print("Migrating config from < 2.4.40...")
+                if 'cmd_web' in data['plugins'] \
+                        and 'max_result_length' in data['plugins']['cmd_web']:
+                    del data['plugins']['cmd_web']['max_result_length']
+                if 'cmd_web' in data['plugins'] \
+                        and 'cmd.web_search' in data['plugins']['cmd_web']:
+                    del data['plugins']['cmd_web']['cmd.web_search']
+                if 'cmd_web' in data['plugins'] \
+                        and 'cmd.web_url_open' in data['plugins']['cmd_web']:
+                    del data['plugins']['cmd_web']['cmd.web_url_open']
+                if 'cmd_web' in data['plugins'] \
+                        and 'cmd.web_url_raw' in data['plugins']['cmd_web']:
+                    del data['plugins']['cmd_web']['cmd.web_url_raw']
+                self.window.core.updater.patch_css('web-blocks.css', True)  # force update
+                self.window.core.updater.patch_css('web-blocks.light.css', True)  # force update
+                self.window.core.updater.patch_css('web-chatgpt.css', True)  # force update
+                self.window.core.updater.patch_css('web-chatgpt_wide.css', True)  # force update
+                updated = True
+
         # update file
         migrated = False
         if updated:

pygpt_net/provider/core/ctx/base.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.04.08 21:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import List, Dict, Optional
+
 from packaging.version import Version
 
 from pygpt_net.item.ctx import CtxMeta, CtxItem, CtxGroup
@@ -29,46 +31,49 @@ class BaseProvider:
     def patch(self, version: Version) -> bool:
         pass
 
-    def append_item(self, meta: CtxMeta, item: CtxItem):
+    def append_item(self, meta: CtxMeta, item: CtxItem) -> bool:
         pass
 
-    def update_item(self, item: CtxItem):
+    def update_item(self, item: CtxItem) -> bool:
         pass
 
-    def create(self, meta: CtxMeta):
+    def create(self, meta: CtxMeta) -> int:
         pass
 
-    def load(self, id) -> list:
+    def load(self, id: int) -> List[CtxItem]:
         return []
 
-    def save(self, id, meta: CtxMeta, items: list):
+    def save(self, id: int, meta: CtxMeta, items: List[CtxItem]) -> bool:
         pass
 
-    def remove(self, id):
+    def remove(self, id: int) -> bool:
         pass
 
-    def remove_item(self, id):
+    def remove_item(self, id: int) -> bool:
         pass
 
-    def remove_items_from(self, meta_id: int, item_id: int):
+    def remove_items_from(self, meta_id: int, item_id: int) -> bool:
         pass
 
-    def truncate(self):
+    def truncate(self) -> bool:
         pass
 
     def get_meta(
             self,
-            search_string: str = None,
-            order_by: str = None,
-            order_direction: str = None,
-            limit: int = None,
-            offset: int = None,
-            filters: dict = None,
+            search_string: Optional[str] = None,
+            order_by: Optional[str] = None,
+            order_direction: Optional[str] = None,
+            limit: Optional[int] = None,
+            offset: Optional[int] = None,
+            filters: Optional[dict] = None,
             search_content: bool = False
-    ):
+    ) -> Dict[int, CtxMeta]:
+        pass
+
+    def get_meta_indexed(self) -> Dict[int, CtxMeta]:
         pass
 
-    def get_meta_indexed(self):
+    def get_item_by_id(self, id: int) -> CtxItem:
         pass
 
     def dump(self, ctx: CtxItem):
@@ -92,25 +97,25 @@ class BaseProvider:
     def clear_meta_indexed_all(self) -> bool:
         pass
 
-    def get_groups(self) -> dict:
+    def get_groups(self) -> Dict[int, CtxGroup]:
         pass
 
-    def insert_group(self, group: CtxGroup):
+    def insert_group(self, group: CtxGroup) -> int:
         pass
 
-    def update_group(self, group: CtxGroup):
+    def update_group(self, group: CtxGroup) -> bool:
         pass
 
-    def remove_group(self, id: int, all: bool = False):
+    def remove_group(self, id: int, all: bool = False) -> bool:
         pass
 
-    def truncate_groups(self):
+    def truncate_groups(self) -> bool:
         pass
 
-    def update_meta_group_id(self, meta_id: int, group_id: int):
+    def update_meta_group_id(self, meta_id: int, group_id: int) -> bool:
         pass
 
-    def clear_meta(self, meta_id: int):
+    def clear_meta(self, meta_id: int) -> bool:
         pass