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

pygpt_net/provider/agents/llama_index/flow_from_schema.py

@@ -0,0 +1,92 @@
+#!/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, Optional, List, Tuple
+
+from pygpt_net.core.agents.custom.logging import StdLogger, NullLogger
+from pygpt_net.core.types import AGENT_MODE_WORKFLOW, AGENT_TYPE_LLAMA
+from pygpt_net.item.model import ModelItem
+from pygpt_net.item.preset import PresetItem
+from pygpt_net.core.bridge import BridgeContext
+
+from agents import TResponseInputItem
+
+from ..base import BaseAgent
+from pygpt_net.core.agents.custom.llama_index.runner import DynamicFlowWorkflowLI
+from pygpt_net.core.agents.custom.llama_index.utils import make_option_getter
+
+
+class Agent(BaseAgent):
+    """
+    Dynamic Flow (LlamaIndex 0.13) – provider that returns a workflow-like object
+    compatible with predefined LlamaWorkflow runner (run() -> handler.stream_events()).
+    """
+    def __init__(self, *args, **kwargs):
+        super(Agent, self).__init__(*args, **kwargs)
+        self.id = "llama_custom"
+        self.type = AGENT_TYPE_LLAMA
+        self.mode = AGENT_MODE_WORKFLOW
+        self.name = "Custom"
+
+    def get_agent(self, window, kwargs: Dict[str, Any]):
+        """
+        Build and return DynamicFlowWorkflowLI.
+        Expected kwargs from your app:
+          - schema: List[dict]
+          - llm: LlamaIndex LLM (base) – użyty gdy brak per-node modelu
+          - tools: List[BaseTool] (LI)
+          - messages: Optional[List[TResponseInputItem]] – initial, dla pierwszego agenta
+          - context: BridgeContext (preset do get_option)
+          - router_stream_mode / max_iterations / stream / logger / model (default ModelItem)
+        """
+        schema: List[Dict[str, Any]] = kwargs.get("schema") or []
+        llm = kwargs.get("llm")
+        tools = kwargs.get("tools", []) or []
+        initial_messages: Optional[List[TResponseInputItem]] = kwargs.get("chat_history")
+        verbose = bool(kwargs.get("verbose", False))
+
+        context: BridgeContext = kwargs.get("context", BridgeContext())
+        preset: Optional[PresetItem] = context.preset
+        default_model: ModelItem = kwargs.get("model", ModelItem())
+
+        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 kwargs.get("max_iterations", 20))
+        router_stream_mode = self.get_option(preset, "router", "stream_mode") or kwargs.get("router_stream_mode", "realtime")
+
+        option_get = make_option_getter(self, preset)
+        stream = bool(kwargs.get("stream", False))
+        logger = StdLogger(prefix="[flow]") if verbose else NullLogger()
+
+        return DynamicFlowWorkflowLI(
+            window=window,
+            logger=logger,
+            schema=schema,
+            initial_messages=initial_messages,
+            preset=preset,
+            default_model=default_model,
+            option_get=option_get,
+            router_stream_mode=str(router_stream_mode).lower(),
+            allow_local_tools_default=allow_local_tools_default,
+            allow_remote_tools_default=allow_remote_tools_default,
+            max_iterations=max_iterations,
+            llm=llm,
+            tools=tools,
+            stream=stream,
+            base_prompt=base_prompt,
+            timeout=120,
+            verbose=True,
+        )
+
+    async def run(self, *args, **kwargs) -> Tuple[Any, str, str]:
+        raise NotImplementedError("Use get_agent() and run it via LlamaWorkflow runner.")

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/llms/openai.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.15 01:00:00                  #
+# Updated Date: 2025.09.22 08:00:00                  #
 # ================================================== #
 
 from typing import Optional, List, Dict
@@ -89,8 +89,8 @@ class OpenAILLM(BaseLLM):
         :param stream: stream mode
         :return: LLM provider instance
         """
-        from .llama_index.openai import OpenAI as LlamaOpenAI
-        from .llama_index.openai import OpenAIResponses as LlamaOpenAIResponses
+        from llama_index.llms.openai import OpenAI as LlamaOpenAI
+        from llama_index.llms.openai import OpenAIResponses as LlamaOpenAIResponses
         args = self.parse_args(model.llama_index, window)
         if "api_key" not in args:
             args["api_key"] = window.core.config.get("api_key", "")
@@ -98,7 +98,9 @@ class OpenAILLM(BaseLLM):
             args["model"] = model.id
 
         args = self.inject_llamaindex_http_clients(args, window.core.config)
-        if window.core.config.get('api_use_responses_llama', False):
+        mode = window.core.config.get("mode")
+        # dont' use Responses in agent modes
+        if window.core.config.get('api_use_responses_llama', False) and mode == MODE_LLAMA_INDEX:
             tools = []
             tools = window.core.api.openai.remote_tools.append_to_tools(
                 mode=MODE_LLAMA_INDEX,