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

pygpt_net/provider/agents/openai/flow_from_schema.py

@@ -0,0 +1,96 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ================================================== #
+# This file is a part of PYGPT package               #
+# Website: https://pygpt.net                         #
+# GitHub:  https://github.com/szczyglis-dev/py-gpt   #
+# MIT License                                        #
+# Created By  : Marcin Szczygliński                  #
+# Updated Date: 2025.09.24 23:00:00                  #
+# ================================================== #
+
+from __future__ import annotations
+from typing import Any, Dict, Tuple, Optional, List
+
+from pygpt_net.core.types import AGENT_TYPE_OPENAI, AGENT_MODE_OPENAI
+from pygpt_net.item.ctx import CtxItem
+from pygpt_net.item.model import ModelItem
+from pygpt_net.item.preset import PresetItem
+
+from pygpt_net.core.agents.bridge import ConnectionContext
+from pygpt_net.core.bridge import BridgeContext
+
+from agents import TResponseInputItem
+
+from ..base import BaseAgent
+
+from pygpt_net.core.agents.custom.logging import NullLogger, StdLogger
+from pygpt_net.core.agents.custom.runner import FlowOrchestrator
+from pygpt_net.core.agents.custom.utils import make_option_getter
+
+
+class Agent(BaseAgent):
+    def __init__(self, *args, **kwargs):
+        super(Agent, self).__init__(*args, **kwargs)
+        self.id = "openai_custom"
+        self.type = AGENT_TYPE_OPENAI
+        self.mode = AGENT_MODE_OPENAI
+        self.name = "Custom"
+
+    async def run(
+        self,
+        window: Any = None,
+        agent_kwargs: Dict[str, Any] = None,
+        previous_response_id: str = None,
+        messages: List[TResponseInputItem] = None,
+        ctx: CtxItem = None,
+        stream: bool = False,
+        bridge: ConnectionContext = None,
+        use_partial_ctx: Optional[bool] = False,
+        schema: Optional[list] = None,
+    ) -> Tuple[CtxItem, str, str]:
+        agent_kwargs = agent_kwargs or {}
+        messages = messages or []
+
+        context: BridgeContext = agent_kwargs.get("context", BridgeContext())
+        preset: Optional[PresetItem] = context.preset
+        model: ModelItem = agent_kwargs.get("model", ModelItem())
+        function_tools: list = agent_kwargs.get("function_tools", [])
+
+        base_prompt = self.get_option(preset, "base", "prompt")
+        allow_local_tools_default = bool(self.get_option(preset, "base", "allow_local_tools"))
+        allow_remote_tools_default = bool(self.get_option(preset, "base", "allow_remote_tools"))
+        max_iterations = int(self.get_option(preset, "base", "max_iterations") or agent_kwargs.get("max_iterations", 20))
+        trace_id = self.get_option(preset, "debug", "trace_id") or agent_kwargs.get("trace_id", None)
+        router_stream_mode = self.get_option(preset, "router", "stream_mode") or agent_kwargs.get("router_stream_mode", "realtime")
+        verbose = bool(agent_kwargs.get("verbose", False))
+        logger = StdLogger(prefix="[flow]") if verbose else NullLogger()
+        option_get = make_option_getter(self, preset)
+
+        orchestrator = FlowOrchestrator(window=window, logger=logger)
+        logger.debug(f"[schema] {schema}")
+
+        result = await orchestrator.run_flow(
+            schema=schema or [],
+            messages=messages,
+            ctx=ctx,
+            bridge=bridge,
+            agent_kwargs=agent_kwargs,
+            preset=preset,
+            model=model,
+            stream=stream,
+            use_partial_ctx=use_partial_ctx or False,
+            base_prompt=base_prompt,
+            allow_local_tools_default=allow_local_tools_default,
+            allow_remote_tools_default=allow_remote_tools_default,
+            function_tools=function_tools,
+            trace_id=trace_id,
+            max_iterations=max_iterations,
+            router_stream_mode=str(router_stream_mode).lower(),
+            option_get=option_get,
+        )
+
+        final_output = result.final_output or ""
+        last_response_id = result.last_response_id or ""
+
+        return result.ctx, final_output, last_response_id

