Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions litellm/proxy/management_endpoints/key_management_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,13 @@ async def _enforce_email_prefix_on_key_alias(
if key_alias is None:
return None
ui_settings = await get_ui_settings_cached()
if ui_settings.get("enforce_email_prefix_on_key_alias") is not True:
if "enforce_email_prefix_on_key_alias" in ui_settings:
is_enabled = ui_settings["enforce_email_prefix_on_key_alias"] is True
else:
from litellm.proxy.proxy_server import general_settings

is_enabled = general_settings.get("enforce_email_prefix_on_key_alias") is True
if not is_enabled:
return key_alias
resolved_email = next(
(email.strip() for email in (owner_email, fallback_email) if email is not None and email.strip()),
Expand Down Expand Up @@ -1073,6 +1079,8 @@ async def _common_key_generation_helper(
fallback_email=user_api_key_dict.user_email,
)

verbose_proxy_logger.warning(f'data_json["key_alias"]: {data_json["key_alias"]}')

_validate_key_alias_format(key_alias=data_json.get("key_alias", None))

await _enforce_unique_key_alias(
Expand Down Expand Up @@ -2034,11 +2042,14 @@ async def prepare_key_update_data(
owner_email=(
await _get_user_email_by_id(
prisma_client=prisma_client,
user_id=cast(Optional[str], non_default_values.get("user_id", existing_key_row.user_id)),
user_id=cast(
Optional[str],
non_default_values.get("user_id", existing_key_row.user_id),
),
)
)
or getattr(existing_key_row, "user_email", None),
fallback_email=user_api_key_dict.user_email if user_api_key_dict is not None else None,
fallback_email=(user_api_key_dict.user_email if user_api_key_dict is not None else None),
)

return non_default_values
Expand Down
11 changes: 6 additions & 5 deletions terraform/litellm/aws/config/prod/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@ proxy_config = {
},
]
general_settings = {
master_key = "os.environ/LITELLM_MASTER_KEY"
database_url = "os.environ/DATABASE_URL"
alerting = ["email", "slack_budget_alerts", "slack"]
alert_types = ["budget_alerts", "spend_reports"]
alerting_threshold = 300
master_key = "os.environ/LITELLM_MASTER_KEY"
database_url = "os.environ/DATABASE_URL"
enforce_email_prefix_on_key_alias = true
alerting = ["email", "slack_budget_alerts", "slack"]
alert_types = ["budget_alerts", "spend_reports"]
alerting_threshold = 300
alerting_args = {
daily_report_frequency = 43200 # 12 hours in seconds
report_check_interval = 3600 # 1 hour in seconds
Expand Down
Loading
Loading