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

(ui) remove the need for setting PROXY_BASE_URL

Browse source
This commit is contained in:
ishaan-jaff 2024-02-01 13:07:31 -08:00
parent 24dc49cfcf
commit 891c5ad056
1 changed files with 6 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

39
litellm/proxy/proxy_server.py
View file

@ -115,12 +115,8 @@ import json
import logging import logging
from typing import Union from typing import Union
proxy_base_url = os.getenv("PROXY_BASE_URL", None) ui_link = f"/ui/"
ui_link = f"/ui/?proxyBaseUrl={proxy_base_url}"
ui_message = f"👉 [LiteLLM Admin Panel on /ui]({ui_link}). Create, Edit Keys with SSO" ui_message = f"👉 [LiteLLM Admin Panel on /ui]({ui_link}). Create, Edit Keys with SSO"
if proxy_base_url is None:
ui_message = "👉 LiteLLM Admin Panel - 'PROXY_BASE_URL' not set in env, see [UI docs](https://docs.litellm.ai/docs/proxy/ui)"
app = FastAPI( app = FastAPI(
docs_url="/", docs_url="/",
title="LiteLLM API", title="LiteLLM API",
@ -2960,17 +2956,11 @@ async def google_login(request: Request):
""" """
microsoft_client_id = os.getenv("MICROSOFT_CLIENT_ID", None) microsoft_client_id = os.getenv("MICROSOFT_CLIENT_ID", None)
google_client_id = os.getenv("GOOGLE_CLIENT_ID", None) google_client_id = os.getenv("GOOGLE_CLIENT_ID", None)
redirect_url = os.getenv("PROXY_BASE_URL", None)
# get url from request
redirect_url = str(request.base_url)
ui_username = os.getenv("UI_USERNAME") ui_username = os.getenv("UI_USERNAME")
if redirect_url is None:
raise ProxyException(
message="PROXY_BASE_URL not set. Set it in .env file",
type="auth_error",
param="PROXY_BASE_URL",
code=status.HTTP_500_INTERNAL_SERVER_ERROR,
)
if redirect_url.endswith("/"): if redirect_url.endswith("/"):
redirect_url += "sso/callback" redirect_url += "sso/callback"
else: else:
@ -3166,31 +3156,14 @@ async def auth_callback(request: Request):
key = response["token"] # type: ignore key = response["token"] # type: ignore
user_id = response["user_id"] # type: ignore user_id = response["user_id"] # type: ignore
# get current host:port/ui litellm_dashboard_ui = "/ui/"
proxy_base_url = os.getenv("PROXY_BASE_URL", None)
if proxy_base_url is None:
raise ProxyException(
message="PROXY_BASE_URL not set. Set it in .env file",
type="auth_error",
param="PROXY_BASE_URL",
code=status.HTTP_500_INTERNAL_SERVER_ERROR,
)
litellm_dashboard_ui = proxy_base_url
if proxy_base_url.endswith("/"):
litellm_dashboard_ui += "ui/"
proxy_base_url = proxy_base_url[:-1]
else:
litellm_dashboard_ui += "/ui/"
import jwt import jwt
jwt_token = jwt.encode( jwt_token = jwt.encode(
{"user_id": user_id, "key": key}, "secret", algorithm="HS256" {"user_id": user_id, "key": key}, "secret", algorithm="HS256"
) )
litellm_dashboard_ui += ( litellm_dashboard_ui += "?userID=" + user_id + "&token=" + jwt_token
"?userID=" + user_id + "&token=" + jwt_token + "&proxyBaseUrl=" + proxy_base_url
)
# if a user has logged in they should be allowed to create keys - this ensures that it's set to True # if a user has logged in they should be allowed to create keys - this ensures that it's set to True
general_settings["allow_user_auth"] = True general_settings["allow_user_auth"] = True