mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-02 07:13:02 +00:00
* feat(dashscope): add image edits and text-to-speech * fix(dashscope): bill reported speech characters and input images, follow the chat region for edits, keep the call timeout on the audio download * fix(dashscope): bill deployment image prices as main does and route edits to the host speech uses A deployment that sets its own input_cost_per_image, output_cost_per_image or input_cost_per_pixel bills through the default image calculator again, so an override is never read as a per-input-image price and pixel pricing on qwen-image-3.0-pro no longer raises. Edits now resolve the caller's api_base or DASHSCOPE_API_BASE through the same API-root helper speech uses, on any host, with DASHSCOPE_API_BASE_IMAGE still winning. An image response whose usage is null or not an object keeps its images instead of raising. * fix(images): bill a deployment's own prices on image edits through the proxy The proxy builds the logging object before the router picks a deployment, so image_edit never handed the deployment's price fields to its cost calculation and billed the cost-map price instead. Pass the custom pricing params with the pre-call update, as the Responses API does. * fix(images): bill per-pixel image prices at a DashScope W*H size DashScope's mapped size reads 1328*1328, which the cost size reader rejected, so a deployment's input_cost_per_pixel billed every DashScope generation or edit at the 1024x1024 default. * fix(dashscope): bill image prices by their meaning, report the rendered size, prefer the deployment edit base, fetch audio over https * fix(dashscope): read the rendered image size from output_width and output_height * test(images): bill a fal edit at its deployment's own image price * fix(dashscope): keep the qwen-image-3.0 input-image fee out of the shared cost map row Released proxies read the cost map from main and bill input_cost_per_image as the flat price of each DashScope image, so the row's $0.003 input fee billed every qwen-image-3.0 image there at a tenth of its $0.03 price. A deployment can still set input_cost_per_image to bill DashScope's input images --------- Co-authored-by: mateo-berri <277851410+mateo-berri@users.noreply.github.com>
350 lines
12 KiB
Python
350 lines
12 KiB
Python
import asyncio
|
|
import io
|
|
from collections.abc import Iterator, Mapping
|
|
from datetime import datetime
|
|
from typing import Final
|
|
|
|
import httpx
|
|
import pytest
|
|
import respx
|
|
from pydantic import TypeAdapter
|
|
from typing_extensions import ReadOnly, TypedDict, override
|
|
|
|
import litellm
|
|
from litellm.integrations.custom_logger import CustomLogger
|
|
from litellm.litellm_core_utils.litellm_logging import Logging
|
|
from litellm.types.utils import FileTypes, ImageResponse
|
|
|
|
_PNG_SIGNATURE: Final = b"\x89PNG\r\n\x1a\n"
|
|
_FIRST_IMAGE: Final = _PNG_SIGNATURE + b"first-reference-image"
|
|
_SECOND_IMAGE: Final = _PNG_SIGNATURE + b"second-reference-image"
|
|
_EDITED_IMAGE_B64: Final = (
|
|
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8/5+hHgAHggJ/PchI7wAAAABJRU5ErkJggg=="
|
|
)
|
|
_TEXT_TOKENS: Final = 50
|
|
_IMAGE_TOKENS: Final = 50
|
|
_OUTPUT_TOKENS: Final = 1000
|
|
_EDIT_RESPONSE: Final = {
|
|
"created": 1589478378,
|
|
"data": [{"b64_json": _EDITED_IMAGE_B64}],
|
|
"usage": {
|
|
"total_tokens": _TEXT_TOKENS + _IMAGE_TOKENS + _OUTPUT_TOKENS,
|
|
"input_tokens": _TEXT_TOKENS + _IMAGE_TOKENS,
|
|
"input_tokens_details": {"image_tokens": _IMAGE_TOKENS, "text_tokens": _TEXT_TOKENS},
|
|
"output_tokens": _OUTPUT_TOKENS,
|
|
},
|
|
}
|
|
|
|
_DASHSCOPE_IMAGE_URL: Final = (
|
|
"https://dashscope-intl.aliyuncs.com/api/v1/services/aigc/multimodal-generation/generation"
|
|
)
|
|
_DASHSCOPE_EDIT_RESPONSE: Final = {
|
|
"output": {
|
|
"choices": [
|
|
{
|
|
"finish_reason": "stop",
|
|
"message": {"role": "assistant", "content": [{"image": "https://example.com/edited.png"}]},
|
|
}
|
|
]
|
|
},
|
|
"usage": {"image_count": 1},
|
|
}
|
|
|
|
_FAL_EDIT_URL: Final = "https://fal.run/fal-ai/flux-2/edit"
|
|
_FAL_EDIT_RESPONSE: Final = {
|
|
"images": [{"url": "https://example.com/edited.png", "width": 1024, "height": 768, "content_type": "image/png"}]
|
|
}
|
|
|
|
|
|
class _LoggedImageEdit(TypedDict):
|
|
model: ReadOnly[str]
|
|
custom_llm_provider: ReadOnly[str]
|
|
response_cost: ReadOnly[float]
|
|
|
|
|
|
_LOGGED_IMAGE_EDIT: Final = TypeAdapter(_LoggedImageEdit)
|
|
|
|
|
|
class _SuccessLogger(CustomLogger):
|
|
def __init__(self) -> None:
|
|
super().__init__()
|
|
self.payload: _LoggedImageEdit | None = None
|
|
self.logged: Final = asyncio.Event()
|
|
|
|
@override
|
|
async def async_log_success_event(
|
|
self, kwargs: Mapping[str, object], response_obj: object, start_time: datetime, end_time: datetime
|
|
) -> None:
|
|
self.payload = _LOGGED_IMAGE_EDIT.validate_python(kwargs.get("standard_logging_object"))
|
|
self.logged.set()
|
|
|
|
|
|
@pytest.fixture
|
|
def httpx_transport(monkeypatch: pytest.MonkeyPatch) -> Iterator[None]:
|
|
monkeypatch.setattr(litellm, "disable_aiohttp_transport", True)
|
|
litellm.in_memory_llm_clients_cache.flush_cache()
|
|
yield
|
|
litellm.in_memory_llm_clients_cache.flush_cache()
|
|
|
|
|
|
def _multipart_image_parts(request: httpx.Request) -> tuple[bytes, ...]:
|
|
body: Final = request.read()
|
|
boundary: Final = request.headers["content-type"].split("boundary=", 1)[1].encode()
|
|
parts: Final = body.split(b"--" + boundary)
|
|
return tuple(part.split(b"\r\n\r\n", 1)[1].removesuffix(b"\r\n") for part in parts if b'name="image[]"' in part)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize("image", (None, []), ids=("none", "empty-list"))
|
|
async def test_bfl_image_edit_missing_image_returns_bad_request(image: list[FileTypes] | None) -> None:
|
|
with pytest.raises(litellm.BadRequestError, match="No image provided") as exc_info:
|
|
await litellm.aimage_edit(
|
|
model="black_forest_labs/flux-kontext-pro",
|
|
prompt="make it blue",
|
|
image=image,
|
|
api_key="fake-key",
|
|
)
|
|
|
|
assert exc_info.value.status_code == 400
|
|
|
|
|
|
def test_openai_image_edit_sync_accepts_bytesio_images(respx_mock: respx.MockRouter, httpx_transport: None) -> None:
|
|
route: Final = respx_mock.post("https://api.openai.com/v1/images/edits").mock(
|
|
return_value=httpx.Response(200, json=_EDIT_RESPONSE)
|
|
)
|
|
|
|
result: Final = litellm.image_edit(
|
|
prompt="combine the reference images",
|
|
model="gpt-image-1",
|
|
image=io.BytesIO(_FIRST_IMAGE),
|
|
api_key="fake-key",
|
|
)
|
|
|
|
assert isinstance(result, ImageResponse)
|
|
assert result.data is not None and result.data[0].b64_json == _EDITED_IMAGE_B64
|
|
assert route.call_count == 1
|
|
assert _multipart_image_parts(route.calls[0].request) == (_FIRST_IMAGE,)
|
|
|
|
|
|
def test_openai_image_edit_without_a_model_leaves_model_out_of_the_request(
|
|
respx_mock: respx.MockRouter, httpx_transport: None
|
|
) -> None:
|
|
route: Final = respx_mock.post("https://api.openai.com/v1/images/edits").mock(
|
|
return_value=httpx.Response(200, json=_EDIT_RESPONSE)
|
|
)
|
|
|
|
litellm.image_edit(
|
|
prompt="combine the reference images",
|
|
image=io.BytesIO(_FIRST_IMAGE),
|
|
custom_llm_provider="openai",
|
|
api_key="fake-key",
|
|
)
|
|
|
|
assert route.call_count == 1
|
|
assert b'name="model"' not in route.calls[0].request.read()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_openai_image_edit_accepts_bytesio_images(respx_mock: respx.MockRouter, httpx_transport: None) -> None:
|
|
route: Final = respx_mock.post("https://api.openai.com/v1/images/edits").mock(
|
|
return_value=httpx.Response(200, json=_EDIT_RESPONSE)
|
|
)
|
|
|
|
result: Final = await litellm.aimage_edit(
|
|
prompt="combine the reference images",
|
|
model="gpt-image-1",
|
|
image=[io.BytesIO(_FIRST_IMAGE), io.BytesIO(_SECOND_IMAGE)],
|
|
api_key="fake-key",
|
|
)
|
|
|
|
assert isinstance(result, ImageResponse)
|
|
assert result.data is not None and result.data[0].b64_json == _EDITED_IMAGE_B64
|
|
assert route.call_count == 1
|
|
assert _multipart_image_parts(route.calls[0].request) == (_FIRST_IMAGE, _SECOND_IMAGE)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_openai_image_edit_accepts_mixed_bytes_and_bytesio(
|
|
respx_mock: respx.MockRouter, httpx_transport: None
|
|
) -> None:
|
|
route: Final = respx_mock.post("https://api.openai.com/v1/images/edits").mock(
|
|
return_value=httpx.Response(200, json=_EDIT_RESPONSE)
|
|
)
|
|
|
|
result: Final = await litellm.aimage_edit(
|
|
prompt="Create a cohesive artistic style across all images",
|
|
model="gpt-image-1",
|
|
image=[_FIRST_IMAGE, io.BytesIO(_SECOND_IMAGE)],
|
|
api_key="fake-key",
|
|
)
|
|
|
|
assert isinstance(result, ImageResponse)
|
|
assert result.data is not None and len(result.data) == 1
|
|
assert result.data[0].b64_json == _EDITED_IMAGE_B64
|
|
assert route.call_count == 1
|
|
assert _multipart_image_parts(route.calls[0].request) == (_FIRST_IMAGE, _SECOND_IMAGE)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_azure_image_edit_logs_deployment_model_and_positive_cost(
|
|
respx_mock: respx.MockRouter, httpx_transport: None, monkeypatch: pytest.MonkeyPatch
|
|
) -> None:
|
|
logger: Final = _SuccessLogger()
|
|
monkeypatch.setattr(litellm, "callbacks", [logger])
|
|
route: Final = respx_mock.post(
|
|
url__startswith="https://fake.openai.azure.com/openai/deployments/CUSTOM_AZURE_DEPLOYMENT_NAME/images/edits"
|
|
).mock(return_value=httpx.Response(200, json=_EDIT_RESPONSE))
|
|
|
|
result: Final = await litellm.aimage_edit(
|
|
prompt="combine the reference images",
|
|
model="azure/CUSTOM_AZURE_DEPLOYMENT_NAME",
|
|
base_model="azure/gpt-image-1",
|
|
image=[_FIRST_IMAGE, _SECOND_IMAGE],
|
|
api_key="fake-key",
|
|
api_base="https://fake.openai.azure.com",
|
|
api_version="2025-04-01-preview",
|
|
)
|
|
await logger.logged.wait()
|
|
|
|
assert isinstance(result, ImageResponse)
|
|
assert route.call_count == 1
|
|
payload: Final = logger.payload
|
|
assert payload is not None
|
|
assert payload["model"] == "CUSTOM_AZURE_DEPLOYMENT_NAME"
|
|
assert payload["custom_llm_provider"] == "azure"
|
|
pricing: Final = litellm.model_cost["azure/gpt-image-1"]
|
|
expected_cost: Final = (
|
|
_TEXT_TOKENS * pricing["input_cost_per_token"]
|
|
+ _IMAGE_TOKENS * pricing["input_cost_per_image_token"]
|
|
+ _OUTPUT_TOKENS * pricing["output_cost_per_image_token"]
|
|
)
|
|
assert expected_cost > 0
|
|
assert payload["response_cost"] == pytest.approx(expected_cost)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_router_image_edit_returns_the_provider_image(
|
|
respx_mock: respx.MockRouter, httpx_transport: None
|
|
) -> None:
|
|
route: Final = respx_mock.post("https://api.openai.com/v1/images/edits").mock(
|
|
return_value=httpx.Response(200, json=_EDIT_RESPONSE)
|
|
)
|
|
router: Final = litellm.Router(
|
|
model_list=[
|
|
{
|
|
"model_name": "gpt-image-1",
|
|
"litellm_params": {
|
|
"model": "gpt-image-1",
|
|
"api_key": "fake-key",
|
|
},
|
|
}
|
|
]
|
|
)
|
|
|
|
result: Final = await router.aimage_edit(
|
|
prompt="combine the reference images",
|
|
model="gpt-image-1",
|
|
image=_FIRST_IMAGE,
|
|
)
|
|
|
|
assert isinstance(result, ImageResponse)
|
|
assert result.data is not None and result.data[0].b64_json == _EDITED_IMAGE_B64
|
|
assert route.call_count == 1
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize(
|
|
("deployment_price", "size", "expected_cost"),
|
|
(
|
|
({"input_cost_per_image": 0.0123}, None, 0.0123),
|
|
({"input_cost_per_pixel": 1e-08}, "2048x2048", 2048 * 2048 * 1e-08),
|
|
),
|
|
)
|
|
async def test_an_edit_bills_the_deployment_price_at_its_size_on_a_logging_object_made_before_routing(
|
|
respx_mock: respx.MockRouter,
|
|
httpx_transport: None,
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
deployment_price: dict[str, float],
|
|
size: str | None,
|
|
expected_cost: float,
|
|
) -> None:
|
|
monkeypatch.delenv("DASHSCOPE_API_BASE", raising=False)
|
|
monkeypatch.delenv("DASHSCOPE_API_BASE_IMAGE", raising=False)
|
|
respx_mock.post(_DASHSCOPE_IMAGE_URL).mock(return_value=httpx.Response(200, json=_DASHSCOPE_EDIT_RESPONSE))
|
|
logging_made_before_routing: Final = Logging(
|
|
model="qwen-image-edit",
|
|
messages=[],
|
|
stream=False,
|
|
call_type="aimage_edit",
|
|
start_time=datetime.now(),
|
|
litellm_call_id="edit-call",
|
|
function_id="edit-call",
|
|
)
|
|
|
|
router: Final = litellm.Router(
|
|
model_list=[
|
|
{
|
|
"model_name": "qwen-image-edit",
|
|
"litellm_params": {
|
|
"model": "dashscope/qwen-image-2.0",
|
|
"api_key": "fake-key",
|
|
**deployment_price,
|
|
},
|
|
}
|
|
]
|
|
)
|
|
|
|
result: Final = await router.aimage_edit(
|
|
model="qwen-image-edit",
|
|
image=_FIRST_IMAGE,
|
|
prompt="Turn the circle into a square",
|
|
size=size,
|
|
litellm_logging_obj=logging_made_before_routing,
|
|
litellm_call_id="edit-call",
|
|
)
|
|
|
|
assert isinstance(result, ImageResponse)
|
|
assert result._hidden_params["response_cost"] == pytest.approx(expected_cost)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_a_fal_edit_bills_the_deployment_price_per_image_on_a_logging_object_made_before_routing(
|
|
respx_mock: respx.MockRouter,
|
|
httpx_transport: None,
|
|
monkeypatch: pytest.MonkeyPatch,
|
|
) -> None:
|
|
monkeypatch.delenv("FAL_AI_API_BASE", raising=False)
|
|
respx_mock.post(_FAL_EDIT_URL).mock(return_value=httpx.Response(200, json=_FAL_EDIT_RESPONSE))
|
|
logging_made_before_routing: Final = Logging(
|
|
model="flux-edit",
|
|
messages=[],
|
|
stream=False,
|
|
call_type="aimage_edit",
|
|
start_time=datetime.now(),
|
|
litellm_call_id="fal-edit-call",
|
|
function_id="fal-edit-call",
|
|
)
|
|
|
|
router: Final = litellm.Router(
|
|
model_list=[
|
|
{
|
|
"model_name": "flux-edit",
|
|
"litellm_params": {
|
|
"model": "fal_ai/fal-ai/flux-2/edit",
|
|
"api_key": "fake-key",
|
|
"output_cost_per_image": 0.0456,
|
|
},
|
|
}
|
|
]
|
|
)
|
|
|
|
result: Final = await router.aimage_edit(
|
|
model="flux-edit",
|
|
image=_FIRST_IMAGE,
|
|
prompt="Turn the circle into a square",
|
|
litellm_logging_obj=logging_made_before_routing,
|
|
litellm_call_id="fal-edit-call",
|
|
)
|
|
|
|
assert isinstance(result, ImageResponse)
|
|
assert result._hidden_params["response_cost"] == pytest.approx(0.0456)
|