pygpt-net 2.6.1__py3-none-any.whl → 2.6.6__py3-none-any.whl

pygpt_net/controller/plugins/presets.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 08:00:00                  #
+# Updated Date: 2025.08.15 03:00:00                  #
 # ================================================== #
 
-import copy
-from typing import Dict
+from copy import deepcopy
+from typing import Dict, Optional
 from uuid import uuid4
 
 from PySide6.QtGui import QAction
@@ -30,10 +30,11 @@ class Presets:
         self.dialog = False
         self.width = 500
         self.height = 500
+        self._sep_action = None
 
     def setup(self):
         """Set up plugin presets"""
-        self.window.plugin_presets.setup()  # widget dialog
+        self.window.plugin_presets.setup()
 
     def new(self):
         """New preset dialog"""
@@ -63,8 +64,6 @@ class Presets:
         self.current_to_preset(id)
         self.window.ui.dialog['create'].close()
         self.update_list()
-        self.update_menu()
-
         self.toggle(id)
 
     def open(self):
@@ -100,6 +99,8 @@ class Presets:
         :param idx: preset index
         """
         id = self.get_id_by_idx(idx)
+        if id is None:
+            return
         self.rename(id)
 
     def rename(self, id: str):
@@ -113,7 +114,6 @@ class Presets:
         if id in presets:
             name = presets[id]['name']
 
-        # set dialog and show
         self.window.ui.dialog['rename'].id = 'plugin.preset'
         self.window.ui.dialog['rename'].input.setText(name)
         self.window.ui.dialog['rename'].current = id
@@ -148,7 +148,6 @@ class Presets:
             del presets[id]
         self.store(presets)
 
-        # remove current preset if exists
         current = self.window.core.config.get('preset.plugins')
         if current == id:
             self.window.core.config.set('preset.plugins', '')
@@ -166,15 +165,16 @@ class Presets:
         self.window.core.plugins.replace_presets(presets)
         self.window.core.plugins.save_presets()
 
-    def get_id_by_idx(self, idx: int) -> str:
+    def get_id_by_idx(self, idx: int) -> Optional[str]:
         """
         Get preset id by index
 
         :param idx: preset index
         """
         presets = self.get_presets()
-        if len(presets) > idx:
+        if 0 <= idx < len(presets):
             return list(presets.keys())[idx]
+        return None
 
     def select_by_idx(self, idx: int):
         """
@@ -183,8 +183,9 @@ class Presets:
         :param idx: preset index
         """
         id = self.get_id_by_idx(idx)
+        if id is None:
+            return
         self.toggle(id)
-        self.update_menu()
 
     def delete_by_idx(
             self,
@@ -205,6 +206,8 @@ class Presets:
             )
             return
         id = self.get_id_by_idx(idx)
+        if id is None:
+            return
         self.delete(id)
 
     def duplicate(self, id: str):
@@ -214,7 +217,7 @@ class Presets:
         :param id: preset ID
         """
         presets = self.get_presets()
-        duplicate = copy.deepcopy(presets[id])
+        duplicate = deepcopy(presets[id])
         new_id = str(uuid4())
         duplicate['name'] = duplicate['name'] + " - copy"
         presets[new_id] = duplicate
@@ -229,6 +232,8 @@ class Presets:
         :param idx: preset index
         """
         id = self.get_id_by_idx(idx)
+        if id is None:
+            return
         self.duplicate(id)
 
     def reset(self, id: str):
@@ -265,6 +270,8 @@ class Presets:
             )
             return
         id = self.get_id_by_idx(idx)
+        if id is None:
+            return
         self.reset(id)
 
     def get_preset(self, id: str) -> Dict:
@@ -285,13 +292,10 @@ class Presets:
         :return: presets dict
         """
         presets = self.window.core.plugins.get_presets()
-        if not isinstance(presets, dict):
-            presets = {}
-            return presets
-
-        # sort by name
+        if not isinstance(presets, dict) or not presets:
+            return {}
         try:
-            return dict(sorted(presets.items(), key=lambda item: item[1]['name']))
+            return dict(sorted(presets.items(), key=lambda item: item[1].get('name', '')))
         except Exception as e:
             self.window.core.debug.log("Error while sorting presets")
             self.window.core.debug.error(e)
@@ -305,42 +309,41 @@ class Presets:
     def update_menu(self):
         """Update presets menu"""
         presets = self.get_presets()
+        menu_store = self.window.ui.menu
+        menu = menu_store['menu.plugins.presets']
 
-        # clear presets
-        for id in self.window.ui.menu['plugins_presets']:
-            self.window.ui.menu['menu.plugins.presets'].removeAction(self.window.ui.menu['plugins_presets'][id])
+        old_actions = list(menu_store['plugins_presets'].values())
+        for act in old_actions:
+            menu.removeAction(act)
+            act.deleteLater()
+        menu_store['plugins_presets'].clear()
 
-        # remove separator if exists
-        if len(self.window.ui.menu['menu.plugins.presets'].actions()) > 2:
-            self.window.ui.menu['menu.plugins.presets'].actions()[-1].deleteLater()
+        if self._sep_action is not None:
+            menu.removeAction(self._sep_action)
+            self._sep_action.deleteLater()
+            self._sep_action = None
 
-        # add separator
         if len(presets) > 0:
-            self.window.ui.menu['menu.plugins.presets'].addSeparator()
-
-        # add presets
-        for id in presets:
-            preset = presets[id]
-            self.window.ui.menu['plugins_presets'][id] = QAction(preset['name'], self.window, checkable=True)
-            self.window.ui.menu['plugins_presets'][id].triggered.connect(
-                lambda checked=None,
-                       id=id: self.window.controller.plugins.presets.toggle(id))
-            self.window.ui.menu['plugins_presets'][id].setMenuRole(QAction.MenuRole.NoRole)
-            self.window.ui.menu['menu.plugins.presets'].addAction(self.window.ui.menu['plugins_presets'][id])
-
-        # update current preset
+            self._sep_action = menu.addSeparator()
+
+        for id, preset in presets.items():
+            action = QAction(preset['name'], menu, checkable=True)
+            action.triggered.connect(lambda checked=False, id=id: self.window.controller.plugins.presets.toggle(id))
+            action.setMenuRole(QAction.MenuRole.NoRole)
+            menu.addAction(action)
+            menu_store['plugins_presets'][id] = action
+
         self.update()
 
     def update(self):
         """Update presets menu"""
-        # clear
-        for preset in self.window.ui.menu['plugins_presets']:
-            self.window.ui.menu['plugins_presets'][preset].setChecked(False)
+        presets_menu = self.window.ui.menu['plugins_presets']
+        for preset in presets_menu:
+            presets_menu[preset].setChecked(False)
 
-        # set checked current preset
         preset = self.window.core.config.get('preset.plugins')
-        if preset in self.window.ui.menu['plugins_presets']:
-            self.window.ui.menu['plugins_presets'][preset].setChecked(True)
+        if preset in presets_menu:
+            presets_menu[preset].setChecked(True)
 
     def toggle(self, id: str):
         """
@@ -350,13 +353,11 @@ class Presets:
         """
         self.window.core.config.set('preset.plugins', id)
         self.window.core.config.save()
-        self.update_menu()
+        self.update()
 
-        # load preset to current settings
         self.preset_to_current()
-        self.window.controller.plugins.reconfigure()  # reconfigure plugins
+        self.window.controller.plugins.reconfigure()
 
-        # update status
         preset = self.get_preset(id)
         if preset:
             self.window.update_status("Preset loaded: " + preset['name'])
@@ -383,12 +384,10 @@ class Presets:
         if id:
             preset = self.get_preset(id)
             if preset:
-                self.window.core.config.set('plugins_enabled', copy.deepcopy(preset['enabled']))
-                self.window.core.config.set('plugins', copy.deepcopy(preset['config']))
+                self.window.core.config.set('plugins_enabled', deepcopy(preset['enabled']))
+                self.window.core.config.set('plugins', deepcopy(preset['config']))
                 self.window.core.config.save()
-                self.window.core.plugins.apply_all_options()  # apply restored config
-
-                # if settings dialog opened then reinitialize
+                self.window.core.plugins.apply_all_options()
                 if self.window.controller.plugins.settings.config_dialog:
                     self.window.controller.plugins.settings.init()
 
@@ -400,8 +399,8 @@ class Presets:
         """
         presets = self.get_presets()
         if preset_id in presets:
-            presets[preset_id]['enabled'] = copy.deepcopy(self.window.core.config.get('plugins_enabled'))
-            presets[preset_id]['config'] = copy.deepcopy(self.window.core.config.get('plugins'))
+            presets[preset_id]['enabled'] = deepcopy(self.window.core.config.get('plugins_enabled'))
+            presets[preset_id]['config'] = deepcopy(self.window.core.config.get('plugins'))
             self.store(presets)
         self.update_list()
         self.update_menu()

pygpt_net/controller/plugins/settings.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.30 02:00:00                  #
+# Updated Date: 2025.08.15 03:00:00                  #
 # ================================================== #
 
 from typing import Any
@@ -32,10 +32,9 @@ class Settings:
     def setup(self):
         """Set up plugin settings"""
         idx = None
-        # restore previous selected or restored tab on dialog create
         if 'plugin.settings' in self.window.ui.tabs:
             idx = self.window.ui.tabs['plugin.settings'].currentIndex()
-        self.window.plugin_settings.setup(idx)  # widget dialog Plugins
+        self.window.plugin_settings.setup(idx)
 
     def toggle_editor(self):
         """Toggle plugin settings dialog"""
@@ -49,14 +48,15 @@ class Settings:
         if not self.config_initialized:
             self.setup()
             self.config_initialized = True
-        if not self.config_dialog:
-            self.init()
-            self.window.ui.dialogs.open(
-                'plugin_settings',
-                width=self.width,
-                height=self.height
-            )
-            self.config_dialog = True
+        if self.config_dialog:
+            return
+        self.init()
+        self.window.ui.dialogs.open(
+            'plugin_settings',
+            width=self.width,
+            height=self.height
+        )
+        self.config_dialog = True
 
     def open_plugin(self, id: str):
         """
@@ -69,20 +69,14 @@ class Settings:
 
     def init(self):
         """Initialize plugin settings options"""
-        # select the first plugin on list if no plugin selected yet
-        if self.current_plugin is None:
-            if len(self.window.core.plugins.plugins) > 0:
-                self.current_plugin = list(self.window.core.plugins.plugins.keys())[0]
-
-        # assign plugins options to config dialog fields
-        for id in self.window.core.plugins.plugins.keys():
-            plugin = self.window.core.plugins.plugins[id]
-            options = plugin.setup()  # get plugin options
-
-            # load and apply options to config dialog
-            self.window.controller.config.load_options('plugin.' + id, options)
-
-        self.window.controller.layout.restore_plugin_settings()  # restore previous selected plugin tab
+        plugins = self.window.core.plugins.plugins
+        if self.current_plugin is None and plugins:
+            self.current_plugin = next(iter(plugins))
+        cfg = self.window.controller.config
+        for pid, plugin in plugins.items():
+            options = plugin.setup()
+            cfg.load_options(f'plugin.{pid}', options)
+        self.window.controller.layout.restore_plugin_settings()
 
     def refresh_option(self, id: str, key: str):
         """
@@ -91,57 +85,55 @@ class Settings:
         :param id: plugin id
         :param key: option key
         """
-        if id not in self.window.core.plugins.plugins:
+        plugins = self.window.core.plugins.plugins
+        plugin = plugins.get(id)
+        if not plugin:
             return
-        if key not in self.window.core.plugins.plugins[id].options:
+        options = plugin.options
+        if key not in options:
             return
-        option = self.window.core.plugins.plugins[id].options[key]  # get option
-        self.window.controller.config.placeholder.apply(option)  # update keys in option
-        items = option["keys"] if "keys" in option else {}
+        option = options[key]
+        self.window.controller.config.placeholder.apply(option)
+        items = option.get("keys", {})
         self.window.controller.config.update_list(
             option=option,
-            parent_id='plugin.' + id,
+            parent_id=f'plugin.{id}',
             key=key,
             items=items,
         )
 
     def save(self):
         """Save plugin settings"""
