mirror of
https://github.com/BerriAI/litellm.git
synced 2026-08-28 05:25:59 +00:00
08fa25042c
The shared proxy wrapper in tests/e2e/e2e_gateway.py was misnamed: Gateway is not a gateway server, it is the client every suite uses to talk to the proxy (keys, models, chat/embed/ocr, spend read-backs, poll helpers). Rename the module to proxy_client.py and the class to ProxyClient, with build_gateway becoming build_proxy_client and the GatewayProvider protocol becoming ProxyClientProvider. The .gateway attribute suites held is now .proxy. Only identifiers changed; prose and string literals that use the word gateway for the proxy-server concept were left alone. Each suite previously built its own instance through a per-suite build_client() that called build_gateway() inside, duplicating the proxy wiring across suites. There is now one session-scoped proxy fixture in tests/e2e/conftest.py; every suite's client fixture depends on it and injects it, so the wiring lives in one place. claude_code keeps building its own client directly since it has its own harness and does not use the shared fixtures. Behavior is unchanged: shared transport, data-plane/control-plane split routing, poll budget, typed request/response models, and resource cleanup all go through the same object.
53 lines
1.6 KiB
Python
53 lines
1.6 KiB
Python
"""Batches suite's `client` fixture.
|
|
|
|
The shared lifecycle (resources/scoped_key), proxy liveness gate, and e2e marker
|
|
live in the parent tests/e2e/conftest.py. BatchClient holds the shared ProxyClient, so
|
|
the `resources` fixture cleans up keys through it; tests register file deletes and
|
|
batch cancels via `resources.defer(...)`.
|
|
|
|
Batch deployments (openai-batch, azure-batch, vertex-batch, ...) are registered
|
|
once per session via /model/new and deleted on teardown so they need not live in
|
|
the proxy config.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import Iterator
|
|
|
|
import pytest
|
|
|
|
from batch_client import BatchClient, build_client
|
|
from capabilities import PROVIDERS
|
|
from e2e_http import NoBody
|
|
from proxy_client import ProxyClient
|
|
|
|
|
|
def pytest_configure(config: pytest.Config) -> None:
|
|
config.addinivalue_line(
|
|
"markers",
|
|
"covers: registry cell a test covers, e.g. llm.batches.openai.basic.nonstream.works",
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def client(proxy: ProxyClient) -> BatchClient:
|
|
return build_client(proxy)
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def batch_deployments(client: BatchClient) -> Iterator[None]:
|
|
probe = client.proxy.probe("/health/liveliness", params=NoBody())
|
|
if not probe.healthy:
|
|
yield
|
|
return
|
|
|
|
registered: list[str] = []
|
|
try:
|
|
for provider in PROVIDERS:
|
|
registered.append(
|
|
client.create_model(provider.model, provider.litellm_params())
|
|
)
|
|
yield
|
|
finally:
|
|
for model_id in registered:
|
|
client.delete_model(model_id)
|