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

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,14 @@
+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).
+
 2.6.59 (2025-09-23)
 
 - LlamaIndex has been upgraded to v0.13.6.

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.23 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.59"
-__build__ = "2025-09-23"
+__version__ = "2.6.61"
+__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/app.py

@@ -103,15 +103,15 @@ from pygpt_net.plugin.wolfram import Plugin as WolframPlugin
 from pygpt_net.plugin.osm import Plugin as OSMPlugin
 
 # agents (Llama-index)
-# from pygpt_net.provider.agents.llama_index.legacy.openai import OpenAIAgent
 from pygpt_net.provider.agents.llama_index.legacy.openai_assistant import OpenAIAssistantAgent
-# from pygpt_net.provider.agents.llama_index.legacy.planner import PlannerAgent
 from pygpt_net.provider.agents.llama_index.planner_workflow import PlannerAgent as PlannerWorkflowAgent
 from pygpt_net.provider.agents.llama_index.openai_workflow import OpenAIAgent as OpenAIWorkflowAgent
-# from pygpt_net.provider.agents.llama_index.legacy.react import ReactAgent
 from pygpt_net.provider.agents.llama_index.react_workflow import ReactWorkflowAgent
 from pygpt_net.provider.agents.llama_index.codeact_workflow import CodeActAgent
 from pygpt_net.provider.agents.llama_index.supervisor_workflow import SupervisorAgent as LlamaSupervisorAgent
+from pygpt_net.provider.agents.llama_index.flow_from_schema import Agent as LlamaCustomAgent  # builder schema
+
+# agents (OpenAI-Agents)
 from pygpt_net.provider.agents.openai.agent import Agent as OpenAIAgentsBase
 from pygpt_net.provider.agents.openai.agent_with_experts import Agent as OpenAIAgentsExperts
 from pygpt_net.provider.agents.openai.agent_with_experts_feedback import Agent as OpenAIAgentsExpertsFeedback
@@ -121,6 +121,8 @@ from pygpt_net.provider.agents.openai.agent_planner import Agent as OpenAIAgentP
 from pygpt_net.provider.agents.openai.evolve import Agent as OpenAIAgentsEvolve
 from pygpt_net.provider.agents.openai.agent_b2b import Agent as OpenAIAgentsB2B
 from pygpt_net.provider.agents.openai.supervisor import Agent as OpenAIAgentSupervisor
+from pygpt_net.provider.agents.openai.flow_from_schema import Agent as OpenAICustomAgent  # builder schema
+
 
 # LLM wrapper providers (langchain, llama-index, embeddings)
 from pygpt_net.provider.llms.anthropic import AnthropicLLM
@@ -204,7 +206,7 @@ from pygpt_net.tools.text_editor import TextEditor as TextEditorTool
 from pygpt_net.tools.html_canvas import HtmlCanvas as HtmlCanvasTool
 from pygpt_net.tools.translator import Translator as TranslatorTool
 from pygpt_net.tools.web_browser import WebBrowser as WebBrowserTool
-# from pygpt_net.tools.agent_builder import AgentBuilder as AgentBuilderTool
+from pygpt_net.tools.agent_builder import AgentBuilder as AgentBuilderTool
 
 def run(**kwargs):
     """
@@ -490,6 +492,7 @@ def run(**kwargs):
     launcher.add_agent(ReactWorkflowAgent())  # llama-index
     launcher.add_agent(CodeActAgent())  # llama-index
     launcher.add_agent(LlamaSupervisorAgent())  # llama-index
+    launcher.add_agent(LlamaCustomAgent())  # llama-index
     launcher.add_agent(OpenAIAgentsBase())  # openai-agents
     launcher.add_agent(OpenAIAgentsExperts())  # openai-agents
     launcher.add_agent(OpenAIAgentFeedback())  # openai-agents
@@ -499,6 +502,7 @@ def run(**kwargs):
     launcher.add_agent(OpenAIAgentsEvolve())  # openai-agents
     launcher.add_agent(OpenAIAgentsB2B())  # openai-agents
     launcher.add_agent(OpenAIAgentSupervisor())  # openai-agents
+    launcher.add_agent(OpenAICustomAgent())  # openai-agents
 
     # register custom agents
     agents = kwargs.get('agents', None)
@@ -516,7 +520,7 @@ def run(**kwargs):
     launcher.add_tool(HtmlCanvasTool())
     launcher.add_tool(TranslatorTool())
     launcher.add_tool(WebBrowserTool())
-    # launcher.add_tool(AgentBuilderTool())
+    launcher.add_tool(AgentBuilderTool())
 
     # register custom tools
     tools = kwargs.get('tools', None)

pygpt_net/controller/__init__.py

@@ -165,6 +165,7 @@ class Controller:
             self.settings.reload()
             self.assistant.reload()
             self.attachment.reload()
+            self.window.core.agents.custom.reload()
             self.presets.reload()
             self.idx.reload()
             self.agent.reload()

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(