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

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.25 14: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)

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

pygpt_net/core/db/viewer.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 json
@@ -154,14 +154,18 @@ class Viewer:
                 msg = f"[DB] Created DB backup: {backup_path}"
                 self.log(msg)
 
+        tables = self.database.get_tables()
+        primary_key = tables[data['table']]['primary_key']
+
         with self.database.get_db().begin() as conn:
             conn.execute(
-                text(f"DELETE FROM {data['table']} WHERE id = :row_id")
+                text(f"DELETE FROM {data['table']} WHERE {primary_key} = :row_id")
                 .bindparams(row_id=data['row_id'])
             )
             msg = f"[DB] Deleted row ID {data['row_id']} from table {data['table']}"
             self.log(msg)
-        self.database.window.ui.debug["db"].browser.update_table_view()
+        # Force refresh to invalidate caches and handle pagination edge cases
+        self.database.window.ui.debug["db"].browser.force_refresh()
 
     def update_row(self, data: Dict[str, Any]):
         """
@@ -207,7 +211,8 @@ class Viewer:
             )
             msg = f"[DB] Updated row ID {data['id']} in table {data['table']}"
             self.log(msg)
-        self.database.window.ui.debug["db"].browser.update_table_view()
+        # Force refresh to invalidate caches and handle pagination edge cases
+        self.database.window.ui.debug["db"].browser.force_refresh()
 
     def truncate_table(self, data: Dict[str, Any], reset: bool = False):
         """
@@ -230,7 +235,8 @@ class Viewer:
             else:
                 msg = f"[DB] Deleted all rows from table {data['table']}"
             self.log(msg)
-        self.database.window.ui.debug["db"].browser.update_table_view()
+        # Force refresh to invalidate caches and handle pagination edge cases
+        self.database.window.ui.debug["db"].browser.force_refresh()
 
     def log(self, msg: str):
         """

pygpt_net/core/node_editor/graph.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.25 00:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -83,16 +83,24 @@ class NodeGraph(QObject):
         props: Dict[str, PropertyModel] = {}
         for ps in spec.properties:
             props[ps.id] = PropertyModel(
-                uuid=gen_uuid(), id=ps.id, type=ps.type, name=ps.name or ps.id,
-                editable=ps.editable, value=ps.value,
-                allowed_inputs=ps.allowed_inputs, allowed_outputs=ps.allowed_outputs,
-                options=ps.options
+                uuid=gen_uuid(),
+                id=ps.id,
+                type=ps.type,
+                name=ps.name or ps.id,
+                editable=ps.editable,
+                value=ps.value,
+                allowed_inputs=ps.allowed_inputs,
+                allowed_outputs=ps.allowed_outputs,
+                options=ps.options,
+                placeholder=getattr(ps, "placeholder", None),
+                description=getattr(ps, "description", None),
             )
         # Auto inject read-only 'base_id' property for visibility if base_id defined and not present
         if spec.base_id and "base_id" not in props:
             props["base_id"] = PropertyModel(
                 uuid=gen_uuid(), id="base_id", type="str", name="Base ID",
-                editable=False, value=base_id, allowed_inputs=0, allowed_outputs=0
+                editable=False, value=base_id, allowed_inputs=0, allowed_outputs=0,
+                placeholder=None, description="Internal base identifier (read-only)."
             )
 
         node = NodeModel(uuid=gen_uuid(), id=nid, name=name or spec.title or nid, type=type_name, properties=props)
@@ -195,7 +203,8 @@ class NodeGraph(QObject):
                 "type": n.type,
                 "id": n.id,
                 "name": n.name,
-                "values": {pid: p.value for pid, p in n.properties.items()},
+                # UI-only fields like HelpLabel are skipped
+                "values": {pid: p.value for pid, p in n.properties.items() if p.type != "HelpLabel"},
             }
         conns_out = [{"src": [c.src_node, c.src_prop], "dst": [c.dst_node, c.dst_prop]}
                      for c in self.connections.values()]
@@ -226,8 +235,8 @@ class NodeGraph(QObject):
                         "out": list(outgoing.get((n.uuid, pid), [])),
                     }
                 else:
-                    # Skip internal helper fields if needed
-                    if pid == "base_id":
+                    # Skip internal/helper and UI-only fields
+                    if pid == "base_id" or prop.type == "HelpLabel":
                         continue
                     slots[pid] = prop.value
             result.append({

pygpt_net/core/node_editor/models.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.25 00:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -22,13 +22,16 @@ from .utils import gen_uuid
 class PropertyModel:
     uuid: str
     id: str
-    type: str  # "slot", "str", "int", "float", "bool", "combo", "text"
+    type: str  # "slot", "str", "int", "float", "bool", "combo", "text", "HelpLabel"
     name: str
     editable: bool = True
     value: Any = None
     allowed_inputs: int = 0   # 0 none, -1 unlimited, >0 limit
     allowed_outputs: int = 0  # 0 none, -1 unlimited, >0 limit
     options: Optional[List[str]] = None  # for combo
+    # UI helpers
+    placeholder: Optional[str] = None
+    description: Optional[str] = None
 
     def to_dict(self) -> dict:
         return {
@@ -41,6 +44,8 @@ class PropertyModel:
             "allowed_inputs": self.allowed_inputs,
             "allowed_outputs": self.allowed_outputs,
             "options": self.options or [],
+            "placeholder": self.placeholder,
+            "description": self.description,
         }
 
     @staticmethod
@@ -55,6 +60,8 @@ class PropertyModel:
             allowed_inputs=d.get("allowed_inputs", 0),
             allowed_outputs=d.get("allowed_outputs", 0),
             options=d.get("options") or None,
+            placeholder=d.get("placeholder"),
+            description=d.get("description"),
         )
 
 

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.24 00:00:00                  #
+# Updated Date: 2025.09.25 15:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -26,6 +26,8 @@ class PropertySpec:
     allowed_inputs: int = 0
     allowed_outputs: int = 0
     options: Optional[List[str]] = None
+    placeholder: Optional[str] = None      # hint text for text editors
+    description: Optional[str] = None      # tooltip/help text shown in UI
 
 
 @dataclass