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

pygpt_net/ui/dialog/models_importer.py

@@ -0,0 +1,82 @@
+#!/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                  #
+# ================================================== #
+from PySide6 import QtCore
+from PySide6.QtWidgets import QPushButton, QHBoxLayout, QVBoxLayout, QLabel
+
+from pygpt_net.ui.widget.lists.model_importer import ModelImporter
+from pygpt_net.ui.widget.dialog.model_importer import ModelImporterOllamaDialog
+from pygpt_net.utils import trans
+
+
+class ModelsImporter:
+    def __init__(self, window=None):
+        """
+        Models importer dialog
+
+        :param window: Window instance
+        """
+        self.window = window
+        self.dialog_id = "models.importer"
+
+    def setup(self, idx=None):
+        """
+        Setup dialog
+
+        :param idx: current model tab index
+        """
+        # models
+        self.window.ui.nodes['models.importer.editor'] = ModelImporter(self.window)
+
+        self.window.ui.nodes['models.importer.btn.refresh'] = \
+            QPushButton(trans("dialog.models.importer.btn.refresh"))
+        self.window.ui.nodes['models.importer.btn.cancel'] = \
+            QPushButton(trans("dialog.models.importer.btn.cancel"))
+        self.window.ui.nodes['models.importer.btn.save'] = \
+            QPushButton(trans("dialog.models.importer.btn.save"))
+
+        self.window.ui.nodes['models.importer.btn.refresh'].clicked.connect(
+            lambda: self.window.controller.model.importer.refresh(reload=True))
+        self.window.ui.nodes['models.importer.btn.cancel'].clicked.connect(
+            lambda: self.window.controller.model.importer.cancel())
+        self.window.ui.nodes['models.importer.btn.save'].clicked.connect(
+            lambda: self.window.controller.model.importer.save())
+
+        # set enter key to save button
+        self.window.ui.nodes['models.importer.btn.refresh'].setAutoDefault(False)
+        self.window.ui.nodes['models.importer.btn.cancel'].setAutoDefault(False)
+        self.window.ui.nodes['models.importer.btn.save'].setAutoDefault(True)
+
+        # footer buttons
+        footer = QHBoxLayout()
+        footer.addWidget(self.window.ui.nodes['models.importer.btn.refresh'])
+        footer.addWidget(self.window.ui.nodes['models.importer.btn.cancel'])
+        footer.addWidget(self.window.ui.nodes['models.importer.btn.save'])
+
+        self.window.ui.nodes["models.importer.url"] = QLabel("S")
+        self.window.ui.nodes["models.importer.url"].setAlignment(QtCore.Qt.AlignRight)
+        self.window.ui.nodes["models.importer.url"].setContentsMargins(10, 10, 10, 10)
+
+        main_layout = QVBoxLayout()
+        main_layout.addWidget(self.window.ui.nodes["models.importer.url"])
+        main_layout.addWidget(self.window.ui.nodes['models.importer.editor'])
+
+        self.window.ui.nodes["models.importer.status"] = QLabel("S")
+        self.window.ui.nodes["models.importer.status"].setAlignment(QtCore.Qt.AlignCenter)
+        self.window.ui.nodes["models.importer.status"].setContentsMargins(10, 10, 10, 10)
+
+        layout = QVBoxLayout()
+        layout.addLayout(main_layout)  # list
+        layout.addWidget(self.window.ui.nodes["models.importer.status"])
+        layout.addLayout(footer)  # bottom buttons (save, defaults)
+
+        self.window.ui.dialog[self.dialog_id] = ModelImporterOllamaDialog(self.window, self.dialog_id)
+        self.window.ui.dialog[self.dialog_id].setLayout(layout)
+        self.window.ui.dialog[self.dialog_id].setWindowTitle(trans('dialog.models.importer'))

pygpt_net/ui/dialogs.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.26 02:00:00                  #
+# Updated Date: 2025.06.24 02:00:00                  #
 # ================================================== #
 
 import threading
@@ -26,6 +26,7 @@ from pygpt_net.ui.dialog.image import Image
 from pygpt_net.ui.dialog.license import License
 from pygpt_net.ui.dialog.logger import Logger
 from pygpt_net.ui.dialog.models import Models
+from pygpt_net.ui.dialog.models_importer import ModelsImporter
 from pygpt_net.ui.dialog.plugins import Plugins
 from pygpt_net.ui.dialog.preset import Preset
 from pygpt_net.ui.dialog.preset_plugins import PresetPlugins
@@ -101,6 +102,7 @@ class Dialogs:
         self.window.plugin_settings = Plugins(self.window)
         self.window.plugin_presets = PresetPlugins(self.window)
         self.window.model_settings = Models(self.window)
+        self.window.model_importer = ModelsImporter(self.window)
         self.window.assistant_store = AssistantVectorStore(self.window)
 
         self.window.ui.dialog['alert'] = AlertDialog(self.window)

pygpt_net/ui/menu/config.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.07 21:00:00                  #
+# Updated Date: 2025.06.24 02:00:00                  #
 # ================================================== #
 
 import os
@@ -38,11 +38,25 @@ class Config:
                                                          trans("menu.config.settings"), self.window)
         self.window.ui.menu['config.settings'].setMenuRole(QAction.MenuRole.NoRole)
 
-        self.window.ui.menu['config.models'] = QAction(QIcon(":/icons/settings_filled.svg"),
-                                                       trans("menu.config.models"), self.window)
+        self.window.ui.menu['config.models'] = QMenu(trans("menu.config.models"), self.window)
 
         self.window.ui.menu['config.access'] = QAction(QIcon(":/icons/accessibility.svg"),
                                                        trans("menu.config.access"), self.window)
+        self.window.ui.menu['config.access'].setMenuRole(QAction.MenuRole.NoRole)
+
+        # models
+        self.window.ui.menu['config.models.edit'] = QAction(QIcon(":/icons/settings_filled.svg"),
+                                                       trans("menu.config.models.edit"), self.window)
+        self.window.ui.menu['config.models.edit'].triggered.connect(
+            lambda: self.window.controller.model.editor.toggle_editor())
+        self.window.ui.menu['config.models.import.ollama'] = QAction(QIcon(":/icons/reload.svg"),
+                                                            trans("menu.config.models.import.ollama"), self.window)
+        self.window.ui.menu['config.models.import.ollama'].triggered.connect(
+            lambda: self.window.controller.model.importer.toggle_editor())
+
+        self.window.ui.menu['config.models'].addAction(self.window.ui.menu['config.models.edit'])
+        self.window.ui.menu['config.models'].addAction(self.window.ui.menu['config.models.import.ollama'])
+
 
         css_dir = os.path.join(self.window.core.config.path, 'css')
         css_files = os.listdir(css_dir)
@@ -125,9 +139,6 @@ class Config:
         self.window.ui.menu['config.settings'].triggered.connect(
             lambda: self.window.controller.settings.toggle_editor('settings'))
 
-        self.window.ui.menu['config.models'].triggered.connect(
-            lambda: self.window.controller.model.editor.toggle_editor())
-
         self.window.ui.menu['config.access'].triggered.connect(
             lambda: self.window.controller.settings.open_section('access'))
 
@@ -145,7 +156,7 @@ class Config:
 
         self.window.ui.menu['menu.config'] = self.window.menuBar().addMenu(trans("menu.config"))
         self.window.ui.menu['menu.config'].addAction(self.window.ui.menu['config.settings'])
-        self.window.ui.menu['menu.config'].addAction(self.window.ui.menu['config.models'])
+        self.window.ui.menu['menu.config'].addMenu(self.window.ui.menu['config.models'])
         self.window.ui.menu['menu.config'].addAction(self.window.ui.menu['config.access'])
 
         self.window.ui.menu['menu.config'].addMenu(self.window.ui.menu['menu.theme'])

pygpt_net/ui/widget/dialog/model_importer.py

@@ -0,0 +1,55 @@
+#!/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                  #
+# ================================================== #
+
+from PySide6.QtCore import Qt
+from .base import BaseDialog
+
+
+class ModelImporterOllamaDialog(BaseDialog):
+    def __init__(self, window=None, id=None):
+        """
+        Model importer dialog
+
+        :param window: main window
+        :param id: settings id
+        """
+        super(ModelImporterOllamaDialog, self).__init__(window, id)
+        self.window = window
+        self.id = id
+
+    def closeEvent(self, event):
+        """
+        Close event
+
+        :param event: close event
+        """
+        self.window.controller.model.importer.dialog = False
+        self.window.controller.model.update()
+        super(ModelImporterOllamaDialog, self).closeEvent(event)
+
+    def keyPressEvent(self, event):
+        """
+        Key press event
+
+        :param event: key press event
+        """
+        if event.key() == Qt.Key_Escape:
+            self.cleanup()
+            self.close()  # close dialog when the Esc key is pressed.
+        else:
+            super(ModelImporterOllamaDialog, self).keyPressEvent(event)
+
+    def cleanup(self):
+        """
+        Cleanup on close
+        """
+        self.window.controller.model.importer.dialog = False
+        self.window.controller.model.update()

pygpt_net/ui/widget/lists/model_importer.py

@@ -0,0 +1,151 @@
+#!/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                  #
+# ================================================== #
+
+from PySide6 import QtCore
+from PySide6.QtGui import QStandardItemModel
+from PySide6.QtWidgets import QWidget, QHBoxLayout, QPushButton, QVBoxLayout, QLabel, QCheckBox
+
+from pygpt_net.ui.widget.lists.base import BaseList
+from pygpt_net.utils import trans
+import pygpt_net.icons_rc
+
+class ModelImporter(QWidget):
+    def __init__(self, window=None):
+        """
+        Models importer widget
+
+        :param window: main window
+        """
+        super(ModelImporter, self).__init__(window)
+        self.window = window
+        self.id = "models.importer"
+        self.layout = self.setup()
+        self.window.ui.models["models.importer.available"] = self.create_model(self.window)
+        self.window.ui.nodes["models.importer.available"].setModel(self.window.ui.models["models.importer.available"])
+        self.window.ui.nodes["models.importer.available"].selectionModel().selectionChanged.connect(
+            lambda: self.window.controller.model.importer.change_available()
+        )
+        self.window.ui.models["models.importer.current"] = self.create_model(self.window)
+        self.window.ui.nodes["models.importer.current"].setModel(self.window.ui.models["models.importer.current"])
+        self.window.ui.nodes["models.importer.current"].selectionModel().selectionChanged.connect(
+            lambda: self.window.controller.model.importer.change_current()
+        )
+        self.setLayout(self.layout)
+
+    def create_model(self, parent) -> QStandardItemModel:
+        """
+        Create model
+
+        :param parent: parent widget
+        :return: QStandardItemModel
+        """
+        return QStandardItemModel(0, 1, parent)
+
+    def setup(self):
+        """Setup layout"""
+        layout = QHBoxLayout()
+        arrows_layout = QVBoxLayout()
+        self.window.ui.nodes["models.importer.add"] = QPushButton(">")
+        self.window.ui.nodes["models.importer.add"].clicked.connect(
+            lambda: self.window.controller.model.importer.add()
+        )
+        self.window.ui.nodes["models.importer.remove"] = QPushButton("<")
+        self.window.ui.nodes["models.importer.remove"].clicked.connect(
+            lambda: self.window.controller.model.importer.remove()
+        )
+        self.window.ui.nodes["models.importer.add"].setEnabled(False)  # initially disabled
+        self.window.ui.nodes["models.importer.remove"].setEnabled(False)  # initially disabled
+        arrows_layout.addWidget(self.window.ui.nodes["models.importer.add"])
+        arrows_layout.addWidget(self.window.ui.nodes["models.importer.remove"])
+
+        self.window.ui.nodes["models.importer.available.label"] = QLabel(trans("models.importer.available.label"))
+        self.window.ui.nodes["models.importer.available"] = BaseList(self.window)
+        self.window.ui.nodes["models.importer.available"].clicked.disconnect()
+
+        self.window.ui.nodes["models.importer.current.label"] = QLabel(trans("models.importer.current.label"))
+        self.window.ui.nodes["models.importer.current"] = BaseList(self.window)
+        self.window.ui.nodes["models.importer.current"].clicked.disconnect()
+
+        self.window.ui.nodes["models.importer.available.all"] = QCheckBox(trans("models.importer.all"), self.window)
+        self.window.ui.nodes["models.importer.available.all"].clicked.connect(
+            lambda: self.window.controller.model.importer.toggle_all(
+                self.window.ui.nodes["models.importer.available.all"].isChecked())
+        )
+
+        available_layout = QVBoxLayout()
+        available_layout.addWidget(self.window.ui.nodes["models.importer.available.label"])
+        available_layout.addWidget(self.window.ui.nodes["models.importer.available"])
+        available_layout.addWidget(self.window.ui.nodes["models.importer.available.all"])
+
+        selected_layout = QVBoxLayout()
+        selected_layout.addWidget(self.window.ui.nodes["models.importer.current.label"])
+        selected_layout.addWidget(self.window.ui.nodes["models.importer.current"])
+
+        layout.addLayout(available_layout)
+        layout.addLayout(arrows_layout)
+        layout.addLayout(selected_layout)
+        return layout
+
+    def update_available(self, data):
+        """
+        Update available models
+
+        :param data: Data to update
+        """
+        id = "models.importer.available"
+        self.window.ui.nodes[id].backup_selection()
+        self.window.ui.models[id].removeRows(0, self.window.ui.models[id].rowCount())
+        i = 0
+        for n in data:
+            self.window.ui.models[id].insertRow(i)
+            name = data[n].id
+            if data[n].name != data[n].id:
+                name += f" --> {data[n].name}"
+            index = self.window.ui.models[id].index(i, 0)
+            tooltip = data[n].id
+            self.window.ui.models[id].setData(index, tooltip, QtCore.Qt.ToolTipRole)
+            self.window.ui.models[id].setData(self.window.ui.models[id].index(i, 0), name)
+            i += 1
+        self.window.ui.nodes[id].restore_selection()
+
+    def update_current(self, data):
+        """
+        Update current models
+
+        :param data: Data to update
+        """
+        id = "models.importer.current"
+        self.window.ui.nodes[id].backup_selection()
+        self.window.ui.models[id].removeRows(0, self.window.ui.models[id].rowCount())
+        i = 0
+        for n in data:
+            self.window.ui.models[id].insertRow(i)
+            name = data[n].id
+            if data[n].name != data[n].id:
+                name += f" --> {data[n].name}"
+            if data[n].imported:
+                name = "* " + name  # mark imported models
+            index = self.window.ui.models[id].index(i, 0)
+            tooltip = data[n].id
+            self.window.ui.models[id].setData(index, tooltip, QtCore.Qt.ToolTipRole)
+            self.window.ui.models[id].setData(self.window.ui.models[id].index(i, 0), name)
+            i += 1
+        self.window.ui.nodes[id].restore_selection()
+
+    def update_lists(self, available: dict, current: dict):
+        """
+        Update lists
+
+        :param available: data with available models
+        :param current: data with current models
+        """
+        self.update_available(available)
+        self.update_current(current)

{pygpt_net-2.5.14.dist-info → pygpt_net-2.5.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pygpt-net
-Version: 2.5.14
+Version: 2.5.15
 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, DeepSeek, 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.
 License: MIT
 Keywords: py_gpt,py-gpt,pygpt,desktop,app,o1,gpt,gpt4,gpt-4o,gpt-4v,gpt3.5,gpt-4,gpt-4-vision,gpt-3.5,llama3,mistral,gemini,deepseek,bielik,claude,tts,whisper,vision,chatgpt,dall-e,chat,chatbot,assistant,text completion,image generation,ai,api,openai,api key,langchain,llama-index,ollama,presets,ui,qt,pyside
@@ -100,7 +100,7 @@ Description-Content-Type: text/markdown
 
 [![pygpt](https://snapcraft.io/pygpt/badge.svg)](https://snapcraft.io/pygpt)
 
-Release: **2.5.14** | build: **2025-06-23** | Python: **>=3.10, <3.13**
+Release: **2.5.15** | build: **2025-06-23** | Python: **>=3.10, <3.13**
 
 > Official website: https://pygpt.net | Documentation: https://pygpt.readthedocs.io
 > 
@@ -1003,17 +1003,33 @@ The name of the currently active profile is shown as (Profile Name) in the windo
 
 ## Built-in models
 
-PyGPT has built-in support for models (as of 2025-06-21):
+PyGPT has built-in support for models (as of 2025-06-24):
 
 - `bielik-11b-v2.3-instruct:Q4_K_M`
 - `chatgpt-4o-latest`
 - `claude-3-5-sonnet-20240620`
-- `claude-3-opus-20240229`
+- `claude-3-7-sonnet`
+- `claude-3-opus`
+- `claude-3-opus`
+- `claude-opus-4-0`
+- `claude-sonnet-4-0`
 - `codellama`
 - `dall-e-2`
 - `dall-e-3`
+- `deepseek-chat`
+- `deepseek-r1:1.5b`
+- `deepseek-r1:14b`
+- `deepseek-r1:32b`
+- `deepseek-r1:670b`
+- `deepseek-r1:7b`
+- `deepseek-r1:671b`
+- `deepseek-reasoner`
+- `deepseek-v3:671b`
 - `gemini-1.5-flash`
 - `gemini-1.5-pro`
+- `gemini-2.0-flash-exp`
+- `gemini-2.5-flash`
+- `gemini-2.5-pro`
 - `gpt-3.5-turbo`
 - `gpt-3.5-turbo-1106`
 - `gpt-3.5-turbo-16k`
@@ -1026,6 +1042,9 @@ PyGPT has built-in support for models (as of 2025-06-21):
 - `gpt-4-turbo-2024-04-09`
 - `gpt-4-turbo-preview`
 - `gpt-4-vision-preview`
+- `gpt-4.1`
+- `gpt-4.1-mini`
+- `gpt-4.5-preview`
 - `gpt-4o`
 - `gpt-4o-2024-11-20`
 - `gpt-4o-audio-preview`
@@ -1036,8 +1055,21 @@ PyGPT has built-in support for models (as of 2025-06-21):
 - `llama3.1:70b`
 - `mistral`
 - `mistral-large`
+- `o1`
 - `o1-mini`
-- `o1-preview`
+- `o1-pro`
+- `o3`
+- `o3-mini`
+- `o3-pro`
+- `qwen:7b`
+- `qwen2:7b`
+- `qwen2.5-coder:7b`
+- `r1` (Perplexity)
+- `sonar` (Perplexity)
+- `sonar-deep-research` (Perplexity)
+- `sonar-pro` (Perplexity)
+- `sonar-reasoning` (Perplexity)
+- `sonar-reasoning-pro` (Perplexity)
 
 All models are specified in the configuration file `models.json`, which you can customize. 
 This file is located in your working directory. You can add new models provided directly by `OpenAI API`
@@ -1055,16 +1087,17 @@ There is built-in support for those LLM providers:
 - HuggingFace (huggingface)
 - Anthropic (anthropic)
 - Ollama (ollama)
+- Deepseek API (deepseek_api)
 
 ## How to use local or non-GPT models
 
-### Llama 3, Mistral, and other local models
+### Llama 3, Mistral, DeepSeek, and other local models
 
 How to use locally installed Llama 3 or Mistral models:
 
-1) Choose a working mode: `Chat with Files` or `LangChain`.
+1) Choose a working mode: `Chat with Files`.
 
-2) On the models list - select, edit, or add a new model (with `ollama` provider). You can edit the model settings through the menu `Config -> Models`, then configure the model parameters in the `advanced` section.
+2) On the models list - select, edit, or add a new model (with `ollama` provider). You can edit the model settings through the menu `Config -> Models -> Edit`, then configure the model parameters in the `advanced` section.
 
 3) Download and install Ollama from here: https://github.com/ollama/ollama
 
@@ -1084,9 +1117,30 @@ For example, on Linux:
 - `codellama`
 - `mistral`
 - `llama2-uncensored`
+- `deepseek-r1`
+
+etc.
 
 You can add more models by editing the models list.
 
+**Real-time importer**
+
+You can also import models in real-time from a running Ollama instance using the `Config -> Models -> Import from Ollama` tool.
+
+**Custom Ollama endpoint**
+
+The default endpoint for Ollama is: http://localhost:11434
+
+You can change it globally by setting the environment variable `OLLAMA_API_BASE` in `Settings -> General -> Advanced -> Application environment`.
+
+You can also change the "base_url" for a specific model in its configuration:
+
+`Config -> Models -> Edit`, then in the `Advanced -> [LlamaIndex] ENV Vars` section add the variable:
+
+NAME: `OLLAMA_API_BASE`
+VALUE: `http://my_endpoint.com:11434`
+
+
 **List of all models supported by Ollama**
 
 https://ollama.com/library
@@ -4070,6 +4124,12 @@ may consume additional tokens that are not displayed in the main window.
 
 ## Recent changes:
 
+**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.