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

pygpt_net/data/config/modes.json

@@ -52,13 +52,7 @@
             "name": "assistant",
             "label": "mode.assistant",
             "default": false
-        },
-        "langchain": {
-            "id": "langchain",
-            "name": "langchain",
-            "label": "mode.langchain",
-            "default": false
-        },        
+        },    
         "agent_llama": {
             "id": "agent_llama",
             "name": "Agent (LlamaIndex)",

pygpt_net/data/config/settings.json

@@ -103,6 +103,21 @@
         "advanced": false,
         "tab": "Google"
     },
+    "api_endpoint_google": {
+        "section": "api_keys",
+        "type": "text",
+        "slider": false,
+        "label": "settings.api_endpoint_google",
+        "description": "settings.api_endpoint_google.desc",
+        "value": "https://generativelanguage.googleapis.com/v1beta/openai",
+        "min": null,
+        "max": null,
+        "multiplier": null,
+        "step": null,
+        "secret": false,
+        "advanced": false,
+        "tab": "Google"
+    },
     "api_key_anthropic": {
         "section": "api_keys",
         "type": "text",
@@ -160,6 +175,21 @@
         "advanced": false,
         "tab": "DeepSeek"
     },
+    "api_endpoint_deepseek": {
+        "section": "api_keys",
+        "type": "text",
+        "slider": false,
+        "label": "settings.api_endpoint_deepseek",
+        "description": "settings.api_endpoint_deepseek.desc",
+        "value": "https://api.deepseek.com/v1",
+        "min": null,
+        "max": null,
+        "multiplier": null,
+        "step": null,
+        "secret": false,
+        "advanced": false,
+        "tab": "DeepSeek"
+    },
     "api_key_xai": {
         "section": "api_keys",
         "type": "text",
@@ -179,6 +209,21 @@
         "advanced": false,
         "tab": "xAI"
     },
+    "api_endpoint_xai": {
+        "section": "api_keys",
+        "type": "text",
+        "slider": false,
+        "label": "settings.api_endpoint_xai",
+        "description": "settings.api_endpoint_xai.desc",
+        "value": "https://api.x.ai/v1",
+        "min": null,
+        "max": null,
+        "multiplier": null,
+        "step": null,
+        "secret": false,
+        "advanced": false,
+        "tab": "xAI"
+    },
     "api_azure_version": {
         "section": "api_keys",
         "type": "text",
@@ -230,6 +275,21 @@
         "advanced": false,
         "tab": "Perplexity"
     },
