pygpt-net 2.6.0.post2__py3-none-any.whl → 2.6.2__py3-none-any.whl

pygpt_net/provider/agents/base.py

@@ -6,7 +6,7 @@
 # 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 03:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, Tuple
@@ -85,6 +85,9 @@ class BaseAgent:
         :param key: Option key
         :return: Option value
         """
+        if preset is None:
+            print("No preset provided, returning default option value")
+            return None
         extra = preset.extra
         if not isinstance(extra, dict) or self.id not in extra:
             return self.get_default(section, key)

pygpt_net/provider/agents/llama_index/codeact_workflow.py

@@ -0,0 +1,95 @@
+#!/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.08.14 03:00:00                  #
+# ================================================== #
+
+from typing import Dict, Any
+
+from pygpt_net.core.bridge import BridgeContext
+from pygpt_net.core.types import (
+    AGENT_MODE_WORKFLOW,
+    AGENT_TYPE_LLAMA,
+)
+
+from .workflow.codeact import DEFAULT_CODE_ACT_PROMPT
+from ..base import BaseAgent
+
+class CodeActAgent(BaseAgent):
+
+    def __init__(self, *args, **kwargs):
+        super(CodeActAgent, self).__init__(*args, **kwargs)
+        self.id = "code_act"
+        self.type = AGENT_TYPE_LLAMA
+        self.mode = AGENT_MODE_WORKFLOW
+        self.name = "CodeAct"
+
+    def get_agent(self, window, kwargs: Dict[str, Any]):
+        """
+        Return Agent provider instance
+
+        :param window: window instance
+        :param kwargs: keyword arguments
+        :return: Agent provider instance
+        """
+        # from llama_index.core.agent.workflow import CodeActAgent as Agent
+        from .workflow.codeact import CodeActAgent as Agent  # <-- custom version with tools
+
+        context = kwargs.get("context", BridgeContext())
+        tools = kwargs.get("plugin_tools", {})
+        specs = kwargs.get("plugin_specs", [])
+        retriever_tool = kwargs.get("retriever_tools", None)
+        workdir = kwargs.get("workdir", "/data")
+        llm = kwargs.get("llm", None)
+        preset = context.preset
+        system_prompt = self.get_option(preset, "additional", "prompt")
+        code_prompt = self.get_option(preset, "base", "prompt")
+        if not code_prompt:
+            code_prompt = DEFAULT_CODE_ACT_PROMPT  # use default prompt if not set
+        kwargs = {
+            "code_execute_fn": window.core.agents.tools.code_execute_fn.execute,
+            "plugin_tool_fn": window.core.agents.tools.tool_exec,
+            "plugin_tools": tools,
+            "plugin_specs": specs,
+            "tool_retriever": retriever_tool,
+            "llm": llm,
+            "system_prompt": system_prompt,  # additional
+            "code_act_system_prompt": code_prompt.replace("{workdir}", workdir),
+        }
+        return Agent(**kwargs)
+
+    def get_options(self) -> Dict[str, Any]:
+        """
+        Return Agent options
+
+        :return: dict of options
+        """
+        return {
+            "base": {
+                "label": "Base prompt",
+                "options": {
+                    "prompt": {
+                        "type": "textarea",
+                        "label": "Prompt",
+                        "description": "Code execute prompt (initial)",
+                        "default": DEFAULT_CODE_ACT_PROMPT,
+                    },
+                }
+            },
+            "additional": {
+                "label": "Additional prompt",
+                "options": {
+                    "prompt": {
+                        "type": "textarea",
+                        "label": "Prompt",
+                        "description": "Additional prompt for agent (will be added to the base prompt)",
+                        "default": "",
+                    },
+                }
+            },
+        }

pygpt_net/provider/agents/llama_index/{openai.py → legacy/openai.py}

@@ -16,12 +16,12 @@ from pygpt_net.core.types import (
     AGENT_TYPE_LLAMA,
 )
 
-from ..base import BaseAgent
+from ...base import BaseAgent
 
 class OpenAIAgent(BaseAgent):
     def __init__(self, *args, **kwargs):
         super(OpenAIAgent, self).__init__(*args, **kwargs)
-        self.id = "openai"
+        self.id = "openai_legacy"
         self.type = AGENT_TYPE_LLAMA
         self.mode = AGENT_MODE_STEP
         self.name = "OpenAI"

pygpt_net/provider/agents/llama_index/{openai_assistant.py → legacy/openai_assistant.py}

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.12 19:00:00                  #
+# Updated Date: 2025.08.14 13:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any
@@ -17,7 +17,7 @@ from pygpt_net.core.types import (
 )
 from pygpt_net.core.bridge.context import BridgeContext
 
-from ..base import BaseAgent
+from ...base import BaseAgent
 
 
 class OpenAIAssistantAgent(BaseAgent):
@@ -26,7 +26,7 @@ class OpenAIAssistantAgent(BaseAgent):
         self.id = "openai_assistant"
         self.type = AGENT_TYPE_LLAMA
         self.mode = AGENT_MODE_ASSISTANT
-        self.name = "OpenAI Assistant"
+        self.name = "OpenAI Assistant (Legacy)"
 
     def get_agent(self, window, kwargs: Dict[str, Any]):
         """
