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

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
@@ -33,11 +33,8 @@ class Markdown:
         """
         if force:
             self.window.controller.ui.store_state()  # store state before theme change
-
-        if self.window.core.config.get('theme.markdown'):
-            self.load()
-        else:
-            self.set_default()
+        
+        self.load()
         self.apply()
 
         if force:
@@ -95,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.08.23 15:00:00                  #
+# Updated Date: 2025.09.26 17:00:00                  #
 # ================================================== #
 
 from typing import Optional
@@ -15,7 +15,7 @@ from PySide6.QtGui import QColor
 
 from pygpt_net.core.types import MODE_IMAGE
 from pygpt_net.core.events import BaseEvent, Event
-from pygpt_net.utils import trans
+from pygpt_net.utils import trans, short_num
 
 from .mode import Mode
 from .tabs import Tabs
@@ -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,25 +153,47 @@ 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()
         sum_tokens += attachments_tokens
 
-        ctx_string = f"{ctx_len} / {ctx_len_all} - {ctx_tokens} {trans('ctx.tokens')}"
+        ctx_string = f"{short_num(ctx_len)} / {short_num(ctx_len_all)} - {short_num(ctx_tokens)} {trans('ctx.tokens')}"
         if ctx_string != self._last_ctx_string:
             ui_nodes['prompt.context'].setText(ctx_string)
             self._last_ctx_string = ctx_string
 
-        parsed_sum = self.format_tokens(sum_tokens)
-        parsed_max_current = self.format_tokens(max_current)
+        if max_current > 0:
+            max_str = short_num(max_current)
+        else:
+            max_str = "∞"
 
-        input_string = f"{input_tokens} + {system_tokens} + {ctx_tokens} + {extra_tokens} + {attachments_tokens} = {parsed_sum} / {parsed_max_current}"
+        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/__init__.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 23:00:00                  #
+# Updated Date: 2025.09.25 14:00:00                  #
 # ================================================== #
 
 import copy
@@ -182,6 +182,12 @@ class Custom:
                             slots = node["slots"]
                             if "name" in slots and slots["name"]:
                                 tab["label"] = slots["name"]
+                            if "role" in slots:
+                                opts["role"] = {
+                                    "type": "str",
+                                    "label": trans("agent.option.role"),
+                                    "default": slots["role"],
+                                }
                             if "instruction" in slots:
                                 opts["prompt"] = {
                                     "type": "textarea",

pygpt_net/core/agents/custom/llama_index/factory.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 23:00:00                  #
+# Updated Date: 2025.09.25 14:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -32,7 +32,6 @@ class BuiltAgentLI:
 class AgentFactoryLI:
     """
     Build LlamaIndex ReActAgent/FunctionAgent from AgentNode + NodeRuntime and explicit LLM/tools.
-    Best practice: chat_history/max_iterations przekazujemy do konstruktora agenta.
     """
     def __init__(self, window, logger) -> None:
         self.window = window
@@ -45,7 +44,7 @@ class AgentFactoryLI:
         node_runtime: NodeRuntime,
         llm: Any,                 # LLM instance (z appki lub resolve_llm)
         tools: List[Any],         # BaseTool list
-        friendly_map: Dict[str, str],
+        friendly_map: Dict[str, Any],
         force_router: bool = False,
         chat_history: List[Any] = None,
         max_iterations: int = 10,
@@ -62,23 +61,35 @@ class AgentFactoryLI:
 
         node_tools = tools if (node_runtime.allow_local_tools or node_runtime.allow_remote_tools) else []
 
+        # Prefer FunctionAgent if the underlying LLM supports function-calling (recommended by LI).
+        # This yields more direct compliance with system_prompt for simple single-output tasks.
+        is_fc_model = False
+        try:
+            is_fc_model = bool(getattr(getattr(llm, "metadata", None), "is_function_calling_model", False))
+        except Exception:
+            is_fc_model = False
+
         if multi_output:
-            agent_cls = FunctionAgent  # routers behave better with FunctionAgent (JSON compliance)
+            agent_cls = FunctionAgent  # routers: keep JSON compliance
         else:
-            agent_cls = FunctionAgent if node_tools else ReActAgent
+            agent_cls = FunctionAgent if is_fc_model else ReActAgent
+
         kwargs: Dict[str, Any] = {
             "name": agent_name,
             "system_prompt": instr,
             "llm": llm,
             "chat_history": chat_history or [],
             "max_iterations": int(max_iterations),
+            # Provide a short description to reinforce the agent's purpose (if role present).
+            "description": (node_runtime.role or agent_name),
         }
         if node_tools:
             kwargs["tools"] = coerce_li_tools(node_tools)
 
         instance = agent_cls(**kwargs)
         self.logger.debug(
-            f"[li] Built agent {node.id} ({agent_name}), multi_output={multi_output}, routes={allowed_routes}"
+            f"[li] Built agent {node.id} ({agent_name}), multi_output={multi_output}, "
+            f"routes={allowed_routes}, agent_cls={agent_cls.__name__}"
         )
         return BuiltAgentLI(
             instance=instance,

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.24 23:00:00                  #
+# Updated Date: 2025.09.26 17:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -210,6 +210,34 @@ class DynamicFlowWorkflowLI(Workflow):
     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__}")
@@ -240,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}")
 
@@ -412,6 +455,7 @@ class DynamicFlowWorkflowLI(Workflow):
                 f"[runtime] model={getattr(node_rt.model,'name',str(node_rt.model))} "
                 f"allow_local={node_rt.allow_local_tools} allow_remote={node_rt.allow_remote_tools} "
                 f"instructions='{ellipsize(node_rt.instructions, self.dbg.preview_chars)}'"
+                f" role='{ellipsize(node_rt.role or '', self.dbg.preview_chars)}'"
             )
 
         llm_node = resolve_llm(self.window, node_rt.model, self.llm_base, self.stream)
@@ -430,13 +474,17 @@ 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
+        allowed_routes_now = list(node.outputs or [])
+        friendly_map = self._friendly_map_for_routes(allowed_routes_now)
+
         # Build agent (chat_history/max_iterations in ctor – best practice)
         built = self.factory.build(
             node=node,
             node_runtime=node_rt,
             llm=llm_node,
             tools=tools_node,
-            friendly_map=self._friendly_map(),
+            friendly_map=friendly_map,
             chat_history=chat_history_msgs,
             max_iterations=self.max_iterations,
         )

pygpt_net/core/agents/custom/llama_index/utils.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 23:00:00                  #
+# Updated Date: 2025.09.25 14:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -47,6 +47,7 @@ def make_option_getter(base_agent, preset: Optional[PresetItem]) -> OptionGetter
 class NodeRuntime:
     model: ModelItem
     instructions: str
+    role: Optional[str]
     allow_local_tools: bool
     allow_remote_tools: bool
 
@@ -76,6 +77,15 @@ def resolve_node_runtime(
     prompt_opt = option_get(node.id, "prompt", None)
     instructions = (prompt_opt or getattr(node, "instruction", None) or base_prompt or "").strip()
 
+    # Role resolve (optional)
+    role_opt = option_get(node.id, "role", None)
+    role_from_schema = getattr(node, "role", None) if hasattr(node, "role") else None
+    role: Optional[str] = None
+    if isinstance(role_opt, str) and role_opt.strip():
+        role = role_opt.strip()
+    elif isinstance(role_from_schema, str) and role_from_schema.strip():
+        role = role_from_schema.strip()
+
     allow_local_tools = bool(
         option_get(
             node.id, "allow_local_tools",
@@ -92,6 +102,7 @@ def resolve_node_runtime(
     return NodeRuntime(
         model=model_item,
         instructions=instructions,
+        role=role,
         allow_local_tools=allow_local_tools,
         allow_remote_tools=allow_remote_tools,
     )

pygpt_net/core/agents/custom/router.py

@@ -6,14 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.24 23:00:00                  #
+# Updated Date: 2025.09.25 14:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
 import json
 import re
 from dataclasses import dataclass
-from typing import List, Optional, Tuple, Any
+from typing import List, Optional, Tuple, Any, Dict
 
 
 @dataclass
@@ -25,13 +25,46 @@ class RouteDecision:
     error: Optional[str] = None
 
 
-def build_router_instruction(agent_name: str, current_id: str, allowed_routes: List[str], friendly_map: dict[str, str]) -> str:
+def build_router_instruction(
+    agent_name: str,
+    current_id: str,
+    allowed_routes: List[str],
+    friendly_map: Dict[str, Any],
+) -> str:
     """
     Builds an instruction that forces the model to output JSON with next route and content.
+
+    Additionally, if the provided friendly_map contains role information for any of the
+    allowed routes (e.g. friendly_map[id] is a dict with a "role" key), these roles
+    are included in the instruction to improve routing. This is optional and included
+    only when present and non-empty.
     """
     allowed = ", ".join(allowed_routes)
-    friendly = {rid: friendly_map.get(rid, rid) for rid in allowed_routes}
-    return (
+
+    # Normalize human-friendly names: accept either a plain string or a dict with
+    # common name keys such as "name", "title" or "label".
+    def _extract_name(val: Any, default_name: str) -> str:
+        if isinstance(val, str):
+            return val
+        if isinstance(val, dict):
+            return str(val.get("name") or val.get("title") or val.get("label") or default_name)
+        return default_name
+
+    # Extract names and optional roles for allowed routes, without changing input map semantics.
+    friendly_names = {rid: _extract_name(friendly_map.get(rid), rid) for rid in allowed_routes}
+
+    # Roles are optional; include only non-empty strings.
+    friendly_roles: Dict[str, str] = {}
+    for rid in allowed_routes:
+        val = friendly_map.get(rid)
+        role_val: Optional[str] = None
+        if isinstance(val, dict):
+            role_val = val.get("role")
+        if isinstance(role_val, str) and role_val.strip():
+            friendly_roles[rid] = role_val.strip()
+
+    # Base instruction
+    instr = (
         "You are a routing-capable agent in a multi-agent flow.\n"
         f"Your id is: {current_id}, name: {agent_name}.\n"
         "You MUST respond ONLY with a single JSON object and nothing else.\n"
@@ -46,9 +79,15 @@ def build_router_instruction(agent_name: str, current_id: str, allowed_routes: L
         "- content must contain the user-facing answer (you may include structured data as JSON or Markdown inside content).\n"
         "- Do NOT add any commentary outside of the JSON. No leading or trailing text.\n"
         "- If using tools, still return the final JSON with tool results summarized in content.\n"
-        f"- Human-friendly route names: {json.dumps(friendly)}\n"
+        f"- Human-friendly route names: {json.dumps(friendly_names)}\n"
     )
 
+    # Append roles only if any are present (optional).
+    if friendly_roles:
+        instr += f"- Human-friendly route roles (optional): {json.dumps(friendly_roles)}\n"
+
+    return instr
+
 
 def _extract_json_block(text: str) -> Optional[str]:
     """

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.24 23:00:00                  #
+# Updated Date: 2025.09.26 17:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -171,6 +171,7 @@ class FlowOrchestrator:
                     f"[runtime] model={getattr(node_rt.model,'name',str(node_rt.model))} "
                     f"allow_local={node_rt.allow_local_tools} allow_remote={node_rt.allow_remote_tools} "
                     f"instructions='{instr_preview}'"
+                    f" role='{node_rt.role}'"
                 )
 
             # Memory selection and INPUT BUILD (memory-first policy)
@@ -241,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
@@ -443,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/custom/schema.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 23:00:00                  #
+# Updated Date: 2025.09.25 14:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -31,6 +31,7 @@ class AgentNode(BaseNode):
     inputs: List[str] = field(default_factory=list)
     memory_out: Optional[str] = None  # single mem by spec
     memory_in: List[str] = field(default_factory=list)  # not used, but kept for completeness
+    role: str = ""  # Optional short description of agent's purpose
 
 
 @dataclass
@@ -91,6 +92,7 @@ def parse_schema(schema: List[Dict[str, Any]]) -> FlowSchema:
                 inputs=list(_safe_get(slots, "input", "in", default=[])) or [],
                 memory_out=(_safe_get(slots, "memory", "out", default=[None]) or [None])[0],
                 memory_in=list(_safe_get(slots, "memory", "in", default=[])) or [],
+                role=_safe_get(slots, "role", default="") or "",
             )
             fs.agents[nid] = node
 

pygpt_net/core/agents/custom/utils.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 23:00:00                  #
+# Updated Date: 2025.09.25 14:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -116,6 +116,7 @@ def make_option_getter(base_agent, preset: Optional[PresetItem]) -> OptionGetter
 class NodeRuntime:
     model: ModelItem
     instructions: str
+    role: Optional[str]
     allow_local_tools: bool
     allow_remote_tools: bool
 
@@ -138,6 +139,7 @@ def resolve_node_runtime(
     Priority:
     - model:      get_option(node.id, "model") -> window.core.models.get(name) -> default_model
     - prompt:     get_option(node.id, "prompt") -> node.instruction -> base_prompt -> ""
+    - role:       get_option(node.id, "role") -> node.role -> None (only used if provided and non-empty)
     - allow_*:    get_option(node.id, "allow_local_tools"/"allow_remote_tools")
                   -> schema flags -> defaults
     """
@@ -157,6 +159,15 @@ def resolve_node_runtime(
     prompt_opt = option_get(node.id, "prompt", None)
     instructions = (prompt_opt or getattr(node, "instruction", None) or base_prompt or "").strip()
 
+    # Role resolve (optional)
+    role_opt = option_get(node.id, "role", None)
+    role_from_schema = getattr(node, "role", None) if hasattr(node, "role") else None
+    role: Optional[str] = None
+    if isinstance(role_opt, str) and role_opt.strip():
+        role = role_opt.strip()
+    elif isinstance(role_from_schema, str) and role_from_schema.strip():
+        role = role_from_schema.strip()
+
     # Tools flags resolve
     allow_local_tools = bool(
         option_get(
@@ -176,6 +187,7 @@ def resolve_node_runtime(
     return NodeRuntime(
         model=model_item,
         instructions=instructions,
+        role=role,
         allow_local_tools=allow_local_tools,
         allow_remote_tools=allow_remote_tools,
     )