diff --git a/shared/utils/check_env.py b/shared/utils/check_env.py index 99663c3..f9a0e89 100644 --- a/shared/utils/check_env.py +++ b/shared/utils/check_env.py @@ -1,26 +1,14 @@ """Definition of check_env function.""" -from __future__ import annotations - import os -def check_env() -> None: +def check_env( + var_list: set[str], +) -> None: """Check necessary environment variables are set.""" - necesasary_var_list = { - 'MONGO_HOST', - 'MONGO_DB', - 'MONGO_COLLECTION', - 'MONGO_USER', - 'MONGO_PASSWORD', - 'DASH_AUTH_USERNAME', - 'DASH_AUTH_PASSWORD', - 'MINIO_ENDPOINT', - 'MINIO_ACCESS_KEY', - 'MINIO_SECRET_KEY', - 'MINIO_BUCKET_NAME', - 'MINIO_BUCKET_NAME_MODELS', - } - for env_var in necesasary_var_list: - # ensure env var set + assert isinstance(var_list, set) + assert all(isinstance(elem, str) for elem in var_list) + # check that env vars are set + for env_var in var_list: assert env_var in os.environ, f"environment variable not set: {env_var}" diff --git a/web_ui/src/main.py b/web_ui/src/main.py index 3d61313..8f74c24 100644 --- a/web_ui/src/main.py +++ b/web_ui/src/main.py @@ -11,7 +11,21 @@ from shared.utils import check_env, setup_logging from .app import init_app # ensure env vars set -check_env() +var_list = { + 'MONGO_HOST', + 'MONGO_DB', + 'MONGO_COLLECTION', + 'MONGO_USER', + 'MONGO_PASSWORD', + 'DASH_AUTH_USERNAME', + 'DASH_AUTH_PASSWORD', + 'MINIO_ENDPOINT', + 'MINIO_ACCESS_KEY', + 'MINIO_SECRET_KEY', + 'MINIO_BUCKET_NAME', + 'MINIO_BUCKET_NAME_MODELS', +} +check_env(var_list) # setup logging stream handler setup_logging()