pygpt-net 2.6.19.post1__py3-none-any.whl → 2.6.21__py3-none-any.whl

pygpt_net/provider/agents/llama_index/workflow/planner.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.14 03:00:00                  #
+# Updated Date: 2025.08.24 02:00:00                  #
 # ================================================== #
 
 from typing import List, Optional, Callable
@@ -518,7 +518,7 @@ class PlannerWorkflow(Workflow):
             lines.append(
                 f"\n**===== Sub Task {i}: {st.name} =====**\n"
                 f"Expected output: {st.expected_output}\n"
-                f"Dependencies: {st.dependencies}\n"
+                f"Dependencies: {st.dependencies}\n\n"
             )
         await self._emit_text(ctx, "\n".join(lines))
         return PlanReady(plan=plan, query=ev.query)
@@ -556,7 +556,7 @@ class PlannerWorkflow(Workflow):
             header = (
                 f"\n\n**===== Sub Task {i}/{total}: {st.name} =====**\n"
                 f"Expected output: {st.expected_output}\n"
-                f"Dependencies: {st.dependencies}\n"
+                f"Dependencies: {st.dependencies}\n\n"
             )
 
             # stop callback

pygpt_net/provider/agents/openai/agent.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.24 03:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, Tuple, Optional
@@ -14,8 +14,6 @@ from typing import Dict, Any, Tuple, Optional
 from agents import (
     Agent as OpenAIAgent,
     Runner,
-    RunConfig,
-    ModelSettings,
 )
 
 from pygpt_net.core.agents.bridge import ConnectionContext
@@ -28,15 +26,13 @@ from pygpt_net.core.types import (
 from pygpt_net.item.ctx import CtxItem
 from pygpt_net.item.model import ModelItem
 
-from pygpt_net.provider.gpt.agents.client import get_custom_model_provider, set_openai_env
-from pygpt_net.provider.gpt.agents.remote_tools import get_remote_tools, is_computer_tool, append_tools
+from pygpt_net.provider.gpt.agents.remote_tools import is_computer_tool, append_tools
 from pygpt_net.provider.gpt.agents.computer import Agent as ComputerAgent, LocalComputer
 from pygpt_net.provider.gpt.agents.response import StreamHandler
 
 from ..base import BaseAgent
 from ...gpt.agents.experts import get_experts
 
-
 class Agent(BaseAgent):
     def __init__(self, *args, **kwargs):
         super(Agent, self).__init__(*args, **kwargs)
@@ -63,7 +59,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": agent_name,
             "instructions": system_prompt,
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
         }
         if handoffs:
             kwargs["handoffs"] = handoffs
@@ -127,11 +123,7 @@ class Agent(BaseAgent):
             "input": messages,
             "max_turns": int(max_steps),
         }
-        if model.provider != "openai":
-            custom_provider = get_custom_model_provider(window, model)
-            kwargs["run_config"] = RunConfig(model_provider=custom_provider)
-        else:
-            set_openai_env(window)
+        if model.provider == "openai":
             if previous_response_id:
                 kwargs["previous_response_id"] = previous_response_id
 

pygpt_net/provider/agents/openai/agent_b2b.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.24 03:00:00                  #
 # ================================================== #
 
 import copy
@@ -15,7 +15,6 @@ from typing import Dict, Any, Tuple, Union, Optional
 from agents import (
     Agent as OpenAIAgent,
     Runner,
-    RunConfig,
     TResponseInputItem,
 )
 
@@ -30,7 +29,6 @@ from pygpt_net.item.ctx import CtxItem
 from pygpt_net.item.model import ModelItem
 from pygpt_net.item.preset import PresetItem
 
-from pygpt_net.provider.gpt.agents.client import get_custom_model_provider, set_openai_env
 from pygpt_net.provider.gpt.agents.remote_tools import append_tools
 from pygpt_net.provider.gpt.agents.response import StreamHandler
 
@@ -77,7 +75,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": "Bot {}".format(id),
             "instructions": self.get_option(preset, option_key, "prompt"),
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
         }
         if handoffs:
             kwargs["handoffs"] = handoffs
@@ -182,13 +180,7 @@ class Agent(BaseAgent):
         :param kwargs: Additional keyword arguments for the model configuration
         :return: Prepared keyword arguments for the model
         """
-        if model.provider != "openai":
-            custom_provider = get_custom_model_provider(window, model)
-            kwargs["run_config"] = RunConfig(model_provider=custom_provider)
-        else:
-            if "run_config" in kwargs:
-                kwargs.pop("run_config")
-            set_openai_env(window)
+        if model.provider == "openai":
             if previous_response_id:
                 kwargs["previous_response_id"] = previous_response_id
         return kwargs
@@ -233,20 +225,23 @@ class Agent(BaseAgent):
             verbose=verbose,
             tools=tools,
         )
-        if experts:
-            agent_kwargs["handoffs"] = experts
 
         bot_1_kwargs = copy.deepcopy(agent_kwargs)
+        bot_2_kwargs = copy.deepcopy(agent_kwargs)
+
         bot_1_kwargs["bot_id"] = 1
-        bot_1 = self.get_agent(window, agent_kwargs)
+        if experts:
+            bot_1_kwargs["handoffs"] = experts
+        bot_1 = self.get_agent(window, bot_1_kwargs)
 
         model_2 = model
-        bot_2_kwargs = copy.deepcopy(agent_kwargs)
         model_name_2 = self.get_option(preset, "bot_2", "model")
         if model_name_2:
             model_2 = window.core.models.get(model_name_2)
             bot_2_kwargs["model"] = model_2
         bot_2_kwargs["bot_id"] = 2
+        if experts:
+            bot_2_kwargs["handoffs"] = experts
         bot_2 = self.get_agent(window, bot_2_kwargs)
 
         kwargs = {

pygpt_net/provider/agents/openai/agent_planner.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.24 03:00:00                  #
 # ================================================== #
 
 from dataclasses import dataclass
@@ -115,7 +115,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": agent_name,
             "instructions": self.get_option(preset, "base", "prompt"),
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
         }
         if handoffs:
             kwargs["handoffs"] = handoffs
@@ -156,7 +156,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": "evaluator",
             "instructions": instructions,
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
             "output_type": EvaluationFeedback,
         }
         tool_kwargs = append_tools(
@@ -195,7 +195,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": "StructuredPlanner",
             "instructions": instructions,
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
             "output_type": StructuredPlan,
         }
         tool_kwargs = append_tools(

pygpt_net/provider/agents/openai/agent_with_experts.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.24 03:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, Tuple, Optional
@@ -63,7 +63,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": agent_name,
             "instructions": system_prompt,
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
         }
         if handoffs:
             kwargs["handoffs"] = handoffs
@@ -128,11 +128,7 @@ class Agent(BaseAgent):
             "input": messages,
             "max_turns": int(max_steps),
         }
-        if model.provider != "openai":
-            custom_provider = get_custom_model_provider(window, model)
-            kwargs["run_config"] = RunConfig(model_provider=custom_provider)
-        else:
-            set_openai_env(window)
+        if model.provider == "openai":
             if previous_response_id:
                 kwargs["previous_response_id"] = previous_response_id
 

pygpt_net/provider/agents/openai/agent_with_experts_feedback.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.24 03:00:00                  #
 # ================================================== #
 
 from dataclasses import dataclass
@@ -82,7 +82,7 @@ class Agent(BaseAgent):
         agent_kwargs = {
             "name": agent_name,
             "instructions": self.get_option(preset, "base", "prompt"),
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
         }
         if handoffs:
             agent_kwargs["handoffs"] = handoffs
@@ -123,7 +123,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": "evaluator",
             "instructions": instructions,
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
             "output_type": EvaluationFeedback,
         }
         tool_kwargs = append_tools(
@@ -192,11 +192,7 @@ class Agent(BaseAgent):
             "input": messages,
             "max_turns": int(max_steps),
         }
-        if model.provider != "openai":
-            custom_provider = get_custom_model_provider(window, model)
-            kwargs["run_config"] = RunConfig(model_provider=custom_provider)
-        else:
-            set_openai_env(window)
+        if model.provider == "openai":
             if previous_response_id:
                 kwargs["previous_response_id"] = previous_response_id
 

pygpt_net/provider/agents/openai/agent_with_feedback.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.24 03:00:00                  #
 # ================================================== #
 
 from dataclasses import dataclass
@@ -82,7 +82,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": agent_name,
             "instructions": self.get_option(preset, "base", "prompt"),
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
         }
         if handoffs:
             kwargs["handoffs"] = handoffs
@@ -123,7 +123,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": "evaluator",
             "instructions": instructions,
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
             "output_type": EvaluationFeedback,
         }
         tool_kwargs = append_tools(
@@ -192,11 +192,7 @@ class Agent(BaseAgent):
             "input": messages,
             "max_turns": int(max_steps),
         }
-        if model.provider != "openai":
-            custom_provider = get_custom_model_provider(window, model)
-            kwargs["run_config"] = RunConfig(model_provider=custom_provider)
-        else:
-            set_openai_env(window)
+        if model.provider == "openai":
             if previous_response_id:
                 kwargs["previous_response_id"] = previous_response_id
 

pygpt_net/provider/agents/openai/bot_researcher.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.24 03:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, Tuple, Union, Optional
@@ -89,7 +89,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": agent_name,
             "instructions": system_prompt,
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
             "handoffs": handoffs,
         }
         tool_kwargs = append_tools(
@@ -154,18 +154,6 @@ class Agent(BaseAgent):
         model_search_kwargs = {}
         model_planner_kwargs = {}
 
-        if model.provider != "openai":
-            custom_provider = get_custom_model_provider(window, model)
-            model_kwargs["run_config"] = RunConfig(model_provider=custom_provider)
-
-        if model_search.provider != "openai":
-            custom_provider = get_custom_model_provider(window, model_search)
-            model_search_kwargs["run_config"] = RunConfig(model_provider=custom_provider)
-
-        if model_planner.provider != "openai":
-            custom_provider = get_custom_model_provider(window, model_planner)
-            model_planner_kwargs["run_config"] = RunConfig(model_provider=custom_provider)
-
         # get experts
         experts = get_experts(
             window=window,
@@ -207,10 +195,6 @@ class Agent(BaseAgent):
             },
             history=messages if messages else [],
         )
-
-        if model.provider == "openai":
-            set_openai_env(window)
-
         final_output = await bot.run(query)
         return ctx, final_output, response_id
 

pygpt_net/provider/agents/openai/bots/research_bot/agents/planner_agent.py

@@ -46,7 +46,7 @@ def get_planner_agent(
     kwargs = {
         "name": "PlannerAgent",
         "instructions": config["prompt"],
-        "model": config["model"].id,
+        "model": window.core.agents.provider.get_openai_model(config["model"]),
         "output_type": WebSearchPlan,
     }
     tool_kwargs = append_tools(

pygpt_net/provider/agents/openai/bots/research_bot/agents/search_agent.py

@@ -34,6 +34,7 @@ def get_search_agent(
     kwargs = {
         "name": "SearchAgent",
         "instructions": config["prompt"],
+        "model": window.core.agents.provider.get_openai_model(config["model"]),
     }
     kwargs.update(tool_kwargs)  # update kwargs with tools
 

pygpt_net/provider/agents/openai/bots/research_bot/agents/writer_agent.py

@@ -37,7 +37,7 @@ def get_writer_agent(
     kwargs = {
         "name": "WriterAgent",
         "instructions": config["prompt"],
-        "model": config["model"].id,
+        "model": window.core.agents.provider.get_openai_model(config["model"]),
         "output_type": ReportData,
     }
     if config.get("experts"):

pygpt_net/provider/agents/openai/bots/research_bot/manager.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 19:00:00                  #
+# Updated Date: 2025.08.24 03:00:00                  #
 # ================================================== #
 # Based on OpenAI examples: https://github.com/openai/openai-agents-python/blob/main/examples
 from __future__ import annotations
@@ -104,9 +104,6 @@ class ResearchManager:
         kwargs = {
             "input": messages,
         }
-        if self.planner_config["run_kwargs"]:
-            kwargs.update(self.planner_config["run_kwargs"])
-
         result = await Runner.run(
             agent,
             **kwargs
@@ -151,9 +148,6 @@ class ResearchManager:
         kwargs = {
             "input": input,
         }
-        if self.search_config["run_kwargs"]:
-            kwargs.update(self.search_config["run_kwargs"])
-
         try:
             result = await Runner.run(
                 agent,
@@ -182,9 +176,6 @@ class ResearchManager:
         kwargs = {
             "input": input,
         }
-        if self.writer_config["run_kwargs"]:
-            kwargs.update(self.writer_config["run_kwargs"])
-
         result = Runner.run_streamed(
             agent,
             **kwargs,

pygpt_net/provider/agents/openai/evolve.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.24 03:00:00                  #
 # ================================================== #
 
 import copy
@@ -94,7 +94,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": agent_name,
             "instructions": self.get_option(preset, "base", "prompt"),
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
         }
         if handoffs:
             kwargs["handoffs"] = handoffs
@@ -135,7 +135,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": "evaluator",
             "instructions": instructions,
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
             "output_type": EvaluationFeedback,
         }
         tool_kwargs = append_tools(
@@ -174,7 +174,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": "chooser",
             "instructions": instructions,
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model),
             "output_type": ChooseFeedback,
         }
         tool_kwargs = append_tools(
@@ -267,11 +267,7 @@ class Agent(BaseAgent):
         kwargs = {
             "max_turns": int(max_steps),
         }
-        if model.provider != "openai":
-            custom_provider = get_custom_model_provider(window, model)
-            kwargs["run_config"] = RunConfig(model_provider=custom_provider)
-        else:
-            set_openai_env(window)
+        if model.provider == "openai":
             if previous_response_id:
                 kwargs["previous_response_id"] = previous_response_id
 

pygpt_net/provider/agents/openai/supervisor.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.17 02:00:00                  #
+# Updated Date: 2025.08.24 03:00:00                  #
 # ================================================== #
 
 import json
@@ -89,7 +89,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": agent_name,
             "instructions": self.get_option(preset, "supervisor", "prompt"),
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model)
         }
         if worker_tool:
             kwargs["tools"] = [worker_tool]
@@ -114,7 +114,7 @@ class Agent(BaseAgent):
         kwargs = {
             "name": agent_name,
             "instructions": self.get_option(preset, "worker", "prompt"),
-            "model": model.id,
+            "model": window.core.agents.provider.get_openai_model(model)
         }
         if handoffs:
             kwargs["handoffs"] = handoffs
@@ -178,11 +178,7 @@ class Agent(BaseAgent):
             "input": messages,
             "max_turns": int(max_steps),
         }
-        if model.provider != "openai":
-            custom_provider = get_custom_model_provider(window, model)
-            kwargs["run_config"] = RunConfig(model_provider=custom_provider)
-        else:
-            set_openai_env(window)
+        if model.provider == "openai":
             if previous_response_id:
                 kwargs["previous_response_id"] = previous_response_id
 

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.08.09 19:00:00                  #
+# Updated Date: 2025.08.24 02:00:00                  #
 # ================================================== #
 
 import copy
@@ -2051,8 +2051,8 @@ class Patch:
             # < 2.5.61
             if old < parse_version("2.5.61"):
                 print("Migrating config from < 2.5.61..")
-                if "llama.idx.chat.agent.render.all" not in data:
-                    data["llama.idx.chat.agent.render.all"] = False
+                if "agent.output.render.all" not in data:
+                    data["agent.output.render.all"] = False
                 data["prompt.expert"] = self.window.core.config.get_base(
                     'prompt.expert')
                 if "experts.use_agent" not in data:
@@ -2273,6 +2273,13 @@ class Patch:
                         data['plugins']['google']['oauth_scopes'] += " https://www.googleapis.com/auth/documents"
                 updated = True
 
+            # < 2.6.21
+            if old < parse_version("2.6.21"):
+                print("Migrating config from < 2.6.21...")
+                if "agent.output.render.all" not in data:
+                    data["agent.output.render.all"] = True
+                updated = True
+
         # update file
         migrated = False
         if updated: