pygpt-net 2.6.20__py3-none-any.whl → 2.6.22__py3-none-any.whl

pygpt_net/controller/lang/lang.py

@@ -6,12 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.11.20 21:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
-from PySide6.QtGui import QAction
+from PySide6.QtGui import QAction, QActionGroup
 
 from pygpt_net.utils import trans, trans_reload
+
 from .custom import Custom
 from .mapping import Mapping
 from .plugins import Plugins
@@ -31,28 +32,48 @@ class Lang:
         self.plugins = Plugins(window)
         self.settings = Settings(window)
         self.loaded = False
+        self._lang_group = None
+
+    def _on_lang_triggered(self, action):
+        """
+        Handle language change triggered by menu action
+
+        :param action: QAction instance
+        """
+        self.window.controller.lang.toggle(action.data())
 
     def setup(self):
         """Setup language menu"""
-        # get files from locale directory
         if not self.loaded:
-            langs = self.window.core.config.get_available_langs()
+            w = self.window
+            menu = w.ui.menu
+            if self._lang_group is None:
+                self._lang_group = QActionGroup(w)
+                self._lang_group.setExclusive(True)
+                self._lang_group.triggered.connect(self._on_lang_triggered)
+
+            langs = w.core.config.get_available_langs()
+            menu_lang = menu['lang']
+            menu_root = menu['menu.lang']
             for lang in langs:
-                self.window.ui.menu['lang'][lang] = QAction(lang.upper(), self.window, checkable=True)
-                self.window.ui.menu['lang'][lang].triggered.connect(
-                    lambda checked=None,
-                           lang=lang: self.window.controller.lang.toggle(lang))
-                self.window.ui.menu['menu.lang'].addAction(self.window.ui.menu['lang'][lang])
+                act = QAction(lang.upper(), w, checkable=True)
+                act.setData(lang)
+                menu_lang[lang] = act
+                self._lang_group.addAction(act)
+                menu_root.addAction(act)
         self.loaded = True
         self.update()
 
     def update(self):
         """Update language menu"""
-        for lang in self.window.ui.menu['lang']:
-            self.window.ui.menu['lang'][lang].setChecked(False)
-        lang = self.window.core.config.get('lang')
-        if lang in self.window.ui.menu['lang']:
-            self.window.ui.menu['lang'][lang].setChecked(True)
+        menu_lang = self.window.ui.menu['lang']
+        current = self.window.core.config.get('lang')
+        act = menu_lang.get(current)
+        if act is not None:
+            act.setChecked(True)
+        else:
+            for a in menu_lang.values():
+                a.setChecked(False)
 
     def reload_config(self):
         """Reload language config"""
@@ -64,37 +85,34 @@ class Lang:
 
         :param id: language code to toggle
         """
-        self.window.core.config.set('lang', id)
-        self.window.core.config.save()
-        trans('', True)  # force reload locale
-
-        self.update()  # update menu
-        self.mapping.apply()  # nodes mapping
-        self.custom.apply()  # custom nodes
+        w = self.window
+        c = w.controller
+        conf = w.core.config
 
-        # tabs
-        self.window.controller.ui.tabs.reload_titles()
+        conf.set('lang', id)
+        conf.save()
+        trans('', True)
 
-        # calendar
-        self.window.controller.calendar.note.update_current()
+        self.update()
+        self.mapping.apply()
+        self.custom.apply()
 
-        # settings
+        c.ui.tabs.reload_titles()
+        c.calendar.note.update_current()
         self.settings.apply()
 
-        # plugins
         try:
             self.plugins.apply()
         except Exception as e:
             print("Error updating plugin locale", e)
-            self.window.core.debug.log(e)
+            w.core.debug.log(e)
 
-        # reload UI
-        self.window.controller.ctx.common.update_label_by_current()
-        self.window.controller.ctx.update(True, False)
-        self.window.controller.ui.update()  # update all (toolbox, etc.)
-        self.window.update_status('')  # clear status
+        w.controller.ctx.common.update_label_by_current()
+        w.controller.ctx.update(True, False)
+        w.controller.ui.update()
+        w.update_status('')
 
     def reload(self):
         """Reload language"""
         self.reload_config()
-        self.setup()
+        self.setup()

pygpt_net/controller/model/importer.py

@@ -6,14 +6,14 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.02 20:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 import copy
 import os
 from typing import List, Dict, Optional, Any
 
-from qasync import QApplication
+from PySide6.QtWidgets import QApplication
 
 from pygpt_net.core.events import Event
 from pygpt_net.core.types import (
@@ -475,6 +475,7 @@ class Importer:
                         MODE_LLAMA_INDEX,
                         MODE_AGENT,
                         MODE_AGENT_LLAMA,
+                        MODE_AGENT_OPENAI,
                         MODE_EXPERT,
                     ]
                     m.provider = 'ollama'

pygpt_net/controller/model/model.py

@@ -6,18 +6,20 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 03:00:00                  #
+# Updated Date: 2025.08.23 15:00:00                  #
 # ================================================== #
 
+import os
 from typing import Optional
 
-from pygpt_net.core.events import Event, AppEvent
+from pygpt_net.core.events import Event, AppEvent, BaseEvent
+from pygpt_net.core.types import MODE_LLAMA_INDEX, MODE_CHAT
 from pygpt_net.item.model import ModelItem
+from pygpt_net.utils import trans
 
 from .editor import Editor
 from .importer import Importer
 
-
 class Model:
     def __init__(self, window=None):
         """
@@ -32,6 +34,63 @@ class Model:
     def _ensure_current_model_map(self):
         return self.window.core.config.data.setdefault('current_model', {})
 
+    def handle(self, event: BaseEvent):
+        """
+        Handle events
+
+        :param event: BaseEvent: Event to handle
+        """
+        name = event.name
+        mode = self.window.core.config.get("mode")
+
+        # on input begin
+        if name == Event.INPUT_BEGIN:
+            force = event.data.get("force", False)
+            stop = event.data.get("stop", False)
+            if not force and not stop:
+                # check ollama model
+                model = self.window.core.config.get('model')
+                if model:
+                    model_data = self.window.core.models.get(model)
+                    if model_data is not None and model_data.is_ollama():
+                        if (mode == MODE_LLAMA_INDEX or
+                                (
+                                        mode == MODE_CHAT and not model_data.is_openai_supported() 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)
+                            if not is_installed:
+                                event.data["stop"] = True  # stop flow
+                                self.window.ui.dialogs.alert(trans("dialog.ollama.not_installed"))
+                                return
+                            if not is_model:
+                                event.data["stop"] = True  # stop flow
+                                self.window.ui.dialogs.alert(
+                                    trans("dialog.ollama.model_not_found").replace("{model}", model_id))
+                                return
+
+        # on input before
+        elif name == Event.INPUT_BEFORE:
+            # check API key, show monit if no API key for current provider
+            model = self.window.core.config.get('model')
+            if model:
+                model_data = self.window.core.models.get(model)
+                if not self.window.controller.chat.common.check_api_key(mode=mode, model=model_data, monit=False):
+                    self.window.controller.chat.common.check_api_key(mode=mode, model=model_data, monit=True)
+                    event.data["stop"] = True  # stop flow
+                    return
+
     def select(self, model: str):
         """
         Select model

pygpt_net/controller/notepad/notepad.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.05 21:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from typing import Optional, Tuple
@@ -20,8 +20,6 @@ from pygpt_net.ui.widget.tabs.body import TabBody
 from pygpt_net.ui.widget.textarea.notepad import NotepadWidget
 from pygpt_net.utils import trans
 
-import pygpt_net.icons_rc
-
 
 class Notepad:
     def __init__(self, window=None):
@@ -32,8 +30,7 @@ class Notepad:
         """
         self.window = window
         self.opened_once = False
-        self.opened_idx = []
-
+        self.opened_idx = set()
 
     def get_next_suffix(self) -> int:
         """
@@ -41,13 +38,16 @@ class Notepad:
 
         :return: next notepad suffix
         """
-        idx = self.window.core.tabs.count_by_type(Tab.TAB_NOTEPAD)
-        for tab in self.window.core.tabs.get_tabs_by_type(Tab.TAB_NOTEPAD):
+        tabs_core = self.window.core.tabs
+        tabs = tabs_core.get_tabs_by_type(Tab.TAB_NOTEPAD)
+        idx = tabs_core.count_by_type(Tab.TAB_NOTEPAD)
+        for tab in tabs:
+            title = tab.title or ""
             try:
-                num = int(tab.title.split(" ")[-1])
-                if num >= idx:
+                num = int(title.rsplit(" ", 1)[-1])
+                if num > idx:
                     idx = num
-            except ValueError:
+            except (ValueError, IndexError):
                 continue
         return idx + 1
 
@@ -58,12 +58,7 @@ class Notepad:
         :return: next available notepad index
         """
         tabs = self.window.core.tabs.get_tabs_by_type(Tab.TAB_NOTEPAD)
-        opened = False
-        for tab in tabs:
-            if tab.data_id == idx:
-                opened = True
-                break
-        return opened
+        return any(tab.data_id == idx for tab in tabs)
 
     def create(
             self,
@@ -77,27 +72,30 @@ class Notepad:
         :param tab: existing tab to use (optional)
         :return: notepad widget (TabBody)
         """
-        if idx is None:
-            idx = self.window.core.tabs.count_by_type(Tab.TAB_NOTEPAD) + 1
-            suffix = self.get_next_suffix()
-        else:
-            suffix = self.get_next_suffix()
+        tabs_core = self.window.core.tabs
+        existing_tabs = tabs_core.get_tabs_by_type(Tab.TAB_NOTEPAD)
+        used_ids = {t.data_id for t in existing_tabs}
 
-        while self.is_opened(idx):
+        if idx is None:
+            idx = 1
+        while idx in used_ids:
             idx += 1
-            suffix = self.get_next_suffix()
+
+        suffix = self.get_next_suffix()
 
         data_id = idx
-        self.window.ui.notepad[data_id] = NotepadWidget(self.window)
-        self.window.ui.notepad[data_id].id = idx
-        self.window.ui.notepad[data_id].textarea.id = idx
-        title = trans('output.tab.notepad')
-        title += " " + str(suffix)
+        widget = NotepadWidget(self.window)
+        widget.id = idx
+        widget.textarea.id = idx
+        self.window.ui.notepad[data_id] = widget
+
+        title = trans('output.tab.notepad') + " " + str(suffix)
         if tab:
             if not tab.title:
                 tab.title = title
-        child = self.window.core.tabs.from_widget(self.window.ui.notepad[data_id])
-        child.on_delete = self.on_delete  # cleanup callback
+
+        child = tabs_core.from_widget(widget)
+        child.on_delete = self.on_delete
         return child, idx, data_id
 
     def on_delete(self, body: TabBody):
@@ -115,6 +113,8 @@ class Notepad:
         if idx in self.window.ui.notepad:
             self.window.ui.notepad[idx].on_delete()
             del self.window.ui.notepad[idx]
+        if idx in self.opened_idx:
+            self.opened_idx.discard(idx)
         self.update()
 
     def load(self):
@@ -130,9 +130,10 @@ class Notepad:
                     items[idx] = item
 
         if num_notepads > 0:
-            for idx in items:
-                if idx in self.window.ui.notepad:
-                    self.window.ui.notepad[idx].setText(items[idx].content)
+            for idx, item in items.items():
+                widget = self.window.ui.notepad.get(idx)
+                if widget is not None:
+                    widget.setText(item.content)
 
     def get_notepad_name(self, idx: int):
         """
@@ -159,17 +160,19 @@ class Notepad:
 
         :param idx: notepad idx
         """
-        item = self.window.core.notepad.get_by_id(idx)
+        core_notepad = self.window.core.notepad
+        item = core_notepad.get_by_id(idx)
         if item is None:
             item = NotepadItem()
             item.idx = idx
-            self.window.core.notepad.items[idx] = item
-
-        if idx in self.window.ui.notepad:
-            prev_content = item.content
-            item.content = self.window.ui.notepad[idx].toPlainText()
-            if prev_content != item.content:  # update only if content changed
-                self.window.core.notepad.update(item)
+            core_notepad.items[idx] = item
+
+        widget = self.window.ui.notepad.get(idx)
+        if widget is not None:
+            text = widget.toPlainText()
+            if item.content != text:
+                item.content = text
+                core_notepad.update(item)
             self.update()
 
     def save_all(self):
@@ -177,16 +180,18 @@ class Notepad:
         items = self.window.core.notepad.get_all()
         num_notepads = self.get_num_notepads()
         if num_notepads > 0:
-            tabs = self.window.core.tabs.get_tabs_by_type(Tab.TAB_NOTEPAD)
-            for tab in tabs:
+            ui_notepad = self.window.ui.notepad
+            for tab in self.window.core.tabs.get_tabs_by_type(Tab.TAB_NOTEPAD):
                 idx = tab.data_id
-                if idx in self.window.ui.notepad:
-                    if idx in items:
-                        prev_content = str(items[idx].content)
-                        items[idx].content = self.window.ui.notepad[idx].toPlainText()
-                        # update only if content changed
-                        if prev_content != items[idx].content:
-                            self.window.core.notepad.update(items[idx])
+                widget = ui_notepad.get(idx)
+                if widget is None:
+                    continue
+                if idx in items:
+                    prev_content = str(items[idx].content)
+                    text = widget.toPlainText()
+                    if prev_content != text:
+                        items[idx].content = text
+                        self.window.core.notepad.update(items[idx])
             self.update()
 
     def setup(self):
@@ -200,21 +205,19 @@ class Notepad:
         :param text: text to append
         :param idx: notepad idx
         """
-        if idx not in self.window.ui.notepad:
+        widget = self.window.ui.notepad.get(idx)
+        if widget is None:
             return
-        dt = ""  # TODO: add to config append date/time
-        # dt = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + ":\n--------------------------\n"
-        prev_text = self.window.ui.notepad[idx].toPlainText()
-        if prev_text.strip() != "":
-            prev_text += "\n"
-        new_text = prev_text + dt + text.strip()
-        self.window.ui.notepad[idx].setText(new_text)
-        self.save(idx)
-
-        # move cursor to end
-        cursor = self.window.ui.notepad[idx].textarea.textCursor()
+        dt = ""
+        prev_text = widget.toPlainText()
+        need_nl = prev_text.strip() != ""
+        textarea = widget.textarea
+        cursor = textarea.textCursor()
         cursor.movePosition(QTextCursor.End)
-        self.window.ui.notepad[idx].textarea.setTextCursor(cursor)
+        to_insert = (("\n" if need_nl else "") + dt + text.strip())
+        cursor.insertText(to_insert)
+        textarea.setTextCursor(cursor)
+        self.save(idx)
 
     def get_num_notepads(self) -> int:
         """
@@ -230,8 +233,9 @@ class Notepad:
 
         :return: current notepad index
         """
+        tabs_ctrl = self.window.controller.ui.tabs
         if self.is_active():
-            tab = self.window.controller.ui.tabs.get_current_tab()
+            tab = tabs_ctrl.get_current_tab()
             if tab is not None:
                 return tab.data_id
         return 1
@@ -246,17 +250,14 @@ class Notepad:
 
     def open(self):
         """Open notepad"""
-        # if notepad disabled, do nothing
         if self.get_num_notepads() == 0:
             return
-
-        # switch to first notepad tab if current tab is not notepad
-        tabs = self.window.ui.layout.get_active_tabs()
         if self.window.controller.ui.tabs.get_current_type() != Tab.TAB_NOTEPAD:
             idx = self.window.core.tabs.get_min_idx_by_type(Tab.TAB_NOTEPAD)
             if idx is not None:
+                tabs = self.window.ui.layout.get_active_tabs()
                 tabs.setCurrentIndex(idx)
-        self.window.activateWindow()  # focus
+        self.window.activateWindow()
 
     def update(self):
         """Update notepads UI"""
@@ -299,9 +300,8 @@ class Notepad:
         :return: current notepad text
         """
         idx = self.get_current_active()
-        if idx in self.window.ui.notepad:
-            return self.window.ui.notepad[idx].toPlainText()
-        return ""
+        widget = self.window.ui.notepad.get(idx)
+        return widget.toPlainText() if widget is not None else ""
 
     def get_notepad_text(self, idx: int) -> str:
         """
@@ -310,9 +310,8 @@ class Notepad:
         :param idx: notepad index
         :return: notepad text
         """
-        if idx in self.window.ui.notepad:
-            return self.window.ui.notepad[idx].toPlainText()
-        return ""
+        widget = self.window.ui.notepad.get(idx)
+        return widget.toPlainText() if widget is not None else ""
 
     def clear(self, idx: int) -> bool:
         """
@@ -320,8 +319,9 @@ class Notepad:
 
         :param idx: notepad idx
         """
-        if idx in self.window.ui.notepad:
-            self.window.ui.notepad[idx].textarea.clear()
+        widget = self.window.ui.notepad.get(idx)
+        if widget is not None:
+            widget.textarea.clear()
             self.save(idx)
             return True
         return False
@@ -342,10 +342,12 @@ class Notepad:
             return
         if tab.type == Tab.TAB_NOTEPAD:
             idx = tab.data_id
-            if idx in self.window.ui.notepad:
-                if idx not in self.opened_idx:
-                    QTimer.singleShot(0, self.window.ui.notepad[idx].scroll_to_bottom)
-                if not self.window.ui.notepad[idx].opened:
-                    self.window.ui.notepad[idx].opened = True
-                if idx not in self.opened_idx:
-                    self.opened_idx.append(idx)
+            widget = self.window.ui.notepad.get(idx)
+            if widget is None:
+                return
+            if idx not in self.opened_idx:
+                QTimer.singleShot(0, widget.scroll_to_bottom)
+            if not widget.opened:
+                widget.opened = True
+            if idx not in self.opened_idx:
+                self.opened_idx.add(idx)

pygpt_net/controller/plugins/settings.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 03:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from typing import Any
@@ -138,10 +138,9 @@ class Settings:
         window.controller.plugins.presets.save_current()
         window.core.config.save()
         self.close()
-        window.update_status(trans('info.settings.saved'))
 
-        event = Event(Event.PLUGIN_SETTINGS_CHANGED)
-        window.dispatch(event)
+        window.update_status(trans('info.settings.saved'))
+        window.dispatch(Event(Event.PLUGIN_SETTINGS_CHANGED))
         window.controller.ui.update_tokens()
 
     def close(self):

pygpt_net/controller/settings/editor.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.11 19:00:00                  #
+# Updated Date: 2025.08.24 02:00:00                  #
 # ================================================== #
 
 import copy
@@ -67,7 +67,7 @@ class Editor:
         self.window.ui.add_hook("update.config.notepad.num", self.hook_update)
         self.window.ui.add_hook("update.config.render.code_syntax", self.hook_update)
         self.window.ui.add_hook("update.config.theme.style", self.hook_update)
-        self.window.ui.add_hook("update.config.llama.idx.chat.agent.render.all", self.hook_update)
+        self.window.ui.add_hook("update.config.agent.output.render.all", self.hook_update)
         self.window.ui.add_hook("update.config.audio.input.backend", self.hook_update)
         self.window.ui.add_hook("update.config.audio.output.backend", self.hook_update)
         # self.window.ui.add_hook("llama.idx.storage", self.hook_update)  # vector store update
@@ -204,7 +204,7 @@ class Editor:
         if self.config_changed('ctx.sources') or self.config_changed('ctx.audio'):
             self.window.controller.ctx.refresh()
 
-        if self.config_changed('llama.idx.chat.agent.render.all'):
+        if self.config_changed('agent.output.render.all'):
             self.window.controller.chat.render.reload()
 
         # update global shortcuts
@@ -294,7 +294,7 @@ class Editor:
             self.window.core.config.set(key, value)
             self.window.controller.ctx.update()
 
-        elif key == "llama.idx.chat.agent.render.all":
+        elif key == "agent.output.render.all":
             self.window.core.config.set(key, value)
             self.window.controller.chat.render.reload()