phoenix/litellm-mirror
0
0
Fork 1
mirror of https://github.com/BerriAI/litellm.git synced 2025-04-26 11:14:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix order of _setup_prisma_client

Browse source
This commit is contained in:
Ishaan Jaff 2025-03-26 20:42:01 -07:00
parent e46c789bb7
commit 155a53c426
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
litellm/proxy/db/exception_handler.py
View file

@ -18,10 +18,9 @@ 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 proxy_config from litellm.proxy.proxy_server import general_settings
_general_settings = proxy_config.config _allow_requests_on_db_unavailable: Union[bool, str] = general_settings.get(
_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):

23
litellm/proxy/proxy_server.py
View file

@ -454,17 +454,6 @@ async def proxy_startup_event(app: FastAPI):
import json import json
init_verbose_loggers() init_verbose_loggers()
### 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 ## 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(
@ -521,6 +510,18 @@ async def proxy_startup_event(app: FastAPI):
if isinstance(worker_config, dict): if isinstance(worker_config, dict):
await initialize(**worker_config) await initialize(**worker_config)
### 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,
)
ProxyStartupEvent._initialize_startup_logging( ProxyStartupEvent._initialize_startup_logging(
llm_router=llm_router, llm_router=llm_router,
proxy_logging_obj=proxy_logging_obj, proxy_logging_obj=proxy_logging_obj,