mirror of
https://github.com/BerriAI/litellm.git
synced 2026-08-28 05:25:59 +00:00
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.
174 lines
5.1 KiB
Python
174 lines
5.1 KiB
Python
"""Client for the batches e2e suite: file upload/download and the batch
|
|
operations (create / retrieve / cancel / list) over the shared ProxyClient.
|
|
|
|
Batch deployments are registered at runtime via /model/new (see conftest.py),
|
|
not baked into the proxy config. `create_batch` returns the raw HTTP outcome
|
|
(StreamingResponse) so a 403 model access denial and a provider-native batch
|
|
body both surface; the test parses BatchObject from the body. A `provider` arg
|
|
routes a call to /{provider}/v1/..., which the provider-fallback scenario needs
|
|
(its ids are raw, not model-encoded). The request/response models are
|
|
co-located here because only this suite uses them.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass
|
|
|
|
from pydantic import BaseModel
|
|
|
|
from proxy_client import ProxyClient
|
|
from e2e_http import (
|
|
FileUploadForm,
|
|
NoBody,
|
|
Result,
|
|
StreamingResponse,
|
|
UnknownApiError,
|
|
)
|
|
from models import LiteLLMParamsBody
|
|
|
|
|
|
class FileObject(BaseModel):
|
|
id: str
|
|
object: str | None = None
|
|
purpose: str | None = None
|
|
bytes: int | None = None
|
|
status: str | None = None
|
|
created_at: int | None = None
|
|
|
|
|
|
class BatchObject(BaseModel):
|
|
id: str
|
|
object: str | None = None
|
|
status: str
|
|
endpoint: str | None = None
|
|
input_file_id: str | None = None
|
|
output_file_id: str | None = None
|
|
completion_window: str | None = None
|
|
created_at: int | None = None
|
|
model: str | None = None
|
|
|
|
|
|
class BatchList(BaseModel):
|
|
object: str | None = None
|
|
data: list[BatchObject] = []
|
|
|
|
|
|
class FileDeleteResponse(BaseModel):
|
|
id: str
|
|
object: str | None = None
|
|
deleted: bool
|
|
|
|
|
|
class BatchCreateBody(BaseModel):
|
|
input_file_id: str
|
|
endpoint: str = "/v1/chat/completions"
|
|
completion_window: str = "24h"
|
|
model: str | None = None
|
|
|
|
|
|
class ModelQuery(BaseModel):
|
|
model: str | None = None
|
|
|
|
|
|
def is_model_access_denied(resp: StreamingResponse) -> bool:
|
|
"""True if the proxy rejected the call because the key may not access the model."""
|
|
return resp.status_code == 403 and "key_model_access_denied" in resp.body
|
|
|
|
|
|
def is_result_access_denied[R: BaseModel](result: Result[R]) -> bool:
|
|
match result:
|
|
case UnknownApiError(status_code=403, body=body):
|
|
return "key_model_access_denied" in body
|
|
case _:
|
|
return False
|
|
|
|
|
|
@dataclass(frozen=True, slots=True)
|
|
class BatchClient:
|
|
proxy: ProxyClient
|
|
|
|
def create_model(self, model_name: str, litellm_params: LiteLLMParamsBody) -> str:
|
|
return self.proxy.create_model(model_name, litellm_params, mode="batch")
|
|
|
|
def delete_model(self, model_id: str) -> None:
|
|
self.proxy.delete_model(model_id)
|
|
|
|
def upload_file(
|
|
self,
|
|
*,
|
|
content: bytes,
|
|
form: FileUploadForm,
|
|
key: str,
|
|
model: str | None = None,
|
|
provider: str | None = None,
|
|
) -> Result[FileObject]:
|
|
return self.proxy.transport.upload(
|
|
_files_path(provider),
|
|
headers=self.proxy.transport.bearer(key),
|
|
form=form,
|
|
filename="batch_input.jsonl",
|
|
content=content,
|
|
params=ModelQuery(model=model),
|
|
response_type=FileObject,
|
|
)
|
|
|
|
def create_batch(
|
|
self, *, body: BatchCreateBody, key: str, provider: str | None = None
|
|
) -> StreamingResponse:
|
|
return self.proxy.transport.send(
|
|
_batches_path(provider),
|
|
headers=self.proxy.transport.bearer(key),
|
|
json=body,
|
|
)
|
|
|
|
def retrieve_batch(
|
|
self, batch_id: str, *, key: str, provider: str | None = None
|
|
) -> Result[BatchObject]:
|
|
return self.proxy.transport.get(
|
|
f"{_batches_path(provider)}/{batch_id}",
|
|
headers=self.proxy.transport.bearer(key),
|
|
params=NoBody(),
|
|
response_type=BatchObject,
|
|
)
|
|
|
|
def cancel_batch(
|
|
self, batch_id: str, *, key: str, provider: str | None = None
|
|
) -> Result[BatchObject]:
|
|
return self.proxy.transport.post(
|
|
f"{_batches_path(provider)}/{batch_id}/cancel",
|
|
headers=self.proxy.transport.bearer(key),
|
|
json=NoBody(),
|
|
response_type=BatchObject,
|
|
)
|
|
|
|
def list_batches(
|
|
self, *, key: str, provider: str | None = None
|
|
) -> Result[BatchList]:
|
|
return self.proxy.transport.get(
|
|
_batches_path(provider),
|
|
headers=self.proxy.transport.bearer(key),
|
|
params=NoBody(),
|
|
response_type=BatchList,
|
|
)
|
|
|
|
def delete_file(
|
|
self, file_id: str, *, key: str, provider: str | None = None
|
|
) -> Result[FileDeleteResponse]:
|
|
return self.proxy.transport.delete(
|
|
f"{_files_path(provider)}/{file_id}",
|
|
headers=self.proxy.transport.bearer(key),
|
|
json=NoBody(),
|
|
response_type=FileDeleteResponse,
|
|
)
|
|
|
|
|
|
def _files_path(provider: str | None) -> str:
|
|
return f"/{provider}/v1/files" if provider else "/v1/files"
|
|
|
|
|
|
def _batches_path(provider: str | None) -> str:
|
|
return f"/{provider}/v1/batches" if provider else "/v1/batches"
|
|
|
|
|
|
def build_client(proxy: ProxyClient) -> BatchClient:
|
|
return BatchClient(proxy=proxy)
|