scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-09-07 08:26:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 89

Revert "fix: model_group not always present in litellm_params, and metadata reference location (#15108)"

Browse source 
This reverts commit 7e56600896.
This commit is contained in:
Ishaan Jaffer 2025-10-04 12:48:07 -07:00
parent 07e1e0a7ca
commit 699072d302
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
litellm/proxy/common_utils/callback_utils.py
View file

@ -289,8 +289,8 @@ def initialize_callbacks_on_proxy( # noqa: PLR0915
def get_model_group_from_litellm_kwargs(kwargs: dict) -> Optional[str]:
_litellm_params = kwargs.get("litellm_params", None) or {}
_metadata = _litellm_params.get(get_metadata_variable_name_from_litellm_params(_litellm_params)) or {}
_model_group = _metadata.get("model_group", None) or kwargs.get("model", None)
_metadata = _litellm_params.get(get_metadata_variable_name_from_kwargs(kwargs)) or {}
_model_group = _metadata.get("model_group", None)
if _model_group is not None:
return _model_group
@ -367,8 +367,8 @@ def add_guardrail_to_applied_guardrails_header(
_metadata["applied_guardrails"] = [guardrail_name]
def get_metadata_variable_name_from_litellm_params(
litellm_params: dict
def get_metadata_variable_name_from_kwargs(
kwargs: dict
) -> Literal["metadata", "litellm_metadata"]:
"""
Helper to return what the "metadata" field should be called in the request data
@ -381,4 +381,4 @@ def get_metadata_variable_name_from_litellm_params(
- OpenAI then started using this field for their metadata
- LiteLLM is now moving to using `litellm_metadata` for our metadata
"""
return "litellm_metadata" if "litellm_metadata" in litellm_params else "metadata"
return "litellm_metadata" if "litellm_metadata" in kwargs else "metadata"

4
litellm/proxy/hooks/parallel_request_limiter_v3.py
View file

@ -865,7 +865,7 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger):
_get_parent_otel_span_from_kwargs,
)
from litellm.proxy.common_utils.callback_utils import (
get_metadata_variable_name_from_litellm_params,
get_metadata_variable_name_from_kwargs,
get_model_group_from_litellm_kwargs,
)
from litellm.types.caching import RedisPipelineIncrementOperation
@ -883,7 +883,7 @@ class _PROXY_MaxParallelRequestsHandler_v3(CustomLogger):
# Get metadata from kwargs
litellm_metadata = kwargs["litellm_params"].get(
get_metadata_variable_name_from_litellm_params(kwargs["litellm_params"]), {}
get_metadata_variable_name_from_kwargs(kwargs), {}
)
if litellm_metadata is None:
return