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

build: Squashed commit of the following:

Browse source 
commit 3e4e2cb20a
Author: Krrish Dholakia <krrishdholakia@gmail.com>
Date:   Tue Feb 4 15:10:34 2025 -0800

    fix(proxy_server.py): fix redirect from `/sso/key/callback` to redirect on custom server path

    Fixes https://github.com/BerriAI/litellm/issues/5997
This commit is contained in:
Krrish Dholakia 2025-02-04 21:45:33 -08:00
parent 75d9b02473
commit df9056e9b7
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
litellm/proxy/proxy_server.py
View file

@ -425,7 +425,6 @@ async def proxy_startup_event(app: FastAPI):
import json import json
init_verbose_loggers() init_verbose_loggers()
### 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
@ -691,12 +690,18 @@ try:
@app.middleware("http") @app.middleware("http")
async def redirect_ui_middleware(request: Request, call_next): async def redirect_ui_middleware(request: Request, call_next):
if request.url.path.startswith("/ui"): if request.url.path.startswith("/ui"):
new_path = request.url.path.replace("/ui", f"{server_root_path}/ui", 1) new_url = str(request.url).replace("/ui", f"{server_root_path}/ui", 1)
return RedirectResponse(new_path) return RedirectResponse(new_url)
return await call_next(request) return await call_next(request)
except Exception: except Exception:
pass pass
# current_dir = os.path.dirname(os.path.abspath(__file__))
# ui_path = os.path.join(current_dir, "_experimental", "out")
# # Mount this test directory instead
# app.mount("/ui", StaticFiles(directory=ui_path, html=True), name="ui")
app.add_middleware( app.add_middleware(
CORSMiddleware, CORSMiddleware,
allow_origins=origins, allow_origins=origins,

2
litellm/utils.py
View file

@ -1725,7 +1725,7 @@ def _format_type(props, indent):
def token_counter( def token_counter(
model="", model="",
custom_tokenizer: Optional[dict] = None, custom_tokenizer: Optional[Union[dict, SelectTokenizerResponse]] = None,
text: Optional[Union[str, List[str]]] = None, text: Optional[Union[str, List[str]]] = None,
messages: Optional[List] = None, messages: Optional[List] = None,
count_response_tokens: Optional[bool] = False, count_response_tokens: Optional[bool] = False,