pygpt-net 2.6.61__py3-none-any.whl → 2.6.63__py3-none-any.whl

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,15 @@
+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.
+- Improved preset list handling by adding a drop field indicator and fixing auto-scroll.
+- Added middle-mouse button panning to Painter.
+- Added an input character counter.
+
 2.6.61 (2025-09-26)
 
 - Enhanced the agents node editor, custom agent flow, and instruction following.

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.61"
-__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/controller/chat/response.py

@@ -36,6 +36,7 @@ class Response:
         """
         super(Response, self).__init__()
         self.window = window
+        self.last_response_id = None
 
     def handle(
             self,
@@ -273,9 +274,14 @@ class Response:
             self.window.update_status(trans("status.agent.reasoning"))
             controller.chat.common.lock_input()  # lock input, re-enable stop button
 
-        # agent final response
+        # agent final response, with fix for async delayed finish (prevent multiple calls for the same response)
         if ctx.extra is not None and (isinstance(ctx.extra, dict) and "agent_finish" in ctx.extra):
-            controller.agent.llama.on_finish(ctx)  # evaluate response and continue if needed
+            consume = False
+            if self.last_response_id is None or self.last_response_id < ctx.id:
+                consume = True
+            self.last_response_id = ctx.id
+            if consume:
+                controller.agent.llama.on_finish(ctx)  # evaluate response and continue if needed
 
     def end(
             self,

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/controller/settings/profile.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.24 23:00:00                  #
+# Updated Date: 2025.09.26 13:00:00                  #
 # ================================================== #
 
 import os
@@ -33,6 +33,8 @@ class Profile:
         self.height = 500
         self.initialized = False
         self.dialog_initialized = False
+        self.before_theme = None
+        self.before_language = None
 
     def setup(self):
         """Setup profile"""
@@ -54,7 +56,8 @@ class Profile:
             uuid: str,
             force: bool = False,
             save_current: bool = True,
-            on_finish: Optional[callable] = None
+            on_finish: Optional[callable] = None,
+            is_create: bool = False,
     ):
         """
         Switch profile
@@ -63,6 +66,7 @@ class Profile:
         :param force: Force switch
         :param save_current: Save current profile
         :param on_finish: Callback function to call after switch
+        :param is_create: Is called from create profile
         """
         current = self.window.core.config.profile.get_current()
         if uuid == current and not force:
@@ -85,7 +89,8 @@ class Profile:
             self.window.controller.settings.workdir.update(
                 path,
                 force=True,
-                profile_name=profile['name']
+                profile_name=profile['name'],
+                is_create=is_create,
             )
         else:
             self.after_update(profile['name'])
@@ -288,7 +293,14 @@ class Profile:
 
         :param uuid: profile UUID
         """
-        self.switch(uuid, force=True, on_finish=self.after_create_finish)
+        self.before_theme = self.window.core.config.get("theme")
+        self.before_language = self.window.core.config.get("lang")
+        self.switch(
+            uuid,
+            force=True,
+            on_finish=self.after_create_finish,
+            is_create=True
+        )
 
     def after_create_finish(self, uuid: str):
         """

pygpt_net/controller/settings/workdir.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.20 23:00:00                  #
+# Updated Date: 2025.09.26 13:00:00                  #
 # ================================================== #
 
 import copy
@@ -288,13 +288,15 @@ class Workdir:
     def update_workdir(
             self,
             force: bool = False,
-            path: str = None
+            path: str = None,
+            is_create: bool = False,
     ):
         """
         Update working directory
 
         :param force: boolean indicating if update should be forced (confirm)
         :param path: new working directory to set
+        :param is_create: True if called on profile creation
         """
         print("\n====================")
         print(f"Changing workdir to: {path}")
@@ -313,8 +315,25 @@ class Workdir:
         # update path in current profile
         self.window.core.config.profile.update_current_workdir(path)
 
+        # save previous theme and language to retain them after workdir change
+        prev_theme = None
+        prev_lang = None
+        if is_create:
+            prev_theme = self.window.core.config.get('theme')
+            prev_lang = self.window.core.config.get('lang')
+
         # reload config
         self.window.core.config.set_workdir(path, reload=True)
+
+        # if profile is just created, use current theme and language
+        if is_create:
+            print("Using current theme and language: ", prev_theme, prev_lang)
+            if prev_theme is not None:
+                self.window.core.config.set('theme', prev_theme)
+            if prev_lang is not None:
+                self.window.core.config.set('lang', prev_lang)
+            self.window.core.config.save()
+
         self.window.core.config.set('license.accepted', True)  # accept license to prevent show dialog again
 
     @Slot(bool, str, str, str)
@@ -323,7 +342,8 @@ class Workdir:
             force: bool,
             profile_name: str,
             current_path: str,
-            new_path: str
+            new_path: str,
+            is_create: bool = False
     ) -> bool:
         """
         Update working directory
@@ -332,18 +352,20 @@ class Workdir:
         :param profile_name: profile name to update after workdir change
         :param current_path: current working directory before update
         :param new_path: new working directory to set
+        :param is_create: if True, skip check for existing workdir in path
         :return: boolean indicating if update was successful
         """
         self.update_workdir(
             force=force,
             path=new_path,
+            is_create=is_create,
         )
         rollback = False
         success = False
         if force:
             try:
                 self.window.ui.dialogs.workdir.show_status(trans("dialog.workdir.result.wait"))
-                self.window.controller.reload()
+                self.window.controller.reload()  # reload all
                 self.window.ui.dialogs.workdir.show_status(trans("dialog.workdir.result.wait"))
                 msg = trans("dialog.workdir.result.success").format(path=new_path)
                 self.window.ui.dialogs.workdir.show_status(msg)
@@ -498,7 +520,8 @@ class Workdir:
             self,
             path: str,
             force: bool = False,
-            profile_name: str = None
+            profile_name: str = None,
+            is_create: bool = False,
     ):
         """
         Switch working directory to the existing one
@@ -506,12 +529,14 @@ class Workdir:
         :param path: existing working directory
         :param force: force update (confirm)
         :param profile_name: profile name (optional, for future use)
+        :param is_create: if True, skip check for existing workdir in path
         """
         self.do_update(
             force=force,
             profile_name=profile_name,
             current_path=self.window.core.config.get_user_path(),
             new_path=path,
+            is_create=is_create,
         )
 
     def migrate(

pygpt_net/controller/theme/common.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.22 15:00:00                  #
+# Updated Date: 2025.09.26 13:00:00                  #
 # ================================================== #
 
 import os
@@ -32,6 +32,8 @@ class Common:
         :return: custom css filename (e.g. style.dark.css)
         """
         # check per theme style css
+        if name is None:
+            name = ""
         filename = 'style.css'
         if filename is not None:
             # per theme mode (light / dark)
@@ -58,7 +60,7 @@ class Common:
 
         :return: True if light theme, False otherwise
         """
-        theme = self.window.core.config.get('theme')
+        theme = str(self.window.core.config.get('theme'))
         return theme.startswith('light_') or theme == 'light'
 
     def toggle_tooltips(self):

pygpt_net/controller/theme/markdown.py

@@ -6,7 +6,7 @@
 # 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.09.26 13:00:00                  #
 # ================================================== #
 
 import os
@@ -92,7 +92,7 @@ class Markdown:
             if base_name == 'web':
                 suffix = "-" + web_style
                 self.web_style = web_style
-            theme = self.window.core.config.get('theme')
+            theme = str(self.window.core.config.get('theme'))
             name = str(base_name)
             if theme.startswith('light'):
                 color = '.light'

pygpt_net/controller/theme/theme.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.27 00:00:00                  #
+# Updated Date: 2025.09.26 13:00:00                  #
 # ================================================== #
 
 import os
@@ -83,6 +83,7 @@ class Theme:
         :param name: theme name
         :param force: force theme change (manual trigger)
         """
