mirror of
https://github.com/BerriAI/litellm.git
synced 2026-08-28 05:25:59 +00:00
* fix(e2e): reference client.proxy in mid-conversation native providers test
EndpointsClient exposes the shared ProxyClient as .proxy and has never had a
.gateway attribute, so these two calls raised AttributeError at runtime and
failed the tests/e2e basedpyright zero-error gate for any PR touching e2e
files. Introduced in 23b5b7d199.
* test(e2e): cover 12 non-core LLM coverage registry cells
Raises Non-Core LLMs registry coverage from 24/50 to 36/50 (overall 51.9%
to 54.8%). Four cells were already asserted by existing tests and only
gain their covers marker (openai embeddings, openai image generation,
openai TTS, cohere rerank); one is dual-marked onto the existing
spend-tracking embeddings test rather than duplicated.
New tests: bedrock and vertex embeddings, streaming TTS (asserts chunked
transfer encoding so a buffered body cannot pass), audio transcriptions
via the realtime suite's wav fixture, moderations flag/pass pair, and
files list/retrieve in the batches suite.
Harness: e2e_http.upload generalized to any form model with a
file_content_type override (batches path unchanged), new stream_binary
primitive + BinaryStream for binary chunked responses, transcribe and
moderations client methods, file retrieve/list client methods.
* fix(e2e): close streamed TTS response on error paths and surface the error body
With stream=True a non-2xx response returned with the body unread, keeping
the socket checked out until garbage collection; the sibling
_streaming_outcome already consumes resp.text on error. The response now
closes on every path and BinaryStream carries a bounded error_body so a
failed stream call is triageable.
* test(e2e): assert streamed TTS response carries no content-length
200 lines
5.9 KiB
Python
200 lines
5.9 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
|
|
|
|
UPLOAD_FILENAME = "batch_input.jsonl"
|
|
|
|
|
|
class FileObject(BaseModel):
|
|
id: str
|
|
object: str | None = None
|
|
purpose: str | None = None
|
|
filename: str | None = None
|
|
bytes: int | None = None
|
|
status: str | None = None
|
|
created_at: int | None = None
|
|
|
|
|
|
class FileList(BaseModel):
|
|
object: str | None = None
|
|
data: list[FileObject] = []
|
|
|
|
|
|
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=UPLOAD_FILENAME,
|
|
content=content,
|
|
params=ModelQuery(model=model),
|
|
response_type=FileObject,
|
|
)
|
|
|
|
def retrieve_file(
|
|
self, file_id: str, *, key: str, provider: str | None = None
|
|
) -> Result[FileObject]:
|
|
return self.proxy.transport.get(
|
|
f"{_files_path(provider)}/{file_id}",
|
|
headers=self.proxy.transport.bearer(key),
|
|
params=NoBody(),
|
|
response_type=FileObject,
|
|
)
|
|
|
|
def list_files(self, *, key: str, provider: str | None = None) -> Result[FileList]:
|
|
return self.proxy.transport.get(
|
|
_files_path(provider),
|
|
headers=self.proxy.transport.bearer(key),
|
|
params=NoBody(),
|
|
response_type=FileList,
|
|
)
|
|
|
|
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)
|