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 extension HTTP transport (#43404)

Asuka Minato65a32e353b02
diff --git a/api/tests/unit_tests/core/extension/test_api_based_extension_requestor.py b/api/tests/unit_tests/core/extension/test_api_based_extension_requestor.py
index a967f28b4d1..1b002566071 100644
--- a/api/tests/unit_tests/core/extension/test_api_based_extension_requestor.py
+++ b/api/tests/unit_tests/core/extension/test_api_based_extension_requestor.py
@@ -1,95 +1,93 @@
+import json
from collections.abc import Callable
import httpx
import pytest
-from pytest_mock import MockerFixture
from core.extension.api_based_extension_requestor import APIBasedExtensionRequestor
from models.api_based_extension import APIBasedExtensionPoint
-def test_request_success(mocker: MockerFixture):
- # Mock httpx.Client and its context manager
- mock_client = mocker.MagicMock()
- mock_client_instance = mock_client.__enter__.return_value
- mocker.patch("httpx.Client", return_value=mock_client)
+def install_client(monkeypatch: pytest.MonkeyPatch, config_overrides: Callable[..., None]):
+ config_overrides(SSRF_PROXY_HTTP_URL=None, SSRF_PROXY_HTTPS_URL=None)
+ client_type = httpx.Client
- mock_response = mocker.MagicMock()
- mock_response.status_code = 200
- mock_response.json.return_value = {"result": "success"}
- mock_client_instance.request.return_value = mock_response
+ def install(handler: Callable[[httpx.Request], httpx.Response]):
+ requests: list[httpx.Request] = []
+ options: list[tuple[dict[str, httpx.BaseTransport] | None, httpx.Timeout]] = []
- requestor = APIBasedExtensionRequestor(api_endpoint="http://example.com", api_key="test_key")
- result = requestor.request(APIBasedExtensionPoint.PING, {"foo": "bar"})
+ def respond(request: httpx.Request) -> httpx.Response:
+ requests.append(request)
+ return handler(request)
- assert result == {"result": "success"}
- mock_client_instance.request.assert_called_once_with(
- method="POST",
- url="http://example.com",
- json={"point": APIBasedExtensionPoint.PING.value, "params": {"foo": "bar"}},
- headers={"Content-Type": "application/json", "Authorization": "Bearer test_key"},
- )
+ def client(*, mounts: dict[str, httpx.BaseTransport] | None, timeout: httpx.Timeout) -> httpx.Client:
+ options.append((mounts, timeout))
+ return client_type(mounts=mounts, timeout=timeout, transport=httpx.MockTransport(respond), trust_env=False)
+ monkeypatch.setattr(httpx, "Client", client)
+ return requests, options
-def test_request_with_ssrf_proxy(mocker: MockerFixture, config_overrides: Callable[..., None]):
- config_overrides(SSRF_PROXY_HTTP_URL="http://proxy:8080", SSRF_PROXY_HTTPS_URL="https://proxy:8081")
+ return install
- # Mock httpx.Client
- mock_client = mocker.MagicMock()
- mock_client_class = mocker.patch("httpx.Client", return_value=mock_client)
- mock_client_instance = mock_client.__enter__.return_value
- # Mock response
- mock_response = mocker.MagicMock()
- mock_response.status_code = 200
- mock_response.json.return_value = {"result": "success"}
- mock_client_instance.request.return_value = mock_response
+def test_request_success(install_client):
+ requests, _ = install_client(lambda _: httpx.Response(200, json={"result": "success"}))
+ requestor = APIBasedExtensionRequestor(api_endpoint="http://example.com", api_key="test_key")
+ result = requestor.request(APIBasedExtensionPoint.PING, {"foo": "bar"})
+
+ assert result == {"result": "success"}
+ assert len(requests) == 1
+ request = requests[0]
+ assert request.method == "POST"
+ assert str(request.url) == "http://example.com"
+ assert json.loads(request.content) == {"point": APIBasedExtensionPoint.PING.value, "params": {"foo": "bar"}}
+ assert request.headers["Content-Type"] == "application/json"
+ assert request.headers["Authorization"] == "Bearer test_key"
+
+
+def test_request_with_ssrf_proxy(
+ install_client, monkeypatch: pytest.MonkeyPatch, config_overrides: Callable[..., None]
+):
+ config_overrides(SSRF_PROXY_HTTP_URL="http://proxy:8080", SSRF_PROXY_HTTPS_URL="https://proxy:8081")
+ _, options = install_client(lambda _: httpx.Response(200, json={"result": "success"}))
+ proxies: list[str] = []
+ transports: list[httpx.MockTransport] = []
- # Mock HTTPTransport
- mock_transport = mocker.patch("httpx.HTTPTransport")
+ def transport(*, proxy: str) -> httpx.MockTransport:
+ proxies.append(proxy)
+ result = httpx.MockTransport(lambda _: httpx.Response(200, json={"result": "success"}))
+ transports.append(result)
+ return result
+ monkeypatch.setattr(httpx, "HTTPTransport", transport)
requestor = APIBasedExtensionRequestor(api_endpoint="http://example.com", api_key="test_key")
requestor.request(APIBasedExtensionPoint.PING, {})
- # Verify httpx.Client was called with mounts
- mock_client_class.assert_called_once()
- kwargs = mock_client_class.call_args.kwargs
- assert "mounts" in kwargs
- assert "http://" in kwargs["mounts"]
- assert "https://" in kwargs["mounts"]
- assert mock_transport.call_count == 2
+ assert len(options) == 1
+ mounts, timeout = options[0]
+ assert mounts == {"http://": transports[0], "https://": transports[1]}
+ assert proxies == ["http://proxy:8080", "https://proxy:8081"]
+ assert timeout is requestor.timeout
-def test_request_with_only_one_proxy_config(mocker: MockerFixture, config_overrides: Callable[..., None]):
+def test_request_with_only_one_proxy_config(install_client, config_overrides: Callable[..., None]):
config_overrides(SSRF_PROXY_HTTP_URL="http://proxy:8080", SSRF_PROXY_HTTPS_URL=None)
-
- # Mock httpx.Client
- mock_client = mocker.MagicMock()
- mock_client_class = mocker.patch("httpx.Client", return_value=mock_client)
- mock_client_instance = mock_client.__enter__.return_value
-
- # Mock response
- mock_response = mocker.MagicMock()
- mock_response.status_code = 200
- mock_response.json.return_value = {"result": "success"}
- mock_client_instance.request.return_value = mock_response
-
+ _, options = install_client(lambda _: httpx.Response(200, json={"result": "success"}))
requestor = APIBasedExtensionRequestor(api_endpoint="http://example.com", api_key="test_key")
requestor.request(APIBasedExtensionPoint.PING, {})
- # Verify httpx.Client was called with mounts=None (default)
- mock_client_class.assert_called_once()
- kwargs = mock_client_class.call_args.kwargs
- assert kwargs.get("mounts") is None
+ assert len(options) == 1
+ assert options[0][0] is None
-def test_request_timeout(mocker: MockerFixture):
- mock_client = mocker.MagicMock()
- mock_client_instance = mock_client.__enter__.return_value
- mocker.patch("httpx.Client", return_value=mock_client)
+def test_request_timeout(install_client):
original = httpx.TimeoutException("timeout")
- mock_client_instance.request.side_effect = original
+ def fail(_request: httpx.Request) -> httpx.Response:
+ raise original
+
+ install_client(fail)
requestor = APIBasedExtensionRequestor(api_endpoint="http://example.com", api_key="test_key")
with pytest.raises(ValueError, match="request timeout") as exc_info:
requestor.request(APIBasedExtensionPoint.PING, {})
@@ -97,13 +95,13 @@ def test_request_timeout(mocker: MockerFixture):
assert exc_info.value.__cause__ is original
-def test_request_connection_error(mocker: MockerFixture):
- mock_client = mocker.MagicMock()
- mock_client_instance = mock_client.__enter__.return_value
- mocker.patch("httpx.Client", return_value=mock_client)
+def test_request_connection_error(install_client):
original = httpx.RequestError("error")
- mock_client_instance.request.side_effect = original
+ def fail(_request: httpx.Request) -> httpx.Response:
+ raise original
+
+ install_client(fail)
requestor = APIBasedExtensionRequestor(api_endpoint="http://example.com", api_key="test_key")
with pytest.raises(ValueError, match="request connection error") as exc_info:
requestor.request(APIBasedExtensionPoint.PING, {})
@@ -111,31 +109,15 @@ def test_request_connection_error(mocker: MockerFixture):
assert exc_info.value.__cause__ is original
-def test_request_error_status_code(mocker: MockerFixture):
- mock_client = mocker.MagicMock()
- mock_client_instance = mock_client.__enter__.return_value
- mocker.patch("httpx.Client", return_value=mock_client)
-
- mock_response = mocker.MagicMock()
- mock_response.status_code = 404
- mock_response.text = "Not Found"
- mock_client_instance.request.return_value = mock_response
-
+def test_request_error_status_code(install_client):
+ install_client(lambda _: httpx.Response(404, text="Not Found"))
requestor = APIBasedExtensionRequestor(api_endpoint="http://example.com", api_key="test_key")
with pytest.raises(ValueError, match="request error, status_code: 404, content: Not Found"):
requestor.request(APIBasedExtensionPoint.PING, {})
-def test_request_error_status_code_long_content(mocker: MockerFixture):
- mock_client = mocker.MagicMock()
- mock_client_instance = mock_client.__enter__.return_value
- mocker.patch("httpx.Client", return_value=mock_client)
-
- mock_response = mocker.MagicMock()
- mock_response.status_code = 500
- mock_response.text = "A" * 200 # Testing truncation of content
- mock_client_instance.request.return_value = mock_response
-
+def test_request_error_status_code_long_content(install_client):
+ install_client(lambda _: httpx.Response(500, text="A" * 200))
requestor = APIBasedExtensionRequestor(api_endpoint="http://example.com", api_key="test_key")
expected_content = "A" * 100
with pytest.raises(ValueError, match=f"request error, status_code: 500, content: {expected_content}"):