pygpt-net 2.6.0.post1__py3-none-any.whl → 2.6.1__py3-none-any.whl

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,7 @@
+2.6.1 (2025-08-14)
+
+- LlamaIndex Agents refactored to Workflows.
+
 2.6.0 (2025-08-13)
 
 - Added split responses to the OpenAI Agents in non-streaming mode.

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.08.13 00:00:00                  #
+# Updated Date: 2025.08.14 00:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.6.0"
-__build__ = "2025-08-13"
+__version__ = "2.6.1"
+__build__ = "2025-08-14"
 __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

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.09 01:00:00                  #
+# Updated Date: 2025.08.14 01:00:00                  #
 # ================================================== #
 
 import os
@@ -72,12 +72,14 @@ from pygpt_net.plugin.agent import Plugin as AgentPlugin
 from pygpt_net.plugin.mailer import Plugin as MailerPlugin
 
 # agents (Llama-index)
-from pygpt_net.provider.agents.llama_index.openai import OpenAIAgent
-from pygpt_net.provider.agents.llama_index.openai_assistant import OpenAIAssistantAgent
-from pygpt_net.provider.agents.llama_index.planner import PlannerAgent
-from pygpt_net.provider.agents.llama_index.react import ReactAgent
+# 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.code_act import CodeActAgent
+from pygpt_net.provider.agents.llama_index.codeact_workflow import CodeActAgent
 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
@@ -420,10 +422,12 @@ def run(**kwargs):
             launcher.add_vector_store(store)
 
     # register base agents
-    launcher.add_agent(OpenAIAgent())  # llama-index
+    # launcher.add_agent(OpenAIAgent())  # llama-index
+    launcher.add_agent(OpenAIWorkflowAgent())  # llama-index
     launcher.add_agent(OpenAIAssistantAgent())  # llama-index
-    launcher.add_agent(PlannerAgent())  # llama-index
-    launcher.add_agent(ReactAgent())  # llama-index
+    # launcher.add_agent(PlannerAgent())  # llama-index
+    launcher.add_agent(PlannerWorkflowAgent())  # llama-index
+    # launcher.add_agent(ReactAgent())  # llama-index
     launcher.add_agent(ReactWorkflowAgent())  # llama-index
     launcher.add_agent(CodeActAgent())  # llama-index
     launcher.add_agent(OpenAIAgentsBase())  # openai-agents

pygpt_net/controller/chat/response.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.11 19:00:00                  #
+# Updated Date: 2025.08.14 01:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any
@@ -164,6 +164,7 @@ class Response:
         :param context: BridgeContext
         :param extra: Extra data
         """
+        global_mode = self.window.core.config.get('mode', MODE_AGENT_LLAMA)
         ctx = context.ctx
         if self.window.controller.kernel.stopped():
             output = ctx.output
@@ -266,6 +267,9 @@ class Response:
         self.window.dispatch(event)
 
         # if continue reasoning
+        if global_mode not in [MODE_AGENT_LLAMA, MODE_AGENT_OPENAI]:
+            return  # no agent mode, nothing to do
+
         if ctx.extra is None or (type(ctx.extra) == dict and "agent_finish" not in ctx.extra):
             self.window.update_status(trans("status.agent.reasoning"))
             self.window.controller.chat.common.lock_input()  # lock input, re-enable stop button

pygpt_net/controller/model/editor.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.07.19 17:00:00                  #
+# Updated Date: 2025.08.14 01:00:00                  #
 # ================================================== #
 
 import copy
+import json
 from typing import Optional, Any
 
 from pygpt_net.core.events import Event
@@ -107,7 +108,14 @@ class Editor:
                 "description": "model.llama_index.env.desc",
                 "advanced": True,
             },
+            "extra_json": {
+                "type": "textarea",
+                "label": "model.extra",
+                "description": "model.extra.desc",
+                "advanced": True,
+            },
         }
+        self.custom_fields = ["extra_json"]
 
     def get_options(self):
         """
@@ -220,8 +228,12 @@ class Editor:
             model = self.window.core.models.items[self.current]
             data_dict = model.to_dict()
             for key in options:
-                value = data_dict[key]
-                options[key]["value"] = value
+                if key in data_dict:
+                    value = data_dict[key]
+                    options[key]["value"] = value
+
+            # custom fields
+            options["extra_json"]["value"] = json.dumps(model.extra, indent=4) if model.extra else ""
 
         if self.current is not None and self.current in self.window.core.models.items:
             self.set_tab_by_id(self.current)
@@ -229,15 +241,24 @@ class Editor:
         # load and apply options to config dialog
         self.window.controller.config.load_options("model", options)
 
-    def save(self, persist: bool = True):
+    def save(
+            self,
+            persist: bool = True,
+            force: bool = False
+    ):
         """
         Save models editor
 
         :param persist: persist to file and close dialog
+        :param force: force save without validation
         """
         options = copy.deepcopy(self.get_options())  # copy options
         data_dict = {}
+
+        # base fields
         for key in options:
+            if key in self.custom_fields:
+                continue
             value = self.window.controller.config.get_value(
                 parent_id="model",
                 key=key,
@@ -245,6 +266,26 @@ class Editor:
             )
             data_dict[key] = value
 
+        # custom fields
+        if "extra_json" in options:
+            extra_json = self.window.controller.config.get_value(
+                parent_id="model",
+                key="extra_json",
+                option=options["extra_json"],
+            )
+            try:
+                if extra_json:
+                    decoded = json.loads(extra_json)
+                    data_dict["extra"] = decoded
+                else:
+                    data_dict["extra"] = {}
+            except json.JSONDecodeError as error:
+                self.window.ui.dialogs.alert(
+                    "JSON decoding error in 'extra' field. Please check the syntax:\n\n{}".format(error)
+                )
+                if not force:
+                    return # if JSON is invalid, do not save
+
         # update current model
         if self.current in self.window.core.models.items:
             self.window.core.models.items[self.current].from_dict(data_dict)

pygpt_net/controller/presets/editor.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.09 19:00:00                  #
+# Updated Date: 2025.08.14 03:00:00                  #
 # ================================================== #
 
 import datetime
@@ -172,12 +172,22 @@ class Editor:
                 "label": "preset.agent_provider",
                 "description": "preset.agent_provider.desc",
                 "use": "agent_provider_llama",
+                "extra": {
+                    "urls": {
+                        "Help": "https://pygpt.readthedocs.io/en/latest/modes.html#agent-llamaindex"
+                    },
+                }
             },
             "agent_provider_openai": {
                 "type": "combo",
                 "label": "preset.agent_provider",
                 "description": "preset.agent_provider.desc",
                 "use": "agent_provider_openai",
+                "extra": {
+                    "urls": {
+                        "Help": "https://pygpt.readthedocs.io/en/latest/modes.html#agent-openai"
+                    },
+                }
             },
             "assistant_id": {
                 "type": "text",
@@ -255,6 +265,7 @@ class Editor:
 
         # add hooks for config update in real-time
         self.window.ui.add_hook("update.preset.prompt", self.hook_update)
+        self.window.ui.add_hook("update.preset.agent_provider", self.hook_update)
         self.window.ui.add_hook("update.preset.agent_provider_openai", self.hook_update)
 
         # register functions dictionary
@@ -275,7 +286,7 @@ class Editor:
         if not self.tab_options_idx:
             return
         mode = self.window.core.config.get('mode')
-        if mode != MODE_AGENT_OPENAI:
+        if mode not in [MODE_AGENT_OPENAI, MODE_AGENT_LLAMA]:
             # show base prompt
             self.window.ui.tabs['preset.editor.extra'].setTabVisible(0, True)
             # hide all tabs
@@ -303,12 +314,21 @@ class Editor:
             # show base prompt
             self.window.ui.tabs['preset.editor.extra'].setTabVisible(0, True)
             return
+
         mode = self.window.core.config.get('mode')
-        if mode == MODE_AGENT_OPENAI:
+        key_agent = ""
+
+        if mode in [MODE_AGENT_OPENAI, MODE_AGENT_LLAMA]:
+            # get current provider
+            if mode == MODE_AGENT_LLAMA:
+                key_agent = "agent_provider"
+            elif mode == MODE_AGENT_OPENAI:
+                key_agent = "agent_provider_openai"
+
             current_provider = self.window.controller.config.get_value(
                 parent_id=self.id,
-                key="agent_provider_openai",
-                option=self.options["agent_provider_openai"],
+                key=key_agent,
+                option=self.options[key_agent],
             )
             if current_provider is None or current_provider == "":
                 # show base prompt
@@ -344,22 +364,38 @@ class Editor:
 
         :param preset: preset item
         """
-        if preset.agent_provider_openai is None or preset.agent_provider_openai == "":
+        mode = self.window.core.config.get('mode')
+        id = None
+        if mode == MODE_AGENT_OPENAI:
+            if preset.agent_provider_openai is None or preset.agent_provider_openai == "":
+                return
+            id = preset.agent_provider_openai
+        elif mode == MODE_AGENT_LLAMA:
+            if preset.agent_provider is None or preset.agent_provider == "":
+                return
+            id = preset.agent_provider
+        else:
             return
 
         # update options in UI
-        id = preset.agent_provider_openai
         agent = self.window.core.agents.provider.get(id)
         if not agent:
             return
         if not preset.extra or id not in preset.extra:
             return
+
         data_dict = preset.extra[id]
         option_tabs = agent.get_options()
         for option_tab_id in data_dict:
-            option_key = "agent." + preset.agent_provider_openai + "." + option_tab_id
+            parent_key = ""
+            if mode == MODE_AGENT_OPENAI:
+                parent_key = preset.agent_provider_openai
+            elif mode == MODE_AGENT_LLAMA:
+                parent_key = preset.agent_provider
+            option_key = "agent." + parent_key + "." + option_tab_id
             if option_key not in self.window.ui.config:
                 continue
+
             extra_options = option_tabs.get(option_tab_id, {}).get('options', {})
             for key in extra_options:
                 value = data_dict[option_tab_id].get(key, None)
@@ -390,7 +426,7 @@ class Editor:
         if not self.tab_options_idx:
             return
         mode = self.window.core.config.get('mode')
-        if mode != MODE_AGENT_OPENAI:
+        if mode not in [MODE_AGENT_OPENAI, MODE_AGENT_LLAMA]:
             return
 
         # load defaults for all tabs
@@ -427,13 +463,18 @@ class Editor:
             return
 
         mode = self.window.core.config.get('mode')
-        if mode != MODE_AGENT_OPENAI:
+        if mode not in [MODE_AGENT_OPENAI, MODE_AGENT_LLAMA]:
             return
 
         preset = self.window.core.presets.get_by_uuid(self.current)
         if not preset:
             return
-        current_provider_id = preset.agent_provider_openai if preset else None
+
+        current_provider_id = None
+        if mode == MODE_AGENT_OPENAI:
+            current_provider_id = preset.agent_provider_openai if preset else None
+        elif mode == MODE_AGENT_LLAMA:
+            current_provider_id = preset.agent_provider if preset else None
 
         # load defaults for all tabs
         for id in self.tab_options_idx:
@@ -475,10 +516,18 @@ class Editor:
         :param id: preset id
         :param preset: preset item
         """
+        mode = self.window.core.config.get('mode')
         exclude_ids = [
             "__prompt__",
         ]
-        id = preset.agent_provider_openai
+        id = None
+        if mode == MODE_AGENT_OPENAI:
+            id = preset.agent_provider_openai
+        elif mode == MODE_AGENT_LLAMA:
+            id = preset.agent_provider
+        else:
+            return
+
         options = {}
         agent = self.window.core.agents.provider.get(id)
         if not agent:
@@ -568,14 +617,20 @@ class Editor:
         :return: None
         """
         mode = self.window.core.config.get('mode')
-        if mode != MODE_AGENT_OPENAI:
+        if mode not in [MODE_AGENT_OPENAI, MODE_AGENT_LLAMA]:
             return
 
+        parent_key = ""
+        if mode == MODE_AGENT_OPENAI:
+            parent_key = "agent_provider_openai"
+        elif mode == MODE_AGENT_LLAMA:
+            parent_key = "agent_provider"
+
         # get current provider
         current_provider = self.window.controller.config.get_value(
             parent_id=self.id,
-            key="agent_provider_openai",
-            option=self.options["agent_provider_openai"],
+            key=parent_key,
+            option=self.options[parent_key],
         )
         if current_provider is None or current_provider == "":
             return
@@ -624,7 +679,7 @@ class Editor:
                 self.window.controller.presets.from_global()  # update current preset
 
         # show/hide extra options
-        elif key == "agent_provider_openai":
+        elif key in ["agent_provider_openai", "agent_provider"]:
             self.toggle_extra_options_by_provider()
             self.append_default_prompt()
             self.load_extra_defaults_current()

pygpt_net/controller/presets/presets.py

@@ -6,12 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.01 03:00:00                  #
+# Updated Date: 2025.08.14 01:00:00                  #
 # ================================================== #
 
 import re
 from typing import Optional, List, Dict
 
+from PySide6.QtCore import QTimer
 from PySide6.QtGui import QTextCursor
 from PySide6.QtWidgets import QTextEdit
 
@@ -529,7 +530,7 @@ class Presets:
             if preset_id is not None and preset_id != "":
                 if preset_id in self.window.core.presets.items:
                     self.window.core.presets.enable(preset_id)
-                    self.refresh()
+                    QTimer.singleShot(100, self.refresh)  # delay refresh
 
     def disable(self, idx: Optional[int] = None):
         """
@@ -543,7 +544,7 @@ class Presets:
             if preset_id is not None and preset_id != "":
                 if preset_id in self.window.core.presets.items:
                     self.window.core.presets.disable(preset_id)
-                    self.refresh()
+                    QTimer.singleShot(100, self.refresh)  # delay refresh
 
     def clear(self, force: bool = False):
         """

pygpt_net/core/agents/provider.py

@@ -48,7 +48,8 @@ class Provider:
         :param id: agent id
         :return: agent provider
         """
-        return self.agents[id]
+        if id in self.agents:
+            return self.agents[id]
 
     def all(self) -> Dict[str, BaseAgent]:
         """

pygpt_net/core/agents/runner.py

@@ -6,11 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.03 14:00:00                  #
+# Updated Date: 2025.08.14 03:00:00                  #
 # ================================================== #
 
 import asyncio
-from typing import Optional, Dict, Any
+from typing import Optional, Dict, Any, Union
 
 from llama_index.core.base.llms.types import ChatMessage, MessageRole
 
@@ -31,6 +31,8 @@ from .runners.llama_workflow import LlamaWorkflow
 from .runners.openai_workflow import OpenAIWorkflow
 from .runners.helpers import Helpers
 from .runners.loop import Loop
+from ...item.ctx import CtxItem
+
 
 class Runner:
     def __init__(self, window=None):
@@ -50,6 +52,9 @@ class Runner:
         self.llama_steps = LlamaSteps(window)
         self.llama_workflow = LlamaWorkflow(window)
         self.openai_workflow = OpenAIWorkflow(window)
+        self.APPEND_SYSTEM_PROMPT_TO_MSG = [
+            "react",  # llama-index
+        ]
 
     def call(
             self,
@@ -107,12 +112,7 @@ class Runner:
                 tools = []
             
             # append system prompt
-            if agent_id not in [
-                "openai_agent_base",  # openai-agents
-                "openai_agent_experts",  # openai-agents
-                "openai_assistant", # llama-index
-                "code_act", # llama-index
-            ]:
+            if agent_id in self.APPEND_SYSTEM_PROMPT_TO_MSG:
                 if system_prompt:
                     msg = ChatMessage(
                         role=MessageRole.SYSTEM,
@@ -178,6 +178,112 @@ class Runner:
             self.last_error = e
             return False
 
+    def call_once(
+            self,
+            context: BridgeContext,
+            extra: Dict[str, Any],
+            signals: BridgeSignals
+    ) -> Union[CtxItem, bool, None]:
+        """
+        Call an agent once (quick call to the agent)
+
+        :param context: BridgeContext
+        :param extra: extra data
+        :param signals: BridgeSignals
+        :return: CtxItem if success, True if stopped, None on error
+        """
+        if self.window.controller.kernel.stopped():
+            return True  # abort if stopped
+
+        agent_id = extra.get("agent_provider", "openai")
+        verbose = self.window.core.config.get("agent.llama.verbose", False)
+
+        try:
+            # prepare input ctx
+            ctx = context.ctx
+            ctx.extra["agent_input"] = True  # mark as user input
+            ctx.extra["agent_output"] = True  # mark as user input
+            ctx.agent_call = True  # disables reply from plugin commands
+            prompt = context.prompt
+
+            # prepare agent
+            model = context.model
+            vector_store_idx = extra.get("agent_idx", None)
+            system_prompt = context.system_prompt
+            max_steps = self.window.core.config.get("agent.llama.steps", 10)
+            is_cmd = self.window.core.command.is_cmd(inline=False)
+            llm = self.window.core.idx.llm.get(model, stream=False)
+            workdir = self.window.core.config.get_workdir_prefix()
+
+            # tools
+            self.window.core.agents.tools.context = context
+            self.window.core.agents.tools.agent_idx = vector_store_idx
+
+            if "agent_tools" in extra:
+                tools = extra["agent_tools"]  # use tools from extra if provided
+            else:
+                tools = self.window.core.agents.tools.prepare(context, extra, force=True)
+
+            if "agent_history" in extra:
+                history = extra["agent_history"]
+            else:
+                history = self.window.core.agents.memory.prepare(context)
+
+            # disable tools if cmd is not enabled
+            if not is_cmd:
+                tools = []
+
+            # append system prompt
+            if agent_id in self.APPEND_SYSTEM_PROMPT_TO_MSG:
+                if system_prompt:
+                    msg = ChatMessage(
+                        role=MessageRole.SYSTEM,
+                        content=system_prompt,
+                    )
+                    history.insert(0, msg)
+
+            agent_kwargs = {
+                "context": context,
+                "tools": tools,
+                "llm": llm,
+                "model": model,
+                "chat_history": history,
+                "max_iterations": max_steps,
+                "verbose": verbose,
+                "system_prompt": system_prompt,
+                "are_commands": is_cmd,
+                "workdir": workdir,
+                "preset": context.preset if context else None,
+            }
+
+            if self.window.core.agents.provider.has(agent_id):
+                provider = self.window.core.agents.provider.get(agent_id)
+                agent = provider.get_agent(self.window, agent_kwargs)
+                if verbose:
+                    print("Using Agent: " + str(agent_id) + ", model: " + str(model.id))
+            else:
+                raise Exception("Agent not found: " + str(agent_id))
+
+            # run agent and return result
+            mode = provider.get_mode()
+            kwargs = {
+                "agent": agent,
+                "ctx": ctx,
+                "prompt": prompt,
+                "signals": signals,
+                "verbose": verbose,
+                "history": history,
+                "llm": llm,
+            }
+            # TODO: add support for other modes
+            if mode == AGENT_MODE_WORKFLOW:
+                return asyncio.run(self.llama_workflow.run_once(**kwargs))
+
+        except Exception as e:
+            self.window.core.debug.error(e)
+            self.last_error = e
+            return None
+
     def get_error(self) -> Optional[Exception]:
         """
         Get last error

pygpt_net/core/agents/runners/helpers.py

@@ -6,12 +6,12 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.06 01:00:00                  #
+# Updated Date: 2025.08.14 01:00:00                  #
 # ================================================== #
 
 import copy
 import re
-import weakref
+import time
 from typing import Optional, Tuple
 
 from pygpt_net.core.bridge.context import BridgeContext
@@ -82,6 +82,7 @@ class Helpers:
         # ctx.attachments = from_ctx.attachments # copy from parent if appended from plugins
         # ctx.files = from_ctx.files  # copy from parent if appended from plugins
         ctx.extra = from_ctx.extra.copy()  # copy extra data
+        ctx.output_timestamp = int(time.time())  # set output timestamp
         return ctx
 
     def send_stream(