mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-17 09:34:48 +00:00
fix(embeddings): apply additional_drop_params to provider-specific params (#52098)
Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
parent
451fd512da
commit
dbe520f664
2 changed files with 56 additions and 11 deletions
|
|
@ -4878,7 +4878,16 @@ def get_optional_params_embeddings(
|
|||
# retrieve all parameters passed to the function
|
||||
passed_params: Final = locals()
|
||||
passed_params.pop("custom_llm_provider", None)
|
||||
special_params: Final = as_str_mapping(_OPAQUE_VALUE.validate_python(passed_params.pop("kwargs"))) or {}
|
||||
special_params: Final = {
|
||||
k: v
|
||||
for k, v in (as_str_mapping(_OPAQUE_VALUE.validate_python(passed_params.pop("kwargs"))) or {}).items()
|
||||
if _should_drop_param(k=k, additional_drop_params=additional_drop_params) is False
|
||||
}
|
||||
provider_kwargs: Final = {
|
||||
k: v
|
||||
for k, v in kwargs.items()
|
||||
if _should_drop_param(k=k, additional_drop_params=additional_drop_params) is False
|
||||
}
|
||||
|
||||
passed_params.pop("drop_params", None)
|
||||
drop_params = normalize_drop_params(drop_params)
|
||||
|
|
@ -4992,7 +5001,7 @@ def get_optional_params_embeddings(
|
|||
)
|
||||
_check_valid_arg(supported_params=supported_params)
|
||||
optional_params = litellm.nvidiaNimEmbeddingConfig.map_openai_params(
|
||||
non_default_params=non_default_params, optional_params={}, kwargs=kwargs
|
||||
non_default_params=non_default_params, optional_params={}, kwargs=provider_kwargs
|
||||
)
|
||||
elif custom_llm_provider == "vertex_ai" or custom_llm_provider == "gemini":
|
||||
# OpenAI SDKs send encoding_format="float" by default; float lists are
|
||||
|
|
@ -5009,9 +5018,9 @@ def get_optional_params_embeddings(
|
|||
_check_valid_arg(supported_params=supported_params)
|
||||
(
|
||||
optional_params,
|
||||
kwargs,
|
||||
_,
|
||||
) = litellm.VertexAITextEmbeddingConfig().map_openai_params(
|
||||
non_default_params=non_default_params, optional_params={}, kwargs=kwargs
|
||||
non_default_params=non_default_params, optional_params={}, kwargs=provider_kwargs
|
||||
)
|
||||
elif custom_llm_provider == "lm_studio":
|
||||
supported_params = litellm.LmStudioEmbeddingConfig().get_supported_openai_params()
|
||||
|
|
@ -5043,8 +5052,7 @@ def get_optional_params_embeddings(
|
|||
else: # unmapped model
|
||||
supported_params = []
|
||||
_check_valid_arg(supported_params=supported_params)
|
||||
final_params = {**kwargs}
|
||||
return final_params
|
||||
return {**provider_kwargs}
|
||||
|
||||
supported_params = object.get_supported_openai_params()
|
||||
_check_valid_arg(supported_params=supported_params)
|
||||
|
|
@ -5100,8 +5108,7 @@ def get_optional_params_embeddings(
|
|||
model=model,
|
||||
drop_params=drop_params if drop_params is not None else False,
|
||||
)
|
||||
final_params = {**optional_params, **kwargs}
|
||||
return final_params
|
||||
return {**optional_params, **provider_kwargs}
|
||||
elif custom_llm_provider == "sap":
|
||||
supported_params = get_supported_openai_params(
|
||||
model=model,
|
||||
|
|
@ -5129,8 +5136,7 @@ def get_optional_params_embeddings(
|
|||
drop_params=drop_params if drop_params is not None else False,
|
||||
)
|
||||
|
||||
final_params = {**optional_params, **kwargs}
|
||||
return final_params
|
||||
return {**optional_params, **provider_kwargs}
|
||||
|
||||
elif custom_llm_provider == "fireworks_ai":
|
||||
supported_params = get_supported_openai_params(
|
||||
|
|
@ -5203,7 +5209,7 @@ def get_optional_params_embeddings(
|
|||
passed_params=passed_params,
|
||||
custom_llm_provider=custom_llm_provider,
|
||||
openai_params=list(DEFAULT_EMBEDDING_PARAM_VALUES.keys()),
|
||||
additional_drop_params=kwargs.get("additional_drop_params", None),
|
||||
additional_drop_params=additional_drop_params,
|
||||
)
|
||||
|
||||
if "extra_body" in final_params and not final_params["extra_body"]:
|
||||
|
|
|
|||
|
|
@ -1733,6 +1733,45 @@ def test_optional_params_with_additional_drop_params():
|
|||
assert "red" not in optional_params["extra_body"]
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
("custom_llm_provider", "model"),
|
||||
[
|
||||
("openai", "text-embedding-3-small"),
|
||||
("azure_ai", "embed-v-4-0"),
|
||||
("nvidia_nim", "nvidia/nv-embed-v1"),
|
||||
("cohere", "embed-v4.0"),
|
||||
("mistral", "mistral-embed"),
|
||||
("jina_ai", "jina-embeddings-v3"),
|
||||
("vertex_ai", "text-embedding-005"),
|
||||
("gemini", "gemini-embedding-001"),
|
||||
("bedrock", "cohere.embed-english-v3"),
|
||||
("bedrock", "unmapped-embedding-model"),
|
||||
("voyage", "voyage-3"),
|
||||
("infinity", "BAAI/bge-small-en-v1.5"),
|
||||
("ollama", "nomic-embed-text"),
|
||||
],
|
||||
)
|
||||
def test_embedding_additional_drop_params_removes_provider_specific_params(custom_llm_provider: str, model: str):
|
||||
without_extras: Final = get_optional_params_embeddings(model=model, custom_llm_provider=custom_llm_provider)
|
||||
forwarded: Final = get_optional_params_embeddings(
|
||||
model=model,
|
||||
custom_llm_provider=custom_llm_provider,
|
||||
input_type="search_query",
|
||||
truncate="END",
|
||||
)
|
||||
assert forwarded != without_extras, f"{custom_llm_provider} never forwards the extras, so the case proves nothing"
|
||||
|
||||
dropped: Final = get_optional_params_embeddings(
|
||||
model=model,
|
||||
custom_llm_provider=custom_llm_provider,
|
||||
input_type="search_query",
|
||||
truncate="END",
|
||||
additional_drop_params=["input_type", "truncate"],
|
||||
)
|
||||
|
||||
assert dropped == without_extras
|
||||
|
||||
|
||||
def test_azure_ai_cohere_embed_input_type_param():
|
||||
optional_params = get_optional_params_embeddings(
|
||||
model="embed-v-4-0",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue