pygpt-net 2.6.8__py3-none-any.whl → 2.6.10__py3-none-any.whl

pygpt_net/CHANGELOG.txt

@@ -1,3 +1,15 @@
+2.6.10 (2025-08-17)
+
+- Enhanced the handling of the context list.
+- Integrated RAG into OpenAI Agents.
+- Enhanced RAG management in Agents.
+- Added an option: Config -> Agents -> General -> Auto-retrieve additional context from RAG.
+- Included Google Docs, Maps, and Colab in the Google plugin.
+
+2.6.9 (2025-08-17)
+
+- Added two new agents for LlamaIndex and OpenAI: Supervisor and Worker (beta).
+
 2.6.8 (2025-08-16)
 
 - Fixed: updated paragraph color on theme switch.

pygpt_net/__init__.py

@@ -6,15 +6,15 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.15 00:00:00                  #
+# Updated Date: 2025.08.17 00:00:00                  #
 # ================================================== #
 
 __author__ = "Marcin Szczygliński"
 __copyright__ = "Copyright 2025, Marcin Szczygliński"
 __credits__ = ["Marcin Szczygliński"]
 __license__ = "MIT"
-__version__ = "2.6.8"
-__build__ = "2025-08-16"
+__version__ = "2.6.10"
+__build__ = "2025-08-17"
 __maintainer__ = "Marcin Szczygliński"
 __github__ = "https://github.com/szczyglis-dev/py-gpt"
 __report__ = "https://github.com/szczyglis-dev/py-gpt/issues"

pygpt_net/app.py

@@ -88,6 +88,7 @@ from pygpt_net.provider.agents.llama_index.openai_workflow import OpenAIAgent as
 # from pygpt_net.provider.agents.llama_index.legacy.react import ReactAgent
 from pygpt_net.provider.agents.llama_index.react_workflow import ReactWorkflowAgent
 from pygpt_net.provider.agents.llama_index.codeact_workflow import CodeActAgent
+from pygpt_net.provider.agents.llama_index.supervisor_workflow import SupervisorAgent as LlamaSupervisorAgent
 from pygpt_net.provider.agents.openai.agent import Agent as OpenAIAgentsBase
 from pygpt_net.provider.agents.openai.agent_with_experts import Agent as OpenAIAgentsExperts
 from pygpt_net.provider.agents.openai.agent_with_experts_feedback import Agent as OpenAIAgentsExpertsFeedback
@@ -96,6 +97,7 @@ from pygpt_net.provider.agents.openai.bot_researcher import Agent as OpenAIAgent
 from pygpt_net.provider.agents.openai.agent_planner import Agent as OpenAIAgentPlanner
 from pygpt_net.provider.agents.openai.evolve import Agent as OpenAIAgentsEvolve
 from pygpt_net.provider.agents.openai.agent_b2b import Agent as OpenAIAgentsB2B
+from pygpt_net.provider.agents.openai.supervisor import Agent as OpenAIAgentSupervisor
 
 # LLM wrapper providers (langchain, llama-index, embeddings)
 from pygpt_net.provider.llms.anthropic import AnthropicLLM
@@ -445,6 +447,7 @@ def run(**kwargs):
     # launcher.add_agent(ReactAgent())  # llama-index
     launcher.add_agent(ReactWorkflowAgent())  # llama-index
     launcher.add_agent(CodeActAgent())  # llama-index
+    launcher.add_agent(LlamaSupervisorAgent())  # llama-index
     launcher.add_agent(OpenAIAgentsBase())  # openai-agents
     launcher.add_agent(OpenAIAgentsExperts())  # openai-agents
     launcher.add_agent(OpenAIAgentFeedback())  # openai-agents
@@ -453,6 +456,7 @@ def run(**kwargs):
     launcher.add_agent(OpenAIAgentsExpertsFeedback())  # openai-agents
     launcher.add_agent(OpenAIAgentsEvolve())  # openai-agents
     launcher.add_agent(OpenAIAgentsB2B())  # openai-agents
+    launcher.add_agent(OpenAIAgentSupervisor())  # openai-agents
 
     # register custom agents
     agents = kwargs.get('agents', None)

pygpt_net/controller/ctx/common.py

@@ -31,7 +31,8 @@ class Common:
         self.summarizer = Summarizer(window)
 
     def _update_ctx_no_scroll(self):
-        self.window.controller.ctx.update(no_scroll=True)
+        """Update ctx list without scroll"""
+        self.window.controller.ctx.update_and_restore()
 
     def update_label_by_current(self):
         """Update ctx label from current ctx"""
@@ -83,7 +84,7 @@ class Common:
         if new_id is not None:
             self.window.core.attachments.context.duplicate(meta_id, new_id)
             self.window.update_status(f"Context duplicated, new ctx id: {new_id}")
-            QTimer.singleShot(100, self._update_ctx_no_scroll)
+            QTimer.singleShot(10, self._update_ctx_no_scroll)
 
     def dismiss_rename(self):
         """Dismiss rename dialog"""
@@ -97,7 +98,12 @@ class Common:
         """
         data_id = meta.id if meta else None
         title = meta.name if meta else None
-        self.window.controller.ui.tabs.focus_by_type(Tab.TAB_CHAT, data_id=data_id, title=title, meta=meta)
+        self.window.controller.ui.tabs.focus_by_type(
+            Tab.TAB_CHAT,
+            data_id=data_id,
+            title=title,
+            meta=meta
+        )
 
     def restore_display_filter(self):
         """Restore display filter"""

pygpt_net/controller/ctx/ctx.py

@@ -334,17 +334,20 @@ class Ctx:
         if id is not None:
             self.select(id)
 
-    def update_list(self, reload: bool = False):
+    def update_list(self, reload: bool = False, restore_scroll: bool = False):
         """
         Reload current ctx list
 
         :param reload: reload ctx list items
+        :param restore_scroll: restore scroll position
         """
         self.window.ui.contexts.ctx_list.update(
             'ctx.list',
             self.window.core.ctx.get_meta(reload),
             expand=False,
         )
+        if restore_scroll:
+            self.window.ui.nodes['ctx.list'].restore_scroll_position()
 
     def refresh(self, restore_model: bool = True):
         """
@@ -520,7 +523,7 @@ class Ctx:
             self.window.core.ctx.clear_current()
             event = RenderEvent(RenderEvent.CLEAR_OUTPUT)
             self.window.dispatch(event)
-        self.update(no_scroll=True)
+        self.update_and_restore()
 
         self.window.controller.ui.tabs.update_title_current("...")
 
@@ -653,8 +656,7 @@ class Ctx:
         if meta is not None:
             meta.important = value
             self.window.core.ctx.save(id)
-            self.update(no_scroll=True)
-            self.select_by_current()
+            self.update_and_restore()
 
     def is_important(self, idx: int) -> bool:
         """
@@ -686,9 +688,15 @@ class Ctx:
             self.window.core.ctx.save(id)
             QTimer.singleShot(
                 10,
-                lambda: self.update(no_scroll=True)
+                lambda: self.update_and_restore()
             )
 
+    def update_and_restore(self):
+        """Update ctx and restore scroll position"""
+        self.window.ui.nodes['ctx.list'].store_scroll_position()
+        self.update()
+        self.window.ui.nodes['ctx.list'].restore_scroll_position()
+
     def update_name(
             self,
             id: int,
@@ -713,7 +721,7 @@ class Ctx:
             self.window.ui.dialog['rename'].close()
 
         if refresh:
-            self.update(no_scroll=True)
+            self.update_and_restore()
         else:
             self.update(reload=True, all=False, no_scroll=True)
 
@@ -964,7 +972,7 @@ class Ctx:
         if update:
             QTimer.singleShot(
                 10,
-                lambda: self.update()
+                lambda: self.update_and_restore()
             )
 
     def remove_from_group(self, meta_id):
@@ -977,7 +985,7 @@ class Ctx:
         self.group_id = None
         QTimer.singleShot(
             10,
-            lambda: self.update(no_scroll=True)
+            lambda: self.update_and_restore()
         )
 
     def new_group(
@@ -1063,13 +1071,7 @@ class Ctx:
             self.window.core.ctx.update_group(group)
             if close:
                 self.window.ui.dialog['rename'].close()
-            self.update(
-                reload=True,
-                all=False,
-                select=False,
-                no_scroll=True
-            )
-            self.select_group(id)
+            self.update_and_restore()
 
     def get_group_name(self, id: int) -> str:
         """
@@ -1119,7 +1121,7 @@ class Ctx:
             self.window.core.ctx.remove_group(group, all=False)
             if self.group_id == id:
                 self.group_id = None
-            self.update(no_scroll=True)
+            self.update_and_restore()
 
     def delete_group_all(
             self,
@@ -1144,7 +1146,7 @@ class Ctx:
             self.window.core.ctx.remove_group(group, all=True)
             if self.group_id == id:
                 self.group_id = None
-            self.update()
+            self.update_and_restore()
 
     def reload(self):
         """Reload ctx"""

pygpt_net/controller/kernel/kernel.py

@@ -31,7 +31,7 @@ from .reply import Reply
 from .stack import Stack
 
 
-class Kernel(QObject):
+class Kernel:
 
     STATE_IDLE = "idle"
     STATE_BUSY = "busy"
@@ -81,7 +81,6 @@ class Kernel(QObject):
 
         :param window: The window context to which the kernel will be bound.
         """
-        super(Kernel, self).__init__(window)
         self.window = window
         self.replies = Reply(window)
         self.stack = Stack(window)

pygpt_net/core/agents/runner.py

@@ -105,6 +105,25 @@ class Runner:
             self.window.core.agents.tools.context = context
             self.window.core.agents.tools.agent_idx = vector_store_idx
 
+            # --- ADDITIONAL CONTEXT ---
+            # append additional context from RAG if available
+            if 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,
+                    model=context.model,
+                )
+                if ad_context:
+                    to_append = ""
+                    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:"
+                        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)

pygpt_net/core/agents/tools.py

@@ -25,6 +25,13 @@ 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
@@ -62,6 +69,32 @@ class Tools:
         plugin_functions = self.get_plugin_functions(context.ctx, verbose=verbose, force=force)
         tools.extend(plugin_functions)
 
+        # add query engine tool if idx is provided
+        query_engine_tools = self.get_retriever_tool(
+            context=context,
+            extra=extra,
+            verbose=verbose,
+        )
+        if query_engine_tools:
+            tools.extend(query_engine_tools)
+        return tools
+
+    def get_retriever_tool(
+            self,
+            context: BridgeContext,
+            extra: Dict[str, Any],
+            verbose: bool = False
+    ) -> List[BaseTool]:
+        """
+        Prepare tools for agent
+
+        :param context: BridgeContext
+        :param extra: extra data
+        :param verbose: verbose mode
+        :return: list of tools
+        """
+        tool = None
+
         # add query engine tool if idx is provided
         idx = extra.get("agent_idx", None)
         if idx is not None and idx != "_":
@@ -69,19 +102,51 @@ class Tools:
             index = self.window.core.idx.storage.get(idx, llm, embed_model)  # get index
             if index is not None:
                 query_engine = index.as_query_engine(similarity_top_k=3)
-                query_engine_tools = [
+                tool = [
                     QueryEngineTool(
                         query_engine=query_engine,
                         metadata=ToolMetadata(
-                            name="query_engine",
-                            description=(
-                                "Provides additional context and access to the indexed documents."
-                            ),
+                            name=self.QUERY_ENGINE_TOOL_NAME,
+                            description=self.QUERY_ENGINE_TOOL_DESCRIPTION,
                         ),
                     ),
                 ]
-                tools.extend(query_engine_tools)
-        return tools
+        return tool
+
+    def get_openai_retriever_tool(
+            self,
+            idx: str,
+            verbose: bool = False
+    ) -> OpenAIFunctionTool:
+        """
+        Prepare OpenAI retriever tool for agent
+
+        :param idx: index name
+        :param verbose: verbose mode
+        :return: OpenAIFunctionTool instance
+        """
+        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))
+            cmd = {
+                "cmd": name,
+                "params": json.loads(args)  # args should be a JSON string
+            }
+            return self.tool_exec(name, cmd["params"])
+
+        schema = {"type": "object", "properties": {
+            "query": {
+                "type": "string",
+                "description": "The query string to search in the index."
+            }
+        }, "additionalProperties": False}
+        description = self.QUERY_ENGINE_TOOL_DESCRIPTION + f" Index: {idx}"
+        return OpenAIFunctionTool(
+            name=self.QUERY_ENGINE_TOOL_NAME,
+            description=description,
+            params_json_schema=schema,
+            on_invoke_tool=run_function,
+        )
 
     def get_plugin_functions(
             self,
@@ -204,6 +269,11 @@ class Tools:
                 tools.append(tool)
             except Exception as e:
                 print(e)
+
+        # append query engine tool if idx is provided
+        if self.agent_idx is not None and self.agent_idx != "_":
+            tools.append(self.get_openai_retriever_tool(self.agent_idx))
+
         return tools
 
     def get_plugin_tools(
@@ -230,7 +300,6 @@ class Tools:
                     continue  # skip blacklisted commands
 
                 description = item['desc']
-                schema = json.loads(item['params'])  # from JSON to dict
 
                 def make_func(name, description):
                     def func(**kwargs):
@@ -255,9 +324,17 @@ class Tools:
                 print(e)
 
         # add query engine tool if idx is provided
-        if self.agent_idx is not None and self.agent_idx  != "_":
-            tools["query_engine"] = None  # placeholder for query engine tool
-
+        if self.agent_idx is not None and self.agent_idx != "_":
+            extra = {
+                "agent_idx": self.agent_idx,  # agent index for query engine tool
+            }
+            query_engine_tools = self.get_retriever_tool(
+                context=context,
+                extra=extra,
+                verbose=verbose,
+            )
+            if query_engine_tools:
+                tools["query_engine"] = query_engine_tools[0]  # add query engine tool
         return tools
 
 
@@ -281,9 +358,7 @@ class Tools:
 
         # add query engine tool spec if idx is provided
         if self.agent_idx is not None and self.agent_idx  != "_":
-            specs.append("**query_engine**: "
-                         "Provides additional context and access to the indexed documents, "
-                         "available params: {'query': {'type': 'string', 'description': 'query string'}}, required: [query]")
+            specs.append(self.QUERY_ENGINE_TOOL_SPEC)
 
         for func in functions:
             try:
@@ -292,8 +367,9 @@ class Tools:
                     continue  # skip blacklisted commands
                 description = func['desc']
                 schema = json.loads(func['params'])  # from JSON to dict
-                spec = "**{}**: {}, available params: {}, required: {}\n".format(name, description, schema.get("properties", {}), schema.get("required", []))
-                specs.append(spec)
+                specs.append(
+                    f"**{name}**: {description}, available params: {schema.get('properties', {})}, required: {schema.get('required', [])}\n"
+                )
             except Exception as e:
                 print(e)
         return specs
@@ -308,7 +384,7 @@ class Tools:
         """
         print("[Plugin] Tool call: " + cmd + " " + str(params))
         # special case for query engine tool
-        if cmd == "query_engine":
+        if cmd == self.QUERY_ENGINE_TOOL_NAME:
             if "query" not in params:
                 return "Query parameter is required for query_engine tool."
             if self.context is None:
@@ -340,41 +416,6 @@ class Tools:
         )
         return response
 
-    def get_retriever_tool(
-            self,
-            context: BridgeContext,
-            extra: Dict[str, Any],
-            verbose: bool = False
-    ) -> List[BaseTool]:
-        """
-        Prepare tools for agent
-
-        :param context: BridgeContext
-        :param extra: extra data
-        :param verbose: verbose mode
-        :return: list of tools
-        """
-        tool = None
-        # add query engine tool if idx is provided
-        idx = extra.get("agent_idx", None)
-        if idx is not None and 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:
-                query_engine = index.as_query_engine(similarity_top_k=3)
-                tool = [
-                    QueryEngineTool(
-                        query_engine=query_engine,
-                        metadata=ToolMetadata(
-                            name="query_engine",
-                            description=(
-                                "Provides additional context and access to the indexed documents."
-                            ),
-                        ),
-                    ),
-                ]
-        return tool
-
     def export_sources(
             self,
             response: AgentChatResponse

pygpt_net/core/render/web/body.py

@@ -985,9 +985,9 @@ class Body:
         syntax_style = self.window.core.config.get("render.code_syntax") or "default"
 
         theme_css = self.window.controller.theme.markdown.get_web_css().replace('%fonts%', fonts_path)
-        parts = [self._SPINNER, theme_css]
-        parts.append("pre { color: #fff; }" if syntax_style in self._syntax_dark else "pre { color: #000; }")
-        parts.append(self.highlight.get_style_defs())
+        parts = [self._SPINNER, theme_css,
+                 "pre { color: #fff; }" if syntax_style in self._syntax_dark else "pre { color: #000; }",
+                 self.highlight.get_style_defs()]
         return "\n".join(parts)
 
     def prepare_action_icons(self, ctx: CtxItem) -> str:
@@ -1014,32 +1014,19 @@ class Body:
         if ctx.output:
             cid = ctx.id
             t = trans
-
             icons.append(
-                f'<a href="extra-audio-read:{cid}" class="action-icon" data-id="{cid}" role="button">'
-                f'<span class="cmd">{self.get_icon("volume", t("ctx.extra.audio"), ctx)}</span></a>'
-            )
+                f'<a href="extra-audio-read:{cid}" class="action-icon" data-id="{cid}" role="button"><span class="cmd">{self.get_icon("volume", t("ctx.extra.audio"), ctx)}</span></a>')
             icons.append(
-                f'<a href="extra-copy:{cid}" class="action-icon" data-id="{cid}" role="button">'
-                f'<span class="cmd">{self.get_icon("copy", t("ctx.extra.copy"), ctx)}</span></a>'
-            )
+                f'<a href="extra-copy:{cid}" class="action-icon" data-id="{cid}" role="button"><span class="cmd">{self.get_icon("copy", t("ctx.extra.copy"), ctx)}</span></a>')
             icons.append(
-                f'<a href="extra-replay:{cid}" class="action-icon" data-id="{cid}" role="button">'
-                f'<span class="cmd">{self.get_icon("reload", t("ctx.extra.reply"), ctx)}</span></a>'
-            )
+                f'<a href="extra-replay:{cid}" class="action-icon" data-id="{cid}" role="button"><span class="cmd">{self.get_icon("reload", t("ctx.extra.reply"), ctx)}</span></a>')
             icons.append(
-                f'<a href="extra-edit:{cid}" class="action-icon edit-icon" data-id="{cid}" role="button">'
-                f'<span class="cmd">{self.get_icon("edit", t("ctx.extra.edit"), ctx)}</span></a>'
-            )
+                f'<a href="extra-edit:{cid}" class="action-icon edit-icon" data-id="{cid}" role="button"><span class="cmd">{self.get_icon("edit", t("ctx.extra.edit"), ctx)}</span></a>')
             icons.append(
-                f'<a href="extra-delete:{cid}" class="action-icon edit-icon" data-id="{cid}" role="button">'
-                f'<span class="cmd">{self.get_icon("delete", t("ctx.extra.delete"), ctx)}</span></a>'
-            )
+                f'<a href="extra-delete:{cid}" class="action-icon edit-icon" data-id="{cid}" role="button"><span class="cmd">{self.get_icon("delete", t("ctx.extra.delete"), ctx)}</span></a>')
             if not self.window.core.ctx.is_first_item(cid):
                 icons.append(
-                    f'<a href="extra-join:{cid}" class="action-icon edit-icon" data-id="{cid}" role="button">'
-                    f'<span class="cmd">{self.get_icon("playlist_add", t("ctx.extra.join"), ctx)}</span></a>'
-                )
+                    f'<a href="extra-join:{cid}" class="action-icon edit-icon" data-id="{cid}" role="button"><span class="cmd">{self.get_icon("playlist_add", t("ctx.extra.join"), ctx)}</span></a>')
         return icons
 
     def get_icon(
@@ -1058,9 +1045,7 @@ class Body:
         """
         app_path = self.window.core.config.get_app_path()
         icon_path = os.path.join(app_path, "data", "icons", f"{icon}.svg")
-        return (
-            f'<img src="file://{icon_path}" class="action-img" title="{title}" alt="{title}" data-id="{item.id}">'
-        )
+        return f'<img src="file://{icon_path}" class="action-img" title="{title}" alt="{title}" data-id="{item.id}">'
 
     def get_image_html(
             self,
@@ -1078,14 +1063,7 @@ class Body:
         """
         url, path = self.window.core.filesystem.extract_local_url(url)
         basename = os.path.basename(path)
-        return (
-            f'<div class="extra-src-img-box" title="{url}">'
-            f'<div class="img-outer"><div class="img-wrapper">'
-            f'<a href="{url}"><img src="{path}" class="image"></a>'
-            f'</div>'
-            f'<a href="{url}" class="title">{basename}</a>'
-            f'</div></div><br/>'
-        )
+        return f'<div class="extra-src-img-box" title="{url}"><div class="img-outer"><div class="img-wrapper"><a href="{url}"><img src="{path}" class="image"></a></div><a href="{url}" class="title">{basename}</a></div></div><br/>'
 
     def get_url_html(
             self,