@@ -39,10 +39,11 @@ class OpenAIAssistantAgent(BaseAgent):
         from llama_index.agent.openai import OpenAIAssistantAgent as Agent
 
         context = kwargs.get("context", BridgeContext())
+        preset = context.preset
         tools = kwargs.get("tools", [])
         verbose = kwargs.get("verbose", False)
         model = context.model
-        system_prompt = context.system_prompt
+        system_prompt = self.get_option(preset, "base", "prompt")
         ctx = context.ctx
         thread_id = None
         assistant_id = None
@@ -61,7 +62,7 @@ class OpenAIAssistantAgent(BaseAgent):
                 thread_id = ctx.meta.thread
 
         # get assistant_id from preset
-        preset_assistant_id = context.assistant_id
+        preset_assistant_id = self.get_option(preset, "base", "assistant_id")
         if (preset_assistant_id is not None
                 and preset_assistant_id != ""):
             assistant_id = preset_assistant_id  # override assistant_id from ctx
@@ -82,3 +83,34 @@ class OpenAIAssistantAgent(BaseAgent):
             kwargs["openai_tools"] = [{"type": "code_interpreter"}, {"type": "file_search"}]
             kwargs["model"] = model.id
             return Agent.from_new(**kwargs)
+
+    def get_options(self) -> Dict[str, Any]:
+        """
+        Return Agent options
+
+        :return: dict of options
+        """
+        return {
+            "base": {
+                "label": "Base prompt",
+                "options": {
+                    "prompt": {
+                        "type": "textarea",
+                        "label": "Prompt",
+                        "description": "Base prompt",
+                        "default": "",
+                    },
+                }
+            },
+            "assistant": {
+                "label": "Assistant config",
+                "options": {
+                    "assistant_id": {
+                        "type": "text",
+                        "label": "Assistant ID",
+                        "description": "OpenAI Assistant ID, asst_abcd1234...",
+                        "default": "",
+                    },
+                }
+            },
+        }

pygpt_net/provider/agents/llama_index/{planner.py → legacy/planner.py}

@@ -16,15 +16,15 @@ from pygpt_net.core.types import (
     AGENT_TYPE_LLAMA,
 )
 
-from ..base import BaseAgent
+from ...base import BaseAgent
 
 class PlannerAgent(BaseAgent):
     def __init__(self, *args, **kwargs):
         super(PlannerAgent, self).__init__(*args, **kwargs)
-        self.id = "planner"
+        self.id = "planner_legacy"
         self.type = AGENT_TYPE_LLAMA
         self.mode = AGENT_MODE_PLAN
