pygpt-net 2.4.56__tar.gz → 2.5.0__tar.gz

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 2.5.0 (2025-01-31)
+
+- Added provider for DeepSeek (in Chat with Files mode, beta).
+- Added new models: OpenAI o1, Llama 3.3, DeepSeek V3 and R1 (API + local, with Ollama).
+- Added tool calls for OpenAI o1.
+- Added native vision for OpenAI o1.
+- Fix: tool calls in Ollama provider.
+- Fix: error handling in stream mode.
+- Fix: added check for active plugin tools before tool call.
+
+## 2.4.57 (2025-01-19)
+
+- Logging fix.
+
 ## 2.4.56 (2025-01-19)
 
 - Improved tab switching and focus change.

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygpt-net
-Version: 2.4.56
+Version: 2.5.0
 Summary: Desktop AI Assistant powered by models: OpenAI o1, GPT-4o, GPT-4, GPT-4 Vision, GPT-3.5, DALL-E 3, Llama 3, Mistral, Gemini, Claude, Bielik, and other models supported by Langchain, Llama Index, and Ollama. Features include chatbot, text completion, image generation, vision analysis, speech-to-text, internet access, file handling, command execution and more.
 Home-page: https://pygpt.net
 License: MIT
@@ -47,6 +47,7 @@ Requires-Dist: llama-index-embeddings-ollama (>=0.5.0,<0.6.0)
 Requires-Dist: llama-index-embeddings-openai (>=0.3.1,<0.4.0)
 Requires-Dist: llama-index-llms-anthropic (>=0.6.3,<0.7.0)
 Requires-Dist: llama-index-llms-azure-openai (>=0.3.0,<0.4.0)
+Requires-Dist: llama-index-llms-deepseek (>=0.1.0,<0.2.0)
 Requires-Dist: llama-index-llms-gemini (>=0.4.3,<0.5.0)
 Requires-Dist: llama-index-llms-huggingface-api (>=0.3.1,<0.4.0)
 Requires-Dist: llama-index-llms-ollama (>=0.5.0,<0.6.0)
@@ -93,7 +94,7 @@ Description-Content-Type: text/markdown
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.4.56** | build: **2025.01.19** | Python: **>=3.10, <3.13**
+Release: **2.5.0** | build: **2025.01.31** | Python: **>=3.10, <3.13**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -105,7 +106,7 @@ Release: **2.4.56** | build: **2025.01.19** | Python: **>=3.10, <3.13**
 
 ## Overview
 
-**PyGPT** is **all-in-one** Desktop AI Assistant that provides direct interaction with OpenAI language models, including `o1`, `gpt-4o`, `gpt-4`, `gpt-4 Vision`, and `gpt-3.5`, through the `OpenAI API`. By utilizing `LangChain` and `LlamaIndex`, the application also supports alternative LLMs, like those available on `HuggingFace`, locally available models (like `Llama 3`,`Mistral` or `Bielik`), `Google Gemini` and `Anthropic Claude`.
+**PyGPT** is **all-in-one** Desktop AI Assistant that provides direct interaction with OpenAI language models, including `o1`, `gpt-4o`, `gpt-4`, `gpt-4 Vision`, and `gpt-3.5`, through the `OpenAI API`. By utilizing `LangChain` and `LlamaIndex`, the application also supports alternative LLMs, like those available on `HuggingFace`, locally available models (like `Llama 3`,`Mistral`, `DeepSeek V3/R1` or `Bielik`), `Google Gemini` and `Anthropic Claude`.
 
 This assistant offers multiple modes of operation such as chat, assistants, completions, and image-related tasks using `DALL-E 3` for generation and `gpt-4 Vision` for image analysis. **PyGPT** has filesystem capabilities for file I/O, can generate and run Python code, execute system commands, execute custom commands and manage file transfers. It also allows models to perform web searches with the `Google` and `Microsoft Bing`.
 
@@ -130,7 +131,7 @@ You can download compiled 64-bit versions for Windows and Linux here: https://py
 - Desktop AI Assistant for `Linux`, `Windows` and `Mac`, written in Python.
 - Works similarly to `ChatGPT`, but locally (on a desktop computer).
 - 11 modes of operation: Chat, Vision, Completion, Assistant, Image generation, LangChain, Chat with Files, Chat with Audio, Experts, Autonomous Mode and Agents.
-- Supports multiple models: `o1`, `GPT-4o`, `GPT-4`, `GPT-3.5`, and any model accessible through `LangChain`, `LlamaIndex` and `Ollama` such as `Llama 3`, `Mistral`, `Google Gemini`, `Anthropic Claude`, `Bielik`, etc.
+- Supports multiple models: `o1`, `GPT-4o`, `GPT-4`, `GPT-3.5`, and any model accessible through `LangChain`, `LlamaIndex` and `Ollama` such as `Llama 3`, `Mistral`, `Google Gemini`, `Anthropic Claude`, `DeepSeek V3/R1`, `Bielik`, etc.
 - Chat with your own Files: integrated `LlamaIndex` support: chat with data such as: `txt`, `pdf`, `csv`, `html`, `md`, `docx`, `json`, `epub`, `xlsx`, `xml`, webpages, `Google`, `GitHub`, video/audio, images and other data types, or use conversation history as additional context provided to the model.
 - Built-in vector databases support and automated files and data embedding.
 - Included support features for individuals with disabilities: customizable keyboard shortcuts, voice control, and translation of on-screen actions into audio via speech synthesis.
@@ -4051,6 +4052,20 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.5.0 (2025-01-31)**
+
+- Added provider for DeepSeek (in Chat with Files mode, beta).
+- Added new models: OpenAI o1, Llama 3.3, DeepSeek V3 and R1 (API + local, with Ollama).
+- Added tool calls for OpenAI o1.
+- Added native vision for OpenAI o1.
+- Fix: tool calls in Ollama provider.
+- Fix: error handling in stream mode.
+- Fix: added check for active plugin tools before tool call.
+
+**2.4.57 (2025-01-19)**
+
+- Logging fix.
+
 **2.4.56 (2025-01-19)**
 
 - Improved tab switching and focus change.

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/README.md

@@ -2,7 +2,7 @@
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.4.56** | build: **2025.01.19** | Python: **>=3.10, <3.13**
+Release: **2.5.0** | build: **2025.01.31** | Python: **>=3.10, <3.13**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -14,7 +14,7 @@ Release: **2.4.56** | build: **2025.01.19** | Python: **>=3.10, <3.13**
 
 ## Overview
 
-**PyGPT** is **all-in-one** Desktop AI Assistant that provides direct interaction with OpenAI language models, including `o1`, `gpt-4o`, `gpt-4`, `gpt-4 Vision`, and `gpt-3.5`, through the `OpenAI API`. By utilizing `LangChain` and `LlamaIndex`, the application also supports alternative LLMs, like those available on `HuggingFace`, locally available models (like `Llama 3`,`Mistral` or `Bielik`), `Google Gemini` and `Anthropic Claude`.
+**PyGPT** is **all-in-one** Desktop AI Assistant that provides direct interaction with OpenAI language models, including `o1`, `gpt-4o`, `gpt-4`, `gpt-4 Vision`, and `gpt-3.5`, through the `OpenAI API`. By utilizing `LangChain` and `LlamaIndex`, the application also supports alternative LLMs, like those available on `HuggingFace`, locally available models (like `Llama 3`,`Mistral`, `DeepSeek V3/R1` or `Bielik`), `Google Gemini` and `Anthropic Claude`.
 
 This assistant offers multiple modes of operation such as chat, assistants, completions, and image-related tasks using `DALL-E 3` for generation and `gpt-4 Vision` for image analysis. **PyGPT** has filesystem capabilities for file I/O, can generate and run Python code, execute system commands, execute custom commands and manage file transfers. It also allows models to perform web searches with the `Google` and `Microsoft Bing`.
 
@@ -39,7 +39,7 @@ You can download compiled 64-bit versions for Windows and Linux here: https://py
 - Desktop AI Assistant for `Linux`, `Windows` and `Mac`, written in Python.
 - Works similarly to `ChatGPT`, but locally (on a desktop computer).
 - 11 modes of operation: Chat, Vision, Completion, Assistant, Image generation, LangChain, Chat with Files, Chat with Audio, Experts, Autonomous Mode and Agents.
-- Supports multiple models: `o1`, `GPT-4o`, `GPT-4`, `GPT-3.5`, and any model accessible through `LangChain`, `LlamaIndex` and `Ollama` such as `Llama 3`, `Mistral`, `Google Gemini`, `Anthropic Claude`, `Bielik`, etc.
+- Supports multiple models: `o1`, `GPT-4o`, `GPT-4`, `GPT-3.5`, and any model accessible through `LangChain`, `LlamaIndex` and `Ollama` such as `Llama 3`, `Mistral`, `Google Gemini`, `Anthropic Claude`, `DeepSeek V3/R1`, `Bielik`, etc.
 - Chat with your own Files: integrated `LlamaIndex` support: chat with data such as: `txt`, `pdf`, `csv`, `html`, `md`, `docx`, `json`, `epub`, `xlsx`, `xml`, webpages, `Google`, `GitHub`, video/audio, images and other data types, or use conversation history as additional context provided to the model.
 - Built-in vector databases support and automated files and data embedding.
 - Included support features for individuals with disabilities: customizable keyboard shortcuts, voice control, and translation of on-screen actions into audio via speech synthesis.
@@ -3960,6 +3960,20 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**2.5.0 (2025-01-31)**
+
+- Added provider for DeepSeek (in Chat with Files mode, beta).
+- Added new models: OpenAI o1, Llama 3.3, DeepSeek V3 and R1 (API + local, with Ollama).
+- Added tool calls for OpenAI o1.
+- Added native vision for OpenAI o1.
+- Fix: tool calls in Ollama provider.
+- Fix: error handling in stream mode.
+- Fix: added check for active plugin tools before tool call.
+
+**2.4.57 (2025-01-19)**
+
+- Logging fix.
+
 **2.4.56 (2025-01-19)**
 
 - Improved tab switching and focus change.

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pygpt-net"
-version = "2.4.56"
+version = "2.5.0"
 description = "Desktop AI Assistant powered by models: OpenAI o1, GPT-4o, GPT-4, GPT-4 Vision, GPT-3.5, DALL-E 3, Llama 3, Mistral, Gemini, Claude, Bielik, and other models supported by Langchain, Llama Index, and Ollama. Features include chatbot, text completion, image generation, vision analysis, speech-to-text, internet access, file handling, command execution and more."
 authors = ["Marcin Szczyglinski <info@pygpt.net>"]
 license = "MIT"
@@ -46,17 +46,18 @@ llama-index = "^0.12.11"
 llama-index-agent-openai = "^0.4.2"
 llama-index-core = "0.12.11"
 llama-index-embeddings-azure-openai = "^0.3.0"
-llama-index-embeddings-huggingface-api = "^0.3.0"
 llama-index-embeddings-gemini = "^0.3.1"
-llama-index-embeddings-openai = "^0.3.1"
+llama-index-embeddings-huggingface-api = "^0.3.0"
 llama-index-embeddings-ollama = "^0.5.0"
+llama-index-embeddings-openai = "^0.3.1"
 llama-index-llms-anthropic = "^0.6.3"
-llama-index-llms-huggingface-api = "^0.3.1"
-llama-index-llms-openai = "^0.3.13"
-llama-index-llms-openai-like = "^0.3.3"
 llama-index-llms-azure-openai = "^0.3.0"
+llama-index-llms-deepseek = "^0.1.0"
 llama-index-llms-gemini = "^0.4.3"
+llama-index-llms-huggingface-api = "^0.3.1"
 llama-index-llms-ollama = "^0.5.0"
+llama-index-llms-openai = "^0.3.13"
+llama-index-llms-openai-like = "^0.3.3"
 llama-index-multi-modal-llms-openai = "^0.4.2"
 llama-index-vector-stores-chroma = "^0.4.1"
 llama-index-vector-stores-elasticsearch = "^0.4.0"

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/src/pygpt_net/CHANGELOG.txt

@@ -1,3 +1,17 @@
+2.5.0 (2025-01-31)
+
+- Added provider for DeepSeek (in Chat with Files mode, beta).
+- Added new models: OpenAI o1, Llama 3.3, DeepSeek V3 and R1 (API + local, with Ollama).
+- Added tool calls for OpenAI o1.
+- Added native vision for OpenAI o1.
+- Fix: tool calls in Ollama provider.
+- Fix: error handling in stream mode.
+- Fix: added check for active plugin tools before tool call.
+
+2.4.57 (2025-01-19)
+
+- Logging fix.
+
 2.4.56 (2025-01-19)
 
 - Improved tab switching and focus change.

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/src/pygpt_net/__init__.py

@@ -6,15 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.19 16:00:00                  #
+# Updated Date: 2025.01.31 22:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.4.56"
-__build__ = "2025.01.19"
+__version__ = "2.5.0"
+__build__ = "2025.01.31"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __report__ = "https://github.com/szczyglis-dev/py-gpt/issues"

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/src/pygpt_net/app.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.15 04:00:00                  #
+# Updated Date: 2025.01.31 19:00:00                  #
 # ================================================== #
 
 from pygpt_net.launcher import Launcher
@@ -43,6 +43,7 @@ from pygpt_net.provider.agents.react import ReactAgent
 # LLM wrapper providers (langchain, llama-index, embeddings)
 from pygpt_net.provider.llms.anthropic import AnthropicLLM
 from pygpt_net.provider.llms.azure_openai import AzureOpenAILLM
+from pygpt_net.provider.llms.deepseek_api import DeepseekApiLLM
 from pygpt_net.provider.llms.google import GoogleLLM
 from pygpt_net.provider.llms.hugging_face import HuggingFaceLLM
 from pygpt_net.provider.llms.hugging_face_api import HuggingFaceApiLLM
@@ -339,6 +340,7 @@ def run(**kwargs):
     launcher.add_llm(HuggingFaceApiLLM())
     launcher.add_llm(LocalLLM())
     launcher.add_llm(OllamaLLM())
+    launcher.add_llm(DeepseekApiLLM())
 
     # register custom langchain and llama-index LLMs
     llms = kwargs.get('llms', None)

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/src/pygpt_net/controller/chat/command.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 00:00:00                  #
+# Updated Date: 2025.01.31 19:00:00                  #
 # ================================================== #
 
 from typing import Any
@@ -14,7 +14,7 @@ from typing import Any
 from pygpt_net.core.types import (
     MODE_AGENT,
 )
-from pygpt_net.core.events import KernelEvent, RenderEvent
+from pygpt_net.core.events import KernelEvent, RenderEvent, Event
 from pygpt_net.core.bridge import BridgeContext
 from pygpt_net.core.ctx.reply import ReplyContext
 from pygpt_net.item.ctx import CtxItem
@@ -44,7 +44,17 @@ class Command:
         cmds = ctx.cmds_before  # from llama index tool calls pre-handler
         if not cmds:  # if no commands in context (from llama index tool calls)
             cmds = self.window.core.command.extract_cmds(ctx.output)
+
         if len(cmds) > 0:
+            # check if commands are enabled, leave only enabled commands
+            for cmd in cmds:
+                cmd_id = str(cmd["cmd"])
+                if not self.window.core.command.is_enabled(cmd_id):
+                    self.log("Command not allowed: " + cmd_id)
+                    cmds.remove(cmd)  # remove command from execution list
+            if len(cmds) == 0:
+                return  # abort if no commands
+
             ctx.cmds = cmds  # append commands to ctx
             self.log("Command call received...")
 

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/src/pygpt_net/controller/chat/stream.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 00:00:00                  #
+# Updated Date: 2025.01.31 22:00:00                  #
 # ================================================== #
 
 from typing import Any
@@ -35,6 +35,7 @@ class Stream:
         output = ""
         output_tokens = 0
         begin = True
+        error = None
 
         # chunks: stream begin
         data = {
@@ -56,6 +57,9 @@ class Stream:
                     if self.window.controller.kernel.stopped():
                         break
 
+                    if error is not None:
+                        break  # break if error
+
                     response = None
                     chunk_type = "raw"
                     if (hasattr(chunk, 'choices')
@@ -159,6 +163,7 @@ class Stream:
 
         except Exception as e:
             self.window.core.debug.log(e)
+            error = e
 
         self.window.controller.ui.update_tokens()  # update UI tokens
 
@@ -177,6 +182,9 @@ class Stream:
         # log
         self.log("[chat] Stream end.")
 
+        if error is not None:
+            raise error  # raise error if any, to display in UI
+
     def log(self, data: Any):
         """
         Log data to debug

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/src/pygpt_net/controller/chat/text.py

@@ -161,6 +161,7 @@ class Text:
         # build final prompt (+plugins)
         sys_prompt = self.window.core.prompt.prepare_sys_prompt(
             mode=mode,
+            model=model_data,
             sys_prompt=sys_prompt,
             ctx=ctx,
             reply=reply,

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/src/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: 2024.12.14 08:00:00                  #
+# Updated Date: 2025.01.31 22:00:00                  #
 # ================================================== #
 
 import copy
@@ -23,6 +23,7 @@ from pygpt_net.core.types import (
 )
 from pygpt_net.core.events import Event
 from pygpt_net.item.ctx import CtxItem
+from pygpt_net.item.model import ModelItem
 
 
 class Command:
@@ -590,3 +591,69 @@ class Command:
         if self.window.controller.agent.legacy.enabled() or self.window.controller.agent.experts.enabled():
             return False
         return self.window.core.config.get('func_call.native', False)  # otherwise check config
+
+    def is_enabled(self, cmd: str) -> bool:
+        """
+        Check if command is enabled
+
+        :param cmd: command
+        :return: True if command is enabled
+        """
+        enabled_cmds = []
+        data = {
+            'prompt': "",
+            'silent': True,
+            'syntax': [],
+            'cmd': [],
+        }
+        event = Event(Event.CMD_SYNTAX, data)
+        self.window.dispatch(event)
+        if (event.data and "cmd" in event.data
+                and isinstance(event.data["cmd"], list)):
+            for item in event.data["cmd"]:
+                if "cmd" in item:
+                    enabled_cmds.append(item["cmd"])
+        data = {
+            'prompt': "",
+            'silent': True,
+            'syntax': [],
+            'cmd': [],
+        }
+        event = Event(Event.CMD_SYNTAX_INLINE, data)
+        self.window.dispatch(event)
+        if (event.data and "cmd" in event.data
+            and isinstance(event.data["cmd"], list)):
+            for item in event.data["cmd"]:
+                if "cmd" in item:
+                    enabled_cmds.append(item["cmd"])
+        if cmd in enabled_cmds:
+            return True
+        return False
+
+    def is_model_supports_tools(
+            self,
+            mode: str,
+            model: ModelItem = None) -> bool:
+        """
+        Check if model supports tools
+
+        :param mode: mode
+        :param model: model item
+        :return: True if model supports tools
+        """
+        return True  # TMP allowed all
+        if model is None:
+            return False
+        disabled_models = [
+            "deepseek-r1:1.5b",
+            "deepseek-r1:7b",
+            "llama2",
+            "llama3.1",
+            "codellama",
+        ]
+        if model.id is not None:
+            for disabled_model in disabled_models:
+                if (model.llama_index['provider'] == "ollama"
+                        and model.id.startswith(disabled_model)):
+                    return False
+        return True

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/src/pygpt_net/core/experts/__init__.py

@@ -358,6 +358,7 @@ class Experts:
         sys_prompt = event.data['value']
         sys_prompt = self.window.core.prompt.prepare_sys_prompt(
             mode,
+            model_data,
             sys_prompt,
             ctx,
             reply,

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/src/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.01.16 01:00:00                  #
+# Updated Date: 2025.01.31 19:00:00                  #
 # ================================================== #
 
 import json
@@ -37,6 +37,11 @@ class Chat:
         self.window = window
         self.storage = storage
         self.context = Context(window)
+        self.tool_calls_not_allowed_providers = [
+            "ollama",
+            "hugging_face_api",
+            "deepseek_api",
+        ]
 
     def call(
             self,
@@ -231,6 +236,10 @@ class Chat:
         chat_mode = self.window.core.config.get("llama.idx.chat.mode")
         use_index = True
         verbose = self.window.core.config.get("log.llama", False)
+        allow_native_tool_calls = True
+        if ('provider' in model.llama_index
+                and model.llama_index['provider'] in self.tool_calls_not_allowed_providers):
+            allow_native_tool_calls = False
 
         if idx is None or idx == "_":
             chat_mode = "simple"  # do not use query engine if no index
@@ -254,7 +263,7 @@ class Chat:
         else:
             llm = self.window.core.idx.llm.get(model)
 
-        # if multimodal support, try to get multimodal provider
+        # TODO: if multimodal support, try to get multimodal provider
         # if model.is_multimodal():
             # llm = self.window.core.idx.llm.get(model, multimodal=True)  # get multimodal LLM model
 
@@ -272,7 +281,7 @@ class Chat:
         )
 
         if use_index:
-            # CMD: commands are applied to system prompt here
+            # TOOLS: commands are applied to system prompt here
             # index as query engine
             chat_engine = index.as_chat_engine(
                 llm=llm,
@@ -286,7 +295,7 @@ class Chat:
             else:
                 response = chat_engine.chat(query)
         else:
-            # CMD: commands are applied to system prompt here
+            # TOOLS: commands are applied to system prompt here
             # prepare tools (native calls if enabled)
             tools = self.window.core.agents.tools.prepare(context, extra)
 
@@ -294,7 +303,8 @@ class Chat:
             history.insert(0, self.context.add_system(system_prompt))
             history.append(self.context.add_user(query))
             if stream:
-                if hasattr(llm, "stream_chat_with_tools"):
+                # IMPORTANT: stream chat with tools not supported by all providers
+                if allow_native_tool_calls and hasattr(llm, "stream_chat_with_tools"):
                     response = llm.stream_chat_with_tools(
                         tools=tools,
                         messages=history,
@@ -304,7 +314,8 @@ class Chat:
                         messages=history,
                     )
             else:
-                if hasattr(llm, "chat_with_tools"):
+                # IMPORTANT: stream chat with tools not supported by all providers
+                if allow_native_tool_calls and hasattr(llm, "chat_with_tools"):
                     response = llm.chat_with_tools(
                         tools=tools,
                         messages=history,
@@ -336,16 +347,17 @@ class Chat:
                     ctx.set_output(output, "")
                     ctx.add_doc_meta(self.get_metadata(response.source_nodes))  # store metadata
             else:
-                # from LLM directly
+                # from LLM directly, no index
                 if stream:
-                    # tools handled in stream output controller
+                    # tools are handled in stream output controller
                     ctx.stream = response  # chunk is in response.delta
                     ctx.input_tokens = input_tokens
                     ctx.set_output("", "")
                 else:
                     # unpack tool calls
                     tool_calls = llm.get_tool_calls_from_response(
-                        response, error_on_no_tool_call=False
+                        response,
+                        error_on_no_tool_call=False,
                     )
                     ctx.tool_calls = self.window.core.command.unpack_tool_calls_from_llama(tool_calls)
                     output = response.message.content

{pygpt_net-2.4.56 → pygpt_net-2.5.0}/src/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: 2024.12.14 08:00:00                  #
+# Updated Date: 2025.01.31 19:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.events import Event
@@ -15,6 +15,7 @@ from pygpt_net.item.ctx import CtxItem
 
 from .custom import Custom
 from .template import Template
+from pygpt_net.item.model import ModelItem
 
 
 class Prompt:
@@ -40,11 +41,18 @@ class Prompt:
             return str(self.window.core.config.get(key))
         return ""
 
-    def build_final_system_prompt(self, prompt: str) -> str:
+    def build_final_system_prompt(
+            self,
+            prompt: str,
+            mode: str,
+            model: ModelItem = None
+    ) -> str:
         """
         Build final system prompt
 
         :param prompt: prompt
+        :param mode: mode
+        :param model: model item
         :return: final system prompt
         """
         # tmp dispatch event: system prompt
@@ -63,6 +71,10 @@ class Prompt:
             if self.window.core.command.is_native_enabled():
                 return prompt
 
+            # abort if model not supported
+            if not self.window.core.command.is_model_supports_tools(mode, model):
+                return prompt
+
             # cmd syntax tokens
             data = {
                 'prompt': prompt,
@@ -71,24 +83,28 @@ class Prompt:
                 'cmd': [],
             }
 
+            # IMPORTANT: append command syntax only if at least one command is detected
             # tmp dispatch event: command syntax apply
             # full execute cmd syntax
             if self.window.core.config.get('cmd'):
                 event = Event(Event.CMD_SYNTAX, data)
                 self.window.dispatch(event)
-                prompt = self.window.core.command.append_syntax(event.data)
+                if event.data and "cmd" in event.data and event.data["cmd"]:
+                    prompt = self.window.core.command.append_syntax(event.data)
 
             # inline cmd syntax only
             elif self.window.controller.plugins.is_type_enabled("cmd.inline"):
                 event = Event(Event.CMD_SYNTAX_INLINE, data)
                 self.window.dispatch(event)
-                prompt = self.window.core.command.append_syntax(event.data)
+                if event.data and "cmd" in event.data and event.data["cmd"]:
+                    prompt = self.window.core.command.append_syntax(event.data)
 
         return prompt
 
     def prepare_sys_prompt(
             self,
             mode: str,
+            model: ModelItem,
             sys_prompt: str,
             ctx: CtxItem,
             reply: bool,
@@ -100,6 +116,7 @@ class Prompt:
         Prepare system prompt
 
         :param mode: mode
+        :param model: model item
         :param sys_prompt: system prompt
         :param ctx: context item
         :param reply: reply from plugins
@@ -134,6 +151,10 @@ class Prompt:
             if self.window.core.command.is_native_enabled() and not disable_native_tool_calls:
                 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
+
             data = {
                 'mode': mode,
                 'prompt': sys_prompt,
@@ -141,16 +162,19 @@ class Prompt:
                 'cmd': [],
                 'is_expert': is_expert,
             }
+            # IMPORTANT: append command syntax only if at least one command is detected
             # full execute cmd syntax
             if self.window.core.config.get('cmd'):
                 event = Event(Event.CMD_SYNTAX, data)
                 self.window.dispatch(event)
-                sys_prompt = self.window.core.command.append_syntax(event.data)
+                if event.data and "cmd" in event.data and event.data["cmd"]:
+                    sys_prompt = self.window.core.command.append_syntax(event.data)
 
             # inline cmd syntax only
             elif self.window.controller.plugins.is_type_enabled("cmd.inline"):
                 event = Event(Event.CMD_SYNTAX_INLINE, data)
                 self.window.dispatch(event)
-                sys_prompt = self.window.core.command.append_syntax(event.data)
+                if event.data and "cmd" in event.data and event.data["cmd"]:
+                    sys_prompt = self.window.core.command.append_syntax(event.data)
 
         return sys_prompt