From 61cd800b9ffbb02c286481d2056b65c7fb5447bf Mon Sep 17 00:00:00 2001 From: Krrish Dholakia Date: Mon, 1 Jan 2024 17:49:54 +0530 Subject: [PATCH] fix(ui/admin.py): handles trailing '/' case --- docs/my-website/docs/proxy/ui.md | 11 +++++++++++ docs/my-website/sidebars.js | 1 + ui/admin.py | 11 ++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 docs/my-website/docs/proxy/ui.md diff --git a/docs/my-website/docs/proxy/ui.md b/docs/my-website/docs/proxy/ui.md new file mode 100644 index 000000000..1cac1fb23 --- /dev/null +++ b/docs/my-website/docs/proxy/ui.md @@ -0,0 +1,11 @@ +# [BETA] Self-serve UI + +Allow your users to create their own keys through a UI + +:::info + +This is in beta, so things may change. If you have feedback, [let us know](https://discord.com/invite/wuPM9dRgDw) + +::: + + diff --git a/docs/my-website/sidebars.js b/docs/my-website/sidebars.js index d53a39d6c..95c8bf957 100644 --- a/docs/my-website/sidebars.js +++ b/docs/my-website/sidebars.js @@ -105,6 +105,7 @@ const sidebars = { "proxy/user_keys", "proxy/load_balancing", "proxy/virtual_keys", + "proxy/ui", "proxy/users", "proxy/model_management", "proxy/reliability", diff --git a/ui/admin.py b/ui/admin.py index 196091d2b..e8d439966 100644 --- a/ui/admin.py +++ b/ui/admin.py @@ -22,9 +22,14 @@ def update_config(proxy_url, allowed_email_subdomain, admin_emails): st.session_state["proxy_url"] = proxy_url st.session_state["allowed_email_subdomain"] = allowed_email_subdomain st.session_state["admin_emails"] = admin_emails - st.session_state[ - "user_auth_url" - ] = f"{your_base_url}/user?page={encode_config(proxy_url=proxy_url, allowed_email_subdomain=allowed_email_subdomain, admin_emails=admin_emails)}" + if your_base_url.endswith("/"): + st.session_state[ + "user_auth_url" + ] = f"{your_base_url}user?page={encode_config(proxy_url=proxy_url, allowed_email_subdomain=allowed_email_subdomain, admin_emails=admin_emails)}" + else: + st.session_state[ + "user_auth_url" + ] = f"{your_base_url}/user?page={encode_config(proxy_url=proxy_url, allowed_email_subdomain=allowed_email_subdomain, admin_emails=admin_emails)}" st.session_state["is_admin"] = True