refac
Some checks are pending
Deploy to HuggingFace Spaces / check-secret (push) Waiting to run
Deploy to HuggingFace Spaces / deploy (push) Blocked by required conditions
Create and publish Docker images with specific build args / build-main-image (linux/amd64) (push) Waiting to run
Create and publish Docker images with specific build args / build-main-image (linux/arm64) (push) Waiting to run
Create and publish Docker images with specific build args / build-cuda-image (linux/amd64) (push) Waiting to run
Create and publish Docker images with specific build args / build-cuda-image (linux/arm64) (push) Waiting to run
Create and publish Docker images with specific build args / build-ollama-image (linux/amd64) (push) Waiting to run
Create and publish Docker images with specific build args / build-ollama-image (linux/arm64) (push) Waiting to run
Create and publish Docker images with specific build args / merge-main-images (push) Blocked by required conditions
Create and publish Docker images with specific build args / merge-cuda-images (push) Blocked by required conditions
Create and publish Docker images with specific build args / merge-ollama-images (push) Blocked by required conditions
Python CI / Format Backend (3.11) (push) Waiting to run
Frontend Build / Format & Build Frontend (push) Waiting to run
Frontend Build / Frontend Unit Tests (push) Waiting to run
Integration Test / Run Cypress Integration Tests (push) Waiting to run
Integration Test / Run Migration Tests (push) Waiting to run

This commit is contained in:
Timothy J. Baek 2024-11-05 15:15:32 -08:00
parent 1ee7730fac
commit 28b541a692

View File

@ -966,9 +966,11 @@ OPENSEARCH_USERNAME = os.environ.get("OPENSEARCH_USERNAME", None)
OPENSEARCH_PASSWORD = os.environ.get("OPENSEARCH_PASSWORD", None) OPENSEARCH_PASSWORD = os.environ.get("OPENSEARCH_PASSWORD", None)
# Pgvector # Pgvector
PGVECTOR_DB_URL = os.environ.get("PGVECTOR_DB_URL", None) PGVECTOR_DB_URL = os.environ.get("PGVECTOR_DB_URL", DATABASE_URL)
if VECTOR_DB == 'pgvector' and not (DATABASE_URL.startswith("postgres") or PGVECTOR_DB_URL): if VECTOR_DB == "pgvector" and not PGVECTOR_DB_URL.startswith("postgres"):
raise ValueError("Pgvector requires setting PGVECTOR_DB_URL or using Postgres with vector extension as the primary database.") raise ValueError(
"Pgvector requires setting PGVECTOR_DB_URL or using Postgres with vector extension as the primary database."
)
#################################### ####################################
# Information Retrieval (RAG) # Information Retrieval (RAG)
@ -1605,59 +1607,53 @@ LDAP_SERVER_LABEL = PersistentConfig(
LDAP_SERVER_HOST = PersistentConfig( LDAP_SERVER_HOST = PersistentConfig(
"LDAP_SERVER_HOST", "LDAP_SERVER_HOST",
"ldap.server.host", "ldap.server.host",
os.environ.get("LDAP_SERVER_HOST", "localhost") os.environ.get("LDAP_SERVER_HOST", "localhost"),
) )
LDAP_SERVER_PORT = PersistentConfig( LDAP_SERVER_PORT = PersistentConfig(
"LDAP_SERVER_PORT", "LDAP_SERVER_PORT",
"ldap.server.port", "ldap.server.port",
int(os.environ.get("LDAP_SERVER_PORT", "389")) int(os.environ.get("LDAP_SERVER_PORT", "389")),
) )
LDAP_ATTRIBUTE_FOR_USERNAME = PersistentConfig( LDAP_ATTRIBUTE_FOR_USERNAME = PersistentConfig(
"LDAP_ATTRIBUTE_FOR_USERNAME", "LDAP_ATTRIBUTE_FOR_USERNAME",
"ldap.server.attribute_for_username", "ldap.server.attribute_for_username",
os.environ.get("LDAP_ATTRIBUTE_FOR_USERNAME", "uid") os.environ.get("LDAP_ATTRIBUTE_FOR_USERNAME", "uid"),
) )
LDAP_APP_DN = PersistentConfig( LDAP_APP_DN = PersistentConfig(
"LDAP_APP_DN", "LDAP_APP_DN", "ldap.server.app_dn", os.environ.get("LDAP_APP_DN", "")
"ldap.server.app_dn",
os.environ.get("LDAP_APP_DN", "")
) )
LDAP_APP_PASSWORD = PersistentConfig( LDAP_APP_PASSWORD = PersistentConfig(
"LDAP_APP_PASSWORD", "LDAP_APP_PASSWORD",
"ldap.server.app_password", "ldap.server.app_password",
os.environ.get("LDAP_APP_PASSWORD", "") os.environ.get("LDAP_APP_PASSWORD", ""),
) )
LDAP_SEARCH_BASE = PersistentConfig( LDAP_SEARCH_BASE = PersistentConfig(
"LDAP_SEARCH_BASE", "LDAP_SEARCH_BASE", "ldap.server.users_dn", os.environ.get("LDAP_SEARCH_BASE", "")
"ldap.server.users_dn",
os.environ.get("LDAP_SEARCH_BASE", "")
) )
LDAP_SEARCH_FILTERS = PersistentConfig( LDAP_SEARCH_FILTERS = PersistentConfig(
"LDAP_SEARCH_FILTER", "LDAP_SEARCH_FILTER",
"ldap.server.search_filter", "ldap.server.search_filter",
os.environ.get("LDAP_SEARCH_FILTER", "") os.environ.get("LDAP_SEARCH_FILTER", ""),
) )
LDAP_USE_TLS = PersistentConfig( LDAP_USE_TLS = PersistentConfig(
"LDAP_USE_TLS", "LDAP_USE_TLS",
"ldap.server.use_tls", "ldap.server.use_tls",
os.environ.get("LDAP_USE_TLS", "True").lower() == "true" os.environ.get("LDAP_USE_TLS", "True").lower() == "true",
) )
LDAP_CA_CERT_FILE = PersistentConfig( LDAP_CA_CERT_FILE = PersistentConfig(
"LDAP_CA_CERT_FILE", "LDAP_CA_CERT_FILE",
"ldap.server.ca_cert_file", "ldap.server.ca_cert_file",
os.environ.get("LDAP_CA_CERT_FILE", "") os.environ.get("LDAP_CA_CERT_FILE", ""),
) )
LDAP_CIPHERS = PersistentConfig( LDAP_CIPHERS = PersistentConfig(
"LDAP_CIPHERS", "LDAP_CIPHERS", "ldap.server.ciphers", os.environ.get("LDAP_CIPHERS", "ALL")
"ldap.server.ciphers",
os.environ.get("LDAP_CIPHERS", "ALL")
) )