pygpt-net 2.5.98.post1__py3-none-any.whl → 2.6.0__py3-none-any.whl

pygpt_net/provider/agents/openai/agent_b2b.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.12 19:00:00                  #
 # ================================================== #
 
 import copy
@@ -93,6 +93,24 @@ class Agent(BaseAgent):
         kwargs.update(tool_kwargs) # update kwargs with tools
         return OpenAIAgent(**kwargs)
 
+    def reverse_history(
+            self,
+            items: list[TResponseInputItem]
+    ):
+        """
+        Reverse the roles of items in the input list in history (assistant to user)
+
+        :param items: List of input items
+        :return: List of input items with reversed roles
+        """
+        counter = 1
+        for item in items:
+            if item.get("role") == "assistant":
+                if counter % 2 == 0:
+                    item["role"] = "user"
+                counter += 1
+        return items
+
     def reverse_items(
             self,
             items: list[TResponseInputItem],
@@ -236,6 +254,10 @@ class Agent(BaseAgent):
         }
         input_items: list[TResponseInputItem] = messages
 
+        # reverse history if needed
+        if use_partial_ctx:
+            input_items = self.reverse_history(input_items)
+
         if not stream:
             while True:
                 # -------- bot 1 --------
@@ -250,6 +272,7 @@ class Agent(BaseAgent):
                     **kwargs
                 )
                 response_id = result.last_response_id
+                output_1 = final_output
                 if verbose:
                     print("Final response:", result)
 
@@ -263,6 +286,15 @@ class Agent(BaseAgent):
                 input_items = result.to_input_list()
                 input_items = self.reverse_items(input_items, verbose=reverse_verbose)
 
+                if use_partial_ctx:
+                    ctx = bridge.on_next_ctx(
+                        ctx=ctx,
+                        input="",  # new ctx: input
+                        output=output_1,  # prev ctx: output
+                        response_id=response_id,
+                        stream=False,
+                    )
+
                 # -------- bot 2 --------
                 kwargs["input"] = input_items
                 kwargs = self.prepare_model(model_2, window, previous_response_id, kwargs)
@@ -271,6 +303,7 @@ class Agent(BaseAgent):
                     **kwargs
                 )
                 response_id = result.last_response_id
+                output_2 = final_output
                 if verbose:
                     print("Final response:", result)
 
@@ -282,17 +315,17 @@ class Agent(BaseAgent):
                 # get and reverse items
                 input_items = result.to_input_list()
                 input_items = self.reverse_items(input_items, verbose=reverse_verbose)
+
+                if use_partial_ctx:
+                    ctx = bridge.on_next_ctx(
+                        ctx=ctx,
+                        input="", # new ctx: input
+                        output=output_2,  # prev ctx: output
+                        response_id=response_id,
+                        stream=False,
+                    )
         else:
             handler = StreamHandler(window, bridge)
-            if use_partial_ctx:
-                # we must replace message roles at beginning, second bot will be user
-                msg_counter = 1
-                for item in input_items:
-                    if item.get("role") == "assistant":
-                        if msg_counter % 2 == 0:
-                            item["role"] = "user"
-                        msg_counter += 1
-
             begin = True
             while True:
                 # -------- bot 1 --------
@@ -335,6 +368,7 @@ class Agent(BaseAgent):
                         input="",  # new ctx: input
                         output=output_1,  # prev ctx: output
                         response_id=response_id,
+                        stream=True,
                     )
                     handler.new()
                 else:
@@ -377,6 +411,7 @@ class Agent(BaseAgent):
                         input="", # new ctx: input
                         output=output_2,  # prev ctx: output
                         response_id=response_id,
+                        stream=True,
                     )
                     handler.new()
                 else:

pygpt_net/provider/agents/openai/agent_planner.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.12 19:00:00                  #
 # ================================================== #
 
 from dataclasses import dataclass
@@ -338,10 +338,30 @@ class Agent(BaseAgent):
 
                 print(f"Evaluator score: {result.score}")
                 if result.score == "pass":
-                    print("Response is good enough, exiting.")
+                    if use_partial_ctx:
+                        ctx = bridge.on_next_ctx(
+                            ctx=ctx,
+                            input=result.feedback,  # new ctx: input
+                            output=final_output,  # prev ctx: output
+                            response_id=response_id,
+                            finish=True,
+                            stream=False,
+                        )
+                    else:
+                        print("Response is good enough, exiting.")
                     break
+
                 print("Re-running with feedback")
                 input_items.append({"content": f"Feedback: {result.feedback}", "role": "user"})
+
+                if use_partial_ctx:
+                    ctx = bridge.on_next_ctx(
+                        ctx=ctx,
+                        input=result.feedback,  # new ctx: input
+                        output=final_output,  # prev ctx: output
+                        response_id=response_id,
+                        stream=False,
+                    )
         else:
             final_output = result.plan + "\n___\n"
             handler = StreamHandler(window, bridge, final_output)
@@ -379,6 +399,7 @@ class Agent(BaseAgent):
                             output=final_output,  # prev ctx: output
                             response_id=response_id,
                             finish=True,
+                            stream=True,
                         )
                     else:
                         ctx.stream = info
@@ -395,6 +416,7 @@ class Agent(BaseAgent):
                         input=result.feedback,  # new ctx: input
                         output=final_output,  # prev ctx: output
                         response_id=response_id,
+                        stream=True,
                     )
                     handler.new()
                 else:

pygpt_net/provider/agents/openai/agent_with_experts.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.12 19:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, Tuple, Optional
@@ -79,43 +79,6 @@ class Agent(BaseAgent):
         kwargs.update(tool_kwargs)  # update kwargs with tools
         return OpenAIAgent(**kwargs)
 
-
-    def get_expert(
-            self,
-            window,
-            prompt: str,
-            model: ModelItem,
-            preset: PresetItem = None,
-            tools: list = None,
-    ) -> OpenAIAgent:
-        """
-        Return Agent provider instance
-
-        :param window: window instance
-        :param prompt: Expert prompt
-        :param model: Model item
-        :param preset: Preset item
-        :param tools: List of function tools
-        :return: Agent provider instance
-        """
-        agent_name = preset.name if preset else "Agent"
-        kwargs = {
-            "name": agent_name,
-            "instructions": prompt,
-            "model": model.id,
-        }
-        tool_kwargs = append_tools(
-            tools=tools,
-            window=window,
-            model=model,
-            preset=preset,
-            allow_local_tools=True,
-            allow_remote_tools=True,
-            is_expert_call=True,
-        )
-        kwargs.update(tool_kwargs)  # update kwargs with tools
-        return OpenAIAgent(**kwargs)
-
     async def run(
             self,
             window: Any = None,

pygpt_net/provider/agents/openai/agent_with_experts_feedback.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.12 19:00:00                  #
 # ================================================== #
 
 from dataclasses import dataclass
@@ -98,42 +98,6 @@ class Agent(BaseAgent):
         agent_kwargs.update(tool_kwargs) # update kwargs with tools
         return OpenAIAgent(**agent_kwargs)
 
-    def get_expert(
-            self,
-            window,
-            prompt: str,
-            model: ModelItem,
-            preset: PresetItem = None,
-            tools: list = None,
-    ) -> OpenAIAgent:
-        """
-        Return Agent provider instance
-
-        :param window: window instance
-        :param prompt: Expert prompt
-        :param model: Model item
-        :param preset: Preset item
-        :param tools: List of function tools
-        :return: Agent provider instance
-        """
-        agent_name = preset.name if preset else "Agent"
-        kwargs = {
-            "name": agent_name,
-            "instructions": prompt,
-            "model": model.id,
-        }
-        tool_kwargs = append_tools(
-            tools=tools,
-            window=window,
-            model=model,
-            preset=preset,
-            allow_local_tools=True,
-            allow_remote_tools=True,
-            is_expert_call=True,
-        )
-        kwargs.update(tool_kwargs)  # update kwargs with tools
-        return OpenAIAgent(**kwargs)
-
     def get_evaluator(
             self,
             window,
@@ -274,10 +238,29 @@ class Agent(BaseAgent):
 
                 print(f"Evaluator score: {result.score}")
                 if result.score == "pass":
-                    print("Response is good enough, exiting.")
+                    if use_partial_ctx:
+                        ctx = bridge.on_next_ctx(
+                            ctx=ctx,
+                            input=result.feedback,  # new ctx: input
+                            output=final_output,  # prev ctx: output
+                            response_id=response_id,
+                            finish=True,
+                            stream=False,
+                        )
+                    else:
+                        print("Response is good enough, exiting.")
                     break
                 print("Re-running with feedback")
                 input_items.append({"content": f"Feedback: {result.feedback}", "role": "user"})
+
+                if use_partial_ctx:
+                    ctx = bridge.on_next_ctx(
+                        ctx=ctx,
+                        input=result.feedback, # new ctx: input
+                        output=final_output,  # prev ctx: output
+                        response_id=response_id,
+                        stream=False,
+                    )
         else:
             handler = StreamHandler(window, bridge)
             while True:
@@ -314,6 +297,7 @@ class Agent(BaseAgent):
                             output=final_output,  # prev ctx: output
                             response_id=response_id,
                             finish=True,
+                            stream=True,
                         )
                     else:
                         ctx.stream = info
@@ -330,6 +314,7 @@ class Agent(BaseAgent):
                         input=result.feedback,  # new ctx: input
                         output=final_output,  # prev ctx: output
                         response_id=response_id,
+                        stream=True,
                     )
                     handler.new()
                 else:

pygpt_net/provider/agents/openai/agent_with_feedback.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.12 19:00:00                  #
 # ================================================== #
 
 from dataclasses import dataclass
@@ -238,10 +238,29 @@ class Agent(BaseAgent):
 
                 print(f"Evaluator score: {result.score}")
                 if result.score == "pass":
-                    print("Response is good enough, exiting.")
+                    if use_partial_ctx:
+                        ctx = bridge.on_next_ctx(
+                            ctx=ctx,
+                            input=result.feedback,  # new ctx: input
+                            output=final_output,  # prev ctx: output
+                            response_id=response_id,
+                            finish=True,
+                            stream=False,
+                        )
+                    else:
+                        print("Response is good enough, exiting.")
                     break
                 print("Re-running with feedback")
                 input_items.append({"content": f"Feedback: {result.feedback}", "role": "user"})
+
+                if use_partial_ctx:
+                    ctx = bridge.on_next_ctx(
+                        ctx=ctx,
+                        input=result.feedback, # new ctx: input
+                        output=final_output,  # prev ctx: output
+                        response_id=response_id,
+                        stream=False,
+                    )
         else:
             handler = StreamHandler(window, bridge)
             while True:
@@ -278,6 +297,7 @@ class Agent(BaseAgent):
                             output=final_output,  # prev ctx: output
                             response_id=response_id,
                             finish=True,
+                            stream=True,
                         )
                     else:
                         ctx.stream = info
@@ -294,6 +314,7 @@ class Agent(BaseAgent):
                         input=result.feedback, # new ctx: input
                         output=final_output,  # prev ctx: output
                         response_id=response_id,
+                        stream=True,
                     )
                     handler.new()
                 else:

pygpt_net/provider/agents/openai/bot_researcher.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.12 19:00:00                  #
 # ================================================== #
 
 from typing import Dict, Any, Tuple, Union, Optional
@@ -211,11 +211,7 @@ class Agent(BaseAgent):
         if model.provider == "openai":
             set_openai_env(window)
 
-        if not stream:
-            final_output = await bot.run(query)
-        else:
-            final_output = await bot.run(query)
-
+        final_output = await bot.run(query)
         return ctx, final_output, response_id
 
 

pygpt_net/provider/agents/openai/evolve.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.12 19:00:00                  #
 # ================================================== #
 
 import copy
@@ -358,11 +358,30 @@ class Agent(BaseAgent):
 
                 print(f"Evaluator score: {result.score}")
                 if result.score == "pass":
-                    print("Response is good enough, exiting.")
+                    if use_partial_ctx:
+                        ctx = bridge.on_next_ctx(
+                            ctx=ctx,
+                            input=result.feedback,  # new ctx: input
+                            output=final_output,  # prev ctx: output
+                            response_id=response_id,
+                            finish=True,
+                            stream=False,
+                        )
+                    else:
+                        print("Response is good enough, exiting.")
                     break
                 print("Re-running with feedback")
                 input_items.append({"content": f"Feedback: {result.feedback}", "role": "user"})
 