pygpt_net/provider/core/agent/json_file.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.19 00:00:00                  #
+# Updated Date: 2025.09.24 00:00:00                  #
 # ================================================== #
 
 import json
@@ -60,7 +60,10 @@ class JsonFileProvider(BaseProvider):
         try:
             if os.path.exists(path):
                 with open(path, 'r', encoding="utf-8") as file:
-                    data = json.load(file)
+                    try:
+                        data = json.load(file)
+                    except json.JSONDecodeError:
+                        data = {}
                     if data == "" or data is None:
                         return {}
                     if "layout" in data:
@@ -143,6 +146,7 @@ class JsonFileProvider(BaseProvider):
             'id': item.id,
             'name': item.name,
             'layout': item.layout,
+            'schema': item.schema,
         }
 
     @staticmethod
@@ -159,6 +163,8 @@ class JsonFileProvider(BaseProvider):
             item.name = data['name']
         if "layout" in data:
             item.layout = data['layout']
+        if "schema" in data:
+            item.schema = data['schema']
 
     @staticmethod
     def serialize_layout(item: BuilderLayoutItem) -> Dict[str, Any]:
@@ -169,9 +175,9 @@ class JsonFileProvider(BaseProvider):
         :return: serialized item
         """
         return {
-            'id': item.id,
-            'name': item.name,
-            'data': item.data,
+            'id': item.id if item else "",
+            'name': item.name if item else "",
+            'data': item.data if item else {},
         }
 
     @staticmethod

pygpt_net/provider/core/config/patch.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.22 19:00:00                  #
+# Updated Date: 2025.09.26 03:00:00                  #
 # ================================================== #
 
 import copy
@@ -151,6 +151,15 @@ class Patch:
                     data["ctx.urls.internal"] = False
                 updated = True
 
+            # < 2.6.61
+            if old < parse_version("2.6.61"):
+                print("Migrating config from < 2.6.61...")
+                if "presets.drag_and_drop.enabled" not in data:
+                    data["presets.drag_and_drop.enabled"] = True
+                if "presets_order" not in data:
+                    data["presets_order"] = {}
+                updated = True
+
         # update file
         migrated = False
         if updated:

pygpt_net/provider/core/config/patches/patch_before_2_6_42.py

@@ -367,8 +367,6 @@ class Patch:
             # < 2.0.72
             if old < parse_version("2.0.72"):
                 print("Migrating config from < 2.0.72...")
-                if 'theme.markdown' not in data:
-                    data['theme.markdown'] = True
                 prompt = 'IMAGE GENERATION: Whenever I provide a basic idea or concept for an image, such as \'a picture of ' \
                          'mountains\', I want you to ALWAYS translate it into English and expand and elaborate on this idea. ' \
                          'Use your  knowledge and creativity to add details that would make the image more vivid and ' \
@@ -1301,8 +1299,6 @@ class Patch:
                     data["render.code_syntax"] = "github-dark"
                 if 'zoom' not in data:
                     data["zoom"] = 1.0
-                if 'ctx.convert_lists' not in data:
-                    data["ctx.convert_lists"] = False
                 if 'render.engine' not in data:
                     data["render.engine"] = "web"
                 if 'render.open_gl' not in data:
@@ -1668,8 +1664,6 @@ class Patch:
             # < 2.4.19
             if old < parse_version("2.4.19"):
                 print("Migrating config from < 2.4.19...")
-                if 'layout.animation.disable' not in data:
-                    data["layout.animation.disable"] = cfg_get_base('layout.animation.disable')
                 if 'cmd_code_interpreter' in data['plugins'] \
                         and 'cmd.ipython_execute' in data['plugins']['cmd_code_interpreter']:
                     # remove

pygpt_net/tools/agent_builder/tool.py

@@ -6,9 +6,10 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.19 00:00:00                  #
+# Updated Date: 2025.09.25 14:00:00                  #
 # ================================================== #
 
+import copy
 from datetime import datetime
 from typing import Dict
 
@@ -18,21 +19,26 @@ from PySide6.QtGui import QAction, QIcon
 from pygpt_net.tools.base import BaseTool
 from pygpt_net.utils import trans
 
+from pygpt_net.core.node_editor.types import (
+    NodeTypeRegistry,
+    PropertySpec,
+    NodeTypeSpec
+)
+
 from .ui.dialogs import Builder
 
+
 class AgentBuilder(BaseTool):
     def __init__(self, *args, **kwargs):
-        """
-        Agent builder (nodes editor)
-
-        :param window: Window instance
-        """
         super(AgentBuilder, self).__init__(*args, **kwargs)
         self.id = "agent_builder"
         self.opened = False
         self.dialog = None  # dialog
         self.initialized = False
         self.current_agent = None  # current agent ID
+        # Reentrancy/teardown guards
+        self._restoring = False    # True while restore/load is in progress
+        self._closing = False      # True while dialog is being closed
 
     def setup(self):
         """Setup controller"""
@@ -42,17 +48,41 @@ class AgentBuilder(BaseTool):
         """Update"""
         pass
 
-    def save(self):
+    def save(self, force: bool = False):
         """Save layout to file"""
+        # Never save during restore or teardown
+        if not self.opened or self._closing or self._restoring:
+            if not force:
+                return
         if "agent.builder" not in self.window.ui.editor:
             return
+
+        builder = self.window.ui.editor["agent.builder"]
+        # Ensure the editor is alive (not closing)
+        if not getattr(builder, "_alive", True) or getattr(builder, "_closing", False):
+            return
+
+        data = builder.save_layout()
+        if not isinstance(data, dict):
+            return  # skip invalid snapshots
+
+        schema_list = builder.export_schema(as_list=True)
+        try:
+            # Deep copy for safety (JSON-only types expected)
+            layout = copy.deepcopy(data)
+            schema = copy.deepcopy(schema_list)
+        except Exception:
+            # As a fallback, store raw references (still pure dict/list)
+            layout = data
+            schema = schema_list
+
         custom = self.window.core.agents.custom
-        layout = self.window.ui.editor["agent.builder"].save_layout()
         custom.update_layout(layout)
         if self.current_agent:
-            custom.update_agent_layout(self.current_agent, layout)
+            custom.update_agent(self.current_agent, layout, schema)
         custom.save()
         self.window.update_status(f"Saved at: {datetime.now().strftime('%H:%M:%S')}")
+        self.update_presets()
 
     def load(self):
         """Load layout from file"""
@@ -60,11 +90,10 @@ class AgentBuilder(BaseTool):
 
     def open(self):
         """Open dialog"""
-        if not self.initialized:
-            self.dialog = Builder(self.window, tool=self)
-            self.dialog.setup()
-            self.restore()
-            self.initialized = True
+        self.dialog = Builder(self.window, tool=self)
+        self.dialog.setup()
+        # Defer restore to allow previous deleteLater() to be processed
+        QtCore.QTimer.singleShot(0, self.restore)
         self.window.ui.dialogs.open('agent.builder', width=900, height=600)
         self.opened = True
         self.update()
@@ -81,26 +110,33 @@ class AgentBuilder(BaseTool):
         else:
             self.open()
 
-    def store_current(self):
+    def store_current(self, force: bool = False):
         """Store current to file"""
-        self.save()
+        if self.opened and not self._restoring and (not self._closing or force):
+            self.save(force=force)
 
     def restore(self):
         """Restore layout and agents from file"""
-        layout = self.window.core.agents.custom.get_layout()
-        if layout:
-            data = layout.data
-            if data:
-                self.window.ui.editor["agent.builder"].load_layout(data)
-                self.window.update_status(f"Loaded layout at: {datetime.now().strftime('%H:%M:%S')}")
+        if self._closing:
+            return
+        self._restoring = True
+        try:
+            layout = self.window.core.agents.custom.get_layout()
+            if layout and "agent.builder" in self.window.ui.editor:
+                data = layout.data
+                if data:
+                    self.window.ui.editor["agent.builder"].load_layout(data)
+                    self.window.update_status(f"Loaded layout at: {datetime.now().strftime('%H:%M:%S')}")
 
-        self.update_list()
+            self.update_list()
 
-        # select first agent on list
-        agents = self.window.core.agents.custom.get_agents()
-        if agents and len(agents) > 0:
-            first_agent_id = list(agents.keys())[0]
-            self.edit_agent(first_agent_id)
+            # select first agent on list
+            agents = self.window.core.agents.custom.get_agents()
+            if agents and len(agents) > 0:
+                first_agent_id = list(agents.keys())[0]
+                self.edit_agent(first_agent_id)
+        finally:
+            self._restoring = False
 
     def show_hide(self, show: bool = True):
         """
@@ -114,13 +150,18 @@ class AgentBuilder(BaseTool):
             self.close()
 
     def on_close(self):
-        """On window close"""
-        self.opened = False
-        self.update()
+        """On dialog window close (before destroy)"""
+        self._closing = True
+        try:
+            self.store_current(force=True)
+        finally:
+            self.opened = False
+            self._closing = False
 
     def on_exit(self):
-        """On exit"""
-        self.store_current()
+        """On app exit"""
+        if self.opened:
+            self.on_close()
 
     def clear(self, force: bool = False):
         """
@@ -135,24 +176,33 @@ class AgentBuilder(BaseTool):
                 msg=trans('agent.builder.confirm.clear.msg'),
             )
             return
-        if self.window.ui.editor["agent.builder"].clear(ask_user=False):
-            self.save()
+        if "agent.builder" in self.window.ui.editor:
+            if self.window.ui.editor["agent.builder"].clear(ask_user=False):
+                self.save()
 
     def add_agent(self, name: str = None):
         """Add new agent"""
         if name is None:
-            self.window.ui.dialog['create'].id = 'agent.builder.agent'
-            self.window.ui.dialog['create'].input.setText("")
-            self.window.ui.dialog['create'].current = ""
-            self.window.ui.dialog['create'].show()
-            self.window.ui.dialog['create'].input.setFocus()
+            dialog = self.window.ui.dialog['create']
+            dialog.id = 'agent.builder.agent'
+            dialog.input.setText("")
+            dialog.current = ""
+            dialog.show()
+            dialog.input.setFocus()
             return
+
+        if self.current_agent:
+            self.save()  # save current before creating new
+
+        self.current_agent = None # prevent overwriting current agent
         uuid = self.window.core.agents.custom.new_agent(name)
         if uuid:
             self.update_list()
-            self.window.ui.editor["agent.builder"].clear(ask_user=False)
+            if "agent.builder" in self.window.ui.editor:
+                self.window.ui.editor["agent.builder"].clear(ask_user=False)
             self.window.ui.dialogs.close('create')
             self.edit_agent(uuid)
+            self.update_presets()
 
     def rename_agent(self, agent_id: str, name: str = None):
         """
@@ -167,17 +217,19 @@ class AgentBuilder(BaseTool):
             return
         current_name = agent.name
         if name is None:
-            self.window.ui.dialog['rename'].id = 'agent.builder.agent'
-            self.window.ui.dialog['rename'].input.setText(current_name)
-            self.window.ui.dialog['rename'].current =agent_id
-            self.window.ui.dialog['rename'].show()
-            self.window.ui.dialog['rename'].input.setFocus()
+            dialog = self.window.ui.dialog['rename']
+            dialog.id = 'agent.builder.agent'
+            dialog.input.setText(current_name)
+            dialog.current =agent_id
+            dialog.show()
+            dialog.input.setFocus()
             return
         if agent:
             agent.name = name
             self.window.core.agents.custom.save()
             self.update_list()
             self.window.ui.dialogs.close('rename')
+            self.update_presets()
 
     def edit_agent(self, agent_id: str):
         """
@@ -185,16 +237,36 @@ class AgentBuilder(BaseTool):
 
         :param agent_id: agent ID
         """
-        self.save()
+        # Save current agent only when switching and UI is stable
+        if (
+            self.current_agent
+            and self.current_agent != agent_id
+            and self.opened
+            and not self._restoring
+            and not self._closing
+            and "agent.builder" in self.window.ui.editor
+        ):
+            builder = self.window.ui.editor["agent.builder"]
+            if getattr(builder, "_alive", True) and not getattr(builder, "_closing", False):
+                self.save()
+
         self.current_agent = agent_id
+
+        if "agent.builder" not in self.window.ui.editor:
+            return
+
         agent = self.window.core.agents.custom.get_agent(agent_id)
         if agent:
+            editor = self.window.ui.editor["agent.builder"]
             layout = agent.layout
             if layout:
-                self.window.ui.editor["agent.builder"].load_layout(layout)
+                editor.load_layout(layout)
             else:
-                self.window.ui.editor["agent.builder"].clear(ask_user=False)
-            self.select_on_list(agent_id)
+                editor.clear(ask_user=False)
+
+            # Select on list only when the list exists (dialog open)
+            if "agent.builder.list" in self.window.ui.nodes:
+                self.select_on_list(agent_id)
 
     def duplicate_agent(self, agent_id: str):
         """
@@ -224,12 +296,39 @@ class AgentBuilder(BaseTool):
             return
         self.window.core.agents.custom.delete_agent(agent_id)
         self.update_list()
+
+        # if deleted current, clear editor
         if self.current_agent == agent_id:
             self.current_agent = None
-            self.window.ui.editor["agent.builder"].clear(ask_user=False)
+            if "agent.builder" in self.window.ui.editor:
+                self.window.ui.editor["agent.builder"].clear(ask_user=False)
+
+            # select current selected on list if any after deletion (only if UI is open)
+            if self.opened and "agent.builder.list" in self.window.ui.nodes:
+                agents = self.window.core.agents.custom.get_agents()
+                if agents and len(agents) > 0:
+                    idx = self.window.ui.nodes["agent.builder.list"].list.currentIndex()
+                    if idx.isValid():
+                        next_id = idx.data(QtCore.Qt.UserRole)
+                        self.edit_agent(next_id)
+
+    def editing_allowed(self) -> bool:
+        """
+        Check if editing is enabled (dialog is open and not closing/restoring)
+
+        :return: True if editing is enabled
+        """
+        return self.opened and not self._closing and not self._restoring and self.current_agent is not None
+
+    def update_presets(self):
+        """Update presets in the tools"""
+        self.window.controller.presets.editor.reload_all(all=True)
 
     def update_list(self):
         """Update agents list"""
+        # Guard: dialog may not be open; do nothing if widget is not present
+        if "agent.builder.list" not in self.window.ui.nodes:
+            return
         data = self.window.core.agents.custom.get_agents()
         self.window.ui.nodes["agent.builder.list"].update_list(data)
 
@@ -239,13 +338,16 @@ class AgentBuilder(BaseTool):
 
         :param agent_id: agent ID
         """
+        if "agent.builder.list" not in self.window.ui.nodes:
+            return
+
         nodes = self.window.ui.nodes
         models = self.window.ui.models
 
         agents_list = nodes["agent.builder.list"].list
         model = models.get("agent.builder.list")
 
-        if model is None:
+        if model is None or agents_list is None:
             return
         for row in range(model.rowCount()):
             idx = model.index(row, 0)
@@ -279,6 +381,85 @@ class AgentBuilder(BaseTool):
         """Setup dialogs (static)"""
         pass
 
+    def get_registry(self) -> NodeTypeRegistry:
+        """
+        Get node type registry
+
+        :return: NodeTypeRegistry
+        """
+        registry = NodeTypeRegistry(empty=True)
+
+        # Start
+        registry.register(NodeTypeSpec(
+            type_name="Flow/Start",
+            title=trans("node.editor.spec.start.title"),
+            base_id="start",
+            export_kind="start",
+            bg_color="#2D5A27",
+            properties=[
+                PropertySpec(id="output", type="flow", name=trans("node.editor.property.output.name"), editable=False,
+                             allowed_inputs=0, allowed_outputs=1),
+                PropertySpec(id="memory", type="memory", name=trans("node.editor.property.memory.name"), editable=False,
+                             allowed_inputs=0, allowed_outputs=-1),
+            ],
+        ))
+        # Agent
+        registry.register(NodeTypeSpec(
+            type_name="Flow/Agent",
+            title=trans("node.editor.spec.agent.title"),
+            base_id="agent",
+            export_kind="agent",
+            bg_color="#304A6E",
+            properties=[
+                PropertySpec(id="name", type="str", name=trans("node.editor.property.name.name"), editable=True,
+                             value="",
+                             placeholder=trans("node.editor.property.name.placeholder")),
+                PropertySpec(id="role", type="str", name=trans("node.editor.property.role.name"), editable=True,
+                             value="",
+                             placeholder=trans("node.editor.property.role.placeholder")),
+                PropertySpec(id="instruction", type="text", name=trans("node.editor.property.instruction.name"),
+                             editable=True, value="",
+                             placeholder=trans("node.editor.property.instruction.placeholder")),
+                PropertySpec(id="remote_tools", type="bool", name=trans("node.editor.property.remote_tools.name"),
+                             editable=True, value=True),
+                PropertySpec(id="local_tools", type="bool", name=trans("node.editor.property.local_tools.name"),
+                             editable=True, value=True),
+                PropertySpec(id="input", type="flow", name=trans("node.editor.property.input.name"), editable=False,
+                             allowed_inputs=-1, allowed_outputs=0),
+                PropertySpec(id="output", type="flow", name=trans("node.editor.property.output.name"), editable=False,
+                             allowed_inputs=0, allowed_outputs=-1),
+                PropertySpec(id="memory", type="memory", name=trans("node.editor.property.memory.name"), editable=False,
+                             allowed_inputs=0, allowed_outputs=1),
+            ],
+        ))
+        # Memory
+        registry.register(NodeTypeSpec(
+            type_name="Flow/Memory",
+            title=trans("node.editor.spec.memory.title"),
+            base_id="mem",
+            export_kind="memory",
+            bg_color="#593E78",
+            properties=[
+                PropertySpec(id="name", type="str", name=trans("node.editor.property.name.name"), editable=True,
+                             value=""),
+                PropertySpec(id="input", type="memory", name=trans("node.editor.property.agent.name"), editable=False,
+                             allowed_inputs=-1, allowed_outputs=0),
+            ],
+        ))
+        # End
+        registry.register(NodeTypeSpec(
+            type_name="Flow/End",
+            title=trans("node.editor.spec.end.title"),
+            base_id="end",
+            export_kind="end",
+            bg_color="#6B2E2E",
+            properties=[
+                PropertySpec(id="input", type="flow", name=trans("node.editor.property.input.name"), editable=False,
+                             allowed_inputs=-1, allowed_outputs=0),
+            ],
+        ))
+        return registry
+
     def get_lang_mappings(self) -> Dict[str, Dict]:
         """
         Get language mappings