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

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
 

pygpt_net/provider/core/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.02.01 00:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import Optional, Dict
+
 from packaging.version import Version
 
 from pygpt_net.item.preset import PresetItem
@@ -32,16 +34,16 @@ class BaseProvider:
     def create(self, item: PresetItem):
         pass
 
-    def load(self) -> dict:
+    def load(self) -> Optional[Dict[str, PresetItem]]:
         pass
 
-    def load_base(self) -> dict:
+    def load_base(self) -> Optional[Dict[str, PresetItem]]:
         pass
 
     def save(self, id: str, item: PresetItem):
         pass
 
-    def save_all(self, items: dict):
+    def save_all(self, items: Dict[str, PresetItem]):
         pass
 
     def remove(self, id: str):

pygpt_net/provider/core/preset/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.26 19:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import json
 import os
 import shutil
+from typing import Dict, Optional, Any
+
 from packaging.version import Version
 
 from pygpt_net.core.types import (
@@ -42,9 +44,7 @@ class JsonFileProvider(BaseProvider):
         self.type = "preset"
 
     def install(self):
-        """
-        Install provider data
-        """
+        """Install provider data"""
         # install presets
         presets_dir = self.window.core.config.get_user_dir('presets')
         src = os.path.join(self.window.core.config.get_app_path(), 'data', 'config', 'presets')
@@ -58,7 +58,7 @@ class JsonFileProvider(BaseProvider):
                 if not os.path.exists(dst_file):
                     shutil.copyfile(src_file, dst_file)
 
-    def load(self) -> dict | None:
+    def load(self) -> Optional[Dict[str, PresetItem]]:
         """
         Load presets from JSON files
 
@@ -82,7 +82,7 @@ class JsonFileProvider(BaseProvider):
 
         return items
 
-    def load_base(self) -> dict | None:
+    def load_base(self) -> Optional[Dict[str, PresetItem]]:
         """
         Load base presets from JSON files
 
@@ -126,7 +126,7 @@ class JsonFileProvider(BaseProvider):
         except Exception as e:
             self.window.core.debug.log(e)
 
-    def save_all(self, items: dict):
+    def save_all(self, items: Dict[str, PresetItem]):
         """
         Save all presets to JSON files
 
@@ -171,7 +171,7 @@ class JsonFileProvider(BaseProvider):
         return self.patcher.execute(version)
 
     @staticmethod
-    def serialize(item: PresetItem) -> dict:
+    def serialize(item: PresetItem) -> Dict[str, Any]:
         """
         Serialize item to dict
 
@@ -207,7 +207,7 @@ class JsonFileProvider(BaseProvider):
         }
 
     @staticmethod
-    def deserialize(data: dict, item: PresetItem):
+    def deserialize(data: Dict[str, Any], item: PresetItem):
         """
         Deserialize item from dict
 

pygpt_net/provider/core/prompt/base.py

@@ -6,12 +6,15 @@
 # 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
+from pygpt_net.item.prompt import PromptItem
 
 
 class BaseProvider:
@@ -32,10 +35,10 @@ class BaseProvider:
     def create(self, attachment: AttachmentItem) -> str:
         pass
 
-    def load(self) -> dict:
+    def load(self) -> Dict[str, PromptItem]:
         pass
 
-    def save(self, items: dict):
+    def save(self, items: Dict[str, PromptItem]):
         pass
 
     def remove(self, id: str):

pygpt_net/provider/core/prompt/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.08.29 04: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):
             prompt.id = self.create_id()
         return prompt.id
 
-    def load(self) -> dict:
+    def load(self) -> Dict[str, PromptItem]:
         """
         Load prompts from file
 
@@ -73,7 +74,7 @@ class JsonFileProvider(BaseProvider):
 
         return items
 
-    def save(self, items: dict):
+    def save(self, items: Dict[str, PromptItem]):
         """
         Save prompts to file
         """
@@ -108,7 +109,11 @@ class JsonFileProvider(BaseProvider):
         pass
 
     def truncate(self, mode: str):
-        """Delete all"""
+        """
+        Delete all
+
+        :param mode: mode
+        """
         path = os.path.join(self.window.core.config.path, self.config_file)
         data = {'__meta__': self.window.core.config.append_meta(), 'items': {}}
         try:
@@ -128,7 +133,7 @@ class JsonFileProvider(BaseProvider):
         return False
 
     @staticmethod
-    def serialize(prompt: PromptItem) -> dict:
+    def serialize(prompt: PromptItem) -> Dict[str, str]:
         """
         Serialize item to dict
 
@@ -141,7 +146,7 @@ class JsonFileProvider(BaseProvider):
         }
 
     @staticmethod
-    def deserialize(data: dict, prompt: PromptItem):
+    def deserialize(data: Dict[str, str], prompt: PromptItem):
         """
         Deserialize item from dict
 

pygpt_net/provider/gpt/assistants.py

@@ -6,11 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 00:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import json
-from typing import Optional
+from typing import Optional, List, Dict
 
 from pygpt_net.item.assistant import AssistantItem
 from pygpt_net.item.ctx import CtxItem
@@ -38,7 +38,11 @@ class Assistants:
         """
         return self.window.core.gpt.get_client()
 
-    def log(self, msg: str, callback: Optional[callable] = None):
+    def log(
+            self,
+            msg: str,
+            callback: Optional[callable] = None
+    ):
         """
         Log message
 
@@ -141,7 +145,12 @@ class Assistants:
         thread_messages = client.beta.threads.messages.list(thread_id)
         return thread_messages.data
 
-    def msg_send(self, id: str, text: str, file_ids: Optional[list] = None):
+    def msg_send(
+            self,
+            id: str,
+            text: str,
+            file_ids: Optional[list] = None
+    ):
         """
         Send message to thread
 
@@ -176,7 +185,7 @@ class Assistants:
         if message is not None:
             return message
 
-    def get_tools(self, assistant: AssistantItem) -> list:
+    def get_tools(self, assistant: AssistantItem) -> List[dict]:
         """
         Get assistant tools
 
@@ -208,7 +217,7 @@ class Assistants:
                 )
         return tools
 
-    def get_tool_resources(self, assistant: AssistantItem) -> dict:
+    def get_tool_resources(self, assistant: AssistantItem) -> Dict[str, dict]:
         """
         Get assistant tool resources
 

pygpt_net/provider/gpt/audio.py

@@ -6,11 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 00:00:00                  #
+# Updated Date: 2024.12.14 18:00:00                  #
 # ================================================== #
 
 import base64
-from typing import Optional
+from typing import Optional, Union, List, Dict, Any
 
 from pygpt_net.core.bridge.context import MultimodalContext
 
@@ -26,11 +26,11 @@ class Audio:
 
     def build_content(
             self,
-            content,
+            content: Optional[Union[str, list]] = None,
             multimodal_ctx: Optional[MultimodalContext] = None,
-    ) -> list:
+    ) -> List[Dict[str, Any]]:
         """
-        Build audio content
+        Build audio content from multimodal context
 
         :param content: previous content or input prompt
         :param multimodal_ctx: multimodal context

pygpt_net/provider/gpt/chat.py

@@ -6,12 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 00:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import json
 import time
-from typing import Optional
+from typing import Optional, Dict, Any, List
 
 from pygpt_net.core.types import (
     MODE_CHAT,
@@ -23,6 +23,8 @@ from pygpt_net.item.ctx import CtxItem
 from pygpt_net.item.model import ModelItem
 
 from .utils import sanitize_name
+from ...item.attachment import AttachmentItem
+
 
 class Chat:
     def __init__(self, window=None):
@@ -37,7 +39,7 @@ class Chat:
     def send(
             self,
             context: BridgeContext,
-            extra: Optional[dict] = None
+            extra: Optional[Dict[str, Any]] = None
     ):
         """
         Call OpenAI API for chat
@@ -152,8 +154,8 @@ class Chat:
             prompt: str,
             system_prompt: str,
             model: ModelItem,
-            history: Optional[list] = None,
-            attachments: Optional[dict] = None,
+            history: Optional[List[CtxItem]] = None,
+            attachments: Optional[Dict[str, AttachmentItem]] = None,
             ai_name: Optional[str] = None,
             user_name: Optional[str] = None,
             multimodal_ctx: Optional[MultimodalContext] = None,

pygpt_net/provider/gpt/completion.py

@@ -6,10 +6,10 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 00:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
-from typing import Optional
+from typing import Optional, Dict, Any, List
 
 from pygpt_net.core.types import (
     MODE_COMPLETION,
@@ -29,7 +29,11 @@ class Completion:
         self.window = window
         self.input_tokens = 0
 
-    def send(self, context: BridgeContext, extra: dict = None):
+    def send(
+            self,
+            context: BridgeContext,
+            extra: Optional[Dict[str, Any]] = None
+    ):
         """
         Call OpenAI API for completion
 
@@ -100,7 +104,7 @@ class Completion:
             prompt: str,
             system_prompt: str,
             model: ModelItem,
-            history: Optional[list] = None,
+            history: Optional[List[CtxItem]] = None,
             ai_name: Optional[str] = None,
             user_name: Optional[str] = None,
     ) -> str: