mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-28 01:32:17 +00:00
* ci: run the unit_selection.sh shard files on every event instead of only fork pull requests Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * ci: rename fork-flag to unit-flag now that it applies on every event * test: move tests/test_litellm root and small trees into tests/unit Pure renames, no content changes. Follow-up commits in this PR fix references, merge the three files that already existed in tests/unit, keep live-provider tests in tests/test_litellm and wire CI. * test: carry tests/test_litellm conftest isolation into tests/unit Callback lists, routing fallbacks, cached HTTP clients, logger state, AWS, proxy-URL and keychain env, and session-end client cleanup now reset for unit tests too. The environment isolation owns its MonkeyPatch so a test's own monkeypatch is undone before the model-cost teardown runs. * test: merge, split and prune the moved root and small-tree tests Merge batches/test_batch_utils.py and the chat_completions and messages dispatch tests into the files that already existed in tests/unit. Keep the live Gemini interactions tests, the async image-fetch format test and the OpenAI embedding scorer test in tests/test_litellm since they need real network or keys. Put test_router.py under tests/unit/test_router so the existing package no longer shadows it. Delete eight tests the audit found superseded by stronger ones kept in this move. * ci: run the moved root and small-tree tests under their legacy flags Add the misc and responses-caching-types flags to unit_selection.sh and CircleCI, extend enterprise-routing and mcp-integration, and point the legacy GHA shards, Makefile, redis-compat workflow, merge smoke manifest and change classifier at the new paths. * test: make the new tests/unit directories packages tests/unit/test_package_layout.py requires every directory to carry an __init__.py, and without one the moved and retained test_litellm_responses_bridge.py modules collide on import. * test: scope the unit socket block to tests/unit in shared sessions The GHA shards collect the legacy test-path and the unit selection in one pytest session. The unit conftest's loopback-only block leaked into legacy modules that reach the network at import. The legacy conftest now lifts the restriction at collect and setup time, and the unit conftest re-applies it when collecting its own modules. * test: give the shard-script tests their own GITHUB_OUTPUT They only passed where the runner set it. The CircleCI unit job's env allowlist drops it, so the script's redirect failed there. * test: point the router and module-deletion checks at tests/unit router_code_coverage and code_qa_check_tests only searched tests/test_litellm, so the moved router tests no longer counted. The two silent-experiment tests the audit deleted were the only direct callers of those methods; they are replaced with tests that assert the forwarded shadow request and the recursion guard. --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
147 lines
5.1 KiB
Python
147 lines
5.1 KiB
Python
"""
|
|
Regression tests for https://github.com/BerriAI/litellm/issues/36493
|
|
|
|
/v1/images/edits on the openai path silently dropped unknown provider params
|
|
(e.g. seed) and the extra_body escape hatch, unlike /v1/images/generations.
|
|
"""
|
|
|
|
import httpx
|
|
import pytest
|
|
|
|
import litellm
|
|
from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler, HTTPHandler
|
|
|
|
PNG_BYTES = b"\x89PNG\r\n\x1a\nfakepng"
|
|
|
|
|
|
def _capture_image_edit_request(captured):
|
|
def respond(request):
|
|
captured["content_type"] = request.headers.get("content-type")
|
|
captured["body"] = request.content
|
|
return httpx.Response(200, json={"created": 1712697600, "data": [{"b64_json": "aW1n"}]})
|
|
|
|
return respond
|
|
|
|
|
|
def _multipart_text_fields(content_type: str, body: bytes) -> dict:
|
|
boundary = content_type.split("boundary=")[1].encode()
|
|
return {
|
|
part.split(b'name="')[1].split(b'"')[0].decode(): part.partition(b"\r\n\r\n")[2].rstrip(b"\r\n-").decode()
|
|
for part in body.split(b"--" + boundary)
|
|
if b'name="' in part and b"filename=" not in part
|
|
}
|
|
|
|
|
|
def test_image_edit_forwards_provider_params_and_extra_body():
|
|
captured = {}
|
|
client = HTTPHandler(client=httpx.Client(transport=httpx.MockTransport(_capture_image_edit_request(captured))))
|
|
|
|
response = litellm.image_edit(
|
|
model="openai/gpt-image-1",
|
|
image=PNG_BYTES,
|
|
prompt="add a hat",
|
|
api_key="sk-test",
|
|
api_base="https://edit.example/v1",
|
|
client=client,
|
|
seed=42,
|
|
extra_body={"quality_level": "high"},
|
|
)
|
|
|
|
assert captured["content_type"].startswith("multipart/form-data")
|
|
fields = _multipart_text_fields(captured["content_type"], captured["body"])
|
|
assert fields["seed"] == "42"
|
|
assert fields["quality_level"] == "high"
|
|
assert "extra_body" not in fields
|
|
assert fields["model"] == "gpt-image-1"
|
|
assert fields["prompt"] == "add a hat"
|
|
assert b'name="image[]"' in captured["body"]
|
|
assert response.data
|
|
|
|
|
|
def test_image_edit_extra_body_takes_precedence_over_kwargs():
|
|
captured = {}
|
|
client = HTTPHandler(client=httpx.Client(transport=httpx.MockTransport(_capture_image_edit_request(captured))))
|
|
|
|
litellm.image_edit(
|
|
model="openai/gpt-image-1",
|
|
image=PNG_BYTES,
|
|
prompt="add a hat",
|
|
api_key="sk-test",
|
|
api_base="https://edit.example/v1",
|
|
client=client,
|
|
seed=42,
|
|
extra_body={"seed": 7},
|
|
)
|
|
|
|
assert _multipart_text_fields(captured["content_type"], captured["body"])["seed"] == "7"
|
|
|
|
|
|
def test_image_edit_flattens_nested_provider_params():
|
|
"""A nested value in extra_body (or a nested unknown kwarg) must be
|
|
serialized as OpenAI-SDK bracket form fields (key[subkey]) rather than
|
|
handed to the httpx multipart encoder, which raises 'Invalid type for
|
|
value. Expected primitive type' on a dict and 500s the request."""
|
|
captured = {}
|
|
client = HTTPHandler(client=httpx.Client(transport=httpx.MockTransport(_capture_image_edit_request(captured))))
|
|
|
|
litellm.image_edit(
|
|
model="openai/gpt-image-1",
|
|
image=PNG_BYTES,
|
|
prompt="add a hat",
|
|
api_key="sk-test",
|
|
api_base="https://edit.example/v1",
|
|
client=client,
|
|
extra_body={"generation_config": {"steps": 30, "guidance": True}},
|
|
)
|
|
|
|
fields = _multipart_text_fields(captured["content_type"], captured["body"])
|
|
assert fields["generation_config[steps]"] == "30"
|
|
assert fields["generation_config[guidance]"] == "true"
|
|
assert "generation_config" not in fields
|
|
|
|
|
|
def test_image_edit_forwards_scalar_array_as_repeated_fields():
|
|
"""A list-valued provider param must reach the backend as one repeated part
|
|
per element, not collapse to its last element under dict.update."""
|
|
captured = {}
|
|
client = HTTPHandler(client=httpx.Client(transport=httpx.MockTransport(_capture_image_edit_request(captured))))
|
|
|
|
litellm.image_edit(
|
|
model="openai/gpt-image-1",
|
|
image=PNG_BYTES,
|
|
prompt="add a hat",
|
|
api_key="sk-test",
|
|
api_base="https://edit.example/v1",
|
|
client=client,
|
|
loras=["style_a", "style_b", "style_c"],
|
|
)
|
|
|
|
body = captured["body"]
|
|
assert body.count(b'name="loras"') == 3
|
|
assert b"style_a" in body and b"style_b" in body and b"style_c" in body
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_aimage_edit_forwards_extra_body():
|
|
"""aimage_edit used to drop extra_headers/extra_query/extra_body when
|
|
building its partial, so they never reached image_edit."""
|
|
captured = {}
|
|
client = AsyncHTTPHandler()
|
|
client.client = httpx.AsyncClient(transport=httpx.MockTransport(_capture_image_edit_request(captured)))
|
|
|
|
response = await litellm.aimage_edit(
|
|
model="openai/gpt-image-1",
|
|
image=PNG_BYTES,
|
|
prompt="add a hat",
|
|
api_key="sk-test",
|
|
api_base="https://edit.example/v1",
|
|
client=client,
|
|
seed=42,
|
|
extra_body={"quality_level": "high"},
|
|
)
|
|
|
|
fields = _multipart_text_fields(captured["content_type"], captured["body"])
|
|
assert fields["seed"] == "42"
|
|
assert fields["quality_level"] == "high"
|
|
assert "extra_body" not in fields
|
|
assert response.data
|