Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

test: exercise real MCP POST transport (#43400)

Asuka Minatofeab757dc727
diff --git a/api/tests/unit_tests/core/mcp/client/test_streamable_http.py b/api/tests/unit_tests/core/mcp/client/test_streamable_http.py
index 74f1f562301..06e7d56c6ba 100644
--- a/api/tests/unit_tests/core/mcp/client/test_streamable_http.py
+++ b/api/tests/unit_tests/core/mcp/client/test_streamable_http.py
@@ -921,11 +921,11 @@ class TestHandleResumptionRequestNew:
class TestHandlePostRequestNew:
- def _make_ctx(self, transport, q, message=None) -> RequestContext:
+ def _make_ctx(self, transport, q, response: httpx.Response, message=None) -> RequestContext:
if message is None:
message = _make_request_msg("tools/list", 1)
return RequestContext(
- client=MagicMock(),
+ client=httpx.Client(transport=httpx.MockTransport(lambda _request: response)),
headers=transport.request_headers,
session_id=transport.session_id,
session_message=SessionMessage(message),
@@ -934,42 +934,32 @@ class TestHandlePostRequestNew:
sse_read_timeout=60,
)
- def _stream_ctx(self, mock_response):
- @contextmanager
- def _stream[**P](*args: P.args, **kwargs: P.kwargs):
- yield mock_response
-
- return _stream
-
def test_202_returns_immediately_no_queue(self):
t = _new_transport()
q: queue.Queue = queue.Queue()
- ctx = self._make_ctx(t, q)
- mock_resp = MagicMock()
- mock_resp.status_code = 202
- ctx.client.stream = self._stream_ctx(mock_resp)
- t._handle_post_request(ctx)
+ response = httpx.Response(202)
+ ctx = self._make_ctx(t, q, response)
+ with ctx.client:
+ t._handle_post_request(ctx)
assert q.empty()
def test_204_returns_immediately_no_queue(self):
t = _new_transport()
q: queue.Queue = queue.Queue()
- ctx = self._make_ctx(t, q)
- mock_resp = MagicMock()
- mock_resp.status_code = 204
- ctx.client.stream = self._stream_ctx(mock_resp)
- t._handle_post_request(ctx)
+ response = httpx.Response(204)
+ ctx = self._make_ctx(t, q, response)
+ with ctx.client:
+ t._handle_post_request(ctx)
assert q.empty()
def test_404_sends_session_terminated_error_for_request(self):
t = _new_transport()
q: queue.Queue = queue.Queue()
msg = _make_request_msg("tools/list", 77)
- ctx = self._make_ctx(t, q, message=msg)
- mock_resp = MagicMock()
- mock_resp.status_code = 404
- ctx.client.stream = self._stream_ctx(mock_resp)
- t._handle_post_request(ctx)
+ response = httpx.Response(404)
+ ctx = self._make_ctx(t, q, response, message=msg)
+ with ctx.client:
+ t._handle_post_request(ctx)
item = q.get_nowait()
assert isinstance(item, SessionMessage)
assert isinstance(item.message.root, JSONRPCError)
@@ -980,11 +970,10 @@ class TestHandlePostRequestNew:
t = _new_transport(url="http://example.com/mcp/server/abc123/mcp")
q: queue.Queue = queue.Queue()
msg = _make_request_msg("initialize", 1)
- ctx = self._make_ctx(t, q, message=msg)
- mock_resp = MagicMock()
- mock_resp.status_code = 404
- ctx.client.stream = self._stream_ctx(mock_resp)
- t._handle_post_request(ctx)
+ response = httpx.Response(404)
+ ctx = self._make_ctx(t, q, response, message=msg)
+ with ctx.client:
+ t._handle_post_request(ctx)
item = q.get_nowait()
assert isinstance(item, SessionMessage)
assert isinstance(item.message.root, JSONRPCError)
@@ -996,56 +985,44 @@ class TestHandlePostRequestNew:
t = _new_transport()
q: queue.Queue = queue.Queue()
msg = _make_notification_msg("some/notification")
- ctx = self._make_ctx(t, q, message=msg)
- mock_resp = MagicMock()
- mock_resp.status_code = 404
- ctx.client.stream = self._stream_ctx(mock_resp)
- t._handle_post_request(ctx)
+ response = httpx.Response(404)
+ ctx = self._make_ctx(t, q, response, message=msg)
+ with ctx.client:
+ t._handle_post_request(ctx)
assert q.empty()
def test_json_response_puts_session_message(self):
t = _new_transport()
q: queue.Queue = queue.Queue()
- ctx = self._make_ctx(t, q)
response_data = json.dumps({"jsonrpc": "2.0", "id": 1, "result": {"ok": True}}).encode()
- mock_resp = MagicMock()
- mock_resp.status_code = 200
- mock_resp.headers = {"content-type": "application/json"}
- mock_resp.raise_for_status.return_value = None
- mock_resp.read.return_value = response_data
- ctx.client.stream = self._stream_ctx(mock_resp)
-
- t._handle_post_request(ctx)
+ response = httpx.Response(200, headers={"content-type": "application/json"}, content=response_data)
+ ctx = self._make_ctx(t, q, response)
+
+ with ctx.client:
+ t._handle_post_request(ctx)
assert isinstance(q.get_nowait(), SessionMessage)
def test_json_response_invalid_json_puts_exception(self):
t = _new_transport()
q: queue.Queue = queue.Queue()
- ctx = self._make_ctx(t, q)
- mock_resp = MagicMock()
- mock_resp.status_code = 200
- mock_resp.headers = {"content-type": "application/json"}
- mock_resp.raise_for_status.return_value = None
- mock_resp.read.return_value = b"{bad json!"
- ctx.client.stream = self._stream_ctx(mock_resp)
+ response = httpx.Response(200, headers={"content-type": "application/json"}, content=b"{bad json!")
+ ctx = self._make_ctx(t, q, response)
- t._handle_post_request(ctx)
+ with ctx.client:
+ t._handle_post_request(ctx)
assert isinstance(q.get_nowait(), Exception)
def test_unexpected_content_type_puts_value_error(self):
t = _new_transport()
q: queue.Queue = queue.Queue()
- ctx = self._make_ctx(t, q)
- mock_resp = MagicMock()
- mock_resp.status_code = 200
- mock_resp.headers = {"content-type": "text/plain"}
- mock_resp.raise_for_status.return_value = None
- ctx.client.stream = self._stream_ctx(mock_resp)
+ response = httpx.Response(200, headers={"content-type": "text/plain"})
+ ctx = self._make_ctx(t, q, response)
- t._handle_post_request(ctx)
+ with ctx.client:
+ t._handle_post_request(ctx)
item = q.get_nowait()
assert isinstance(item, ValueError)
assert "Unexpected content type" in str(item)
@@ -1054,57 +1031,43 @@ class TestHandlePostRequestNew:
t = _new_transport()
q: queue.Queue = queue.Queue()
msg = _make_request_msg("initialize", 1)
- ctx = self._make_ctx(t, q, message=msg)
response_data = json.dumps({"jsonrpc": "2.0", "id": 1, "result": {}}).encode()
- mock_resp = MagicMock()
- mock_resp.status_code = 200
- mock_resp.headers = MagicMock()
- headers_dict = {"content-type": "application/json", MCP_SESSION_ID: "new-sid"}
- mock_resp.headers.__getitem__ = lambda self, k: headers_dict[k]
- mock_resp.headers.get = lambda k, default=None: headers_dict.get(k, default)
- mock_resp.raise_for_status.return_value = None
- mock_resp.read.return_value = response_data
- ctx.client.stream = self._stream_ctx(mock_resp)
-
- t._handle_post_request(ctx)
+ response = httpx.Response(
+ 200,
+ headers={"content-type": "application/json", MCP_SESSION_ID: "new-sid"},
+ content=response_data,
+ )
+ ctx = self._make_ctx(t, q, response, message=msg)
+
+ with ctx.client:
+ t._handle_post_request(ctx)
assert t.session_id == "new-sid"
def test_notification_skips_response_processing(self):
t = _new_transport()
q: queue.Queue = queue.Queue()
msg = _make_notification_msg("notifications/something")
- ctx = self._make_ctx(t, q, message=msg)
response_data = json.dumps({"jsonrpc": "2.0", "id": 1, "result": {}}).encode()
- mock_resp = MagicMock()
- mock_resp.status_code = 200
- mock_resp.headers = {"content-type": "application/json"}
- mock_resp.raise_for_status.return_value = None
- mock_resp.read.return_value = response_data
- ctx.client.stream = self._stream_ctx(mock_resp)
-
- t._handle_post_request(ctx)
+ response = httpx.Response(200, headers={"content-type": "application/json"}, content=response_data)
+ ctx = self._make_ctx(t, q, response, message=msg)
+
+ with ctx.client:
+ t._handle_post_request(ctx)
assert q.empty()
def test_sse_response_handles_stream(self):
t = _new_transport()
q: queue.Queue = queue.Queue()
- ctx = self._make_ctx(t, q)
data = json.dumps({"jsonrpc": "2.0", "id": 1, "result": {}})
- mock_sse_event = _make_sse_mock("message", data)
-
- mock_resp = MagicMock()
- mock_resp.status_code = 200
- mock_resp.headers = {"content-type": "text/event-stream"}
- mock_resp.raise_for_status.return_value = None
- ctx.client.stream = self._stream_ctx(mock_resp)
+ response = httpx.Response(
+ 200, headers={"content-type": "text/event-stream"}, content=f"event: message\ndata: {data}\n\n"
+ )
+ ctx = self._make_ctx(t, q, response)
- with patch("core.mcp.client.streamable_client.EventSource") as MockEventSource:
- mock_es_instance = MagicMock()
- mock_es_instance.iter_sse.return_value = [mock_sse_event]
- MockEventSource.return_value = mock_es_instance
+ with ctx.client:
t._handle_post_request(ctx)
assert isinstance(q.get_nowait(), SessionMessage)