mirror of
https://github.com/BerriAI/litellm.git
synced 2025-04-27 11:43:54 +00:00
fix: custom_llm_provider needs to be set before setting timeout
This commit is contained in:
parent
b37449f99c
commit
91ee911cb4
1 changed files with 10 additions and 14 deletions
|
@ -674,20 +674,6 @@ def completion(
|
||||||
k: v for k, v in kwargs.items() if k not in default_params
|
k: v for k, v in kwargs.items() if k not in default_params
|
||||||
} # model-specific params - pass them straight to the model/provider
|
} # model-specific params - pass them straight to the model/provider
|
||||||
|
|
||||||
### TIMEOUT LOGIC ###
|
|
||||||
timeout = timeout or kwargs.get("request_timeout", 600) or 600
|
|
||||||
# set timeout for 10 minutes by default
|
|
||||||
|
|
||||||
if (
|
|
||||||
timeout is not None
|
|
||||||
and isinstance(timeout, httpx.Timeout)
|
|
||||||
and supports_httpx_timeout(custom_llm_provider) == False
|
|
||||||
):
|
|
||||||
read_timeout = timeout.read or 600
|
|
||||||
timeout = read_timeout # default 10 min timeout
|
|
||||||
elif timeout is not None and not isinstance(timeout, httpx.Timeout):
|
|
||||||
timeout = float(timeout) # type: ignore
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if base_url is not None:
|
if base_url is not None:
|
||||||
api_base = base_url
|
api_base = base_url
|
||||||
|
@ -727,6 +713,16 @@ def completion(
|
||||||
"aws_region_name", None
|
"aws_region_name", None
|
||||||
) # support region-based pricing for bedrock
|
) # support region-based pricing for bedrock
|
||||||
|
|
||||||
|
### TIMEOUT LOGIC ###
|
||||||
|
timeout = timeout or kwargs.get("request_timeout", 600) or 600
|
||||||
|
# set timeout for 10 minutes by default
|
||||||
|
if isinstance(timeout, httpx.Timeout) and not supports_httpx_timeout(
|
||||||
|
custom_llm_provider
|
||||||
|
):
|
||||||
|
timeout = timeout.read or 600 # default 10 min timeout
|
||||||
|
elif not isinstance(timeout, httpx.Timeout):
|
||||||
|
timeout = float(timeout) # type: ignore
|
||||||
|
|
||||||
### REGISTER CUSTOM MODEL PRICING -- IF GIVEN ###
|
### REGISTER CUSTOM MODEL PRICING -- IF GIVEN ###
|
||||||
if input_cost_per_token is not None and output_cost_per_token is not None:
|
if input_cost_per_token is not None and output_cost_per_token is not None:
|
||||||
litellm.register_model(
|
litellm.register_model(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue