pygpt-net 2.5.14__py3-none-any.whl → 2.5.16__py3-none-any.whl

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,15 @@
+2.5.16 (2025-06-25)
+
+- OpenAI API upgraded to 1.91.0.
+- Chat mode migrated to Responses API with native built-in web search tool. (beta)
+- Fixed file_read tool in I/O plugin.
+
+2.5.15 (2025-06-24)
+
+- Added Ollama models importer in "Settings -> Models -> Import from Ollama".
+- Fixed Ollama provider in the newest LlamaIndex.
+- Added the ability to set a custom base URL for Ollama -> ENV: OLLAMA_API_BASE.
+
 2.5.14 (2025-06-23)
 
 - Fix: crash if empty shortcuts in config.

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-06-23 19:00:00                  #
+# Updated Date: 2025-06-25 02:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.5.14"
-__build__ = "2025-06-23"
+__version__ = "2.5.16"
+__build__ = "2025-06-25"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __report__ = "https://github.com/szczyglis-dev/py-gpt/issues"

pygpt_net/controller/chat/input.py

@@ -6,9 +6,9 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.02.02 02:00:00                  #
+# Updated Date: 2025.06.24 16:00:00                  #
 # ================================================== #
-
+import os
 from typing import Optional, Any, Dict
 
 from pygpt_net.core.bridge import BridgeContext
@@ -80,6 +80,13 @@ class Input:
                 model_data = self.window.core.models.get(model)
                 if model_data is not None and model_data.is_ollama():
                     model_id = model_data.get_ollama_model()
+                    # load ENV vars first
+                    if ('env' in model_data.llama_index
+                            and model_data.llama_index['env'] is not None):
+                        for item in model_data.llama_index['env']:
+                            key = item.get('name', '').strip()
+                            value = item.get('value', '').strip()
+                            os.environ[key] = value
                     status = self.window.core.models.ollama.check_model(model_id)
                     is_installed = status.get('is_installed', False)
                     is_model = status.get('is_model', False)

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: 2025.03.02 19:00:00                  #
+# Updated Date: 2025.06.25 02:00:00                  #
 # ================================================== #
 
 from typing import Any
@@ -36,6 +36,9 @@ class Stream:
         output_tokens = 0
         begin = True
         error = None