+        self.current_theme = name
         window = self.window
         core = window.core
         controller = window.controller

pygpt_net/controller/ui/ui.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.25 12:00:00                  #
+# Updated Date: 2025.09.26 17:00:00                  #
 # ================================================== #
 
 from typing import Optional
@@ -51,6 +51,9 @@ class UI:
         self._last_chat_model = None
         self._last_chat_label = None
 
+        # Cache for Input tab tooltip to avoid redundant updates
+        self._last_input_tab_tooltip = None
+
     def setup(self):
         """Setup UI"""
         self.update_font_size()
@@ -150,7 +153,11 @@ class UI:
     def update_tokens(self):
         """Update tokens counter in real-time"""
         ui_nodes = self.window.ui.nodes
-        prompt = ui_nodes['input'].toPlainText().strip()
+
+        # Read raw input for accurate character count (without trimming)
+        raw_text = ui_nodes['input'].toPlainText()
+        prompt = raw_text.strip()
+
         input_tokens, system_tokens, extra_tokens, ctx_tokens, ctx_len, ctx_len_all, \
             sum_tokens, max_current, threshold = self.window.core.tokens.get_current(prompt)
         attachments_tokens = self.window.controller.chat.attachment.get_current_tokens()
@@ -161,11 +168,32 @@ class UI:
             ui_nodes['prompt.context'].setText(ctx_string)
             self._last_ctx_string = ctx_string
 
-        input_string = f"{short_num(input_tokens)} + {short_num(system_tokens)} + {short_num(ctx_tokens)} + {short_num(extra_tokens)} + {short_num(attachments_tokens)} = {short_num(sum_tokens)} / {short_num(max_current)}"
+        if max_current > 0:
+            max_str = short_num(max_current)
+        else:
+            max_str = "∞"
+
+        input_string = f"{short_num(input_tokens)} + {short_num(system_tokens)} + {short_num(ctx_tokens)} + {short_num(extra_tokens)} + {short_num(attachments_tokens)} = {short_num(sum_tokens)} / {max_str}"
         if input_string != self._last_input_string:
             ui_nodes['input.counter'].setText(input_string)
             self._last_input_string = input_string
 
+        # Update Input tab tooltip with live "<chars> chars (~<tokens> tokens)" string
+        try:
+            tabs = self.window.ui.tabs.get('input')
+        except Exception:
+            tabs = None
+
+        if tabs is not None:
+            try:
+                tooltip = trans("input.tab.tooltip").format(chars=short_num(len(raw_text)), tokens=short_num(input_tokens))
+            except Exception:
+                tooltip = ""
+            #tooltip = f"{short_num(len(raw_text))} chars (~{short_num(input_tokens)} tokens)"
+            if tooltip != self._last_input_tab_tooltip:
+                tabs.setTabToolTip(0, tooltip)
+                self._last_input_tab_tooltip = tooltip
+
     def store_state(self):
         """Store UI state"""
         self.window.controller.layout.scroll_save()

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.25 14: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,15 +237,25 @@ 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}'")
-        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")
+        # Lightweight header to ensure agent name is known before tokens.
+        await self._emit_agent_text(ctx, "", agent_name=name)
 
     async def _emit_step_sep(self, ctx: Context, node_id: str):
         try:
-            await self._emit(ctx, StepEvent(name="next", index=self._steps, total=self.max_iterations, meta={"node": node_id}))
+            a = self.fs.agents.get(node_id)
+            friendly_name = (a.name if a and a.name else node_id)
+            await self._emit(
+                ctx,
+                StepEvent(
+                    name="next",
+                    index=self._steps,
+                    total=self.max_iterations,
+                    meta={
+                        "node": node_id,
+                        "agent_name": friendly_name,  # pass current agent display name
+                    },
+                ),
+            )
         except Exception as e:
             self.logger.error(f"[event] StepEvent emit failed: {e}")
 
@@ -335,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:
@@ -359,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
@@ -429,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
@@ -459,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,
@@ -513,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:
@@ -526,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)