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

pygpt_net/core/command/__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.25 02:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 import copy
@@ -617,8 +617,8 @@ class Command:
         :return: True if enabled
         """
         disabled_modes = [
-            #MODE_LLAMA_INDEX,
-            MODE_LANGCHAIN,
+            # MODE_LLAMA_INDEX,
+            # MODE_LANGCHAIN,
             MODE_COMPLETION,
         ]
         mode = self.window.core.config.get('mode')
@@ -630,10 +630,12 @@ class Command:
         if model:
             model_data = self.window.core.models.get(model)
             if model_data:
-                llama_provider = model_data.get_llama_provider()
-                if llama_provider in self.window.core.idx.chat.tool_calls_not_allowed_providers:
+                if not self.window.core.models.is_tool_call_allowed(mode, model_data):
                     return False
-        return self.window.core.config.get('func_call.native', False)  # otherwise check config
+        enabled = self.window.core.config.get('func_call.native', False)  # otherwise check config
+        # if enabled:
+            # self.window.core.debug.info("[cmd] Native tool calls enabled")
+        return enabled
 
     def is_enabled(self, cmd: str) -> bool:
         """
@@ -693,12 +695,12 @@ class Command:
             "deepseek-r1:1.5b",
             "deepseek-r1:7b",
             "llama2",
-            "llama3.1",
+            #"llama3.1",
             "codellama",
         ]
         if model.id is not None:
             for disabled_model in disabled_models:
-                if (model.llama_index['provider'] == "ollama"
+                if (model.get_provider() == "ollama"
                         and model.id.startswith(disabled_model)):
                     return False
         return True

pygpt_net/core/debug/presets.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.03.02 19:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 import os
@@ -60,7 +60,7 @@ class PresetsDebug:
                 MODE_COMPLETION: preset.completion,
                 MODE_IMAGE: preset.img,
                 MODE_VISION: preset.vision,
-                MODE_LANGCHAIN: preset.langchain,
+                # MODE_LANGCHAIN: preset.langchain,
                 MODE_ASSISTANT: preset.assistant,
                 MODE_LLAMA_INDEX: preset.llama_index,
                 MODE_AGENT: preset.agent,

pygpt_net/core/experts/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.03.02 19:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 from typing import Dict, List
@@ -40,7 +40,7 @@ class Experts:
             MODE_CHAT,
             MODE_COMPLETION,
             MODE_VISION,
-            MODE_LANGCHAIN,
+            # MODE_LANGCHAIN,
             MODE_LLAMA_INDEX,
             MODE_AUDIO,
             MODE_RESEARCH,

pygpt_net/core/idx/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.26 16:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 import json
@@ -37,12 +37,6 @@ class Chat:
         self.window = window
         self.storage = storage
         self.context = Context(window)
-        self.tool_calls_not_allowed_providers = [
-            "ollama",
-            "google",
-            "hugging_face_api",
-            "deepseek_api",
-        ]
 
     def call(
             self,
@@ -73,17 +67,11 @@ class Chat:
                 extra=extra,
             )
 
-        # if not raw, check if chat mode is available
-        if MODE_CHAT in model.llama_index['mode']:
-            return self.chat(
-                context=context,
-                extra=extra,
-            )
-        else:
-            return self.query(
-                context=context,
-                extra=extra,
-            )  # if not, use query mode
+        # chat
+        return self.chat(
+            context=context,
+            extra=extra,
+        )
 
     def raw_query(
             self,
@@ -239,8 +227,7 @@ class Chat:
         verbose = self.window.core.config.get("log.llama", False)
         allow_native_tool_calls = True
         response = None
-        if ('provider' in model.llama_index
-                and model.llama_index['provider'] in self.tool_calls_not_allowed_providers):
+        if not self.window.core.models.is_tool_call_allowed(context.mode, model):
             allow_native_tool_calls = False
 
         if idx is None or idx == "_":

pygpt_net/core/idx/llm.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.16 01:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 import os.path
@@ -31,7 +31,7 @@ class Llm:
         :param window: Window instance
         """
         self.window = window
-        self.default_model = "gpt-3.5-turbo"
+        self.default_model = "gpt-4o-mini"
         self.default_embed = "openai"
         self.initialized = False
 
@@ -56,39 +56,38 @@ class Llm:
         # TMP: deprecation warning fix
         # https://github.com/DataDog/dd-trace-py/issues/8212#issuecomment-1971063988
         if not self.initialized:
-            import warnings
-            from langchain._api import LangChainDeprecationWarning
-            warnings.simplefilter("ignore", category=LangChainDeprecationWarning)
+            # import warnings
+            # from langchain._api import LangChainDeprecationWarning
+            # warnings.simplefilter("ignore", category=LangChainDeprecationWarning)
             self.initialized = True
 
         llm = None
         if model is not None:
-            if 'provider' in model.llama_index:
-                provider = model.llama_index['provider']
-                if provider in self.window.core.llm.llms:
-                    # init env vars
-                    self.window.core.llm.llms[provider].init(
+            provider = model.get_provider()
+            if provider in self.window.core.llm.llms:
+                # init env vars
+                self.window.core.llm.llms[provider].init(
+                    window=self.window,
+                    model=model,
+                    mode=MODE_LLAMA_INDEX,
+                    sub_mode="",
+                )
+                # get llama LLM instance
+                if multimodal and model.is_multimodal():
+                    # at first, try to get multimodal provider
+                    llm = self.window.core.llm.llms[provider].llama_multimodal(
+                        window=self.window,
+                        model=model,
+                    )
+                    if llm is not None:
+                        print("Using multimodal.")
+
+                if llm is None:
+                    # if no multimodal, get default llama provider
+                    llm = self.window.core.llm.llms[provider].llama(
                         window=self.window,
                         model=model,
-                        mode=MODE_LLAMA_INDEX,
-                        sub_mode="",
                     )
-                    # get llama LLM instance
-                    if multimodal and model.is_multimodal():
-                        # at first, try to get multimodal provider
-                        llm = self.window.core.llm.llms[provider].llama_multimodal(
-                            window=self.window,
-                            model=model,
-                        )
-                        if llm is not None:
-                            print("Using multimodal.")
-
-                    if llm is None:
-                        # if no multimodal, get default llama provider
-                        llm = self.window.core.llm.llms[provider].llama(
-                            window=self.window,
-                            model=model,
-                        )
 
         # default model
         if llm is None:

pygpt_net/core/llm/__init__.py

@@ -6,10 +6,10 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.14 08:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
-from typing import Optional, List
+from typing import Optional, List, Dict
 
 
 class LLM:
@@ -34,7 +34,29 @@ class LLM:
         """
         if type is not None:
             return [id for id in self.llms.keys() if type in self.llms[id].type]
-        return list(self.llms.keys())
+        return list(self.llms.keys())  # get all
+
+    def get_choices(
+            self,
+            type: Optional[str] = None
+    ) -> Dict[str, str]:
+        """
+        Get providers choices
+
+        :param type: provider type
+        :return: providers choices
+        """
+        choices = {}
+        if type is not None:
+            for id in list(self.llms.keys()):
+                if type in self.llms[id].type:
+                    choices[id] = self.llms[id].name
+        else:
+            for id in list(self.llms.keys()):
+                choices[id] = self.llms[id].name
+
+        # sorted by name
+        return dict(sorted(choices.items(), key=lambda item: item[1].lower()))
 
     def register(
             self,

pygpt_net/core/models/__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.26 16:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 import copy
@@ -385,32 +385,106 @@ class Models:
         :param mode: mode (initial)
         :return: mode (supported)
         """
+        prev_mode = mode
         # if OpenAI API model and not llama_index mode, switch to Chat mode
-        if model.is_openai():
-            if model.is_supported(MODE_CHAT) and mode != MODE_LLAMA_INDEX:  # do not switch if llama_index mode!
+        if model.is_supported(MODE_CHAT) and mode != MODE_LLAMA_INDEX:  # do not switch if llama_index mode!
+            if prev_mode != MODE_CHAT:
                 self.window.core.debug.info(
-                    "WARNING: Switching to chat mode (model not supported in: {})".format(mode))
-                return MODE_CHAT
+                    "WARNING: Switching to chat mode (model not supported in: {})".format(prev_mode))
+            return MODE_CHAT
 
         # Research / Perplexity
         if model.is_supported(MODE_RESEARCH):
-            self.window.core.debug.info(
-                "WARNING: Switching to research mode (model not supported in: {})".format(mode))
+            if prev_mode != MODE_RESEARCH:
+                self.window.core.debug.info(
+                    "WARNING: Switching to research mode (model not supported in: {})".format(mode))
             mode = MODE_RESEARCH
 
         # Llama Index / Chat with Files
         elif model.is_supported(MODE_LLAMA_INDEX):
-            self.window.core.debug.info(
-                "WARNING: Switching to llama_index mode (model not supported in: {})".format(mode))
+            if prev_mode != MODE_LLAMA_INDEX:
+                self.window.core.debug.info(
+                    "WARNING: Switching to llama_index mode (model not supported in: {})".format(mode))
             mode = MODE_LLAMA_INDEX
 
         # LangChain
+        """
         elif model.is_supported(MODE_LANGCHAIN):
             self.window.core.debug.info(
                 "WARNING: Switching to langchain mode (model not supported in: {})".format(mode))
             mode = MODE_LANGCHAIN
+        """
         return mode
 
+    def prepare_client_args(
+            self,
+            args: dict,
+            mode: str = MODE_CHAT,
+            model: ModelItem = None
+    ) -> Dict[str, str]:
+        """
+        Prepare chat client arguments
+
+        :param args: client arguments
+        :param mode: mode name
+        :param model: ModelItem
+        :return: client arguments dict
+        """
+        # research mode endpoint - Perplexity
+        if mode == MODE_RESEARCH:
+            args["api_key"] = self.window.core.config.get('api_key_perplexity', "")
+            args["base_url"] = self.window.core.config.get('api_endpoint_perplexity', "")
+            self.window.core.debug.info("[api] Using client: Perplexity")
+        elif mode == MODE_CHAT:
+            if model is not None:
+                # xAI / grok
+                if model.provider == "x_ai":
+                    args["api_key"] = self.window.core.config.get('api_key_xai', "")
+                    args["base_url"] = self.window.core.config.get('api_endpoint_xai', "")
+                    self.window.core.debug.info("[api] Using client: xAI")
+                # Perplexity
+                elif model.provider == "perplexity":
+                    args["api_key"] = self.window.core.config.get('api_key_perplexity', "")
+                    args["base_url"] = self.window.core.config.get('api_endpoint_perplexity', "")
+                    self.window.core.debug.info("[api] Using client: Perplexity")
+                # Google
+                elif model.provider == "google":
+                    args["api_key"] = self.window.core.config.get('api_key_google', "")
+                    args["base_url"] = self.window.core.config.get('api_endpoint_google', "")
+                    self.window.core.debug.info("[api] Using client: Google")
+                # Deepseek
+                elif model.provider == "deepseek_api":
+                    args["api_key"] = self.window.core.config.get('api_key_deepseek_api', "")
+                    args["base_url"] = self.window.core.config.get('api_endpoint_deepseek_api', "")
+                    self.window.core.debug.info("[api] Using client: Deepseek API")
+                else:
+                    self.window.core.debug.info("[api] Using client: OpenAI default")
+            else:
+                self.window.core.debug.info("[api] No model provided, using default OpenAI client")
+        return args
+
+    def is_tool_call_allowed(self, mode: str, model: ModelItem) -> bool:
+        """
+        Check if native tool call is allowed for model and mode
+
+        :param mode: Mode name
+        :param model: ModelItem
+        :return: True if tool call is allowed, False otherwise
+        """
+        not_allowed_providers = [
+            "ollama",
+            "hugging_face_api",
+            "deepseek_api",
+            "perplexity",
+            # "x_ai",
+        ]
+        if mode == MODE_LLAMA_INDEX:
+            if model.provider == "google":
+                not_allowed_providers.append("google")  # bug in types in google-generativeai==0.8.5
+        if model.provider in not_allowed_providers:
+            return False
+        return True
+
     def get_version(self) -> str:
         """
         Get config version

pygpt_net/core/modes/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.03.02 19:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 from typing import Dict, List
@@ -48,7 +48,7 @@ class Modes:
             MODE_COMPLETION,
             MODE_EXPERT,
             MODE_IMAGE,
-            MODE_LANGCHAIN,
+            # MODE_LANGCHAIN,
             MODE_LLAMA_INDEX,
             MODE_VISION,
             MODE_RESEARCH,

pygpt_net/core/presets/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.03.02 19:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 import copy
@@ -220,8 +220,8 @@ class Presets:
             return MODE_IMAGE
         if preset.vision:
             return MODE_VISION
-        if preset.langchain:
-            return MODE_LANGCHAIN
+        # if preset.langchain:
+            # return MODE_LANGCHAIN
         if preset.assistant:
             return MODE_ASSISTANT
         if preset.llama_index:

pygpt_net/core/prompt/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.02.01 11:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.events import Event
@@ -81,8 +81,8 @@ class Prompt:
                 return prompt
 
             # abort if model not supported
-            if not self.window.core.command.is_model_supports_tools(mode, model):
-                return prompt
+            # if not self.window.core.command.is_model_supports_tools(mode, model):
+                # return prompt
 
             # cmd syntax tokens
             data = {
@@ -169,8 +169,8 @@ class Prompt:
                 return sys_prompt  # abort if native func call enabled
 
             # abort if model not supported
-            if not self.window.core.command.is_model_supports_tools(mode, model):
-                return sys_prompt
+            # if not self.window.core.command.is_model_supports_tools(mode, model):
+                # return sys_prompt
 
             data = {
                 'mode': mode,

pygpt_net/core/render/web/renderer.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.06.21 16:00:00                  #
+# Updated Date: 2025.06.28 22:00:00                  #
 # ================================================== #
 
 import json
@@ -1001,7 +1001,7 @@ class Renderer(BaseRenderer):
         escaped_html = json.dumps(html)
         try:
             node = self.get_output_node_by_pid(pid)
-            node.page().runJavaScript(f"appendNode({escaped_html});")
+            node.page().runJavaScript(f"if (typeof window.appendNode !== 'undefined') appendNode({escaped_html});")
             node.update_current_content()
         except Exception as e:
             pass
@@ -1083,7 +1083,7 @@ class Renderer(BaseRenderer):
         :param ctx: context item
         """
         try:
-            self.get_output_node(ctx.meta).page().runJavaScript("removeNode({});".format(ctx.id))
+            self.get_output_node(ctx.meta).page().runJavaScript("if (typeof window.removeNode !== 'undefined') removeNode({});".format(ctx.id))
         except Exception as e:
             pass
 
@@ -1094,7 +1094,7 @@ class Renderer(BaseRenderer):
         :param ctx: context item
         """
         try:
-            self.get_output_node(ctx.meta).page().runJavaScript("removeNodesFromId({});".format(ctx.id))
+            self.get_output_node(ctx.meta).page().runJavaScript("if (typeof window.removeNodesFromId !== 'undefined') removeNodesFromId({});".format(ctx.id))
         except Exception as e:
             pass
 
@@ -1147,7 +1147,7 @@ class Renderer(BaseRenderer):
         try:
             nodes = self.get_all_nodes()
             for node in nodes:
-                node.page().runJavaScript("enableEditIcons();")
+                node.page().runJavaScript("if (typeof window.enableEditIcons !== 'undefined') enableEditIcons();")
         except Exception as e:
             pass
 
@@ -1162,7 +1162,7 @@ class Renderer(BaseRenderer):
         try:
             nodes = self.get_all_nodes()
             for node in nodes:
-                node.page().runJavaScript("disableEditIcons();")
+                node.page().runJavaScript("if (typeof window.disableEditIcons !== 'undefined') disableEditIcons();")
         except Exception as e:
             pass
 
@@ -1177,7 +1177,7 @@ class Renderer(BaseRenderer):
         try:
             nodes = self.get_all_nodes()
             for node in nodes:
-                node.page().runJavaScript("enableTimestamp();")
+                node.page().runJavaScript("if (typeof window.enableTimestamp !== 'undefined') enableTimestamp();")
         except Exception as e:
             pass
 
@@ -1192,7 +1192,7 @@ class Renderer(BaseRenderer):
         try:
             nodes = self.get_all_nodes()
             for node in nodes:
-                node.page().runJavaScript("disableTimestamp();")
+                node.page().runJavaScript("if (typeof window.disableTimestamp !== 'undefined') disableTimestamp();")
         except Exception as e:
             pass
 
@@ -1253,11 +1253,11 @@ class Renderer(BaseRenderer):
         for pid in self.pids:
             if self.pids[pid].loaded:
                 for node in nodes:
-                    node.page().runJavaScript("updateCSS({});".format(to_json))
+                    node.page().runJavaScript("if (typeof window.updateCSS !== 'undefined') updateCSS({});".format(to_json))
                     if self.window.core.config.get('render.blocks'):
-                        node.page().runJavaScript("enableBlocks();")
+                        node.page().runJavaScript("if (typeof window.enableBlocks !== 'undefined') enableBlocks();")
                     else:
-                        node.page().runJavaScript("disableBlocks();")  # TODO: ctx!!!!!
+                        node.page().runJavaScript("if (typeof window.disableBlocks !== 'undefined') disableBlocks();")  # TODO: ctx!!!!!
                 return
 
     def on_theme_change(self):
@@ -1281,7 +1281,7 @@ class Renderer(BaseRenderer):
         """
         escaped_content = json.dumps(content)
         try:
-            self.get_output_node(meta).page().runJavaScript(f"appendToolOutput({escaped_content});")
+            self.get_output_node(meta).page().runJavaScript(f"if (typeof window.appendToolOutput !== 'undefined') appendToolOutput({escaped_content});")
         except Exception as e:
             pass
 
@@ -1298,7 +1298,7 @@ class Renderer(BaseRenderer):
         """
         escaped_content = json.dumps(content)
         try:
-            self.get_output_node(meta).page().runJavaScript(f"updateToolOutput({escaped_content});")
+            self.get_output_node(meta).page().runJavaScript(f"if (typeof window.updateToolOutput !== 'undefined') updateToolOutput({escaped_content});")
         except Exception as e:
             pass
 
@@ -1309,7 +1309,7 @@ class Renderer(BaseRenderer):
         :param meta: context meta
         """
         try:
-            self.get_output_node(meta).page().runJavaScript(f"clearToolOutput();")
+            self.get_output_node(meta).page().runJavaScript(f"if (typeof window.clearToolOutput !== 'undefined') clearToolOutput();")
         except Exception as e:
             pass
 
@@ -1320,14 +1320,14 @@ class Renderer(BaseRenderer):
         :param meta: context meta
         """
         try:
-            self.get_output_node(meta).page().runJavaScript(f"beginToolOutput();")
+            self.get_output_node(meta).page().runJavaScript(f"if (typeof window.beginToolOutput !== 'undefined') beginToolOutput();")
         except Exception as e:
             pass
 
     def tool_output_end(self):
         """End tool output"""
         try:
-            self.get_output_node().page().runJavaScript(f"endToolOutput();")
+            self.get_output_node().page().runJavaScript(f"if (typeof window.endToolOutput !== 'undefined') endToolOutput();")
         except Exception as e:
             pass
 

pygpt_net/core/tokens/__init__.py

@@ -6,14 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.03.02 19:00:00                  #
+# Updated Date: 2025.06.28 16:00:00                  #
 # ================================================== #
 
 from typing import Tuple, List
 
 import tiktoken
 
-from langchain_core.messages import ChatMessage as ChatMessageLangchain
+# from langchain_core.messages import ChatMessage as ChatMessageLangchain
 from llama_index.core.base.llms.types import ChatMessage as ChatMessageLlama
 
 from pygpt_net.core.types import (
@@ -186,7 +186,7 @@ class Tokens:
 
     @staticmethod
     def from_langchain_messages(
-            messages: List[ChatMessageLangchain],
+            messages: List,
             model: str = "gpt-4"
     ) -> int:
         """

pygpt_net/core/updater/__init__.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                  #
 # ================================================== #
 
 import copy
@@ -16,6 +16,7 @@ import json
 import ssl
 import time
 from typing import Tuple
+import locale
 
 from urllib.request import urlopen, Request
 
@@ -333,8 +334,9 @@ class Updater:
         :param people: people list
         :return: parsed people list
         """
-        # split by ",", trim, add to list, sort and return joined
-        return ", ".join(natsort([x.strip() for x in people.split(",")]))
+        people_list = [x.strip() for x in people.split(",")]
+        sorted_people = sorted(people_list, key=locale.strxfrm)
+        return ", ".join(sorted_people)
 
     def check(self, force: bool = False) -> bool:
         """