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

pygpt_net/provider/vector_stores/temp.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.14 05:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import os.path
+from typing import Optional
 
 from llama_index.core import StorageContext, load_index_from_storage
 from llama_index.core.indices.base import BaseIndex
@@ -64,7 +65,10 @@ class TempProvider(BaseStore):
         )
         return path
 
-    def exists(self, id: str = None) -> bool:
+    def exists(
+            self,
+            id: Optional[str] = None
+    ) -> bool:
         """
         Check if index with id exists
 
@@ -100,7 +104,11 @@ class TempProvider(BaseStore):
         else:
             self.indexes[id] = self.index_from_empty()
 
-    def get(self, id: str, service_context: ServiceContext = None) -> BaseIndex:
+    def get(
+            self,
+            id: str,
+            service_context: Optional[ServiceContext] = None
+    ) -> BaseIndex:
         """
         Get index
 
@@ -123,7 +131,11 @@ class TempProvider(BaseStore):
 
         return self.indexes[id]
 
-    def store(self, id: str, index: BaseIndex = None):
+    def store(
+            self,
+            id: str,
+            index: Optional[BaseIndex] = None
+    ):
         """
         Store index
 

pygpt_net/provider/web/base.py

@@ -6,9 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.18 21:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import List, Dict
+
 from pygpt_net.plugin.base.plugin import BasePlugin
 
 
@@ -45,7 +47,12 @@ class BaseProvider:
         """Initialize provider options (for plugin settings)"""
         pass
 
-    def search(self, query, limit: int = 10, offset: int = 0):
+    def search(
+            self,
+            query,
+            limit: int = 10,
+            offset: int = 0
+    ) -> List[str]:
         """
         Execute search query and return list of urls
 
@@ -56,7 +63,7 @@ class BaseProvider:
         """
         pass
 
-    def is_configured(self, cmds: list) -> bool:
+    def is_configured(self, cmds: List[Dict]) -> bool:
         """
         Check if provider is configured
 

pygpt_net/provider/web/google_custom_search.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.02.25 01:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import json
+from typing import List, Dict
 from urllib.parse import quote
 from .base import BaseProvider
 
@@ -63,7 +64,12 @@ class GoogleCustomSearch(BaseProvider):
             urls=url_cx,
         )
 
-    def search(self, query: str, limit: int = 10, offset: int = 0) -> list:
+    def search(
+            self,
+            query: str,
+            limit: int = 10,
+            offset: int = 0
+    ) -> List[str]:
         """
         Execute search query and return list of urls
 
@@ -103,7 +109,7 @@ class GoogleCustomSearch(BaseProvider):
 
         return urls
 
-    def is_configured(self, cmds: list) -> bool:
+    def is_configured(self, cmds: List[Dict]) -> bool:
         """
         Check if provider is configured (required API keys, etc.)
 

pygpt_net/provider/web/microsoft_bing.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.02.25 01:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import json
+from typing import List, Dict
 from urllib.parse import quote
 
 import requests
@@ -60,7 +61,12 @@ class MicrosoftBingSearch(BaseProvider):
             tab="microsoft_bing",
         )
 
-    def search(self, query: str, limit: int = 10, offset: int = 0) -> list:
+    def search(
+            self,
+            query: str,
+            limit: int = 10,
+            offset: int = 0
+    ) -> List[str]:
         """
         Execute search query and return list of urls
 
@@ -97,7 +103,7 @@ class MicrosoftBingSearch(BaseProvider):
             print('Error:', response.status_code, response.text)
         return urls
 
-    def is_configured(self, cmds: list) -> bool:
+    def is_configured(self, cmds: List[Dict]) -> bool:
         """
         Check if provider is configured (required API keys, etc.)
 

pygpt_net/tools/__init__.py

@@ -6,9 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 23:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import Dict, Optional
+
+from PySide6.QtGui import QAction
+
 from pygpt_net.ui.widget.dialog.base import BaseDialog
 from .base import BaseTool
 
@@ -42,7 +46,7 @@ class Tools:
         if id in self.tools:
             return self.tools[id]
 
-    def get_all(self) -> dict:
+    def get_all(self) -> Dict[str, BaseTool]:
         """
         Get all tools
 
@@ -83,7 +87,7 @@ class Tools:
         for id in self.tools:
             self.tools[id].on_reload()
 
-    def setup_menu_actions(self) -> dict:
+    def setup_menu_actions(self) -> Dict[str, QAction]:
         """
         Setup Tools menu actions
 
@@ -110,7 +114,11 @@ class Tools:
         for id in self.tools:
             self.tools[id].setup_theme()
 
-    def get_instance(self, type_id: str, dialog_id: str = None) -> BaseDialog:
+    def get_instance(
+            self,
+            type_id: str,
+            dialog_id: Optional[str] = None
+    ) -> Optional[BaseDialog]:
         """
         Spawn and return dialog instance
 
@@ -123,7 +131,7 @@ class Tools:
             if instance is not None:
                 return instance
 
-    def get_lang_mappings(self) -> dict:
+    def get_lang_mappings(self) -> Dict[str, dict]:
         """
         Get language mappings
 

pygpt_net/tools/audio_transcriber/__init__.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 03:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import os
+from typing import Dict
 
 from PySide6.QtGui import QAction, QIcon
 from PySide6.QtWidgets import QFileDialog
@@ -255,7 +256,7 @@ class AudioTranscriber(BaseTool):
         self.window.ui.nodes['audio.transcribe.status'].setText("")
         self.store("")
 
-    def setup_menu(self) -> dict:
+    def setup_menu(self) -> Dict[str, QAction]:
         """
         Setup main menu
 
@@ -278,7 +279,7 @@ class AudioTranscriber(BaseTool):
         self.dialog = AudioTranscribe(self.window)
         self.dialog.setup()
 
-    def get_lang_mappings(self) -> dict:
+    def get_lang_mappings(self) -> Dict[str, Dict]:
         """
         Get language mappings
 

pygpt_net/tools/base.py

@@ -6,10 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.12 04:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
+from typing import Optional, Dict
+
 from PySide6.QtCore import QObject
+from PySide6.QtGui import QAction
 from PySide6.QtWidgets import QWidget
 
 from pygpt_net.core.tabs.tab import Tab
@@ -63,13 +66,13 @@ class BaseTool(QObject):
         """
         self.window = window
 
-    def setup_menu(self) -> list:
+    def setup_menu(self) -> Dict[str, QAction]:
         """
         Setup main menu
 
-        :return list with menu actions
+        :return dict with menu actions
         """
-        return []
+        return {}
 
     def setup_dialogs(self):
         """Setup dialogs (static)"""
@@ -79,16 +82,20 @@ class BaseTool(QObject):
         """Setup theme"""
         pass
 
-    def get_instance(self, id: str, dialog_id: str = None) -> BaseDialog or None:
+    def get_instance(
+            self,
+            type_id: str,
+            dialog_id: Optional[str] = None
+    ) -> Optional[BaseDialog]:
         """
         Spawn and return dialog instance
 
-        :param id: dialog instance ID
+        :param type_id: dialog instance ID
         :param dialog_id: dialog instance ID
         """
         return None
 
-    def as_tab(self, tab: Tab) -> QWidget or None:
+    def as_tab(self, tab: Tab) -> Optional[QWidget]:
         """
         Spawn and return tab instance
 
@@ -97,7 +104,7 @@ class BaseTool(QObject):
         """
         return None
 
-    def get_lang_mappings(self) -> dict:
+    def get_lang_mappings(self) -> Dict[str, Dict]:
         """
         Get language mappings
 

pygpt_net/tools/code_interpreter/__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.12 04:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import os
+from typing import Dict
 
 from PySide6.QtCore import QTimer
 from PySide6.QtGui import QTextCursor, QAction, QIcon
@@ -507,7 +508,7 @@ class CodeInterpreter(BaseTool):
         cur.movePosition(QTextCursor.End)
         self.get_widget_history().setTextCursor(cur)
 
-    def setup_menu(self) -> dict:
+    def setup_menu(self) -> Dict[str, QAction]:
         """
         Setup main menu
 
@@ -549,7 +550,7 @@ class CodeInterpreter(BaseTool):
         """Setup theme"""
         self.get_widget_output().value = self.window.core.config.get('font_size')
 
-    def get_lang_mappings(self) -> dict:
+    def get_lang_mappings(self) -> Dict[str, Dict]:
         """
         Get language mappings
 

pygpt_net/tools/html_canvas/__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.12 04:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import os
+from typing import Dict
 
 from PySide6.QtCore import QTimer, Slot
 from PySide6.QtGui import QAction, QIcon
@@ -265,7 +266,7 @@ class HtmlCanvas(BaseTool):
         # fix: QTimer required here to prevent crash if signal emitted from WebEngine window
         QTimer.singleShot(0, lambda: self.window.controller.chat.common.save_text(text, type))
 
-    def setup_menu(self) -> dict:
+    def setup_menu(self) -> Dict[str, QAction]:
         """
         Setup main menu
 
@@ -306,7 +307,7 @@ class HtmlCanvas(BaseTool):
         """Setup theme"""
         pass
 
-    def get_lang_mappings(self) -> dict:
+    def get_lang_mappings(self) -> Dict[str, Dict]:
         """
         Get language mappings
 

pygpt_net/tools/image_viewer/__init__.py

@@ -6,12 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import hashlib
 import os
 import shutil
+from typing import Dict, Optional
 
 from PySide6 import QtGui, QtCore
 from PySide6.QtGui import QAction, QIcon
@@ -19,6 +20,7 @@ from PySide6.QtWidgets import QFileDialog
 
 from pygpt_net.tools.base import BaseTool
 from pygpt_net.tools.image_viewer.ui.dialogs import DialogSpawner
+from pygpt_net.ui.widget.dialog.base import BaseDialog
 from pygpt_net.utils import trans
 
 
@@ -255,7 +257,7 @@ class ImageViewer(BaseTool):
         except Exception as e:
             self.window.core.debug.log(e)
 
-    def setup_menu(self) -> dict:
+    def setup_menu(self) -> Dict[str, QAction]:
         """
         Setup main menu
 
@@ -273,7 +275,11 @@ class ImageViewer(BaseTool):
         )
         return actions
 
-    def get_instance(self, type_id: str, dialog_id: str = None):
+    def get_instance(
+            self,
+            type_id: str,
+            dialog_id: Optional[str] = None
+    ) -> Optional[BaseDialog]:
         """
         Spawn and return dialog instance
 
@@ -284,7 +290,7 @@ class ImageViewer(BaseTool):
         if type_id == "image_viewer":
             return self.spawner.setup(dialog_id)
 
-    def get_lang_mappings(self) -> dict:
+    def get_lang_mappings(self) -> Dict[str, Dict]:
         """
         Get language mappings
 

pygpt_net/tools/indexer/__init__.py

@@ -6,11 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.08.20 19:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import datetime
 import json
+from typing import Dict, Any, List
 
 from PySide6.QtCore import Slot
 from PySide6.QtGui import QAction, QIcon, QTextCursor
@@ -200,7 +201,7 @@ class IndexerTool(BaseTool):
                 last_str = datetime.datetime.fromtimestamp(last_ts).strftime('%Y-%m-%d %H:%M:%S')
         self.window.ui.nodes['tool.indexer.ctx.last_auto'].setText(last_str)
 
-    def update_tab_files(self):
+    def update_tab_files(self) -> List[str]:
         """
         Update files tab
 
@@ -420,7 +421,7 @@ class IndexerTool(BaseTool):
         self.refresh()
 
     @Slot(object)
-    def handle_log(self, data: any):
+    def handle_log(self, data: Any):
         """
         Handle log message
 
@@ -428,7 +429,7 @@ class IndexerTool(BaseTool):
         """
         self.log(data)
 
-    def log(self, data: any):
+    def log(self, data: Any):
         """
         Log message to console or logger window
 
@@ -451,7 +452,7 @@ class IndexerTool(BaseTool):
         """Clear log"""
         self.window.ui.nodes["tool.indexer.status"].clear()
 
-    def get_tables(self) -> dict:
+    def get_tables(self) -> Dict[str, Dict]:
         """
         Get tables configuration
 
@@ -513,7 +514,7 @@ class IndexerTool(BaseTool):
         }
         return tables
 
-    def setup_menu(self) -> dict:
+    def setup_menu(self) -> Dict[str, QAction]:
         """
         Setup main menu (Tools)
 
@@ -536,7 +537,7 @@ class IndexerTool(BaseTool):
         self.dialog = DialogBuilder(self.window)
         self.dialog.setup()
 
-    def get_lang_mappings(self) -> dict:
+    def get_lang_mappings(self) -> Dict[str, Dict]:
         """
         Get language mappings
 

pygpt_net/tools/media_player/__init__.py

@@ -6,12 +6,13 @@
 # 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 datetime
 import os.path
 import shutil
+from typing import Dict
 
 from PySide6.QtGui import QAction, QIcon
 
@@ -165,7 +166,7 @@ class MediaPlayer(BaseTool):
         else:
             self.close()
 
-    def setup_menu(self) -> dict:
+    def setup_menu(self) -> Dict[str, QAction]:
         """
         Setup main menu
 
@@ -188,7 +189,7 @@ class MediaPlayer(BaseTool):
         self.dialog = VideoPlayer(self.window)
         self.dialog.setup()
 
-    def get_lang_mappings(self) -> dict:
+    def get_lang_mappings(self) -> Dict[str, Dict]:
         """
         Get language mappings
 

pygpt_net/tools/text_editor/__init__.py

@@ -6,17 +6,19 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2024.12.14 22:00:00                  #
 # ================================================== #
 
 import hashlib
 import os
+from typing import Dict, Optional
 
 from PySide6.QtGui import QAction, QIcon
 from PySide6.QtWidgets import QFileDialog
 
 from pygpt_net.tools.base import BaseTool
 from pygpt_net.tools.text_editor.ui.dialogs import DialogSpawner
+from pygpt_net.ui.widget.dialog.base import BaseDialog
 from pygpt_net.utils import trans
 
 
@@ -47,7 +49,13 @@ class TextEditor(BaseTool):
         """
         return 'file_editor_' + hashlib.md5(file.encode('utf-8')).hexdigest()
 
-    def open_file(self, id: str, auto_close: bool = True, force: bool = False, save: bool = False):
+    def open_file(
+            self,
+            id: str,
+            auto_close: bool = True,
+            force: bool = False,
+            save: bool = False
+    ):
         """
         Open text file dialog
 
@@ -73,7 +81,12 @@ class TextEditor(BaseTool):
         if path:
             self.open(path, id, auto_close)
 
-    def clear(self, id: str = None, force: bool = False, save: bool = False):
+    def clear(
+            self,
+            id: str = None,
+            force: bool = False,
+            save: bool = False
+    ):
         """
         Clear current instance
 
@@ -101,8 +114,8 @@ class TextEditor(BaseTool):
 
     def open(
             self,
-            file: str = None,
-            current_id: str = None,
+            file: Optional[str] = None,
+            current_id: Optional[str] = None,
             auto_close: bool = True,
             force: bool = False):
         """
@@ -153,7 +166,11 @@ class TextEditor(BaseTool):
         else:
             self.window.core.filesystem.editor.clear(id)  # clear editor if no file
 
-    def close(self, id: str, save: bool = False):
+    def close(
+            self,
+            id: str,
+            save: bool = False
+    ):
         """
         Close file editor
 
@@ -180,7 +197,12 @@ class TextEditor(BaseTool):
             id = self.save_as_file(id)
         return id
 
-    def restore(self, id: str, force: bool = False, save: bool = False):
+    def restore(
+            self,
+            id: str,
+            force: bool = False,
+            save: bool = False
+    ):
         """
         Restore file content
 
@@ -225,7 +247,7 @@ class TextEditor(BaseTool):
             self.window.core.filesystem.editor.save(id, path)
         return id
 
-    def setup_menu(self) -> dict:
+    def setup_menu(self) -> Dict[str, QAction]:
         """
         Setup main menu
 
@@ -243,7 +265,11 @@ class TextEditor(BaseTool):
         )
         return actions
 
-    def get_instance(self, type_id: str, dialog_id: str = None):
+    def get_instance(
+            self,
+            type_id: str,
+            dialog_id: Optional[str] = None
+    ) -> Optional[BaseDialog]:
         """
         Spawn and return dialog instance
 
@@ -254,7 +280,7 @@ class TextEditor(BaseTool):
         if type_id == "text_editor":
             return self.spawner.setup(dialog_id)
 
-    def get_lang_mappings(self) -> dict:
+    def get_lang_mappings(self) -> Dict[str, Dict]:
         """
         Get language mappings
 

pygpt_net/ui/layout/chat/output.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.09 03:00:00                  #
+# Updated Date: 2024.12.14 19:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -192,7 +192,7 @@ class Output:
         right_layout.addWidget(self.window.ui.nodes['prompt.context'])
         right_layout.addWidget(QLabel("  "))
         right_layout.addWidget(self.window.ui.nodes['input.counter'])
-        right_layout.setContentsMargins(0, 0, 0, 0)
+        right_layout.setContentsMargins(0, 8, 20, 0)
 
         left_widget = QWidget()
         left_widget.setLayout(left_layout)

pygpt_net/ui/layout/ctx/ctx_list.py

@@ -216,7 +216,7 @@ class CtxList:
         label = data.label
         if data.important:
             is_important = True
-        if data.additional_ctx and len(data.additional_ctx) > 0:
+        if data.has_additional_ctx():
             is_attachment = True
         custom_data = {
             "label": label,