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

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.16 01: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
 
@@ -310,48 +311,16 @@ class IndexerTool(BaseTool):
 
         :param force: force indexing
         """
-        input_params = {}
-        input_config = {}
-        is_replace = self.window.ui.nodes["tool.indexer.web.options.replace"].isChecked()
-        loader = self.window.ui.nodes["tool.indexer.web.loader"].get_value()
-        if not loader:
+        result, loader, input_params, input_config = self.window.core.idx.ui.loaders.handle_options(
+            self.window.ui.nodes["tool.indexer.web.loader"],
+            "tool.indexer.web.loader.option",
+            "tool.indexer.web.loader.config",
+        )
+        if not result:
             self.window.ui.dialogs.alert(trans("tool.indexer.alert.no_loader"))
             return
-        loaders = self.window.core.idx.indexing.get_external_instructions()
-        if loader in loaders:
-            params = loaders[loader]
-            for k in params["args"]:
-                key_path = "tool.indexer.web.loader.option." + loader + "." + k
-                if key_path in self.window.ui.nodes:
-                    input_params[k] = self.window.ui.nodes[key_path].text()
 
-        loaders = self.window.core.idx.indexing.get_external_config()
-        if loader in loaders:
-            params = loaders[loader]
-            for k in params:
-                key_path = "tool.indexer.web.loader.config." + loader + "." + k
-                type = params[k]["type"]
-                if key_path in self.window.ui.nodes:
-                    tmp_value = self.window.ui.nodes[key_path].text()
-                    try:
-                        if tmp_value:
-                            if type == "int":
-                                tmp_value = int(tmp_value)
-                            elif type == "float":
-                                tmp_value = float(tmp_value)
-                            elif type == "bool":
-                                if tmp_value.lower() in ["true", "1"]:
-                                    tmp_value = True
-                                else:
-                                    tmp_value = False
-                            elif type == "list":
-                                tmp_value = tmp_value.split(",")
-                            elif type == "dict":
-                                tmp_value = json.loads(tmp_value)
-                            input_config[k] = tmp_value
-                    except Exception as e:
-                        self.window.core.debug.log(e)
-                        self.window.ui.dialogs.alert(e)
+        is_replace = self.window.ui.nodes["tool.indexer.web.options.replace"].isChecked()
         if not force:
             self.window.ui.dialogs.confirm(
                 type="idx.tool.index",
@@ -420,7 +389,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 +397,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 +420,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 +482,7 @@ class IndexerTool(BaseTool):
         }
         return tables
 
-    def setup_menu(self) -> dict:
+    def setup_menu(self) -> Dict[str, QAction]:
         """
         Setup main menu (Tools)
 
@@ -536,7 +505,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/indexer/ui/web.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.08.19 20:00:00                  #
+# Updated Date: 2024.12.16 01:00:00                  #
 # ================================================== #
 
 import json
@@ -15,6 +15,7 @@ from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QLabel, QVBoxLayout, QWidget, QCheckBox, QHBoxLayout, QScrollArea, \
     QSizePolicy
 
+from pygpt_net.ui.widget.element.group import QVLine, QHLine
 from pygpt_net.ui.widget.element.labels import HelpLabel, UrlLabel
 from pygpt_net.ui.widget.option.combo import OptionCombo
 from pygpt_net.ui.widget.option.input import OptionInput
@@ -33,15 +34,17 @@ class WebTab:
         self.params_widget = None
 
     def setup(self):
-        """
-        Setup tab widget
-        """
+        """Setup tab widget"""
         # get loaders list
         loaders = self.window.controller.config.placeholder.apply_by_id("llama_index_loaders_web")
         loaders_list = []
         for loader in loaders:
-            key = list(loader.keys())[0]
-            loaders_list.append(key.replace("web_", ""))
+            k = list(loader.keys())[0]
+            key = k.replace("web_", "")
+            value = loader[k]
+            loaders_list.append({
+                key: value,
+            })
 
         self.window.ui.nodes["tool.indexer.web.loader"] = OptionCombo(
             self.window,
@@ -55,14 +58,14 @@ class WebTab:
         )
 
         self.window.ui.nodes["tool.indexer.web.loader"].layout.setContentsMargins(0, 0, 0, 0)
-        self.window.ui.nodes["tool.indexer.web.loader.label"] = QLabel(trans("tool.indexer.tab.web.loader"))
+        self.window.ui.nodes["tool.indexer.web.loader.label"] = HelpLabel(trans("tool.indexer.tab.web.loader"))
         self.window.ui.add_hook("update.tool.indexer.web.loader", self.hook_loader_change)
 
         self.window.ui.nodes["tool.indexer.web.options.label"] = HelpLabel(trans("tool.indexer.tab.web.source"))
         self.window.ui.nodes["tool.indexer.web.config.label"] = HelpLabel(trans("tool.indexer.tab.web.cfg"))
         self.window.ui.nodes["tool.indexer.web.config.help"] = UrlLabel(
             trans("tool.indexer.tab.web.help"),
-            "https://pygpt.readthedocs.io/en/latest/modes.html#chat-with-files-llama-index")
+            "https://pygpt.readthedocs.io/en/latest/configuration.html#data-loaders")
 
         # --------------------------------------------------
 
@@ -78,7 +81,7 @@ class WebTab:
 
         # params
         params_layout.addWidget(self.window.ui.nodes["tool.indexer.web.options.label"])
-        inputs, groups = self.setup_loader_options()
+        inputs, groups = self.window.core.idx.ui.loaders.setup_loader_options()
         for loader in inputs:
             for k in inputs[loader]:
                 self.window.ui.nodes["tool.indexer.web.loader.option." + loader + "." + k] = inputs[loader][k]
@@ -87,9 +90,13 @@ class WebTab:
             params_layout.addWidget(self.window.ui.nodes["tool.indexer.web.loader.option_group"][loader])
             self.window.ui.nodes["tool.indexer.web.loader.option_group"][loader].hide()  # hide on start
 
+        # separator
+        params_layout.addWidget(QHLine())
+
         # config
         params_layout.addWidget(self.window.ui.nodes["tool.indexer.web.config.label"])
-        inputs, groups = self.setup_loader_config()
+        self.window.ui.nodes["tool.indexer.web.config.label"].setAlignment(Qt.AlignCenter)
+        inputs, groups = self.window.core.idx.ui.loaders.setup_loader_config()
         for loader in inputs:
             for k in inputs[loader]:
                 self.window.ui.nodes["tool.indexer.web.loader.config." + loader + "." + k] = inputs[loader][k]
@@ -99,6 +106,7 @@ class WebTab:
             self.window.ui.nodes["tool.indexer.web.loader.config_group"][loader].hide()  # hide on start
         params_layout.addWidget(self.window.ui.nodes["tool.indexer.web.config.help"], alignment=Qt.AlignCenter)
 
+        # stretch
         params_layout.addStretch(1)
 
         self.params_widget = QWidget()
@@ -117,9 +125,10 @@ class WebTab:
 
         self.window.ui.nodes["tool.indexer.provider"] = HelpLabel(self.window.core.config.get("llama.idx.storage"))
 
-        loader_layout = QHBoxLayout()
+        loader_layout = QVBoxLayout()
         loader_layout.addWidget(self.window.ui.nodes["tool.indexer.web.loader.label"])
         loader_layout.addWidget(self.window.ui.nodes["tool.indexer.web.loader"])
+        loader_layout.setContentsMargins(0, 10, 0, 0)
 
         options_layout = QVBoxLayout()
         options_layout.addWidget(self.window.ui.nodes["tool.indexer.web.options.replace"])
@@ -177,70 +186,3 @@ class WebTab:
 
         self.params_widget.adjustSize()
         self.params_scroll.update()
-
-    def setup_loader_options(self):
-        """
-        Setup loader options
-        """
-        inputs = {}
-        groups = {}
-        loaders = self.window.core.idx.indexing.get_external_instructions()
-        for loader in loaders:
-            params = loaders[loader]
-            inputs[loader] = {}
-            group = QVBoxLayout()
-            for k in params["args"]:
-                widget = OptionInput(self.window, "tool.indexer", f"web.loader.{loader}.option.{k}", {
-                    "label": k,
-                    "value": "",
-                })
-                widget.setPlaceholderText(params["args"][k]["type"])
-                inputs[loader][k] = widget
-                row = QHBoxLayout()  # cols
-                row.addWidget(QLabel(k))
-                row.addWidget(widget)
-                group.addLayout(row)
-            group_widget = QWidget()
-            group_widget.setLayout(group)
-            groups[loader] = group_widget
-
-        return inputs, groups
-
-    def setup_loader_config(self):
-        """
-        Setup loader config
-        """
-        inputs = {}
-        groups = {}
-        loaders = self.window.core.idx.indexing.get_external_config()
-        for loader in loaders:
-            params = loaders[loader]
-            inputs[loader] = {}
-            group = QVBoxLayout()
-            for k in params:
-                widget = OptionInput(self.window, "tool.indexer", f"web.loader.{loader}.config.{k}", {
-                    "label": k,
-                    "value": params[k]["value"],
-                })
-                try:
-                    if params[k]["value"] is not None:
-                        if params[k]["type"] == "list" and isinstance(params[k]["value"], list):
-                            widget.setText(", ".join(params[k]["value"]))
-                        elif params[k]["type"] == "dict" and isinstance(params[k]["value"], dict):
-                            widget.setText(json.dumps(params[k]["value"]))
-                        else:
-                            widget.setText(str(params[k]["value"]))
-                except Exception as e:
-                    self.window.core.debug.log(e)
-
-                widget.setPlaceholderText(params[k]["type"])
-                inputs[loader][k] = widget
-                row = QHBoxLayout()  # cols
-                row.addWidget(QLabel(k))
-                row.addWidget(widget)
-                group.addLayout(row)
-            group_widget = QWidget()
-            group_widget.setLayout(group)
-            groups[loader] = group_widget
-
-        return inputs, groups

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)