mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-17 09:34:48 +00:00
fix: keep handwritten true endpoint flags when generating provider_endpoints_support.json
This commit is contained in:
parent
aa769fbc69
commit
4947df9e17
5 changed files with 808 additions and 780 deletions
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -123,9 +123,7 @@ def _derived_keys(bridged_fields: tuple[str, ...]) -> tuple[str, ...]:
|
|||
return tuple(dict.fromkeys((*MODE_TO_FLAG.values(), *SUPPORTED_ENDPOINT_TO_FLAG.values(), *bridged_fields)))
|
||||
|
||||
|
||||
def _model_evidence(
|
||||
model: JsonValue, bridged_fields: tuple[str, ...]
|
||||
) -> Iterator[tuple[str, str]]:
|
||||
def _model_evidence(model: JsonValue, bridged_fields: tuple[str, ...]) -> Iterator[tuple[str, str]]:
|
||||
provider: Final = _model_provider_slug(model)
|
||||
if provider is None or not isinstance(model, dict):
|
||||
return
|
||||
|
|
@ -136,13 +134,9 @@ def _model_evidence(
|
|||
yield from ((provider, flag) for flag in bridged_fields)
|
||||
|
||||
|
||||
def _provider_evidence(
|
||||
cost_map: Mapping[str, JsonValue], bridged_fields: tuple[str, ...]
|
||||
) -> Iterator[tuple[str, str]]:
|
||||
def _provider_evidence(cost_map: Mapping[str, JsonValue], bridged_fields: tuple[str, ...]) -> Iterator[tuple[str, str]]:
|
||||
return chain.from_iterable(
|
||||
_model_evidence(model, bridged_fields)
|
||||
for model_name, model in cost_map.items()
|
||||
if model_name != "sample_spec"
|
||||
_model_evidence(model, bridged_fields) for model_name, model in cost_map.items() if model_name != "sample_spec"
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -164,14 +158,10 @@ def _generated_provider(
|
|||
provider: Final = _json_object(value, f"provider {slug}")
|
||||
current_flags_value: Final = provider.get("endpoints")
|
||||
current_flags: Final = (
|
||||
_json_object(current_flags_value, f"provider {slug} endpoints")
|
||||
if current_flags_value is not None
|
||||
else {}
|
||||
_json_object(current_flags_value, f"provider {slug} endpoints") if current_flags_value is not None else {}
|
||||
)
|
||||
derived_flags: Final = {flag: (slug, flag) in evidence for flag in derived_keys}
|
||||
handwritten_flags: Final = {
|
||||
flag: value for flag, value in current_flags.items() if flag not in derived_key_set
|
||||
}
|
||||
derived_flags: Final = {flag: current_flags.get(flag) is True or (slug, flag) in evidence for flag in derived_keys}
|
||||
handwritten_flags: Final = {flag: value for flag, value in current_flags.items() if flag not in derived_key_set}
|
||||
return {
|
||||
**provider,
|
||||
"endpoints": {**derived_flags, **handwritten_flags},
|
||||
|
|
@ -182,9 +172,7 @@ def generate_provider_endpoints_support(
|
|||
cost_map: Mapping[str, JsonValue],
|
||||
current_json: Mapping[str, JsonValue],
|
||||
) -> dict[str, JsonValue]:
|
||||
current_providers: Final = _json_object(
|
||||
current_json.get("providers"), "provider_endpoints_support providers"
|
||||
)
|
||||
current_providers: Final = _json_object(current_json.get("providers"), "provider_endpoints_support providers")
|
||||
endpoints: Final = _json_object(current_json.get("endpoints"), "provider_endpoints_support endpoints")
|
||||
bridged_fields: Final = _bridged_fields(endpoints)
|
||||
derived_keys: Final = _derived_keys(bridged_fields)
|
||||
|
|
|
|||
|
|
@ -99,12 +99,12 @@ def test_chat_models_enable_bridge_flags_but_other_models_do_not() -> None:
|
|||
assert _flags(generated, "no_chat")["generateContent"] is False
|
||||
|
||||
|
||||
def test_unbacked_derived_flags_reset_and_handwritten_flags_remain() -> None:
|
||||
def test_unbacked_false_flags_stay_false_and_handwritten_flags_remain() -> None:
|
||||
cost_map: Final = {"example/model": {"litellm_provider": "example", "mode": "image_generation"}}
|
||||
current_json: Final = _current_json(
|
||||
{
|
||||
"example": _provider({"responses": True, "count_tokens": True, "files": False}),
|
||||
"without_models": _provider({"responses": True}),
|
||||
"example": _provider({"responses": False, "count_tokens": True, "files": False}),
|
||||
"without_models": _provider({"responses": False}),
|
||||
}
|
||||
)
|
||||
|
||||
|
|
@ -117,6 +117,26 @@ def test_unbacked_derived_flags_reset_and_handwritten_flags_remain() -> None:
|
|||
assert _flags(generated, "without_models")["chat_completions"] is False
|
||||
|
||||
|
||||
def test_true_flags_never_flip_to_false_through_regeneration() -> None:
|
||||
cost_map: Final = {"example/model": {"litellm_provider": "example", "mode": "image_generation"}}
|
||||
current_json: Final = _current_json(
|
||||
{
|
||||
"example": _provider({"responses": True, "embeddings": True}),
|
||||
"without_models": _provider({"chat_completions": True, "a2a": True}),
|
||||
}
|
||||
)
|
||||
|
||||
generated: Final = generate_provider_endpoints_support(cost_map, current_json)
|
||||
regenerated: Final = generate_provider_endpoints_support(cost_map, generated)
|
||||
|
||||
assert _flags(generated, "example")["responses"] is True
|
||||
assert _flags(generated, "example")["embeddings"] is True
|
||||
assert _flags(generated, "example")["image_generations"] is True
|
||||
assert _flags(generated, "without_models")["chat_completions"] is True
|
||||
assert _flags(generated, "without_models")["a2a"] is True
|
||||
assert regenerated == generated
|
||||
|
||||
|
||||
def test_provider_aliases_share_their_mapped_slugs() -> None:
|
||||
cost_map: Final = {
|
||||
"vertex/model-a": {"litellm_provider": "vertex_ai-chat", "mode": "chat"},
|
||||
|
|
|
|||
20
tests/integration/configuration/test_public_endpoints.py
Normal file
20
tests/integration/configuration/test_public_endpoints.py
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
from typing import Final
|
||||
|
||||
from integration._support.client import Gateway, list_value, object_value, string_value
|
||||
|
||||
PASS_THROUGH_PROVIDERS: Final = frozenset(
|
||||
{"openrouter", "litellm_proxy", "hosted_vllm", "custom_openai", "vllm", "huggingface"}
|
||||
)
|
||||
|
||||
|
||||
def _chat_completion_providers(gateway: Gateway) -> frozenset[str]:
|
||||
entries: Final = list_value(gateway.get("/public/endpoints")["endpoints"])
|
||||
entry: Final = next(object_value(value) for value in entries if object_value(value)["key"] == "chat_completions")
|
||||
return frozenset(string_value(object_value(provider)["slug"]) for provider in list_value(entry["providers"]))
|
||||
|
||||
|
||||
def test_pass_through_providers_are_listed_under_chat_completions(gateway: Gateway) -> None:
|
||||
listed: Final = _chat_completion_providers(gateway)
|
||||
missing: Final = sorted(PASS_THROUGH_PROVIDERS - listed)
|
||||
|
||||
assert missing == [], f"pass-through providers missing from chat_completions on /public/endpoints: {missing}"
|
||||
Loading…
Add table
Reference in a new issue