From 6c5f5fe36841a82e4a2a1aed95e0d28736acf288 Mon Sep 17 00:00:00 2001 From: Jun Siang Cheah Date: Sun, 26 May 2024 17:05:26 +0100 Subject: [PATCH 1/5] refac: move ui flags into feature flags --- backend/main.py | 12 +++++----- .../components/admin/Settings/Database.svelte | 2 +- .../chat/Messages/ResponseMessage.svelte | 2 +- src/lib/stores/index.ts | 22 +++++++++++-------- src/routes/auth/+page.svelte | 6 ++--- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/backend/main.py b/backend/main.py index 3d0e4fd4a..ab43da853 100644 --- a/backend/main.py +++ b/backend/main.py @@ -356,14 +356,16 @@ async def get_app_config(): "status": True, "name": WEBUI_NAME, "version": VERSION, - "auth": WEBUI_AUTH, - "auth_trusted_header": bool(webui_app.state.AUTH_TRUSTED_EMAIL_HEADER), - "enable_signup": webui_app.state.config.ENABLE_SIGNUP, - "enable_image_generation": images_app.state.config.ENABLED, - "enable_admin_export": ENABLE_ADMIN_EXPORT, "default_locale": default_locale, "default_models": webui_app.state.config.DEFAULT_MODELS, "default_prompt_suggestions": webui_app.state.config.DEFAULT_PROMPT_SUGGESTIONS, + "feature_flags": { + "auth": WEBUI_AUTH, + "enable_signup": webui_app.state.config.ENABLE_SIGNUP, + "auth_trusted_header": bool(webui_app.state.AUTH_TRUSTED_EMAIL_HEADER), + "enable_image_generation": images_app.state.config.ENABLED, + "enable_admin_export": ENABLE_ADMIN_EXPORT, + }, } diff --git a/src/lib/components/admin/Settings/Database.svelte b/src/lib/components/admin/Settings/Database.svelte index 711c1254f..87f29f4f5 100644 --- a/src/lib/components/admin/Settings/Database.svelte +++ b/src/lib/components/admin/Settings/Database.svelte @@ -34,7 +34,7 @@
{$i18n.t('Database')}
- {#if $config?.enable_admin_export ?? true} + {#if $config?.feature_flags.enable_admin_export ?? true}
diff --git a/src/lib/components/chat/Messages/ResponseMessage.svelte b/src/lib/components/chat/Messages/ResponseMessage.svelte index 619bcbc07..05d8f0cda 100644 --- a/src/lib/components/chat/Messages/ResponseMessage.svelte +++ b/src/lib/components/chat/Messages/ResponseMessage.svelte @@ -693,7 +693,7 @@ - {#if $config.enable_image_generation && !readOnly} + {#if $config?.feature_flags.enable_image_generation && !readOnly}