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

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,10 @@
+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

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

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/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

@@ -6,7 +6,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.26 17:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -268,13 +268,28 @@ 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)
+        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:
-            await self._emit(ctx, StepEvent(name="next", index=self._steps, total=self.max_iterations, meta={"node": node_id}))
+            # 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(
+                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}")
 

pygpt_net/core/agents/custom/runner.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 14:00:00                  #
+# Updated Date: 2025.09.26 17:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -242,13 +242,14 @@ class FlowOrchestrator:
                 run_kwargs["trace_id"] = trace_id
 
             # Header for UI
-            title = f"\n\n**{built.name}**\n\n"
-            ctx.stream = title
+            ctx.set_agent_name(agent.name)
+            # title = f"\n\n**{built.name}**\n\n"
+            # ctx.stream = title
             bridge.on_step(ctx, begin)
             begin = False
             handler.begin = begin
-            if not use_partial_ctx:
-                handler.to_buffer(title)
+            # if not use_partial_ctx:
+                # handler.to_buffer(title)
 
             display_text = ""  # what we show to UI for this step
             next_id: Optional[str] = None
@@ -444,6 +445,10 @@ class FlowOrchestrator:
             else:
                 bridge.on_next(ctx)
 
+            # set next agent name if not at the end
+            if current_ids and current_ids[0] in fs.agents:
+                ctx.set_agent_name(fs.agents[current_ids[0]].name)
+
             # Step duration
             dur = perf_counter() - step_start
             self.logger.debug(f"[step {steps}] duration={dur:.3f}s")

pygpt_net/core/agents/runners/llama_workflow.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 02:00:00                  #
+# Updated Date: 2025.09.26 17:00:00                  #
 # ================================================== #
 
 import re
@@ -18,6 +18,7 @@ from llama_index.core.agent.workflow import (
     ToolCallResult,
     AgentStream,
     AgentOutput,
+    # AgentInput,  # not needed currently
 )
 from workflows.errors import WorkflowCancelledByUser
 
@@ -38,6 +39,7 @@ class LlamaWorkflow(BaseRunner):
         """
         super(LlamaWorkflow, self).__init__(window)
         self.window = window
+        self.last_response_id = None
 
     async def run(
             self,
@@ -177,12 +179,13 @@ class LlamaWorkflow(BaseRunner):
 
         prev_output = ctx.live_output
         if prev_output:
-            prev_output = self.filter_output(prev_output)  # remove all <execute>...</execute>
+            prev_output = self.filter_output(prev_output)  # remove all [!exec]...[/!exec]
 
         response_ctx.set_agent_final_response(ctx.agent_final_response)  # always set to further use
         response_ctx.set_output(prev_output)  # append from stream
         response_ctx.extra["agent_output"] = True  # mark as output response
         response_ctx.extra["agent_finish"] = True  # mark as finished
+        response_ctx.set_agent_name(ctx.get_agent_name()) # store last agent name
 
         if "agent_input" in response_ctx.extra:
             del response_ctx.extra["agent_input"]  # remove agent input from extra
@@ -254,8 +257,10 @@ class LlamaWorkflow(BaseRunner):
         item_ctx.output = ""  # empty to prevent render
         item_ctx.stream = ""  # for stream
 
+        # Keep last known agent name to avoid redundant ctx updates.
+        last_agent_name: Optional[str] = None
+
         async for event in handler.stream_events():
-            print(event)
             if self.is_stopped():
                 # persist current output on stop
                 item_ctx.output = item_ctx.live_output
@@ -297,7 +302,24 @@ class LlamaWorkflow(BaseRunner):
                         begin=begin,
                         stream=True,
                     )
+                    # Propagate agent name early based on StepEvent meta, if available.
+                    try:
+                        meta = getattr(event, "meta", {}) or {}
+                        next_name = meta.get("agent_name")
+                        if next_name:
+                            last_agent_name = self._apply_agent_name_to_ctx(item_ctx, next_name, last_agent_name)
+                    except Exception:
+                        pass
+                # Optional: mark start of a new stream block
+                begin = True
             elif isinstance(event, AgentStream):
+                # Update agent name from event if present; fallback to header parsing.
+                name = getattr(event, "current_agent_name", None)
+                if not name:
+                    name = self._guess_agent_name_from_text(getattr(event, "delta", "") or "")
+                if name:
+                    last_agent_name = self._apply_agent_name_to_ctx(item_ctx, name, last_agent_name)
+
                 if verbose:
                     print(f"{event.delta}", end="", flush=True)
                 if event.delta:
@@ -307,6 +329,10 @@ class LlamaWorkflow(BaseRunner):
                         self.send_stream(item_ctx, signals, begin)  # send stream to webview
                     begin = False
             elif isinstance(event, AgentOutput):
+                # Ensure final agent name is applied as well.
+                name = getattr(event, "current_agent_name", None)
+                if name:
+                    last_agent_name = self._apply_agent_name_to_ctx(item_ctx, name, last_agent_name)
                 thought, answer = self.extract_final_response(str(event))
                 if answer:
                     item_ctx.set_agent_final_response(answer)
@@ -348,6 +374,40 @@ class LlamaWorkflow(BaseRunner):
         next_ctx.set_output("")
         next_ctx.partial = True
         next_ctx.extra["agent_output"] = True  # allow usage in history
-
+        next_ctx.set_agent_name(ctx.get_agent_name())  # propagate agent name
         self.send_response(next_ctx, signals, KernelEvent.APPEND_DATA)
-        return next_ctx
+
+        return next_ctx
+
+    # ===== helpers for agent name propagation =====
+
+    def _apply_agent_name_to_ctx(self, ctx: CtxItem, name: str, last_known: Optional[str]) -> str:
+        """
+        Apply agent name to your context, avoiding redundant updates.
+        Falls back to ctx.extra['agent_name'] if set_agent_name is unavailable.
+        """
+        if not name:
+            return last_known or ""
+        if last_known and last_known == name:
+            return last_known
+        try:
+            if hasattr(ctx, "set_agent_name") and callable(getattr(ctx, "set_agent_name")):
+                ctx.set_agent_name(name)
+            # Always mirror into extra for downstream consumers
+            ctx.extra["agent_name"] = name
+        except Exception:
+            ctx.extra["agent_name"] = name
+        return name
+
+    def _guess_agent_name_from_text(self, text: str) -> Optional[str]:
+        """
+        Try to infer agent name from header like '**Name**' which our workflow emits
+        before each agent block.
+        """
+        if not text:
+            return None
+        # Look for the first bold segment – keep it lenient
+        m = re.search(r"\*\*([^*]+?)\*\*", text)
+        if m:
+            return m.group(1).strip()
+        return None

pygpt_net/core/agents/runners/openai_workflow.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 03:00:00                  #
+# Updated Date: 2025.09.26 17:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, List, Optional
@@ -237,6 +237,7 @@ class OpenAIWorkflow(BaseRunner):
         response_ctx.set_agent_final_response(output)  # always set to further use
         response_ctx.extra["agent_output"] = True  # mark as output response
         response_ctx.extra["agent_finish"] = True  # mark as finished
+        response_ctx.set_agent_name(ctx.get_agent_name()) # store last agent name
         response_ctx.msg_id = response_id  # set response id for OpenAI
 
         if ctx.agent_final_response:  # only if not empty

pygpt_net/core/node_editor/types.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 15:00:00                  #
+# Updated Date: 2025.09.26 12:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -34,11 +34,14 @@ class PropertySpec:
 class NodeTypeSpec:
     type_name: str
     title: Optional[str] = None
+    # UI-only human-readable label used for menus; never persisted nor used as an identifier
+    display_name: Optional[str] = None
     properties: List[PropertySpec] = field(default_factory=list)
     # Below are optional extensions for agent-flow needs:
     base_id: Optional[str] = None        # base prefix for friendly ids, e.g. "agent"
     export_kind: Optional[str] = None    # short kind for export, e.g. "agent", "start"
     bg_color: Optional[str] = None       # optional per-type background color (CSS/hex)
+    max_num: Optional[int] = None        # optional per-layout cap; None or <=0 means unlimited
 
 class NodeTypeRegistry:
     """Registry for node type specifications. Extend/override in subclasses."""
@@ -56,6 +59,15 @@ class NodeTypeRegistry:
     def get(self, type_name: str) -> Optional[NodeTypeSpec]:
         return self._types.get(type_name)
 
+    def display_name(self, type_name: str) -> str:
+        """Return UI label for a type: spec.display_name if non-empty, otherwise type_name."""
+        spec = self.get(type_name)
+        if spec:
+            dn = getattr(spec, "display_name", None)
+            if isinstance(dn, str) and dn.strip():
+                return dn
+        return type_name
+
     def _install_default_types(self):
         # Example/basic nodes kept intact
         self.register(NodeTypeSpec(