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

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/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.12.09 00: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,46 @@ 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):
+    def get_meta_indexed(self) -> Dict[int, CtxMeta]:
         pass
 
     def get_item_by_id(self, id: int) -> CtxItem:
@@ -95,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
 
 

pygpt_net/provider/core/ctx/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.12.09 00:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import time
+from typing import List, Dict, Optional
 from uuid import uuid4
 from packaging.version import Version
 
@@ -29,6 +30,11 @@ class DbSqliteProvider(BaseProvider):
         self.type = "ctx"
 
     def attach(self, window):
+        """
+        Attach window
+
+        :param window: Window instance
+        """
         self.window = window
         self.storage.attach(window)
 
@@ -68,14 +74,14 @@ class DbSqliteProvider(BaseProvider):
 
     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:
+    ) -> Dict[int, CtxMeta]:
         """
         Return dict of ctx meta, TODO: add order, limit, offset, etc.
 
@@ -102,7 +108,7 @@ class DbSqliteProvider(BaseProvider):
             search_content=search_content,
         )
 
-    def get_meta_indexed(self) -> dict:
+    def get_meta_indexed(self) -> Dict[int, CtxMeta]:
         """
         Return dict of ctx meta indexed by ID
 
@@ -118,7 +124,7 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.get_last_meta_id()
 
-    def get_item_by_id(self, id: int) -> CtxItem:
+    def get_item_by_id(self, id: int) -> Optional[CtxItem]:
         """
         Get ctx item by ID
 
@@ -127,7 +133,7 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.get_item_by_id(id)
 
-    def load(self, id: int) -> list:
+    def load(self, id: int) -> List[CtxItem]:
         """
         Load items for ctx ID
 
@@ -137,13 +143,14 @@ class DbSqliteProvider(BaseProvider):
         return self.storage.get_items(id)
 
     def get_ctx_count_by_day(
-            self, year: int,
-            month: int = None,
-            day: int = None,
-            search_string: str = None,
-            filters: dict = None,
+            self,
+            year: int,
+            month: Optional[int] = None,
+            day: Optional[int] = None,
+            search_string: Optional[str] = None,
+            filters: Optional[dict] = None,
             search_content: bool = False,
-    ) -> dict:
+    ) -> Dict[str, int]:
         """
         Get ctx count by day or by month if only year is provided
 
@@ -165,13 +172,14 @@ class DbSqliteProvider(BaseProvider):
         )
 
     def get_ctx_labels_count_by_day(
-            self, year: int,
-            month: int = None,
-            day: int = None,
-            search_string: str = None,
-            filters: dict = None,
+            self,
+            year: int,
+            month: Optional[int] = None,
+            day: Optional[int] = None,
+            search_string: Optional[str] = None,
+            filters: Optional[dict] = None,
             search_content: bool = False,
-    ) -> dict:
+    ) -> Dict[str, Dict[int, int]]:
         """
         Get ctx labels count by day or by month if only year is provided
 
@@ -213,7 +221,7 @@ class DbSqliteProvider(BaseProvider):
         self.storage.update_meta_ts(item.meta_id)
         return self.storage.update_item(item) is not None
 
-    def save(self, id: int, meta: CtxMeta, items: list) -> bool:
+    def save(self, id: int, meta: CtxMeta, items: List[CtxItem]) -> bool:
         """
         Save ctx
 
@@ -225,7 +233,7 @@ class DbSqliteProvider(BaseProvider):
         if self.storage.update_meta(meta):
             return True  # update only meta, items are appended separately
 
-    def save_all(self, id: int, meta: CtxMeta, items: list) -> bool:
+    def save_all(self, id: int, meta: CtxMeta, items: List[CtxItem]) -> bool:
         """
         Save ctx
 
@@ -255,7 +263,7 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.delete_item_by_id(id)
 
-    def remove_items_from(self, meta_id: int, item_id: int):
+    def remove_items_from(self, meta_id: int, item_id: int) -> bool:
         """
         Remove ctx items from meta_id
 
@@ -328,7 +336,7 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.clear_meta_indexed_all()
 
-    def get_groups(self) -> dict:
+    def get_groups(self) -> Dict[int, CtxGroup]:
         """
         Return dict of groups
 
@@ -336,7 +344,7 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.get_groups()
 
-    def get_meta_by_id(self, id: int) -> CtxMeta or None:
+    def get_meta_by_id(self, id: int) -> Optional[CtxMeta]:
         """
         Get meta by ID
 
@@ -353,15 +361,16 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.get_meta_by_root_id_and_preset_id(root_id, preset_id)
 
-    def insert_group(self, group: CtxGroup):
+    def insert_group(self, group: CtxGroup) -> int:
         """
         Insert group
 
         :param group: CtxGroup
+        :return: group ID
         """
         return self.storage.insert_group(group)
 
-    def update_group(self, group: CtxGroup):
+    def update_group(self, group: CtxGroup) -> bool:
         """
         Update group
 
@@ -369,32 +378,39 @@ class DbSqliteProvider(BaseProvider):
         """
         return self.storage.update_group(group)
 
-    def remove_group(self, id: int, all: bool = False):
+    def remove_group(self, id: int, all: bool = False) -> bool:
         """
         Remove group by ID
 
         :param id: group ID
         :param all: remove items
+        :return: True if removed
         """
         return self.storage.delete_group(id, all=all)
 
-    def truncate_groups(self):
-        """Remove groups"""
+    def truncate_groups(self) -> bool:
+        """
+        Remove groups
+
+        :return: True if removed
+        """
         return self.storage.truncate_groups()
 
-    def update_meta_group_id(self, id: int, group_id: int):
+    def update_meta_group_id(self, id: int, group_id: int) -> bool:
         """
         Update meta group ID
 
         :param id: ctx ID
         :param group_id: group ID
+        :return: True if updated
         """
         return self.storage.update_meta_group_id(id, group_id)
 
-    def clear_meta(self, id: int):
+    def clear_meta(self, id: int) -> bool:
         """
         Clear meta by ID
 
         :param id: ctx ID
+        :return: True if cleared
         """
         return self.storage.clear_meta(id)