pygpt-net 2.6.20__py3-none-any.whl → 2.6.21__py3-none-any.whl

pygpt_net/item/model.py

@@ -6,10 +6,11 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.08 19:00:00                  #
+# Updated Date: 2025.08.23 15:00:00                  #
 # ================================================== #
 
 import json
+from typing import Optional
 
 from pygpt_net.core.types import (
     MODE_CHAT,
@@ -22,27 +23,27 @@ from pygpt_net.core.types import (
 
 class ModelItem:
 
-    def __init__(self, id=None):
+    def __init__(self, id: Optional[str] = None):
         """
         Model data item
 
         :param id: Model ID
         """
+        self.ctx = 0
+        self.default = False
+        self.extra = {}
         self.id = id
-        self.name = None
-        self.mode = ["chat"]
+        self.imported = False
+        self.input = ["text"]  # multimodal support: image, audio, etc.
         self.langchain = {}
         self.llama_index = {}
+        self.mode = ["chat"]
         self.multimodal = ["text"]  # multimodal support: image, audio, etc.
-        self.input = ["text"]  # multimodal support: image, audio, etc.
+        self.name = None
         self.output = ["text"]  # multimodal support: image, audio, etc.
-        self.ctx = 0
-        self.tokens = 0
-        self.default = False
-        self.imported = False
         self.provider = "openai"  # default provider
+        self.tokens = 0
         self.tool_calls = False  # native tool calls available
-        self.extra = {}
 
     def from_dict(self, data: dict):
         """
@@ -50,61 +51,37 @@ class ModelItem:
 
         :param data: dict
         """
-        if 'id' in data:
-            self.id = data['id']
-        if 'name' in data:
-            self.name = data['name']
-        if 'mode' in data:
-            mode = data['mode'].replace(' ', '')
-            self.mode = mode.split(',')
-        if 'input' in data:
-            input = data['input'].replace(' ', '')
-            self.input = input.split(',')
-        if 'output' in data:
-            output = data['output'].replace(' ', '')
-            self.output = output.split(',')
         if 'ctx' in data:
             self.ctx = data['ctx']
-        if 'tokens' in data:
-            self.tokens = data['tokens']
         if 'default' in data:
             self.default = data['default']
         if 'extra' in data:
             self.extra = data['extra']
+        if 'id' in data:
+            self.id = data['id']
         if 'imported' in data:
             self.imported = data['imported']
+        if 'input' in data:
+            input = data['input'].replace(' ', '')
+            self.input = input.split(',')
+        if 'mode' in data:
+            mode = data['mode'].replace(' ', '')
+            self.mode = mode.split(',')
+        if 'name' in data:
+            self.name = data['name']
+        if 'output' in data:
+            output = data['output'].replace(' ', '')
+            self.output = output.split(',')
         if 'provider' in data:
             self.provider = data['provider']
+        if 'tokens' in data:
+            self.tokens = data['tokens']
         if 'tool_calls' in data:
             self.tool_calls = data['tool_calls']
-
-        # langchain
-        """
-        if 'langchain.provider' in data:
-            self.langchain['provider'] = data['langchain.provider']
-        if 'langchain.mode' in data:
-            if data['langchain.mode'] is None or data['langchain.mode'] == "":
-                self.langchain['mode'] = []
-            else:
-                mode = data['langchain.mode'].replace(' ', '')
-                self.langchain['mode'] = mode.split(',')
-        if 'langchain.args' in data:
-            self.langchain['args'] = data['langchain.args']
-        if 'langchain.env' in data:
-            self.langchain['env'] = data['langchain.env']
-        """
         
         # llama index
         if 'llama_index.provider' in data:
             self.llama_index['provider'] = data['llama_index.provider']  # backward compatibility < v2.5.20
-        """
-        if 'llama_index.mode' in data:
-            if data['llama_index.mode'] is None or data['llama_index.mode'] == "":
-                self.llama_index['mode'] = []
-            else:
-                mode = data['llama_index.mode'].replace(' ', '')
-                self.llama_index['mode'] = mode.split(',')
-        """
         if 'llama_index.args' in data:
             self.llama_index['args'] = data['llama_index.args']
         if 'llama_index.env' in data:
@@ -116,83 +93,44 @@ class ModelItem:
 
         :return: dict
         """
-        data = {}
-        data['id'] = self.id
-        data['name'] = self.name
-        data['mode'] = ','.join(self.mode)
-        data['input'] = ','.join(self.input)
-        data['output'] = ','.join(self.output)
-        # data['langchain'] = self.langchain
-        data['ctx'] = self.ctx
-        data['tokens'] = self.tokens
-        data['default'] = self.default
-        data['extra'] = self.extra
-        data['imported'] = self.imported
-        data['provider'] = self.provider
-        data['tool_calls'] = self.tool_calls
-
-        # data['langchain.provider'] = None
-        # data['langchain.mode'] = ""
-        # data['langchain.args'] = []
-        # data['langchain.env'] = []
-        # data['llama_index.provider'] = None
-        # data['llama_index.mode'] = ""
-        data['llama_index.args'] = []
-        data['llama_index.env'] = []
-
-
-        # langchain
-        """
-        if 'provider' in self.langchain:
-            data['langchain.provider'] = self.langchain['provider']        
-        if 'mode' in self.langchain:
-            data['langchain.mode'] = ",".join(self.langchain['mode'])
-        if 'args' in self.langchain:
-            # old versions support
-            if isinstance(self.langchain['args'], dict):
-                for key, value in self.langchain['args'].items():
-                    item = {}
-                    item['name'] = key
-                    item['value'] = value
-                    item['type'] = 'str'
-                    data['langchain.args'].append(item)
-            elif isinstance(self.langchain['args'], list):
-                data['langchain.args'] = self.langchain['args']
-        if 'env' in self.langchain:
-            # old versions support
-            if isinstance(self.langchain['env'], dict):
-                for key, value in self.langchain['env'].items():
-                    item = {}
-                    item['name'] = key
-                    item['value'] = value
-                    data['langchain.env'].append(item)
-            elif isinstance(self.langchain['env'], list):
-                data['langchain.env'] = self.langchain['env']
-        """
-
-        # llama_index
-        # if 'provider' in self.llama_index:
-            # data['llama_index.provider'] = self.llama_index['provider']
-        # if 'mode' in self.llama_index:
-            # data['llama_index.mode'] = ",".join(self.llama_index['mode'])
+        data = {
+            'id': self.id,
+            'name': self.name,
+            'mode': ','.join(self.mode),
+            'input': ','.join(self.input),
+            'output': ','.join(self.output),
+            'ctx': self.ctx,
+            'tokens': self.tokens,
+            'default': self.default,
+            'extra': self.extra,
+            'imported': self.imported,
+            'provider': self.provider,
+            'tool_calls': self.tool_calls,
+            'llama_index.args': [],
+            'llama_index.env': []
+        }
+
         if 'args' in self.llama_index:
             # old versions support
             if isinstance(self.llama_index['args'], dict):
                 for key, value in self.llama_index['args'].items():
-                    item = {}
-                    item['name'] = key
-                    item['value'] = value
-                    item['type'] = 'str'
+                    item = {
+                        'name': key,
+                        'value': value,
+                        'type': 'str'
+                    }
                     data['llama_index.args'].append(item)
             elif isinstance(self.llama_index['args'], list):
                 data['llama_index.args'] = self.llama_index['args']
+
         if 'env' in self.llama_index:
             # old versions support
             if isinstance(self.llama_index['env'], dict):
                 for key, value in self.llama_index['env'].items():
-                    item = {}
-                    item['name'] = key
-                    item['value'] = value
+                    item = {
+                        'name': key,
+                        'value': value
+                    }
                     data['llama_index.env'].append(item)
             elif isinstance(self.llama_index['env'], list):
                 data['llama_index.env'] = self.llama_index['env']
@@ -262,7 +200,12 @@ class ModelItem:
             return False
         return "ollama" in self.llama_index.get("provider", "")
 
-    def get_provider(self):
+    def get_provider(self) -> str:
+        """
+        Get model provider
+
+        :return: Provider name
+        """
         return self.provider
 
     def get_ollama_model(self) -> str:

pygpt_net/item/preset.py

@@ -6,165 +6,178 @@
 # 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.23 15:00:00                  #
 # ================================================== #
 
 import json
 import uuid
 
-
 class PresetItem:
-
-
     def __init__(self):
-        self.uuid = None
-        self.name = "*"
-        self.ai_name = ""
+        self.agent = False
+        self.agent_llama = False
+        self.agent_openai = False
+        self.agent_provider = None
+        self.agent_provider_openai = None
         self.ai_avatar = ""
+        self.ai_name = ""
         self.ai_personalize = False
-        self.user_name = ""
-        self.prompt = ""
+        self.assistant = False
+        self.assistant_id = ""
+        self.audio = False
         self.chat = False
         self.completion = False
+        self.computer = False
+        self.description = ""
+        self.enabled = True
+        self.expert = False
+        self.experts = []  # agent mode
+        self.extra = {}
+        self.filename = None
         self.img = False
-        self.vision = False
+        self.idx = None
         self.langchain = False
-        self.assistant = False
         self.llama_index = False
-        self.agent = False
-        self.agent_llama = False
-        self.agent_openai = False
-        self.expert = False
-        self.audio = False
+        self.model = None
+        self.name = "*"
+        self.prompt = ""
         self.research = False
-        self.computer = False
+        self.remote_tools = []
         self.temperature = 1.0
-        self.filename = None
-        self.model = None
-        self.version = None
-        self.experts = []  # agent mode
-        self.idx = None
-        self.agent_provider = None
-        self.agent_provider_openai = None
-        self.assistant_id = ""
-        self.description = ""
-        self.enabled = True
         self.tools = {
             "function": [],
         }
-        self.remote_tools = []
-        self.extra = {}
+        self.uuid = None
+        self.user_name = ""
+        self.version = None
+        self.vision = False
 
     def get_id(self) -> str:
+        """
+        Get preset ID
+
+        :return: ID of the preset
+        """
         return self.filename
 
-    def to_dict(self):
+    def to_dict(self) -> dict:
+        """
+        Convert preset item to dict
+
+        :return: dict representation of the preset item
+        """
         return {
-            "uuid": str(self.uuid),
-            "name": self.name,
-            "ai_name": self.ai_name,
+            "agent": self.agent,
+            "agent_llama": self.agent_llama,
+            "agent_openai": self.agent_openai,
+            "agent_provider": self.agent_provider,
+            "agent_provider_openai": self.agent_provider_openai,
             "ai_avatar": self.ai_avatar,
+            "ai_name": self.ai_name,
             "ai_personalize": self.ai_personalize,
-            "user_name": self.user_name,
-            "prompt": self.prompt,
+            "assistant": self.assistant,
+            "assistant_id": self.assistant_id,
+            "audio": self.audio,
             "chat": self.chat,
             "completion": self.completion,
+            "computer": self.computer,
+            "description": self.description,
+            "enabled": self.enabled,
+            "expert": self.expert,
+            "experts": self.experts,
+            "extra": self.extra,
+            "filename": self.filename,
             "img": self.img,
-            "vision": self.vision,
+            "idx": self.idx,
             "langchain": self.langchain,
-            "assistant": self.assistant,
             "llama_index": self.llama_index,
-            "agent": self.agent,
-            "agent_llama": self.agent_llama,
-            "agent_openai": self.agent_openai,
-            "expert": self.expert,
-            "audio": self.audio,
+            "model": self.model,
+            "name": self.name,
+            "prompt": self.prompt,
+            "remote_tools": self.remote_tools,
             "research": self.research,
-            "computer": self.computer,
             "temperature": self.temperature,
-            "filename": self.filename,
-            "model": self.model,
             "tool.function": self.tools["function"],
-            "experts": self.experts,
-            "idx": self.idx,
-            "agent_provider": self.agent_provider,
-            "agent_provider_openai": self.agent_provider_openai,
-            "assistant_id": self.assistant_id,
-            "enabled": self.enabled,
-            "description": self.description,
-            "remote_tools": self.remote_tools,
-            "extra": self.extra,
+            "user_name": self.user_name,
+            "uuid": str(self.uuid),
+            "version": self.version,
+            "vision": self.vision,
         }
 
-    def from_dict(self, data):
-        if "uuid" in data:
-            self.uuid = uuid.UUID(data["uuid"])
-        if "name" in data:
-            self.name = data["name"]
-        if "ai_name" in data:
-            self.ai_name = data["ai_name"]
+    def from_dict(self, data: dict):
+        """
+        Load data from dict
+
+        :param data: data dict
+        """
+        if "agent" in data:
+            self.agent = data["agent"]
+        if "agent_llama" in data:
+            self.agent_llama = data["agent_llama"]
+        if "agent_openai" in data:
+            self.agent_openai = data["agent_openai"]
+        if "agent_provider" in data:
+            self.agent_provider = data["agent_provider"]
+        if "agent_provider_openai" in data:
+            self.agent_provider_openai = data["agent_provider_openai"]
         if "ai_avatar" in data:
             self.ai_avatar = data["ai_avatar"]
+        if "ai_name" in data:
+            self.ai_name = data["ai_name"]
         if "ai_personalize" in data:
             self.ai_personalize = data["ai_personalize"]
-        if "user_name" in data:
-            self.user_name = data["user_name"]
-        if "prompt" in data:
-            self.prompt = data["prompt"]
+        if "assistant" in data:
+            self.assistant = data["assistant"]
+        if "assistant_id" in data:
+            self.assistant_id = data["assistant_id"]
+        if "audio" in data:
+            self.audio = data["audio"]
         if "chat" in data:
             self.chat = data["chat"]
         if "completion" in data:
             self.completion = data["completion"]
+        if "computer" in data:
+            self.computer = data["computer"]
+        if "description" in data:
+            self.description = data["description"]
+        if "enabled" in data:
+            self.enabled = data["enabled"]
+        if "expert" in data:
+            self.expert = data["expert"]
+        if "experts" in data:
+            self.experts = data["experts"]
+        if "extra" in data:
+            self.extra = data["extra"]
+        if "filename" in data:
+            self.filename = data["filename"]
         if "img" in data:
             self.img = data["img"]
-        if "vision" in data:
-            self.vision = data["vision"]
+        if "idx" in data:
+            self.idx = data["idx"]
         if "langchain" in data:
             self.langchain = data["langchain"]
-        if "assistant" in data:
-            self.assistant = data["assistant"]
         if "llama_index" in data:
             self.llama_index = data["llama_index"]
-        if "agent" in data:
-            self.agent = data["agent"]
-        if "agent_llama" in data:
-            self.agent_llama = data["agent_llama"]
-        if "agent_openai" in data:
-            self.agent_openai = data["agent_openai"]
-        if "expert" in data:
-            self.expert = data["expert"]
-        if "audio" in data:
-            self.audio = data["audio"]
+        if "model" in data:
+            self.model = data["model"]
+        if "name" in data:
+            self.name = data["name"]
+        if "prompt" in data:
+            self.prompt = data["prompt"]
+        if "remote_tools" in data:
+            self.remote_tools = data["remote_tools"]
         if "research" in data:
             self.research = data["research"]
-        if "computer" in data:
-            self.computer = data["computer"]
         if "temperature" in data:
             self.temperature = data["temperature"]
-        if "filename" in data:
-            self.filename = data["filename"]
-        if "model" in data:
-            self.model = data["model"]
         if "tool.function" in data:
             self.tools["function"] = data["tool.function"]
-        if "experts" in data:
-            self.experts = data["experts"]
-        if "idx" in data:
-            self.idx = data["idx"]
-        if "agent_provider" in data:
-            self.agent_provider = data["agent_provider"]
-        if "agent_provider_openai" in data:
-            self.agent_provider_openai = data["agent_provider_openai"]
-        if "assistant_id" in data:
-            self.assistant_id = data["assistant_id"]
-        if "enabled" in data:
-            self.enabled = data["enabled"]
-        if "description" in data:
-            self.description = data["description"]
-        if "remote_tools" in data:
-            self.remote_tools = data["remote_tools"]
-        if "extra" in data:
-            self.extra = data["extra"]
+        if "user_name" in data:
+            self.user_name = data["user_name"]
+        if "uuid" in data:
+            self.uuid = uuid.UUID(data["uuid"])
+        if "vision" in data:
+            self.vision = data["vision"]
         return self
 
     def add_function(self, name: str, parameters: str, desc: str):
@@ -211,6 +224,10 @@ class PresetItem:
             pass
         return ""
 
-    def __str__(self):
-        """To string"""
+    def __str__(self) -> str:
+        """
+        To string
+
+        :return: serialized item
+        """
         return self.dump()

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