Merge branch 'tui_oauth' of github.com:Edison-Watch/open-edison into tui_oauth

Author: Drummersbrother

src/mcp_importer/api.py

@@ -27,6 +27,7 @@
 from src.mcp_importer.merge import MergePolicy, merge_servers
 from src.oauth_manager import OAuthStatus, get_oauth_manager
 from src.oauth_override import OpenEdisonOAuth
+from src.tools.io import suppress_fds
 
 
 class CLIENT(str, Enum):
@@ -202,9 +203,11 @@ async def _verify_async() -> bool:  # noqa: C901
                     proxy_remote: FastMCP[Any] | None = None
                     host_remote: FastMCP[Any] | None = None
                     try:
-                        proxy_remote = FastMCP.as_proxy(backend_cfg_remote)
-                        host_remote = FastMCP(name=f"open-edison-verify-host-{server.name}")
-                        host_remote.mount(proxy_remote, prefix=server.name)
+                        # TODO: In debug mode, do not suppress child process output.
+                        with suppress_fds(suppress_stdout=False, suppress_stderr=True):
+                            proxy_remote = FastMCP.as_proxy(backend_cfg_remote)
+                            host_remote = FastMCP(name=f"open-edison-verify-host-{server.name}")
+                            host_remote.mount(proxy_remote, prefix=server.name)
 
                         async def _list_tools_only() -> Any:
                             return await host_remote._tool_manager.list_tools()  # type: ignore[attr-defined]
@@ -233,21 +236,23 @@ async def _list_tools_only() -> Any:
                     if oauth_info.status in (OAuthStatus.NEEDS_AUTH, OAuthStatus.AUTHENTICATED):
                         return True
                     # NOT_REQUIRED: quick unauthenticated ping
+                    # TODO: In debug mode, do not suppress child process output.
+                    questionary.print(f"Testing connection to '{server.name}'...", style="bold fg:ansigreen")
                     log.debug(f"Establishing contact with remote server '{server.name}'")
-                    # Async timeout
                     async with asyncio.timeout(connection_timeout):
                         async with FastMCPClient(
                             remote_url,
                             auth=None,
                             timeout=connection_timeout,
                             init_timeout=connection_timeout,
-                        ) as client:  # type: ignore
+                        ) as client:
                             log.debug(f"Connection established to '{server.name}'; pinging...")
-                            await asyncio.wait_for(client.ping(), timeout=connection_timeout)
+                            with suppress_fds(suppress_stdout=True, suppress_stderr=True):
+                                await asyncio.wait_for(fut=client.ping(), timeout=1.0)
                             log.info(f"Ping received from '{server.name}'; shutting down client")
                             ping_succeeded = True
                         log.debug(f"Client '{server.name}' shut down")
-                        return ping_succeeded
+                    return ping_succeeded
                 except TimeoutError:
                     if ping_succeeded:
                         questionary.print(
@@ -281,9 +286,13 @@ async def _list_tools_only() -> Any:
         proxy_local: FastMCP[Any] | None = None
         host_local: FastMCP[Any] | None = None
         try:
-            proxy_local = FastMCP.as_proxy(backend_cfg_local)
-            host_local = FastMCP(name=f"open-edison-verify-host-{server.name}")
-            host_local.mount(proxy_local, prefix=server.name)
+            # TODO: In debug mode, do not suppress child process output.
+            log.info("Checking properties of '{}'...", server.name)
+            with suppress_fds(suppress_stdout=False, suppress_stderr=True):
+                proxy_local = FastMCP.as_proxy(backend_cfg_local)
+                host_local = FastMCP(name=f"open-edison-verify-host-{server.name}")
+                host_local.mount(proxy_local, prefix=server.name)
+            log.info("MCP properties check succeeded for '{}'", server.name)
 
             async def _list_tools_only() -> Any:
                 return await host_local._tool_manager.list_tools()  # type: ignore[attr-defined]

src/tools/io.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+import os
+from collections.abc import Iterator
+from contextlib import contextmanager
+
+
+@contextmanager
+def suppress_fds(*, suppress_stdout: bool = False, suppress_stderr: bool = True) -> Iterator[None]:
+    """Temporarily redirect process-level stdout/stderr to os.devnull.
+
+    Args:
+        suppress_stdout: If True, redirect fd 1 to devnull
+        suppress_stderr: If True, redirect fd 2 to devnull
+
+    Yields:
+        None
+    """
+    saved: list[tuple[int, int]] = []
+    try:
+        if suppress_stdout:
+            saved.append((1, os.dup(1)))
+            devnull_out = os.open(os.devnull, os.O_WRONLY)
+            os.dup2(devnull_out, 1)
+            os.close(devnull_out)
+        if suppress_stderr:
+            saved.append((2, os.dup(2)))
+            devnull_err = os.open(os.devnull, os.O_WRONLY)
+            os.dup2(devnull_err, 2)
+            os.close(devnull_err)
+        yield
+    finally:
+        for fd, backup in saved:
+            try:
+                os.dup2(backup, fd)
+            finally:
+                os.close(backup)
+
+