From 427580eff512fbdafec90157d443c4d1de63332d Mon Sep 17 00:00:00 2001 From: Ishaan Jaff Date: Wed, 26 Mar 2025 20:35:27 -0700 Subject: [PATCH] fix _setup_prisma_client --- litellm/proxy/db/exception_handler.py | 5 +++-- litellm/proxy/proxy_server.py | 17 ++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/litellm/proxy/db/exception_handler.py b/litellm/proxy/db/exception_handler.py index db73f9e9c93..79229f1e1bb 100644 --- a/litellm/proxy/db/exception_handler.py +++ b/litellm/proxy/db/exception_handler.py @@ -18,9 +18,10 @@ class PrismaDBExceptionHandler: """ Returns True if the request should be allowed to proceed despite the DB connection error """ - from litellm.proxy.proxy_server import general_settings + from litellm.proxy.proxy_server import proxy_config - _allow_requests_on_db_unavailable: Union[bool, str] = general_settings.get( + _general_settings = proxy_config.config + _allow_requests_on_db_unavailable: Union[bool, str] = _general_settings.get( "allow_requests_on_db_unavailable", False ) if isinstance(_allow_requests_on_db_unavailable, bool): diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index 59b4bc8fe34..67d88b9d322 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -457,6 +457,14 @@ async def proxy_startup_event(app: FastAPI): ### LOAD MASTER KEY ### # check if master key set in environment - load from there master_key = get_secret("LITELLM_MASTER_KEY", None) # type: ignore + # check if DATABASE_URL in environment - load from there + if prisma_client is None: + _db_url: Optional[str] = get_secret("DATABASE_URL", None) # type: ignore + prisma_client = await ProxyStartupEvent._setup_prisma_client( + database_url=_db_url, + proxy_logging_obj=proxy_logging_obj, + user_api_key_cache=user_api_key_cache, + ) ## CHECK PREMIUM USER verbose_proxy_logger.debug( "litellm.proxy.proxy_server.py::startup() - CHECKING PREMIUM USER - {}".format( @@ -519,15 +527,6 @@ async def proxy_startup_event(app: FastAPI): redis_usage_cache=redis_usage_cache, ) - # check if DATABASE_URL in environment - load from there - if prisma_client is None: - _db_url: Optional[str] = get_secret("DATABASE_URL", None) # type: ignore - prisma_client = await ProxyStartupEvent._setup_prisma_client( - database_url=_db_url, - proxy_logging_obj=proxy_logging_obj, - user_api_key_cache=user_api_key_cache, - ) - ## JWT AUTH ## ProxyStartupEvent._initialize_jwt_auth( general_settings=general_settings,