pygpt-net 2.5.19__py3-none-any.whl → 2.5.21__py3-none-any.whl

pygpt_net/provider/core/model/patch.py

@@ -6,11 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.27 16:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 from packaging.version import parse as parse_version, Version
 
+from pygpt_net.core.types import MODE_RESEARCH
+
 
 class Patch:
     def __init__(self, window=None):
@@ -328,6 +330,7 @@ class Patch:
                         # langchain
                         is_endpoint = False
                         is_version = False
+                        """
                         for item in model.langchain["env"]:
                             if item["name"] == "AZURE_OPENAI_ENDPOINT":
                                 is_endpoint = True
@@ -355,6 +358,7 @@ class Patch:
                                     "value": "{api_azure_version}",
                                 }
                             )
+                        """
 
                         # llama
                         is_endpoint = False
@@ -390,6 +394,7 @@ class Patch:
                     # Anthropic
                     elif model.id.startswith("claude-"):
                         is_key = False
+                        """
                         for item in model.langchain["env"]:
                             if item["name"] == "ANTHROPIC_API_KEY":
                                 is_key = True
@@ -404,6 +409,7 @@ class Patch:
                                     "value": "{api_key_anthropic}",
                                 }
                             )
+                        """
                         is_key = False
                         for item in model.llama_index["env"]:
                             if item["name"] == "ANTHROPIC_API_KEY":
@@ -422,6 +428,7 @@ class Patch:
                     # Google
                     elif model.id.startswith("gemini-"):
                         is_key = False
+                        """
                         for item in model.langchain["env"]:
                             if item["name"] == "GOOGLE_API_KEY":
                                 is_key = True
@@ -436,6 +443,7 @@ class Patch:
                                     "value": "{api_key_google}",
                                 }
                             )
+                        """
                         is_key = False
                         for item in model.llama_index["env"]:
                             if item["name"] == "GOOGLE_API_KEY":
@@ -555,12 +563,6 @@ class Patch:
                 print("Migrating models from < 2.5.18...")
                 for id in data:
                     model = data[id]
-                    if (model.id.startswith("o1")
-                            or model.id.startswith("o3")
-                            or model.id.startswith("gpt-")
-                            or model.id.startswith("chatgpt")
-                            or model.id.startswith("dall-e")):
-                        model.openai = True
                     if model.is_supported("llama_index"):
                         if "chat" not in model.mode:
                             model.mode.append("chat")
@@ -570,6 +572,53 @@ class Patch:
             if old < parse_version("2.5.19"):
                 updated = True
 
+            # < 2.5.20 <--- add provider field
+            if old < parse_version("2.5.20"):
+                print("Migrating models from < 2.5.20...")
+                for id in data:
+                    model = data[id]
+
+                    # add global providers
+                    if model.is_ollama():
+                        model.provider = "ollama"
+                    if (model.id.startswith("gpt-")
+                      or model.id.startswith("chatgpt")
+                      or model.id.startswith("o1")
+                      or model.id.startswith("o3")
+                      or model.id.startswith("o4")
+                      or model.id.startswith("o5")
+                      or model.id.startswith("dall-e")):
+                        model.provider = "openai"
+                    if model.id.startswith("claude-"):
+                        model.provider = "anthropic"
+                    if model.id.startswith("gemini-"):
+                        model.provider = "google"
+                    if MODE_RESEARCH in model.mode:
+                        model.provider = "perplexity"
+                    if model.id.startswith("grok-"):
+                        model.provider = "x_ai"
+                    if id.startswith("deepseek_api"):
+                        model.provider = "deepseek_api"
+                    if model.provider is None or model.provider == "":
+                        model.provider = "local_ai"
+
+                    # patch llama_index config
+                    if model.llama_index:
+                        if 'mode' in model.llama_index:
+                            del model.llama_index['mode']
+                        if 'provider' in model.llama_index:
+                            del model.llama_index['provider']
+
+                    # add llama_index mode to o1, o3
+                    if model.id.startswith("o1") or model.id.startswith("o3"):
+                        if "llama_index" not in model.mode:
+                            model.mode.append("llama_index")
+
+                    # del langchain config
+                    if 'langchain' in model.mode:
+                        model.mode.remove("langchain")
+                updated = True
+
         # update file
         if updated:
             data = dict(sorted(data.items()))

pygpt_net/provider/core/preset/json_file.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 22:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 import json
@@ -189,7 +189,7 @@ class JsonFileProvider(BaseProvider):
             MODE_COMPLETION: item.completion,
             MODE_IMAGE: item.img,
             MODE_VISION: item.vision,
-            MODE_LANGCHAIN: item.langchain,
+            # MODE_LANGCHAIN: item.langchain,
             MODE_ASSISTANT: item.assistant,
             MODE_LLAMA_INDEX: item.llama_index,
             MODE_AGENT: item.agent,
@@ -224,8 +224,8 @@ class JsonFileProvider(BaseProvider):
             item.img = data[MODE_IMAGE]
         if MODE_VISION in data:
             item.vision = data[MODE_VISION]
-        if MODE_LANGCHAIN in data:
-            item.langchain = data[MODE_LANGCHAIN]
+        # if MODE_LANGCHAIN in data:
+            # item.langchain = data[MODE_LANGCHAIN]
         if MODE_ASSISTANT in data:
             item.assistant = data[MODE_ASSISTANT]
         if MODE_LLAMA_INDEX in data:

pygpt_net/provider/gpt/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.27 16:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 import base64
 
@@ -55,7 +55,11 @@ class Gpt:
         self.summarizer = Summarizer(window)
         self.vision = Vision(window)
 
-    def get_client(self, mode: str = MODE_CHAT, model: ModelItem = None) -> OpenAI:
+    def get_client(
+            self,
+            mode: str = MODE_CHAT,
+            model: ModelItem = None
+    ) -> OpenAI:
         """
         Return OpenAI client
 
@@ -81,21 +85,8 @@ class Gpt:
                     transport=transport,
                 )
 
-        # research mode endpoint - Perplexity
-        if mode == MODE_RESEARCH:
-            if self.window.core.config.has('api_key_perplexity'):
-                args["api_key"] = self.window.core.config.get('api_key_perplexity')
-            if self.window.core.config.has('api_endpoint_perplexity'):
-                endpoint = self.window.core.config.get('api_endpoint_perplexity')
-                if endpoint:
-                    args["base_url"] = endpoint
-        elif mode == MODE_CHAT:
-            if model is not None:
-                # xAI / grok
-                if model.id.startswith("grok"):
-                    args["api_key"] = self.window.core.config.get('api_key_xai')
-                    args["base_url"] = self.window.core.config.get('api_endpoint_xai')
-
+        # update client args by mode and model
+        args = self.window.core.models.prepare_client_args(args, mode, model)
         return OpenAI(**args)
 
     def call(self, context: BridgeContext, extra: dict = None) -> bool:
@@ -245,6 +236,7 @@ class Gpt:
                     )
             else:
                 if response.choices[0]:
+                    print(response.choices[0].message)
                     if response.choices[0].message.content:
                         output = response.choices[0].message.content.strip()
                     elif response.choices[0].message.tool_calls:

pygpt_net/provider/gpt/chat.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.27 16:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 import json
@@ -17,7 +17,6 @@ from pygpt_net.core.types import (
     MODE_CHAT,
     MODE_VISION,
     MODE_AUDIO,
-    MODE_RESEARCH,
 )
 from pygpt_net.core.bridge.context import BridgeContext, MultimodalContext
 from pygpt_net.item.ctx import CtxItem
@@ -113,7 +112,10 @@ class Chat:
                 })
 
         # fix: o1 compatibility
-        if model.id is not None and not model.id.startswith("o1") and not model.id.startswith("o3"):
+        if (model.id is not None
+                and not model.id.startswith("o1")
+                and not model.id.startswith("o3")
+                and model.is_gpt()):
             response_kwargs['presence_penalty'] = self.window.core.config.get('presence_penalty')
             response_kwargs['frequency_penalty'] = self.window.core.config.get('frequency_penalty')
             response_kwargs['temperature'] = self.window.core.config.get('temperature')
@@ -184,6 +186,8 @@ class Chat:
 
         # tokens config
         mode = MODE_CHAT
+        is_tool_output = False
+        tool_call_native_enabled = self.window.core.config.get('func_call.native', False)
         allowed_system = True
         if (model.id is not None
                 and model.id in ["o1-mini", "o1-preview"]):
@@ -257,24 +261,90 @@ class Chat:
                                 }
                     messages.append(msg)
 
-        # use vision and audio if available in current model
-        content = str(prompt)
-        if MODE_VISION in model.mode:
-            content = self.window.core.gpt.vision.build_content(
-                content=content,
-                attachments=attachments,
-            )
-        if MODE_AUDIO in model.mode:
-            content = self.window.core.gpt.audio.build_content(
-                content=content,
-                multimodal_ctx=multimodal_ctx,
-            )
+                    # ---- tool output ----
+                    is_tool_output = False
+                    if tool_call_native_enabled and item.extra and isinstance(item.extra, dict):
+                        if "tool_calls" in item.extra and isinstance(item.extra["tool_calls"], list):
+                            for tool_call in item.extra["tool_calls"]:
+                                if "function" in tool_call:
+                                    if "id" not in tool_call or "name" not in tool_call["function"]:
+                                        continue
+                                    if tool_call["id"] and tool_call["function"]["name"]:
+                                        if "tool_output" in item.extra and isinstance(item.extra["tool_output"], list):
+                                            for tool_output in item.extra["tool_output"]:
+                                                if ("cmd" in tool_output
+                                                        and tool_output["cmd"] == tool_call["function"]["name"]):
+                                                    msg = {
+                                                        "role": "tool",
+                                                        "tool_call_id": tool_call["id"],
+                                                        "content": str(tool_output),
+                                                    }
+                                                    last_msg = messages[-1] if messages else None
+                                                    if last_msg and last_msg.get(
+                                                            "role") == "assistant":
+                                                        last_msg["tool_calls"] = []
+                                                        for call in item.extra["tool_calls"]:
+                                                            last_msg["tool_calls"].append(
+                                                                {
+                                                                    "id": call["id"],
+                                                                    "type": "function",
+                                                                    "function": {
+                                                                        "name": call["function"]["name"],
+                                                                        "arguments": json.dumps(
+                                                                            call["function"]["arguments"]),
+                                                                    }
+                                                                }
+                                                            )
+                                                        last_msg["content"] = ""
+                                                    messages.append(msg)
+                                                    is_tool_output = True
+                                                    break
+                                                elif "result" in tool_output:
+                                                    # if result is present, append it as function call output
+                                                    msg = {
+                                                        "role": "tool",
+                                                        "tool_call_id": tool_call["id"],
+                                                        "content": str(tool_output["result"]),
+                                                    }
+                                                    last_msg = messages[-1] if messages else None
+                                                    if last_msg and last_msg.get(
+                                                            "role") == "assistant":
+                                                        last_msg["tool_calls"] = []
+                                                        for call in item.extra["tool_calls"]:
+                                                            last_msg["tool_calls"].append(
+                                                                {
+                                                                    "id": call["id"],
+                                                                    "type": "function",
+                                                                    "function": {
+                                                                        "name": call["function"]["name"],
+                                                                        "arguments": json.dumps(call["function"]["arguments"]),
+                                                                    }
+                                                                }
+                                                            )
+                                                        last_msg["content"] = ""
+                                                    messages.append(msg)
+                                                    is_tool_output = True
+                                                    break
 
-        # append current prompt
-        messages.append({
-            "role": "user",
-            "content": content,
-        })
+        # use vision and audio if available in current model
+        if not is_tool_output:  # append current prompt only if not tool output
+            content = str(prompt)
+            if MODE_VISION in model.mode:
+                content = self.window.core.gpt.vision.build_content(
+                    content=content,
+                    attachments=attachments,
+                )
+            if MODE_AUDIO in model.mode:
+                content = self.window.core.gpt.audio.build_content(
+                    content=content,
+                    multimodal_ctx=multimodal_ctx,
+                )
+
+            # append current prompt
+            messages.append({
+                "role": "user",
+                "content": content,
+            })
 
         # input tokens: update
         self.input_tokens += self.window.core.tokens.from_messages(

pygpt_net/provider/gpt/responses.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.26 18:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 import json
@@ -66,7 +66,7 @@ class Responses:
         user_name = ctx.input_name  # from ctx
         ai_name = ctx.output_name  # from ctx
 
-        client = self.window.core.gpt.get_client(mode)
+        client = self.window.core.gpt.get_client(mode, model)
 
         # build chat messages
         messages = self.build(
@@ -175,9 +175,11 @@ class Responses:
         """
         messages = []
         self.prev_response_id = None  # reset
+        is_tool_output = False  # reset
 
         # tokens config
         mode = MODE_CHAT
+        tool_call_native_enabled = self.window.core.config.get('func_call.native', False)
         allowed_system = True
         if (model.id is not None
                 and model.id in ["o1-mini", "o1-preview"]):
@@ -243,28 +245,63 @@ class Responses:
                                 }
                     messages.append(msg)
 
-                if item.msg_id and (item.cmds is None or len(item.cmds) == 0):  # if no cmds before
+                    # ---- tool output ----
+                    is_tool_output = False  # reset tool output flag
+                    if tool_call_native_enabled and item.extra and isinstance(item.extra, dict):
+                        if "tool_calls" in item.extra and isinstance(item.extra["tool_calls"], list):
+                            for tool_call in item.extra["tool_calls"]:
+                                if "function" in tool_call:
+                                    if "call_id" not in tool_call or "name" not in tool_call["function"]:
+                                        continue
+                                    if tool_call["call_id"] and tool_call["function"]["name"]:
+                                        if "tool_output" in item.extra and isinstance(item.extra["tool_output"], list):
+                                            for tool_output in item.extra["tool_output"]:
+                                                if ("cmd" in tool_output
+                                                        and tool_output["cmd"] == tool_call["function"]["name"]):
+                                                    msg = {
+                                                        "type": "function_call_output",
+                                                        "call_id": tool_call["call_id"],
+                                                        "output": str(tool_output),
+                                                    }
+                                                    is_tool_output = True
+                                                    messages.append(msg)
+                                                    break
+                                                elif "result" in tool_output:
+                                                    # if result is present, append it as function call output
+                                                    msg = {
+                                                        "type": "function_call_output",
+                                                        "call_id": tool_call["call_id"],
+                                                        "output": str(tool_output["result"]),
+                                                    }
+                                                    is_tool_output = True
+                                                    messages.append(msg)
+                                                    break
+
+                # --- previous message ID ---
+                if (item.msg_id
+                        and ((item.cmds is None or len(item.cmds) == 0) or is_tool_output)):  # if no cmds before or tool output
                     self.prev_response_id = item.msg_id  # previous response ID to use in current input
 
         # use vision and audio if available in current model
-        content = str(prompt)
-        if MODE_VISION in model.mode:
-            content = self.window.core.gpt.vision.build_content(
-                content=content,
-                attachments=attachments,
-                responses_api=True,
-            )
-        if MODE_AUDIO in model.mode:
-            content = self.window.core.gpt.audio.build_content(
-                content=content,
-                multimodal_ctx=multimodal_ctx,
-            )
-
-        # append current prompt
-        messages.append({
-            "role": "user",
-            "content": content,
-        })
+        if not is_tool_output:  # append current prompt only if not tool output
+            content = str(prompt)
+            if MODE_VISION in model.mode:
+                content = self.window.core.gpt.vision.build_content(
+                    content=content,
+                    attachments=attachments,
+                    responses_api=True,
+                )
+            if MODE_AUDIO in model.mode:
+                content = self.window.core.gpt.audio.build_content(
+                    content=content,
+                    multimodal_ctx=multimodal_ctx,
+                )
+
+            # append current prompt
+            messages.append({
+                "role": "user",
+                "content": content,
+            })
 
         # input tokens: update
         self.input_tokens += self.window.core.tokens.from_messages(

pygpt_net/provider/llms/anthropic.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.26 16:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 from llama_index.llms.anthropic import Anthropic
@@ -30,6 +30,7 @@ class AnthropicLLM(BaseLLM):
             - api_key: API key for Anthropic API
         """
         self.id = "anthropic"
+        self.name = "Anthropic"
         self.type = [MODE_LLAMA_INDEX]
 
     def llama(

pygpt_net/provider/llms/azure_openai.py

@@ -6,13 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 22:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 from typing import Optional, List, Dict
 
-from langchain_openai import AzureOpenAI
-from langchain_openai import AzureChatOpenAI
+# from langchain_openai import AzureOpenAI
+# from langchain_openai import AzureChatOpenAI
 
 from llama_index.core.llms.llm import BaseLLM as LlamaBaseLLM
 from llama_index.core.base.embeddings.base import BaseEmbedding
@@ -20,7 +20,6 @@ from llama_index.llms.azure_openai import AzureOpenAI as LlamaAzureOpenAI
 from llama_index.embeddings.azure_openai import AzureOpenAIEmbedding
 
 from pygpt_net.core.types import (
-    MODE_LANGCHAIN,
     MODE_LLAMA_INDEX,
 )
 from pygpt_net.provider.llms.base import BaseLLM
@@ -39,7 +38,8 @@ class AzureOpenAILLM(BaseLLM):
             - api_key: API key for Azure OpenAI API
         """
         self.id = "azure_openai"
-        self.type = [MODE_LANGCHAIN, MODE_LLAMA_INDEX, "embeddings"]
+        self.name = "Azure OpenAI"
+        self.type = [MODE_LLAMA_INDEX, "embeddings"]
 
     def completion(
             self,
@@ -54,9 +54,11 @@ class AzureOpenAILLM(BaseLLM):
         :param model: model instance
         :param stream: stream mode
         :return: LLM provider instance
-        """
+
         args = self.parse_args(model.langchain)
         return AzureOpenAI(**args)
+        """
+        pass
 
     def chat(
             self,
@@ -71,9 +73,11 @@ class AzureOpenAILLM(BaseLLM):
         :param model: model instance
         :param stream: stream mode
         :return: LLM provider instance
-        """
+
         args = self.parse_args(model.langchain)
         return AzureChatOpenAI(**args)
+        """
+        pass
 
     def llama(
             self,

pygpt_net/provider/llms/base.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 22:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 import os
@@ -48,7 +48,8 @@ class BaseLLM:
         """
         options = {}
         if mode == MODE_LANGCHAIN:
-            options = model.langchain
+            pass
+            # options = model.langchain
         elif mode == MODE_LLAMA_INDEX:
             options = model.llama_index
         if 'env' in options:

pygpt_net/provider/llms/deepseek_api.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.31 19:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.types import (
@@ -14,6 +14,7 @@ from pygpt_net.core.types import (
 )
 from llama_index.llms.deepseek import DeepSeek
 from llama_index.core.llms.llm import BaseLLM as LlamaBaseLLM
+
 from pygpt_net.provider.llms.base import BaseLLM
 from pygpt_net.item.model import ModelItem
 
@@ -22,6 +23,7 @@ class DeepseekApiLLM(BaseLLM):
     def __init__(self, *args, **kwargs):
         super(DeepseekApiLLM, self).__init__(*args, **kwargs)
         self.id = "deepseek_api"
+        self.name = "Deepseek API"
         self.type = [MODE_LLAMA_INDEX]
 
     def llama(

pygpt_net/provider/llms/google.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.26 16:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 from typing import Optional, List, Dict
@@ -34,6 +34,7 @@ class GoogleLLM(BaseLLM):
             - api_key: API key for Google API
         """
         self.id = "google"
+        self.name = "Google"
         self.type = [MODE_LLAMA_INDEX, "embeddings"]
 
     def llama(

pygpt_net/provider/llms/hugging_face.py

@@ -6,10 +6,10 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.26 16:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
-from langchain_community.llms import HuggingFaceHub
+# from langchain_community.llms import HuggingFaceHub
 
 from pygpt_net.core.types import (
     MODE_LANGCHAIN,
@@ -22,7 +22,8 @@ class HuggingFaceLLM(BaseLLM):
     def __init__(self, *args, **kwargs):
         super(HuggingFaceLLM, self).__init__(*args, **kwargs)
         self.id = "huggingface"
-        self.type = [MODE_LANGCHAIN]
+        self.name = "HuggingFace"
+        self.type = []
 
     def completion(
             self,
@@ -37,11 +38,13 @@ class HuggingFaceLLM(BaseLLM):
         :param model: model instance
         :param stream: stream mode
         :return: LLM provider instance
-        """
+
         args = self.parse_args(model.langchain)
         if "model" not in args:
             args["model"] = model.id
         return HuggingFaceHub(**args)
+        """
+        pass
 
     def chat(
             self,
@@ -57,4 +60,4 @@ class HuggingFaceLLM(BaseLLM):
         :param stream: stream mode
         :return: LLM provider instance
         """
-        return None
+        pass