pygpt-net 2.6.62__tar.gz → 2.6.63__tar.gz

{pygpt_net-2.6.62 → pygpt_net-2.6.63}/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 2.6.63 (2025-09-27)
+
+- Improved agents' workflows.
+- Enhanced the display of agents' steps in the UI.
+
 ## 2.6.62 (2025-09-26)
 
 - Enhanced agent workflow execution.

{pygpt_net-2.6.62 → pygpt_net-2.6.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pygpt-net
-Version: 2.6.62
+Version: 2.6.63
 Summary: Desktop AI Assistant powered by: OpenAI GPT-5, GPT-4, o1, o3, Gemini, Claude, Grok, DeepSeek, and other models supported by Llama Index, and Ollama. Chatbot, agents, completion, image generation, vision analysis, speech-to-text, plugins, MCP, internet access, file handling, command execution and more.
 License: MIT
 Keywords: ai,api,api key,app,assistant,bielik,chat,chatbot,chatgpt,claude,dall-e,deepseek,desktop,gemini,gpt,gpt-3.5,gpt-4,gpt-4-vision,gpt-4o,gpt-5,gpt-oss,gpt3.5,gpt4,grok,langchain,llama-index,llama3,mistral,o1,o3,ollama,openai,presets,py-gpt,py_gpt,pygpt,pyside,qt,text completion,tts,ui,vision,whisper
@@ -117,7 +117,7 @@ Description-Content-Type: text/markdown
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.6.62** | build: **2025-09-26** | Python: **>=3.10, <3.14**
+Release: **2.6.63** | build: **2025-09-27** | Python: **>=3.10, <3.14**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -3723,6 +3723,11 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.6.63 (2025-09-27)**
+
+- Improved agents' workflows.
+- Enhanced the display of agents' steps in the UI.
+
 **2.6.62 (2025-09-26)**
 
 - Enhanced agent workflow execution.

{pygpt_net-2.6.62 → pygpt_net-2.6.63}/README.md

@@ -2,7 +2,7 @@
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.6.62** | build: **2025-09-26** | Python: **>=3.10, <3.14**
+Release: **2.6.63** | build: **2025-09-27** | Python: **>=3.10, <3.14**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -3608,6 +3608,11 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.6.63 (2025-09-27)**
+
+- Improved agents' workflows.
+- Enhanced the display of agents' steps in the UI.
+
 **2.6.62 (2025-09-26)**
 
 - Enhanced agent workflow execution.

{pygpt_net-2.6.62 → pygpt_net-2.6.63}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pygpt-net"
-version = "2.6.62"
+version = "2.6.63"
 description = "Desktop AI Assistant powered by: OpenAI GPT-5, GPT-4, o1, o3, Gemini, Claude, Grok, DeepSeek, and other models supported by Llama Index, and Ollama. Chatbot, agents, completion, image generation, vision analysis, speech-to-text, plugins, MCP, internet access, file handling, command execution and more."
 authors = ["Marcin Szczyglinski <info@pygpt.net>"]
 license = "MIT"

{pygpt_net-2.6.62 → pygpt_net-2.6.63}/src/pygpt_net/CHANGELOG.txt

@@ -1,3 +1,8 @@
+2.6.63 (2025-09-27)
+
+- Improved agents' workflows.
+- Enhanced the display of agents' steps in the UI.
+
 2.6.62 (2025-09-26)
 
 - Enhanced agent workflow execution.

{pygpt_net-2.6.62 → pygpt_net-2.6.63}/src/pygpt_net/__init__.py

@@ -6,15 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.26 00:00:00                  #
+# Updated Date: 2025.09.27 00:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.6.62"
-__build__ = "2025-09-26"
+__version__ = "2.6.63"
+__build__ = "2025-09-27"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __report__ = "https://github.com/szczyglis-dev/py-gpt/issues"

{pygpt_net-2.6.62 → pygpt_net-2.6.63}/src/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.09.24 00:00:00                  #
+# Updated Date: 2025.09.27 00:00:00                  #
 # ================================================== #
 
 import datetime
@@ -393,6 +393,9 @@ class Editor:
                         value=extra_options[key].get('default', None),
                     )
 
+            # ensure combo defaults are effectively applied for this tab (only empty values are updated)
+            self._apply_combo_defaults_for_group(option_key, extra_options)
+
     def load_extra_defaults(self):
         """Load extra options defaults for preset editor"""
         if not self.tab_options_idx:
@@ -423,6 +426,8 @@ class Editor:
                             option=extra_options[key],
                             value=value,
                         )
+                # ensure combo defaults are effectively applied for this tab (only empty values are updated)
+                self._apply_combo_defaults_for_group(option_key, extra_options)
 
     def load_extra_defaults_current(self):
         """Load extra options defaults on mode change"""
@@ -479,6 +484,8 @@ class Editor:
                             option=extra_options[key],
                             value=value,
                         )
+                # ensure combo defaults are effectively applied for this tab (only empty values are updated)
+                self._apply_combo_defaults_for_group(option_key, extra_options)
 
     def append_extra_options(self, preset: PresetItem):
         """
@@ -785,6 +792,9 @@ class Editor:
                             value=opt_schema.get('default'),
                         )
 
+            # ensure combo defaults are effectively applied for this tab (only empty values are updated)
+            self._apply_combo_defaults_for_group(config_id, schema_options)
+
         # 4) Recompute mapping fully based on actual tabs and their 'agent_id' properties.
         self._rebuild_tab_index_mapping()
 
@@ -1521,6 +1531,9 @@ class Editor:
                                 value=opt_schema.get('default'),
                             )
 
+                    # ensure combo defaults are effectively applied for this tab (only empty values are updated)
+                    self._apply_combo_defaults_for_group(config_id, schema_options)
+
             # 7) Recompute the index mapping strictly from the QTabWidget
             self._rebuild_tab_index_mapping()
 
@@ -1529,3 +1542,54 @@ class Editor:
 
         finally:
             tabs.setUpdatesEnabled(True)
+
+    # ---------- Helpers for reliable combo defaults in agent extra options ----------
+
+    def _apply_combo_defaults_for_group(self, parent_id: str, schema_options: Dict[str, Any]) -> None:
+        """
+        Ensure that combo-type inputs inside a given UI config group have their default values applied
+        when the current value is empty ("", None or "_"). This avoids the situation where combo boxes
+        remain uninitialized while other field types receive defaults correctly.
+
+        This function never overrides a non-empty value set by the user or loaded from a preset.
+        """
+        if not schema_options:
+            return
+
+        get_value = self.window.controller.config.get_value
+        apply_value = self.window.controller.config.apply_value
+
+        for key, opt_schema in schema_options.items():
+            if not isinstance(opt_schema, dict):
+                continue
+            if opt_schema.get('type') != 'combo':
+                continue
+
+            default_val = opt_schema.get('default', None)
+            if default_val is None:
+                continue
+
+            current_val = get_value(
+                parent_id=parent_id,
+                key=key,
+                option=opt_schema,
+            )
+
+            # Treat "_", "", None as empty and safe to replace with default
+            if current_val in (None, "", "_"):
+                # First try apply_value (standard path)
+                apply_value(
+                    parent_id=parent_id,
+                    key=key,
+                    option=opt_schema,
+                    value=default_val,
+                )
+                # Additionally set directly on widget if accessible to guard against timing of key population
+                try:
+                    widget_group = self.window.ui.config.get(parent_id, {})
+                    widget = widget_group.get(key)
+                    if widget and hasattr(widget, "set_value"):
+                        widget.set_value(default_val)
+                except Exception:
+                    # Silent fallback; apply_value above should already handle most cases
+                    pass

{pygpt_net-2.6.62 → pygpt_net-2.6.63}/src/pygpt_net/core/agents/custom/llama_index/runner.py

@@ -1,3 +1,5 @@
+# core/agents/runners/llama_workflow.py
+
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # ================================================== #
@@ -6,7 +8,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.26 17:00:00                  #
+# Updated Date: 2025.09.27 06:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -207,37 +209,6 @@ class DynamicFlowWorkflowLI(Workflow):
                 return False
         return False
 
-    def _friendly_map(self) -> Dict[str, str]:
-        return {aid: a.name or aid for aid, a in self.fs.agents.items()}
-
-    def _friendly_map_for_routes(self, route_ids: List[str]) -> Dict[str, Any]:
-        """
-        Build a friendly map for the given route ids:
-        - Always include a human-friendly name.
-        - Include role only if provided in preset options or schema and non-empty.
-        """
-        out: Dict[str, Any] = {}
-        for rid in route_ids or []:
-            a = self.fs.agents.get(rid)
-            name = (a.name if a and a.name else rid)
-            # Prefer preset option, then schema role
-            role_opt = None
-            try:
-                role_opt = self.option_get(rid, "role", None)
-            except Exception:
-                role_opt = None
-            role_schema = getattr(a, "role", None) if a is not None else None
-            role_val = None
-            if isinstance(role_opt, str) and role_opt.strip():
-                role_val = role_opt.strip()
-            elif isinstance(role_schema, str) and role_schema.strip():
-                role_val = role_schema.strip()
-            item = {"name": name}
-            if role_val:
-                item["role"] = role_val
-            out[rid] = item
-        return out
-
     async def _emit(self, ctx: Context, ev: Any):
         if self.dbg.event_echo:
             self.logger.debug(f"[event] emit {ev.__class__.__name__}")
@@ -245,8 +216,8 @@ class DynamicFlowWorkflowLI(Workflow):
 
     async def _emit_agent_text(self, ctx: Context, text: str, agent_name: str = "Agent"):
         """
-        Emit AgentStream(delta=text) robustly. If your env requires extra fields,
-        fall back to extended AgentStream like in your SupervisorWorkflow.
+        Emit AgentStream(delta=text) robustly. If env requires extra fields,
+        fall back to extended AgentStream.
         """
         try:
             if self.dbg.event_echo:
@@ -266,16 +237,11 @@ class DynamicFlowWorkflowLI(Workflow):
             )
 
     async def _emit_header(self, ctx: Context, name: str):
-        if self.dbg.event_echo:
-            self.logger.debug(f"[event] header emit begin name='{name}'")
+        # Lightweight header to ensure agent name is known before tokens.
         await self._emit_agent_text(ctx, "", agent_name=name)
-        # await self._emit_agent_text(ctx, f"\n\n**{name}**\n\n", agent_name=name)
-        if self.dbg.event_echo:
-            self.logger.debug("[event] header emit done")
 
     async def _emit_step_sep(self, ctx: Context, node_id: str):
         try:
-            # Include human-friendly agent name in StepEvent meta for downstream ctx propagation.
             a = self.fs.agents.get(node_id)
             friendly_name = (a.name if a and a.name else node_id)
             await self._emit(
@@ -350,6 +316,9 @@ class DynamicFlowWorkflowLI(Workflow):
             return user_msg, [], "no-mem:last_output"
 
     async def _update_memory_after_step(self, node_id: str, user_msg_text: str, display_text: str):
+        """
+        Update per-node memory after a step, storing baton user message and assistant output.
+        """
         mem_id = self.g.agent_to_memory.get(node_id)
         mem_state = self.mem.get(mem_id) if mem_id else None
         if not mem_state:
@@ -374,7 +343,7 @@ class DynamicFlowWorkflowLI(Workflow):
     # ============== Workflow steps ==============
 
     def run(self, query: str, ctx: Optional[Context] = None, memory: Any = None, verbose: bool = False, on_stop=None):
-        """Entry point used by your LlamaWorkflow runner."""
+        """Entry point used by LlamaWorkflow runner."""
         self._on_stop = on_stop
 
         # Build initial chat once
@@ -444,8 +413,9 @@ class DynamicFlowWorkflowLI(Workflow):
             return FlowTickEvent() if self._current_ids else FlowStopEvent(final_answer=self._last_plain_output or "")
 
         node: AgentNode = self.fs.agents[current_id]
-        if self._steps > 1:
-            await self._emit_step_sep(ctx, current_id)
+
+        # IMPORTANT: emit StepEvent also for the very first agent step.
+        await self._emit_step_sep(ctx, current_id)
         await self._emit_header(ctx, node.name or current_id)
 
         # Resolve runtime + per-node LLM/tools
@@ -474,11 +444,10 @@ class DynamicFlowWorkflowLI(Workflow):
                 f"user='{ellipsize(user_msg_text, self.dbg.preview_chars)}'"
             )
 
-        # Prepare friendly map with optional roles for this node's allowed routes
+        # Build agent
         allowed_routes_now = list(node.outputs or [])
-        friendly_map = self._friendly_map_for_routes(allowed_routes_now)
+        friendly_map = {rid: self.fs.agents.get(rid).name or rid for rid in allowed_routes_now if rid in self.fs.agents}
 
-        # Build agent (chat_history/max_iterations in ctor – best practice)
         built = self.factory.build(
             node=node,
             node_runtime=node_rt,
@@ -528,9 +497,6 @@ class DynamicFlowWorkflowLI(Workflow):
             display_text = decision.content or ""
             if display_text:
                 await self._emit_agent_text(ctx, display_text, agent_name=(node.name or current_id))
-            if self.dbg.log_memory_dump:
-                self.logger.debug(f"[mem.prep] node={current_id} save user='{ellipsize(user_msg_text, self.dbg.preview_chars)}' "
-                                  f"assist='{ellipsize(display_text, self.dbg.preview_chars)}'")
             await self._update_memory_after_step(current_id, user_msg_text, display_text)
             next_id = decision.route if decision.valid else (allowed_routes[0] if allowed_routes else None)
             if self.dbg.log_routes:
@@ -541,9 +507,6 @@ class DynamicFlowWorkflowLI(Workflow):
             display_text = raw_text_clean or ""
             if display_text:
                 await self._emit_agent_text(ctx, display_text, agent_name=(node.name or current_id))
-            if self.dbg.log_memory_dump:
-                self.logger.debug(f"[mem.prep] node={current_id} save user='{ellipsize(user_msg_text, self.dbg.preview_chars)}' "
-                                  f"assist='{ellipsize(display_text, self.dbg.preview_chars)}'")
             await self._update_memory_after_step(current_id, user_msg_text, display_text)
             outs = self.g.get_next(current_id)
             next_id = outs[0] if outs else self.g.first_connected_end(current_id)