+        tool_calls = []
+        fn_args_buffers = {}
+        citations = []
 
         # chunks: stream begin
         data = {
@@ -60,24 +63,32 @@ class Stream:
                     if error is not None:
                         break  # break if error
 
+                    etype = None
                     response = None
                     chunk_type = "raw"
-                    if (hasattr(chunk, 'choices')
-                            and chunk.choices[0] is not None
-                            and hasattr(chunk.choices[0], 'delta')
-                            and chunk.choices[0].delta is not None):
-                        chunk_type = "api_chat"
-                    elif (hasattr(chunk, 'choices')
-                          and chunk.choices[0] is not None
-                          and hasattr(chunk.choices[0], 'text')
-                          and chunk.choices[0].text is not None):
-                        chunk_type = "api_completion"
-                    elif (hasattr(chunk, 'content')
-                          and chunk.content is not None):
-                        chunk_type = "langchain_chat"
-                    elif (hasattr(chunk, 'delta')
-                          and chunk.delta is not None):
-                        chunk_type = "llama_chat"
+                    if ctx.use_responses_api:
+                        if hasattr(chunk, 'type'):  # streaming event type
+                            etype = chunk.type
+                            chunk_type = "api_chat_responses"  # responses API
+                        else:
+                            continue
+                    else:
+                        if (hasattr(chunk, 'choices')
+                                and chunk.choices[0] is not None
+                                and hasattr(chunk.choices[0], 'delta')
+                                and chunk.choices[0].delta is not None):
+                            chunk_type = "api_chat"  # chat completions API
+                        elif (hasattr(chunk, 'choices')
+                              and chunk.choices[0] is not None
+                              and hasattr(chunk.choices[0], 'text')
+                              and chunk.choices[0].text is not None):
+                            chunk_type = "api_completion"
+                        elif (hasattr(chunk, 'content')
+                              and chunk.content is not None):
+                            chunk_type = "langchain_chat"
+                        elif (hasattr(chunk, 'delta')
+                              and chunk.delta is not None):
+                            chunk_type = "llama_chat"
 
                     # OpenAI chat completion
                     if chunk_type == "api_chat":
@@ -110,6 +121,43 @@ class Stream:
                                 if tool_chunk.function.arguments:
                                     tool_call["function"]["arguments"] += tool_chunk.function.arguments
 
+                    elif chunk_type == "api_chat_responses":
+
+                        if etype == "response.output_text.delta":
+                            response = chunk.delta
+
+                        # ---------- function_call ----------
+                        elif etype == "response.output_item.added" and chunk.item.type == "function_call":
+                            tool_calls.append({
+                                "id": chunk.item.id,
+                                "type": "function",
+                                "function": {"name": chunk.item.name, "arguments": ""}
+                            })
+                            fn_args_buffers[chunk.item.id] = ""
+
+                        elif etype == "response.function_call_arguments.delta":
+                            fn_args_buffers[chunk.item_id] += chunk.delta
+
+                        elif etype == "response.function_call_arguments.done":
+                            for tc in tool_calls:
+                                if tc["id"] == chunk.item_id:
+                                    tc["function"]["arguments"] = fn_args_buffers[chunk.item_id]
+                                    break
+                            fn_args_buffers.pop(chunk.item_id, None)
+
+                        # ---------- annotations ----------
+                        elif etype == "response.output_text.annotation.added":
+                            if chunk.annotation['type'] == "url_citation":
+                                if citations is None:
+                                    citations = []
+                                url_citation = chunk.annotation['url']
+                                citations.append(url_citation)
+                                ctx.urls = citations
+
+                        # ---------- end / error ----------
+                        elif etype in {"response.done", "response.failed", "error"}:
+                            pass
+
                     # OpenAI completion
                     elif chunk_type == "api_completion":
                         if chunk.choices[0].text is not None:

pygpt_net/controller/lang/mapping.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.01.18 16:00:00                  #
+# Updated Date: 2025.06.24 02:00:00                  #
 # ================================================== #
 
 from typing import Dict
@@ -351,6 +351,7 @@ class Mapping:
         menu_title['config.edit.css'] = 'menu.config.edit.css'
         menu_title['config.edit.json'] = 'menu.config.edit.json'
         menu_title['config.profile'] = 'menu.config.profile'
+        menu_title['config.models'] = 'menu.config.models'
         menu_title['menu.lang'] = 'menu.lang'
         menu_title['menu.debug'] = 'menu.debug'
         menu_title['menu.theme'] = 'menu.theme'
@@ -376,7 +377,8 @@ class Mapping:
         menu_text['app.clear_history_groups'] = 'menu.file_clear_history_groups'
         menu_text['app.exit'] = 'menu.file.exit'
         menu_text['config.settings'] = 'menu.config.settings'
-        menu_text['config.models'] = 'menu.config.models'
+        menu_text['config.models.edit'] = 'menu.config.models.edit'
+        menu_text['config.models.import.ollama'] = 'menu.config.models.import.ollama'
         menu_text['config.access'] = 'menu.config.access'
         menu_text['config.open_dir'] = 'menu.config.open_dir'
         menu_text['config.change_dir'] = 'menu.config.change_dir'

pygpt_net/controller/model/__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.02 02:00:00                  #
+# Updated Date: 2025.06.24 02:00:00                  #
 # ================================================== #
 
 from typing import Optional
@@ -15,6 +15,7 @@ from pygpt_net.core.events import Event, AppEvent
 from pygpt_net.item.model import ModelItem
 
 from .editor import Editor
+from .importer import Importer
 
 
 class Model:
@@ -26,6 +27,7 @@ class Model:
         """
         self.window = window
         self.editor = Editor(window)
+        self.importer = Importer(window)
 
     def select(self, model: str):
         """

pygpt_net/controller/model/importer.py

@@ -0,0 +1,337 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ================================================== #
+# This file is a part of PYGPT package               #
+# Website: https://pygpt.net                         #
+# GitHub:  https://github.com/szczyglis-dev/py-gpt   #
+# MIT License                                        #
+# Created By  : Marcin Szczygliński                  #
+# Updated Date: 2025.06.24 02:00:00                  #
+# ================================================== #
+
+import copy
+import os
+from typing import List, Dict, Optional
+
+from pygpt_net.utils import trans
+
+
+class Importer:
+    def __init__(self, window=None):
+        """
+        Models importer controller
+
+        :param window: Window instance
+        """
+        self.window = window
+        self.dialog = False
+        self.initialized = False
+        self.width = 800
+        self.height = 500
+        self.items_available = {}  # available models for import
+        self.items_current = {}  # current models in use
+        self.pending = {}  # waiting to be imported models
+        self.removed = {}  # waiting to be removed models
+        self.selected_available = None  # selected available model
+        self.selected_current = None  # selected current model
+        self.all = False  # show all models, not only available for import
+
+    def in_current(self, model: str) -> bool:
+        """
+        Check if model is in current list
+
+        :param model: model ID
+        :return: True if model is in current list, False otherwise
+        """
+        if model in self.items_current:
+            return True
+        for key in list(self.items_current.keys()):
+            m = self.items_current[key]
+            if m.id == model:  # also check in IDs
+                return True
+        return False
+
+    def change_available(self):
+        """On change available model selection"""
+        val = self.window.ui.nodes["models.importer.available"].selectionModel().currentIndex()
+        idx = val.row()
+        if idx < 0:
+            self.selected_available = None
+            self.window.ui.nodes["models.importer.add"].setEnabled(False)
+        else:
+            self.selected_available = self.get_by_idx(idx, self.items_available)
+            if self.items_available.get(self.selected_available) is None:
+                self.selected_available = None
+                self.window.ui.nodes["models.importer.add"].setEnabled(False)
+            else:
+                # if not in current then enable add button
+                if not self.in_current(self.selected_available):
+                    self.window.ui.nodes["models.importer.add"].setEnabled(True)
+                else:
+                    self.window.ui.nodes["models.importer.add"].setEnabled(False)
+
+    def change_current(self):
+        """On change current model selection"""
+        val = self.window.ui.nodes["models.importer.current"].selectionModel().currentIndex()
+        idx = val.row()
+        if idx < 0:
+            self.selected_current = None
+            self.window.ui.nodes["models.importer.remove"].setEnabled(False)
+        else:
+            self.selected_current = self.get_by_idx(idx, self.items_current)
+            if self.items_current.get(self.selected_current) is None:
+                self.selected_current = None
+                self.window.ui.nodes["models.importer.remove"].setEnabled(False)
+            else:
+                if self.selected_current in self.items_current and self.items_current[self.selected_current].imported:
+                    self.window.ui.nodes["models.importer.remove"].setEnabled(True)
+                else:
+                    self.window.ui.nodes["models.importer.remove"].setEnabled(False)
+
+    def add(self):
+        """Add model to current list"""
+        if self.selected_available is None:
+            self.set_status(trans('models.importer.error.add.no_model'))
+            return
+        if self.in_current(self.selected_available):
+            self.set_status(trans('models.importer.error.add.not_exists'))
+            return
+        model = self.items_available[self.selected_available]
+        self.items_current[self.selected_available] = model
+        if self.selected_available not in self.pending:
+            self.pending[self.selected_available] = model
+        if self.selected_available in self.removed:
+            del self.removed[self.selected_available]
+        if not self.all:
+            del self.items_available[self.selected_available]
+        self.refresh()
+
+    def remove(self):
+        """Remove model from current list"""
+        if self.selected_current is None:
+            self.set_status(trans('models.importer.error.remove.no_model'))
+            return
+        if not self.in_current(self.selected_current):
+            self.set_status(trans('models.importer.error.remove.not_exists'))
+            return
+        model = self.items_current[self.selected_current]
+        self.items_available[self.selected_current] = model
+        if self.selected_current not in self.removed:
+            self.removed[self.selected_current] = model
+        del self.items_current[self.selected_current]
+        if self.selected_current in self.pending:
+            del self.pending[self.selected_current]
+        self.refresh()
+
+    def setup(self):
+        """Set up importer"""
+        idx = None
+        self.window.model_importer.setup(idx)  # widget dialog setup
+
+    def toggle_editor(self):
+        """Toggle models importer dialog"""
+        if self.dialog:
+            self.close()
+        else:
+            self.open()
+
+    def open(self, force: bool = False):
+        """
+        Open models editor dialog
+
+        :param force: force open dialog
+        """
+        if not self.initialized:
+            self.setup()
+            self.initialized = True
+        if not self.dialog or force:
+            self.pending = {}
+            self.removed = {}
+            self.init()
+            self.window.ui.dialogs.open(
+                "models.importer",
+                width=self.width,
+                height=self.height,
+            )
+            self.dialog = True
+
+    def close(self):
+        """Close models importer dialog"""
+        if self.dialog:
+            self.window.ui.dialogs.close('models.importer')
+            self.dialog = False
+
+    def cancel(self):
+        """Cancel models importer dialog"""
+        self.close()
+
+    def init(self):
+        """Initialize importer"""
+        if self.initialized and self.window.ui.nodes["models.importer.available.all"].isChecked():
+            self.all = True
+
+        base_url = "http://localhost:11434"
+        if 'OLLAMA_API_BASE' in os.environ:
+            base_url = os.environ['OLLAMA_API_BASE']
+        self.window.ui.nodes["models.importer.url"].setText(base_url)
+        self.items_available = self.get_ollama_available()
+        self.items_current = self.get_ollama_current()
+        self.refresh()
+
+    def toggle_all(self, all: bool):
+        """
+        Toggle all models visibility
+
+        :param all: show all models, not only available for import
+        """
+        self.all = all
+        self.refresh(reload=True)
+
+    def set_status(self, status: str):
+        """
+        Set status message
+
+        :param status: status message
+        """
+        if self.initialized:
+            self.window.ui.nodes["models.importer.status"].setText(status)
+
+    def get_ollama_current(self) -> Dict:
+        """
+        Get current ollama models
+
+        :return: ollama models dictionary
+        """
+        items = copy.deepcopy(self.window.core.models.items)
+        for key in list(items.keys()):
+            if (items[key].llama_index is None
+                    or 'provider' not in items[key].llama_index
+                    or items[key].llama_index['provider'] != 'ollama'):
+                del items[key]
+        return items
+
+    def get_ollama_available(self) -> Dict:
+        """
+        Get available ollama models
+
+        :return: ollama models dictionary
+        """
+        models = {}
+        status = self.window.core.models.ollama.get_status()
+        if not status['status']:
+            self.set_status(trans('models.importer.error.no_connection'))
+            return models
+        else:
+            ollama_models = status.get('models', [])
+            if not ollama_models:
+                self.set_status(trans('models.importer.error.no_models'))
+                return models
+            else:
+                for model in ollama_models:
+                    name = model.get('name').replace(":latest", "")
+                    m = self.window.core.models.create_empty(append=False)
+                    m.id = name
+                    m.name = name
+                    m.mode = [
+                        "llama_index",
+                        "agent",
+                        "agent_llama",
+                        "expert",
+                    ]
+                    m.llama_index['provider'] = 'ollama'
+                    m.llama_index['mode'] = ['chat']
+                    m.llama_index['args'] = [
+                        {
+                            'name': 'model',
+                            'value': name,
+                            'type': 'str'
+                        }
+                    ]
+                    m.langchain['provider'] = 'ollama'
+                    m.langchain['mode'] = ['chat']
+                    m.langchain['args'] = [
+                        {
+                            'name': 'model',
+                            'value': name,
+                            'type': 'str'
+                        }
+                    ]
+                    m.imported = True
+                    m.ctx = 32000  # default
+                    key = m.id
+                    #if key in self.items_current:
+                        #key += "_imported"
+                    models[key] = m
+                self.set_status(trans('models.importer.loaded'))
+        return models
+
+    def from_pending(self):
+        """Move pending models to base list"""
+        added = False
+        base_models = self.window.core.models.items
+        for key in list(self.pending.keys()):
+            if key not in base_models:
+                base_models[key] = copy.deepcopy(self.pending[key])
+                base_models[key].imported = True
+                added = True
+        for key in list(self.removed.keys()):
+            if key in base_models:
+                del base_models[key]
+                added = True
+        self.pending = {}
+        self.removed = {}
+        if added:
+            self.window.core.models.save()
+            self.set_status(trans('models.importer.status.imported'))
+
+    def save(self, persist: bool = True):
+        """
+        Save models
+
+        :param persist: persist to file and close dialog
+        """
+        self.from_pending()
+        self.window.controller.model.init_list()
+        self.window.controller.model.update()
+        self.close()
+
+    def refresh(self, reload: bool = False):
+        """
+        Reload items
+
+        :param reload: reload available models
+        """
+        if reload:
+            self.items_available = self.get_ollama_available()
+
+        # remove from available if already in current
+        if not self.all:
+            for key in list(self.items_available.keys()):
+                if self.in_current(key):
+                    del self.items_available[key]
+
+        self.window.ui.nodes['models.importer.editor'].update_available(self.items_available)
+        self.window.ui.nodes['models.importer.editor'].update_current(self.items_current)
+
+    def get_by_idx(self, idx: int, items: Dict) -> Optional[str]:
+        """
+        Get model key by list index
+
+        :param idx: list index
+        :param items: items dictionary
+        :return: model key
+        """
+        model_idx = 0
+        for id in self.get_ids(items):
+            if model_idx == idx:
+                return id
+            model_idx += 1
+        return None
+
+    def get_ids(self, items: Dict) -> List[str]:
+        """
+        Return models ids
+
+        :return: model ids list
+        """
+        return list(items.keys())

pygpt_net/controller/settings/editor.py

@@ -203,6 +203,9 @@ class Editor:
         if self.config_changed('access.shortcuts'):
             self.window.setup_global_shortcuts()
 
+        # update ENV
+        self.window.core.config.setup_env()
+
         self.before_config = copy.deepcopy(self.window.core.config.all())
         self.window.controller.settings.close_window(id)
 

pygpt_net/core/bridge/worker.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.29 23:00:00                  #
+# Updated Date: 2025.06.25 02:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import QObject, Signal, QRunnable, Slot
@@ -15,6 +15,7 @@ from pygpt_net.core.types import (
     MODE_AGENT_LLAMA,
     MODE_LANGCHAIN,
     MODE_LLAMA_INDEX,
+    MODE_ASSISTANT,
 )
 from pygpt_net.core.events import KernelEvent, Event
 
@@ -48,7 +49,8 @@ class BridgeWorker(QObject, QRunnable):
             self.handle_post_prompt_async()
 
             # ADDITIONAL CONTEXT: append additional context from attachments
-            self.handle_additional_context()
+            if self.mode != MODE_ASSISTANT:
+                self.handle_additional_context()
 
             # POST PROMPT END: handle post prompt end event
             self.handle_post_prompt_end()

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.02.02 02:00:00                  #
+# Updated Date: 2025.06.25 02:00:00                  #
 # ================================================== #
 
 import copy
@@ -228,6 +228,34 @@ class Command:
                 print("Error parsing tool call: " + str(e))
         return parsed
 
+    def unpack_tool_calls_responses(
+            self,
+            tool_calls: List
+    ) -> List[Dict[str, Any]]:
+        """
+        Unpack tool calls from OpenAI response
+
+        :param tool_calls: tool calls list
+        :return: parsed tool calls list
+        """
+        parsed = []
+        for tool_call in tool_calls:
+            try:
+                parsed.append(
+                    {
+                        "id": tool_call.id,
+                        "type": "function",
+                        "function": {
+                            "name": tool_call.name,
+                            "arguments": json.loads(tool_call.arguments)
+                        }
+                    }
+                )
+            except Exception as e:
+                self.window.core.debug.log(e)
+                print("Error parsing tool call: " + str(e))
+        return parsed
+
     def unpack_tool_calls_chunks(
             self,
             ctx: CtxItem,
@@ -503,6 +531,9 @@ class Command:
                 if "required" in param and param["required"]:
                     required.append(param["name"])
 
+            if len(required) > 0:
+                params["required"] = required
+
             # extract params and convert to JSON schema format
             for param in cmd["params"]:
                 try:
@@ -570,7 +601,7 @@ class Command:
                             elif params["properties"][key]["type"] == "list":
                                 params["properties"][key]["type"] = "array"
                                 params["properties"][key]["items"] = {
-                                    "$ref": "#"
+                                    "type": "string"
                                 }
                 except Exception as e:
                     print(e)