mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-13 08:52:02 +00:00
feat(videos): serve custom_provider_map BaseVideoConfig providers on /v1/videos (#49785)
Backport of #49785 to lts/1.108.x.
Cherry-picked from fcef9cd0a3 (main).
Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
Kerry Lu
kerry
parent
f559536757
commit
79a3567b66
10 changed files with 465 additions and 140 deletions
|
|
@ -29,7 +29,6 @@ from litellm.litellm_core_utils.mock_functions import mock_image_generation
|
|||
from litellm.llms.base_llm import BaseImageEditConfig, BaseImageGenerationConfig
|
||||
from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler, HTTPHandler
|
||||
from litellm.llms.custom_httpx.llm_http_handler import BaseLLMHTTPHandler
|
||||
from litellm.llms.custom_llm import CustomLLM
|
||||
from litellm.utils import exception_type, filter_out_litellm_params, get_litellm_params
|
||||
|
||||
#################### Initialize provider clients ####################
|
||||
|
|
@ -523,10 +522,7 @@ def image_generation(
|
|||
)
|
||||
elif custom_llm_provider in litellm._custom_providers: # Assume custom LLM provider
|
||||
# Get the Custom Handler
|
||||
custom_handler: CustomLLM | None = None
|
||||
for item in litellm.custom_provider_map:
|
||||
if item["provider"] == custom_llm_provider:
|
||||
custom_handler = item["custom_handler"]
|
||||
custom_handler: Final = ProviderConfigManager.get_custom_llm_handler(custom_llm_provider)
|
||||
|
||||
if custom_handler is None:
|
||||
raise LiteLLMUnknownProvider(model=model, custom_llm_provider=custom_llm_provider)
|
||||
|
|
@ -799,10 +795,7 @@ def image_edit(
|
|||
|
||||
# Check for custom provider
|
||||
if custom_llm_provider in litellm._custom_providers:
|
||||
custom_handler: CustomLLM | None = None
|
||||
for item in litellm.custom_provider_map:
|
||||
if item["provider"] == custom_llm_provider:
|
||||
custom_handler = item["custom_handler"]
|
||||
custom_handler: Final = ProviderConfigManager.get_custom_llm_handler(custom_llm_provider)
|
||||
|
||||
if custom_handler is None:
|
||||
raise LiteLLMUnknownProvider(model=model, custom_llm_provider=custom_llm_provider)
|
||||
|
|
|
|||
|
|
@ -7583,7 +7583,7 @@ class BaseLLMHTTPHandler:
|
|||
"""
|
||||
if client is None or not isinstance(client, AsyncHTTPHandler):
|
||||
async_httpx_client = get_async_httpx_client(
|
||||
llm_provider=litellm.LlmProviders(custom_llm_provider),
|
||||
llm_provider=custom_llm_provider,
|
||||
params={"ssl_verify": litellm_params.get("ssl_verify", None)},
|
||||
)
|
||||
else:
|
||||
|
|
@ -7778,7 +7778,7 @@ class BaseLLMHTTPHandler:
|
|||
"""
|
||||
if client is None or not isinstance(client, AsyncHTTPHandler):
|
||||
async_httpx_client = get_async_httpx_client(
|
||||
llm_provider=litellm.LlmProviders(custom_llm_provider),
|
||||
llm_provider=custom_llm_provider,
|
||||
params={"ssl_verify": litellm_params.get("ssl_verify", None)},
|
||||
)
|
||||
else:
|
||||
|
|
@ -7958,7 +7958,7 @@ class BaseLLMHTTPHandler:
|
|||
"""
|
||||
if client is None or not isinstance(client, AsyncHTTPHandler):
|
||||
async_httpx_client = get_async_httpx_client(
|
||||
llm_provider=litellm.LlmProviders(custom_llm_provider),
|
||||
llm_provider=custom_llm_provider,
|
||||
params={"ssl_verify": litellm_params.get("ssl_verify", None)},
|
||||
)
|
||||
else:
|
||||
|
|
@ -8121,7 +8121,7 @@ class BaseLLMHTTPHandler:
|
|||
):
|
||||
if client is None or not isinstance(client, AsyncHTTPHandler):
|
||||
async_httpx_client = get_async_httpx_client(
|
||||
llm_provider=litellm.LlmProviders(custom_llm_provider),
|
||||
llm_provider=custom_llm_provider,
|
||||
params={"ssl_verify": litellm_params.get("ssl_verify", None)},
|
||||
)
|
||||
else:
|
||||
|
|
@ -8261,7 +8261,7 @@ class BaseLLMHTTPHandler:
|
|||
):
|
||||
if client is None or not isinstance(client, AsyncHTTPHandler):
|
||||
async_httpx_client = get_async_httpx_client(
|
||||
llm_provider=litellm.LlmProviders(custom_llm_provider),
|
||||
llm_provider=custom_llm_provider,
|
||||
params={"ssl_verify": litellm_params.get("ssl_verify", None)},
|
||||
)
|
||||
else:
|
||||
|
|
@ -8433,7 +8433,7 @@ class BaseLLMHTTPHandler:
|
|||
):
|
||||
if client is None or not isinstance(client, AsyncHTTPHandler):
|
||||
async_httpx_client = get_async_httpx_client(
|
||||
llm_provider=litellm.LlmProviders(custom_llm_provider),
|
||||
llm_provider=custom_llm_provider,
|
||||
params={"ssl_verify": litellm_params.get("ssl_verify", None)},
|
||||
)
|
||||
else:
|
||||
|
|
@ -8619,7 +8619,7 @@ class BaseLLMHTTPHandler:
|
|||
):
|
||||
if client is None or not isinstance(client, AsyncHTTPHandler):
|
||||
async_httpx_client = get_async_httpx_client(
|
||||
llm_provider=litellm.LlmProviders(custom_llm_provider),
|
||||
llm_provider=custom_llm_provider,
|
||||
params={"ssl_verify": litellm_params.get("ssl_verify", None)},
|
||||
)
|
||||
else:
|
||||
|
|
@ -8751,7 +8751,7 @@ class BaseLLMHTTPHandler:
|
|||
"""
|
||||
if client is None or not isinstance(client, AsyncHTTPHandler):
|
||||
async_httpx_client = get_async_httpx_client(
|
||||
llm_provider=litellm.LlmProviders(custom_llm_provider),
|
||||
llm_provider=custom_llm_provider,
|
||||
params={"ssl_verify": litellm_params.get("ssl_verify", None)},
|
||||
)
|
||||
else:
|
||||
|
|
@ -8832,7 +8832,7 @@ class BaseLLMHTTPHandler:
|
|||
"""
|
||||
if client is None or not isinstance(client, AsyncHTTPHandler):
|
||||
async_httpx_client = get_async_httpx_client(
|
||||
llm_provider=litellm.LlmProviders(custom_llm_provider),
|
||||
llm_provider=custom_llm_provider,
|
||||
params={"ssl_verify": litellm_params.get("ssl_verify", None)},
|
||||
)
|
||||
else:
|
||||
|
|
@ -9016,7 +9016,7 @@ class BaseLLMHTTPHandler:
|
|||
"""
|
||||
if client is None or not isinstance(client, AsyncHTTPHandler):
|
||||
async_httpx_client = get_async_httpx_client(
|
||||
llm_provider=litellm.LlmProviders(custom_llm_provider),
|
||||
llm_provider=custom_llm_provider,
|
||||
params={"ssl_verify": litellm_params.get("ssl_verify", None)},
|
||||
)
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ from .llms.codestral.completion.handler import CodestralTextCompletion
|
|||
from .llms.cohere.embed import handler as cohere_embed
|
||||
from .llms.custom_httpx.aiohttp_handler import BaseLLMAIOHTTPHandler
|
||||
from .llms.custom_httpx.llm_http_handler import BaseLLMHTTPHandler
|
||||
from .llms.custom_llm import CustomLLM, custom_chat_llm_router
|
||||
from .llms.custom_llm import custom_chat_llm_router
|
||||
from .llms.databricks.embed.handler import DatabricksEmbeddingHandler
|
||||
from .llms.deprecated_providers import aleph_alpha
|
||||
from .llms.gdc.chat.transformation import GDCGeminiConfig
|
||||
|
|
@ -4954,10 +4954,7 @@ def _complete_custom_providers(
|
|||
stream: Final = ctx.stream
|
||||
timeout: Final = ctx.timeout
|
||||
|
||||
custom_handler: CustomLLM | None = None
|
||||
for item in litellm.custom_provider_map:
|
||||
if item["provider"] == custom_llm_provider:
|
||||
custom_handler = item["custom_handler"]
|
||||
custom_handler: Final = ProviderConfigManager.get_custom_llm_handler(custom_llm_provider)
|
||||
|
||||
if custom_handler is None:
|
||||
raise LiteLLMUnknownProvider(model=model, custom_llm_provider=custom_llm_provider)
|
||||
|
|
@ -7366,10 +7363,7 @@ def embedding(
|
|||
litellm_params={},
|
||||
)
|
||||
elif custom_llm_provider in litellm._custom_providers:
|
||||
custom_handler: CustomLLM | None = None
|
||||
for item in litellm.custom_provider_map:
|
||||
if item["provider"] == custom_llm_provider:
|
||||
custom_handler = item["custom_handler"]
|
||||
custom_handler: Final = ProviderConfigManager.get_custom_llm_handler(custom_llm_provider)
|
||||
|
||||
if custom_handler is None:
|
||||
raise LiteLLMUnknownProvider(model=model, custom_llm_provider=custom_llm_provider)
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
from typing import TYPE_CHECKING
|
||||
|
||||
from typing_extensions import TypedDict
|
||||
from typing_extensions import ReadOnly, TypedDict
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from litellm.llms.base_llm.videos.transformation import BaseVideoConfig
|
||||
from litellm.llms.custom_llm import CustomLLM
|
||||
|
||||
|
||||
class CustomLLMItem(TypedDict):
|
||||
provider: str
|
||||
custom_handler: "CustomLLM"
|
||||
custom_handler: ReadOnly["CustomLLM | BaseVideoConfig"]
|
||||
|
|
|
|||
|
|
@ -438,6 +438,7 @@ if TYPE_CHECKING:
|
|||
get_num_retries_from_retry_policy,
|
||||
reset_retry_policy,
|
||||
)
|
||||
from litellm.llms.custom_llm import CustomLLM
|
||||
from litellm.types.llms.anthropic import (
|
||||
ANTHROPIC_API_ONLY_HEADERS,
|
||||
AnthropicThinkingParam,
|
||||
|
|
@ -10168,8 +10169,13 @@ class ProviderConfigManager:
|
|||
@staticmethod
|
||||
def get_provider_video_config(
|
||||
model: str | None,
|
||||
provider: LlmProviders,
|
||||
provider: LlmProviders | str,
|
||||
) -> BaseVideoConfig | None:
|
||||
if not isinstance(provider, LlmProviders):
|
||||
custom_video_config: Final = ProviderConfigManager.get_custom_provider_video_config(provider)
|
||||
if custom_video_config is not None or provider not in LlmProvidersSet:
|
||||
return custom_video_config
|
||||
return ProviderConfigManager.get_provider_video_config(model=model, provider=LlmProviders(provider))
|
||||
if LlmProviders.OPENAI == provider:
|
||||
from litellm.llms.openai.videos.transformation import OpenAIVideoConfig
|
||||
|
||||
|
|
@ -10216,6 +10222,34 @@ class ProviderConfigManager:
|
|||
return litellm.EdenAIVideoConfig()
|
||||
return None
|
||||
|
||||
@staticmethod
|
||||
def get_custom_llm_handler(provider: str | None) -> CustomLLM | None:
|
||||
"""The `CustomLLM` registered for `provider` in `litellm.custom_provider_map`, if its handler is one."""
|
||||
from litellm.llms.custom_llm import CustomLLM
|
||||
|
||||
return next(
|
||||
(
|
||||
item["custom_handler"]
|
||||
for item in litellm.custom_provider_map
|
||||
if item["provider"] == provider and isinstance(item["custom_handler"], CustomLLM)
|
||||
),
|
||||
None,
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def get_custom_provider_video_config(provider: str) -> BaseVideoConfig | None:
|
||||
"""The `BaseVideoConfig` registered for `provider` in `litellm.custom_provider_map`, if its handler is one."""
|
||||
from litellm.llms.base_llm.videos.transformation import BaseVideoConfig
|
||||
|
||||
return next(
|
||||
(
|
||||
item["custom_handler"]
|
||||
for item in litellm.custom_provider_map
|
||||
if item["provider"] == provider and isinstance(item["custom_handler"], BaseVideoConfig)
|
||||
),
|
||||
None,
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def get_provider_container_config(
|
||||
provider: LlmProviders,
|
||||
|
|
|
|||
|
|
@ -26,6 +26,17 @@ from litellm.types.videos.utils import decode_video_id_with_provider
|
|||
from litellm.utils import ProviderConfigManager, client
|
||||
from litellm.videos.utils import VideoGenerationRequestUtils
|
||||
|
||||
|
||||
def _unsupported_video_call(
|
||||
call_name: str, custom_llm_provider: str, model: str | None = None
|
||||
) -> litellm.BadRequestError:
|
||||
return litellm.BadRequestError(
|
||||
message=f"{call_name} is not supported for {custom_llm_provider}",
|
||||
model=model or "",
|
||||
llm_provider=custom_llm_provider,
|
||||
)
|
||||
|
||||
|
||||
#################### Initialize provider clients ####################
|
||||
llm_http_handler: BaseLLMHTTPHandler = BaseLLMHTTPHandler()
|
||||
|
||||
|
|
@ -40,7 +51,7 @@ async def avideo_generation(
|
|||
size: str | None = None,
|
||||
user: str | None = None,
|
||||
timeout=600, # default to 10 minutes
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
|
||||
# The extra values given here take precedence over values defined on the client or passed to this method.
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
|
|
@ -170,7 +181,7 @@ def video_generation(
|
|||
size: str | None = None,
|
||||
user: str | None = None,
|
||||
timeout=600, # default to 10 minutes
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
|
||||
# The extra values given here take precedence over values defined on the client or passed to this method.
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
|
|
@ -208,11 +219,11 @@ def video_generation(
|
|||
# get provider config
|
||||
video_generation_provider_config: BaseVideoConfig | None = ProviderConfigManager.get_provider_video_config(
|
||||
model=model,
|
||||
provider=litellm.LlmProviders(custom_llm_provider),
|
||||
provider=custom_llm_provider,
|
||||
)
|
||||
|
||||
if video_generation_provider_config is None:
|
||||
raise ValueError(f"video generation is not supported for {custom_llm_provider}")
|
||||
raise _unsupported_video_call("video generation", custom_llm_provider, model)
|
||||
|
||||
local_vars.update(kwargs)
|
||||
# Get VideoGenerationOptionalRequestParams with only valid parameters
|
||||
|
|
@ -329,11 +340,11 @@ def video_content(
|
|||
# get provider config
|
||||
video_provider_config: Final[BaseVideoConfig | None] = ProviderConfigManager.get_provider_video_config(
|
||||
model=None,
|
||||
provider=litellm.LlmProviders(custom_llm_provider),
|
||||
provider=custom_llm_provider,
|
||||
)
|
||||
|
||||
if video_provider_config is None:
|
||||
raise ValueError(f"video support download is not supported for {custom_llm_provider}")
|
||||
raise _unsupported_video_call("video support download", custom_llm_provider)
|
||||
|
||||
local_vars.update(kwargs)
|
||||
# For video content download, we don't need complex optional parameter handling
|
||||
|
|
@ -456,7 +467,7 @@ async def avideo_remix(
|
|||
video_id: str,
|
||||
prompt: str,
|
||||
timeout=600, # default to 10 minutes
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
|
||||
# The extra values given here take precedence over values defined on the client or passed to this method.
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
|
|
@ -559,7 +570,7 @@ def video_remix(
|
|||
video_id: str,
|
||||
prompt: str,
|
||||
timeout=600, # default to 10 minutes
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
|
||||
# The extra values given here take precedence over values defined on the client or passed to this method.
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
|
|
@ -598,11 +609,11 @@ def video_remix(
|
|||
# get provider config
|
||||
video_remix_provider_config: Final[BaseVideoConfig | None] = ProviderConfigManager.get_provider_video_config(
|
||||
model=None,
|
||||
provider=litellm.LlmProviders(custom_llm_provider),
|
||||
provider=custom_llm_provider,
|
||||
)
|
||||
|
||||
if video_remix_provider_config is None:
|
||||
raise ValueError(f"video remix is not supported for {custom_llm_provider}")
|
||||
raise _unsupported_video_call("video remix", custom_llm_provider)
|
||||
|
||||
local_vars.update(kwargs)
|
||||
# For video remix, we need the video_id and prompt
|
||||
|
|
@ -660,7 +671,7 @@ async def avideo_list(
|
|||
order: str | None = None,
|
||||
api_key: str | None = None,
|
||||
timeout=600, # default to 10 minutes
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
|
||||
# The extra values given here take precedence over values defined on the client or passed to this method.
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
|
|
@ -774,7 +785,7 @@ def video_list(
|
|||
limit: int | None = None,
|
||||
order: str | None = None,
|
||||
timeout=600, # default to 10 minutes
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
|
||||
# The extra values given here take precedence over values defined on the client or passed to this method.
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
|
|
@ -810,11 +821,11 @@ def video_list(
|
|||
# get provider config
|
||||
video_list_provider_config: Final[BaseVideoConfig | None] = ProviderConfigManager.get_provider_video_config(
|
||||
model=None,
|
||||
provider=litellm.LlmProviders(custom_llm_provider),
|
||||
provider=custom_llm_provider,
|
||||
)
|
||||
|
||||
if video_list_provider_config is None:
|
||||
raise ValueError(f"video list is not supported for {custom_llm_provider}")
|
||||
raise _unsupported_video_call("video list", custom_llm_provider)
|
||||
|
||||
local_vars.update(kwargs)
|
||||
# For video list, we need the query parameters
|
||||
|
|
@ -871,7 +882,7 @@ def video_list(
|
|||
async def avideo_status(
|
||||
video_id: str,
|
||||
timeout=600, # default to 10 minutes
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
|
||||
# The extra values given here take precedence over values defined on the client or passed to this method.
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
|
|
@ -970,7 +981,7 @@ def video_status(
|
|||
def video_status(
|
||||
video_id: str,
|
||||
timeout=600, # default to 10 minutes
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
# Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
|
||||
# The extra values given here take precedence over values defined on the client or passed to this method.
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
|
|
@ -1031,11 +1042,11 @@ def video_status(
|
|||
# get provider config
|
||||
video_status_provider_config: Final[BaseVideoConfig | None] = ProviderConfigManager.get_provider_video_config(
|
||||
model=None,
|
||||
provider=litellm.LlmProviders(custom_llm_provider),
|
||||
provider=custom_llm_provider,
|
||||
)
|
||||
|
||||
if video_status_provider_config is None:
|
||||
raise ValueError(f"video status is not supported for {custom_llm_provider}")
|
||||
raise _unsupported_video_call("video status", custom_llm_provider)
|
||||
|
||||
local_vars.update(kwargs)
|
||||
# For video status, we need the video_id
|
||||
|
|
@ -1088,7 +1099,7 @@ async def avideo_create_character(
|
|||
name: str,
|
||||
video: FileTypes,
|
||||
timeout=600,
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
extra_query: dict[str, object] | None = None,
|
||||
extra_body: dict[str, object] | None = None,
|
||||
|
|
@ -1143,7 +1154,7 @@ def video_create_character(
|
|||
name: str,
|
||||
video: FileTypes,
|
||||
timeout=600,
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
extra_query: dict[str, object] | None = None,
|
||||
extra_body: dict[str, object] | None = None,
|
||||
|
|
@ -1172,11 +1183,11 @@ def video_create_character(
|
|||
|
||||
provider_config: Final[BaseVideoConfig | None] = ProviderConfigManager.get_provider_video_config(
|
||||
model=None,
|
||||
provider=litellm.LlmProviders(custom_llm_provider),
|
||||
provider=custom_llm_provider,
|
||||
)
|
||||
|
||||
if provider_config is None:
|
||||
raise ValueError(f"video create character is not supported for {custom_llm_provider}")
|
||||
raise _unsupported_video_call("video create character", custom_llm_provider)
|
||||
|
||||
local_vars.update(kwargs)
|
||||
request_params: Final[dict] = {"name": name}
|
||||
|
|
@ -1218,7 +1229,7 @@ def video_create_character(
|
|||
async def avideo_get_character(
|
||||
character_id: str,
|
||||
timeout=600,
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
extra_query: dict[str, object] | None = None,
|
||||
extra_body: dict[str, object] | None = None,
|
||||
|
|
@ -1268,7 +1279,7 @@ async def avideo_get_character(
|
|||
def video_get_character(
|
||||
character_id: str,
|
||||
timeout=600,
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
extra_query: dict[str, object] | None = None,
|
||||
extra_body: dict[str, object] | None = None,
|
||||
|
|
@ -1297,11 +1308,11 @@ def video_get_character(
|
|||
|
||||
provider_config: Final[BaseVideoConfig | None] = ProviderConfigManager.get_provider_video_config(
|
||||
model=None,
|
||||
provider=litellm.LlmProviders(custom_llm_provider),
|
||||
provider=custom_llm_provider,
|
||||
)
|
||||
|
||||
if provider_config is None:
|
||||
raise ValueError(f"video get character is not supported for {custom_llm_provider}")
|
||||
raise _unsupported_video_call("video get character", custom_llm_provider)
|
||||
|
||||
local_vars.update(kwargs)
|
||||
request_params: Final[dict] = {"character_id": character_id}
|
||||
|
|
@ -1343,7 +1354,7 @@ async def avideo_edit(
|
|||
video_id: str,
|
||||
prompt: str,
|
||||
timeout=600,
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
extra_query: dict[str, object] | None = None,
|
||||
extra_body: dict[str, object] | None = None,
|
||||
|
|
@ -1398,7 +1409,7 @@ def video_edit(
|
|||
video_id: str,
|
||||
prompt: str,
|
||||
timeout=600,
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
extra_query: dict[str, object] | None = None,
|
||||
extra_body: dict[str, object] | None = None,
|
||||
|
|
@ -1430,11 +1441,11 @@ def video_edit(
|
|||
|
||||
provider_config: Final[BaseVideoConfig | None] = ProviderConfigManager.get_provider_video_config(
|
||||
model=None,
|
||||
provider=litellm.LlmProviders(custom_llm_provider),
|
||||
provider=custom_llm_provider,
|
||||
)
|
||||
|
||||
if provider_config is None:
|
||||
raise ValueError(f"video edit is not supported for {custom_llm_provider}")
|
||||
raise _unsupported_video_call("video edit", custom_llm_provider)
|
||||
|
||||
local_vars.update(kwargs)
|
||||
request_params: Final[dict] = {"video_id": video_id, "prompt": prompt}
|
||||
|
|
@ -1480,7 +1491,7 @@ async def avideo_extension(
|
|||
prompt: str,
|
||||
seconds: str,
|
||||
timeout=600,
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
extra_query: dict[str, object] | None = None,
|
||||
extra_body: dict[str, object] | None = None,
|
||||
|
|
@ -1534,7 +1545,7 @@ def video_extension(
|
|||
prompt: str,
|
||||
seconds: str,
|
||||
timeout=600,
|
||||
custom_llm_provider=None,
|
||||
custom_llm_provider: str | None = None,
|
||||
extra_headers: dict[str, object] | None = None,
|
||||
extra_query: dict[str, object] | None = None,
|
||||
extra_body: dict[str, object] | None = None,
|
||||
|
|
@ -1564,11 +1575,11 @@ def video_extension(
|
|||
|
||||
provider_config: Final[BaseVideoConfig | None] = ProviderConfigManager.get_provider_video_config(
|
||||
model=None,
|
||||
provider=litellm.LlmProviders(custom_llm_provider),
|
||||
provider=custom_llm_provider,
|
||||
)
|
||||
|
||||
if provider_config is None:
|
||||
raise ValueError(f"video extension is not supported for {custom_llm_provider}")
|
||||
raise _unsupported_video_call("video extension", custom_llm_provider)
|
||||
|
||||
local_vars.update(kwargs)
|
||||
request_params: Final[dict] = {
|
||||
|
|
|
|||
181
tests/integration/_support/custom_video_provider.py
Normal file
181
tests/integration/_support/custom_video_provider.py
Normal file
|
|
@ -0,0 +1,181 @@
|
|||
"""A customer-owned video provider for the proxy's `custom_provider_map`: a job queue with its own wire shape."""
|
||||
|
||||
from collections.abc import Mapping
|
||||
from types import MappingProxyType
|
||||
from typing import Final
|
||||
|
||||
import httpx
|
||||
from httpx._types import RequestFiles
|
||||
|
||||
from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
|
||||
from litellm.llms.base_llm.videos.transformation import BaseVideoConfig
|
||||
from litellm.llms.custom_llm import CustomLLM
|
||||
from litellm.types.router import GenericLiteLLMParams
|
||||
from litellm.types.videos.main import VideoCreateOptionalRequestParams, VideoObject
|
||||
from litellm.types.videos.utils import encode_video_id_with_provider, extract_original_video_id
|
||||
|
||||
_STATUS_BY_STATE: Final = MappingProxyType({"queued": "queued", "running": "in_progress", "done": "completed"})
|
||||
|
||||
|
||||
def _video_object(job: Mapping[str, object], model: str | None, custom_llm_provider: str | None) -> VideoObject:
|
||||
job_id: Final = str(job["job_id"])
|
||||
seconds: Final = job.get("seconds")
|
||||
video: Final = VideoObject(
|
||||
id=encode_video_id_with_provider(job_id, custom_llm_provider, model) if custom_llm_provider else job_id,
|
||||
object="video",
|
||||
status=_STATUS_BY_STATE[str(job["state"])],
|
||||
created_at=0,
|
||||
model=model,
|
||||
seconds=str(seconds) if seconds is not None else None,
|
||||
)
|
||||
return video
|
||||
|
||||
|
||||
class QueueVideoConfig(BaseVideoConfig):
|
||||
def get_supported_openai_params(self, model: str) -> list: # mutable-ok: BaseVideoConfig contract
|
||||
return ["seconds"]
|
||||
|
||||
def map_openai_params(
|
||||
self,
|
||||
video_create_optional_params: VideoCreateOptionalRequestParams,
|
||||
model: str,
|
||||
drop_params: bool,
|
||||
) -> dict: # mutable-ok: BaseVideoConfig contract
|
||||
return {key: value for key, value in video_create_optional_params.items() if key == "seconds"}
|
||||
|
||||
def validate_environment(
|
||||
self,
|
||||
headers: dict, # mutable-ok: BaseVideoConfig contract
|
||||
model: str,
|
||||
api_key: str | None = None,
|
||||
litellm_params: GenericLiteLLMParams | None = None,
|
||||
) -> dict: # mutable-ok: BaseVideoConfig contract
|
||||
key: Final = (litellm_params.api_key if litellm_params is not None else None) or api_key or ""
|
||||
return {**headers, "X-Api-Key": key}
|
||||
|
||||
def get_complete_url(
|
||||
self,
|
||||
model: str,
|
||||
api_base: str | None,
|
||||
litellm_params: dict, # mutable-ok: BaseVideoConfig contract
|
||||
) -> str:
|
||||
if api_base is None:
|
||||
raise ValueError("api_base is required")
|
||||
return f"{api_base.rstrip('/')}/jobs"
|
||||
|
||||
def transform_video_create_request(
|
||||
self,
|
||||
model: str,
|
||||
prompt: str,
|
||||
api_base: str,
|
||||
video_create_optional_request_params: dict, # mutable-ok: BaseVideoConfig contract
|
||||
litellm_params: GenericLiteLLMParams,
|
||||
headers: dict, # mutable-ok: BaseVideoConfig contract
|
||||
) -> tuple[dict, RequestFiles, str]: # mutable-ok: BaseVideoConfig contract
|
||||
seconds: Final = video_create_optional_request_params.get("seconds")
|
||||
return ({"model": model, "prompt": prompt, "seconds": seconds}, [], api_base)
|
||||
|
||||
def transform_video_create_response(
|
||||
self,
|
||||
model: str,
|
||||
raw_response: httpx.Response,
|
||||
logging_obj: LiteLLMLoggingObj,
|
||||
custom_llm_provider: str | None = None,
|
||||
request_data: dict | None = None,
|
||||
) -> VideoObject:
|
||||
return _video_object(raw_response.json(), model, custom_llm_provider)
|
||||
|
||||
def transform_video_status_retrieve_request(
|
||||
self,
|
||||
video_id: str,
|
||||
api_base: str,
|
||||
litellm_params: GenericLiteLLMParams,
|
||||
headers: dict, # mutable-ok: BaseVideoConfig contract
|
||||
) -> tuple[str, dict]: # mutable-ok: BaseVideoConfig contract
|
||||
return (f"{api_base}/{extract_original_video_id(video_id)}", {})
|
||||
|
||||
def transform_video_status_retrieve_response(
|
||||
self,
|
||||
raw_response: httpx.Response,
|
||||
logging_obj: LiteLLMLoggingObj,
|
||||
custom_llm_provider: str | None = None,
|
||||
client: object = None,
|
||||
) -> VideoObject:
|
||||
return _video_object(raw_response.json(), None, custom_llm_provider)
|
||||
|
||||
def transform_video_content_request(
|
||||
self,
|
||||
video_id: str,
|
||||
api_base: str,
|
||||
litellm_params: GenericLiteLLMParams,
|
||||
headers: dict, # mutable-ok: BaseVideoConfig contract
|
||||
variant: str | None = None,
|
||||
) -> tuple[str, dict]: # mutable-ok: BaseVideoConfig contract
|
||||
return (f"{api_base}/{extract_original_video_id(video_id)}/file", {})
|
||||
|
||||
def transform_video_content_response(
|
||||
self,
|
||||
raw_response: httpx.Response,
|
||||
logging_obj: LiteLLMLoggingObj,
|
||||
client: object = None,
|
||||
) -> bytes:
|
||||
return raw_response.content
|
||||
|
||||
def transform_video_list_request(
|
||||
self,
|
||||
api_base: str,
|
||||
litellm_params: GenericLiteLLMParams,
|
||||
headers: dict, # mutable-ok: BaseVideoConfig contract
|
||||
after: str | None = None,
|
||||
limit: int | None = None,
|
||||
order: str | None = None,
|
||||
extra_query: dict[str, object] | None = None,
|
||||
) -> tuple[str, dict]: # mutable-ok: BaseVideoConfig contract
|
||||
return (api_base, {})
|
||||
|
||||
def transform_video_list_response(
|
||||
self,
|
||||
raw_response: httpx.Response,
|
||||
logging_obj: LiteLLMLoggingObj,
|
||||
custom_llm_provider: str | None = None,
|
||||
) -> dict[str, str]: # mutable-ok: BaseVideoConfig contract
|
||||
return raw_response.json()
|
||||
|
||||
def transform_video_remix_request(
|
||||
self,
|
||||
video_id: str,
|
||||
prompt: str,
|
||||
api_base: str,
|
||||
litellm_params: GenericLiteLLMParams,
|
||||
headers: dict, # mutable-ok: BaseVideoConfig contract
|
||||
extra_body: dict[str, object] | None = None,
|
||||
) -> tuple[str, dict]: # mutable-ok: BaseVideoConfig contract
|
||||
raise NotImplementedError("the queue backend has no remix")
|
||||
|
||||
def transform_video_remix_response(
|
||||
self,
|
||||
raw_response: httpx.Response,
|
||||
logging_obj: LiteLLMLoggingObj,
|
||||
custom_llm_provider: str | None = None,
|
||||
) -> VideoObject:
|
||||
raise NotImplementedError("the queue backend has no remix")
|
||||
|
||||
def transform_video_delete_request(
|
||||
self,
|
||||
video_id: str,
|
||||
api_base: str,
|
||||
litellm_params: GenericLiteLLMParams,
|
||||
headers: dict, # mutable-ok: BaseVideoConfig contract
|
||||
) -> tuple[str, dict]: # mutable-ok: BaseVideoConfig contract
|
||||
raise NotImplementedError("the queue backend has no delete")
|
||||
|
||||
def transform_video_delete_response(
|
||||
self,
|
||||
raw_response: httpx.Response,
|
||||
logging_obj: LiteLLMLoggingObj,
|
||||
) -> VideoObject:
|
||||
raise NotImplementedError("the queue backend has no delete")
|
||||
|
||||
|
||||
VIDEO_CONFIG: Final = QueueVideoConfig()
|
||||
IMAGE_ONLY_HANDLER: Final = CustomLLM()
|
||||
112
tests/integration/providers/test_custom_video_provider_wire.py
Normal file
112
tests/integration/providers/test_custom_video_provider_wire.py
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
"""A provider registered in `custom_provider_map` with a `BaseVideoConfig` serves /v1/videos create, status and content."""
|
||||
|
||||
import json
|
||||
import shutil
|
||||
from contextlib import ExitStack
|
||||
from pathlib import Path
|
||||
from typing import Final
|
||||
|
||||
from integration._support.client import Gateway
|
||||
from integration._support.process import owned_proxy_process
|
||||
from integration._support.wire import Reply, Request, Wire, wire_server
|
||||
|
||||
_SUPPORT_MODULE: Final = Path(__file__).resolve().parents[1] / "_support" / "custom_video_provider.py"
|
||||
_PROMPT: Final = "a cat walking across a bridge"
|
||||
_MP4: Final = b"\x00\x00\x00\x18ftypmp42" + b"queue-video-bytes"
|
||||
|
||||
|
||||
def _queue_backend(request: Request) -> Reply:
|
||||
if (request.method, request.target) == ("POST", "/jobs"):
|
||||
return Reply(body=json.dumps({"job_id": "job-7", "state": "queued"}).encode())
|
||||
if (request.method, request.target) == ("GET", "/jobs/job-7"):
|
||||
return Reply(body=json.dumps({"job_id": "job-7", "state": "done", "seconds": 8}).encode())
|
||||
if (request.method, request.target) == ("GET", "/jobs/job-7/file"):
|
||||
return Reply(body=_MP4, content_type="video/mp4")
|
||||
return Reply(status=404, body=json.dumps({"error": f"no route {request.method} {request.target}"}).encode())
|
||||
|
||||
|
||||
def _write_config(path: Path, wire: Wire) -> Path:
|
||||
shutil.copy(_SUPPORT_MODULE, path.parent / "custom_video_provider.py")
|
||||
path.write_text(
|
||||
json.dumps(
|
||||
{
|
||||
"model_list": [
|
||||
{
|
||||
"model_name": "queue-video",
|
||||
"litellm_params": {
|
||||
"model": "queue-video/seedance-1",
|
||||
"api_base": wire.url,
|
||||
"api_key": "queue-secret",
|
||||
},
|
||||
},
|
||||
{
|
||||
"model_name": "image-only-video",
|
||||
"litellm_params": {
|
||||
"model": "image-only/seedance-1",
|
||||
"api_base": wire.url,
|
||||
"api_key": "unused",
|
||||
},
|
||||
},
|
||||
],
|
||||
"litellm_settings": {
|
||||
"custom_provider_map": [
|
||||
{"provider": "queue-video", "custom_handler": "custom_video_provider.VIDEO_CONFIG"},
|
||||
{"provider": "image-only", "custom_handler": "custom_video_provider.IMAGE_ONLY_HANDLER"},
|
||||
]
|
||||
},
|
||||
}
|
||||
),
|
||||
encoding="utf-8",
|
||||
)
|
||||
return path
|
||||
|
||||
|
||||
def _lower_headers(request: Request) -> dict[str, str]:
|
||||
return {name.lower(): value for name, value in request.headers.items()}
|
||||
|
||||
|
||||
def test_custom_provider_map_base_video_config_serves_create_status_and_content(
|
||||
gateway: Gateway, tmp_path: Path
|
||||
) -> None:
|
||||
with ExitStack() as stack:
|
||||
wire: Final = stack.enter_context(wire_server(_queue_backend))
|
||||
config: Final = _write_config(tmp_path / "custom-video.yaml", wire)
|
||||
owned: Final = stack.enter_context(owned_proxy_process(gateway, tmp_path, {}, config=config))
|
||||
|
||||
created: Final = owned.gateway.request(
|
||||
"POST", "/v1/videos", {"model": "queue-video", "prompt": _PROMPT, "seconds": "8"}
|
||||
)
|
||||
assert created.status_code == 200, created.text
|
||||
created_body: Final = created.json()
|
||||
assert created_body["status"] == "queued", created_body
|
||||
video_id: Final = created_body["id"]
|
||||
assert isinstance(video_id, str) and video_id.startswith("video_"), created_body
|
||||
|
||||
submits: Final = wire.drain()
|
||||
assert [(r.method, r.target) for r in submits] == [("POST", "/jobs")], submits
|
||||
assert json.loads(submits[0].body) == {"model": "seedance-1", "prompt": _PROMPT, "seconds": "8"}
|
||||
assert _lower_headers(submits[0])["x-api-key"] == "queue-secret"
|
||||
|
||||
status: Final = owned.gateway.request("GET", f"/v1/videos/{video_id}")
|
||||
assert status.status_code == 200, status.text
|
||||
assert status.json()["status"] == "completed", status.text
|
||||
|
||||
content: Final = owned.gateway.request("GET", f"/v1/videos/{video_id}/content")
|
||||
assert content.status_code == 200, content.text
|
||||
assert content.content == _MP4
|
||||
|
||||
polls: Final = wire.drain()
|
||||
assert [(r.method, r.target) for r in polls] == [("GET", "/jobs/job-7"), ("GET", "/jobs/job-7/file")], polls
|
||||
assert all(_lower_headers(r)["x-api-key"] == "queue-secret" for r in polls)
|
||||
|
||||
|
||||
def test_custom_provider_without_a_video_config_is_refused_with_400(gateway: Gateway, tmp_path: Path) -> None:
|
||||
with ExitStack() as stack:
|
||||
wire: Final = stack.enter_context(wire_server(_queue_backend))
|
||||
config: Final = _write_config(tmp_path / "custom-video.yaml", wire)
|
||||
owned: Final = stack.enter_context(owned_proxy_process(gateway, tmp_path, {}, config=config))
|
||||
|
||||
refused: Final = owned.gateway.request("POST", "/v1/videos", {"model": "image-only-video", "prompt": _PROMPT})
|
||||
assert refused.status_code == 400, refused.text
|
||||
assert "video generation is not supported for image-only" in refused.text
|
||||
assert wire.drain() == ()
|
||||
|
|
@ -1382,27 +1382,6 @@ def test_aaamodel_prices_and_context_window_json_is_valid():
|
|||
raise AssertionError(error_message)
|
||||
|
||||
|
||||
def test_cost_map_schema_accepts_vertex_modality_and_context_tiers() -> None:
|
||||
row: Final = {
|
||||
"litellm_provider": "vertex_ai",
|
||||
"mode": "chat",
|
||||
"input_cost_per_token": 1e-6,
|
||||
"output_cost_per_token": 2e-6,
|
||||
"input_cost_per_token_above_200k_tokens_flex": 3e-6,
|
||||
"output_cost_per_token_above_200k_tokens_flex": 4e-6,
|
||||
"input_cost_per_token_above_200k_tokens_batches": 3e-6,
|
||||
"output_cost_per_token_above_200k_tokens_batches": 4e-6,
|
||||
"input_cost_per_audio_token_above_200k_tokens": 5e-6,
|
||||
"input_cost_per_audio_token_above_200k_tokens_flex": 6e-6,
|
||||
"input_cost_per_audio_token_above_200k_tokens_priority": 7e-6,
|
||||
"input_cost_per_audio_token_above_200k_tokens_batches": 8e-6,
|
||||
"output_cost_per_image_token_priority": 9e-6,
|
||||
"output_cost_per_image_token_batches": 10e-6,
|
||||
}
|
||||
|
||||
assert Draft7Validator(_COST_MAP_ROW_SCHEMA).is_valid({"synthetic-vertex-tier-model": row})
|
||||
|
||||
|
||||
def test_max_tokens_consistency():
|
||||
"""
|
||||
Test that max_tokens == max_output_tokens for all models.
|
||||
|
|
@ -1608,6 +1587,38 @@ def test_get_provider_rerank_config():
|
|||
assert isinstance(config, HostedVLLMRerankConfig)
|
||||
|
||||
|
||||
def test_get_provider_video_config_resolves_a_custom_provider_map_base_video_config(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
) -> None:
|
||||
"""A `BaseVideoConfig` registered in `custom_provider_map` answers for its provider name, a `CustomLLM`
|
||||
registered there does not, and a built-in name still resolves to its built-in config even when a `CustomLLM`
|
||||
shadows it in the map."""
|
||||
from litellm.llms.custom_llm import CustomLLM
|
||||
from litellm.llms.openai.videos.transformation import OpenAIVideoConfig
|
||||
|
||||
class QueueVideoConfig(OpenAIVideoConfig):
|
||||
pass
|
||||
|
||||
video_config: Final = QueueVideoConfig()
|
||||
monkeypatch.setattr(
|
||||
litellm,
|
||||
"custom_provider_map",
|
||||
[
|
||||
{"provider": "queue-video", "custom_handler": video_config},
|
||||
{"provider": "image-only", "custom_handler": CustomLLM()},
|
||||
{"provider": "openai", "custom_handler": CustomLLM()},
|
||||
],
|
||||
)
|
||||
monkeypatch.setattr(litellm, "_custom_providers", ["queue-video", "image-only", "openai"])
|
||||
|
||||
assert ProviderConfigManager.get_provider_video_config(model="seedance-1", provider="queue-video") is video_config
|
||||
assert ProviderConfigManager.get_provider_video_config(model="seedance-1", provider="image-only") is None
|
||||
assert isinstance(
|
||||
ProviderConfigManager.get_provider_video_config(model="sora-2", provider="openai"), OpenAIVideoConfig
|
||||
)
|
||||
assert ProviderConfigManager.get_provider_video_config(model="seedance-1", provider="not-registered") is None
|
||||
|
||||
|
||||
def test_get_provider_text_to_speech_config_vertex_gemini_skips_cloud_tts():
|
||||
"""Regression for LIT-6501: mapping vertex Gemini TTS params through Google Cloud TTS
|
||||
dropped response_format before the speech_to_completion bridge could honor it."""
|
||||
|
|
@ -7696,7 +7707,6 @@ def test_openai_non_text_embedding_3_drop_params_per_call():
|
|||
litellm.drop_params = prev_drop_params
|
||||
|
||||
|
||||
|
||||
@pytest.mark.usefixtures(
|
||||
"_vcr_outcome_gate_local_testing",
|
||||
"isolate_litellm_state",
|
||||
|
|
@ -10042,24 +10052,3 @@ def test_get_optional_params_forwards_a_tool_config_cache_point_to_a_downstream_
|
|||
)
|
||||
|
||||
assert optional_params["extra_body"] == {"kept": True, "cache_control_injection_points": [point]}
|
||||
|
||||
|
||||
def test_cost_map_schema_accepts_vertex_modality_and_context_tiers() -> None:
|
||||
row: Final = {
|
||||
"litellm_provider": "vertex_ai",
|
||||
"mode": "chat",
|
||||
"input_cost_per_token": 1e-6,
|
||||
"output_cost_per_token": 2e-6,
|
||||
"input_cost_per_token_above_200k_tokens_flex": 3e-6,
|
||||
"output_cost_per_token_above_200k_tokens_flex": 4e-6,
|
||||
"input_cost_per_token_above_200k_tokens_batches": 3e-6,
|
||||
"output_cost_per_token_above_200k_tokens_batches": 4e-6,
|
||||
"input_cost_per_audio_token_above_200k_tokens": 5e-6,
|
||||
"input_cost_per_audio_token_above_200k_tokens_flex": 6e-6,
|
||||
"input_cost_per_audio_token_above_200k_tokens_priority": 7e-6,
|
||||
"input_cost_per_audio_token_above_200k_tokens_batches": 8e-6,
|
||||
"output_cost_per_image_token_priority": 9e-6,
|
||||
"output_cost_per_image_token_batches": 10e-6,
|
||||
}
|
||||
|
||||
assert Draft7Validator(_COST_MAP_ROW_SCHEMA).is_valid({"synthetic-vertex-tier-model": row})
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ reflect production.
|
|||
|
||||
from contextlib import ExitStack
|
||||
from dataclasses import dataclass
|
||||
from typing import Any, Dict
|
||||
from typing import Any, Dict, Final
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
|
@ -205,9 +205,7 @@ def test_video_edit__dispatch_and_provider_from_id(seams):
|
|||
|
||||
|
||||
def test_video_extension__dispatch_and_provider_from_id(seams):
|
||||
result = videos_main.video_extension(
|
||||
video_id=AZURE_VIDEO_ID, prompt="continue", seconds="5"
|
||||
)
|
||||
result = videos_main.video_extension(video_id=AZURE_VIDEO_ID, prompt="continue", seconds="5")
|
||||
|
||||
seams.assert_only("video_extension_handler")
|
||||
assert result is seams.handler.video_extension_handler.return_value
|
||||
|
|
@ -285,9 +283,7 @@ def test_generation__mock_response_short_circuits(seams):
|
|||
|
||||
|
||||
def test_list__mock_response_short_circuits(seams):
|
||||
resp = videos_main.video_list(
|
||||
mock_response=[{"id": "v1", "object": "video", "status": "completed"}]
|
||||
)
|
||||
resp = videos_main.video_list(mock_response=[{"id": "v1", "object": "video", "status": "completed"}])
|
||||
|
||||
assert isinstance(resp, list)
|
||||
assert resp[0].id == "v1"
|
||||
|
|
@ -318,7 +314,7 @@ def test_get_character__mock_response_short_circuits(seams):
|
|||
def test_unsupported_provider_raises_without_dispatch(seams):
|
||||
seams.get_config.return_value = None
|
||||
|
||||
with pytest.raises(litellm.APIConnectionError):
|
||||
with pytest.raises(litellm.BadRequestError, match="video status is not supported for azure"):
|
||||
videos_main.video_status(video_id=AZURE_VIDEO_ID)
|
||||
|
||||
seams.handler.video_status_handler.assert_not_called()
|
||||
|
|
@ -333,9 +329,7 @@ def test_unsupported_provider_raises_without_dispatch(seams):
|
|||
async def test_avideo_generation__delegates_with_async_flag():
|
||||
sentinel = VideoObject(id="v-async", object="video", status="queued")
|
||||
with (
|
||||
patch.object(
|
||||
videos_main, "video_generation", MagicMock(return_value=sentinel)
|
||||
) as sync,
|
||||
patch.object(videos_main, "video_generation", MagicMock(return_value=sentinel)) as sync,
|
||||
patch.object(
|
||||
litellm,
|
||||
"get_llm_provider",
|
||||
|
|
@ -352,9 +346,7 @@ async def test_avideo_generation__delegates_with_async_flag():
|
|||
@pytest.mark.asyncio
|
||||
async def test_avideo_status__delegates_untouched():
|
||||
sentinel = VideoObject(id="v-async", object="video", status="queued")
|
||||
with patch.object(
|
||||
videos_main, "video_status", MagicMock(return_value=sentinel)
|
||||
) as sync:
|
||||
with patch.object(videos_main, "video_status", MagicMock(return_value=sentinel)) as sync:
|
||||
result = await videos_main.avideo_status(video_id="video_plain")
|
||||
|
||||
assert result is sentinel
|
||||
|
|
@ -367,9 +359,7 @@ async def test_avideo_content__pre_decodes_provider_before_delegating():
|
|||
"""avideo_content resolves the provider from the encoded id itself before
|
||||
handing off, so the sync worker receives the decoded provider, not None."""
|
||||
sentinel = b"mp4-bytes"
|
||||
with patch.object(
|
||||
videos_main, "video_content", MagicMock(return_value=sentinel)
|
||||
) as sync:
|
||||
with patch.object(videos_main, "video_content", MagicMock(return_value=sentinel)) as sync:
|
||||
result = await videos_main.avideo_content(video_id=AZURE_VIDEO_ID)
|
||||
|
||||
assert result is sentinel
|
||||
|
|
@ -393,9 +383,7 @@ DB_YAML_CREDS = {
|
|||
CREDENTIAL_OPERATIONS = [
|
||||
(
|
||||
"video_generation_handler",
|
||||
lambda: videos_main.video_generation(
|
||||
prompt="p", model="sora-2", **DB_YAML_CREDS
|
||||
),
|
||||
lambda: videos_main.video_generation(prompt="p", model="sora-2", **DB_YAML_CREDS),
|
||||
),
|
||||
(
|
||||
"video_status_handler",
|
||||
|
|
@ -407,21 +395,15 @@ CREDENTIAL_OPERATIONS = [
|
|||
),
|
||||
(
|
||||
"video_remix_handler",
|
||||
lambda: videos_main.video_remix(
|
||||
video_id=AZURE_VIDEO_ID, prompt="p", **DB_YAML_CREDS
|
||||
),
|
||||
lambda: videos_main.video_remix(video_id=AZURE_VIDEO_ID, prompt="p", **DB_YAML_CREDS),
|
||||
),
|
||||
(
|
||||
"video_edit_handler",
|
||||
lambda: videos_main.video_edit(
|
||||
video_id=AZURE_VIDEO_ID, prompt="p", **DB_YAML_CREDS
|
||||
),
|
||||
lambda: videos_main.video_edit(video_id=AZURE_VIDEO_ID, prompt="p", **DB_YAML_CREDS),
|
||||
),
|
||||
(
|
||||
"video_extension_handler",
|
||||
lambda: videos_main.video_extension(
|
||||
video_id=AZURE_VIDEO_ID, prompt="p", seconds="5", **DB_YAML_CREDS
|
||||
),
|
||||
lambda: videos_main.video_extension(video_id=AZURE_VIDEO_ID, prompt="p", seconds="5", **DB_YAML_CREDS),
|
||||
),
|
||||
(
|
||||
"video_list_handler",
|
||||
|
|
@ -429,9 +411,7 @@ CREDENTIAL_OPERATIONS = [
|
|||
),
|
||||
(
|
||||
"video_create_character_handler",
|
||||
lambda: videos_main.video_create_character(
|
||||
name="hero", video=MagicMock(name="vid"), **DB_YAML_CREDS
|
||||
),
|
||||
lambda: videos_main.video_create_character(name="hero", video=MagicMock(name="vid"), **DB_YAML_CREDS),
|
||||
),
|
||||
(
|
||||
"video_get_character_handler",
|
||||
|
|
@ -453,3 +433,33 @@ def test_db_yaml_credentials_reach_every_handler(seams, handler_name, invoke):
|
|||
assert litellm_params.get("api_base") == DB_YAML_CREDS["api_base"]
|
||||
assert litellm_params.get("api_version") == DB_YAML_CREDS["api_version"]
|
||||
assert litellm_params.get("vertex_project") == DB_YAML_CREDS["vertex_project"]
|
||||
|
||||
|
||||
def test_video_generation__custom_provider_map_base_video_config_is_dispatched(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
from litellm.llms.openai.videos.transformation import OpenAIVideoConfig
|
||||
|
||||
class QueueVideoConfig(OpenAIVideoConfig):
|
||||
pass
|
||||
|
||||
video_config: Final = QueueVideoConfig()
|
||||
monkeypatch.setattr(litellm, "custom_provider_map", [{"provider": "queue-video", "custom_handler": video_config}])
|
||||
monkeypatch.setattr(litellm, "_custom_providers", ["queue-video"])
|
||||
handler: Final = MagicMock(spec=BaseLLMHTTPHandler)
|
||||
with patch.object(videos_main, "base_llm_http_handler", handler):
|
||||
videos_main.video_generation(model="queue-video/seedance-1", prompt="a cat", api_base="http://backend.test")
|
||||
kw: Final = handler.video_generation_handler.call_args.kwargs
|
||||
assert kw["video_generation_provider_config"] is video_config
|
||||
assert kw["custom_llm_provider"] == "queue-video"
|
||||
assert kw["model"] == "seedance-1"
|
||||
|
||||
|
||||
def test_video_generation__custom_provider_without_a_video_config_is_a_400(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
from litellm.llms.custom_llm import CustomLLM
|
||||
|
||||
monkeypatch.setattr(litellm, "custom_provider_map", [{"provider": "image-only", "custom_handler": CustomLLM()}])
|
||||
monkeypatch.setattr(litellm, "_custom_providers", ["image-only"])
|
||||
handler: Final = MagicMock(spec=BaseLLMHTTPHandler)
|
||||
with patch.object(videos_main, "base_llm_http_handler", handler):
|
||||
with pytest.raises(litellm.BadRequestError, match="video generation is not supported for image-only"):
|
||||
videos_main.video_generation(model="image-only/seedance-1", prompt="a cat")
|
||||
handler.video_generation_handler.assert_not_called()
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue