cleanup

Author: kantord

mcp_client.py

@@ -232,7 +232,7 @@ async def list_tools_from_server(workload: dict[str, Any]) -> dict[str, Any]:
                 "error": f"Transport/proxy mode '{proxy_mode or transport_type}' not yet supported",
             }
 
-    except asyncio.TimeoutError:
+    except TimeoutError:
         return {
             "workload": name,
             "status": "error",

toolhive_client.py

@@ -70,16 +70,17 @@ async def _is_toolhive_available(
             )
             response.raise_for_status()
             data = response.json()
-            if not isinstance(data, dict) or "version" not in data:
-                raise ConnectionError(
-                    f"Port {port} on host {host} did not respond with ToolHive format"
-                )
-            return (port, port)
     except (httpx.HTTPError, OSError) as e:
         raise ConnectionError(
             f"ToolHive not available at {host}:{port}: {e}"
         )
 
+    if not isinstance(data, dict) or "version" not in data:
+        raise ConnectionError(
+            f"Port {port} on host {host} did not respond with ToolHive format"
+        )
+    return (port, port)
+
 
 async def _scan_for_toolhive_async(
     host: str,
@@ -109,7 +110,7 @@ async def _scan_for_toolhive_async(
             ),
             timeout=total_timeout,
         )
-    except asyncio.TimeoutError:
+    except TimeoutError:
         raise ConnectionError(
             f"ToolHive port scan timed out after {total_timeout}s "
             f"on {host} in port range {scan_port_start}-{scan_port_end}"