forked from phoenix/litellm-mirror
fix _select_model_name_for_cost_calc
This commit is contained in:
parent
e0f1f18339
commit
501ced09ba
1 changed files with 2 additions and 4 deletions
|
@ -454,13 +454,14 @@ def _select_model_name_for_cost_calc(
|
||||||
|
|
||||||
if base_model is not None:
|
if base_model is not None:
|
||||||
return base_model
|
return base_model
|
||||||
|
|
||||||
return_model = model
|
return_model = model
|
||||||
if isinstance(completion_response, str):
|
if isinstance(completion_response, str):
|
||||||
return return_model
|
return return_model
|
||||||
|
|
||||||
elif return_model is None and hasattr(completion_response, "get"):
|
elif return_model is None and hasattr(completion_response, "get"):
|
||||||
return_model = completion_response.get("model", "") # type: ignore
|
return_model = completion_response.get("model", "") # type: ignore
|
||||||
|
elif hasattr(completion_response, "model"):
|
||||||
|
return_model = completion_response.model # type: ignore
|
||||||
hidden_params = getattr(completion_response, "_hidden_params", None)
|
hidden_params = getattr(completion_response, "_hidden_params", None)
|
||||||
|
|
||||||
if hidden_params is not None:
|
if hidden_params is not None:
|
||||||
|
@ -857,9 +858,6 @@ def response_cost_calculator(
|
||||||
else:
|
else:
|
||||||
if isinstance(response_object, BaseModel):
|
if isinstance(response_object, BaseModel):
|
||||||
response_object._hidden_params["optional_params"] = optional_params
|
response_object._hidden_params["optional_params"] = optional_params
|
||||||
|
|
||||||
if custom_pricing is True: # override defaults if custom pricing is set
|
|
||||||
base_model = model
|
|
||||||
# base_model defaults to None if not set on model_info
|
# base_model defaults to None if not set on model_info
|
||||||
response_cost = completion_cost(
|
response_cost = completion_cost(
|
||||||
completion_response=response_object,
|
completion_response=response_object,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue