pygpt-net 2.6.17__py3-none-any.whl → 2.6.18__py3-none-any.whl

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,8 @@
+2.6.18 (2025-08-21)
+
+- Refactor and optimizations.
+- Fix: Evolve agent stop event calling.
+
 2.6.17 (2025-08-21)
 
 - Optimized profile switching.

pygpt_net/__init__.py

@@ -13,7 +13,7 @@ __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.6.17"
+__version__ = "2.6.18"
 __build__ = "2025-08-21"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"

pygpt_net/app.py

@@ -25,12 +25,14 @@ if platform.system() == 'Windows':
 # enable debug logging
 # os.environ["QT_LOGGING_RULES"] = "*.debug=true"
 # os.environ["QTWEBENGINE_REMOTE_DEBUGGING"] = "9222"
+"""
 os.environ["QTWEBENGINE_CHROMIUM_FLAGS"] = (
     "--renderer-process-limit=1 "
     "--process-per-site "
     "--enable-precise-memory-info "
     "--js-flags=--expose-gc"
 )
+"""
 
 _original_open = builtins.open
 

pygpt_net/controller/chat/output.py

@@ -291,8 +291,8 @@ class Output:
 
         if mode != MODE_ASSISTANT:
             self.window.controller.kernel.stack.handle()  # handle reply
-            # event = RenderEvent(RenderEvent.RELOAD)
-            # self.window.dispatch(event)  # reload chat window
+            event = RenderEvent(RenderEvent.RELOAD)
+            self.window.dispatch(event)  # reload chat window
 
         mem_clean()
 

pygpt_net/controller/chat/response.py

@@ -103,7 +103,6 @@ class Response:
             extra["error"] = e
             self.failed(context, extra)
 
-
         if stream: 
             if mode not in self.window.controller.chat.output.not_stream_modes:
                 return # handled in stream:handleEnd()
@@ -205,7 +204,6 @@ class Response:
         # if next in agent cycle
         if ctx.partial:
             self.window.dispatch(AppEvent(AppEvent.CTX_END))  # app event
-            self.window.dispatch(RenderEvent(RenderEvent.RELOAD))  # reload chat window
 
         # handle current step
         ctx.current = False  # reset current state
@@ -214,33 +212,30 @@ class Response:
         internal = ctx.internal
 
         self.window.core.ctx.set_last_item(ctx)
-        data = {
+        event = RenderEvent(RenderEvent.BEGIN, {
             "meta": ctx.meta,
             "ctx": ctx,
             "stream": stream,
-        }
-        event = RenderEvent(RenderEvent.BEGIN, data)
+        })
         self.window.dispatch(event)
 
         # append step input to chat window
-        data = {
+        event = RenderEvent(RenderEvent.INPUT_APPEND, {
             "meta": ctx.meta,
             "ctx": ctx,
-        }
-        event = RenderEvent(RenderEvent.INPUT_APPEND, data)
+        })
         self.window.dispatch(event)
+
         if ctx.id is None:
             self.window.core.ctx.add(ctx)
-        self.window.controller.ctx.update(
-            reload=True,
-            all=False,
-        )
+
         self.window.core.ctx.update_item(ctx)
 
         # update ctx meta
         if mode in (MODE_AGENT_LLAMA, MODE_AGENT_OPENAI) and ctx.meta is not None:
             self.window.core.ctx.replace(ctx.meta)
             self.window.core.ctx.save(ctx.meta.id)
+
             # update preset if exists
             preset = self.window.controller.presets.get_current()
             if preset is not None:
@@ -257,31 +252,22 @@ class Response:
 
         # post-handle, execute cmd, etc.
         self.window.controller.chat.output.post_handle(ctx, mode, stream, reply, internal)
-
-        data = {
-            "meta": ctx.meta,
-        }
-        event = RenderEvent(RenderEvent.TOOL_BEGIN, data)
-        self.window.dispatch(event)  # show cmd waiting
         self.window.controller.chat.output.handle_end(ctx, mode)  # handle end.
 
-        data = {
-            "meta": ctx.meta,
-            "ctx": ctx,
-            "stream": self.window.core.config.get("stream", False),
-        }
-        event = RenderEvent(RenderEvent.END, data)
+        event = RenderEvent(RenderEvent.RELOAD)
         self.window.dispatch(event)
 
         # if continue reasoning
         if global_mode not in (MODE_AGENT_LLAMA, MODE_AGENT_OPENAI):
             return  # no agent mode, nothing to do
 
-        if ctx.extra is None or (type(ctx.extra) == dict and "agent_finish" not in ctx.extra):
+        # not agent final response
+        if ctx.extra is None or (isinstance(ctx.extra, dict) and "agent_finish" not in ctx.extra):
             self.window.update_status(trans("status.agent.reasoning"))
             self.window.controller.chat.common.lock_input()  # lock input, re-enable stop button
 
-        if ctx.extra is not None and (type(ctx.extra) == dict and "agent_finish" in ctx.extra):
+        # agent final response
+        if ctx.extra is not None and (isinstance(ctx.extra, dict) and "agent_finish" in ctx.extra):
             self.window.controller.agent.llama.on_finish(ctx)  # evaluate response and continue if needed
 
     def end(

pygpt_net/core/agents/observer/evaluation.py

@@ -139,9 +139,8 @@ class Evaluation:
         for ctx in history:
             if self.is_input(ctx):  # ensure ctx is input
                 if not use_prev and "agent_evaluate" in ctx.extra:  # exclude evaluation inputs
-                        continue
-                if ctx.input:
-                    last_input = ctx.input
+                    continue
+                last_input = ctx.input
         return last_input
 
     def is_input(self, ctx: CtxItem) -> bool:
@@ -151,7 +150,7 @@ class Evaluation:
         :param ctx: context item
         :return: True if input, False otherwise
         """
-        return ctx.extra is not None and "agent_input" in ctx.extra
+        return ctx.extra is not None and "agent_input" in ctx.extra and ctx.input
 
     def is_output(self, ctx: CtxItem) -> bool:
         """
@@ -174,9 +173,8 @@ class Evaluation:
         task = ""
         for ctx in history:
             if self.is_input(ctx):
-                if ctx.input:
-                    task = ctx.input
-                    break
+                task = ctx.input
+                break
         return task
 
     def get_final_response(self, history: List[CtxItem]) -> str:

pygpt_net/core/agents/runner.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 13:00:00                  #
+# Updated Date: 2025.08.21 07:00:00                  #
 # ================================================== #
 
 import asyncio
@@ -39,6 +39,7 @@ class Runner:
     APPEND_SYSTEM_PROMPT_TO_MSG = [
         "react",  # llama-index
     ]
+    ADDITIONAL_CONTEXT_PREFIX = "ADDITIONAL CONTEXT:"
 
     def __init__(self, window=None):
         """
@@ -76,9 +77,13 @@ class Runner:
             return True  # abort if stopped
 
         agent_id = extra.get("agent_provider", "openai")
-        verbose = self.window.core.config.get("agent.llama.verbose", False)
+        verbose = self.is_verbose()
 
         try:
+            # first, check if agent exists
+            if not self.window.core.agents.provider.has(agent_id):
+                raise Exception(f"Agent not found: {agent_id}")
+
             # prepare input ctx
             ctx = context.ctx
             ctx.extra["agent_input"] = True  # mark as user input
@@ -102,8 +107,22 @@ class Runner:
                 vector_store_idx = preset.idx
 
             # tools
-            self.window.core.agents.tools.context = context
-            self.window.core.agents.tools.agent_idx = vector_store_idx
+            agent_tools = self.window.core.agents.tools
+            agent_tools.set_context(context)
+            agent_tools.set_idx(vector_store_idx)
+
+            tools = agent_tools.prepare(context, extra, force=True)
+            function_tools = agent_tools.get_function_tools(ctx, extra, force=True)
+            plugin_tools = agent_tools.get_plugin_tools(context, extra, force=True)
+            plugin_specs = agent_tools.get_plugin_specs(context, extra, force=True)
+            retriever_tool = agent_tools.get_retriever_tool(context, extra)
+
+            # disable tools if cmd is not enabled
+            if not is_cmd:
+                function_tools = []
+                plugin_tools = []
+                plugin_specs = []
+                tools = []
 
             # --- ADDITIONAL CONTEXT ---
             # append additional context from RAG if available
@@ -118,24 +137,11 @@ class Runner:
                     if ctx.hidden_input is None:
                         ctx.hidden_input = ""
                     if not ctx.hidden_input:  # may be not empty (appended before from attachments)
-                        to_append =  "ADDITIONAL CONTEXT:"
+                        to_append = self.ADDITIONAL_CONTEXT_PREFIX
                         ctx.hidden_input += to_append
                     to_append += "\n" + ad_context
                     ctx.hidden_input += to_append
                     prompt += "\n\n" + to_append
-
-            tools = self.window.core.agents.tools.prepare(context, extra, force=True)
-            function_tools = self.window.core.agents.tools.get_function_tools(ctx, extra, force=True)
-            plugin_tools = self.window.core.agents.tools.get_plugin_tools(context, extra, force=True)
-            plugin_specs = self.window.core.agents.tools.get_plugin_specs(context, extra, force=True)
-            retriever_tool = self.window.core.agents.tools.get_retriever_tool(context, extra)
-
-            # disable tools if cmd is not enabled
-            if not is_cmd:
-                function_tools = []
-                plugin_tools = []
-                plugin_specs = []
-                tools = []
             
             # append system prompt
             if agent_id in self.APPEND_SYSTEM_PROMPT_TO_MSG:
@@ -164,14 +170,11 @@ class Runner:
                 "preset": context.preset if context else None,
             }
 
-            if self.window.core.agents.provider.has(agent_id):
-                provider = self.window.core.agents.provider.get(agent_id)
-                agent = provider.get_agent(self.window, agent_kwargs)
-                agent_run = provider.run
-                if verbose:
-                    print("Using Agent: " + str(agent_id) + ", model: " + str(model.id))
-            else:
-                raise Exception("Agent not found: " + str(agent_id))
+            provider = self.window.core.agents.provider.get(agent_id)
+            agent = provider.get_agent(self.window, agent_kwargs)
+            agent_run = provider.run
+            if verbose:
+                print(f"Using Agent: {agent_id}, model: {model.id}")
 
             # run agent
             mode = provider.get_mode()
@@ -200,8 +203,7 @@ class Runner:
                 return asyncio.run(self.openai_workflow.run(**kwargs))
 
         except Exception as e:
-            print("Error in agent runner:", e)
-            self.window.core.debug.error(e)
+            self.window.core.debug.log(e)
             self.last_error = e
             return False
 
@@ -223,9 +225,13 @@ class Runner:
             return True  # abort if stopped
 
         agent_id = extra.get("agent_provider", "openai")
-        verbose = self.window.core.config.get("agent.llama.verbose", False)
+        verbose = self.is_verbose()
 
         try:
+            # first, check if agent exists
+            if not self.window.core.agents.provider.has(agent_id):
+                raise Exception(f"Agent not found: {agent_id}")
+
             # prepare input ctx
             ctx = context.ctx
             ctx.extra["agent_input"] = True  # mark as user input
@@ -244,13 +250,14 @@ class Runner:
             workdir = self.window.core.config.get_workdir_prefix()
 
             # tools
-            self.window.core.agents.tools.context = context
-            self.window.core.agents.tools.agent_idx = vector_store_idx
+            agent_tools = self.window.core.agents.tools
+            agent_tools.set_context(context)
+            agent_tools.set_idx(vector_store_idx)
 
             if "agent_tools" in extra:
                 tools = extra["agent_tools"]  # use tools from extra if provided
             else:
-                tools = self.window.core.agents.tools.prepare(context, extra, force=True)
+                tools = agent_tools.prepare(context, extra, force=True)
                 if not is_cmd:
                     tools = []  # disable tools if cmd is not enabled, force agent tools
 
@@ -282,13 +289,10 @@ class Runner:
                 "preset": context.preset if context else None,
             }
 
-            if self.window.core.agents.provider.has(agent_id):
-                provider = self.window.core.agents.provider.get(agent_id)
-                agent = provider.get_agent(self.window, agent_kwargs)
-                if verbose:
-                    print("Using Agent: " + str(agent_id) + ", model: " + str(model.id))
-            else:
-                raise Exception("Agent not found: " + str(agent_id))
+            provider = self.window.core.agents.provider.get(agent_id)
+            agent = provider.get_agent(self.window, agent_kwargs)
+            if verbose:
+                print(f"Using Agent: {agent_id}, model: {model.id}")
 
             # run agent and return result
             mode = provider.get_mode()
@@ -304,12 +308,19 @@ class Runner:
             }
             # TODO: add support for other modes
             if mode == AGENT_MODE_WORKFLOW:
-                return asyncio.run(self.llama_workflow.run_once(**kwargs))
+                return asyncio.run(self.llama_workflow.run_once(**kwargs))  # return CtxItem
 
         except Exception as e:
-            self.window.core.debug.error(e)
+            self.window.core.debug.log(e)
             self.last_error = e
-            return None
+
+    def is_verbose(self) -> bool:
+        """
+        Check if verbose mode is enabled
+
+        :return: True if verbose mode is enabled
+        """
+        return self.window.core.config.get("agent.llama.verbose", False)
 
     def get_error(self) -> Optional[Exception]:
         """

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.07.30 00:00:00                  #
+# Updated Date: 2025.08.21 07:00:00                  #
 # ================================================== #
 
 import json
@@ -21,17 +21,16 @@ from llama_index.core.tools import BaseTool, FunctionTool, QueryEngineTool, Tool
 
 from pygpt_net.core.bridge.context import BridgeContext
 from pygpt_net.core.events import Event
+from pygpt_net.core.types import (
+    TOOL_QUERY_ENGINE_NAME,
+    TOOL_QUERY_ENGINE_DESCRIPTION,
+    TOOL_QUERY_ENGINE_SPEC,
+)
 from pygpt_net.item.ctx import CtxItem
 
 
 class Tools:
 
-    QUERY_ENGINE_TOOL_NAME = "rag_get_context"
-    QUERY_ENGINE_TOOL_DESCRIPTION = "Get additional context for provided question. Use this whenever you need additional context to provide an answer. "
-    QUERY_ENGINE_TOOL_SPEC = ("**"+QUERY_ENGINE_TOOL_NAME+"**: "
-                         + QUERY_ENGINE_TOOL_DESCRIPTION +
-                         "available params: {'query': {'type': 'string', 'description': 'query string'}}, required: [query]")
-
     def __init__(self, window=None):
         """
         Agent tools
@@ -97,7 +96,7 @@ class Tools:
 
         # add query engine tool if idx is provided
         idx = extra.get("agent_idx", None)
-        if idx is not None and idx != "_":
+        if self.window.core.idx.is_valid(idx):
             llm, embed_model = self.window.core.idx.llm.get_service_context(model=context.model)
             index = self.window.core.idx.storage.get(idx, llm, embed_model)  # get index
             if index is not None:
@@ -106,8 +105,8 @@ class Tools:
                     QueryEngineTool(
                         query_engine=query_engine,
                         metadata=ToolMetadata(
-                            name=self.QUERY_ENGINE_TOOL_NAME,
-                            description=self.QUERY_ENGINE_TOOL_DESCRIPTION,
+                            name=TOOL_QUERY_ENGINE_NAME,
+                            description=TOOL_QUERY_ENGINE_DESCRIPTION,
                         ),
                     ),
                 ]
@@ -127,7 +126,7 @@ class Tools:
         """
         async def run_function(run_ctx: RunContextWrapper[Any], args: str) -> str:
             name = run_ctx.tool_name
-            print("[Plugin] Tool call: " + name + " with args: " + str(args))
+            print(f"[Plugin] Tool call: {name} with args: {args}")
             cmd = {
                 "cmd": name,
                 "params": json.loads(args)  # args should be a JSON string
@@ -140,9 +139,9 @@ class Tools:
                 "description": "The query string to search in the index."
             }
         }, "additionalProperties": False}
-        description = self.QUERY_ENGINE_TOOL_DESCRIPTION + f" Index: {idx}"
+        description = TOOL_QUERY_ENGINE_DESCRIPTION + f" Index: {idx}"
         return OpenAIFunctionTool(
-            name=self.QUERY_ENGINE_TOOL_NAME,
+            name=TOOL_QUERY_ENGINE_NAME,
             description=description,
             params_json_schema=schema,
             on_invoke_tool=run_function,
@@ -153,14 +152,14 @@ class Tools:
             ctx: CtxItem,
             verbose: bool = False,
             force: bool = False
-    ) -> list:
+    ) -> List[BaseTool]:
         """
         Parse plugin functions
 
         :param ctx: CtxItem
         :param verbose: verbose mode
         :param force: force to get functions even if not needed
-        :return: List of functions
+        :return: List of BaseTool instances
         """
         tools = []
         functions = self.window.core.command.get_functions(force=force)
@@ -175,7 +174,7 @@ class Tools:
 
                 def make_func(name, description):
                     def func(**kwargs):
-                        self.log("[Plugin] Tool call: " + name + " " + str(kwargs))
+                        self.log(f"[Plugin] Tool call: {name} {kwargs}")
                         cmd = {
                             "cmd": name,
                             "params": kwargs,
@@ -202,7 +201,7 @@ class Tools:
                 )
                 tools.append(tool)
             except Exception as e:
-                print(e)
+                self.window.core.debug.log(e)
         return tools
 
     def get_function_tools(
@@ -210,7 +209,7 @@ class Tools:
             ctx: CtxItem,
             verbose: bool = False,
             force: bool = False
-    ) -> list:
+    ) -> List[OpenAIFunctionTool]:
         """
         Parse plugin functions and return as OpenAI FunctionTool instances
 
@@ -231,7 +230,7 @@ class Tools:
 
                 async def run_function(run_ctx: RunContextWrapper[Any], args: str) -> str:
                     name = run_ctx.tool_name
-                    print("[Plugin] Tool call: " + name + " with args: " + str(args))
+                    print(f"[Plugin] Tool call: {name} with args: {args}")
                     cmd = {
                         "cmd": name,
                         "params": json.loads(args)  # args should be a JSON string
@@ -268,10 +267,10 @@ class Tools:
                 )
                 tools.append(tool)
             except Exception as e:
-                print(e)
+                self.window.core.debug.log(e)
 
         # append query engine tool if idx is provided
-        if self.agent_idx is not None and self.agent_idx != "_":
+        if self.window.core.idx.is_valid(self.agent_idx):
             tools.append(self.get_openai_retriever_tool(self.agent_idx))
 
         return tools
@@ -282,7 +281,7 @@ class Tools:
             extra: Dict[str, Any],
             verbose: bool = False,
             force: bool = False
-    ) -> dict:
+    ) -> Dict[str, BaseTool]:
         """
         Parse plugin functions
 
@@ -290,6 +289,7 @@ class Tools:
         :param extra: extra data
         :param verbose: verbose mode
         :param force: force to get functions even if not needed
+        :return: Dictionary of tool names and BaseTool instances
         """
         tools = {}
         functions = self.window.core.command.get_functions(force=force)
@@ -303,7 +303,7 @@ class Tools:
 
                 def make_func(name, description):
                     def func(**kwargs):
-                        self.log("[Plugin] Tool call: " + name + " " + str(kwargs))
+                        self.log(f"[Plugin] Tool call: {name} {kwargs}")
                         cmd = {
                             "cmd": name,
                             "params": kwargs,
@@ -321,10 +321,10 @@ class Tools:
                 func = make_func(name, description)
                 tools[name] = func
             except Exception as e:
-                print(e)
+                self.window.core.debug.log(e)
 
         # add query engine tool if idx is provided
-        if self.agent_idx is not None and self.agent_idx != "_":
+        if self.window.core.idx.is_valid(self.agent_idx):
             extra = {
                 "agent_idx": self.agent_idx,  # agent index for query engine tool
             }
@@ -344,7 +344,7 @@ class Tools:
             extra: Dict[str, Any],
             verbose: bool = False,
             force: bool = False
-    ) -> list:
+    ) -> List[str]:
         """
         Parse plugin functions
 
@@ -352,13 +352,14 @@ class Tools:
         :param extra: extra data
         :param verbose: verbose mode
         :param force: force to get functions even if not needed
+        :return: List of tool specifications as strings
         """
         specs = []
         functions = self.window.core.command.get_functions(force=force)
 
         # add query engine tool spec if idx is provided
-        if self.agent_idx is not None and self.agent_idx  != "_":
-            specs.append(self.QUERY_ENGINE_TOOL_SPEC)
+        if self.window.core.idx.is_valid(self.agent_idx):
+            specs.append(TOOL_QUERY_ENGINE_SPEC)
 
         for func in functions:
             try:
@@ -371,7 +372,7 @@ class Tools:
                     f"**{name}**: {description}, available params: {schema.get('properties', {})}, required: {schema.get('required', [])}\n"
                 )
             except Exception as e:
-                print(e)
+                self.window.core.debug.log(e)
         return specs
 
     def tool_exec(self, cmd: str, params: Dict[str, Any]) -> str:
@@ -382,22 +383,23 @@ class Tools:
         :param params: command parameters
         :return: command output
         """
-        print("[Plugin] Tool call: " + cmd + " " + str(params))
+        print(f"[Plugin] Tool call: {cmd}, {params}")
+
         # special case for query engine tool
-        if cmd == self.QUERY_ENGINE_TOOL_NAME:
+        if cmd == TOOL_QUERY_ENGINE_NAME:
             if "query" not in params:
                 return "Query parameter is required for query_engine tool."
             if self.context is None:
                 return "Context is not set for query_engine tool."
-            if self.agent_idx is None or self.agent_idx == "_":
+            if not self.window.core.idx.is_valid(self.agent_idx):
                 return "Agent index is not set for query_engine tool."
             llm, embed_model = self.window.core.idx.llm.get_service_context(model=self.context.model)
             index = self.window.core.idx.storage.get(self.agent_idx, llm, embed_model)  # get index
             if index is not None:
                 query_engine = index.as_query_engine(similarity_top_k=3)
                 response = query_engine.query(params["query"])
-                print("[Plugin] Query engine response: " + str(response))
-                self.log("[Plugin] Query engine response: " + str(response))
+                print(f"[Plugin] Query engine response: {response}")
+                self.log(f"[Plugin] Query engine response: {response}")
                 return str(response)
             else:
                 return "Index not found for query_engine tool."
@@ -428,12 +430,13 @@ class Tools:
         """
         data = []
         for output in response.sources:
-            item = {}
-            item["ToolOutput"] = {
-                "content": str(output.content),
-                "tool_name": str(output.tool_name),
-                "raw_input": str(output.raw_input),
-                "raw_output": str(output.raw_output),
+            item = {
+                "ToolOutput": {
+                    "content": str(output.content),
+                    "tool_name": str(output.tool_name),
+                    "raw_input": str(output.raw_input),
+                    "raw_output": str(output.raw_output),
+                }
             }
             data.append(item)
         return data
@@ -499,6 +502,22 @@ class Tools:
             if clear:
                 self.clear_last_tool_output()  # clear after use
 
+    def set_idx(self, agent_idx: str):
+        """
+        Set agent index for query engine tool
+
+        :param agent_idx: agent index
+        """
+        self.agent_idx = agent_idx
+
+    def set_context(self, context: BridgeContext):
+        """
+        Set context for tool execution
+
+        :param context: BridgeContext instance
+        """
+        self.context = context
+
     def log(self, msg: str):
         """
         Log message