pygpt-net 2.6.15__py3-none-any.whl → 2.6.16__py3-none-any.whl

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,9 @@
+2.6.16 (2025-08-20)
+
+- Fixed: Attachment string joining.
+- Improved expert function calls.
+- Added sorting to the plugin list.
+
 2.6.15 (2025-08-20)
 
 - Added: do not change the context menu font size in text editing.

pygpt_net/__init__.py

@@ -13,7 +13,7 @@ __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.6.15"
+__version__ = "2.6.16"
 __build__ = "2025-08-20"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"

pygpt_net/controller/chat/command.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.18 01:00:00                  #
+# Updated Date: 2025.08.20 09:00:00                  #
 # ================================================== #
 
 import copy
@@ -88,6 +88,10 @@ class Command:
             else:
                 reply.type = ReplyContext.CMD_EXECUTE_INLINE
 
+            # force call (experts, internal, etc.)
+            if internal and ctx.force_call:
+                reply.type = ReplyContext.CMD_EXECUTE
+
             data = {
                 "meta": ctx.meta,
             }
@@ -101,10 +105,19 @@ class Command:
             if internal:
                 ctx.agent_call = True
                 if reply.type == ReplyContext.CMD_EXECUTE:
-                    self.window.controller.plugins.apply_cmds(
-                        reply.ctx,
-                        reply.cmds,
-                    )
+                    if ctx.force_call:
+                        # force call, execute all commands
+                        self.window.controller.plugins.apply_cmds(
+                            reply.ctx,
+                            reply.cmds,
+                            all=True,
+                            execute_only=True,
+                        )
+                    else:
+                        self.window.controller.plugins.apply_cmds(
+                            reply.ctx,
+                            reply.cmds,
+                        )
                 elif reply.type == ReplyContext.CMD_EXECUTE_INLINE:
                     self.window.controller.plugins.apply_cmds_inline(
                         reply.ctx,
@@ -114,7 +127,6 @@ class Command:
             else:
                 # force call
                 if ctx.force_call:
-                    #ctx.agent_call = True
                     self.window.controller.plugins.apply_cmds(
                         reply.ctx,
                         reply.cmds,

pygpt_net/controller/plugins/plugins.py

@@ -9,7 +9,7 @@
 # Updated Date: 2025.08.15 23:00:00                  #
 # ================================================== #
 
-from typing import List, Dict, Any
+from typing import List, Dict, Any, Optional
 
 from PySide6.QtGui import QAction
 
@@ -37,9 +37,11 @@ class Plugins:
         self._suspend_updates = 0
 
     def _begin_batch(self):
+        """Begin batch updates"""
         self._suspend_updates += 1
 
     def _end_batch(self):
+        """End batch updates"""
         if self._suspend_updates > 0:
             self._suspend_updates -= 1
         if self._suspend_updates == 0:
@@ -85,7 +87,7 @@ class Plugins:
         pm = self.window.core.plugins
         ui_menu = self.window.ui.menu
         menu_plugins = ui_menu['plugins']
-        for pid in pm.get_ids():
+        for pid in pm.get_ids(sort=True):
             if pid in menu_plugins:
                 continue
             name = pm.get_name(pid)
@@ -185,7 +187,6 @@ class Plugins:
 
         :param id: plugin id
         :return: True if enabled
-        :rtype: bool
         """
         return self.window.core.plugins.is_registered(id) and self.enabled.get(id, False)
 
@@ -213,7 +214,7 @@ class Plugins:
         """
         pm = self.window.core.plugins
         plugin_idx = 0
-        for pid in pm.get_ids():
+        for pid in pm.get_ids(sort=True):
             if pm.has_options(pid):
                 if plugin_idx == idx:
                     self.settings.current_plugin = pid
@@ -222,15 +223,15 @@ class Plugins:
         current = self.window.ui.models['plugin.list'].index(idx, 0)
         self.window.ui.nodes['plugin.list'].setCurrentIndex(current)
 
-    def get_tab_idx(self, plugin_id: str) -> int:
+    def get_tab_idx(self, plugin_id: str) -> Optional[int]:
         """
         Get plugin tab index
 
         :param plugin_id: plugin id
-        :return: tab index
+        :return: tab index or None if not found
         """
         pm = self.window.core.plugins
-        for i, pid in enumerate(pm.get_ids()):
+        for i, pid in enumerate(pm.get_ids(sort=True)):
             if pid == plugin_id:
                 return i
         return None
@@ -262,6 +263,7 @@ class Plugins:
     def has_type(self, id: str, type: str):
         """
         Check if plugin has type
+
         :param id: plugin ID
         :param type: type to check
         :return: True if has type
@@ -342,7 +344,19 @@ class Plugins:
             cmds: List[Dict[str, Any]],
             all: bool = False,
             execute_only: bool = False
-    ):
+    ) -> Optional[List[Any]]:
+        """
+        Common method to apply commands
+
+        This method is used for both inline and non-inline commands.
+
+        :param event_type: name of the event type, either Event.CMD_EXECUTE or Event.CMD_INLINE
+        :param ctx: CtxItem
+        :param cmds: commands list, each command is a dictionary with keys like "cmd", "args", etc.
+        :param all: True to apply all commands, False to apply only enabled commands
+        :param execute_only: True to execute commands only, without any additional event
+        :return: results: results of the command execution, if any (ctx.results)
+        """
         commands = self.window.core.command.from_commands(cmds)
         if len(commands) == 0:
             return
@@ -375,14 +389,15 @@ class Plugins:
             cmds: List[Dict[str, Any]],
             all: bool = False,
             execute_only: bool = False
-    ):
+    ) -> Optional[List[Any]]:
         """
-        Apply commands
+        Apply commands (CMD_EXECUTE event only)
 
         :param ctx: CtxItem
         :param cmds: commands list
         :param all: True to apply all commands, False to apply only enabled commands
         :param execute_only: True to execute commands only, without any additional event
+        :return: results: results of the command execution, if any (ctx.results)
         """
         return self._apply_cmds_common(Event.CMD_EXECUTE, ctx, cmds, all=all, execute_only=execute_only)
 
@@ -390,13 +405,13 @@ class Plugins:
             self,
             ctx: CtxItem,
             cmds: List[Dict[str, Any]]
-    ):
+    ) -> Optional[List[Any]]:
         """
         Apply all commands (inline or not)
 
-        :param ctx: context
-        :param cmds: commands
-        :return: results
+        :param ctx: CtxItem
+        :param cmds: commands list
+        :return: results: results of the command execution, if any (ctx.results)
         """
         if self.window.core.config.get("cmd"):
             return self.apply_cmds(ctx, cmds)
@@ -408,12 +423,13 @@ class Plugins:
             self,
             ctx: CtxItem,
             cmds: List[Dict[str, Any]]
-    ):
+    ) -> Optional[List[Any]]:
         """
         Apply inline commands
 
         :param ctx: CtxItem
         :param cmds: commands list
+        :return: results: results of the command execution, if any (ctx.results)
         """
         return self._apply_cmds_common(Event.CMD_INLINE, ctx, cmds)
 

pygpt_net/controller/presets/editor.py

@@ -258,11 +258,7 @@ class Editor:
         self.window.ui.add_hook("update.preset.agent_provider_openai", self.hook_update)
 
     def toggle_extra_options(self):
-        """
-        Toggle extra options in preset editor
-
-        :return: None
-        """
+        """Toggle extra options in preset editor"""
         if not self.tab_options_idx:
             return
         mode = self.window.core.config.get('mode')
@@ -285,11 +281,7 @@ class Editor:
             self.toggle_extra_options_by_provider()
 
     def toggle_extra_options_by_provider(self):
-        """
-        Toggle extra options in preset editor by provider
-
-        :return: None
-        """
+        """Toggle extra options in preset editor by provider"""
         if not self.tab_options_idx:
             # show base prompt
             self.window.ui.tabs['preset.editor.extra'].setTabVisible(0, True)
@@ -398,11 +390,7 @@ class Editor:
                     )
 
     def load_extra_defaults(self):
-        """
-        Load extra options defaults for preset editor
-
-        :return: None
-        """
+        """Load extra options defaults for preset editor"""
         if not self.tab_options_idx:
             return
         mode = self.window.core.config.get('mode')
@@ -431,11 +419,7 @@ class Editor:
                         )
 
     def load_extra_defaults_current(self):
-        """
-        Load extra options defaults on mode change
-
-        :return: None
-        """
+        """Load extra options defaults on mode change"""
         if not self.tab_options_idx:
             return
 
@@ -491,9 +475,8 @@ class Editor:
 
     def append_extra_options(self, preset: PresetItem):
         """
-        Get extra options for preset editor
+        Append extra options for preset editor
 
-        :param id: preset id
         :param preset: preset item
         """
         mode = self.window.core.config.get('mode')
@@ -536,9 +519,7 @@ class Editor:
         preset.extra[id] = data_dict
 
     def append_extra_config(self):
-        """
-        Build extra configuration for the preset editor dialog
-        """
+        """Build extra configuration for the preset editor dialog"""
         if self.built:
             return
 
@@ -592,11 +573,7 @@ class Editor:
         self.built = True
 
     def append_default_prompt(self):
-        """
-        Append default prompt to the preset editor
-
-        :return: None
-        """
+        """Append default prompt to the preset editor"""
         mode = self.window.core.config.get('mode')
         if mode not in [MODE_AGENT_OPENAI, MODE_AGENT_LLAMA]:
             return
@@ -691,6 +668,7 @@ class Editor:
 
         if id is None:
             self.experts.update_list()
+            self.window.ui.config[self.id]['idx'].set_value("_")  # reset idx combo if new preset
 
         if id is not None and id != "":
             if id in self.window.core.presets.items:
@@ -769,6 +747,7 @@ class Editor:
 
         # set focus to name field
         current_model = self.window.core.config.get('model')
+
         # set current model in combo box as selected
         if id is None:
             self.window.ui.config[self.id]['model'].set_value(current_model)
@@ -784,7 +763,7 @@ class Editor:
             close: bool = True
     ):
         """
-        Save ore create preset
+        Save preset
 
         :param force: force overwrite file
         :param close: close dialog
@@ -900,7 +879,7 @@ class Editor:
         if not is_new:
             no_scroll = True
         self.window.core.presets.save(id)
-        self.window.controller.presets.refresh()
+        self.window.controller.presets.refresh(no_scroll=no_scroll)
 
         # close dialog
         if close:

pygpt_net/core/agents/observer/evaluation.py

@@ -188,24 +188,13 @@ class Evaluation:
         """
         outputs = []
         for ctx in history:
-            if self.is_output(ctx):
-                if ctx.output:
-                    outputs.append(ctx.output)
-
             # if next input then clear outputs - use only output after last user input
             if self.is_input(ctx):
                 outputs.clear()
 
-        # feedback for OpenAI agents
-        if len(outputs) == 0:
-            for ctx in history:
-                if self.is_output(ctx):
-                    if ctx.output:
-                        outputs.append(ctx.output)
-
-                # if next input then clear outputs - use only output after last user input
-                if self.is_input(ctx):
-                    outputs.clear()
+            if self.is_output(ctx):
+                if ctx.output:
+                    outputs.append(ctx.output)
 
         return "\n\n".join(outputs) if outputs else ""
 

pygpt_net/core/agents/runners/llama_workflow.py

@@ -240,6 +240,8 @@ class LlamaWorkflow(BaseRunner):
         item_ctx.output = ""  # empty to prevent render
         item_ctx.stream = ""  # for stream
 
+        print("RUN AGENT!!!!!!!!!!!!!!!!!!!!")
+
         async for event in handler.stream_events():
             if self.is_stopped():
                 # persist current output on stop
@@ -275,12 +277,13 @@ class LlamaWorkflow(BaseRunner):
                 if verbose:
                     print("\n\n-----STEP-----\n\n")
                     print(f"[{event.name}] {event.index}/{event.total} meta={event.meta}")
-                item_ctx = self.on_next_ctx(
-                    item_ctx,
-                    signals=signals,
-                    begin=begin,
-                    stream=True,
-                )
+                if flush:
+                    item_ctx = self.on_next_ctx(
+                        item_ctx,
+                        signals=signals,
+                        begin=begin,
+                        stream=True,
+                    )
             elif isinstance(event, AgentStream):
                 if verbose:
                     print(f"{event.delta}", end="", flush=True)

pygpt_net/core/command/command.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 23:00:00                  #
+# Updated Date: 2025.08.20 09:00:00                  #
 # ================================================== #
 
 import copy
@@ -574,11 +574,12 @@ class Command:
                     pass
         return params
 
-    def is_native_enabled(self, force: bool = False) -> bool:
+    def is_native_enabled(self, force: bool = False, model: str = None) -> bool:
         """
         Check if native tool calls are enabled
 
         :param force: force check, ignore config
+        :param model: model name (optional)
         :return: True if enabled
         """
         disabled_modes = [
@@ -592,7 +593,8 @@ class Command:
             return False
 
         if not force:
-            model = self.window.core.config.get('model')
+            if model is None:
+                model = self.window.core.config.get('model')  # get from globals
             if model:
                 model_data = self.window.core.models.get(model)
                 if model_data:

pygpt_net/core/experts/experts.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 13:00:00                  #
+# Updated Date: 2025.08.20 09:00:00                  #
 # ================================================== #
 
 import json
@@ -53,6 +53,7 @@ class Experts:
         self.allowed_cmds = ["expert_call"]
         self.worker = None
         self.last_expert_id = None  # last expert id used in call
+        self.last_idx = None  # last index used in call
         self.master_ctx = None  # master meta for expert calls
 
     def get_mode(self) -> str:
@@ -218,6 +219,28 @@ class Experts:
                 return {}
         return calls
 
+    def extract_tool_calls(self, ctx: CtxItem):
+        """
+        Extract tool calls from expert
+
+        :param ctx: context item
+        """
+        for call in ctx.tool_calls:
+            if (call["type"] == "function"
+                    and "function" in call
+                    and call["function"]["name"] == "get_context"):
+                ctx.force_call = True  # force call if get_context tool is used
+                ctx.cmds_before = [
+                    {
+                        "cmd": "get_context",
+                        "params": {
+                            "query": call["function"]["arguments"]["query"],
+                            "idx": self.last_idx,
+                        },
+                    }
+                ]
+                break
+
     def reply(self, ctx: CtxItem):
         """
         Re-send response from commands to master expert
@@ -360,6 +383,9 @@ class Experts:
                     ctx.extra = {}
                 ctx.extra["tool_calls"] = ctx.tool_calls
 
+        # if 'get_context' tool is used then force call, and append idx
+        self.extract_tool_calls(ctx)  # extract tool calls from ctx
+
         self.window.controller.chat.command.handle(ctx, internal=True)  # handle cmds sync
         if ctx.reply:
             self.window.update_status("")  # clear status
@@ -385,7 +411,6 @@ class Experts:
 
         # make copy of ctx for reply, and change input name to expert name
         reply_ctx = CtxItem()
-
         reply_ctx.from_dict(ctx.to_dict())
         reply_ctx.meta = master_ctx.meta
 
@@ -523,6 +548,25 @@ class Experts:
         ]
         return cmds
 
+    def get_retriever_tool(self) -> Dict[str, str]:
+        """
+        Get retriever tool for additional context retrieval
+
+        :return: retriever tool definition
+        """
+        return {
+            "cmd": "get_context",
+            "instruction": "get additional context for a given query",
+            "params": [
+                {
+                    "name": "query",
+                    "description": "query to retrieve additional context for",
+                    "required": True,
+                    "type": "str",
+                }
+            ]
+        }
+
     def has_calls(self, ctx: CtxItem) -> bool:
         """
         Check if context has expert calls
@@ -653,6 +697,9 @@ class ExpertWorker(QRunnable):
             use_index = False
             if db_idx and db_idx != '_':
                 use_index = True
+                self.window.core.experts.last_idx = db_idx  # store last index used in call
+            else:
+                self.window.core.experts.last_idx = None
             if use_index:
                 index, llm = self.window.core.idx.chat.get_index(db_idx, model_data, stream=False)
             else:
@@ -715,9 +762,16 @@ class ExpertWorker(QRunnable):
                     return
             else:
                 # native func call
-                if self.window.core.command.is_native_enabled():
+                if self.window.core.command.is_native_enabled(force=False, model=model):
+
+                    # get native functions, without expert_call here
                     functions = self.window.core.command.get_functions(master_ctx.id)
-                    # without expert_call here
+
+                    # append retrieval tool if index is selected
+                    if use_index:
+                        retriever_tool = self.window.core.experts.get_retriever_tool()
+                        func_list = self.window.core.command.cmds_to_functions([retriever_tool])
+                        functions.append(func_list[0])  # append only first function
 
                 # call bridge
                 bridge_context = BridgeContext(
@@ -766,15 +820,7 @@ class ExpertWorker(QRunnable):
             self.window.core.ctx.update_item(ctx)
 
             ctx.from_previous()  # append previous result if exists
-
-            # tmp switch meta for render purposes
-            ctx.meta = master_ctx.meta
-
-            if use_agent:
-                self.signals.output.emit(ctx, mode)  # emit output signal, only if final response from agent
-
             ctx.clear_reply()  # reset results
-            ctx.meta = slave  # restore before cmd execute
 
             if not use_agent:
                 ctx.sub_tool_call = True
@@ -793,7 +839,6 @@ class ExpertWorker(QRunnable):
 
             # make copy of ctx for reply, and change input name to expert name
             reply_ctx = CtxItem()
-
             reply_ctx.from_dict(ctx.to_dict())
             reply_ctx.meta = master_ctx.meta
 

pygpt_net/core/plugins/plugins.py

@@ -57,14 +57,25 @@ class Plugins:
         """
         return self.plugins
 
-    def get_ids(self) -> List[str]:
+    def get_ids(self, sort: bool = False) -> List[str]:
         """
         Get all plugins ids
 
+        :param sort: if True, return sorted ids
         :return: plugins ids list
         """
+        if sort:
+            return self.get_sorted_ids()
         return list(self.plugins.keys())
 
+    def get_sorted_ids(self) -> List[str]:
+        """
+        Get all plugins ids sorted by name
+
+        :return: sorted plugins ids list
+        """
+        return sorted(self.plugins.keys(), key=lambda pid: self.get_name(pid).lower())
+
     def get(self, plugin_id: str) -> Optional[BasePlugin]:
         """
         Get plugin by id

pygpt_net/data/config/config.json

@@ -1,7 +1,7 @@
 {
   "__meta__": {
-    "version": "2.6.15",
-    "app.version": "2.6.15",
+    "version": "2.6.16",
+    "app.version": "2.6.16",
     "updated_at": "2025-08-20T00:00:00"
   },
   "access.audio.event.speech": false,
@@ -176,11 +176,11 @@
   "download.dir": "download",
   "experts.func_call.native": false,
   "experts.mode": "chat",
-  "experts.use_agent": false,
+  "experts.use_agent": true,
   "experts.api_use_responses": false,
   "experts.internal.api_use_responses": false,
-  "font_size": 12,
-  "font_size.input": 12,
+  "font_size": 14,
+  "font_size.input": 14,
   "font_size.ctx": 12,
   "font_size.toolbox": 12,
   "func_call.native": true,

pygpt_net/data/config/models.json

@@ -1,7 +1,7 @@
 {
     "__meta__": {
-        "version": "2.6.15",
-        "app.version": "2.6.15",
+        "version": "2.6.16",
+        "app.version": "2.6.16",
         "updated_at": "2025-08-20T23:07:35"
     },
     "items": {

pygpt_net/data/locale/locale.en.ini

@@ -1147,8 +1147,8 @@ settings.experts.internal.api_use_responses = Use Responses API in Experts (slav
 settings.experts.internal.api_use_responses.desc = Use Responses API instead of ChatCompletions API for Expert instances (slave models). OpenAI models only.
 settings.experts.mode = Sub-mode for experts
 settings.experts.mode.desc = Sub-mode to use for Experts
-settings.experts.use_agent = Use planner agent for expert reasoning
-settings.experts.use_agent.desc = If enabled, expert will use the planner agent when generating response and calling tools.
+settings.experts.use_agent = Use agent for expert reasoning
+settings.experts.use_agent.desc = If enabled, expert will use the agent when generating response and calling tools.
 settings.font_size = Font size (chat plain-text, notepads)
 settings.font_size.ctx = Font size (ctx list)
 settings.font_size.input = Font size (input)

pygpt_net/data/locale/plugin.openai_dalle.de.ini

@@ -1,5 +1,5 @@
 [LOCALE]
 plugin.description = Integriert die DALL-E 3 Bildgenerierung mit jedem Chat und Modus. Einfach aktivieren und im Chatmodus nach einem Bild fragen, unter Verwendung des Standardmodells wie GPT-4. Das Plugin erfordert nicht, dass die Option "Befehle ausführen" aktiviert ist.
-plugin.name = DALL-E 3: Bildgenerierung (inline)
+plugin.name = Bildgenerierung (inline)
 prompt.description = Prompt verwendet, um im Hintergrund eine Abfrage für DALL-E zu generieren.
 prompt.label = Prompt

pygpt_net/data/locale/plugin.openai_dalle.en.ini

@@ -2,6 +2,6 @@
 model.description = The model used for generating images; default is "dall-e-3".
 model.label = Model
 plugin.description = Integrates DALL-E 3 image generation with any chat and mode. Just enable and ask for an image in Chat mode, using the standard model like GPT-4. The plugin does not require the "+ Tools" option to be enabled.
-plugin.name = DALL-E 3: Image Generation (inline)
+plugin.name = Image Generation (inline)
 prompt.description = Prompt used for generating a query for DALL-E in the background.
 prompt.label = Prompt

pygpt_net/data/locale/plugin.openai_dalle.es.ini

@@ -1,5 +1,5 @@
 [LOCALE]
 plugin.description = Integra la generación de imágenes de DALL-E 3 con cualquier chat y modo. Solo hay que activarla y pedir una imagen en el Modo Chat, utilizando el modelo estándar como GPT-4. El plugin no requiere que la opción "Ejecutar comandos" esté habilitada.
-plugin.name = DALL-E 3: Generación de Imágenes (en línea)
+plugin.name = Generación de Imágenes (en línea)
 prompt.description = Prompt utilizado para generar una consulta para DALL-E en segundo plano.
 prompt.label = Prompt

pygpt_net/data/locale/plugin.openai_dalle.fr.ini

@@ -1,5 +1,5 @@
 [LOCALE]
 plugin.description = Intègre la génération d'images DALL-E 3 avec n'importe quelle discussion et mode. Il suffit de l'activer et de demander une image en mode Chat, en utilisant le modèle standard comme GPT-4. Le plugin ne nécessite pas que l'option "Exécuter des commandes" soit activée.
-plugin.name = DALL-E 3 : Génération d'Images (intégré)
+plugin.name = Génération d'Images (intégré)
 prompt.description = Prompt utilisé pour générer une requête pour DALL-E en arrière-plan.
 prompt.label = Prompt