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 15:10:34 -08:00
parent 27e1e22a0f
commit 3e4e2cb20a
6 changed files with 10 additions and 8 deletions

View file

@ -3909,7 +3909,7 @@
"mode": "chat",
"supports_function_calling": true
},
"vertex_ai/codestral@2405": {
"vertex_ai/codestral@2501": {
"max_tokens": 128000,
"max_input_tokens": 128000,
"max_output_tokens": 128000,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -425,7 +425,6 @@ async def proxy_startup_event(app: FastAPI):
import json
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
@ -691,12 +690,18 @@ try:
@app.middleware("http")
async def redirect_ui_middleware(request: Request, call_next):
if request.url.path.startswith("/ui"):
new_path = request.url.path.replace("/ui", f"{server_root_path}/ui", 1)
return RedirectResponse(new_path)
new_url = str(request.url).replace("/ui", f"{server_root_path}/ui", 1)
return RedirectResponse(new_url)
return await call_next(request)
except Exception:
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(
CORSMiddleware,
allow_origins=origins,

View file

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