phoenix/litellm
1
0
Fork 0
forked from phoenix/litellm-mirror
Code Pull requests Activity

(fix) proxy - don't overwrite metadata passed

Browse source
This commit is contained in:
ishaan-jaff 2023-11-30 15:15:47 -08:00
parent f305c3aaef
commit bc2299184b
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
litellm/proxy/proxy_server.py
View file

@ -679,7 +679,11 @@ async def completion(request: Request, model: Optional[str] = None, user_api_key
if user_model: if user_model:
data["model"] = user_model data["model"] = user_model
data["call_type"] = "text_completion" data["call_type"] = "text_completion"
data["metadata"] = {"user_api_key": user_api_key_dict["api_key"]} if "metadata" in data:
data["metadata"]["user_api_key"] = user_api_key_dict["api_key"]
else:
data["metadata"] = {"user_api_key": user_api_key_dict["api_key"]}
return litellm_completion( return litellm_completion(
**data **data
) )
@ -716,7 +720,11 @@ async def chat_completion(request: Request, model: Optional[str] = None, user_ap
or model # for azure deployments or model # for azure deployments
or data["model"] # default passed in http request or data["model"] # default passed in http request
) )
data["metadata"] = {"user_api_key": user_api_key_dict["api_key"]}
if "metadata" in data:
data["metadata"]["user_api_key"] = user_api_key_dict["api_key"]
else:
data["metadata"] = {"user_api_key": user_api_key_dict["api_key"]}
global user_temperature, user_request_timeout, user_max_tokens, user_api_base global user_temperature, user_request_timeout, user_max_tokens, user_api_base
# override with user settings, these are params passed via cli # override with user settings, these are params passed via cli
@ -776,7 +784,11 @@ async def embeddings(request: Request, user_api_key_dict: dict = Depends(user_ap
) )
if user_model: if user_model:
data["model"] = user_model data["model"] = user_model
data["metadata"] = {"user_api_key": user_api_key_dict["api_key"]} if "metadata" in data:
data["metadata"]["user_api_key"] = user_api_key_dict["api_key"]
else:
data["metadata"] = {"user_api_key": user_api_key_dict["api_key"]}
## ROUTE TO CORRECT ENDPOINT ## ## ROUTE TO CORRECT ENDPOINT ##
router_model_names = [m["model_name"] for m in llm_model_list] if llm_model_list is not None else [] router_model_names = [m["model_name"] for m in llm_model_list] if llm_model_list is not None else []
if llm_router is not None and data["model"] in router_model_names: # model in router model list if llm_router is not None and data["model"] in router_model_names: # model in router model list