refactor(mcp-readability): fold endpoint_url into tools_source

Per review: an endpoint's source is now defined entirely by tools_source — the
http URL lives in tools_source.url. Drop the top-level endpoint_url fallback from
the http fetch (and its docstring/test); identity is (product_name, endpoint_type).

Author: Akangsha Goel

datasets/mcp_readability/endpoints.yaml

@@ -20,9 +20,12 @@ endpoints:
     endpoint_type: DEV
     tools_source:
       type: stdio
+      # MCP Toolbox for Databases, run over stdio via its npm wrapper.
       command: "npx"
-      args: ["-y", "<toolbox-package>", "--prebuilt", "bigquery", "--stdio"]
-      # env: { ... }                   # optional process env (creds, config)
+      args: ["-y", "@toolbox-sdk/server", "--prebuilt=bigquery", "--stdio"]
+      # Needs BigQuery credentials in the environment (ADC + project), e.g.:
+      # env:
+      #   BIGQUERY_PROJECT: "your-gcp-project"
 
   - product_name: "Sample (offline)"
     endpoint_type: DEV

evalbench/generators/models/mcp_tools.py

@@ -8,10 +8,9 @@
 The source is pluggable per endpoint via ``tools_source.type``. The type names
 the *transport*, not the protocol -- ``http`` and ``stdio`` both speak MCP:
   - ``http``: live MCP ``tools/list`` over Streamable HTTP using the official
-    ``mcp`` Python SDK. The fetch URL is ``tools_source.url`` (falling back to
-    the endpoint's ``endpoint_url``). No authentication is configured -- the
-    public endpoints are reached unauthenticated; auth can be added back later
-    if a future endpoint requires it.
+    ``mcp`` Python SDK. The fetch URL is ``tools_source.url``. No authentication
+    is configured -- the public endpoints are reached unauthenticated; auth can
+    be added back later if a future endpoint requires it.
   - ``stdio``: launch a local MCP server via a command and speak MCP over its
     stdio pipes (official ``mcp`` SDK). The process is started before fetching,
     ``tools/list`` is called, then it is shut down. For local / command-launched
@@ -74,7 +73,7 @@ def fetch_tools(self, endpoint: dict) -> tuple[list[mcp_types.Tool], str]:
         if source_type == "file":
             tools = self._from_file(source)
         elif source_type == "http":
-            tools = self._from_http(source, endpoint)
+            tools = self._from_http(source)
         elif source_type == "stdio":
             tools = self._from_stdio(source)
         else:
@@ -112,12 +111,10 @@ def sanitize_url(url: str) -> str:
     # ------------------------------------------------------------------
     # http source (official SDK over Streamable HTTP, no auth)
     # ------------------------------------------------------------------
-    def _from_http(self, source: dict, endpoint: dict) -> list[mcp_types.Tool]:
-        raw_url = source.get("url") or endpoint.get("endpoint_url")
+    def _from_http(self, source: dict) -> list[mcp_types.Tool]:
+        raw_url = source.get("url")
         if not raw_url:
-            raise McpToolsError(
-                "tools_source.type 'http' requires a 'url' (or endpoint_url)"
-            )
+            raise McpToolsError("tools_source.type 'http' requires a 'url'")
         url = self.sanitize_url(raw_url)
         try:
             return anyio.run(functools.partial(self._async_fetch_tools, url))

evalbench/test/mcp_tools_test.py

@@ -107,18 +107,20 @@ def test_sanitize_url_preserves_existing_mcp_suffix(self):
         )
 
     # ---- http source (mocked, no network) -----------------------------
-    def test_http_source_defaults_url_to_endpoint_url(self):
+    def test_http_source_uses_tools_source_url(self):
         captured = {}
 
-        def fake_from_http(source, endpoint):
-            captured["url"] = source.get("url") or endpoint.get("endpoint_url")
+        def fake_from_http(source):
+            captured["url"] = source.get("url")
             return [
                 mcp_types.Tool(name="t", description="d", inputSchema={})
             ]
 
         endpoint = {
-            "endpoint_url": "https://svc.googleapis.com/mcp",
-            "tools_source": {"type": "http"},
+            "tools_source": {
+                "type": "http",
+                "url": "https://svc.googleapis.com/mcp",
+            },
         }
         with patch.object(self.gen, "_from_http", side_effect=fake_from_http):
             tools, man_page = self.gen.fetch_tools(endpoint)