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

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,17 @@
+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.
+- Added drag-and-drop and reordering functionality to the presets list.
+- Added statistics for response tokens, including time elapsed and tokens per second.
+- Improved UI/UX.
+
 2.6.60 (2025-09-25)
 
 - Added a new tool: Agents Builder - allowing visual design of agent workflows using nodes - available in Tools -> Agents Builder (beta).

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.25 00:00:00                  #
+# Updated Date: 2025.09.26 00:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.6.60"
-__build__ = "2025-09-25"
+__version__ = "2.6.62"
+__build__ = "2025-09-26"
 __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/common.py

@@ -6,10 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.01 23:00:00                  #
+# Updated Date: 2025.09.25 12:00:00                  #
 # ================================================== #
 
 import os
+from time import perf_counter
+from typing import Callable, Optional
 
 from PySide6.QtGui import QTextCursor
 from PySide6.QtWidgets import QFileDialog, QApplication
@@ -18,7 +20,7 @@ from pygpt_net.core.events import Event, AppEvent, RenderEvent, KernelEvent
 from pygpt_net.core.types import MODE_ASSISTANT, MODE_AUDIO
 from pygpt_net.item.ctx import CtxItem
 from pygpt_net.item.model import ModelItem
-from pygpt_net.utils import trans
+from pygpt_net.utils import trans, short_num
 
 
 class Common:
@@ -30,6 +32,12 @@ class Common:
         """
         self.window = window
         self.initialized = False
+        # Counter (seconds, float) – current/last measured time
+        self.counter: float = 0.0
+        # Private start timestamp
+        self._t0: Optional[float] = None
+        # Optional number-shortening function (e.g., 10000 -> "10k"); if None, a fallback is used
+        self._shortener = None
 
     def setup(self):
         """Set up UI"""
@@ -310,6 +318,7 @@ class Common:
             dispatch(AppEvent(AppEvent.INPUT_STOPPED))  # app event
 
         self.stop_client()  # stop clients
+        self.reset_counter()
 
     def stop_client(self):
         """Stop all clients"""
@@ -457,15 +466,115 @@ class Common:
                 f.write(str(text).strip())
             self.window.update_status(f"{trans('status.saved')}: {os.path.basename(file_name)}")
 
+    # --- Timer control ---
+
+    def start_counter(self) -> None:
+        """Start the timer – call when send the request."""
+        self._t0 = perf_counter()
+
+    def stop_counter(self) -> float:
+        """
+        Stop the timer. Returns elapsed seconds and stores it in self.counter.
+        """
+        if self._t0 is None:
+            raise RuntimeError("Timer was not started (start_counter()).")
+        self.counter = perf_counter() - self._t0
+        self._t0 = None
+        return self.counter
+
+    def get_counter(self) -> float:
+        """
+        Current elapsed time (if running) or last measured time (in seconds).
+        """
+        if self._t0 is not None:
+            return perf_counter() - self._t0
+        return self.counter
+
+    def reset_counter(self) -> None:
+        """Reset the timer."""
+        self._t0 = None
+        self.counter = 0.0
+
+    # --- Calculation and formatting ---
+
+    def tokens_per_second(self, tokens_generated: int, seconds: Optional[float] = None) -> float:
+        """
+        Average tokens/s for the given token count and time (defaults to current/last).
+        """
+        sec = self.get_counter() if seconds is None else max(float(seconds), 0.0)
+        if sec <= 0.0:
+            return 0.0
+        return float(tokens_generated) / sec
+
+    def format_duration(self, seconds: Optional[float] = None, max_units: int = 2) -> str:
+        """
+        Pretty duration: e.g., 800ms, 12s, 1m 12s, 3h 5m, 1d 2h (by default up to 2 units).
+        """
+        sec = self.get_counter() if seconds is None else max(float(seconds), 0.0)
+
+        if sec < 1.0:
+            return f"{int(round(sec * 1000)):d}ms"
+
+        total = int(sec)  # floor to whole seconds
+        days, rem = divmod(total, 86400)
+        hours, rem = divmod(rem, 3600)
+        minutes, seconds = divmod(rem, 60)
+
+        parts = []
+        if days:
+            parts.append(f"{days}d")
+        if hours:
+            parts.append(f"{hours}h")
+        if minutes:
+            parts.append(f"{minutes}m")
+        if seconds or not parts:
+            parts.append(f"{seconds}s")
+
+        return " ".join(parts[:max_units])
+
+    def _fallback_shorten(self, value: float) -> str:
+        """
+        Simple fallback shortener (e.g., 15300 -> '15.3k').
+        """
+        n = abs(value)
+        sign = "-" if value < 0 else ""
+        if n < 1_000:
+            return f"{sign}{int(round(n))}"
+        elif n < 1_000_000:
+            v = n / 1_000
+            s = f"{v:.1f}".rstrip("0").rstrip(".")
+            return f"{sign}{s}k"
+        elif n < 1_000_000_000:
+            v = n / 1_000_000
+            s = f"{v:.1f}".rstrip("0").rstrip(".")
+            return f"{sign}{s}M"
+        else:
+            v = n / 1_000_000_000
+            s = f"{v:.1f}".rstrip("0").rstrip(".")
+            return f"{sign}{s}B"
+
+    def format_stats(self, tokens_generated: int) -> str:
+        """
+        Returns a string in the format: "<X> tokens/s - <duration>", e.g., "15k tokens/s - 1m 12s".
+        """
+        tps = self.tokens_per_second(tokens_generated)
+        if self._shortener:
+            tps_str = self._shortener(tps if isinstance(tps, (int, float)) else float(tps))
+        else:
+            tps_str = self._fallback_shorten(tps)
+        duration = self.format_duration()
+        return f"{tps_str} tokens/s - {duration}"
+
     def show_response_tokens(self, ctx: CtxItem):
         """
         Update response tokens
 
         :param ctx: CtxItem
         """
-        extra_data = ""
-        if ctx.is_vision:
-            extra_data = " (VISION)"
+        stats = ""
+        if ctx.output_tokens > 0 and self.get_counter() > 0:
+            stats = f" | {self.format_stats(ctx.output_tokens)}"
+        self.reset_counter()
         self.window.update_status(
-            f"{trans('status.tokens')}: {ctx.input_tokens} + {ctx.output_tokens} = {ctx.total_tokens}{extra_data}"
+            f"{trans('status.tokens')}: {short_num(ctx.input_tokens)} + {short_num(ctx.output_tokens)} = {short_num(ctx.total_tokens)}{stats}"
         )

pygpt_net/controller/chat/input.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.23 15:00:00                  #
+# Updated Date: 2025.09.25 12:00:00                  #
 # ================================================== #
 
 from typing import Optional, Any, Dict
@@ -206,6 +206,9 @@ class Input:
             'mode': mode,
         }))
 
+        # start timer
+        self.window.controller.chat.common.start_counter()
+
         # send input to API
         if mode == MODE_IMAGE:
             controller.chat.image.send(

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/presets.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.05 18:00:00                  #
+# Updated Date: 2025.09.26 03:00:00                  #
 # ================================================== #
 
 import re
@@ -24,12 +24,14 @@ from pygpt_net.core.types import (
     MODE_AGENT_OPENAI,
 )
 from pygpt_net.controller.presets.editor import Editor
+    # Editor controller
 from pygpt_net.core.events import AppEvent
 from pygpt_net.item.preset import PresetItem
 from pygpt_net.utils import trans
 
 
 _FILENAME_SANITIZE_RE = re.compile(r'[^a-zA-Z0-9_\-\.]')
+# keep original validation (do not break other parts)
 _VALIDATE_FILENAME_RE = re.compile(r'[^\w\s\-\.]')
 
 
@@ -76,7 +78,7 @@ class Presets:
 
     def select(self, idx: int):
         """
-        Select preset
+        Select preset by list index (legacy)
 
         :param idx: value of the list (row idx)
         """
@@ -94,6 +96,32 @@ class Presets:
         if editor_ctrl.opened and editor_ctrl.current != preset_id:
             self.editor.init(preset_id)
 
+    def select_by_id(self, preset_id: str):
+        """
+        Select preset by explicit ID (robust for DnD-ordered views).
+        """
+        if self.preset_change_locked():
+            return
+        if not preset_id:
+            return
+        w = self.window
+        mode = w.core.config.get('mode')
+        if not w.core.presets.has(mode, preset_id):
+            return
+        w.core.config.set("preset", preset_id)
+        if 'current_preset' not in w.core.config.data:
+            w.core.config.data['current_preset'] = {}
+        w.core.config.data['current_preset'][mode] = preset_id
+        self.select_model()
+        w.controller.ui.update()
+        w.controller.model.select_current()
+        w.dispatch(AppEvent(AppEvent.PRESET_SELECTED))
+        idx = w.core.presets.get_idx_by_id(mode, preset_id)
+        self.set_selected(idx)
+        editor_ctrl = w.controller.presets.editor
+        if editor_ctrl.opened and editor_ctrl.current != preset_id:
+            self.editor.init(preset_id)
+
     def get_current(self) -> Optional[PresetItem]:
         """
         Get current preset
@@ -584,6 +612,43 @@ class Presets:
         if mode == MODE_ASSISTANT:
             w.core.assistants.load()
 
+    def _nearest_id_after_delete(self, mode: str, idx: Optional[int], deleting_id: Optional[str]) -> Optional[str]:
+        """
+        Compute the nearest neighbor to select after deletion:
+        - Prefer the next item (below) if exists;
+        - Otherwise choose the previous one (above);
+        - Returns None when no neighbor can be determined.
+        This uses the current view order for the given mode, including pinned current.<mode> at index 0.
+        """
+        try:
+            w = self.window
+            data = w.core.presets.get_by_mode(mode) or {}
+            ids = list(data.keys())
+            if not ids:
+                return None
+
+            # If idx is invalid, try to resolve from deleting_id
+            if idx is None or idx < 0 or idx >= len(ids):
+                if deleting_id and deleting_id in ids:
+                    idx = ids.index(deleting_id)
+                else:
+                    return None
+
+            # Prefer below
+            if idx + 1 < len(ids):
+                cand = ids[idx + 1]
+                if cand and cand != deleting_id:
+                    return cand
+
+            # Otherwise above
+            if idx - 1 >= 0:
+                cand = ids[idx - 1]
+                if cand and cand != deleting_id:
+                    return cand
+        except Exception:
+            pass
+        return None
+
     def delete(
             self,
             idx: Optional[int] = None,
@@ -607,10 +672,31 @@ class Presets:
                         msg=trans('confirm.preset.delete'),
                     )
                     return
-                if preset_id == w.core.config.get('preset'):
-                    w.core.config.set('preset', None)
-                    w.ui.nodes['preset.prompt'].setPlainText("")
+
+                # Determine neighbor only if the deleted preset is currently active.
+                # This keeps API semantics untouched and prevents unexpected selection changes.
+                is_current = (preset_id == w.core.config.get('preset'))
+                target_id = None
+                if is_current:
+                    target_id = self._nearest_id_after_delete(mode, idx, preset_id)
+
+                # Remove from core (also removes file when True)
                 w.core.presets.remove(preset_id, True)
+
+                # When removing the active preset, jump to the nearest neighbor (below or above).
+                # If no neighbor can be determined, fall back to previous behavior (clear and let defaults apply).
+                if is_current:
+                    if target_id and target_id in w.core.presets.items:
+                        # Persist new selection in config (and keep current_preset mapping coherent)
+                        w.core.config.set('preset', target_id)
+                        if 'current_preset' not in w.core.config.data:
+                            w.core.config.data['current_preset'] = {}
+                        w.core.config.data['current_preset'][mode] = target_id
+                    else:
+                        # Fallback: clear selection to allow select_default() to pick the first available
+                        w.core.config.set('preset', None)
+                        w.ui.nodes['preset.prompt'].setPlainText("")
+
                 self.refresh(no_scroll=True)
                 w.update_status(trans('status.preset.deleted'))
 
@@ -715,4 +801,33 @@ class Presets:
 
     def clear_selected(self):
         """Clear selected list"""
-        self.selected = []
+        self.selected = []
+
+    # ----------------------------
+    # Drag & drop ordering helpers
+    # ----------------------------
+
+    def persist_order_for_mode(self, mode: str, uuids: List[str]):
+        """
+        Persist new order (by UUIDs) for given mode.
+
+        The special '*' preset (current.<mode>) is not included here and always pinned at index 0.
+        """
+        w = self.window
+        cfg = w.core.config
+        order = cfg.get('presets_order') or {}
+        # Normalize to lists
+        if isinstance(order.get(mode), dict):
+            mapped = order.get(mode)
+            order[mode] = [mapped[k] for k in sorted(mapped.keys(), key=lambda x: int(x))]
+        order[mode] = [u for u in uuids if u]
+        cfg.set('presets_order', order)
+
+    def dnd_enabled(self) -> bool:
+        """
+        Check if drag and drop is globally enabled in config.
+        """
+        try:
+            return bool(self.window.core.config.get('presets.drag_and_drop.enabled'))
+        except Exception:
+            return False

pygpt_net/controller/settings/editor.py

@@ -51,11 +51,9 @@ class Editor:
         self.window.ui.add_hook("update.config.font_size.ctx", self.hook_update)
         self.window.ui.add_hook("update.config.font_size.toolbox", self.hook_update)
         self.window.ui.add_hook("update.config.zoom", self.hook_update)
-        self.window.ui.add_hook("update.config.theme.markdown", self.hook_update)
         self.window.ui.add_hook("update.config.vision.capture.enabled", self.hook_update)
         self.window.ui.add_hook("update.config.vision.capture.auto", self.hook_update)
         self.window.ui.add_hook("update.config.ctx.records.limit", self.hook_update)
-        self.window.ui.add_hook("update.config.ctx.convert_lists", self.hook_update)
         self.window.ui.add_hook("update.config.ctx.records.separators", self.hook_update)
         self.window.ui.add_hook("update.config.ctx.records.groups.separators", self.hook_update)
         self.window.ui.add_hook("update.config.ctx.records.pinned.separators", self.hook_update)
@@ -176,10 +174,6 @@ class Editor:
             value = self.window.core.config.get('theme.style')
             self.window.controller.theme.toggle_style(value)
 
-        # convert lists
-        if self.config_changed('ctx.convert_lists'):
-            self.window.controller.ctx.refresh()
-
         # access: voice control
         if self.config_changed('access.voice_control'):
             self.window.controller.access.voice.update()
@@ -266,19 +260,10 @@ class Editor:
             self.window.core.config.set(key, value)
             self.window.controller.ui.update_font_size()
 
-        # update markdown
-        elif key == "theme.markdown":
-            self.window.core.config.set(key, value)
-            self.window.controller.theme.markdown.update(force=True)
-
         elif key == "render.code_syntax":
             self.window.core.config.set(key, value)
             self.window.controller.theme.toggle_syntax(value, update_menu=True)
 
-        elif key == "ctx.convert_lists":
-            self.window.core.config.set(key, value)
-            self.window.controller.ctx.refresh()
-
         elif key == "ctx.records.separators":
             self.window.core.config.set(key, value)
             self.window.controller.ctx.update()

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):