-        self.name = "Planner (sub-tasks)"
+        self.name = "Planner (Legacy)"
 
     def get_agent(self, window, kwargs: Dict[str, Any]):
         """

pygpt_net/provider/agents/llama_index/{react.py → legacy/react.py}

@@ -19,15 +19,15 @@ from pygpt_net.core.types import (
     AGENT_MODE_STEP,
 )
 
-from ..base import BaseAgent
+from ...base import BaseAgent
 
 class ReactAgent(BaseAgent):
     def __init__(self, *args, **kwargs):
         super(ReactAgent, self).__init__(*args, **kwargs)
-        self.id = "react"
+        self.id = "react_legacy"
         self.type = AGENT_TYPE_LLAMA
         self.mode = AGENT_MODE_STEP
-        self.name = "ReAct"
+        self.name = "ReAct (Legacy)"
 
     def get_agent(self, window, kwargs: Dict[str, Any]):
         """

pygpt_net/provider/agents/llama_index/openai_workflow.py

@@ -0,0 +1,52 @@
+#!/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.08.14 03:00:00                  #
+# ================================================== #
+
+from typing import Dict, Any, List
+
+from pygpt_net.core.types import (
+    AGENT_TYPE_LLAMA,
+    AGENT_MODE_WORKFLOW,
+)
+from llama_index.core.llms.llm import LLM
+from llama_index.core.tools.types import BaseTool
+
+from ..base import BaseAgent
+
+class OpenAIAgent(BaseAgent):
+    def __init__(self, *args, **kwargs):
+        super(OpenAIAgent, self).__init__(*args, **kwargs)
+        self.id = "openai"
+        self.type = AGENT_TYPE_LLAMA
+        self.mode = AGENT_MODE_WORKFLOW
+        self.name = "FunctionAgent"  # previous name: OpenAI
+
+    def get_agent(self, window, kwargs: Dict[str, Any]):
+        """
+        Get agent instance
+
+        :param window: Window instance
+        :param kwargs: Agent parameters
+        :return: PlannerWorkflow instance
+        """
+        from .workflow.openai import OpenAIWorkflowAgent
+
+        tools: List[BaseTool] = kwargs.get("tools", []) or []
+        llm: LLM = kwargs.get("llm", None)
+        verbose: bool = kwargs.get("verbose", False)
+        system_prompt: str = kwargs.get("system_prompt", None)
+        max_steps: int = kwargs.get("max_steps", 12)
+
+        return OpenAIWorkflowAgent(
+            tools=tools,
+            llm=llm,
+            system_prompt=system_prompt,
+            verbose=verbose,
+        )

pygpt_net/provider/agents/llama_index/planner_workflow.py