-        for id in self.window.core.plugins.plugins.keys():
-            plugin = self.window.core.plugins.plugins[id]
-            options = plugin.setup()  # get plugin options
-
-            # add plugin to global config data if not exists
-            if id not in self.window.core.config.get('plugins'):
-                self.window.core.config.data['plugins'][id] = {}
-
-            # update config with new values
-            for key in options:
-                value = self.window.controller.config.get_value(
-                    parent_id='plugin.' + id, 
-                    key=key, 
-                    option=options[key],
+        window = self.window
+        plugins = window.core.plugins.plugins
+        controller_cfg = window.controller.config
+        config_data = window.core.config.data
+        plugins_cfg = config_data.setdefault('plugins', {})
+
+        for pid, plugin in plugins.items():
+            options = plugin.setup()
+            dst = plugins_cfg.setdefault(pid, {})
+            for key, opt in options.items():
+                value = controller_cfg.get_value(
+                    parent_id=f'plugin.{pid}',
+                    key=key,
+                    option=opt,
                 )
-                self.window.core.plugins.plugins[id].options[key]['value'] = value
-                self.window.core.config.data['plugins'][id][key] = value
-
-            # remove key from config if plugin option not exists
-            for key in list(self.window.core.config.data['plugins'].keys()):
-                if key not in self.window.core.plugins.plugins:
-                    self.window.core.config.data['plugins'].pop(key)
+                plugin.options[key]['value'] = value
+                dst[key] = value
 
-        # save preset
-        self.window.controller.plugins.presets.save_current()
+        stale = set(plugins_cfg.keys()) - set(plugins.keys())
+        for pid in stale:
+            plugins_cfg.pop(pid, None)
 
-        # save config
-        self.window.core.config.save()
+        window.controller.plugins.presets.save_current()
+        window.core.config.save()
         self.close()
-        self.window.update_status(trans('info.settings.saved'))
+        window.update_status(trans('info.settings.saved'))
 
-        # dispatch on update event
         event = Event(Event.PLUGIN_SETTINGS_CHANGED)
-        self.window.dispatch(event)
-        self.window.controller.ui.update_tokens()  # update tokens (if cmd syntax changed)
+        window.dispatch(event)
+        window.controller.ui.update_tokens()
 
     def close(self):
         """Close plugin settings dialog"""
@@ -157,15 +149,12 @@ class Settings:
         """
         if not force:
             self.window.ui.dialogs.confirm(
-                type='plugin.settings.defaults.user', 
+                type='plugin.settings.defaults.user',
                 id=-1,
                 msg=trans('dialog.plugin.settings.defaults.user.confirm'),
             )
             return
-
-        # reload settings window
         self.init()
-        # self.window.ui.dialogs.alert(trans('dialog.plugin.settings.defaults.user.result'))
 
     def load_defaults_app(self, force: bool = False):
         """
@@ -180,11 +169,7 @@ class Settings:
                 msg=trans('dialog.plugin.settings.defaults.app.confirm'),
             )
             return
-
-        # restore default options
         self.window.core.plugins.restore_options(self.current_plugin)
-
-        # reload settings window
         self.init()
         self.window.ui.dialogs.alert(trans('dialog.plugin.settings.defaults.app.result'))
 
@@ -196,4 +181,4 @@ class Settings:
         :param key: option key
         :return: option value
         """
-        return self.window.core.plugins.plugins[id].options[key]
+        return self.window.core.plugins.plugins[id].options[key]

pygpt_net/controller/presets/editor.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.14 03:00:00                  #
+# Updated Date: 2025.08.14 13:00:00                  #
 # ================================================== #
 
 import datetime
@@ -38,6 +38,14 @@ from pygpt_net.utils import trans
 from .experts import Experts
 
 class Editor:
+
+    TAB_IDX = {
+        "general": 0,
+        "personalize": 1,
+        "experts": 2,
+        "remote_tools": 3,
+    }
+
     def __init__(self, window=None):
         """
         Presets editor controller
@@ -77,7 +85,7 @@ class Editor:
                 "label": "preset.user_name",
             },
             "description": {
-                "type": "textarea",
+                "type": "text",
                 "label": "preset.description",
                 "placeholder": "preset.description.desc",
             },
@@ -189,25 +197,6 @@ class Editor:
                     },
                 }
             },
