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

pygpt_net/controller/theme/nodes.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2024.12.12 01:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 from pygpt_net.core.events import RenderEvent
@@ -28,24 +28,33 @@ class Nodes:
         :param key: UI node key
         :param type: stylesheet type
         """
-        if key not in self.window.ui.nodes:
+        nodes = self.window.ui.nodes
+        theme = self.window.controller.theme
+
+        if key not in nodes:
             return
 
         if type == 'font.toolbox':
-            self.window.ui.nodes[key].setStyleSheet(self.window.controller.theme.style('font.toolbox'))
+            nodes[key].setStyleSheet(theme.style('font.toolbox'))
         elif type == 'font.chat.output':
-            for pid in self.window.ui.nodes[key]:
+            style_output = theme.style('font.chat.output')
+            for pid in nodes[key]:
                 try:
-                    self.window.ui.nodes[key][pid].setStyleSheet(self.window.controller.theme.style('font.chat.output'))
+                    nodes[key][pid].setStyleSheet(style_output)
                 except Exception as e:
                     pass
         elif type == 'font.chat.input':
-            self.window.ui.nodes[key].setStyleSheet(self.window.controller.theme.style('font.chat.input'))
+            nodes[key].setStyleSheet(theme.style('font.chat.input'))
         elif type == 'font.ctx.list':
-            self.window.ui.nodes[key].setStyleSheet(self.window.controller.theme.style('font.ctx.list'))
+            nodes[key].setStyleSheet(theme.style('font.ctx.list'))
 
     def apply_all(self):
         """Apply stylesheets to nodes"""
+        w = self.window
+        ui = w.ui
+        ctrl = w.controller
+        engine = ctrl.chat.render.get_engine()
+
         nodes = {
             'font.chat.input': [
                 'input',
@@ -90,58 +99,56 @@ class Nodes:
         }
 
         # apply to nodes
-        for type in nodes:
-            for key in nodes[type]:
-                if key == "output" and self.window.controller.chat.render.get_engine() != 'legacy':
+        apply_ref = self.apply
+        skip_output = engine != 'legacy'
+        for t, keys in nodes.items():
+            for k in keys:
+                if skip_output and k == "output":
                     continue
-                self.apply(key, type)
+                apply_ref(k, t)
 
         # apply to notepads
-        num_notepads = self.window.controller.notepad.get_num_notepads()
-        if num_notepads > 0:
-            for id in self.window.ui.notepad:
-                self.window.ui.notepad[id].textarea.setStyleSheet(self.window.controller.theme.style('font.chat.output'))
+        size = w.core.config.get('font_size')
+        style_output = ctrl.theme.style('font.chat.output')
+        if ui.notepad:
+            for np in ui.notepad.values():
+                ta = np.textarea
+                ta.setStyleSheet(style_output)
+                ta.value = size
 
         # apply to calendar
-        if 'note' in self.window.ui.calendar:
-            self.window.ui.calendar['note'].setStyleSheet(self.window.controller.theme.style('font.chat.output'))
-
-        # update value
-        size = self.window.core.config.get('font_size')
-        if 'note' in self.window.ui.calendar:
-            self.window.ui.calendar['note'].value = size
-        if num_notepads > 0:
-            for id in range(1, num_notepads + 1):
-                if id in self.window.ui.notepad:
-                    self.window.ui.notepad[id].textarea.value = size
+        note = ui.calendar.get('note')
+        if note is not None:
+            note.setStyleSheet(style_output)
+            note.value = size
 
         # plain text/markdown
-        for pid in self.window.ui.nodes['output_plain']:
+        output_plain = ui.nodes.get('output_plain', {})
+        for obj in output_plain.values():
             try:
-                self.window.ui.nodes['output_plain'][pid].value = size
-                self.window.ui.nodes['output_plain'][pid].update()
-            except Exception as e:
+                obj.value = size
+                obj.update()
+            except Exception:
                 pass
 
         # ------------------------
 
         # zoom, (Chromium, web engine)
-        if self.window.controller.chat.render.get_engine() == 'web':
-            zoom = self.window.core.config.get('zoom')
-            for pid in self.window.ui.nodes['output']:
+        output_nodes = ui.nodes.get('output', {})
+        if engine == 'web':
+            zoom = w.core.config.get('zoom')
+            for obj in output_nodes.values():
                 try:
-                    self.window.ui.nodes['output'][pid].value = zoom
-                    self.window.ui.nodes['output'][pid].update_zoom()
-                except Exception as e:
+                    obj.value = zoom
+                    obj.update_zoom()
+                except Exception:
                     pass
-            event = RenderEvent(RenderEvent.ON_THEME_CHANGE)
-            self.window.dispatch(event)
+            w.dispatch(RenderEvent(RenderEvent.ON_THEME_CHANGE))
 
         # font size, legacy (markdown)
-        elif self.window.controller.chat.render.get_engine() == 'legacy':
-            for pid in self.window.ui.nodes['output']:
-                self.window.ui.nodes['output'][pid].value = size
-                self.window.ui.nodes['output'][pid].update()
+        elif engine == 'legacy':
+            for obj in output_nodes.values():
+                obj.value = size
+                obj.update()
 
-        # update tools
-        self.window.tools.setup_theme()
+        w.tools.setup_theme()  # update tools

pygpt_net/controller/theme/theme.py

@@ -6,13 +6,16 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.20 23:00:00                  #
+# Updated Date: 2025.08.24 23:00:00                  #
 # ================================================== #
 
 import os
 from typing import Any, Optional
 
+from PySide6.QtWidgets import QApplication
+
 from pygpt_net.core.events import RenderEvent
+from pygpt_net.utils import trans
 
 from .common import Common
 from .markdown import Markdown
@@ -41,6 +44,29 @@ class Theme:
         self.common.toggle_tooltips()
         self.reload(force=False)
 
+    def toggle_theme_by_menu(self, name):
+        """
+        Toggle theme by menu action
+
+        :param name: theme name
+        """
+        self.window.update_status(trans("status.loading"))
+        QApplication.processEvents()
+        self.toggle(name, force=True)
+        self.window.update_status("")
+
+    def toggle_option_by_menu(self, name: str, value: Any = None):
+        """
+        Toggle theme option by menu action
+
+        :param name: option name
+        :param value: option value
+        """
+        self.window.update_status(trans("status.loading"))
+        QApplication.processEvents()
+        self.toggle_option(name, value)
+        self.window.update_status("")
+
     def toggle(
             self,
             name: str,
@@ -85,6 +111,7 @@ class Theme:
 
         :param name: web style name
         """
+        QApplication.processEvents()
         core = self.window.core
         core.config.set('theme.style', name)
         core.config.save()
@@ -103,6 +130,7 @@ class Theme:
         :param name: option name
         :param value: option value
         """
+        QApplication.processEvents()
         window = self.window
         core = window.core
         cfg = core.config
@@ -149,8 +177,7 @@ class Theme:
 
     def update_style(self):
         """Update style"""
-        current = self.window.core.config.get('theme.style')
-        self.toggle_style(current)
+        self.toggle_style(self.window.core.config.get('theme.style'))
 
     def update_theme(self, force: bool = True):
         """
@@ -158,13 +185,11 @@ class Theme:
 
         :param force: force theme change (manual trigger)
         """
-        current = self.window.core.config.get('theme')
-        self.toggle(current, force=force)
+        self.toggle(self.window.core.config.get('theme'), force=force)
 
     def update_syntax(self):
         """Update syntax menu"""
-        current = self.window.core.config.get('render.code_syntax')
-        self.toggle_syntax(current, update_menu=True)
+        self.toggle_syntax(self.window.core.config.get('render.code_syntax'), update_menu=True)
 
     def reload(self, force: bool = True):
         """
@@ -254,8 +279,7 @@ class Theme:
 
         :param prev_theme: previous theme name
         """
-        current_theme = self.window.core.config.get('theme')
-        if not prev_theme or prev_theme != current_theme:
+        if not prev_theme or prev_theme != self.window.core.config.get('theme'):
             self.setup()
             self.update_style()
         self.update_syntax()

pygpt_net/controller/tools/tools.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.08.24 23:00:00                  #
 # ================================================== #
 
 from typing import Dict, List
@@ -81,7 +81,7 @@ class Tools:
                 caller = parent
             action = QAction(QIcon(icon), title, parent)
             action.triggered.connect(
-                lambda idx=idx, column_idx=column_idx, id=id, caller=caller: caller.add_tab(idx, column_idx, Tab.TAB_TOOL, id)
+                lambda checked=False, idx=idx, column_idx=column_idx, id=id, caller=caller: caller.add_tab(idx, column_idx, Tab.TAB_TOOL, id)
             )
             submenu.addAction(action)
         return submenu

pygpt_net/controller/ui/tabs.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, Optional, Tuple
@@ -134,8 +134,7 @@ class Tabs:
     def reload(self):
         """Reload tabs"""
         self.window.core.tabs.reload()
-        event = RenderEvent(RenderEvent.PREPARE)
-        self.window.dispatch(event)
+        self.window.dispatch(RenderEvent(RenderEvent.PREPARE))
         self.debug()
 
     def reload_after(self):

pygpt_net/controller/ui/ui.py

@@ -6,20 +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                  #
 # ================================================== #
 
 from typing import Optional
 
 from PySide6.QtGui import QColor
 
+from pygpt_net.core.events import BaseEvent, Event
 from pygpt_net.utils import trans
 
 from .mode import Mode
 from .tabs import Tabs
 from .vision import Vision
 
-
 class UI:
     def __init__(self, window=None):
         """
@@ -65,6 +65,20 @@ class UI:
         self.vision.update()
         self.window.controller.agent.legacy.update()
 
+    def handle(self, event: BaseEvent):
+        """
+        Handle events
+
+        :param event: BaseEvent: Event to handle
+        """
+        name = event.name
+
+        # on input begin
+        if name == Event.INPUT_BEGIN:
+            self.tabs.switch_to_first_chat()  # switch to first active chat tab
+        elif name == Event.CTX_END:
+            self.update_tokens()  # update UI
+
     def get_colors(self) -> dict:
         """
         Get color labels

pygpt_net/core/agents/observer/evaluation.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.12 00:00:00                  #
+# Updated Date: 2025.08.24 02:00:00                  #
 # ================================================== #
 
 from typing import List
@@ -188,8 +188,8 @@ class Evaluation:
         i = 0
         for ctx in history:
             # if next input (but not last) then clear outputs - use only output after last user input
-            if self.is_input(ctx) and i < len(history) - 1:
-                outputs.clear()
+            # if self.is_input(ctx) and i < len(history) - 1:
+                # outputs.clear()
 
             if self.is_output(ctx):
                 if ctx.output:

pygpt_net/core/agents/provider.py

@@ -6,11 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.01 03:00:00                  #
+# Updated Date: 2025.08.24 03:00:00                  #
 # ================================================== #
+import os
+from typing import List, Dict, Any
 
-from typing import List, Dict
-
+from pygpt_net.core.types import MODE_CHAT
+from pygpt_net.item.model import ModelItem
 from pygpt_net.provider.agents.base import BaseAgent
 
 
@@ -94,3 +96,23 @@ class Provider:
         # sort by name
         choices.sort(key=lambda x: list(x.values())[0].lower())
         return choices
+
+    def get_openai_model(self, model: ModelItem) -> Any:
+        """
+        Get OpenAI model by model id
+
+        :param model: ModelItem
+        :return: OpenAI model provider
+        """
+        from openai import AsyncOpenAI
+        from agents import (
+            OpenAIChatCompletionsModel,
+        )
+        if model.provider == "openai":
+            return model.id
+        else:
+            args = self.window.core.models.prepare_client_args(MODE_CHAT, model)
+            return OpenAIChatCompletionsModel(
+                model=model.id,
+                openai_client=AsyncOpenAI(**args),
+            )

pygpt_net/core/agents/runner.py

@@ -105,6 +105,7 @@ class Runner:
             # vector store idx from preset
             if preset:
                 vector_store_idx = preset.idx
+                extra["agent_idx"] = vector_store_idx
 
             # tools
             agent_tools = self.window.core.agents.tools
@@ -126,7 +127,9 @@ class Runner:
 
             # --- ADDITIONAL CONTEXT ---
             # append additional context from RAG if available
-            if vector_store_idx and self.window.core.config.get("agent.idx.auto_retrieve", True):
+            if (vector_store_idx
+                    and vector_store_idx != "_"
+                    and self.window.core.config.get("agent.idx.auto_retrieve", True)):
                 ad_context = self.window.core.idx.chat.query_retrieval(
                     query=prompt,
                     idx=vector_store_idx,

pygpt_net/core/agents/runners/llama_workflow.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.14 01:00:00                  #
+# Updated Date: 2025.08.24 02:00:00                  #
 # ================================================== #
 
 import re
@@ -87,13 +87,14 @@ class LlamaWorkflow(BaseRunner):
             self.set_idle(signals)
             return False
 
+        use_current = False
         if ctx.partial:
+            use_current = True  # use current item as response if partial item (do not create new one)
             ctx.partial = False  # reset partial flag
 
-        response_ctx = self.make_response(ctx)
+        response_ctx = self.make_response(ctx, use_current=use_current)
         self.end_stream(response_ctx, signals)
         self.send_response(response_ctx, signals, KernelEvent.APPEND_DATA)  # send response
-
         self.set_idle(signals)
         return True
 
@@ -152,19 +153,24 @@ class LlamaWorkflow(BaseRunner):
             ctx.output = ctx.agent_final_response  # set output to current context
         else:
             ctx.output = ctx.live_output
-
         return ctx
 
     def make_response(
             self,
-            ctx: CtxItem
+            ctx: CtxItem,
+            use_current: bool = False
     ) -> CtxItem:
         """
         Create a response context item with the given input and output.
 
         :param ctx: CtxItem - the context item to use as a base
+        :param use_current: If True, use the current context item instead of creating a new one
         """
-        response_ctx = self.add_ctx(ctx, with_tool_outputs=True)
+        if use_current:
+            response_ctx = ctx  # use current context item
+        else:
+            response_ctx = self.add_ctx(ctx, with_tool_outputs=True)
+
         response_ctx.set_input("")
 
         prev_output = ctx.live_output
@@ -176,6 +182,9 @@ class LlamaWorkflow(BaseRunner):
         response_ctx.extra["agent_output"] = True  # mark as output response
         response_ctx.extra["agent_finish"] = True  # mark as finished
 
+        if "agent_input" in response_ctx.extra:
+            del response_ctx.extra["agent_input"]  # remove agent input from extra
+
         if ctx.agent_final_response:  # only if not empty
             response_ctx.extra["output"] = ctx.agent_final_response
 
@@ -194,9 +203,12 @@ class LlamaWorkflow(BaseRunner):
         :param output: Output string
         :return: Filtered output string
         """
+        if output is None:
+            return ""
+
         # Remove <execute>...</execute> tags
         filtered_output = re.sub(r'<execute>.*?</execute>', '', output, flags=re.DOTALL)
-        return filtered_output
+        return filtered_output.strip()
 
     async def run_agent(
             self,

pygpt_net/core/agents/runners/loop.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.14 03:00:00                  #
+# Updated Date: 2025.08.24 02:00:00                  #
 # ================================================== #
 
 from typing import Optional, List
@@ -136,6 +136,7 @@ class Loop(BaseRunner):
         self.set_status(signals, msg)
         if score < 0:
             self.send_response(ctx, signals, KernelEvent.APPEND_END)
+            self.set_idle(signals)
             return True
         good_score = self.window.core.config.get("agent.llama.loop.score", 75)
         if score >= good_score != 0:
@@ -145,6 +146,7 @@ class Loop(BaseRunner):
                 score=str(score)
             )
             self.send_response(ctx, signals, KernelEvent.APPEND_END, msg=msg)
+            self.set_idle(signals)
             return True
 
         # print("Instruction: " + instruction, "Score: " + str(score))

pygpt_net/core/agents/runners/openai_workflow.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.12 19:00:00                  #
+# Updated Date: 2025.08.24 03:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, List
@@ -59,6 +59,9 @@ class OpenAIWorkflow(BaseRunner):
         if self.is_stopped():
             return True  # abort if stopped
 
+        if "llm" in agent_kwargs:
+            agent_kwargs["llm"] = None  # clear llm if provided, as it is not used in OpenAI workflow
+
         self.set_busy(signals)
 
         # append input to messages
@@ -69,7 +72,7 @@ class OpenAIWorkflow(BaseRunner):
         self.window.core.gpt.vision.append_images(ctx)  # append images to ctx if provided
         history = history + msg
 
-        # callbacks
+        # ------------ callbacks ----------------
         def on_step(
                 ctx: CtxItem,
                 begin: bool = False
@@ -136,6 +139,16 @@ class OpenAIWorkflow(BaseRunner):
                 self.send_stream(ctx, signals, False)
                 self.end_stream(ctx, signals)
 
+            # fix: prevent race condition with next context if feedback after response
+            if finish and input == output:
+                ctx.extra["agent_finish"] = True  # mark as finished and ready for evaluation
+                ctx.extra["agent_finish_evaluate"] = True  # mark as feedback response (ignored in loop evaluation)
+                if stream:
+                    self.send_stream(ctx, signals, False)
+                    self.end_stream(ctx, signals)
+                self.send_response(ctx, signals, KernelEvent.APPEND_DATA)
+                return ctx
+
             # create and return next context item
             next_ctx = self.add_next_ctx(ctx)
             next_ctx.set_input(input)
@@ -158,7 +171,8 @@ class OpenAIWorkflow(BaseRunner):
             self.set_idle(signals)
             self.set_error(error)
 
-        # callbacks
+        # ------------ / callbacks ----------------
+
         bridge = ConnectionContext(
             stopped=self.is_stopped,
             on_step=on_step,

pygpt_net/core/agents/tools.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.21 07:00:00                  #
+# Updated Date: 2025.08.24 02:00:00                  #
 # ================================================== #
 
 import json
@@ -564,6 +564,9 @@ class CodeExecutor:
         :param code: Python code to execute
         :return: Output from the code execution
         """
+        if not self.window.core.command.is_cmd():
+            return "Tool execution is not enabled. Abort execution and ask user for tool enable."
+
         self.window.core.agents.tools.last_tool_output = None
         if code == "/restart":
             commands = [