+    "api_endpoint_perplexity": {
+        "section": "api_keys",
+        "type": "text",
+        "slider": false,
+        "label": "settings.api_endpoint_perplexity",
+        "description": "settings.api_endpoint_perplexity.desc",
+        "value": "https://api.perplexity.ai",
+        "min": null,
+        "max": null,
+        "multiplier": null,
+        "step": null,
+        "secret": false,
+        "advanced": false,
+        "tab": "Perplexity"
+    },
     "app.env": {
         "section": "general",
         "type": "dict",

pygpt_net/data/locale/locale.en.ini

@@ -816,8 +816,10 @@ model.llama_index.mode.desc = Available sub-modes: chat
 model.llama_index.provider = [LlamaIndex] Provider
 model.llama_index.provider.desc = LLM provider to use in "Chat with Files" mode
 model.mode = Mode(s)
-model.mode.desc = Available modes: chat (Chat), llama_index (Chat with Files), audio (Chat with Audio), research (Research), completion (Completion), img (Image), vision (Vision), assistant (Assistants), langchain (Langchain), agent_llama (Agent LlamaIndex), agent (Agent Autonomous), expert (Experts)
+model.mode.desc = Available modes: chat, llama_index, audio, research, completion, img, vision, assistant, agent_llama, agent, expert
 model.name = Name
+model.provider = Provider
+model.provider.desc = LLM provider
 models.importer.all = Show all
 models.importer.available.label = Ollama models
 models.importer.current.label = PyGPT models
@@ -953,8 +955,14 @@ settings.api_azure_version = OpenAI API version
 settings.api_azure_version.desc = Azure OpenAI API version, e.g. 2023-07-01-preview
 settings.api_endpoint = API Endpoint
 settings.api_endpoint.desc = OpenAI API (or compatible) endpoint URL, default: https://api.openai.com/v1
+settings.api_endpoint_deepseek = API Endpoint
+settings.api_endpoint_deepseek.desc = Deepseek API endpoint URL, default: https://api.deepseek.com/v1
+settings.api_endpoint_google = API Endpoint
+settings.api_endpoint_google.desc = Google API endpoint URL, default: https://generativelanguage.googleapis.com/v1beta/openai
+settings.api_endpoint_perplexity = API Endpoint
+settings.api_endpoint_perplexity.desc = Perplexity API endpoint URL, default: https://api.perplexity.ai
 settings.api_endpoint_xai = API Endpoint
-settings.api_endpoint_xai.desc = xAPI API endpoint URL, default: https://api.x.ai
+settings.api_endpoint_xai.desc = xAI API endpoint URL, default: https://api.x.ai
 settings.api_key = OpenAI API KEY
 settings.api_key.anthropic = Anthropic API KEY
 settings.api_key.anthropic.desc = Required for the Anthropic API and Claude models.

pygpt_net/item/model.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
@@ -15,6 +15,17 @@ from pygpt_net.core.types import MODE_CHAT
 
 
 class ModelItem:
+
+    OPENAI_COMPATIBLE = [
+        "openai",
+        "azure_openai",
+        "google",
+        "local_ai",
+        "perplexity",
+        "deepseek_api",
+        "x_ai",
+    ]
+
     def __init__(self, id=None):
         """
         Model data item
@@ -31,7 +42,7 @@ class ModelItem:
         self.tokens = 0
         self.default = False
         self.imported = False
-        self.openai = False  # OpenAI API supported model
+        self.provider = ""
         self.extra = {}
 
     def from_dict(self, data: dict):
@@ -57,8 +68,8 @@ class ModelItem:
             self.extra = data['extra']
         if 'imported' in data:
             self.imported = data['imported']
-        if 'openai' in data:
-            self.openai = data['openai']
+        if 'provider' in data:
+            self.provider = data['provider']
 
         # multimodal
         if 'multimodal' in data:
@@ -66,6 +77,7 @@ class ModelItem:
             self.multimodal = options.split(',')
 
         # langchain
+        """
         if 'langchain.provider' in data:
             self.langchain['provider'] = data['langchain.provider']
         if 'langchain.mode' in data:
@@ -78,16 +90,19 @@ class ModelItem:
             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']
+            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:
@@ -103,27 +118,29 @@ class ModelItem:
         data['id'] = self.id
         data['name'] = self.name
         data['mode'] = ','.join(self.mode)
-        data['langchain'] = self.langchain
+        # data['langchain'] = self.langchain
         data['ctx'] = self.ctx
         data['tokens'] = self.tokens
         data['default'] = self.default
         data['multimodal'] = ','.join(self.multimodal)
         data['extra'] = self.extra
         data['imported'] = self.imported
-        data['openai'] = self.openai
-
-        data['langchain.provider'] = None
-        data['langchain.mode'] = ""
-        data['langchain.args'] = []
-        data['langchain.env'] = []
-        data['llama_index.provider'] = None
-        data['llama_index.mode'] = ""
+        data['provider'] = self.provider
+
+        # 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']
+            data['langchain.provider'] = self.langchain['provider']        
         if 'mode' in self.langchain:
             data['langchain.mode'] = ",".join(self.langchain['mode'])
         if 'args' in self.langchain:
@@ -147,12 +164,13 @@ class ModelItem:
                     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'])
+        # 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'])
         if 'args' in self.llama_index:
             # old versions support
             if isinstance(self.llama_index['args'], dict):
@@ -184,8 +202,8 @@ class ModelItem:
         :param mode: Mode
         :return: True if supported
         """
-        if mode == MODE_CHAT and not self.is_openai():
-            # only OpenAI models are supported for chat mode
+        if mode == MODE_CHAT and not self.is_openai_supported():
+            # only OpenAI API compatible models are supported in Chat mode
             return False
         return mode in self.mode
 
@@ -197,13 +215,13 @@ class ModelItem:
         """
         return len(self.multimodal) > 0
 
-    def is_openai(self) -> bool:
+    def is_openai_supported(self) -> bool:
         """
-        Check if model is supported by OpenAI API
+        Check if model is supported by OpenAI API (or compatible)
 
-        :return: True if OpenAI
+        :return: True if OpenAI compatible
         """
-        return self.openai
+        return self.provider in self.OPENAI_COMPATIBLE
 
     def is_gpt(self) -> bool:
         """
@@ -226,12 +244,17 @@ class ModelItem:
 
         :return: True if Ollama
         """
+        if self.provider == "ollama":
+            return True
         if self.llama_index is None:
             return False
         if self.llama_index.get("provider") is None:
             return False
         return "ollama" in self.llama_index.get("provider", "")
 
+    def get_provider(self):
+        return self.provider
+
     def get_ollama_model(self) -> str:
         """
         Get Ollama model ID
@@ -244,14 +267,6 @@ class ModelItem:
                     return arg["value"]
         return ""
 
-    def get_llama_provider(self) -> str:
-        """
-        Get Llama Index provider
-
-        :return: provider name
-        """
-        return self.llama_index.get("provider", "")
-
     def has_mode(self, mode: str) -> bool:
         """
         Check if model has mode

pygpt_net/plugin/base/plugin.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 copy
@@ -289,13 +289,14 @@ class BasePlugin(QObject):
         msg = self.window.core.debug.parse_alert(err)
         self.window.ui.dialogs.alert("{}: {}".format(self.name, msg))
 
-    def debug(self, data: Any):
+    def debug(self, data: Any, console: bool = True):
         """
         Send debug message to logger window
 
         :param data: data to send
+        :param console: print in console
         """
-        self.window.core.debug.info(data)
+        self.window.core.debug.info(data, console)
 
     def reply(
             self,
@@ -347,7 +348,7 @@ class BasePlugin(QObject):
         :param msg: message to log
         """
         msg = "[{}] {}".format(self.prefix, msg)
-        self.debug(msg)
+        self.debug(msg, not self.is_log())
         if self.is_threaded():
             return
         self.window.update_status(msg.replace("\n", " "))
@@ -439,7 +440,7 @@ class BasePlugin(QObject):
         :param ctx: context (CtxItem)
         :return: response dict
         """
-        ignore_extra = ["request", "result", "context"]
+        ignore_extra = ["request", "context"]
         allow_output = ["request", "result", "context"]
         clean_response = {}
         for key in response:

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.06.27 16:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 import copy
@@ -1880,6 +1880,17 @@ class Patch:
                     data["api_endpoint_xai"] = "https://api.x.ai/v1"
                 updated = True
 
+            # < 2.5.20
+            if old < parse_version("2.5.20"):
+                print("Migrating config from < 2.5.20...")
+                if 'api_endpoint_deepseek' not in data:
+                    data["api_endpoint_deepseek"] = "https://api.deepseek.com/v1"
+                if 'api_endpoint_google' not in data:
+                    data["api_endpoint_google"] = "https://generativelanguage.googleapis.com/v1beta/openai"
+                if "mode" in data and "mode" == "langchain":  # deprecated mode
+                    data["mode"] = "chat"
+                updated = True
+
         # update file
         migrated = False
         if updated:

pygpt_net/provider/core/model/json_file.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                  #
 # ================================================== #
 
 import json
@@ -158,7 +158,7 @@ class JsonFileProvider(BaseProvider):
             'id': item.id,
             'name': item.name,
             'mode': item.mode,
-            'langchain': item.langchain,
+            # 'langchain': item.langchain,
             'llama_index': item.llama_index,
             'ctx': item.ctx,
             'tokens': item.tokens,
@@ -166,7 +166,7 @@ class JsonFileProvider(BaseProvider):
             'multimodal': item.multimodal,
             'extra': item.extra,
             'imported': item.imported,
-            'openai': item.openai,
+            'provider': item.provider,
         }
 
     @staticmethod
@@ -183,8 +183,8 @@ class JsonFileProvider(BaseProvider):
             item.name = data['name']
         if 'mode' in data:
             item.mode = data['mode']
-        if 'langchain' in data:
-            item.langchain = data['langchain']
+        # if 'langchain' in data:
+            # item.langchain = data['langchain']
         if 'llama_index' in data:
             item.llama_index = data['llama_index']
         if 'ctx' in data:
@@ -199,8 +199,8 @@ class JsonFileProvider(BaseProvider):
             item.extra = data['extra']
         if 'imported' in data:
             item.imported = data['imported']
-        if 'openai' in data:
-            item.openai = data['openai']
+        if 'provider' in data:
+            item.provider = data['provider']
 
     def dump(self, item: ModelItem) -> str:
         """

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: