93a7267b10
Each removed test re-asserts a contract a stronger test already owns at the real boundary; the keeper is named per group. - api_server CORS: `_origin_allowed` for an allowlisted origin and for an Origin-less client -> the configured-origin preflight test and every Origin-less /health request. The Idempotency-Key allow-header assertion moves into the preflight test instead of running a second identical preflight. - api_server room grants: the execution-policy predicate's two outcomes -> test_api_server_runs' HTTP grant-refresh tests (403 on drift, 200 on the authorized digest). - api_server multimodal: the pure input_image canonicalization -> the /v1/responses test that sends the same parts and asserts the same shape. - credential pool: matched-hint rotation (401) and second-429 rotation -> test_credential_pool_routing's real-pool hint test and TestPoolRotationCycle, which assert the same steps plus the exact rotate kwargs and swap. - shared metrics: two runtime cases that replay the send resolver's truth table -> TestSendRequiresCollection; the e2e gzip-retry test (both attempts compress in the same second, so it cannot see mtime) -> TestCompression::test_gzip_is_deterministic_across_time; e2e outbox untouched -> TestOutboxIsNotAQueue. - mcp oauth: provider reuse across reconnects -> the manager restore test; the non-tty private predicate -> build_oauth_auth's fail-fast test; the manager disk-watch test -> the integration test, which gains its one unique assertion (an unchanged file returns False). - startup watchdog: disarm-without-arm -> test_disarm_is_idempotent, whose second disarm runs in the same state and branch.
154 lines
5.7 KiB
Python
154 lines
5.7 KiB
Python
"""End-to-end tests for inline image inputs on /v1/chat/completions and /v1/responses.
|
|
|
|
Covers the multimodal normalization path added to the API server. Unlike the
|
|
adapter-level tests that patch ``_run_agent``, these tests patch
|
|
``AIAgent.run_conversation`` instead so the adapter's full request-handling
|
|
path (including the ``run_agent`` prologue that used to crash on list content)
|
|
executes against a real aiohttp app.
|
|
"""
|
|
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
from aiohttp import web
|
|
from aiohttp.test_utils import TestClient, TestServer
|
|
|
|
from gateway.config import PlatformConfig
|
|
from gateway.platforms.api_server import (
|
|
APIServerAdapter,
|
|
_content_has_visible_payload,
|
|
_normalize_multimodal_content,
|
|
cors_middleware,
|
|
security_headers_middleware,
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Pure-function tests for _normalize_multimodal_content
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestNormalizeMultimodalContent:
|
|
def test_string_passthrough(self):
|
|
assert _normalize_multimodal_content("hello") == "hello"
|
|
|
|
def test_none_returns_empty_string(self):
|
|
assert _normalize_multimodal_content(None) == ""
|
|
|
|
def test_text_only_list_collapses_to_string(self):
|
|
content = [{"type": "text", "text": "hi"}, {"type": "text", "text": "there"}]
|
|
assert _normalize_multimodal_content(content) == "hi\nthere"
|
|
|
|
def test_responses_input_text_canonicalized(self):
|
|
content = [{"type": "input_text", "text": "hello"}]
|
|
assert _normalize_multimodal_content(content) == "hello"
|
|
|
|
|
|
class TestContentHasVisiblePayload:
|
|
|
|
|
|
def test_list_with_image_only(self):
|
|
assert _content_has_visible_payload([{"type": "image_url", "image_url": {"url": "x"}}])
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# HTTP integration — real aiohttp client hitting the adapter handlers
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _make_adapter() -> APIServerAdapter:
|
|
return APIServerAdapter(PlatformConfig(enabled=True))
|
|
|
|
|
|
def _create_app(adapter: APIServerAdapter) -> web.Application:
|
|
mws = [mw for mw in (cors_middleware, security_headers_middleware) if mw is not None]
|
|
app = web.Application(middlewares=mws)
|
|
app["api_server_adapter"] = adapter
|
|
app.router.add_post("/v1/chat/completions", adapter._handle_chat_completions)
|
|
app.router.add_post("/v1/responses", adapter._handle_responses)
|
|
app.router.add_get("/v1/responses/{response_id}", adapter._handle_get_response)
|
|
return app
|
|
|
|
|
|
@pytest.fixture
|
|
def adapter():
|
|
return _make_adapter()
|
|
|
|
|
|
class TestChatCompletionsMultimodalHTTP:
|
|
@pytest.mark.asyncio
|
|
async def test_inline_image_preserved_to_run_agent(self, adapter):
|
|
"""Multimodal user content reaches _run_agent as a list of parts."""
|
|
image_payload = [
|
|
{"type": "text", "text": "What's in this image?"},
|
|
{"type": "image_url", "image_url": {"url": "https://example.com/cat.png", "detail": "high"}},
|
|
]
|
|
|
|
app = _create_app(adapter)
|
|
async with TestClient(TestServer(app)) as cli:
|
|
with patch.object(
|
|
adapter,
|
|
"_run_agent",
|
|
new=MagicMock(),
|
|
) as mock_run:
|
|
async def _stub(**kwargs):
|
|
mock_run.captured = kwargs
|
|
return (
|
|
{"final_response": "A cat.", "messages": [], "api_calls": 1},
|
|
{"input_tokens": 0, "output_tokens": 0, "total_tokens": 0},
|
|
)
|
|
mock_run.side_effect = _stub
|
|
|
|
resp = await cli.post(
|
|
"/v1/chat/completions",
|
|
json={
|
|
"model": "hermes-agent",
|
|
"messages": [{"role": "user", "content": image_payload}],
|
|
},
|
|
)
|
|
|
|
assert resp.status == 200, await resp.text()
|
|
assert mock_run.captured["user_message"] == image_payload
|
|
|
|
|
|
class TestResponsesMultimodalHTTP:
|
|
@pytest.mark.asyncio
|
|
async def test_input_image_canonicalized_and_forwarded(self, adapter):
|
|
app = _create_app(adapter)
|
|
async with TestClient(TestServer(app)) as cli:
|
|
with patch.object(adapter, "_run_agent", new=MagicMock()) as mock_run:
|
|
async def _stub(**kwargs):
|
|
mock_run.captured = kwargs
|
|
return (
|
|
{"final_response": "ok", "messages": [], "api_calls": 1},
|
|
{"input_tokens": 0, "output_tokens": 0, "total_tokens": 0},
|
|
)
|
|
mock_run.side_effect = _stub
|
|
|
|
resp = await cli.post(
|
|
"/v1/responses",
|
|
json={
|
|
"model": "hermes-agent",
|
|
"input": [
|
|
{
|
|
"role": "user",
|
|
"content": [
|
|
{"type": "input_text", "text": "Describe."},
|
|
{
|
|
"type": "input_image",
|
|
"image_url": "https://example.com/cat.png",
|
|
},
|
|
],
|
|
}
|
|
],
|
|
},
|
|
)
|
|
|
|
assert resp.status == 200, await resp.text()
|
|
expected = [
|
|
{"type": "text", "text": "Describe."},
|
|
{"type": "image_url", "image_url": {"url": "https://example.com/cat.png"}},
|
|
]
|
|
assert mock_run.captured["user_message"] == expected
|
|
|