Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions providers/common/ai/docs/connections/mcp.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,15 @@ Command (Extra field)
Examples: ``uvx``, ``python``, ``node``

Arguments (Extra field)
JSON array of arguments for the stdio command.

Examples: ``["mcp-run-python"]``, ``["-m", "my_mcp_server"]``
Arguments for the stdio command. Enter a JSON array of strings in the form
field. A value that does not start with ``[`` (ignoring leading whitespace)
is passed as a single argument, so use the array form for more than one
argument. A value starting with ``[`` must be a valid JSON array of
strings, otherwise an error is raised. To pass one literal argument that
starts with ``[``, wrap it in an array, for example ``["[::1]"]``.

Examples: ``["mcp-run-python"]``, ``["-m", "my_mcp_server"]``,
``mcp-run-python`` (same as ``["mcp-run-python"]``)

Environment (Extra field)
JSON object of environment variables for the ``stdio`` subprocess. Ignored
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# under the License.
from __future__ import annotations

import json
from typing import TYPE_CHECKING, Any

from airflow.providers.common.compat.sdk import BaseHook
Expand Down Expand Up @@ -46,7 +47,8 @@ class MCPHook(BaseHook):
- **password**: Auth token (optional)
- **Extra.transport**: Transport type — ``http`` (default), ``sse``, or ``stdio``
- **Extra.command**: Command to run for stdio transport (e.g. ``uvx``)
- **Extra.args**: Command arguments for stdio transport (e.g. ``["mcp-run-python"]``)
- **Extra.args**: Command arguments for stdio transport, as a list or a JSON array string
(e.g. ``["mcp-run-python"]``). Any other string is a single argument.
- **Extra.env**: Environment variables for the stdio subprocess (e.g.
``{"API_KEY": "..."}``). Ignored for HTTP/SSE.
- **Extra.timeout**: Connection init timeout in seconds for stdio (default: 10)
Expand Down Expand Up @@ -190,6 +192,23 @@ def _stdio_env(self, extra: dict[str, Any]) -> dict[str, str] | None:

return env or None

def _parse_args_string(self, value: str) -> list[str]:
"""Parse a string ``args`` value: a JSON array (as the UI form stores it) or a single argument."""
if not value.strip().startswith("["):
return [value]
try:
parsed = json.loads(value)
except json.JSONDecodeError as e:
raise ValueError(
f"'args' in extra for connection {self.mcp_conn_id!r} looks like a JSON array "
f"but is not valid JSON: {e}"
) from e
if not all(isinstance(arg, str) for arg in parsed):
raise ValueError(
f"'args' in extra for connection {self.mcp_conn_id!r} must be a JSON array of strings."
)
return parsed

def get_conn(self) -> Any:
"""
Return a configured PydanticAI MCP toolset instance.
Expand Down Expand Up @@ -238,7 +257,7 @@ def get_conn(self) -> Any:
)
args = extra.get("args", [])
if isinstance(args, str):
args = [args]
args = self._parse_args_string(args)
timeout = extra.get("timeout", 10)
toolset = MCPToolset(
StdioTransport(command=command, args=args, env=self._stdio_env(extra)),
Expand Down
40 changes: 40 additions & 0 deletions providers/common/ai/tests/unit/common/ai/hooks/test_mcp.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,46 @@ def test_args_string_converted_to_list(self, mock_transport_cls, mock_toolset_cl

mock_transport_cls.assert_called_once_with(command="uvx", args=["mcp-run-python"], env=None)

@pytest.mark.parametrize(
("args", "expected"),
[
pytest.param('["-m", "my_server"]', ["-m", "my_server"], id="json-array-string"),
pytest.param(' ["-m", "my_server"] ', ["-m", "my_server"], id="json-array-string-whitespace"),
],
)
@patch(_MCP_TOOLSET, autospec=True)
@patch(_STDIO_TRANSPORT, autospec=True)
def test_args_string_parsing(self, mock_transport_cls, mock_toolset_cls, args, expected):
hook = MCPHook(mcp_conn_id="test_conn")
conn = Connection(
conn_id="test_conn",
conn_type="mcp",
extra=json.dumps({"transport": "stdio", "command": "python", "args": args}),
)
with patch.object(hook, "get_connection", return_value=conn):
hook.get_conn()

mock_transport_cls.assert_called_once_with(command="python", args=expected, env=None)

@pytest.mark.parametrize(
("args", "match"),
[
pytest.param('["-m", "my_server"', "not valid JSON", id="malformed-json"),
pytest.param('["-m", 1]', "JSON array of strings", id="non-string-item"),
],
)
@patch(_MCP_TOOLSET, autospec=True)
@patch(_STDIO_TRANSPORT, autospec=True)
def test_invalid_args_json_array_string_raises(self, mock_transport_cls, mock_toolset_cls, args, match):
hook = MCPHook(mcp_conn_id="test_conn")
conn = Connection(
conn_id="test_conn",
conn_type="mcp",
extra=json.dumps({"transport": "stdio", "command": "python", "args": args}),
)
with patch.object(hook, "get_connection", return_value=conn), pytest.raises(ValueError, match=match):
hook.get_conn()

def test_http_without_host_raises(self):
hook = MCPHook(mcp_conn_id="test_conn")
conn = Connection(conn_id="test_conn", conn_type="mcp")
Expand Down