highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-09-21 14:12:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change EE environment variable name

Browse Source
This commit is contained in:
Weves
2024-06-25 16:31:07 -07:00
committed by Chris Weaver
parent 1ee8ee9e8b
commit 5d552705aa
6 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/env_template.txt vendored
View File

@@ -23,7 +23,8 @@ REQUIRE_EMAIL_VERIFICATION=False
# Toggles on/off the EE Features # 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 # Set these so if you wipe the DB, you don't end up having to go through the UI every time

2
backend/danswer/configs/app_configs.py
View File

@@ -289,5 +289,5 @@ CUSTOM_ANSWER_VALIDITY_CONDITIONS = json.loads(
# founders@danswer.ai OR message Chris Weaver or Yuhong Sun in the Danswer # 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) # Slack community (https://join.slack.com/t/danswer/shared_invite/zt-1w76msxmd-HJHLe3KNFIAIzk_0dSOKaQ)
ENTERPRISE_EDITION_ENABLED = ( ENTERPRISE_EDITION_ENABLED = (
os.environ.get("ENABLE_PAID_EE_FEATURES", "").lower() == "true" os.environ.get("ENABLE_PAID_ENTERPRISE_EDITION_FEATURES", "").lower() == "true"
) )

6
deployment/docker_compose/docker-compose.dev.yml
View File

@@ -88,7 +88,7 @@ services:
- LOG_ENDPOINT_LATENCY=${LOG_ENDPOINT_LATENCY:-} - LOG_ENDPOINT_LATENCY=${LOG_ENDPOINT_LATENCY:-}
# Enterprise Edition only # 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:-} - API_KEY_HASH_ROUNDS=${API_KEY_HASH_ROUNDS:-}
# Seeding configuration # Seeding configuration
- ENV_SEED_CONFIGURATION=${ENV_SEED_CONFIGURATION:-} - ENV_SEED_CONFIGURATION=${ENV_SEED_CONFIGURATION:-}
@@ -191,7 +191,7 @@ services:
- LOG_VESPA_TIMING_INFORMATION=${LOG_VESPA_TIMING_INFORMATION:-} - LOG_VESPA_TIMING_INFORMATION=${LOG_VESPA_TIMING_INFORMATION:-}
# Enterprise Edition stuff # 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: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
logging: logging:
@@ -226,7 +226,7 @@ services:
- THEME_IS_DARK=${THEME_IS_DARK:-} - THEME_IS_DARK=${THEME_IS_DARK:-}
# Enterprise Edition only # 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: inference_model_server:

6
deployment/docker_compose/docker-compose.gpu-dev.yml
View File

@@ -84,7 +84,7 @@ services:
# Enterprise Edition only # Enterprise Edition only
- API_KEY_HASH_ROUNDS=${API_KEY_HASH_ROUNDS:-} - 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: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
logging: logging:
@@ -184,7 +184,7 @@ services:
# Enterprise Edition only # Enterprise Edition only
- API_KEY_HASH_ROUNDS=${API_KEY_HASH_ROUNDS:-} - 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: extra_hosts:
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
logging: logging:
@@ -215,7 +215,7 @@ services:
- THEME_IS_DARK=${THEME_IS_DARK:-} - THEME_IS_DARK=${THEME_IS_DARK:-}
# Enterprise Edition only # 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: inference_model_server:

6
web/Dockerfile
View File

@@ -49,9 +49,6 @@ ENV NEXT_PUBLIC_NEGATIVE_PREDEFINED_FEEDBACK_OPTIONS=${NEXT_PUBLIC_NEGATIVE_PRED
ARG NEXT_PUBLIC_THEME ARG NEXT_PUBLIC_THEME
ENV NEXT_PUBLIC_THEME=${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 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} 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 ARG NEXT_PUBLIC_THEME
ENV NEXT_PUBLIC_THEME=${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 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} ENV NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED=${NEXT_PUBLIC_DO_NOT_USE_TOGGLE_OFF_DANSWER_POWERED}

2
web/src/lib/constants.ts
View File

@@ -30,7 +30,7 @@ export const LOGOUT_DISABLED =
// NOTE: this should ONLY be used on the server-side. If used client side, // NOTE: this should ONLY be used on the server-side. If used client side,
// it will not be accurate (will always be false). // it will not be accurate (will always be false).
export const SERVER_SIDE_ONLY__PAID_ENTERPRISE_FEATURES_ENABLED = 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 export const CUSTOM_ANALYTICS_ENABLED = process.env.CUSTOM_ANALYTICS_SECRET_KEY
? true ? true