mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-27 01:22:18 +00:00
f6882246d4
* 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>
71 lines
2.7 KiB
Python
71 lines
2.7 KiB
Python
from typing import Final
|
|
from urllib.parse import parse_qs, urlparse
|
|
|
|
import httpx
|
|
import pytest
|
|
|
|
import litellm
|
|
from litellm.llms.custom_httpx.http_handler import HTTPHandler
|
|
|
|
NATIVE_VERTEX_ROWS: Final = (
|
|
b'{"request": {"contents": [{"role": "user", "parts": [{"text": "Who won the 2024 Tour de France?"}]}],'
|
|
b' "tools": [{"googleSearch": {"excludeDomains": ["example.com"]}}]}}\n'
|
|
b'{"request": {"contents": [{"role": "user", "parts": [{"text": "What is the tallest building in Tokyo?"}]}],'
|
|
b' "tools": [{"googleSearch": {}}]}}\n'
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"custom_llm_provider, purpose",
|
|
[("openai", "batch"), ("vertex_ai", "assistants")],
|
|
ids=["non-vertex-provider", "non-batch-purpose"],
|
|
)
|
|
def test_create_file_passthrough_is_rejected_outside_a_vertex_batch(custom_llm_provider, purpose):
|
|
with pytest.raises(litellm.BadRequestError) as exc_info:
|
|
litellm.create_file(
|
|
file=("batch.jsonl", b'{"request": {"contents": []}}\n', "application/jsonl"),
|
|
purpose=purpose,
|
|
custom_llm_provider=custom_llm_provider,
|
|
passthrough=True,
|
|
api_key="sk-test",
|
|
api_base="http://127.0.0.1:9",
|
|
)
|
|
|
|
assert "vertex_ai" in str(exc_info.value)
|
|
assert "batch" in str(exc_info.value)
|
|
|
|
|
|
def _gcs_upload_transport(uploads: list[httpx.Request]) -> httpx.MockTransport:
|
|
def respond(request: httpx.Request) -> httpx.Response:
|
|
uploads.append(request)
|
|
object_name: Final = parse_qs(urlparse(str(request.url)).query)["name"][0]
|
|
return httpx.Response(
|
|
200,
|
|
json={
|
|
"id": f"my-bucket/{object_name}/1758585600000000",
|
|
"name": object_name,
|
|
"size": str(len(request.read())),
|
|
"timeCreated": "2026-09-23T00:00:00.000Z",
|
|
},
|
|
)
|
|
|
|
return httpx.MockTransport(respond)
|
|
|
|
|
|
def test_create_file_passthrough_kwarg_ships_native_rows_byte_for_byte_under_the_passthrough_prefix():
|
|
uploads: Final[list[httpx.Request]] = []
|
|
file_object = litellm.create_file(
|
|
file=("batch.jsonl", NATIVE_VERTEX_ROWS, "application/jsonl"),
|
|
purpose="batch",
|
|
custom_llm_provider="vertex_ai",
|
|
passthrough=True,
|
|
model="vertex_ai/gemini-2.5-flash",
|
|
gcs_bucket_name="my-bucket",
|
|
api_key="test-token",
|
|
client=HTTPHandler(client=httpx.Client(transport=_gcs_upload_transport(uploads))),
|
|
)
|
|
(upload,) = uploads
|
|
object_name: Final = parse_qs(urlparse(str(upload.url)).query)["name"][0]
|
|
assert upload.read() == NATIVE_VERTEX_ROWS
|
|
assert object_name.startswith("litellm-vertex-files/passthrough/publishers/google/models/gemini-2.5-flash/")
|
|
assert file_object.id == f"gs://my-bucket/{object_name}"
|