@@ -0,0 +1,115 @@
+#!/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.08.14 03:00:00                  #
+# ================================================== #
+
+from typing import Dict, Any, List
+
+from pygpt_net.core.bridge import BridgeContext
+from pygpt_net.core.types import (
+    AGENT_TYPE_LLAMA,
+    AGENT_MODE_WORKFLOW,
+)
+from llama_index.core.llms.llm import LLM
+from llama_index.core.tools.types import BaseTool
+
+from .workflow.planner import (
+    DEFAULT_INITIAL_PLAN_PROMPT,
+    DEFAULT_PLAN_REFINE_PROMPT,
+    DEFAULT_EXECUTE_PROMPT
+)
+from ..base import BaseAgent
+
+class PlannerAgent(BaseAgent):
+    def __init__(self, *args, **kwargs):
+        super(PlannerAgent, self).__init__(*args, **kwargs)
+        self.id = "planner"
+        self.type = AGENT_TYPE_LLAMA
+        self.mode = AGENT_MODE_WORKFLOW
+        self.name = "Planner"
+
+    def get_agent(self, window, kwargs: Dict[str, Any]):
+        """
+        Get agent instance
+
+        :param window: Window instance
+        :param kwargs: Agent parameters
+        :return: PlannerWorkflow instance
+        """
+        from .workflow.planner import PlannerWorkflow
+
+        context = kwargs.get("context", BridgeContext())
+        preset = context.preset
+        tools: List[BaseTool] = kwargs.get("tools", []) or []
+        llm: LLM = kwargs.get("llm", None)
+        verbose: bool = kwargs.get("verbose", False)
+        max_steps: int = kwargs.get("max_steps", 12)
+
+        # get prompts from options or use defaults
+        prompt_step = self.get_option(preset, "step", "prompt")
+        prompt_plan_initial = self.get_option(preset, "plan", "prompt")
+        prompt_plan_refine = self.get_option(preset, "plan_refine", "prompt")
+        if not prompt_step:
+            prompt_step = DEFAULT_EXECUTE_PROMPT
+        if not prompt_plan_initial:
+            prompt_plan_initial = DEFAULT_INITIAL_PLAN_PROMPT
+        if not prompt_plan_refine:
+            prompt_plan_refine = DEFAULT_PLAN_REFINE_PROMPT
+
+        return PlannerWorkflow(
+            tools=tools,
+            llm=llm,
+            verbose=verbose,
+            max_steps=max_steps,
+            system_prompt=prompt_step,
+            initial_plan_prompt= prompt_plan_initial,
+            plan_refine_prompt= prompt_plan_refine,
+        )
+
+    def get_options(self) -> Dict[str, Any]:
+        """
+        Return Agent options
+
+        :return: dict of options
+        """
+        return {
+            "step": {
+                "label": "Execute prompt",
+                "options": {
+                    "prompt": {
+                        "type": "textarea",
+                        "label": "Prompt",
+                        "description": "Steps execute prompt",
+                        "default": DEFAULT_EXECUTE_PROMPT,
+                    },
+                }
+            },
+            "plan": {
+                "label": "Planner (initial))",
+                "options": {
+                    "prompt": {
+                        "type": "textarea",
+                        "label": "Prompt",
+                        "description": "Initial plan prompt",
+                        "default": DEFAULT_INITIAL_PLAN_PROMPT,
+                    },
+                }
+            },
+            "plan_refine": {
+                "label": "Planner (refine)",
+                "options": {
+                    "prompt": {
+                        "type": "textarea",
+                        "label": "Prompt",
+                        "description": "Plan refine prompt",
+                        "default": DEFAULT_PLAN_REFINE_PROMPT,
+                    },
+                }
+            },
+        }

pygpt_net/provider/agents/llama_index/react_workflow.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.12 19:00:00                  #
+# Updated Date: 2025.08.14 03:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any
@@ -23,10 +23,10 @@ from ..base import BaseAgent
 class ReactWorkflowAgent(BaseAgent):
     def __init__(self, *args, **kwargs):
         super(ReactWorkflowAgent, self).__init__(*args, **kwargs)
-        self.id = "react_workflow"
+        self.id = "react"
         self.type = AGENT_TYPE_LLAMA
         self.mode = AGENT_MODE_WORKFLOW
-        self.name = "ReAct (Workflow)"
+        self.name = "ReAct"
 
     def get_agent(self, window, kwargs: Dict[str, Any]):
         """
@@ -36,7 +36,6 @@ class ReactWorkflowAgent(BaseAgent):
         :param kwargs: keyword arguments
         :return: Agent provider instance
         """
-
         from llama_index.core.agent.workflow import ReActAgent as Agent
 
         tools = kwargs.get("tools", [])
@@ -44,6 +43,7 @@ class ReactWorkflowAgent(BaseAgent):
         llm = kwargs.get("llm", None)
         chat_history = kwargs.get("chat_history", [])
         max_iterations = kwargs.get("max_iterations", 10)
+        system_prompt = kwargs.get("system_prompt", None)
 
         """
         # TODO: multimodal support
@@ -62,10 +62,12 @@ class ReactWorkflowAgent(BaseAgent):
             )
             return step_engine.as_agent()
         """
+        # system prompt for ReAct agent is added to messages
         return Agent(
             tools=tools,
             llm=llm,
             chat_history=chat_history,
             max_iterations=max_iterations,
+            system_prompt=system_prompt,
             verbose=verbose,
         )