fix _setup_prisma_client

This commit is contained in:
Ishaan Jaff 2025-03-26 20:35:27 -07:00
parent 6f3be086b5
commit e46c789bb7
2 changed files with 11 additions and 11 deletions

View file

@ -18,9 +18,10 @@ class PrismaDBExceptionHandler:
""" """
Returns True if the request should be allowed to proceed despite the DB connection error 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 "allow_requests_on_db_unavailable", False
) )
if isinstance(_allow_requests_on_db_unavailable, bool): if isinstance(_allow_requests_on_db_unavailable, bool):

View file

@ -457,6 +457,14 @@ async def proxy_startup_event(app: FastAPI):
### LOAD MASTER KEY ### ### LOAD MASTER KEY ###
# check if master key set in environment - load from there # check if master key set in environment - load from there
master_key = get_secret("LITELLM_MASTER_KEY", None) # type: ignore 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 ## CHECK PREMIUM USER
verbose_proxy_logger.debug( verbose_proxy_logger.debug(
"litellm.proxy.proxy_server.py::startup() - CHECKING PREMIUM USER - {}".format( "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, 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 ## ## JWT AUTH ##
ProxyStartupEvent._initialize_jwt_auth( ProxyStartupEvent._initialize_jwt_auth(
general_settings=general_settings, general_settings=general_settings,