+                if use_partial_ctx:
+                    ctx = bridge.on_next_ctx(
+                        ctx=ctx,
+                        input=result.feedback,  # new ctx: input
+                        output=final_output,  # prev ctx: output
+                        response_id=response_id,
+                        stream=False,
+                    )
+
                 if num_generation >= max_generations > 0:
                     info = f"\n\n**Max generations reached ({max_generations}), exiting.**\n"
                     ctx.stream = info
@@ -439,6 +458,7 @@ class Agent(BaseAgent):
                             output=final_output,  # prev ctx: output
                             response_id=response_id,
                             finish=True,
+                            stream=True,
                         )
                     else:
                         ctx.stream = info
@@ -457,6 +477,7 @@ class Agent(BaseAgent):
                         input=result.feedback,  # new ctx: input
                         output=final_output,  # prev ctx: output
                         response_id=response_id,
+                        stream=True,
                     )
                     handler.new()
                 else:

pygpt_net/provider/core/config/patch.py

@@ -2243,6 +2243,13 @@ class Patch:
                     data["agent.openai.response.split"] = True
                 updated = True
 
+            # < 2.6.0
+            if old < parse_version("2.6.0"):
+                print("Migrating config from < 2.6.0...")
+                self.window.core.updater.patch_css('style.light.css', True)  # scrollbar, calendar fix
+                self.window.core.updater.patch_css('style.dark.css', True)  # calendar fix
+                updated = True
+
         # update file
         migrated = False
         if updated:

pygpt_net/provider/gpt/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.08 05:00:00                  #
+# Updated Date: 2025.08.12 19:00:00                  #
 # ================================================== #
 
 from openai import OpenAI
@@ -62,6 +62,7 @@ class Gpt:
         self.tools = Tools(window)
         self.vision = Vision(window)
         self.client = None
+        self.locked = False
 
     def get_client(
             self,
@@ -233,9 +234,12 @@ class Gpt:
         if context.request:
             context.stream = False
             context.mode = "chat"  # fake mode for redirect
-            result = self.call(context, extra)
+            self.locked = True
+            self.call(context, extra)
+            self.locked = False
             return context.ctx.output
 
+        self.locked = True
         ctx = context.ctx
         mode = context.mode
         prompt = context.prompt
@@ -291,7 +295,21 @@ class Gpt:
         except Exception as e:
             self.window.core.debug.log(e)
             print("Error in GPT quick call: " + str(e))
+        finally:
+            self.locked = False
 
     def stop(self):
-        """Stop OpenAI API"""
+        """On global event stop"""
         pass
+
+    def close(self):
+        """Close OpenAI client"""
+        if self.locked:
+            return
+        if self.client is not None:
+            try:
+                self.client.close()
+                self.client = None
+            except Exception as e:
+                self.window.core.debug.log(e)
+                print("Error closing GPT client:", e)

pygpt_net/tools/html_canvas/ui/widgets.py

@@ -34,6 +34,10 @@ class ToolWidget:
         self.edit = None  # canvas edit
         self.btn_edit = None  # edit checkbox
 
+    def on_open(self):
+        """On open"""
+        pass
+
     def on_delete(self):
         """On delete"""
         if self.tool:

pygpt_net/tools/media_player/tool.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 22:00:00                  #
+# Updated Date: 2025.08.12 15:00:00                  #
 # ================================================== #
 
 import datetime
@@ -36,9 +36,12 @@ class MediaPlayer(BaseTool):
         self.id = "player"
         self.opened = False
         self.dialog = None
+        self.initialized = False
 
-    def setup(self):
+    def lazy_setup(self):
         """Setup media player"""
+        if self.initialized:
+            return
         if self.window.core.config.has("video.player.path"):
             path = self.window.core.config.get("video.player.path")
             if path:
@@ -50,6 +53,11 @@ class MediaPlayer(BaseTool):
         if self.window.core.config.has("video.player.volume.mute"):
             self.window.video_player.set_muted(self.window.core.config.get("video.player.volume.mute"))
         self.window.video_player.update()  # update player volume, slider, etc.
+        self.initialized = True
+
+    def setup(self):
+        """Setup media player"""
+        pass
 
     def update(self):
         """Update menu"""
@@ -130,6 +138,7 @@ class MediaPlayer(BaseTool):
                 )
     def open(self):
         """Open player window"""
+        self.lazy_setup()
         self.window.ui.dialogs.open('video_player', width=800, height=600)
         self.window.video_player.force_resize()
         self.opened = True