From 5d552705aa5fe505dca3f18d3d8521034c156f38 Mon Sep 17 00:00:00 2001 From: Weves Date: Tue, 25 Jun 2024 16:31:07 -0700 Subject: [PATCH] Change EE environment variable name --- .vscode/env_template.txt | 3 ++- backend/danswer/configs/app_configs.py | 2 +- deployment/docker_compose/docker-compose.dev.yml | 6 +++--- deployment/docker_compose/docker-compose.gpu-dev.yml | 6 +++--- web/Dockerfile | 6 ------ web/src/lib/constants.ts | 2 +- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.vscode/env_template.txt b/.vscode/env_template.txt index 684c48cf1..c257949e2 100644 --- a/.vscode/env_template.txt +++ b/.vscode/env_template.txt @@ -23,7 +23,8 @@ REQUIRE_EMAIL_VERIFICATION=False # Toggles on/off the EE Features -ENABLE_PAID_EE_FEATURES=False +# NOTE: DO NOT ENABLE THIS UNLESS YOU HAVE A PAID ENTERPRISE LICENSE +ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=False # Set these so if you wipe the DB, you don't end up having to go through the UI every time diff --git a/backend/danswer/configs/app_configs.py b/backend/danswer/configs/app_configs.py index d369c9a04..92995ac44 100644 --- a/backend/danswer/configs/app_configs.py +++ b/backend/danswer/configs/app_configs.py @@ -289,5 +289,5 @@ CUSTOM_ANSWER_VALIDITY_CONDITIONS = json.loads( # founders@danswer.ai OR message Chris Weaver or Yuhong Sun in the Danswer # Slack community (https://join.slack.com/t/danswer/shared_invite/zt-1w76msxmd-HJHLe3KNFIAIzk_0dSOKaQ) ENTERPRISE_EDITION_ENABLED = ( - os.environ.get("ENABLE_PAID_EE_FEATURES", "").lower() == "true" + os.environ.get("ENABLE_PAID_ENTERPRISE_EDITION_FEATURES", "").lower() == "true" ) diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml index 2681888df..1c78461aa 100644 --- a/deployment/docker_compose/docker-compose.dev.yml +++ b/deployment/docker_compose/docker-compose.dev.yml @@ -88,7 +88,7 @@ services: - LOG_ENDPOINT_LATENCY=${LOG_ENDPOINT_LATENCY:-} # Enterprise Edition only - - ENABLE_PAID_EE_FEATURES=${ENABLE_PAID_EE_FEATURES:-false} + - ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=${ENABLE_PAID_ENTERPRISE_EDITION_FEATURES:-false} - API_KEY_HASH_ROUNDS=${API_KEY_HASH_ROUNDS:-} # Seeding configuration - ENV_SEED_CONFIGURATION=${ENV_SEED_CONFIGURATION:-} @@ -191,7 +191,7 @@ services: - LOG_VESPA_TIMING_INFORMATION=${LOG_VESPA_TIMING_INFORMATION:-} # Enterprise Edition stuff - - ENABLE_PAID_EE_FEATURES=${ENABLE_PAID_EE_FEATURES:-false} + - ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=${ENABLE_PAID_ENTERPRISE_EDITION_FEATURES:-false} extra_hosts: - "host.docker.internal:host-gateway" logging: @@ -226,7 +226,7 @@ services: - THEME_IS_DARK=${THEME_IS_DARK:-} # Enterprise Edition only - - ENABLE_PAID_EE_FEATURES=${ENABLE_PAID_EE_FEATURES:-false} + - ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=${ENABLE_PAID_ENTERPRISE_EDITION_FEATURES:-false} inference_model_server: diff --git a/deployment/docker_compose/docker-compose.gpu-dev.yml b/deployment/docker_compose/docker-compose.gpu-dev.yml index dd0df8840..4b204d4e0 100644 --- a/deployment/docker_compose/docker-compose.gpu-dev.yml +++ b/deployment/docker_compose/docker-compose.gpu-dev.yml @@ -84,7 +84,7 @@ services: # Enterprise Edition only - API_KEY_HASH_ROUNDS=${API_KEY_HASH_ROUNDS:-} - - ENABLE_PAID_EE_FEATURES=${ENABLE_PAID_EE_FEATURES:-false} + - ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=${ENABLE_PAID_ENTERPRISE_EDITION_FEATURES:-false} extra_hosts: - "host.docker.internal:host-gateway" logging: @@ -184,7 +184,7 @@ services: # Enterprise Edition only - API_KEY_HASH_ROUNDS=${API_KEY_HASH_ROUNDS:-} - - ENABLE_PAID_EE_FEATURES=${ENABLE_PAID_EE_FEATURES:-false} + - ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=${ENABLE_PAID_ENTERPRISE_EDITION_FEATURES:-false} extra_hosts: - "host.docker.internal:host-gateway" logging: @@ -215,7 +215,7 @@ services: - THEME_IS_DARK=${THEME_IS_DARK:-} # Enterprise Edition only - - ENABLE_PAID_EE_FEATURES=${ENABLE_PAID_EE_FEATURES:-false} + - ENABLE_PAID_ENTERPRISE_EDITION_FEATURES=${ENABLE_PAID_ENTERPRISE_EDITION_FEATURES:-false} inference_model_server: diff --git a/web/Dockerfile b/web/Dockerfile index 078a55c9f..585b1fb75 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -49,9 +49,6 @@ ENV NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_NEGATIVE_PRED ARG NEXT_PUBLIC_THEME ENV NEXT_PUBLIC_THEME=${NEXT_PUBLIC_THEME} -ARG NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES -ENV NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES=${NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES} - ARG NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED ENV NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED=${NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED} @@ -106,9 +103,6 @@ ENV NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_NEGATIVE_PRED ARG NEXT_PUBLIC_THEME ENV NEXT_PUBLIC_THEME=${NEXT_PUBLIC_THEME} -ARG NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES -ENV NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES=${NEXT_PUBLIC_ENABLE_PAID_EE_FEATURES} - ARG NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED ENV NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED=${NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED} diff --git a/web/src/lib/constants.ts b/web/src/lib/constants.ts index ba6d491d7..fc3b187c4 100644 --- a/web/src/lib/constants.ts +++ b/web/src/lib/constants.ts @@ -30,7 +30,7 @@ export const LOGOUT_DISABLED = // NOTE: this should ONLY be used on the server-side. If used client side, // it will not be accurate (will always be false). export const SERVER_SIDE_ONLY__PAID_ENTERPRISE_FEATURES_ENABLED = - process.env.ENABLE_PAID_EE_FEATURES?.toLowerCase() === "true"; + process.env.ENABLE_PAID_ENTERPRISE_EDITION_FEATURES?.toLowerCase() === "true"; export const CUSTOM_ANALYTICS_ENABLED = process.env.CUSTOM_ANALYTICS_SECRET_KEY ? true