Skip to content

fix(proxy): preserve master_key set by initialize() during lifespan startup #22396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
giulio-leone wants to merge 1 commit into from
Closed

fix(proxy): preserve master_key set by initialize() during lifespan startup #22396

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion litellm/proxy/proxy_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,13 @@ async def proxy_startup_event(app: FastAPI): # noqa: PLR0915
premium_user = _license_check.is_premium()

## CHECK MASTER KEY IN ENVIRONMENT ##
master_key = get_secret_str("LITELLM_MASTER_KEY")
# Only overwrite master_key from env var if it is actually set.
# initialize() may have already configured master_key from a config file;
# unconditionally assigning None here would discard that value when the
# LITELLM_MASTER_KEY env var is absent (e.g. programmatic startup, tests).
_env_master_key = get_secret_str("LITELLM_MASTER_KEY")
if _env_master_key:
master_key = _env_master_key
### LOAD CONFIG ###
worker_config: Optional[Union[str, dict]] = get_secret("WORKER_CONFIG") # type: ignore
env_config_yaml: Optional[str] = get_secret_str("CONFIG_FILE_PATH")
Expand Down
Loading