Skip to content

Commit f10af75

Browse files
author
Krrish Dholakia
committed
fix(utils.py): allow dropping extra_body in additional_drop_params
Fixes BerriAI#4769
1 parent 00d431e commit f10af75

2 files changed

Lines changed: 21 additions & 16 deletions

File tree

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
model_list:
2-
- model_name: azure-mistral
2+
- model_name: groq-llama3
33
litellm_params:
4-
model: azure_ai/mistral
5-
api_key: os.environ/AZURE_AI_MISTRAL_API_KEY
6-
api_base: os.environ/AZURE_AI_MISTRAL_API_BASE
7-
8-
litellm_settings:
9-
drop_params: true
4+
model: groq/llama3-groq-70b-8192-tool-use-preview
5+
api_key: os.environ/GROQ_API_KEY

litellm/utils.py

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3667,16 +3667,25 @@ def _map_and_modify_arg(supported_params: dict, provider: str, model: str):
36673667
+ litellm.openai_compatible_providers
36683668
):
36693669
# for openai, azure we should pass the extra/passed params within `extra_body` https://github.com/openai/openai-python/blob/ac33853ba10d13ac149b1fa3ca6dba7d613065c9/src/openai/resources/models.py#L46
3670-
extra_body = passed_params.pop("extra_body", {})
3671-
for k in passed_params.keys():
3672-
if k not in default_params.keys():
3673-
extra_body[k] = passed_params[k]
3674-
optional_params.setdefault("extra_body", {})
3675-
optional_params["extra_body"] = {**optional_params["extra_body"], **extra_body}
3670+
if (
3671+
_should_drop_param(
3672+
k="extra_body", additional_drop_params=additional_drop_params
3673+
)
3674+
is False
3675+
):
3676+
extra_body = passed_params.pop("extra_body", {})
3677+
for k in passed_params.keys():
3678+
if k not in default_params.keys():
3679+
extra_body[k] = passed_params[k]
3680+
optional_params.setdefault("extra_body", {})
3681+
optional_params["extra_body"] = {
3682+
**optional_params["extra_body"],
3683+
**extra_body,
3684+
}
36763685

3677-
optional_params["extra_body"] = _ensure_extra_body_is_safe(
3678-
extra_body=optional_params["extra_body"]
3679-
)
3686+
optional_params["extra_body"] = _ensure_extra_body_is_safe(
3687+
extra_body=optional_params["extra_body"]
3688+
)
36803689
else:
36813690
# if user passed in non-default kwargs for specific providers/models, pass them along
36823691
for k in passed_params.keys():

0 commit comments

Comments
 (0)