pygpt-net 2.6.0.post2__py3-none-any.whl → 2.6.2__py3-none-any.whl

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.09 19: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",
             },
@@ -172,31 +180,22 @@ class Editor:
                 "label": "preset.agent_provider",
                 "description": "preset.agent_provider.desc",
                 "use": "agent_provider_llama",
+                "extra": {
+                    "urls": {
+                        "Help": "https://pygpt.readthedocs.io/en/latest/modes.html#agent-llamaindex"
+                    },
+                }
             },
             "agent_provider_openai": {
                 "type": "combo",
                 "label": "preset.agent_provider",
                 "description": "preset.agent_provider.desc",
                 "use": "agent_provider_openai",
-            },
-            "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",
+                        "Help": "https://pygpt.readthedocs.io/en/latest/modes.html#agent-openai"
                     },
-                },
+                }
             },
         }
         self.hidden_by_mode = {  # hidden fields by mode
@@ -255,17 +254,9 @@ class Editor:
 
         # add hooks for config update in real-time
         self.window.ui.add_hook("update.preset.prompt", self.hook_update)
+        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
@@ -275,7 +266,7 @@ class Editor:
         if not self.tab_options_idx:
             return
         mode = self.window.core.config.get('mode')
-        if mode != MODE_AGENT_OPENAI:
+        if mode not in [MODE_AGENT_OPENAI, MODE_AGENT_LLAMA]:
             # show base prompt
             self.window.ui.tabs['preset.editor.extra'].setTabVisible(0, True)
             # hide all tabs
@@ -303,12 +294,21 @@ class Editor:
             # show base prompt
             self.window.ui.tabs['preset.editor.extra'].setTabVisible(0, True)
             return
+
         mode = self.window.core.config.get('mode')
-        if mode == MODE_AGENT_OPENAI:
+        key_agent = ""
+
+        if mode in [MODE_AGENT_OPENAI, MODE_AGENT_LLAMA]:
+            # get current provider
+            if mode == MODE_AGENT_LLAMA:
+                key_agent = "agent_provider"
+            elif mode == MODE_AGENT_OPENAI:
+                key_agent = "agent_provider_openai"
+
             current_provider = self.window.controller.config.get_value(
                 parent_id=self.id,
-                key="agent_provider_openai",
-                option=self.options["agent_provider_openai"],
+                key=key_agent,
+                option=self.options[key_agent],
             )
             if current_provider is None or current_provider == "":
                 # show base prompt
@@ -344,22 +344,38 @@ class Editor:
 
         :param preset: preset item
         """
-        if preset.agent_provider_openai is None or preset.agent_provider_openai == "":
+        mode = self.window.core.config.get('mode')
+        id = None
+        if mode == MODE_AGENT_OPENAI:
+            if preset.agent_provider_openai is None or preset.agent_provider_openai == "":
+                return
+            id = preset.agent_provider_openai
+        elif mode == MODE_AGENT_LLAMA:
+            if preset.agent_provider is None or preset.agent_provider == "":
+                return
+            id = preset.agent_provider
+        else:
             return
 
         # update options in UI
-        id = preset.agent_provider_openai
         agent = self.window.core.agents.provider.get(id)
         if not agent:
             return
         if not preset.extra or id not in preset.extra:
             return
+
         data_dict = preset.extra[id]
         option_tabs = agent.get_options()
         for option_tab_id in data_dict:
-            option_key = "agent." + preset.agent_provider_openai + "." + option_tab_id
+            parent_key = ""
+            if mode == MODE_AGENT_OPENAI:
+                parent_key = preset.agent_provider_openai
+            elif mode == MODE_AGENT_LLAMA:
+                parent_key = preset.agent_provider
+            option_key = "agent." + parent_key + "." + option_tab_id
             if option_key not in self.window.ui.config:
                 continue
+
             extra_options = option_tabs.get(option_tab_id, {}).get('options', {})
             for key in extra_options:
                 value = data_dict[option_tab_id].get(key, None)
@@ -390,7 +406,7 @@ class Editor:
         if not self.tab_options_idx:
             return
         mode = self.window.core.config.get('mode')
-        if mode != MODE_AGENT_OPENAI:
+        if mode not in [MODE_AGENT_OPENAI, MODE_AGENT_LLAMA]:
             return
 
         # load defaults for all tabs
@@ -427,13 +443,18 @@ class Editor:
             return
 
         mode = self.window.core.config.get('mode')
-        if mode != MODE_AGENT_OPENAI:
+        if mode not in [MODE_AGENT_OPENAI, MODE_AGENT_LLAMA]:
             return
 
         preset = self.window.core.presets.get_by_uuid(self.current)
         if not preset:
             return
-        current_provider_id = preset.agent_provider_openai if preset else None
+
+        current_provider_id = None
+        if mode == MODE_AGENT_OPENAI:
+            current_provider_id = preset.agent_provider_openai if preset else None
+        elif mode == MODE_AGENT_LLAMA:
+            current_provider_id = preset.agent_provider if preset else None
 
         # load defaults for all tabs
         for id in self.tab_options_idx:
@@ -475,10 +496,18 @@ class Editor:
         :param id: preset id
         :param preset: preset item
         """
+        mode = self.window.core.config.get('mode')
         exclude_ids = [
             "__prompt__",
         ]
-        id = preset.agent_provider_openai
+        id = None
+        if mode == MODE_AGENT_OPENAI:
+            id = preset.agent_provider_openai
+        elif mode == MODE_AGENT_LLAMA:
+            id = preset.agent_provider
+        else:
+            return
+
         options = {}
         agent = self.window.core.agents.provider.get(id)
         if not agent:
@@ -545,6 +574,7 @@ class Editor:
                         checkboxLayout.addLayout(opt_layout)
                     else:
                         layout.addLayout(opt_layout)
+                layout.addStretch(1)
                 layout.addLayout(checkboxLayout)
 
                 # as tab
@@ -568,14 +598,20 @@ class Editor:
         :return: None
         """
         mode = self.window.core.config.get('mode')
-        if mode != MODE_AGENT_OPENAI:
+        if mode not in [MODE_AGENT_OPENAI, MODE_AGENT_LLAMA]:
             return
 
+        parent_key = ""
+        if mode == MODE_AGENT_OPENAI:
+            parent_key = "agent_provider_openai"
+        elif mode == MODE_AGENT_LLAMA:
+            parent_key = "agent_provider"
+
         # get current provider
         current_provider = self.window.controller.config.get_value(
             parent_id=self.id,
-            key="agent_provider_openai",
-            option=self.options["agent_provider_openai"],
+            key=parent_key,
+            option=self.options[parent_key],
         )
         if current_provider is None or current_provider == "":
             return
@@ -624,7 +660,7 @@ class Editor:
                 self.window.controller.presets.from_global()  # update current preset
 
         # show/hide extra options
-        elif key == "agent_provider_openai":
+        elif key in ["agent_provider_openai", "agent_provider"]:
             self.toggle_extra_options_by_provider()
             self.append_default_prompt()
             self.load_extra_defaults_current()
@@ -722,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
@@ -730,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
@@ -899,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
@@ -945,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)
 
@@ -1134,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})")
+

pygpt_net/controller/presets/presets.py

@@ -6,12 +6,13 @@
 # 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                  #
 # ================================================== #
 
 import re
 from typing import Optional, List, Dict
 
+from PySide6.QtCore import QTimer
 from PySide6.QtGui import QTextCursor
 from PySide6.QtWidgets import QTextEdit
 
@@ -529,7 +530,7 @@ class Presets:
             if preset_id is not None and preset_id != "":
                 if preset_id in self.window.core.presets.items:
                     self.window.core.presets.enable(preset_id)
-                    self.refresh()
+                    QTimer.singleShot(100, self.refresh)  # delay refresh
 
     def disable(self, idx: Optional[int] = None):
         """
@@ -543,7 +544,7 @@ class Presets:
             if preset_id is not None and preset_id != "":
                 if preset_id in self.window.core.presets.items:
                     self.window.core.presets.disable(preset_id)
-                    self.refresh()
+                    QTimer.singleShot(100, self.refresh)  # delay refresh
 
     def clear(self, force: bool = False):
         """
@@ -708,4 +709,4 @@ class Presets:
 
     def clear_selected(self):
         """Clear selected list"""
-        self.selected = []
+        self.selected = []

pygpt_net/controller/ui/mode.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.09 19:00:00                  #
+# Updated Date: 2025.08.14 13:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.types import (
@@ -76,10 +76,10 @@ class Mode:
         # presets: experts
         if mode == MODE_EXPERT:
             self.window.ui.nodes['preset.editor.description'].setVisible(True)
-            self.window.ui.nodes['preset.editor.remote_tools'].setVisible(True)
+            self.window.controller.presets.editor.toggle_tab("remote_tools", True)
         else:
+            self.window.controller.presets.editor.toggle_tab("remote_tools", False)
             self.window.ui.nodes['preset.editor.description'].setVisible(False)
-            self.window.ui.nodes['preset.editor.remote_tools'].setVisible(False)
 
         if mode == MODE_COMPLETION:
             self.window.ui.nodes['preset.editor.user_name'].setVisible(True)
@@ -93,76 +93,38 @@ class Mode:
 
         # presets: editor
         if mode == MODE_AGENT:
+            self.window.controller.presets.editor.toggle_tab("experts", True)
             self.window.ui.nodes['preset.editor.temperature'].setVisible(True)
-            self.window.ui.nodes['preset.editor.agent_llama'].setVisible(False)
+            self.window.ui.nodes['preset.editor.idx'].setVisible(False)
             self.window.ui.nodes['preset.editor.agent_provider'].setVisible(False)
-            self.window.ui.nodes['preset.editor.functions'].setVisible(False)
             self.window.ui.nodes['preset.editor.modes'].setVisible(False)
-            self.window.ui.nodes['preset.editor.experts'].setVisible(True)
             self.window.ui.tabs['preset.editor.extra'].setTabText(0, trans("preset.prompt.agent"))
-            # self.window.ui.nodes["preset.prompt.label"].setText(trans("preset.prompt.agent"))
-            self.window.ui.nodes['preset.tool.function.label.all'].setVisible(False)
-            self.window.ui.nodes['preset.tool.function.label.assistant'].setVisible(False)
-            self.window.ui.nodes['preset.tool.function.label.agent_llama'].setVisible(False)
         elif mode == MODE_AGENT_LLAMA:
+            self.window.controller.presets.editor.toggle_tab("experts", False)
             self.window.ui.nodes['preset.editor.temperature'].setVisible(False)
-            self.window.ui.nodes['preset.editor.agent_llama'].setVisible(True)
+            self.window.ui.nodes['preset.editor.idx'].setVisible(True)
             self.window.ui.nodes['preset.editor.agent_provider'].setVisible(True)
-            self.window.ui.nodes['preset.editor.functions'].setVisible(False)
             self.window.ui.nodes['preset.editor.modes'].setVisible(False)
-            self.window.ui.nodes['preset.editor.experts'].setVisible(False)
             self.window.ui.tabs['preset.editor.extra'].setTabText(0, trans("preset.prompt.agent_llama"))
-            # self.window.ui.nodes["preset.prompt.label"].setText(trans("preset.prompt.agent_llama"))
-            self.window.ui.nodes['preset.tool.function.label.all'].setVisible(False)
-            self.window.ui.nodes['preset.tool.function.label.assistant'].setVisible(False)
-            self.window.ui.nodes['preset.tool.function.label.agent_llama'].setVisible(False)
         elif mode == MODE_AGENT_OPENAI:
+            self.window.controller.presets.editor.toggle_tab("experts", True)
             self.window.ui.nodes['preset.editor.temperature'].setVisible(False)
-            self.window.ui.nodes['preset.editor.agent_llama'].setVisible(False)
+            self.window.ui.nodes['preset.editor.idx'].setVisible(True)
             self.window.ui.nodes['preset.editor.agent_provider'].setVisible(False)
-            self.window.ui.nodes['preset.editor.functions'].setVisible(False)
             self.window.ui.nodes['preset.editor.modes'].setVisible(False)
-            self.window.ui.nodes['preset.editor.experts'].setVisible(True)
             self.window.ui.tabs['preset.editor.extra'].setTabText(0, trans("preset.prompt.agent_llama"))
-            # self.window.ui.nodes["preset.prompt.label"].setText(trans("preset.prompt.agent_llama"))
-            self.window.ui.nodes['preset.tool.function.label.all'].setVisible(False)
-            self.window.ui.nodes['preset.tool.function.label.assistant'].setVisible(False)
-            self.window.ui.nodes['preset.tool.function.label.agent_llama'].setVisible(False)
         else:
+            if mode == MODE_EXPERT:
+                self.window.ui.nodes['preset.editor.idx'].setVisible(True)
+            else:
+                self.window.ui.nodes['preset.editor.idx'].setVisible(False)
+
+            self.window.controller.presets.editor.toggle_tab("experts", False)
             self.window.ui.nodes['preset.editor.temperature'].setVisible(True)
-            self.window.ui.nodes['preset.editor.agent_llama'].setVisible(False)
+            self.window.ui.nodes['preset.editor.idx'].setVisible(True)
             self.window.ui.nodes['preset.editor.agent_provider'].setVisible(False)
-            self.window.ui.nodes['preset.editor.functions'].setVisible(False)
             self.window.ui.nodes['preset.editor.modes'].setVisible(True)
-            self.window.ui.nodes['preset.editor.experts'].setVisible(False)
             self.window.ui.tabs['preset.editor.extra'].setTabText(0, trans("preset.prompt"))
-            # self.window.ui.nodes["preset.prompt.label"].setText(trans("preset.prompt"))
-            self.window.ui.nodes['preset.tool.function.label.assistant'].setVisible(False)
-            self.window.ui.nodes['preset.tool.function.label.agent_llama'].setVisible(False)
-
-            if mode == MODE_ASSISTANT:
-                self.window.ui.nodes['preset.tool.function.label.assistant'].setVisible(True)
-                self.window.ui.nodes['preset.tool.function.label.all'].setVisible(False)
-            else:
-                self.window.ui.nodes['preset.tool.function.label.assistant'].setVisible(False)
-                self.window.ui.nodes['preset.tool.function.label.all'].setVisible(False)
-
-        # presets: clear
-        """
-        self.window.ui.nodes['preset.clear'].setVisible(False)
-        if mode in [MODE_IMAGE, MODE_ASSISTANT]:
-            self.window.ui.nodes['preset.clear'].setVisible(False)
-        else:
-            self.window.ui.nodes['preset.clear'].setVisible(True)
-        """
-
-        # presets: use
-        """
-        if mode == MODE_IMAGE:
-            self.window.ui.nodes['preset.use'].setVisible(True)
-        else:
-            self.window.ui.nodes['preset.use'].setVisible(False)
-        """
 
         # img options
         if mode == MODE_IMAGE:
@@ -182,14 +144,6 @@ class Mode:
         else:
             self.window.ui.nodes['agent_llama.options'].setVisible(False)
 
-        """
-        # agent llama sys prompt
-        if mode in [MODE_AGENT_LLAMA]:
-            self.window.ui.nodes['preset.prompt'].setVisible(False)
-        else:
-            self.window.ui.nodes['preset.prompt'].setVisible(True)
-        """
-
         # assistants list
         if mode == MODE_ASSISTANT:
             self.window.ui.nodes['assistants.widget'].setVisible(True)
@@ -198,10 +152,8 @@ class Mode:
 
         # indexes list
         if mode == MODE_LLAMA_INDEX:
-            # self.window.ui.nodes['indexes.widget'].setVisible(True)
             self.window.ui.nodes['idx.options'].setVisible(True)
         else:
-            # self.window.ui.nodes['indexes.widget'].setVisible(False)
             self.window.ui.nodes['idx.options'].setVisible(False)
 
         # stream mode
@@ -215,12 +167,11 @@ class Mode:
         show = self.is_vision(mode)
         self.window.ui.menu['menu.video'].menuAction().setVisible(show)
         self.window.ui.nodes['icon.video.capture'].setVisible(show)
-        # self.window.ui.nodes['vision.capture.options'].setVisible(show)
         self.window.ui.nodes['attachments.capture_clear'].setVisible(show)
 
         # attachments
         show = self.are_attachments(mode)
-        self.window.ui.tabs['input'].setTabVisible(1, show)  # attachments
+        self.window.ui.tabs['input'].setTabVisible(1, show)
 
         # uploaded files
         if mode == MODE_ASSISTANT:

pygpt_net/core/agents/provider.py

@@ -48,7 +48,8 @@ class Provider:
         :param id: agent id
         :return: agent provider
         """
-        return self.agents[id]
+        if id in self.agents:
+            return self.agents[id]
 
     def all(self) -> Dict[str, BaseAgent]:
         """