pygpt-net 2.6.51__py3-none-any.whl → 2.6.53__py3-none-any.whl

pygpt_net/plugin/mcp/worker.py

@@ -0,0 +1,263 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# ================================================== #
+# This file is a part of PYGPT package               #
+# Website: https://pygpt.net                         #
+# GitHub:  https://github.com/szczyglis-dev/py-gpt   #
+# MIT License                                        #
+# Created By  : Marcin Szczygliński                  #
+# Updated Date: 2025.09.16 22:00:00                  #
+# ================================================== #
+
+import asyncio
+import json
+import shlex
+from contextlib import asynccontextmanager
+from typing import Dict, Any, List, Tuple, Optional
+from urllib.parse import urlparse
+
+from PySide6.QtCore import Slot
+
+from pygpt_net.plugin.base.worker import BaseWorker, BaseSignals
+
+
+class WorkerSignals(BaseSignals):
+    pass  # add custom signals here
+
+
+class Worker(BaseWorker):
+    def __init__(self, *args, **kwargs):
+        super(Worker, self).__init__()
+        self.signals = BaseSignals()
+        self.args = args
+        self.kwargs = kwargs
+        self.plugin = None
+        self.cmds: Optional[List[dict]] = None
+        self.ctx = None
+        self.tools_index: Dict[str, Dict[str, Any]] = {}
+
+    @Slot()
+    def run(self):
+        """
+        Worker entry point executed in a background thread.
+        Starts an asyncio loop to talk to MCP servers.
+        """
+        try:
+            responses = asyncio.run(self._run_async())
+            if responses:
+                self.reply_more(responses)
+        except Exception as e:
+            self.error(e)
+        finally:
+            self.cleanup()
+
+    async def _run_async(self) -> List[dict]:
+        """
+        Group commands per server, open a session per server, then call tools.
+        """
+        responses: List[dict] = []
+
+        try:
+            from mcp import ClientSession, types  # type: ignore
+            from mcp.client.stdio import stdio_client  # type: ignore
+            from mcp.client.streamable_http import streamablehttp_client  # type: ignore
+            from mcp.client.sse import sse_client  # type: ignore
+            from mcp import StdioServerParameters  # type: ignore
+        except Exception as e:
+            self.status('MCP SDK not installed. Install with: pip install "mcp[cli]"')
+            self.log(f"MCP import error in worker: {e}")
+            for item in (self.cmds or []):
+                responses.append(self.make_response(item, f"MCP SDK not installed: {e}"))
+            return responses
+
+        # Group by server
+        grouped: Dict[str, List[dict]] = {}
+        for item in self.cmds or []:
+            meta = self.tools_index.get(item["cmd"])
+            if not meta:
+                continue
+            server_key = self._server_key(meta["server"])
+            grouped.setdefault(server_key, []).append(item)
+
+        # Execute per server
+        for server_key, items in grouped.items():
+            meta0 = self.tools_index.get(items[0]["cmd"])
+            if not meta0:
+                continue
+            server_cfg = meta0["server"]
+            address = (server_cfg.get("server_address") or "").strip()
+            transport = meta0["transport"]
+            headers = self._build_headers(server_cfg)
+
+            try:
+                async with self._open_session(address, transport, headers=headers) as session:
+                    for item in items:
+                        if self.is_stopped():
+                            break
+
+                        meta = self.tools_index.get(item["cmd"])
+                        if not meta:
+                            continue
+
+                        tool_name = meta["tool_name"]
+                        schema = meta.get("schema")
+                        arguments = self._coerce_arguments(item.get("params", {}), schema)
+
+                        try:
+                            result = await session.call_tool(tool_name, arguments=arguments)
+                            text = self._extract_text_result(result)
+                            responses.append(self.make_response(item, text))
+                        except Exception as e:
+                            responses.append(self.make_response(item, self.throw_error(e)))
+
+            except Exception as e:
+                msg = f"MCP server error ({address}): {e}"
+                self.log(msg)
+                self.status(msg)
+                for item in items:
+                    responses.append(self.make_response(item, self.throw_error(e)))
+
+        return responses
+
+    # ---------------------------
+    # Session / transport helpers
+    # ---------------------------
+
+    @asynccontextmanager
+    async def _open_session(self, address: str, transport: str, headers: Optional[dict] = None):
+        """
+        Open and initialize MCP session for given server address and transport.
+        Yields a ready-to-use ClientSession.
+        """
+        from mcp import ClientSession  # type: ignore
+
+        if transport == "stdio":
+            from mcp.client.stdio import stdio_client  # type: ignore
+            from mcp import StdioServerParameters  # type: ignore
+            cmd, args = self._parse_stdio_command(address)
+            params = StdioServerParameters(command=cmd, args=args)
+            async with stdio_client(params) as (read, write):
+                async with ClientSession(read, write) as session:
+                    await session.initialize()
+                    yield session
+
+        elif transport == "http":
+            from mcp.client.streamable_http import streamablehttp_client  # type: ignore
+            async with streamablehttp_client(address, headers=headers or None) as (read, write, _):
+                async with ClientSession(read, write) as session:
+                    await session.initialize()
+                    yield session
+
+        elif transport == "sse":
+            from mcp.client.sse import sse_client  # type: ignore
+            async with sse_client(address, headers=headers or None) as (read, write):
+                async with ClientSession(read, write) as session:
+                    await session.initialize()
+                    yield session
+
+        else:
+            raise RuntimeError(f"Unsupported transport: {transport}")
+
+    def _parse_stdio_command(self, address: str) -> Tuple[str, List[str]]:
+        """Parse 'stdio: <command line>' into (command, args)."""
+        cmdline = address[len("stdio:"):].strip()
+        tokens = shlex.split(cmdline)
+        if not tokens:
+            raise ValueError("Invalid stdio address: empty command")
+        return tokens[0], tokens[1:]
+
+    # ---------------------------
+    # Result & argument handling
+    # ---------------------------
+
+    def _coerce_arguments(self, params: Dict[str, Any], schema: Optional[dict]) -> Dict[str, Any]:
+        """Coerce incoming params into types expected by the tool schema."""
+        if not schema or not isinstance(schema, dict):
+            return params or {}
+
+        props = schema.get("properties", {}) or {}
+        coerced: Dict[str, Any] = {}
+
+        for name, value in (params or {}).items():
+            target = props.get(name, {})
+            jtype = target.get("type", "string")
+
+            try:
+                if jtype == "integer":
+                    coerced[name] = int(value)
+                elif jtype == "number":
+                    coerced[name] = float(value)
+                elif jtype == "boolean":
+                    if isinstance(value, bool):
+                        coerced[name] = value
+                    elif isinstance(value, str):
+                        coerced[name] = value.strip().lower() in ("1", "true", "yes", "y", "on")
+                    else:
+                        coerced[name] = bool(value)
+                elif jtype in ("array", "object"):
+                    if isinstance(value, (dict, list)):
+                        coerced[name] = value
+                    elif isinstance(value, str):
+                        try:
+                            coerced[name] = json.loads(value)
+                        except Exception:
+                            coerced[name] = value
+                    else:
+                        coerced[name] = value
+                else:
+                    coerced[name] = value
+            except Exception:
+                coerced[name] = value
+
+        return coerced
+
+    def _extract_text_result(self, result: Any) -> str:
+        """
+        Convert MCP tool result into a readable string.
+        Prefer structuredContent; fallback to text content blocks.
+        """
+        try:
+            if getattr(result, "structuredContent", None) is not None:
+                return json.dumps(result.structuredContent, ensure_ascii=False, indent=2)
+
+            content_list = getattr(result, "content", None)
+            if not content_list:
+                return "No result (empty content)"
+            from mcp import types  # type: ignore
+            texts: List[str] = []
+            for block in content_list:
+                if isinstance(block, types.TextContent):
+                    texts.append(block.text)
+                else:
+                    btype = getattr(block, "type", "content")
+                    texts.append(f"[{btype}]")
+            return "\n".join(texts) if texts else "No result (no text content)"
+        except Exception as e:
+            return f"Failed to parse MCP result: {e}"
+
+    # ---------------------------
+    # Misc helpers
+    # ---------------------------
+
+    def _server_key(self, server: dict) -> str:
+        """Create a deterministic key for a server config entry."""
+        addr = (server.get("server_address") or "").strip()
+        if addr.lower().startswith("http"):
+            try:
+                parsed = urlparse(addr)
+                return f"http::{parsed.netloc}{parsed.path}"
+            except Exception:
+                return f"http::{addr}"
+        if addr.lower().startswith(("sse://", "sse+http://", "sse+https://")):
+            return f"sse::{addr}"
+        if addr.startswith("stdio:"):
+            return f"stdio::{addr[len('stdio:'):].strip()}"
+        return addr
+
+    def _build_headers(self, server: dict) -> Optional[dict]:
+        """Build optional headers for HTTP/SSE transports (Authorization only)."""
+        auth = (server.get("authorization") or "").strip()
+        headers = {}
+        if auth:
+            headers["Authorization"] = auth
+        return headers or None

pygpt_net/provider/api/anthropic/tools.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.05 01:00:00                  #
+# Updated Date: 2025.09.17 05:00:00                  #
 # ================================================== #
 
 import json
@@ -177,8 +177,10 @@ class Tools:
         if model and model.id and model.id.startswith("claude-3-5"):
             return tools
 
+        is_web = self.window.controller.chat.remote_tools.enabled(model, "web_search")  # get global config
+
         # Web Search tool
-        if cfg.get("remote_tools.anthropic.web_search"):
+        if is_web:
             ttype = cfg.get("remote_tools.anthropic.web_search.type", "web_search_20250305")  # stable as of docs
             tname = "web_search"
 

pygpt_net/provider/api/google/__init__.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.15 01:00:00                  #
+# Updated Date: 2025.09.17 05:00:00                  #
 # ================================================== #
 
 import os
@@ -260,9 +260,10 @@ class ApiGoogle:
         tools: list = []
         cfg = self.window.core.config
         model_id = (model.id if model and getattr(model, "id", None) else "").lower()
+        is_web = self.window.controller.chat.remote_tools.enabled(model, "web_search")  # get global config
 
         # Google Search tool
-        if cfg.get("remote_tools.google.web_search") and "image" not in model.id:
+        if is_web and "image" not in model.id:
             try:
                 if not model_id.startswith("gemini-1.5") and not model_id.startswith("models/gemini-1.5"):
                     # Gemini 2.x uses GoogleSearch

pygpt_net/provider/api/openai/agents/remote_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.01 03:00:00                  #
+# Updated Date: 2025.09.17 05:00:00                  #
 # ================================================== #
 
 import json
@@ -135,9 +135,11 @@ def get_remote_tools(
         "computer_use": False,
     }
 
+    enabled_global = window.controller.chat.remote_tools.enabled  # get global config
+
     # from global config if not expert call
     if not is_expert_call:
-        enabled["web_search"] = window.core.config.get("remote_tools.web_search", False)
+        enabled["web_search"] = enabled_global(model, "web_search") # <-- from global config
         enabled["image"] = window.core.config.get("remote_tools.image", False)
         enabled["code_interpreter"] = window.core.config.get("remote_tools.code_interpreter", False)
         enabled["mcp"] = window.core.config.get("remote_tools.mcp", False)
@@ -147,8 +149,16 @@ def get_remote_tools(
         # for expert call, get from preset config
         if preset:
             if preset.remote_tools:
-                tools_list = [preset_remote_tool.strip() for preset_remote_tool in preset.remote_tools.split(",") if
-                              preset_remote_tool.strip()]
+                if isinstance(preset.remote_tools, str):
+                    tools_list = [preset_remote_tool.strip() for preset_remote_tool in preset.remote_tools.split(",") if
+                                  preset_remote_tool.strip()]
+                elif isinstance(preset.remote_tools, list):
+                    tools_list = [str(preset_remote_tool).strip() for preset_remote_tool in preset.remote_tools if
+                                  str(preset_remote_tool).strip()]
+                else:
+                    tools_list = []
+                if "web_search" not in tools_list:
+                    enabled["web_search"] = enabled_global(model, "web_search")  # <-- from global config
                 for item in tools_list:
                     if item in enabled:
                         enabled[item] = True

pygpt_net/provider/api/openai/chat.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.28 09:00:00                  #
+# Updated Date: 2025.09.17 05:00:00                  #
 # ================================================== #
 
 import json
@@ -145,9 +145,21 @@ class Chat:
         if stream:
             response_kwargs['stream_options'] = {"include_usage": True}
 
+        # OpenRouter: add web search remote tool (if enabled)
+        # https://openrouter.ai/docs/features/web-search
+        model_id = model.id
+        if model.provider == "open_router":
+            is_web = self.window.controller.chat.remote_tools.enabled(model, "web_search")  # web search config
+            if is_web:
+                if not model_id.endswith(":online"):
+                    model_id += ":online"
+            else:
+                if model_id.endswith(":online"):
+                    model_id = model_id.replace(":online", "")
+
         response = client.chat.completions.create(
             messages=messages,
-            model=model.id,
+            model=model_id,
             stream=stream,
             **response_kwargs,
         )

pygpt_net/provider/api/openai/remote_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.09.17 05:00:00                  #
 # ================================================== #
 
 import json
@@ -87,10 +87,11 @@ class RemoteTools:
             "file_search": False,
             "computer_use": False,
         }
+        enabled_global = self.window.controller.chat.remote_tools.enabled  # get global config
 
         # from global config if not expert call
         if not is_expert_call:
-            enabled["web_search"] = self.window.core.config.get("remote_tools.web_search", False)
+            enabled["web_search"] = enabled_global(model, "web_search") # <-- from global config
             enabled["image"] = self.window.core.config.get("remote_tools.image", False)
             enabled["code_interpreter"] = self.window.core.config.get("remote_tools.code_interpreter", False)
             enabled["mcp"] = self.window.core.config.get("remote_tools.mcp", False)
@@ -101,6 +102,8 @@ class RemoteTools:
             if preset:
                 if preset.remote_tools:
                     tools_list = [preset_remote_tool.strip() for preset_remote_tool in preset.remote_tools.split(",") if preset_remote_tool.strip()]
+                    if "web_search" not in tools_list:
+                        enabled["web_search"] = enabled_global(model, "web_search") # <-- from global config
                     for item in tools_list:
                         if item in enabled:
                             enabled[item] = True

pygpt_net/provider/api/x_ai/remote.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.05 01:00:00                  #
+# Updated Date: 2025.09.17 05:00:00                  #
 # ================================================== #
 
 from __future__ import annotations
@@ -57,11 +57,16 @@ class Remote:
         :return: Dict with 'sdk' and 'http' keys
         """
         cfg = self.window.core.config
+        is_web = self.window.controller.chat.remote_tools.enabled(model, "web_search")  # get global config
 
         mode = str(cfg.get("remote_tools.xai.mode") or "auto").lower()
         if mode not in ("auto", "on", "off"):
             mode = "auto"
 
+        if mode == "off":
+            if is_web:
+                mode = "auto"  # override off if global web_search enabled
+
         # sources toggles
         s_web = bool(cfg.get("remote_tools.xai.sources.web", True))
         s_x   = bool(cfg.get("remote_tools.xai.sources.x", True))

pygpt_net/provider/core/config/patch.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.16 11:00:00                  #
+# Updated Date: 2025.09.17 05:00:00                  #
 # ================================================== #
 
 import copy
@@ -104,6 +104,13 @@ class Patch:
                 patch_css('style.dark.css', True)
                 updated = True
 
+            # < 2.6.53
+            if old < parse_version("2.6.53"):
+                print("Migrating config from < 2.6.53...")
+                if "remote_tools.global.web_search" not in data:
+                    data["remote_tools.global.web_search"] = True
+                updated = True
+
         # update file
         migrated = False
         if updated:

pygpt_net/ui/dialog/plugins.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.05 18:00:00                  #
+# Updated Date: 2025.09.16 22:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -454,7 +454,6 @@ class Plugins:
             # cols_widget.setMaximumHeight(90)
 
             self.window.ui.nodes[desc_key] = DescLabel(txt_desc)
-            self.window.ui.nodes[desc_key].setMaximumHeight(40)
             # self.window.ui.nodes[desc_key].setToolTip(txt_tooltip)
 
             layout = QVBoxLayout()
@@ -473,7 +472,6 @@ class Plugins:
 
             if option['type'] not in no_desc_types:
                 self.window.ui.nodes[desc_key] = DescLabel(txt_desc)
-                self.window.ui.nodes[desc_key].setMaximumHeight(40)
                 # self.window.ui.nodes[desc_key].setToolTip(txt_tooltip)
                 layout.addWidget(self.window.ui.nodes[desc_key])
 

pygpt_net/ui/layout/chat/output.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.24 23:00:00                  #
+# Updated Date: 2025.09.17 07:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt
@@ -72,7 +72,7 @@ class Output:
 
         nodes['icon.audio.output'] = IconLabel(":/icons/volume.svg", window=self.window)
         nodes['icon.audio.output'].setToolTip(trans("icon.audio.output"))
-        nodes['icon.audio.output'].clicked.connect(lambda: ctrl.plugins.toggle('audio_output'))
+        nodes['icon.audio.output'].clicked.connect(lambda: ctrl.plugins.toggle_audio_output())  # special case for AUDIO mode
 
         nodes['icon.audio.input'] = IconLabel(":/icons/mic.svg", window=self.window)
         nodes['icon.audio.input'].setToolTip(trans("icon.audio.input"))
@@ -86,6 +86,10 @@ class Output:
         nodes['icon.indexer'].setToolTip("Indexer")
         nodes['icon.indexer'].clicked.connect(lambda: tools.get("indexer").toggle())
 
+        nodes['icon.remote_tool.web'] = IconLabel(":/icons/web_on.svg", window=self.window)
+        nodes['icon.remote_tool.web'].setToolTip(trans("icon.remote_tool.web"))
+        nodes['icon.remote_tool.web'].clicked.connect(lambda: ctrl.chat.remote_tools.toggle('web_search'))
+
         min_policy = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum)
 
         nodes['chat.label'] = ChatStatusLabel("")
@@ -135,6 +139,7 @@ class Output:
         nodes['anim.loading'].hide()
 
         right_bar_layout = QHBoxLayout()
+        right_bar_layout.addWidget(nodes['icon.remote_tool.web'])
         right_bar_layout.addWidget(nodes['icon.video.capture'])
         right_bar_layout.addWidget(nodes['icon.audio.input'])
         right_bar_layout.addWidget(nodes['icon.audio.output'])

pygpt_net/ui/widget/element/labels.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.05 18:00:00                  #
+# Updated Date: 2025.09.16 22:00:00                  #
 # ================================================== #
 
 from PySide6.QtCore import Qt, QTimer, QRect, Signal, QUrl, QEvent
@@ -34,7 +34,6 @@ class DescLabel(BaseLabel):
     def __init__(self, text, window=None):
         super().__init__(text, window)
         self.window = window
-        self.setMaximumHeight(80)
         self.setProperty('class', 'label-desc')
 
 

pygpt_net/ui/widget/tabs/body.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.16 02:00:00                  #
+# Updated Date: 2025.09.16 22:00:00                  #
 # ================================================== #
 
 from typing import Any
@@ -35,7 +35,7 @@ class TabBody(QTabWidget):
             self.on_delete(self)
         self.delete_refs()
 
-    def remove_widget(self, widget: QWidget) -> None:
+    def unwrap(self, widget: QWidget) -> None:
         """
         Remove widget from tab body
 
@@ -46,7 +46,7 @@ class TabBody(QTabWidget):
             layout.removeWidget(widget)
         self.delete_ref(widget)
 
-    def remove_all_widgets(self) -> None:
+    def unwrap_all(self) -> None:
         """
         Remove all widgets from tab body
         """
@@ -55,7 +55,14 @@ class TabBody(QTabWidget):
             while layout.count():
                 item = layout.takeAt(0)
                 widget = item.widget()
-                layout.removeWidget(widget)
+                try:
+                    layout.removeWidget(widget)
+                except Exception:
+                    pass
+                try:
+                    self.delete_ref(widget)
+                except Exception:
+                    pass
 
     def add_ref(self, ref: Any) -> None:
         """
@@ -157,4 +164,16 @@ class TabBody(QTabWidget):
             if self.owner is not None:
                 col_idx = self.owner.column_idx
                 self.window.controller.ui.tabs.on_column_focus(col_idx)
-        return super().eventFilter(source, event)
+        return super().eventFilter(source, event)
+
+    def to_dict(self) -> dict:
+        """
+        Convert to dict
+
+        :return: dict
+        """
+        return {
+            "refs": [str(ref) for ref in self.refs],  # references to widgets
+            "body": [str(b) for b in self.body],  # body widgets
+            "len(layout)": self.layout().count() if self.layout() else 0,
+        }