-            "assistant_id": {
-                "type": "text",
-                "label": "preset.assistant_id",
-                "description": "preset.assistant_id.desc",
-            },
-            "tool.function": {
-                "type": "dict",
-                "label": "preset.tool.function",
-                "keys": {
-                    'name': 'text',
-                    'params': 'textarea',
-                    'desc': 'textarea',
-                },
-                "extra": {
-                    "urls": {
-                        "Help": "https://platform.openai.com/docs/guides/function-calling",
-                    },
-                },
-            },
         }
         self.hidden_by_mode = {  # hidden fields by mode
             MODE_CHAT: ["idx"],
@@ -268,15 +257,6 @@ class Editor:
         self.window.ui.add_hook("update.preset.agent_provider", self.hook_update)
         self.window.ui.add_hook("update.preset.agent_provider_openai", self.hook_update)
 
-        # register functions dictionary
-        parent = "preset"
-        key = "tool.function"
-        self.window.ui.dialogs.register_dictionary(
-            key,
-            parent,
-            self.get_option(key),
-        )
-
     def toggle_extra_options(self):
         """
         Toggle extra options in preset editor
@@ -594,6 +574,7 @@ class Editor:
                         checkboxLayout.addLayout(opt_layout)
                     else:
                         layout.addLayout(opt_layout)
+                layout.addStretch(1)
                 layout.addLayout(checkboxLayout)
 
                 # as tab
@@ -777,6 +758,7 @@ class Editor:
         # load extra options
         self.load_extra_options(data)
 
+        # toggle extra options
         self.toggle_extra_options()
 
         # update experts list, after ID loaded
@@ -785,24 +767,6 @@ class Editor:
         # setup avatar config
         self.update_avatar_config(data)
 
-        # restore functions
-        if data.has_functions():
-            functions = data.get_functions()
-            values = []
-            for function in functions:
-                values.append(
-                    {
-                        "name": function['name'],
-                        "params": function['params'],
-                        "desc": function['desc'],
-                    }
-                )
-            self.window.ui.config[self.id]['tool.function'].items = values
-            self.window.ui.config[self.id]['tool.function'].model.updateData(values)
-        else:
-            self.window.ui.config[self.id]['tool.function'].items = []
-            self.window.ui.config[self.id]['tool.function'].model.updateData([])
-
         # set focus to name field
         current_model = self.window.core.config.get('model')
         # set current model in combo box as selected
@@ -954,16 +918,9 @@ class Editor:
         # sort by name
         self.window.core.presets.sort_by_name()
 
-        # switch to editing preset, if new
-        if is_new:
-            self.window.controller.presets.set(mode, id)
-            self.window.controller.presets.select_model()
-        else:
-            # switch to model if current preset
-            current_preset = self.window.core.config.get('preset')
-            if current_preset is not None and current_preset == id:
-                self.window.controller.presets.set(mode, current_preset)
-                self.window.controller.presets.select_model()
+        # switch to editing preset on save
+        self.window.controller.presets.set(mode, id)
+        self.window.controller.presets.select_model()
 
         # update presets list
         no_scroll = False
@@ -1000,36 +957,6 @@ class Editor:
             'function': [],  # functions are assigned separately (below)
         }
 
-        # assign functions tool
-        values = self.window.controller.config.get_value(
-            parent_id=self.id,
-            key='tool.function',
-            option=self.options['tool.function'],
-        )
-        functions = []
-        for function in values:
-            name = function['name']
-            params = function['params']
-            desc = function['desc']
-            if name is None or name == "":
-                continue
-            if params is None or params == "":
-                params = '{"type": "object", "properties": {}}'  # default empty JSON params
-            if desc is None:
-                desc = ""
-            functions.append(
-                {
-                    "name": name,
-                    "params": params,
-                    "desc": desc,
-                }
-            )
-
-        if len(functions) > 0:
-            preset.tools['function'] = functions
-        else:
-            preset.tools['function'] = []
-
         # extra options
         self.append_extra_options(preset)
 
@@ -1189,3 +1116,21 @@ class Editor:
             option=self.options["ai_avatar"],
             value="",
         )
+
+    def toggle_tab(self, name: str, show: bool = True):
+        """
+        Show experts tab
+
+        :param name: name of the tab
+        :param show: Show or hide experts tab
+        """
+        tabs = self.window.ui.tabs['preset.editor.tabs']
+        idx = self.TAB_IDX[name]
+        if tabs is not None:
+            if show:
+                tabs.setTabEnabled(idx, True)
+                tabs.setTabVisible(idx, True)
+                self.experts.update_tab()
+            else:
+                tabs.setTabEnabled(idx, False)
+                tabs.setTabVisible(idx, False)

pygpt_net/controller/presets/experts.py

@@ -6,12 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.01 03:00:00                  #
+# Updated Date: 2025.08.14 13:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.types import (
     MODE_EXPERT,
 )
+from pygpt_net.utils import trans
+
 
 class Experts:
     def __init__(self, window=None):
@@ -74,6 +76,8 @@ class Experts:
             # clear selected list if no agent is selected
             self.window.ui.nodes['preset.editor.experts'].update_selected({})
 
+        self.update_tab()
+
     def change_available(self):
         """Change selected expert"""
         pass
@@ -157,3 +161,18 @@ class Experts:
         self.window.core.presets.remove_expert(agent_uuid, expert_uuid)
         self.update_list()
 
+    def update_tab(self):
+        """Update experts tab label with number of experts"""
+        num = 0
+        agent_uuid = self.get_current_agent_id()
+        if agent_uuid:
+            agent = self.window.core.presets.get_by_uuid(agent_uuid)
+            if agent:
+                num = len(agent.experts)
+        tabs = self.window.ui.tabs['preset.editor.tabs']
+        idx = self.window.controller.presets.editor.TAB_IDX["experts"]
+        if num == 0:
+            tabs.setTabText(idx, trans("preset.tab.experts"))
+        else:
+            tabs.setTabText(idx, trans("preset.tab.experts") + f" ({num})")
+