mirror of
https://github.com/BerriAI/litellm.git
synced 2025-04-26 03:04:13 +00:00
fix(router.py): use litellm.request_timeout
as default for router clients
This commit is contained in:
parent
90f5aa7125
commit
1de5235ba0
2 changed files with 14 additions and 2 deletions
|
@ -2869,7 +2869,7 @@ class Router:
|
||||||
api_version = litellm.get_secret(api_version_env_name)
|
api_version = litellm.get_secret(api_version_env_name)
|
||||||
litellm_params["api_version"] = api_version
|
litellm_params["api_version"] = api_version
|
||||||
|
|
||||||
timeout = litellm_params.pop("timeout", None)
|
timeout = litellm_params.pop("timeout", None) or litellm.request_timeout
|
||||||
if isinstance(timeout, str) and timeout.startswith("os.environ/"):
|
if isinstance(timeout, str) and timeout.startswith("os.environ/"):
|
||||||
timeout_env_name = timeout.replace("os.environ/", "")
|
timeout_env_name = timeout.replace("os.environ/", "")
|
||||||
timeout = litellm.get_secret(timeout_env_name)
|
timeout = litellm.get_secret(timeout_env_name)
|
||||||
|
|
|
@ -11941,11 +11941,23 @@ class CustomStreamWrapper:
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
return processed_chunk
|
return processed_chunk
|
||||||
|
except httpx.TimeoutException as e: # if httpx read timeout error occues
|
||||||
|
traceback_exception = traceback.format_exc()
|
||||||
|
## ADD DEBUG INFORMATION - E.G. LITELLM REQUEST TIMEOUT
|
||||||
|
traceback_exception += "\nLiteLLM Default Request Timeout - {}".format(
|
||||||
|
litellm.request_timeout
|
||||||
|
)
|
||||||
|
if self.logging_obj is not None:
|
||||||
|
# Handle any exceptions that might occur during streaming
|
||||||
|
asyncio.create_task(
|
||||||
|
self.logging_obj.async_failure_handler(e, traceback_exception)
|
||||||
|
)
|
||||||
|
raise e
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
traceback_exception = traceback.format_exc()
|
traceback_exception = traceback.format_exc()
|
||||||
# Handle any exceptions that might occur during streaming
|
# Handle any exceptions that might occur during streaming
|
||||||
asyncio.create_task(
|
asyncio.create_task(
|
||||||
self.logging_obj.async_failure_handler(e, traceback_exception)
|
self.logging_obj.async_failure_handler(e, traceback_exception) # type: ignore
|
||||||
)
|
)
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue